Merge topic 'iwyu'

d58d28a9 ParserHelper: Move macros to bottom of files
07953c18 remove file cmStandardIncludes.h
f918b053 cmFortranParser: include what you use
b74314c6 cmDependsJavaParser: include what you use
74404df4 cmCommandArgumentParser: include what you use
e7168c08 cmExprParser: include what you use
ee72803e fix some include-what-you-use diagnostics

Source/CPack/cmCPackGenerator.h

@@ -13,7 +13,6 @@
 #include "cmCPackComponentGroup.h"
 #include "cmSystemTools.h"
 
-class cmCPackGenerator;
 class cmCPackLog;
 class cmInstalledFile;
 class cmMakefile;

Source/cmBuildNameCommand.cxx

@@ -6,7 +6,6 @@
 #include <cmsys/RegularExpression.hxx>
 
 #include "cmMakefile.h"
-#include "cmPolicies.h"
 #include "cmStateTypes.h"
 #include "cmSystemTools.h"
 

Source/cmCTest.h

@@ -14,7 +14,6 @@
 #include <time.h>
 #include <vector>
 
-class cmCTest;
 class cmCTestGenericHandler;
 class cmCTestStartCommand;
 class cmGeneratedFileStream;

Source/cmCommandArgumentParser.cxx

@@ -85,7 +85,9 @@ Modify cmCommandArgumentParser.cxx:
 
 */
 
-#include "cmStandardIncludes.h"
+#include <cmConfigure.h> // IWYU pragma: keep
+
+#include <string.h>
 
 #define yyGetParser (cmCommandArgument_yyget_extra(yyscanner))
 
@@ -125,7 +127,7 @@ static void cmCommandArgument_yyerror(yyscan_t yyscanner, const char* message);
 # pragma warning (disable: 4702) /* unreachable code */
 #endif
 
-#line 129 "cmCommandArgumentParser.cxx" /* yacc.c:339  */
+#line 131 "cmCommandArgumentParser.cxx" /* yacc.c:339  */
 
 # ifndef YY_NULLPTR
 #  if defined __cplusplus && 201103L <= __cplusplus
@@ -198,7 +200,7 @@ int cmCommandArgument_yyparse (yyscan_t yyscanner);
 
 /* Copy the second part of user declarations.  */
 
-#line 202 "cmCommandArgumentParser.cxx" /* yacc.c:358  */
+#line 204 "cmCommandArgumentParser.cxx" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -496,9 +498,9 @@ static const yytype_uint8 yytranslate[] =
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint8 yyrline[] =
 {
-       0,    94,    94,   100,   103,   108,   111,   116,   119,   124,
-     127,   130,   133,   136,   139,   144,   147,   150,   153,   158,
-     161,   166,   169,   174,   177
+       0,    96,    96,   102,   105,   110,   113,   118,   121,   126,
+     129,   132,   135,   138,   141,   146,   149,   152,   155,   160,
+     163,   168,   171,   176,   179
 };
 #endif
 
@@ -1295,192 +1297,192 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-#line 94 "cmCommandArgumentParser.y" /* yacc.c:1646  */
+#line 96 "cmCommandArgumentParser.y" /* yacc.c:1646  */
     {
     (yyval.str) = 0;
     yyGetParser->SetResult((yyvsp[0].str));
   }
-#line 1304 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
+#line 1306 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
     break;
 
   case 3:
-#line 100 "cmCommandArgumentParser.y" /* yacc.c:1646  */
+#line 102 "cmCommandArgumentParser.y" /* yacc.c:1646  */
     {
     (yyval.str) = (yyvsp[0].str);
   }
-#line 1312 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
+#line 1314 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
     break;
 
   case 4:
-#line 103 "cmCommandArgumentParser.y" /* yacc.c:1646  */
+#line 105 "cmCommandArgumentParser.y" /* yacc.c:1646  */
     {
     (yyval.str) = yyGetParser->CombineUnions((yyvsp[-1].str), (yyvsp[0].str));
   }
-#line 1320 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
+#line 1322 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
     break;
 
   case 5:
-#line 108 "cmCommandArgumentParser.y" /* yacc.c:1646  */
+#line 110 "cmCommandArgumentParser.y" /* yacc.c:1646  */
     {
     (yyval.str) = 0;
   }
-#line 1328 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
+#line 1330 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
     break;
 
   case 6:
-#line 111 "cmCommandArgumentParser.y" /* yacc.c:1646  */
+#line 113 "cmCommandArgumentParser.y" /* yacc.c:1646  */
     {
     (yyval.str) = yyGetParser->CombineUnions((yyvsp[-1].str), (yyvsp[0].str));
   }
-#line 1336 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
+#line 1338 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
     break;
 
   case 7:
-#line 116 "cmCommandArgumentParser.y" /* yacc.c:1646  */
+#line 118 "cmCommandArgumentParser.y" /* yacc.c:1646  */
     {
     (yyval.str) = (yyvsp[0].str);
   }
-#line 1344 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
+#line 1346 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
     break;
 
   case 8:
-#line 119 "cmCommandArgumentParser.y" /* yacc.c:1646  */
+#line 121 "cmCommandArgumentParser.y" /* yacc.c:1646  */
     {
     (yyval.str) = (yyvsp[0].str);
   }
-#line 1352 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
+#line 1354 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
     break;
 
   case 9:
-#line 124 "cmCommandArgumentParser.y" /* yacc.c:1646  */
+#line 126 "cmCommandArgumentParser.y" /* yacc.c:1646  */
     {
     (yyval.str) = (yyvsp[0].str);
   }
-#line 1360 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
+#line 1362 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
     break;
 
   case 10:
-#line 127 "cmCommandArgumentParser.y" /* yacc.c:1646  */
+#line 129 "cmCommandArgumentParser.y" /* yacc.c:1646  */
     {
     (yyval.str) = (yyvsp[0].str);
   }
-#line 1368 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
+#line 1370 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
     break;
 
   case 11:
-#line 130 "cmCommandArgumentParser.y" /* yacc.c:1646  */
+#line 132 "cmCommandArgumentParser.y" /* yacc.c:1646  */
     {
     (yyval.str) = (yyvsp[0].str);
   }
-#line 1376 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
+#line 1378 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
     break;
 
   case 12:
-#line 133 "cmCommandArgumentParser.y" /* yacc.c:1646  */
+#line 135 "cmCommandArgumentParser.y" /* yacc.c:1646  */
     {
     (yyval.str) = (yyvsp[0].str);
   }
-#line 1384 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
+#line 1386 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
     break;
 
   case 13:
-#line 136 "cmCommandArgumentParser.y" /* yacc.c:1646  */
+#line 138 "cmCommandArgumentParser.y" /* yacc.c:1646  */
     {
     (yyval.str) = (yyvsp[0].str);
   }
-#line 1392 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
+#line 1394 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
     break;
 
   case 14:
-#line 139 "cmCommandArgumentParser.y" /* yacc.c:1646  */
+#line 141 "cmCommandArgumentParser.y" /* yacc.c:1646  */
     {
     (yyval.str) = (yyvsp[0].str);
   }
-#line 1400 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
+#line 1402 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
     break;
 
   case 15:
-#line 144 "cmCommandArgumentParser.y" /* yacc.c:1646  */
+#line 146 "cmCommandArgumentParser.y" /* yacc.c:1646  */
     {
     (yyval.str) = yyGetParser->ExpandSpecialVariable((yyvsp[-2].str), (yyvsp[-1].str));
   }
-#line 1408 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
+#line 1410 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
     break;
 
   case 16:
-#line 147 "cmCommandArgumentParser.y" /* yacc.c:1646  */
+#line 149 "cmCommandArgumentParser.y" /* yacc.c:1646  */
     {
     (yyval.str) = yyGetParser->ExpandSpecialVariable((yyvsp[-2].str), (yyvsp[-1].str));
   }
-#line 1416 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
+#line 1418 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
     break;
 
   case 17:
-#line 150 "cmCommandArgumentParser.y" /* yacc.c:1646  */
+#line 152 "cmCommandArgumentParser.y" /* yacc.c:1646  */
     {
     (yyval.str) = yyGetParser->ExpandVariable((yyvsp[-1].str));
   }
-#line 1424 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
+#line 1426 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
     break;
 
   case 18:
-#line 153 "cmCommandArgumentParser.y" /* yacc.c:1646  */
+#line 155 "cmCommandArgumentParser.y" /* yacc.c:1646  */
     {
     (yyval.str) = yyGetParser->ExpandVariableForAt((yyvsp[0].str));
   }
-#line 1432 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
+#line 1434 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
     break;
 
   case 19:
-#line 158 "cmCommandArgumentParser.y" /* yacc.c:1646  */
+#line 160 "cmCommandArgumentParser.y" /* yacc.c:1646  */
     {
     (yyval.str) = (yyvsp[0].str);
   }
-#line 1440 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
+#line 1442 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
     break;
 
   case 20:
-#line 161 "cmCommandArgumentParser.y" /* yacc.c:1646  */
+#line 163 "cmCommandArgumentParser.y" /* yacc.c:1646  */
     {
     (yyval.str) = (yyvsp[-1].str);
   }
-#line 1448 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
+#line 1450 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
     break;
 
   case 21:
-#line 166 "cmCommandArgumentParser.y" /* yacc.c:1646  */
+#line 168 "cmCommandArgumentParser.y" /* yacc.c:1646  */
     {
     (yyval.str) = 0;
   }
-#line 1456 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
+#line 1458 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
     break;
 
   case 22:
-#line 169 "cmCommandArgumentParser.y" /* yacc.c:1646  */
+#line 171 "cmCommandArgumentParser.y" /* yacc.c:1646  */
     {
     (yyval.str) = yyGetParser->CombineUnions((yyvsp[-1].str), (yyvsp[0].str));
   }
-#line 1464 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
+#line 1466 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
     break;
 
   case 23:
-#line 174 "cmCommandArgumentParser.y" /* yacc.c:1646  */
+#line 176 "cmCommandArgumentParser.y" /* yacc.c:1646  */
     {
     (yyval.str) = (yyvsp[0].str);
   }
-#line 1472 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
+#line 1474 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
     break;
 
   case 24:
-#line 177 "cmCommandArgumentParser.y" /* yacc.c:1646  */
+#line 179 "cmCommandArgumentParser.y" /* yacc.c:1646  */
     {
     (yyval.str) = (yyvsp[0].str);
   }
-#line 1480 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
+#line 1482 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
     break;
 
 
-#line 1484 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
+#line 1486 "cmCommandArgumentParser.cxx" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -1710,7 +1712,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 182 "cmCommandArgumentParser.y" /* yacc.c:1906  */
+#line 184 "cmCommandArgumentParser.y" /* yacc.c:1906  */
 
 /* End of grammar */
 

Source/cmCommandArgumentParser.y

@@ -14,7 +14,9 @@ Modify cmCommandArgumentParser.cxx:
 
 */
 
-#include "cmStandardIncludes.h"
+#include <cmConfigure.h> // IWYU pragma: keep
+
+#include <string.h>
 
 #define yyGetParser (cmCommandArgument_yyget_extra(yyscanner))
 

Source/cmCommandArgumentParserHelper.h

@@ -8,27 +8,15 @@
 #include <string>
 #include <vector>
 
-#define YYSTYPE cmCommandArgumentParserHelper::ParserType
-#define YYSTYPE_IS_DECLARED
-#define YY_EXTRA_TYPE cmCommandArgumentParserHelper*
-#define YY_DECL                                                               \
-  int cmCommandArgument_yylex(YYSTYPE* yylvalp, yyscan_t yyscanner)
-
-/** \class cmCommandArgumentParserHelper
- * \brief Helper class for parsing java source files
- *
- * Finds dependencies for java file and list of outputs
- */
-
 class cmMakefile;
 
 class cmCommandArgumentParserHelper
 {
 public:
-  typedef struct
+  struct ParserType
   {
     char* str;
-  } ParserType;
+  };
 
   cmCommandArgumentParserHelper();
   ~cmCommandArgumentParserHelper();
@@ -100,4 +88,10 @@ private:
   bool RemoveEmpty;
 };
 
+#define YYSTYPE cmCommandArgumentParserHelper::ParserType
+#define YYSTYPE_IS_DECLARED
+#define YY_EXTRA_TYPE cmCommandArgumentParserHelper*
+#define YY_DECL                                                               \
+  int cmCommandArgument_yylex(YYSTYPE* yylvalp, yyscan_t yyscanner)
+
 #endif

Source/cmCommands.cxx

@@ -1,6 +1,7 @@
 /* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmCommands.h"
+#include "cmPolicies.h"
 #include "cmState.h"
 
 #include "cmAddCustomCommandCommand.h"

Source/cmCoreTryCompile.cxx

@@ -8,6 +8,7 @@
 #include <sstream>
 #include <stdio.h>
 #include <string.h>
+#include <utility>
 
 #include "cmAlgorithms.h"
 #include "cmExportTryCompileFileGenerator.h"

Source/cmDependsJavaParser.y

@@ -14,6 +14,12 @@ Modify cmDependsJavaParser.cxx:
 
 */
 
+#include <cmConfigure.h> // IWYU pragma: keep
+
+#include <stdlib.h>
+#include <string.h>
+#include <string>
+
 #define yyGetParser (cmDependsJava_yyget_extra(yyscanner))
 
 /*-------------------------------------------------------------------------*/

Source/cmDependsJavaParserHelper.h

@@ -8,26 +8,18 @@
 #include <string>
 #include <vector>
 
-class cmDependsJavaParserHelper;
-
-#define YYSTYPE cmDependsJavaParserHelper::ParserType
-#define YYSTYPE_IS_DECLARED
-#define YY_EXTRA_TYPE cmDependsJavaParserHelper*
-#define YY_DECL int cmDependsJava_yylex(YYSTYPE* yylvalp, yyscan_t yyscanner)
-
 /** \class cmDependsJavaParserHelper
  * \brief Helper class for parsing java source files
  *
  * Finds dependencies for java file and list of outputs
  */
-
 class cmDependsJavaParserHelper
 {
 public:
-  typedef struct
+  struct ParserType
   {
     char* str;
-  } ParserType;
+  };
 
   cmDependsJavaParserHelper();
   ~cmDependsJavaParserHelper();
@@ -96,4 +88,9 @@ private:
   void CleanupParser();
 };
 
+#define YYSTYPE cmDependsJavaParserHelper::ParserType
+#define YYSTYPE_IS_DECLARED
+#define YY_EXTRA_TYPE cmDependsJavaParserHelper*
+#define YY_DECL int cmDependsJava_yylex(YYSTYPE* yylvalp, yyscan_t yyscanner)
+
 #endif

Source/cmExportLibraryDependenciesCommand.cxx

@@ -9,7 +9,6 @@
 #include "cmGeneratedFileStream.h"
 #include "cmGlobalGenerator.h"
 #include "cmMakefile.h"
-#include "cmPolicies.h"
 #include "cmStateTypes.h"
 #include "cmSystemTools.h"
 #include "cmTarget.h"

Source/cmExprParser.cxx

@@ -85,14 +85,17 @@ Modify cmExprParser.cxx:
 
 */
 
+#include <cmConfigure.h> // IWYU pragma: keep
+
+#include <stdlib.h>
+#include <string.h>
+
 /*-------------------------------------------------------------------------*/
 #define YYDEBUG 1
 #include "cmExprParserHelper.h" /* Interface to parser object.  */
 #include "cmExprLexer.h"  /* Interface to lexer object.  */
 #include "cmExprParserTokens.h" /* Need YYSTYPE for YY_DECL.  */
 
-#include <math.h>
-
 /* Forward declare the lexer entry point.  */
 YY_DECL;
 
@@ -105,7 +108,7 @@ static void cmExpr_yyerror(yyscan_t yyscanner, const char* message);
 # pragma warning (disable: 4065) /* Switch statement contains default but no case. */
 #endif
 
-#line 109 "cmExprParser.cxx" /* yacc.c:339  */
+#line 112 "cmExprParser.cxx" /* yacc.c:339  */
 
 # ifndef YY_NULLPTR
 #  if defined __cplusplus && 201103L <= __cplusplus
@@ -182,7 +185,7 @@ int cmExpr_yyparse (yyscan_t yyscanner);
 
 /* Copy the second part of user declarations.  */
 
-#line 186 "cmExprParser.cxx" /* yacc.c:358  */
+#line 189 "cmExprParser.cxx" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -481,9 +484,9 @@ static const yytype_uint8 yytranslate[] =
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint8 yyrline[] =
 {
-       0,    70,    70,    75,    78,    83,    86,    91,    94,    99,
-     102,   105,   110,   113,   116,   121,   124,   127,   130,   135,
-     138,   141,   146,   149
+       0,    73,    73,    78,    81,    86,    89,    94,    97,   102,
+     105,   108,   113,   116,   119,   124,   127,   130,   133,   138,
+     141,   144,   149,   152
 };
 #endif
 
@@ -1278,183 +1281,183 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-#line 70 "cmExprParser.y" /* yacc.c:1646  */
+#line 73 "cmExprParser.y" /* yacc.c:1646  */
     {
     cmExpr_yyget_extra(yyscanner)->SetResult((yyvsp[0].Number));
   }
-#line 1286 "cmExprParser.cxx" /* yacc.c:1646  */
+#line 1289 "cmExprParser.cxx" /* yacc.c:1646  */
     break;
 
   case 3:
-#line 75 "cmExprParser.y" /* yacc.c:1646  */
+#line 78 "cmExprParser.y" /* yacc.c:1646  */
     {
     (yyval.Number) = (yyvsp[0].Number);
   }
-#line 1294 "cmExprParser.cxx" /* yacc.c:1646  */
+#line 1297 "cmExprParser.cxx" /* yacc.c:1646  */
     break;
 
   case 4:
-#line 78 "cmExprParser.y" /* yacc.c:1646  */
+#line 81 "cmExprParser.y" /* yacc.c:1646  */
     {
     (yyval.Number) = (yyvsp[-2].Number) | (yyvsp[0].Number);
   }
-#line 1302 "cmExprParser.cxx" /* yacc.c:1646  */
+#line 1305 "cmExprParser.cxx" /* yacc.c:1646  */
     break;
 
   case 5:
-#line 83 "cmExprParser.y" /* yacc.c:1646  */
+#line 86 "cmExprParser.y" /* yacc.c:1646  */
     {
     (yyval.Number) = (yyvsp[0].Number);
   }
-#line 1310 "cmExprParser.cxx" /* yacc.c:1646  */
+#line 1313 "cmExprParser.cxx" /* yacc.c:1646  */
     break;
 
   case 6:
-#line 86 "cmExprParser.y" /* yacc.c:1646  */
+#line 89 "cmExprParser.y" /* yacc.c:1646  */
     {
     (yyval.Number) = (yyvsp[-2].Number) ^ (yyvsp[0].Number);
   }
-#line 1318 "cmExprParser.cxx" /* yacc.c:1646  */
+#line 1321 "cmExprParser.cxx" /* yacc.c:1646  */
     break;
 
   case 7:
-#line 91 "cmExprParser.y" /* yacc.c:1646  */
+#line 94 "cmExprParser.y" /* yacc.c:1646  */
     {
     (yyval.Number) = (yyvsp[0].Number);
   }
-#line 1326 "cmExprParser.cxx" /* yacc.c:1646  */
+#line 1329 "cmExprParser.cxx" /* yacc.c:1646  */
     break;
 
   case 8:
-#line 94 "cmExprParser.y" /* yacc.c:1646  */
+#line 97 "cmExprParser.y" /* yacc.c:1646  */
     {
     (yyval.Number) = (yyvsp[-2].Number) & (yyvsp[0].Number);
   }
-#line 1334 "cmExprParser.cxx" /* yacc.c:1646  */
+#line 1337 "cmExprParser.cxx" /* yacc.c:1646  */
     break;
 
   case 9:
-#line 99 "cmExprParser.y" /* yacc.c:1646  */
+#line 102 "cmExprParser.y" /* yacc.c:1646  */
     {
     (yyval.Number) = (yyvsp[0].Number);
   }
-#line 1342 "cmExprParser.cxx" /* yacc.c:1646  */
+#line 1345 "cmExprParser.cxx" /* yacc.c:1646  */
     break;
 
   case 10:
-#line 102 "cmExprParser.y" /* yacc.c:1646  */
+#line 105 "cmExprParser.y" /* yacc.c:1646  */
     {
     (yyval.Number) = (yyvsp[-2].Number) << (yyvsp[0].Number);
   }
-#line 1350 "cmExprParser.cxx" /* yacc.c:1646  */
+#line 1353 "cmExprParser.cxx" /* yacc.c:1646  */
     break;
 
   case 11:
-#line 105 "cmExprParser.y" /* yacc.c:1646  */
+#line 108 "cmExprParser.y" /* yacc.c:1646  */
     {
     (yyval.Number) = (yyvsp[-2].Number) >> (yyvsp[0].Number);
   }
-#line 1358 "cmExprParser.cxx" /* yacc.c:1646  */
+#line 1361 "cmExprParser.cxx" /* yacc.c:1646  */
     break;
 
   case 12:
-#line 110 "cmExprParser.y" /* yacc.c:1646  */
+#line 113 "cmExprParser.y" /* yacc.c:1646  */
     {
     (yyval.Number) = (yyvsp[0].Number);
   }
-#line 1366 "cmExprParser.cxx" /* yacc.c:1646  */
+#line 1369 "cmExprParser.cxx" /* yacc.c:1646  */
     break;
 
   case 13:
-#line 113 "cmExprParser.y" /* yacc.c:1646  */
+#line 116 "cmExprParser.y" /* yacc.c:1646  */
     {
     (yyval.Number) = (yyvsp[-2].Number) + (yyvsp[0].Number);
   }
-#line 1374 "cmExprParser.cxx" /* yacc.c:1646  */
+#line 1377 "cmExprParser.cxx" /* yacc.c:1646  */
     break;
 
   case 14:
-#line 116 "cmExprParser.y" /* yacc.c:1646  */
+#line 119 "cmExprParser.y" /* yacc.c:1646  */
     {
     (yyval.Number) = (yyvsp[-2].Number) - (yyvsp[0].Number);
   }
-#line 1382 "cmExprParser.cxx" /* yacc.c:1646  */
+#line 1385 "cmExprParser.cxx" /* yacc.c:1646  */
     break;
 
   case 15:
-#line 121 "cmExprParser.y" /* yacc.c:1646  */
+#line 124 "cmExprParser.y" /* yacc.c:1646  */
     {
     (yyval.Number) = (yyvsp[0].Number);
   }
-#line 1390 "cmExprParser.cxx" /* yacc.c:1646  */
+#line 1393 "cmExprParser.cxx" /* yacc.c:1646  */
     break;
 
   case 16:
-#line 124 "cmExprParser.y" /* yacc.c:1646  */
+#line 127 "cmExprParser.y" /* yacc.c:1646  */
     {
     (yyval.Number) = (yyvsp[-2].Number) * (yyvsp[0].Number);
   }
-#line 1398 "cmExprParser.cxx" /* yacc.c:1646  */
+#line 1401 "cmExprParser.cxx" /* yacc.c:1646  */
     break;
 
   case 17:
-#line 127 "cmExprParser.y" /* yacc.c:1646  */
+#line 130 "cmExprParser.y" /* yacc.c:1646  */
     {
     (yyval.Number) = (yyvsp[-2].Number) / (yyvsp[0].Number);
   }
-#line 1406 "cmExprParser.cxx" /* yacc.c:1646  */
+#line 1409 "cmExprParser.cxx" /* yacc.c:1646  */
     break;
 
   case 18:
-#line 130 "cmExprParser.y" /* yacc.c:1646  */
+#line 133 "cmExprParser.y" /* yacc.c:1646  */
     {
     (yyval.Number) = (yyvsp[-2].Number) % (yyvsp[0].Number);
   }
-#line 1414 "cmExprParser.cxx" /* yacc.c:1646  */
+#line 1417 "cmExprParser.cxx" /* yacc.c:1646  */
     break;
 
   case 19:
-#line 135 "cmExprParser.y" /* yacc.c:1646  */
+#line 138 "cmExprParser.y" /* yacc.c:1646  */
     {
     (yyval.Number) = (yyvsp[0].Number);
   }
-#line 1422 "cmExprParser.cxx" /* yacc.c:1646  */
+#line 1425 "cmExprParser.cxx" /* yacc.c:1646  */
     break;
 
   case 20:
-#line 138 "cmExprParser.y" /* yacc.c:1646  */
+#line 141 "cmExprParser.y" /* yacc.c:1646  */
     {
     (yyval.Number) = + (yyvsp[0].Number);
   }
-#line 1430 "cmExprParser.cxx" /* yacc.c:1646  */
+#line 1433 "cmExprParser.cxx" /* yacc.c:1646  */
     break;
 
   case 21:
-#line 141 "cmExprParser.y" /* yacc.c:1646  */
+#line 144 "cmExprParser.y" /* yacc.c:1646  */
     {
     (yyval.Number) = - (yyvsp[0].Number);
   }
-#line 1438 "cmExprParser.cxx" /* yacc.c:1646  */
+#line 1441 "cmExprParser.cxx" /* yacc.c:1646  */
     break;
 
   case 22:
-#line 146 "cmExprParser.y" /* yacc.c:1646  */
+#line 149 "cmExprParser.y" /* yacc.c:1646  */
     {
     (yyval.Number) = (yyvsp[0].Number);
   }
-#line 1446 "cmExprParser.cxx" /* yacc.c:1646  */
+#line 1449 "cmExprParser.cxx" /* yacc.c:1646  */
     break;
 
   case 23:
-#line 149 "cmExprParser.y" /* yacc.c:1646  */
+#line 152 "cmExprParser.y" /* yacc.c:1646  */
     {
     (yyval.Number) = (yyvsp[-1].Number);
   }
-#line 1454 "cmExprParser.cxx" /* yacc.c:1646  */
+#line 1457 "cmExprParser.cxx" /* yacc.c:1646  */
     break;
 
 
-#line 1458 "cmExprParser.cxx" /* yacc.c:1646  */
+#line 1461 "cmExprParser.cxx" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -1684,7 +1687,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 154 "cmExprParser.y" /* yacc.c:1906  */
+#line 157 "cmExprParser.y" /* yacc.c:1906  */
 
 /* End of grammar */
 

Source/cmExprParser.y

@@ -14,14 +14,17 @@ Modify cmExprParser.cxx:
 
 */
 
+#include <cmConfigure.h> // IWYU pragma: keep
+
+#include <stdlib.h>
+#include <string.h>
+
 /*-------------------------------------------------------------------------*/
 #define YYDEBUG 1
 #include "cmExprParserHelper.h" /* Interface to parser object.  */
 #include "cmExprLexer.h"  /* Interface to lexer object.  */
 #include "cmExprParserTokens.h" /* Need YYSTYPE for YY_DECL.  */
 
-#include <math.h>
-
 /* Forward declare the lexer entry point.  */
 YY_DECL;
 

Source/cmExprParserHelper.h

@@ -8,23 +8,13 @@
 #include <string>
 #include <vector>
 
-#define YYSTYPE cmExprParserHelper::ParserType
-#define YYSTYPE_IS_DECLARED
-#define YY_EXTRA_TYPE cmExprParserHelper*
-#define YY_DECL int cmExpr_yylex(YYSTYPE* yylvalp, yyscan_t yyscanner)
-
-/** \class cmExprParserHelper
- * \brief Helper class for parsing java source files
- *
- * Finds dependencies for java file and list of outputs
- */
 class cmExprParserHelper
 {
 public:
-  typedef struct
+  struct ParserType
   {
     int Number;
-  } ParserType;
+  };
 
   cmExprParserHelper();
   ~cmExprParserHelper();
@@ -57,4 +47,9 @@ private:
   std::string ErrorString;
 };
 
+#define YYSTYPE cmExprParserHelper::ParserType
+#define YYSTYPE_IS_DECLARED
+#define YY_EXTRA_TYPE cmExprParserHelper*
+#define YY_DECL int cmExpr_yylex(YYSTYPE* yylvalp, yyscan_t yyscanner)
+
 #endif

Source/cmFortranParser.cxx

@@ -97,13 +97,17 @@ Modify cmFortranParser.cxx:
   - "#if 0" out yyerrorlab block in range ["goto yyerrlab1", "yyerrlab1:"]
 */
 
+#include <cmConfigure.h> // IWYU pragma: keep
+
+#include <cmsys/String.h>
+#include <stdlib.h>
+#include <string.h>
+
 /*-------------------------------------------------------------------------*/
 #define cmFortranParser_cxx
 #include "cmFortranParser.h" /* Interface to parser object.  */
 #include "cmFortranParserTokens.h" /* Need YYSTYPE for YY_DECL.  */
 
-#include <cmsys/String.h>
-
 /* Forward declare the lexer entry point.  */
 YY_DECL;
 
@@ -124,7 +128,7 @@ static void cmFortran_yyerror(yyscan_t yyscanner, const char* message)
 # pragma warning (disable: 4244) /* Conversion to smaller type, data loss. */
 #endif
 
-#line 137 "cmFortranParser.cxx" /* yacc.c:339  */
+#line 132 "cmFortranParser.cxx" /* yacc.c:339  */
 
 # ifndef YY_NULLPTR
 #  if defined __cplusplus && 201103L <= __cplusplus
@@ -244,11 +248,11 @@ extern int cmFortran_yydebug;
 
 union YYSTYPE
 {
-#line 75 "cmFortranParser.y" /* yacc.c:355  */
+#line 70 "cmFortranParser.y" /* yacc.c:355  */
 
   char* string;
 
-#line 261 "cmFortranParser.cxx" /* yacc.c:355  */
+#line 256 "cmFortranParser.cxx" /* yacc.c:355  */
 };
 
 typedef union YYSTYPE YYSTYPE;
@@ -264,7 +268,7 @@ int cmFortran_yyparse (yyscan_t yyscanner);
 
 /* Copy the second part of user declarations.  */
 
-#line 277 "cmFortranParser.cxx" /* yacc.c:358  */
+#line 272 "cmFortranParser.cxx" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -565,13 +569,13 @@ static const yytype_uint8 yytranslate[] =
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint8 yyrline[] =
 {
-       0,   103,   103,   103,   106,   110,   115,   124,   130,   137,
-     142,   146,   151,   159,   164,   169,   174,   179,   184,   189,
-     194,   199,   203,   207,   211,   215,   216,   221,   221,   221,
-     222,   222,   223,   223,   224,   224,   225,   225,   226,   226,
-     227,   227,   228,   228,   229,   229,   230,   230,   233,   234,
-     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
-     245,   246,   247,   248
+       0,    98,    98,    98,   101,   105,   110,   119,   125,   132,
+     137,   141,   146,   154,   159,   164,   169,   174,   179,   184,
+     189,   194,   198,   202,   206,   210,   211,   216,   216,   216,
+     217,   217,   218,   218,   219,   219,   220,   220,   221,   221,
+     222,   222,   223,   223,   224,   224,   225,   225,   228,   229,
+     230,   231,   232,   233,   234,   235,   236,   237,   238,   239,
+     240,   241,   242,   243
 };
 #endif
 
@@ -1523,26 +1527,26 @@ yyreduce:
   switch (yyn)
     {
         case 4:
-#line 106 "cmFortranParser.y" /* yacc.c:1646  */
+#line 101 "cmFortranParser.y" /* yacc.c:1646  */
     {
     cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
     cmFortranParser_SetInInterface(parser, true);
   }
-#line 1541 "cmFortranParser.cxx" /* yacc.c:1646  */
+#line 1536 "cmFortranParser.cxx" /* yacc.c:1646  */
     break;
 
   case 5:
-#line 110 "cmFortranParser.y" /* yacc.c:1646  */
+#line 105 "cmFortranParser.y" /* yacc.c:1646  */
     {
     cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
     cmFortranParser_RuleUse(parser, (yyvsp[-2].string));
     free((yyvsp[-2].string));
   }
-#line 1551 "cmFortranParser.cxx" /* yacc.c:1646  */
+#line 1546 "cmFortranParser.cxx" /* yacc.c:1646  */
     break;
 
   case 6:
-#line 115 "cmFortranParser.y" /* yacc.c:1646  */
+#line 110 "cmFortranParser.y" /* yacc.c:1646  */
     {
     cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
     if (cmsysString_strcasecmp((yyvsp[-2].string), "function") != 0 &&
@@ -1552,22 +1556,22 @@ yyreduce:
     }
     free((yyvsp[-2].string));
   }
-#line 1565 "cmFortranParser.cxx" /* yacc.c:1646  */
+#line 1560 "cmFortranParser.cxx" /* yacc.c:1646  */
     break;
 
   case 7:
-#line 124 "cmFortranParser.y" /* yacc.c:1646  */
+#line 119 "cmFortranParser.y" /* yacc.c:1646  */
     {
     cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
     cmFortranParser_RuleUse(parser, (yyvsp[-4].string));
     free((yyvsp[-4].string));
     free((yyvsp[-2].string));
   }
-#line 1576 "cmFortranParser.cxx" /* yacc.c:1646  */
+#line 1571 "cmFortranParser.cxx" /* yacc.c:1646  */
     break;
 
   case 8:
-#line 130 "cmFortranParser.y" /* yacc.c:1646  */
+#line 125 "cmFortranParser.y" /* yacc.c:1646  */
     {
     cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
     cmFortranParser_RuleUse(parser, (yyvsp[-6].string));
@@ -1575,40 +1579,40 @@ yyreduce:
     free((yyvsp[-4].string));
     free((yyvsp[-2].string));
   }
-#line 1588 "cmFortranParser.cxx" /* yacc.c:1646  */
+#line 1583 "cmFortranParser.cxx" /* yacc.c:1646  */
     break;
 
   case 9:
-#line 137 "cmFortranParser.y" /* yacc.c:1646  */
+#line 132 "cmFortranParser.y" /* yacc.c:1646  */
     {
     cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
     cmFortranParser_SetInInterface(parser, true);
     free((yyvsp[-2].string));
   }
-#line 1598 "cmFortranParser.cxx" /* yacc.c:1646  */
+#line 1593 "cmFortranParser.cxx" /* yacc.c:1646  */
     break;
 
   case 10:
-#line 142 "cmFortranParser.y" /* yacc.c:1646  */
+#line 137 "cmFortranParser.y" /* yacc.c:1646  */
     {
     cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
     cmFortranParser_SetInInterface(parser, false);
   }
-#line 1607 "cmFortranParser.cxx" /* yacc.c:1646  */
+#line 1602 "cmFortranParser.cxx" /* yacc.c:1646  */
     break;
 
   case 11:
-#line 146 "cmFortranParser.y" /* yacc.c:1646  */
+#line 141 "cmFortranParser.y" /* yacc.c:1646  */
     {
     cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
     cmFortranParser_RuleUse(parser, (yyvsp[-2].string));
     free((yyvsp[-2].string));
   }
-#line 1617 "cmFortranParser.cxx" /* yacc.c:1646  */
+#line 1612 "cmFortranParser.cxx" /* yacc.c:1646  */
     break;
 
   case 12:
-#line 151 "cmFortranParser.y" /* yacc.c:1646  */
+#line 146 "cmFortranParser.y" /* yacc.c:1646  */
     {
     if (cmsysString_strcasecmp((yyvsp[-4].string), "non_intrinsic") == 0) {
       cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
@@ -1617,139 +1621,139 @@ yyreduce:
     free((yyvsp[-4].string));
     free((yyvsp[-2].string));
   }
-#line 1630 "cmFortranParser.cxx" /* yacc.c:1646  */
+#line 1625 "cmFortranParser.cxx" /* yacc.c:1646  */
     break;
 
   case 13:
-#line 159 "cmFortranParser.y" /* yacc.c:1646  */
+#line 154 "cmFortranParser.y" /* yacc.c:1646  */
     {
     cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
     cmFortranParser_RuleInclude(parser, (yyvsp[-2].string));
     free((yyvsp[-2].string));
   }
-#line 1640 "cmFortranParser.cxx" /* yacc.c:1646  */
+#line 1635 "cmFortranParser.cxx" /* yacc.c:1646  */
     break;
 
   case 14:
-#line 164 "cmFortranParser.y" /* yacc.c:1646  */
+#line 159 "cmFortranParser.y" /* yacc.c:1646  */
     {
     cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
     cmFortranParser_RuleLineDirective(parser, (yyvsp[-2].string));
     free((yyvsp[-2].string));
   }
-#line 1650 "cmFortranParser.cxx" /* yacc.c:1646  */
+#line 1645 "cmFortranParser.cxx" /* yacc.c:1646  */
     break;
 
   case 15:
-#line 169 "cmFortranParser.y" /* yacc.c:1646  */
+#line 164 "cmFortranParser.y" /* yacc.c:1646  */
     {
     cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
     cmFortranParser_RuleInclude(parser, (yyvsp[-2].string));
     free((yyvsp[-2].string));
   }
-#line 1660 "cmFortranParser.cxx" /* yacc.c:1646  */
+#line 1655 "cmFortranParser.cxx" /* yacc.c:1646  */
     break;
 
   case 16:
-#line 174 "cmFortranParser.y" /* yacc.c:1646  */
+#line 169 "cmFortranParser.y" /* yacc.c:1646  */
     {
     cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
     cmFortranParser_RuleInclude(parser, (yyvsp[-2].string));
     free((yyvsp[-2].string));
   }
-#line 1670 "cmFortranParser.cxx" /* yacc.c:1646  */
+#line 1665 "cmFortranParser.cxx" /* yacc.c:1646  */
     break;
 
   case 17:
-#line 179 "cmFortranParser.y" /* yacc.c:1646  */
+#line 174 "cmFortranParser.y" /* yacc.c:1646  */
     {
     cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
     cmFortranParser_RuleDefine(parser, (yyvsp[-2].string));
     free((yyvsp[-2].string));
   }
-#line 1680 "cmFortranParser.cxx" /* yacc.c:1646  */
+#line 1675 "cmFortranParser.cxx" /* yacc.c:1646  */
     break;
 
   case 18:
-#line 184 "cmFortranParser.y" /* yacc.c:1646  */
+#line 179 "cmFortranParser.y" /* yacc.c:1646  */
     {
     cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
     cmFortranParser_RuleUndef(parser, (yyvsp[-2].string));
     free((yyvsp[-2].string));
   }
-#line 1690 "cmFortranParser.cxx" /* yacc.c:1646  */
+#line 1685 "cmFortranParser.cxx" /* yacc.c:1646  */
     break;
 
   case 19:
-#line 189 "cmFortranParser.y" /* yacc.c:1646  */
+#line 184 "cmFortranParser.y" /* yacc.c:1646  */
     {
     cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
     cmFortranParser_RuleIfdef(parser, (yyvsp[-2].string));
     free((yyvsp[-2].string));
   }
-#line 1700 "cmFortranParser.cxx" /* yacc.c:1646  */
+#line 1695 "cmFortranParser.cxx" /* yacc.c:1646  */
     break;
 
   case 20:
-#line 194 "cmFortranParser.y" /* yacc.c:1646  */
+#line 189 "cmFortranParser.y" /* yacc.c:1646  */
     {
     cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
     cmFortranParser_RuleIfndef(parser, (yyvsp[-2].string));
     free((yyvsp[-2].string));
   }
-#line 1710 "cmFortranParser.cxx" /* yacc.c:1646  */
+#line 1705 "cmFortranParser.cxx" /* yacc.c:1646  */
     break;
 
   case 21:
-#line 199 "cmFortranParser.y" /* yacc.c:1646  */
+#line 194 "cmFortranParser.y" /* yacc.c:1646  */
     {
     cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
     cmFortranParser_RuleIf(parser);
   }
-#line 1719 "cmFortranParser.cxx" /* yacc.c:1646  */
+#line 1714 "cmFortranParser.cxx" /* yacc.c:1646  */
     break;
 
   case 22:
-#line 203 "cmFortranParser.y" /* yacc.c:1646  */
+#line 198 "cmFortranParser.y" /* yacc.c:1646  */
     {
     cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
     cmFortranParser_RuleElif(parser);
   }
-#line 1728 "cmFortranParser.cxx" /* yacc.c:1646  */
+#line 1723 "cmFortranParser.cxx" /* yacc.c:1646  */
     break;
 
   case 23:
-#line 207 "cmFortranParser.y" /* yacc.c:1646  */
+#line 202 "cmFortranParser.y" /* yacc.c:1646  */
     {
     cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
     cmFortranParser_RuleElse(parser);
   }
-#line 1737 "cmFortranParser.cxx" /* yacc.c:1646  */
+#line 1732 "cmFortranParser.cxx" /* yacc.c:1646  */
     break;
 
   case 24:
-#line 211 "cmFortranParser.y" /* yacc.c:1646  */
+#line 206 "cmFortranParser.y" /* yacc.c:1646  */
     {
     cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
     cmFortranParser_RuleEndif(parser);
   }
-#line 1746 "cmFortranParser.cxx" /* yacc.c:1646  */
+#line 1741 "cmFortranParser.cxx" /* yacc.c:1646  */
     break;
 
   case 48:
-#line 233 "cmFortranParser.y" /* yacc.c:1646  */
+#line 228 "cmFortranParser.y" /* yacc.c:1646  */
     { free ((yyvsp[0].string)); }
-#line 1752 "cmFortranParser.cxx" /* yacc.c:1646  */
+#line 1747 "cmFortranParser.cxx" /* yacc.c:1646  */
     break;
 
   case 55:
-#line 240 "cmFortranParser.y" /* yacc.c:1646  */
+#line 235 "cmFortranParser.y" /* yacc.c:1646  */
     { free ((yyvsp[0].string)); }
-#line 1758 "cmFortranParser.cxx" /* yacc.c:1646  */
+#line 1753 "cmFortranParser.cxx" /* yacc.c:1646  */
     break;
 
 
-#line 1762 "cmFortranParser.cxx" /* yacc.c:1646  */
+#line 1757 "cmFortranParser.cxx" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -1979,6 +1983,6 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 251 "cmFortranParser.y" /* yacc.c:1906  */
+#line 246 "cmFortranParser.y" /* yacc.c:1906  */
 
 /* End of grammar */

Source/cmFortranParser.h

@@ -6,7 +6,9 @@
 #if !defined(cmFortranLexer_cxx) && !defined(cmFortranParser_cxx)
 #include <cmConfigure.h>
 
-#include "cmStandardIncludes.h"
+#include <set>
+#include <string>
+#include <vector>
 #endif
 
 #include <stddef.h> /* size_t */

Source/cmFortranParser.y

@@ -26,13 +26,17 @@ Modify cmFortranParser.cxx:
   - "#if 0" out yyerrorlab block in range ["goto yyerrlab1", "yyerrlab1:"]
 */
 
+#include <cmConfigure.h> // IWYU pragma: keep
+
+#include <cmsys/String.h>
+#include <stdlib.h>
+#include <string.h>
+
 /*-------------------------------------------------------------------------*/
 #define cmFortranParser_cxx
 #include "cmFortranParser.h" /* Interface to parser object.  */
 #include "cmFortranParserTokens.h" /* Need YYSTYPE for YY_DECL.  */
 
-#include <cmsys/String.h>
-
 /* Forward declare the lexer entry point.  */
 YY_DECL;
 

Source/cmFortranParserTokens.h

@@ -130,7 +130,7 @@ extern int cmFortran_yydebug;
 
 union YYSTYPE
 {
-#line 75 "cmFortranParser.y" /* yacc.c:1909  */
+#line 70 "cmFortranParser.y" /* yacc.c:1909  */
 
   char* string;
 

Source/cmLinkLineDeviceComputer.cxx

@@ -2,10 +2,18 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 
 #include "cmLinkLineDeviceComputer.h"
+
+#include <set>
+#include <sstream>
+#include <vector>
+
 #include "cmComputeLinkInformation.h"
 #include "cmGeneratorTarget.h"
 #include "cmGlobalNinjaGenerator.h"
-#include "cmOutputConverter.h"
+#include "cmStateDirectory.h"
+#include "cmStateTypes.h"
+
+class cmOutputConverter;
 
 cmLinkLineDeviceComputer::cmLinkLineDeviceComputer(
   cmOutputConverter* outputConverter, cmStateDirectory stateDir)

Source/cmLinkLineDeviceComputer.h

@@ -4,8 +4,17 @@
 #ifndef cmLinkLineDeviceComputer_h
 #define cmLinkLineDeviceComputer_h
 
+#include <cmConfigure.h>
+
+#include <string>
+
 #include "cmLinkLineComputer.h"
+
+class cmComputeLinkInformation;
+class cmGeneratorTarget;
 class cmGlobalNinjaGenerator;
+class cmOutputConverter;
+class cmStateDirectory;
 
 class cmLinkLineDeviceComputer : public cmLinkLineComputer
 {

Source/cmLoadCommandCommand.cxx

@@ -2,22 +2,21 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmLoadCommandCommand.h"
 
+#include <signal.h>
+#include <sstream>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "cmCPluginAPI.cxx"
 #include "cmCPluginAPI.h"
 #include "cmDynamicLoader.h"
 #include "cmMakefile.h"
-#include "cmPolicies.h"
 #include "cmState.h"
 #include "cmSystemTools.h"
 
 class cmExecutionStatus;
 
-#include <signal.h>
-#include <sstream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #ifdef __QNX__
 #include <malloc.h> /* for malloc/free on QNX */
 #endif

Source/cmLocalGenerator.cxx

@@ -13,7 +13,6 @@
 #include "cmInstallScriptGenerator.h"
 #include "cmInstallTargetGenerator.h"
 #include "cmLinkLineComputer.h"
-#include "cmLinkLineDeviceComputer.h"
 #include "cmMakefile.h"
 #include "cmRulePlaceholderExpander.h"
 #include "cmSourceFile.h"

Source/cmMakefileExecutableTargetGenerator.cxx

@@ -2,6 +2,7 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmMakefileExecutableTargetGenerator.h"
 
+#include <algorithm>
 #include <sstream>
 #include <string>
 #include <vector>

Source/cmMakefileExecutableTargetGenerator.h

@@ -5,6 +5,8 @@
 
 #include <cmConfigure.h>
 
+#include <string>
+
 #include "cmMakefileTargetGenerator.h"
 
 class cmGeneratorTarget;

Source/cmMakefileLibraryTargetGenerator.cxx

@@ -2,8 +2,7 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmMakefileLibraryTargetGenerator.h"
 
-#include <cmConfigure.h> // IWYU pragma: keep
-
+#include <algorithm>
 #include <sstream>
 #include <vector>
 

Source/cmOutputRequiredFilesCommand.cxx

@@ -10,7 +10,6 @@
 #include "cmAlgorithms.h"
 #include "cmGeneratorExpression.h"
 #include "cmMakefile.h"
-#include "cmPolicies.h"
 #include "cmSourceFile.h"
 #include "cmSystemTools.h"
 #include "cmTarget.h"

Source/cmQtAutoGenerators.cxx

@@ -14,6 +14,7 @@
 #include <utility>
 
 #include "cmAlgorithms.h"
+#include "cmFilePathChecksum.h"
 #include "cmGlobalGenerator.h"
 #include "cmMakefile.h"
 #include "cmOutputConverter.h"

Source/cmSourceGroupCommand.cxx

@@ -2,7 +2,9 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmSourceGroupCommand.h"
 
+#include <set>
 #include <sstream>
+#include <stddef.h>
 
 #include "cmMakefile.h"
 #include "cmSourceGroup.h"

Source/cmStandardIncludes.h

@@ -1,53 +0,0 @@
-/* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-   file Copyright.txt or https://cmake.org/licensing for details.  */
-/**
- * Include header files as a function of the build process, compiler,
- * and operating system.
- */
-#ifndef cmStandardIncludes_h
-#define cmStandardIncludes_h
-
-#include <cmConfigure.h>
-
-// Provide fixed-size integer types.
-#include <cm_kwiml.h>
-
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <sstream>
-
-// we must have stl with the standard include style
-#include <algorithm>
-#include <functional>
-#include <iterator>
-#include <map>
-#include <set>
-#include <string>
-#include <vector>
-
-// include the "c" string header
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if defined(_MSC_VER)
-typedef unsigned short mode_t;
-#else
-#include <sys/types.h>
-#endif
-
-// use this class to shrink the size of symbols in .o files
-// std::string is really basic_string<....lots of stuff....>
-// when combined with a map or set, the symbols can be > 2000 chars!
-#include <cmsys/String.hxx>
-// typedef cmsys::String std::string;
-
-/* Poison this operator to avoid common mistakes.  */
-extern void operator<<(std::ostream&, const std::ostringstream&);
-
-#include "cmCustomCommandLines.h"
-#include "cmDocumentationEntry.h"
-#include "cmTargetLinkLibraryType.h"
-
-#endif

Source/cmSubdirDependsCommand.cxx

@@ -2,8 +2,6 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmSubdirDependsCommand.h"
 
-#include "cmPolicies.h"
-
 class cmExecutionStatus;
 
 bool cmSubdirDependsCommand::InitialPass(std::vector<std::string> const&,

Source/cmSystemTools.cxx

@@ -45,6 +45,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <time.h>
+#include <utility>
 
 #if defined(_WIN32)
 #include <windows.h>

Source/cmUseMangledMesaCommand.cxx

@@ -5,7 +5,6 @@
 #include <cmsys/FStream.hxx>
 #include <cmsys/RegularExpression.hxx>
 
-#include "cmPolicies.h"
 #include "cmSystemTools.h"
 
 class cmExecutionStatus;

Source/cmUtilitySourceCommand.cxx

@@ -5,7 +5,6 @@
 #include <string.h>
 
 #include "cmMakefile.h"
-#include "cmPolicies.h"
 #include "cmState.h"
 #include "cmStateTypes.h"
 #include "cmSystemTools.h"

Source/cmVariableRequiresCommand.cxx

@@ -3,7 +3,6 @@
 #include "cmVariableRequiresCommand.h"
 
 #include "cmMakefile.h"
-#include "cmPolicies.h"
 #include "cmState.h"
 #include "cmSystemTools.h"