IWYU: Update for Debian 12 CI job

`include-what-you-use` diagnostics, in practice, are specific to
the environment's compiler and standard library.  Update includes
to satisfy IWYU for our CI job under Debian 12.

.gitlab/ci/configure_debian12_iwyu.cmake

@@ -1,4 +1,5 @@
 set(CMake_RUN_IWYU ON CACHE BOOL "")
+set(CMake_IWYU_OPTIONS "-DCMAKE_IWYU_FORWARD_STD_HASH" CACHE STRING "")
 # Uncomment to diagnose IWYU problems as needed.
 #set(CMake_IWYU_VERBOSE ON CACHE BOOL "")
 set(IWYU_COMMAND "/usr/bin/include-what-you-use-15" CACHE FILEPATH "")

Source/CTest/cmCTestBZR.cxx

@@ -16,7 +16,6 @@
 
 #include "cmCTest.h"
 #include "cmCTestVC.h"
-#include "cmProcessTools.h"
 #include "cmSystemTools.h"
 #include "cmXMLParser.h"
 

Source/CTest/cmCTestBuildHandler.cxx

@@ -3,6 +3,7 @@
 #include "cmCTestBuildHandler.h"
 
 #include <cstdlib>
+#include <ratio>
 #include <set>
 #include <utility>
 

Source/CTest/cmCTestCVS.cxx

@@ -10,7 +10,6 @@
 #include "cmsys/RegularExpression.hxx"
 
 #include "cmCTest.h"
-#include "cmProcessTools.h"
 #include "cmStringAlgorithms.h"
 #include "cmSystemTools.h"
 #include "cmXMLWriter.h"

Source/CTest/cmCTestConfigureCommand.cxx

@@ -4,6 +4,7 @@
 
 #include <cstring>
 #include <sstream>
+#include <vector>
 
 #include <cmext/string_view>
 

Source/CTest/cmCTestCoverageHandler.cxx

@@ -9,7 +9,9 @@
 #include <cstring>
 #include <iomanip>
 #include <iterator>
+#include <ratio>
 #include <sstream>
+#include <type_traits>
 #include <utility>
 
 #include <cmext/algorithm>

Source/CTest/cmCTestGIT.cxx

@@ -16,7 +16,6 @@
 #include "cmCTestVC.h"
 #include "cmList.h"
 #include "cmProcessOutput.h"
-#include "cmProcessTools.h"
 #include "cmStringAlgorithms.h"
 #include "cmSystemTools.h"
 #include "cmValue.h"

Source/CTest/cmCTestHG.cxx

@@ -11,7 +11,6 @@
 
 #include "cmCTest.h"
 #include "cmCTestVC.h"
-#include "cmProcessTools.h"
 #include "cmSystemTools.h"
 #include "cmXMLParser.h"
 

Source/CTest/cmCTestMemCheckHandler.cxx

@@ -7,6 +7,7 @@
 #include <cstring>
 #include <iostream>
 #include <iterator>
+#include <ratio>
 #include <sstream>
 #include <utility>
 

Source/CTest/cmCTestP4.cxx

@@ -14,7 +14,6 @@
 #include "cmCTest.h"
 #include "cmCTestVC.h"
 #include "cmList.h"
-#include "cmProcessTools.h"
 #include "cmRange.h"
 #include "cmSystemTools.h"
 

Source/CTest/cmCTestSVN.cxx

@@ -13,7 +13,6 @@
 
 #include "cmCTest.h"
 #include "cmCTestVC.h"
-#include "cmProcessTools.h"
 #include "cmStringAlgorithms.h"
 #include "cmSystemTools.h"
 #include "cmXMLParser.h"

Source/CTest/cmCTestTestCommand.cxx

@@ -4,6 +4,7 @@
 
 #include <chrono>
 #include <cstdlib>
+#include <ratio>
 #include <sstream>
 
 #include <cmext/string_view>

Source/CTest/cmCTestTestHandler.cxx

@@ -13,6 +13,7 @@
 #include <functional>
 #include <iomanip>
 #include <iterator>
+#include <ratio>
 #include <set>
 #include <sstream>
 #include <utility>

Source/CTest/cmCTestTestHandler.h

@@ -22,7 +22,7 @@
 #include "cmCTest.h"
 #include "cmCTestGenericHandler.h"
 #include "cmCTestResourceSpec.h"
-#include "cmCTestTypes.h"
+#include "cmCTestTypes.h" // IWYU pragma: keep
 #include "cmDuration.h"
 #include "cmListFileCache.h"
 #include "cmValue.h"

Source/CTest/cmParseGTMCoverage.cxx

@@ -2,7 +2,6 @@
 
 #include <cstdio>
 #include <cstdlib>
-#include <map>
 #include <vector>
 
 #include "cmsys/Directory.hxx"

Source/CTest/cmProcess.cxx

@@ -4,6 +4,7 @@
 
 #include <csignal>
 #include <iostream>
+#include <ratio>
 #include <string>
 #include <utility>
 

Source/CursesDialog/cmCursesCacheEntryComposite.cxx

@@ -4,6 +4,7 @@
 
 #include <cassert>
 #include <utility>
+#include <vector>
 
 #include <cm/memory>
 

Source/LexerParser/cmCommandArgumentParser.cxx

@@ -97,7 +97,6 @@ Run bison like this:
 # include <malloc.h>
 #endif
 
-#include <stdint.h>
 /* Make sure the parser uses standard memory allocation.  The default
    generated parser malloc/free declarations do not work on all
    platforms.  */
@@ -137,7 +136,7 @@ static void cmCommandArgument_yyerror(yyscan_t yyscanner, const char* message);
 # endif
 #endif
 
-#line 141 "cmCommandArgumentParser.cxx"
+#line 140 "cmCommandArgumentParser.cxx"
 
 # ifndef YY_CAST
 #  ifdef __cplusplus
@@ -576,9 +575,9 @@ static const yytype_int8 yytranslate[] =
 /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint8 yyrline[] =
 {
-       0,   102,   102,   108,   111,   116,   119,   124,   127,   132,
-     135,   138,   141,   144,   147,   152,   155,   158,   161,   166,
-     169,   174,   177,   182,   185
+       0,   101,   101,   107,   110,   115,   118,   123,   126,   131,
+     134,   137,   140,   143,   146,   151,   154,   157,   160,   165,
+     168,   173,   176,   181,   184
 };
 #endif
 
@@ -1437,192 +1436,192 @@ yyreduce:
   switch (yyn)
     {
   case 2: /* Start: GoalWithOptionalBackSlash  */
-#line 102 "cmCommandArgumentParser.y"
+#line 101 "cmCommandArgumentParser.y"
                             {
     (yyval.str) = 0;
     yyGetParser->SetResult((yyvsp[0].str));
   }
-#line 1446 "cmCommandArgumentParser.cxx"
+#line 1445 "cmCommandArgumentParser.cxx"
     break;
 
   case 3: /* GoalWithOptionalBackSlash: Goal  */
-#line 108 "cmCommandArgumentParser.y"
+#line 107 "cmCommandArgumentParser.y"
        {
     (yyval.str) = (yyvsp[0].str);
   }
-#line 1454 "cmCommandArgumentParser.cxx"
+#line 1453 "cmCommandArgumentParser.cxx"
     break;
 
   case 4: /* GoalWithOptionalBackSlash: Goal "\\"  */
-#line 111 "cmCommandArgumentParser.y"
+#line 110 "cmCommandArgumentParser.y"
                   {
     (yyval.str) = yyGetParser->CombineUnions((yyvsp[-1].str), (yyvsp[0].str));
   }
-#line 1462 "cmCommandArgumentParser.cxx"
+#line 1461 "cmCommandArgumentParser.cxx"
     break;
 
   case 5: /* Goal: %empty  */
-#line 116 "cmCommandArgumentParser.y"
+#line 115 "cmCommandArgumentParser.y"
   {
     (yyval.str) = 0;
   }
-#line 1470 "cmCommandArgumentParser.cxx"
+#line 1469 "cmCommandArgumentParser.cxx"
     break;
 
   case 6: /* Goal: String Goal  */
-#line 119 "cmCommandArgumentParser.y"
+#line 118 "cmCommandArgumentParser.y"
               {
     (yyval.str) = yyGetParser->CombineUnions((yyvsp[-1].str), (yyvsp[0].str));
   }
-#line 1478 "cmCommandArgumentParser.cxx"
+#line 1477 "cmCommandArgumentParser.cxx"
     break;
 
   case 7: /* String: OuterText  */
-#line 124 "cmCommandArgumentParser.y"
+#line 123 "cmCommandArgumentParser.y"
             {
     (yyval.str) = (yyvsp[0].str);
   }
-#line 1486 "cmCommandArgumentParser.cxx"
+#line 1485 "cmCommandArgumentParser.cxx"
     break;
 
   case 8: /* String: Variable  */
-#line 127 "cmCommandArgumentParser.y"
+#line 126 "cmCommandArgumentParser.y"
            {
     (yyval.str) = (yyvsp[0].str);
   }
-#line 1494 "cmCommandArgumentParser.cxx"
+#line 1493 "cmCommandArgumentParser.cxx"
     break;
 
   case 9: /* OuterText: cal_NAME  */
-#line 132 "cmCommandArgumentParser.y"
+#line 131 "cmCommandArgumentParser.y"
            {
     (yyval.str) = (yyvsp[0].str);
   }
-#line 1502 "cmCommandArgumentParser.cxx"
+#line 1501 "cmCommandArgumentParser.cxx"
     break;
 
   case 10: /* OuterText: "@"  */
-#line 135 "cmCommandArgumentParser.y"
+#line 134 "cmCommandArgumentParser.y"
          {
     (yyval.str) = (yyvsp[0].str);
   }
-#line 1510 "cmCommandArgumentParser.cxx"
+#line 1509 "cmCommandArgumentParser.cxx"
     break;
 
   case 11: /* OuterText: "$"  */
-#line 138 "cmCommandArgumentParser.y"
+#line 137 "cmCommandArgumentParser.y"
              {
     (yyval.str) = (yyvsp[0].str);
   }
-#line 1518 "cmCommandArgumentParser.cxx"
+#line 1517 "cmCommandArgumentParser.cxx"
     break;
 
   case 12: /* OuterText: "{"  */
-#line 141 "cmCommandArgumentParser.y"
+#line 140 "cmCommandArgumentParser.y"
              {
     (yyval.str) = (yyvsp[0].str);
   }
-#line 1526 "cmCommandArgumentParser.cxx"
+#line 1525 "cmCommandArgumentParser.cxx"
     break;
 
   case 13: /* OuterText: "}"  */
-#line 144 "cmCommandArgumentParser.y"
+#line 143 "cmCommandArgumentParser.y"
              {
     (yyval.str) = (yyvsp[0].str);
   }
-#line 1534 "cmCommandArgumentParser.cxx"
+#line 1533 "cmCommandArgumentParser.cxx"
     break;
 
   case 14: /* OuterText: cal_SYMBOL  */
-#line 147 "cmCommandArgumentParser.y"
+#line 146 "cmCommandArgumentParser.y"
              {
     (yyval.str) = (yyvsp[0].str);
   }
-#line 1542 "cmCommandArgumentParser.cxx"
+#line 1541 "cmCommandArgumentParser.cxx"
     break;
 
   case 15: /* Variable: cal_ENVCURLY EnvVarName "}"  */
-#line 152 "cmCommandArgumentParser.y"
+#line 151 "cmCommandArgumentParser.y"
                                      {
     (yyval.str) = yyGetParser->ExpandSpecialVariable((yyvsp[-2].str), (yyvsp[-1].str));
   }
-#line 1550 "cmCommandArgumentParser.cxx"
+#line 1549 "cmCommandArgumentParser.cxx"
     break;
 
   case 16: /* Variable: cal_NCURLY MultipleIds "}"  */
-#line 155 "cmCommandArgumentParser.y"
+#line 154 "cmCommandArgumentParser.y"
                                     {
     (yyval.str) = yyGetParser->ExpandSpecialVariable((yyvsp[-2].str), (yyvsp[-1].str));
   }
-#line 1558 "cmCommandArgumentParser.cxx"
+#line 1557 "cmCommandArgumentParser.cxx"
     break;
 
   case 17: /* Variable: cal_DCURLY MultipleIds "}"  */
-#line 158 "cmCommandArgumentParser.y"
+#line 157 "cmCommandArgumentParser.y"
                                     {
     (yyval.str) = yyGetParser->ExpandVariable((yyvsp[-1].str));
   }
-#line 1566 "cmCommandArgumentParser.cxx"
+#line 1565 "cmCommandArgumentParser.cxx"
     break;
 
   case 18: /* Variable: cal_ATNAME  */
-#line 161 "cmCommandArgumentParser.y"
+#line 160 "cmCommandArgumentParser.y"
              {
     (yyval.str) = yyGetParser->ExpandVariableForAt((yyvsp[0].str));
   }
-#line 1574 "cmCommandArgumentParser.cxx"
+#line 1573 "cmCommandArgumentParser.cxx"
     break;
 
   case 19: /* EnvVarName: MultipleIds  */
-#line 166 "cmCommandArgumentParser.y"
+#line 165 "cmCommandArgumentParser.y"
               {
     (yyval.str) = (yyvsp[0].str);
   }
-#line 1582 "cmCommandArgumentParser.cxx"
+#line 1581 "cmCommandArgumentParser.cxx"
     break;
 
   case 20: /* EnvVarName: cal_SYMBOL EnvVarName  */
-#line 169 "cmCommandArgumentParser.y"
+#line 168 "cmCommandArgumentParser.y"
                         {
     (yyval.str) = (yyvsp[-1].str);
   }
-#line 1590 "cmCommandArgumentParser.cxx"
+#line 1589 "cmCommandArgumentParser.cxx"
     break;
 
   case 21: /* MultipleIds: %empty  */
-#line 174 "cmCommandArgumentParser.y"
+#line 173 "cmCommandArgumentParser.y"
   {
     (yyval.str) = 0;
   }
-#line 1598 "cmCommandArgumentParser.cxx"
+#line 1597 "cmCommandArgumentParser.cxx"
     break;
 
   case 22: /* MultipleIds: ID MultipleIds  */
-#line 177 "cmCommandArgumentParser.y"
+#line 176 "cmCommandArgumentParser.y"
                  {
     (yyval.str) = yyGetParser->CombineUnions((yyvsp[-1].str), (yyvsp[0].str));
   }
-#line 1606 "cmCommandArgumentParser.cxx"
+#line 1605 "cmCommandArgumentParser.cxx"
     break;
 
   case 23: /* ID: cal_NAME  */
-#line 182 "cmCommandArgumentParser.y"
+#line 181 "cmCommandArgumentParser.y"
            {
     (yyval.str) = (yyvsp[0].str);
   }
-#line 1614 "cmCommandArgumentParser.cxx"
+#line 1613 "cmCommandArgumentParser.cxx"
     break;
 
   case 24: /* ID: Variable  */
-#line 185 "cmCommandArgumentParser.y"
+#line 184 "cmCommandArgumentParser.y"
            {
     (yyval.str) = (yyvsp[0].str);
   }
-#line 1622 "cmCommandArgumentParser.cxx"
+#line 1621 "cmCommandArgumentParser.cxx"
     break;
 
 
-#line 1626 "cmCommandArgumentParser.cxx"
+#line 1625 "cmCommandArgumentParser.cxx"
 
       default: break;
     }
@@ -1846,7 +1845,7 @@ yyreturnlab:
   return yyresult;
 }
 
-#line 190 "cmCommandArgumentParser.y"
+#line 189 "cmCommandArgumentParser.y"
 
 /* End of grammar */
 

Source/LexerParser/cmCommandArgumentParser.y

@@ -22,7 +22,6 @@ Run bison like this:
 # include <malloc.h>
 #endif
 
-#include <stdint.h>
 /* Make sure the parser uses standard memory allocation.  The default
    generated parser malloc/free declarations do not work on all
    platforms.  */

Source/LexerParser/cmDependsJavaParser.y

@@ -13,7 +13,6 @@ Run bison like this:
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
-#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <string>

Source/LexerParser/cmExprParser.cxx

@@ -88,7 +88,6 @@ Run bison like this:
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
-#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdexcept>
@@ -127,7 +126,7 @@ static void cmExpr_yyerror(yyscan_t yyscanner, const char* message);
 #  pragma diag_suppress 550 /* variable set but never used */
 #endif
 
-#line 131 "cmExprParser.cxx"
+#line 130 "cmExprParser.cxx"
 
 # ifndef YY_CAST
 #  ifdef __cplusplus
@@ -569,9 +568,9 @@ static const yytype_int8 yytranslate[] =
 /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint8 yyrline[] =
 {
-       0,    88,    88,    93,    96,   101,   104,   109,   112,   117,
-     120,   123,   128,   131,   134,   139,   142,   145,   151,   156,
-     159,   162,   165,   170,   173
+       0,    87,    87,    92,    95,   100,   103,   108,   111,   116,
+     119,   122,   127,   130,   133,   138,   141,   144,   150,   155,
+     158,   161,   164,   169,   172
 };
 #endif
 
@@ -1432,194 +1431,194 @@ yyreduce:
   switch (yyn)
     {
   case 2: /* start: exp  */
-#line 88 "cmExprParser.y"
+#line 87 "cmExprParser.y"
       {
     cmExpr_yyget_extra(yyscanner)->SetResult((yyvsp[0].Number));
   }
-#line 1440 "cmExprParser.cxx"
+#line 1439 "cmExprParser.cxx"
     break;
 
   case 3: /* exp: bitwiseor  */
-#line 93 "cmExprParser.y"
+#line 92 "cmExprParser.y"
             {
     (yyval.Number) = (yyvsp[0].Number);
   }
-#line 1448 "cmExprParser.cxx"
+#line 1447 "cmExprParser.cxx"
     break;
 
   case 4: /* exp: exp exp_OR bitwiseor  */
-#line 96 "cmExprParser.y"
+#line 95 "cmExprParser.y"
                        {
     (yyval.Number) = (yyvsp[-2].Number) | (yyvsp[0].Number);
   }
-#line 1456 "cmExprParser.cxx"
+#line 1455 "cmExprParser.cxx"
     break;
 
   case 5: /* bitwiseor: bitwisexor  */
-#line 101 "cmExprParser.y"
+#line 100 "cmExprParser.y"
              {
     (yyval.Number) = (yyvsp[0].Number);
   }
-#line 1464 "cmExprParser.cxx"
+#line 1463 "cmExprParser.cxx"
     break;
 
   case 6: /* bitwiseor: bitwiseor exp_XOR bitwisexor  */
-#line 104 "cmExprParser.y"
+#line 103 "cmExprParser.y"
                                {
     (yyval.Number) = (yyvsp[-2].Number) ^ (yyvsp[0].Number);
   }
-#line 1472 "cmExprParser.cxx"
+#line 1471 "cmExprParser.cxx"
     break;
 
   case 7: /* bitwisexor: bitwiseand  */
-#line 109 "cmExprParser.y"
+#line 108 "cmExprParser.y"
              {
     (yyval.Number) = (yyvsp[0].Number);
   }
-#line 1480 "cmExprParser.cxx"
+#line 1479 "cmExprParser.cxx"
     break;
 
   case 8: /* bitwisexor: bitwisexor exp_AND bitwiseand  */
-#line 112 "cmExprParser.y"
+#line 111 "cmExprParser.y"
                                 {
     (yyval.Number) = (yyvsp[-2].Number) & (yyvsp[0].Number);
   }
-#line 1488 "cmExprParser.cxx"
+#line 1487 "cmExprParser.cxx"
     break;
 
   case 9: /* bitwiseand: shift  */
-#line 117 "cmExprParser.y"
+#line 116 "cmExprParser.y"
         {
     (yyval.Number) = (yyvsp[0].Number);
   }
-#line 1496 "cmExprParser.cxx"
+#line 1495 "cmExprParser.cxx"
     break;
 
   case 10: /* bitwiseand: bitwiseand exp_SHIFTLEFT shift  */
-#line 120 "cmExprParser.y"
+#line 119 "cmExprParser.y"
                                  {
     (yyval.Number) = (yyvsp[-2].Number) << (yyvsp[0].Number);
   }
-#line 1504 "cmExprParser.cxx"
+#line 1503 "cmExprParser.cxx"
     break;
 
   case 11: /* bitwiseand: bitwiseand exp_SHIFTRIGHT shift  */
-#line 123 "cmExprParser.y"
+#line 122 "cmExprParser.y"
                                   {
     (yyval.Number) = (yyvsp[-2].Number) >> (yyvsp[0].Number);
   }
-#line 1512 "cmExprParser.cxx"
+#line 1511 "cmExprParser.cxx"
     break;
 
   case 12: /* shift: term  */
-#line 128 "cmExprParser.y"
+#line 127 "cmExprParser.y"
        {
     (yyval.Number) = (yyvsp[0].Number);
   }
-#line 1520 "cmExprParser.cxx"
+#line 1519 "cmExprParser.cxx"
     break;
 
   case 13: /* shift: shift exp_PLUS term  */
-#line 131 "cmExprParser.y"
+#line 130 "cmExprParser.y"
                       {
     (yyval.Number) = (yyvsp[-2].Number) + (yyvsp[0].Number);
   }
-#line 1528 "cmExprParser.cxx"
+#line 1527 "cmExprParser.cxx"
     break;
 
   case 14: /* shift: shift exp_MINUS term  */
-#line 134 "cmExprParser.y"
+#line 133 "cmExprParser.y"
                        {
     (yyval.Number) = (yyvsp[-2].Number) - (yyvsp[0].Number);
   }
-#line 1536 "cmExprParser.cxx"
+#line 1535 "cmExprParser.cxx"
     break;
 
   case 15: /* term: unary  */
-#line 139 "cmExprParser.y"
+#line 138 "cmExprParser.y"
         {
     (yyval.Number) = (yyvsp[0].Number);
   }
-#line 1544 "cmExprParser.cxx"
+#line 1543 "cmExprParser.cxx"
     break;
 
   case 16: /* term: term exp_TIMES unary  */
-#line 142 "cmExprParser.y"
+#line 141 "cmExprParser.y"
                        {
     (yyval.Number) = (yyvsp[-2].Number) * (yyvsp[0].Number);
   }
-#line 1552 "cmExprParser.cxx"
+#line 1551 "cmExprParser.cxx"
     break;
 
   case 17: /* term: term exp_DIVIDE unary  */
-#line 145 "cmExprParser.y"
+#line 144 "cmExprParser.y"
                         {
     if (yyvsp[0].Number == 0) {
       throw std::overflow_error("divide by zero");
     }
     (yyval.Number) = (yyvsp[-2].Number) / (yyvsp[0].Number);
   }
-#line 1563 "cmExprParser.cxx"
+#line 1562 "cmExprParser.cxx"
     break;
 
   case 18: /* term: term exp_MOD unary  */
-#line 151 "cmExprParser.y"
+#line 150 "cmExprParser.y"
                      {
     (yyval.Number) = (yyvsp[-2].Number) % (yyvsp[0].Number);
   }
-#line 1571 "cmExprParser.cxx"
+#line 1570 "cmExprParser.cxx"
     break;
 
   case 19: /* unary: factor  */
-#line 156 "cmExprParser.y"
+#line 155 "cmExprParser.y"
          {
     (yyval.Number) = (yyvsp[0].Number);
   }
-#line 1579 "cmExprParser.cxx"
+#line 1578 "cmExprParser.cxx"
     break;
 
   case 20: /* unary: exp_PLUS unary  */
-#line 159 "cmExprParser.y"
+#line 158 "cmExprParser.y"
                  {
     (yyval.Number) = + (yyvsp[0].Number);
   }
-#line 1587 "cmExprParser.cxx"
+#line 1586 "cmExprParser.cxx"
     break;
 
   case 21: /* unary: exp_MINUS unary  */
-#line 162 "cmExprParser.y"
+#line 161 "cmExprParser.y"
                   {
     (yyval.Number) = - (yyvsp[0].Number);
   }
-#line 1595 "cmExprParser.cxx"
+#line 1594 "cmExprParser.cxx"
     break;
 
   case 22: /* unary: exp_NOT unary  */
-#line 165 "cmExprParser.y"
+#line 164 "cmExprParser.y"
                 {
     (yyval.Number) = ~ (yyvsp[0].Number);
   }
-#line 1603 "cmExprParser.cxx"
+#line 1602 "cmExprParser.cxx"
     break;
 
   case 23: /* factor: exp_NUMBER  */
-#line 170 "cmExprParser.y"
+#line 169 "cmExprParser.y"
              {
     (yyval.Number) = (yyvsp[0].Number);
   }
-#line 1611 "cmExprParser.cxx"
+#line 1610 "cmExprParser.cxx"
     break;
 
   case 24: /* factor: exp_OPENPARENT exp exp_CLOSEPARENT  */
-#line 173 "cmExprParser.y"
+#line 172 "cmExprParser.y"
                                      {
     (yyval.Number) = (yyvsp[-1].Number);
   }
-#line 1619 "cmExprParser.cxx"
+#line 1618 "cmExprParser.cxx"
     break;
 
 
-#line 1623 "cmExprParser.cxx"
+#line 1622 "cmExprParser.cxx"
 
       default: break;
     }
@@ -1843,7 +1842,7 @@ yyreturnlab:
   return yyresult;
 }
 
-#line 178 "cmExprParser.y"
+#line 177 "cmExprParser.y"
 
 /* End of grammar */
 

Source/LexerParser/cmExprParser.y

@@ -13,7 +13,6 @@ Run bison like this:
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
-#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdexcept>

Source/LexerParser/cmGccDepfileLexer.cxx

@@ -256,7 +256,6 @@ typedef int16_t flex_int16_t;
 typedef uint16_t flex_uint16_t;
 typedef int32_t flex_int32_t;
 typedef uint32_t flex_uint32_t;
-typedef uint64_t flex_uint64_t;
 #else
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
@@ -421,7 +420,7 @@ struct yy_buffer_state
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
 	 */
-	yy_size_t yy_n_chars;
+	int yy_n_chars;
 
 	/* Whether we "own" the buffer - i.e., we know we created it,
 	 * and can realloc() it to grow it, and should free() it to
@@ -498,7 +497,7 @@ static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file , yyscan_t yyscanner
 
 YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner );
 YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner );
-YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, yy_size_t len , yyscan_t yyscanner );
+YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner );
 
 void *yyalloc ( yy_size_t , yyscan_t yyscanner );
 void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner );
@@ -545,7 +544,7 @@ static void yynoreturn yy_fatal_error ( const char* msg , yyscan_t yyscanner );
  */
 #define YY_DO_BEFORE_ACTION \
 	yyg->yytext_ptr = yy_bp; \
-	yyleng = (yy_size_t) (yy_cp - yy_bp); \
+	yyleng = (int) (yy_cp - yy_bp); \
 	yyg->yy_hold_char = *yy_cp; \
 	*yy_cp = '\0'; \
 	yyg->yy_c_buf_p = yy_cp;
@@ -674,8 +673,8 @@ struct yyguts_t
     size_t yy_buffer_stack_max; /**< capacity of stack. */
     YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
     char yy_hold_char;
-    yy_size_t yy_n_chars;
-    yy_size_t yyleng_r;
+    int yy_n_chars;
+    int yyleng_r;
     char *yy_c_buf_p;
     int yy_init;
     int yy_start;
@@ -722,7 +721,7 @@ FILE *yyget_out ( yyscan_t yyscanner );
 
 void yyset_out  ( FILE * _out_str , yyscan_t yyscanner );
 
-			yy_size_t yyget_leng ( yyscan_t yyscanner );
+			int yyget_leng ( yyscan_t yyscanner );
 
 char *yyget_text ( yyscan_t yyscanner );
 
@@ -795,7 +794,7 @@ static int input ( yyscan_t yyscanner );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		yy_size_t n; \
+		int n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -1241,7 +1240,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 
 	else
 		{
-			yy_size_t num_to_read =
+			int num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
@@ -1255,7 +1254,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 
 			if ( b->yy_is_our_buffer )
 				{
-				yy_size_t new_size = b->yy_buf_size * 2;
+				int new_size = b->yy_buf_size * 2;
 
 				if ( new_size <= 0 )
 					b->yy_buf_size += b->yy_buf_size / 8;
@@ -1313,7 +1312,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 
 	if ((yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
 		/* Extend the array by 50%, plus the number we really need. */
-		yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
+		int new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
 		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc(
 			(void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size , yyscanner );
 		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
@@ -1406,7 +1405,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
-		yy_size_t number_to_move = yyg->yy_n_chars + 2;
+		int number_to_move = yyg->yy_n_chars + 2;
 		char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
 					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
 		char *source =
@@ -1458,7 +1457,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 
 		else
 			{ /* need more input */
-			yy_size_t offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
+			int offset = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr);
 			++yyg->yy_c_buf_p;
 
 			switch ( yy_get_next_buffer( yyscanner ) )
@@ -1836,12 +1835,12 @@ YY_BUFFER_STATE yy_scan_string (const char * yystr , yyscan_t yyscanner)
  * @param yyscanner The scanner object.
  * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE yy_scan_bytes  (const char * yybytes, yy_size_t  _yybytes_len , yyscan_t yyscanner)
+YY_BUFFER_STATE yy_scan_bytes  (const char * yybytes, int  _yybytes_len , yyscan_t yyscanner)
 {
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n;
-	yy_size_t i;
+	int i;
 
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = (yy_size_t) (_yybytes_len + 2);
@@ -1885,7 +1884,7 @@ static void yynoreturn yy_fatal_error (const char* msg , yyscan_t yyscanner)
 	do \
 		{ \
 		/* Undo effects of setting up yytext. */ \
-        yy_size_t yyless_macro_arg = (n); \
+        int yyless_macro_arg = (n); \
         YY_LESS_LINENO(yyless_macro_arg);\
 		yytext[yyleng] = yyg->yy_hold_char; \
 		yyg->yy_c_buf_p = yytext + yyless_macro_arg; \
@@ -1953,7 +1952,7 @@ FILE *yyget_out  (yyscan_t yyscanner)
 /** Get the length of the current token.
  * @param yyscanner The scanner object.
  */
-yy_size_t yyget_leng  (yyscan_t yyscanner)
+int yyget_leng  (yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
     return yyleng;

Source/LexerParser/cmGccDepfileLexer.h

@@ -258,7 +258,6 @@ typedef int16_t flex_int16_t;
 typedef uint16_t flex_uint16_t;
 typedef int32_t flex_int32_t;
 typedef uint32_t flex_uint32_t;
-typedef uint64_t flex_uint64_t;
 #else
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
@@ -372,7 +371,7 @@ struct yy_buffer_state
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
 	 */
-	yy_size_t yy_n_chars;
+	int yy_n_chars;
 
 	/* Whether we "own" the buffer - i.e., we know we created it,
 	 * and can realloc() it to grow it, and should free() it to
@@ -416,7 +415,7 @@ void yypop_buffer_state ( yyscan_t yyscanner );
 
 YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner );
 YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner );
-YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, yy_size_t len , yyscan_t yyscanner );
+YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner );
 
 void *yyalloc ( yy_size_t , yyscan_t yyscanner );
 void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner );
@@ -463,7 +462,7 @@ FILE *yyget_out ( yyscan_t yyscanner );
 
 void yyset_out  ( FILE * _out_str , yyscan_t yyscanner );
 
-			yy_size_t yyget_leng ( yyscan_t yyscanner );
+			int yyget_leng ( yyscan_t yyscanner );
 
 char *yyget_text ( yyscan_t yyscanner );
 

Source/cmBinUtilsMacOSMachOLinker.cxx

@@ -5,7 +5,6 @@
 
 #include <sstream>
 #include <string>
-#include <type_traits>
 #include <utility>
 #include <vector>
 

Source/cmBlockCommand.cxx

@@ -3,7 +3,8 @@
 
 #include "cmBlockCommand.h"
 
-#include <cstdint> // IWYU pragma: keep
+#include <cstdint>
+#include <initializer_list>
 #include <utility>
 
 #include <cm/memory>

Source/cmCMakeHostSystemInformationCommand.cxx

@@ -5,6 +5,7 @@
 #include <algorithm>
 #include <cassert>
 #include <cctype>
+#include <cstddef>
 #include <initializer_list>
 #include <map>
 #include <string>

Source/cmCMakeLanguageCommand.cxx

@@ -5,7 +5,6 @@
 #include <algorithm>
 #include <array>
 #include <cstddef>
-#include <memory>
 #include <string>
 #include <utility>
 
@@ -21,7 +20,7 @@
 #include "cmGlobalGenerator.h"
 #include "cmListFileCache.h"
 #include "cmMakefile.h"
-#include "cmMessageType.h"
+#include "cmMessageType.h" // IWYU pragma: keep
 #include "cmRange.h"
 #include "cmState.h"
 #include "cmStringAlgorithms.h"

Source/cmCMakePresetsGraph.cxx

@@ -4,6 +4,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <cstddef>
 #include <functional>
 #include <iostream>
 #include <iterator>

Source/cmCMakePresetsGraph.h

@@ -15,9 +15,9 @@
 #include <cm/optional>
 
 #include "cmJSONState.h"
-#include "cmStateTypes.h"
+#include "cmStateTypes.h" // IWYU pragma: keep
 
-#include "CTest/cmCTestTypes.h"
+#include "CTest/cmCTestTypes.h" // IWYU pragma: keep
 
 enum class PackageResolveMode;
 

Source/cmCMakePresetsGraphReadJSONConfigurePresets.cxx

@@ -16,9 +16,10 @@
 #include "cmCMakePresetsGraph.h"
 #include "cmCMakePresetsGraphInternal.h"
 #include "cmJSONHelpers.h"
-#include "cmJSONState.h"
 #include "cmStateTypes.h"
 
+class cmJSONState;
+
 namespace {
 using CacheVariable = cmCMakePresetsGraph::CacheVariable;
 using ConfigurePreset = cmCMakePresetsGraph::ConfigurePreset;

Source/cmCMakePresetsGraphReadJSONPackagePresets.cxx

@@ -1,7 +1,6 @@
 /* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include <cstddef>
-#include <functional>
 #include <map>
 #include <memory>
 #include <string>

Source/cmCMakePresetsGraphReadJSONTestPresets.cxx

@@ -1,7 +1,6 @@
 /* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include <cstddef>
-#include <functional>
 #include <map>
 #include <memory>
 #include <string>

Source/cmCMakePresetsGraphReadJSONWorkflowPresets.cxx

@@ -1,7 +1,6 @@
 /* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include <cstddef>
-#include <functional>
 #include <string>
 #include <vector>
 

Source/cmCPackPropertiesGenerator.cxx

@@ -1,6 +1,7 @@
 #include "cmCPackPropertiesGenerator.h"
 
 #include <map>
+#include <memory>
 #include <ostream>
 
 #include "cmGeneratorExpression.h"

Source/cmCTest.cxx

@@ -11,6 +11,7 @@
 #include <ctime>
 #include <iostream>
 #include <map>
+#include <ratio>
 #include <sstream>
 #include <string>
 #include <utility>

Source/cmCommonTargetGenerator.cxx

@@ -4,6 +4,7 @@
 
 #include <algorithm>
 #include <sstream>
+#include <type_traits>
 #include <utility>
 
 #include <cm/string_view>

Source/cmComputeLinkDepends.cxx

@@ -8,6 +8,7 @@
 #include <cstdio>
 #include <iterator>
 #include <sstream>
+#include <type_traits>
 #include <unordered_map>
 #include <utility>
 

Source/cmConditionEvaluator.h

@@ -10,7 +10,7 @@
 #include <cmext/string_view>
 
 #include "cmListFileCache.h"
-#include "cmMessageType.h"
+#include "cmMessageType.h" // IWYU pragma: keep
 #include "cmPolicies.h"
 #include "cmValue.h"
 

Source/cmCoreTryCompile.cxx

@@ -7,7 +7,6 @@
 #include <cstring>
 #include <set>
 #include <sstream>
-#include <type_traits>
 #include <utility>
 
 #include <cm/string_view>

Source/cmCxxModuleMapper.h

@@ -13,7 +13,8 @@
 #include <cm/optional>
 #include <cmext/string_view>
 
-#include "cmScanDepFormat.h"
+enum class LookupMethod;
+struct cmScanDepInfo;
 
 enum class CxxModuleMapFormat
 {

Source/cmDebuggerAdapter.h

@@ -16,7 +16,7 @@
 
 #include <cm3p/cppdap/io.h> // IWYU pragma: keep
 
-#include "cmMessageType.h"
+#include "cmMessageType.h" // IWYU pragma: keep
 
 class cmListFileFunction;
 class cmMakefile;

Source/cmDebuggerBreakpointManager.cxx

@@ -5,7 +5,6 @@
 #include <algorithm>
 #include <cstddef>
 #include <cstdint>
-#include <memory>
 #include <utility>
 
 #include <cm3p/cppdap/optional.h>

Source/cmDebuggerBreakpointManager.h

@@ -14,11 +14,9 @@
 
 #include <cm3p/cppdap/protocol.h>
 
-class cmListFileFunction;
+#include "cmDebuggerSourceBreakpoint.h"
 
-namespace cmDebugger {
-class cmDebuggerSourceBreakpoint;
-}
+class cmListFileFunction;
 
 namespace dap {
 class Session;

Source/cmDebuggerExceptionManager.h

@@ -5,7 +5,6 @@
 #include "cmConfigure.h" // IWYU pragma: keep
 
 #include <cstddef>
-#include <functional>
 #include <mutex>
 #include <string>
 #include <unordered_map>
@@ -14,7 +13,7 @@
 
 #include <cm3p/cppdap/protocol.h>
 
-#include "cmMessageType.h"
+#include "cmMessageType.h" // IWYU pragma: keep
 
 namespace dap {
 class Session;

Source/cmDebuggerProtocol.h

@@ -4,7 +4,7 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
-#include <vector>
+#include <string>
 
 #include <cm3p/cppdap/protocol.h>
 

Source/cmDebuggerVariablesHelper.cxx

@@ -7,6 +7,7 @@
 #include <cstddef>
 #include <functional>
 #include <iomanip>
+#include <iterator>
 #include <map>
 #include <sstream>
 

Source/cmDebuggerVariablesManager.h

@@ -7,14 +7,9 @@
 #include <cstdint>
 #include <functional>
 #include <unordered_map>
-#include <vector>
 
-#include <cm3p/cppdap/types.h> // IWYU pragma: keep
-
-namespace dap {
-struct Variable;
-struct VariablesRequest;
-}
+#include <cm3p/cppdap/protocol.h>
+#include <cm3p/cppdap/types.h>
 
 namespace cmDebugger {
 

Source/cmDefinitions.cxx

@@ -3,7 +3,6 @@
 #include "cmDefinitions.h"
 
 #include <cassert>
-#include <functional>
 #include <unordered_set>
 #include <utility>
 

Source/cmDefinitions.h

@@ -4,7 +4,6 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
-#include <functional>
 #include <string>
 #include <unordered_map>
 #include <vector>

Source/cmDependsCompiler.cxx

@@ -6,7 +6,6 @@
 #include <algorithm>
 #include <iterator>
 #include <map>
-#include <memory>
 #include <string>
 #include <unordered_set>
 #include <utility>

Source/cmDependsFortran.cxx

@@ -6,6 +6,7 @@
 #include <cstdlib>
 #include <iostream>
 #include <map>
+#include <type_traits>
 #include <utility>
 
 #include "cmsys/FStream.hxx"

Source/cmDocumentationFormatter.cxx

@@ -2,7 +2,7 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmDocumentationFormatter.h"
 
-#include <algorithm>
+#include <algorithm> // IWYU pragma: keep
 #include <cassert>
 #include <iomanip>
 #include <ostream>

Source/cmDocumentationFormatter.h

@@ -4,6 +4,7 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
+#include <cstddef>
 #include <iosfwd>
 #include <string>
 

Source/cmExportBuildAndroidMKGenerator.cxx

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

Source/cmExportBuildAndroidMKGenerator.h

@@ -8,7 +8,6 @@
 #include <string>
 
 #include "cmExportBuildFileGenerator.h"
-#include "cmExportFileGenerator.h"
 #include "cmStateTypes.h"
 
 class cmGeneratorTarget;

Source/cmExportInstallAndroidMKGenerator.h

@@ -8,7 +8,6 @@
 #include <set>
 #include <string>
 
-#include "cmExportFileGenerator.h"
 #include "cmExportInstallFileGenerator.h"
 #include "cmStateTypes.h"
 

Source/cmExportLibraryDependenciesCommand.cxx

@@ -3,6 +3,7 @@
 #include "cmExportLibraryDependenciesCommand.h"
 
 #include <map>
+#include <unordered_map>
 #include <utility>
 
 #include <cm/memory>

Source/cmExportTryCompileFileGenerator.cxx

@@ -2,7 +2,6 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmExportTryCompileFileGenerator.h"
 
-#include <map>
 #include <utility>
 
 #include <cm/memory>
@@ -13,7 +12,6 @@
 #include "cmGeneratorTarget.h"
 #include "cmGlobalGenerator.h"
 #include "cmList.h"
-#include "cmListFileCache.h"
 #include "cmLocalGenerator.h"
 #include "cmMakefile.h"
 #include "cmOutputConverter.h"

Source/cmFileAPI.cxx

@@ -5,7 +5,6 @@
 #include <algorithm>
 #include <cassert>
 #include <chrono>
-#include <cstddef>
 #include <ctime>
 #include <iomanip>
 #include <sstream>

Source/cmFileAPICodemodel.cxx

@@ -5,7 +5,6 @@
 #include <algorithm>
 #include <cassert>
 #include <cstddef>
-#include <functional>
 #include <limits>
 #include <map>
 #include <memory>

Source/cmFileTime.cxx

@@ -2,7 +2,6 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmFileTime.h"
 
-#include <ctime>
 #include <string>
 
 // Use a platform-specific API to get file times efficiently.

Source/cmFindBase.cxx

@@ -6,6 +6,7 @@
 #include <cstddef>
 #include <deque>
 #include <functional>
+#include <iterator>
 #include <map>
 #include <utility>
 

Source/cmFindPackageCommand.cxx

@@ -11,7 +11,6 @@
 #include <sstream>
 #include <utility>
 
-#include <cm/memory>
 #include <cm/optional>
 #include <cmext/string_view>
 

Source/cmGccDepfileLexerHelper.cxx

@@ -4,7 +4,6 @@
 
 #include <algorithm>
 #include <cstdio>
-#include <memory>
 #include <string>
 #include <vector>
 

Source/cmGeneratedFileStream.cxx

@@ -3,6 +3,7 @@
 #include "cmGeneratedFileStream.h"
 
 #include <cstdio>
+#include <locale>
 
 #include "cmStringAlgorithms.h"
 #include "cmSystemTools.h"

Source/cmGeneratorExpressionParser.h

@@ -7,10 +7,9 @@
 #include <memory>
 #include <vector>
 
+#include "cmGeneratorExpressionEvaluator.h"
 #include "cmGeneratorExpressionLexer.h"
 
-struct cmGeneratorExpressionEvaluator;
-
 struct cmGeneratorExpressionParser
 {
   cmGeneratorExpressionParser(std::vector<cmGeneratorExpressionToken> tokens);

Source/cmGeneratorTarget.cxx

@@ -13,6 +13,7 @@
 #include <iterator>
 #include <queue>
 #include <sstream>
+#include <type_traits>
 #include <unordered_set>
 #include <utility>
 

Source/cmGeneratorTarget.h

@@ -17,6 +17,7 @@
 #include <cm/optional>
 
 #include "cmAlgorithms.h"
+#include "cmComputeLinkInformation.h"
 #include "cmLinkItem.h"
 #include "cmListFileCache.h"
 #include "cmPolicies.h"
@@ -24,7 +25,6 @@
 #include "cmValue.h"
 
 enum class cmBuildStep;
-class cmComputeLinkInformation;
 class cmCustomCommand;
 class cmFileSet;
 class cmGlobalGenerator;

Source/cmGhsMultiTargetGenerator.cxx

@@ -6,6 +6,7 @@
 #include <memory>
 #include <ostream>
 #include <set>
+#include <type_traits>
 #include <utility>
 #include <vector>
 

Source/cmGlobalGenerator.cxx

@@ -13,6 +13,7 @@
 #include <iomanip>
 #include <iterator>
 #include <sstream>
+#include <type_traits>
 #include <utility>
 
 #include <cm/memory>
@@ -24,6 +25,8 @@
 #include "cmsys/FStream.hxx"
 #include "cmsys/RegularExpression.hxx"
 
+#include "cm_codecvt_Encoding.hxx"
+
 #include "cmAlgorithms.h"
 #include "cmCPackPropertiesGenerator.h"
 #include "cmComputeTargetDepends.h"

Source/cmGlobalGenerator.h

@@ -19,18 +19,16 @@
 #include <cmext/algorithm>
 #include <cmext/string_view>
 
-#include "cm_codecvt_Encoding.hxx"
-
 #include "cmBuildOptions.h"
 #include "cmCustomCommandLines.h"
 #include "cmDuration.h"
 #include "cmExportSet.h"
+#include "cmLocalGenerator.h"
 #include "cmStateSnapshot.h"
 #include "cmStringAlgorithms.h"
 #include "cmSystemTools.h"
 #include "cmTarget.h"
 #include "cmTargetDepend.h"
-#include "cmTransformDepfile.h"
 #include "cmValue.h"
 
 #if !defined(CMAKE_BOOTSTRAP)
@@ -41,13 +39,15 @@
 
 #define CMAKE_DIRECTORY_ID_SEP "::@"
 
+enum class cmDepfileFormat;
+enum class codecvt_Encoding;
+
 class cmDirectoryId;
 class cmExportBuildFileGenerator;
 class cmExternalMakefileProjectGenerator;
 class cmGeneratorTarget;
 class cmInstallRuntimeDependencySet;
 class cmLinkLineComputer;
-class cmLocalGenerator;
 class cmMakefile;
 class cmOutputConverter;
 class cmQtAutoGenGlobalInitializer;

Source/cmGlobalNinjaGenerator.cxx

@@ -8,6 +8,7 @@
 #include <cstdio>
 #include <functional>
 #include <sstream>
+#include <type_traits>
 #include <utility>
 
 #include <cm/iterator>

Source/cmInstallCxxModuleBmiGenerator.cxx

@@ -11,6 +11,7 @@
 #include "cmListFileCache.h"
 #include "cmLocalGenerator.h"
 #include "cmOutputConverter.h"
+#include "cmScriptGenerator.h"
 #include "cmStringAlgorithms.h"
 
 cmInstallCxxModuleBmiGenerator::cmInstallCxxModuleBmiGenerator(

Source/cmInstallCxxModuleBmiGenerator.h

@@ -9,7 +9,6 @@
 #include <vector>
 
 #include "cmInstallGenerator.h"
-#include "cmScriptGenerator.h"
 
 class cmGeneratorTarget;
 class cmListFileBacktrace;

Source/cmInstallDirectoryGenerator.h

@@ -9,7 +9,6 @@
 #include <vector>
 
 #include "cmInstallGenerator.h"
-#include "cmScriptGenerator.h"
 
 class cmListFileBacktrace;
 class cmLocalGenerator;

Source/cmInstallExportGenerator.cxx

@@ -16,6 +16,7 @@
 #include "cmInstallType.h"
 #include "cmListFileCache.h"
 #include "cmLocalGenerator.h"
+#include "cmScriptGenerator.h"
 #include "cmStringAlgorithms.h"
 #include "cmSystemTools.h"
 

Source/cmInstallExportGenerator.h

@@ -10,7 +10,6 @@
 #include <vector>
 
 #include "cmInstallGenerator.h"
-#include "cmScriptGenerator.h"
 
 class cmExportInstallFileGenerator;
 class cmExportSet;

Source/cmInstallFileSetGenerator.h

@@ -8,7 +8,6 @@
 #include <vector>
 
 #include "cmInstallGenerator.h"
-#include "cmScriptGenerator.h"
 
 class cmGeneratorTarget;
 class cmFileSet;

Source/cmInstallFilesGenerator.h

@@ -9,7 +9,6 @@
 #include <vector>
 
 #include "cmInstallGenerator.h"
-#include "cmScriptGenerator.h"
 
 class cmListFileBacktrace;
 class cmLocalGenerator;

Source/cmInstallGetRuntimeDependenciesGenerator.cxx

@@ -19,6 +19,7 @@
 #include "cmLocalGenerator.h"
 #include "cmMakefile.h"
 #include "cmOutputConverter.h"
+#include "cmScriptGenerator.h"
 #include "cmStringAlgorithms.h"
 
 namespace {

Source/cmInstallGetRuntimeDependenciesGenerator.h

@@ -7,7 +7,6 @@
 #include <vector>
 
 #include "cmInstallGenerator.h"
-#include "cmScriptGenerator.h"
 
 class cmListFileBacktrace;
 class cmLocalGenerator;

Source/cmInstallImportedRuntimeArtifactsGenerator.h

@@ -8,7 +8,6 @@
 
 #include "cmInstallGenerator.h"
 #include "cmListFileCache.h"
-#include "cmScriptGenerator.h"
 
 class cmGeneratorTarget;
 class cmLocalGenerator;

Source/cmInstallRuntimeDependencySetGenerator.h

@@ -7,7 +7,6 @@
 #include <vector>
 
 #include "cmInstallGenerator.h"
-#include "cmScriptGenerator.h"
 
 class cmInstallRuntimeDependencySet;
 class cmListFileBacktrace;

Source/cmInstallScriptGenerator.h

@@ -9,7 +9,6 @@
 
 #include "cmInstallGenerator.h"
 #include "cmListFileCache.h"
-#include "cmScriptGenerator.h"
 
 class cmLocalGenerator;
 

Source/cmInstallTargetGenerator.cxx

@@ -23,6 +23,7 @@
 #include "cmMessageType.h"
 #include "cmOutputConverter.h"
 #include "cmPolicies.h"
+#include "cmScriptGenerator.h"
 #include "cmStateTypes.h"
 #include "cmStringAlgorithms.h"
 #include "cmSystemTools.h"

Source/cmInstallTargetGenerator.h

@@ -11,7 +11,6 @@
 #include "cmInstallGenerator.h"
 #include "cmInstallType.h"
 #include "cmListFileCache.h"
-#include "cmScriptGenerator.h"
 
 class cmGeneratorTarget;
 class cmLocalGenerator;

Source/cmInstalledFile.h

@@ -9,7 +9,8 @@
 #include <string>
 #include <vector>
 
-class cmCompiledGeneratorExpression;
+#include "cmGeneratorExpression.h"
+
 class cmMakefile;
 
 /** \class cmInstalledFile

Source/cmJSONState.cxx

@@ -3,10 +3,9 @@
 
 #include "cmJSONState.h"
 
+#include <iterator>
 #include <sstream>
 
-#include <cm/memory>
-
 #include <cm3p/json/reader.h>
 #include <cm3p/json/value.h>
 

Source/cmJSONState.h

@@ -9,7 +9,6 @@
 #include <utility>
 #include <vector>
 
-#include "cmJSONState.h"
 #include "cmStringAlgorithms.h"
 
 namespace Json {

Source/cmLocalGenerator.cxx

@@ -10,6 +10,7 @@
 #include <initializer_list>
 #include <iterator>
 #include <sstream>
+#include <type_traits>
 #include <unordered_set>
 #include <utility>
 #include <vector>
@@ -40,6 +41,7 @@
 #include "cmLinkLineDeviceComputer.h"
 #include "cmList.h"
 #include "cmMakefile.h"
+#include "cmMessageType.h"
 #include "cmRange.h"
 #include "cmRulePlaceholderExpander.h"
 #include "cmSourceFile.h"

Source/cmLocalGenerator.h

@@ -19,8 +19,9 @@
 #include <cm3p/kwiml/int.h>
 
 #include "cmCustomCommandTypes.h"
+#include "cmGeneratorTarget.h"
 #include "cmListFileCache.h"
-#include "cmMessageType.h"
+#include "cmMessageType.h" // IWYU pragma: keep
 #include "cmOutputConverter.h"
 #include "cmPolicies.h"
 #include "cmStateSnapshot.h"
@@ -31,7 +32,6 @@ class cmComputeLinkInformation;
 class cmCustomCommand;
 class cmCustomCommandGenerator;
 class cmCustomCommandLines;
-class cmGeneratorTarget;
 class cmGlobalGenerator;
 class cmImplicitDependsList;
 class cmLinkLineComputer;

Source/cmLocalNinjaGenerator.cxx

@@ -14,6 +14,8 @@
 
 #include "cmsys/FStream.hxx"
 
+#include "cm_codecvt_Encoding.hxx"
+
 #include "cmCryptoHash.h"
 #include "cmCustomCommand.h"
 #include "cmCustomCommandGenerator.h"

Source/cmMakefile.cxx

@@ -32,6 +32,7 @@
 #include "cmCommandArgumentParserHelper.h"
 #include "cmCustomCommand.h"
 #include "cmCustomCommandLines.h"
+#include "cmCustomCommandTypes.h"
 #include "cmExecutionStatus.h"
 #include "cmExpandedCommandArgument.h" // IWYU pragma: keep
 #include "cmExportBuildFileGenerator.h"

Source/cmMakefile.h

@@ -25,9 +25,9 @@
 
 #include "cmAlgorithms.h"
 #include "cmCustomCommand.h"
-#include "cmCustomCommandTypes.h"
+#include "cmFunctionBlocker.h"
 #include "cmListFileCache.h"
-#include "cmMessageType.h"
+#include "cmMessageType.h" // IWYU pragma: keep
 #include "cmNewLineStyle.h"
 #include "cmPolicies.h"
 #include "cmSourceFileLocationKind.h"
@@ -43,12 +43,14 @@
 #  include "cmSourceGroup.h"
 #endif
 
+enum class cmCustomCommandType;
+enum class cmObjectLibraryCommands;
+
 class cmCompiledGeneratorExpression;
 class cmCustomCommandLines;
 class cmExecutionStatus;
 class cmExpandedCommandArgument;
 class cmExportBuildFileGenerator;
-class cmFunctionBlocker;
 class cmGeneratorExpressionEvaluationFile;
 class cmGlobalGenerator;
 class cmInstallGenerator;

Source/cmMakefileProfilingData.cxx

@@ -4,7 +4,6 @@
 
 #include <chrono>
 #include <stdexcept>
-#include <type_traits>
 #include <utility>
 
 #include <cm3p/json/value.h>

Source/cmMessenger.cxx

@@ -4,6 +4,7 @@
 
 #include "cmDocumentationFormatter.h"
 #include "cmMessageMetadata.h"
+#include "cmMessageType.h"
 #include "cmStringAlgorithms.h"
 #include "cmSystemTools.h"
 

Source/cmMessenger.h

@@ -11,7 +11,7 @@
 #include <cm/optional>
 
 #include "cmListFileCache.h"
-#include "cmMessageType.h"
+#include "cmMessageType.h" // IWYU pragma: keep
 
 #ifdef CMake_ENABLE_DEBUGGER
 namespace cmDebugger {

Source/cmNinjaNormalTargetGenerator.cxx

@@ -5,7 +5,6 @@
 #include <algorithm>
 #include <cassert>
 #include <iterator>
-#include <map>
 #include <set>
 #include <sstream>
 #include <unordered_set>