diff --git a/Source/CPack/cmCPackAppImageGenerator.cxx b/Source/CPack/cmCPackAppImageGenerator.cxx
index 3020f2f8a2..373dcfaff0 100644
--- a/Source/CPack/cmCPackAppImageGenerator.cxx
+++ b/Source/CPack/cmCPackAppImageGenerator.cxx
@@ -11,6 +11,8 @@
 
 #include <fcntl.h>
 
+#include <sys/types.h>
+
 #include "cmsys/FStream.hxx"
 
 #include "cmCPackLog.h"
diff --git a/Source/CPack/cmCPackExternalGenerator.h b/Source/CPack/cmCPackExternalGenerator.h
index 2055831052..78f80116b6 100644
--- a/Source/CPack/cmCPackExternalGenerator.h
+++ b/Source/CPack/cmCPackExternalGenerator.h
@@ -9,7 +9,6 @@
 
 #include "cmCPackGenerator.h"
 
-class cmGlobalGenerator;
 namespace Json {
 class Value;
 }
diff --git a/Source/CTest/cmCTestBuildCommand.h b/Source/CTest/cmCTestBuildCommand.h
index 805da0f085..b83f5dba9d 100644
--- a/Source/CTest/cmCTestBuildCommand.h
+++ b/Source/CTest/cmCTestBuildCommand.h
@@ -4,15 +4,10 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
-#include <memory>
 #include <string>
-#include <vector>
 
 #include "cmCTestHandlerCommand.h"
 
-class cmExecutionStatus;
-class cmCTestGenericHandler;
-
 class cmCTestBuildCommand : public cmCTestHandlerCommand
 {
 public:
diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx
index d52a2cb8a0..046ae3d589 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -4,7 +4,6 @@
 
 #include <cstdlib>
 #include <memory>
-#include <ratio>
 #include <set>
 #include <utility>
 
diff --git a/Source/CTest/cmCTestBuildHandler.h b/Source/CTest/cmCTestBuildHandler.h
index 8baec69626..2b8feecf6b 100644
--- a/Source/CTest/cmCTestBuildHandler.h
+++ b/Source/CTest/cmCTestBuildHandler.h
@@ -17,7 +17,6 @@
 #include "cmDuration.h"
 #include "cmProcessOutput.h"
 
-class cmMakefile;
 class cmStringReplaceHelper;
 class cmXMLWriter;
 class cmCTest;
diff --git a/Source/CTest/cmCTestConfigureCommand.h b/Source/CTest/cmCTestConfigureCommand.h
index 5e3001e79d..6caa56b7fa 100644
--- a/Source/CTest/cmCTestConfigureCommand.h
+++ b/Source/CTest/cmCTestConfigureCommand.h
@@ -5,7 +5,6 @@
 #include "cmConfigure.h" // IWYU pragma: keep
 
 #include <string>
-#include <vector>
 
 #include "cmCTestHandlerCommand.h"
 
diff --git a/Source/CTest/cmCTestCoverageCommand.h b/Source/CTest/cmCTestCoverageCommand.h
index 5df1c0ece9..95b64ebc9f 100644
--- a/Source/CTest/cmCTestCoverageCommand.h
+++ b/Source/CTest/cmCTestCoverageCommand.h
@@ -4,7 +4,6 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
-#include <memory>
 #include <string>
 #include <vector>
 
@@ -13,9 +12,6 @@
 #include "cmArgumentParserTypes.h" // IWYU pragma: keep
 #include "cmCTestHandlerCommand.h"
 
-class cmExecutionStatus;
-class cmCTestGenericHandler;
-
 class cmCTestCoverageCommand : public cmCTestHandlerCommand
 {
 public:
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index 1a0451d447..5eb201f813 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -9,9 +9,7 @@
 #include <iomanip>
 #include <iterator>
 #include <memory>
-#include <ratio>
 #include <sstream>
-#include <type_traits>
 #include <utility>
 
 #include <cmext/algorithm>
@@ -36,8 +34,6 @@
 #include "cmWorkingDirectory.h"
 #include "cmXMLWriter.h"
 
-class cmMakefile;
-
 #define SAFEDIV(x, y) (((y) != 0) ? ((x) / (y)) : (0))
 
 cmCTestCoverageHandler::cmCTestCoverageHandler(cmCTest* ctest)
diff --git a/Source/CTest/cmCTestCoverageHandler.h b/Source/CTest/cmCTestCoverageHandler.h
index e8232f8a3d..b27816108b 100644
--- a/Source/CTest/cmCTestCoverageHandler.h
+++ b/Source/CTest/cmCTestCoverageHandler.h
@@ -15,7 +15,6 @@
 #include "cmCTestGenericHandler.h"
 
 class cmGeneratedFileStream;
-class cmMakefile;
 class cmXMLWriter;
 class cmCTest;
 
diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx
index 68d0d8e5a6..1e65450c81 100644
--- a/Source/CTest/cmCTestLaunch.cxx
+++ b/Source/CTest/cmCTestLaunch.cxx
@@ -4,11 +4,14 @@
 
 #include <cstdio>
 #include <cstring>
+#include <functional>
 #include <iostream>
 #include <map>
 #include <memory>
 #include <utility>
 
+#include <cm/optional>
+
 #include <cm3p/uv.h>
 
 #include "cmsys/FStream.hxx"
diff --git a/Source/CTest/cmCTestLaunchReporter.h b/Source/CTest/cmCTestLaunchReporter.h
index 59692e5c09..65b3e3aa17 100644
--- a/Source/CTest/cmCTestLaunchReporter.h
+++ b/Source/CTest/cmCTestLaunchReporter.h
@@ -8,10 +8,12 @@
 #include <string>
 #include <vector>
 
-#include "cmsys/RegularExpression.hxx"
-
 #include "cmUVProcessChain.h"
 
+namespace cmsys {
+class RegularExpression;
+}
+
 class cmXMLElement;
 
 /** \class cmCTestLaunchReporter
diff --git a/Source/CTest/cmCTestMemCheckCommand.h b/Source/CTest/cmCTestMemCheckCommand.h
index b0ea52f287..c0a839532a 100644
--- a/Source/CTest/cmCTestMemCheckCommand.h
+++ b/Source/CTest/cmCTestMemCheckCommand.h
@@ -4,16 +4,10 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
-#include <memory>
 #include <string>
-#include <vector>
 
 #include "cmCTestTestCommand.h"
 
-class cmExecutionStatus;
-class cmCTestGenericHandler;
-class cmCTestTestHandler;
-
 class cmCTestMemCheckCommand : public cmCTestTestCommand
 {
 public:
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index c95cc3ff7e..95f73cbba0 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -7,7 +7,6 @@
 #include <cstring>
 #include <iostream>
 #include <iterator>
-#include <ratio>
 #include <sstream>
 #include <utility>
 
diff --git a/Source/CTest/cmCTestMemCheckHandler.h b/Source/CTest/cmCTestMemCheckHandler.h
index 5f381c271d..9bc32fd08f 100644
--- a/Source/CTest/cmCTestMemCheckHandler.h
+++ b/Source/CTest/cmCTestMemCheckHandler.h
@@ -9,8 +9,6 @@
 
 #include "cmCTestTestHandler.h"
 
-class cmMakefile;
-class cmXMLWriter;
 class cmCTest;
 
 /** \class cmCTestMemCheckHandler
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index 1c4f2a5872..71a3ab4a4a 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -8,6 +8,7 @@
 #include <cmath>
 #include <cstddef> // IWYU pragma: keep
 #include <cstdlib>
+#include <functional>
 #include <iomanip>
 #include <iostream>
 #include <list>
@@ -34,7 +35,6 @@
 #include "cmCTestBinPacker.h"
 #include "cmCTestRunTest.h"
 #include "cmCTestTestHandler.h"
-#include "cmDuration.h"
 #include "cmJSONState.h"
 #include "cmListFileCache.h"
 #include "cmRange.h"
diff --git a/Source/CTest/cmCTestReadCustomFilesCommand.cxx b/Source/CTest/cmCTestReadCustomFilesCommand.cxx
index 343a74ed00..1b0271f732 100644
--- a/Source/CTest/cmCTestReadCustomFilesCommand.cxx
+++ b/Source/CTest/cmCTestReadCustomFilesCommand.cxx
@@ -2,6 +2,8 @@
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 #include "cmCTestReadCustomFilesCommand.h"
 
+#include <vector>
+
 #include "cmCTest.h"
 #include "cmExecutionStatus.h"
 
diff --git a/Source/CTest/cmCTestReadCustomFilesCommand.h b/Source/CTest/cmCTestReadCustomFilesCommand.h
index 8b1b357ff2..165dd264d1 100644
--- a/Source/CTest/cmCTestReadCustomFilesCommand.h
+++ b/Source/CTest/cmCTestReadCustomFilesCommand.h
@@ -5,12 +5,9 @@
 #include "cmConfigure.h" // IWYU pragma: keep
 
 #include <string>
-#include <vector>
 
 #include "cmCTestCommand.h"
 
-class cmExecutionStatus;
-
 class cmCTestReadCustomFilesCommand : public cmCTestCommand
 {
 public:
diff --git a/Source/CTest/cmCTestRunScriptCommand.cxx b/Source/CTest/cmCTestRunScriptCommand.cxx
index e41531055a..d1b1ab7187 100644
--- a/Source/CTest/cmCTestRunScriptCommand.cxx
+++ b/Source/CTest/cmCTestRunScriptCommand.cxx
@@ -2,6 +2,8 @@
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 #include "cmCTestRunScriptCommand.h"
 
+#include <vector>
+
 #include "cmCTestScriptHandler.h"
 #include "cmExecutionStatus.h"
 #include "cmMakefile.h"
diff --git a/Source/CTest/cmCTestRunScriptCommand.h b/Source/CTest/cmCTestRunScriptCommand.h
index 5b189e512a..830b6bf024 100644
--- a/Source/CTest/cmCTestRunScriptCommand.h
+++ b/Source/CTest/cmCTestRunScriptCommand.h
@@ -5,12 +5,9 @@
 #include "cmConfigure.h" // IWYU pragma: keep
 
 #include <string>
-#include <vector>
 
 #include "cmCTestCommand.h"
 
-class cmExecutionStatus;
-
 /** \class cmCTestRunScript
  * \brief Run a ctest script
  */
diff --git a/Source/CTest/cmCTestSVN.h b/Source/CTest/cmCTestSVN.h
index 9b4ea6aa50..7507cac698 100644
--- a/Source/CTest/cmCTestSVN.h
+++ b/Source/CTest/cmCTestSVN.h
@@ -13,7 +13,6 @@
 
 class cmCTest;
 class cmMakefile;
-class cmXMLWriter;
 
 /** \class cmCTestSVN
  * \brief Interaction with subversion command-line tool
diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx
index ca66f18982..bed2bb78c2 100644
--- a/Source/CTest/cmCTestScriptHandler.cxx
+++ b/Source/CTest/cmCTestScriptHandler.cxx
@@ -4,8 +4,8 @@
 
 #include <chrono>
 #include <cstdlib>
+#include <functional>
 #include <map>
-#include <ratio>
 #include <sstream>
 #include <utility>
 
diff --git a/Source/CTest/cmCTestStartCommand.cxx b/Source/CTest/cmCTestStartCommand.cxx
index f939512871..e46b4bfc42 100644
--- a/Source/CTest/cmCTestStartCommand.cxx
+++ b/Source/CTest/cmCTestStartCommand.cxx
@@ -4,6 +4,7 @@
 
 #include <cstddef>
 #include <sstream>
+#include <vector>
 
 #include "cmCTest.h"
 #include "cmCTestVC.h"
diff --git a/Source/CTest/cmCTestStartCommand.h b/Source/CTest/cmCTestStartCommand.h
index 0b5a337434..acac56327e 100644
--- a/Source/CTest/cmCTestStartCommand.h
+++ b/Source/CTest/cmCTestStartCommand.h
@@ -6,7 +6,6 @@
 
 #include <iosfwd>
 #include <string>
-#include <vector>
 
 #include "cmCTestCommand.h"
 
diff --git a/Source/CTest/cmCTestSubmitCommand.h b/Source/CTest/cmCTestSubmitCommand.h
index f688976711..689f193ada 100644
--- a/Source/CTest/cmCTestSubmitCommand.h
+++ b/Source/CTest/cmCTestSubmitCommand.h
@@ -4,7 +4,6 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
-#include <memory>
 #include <string>
 #include <vector>
 
@@ -13,9 +12,6 @@
 #include "cmArgumentParserTypes.h"
 #include "cmCTestHandlerCommand.h"
 
-class cmExecutionStatus;
-class cmCTestGenericHandler;
-
 class cmCTestSubmitCommand : public cmCTestHandlerCommand
 {
 public:
diff --git a/Source/CTest/cmCTestTestCommand.h b/Source/CTest/cmCTestTestCommand.h
index 090d42d37b..125d5a5c1e 100644
--- a/Source/CTest/cmCTestTestCommand.h
+++ b/Source/CTest/cmCTestTestCommand.h
@@ -7,7 +7,6 @@
 #include <memory>
 #include <string>
 #include <type_traits>
-#include <vector>
 
 #include <cm/optional>
 #include <cmext/string_view>
@@ -17,7 +16,6 @@
 #include "cmCTestHandlerCommand.h"
 
 class cmExecutionStatus;
-class cmCTestGenericHandler;
 class cmCTestTestHandler;
 
 class cmCTestTestCommand : public cmCTestHandlerCommand
diff --git a/Source/CTest/cmCTestTestHandler.h b/Source/CTest/cmCTestTestHandler.h
index 83aae981e1..e57bc107e8 100644
--- a/Source/CTest/cmCTestTestHandler.h
+++ b/Source/CTest/cmCTestTestHandler.h
@@ -25,7 +25,6 @@
 #include "cmDuration.h"
 #include "cmListFileCache.h"
 
-class cmMakefile;
 class cmXMLWriter;
 
 struct cmCTestTestOptions
diff --git a/Source/CTest/cmCTestUpdateCommand.cxx b/Source/CTest/cmCTestUpdateCommand.cxx
index 71d92c4a58..925941b100 100644
--- a/Source/CTest/cmCTestUpdateCommand.cxx
+++ b/Source/CTest/cmCTestUpdateCommand.cxx
@@ -5,7 +5,6 @@
 #include <chrono>
 #include <sstream>
 #include <string>
-#include <vector>
 
 #include <cm/memory>
 #include <cmext/string_view>
diff --git a/Source/CTest/cmCTestUpdateCommand.h b/Source/CTest/cmCTestUpdateCommand.h
index 93316de844..7bc2e0146a 100644
--- a/Source/CTest/cmCTestUpdateCommand.h
+++ b/Source/CTest/cmCTestUpdateCommand.h
@@ -5,7 +5,6 @@
 #include "cmConfigure.h" // IWYU pragma: keep
 
 #include <string>
-#include <vector>
 
 #include "cmCTestHandlerCommand.h"
 
diff --git a/Source/CTest/cmProcess.h b/Source/CTest/cmProcess.h
index 33b781c9c8..2489ba522d 100644
--- a/Source/CTest/cmProcess.h
+++ b/Source/CTest/cmProcess.h
@@ -16,6 +16,8 @@
 
 #include <cm3p/uv.h>
 
+#include <sys/types.h>
+
 #include "cmDuration.h"
 #include "cmProcessOutput.h"
 #include "cmUVHandlePtr.h"
diff --git a/Source/CTest/cmUVJobServerClient.cxx b/Source/CTest/cmUVJobServerClient.cxx
index 6ea54526bd..19fed2c499 100644
--- a/Source/CTest/cmUVJobServerClient.cxx
+++ b/Source/CTest/cmUVJobServerClient.cxx
@@ -12,6 +12,8 @@
 
 #  include <fcntl.h>
 #  include <unistd.h>
+
+#  include <sys/types.h>
 #endif
 
 #include <cm/memory>
diff --git a/Source/CursesDialog/cmCursesBoolWidget.h b/Source/CursesDialog/cmCursesBoolWidget.h
index d9fa96f94d..a6eccc08a9 100644
--- a/Source/CursesDialog/cmCursesBoolWidget.h
+++ b/Source/CursesDialog/cmCursesBoolWidget.h
@@ -7,8 +7,6 @@
 #include "cmCursesStandardIncludes.h"
 #include "cmCursesWidget.h"
 
-class cmCursesMainForm;
-
 class cmCursesBoolWidget : public cmCursesWidget
 {
 public:
diff --git a/Source/CursesDialog/cmCursesDummyWidget.h b/Source/CursesDialog/cmCursesDummyWidget.h
index b3c6f8f419..001625afd9 100644
--- a/Source/CursesDialog/cmCursesDummyWidget.h
+++ b/Source/CursesDialog/cmCursesDummyWidget.h
@@ -7,8 +7,6 @@
 #include "cmCursesStandardIncludes.h"
 #include "cmCursesWidget.h"
 
-class cmCursesMainForm;
-
 class cmCursesDummyWidget : public cmCursesWidget
 {
 public:
diff --git a/Source/CursesDialog/cmCursesLabelWidget.h b/Source/CursesDialog/cmCursesLabelWidget.h
index 0a957c9539..b432dceca0 100644
--- a/Source/CursesDialog/cmCursesLabelWidget.h
+++ b/Source/CursesDialog/cmCursesLabelWidget.h
@@ -9,8 +9,6 @@
 #include "cmCursesStandardIncludes.h"
 #include "cmCursesWidget.h"
 
-class cmCursesMainForm;
-
 class cmCursesLabelWidget : public cmCursesWidget
 {
 public:
diff --git a/Source/CursesDialog/cmCursesMainForm.h b/Source/CursesDialog/cmCursesMainForm.h
index d7695b7d41..5c70aaefbe 100644
--- a/Source/CursesDialog/cmCursesMainForm.h
+++ b/Source/CursesDialog/cmCursesMainForm.h
@@ -11,12 +11,12 @@
 
 #include <cm/optional>
 
-#include "cmCursesCacheEntryComposite.h"
 #include "cmCursesForm.h"
 #include "cmCursesStandardIncludes.h"
 #include "cmStateTypes.h"
 
 class cmake;
+class cmCursesCacheEntryComposite;
 class cmCursesLongMessageForm;
 
 /** \class cmCursesMainForm
diff --git a/Source/CursesDialog/cmCursesOptionsWidget.h b/Source/CursesDialog/cmCursesOptionsWidget.h
index 80ba37f9d9..d12eafe684 100644
--- a/Source/CursesDialog/cmCursesOptionsWidget.h
+++ b/Source/CursesDialog/cmCursesOptionsWidget.h
@@ -10,8 +10,6 @@
 #include "cmCursesStandardIncludes.h"
 #include "cmCursesWidget.h"
 
-class cmCursesMainForm;
-
 class cmCursesOptionsWidget : public cmCursesWidget
 {
 public:
diff --git a/Source/CursesDialog/cmCursesPathWidget.h b/Source/CursesDialog/cmCursesPathWidget.h
index 7aa4545684..c4348a29b3 100644
--- a/Source/CursesDialog/cmCursesPathWidget.h
+++ b/Source/CursesDialog/cmCursesPathWidget.h
@@ -9,8 +9,6 @@
 #include "cmCursesStandardIncludes.h"
 #include "cmCursesStringWidget.h"
 
-class cmCursesMainForm;
-
 class cmCursesPathWidget : public cmCursesStringWidget
 {
 public:
diff --git a/Source/cmArgumentParser.h b/Source/cmArgumentParser.h
index 7893e2e2d9..2b37869817 100644
--- a/Source/cmArgumentParser.h
+++ b/Source/cmArgumentParser.h
@@ -7,7 +7,6 @@
 #include <cassert>
 #include <cstddef>
 #include <functional>
-#include <iterator>
 #include <map>
 #include <string>
 #include <utility>
diff --git a/Source/cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool.cxx b/Source/cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool.cxx
index 8c3dd49f77..82e956c58f 100644
--- a/Source/cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool.cxx
+++ b/Source/cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool.cxx
@@ -4,6 +4,7 @@
 #include "cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool.h"
 
 #include <sstream>
+#include <vector>
 
 #include <cmsys/RegularExpression.hxx>
 
diff --git a/Source/cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool.h b/Source/cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool.h
index 67197084f9..ebebbb6e30 100644
--- a/Source/cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool.h
+++ b/Source/cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <string>
-#include <vector>
 
 #include "cmBinUtilsLinuxELFGetRuntimeDependenciesTool.h"
 
diff --git a/Source/cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool.cxx b/Source/cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool.cxx
index d2afe156f2..5fed9c94ca 100644
--- a/Source/cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool.cxx
+++ b/Source/cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool.cxx
@@ -4,6 +4,7 @@
 #include "cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool.h"
 
 #include <sstream>
+#include <vector>
 
 #include <cmsys/RegularExpression.hxx>
 
diff --git a/Source/cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool.h b/Source/cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool.h
index faab98ea6f..4cf70e21d7 100644
--- a/Source/cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool.h
+++ b/Source/cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <string>
-#include <vector>
 
 #include "cmBinUtilsMacOSMachOGetRuntimeDependenciesTool.h"
 
diff --git a/Source/cmBinUtilsWindowsPEDumpbinGetRuntimeDependenciesTool.cxx b/Source/cmBinUtilsWindowsPEDumpbinGetRuntimeDependenciesTool.cxx
index 8e4a9aa091..47ee8e8f4a 100644
--- a/Source/cmBinUtilsWindowsPEDumpbinGetRuntimeDependenciesTool.cxx
+++ b/Source/cmBinUtilsWindowsPEDumpbinGetRuntimeDependenciesTool.cxx
@@ -4,6 +4,7 @@
 #include "cmBinUtilsWindowsPEDumpbinGetRuntimeDependenciesTool.h"
 
 #include <sstream>
+#include <vector>
 
 #include <cmsys/RegularExpression.hxx>
 
diff --git a/Source/cmBinUtilsWindowsPEDumpbinGetRuntimeDependenciesTool.h b/Source/cmBinUtilsWindowsPEDumpbinGetRuntimeDependenciesTool.h
index 552db10726..4fcd454d4c 100644
--- a/Source/cmBinUtilsWindowsPEDumpbinGetRuntimeDependenciesTool.h
+++ b/Source/cmBinUtilsWindowsPEDumpbinGetRuntimeDependenciesTool.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <string>
-#include <vector>
 
 #include "cmBinUtilsWindowsPEGetRuntimeDependenciesTool.h"
 
diff --git a/Source/cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.cxx b/Source/cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.cxx
index 258e015b89..a83485c792 100644
--- a/Source/cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.cxx
+++ b/Source/cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.cxx
@@ -4,6 +4,7 @@
 #include "cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.h"
 
 #include <sstream>
+#include <vector>
 
 #include <cmsys/RegularExpression.hxx>
 
diff --git a/Source/cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.h b/Source/cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.h
index 994235d465..ef8e9d6344 100644
--- a/Source/cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.h
+++ b/Source/cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <string>
-#include <vector>
 
 #include "cmBinUtilsWindowsPEGetRuntimeDependenciesTool.h"
 
diff --git a/Source/cmBlockCommand.cxx b/Source/cmBlockCommand.cxx
index 98d97a39af..de31848723 100644
--- a/Source/cmBlockCommand.cxx
+++ b/Source/cmBlockCommand.cxx
@@ -4,7 +4,6 @@
 #include "cmBlockCommand.h"
 
 #include <cstdint>
-#include <initializer_list>
 #include <utility>
 
 #include <cm/memory>
diff --git a/Source/cmCMakePresetsGraph.cxx b/Source/cmCMakePresetsGraph.cxx
index c112622ff3..870315f873 100644
--- a/Source/cmCMakePresetsGraph.cxx
+++ b/Source/cmCMakePresetsGraph.cxx
@@ -11,7 +11,6 @@
 #include <utility>
 
 #include <cm/memory>
-#include <cm/string_view>
 
 #include "cmsys/RegularExpression.hxx"
 
diff --git a/Source/cmCMakePresetsGraphReadJSON.cxx b/Source/cmCMakePresetsGraphReadJSON.cxx
index e76ba1d395..4880186cf3 100644
--- a/Source/cmCMakePresetsGraphReadJSON.cxx
+++ b/Source/cmCMakePresetsGraphReadJSON.cxx
@@ -1,7 +1,7 @@
 /* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 #include <algorithm>
-#include <fstream>
+#include <cstddef>
 #include <functional>
 #include <map>
 #include <string>
diff --git a/Source/cmCMakePresetsGraphReadJSONPackagePresets.cxx b/Source/cmCMakePresetsGraphReadJSONPackagePresets.cxx
index e26c0c40d4..2fec3ae290 100644
--- a/Source/cmCMakePresetsGraphReadJSONPackagePresets.cxx
+++ b/Source/cmCMakePresetsGraphReadJSONPackagePresets.cxx
@@ -1,6 +1,7 @@
 /* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 #include <cstddef>
+#include <functional>
 #include <map>
 #include <memory>
 #include <string>
@@ -15,7 +16,7 @@
 #include "cmCMakePresetsGraph.h"
 #include "cmCMakePresetsGraphInternal.h"
 #include "cmJSONHelpers.h"
-class cmJSONState;
+#include "cmJSONState.h"
 
 namespace {
 using PackagePreset = cmCMakePresetsGraph::PackagePreset;
diff --git a/Source/cmCMakePresetsGraphReadJSONTestPresets.cxx b/Source/cmCMakePresetsGraphReadJSONTestPresets.cxx
index 22717f26c6..2d2669af86 100644
--- a/Source/cmCMakePresetsGraphReadJSONTestPresets.cxx
+++ b/Source/cmCMakePresetsGraphReadJSONTestPresets.cxx
@@ -1,6 +1,7 @@
 /* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 #include <cstddef>
+#include <functional>
 #include <map>
 #include <memory>
 #include <string>
diff --git a/Source/cmCMakePresetsGraphReadJSONWorkflowPresets.cxx b/Source/cmCMakePresetsGraphReadJSONWorkflowPresets.cxx
index e428da4d2b..d85d2e1b79 100644
--- a/Source/cmCMakePresetsGraphReadJSONWorkflowPresets.cxx
+++ b/Source/cmCMakePresetsGraphReadJSONWorkflowPresets.cxx
@@ -1,6 +1,7 @@
 /* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 #include <cstddef>
+#include <functional>
 #include <string>
 #include <vector>
 
diff --git a/Source/cmCPackPropertiesGenerator.cxx b/Source/cmCPackPropertiesGenerator.cxx
index c1e662dbd5..db33bba676 100644
--- a/Source/cmCPackPropertiesGenerator.cxx
+++ b/Source/cmCPackPropertiesGenerator.cxx
@@ -1,7 +1,6 @@
 #include "cmCPackPropertiesGenerator.h"
 
 #include <map>
-#include <memory>
 #include <ostream>
 
 #include "cmGeneratorExpression.h"
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index cc40715c06..e62743b523 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -10,6 +10,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
+#include <functional>
 #include <initializer_list>
 #include <iostream>
 #include <map>
@@ -76,6 +77,8 @@
 #  include <be/kernel/OS.h> /* disable_debugger() API. */
 #endif
 
+struct tm;
+
 struct cmCTest::Private
 {
   Private(cmCTest* ctest)
diff --git a/Source/cmCommands.cxx b/Source/cmCommands.cxx
index 0b253133b1..498c1b5d6b 100644
--- a/Source/cmCommands.cxx
+++ b/Source/cmCommands.cxx
@@ -3,7 +3,7 @@
 
 #include "cmCommands.h"
 
-#include <cm/memory>
+#include <string>
 
 #include "cmAddCompileDefinitionsCommand.h"
 #include "cmAddCustomCommandCommand.h"
diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index e8057de4f5..f5f46e69f1 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -4,7 +4,6 @@
 
 #include <algorithm>
 #include <sstream>
-#include <type_traits>
 #include <utility>
 
 #include <cm/string_view>
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 3051321561..d2da7ec36e 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -8,7 +8,6 @@
 #include <cstdio>
 #include <iterator>
 #include <sstream>
-#include <type_traits>
 #include <unordered_map>
 #include <utility>
 
diff --git a/Source/cmConfigureLog.h b/Source/cmConfigureLog.h
index a48504151f..db4b7aff0d 100644
--- a/Source/cmConfigureLog.h
+++ b/Source/cmConfigureLog.h
@@ -2,6 +2,7 @@
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 #pragma once
 
+#include <cstddef>
 #include <map>
 #include <memory>
 #include <string>
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index eab2ad340d..c18ed51495 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -5,6 +5,7 @@
 #include <array>
 #include <cstdio>
 #include <cstring>
+#include <functional>
 #include <set>
 #include <sstream>
 #include <utility>
diff --git a/Source/cmDebuggerExceptionManager.h b/Source/cmDebuggerExceptionManager.h
index 2524b67d51..bec0f564dd 100644
--- a/Source/cmDebuggerExceptionManager.h
+++ b/Source/cmDebuggerExceptionManager.h
@@ -5,6 +5,7 @@
 #include "cmConfigure.h" // IWYU pragma: keep
 
 #include <cstddef>
+#include <functional>
 #include <mutex>
 #include <string>
 #include <unordered_map>
diff --git a/Source/cmDebuggerThreadManager.cxx b/Source/cmDebuggerThreadManager.cxx
index 951a10112c..ae699c2140 100644
--- a/Source/cmDebuggerThreadManager.cxx
+++ b/Source/cmDebuggerThreadManager.cxx
@@ -5,6 +5,9 @@
 
 #include <algorithm>
 
+#include <cm/optional>
+
+#include <cm3p/cppdap/optional.h>
 #include <cm3p/cppdap/protocol.h>
 #include <cm3p/cppdap/types.h>
 
diff --git a/Source/cmDebuggerVariablesManager.cxx b/Source/cmDebuggerVariablesManager.cxx
index 8a51805839..442c9ec113 100644
--- a/Source/cmDebuggerVariablesManager.cxx
+++ b/Source/cmDebuggerVariablesManager.cxx
@@ -4,6 +4,7 @@
 #include "cmDebuggerVariablesManager.h"
 
 #include <utility>
+#include <vector>
 
 #include <cm3p/cppdap/protocol.h>
 #include <cm3p/cppdap/types.h>
diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx
index be63469d3e..2b85d2b01a 100644
--- a/Source/cmDependsFortran.cxx
+++ b/Source/cmDependsFortran.cxx
@@ -6,7 +6,6 @@
 #include <cstdlib>
 #include <iostream>
 #include <map>
-#include <type_traits>
 #include <utility>
 
 #include "cmsys/FStream.hxx"
diff --git a/Source/cmDependsJava.cxx b/Source/cmDependsJava.cxx
index e85fcf5954..15cf170122 100644
--- a/Source/cmDependsJava.cxx
+++ b/Source/cmDependsJava.cxx
@@ -2,6 +2,8 @@
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 #include "cmDependsJava.h"
 
+#include <set>
+
 #include "cmSystemTools.h"
 
 cmDependsJava::cmDependsJava() = default;
diff --git a/Source/cmDependsJava.h b/Source/cmDependsJava.h
index 9b9710bea7..05b9efa47b 100644
--- a/Source/cmDependsJava.h
+++ b/Source/cmDependsJava.h
@@ -5,7 +5,6 @@
 #include "cmConfigure.h" // IWYU pragma: keep
 
 #include <iosfwd>
-#include <set>
 #include <string>
 
 #include "cmDepends.h"
diff --git a/Source/cmExportBuildAndroidMKGenerator.cxx b/Source/cmExportBuildAndroidMKGenerator.cxx
index c3cffc208c..8650d49159 100644
--- a/Source/cmExportBuildAndroidMKGenerator.cxx
+++ b/Source/cmExportBuildAndroidMKGenerator.cxx
@@ -2,6 +2,7 @@
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 #include "cmExportBuildAndroidMKGenerator.h"
 
+#include <functional>
 #include <sstream>
 #include <vector>
 
diff --git a/Source/cmExportBuildAndroidMKGenerator.h b/Source/cmExportBuildAndroidMKGenerator.h
index 0624f2b2bf..a7542583b1 100644
--- a/Source/cmExportBuildAndroidMKGenerator.h
+++ b/Source/cmExportBuildAndroidMKGenerator.h
@@ -11,8 +11,6 @@
 #include "cmExportBuildFileGenerator.h"
 #include "cmStateTypes.h"
 
-class cmGeneratorTarget;
-
 /** \class cmExportBuildAndroidMKGenerator
  * \brief Generate a file exporting targets from a build tree.
  *
diff --git a/Source/cmExportBuildCMakeConfigGenerator.cxx b/Source/cmExportBuildCMakeConfigGenerator.cxx
index d317ffd2d2..0e59b255fa 100644
--- a/Source/cmExportBuildCMakeConfigGenerator.cxx
+++ b/Source/cmExportBuildCMakeConfigGenerator.cxx
@@ -4,6 +4,7 @@
 
 #include <algorithm>
 #include <cstddef>
+#include <functional>
 #include <map>
 #include <memory>
 #include <set>
diff --git a/Source/cmExportBuildCMakeConfigGenerator.h b/Source/cmExportBuildCMakeConfigGenerator.h
index 7c089b5986..c6250323c6 100644
--- a/Source/cmExportBuildCMakeConfigGenerator.h
+++ b/Source/cmExportBuildCMakeConfigGenerator.h
@@ -10,10 +10,6 @@
 #include "cmExportBuildFileGenerator.h"
 #include "cmExportCMakeConfigGenerator.h"
 
-class cmFileSet;
-class cmGeneratorTarget;
-class cmTargetExport;
-
 /** \class cmExportBuildCMakeConfigGenerator
  * \brief Generate a file exporting targets from a build tree.
  *
diff --git a/Source/cmExportBuildPackageInfoGenerator.cxx b/Source/cmExportBuildPackageInfoGenerator.cxx
index c1677a8685..a8546c0b13 100644
--- a/Source/cmExportBuildPackageInfoGenerator.cxx
+++ b/Source/cmExportBuildPackageInfoGenerator.cxx
@@ -3,6 +3,7 @@
 #include "cmExportBuildPackageInfoGenerator.h"
 
 #include <cassert>
+#include <functional>
 #include <map>
 #include <utility>
 #include <vector>
diff --git a/Source/cmExportInstallAndroidMKGenerator.cxx b/Source/cmExportInstallAndroidMKGenerator.cxx
index 5ebde1f259..15d4b41888 100644
--- a/Source/cmExportInstallAndroidMKGenerator.cxx
+++ b/Source/cmExportInstallAndroidMKGenerator.cxx
@@ -3,6 +3,7 @@
 #include "cmExportInstallAndroidMKGenerator.h"
 
 #include <cstddef>
+#include <functional>
 #include <memory>
 #include <sstream>
 #include <vector>
diff --git a/Source/cmExportInstallCMakeConfigGenerator.cxx b/Source/cmExportInstallCMakeConfigGenerator.cxx
index a039be48dc..1eb339450c 100644
--- a/Source/cmExportInstallCMakeConfigGenerator.cxx
+++ b/Source/cmExportInstallCMakeConfigGenerator.cxx
@@ -3,6 +3,7 @@
 #include "cmExportInstallCMakeConfigGenerator.h"
 
 #include <algorithm>
+#include <functional>
 #include <map>
 #include <memory>
 #include <set>
diff --git a/Source/cmExportInstallCMakeConfigGenerator.h b/Source/cmExportInstallCMakeConfigGenerator.h
index 4729c239ee..480384d187 100644
--- a/Source/cmExportInstallCMakeConfigGenerator.h
+++ b/Source/cmExportInstallCMakeConfigGenerator.h
@@ -10,10 +10,7 @@
 #include "cmExportCMakeConfigGenerator.h"
 #include "cmExportInstallFileGenerator.h"
 
-class cmFileSet;
-class cmGeneratorTarget;
 class cmInstallExportGenerator;
-class cmTargetExport;
 
 /** \class cmExportInstallCMakeConfigGenerator
  * \brief Generate files exporting targets from an install tree.
diff --git a/Source/cmExportInstallFileGenerator.h b/Source/cmExportInstallFileGenerator.h
index 85da19578b..738fbb70c0 100644
--- a/Source/cmExportInstallFileGenerator.h
+++ b/Source/cmExportInstallFileGenerator.h
@@ -17,7 +17,6 @@
 #include "cmInstallExportGenerator.h"
 #include "cmStateTypes.h"
 
-class cmExportSet;
 class cmGeneratorTarget;
 class cmInstallTargetGenerator;
 class cmTargetExport;
diff --git a/Source/cmExportInstallPackageInfoGenerator.cxx b/Source/cmExportInstallPackageInfoGenerator.cxx
index 0fa8bef0cb..7fab8dc9de 100644
--- a/Source/cmExportInstallPackageInfoGenerator.cxx
+++ b/Source/cmExportInstallPackageInfoGenerator.cxx
@@ -2,6 +2,7 @@
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 #include "cmExportInstallPackageInfoGenerator.h"
 
+#include <functional>
 #include <map>
 #include <memory>
 #include <set>
diff --git a/Source/cmExportPackageInfoGenerator.cxx b/Source/cmExportPackageInfoGenerator.cxx
index d82f45bf6a..14972d28d2 100644
--- a/Source/cmExportPackageInfoGenerator.cxx
+++ b/Source/cmExportPackageInfoGenerator.cxx
@@ -5,7 +5,6 @@
 #include <cstddef>
 #include <memory>
 #include <set>
-#include <type_traits>
 #include <utility>
 #include <vector>
 
diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index 20c0714a43..456e6b9453 100644
--- a/Source/cmExportTryCompileFileGenerator.cxx
+++ b/Source/cmExportTryCompileFileGenerator.cxx
@@ -6,7 +6,6 @@
 #include <utility>
 
 #include <cm/memory>
-#include <cm/string_view>
 
 #include "cmFileSet.h"
 #include "cmGenExContext.h"
@@ -24,8 +23,6 @@
 #include "cmTarget.h"
 #include "cmValue.h"
 
-class cmTargetExport;
-
 cmExportTryCompileFileGenerator::cmExportTryCompileFileGenerator(
   cmGlobalGenerator* gg, std::vector<std::string> const& targets,
   cmMakefile* mf, std::set<std::string> const& langs)
diff --git a/Source/cmExportTryCompileFileGenerator.h b/Source/cmExportTryCompileFileGenerator.h
index 2637dfe768..d9a8361381 100644
--- a/Source/cmExportTryCompileFileGenerator.h
+++ b/Source/cmExportTryCompileFileGenerator.h
@@ -11,11 +11,9 @@
 
 #include "cmExportCMakeConfigGenerator.h"
 
-class cmFileSet;
 class cmGeneratorTarget;
 class cmGlobalGenerator;
 class cmMakefile;
-class cmTargetExport;
 
 class cmExportTryCompileFileGenerator : public cmExportCMakeConfigGenerator
 {
diff --git a/Source/cmFLTKWrapUICommand.cxx b/Source/cmFLTKWrapUICommand.cxx
index 3f6095661c..269cf233ad 100644
--- a/Source/cmFLTKWrapUICommand.cxx
+++ b/Source/cmFLTKWrapUICommand.cxx
@@ -6,6 +6,7 @@
 #include <utility>
 
 #include <cm/memory>
+#include <cm/string_view>
 
 #include "cmCustomCommand.h"
 #include "cmCustomCommandLines.h"
diff --git a/Source/cmFastbuildNormalTargetGenerator.cxx b/Source/cmFastbuildNormalTargetGenerator.cxx
index 1e9a9e052a..0ee97d7aee 100644
--- a/Source/cmFastbuildNormalTargetGenerator.cxx
+++ b/Source/cmFastbuildNormalTargetGenerator.cxx
@@ -6,6 +6,7 @@
 #include <algorithm>
 #include <array>
 #include <cstddef>
+#include <functional>
 #include <iterator>
 #include <map>
 #include <sstream>
@@ -21,7 +22,6 @@
 
 #include "cmsys/FStream.hxx"
 
-#include "cmAlgorithms.h"
 #include "cmCommonTargetGenerator.h"
 #include "cmCryptoHash.h"
 #include "cmFastbuildTargetGenerator.h"
diff --git a/Source/cmFastbuildTargetGenerator.h b/Source/cmFastbuildTargetGenerator.h
index 9383aab2aa..f6f9697c82 100644
--- a/Source/cmFastbuildTargetGenerator.h
+++ b/Source/cmFastbuildTargetGenerator.h
@@ -21,7 +21,6 @@ class cmCustomCommand;
 class cmCustomCommandGenerator;
 class cmLocalFastbuildGenerator;
 class cmMakefile;
-class cmSourceFile;
 
 enum class FastbuildBuildStep
 {
diff --git a/Source/cmFastbuildUtilityTargetGenerator.cxx b/Source/cmFastbuildUtilityTargetGenerator.cxx
index ebe2650b57..1936f7f93c 100644
--- a/Source/cmFastbuildUtilityTargetGenerator.cxx
+++ b/Source/cmFastbuildUtilityTargetGenerator.cxx
@@ -8,6 +8,8 @@
 #include <utility>
 #include <vector>
 
+#include <cm/memory>
+
 #include "cmFastbuildTargetGenerator.h"
 #include "cmGeneratorTarget.h"
 #include "cmGlobalFastbuildGenerator.h"
diff --git a/Source/cmFileAPICodemodel.cxx b/Source/cmFileAPICodemodel.cxx
index 46722e5979..c16ea286f9 100644
--- a/Source/cmFileAPICodemodel.cxx
+++ b/Source/cmFileAPICodemodel.cxx
@@ -5,6 +5,7 @@
 #include <algorithm>
 #include <cassert>
 #include <cstddef>
+#include <functional>
 #include <limits>
 #include <map>
 #include <memory>
diff --git a/Source/cmFileAPICommand.cxx b/Source/cmFileAPICommand.cxx
index 797d207118..6ea01cce9d 100644
--- a/Source/cmFileAPICommand.cxx
+++ b/Source/cmFileAPICommand.cxx
@@ -6,6 +6,7 @@ file LICENSE.rst or https://cmake.org/licensing for details.  */
 #include <array>
 #include <cctype>
 #include <cstdlib>
+#include <utility>
 
 #include <cm/string_view>
 #include <cmext/string_view>
diff --git a/Source/cmFileInstaller.cxx b/Source/cmFileInstaller.cxx
index 6d88980176..e95e694332 100644
--- a/Source/cmFileInstaller.cxx
+++ b/Source/cmFileInstaller.cxx
@@ -6,6 +6,7 @@
 #include <map>
 #include <sstream>
 #include <utility>
+#include <vector>
 
 #include <cm/string_view>
 #include <cmext/string_view>
diff --git a/Source/cmFileInstaller.h b/Source/cmFileInstaller.h
index dec135db73..4aa10d1310 100644
--- a/Source/cmFileInstaller.h
+++ b/Source/cmFileInstaller.h
@@ -5,7 +5,6 @@
 #include "cmConfigure.h" // IWYU pragma: keep
 
 #include <string>
-#include <vector>
 
 #include "cmFileCopier.h"
 #include "cmInstallMode.h"
diff --git a/Source/cmFileTime.cxx b/Source/cmFileTime.cxx
index 04a0203b52..7430f66d62 100644
--- a/Source/cmFileTime.cxx
+++ b/Source/cmFileTime.cxx
@@ -2,6 +2,7 @@
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 #include "cmFileTime.h"
 
+#include <ctime>
 #include <string>
 
 // Use a platform-specific API to get file times efficiently.
diff --git a/Source/cmFindBase.h b/Source/cmFindBase.h
index 0be2d73dd0..540388f810 100644
--- a/Source/cmFindBase.h
+++ b/Source/cmFindBase.h
@@ -11,9 +11,7 @@
 #include "cmFindCommon.h"
 #include "cmStateTypes.h"
 
-class cmConfigureLog;
 class cmExecutionStatus;
-class cmMakefile;
 
 /** \class cmFindBase
  * \brief Base class for most FIND_XXX commands.
diff --git a/Source/cmFindPackageCommand.h b/Source/cmFindPackageCommand.h
index ab083848e5..4ac057e6e6 100644
--- a/Source/cmFindPackageCommand.h
+++ b/Source/cmFindPackageCommand.h
@@ -32,9 +32,7 @@ namespace std {
 /* clang-format on */
 #endif
 
-class cmConfigureLog;
 class cmExecutionStatus;
-class cmMakefile;
 class cmPackageState;
 class cmSearchPath;
 class cmPackageInformation;
diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx
index 8ea6c4d397..a629438cac 100644
--- a/Source/cmFunctionCommand.cxx
+++ b/Source/cmFunctionCommand.cxx
@@ -2,6 +2,7 @@
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 #include "cmFunctionCommand.h"
 
+#include <functional>
 #include <utility>
 
 #include <cm/memory>
diff --git a/Source/cmGccDepfileReader.cxx b/Source/cmGccDepfileReader.cxx
index e5b86ad4fc..6624c76f71 100644
--- a/Source/cmGccDepfileReader.cxx
+++ b/Source/cmGccDepfileReader.cxx
@@ -2,7 +2,6 @@
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 #include "cmGccDepfileReader.h"
 
-#include <type_traits>
 #include <utility>
 #include <vector>
 
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index d5d59376a0..9f75f5c5b1 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -36,6 +36,7 @@
 #include "cmGlobalGenerator.h"
 #include "cmLinkItem.h"
 #include "cmList.h"
+#include "cmListFileCache.h"
 #include "cmLocalGenerator.h"
 #include "cmMakefile.h"
 #include "cmMessageType.h"
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index c1cf27a0c0..3ff37b8df1 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -10,7 +10,6 @@
 #include <cstdio>
 #include <cstring>
 #include <sstream>
-#include <type_traits>
 #include <unordered_set>
 #include <utility>
 
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 515f0493d3..94c16b5cee 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -24,6 +24,7 @@
 #include "cmListFileCache.h"
 #include "cmObjectLocation.h"
 #include "cmPolicies.h"
+#include "cmSourceFile.h"
 #include "cmStandardLevel.h"
 #include "cmStateTypes.h"
 #include "cmValue.h"
@@ -44,7 +45,6 @@ class cmFileSet;
 class cmGlobalGenerator;
 class cmLocalGenerator;
 class cmMakefile;
-class cmSourceFile;
 struct cmSyntheticTargetCache;
 class cmTarget;
 
diff --git a/Source/cmGeneratorTarget_CompatibleInterface.cxx b/Source/cmGeneratorTarget_CompatibleInterface.cxx
index bf9970b828..1a8a94469e 100644
--- a/Source/cmGeneratorTarget_CompatibleInterface.cxx
+++ b/Source/cmGeneratorTarget_CompatibleInterface.cxx
@@ -7,6 +7,7 @@
 #include <algorithm>
 #include <cassert>
 #include <cerrno>
+#include <cstddef>
 #include <cstdlib>
 #include <cstring>
 #include <iterator>
diff --git a/Source/cmGeneratorTarget_Link.cxx b/Source/cmGeneratorTarget_Link.cxx
index d0e07546e0..ddc8e3c337 100644
--- a/Source/cmGeneratorTarget_Link.cxx
+++ b/Source/cmGeneratorTarget_Link.cxx
@@ -11,7 +11,6 @@
 #include <set>
 #include <sstream>
 #include <string>
-#include <type_traits>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
diff --git a/Source/cmGeneratorTarget_Sources.cxx b/Source/cmGeneratorTarget_Sources.cxx
index 1171349390..4fc05ad036 100644
--- a/Source/cmGeneratorTarget_Sources.cxx
+++ b/Source/cmGeneratorTarget_Sources.cxx
@@ -10,7 +10,6 @@
 #include <set>
 #include <sstream>
 #include <string>
-#include <type_traits>
 #include <unordered_set>
 #include <utility>
 #include <vector>
@@ -21,7 +20,6 @@
 
 #include "cmsys/RegularExpression.hxx"
 
-#include "cmAlgorithms.h"
 #include "cmEvaluatedTargetProperty.h"
 #include "cmFileSet.h"
 #include "cmGenExContext.h"
diff --git a/Source/cmGeneratorTarget_TargetPropertyEntry.cxx b/Source/cmGeneratorTarget_TargetPropertyEntry.cxx
index c2b2f43c9e..2280e9387d 100644
--- a/Source/cmGeneratorTarget_TargetPropertyEntry.cxx
+++ b/Source/cmGeneratorTarget_TargetPropertyEntry.cxx
@@ -17,14 +17,7 @@
 #include "cmList.h"
 #include "cmListFileCache.h"
 
-namespace cm {
-namespace GenEx {
-struct Context;
-}
-}
-
 class cmake;
-struct cmGeneratorExpressionDAGChecker;
 
 cmLinkItem cmGeneratorTarget::TargetPropertyEntry::NoLinkItem;
 
diff --git a/Source/cmGeneratorTarget_TransitiveProperty.cxx b/Source/cmGeneratorTarget_TransitiveProperty.cxx
index 4f3c478806..61e550eeba 100644
--- a/Source/cmGeneratorTarget_TransitiveProperty.cxx
+++ b/Source/cmGeneratorTarget_TransitiveProperty.cxx
@@ -22,6 +22,7 @@
 #include "cmGeneratorExpressionNode.h"
 #include "cmLinkItem.h"
 #include "cmList.h"
+#include "cmListFileCache.h"
 #include "cmLocalGenerator.h"
 #include "cmPolicies.h"
 #include "cmStringAlgorithms.h"
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index 3fa494feb4..7443d11629 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -6,7 +6,6 @@
 #include <memory>
 #include <ostream>
 #include <set>
-#include <type_traits>
 #include <utility>
 #include <vector>
 
diff --git a/Source/cmGlobalFastbuildGenerator.cxx b/Source/cmGlobalFastbuildGenerator.cxx
index 87bff2e619..7b613c724b 100644
--- a/Source/cmGlobalFastbuildGenerator.cxx
+++ b/Source/cmGlobalFastbuildGenerator.cxx
@@ -44,8 +44,6 @@
 
 #endif
 
-class cmLinkLineComputer;
-
 #define FASTBUILD_REBUILD_BFF_TARGET_NAME "rebuild-bff"
 #define FASTBUILD_GLOB_CHECK_TARGET "glob-check"
 #define FASTBUILD_ENV_VAR_NAME "LocalEnv"
diff --git a/Source/cmGlobalFastbuildGenerator.h b/Source/cmGlobalFastbuildGenerator.h
index 0d50df27f0..0059c93ddf 100644
--- a/Source/cmGlobalFastbuildGenerator.h
+++ b/Source/cmGlobalFastbuildGenerator.h
@@ -24,13 +24,8 @@
 class cmFastbuildTargetGenerator;
 class cmGeneratorTarget;
 class cmGlobalGeneratorFactory;
-class cmLinkLineComputer;
-class cmLocalGenerator;
 class cmMakefile;
-class cmOutputConverter;
-class cmStateDirectory;
 class cmake;
-enum class cmDepfileFormat;
 struct cmDocumentationEntry;
 
 #define FASTBUILD_DOLLAR_TAG "FASTBUILD_DOLLAR_TAG"
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 5b88e4b728..4c40e9316d 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -11,7 +11,6 @@
 #include <initializer_list>
 #include <iterator>
 #include <sstream>
-#include <type_traits>
 #include <utility>
 
 #include <cm/memory>
@@ -44,6 +43,7 @@
 #include "cmInstallRuntimeDependencySet.h"
 #include "cmLinkLineComputer.h"
 #include "cmList.h"
+#include "cmListFileCache.h"
 #include "cmLocalGenerator.h"
 #include "cmMSVC60LinkLineComputer.h"
 #include "cmMakefile.h"
@@ -71,8 +71,6 @@
 #  include "cmQtAutoGenGlobalInitializer.h"
 #endif
 
-class cmListFileBacktrace;
-
 std::string const kCMAKE_PLATFORM_INFO_INITIALIZED =
   "CMAKE_PLATFORM_INFO_INITIALIZED";
 
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index 4d11129f26..fe45795e52 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -10,6 +10,7 @@
 
 #include <cm/memory>
 #include <cm/string>
+#include <cm/string_view>
 #include <cmext/algorithm>
 #include <cmext/memory>
 
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index d2bcccc8a3..ff4dbc6ea5 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -9,7 +9,6 @@
 #include <functional>
 #include <iterator>
 #include <sstream>
-#include <type_traits>
 #include <utility>
 
 #include <cm/memory>
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index a1bca7281f..152c45cd52 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -28,11 +28,7 @@
 
 class cmCustomCommand;
 class cmGeneratorTarget;
-class cmLinkLineComputer;
-class cmLocalGenerator;
 class cmMakefile;
-class cmOutputConverter;
-class cmStateDirectory;
 class cmake;
 struct cmCxxModuleExportInfo;
 
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h
index 4dcc165a47..5dfdbd0a30 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -21,7 +21,6 @@
 class cmGeneratedFileStream;
 class cmLocalGenerator;
 class cmLocalUnixMakefileGenerator3;
-class cmMakefile;
 class cmMakefileTargetGenerator;
 class cmake;
 
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index ea9dde256f..eeb7cc8554 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -30,6 +30,7 @@
 #include "cmMessageType.h"
 #include "cmPolicies.h"
 #include "cmSourceFile.h"
+#include "cmSourceGroup.h"
 #include "cmState.h"
 #include "cmStateTypes.h"
 #include "cmStringAlgorithms.h"
diff --git a/Source/cmGlobalWatcomWMakeGenerator.h b/Source/cmGlobalWatcomWMakeGenerator.h
index 70bd8b4bb3..3381df9728 100644
--- a/Source/cmGlobalWatcomWMakeGenerator.h
+++ b/Source/cmGlobalWatcomWMakeGenerator.h
@@ -13,7 +13,6 @@
 #include "cmGlobalGeneratorFactory.h"
 #include "cmGlobalUnixMakefileGenerator3.h"
 
-class cmMakefile;
 class cmake;
 
 /** \class cmGlobalWatcomWMakeGenerator
diff --git a/Source/cmGraphVizWriter.cxx b/Source/cmGraphVizWriter.cxx
index 45461c67e7..65036fd579 100644
--- a/Source/cmGraphVizWriter.cxx
+++ b/Source/cmGraphVizWriter.cxx
@@ -11,6 +11,8 @@
 
 #include <cm/memory>
 
+#include "cmsys/RegularExpression.hxx"
+
 #include "cmGeneratedFileStream.h"
 #include "cmGeneratorTarget.h"
 #include "cmGlobalGenerator.h"
diff --git a/Source/cmGraphVizWriter.h b/Source/cmGraphVizWriter.h
index 7346c43c9c..3f6bd3185f 100644
--- a/Source/cmGraphVizWriter.h
+++ b/Source/cmGraphVizWriter.h
@@ -11,13 +11,15 @@
 #include <utility>
 #include <vector>
 
-#include "cmsys/RegularExpression.hxx"
-
 #include "cmGeneratedFileStream.h"
 #include "cmLinkItem.h"
 #include "cmLinkItemGraphVisitor.h"
 #include "cmStateTypes.h"
 
+namespace cmsys {
+class RegularExpression;
+}
+
 class cmGlobalGenerator;
 
 /** This class implements writing files for graphviz (dot) for graphs
diff --git a/Source/cmInstallFilesGenerator.cxx b/Source/cmInstallFilesGenerator.cxx
index febeb52ccf..6da1862ba4 100644
--- a/Source/cmInstallFilesGenerator.cxx
+++ b/Source/cmInstallFilesGenerator.cxx
@@ -9,8 +9,6 @@
 #include "cmList.h"
 #include "cmListFileCache.h"
 
-class cmLocalGenerator;
-
 cmInstallFilesGenerator::cmInstallFilesGenerator(
   std::vector<std::string> const& files, std::string const& dest,
   bool programs, std::string file_permissions,
diff --git a/Source/cmInstallImportedRuntimeArtifactsGenerator.h b/Source/cmInstallImportedRuntimeArtifactsGenerator.h
index ec685875c9..90c13a8946 100644
--- a/Source/cmInstallImportedRuntimeArtifactsGenerator.h
+++ b/Source/cmInstallImportedRuntimeArtifactsGenerator.h
@@ -10,7 +10,6 @@
 #include "cmListFileCache.h"
 
 class cmGeneratorTarget;
-class cmLocalGenerator;
 
 class cmInstallImportedRuntimeArtifactsGenerator : public cmInstallGenerator
 {
diff --git a/Source/cmInstallTargetGenerator.h b/Source/cmInstallTargetGenerator.h
index 6ddfca615a..7421d0d299 100644
--- a/Source/cmInstallTargetGenerator.h
+++ b/Source/cmInstallTargetGenerator.h
@@ -13,7 +13,6 @@
 #include "cmListFileCache.h"
 
 class cmGeneratorTarget;
-class cmLocalGenerator;
 
 /** \class cmInstallTargetGenerator
  * \brief Generate target installation rules.
diff --git a/Source/cmJSONHelpers.h b/Source/cmJSONHelpers.h
index ab96c64287..269c22485d 100644
--- a/Source/cmJSONHelpers.h
+++ b/Source/cmJSONHelpers.h
@@ -5,8 +5,8 @@
 #include "cmConfigure.h" // IWYU pragma: keep
 
 #include <algorithm>
+#include <cstddef>
 #include <functional>
-#include <iostream>
 #include <iterator>
 #include <map>
 #include <string>
diff --git a/Source/cmLDConfigLDConfigTool.h b/Source/cmLDConfigLDConfigTool.h
index 08bd0447be..dd50217cc4 100644
--- a/Source/cmLDConfigLDConfigTool.h
+++ b/Source/cmLDConfigLDConfigTool.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <string>
-#include <vector>
 
 #include "cmLDConfigTool.h"
 
diff --git a/Source/cmLinkLineDeviceComputer.cxx b/Source/cmLinkLineDeviceComputer.cxx
index 5659492707..daacea5747 100644
--- a/Source/cmLinkLineDeviceComputer.cxx
+++ b/Source/cmLinkLineDeviceComputer.cxx
@@ -6,6 +6,7 @@
 #include <algorithm>
 #include <set>
 #include <utility>
+#include <vector>
 
 #include <cmext/algorithm>
 
diff --git a/Source/cmLinkLineDeviceComputer.h b/Source/cmLinkLineDeviceComputer.h
index 965a82141a..6e82f06eb2 100644
--- a/Source/cmLinkLineDeviceComputer.h
+++ b/Source/cmLinkLineDeviceComputer.h
@@ -6,7 +6,6 @@
 #include "cmConfigure.h" // IWYU pragma: keep
 
 #include <string>
-#include <vector>
 
 #include "cmLinkLineComputer.h"
 
@@ -15,8 +14,6 @@ class cmGeneratorTarget;
 class cmLocalGenerator;
 class cmOutputConverter;
 class cmStateDirectory;
-template <typename T>
-class BT;
 
 class cmLinkLineDeviceComputer : public cmLinkLineComputer
 {
diff --git a/Source/cmLocalCommonGenerator.cxx b/Source/cmLocalCommonGenerator.cxx
index 4a7d78b21e..c2dfa6fb49 100644
--- a/Source/cmLocalCommonGenerator.cxx
+++ b/Source/cmLocalCommonGenerator.cxx
@@ -2,6 +2,7 @@
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 #include "cmLocalCommonGenerator.h"
 
+#include <map>
 #include <memory>
 #include <utility>
 #include <vector>
diff --git a/Source/cmLocalCommonGenerator.h b/Source/cmLocalCommonGenerator.h
index 5de2365c95..44a566d60f 100644
--- a/Source/cmLocalCommonGenerator.h
+++ b/Source/cmLocalCommonGenerator.h
@@ -4,7 +4,6 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
-#include <map>
 #include <string>
 #include <vector>
 
@@ -13,11 +12,6 @@
 class cmGeneratorTarget;
 class cmGlobalGenerator;
 class cmMakefile;
-struct cmObjectLocations;
-class cmSourceFile;
-namespace cmStateEnums {
-enum class IntermediateDirKind;
-}
 
 /** \class cmLocalCommonGenerator
  * \brief Common infrastructure for Makefile and Ninja local generators.
diff --git a/Source/cmLocalFastbuildGenerator.cxx b/Source/cmLocalFastbuildGenerator.cxx
index e793c0fa57..b2e4a69c95 100644
--- a/Source/cmLocalFastbuildGenerator.cxx
+++ b/Source/cmLocalFastbuildGenerator.cxx
@@ -3,6 +3,7 @@
 
 #include "cmLocalFastbuildGenerator.h"
 
+#include <map>
 #include <memory>
 #include <utility>
 #include <vector>
diff --git a/Source/cmLocalFastbuildGenerator.h b/Source/cmLocalFastbuildGenerator.h
index 3af7573dfd..282178662f 100644
--- a/Source/cmLocalFastbuildGenerator.h
+++ b/Source/cmLocalFastbuildGenerator.h
@@ -2,18 +2,14 @@
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 #pragma once
 
-#include <map>
 #include <string>
 
 #include "cmLocalCommonGenerator.h"
 #include "cmOutputConverter.h"
 
-class cmGeneratorTarget;
 class cmGlobalFastbuildGenerator;
 class cmGlobalGenerator;
 class cmMakefile;
-class cmSourceFile;
-struct cmObjectLocations;
 
 class cmLocalFastbuildGenerator : public cmLocalCommonGenerator
 {
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 1246fe060c..83dc6b1dca 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -11,7 +11,6 @@
 #include <initializer_list>
 #include <iterator>
 #include <sstream>
-#include <type_traits>
 #include <unordered_set>
 #include <utility>
 #include <vector>
diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx
index 0833e17af1..733b71acc2 100644
--- a/Source/cmLocalGhsMultiGenerator.cxx
+++ b/Source/cmLocalGhsMultiGenerator.cxx
@@ -2,6 +2,7 @@
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 #include "cmLocalGhsMultiGenerator.h"
 
+#include <map>
 #include <utility>
 #include <vector>
 
@@ -15,10 +16,6 @@
 #include "cmStringAlgorithms.h"
 #include "cmSystemTools.h"
 
-namespace cmStateEnums {
-enum class IntermediateDirKind;
-}
-
 cmLocalGhsMultiGenerator::cmLocalGhsMultiGenerator(cmGlobalGenerator* gg,
                                                    cmMakefile* mf)
   : cmLocalGenerator(gg, mf)
diff --git a/Source/cmLocalGhsMultiGenerator.h b/Source/cmLocalGhsMultiGenerator.h
index 6f4c5f81b0..ed563d6d75 100644
--- a/Source/cmLocalGhsMultiGenerator.h
+++ b/Source/cmLocalGhsMultiGenerator.h
@@ -2,19 +2,12 @@
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 #pragma once
 
-#include <map>
 #include <string>
 
 #include "cmLocalGenerator.h"
 
-class cmGeneratorTarget;
 class cmGlobalGenerator;
 class cmMakefile;
-struct cmObjectLocations;
-class cmSourceFile;
-namespace cmStateEnums {
-enum class IntermediateDirKind;
-}
 
 /** \class cmLocalGhsMultiGenerator
  * \brief Write Green Hills MULTI project files.
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 56a6aa1922..4f186a840e 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -25,6 +25,7 @@
 #include "cmGlobalGenerator.h"
 #include "cmGlobalNinjaGenerator.h"
 #include "cmList.h"
+#include "cmListFileCache.h"
 #include "cmLocalGenerator.h"
 #include "cmMakefile.h"
 #include "cmMessageType.h"
diff --git a/Source/cmLocalNinjaGenerator.h b/Source/cmLocalNinjaGenerator.h
index 763ec64b66..f80c1ed3ea 100644
--- a/Source/cmLocalNinjaGenerator.h
+++ b/Source/cmLocalNinjaGenerator.h
@@ -6,7 +6,6 @@
 
 #include <iosfwd>
 #include <map>
-#include <memory>
 #include <set>
 #include <string>
 #include <vector>
@@ -25,7 +24,6 @@ class cmGlobalGenerator;
 class cmGlobalNinjaGenerator;
 class cmListFileBacktrace;
 class cmMakefile;
-class cmRulePlaceholderExpander;
 class cmake;
 
 /**
diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 48c23f3b9c..c1506a47f4 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -2,6 +2,7 @@
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 #include "cmMacroCommand.h"
 
+#include <functional>
 #include <utility>
 
 #include <cm/memory>
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 911485bd4c..f480874c0c 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -50,6 +50,7 @@
 #include "cmRange.h"
 #include "cmSourceFile.h"
 #include "cmSourceFileLocation.h"
+#include "cmSourceGroup.h"
 #include "cmStack.h"
 #include "cmState.h"
 #include "cmStateDirectory.h"
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 17904182d4..856c02b85a 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -40,10 +40,6 @@
 // will not compile without the complete type.
 #include "cmTarget.h" // IWYU pragma: keep
 
-#if !defined(CMAKE_BOOTSTRAP)
-#  include "cmSourceGroup.h"
-#endif
-
 enum class cmCustomCommandType;
 enum class cmObjectLibraryCommands;
 
@@ -64,6 +60,10 @@ class cmTestGenerator;
 class cmVariableWatch;
 class cmake;
 
+#if !defined(CMAKE_BOOTSTRAP)
+class cmSourceGroup;
+#endif
+
 /** A type-safe wrapper for a string representing a directory id.  */
 class cmDirectoryId
 {
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index ae18f9bbb2..4e3cee94a7 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -6,6 +6,7 @@
 #include <array>
 #include <cassert>
 #include <cstdio>
+#include <functional>
 #include <iterator>
 #include <sstream>
 #include <unordered_map>
@@ -13,6 +14,7 @@
 #include <utility>
 
 #include <cm/memory>
+#include <cm/optional>
 #include <cm/string_view>
 #include <cmext/algorithm>
 #include <cmext/string_view>
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 842130a8a5..ef8dabe0a7 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -24,6 +24,7 @@
 
 #include "cmBuildDatabase.h"
 #include "cmComputeLinkInformation.h"
+#include "cmCustomCommand.h"
 #include "cmCustomCommandGenerator.h"
 #include "cmDyndepCollation.h"
 #include "cmFileSet.h"
@@ -55,8 +56,6 @@
 #include "cmValue.h"
 #include "cmake.h"
 
-class cmCustomCommand;
-
 std::unique_ptr<cmNinjaTargetGenerator> cmNinjaTargetGenerator::New(
   cmGeneratorTarget* target)
 {
diff --git a/Source/cmOrderDirectories.cxx b/Source/cmOrderDirectories.cxx
index 8ace6b4e02..26bf95e18e 100644
--- a/Source/cmOrderDirectories.cxx
+++ b/Source/cmOrderDirectories.cxx
@@ -6,7 +6,6 @@
 #include <cassert>
 #include <functional>
 #include <sstream>
-#include <type_traits>
 #include <vector>
 
 #include <cm/memory>
diff --git a/Source/cmPlistParser.cxx b/Source/cmPlistParser.cxx
index 0bd85fc4e2..d0fedecd72 100644
--- a/Source/cmPlistParser.cxx
+++ b/Source/cmPlistParser.cxx
@@ -2,6 +2,8 @@
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 #include "cmPlistParser.h"
 
+#include <vector>
+
 #include <cm3p/json/reader.h>
 #include <cm3p/json/value.h>
 
diff --git a/Source/cmQTWrapCPPCommand.cxx b/Source/cmQTWrapCPPCommand.cxx
index b5aadf2da2..d1dcb7619b 100644
--- a/Source/cmQTWrapCPPCommand.cxx
+++ b/Source/cmQTWrapCPPCommand.cxx
@@ -5,6 +5,7 @@
 #include <utility>
 
 #include <cm/memory>
+#include <cm/string_view>
 
 #include "cmCustomCommand.h"
 #include "cmCustomCommandLines.h"
diff --git a/Source/cmQTWrapUICommand.cxx b/Source/cmQTWrapUICommand.cxx
index 692f77b270..a1dc3169bb 100644
--- a/Source/cmQTWrapUICommand.cxx
+++ b/Source/cmQTWrapUICommand.cxx
@@ -5,6 +5,7 @@
 #include <utility>
 
 #include <cm/memory>
+#include <cm/string_view>
 
 #include "cmCustomCommand.h"
 #include "cmCustomCommandLines.h"
diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx
index 4f6102a47f..f169687a9b 100644
--- a/Source/cmQtAutoGenInitializer.cxx
+++ b/Source/cmQtAutoGenInitializer.cxx
@@ -5,6 +5,7 @@
 #include <array>
 #include <cstddef>
 #include <deque>
+#include <functional>
 #include <initializer_list>
 #include <limits>
 #include <map>
diff --git a/Source/cmSetPropertyCommand.cxx b/Source/cmSetPropertyCommand.cxx
index f10fe5ad53..0ef808150a 100644
--- a/Source/cmSetPropertyCommand.cxx
+++ b/Source/cmSetPropertyCommand.cxx
@@ -6,6 +6,7 @@
 #include <sstream>
 #include <unordered_set>
 
+#include <cm/optional>
 #include <cm/string_view>
 
 #include "cmExecutionStatus.h"
diff --git a/Source/cmSetTestsPropertiesCommand.cxx b/Source/cmSetTestsPropertiesCommand.cxx
index f2bbbaed8e..cbe0919da5 100644
--- a/Source/cmSetTestsPropertiesCommand.cxx
+++ b/Source/cmSetTestsPropertiesCommand.cxx
@@ -11,7 +11,6 @@
 #include "cmExecutionStatus.h"
 #include "cmGlobalGenerator.h"
 #include "cmMakefile.h"
-#include "cmRange.h"
 #include "cmStringAlgorithms.h"
 #include "cmSystemTools.h"
 #include "cmTest.h"
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index 42d60faafd..e694a28f1e 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -15,7 +15,7 @@
 #include "cmCacheManager.h"
 #include "cmDefinitions.h"
 #include "cmExecutionStatus.h"
-#include "cmGlobCacheEntry.h"
+#include "cmGlobCacheEntry.h" // IWYU pragma: keep
 #include "cmGlobVerificationManager.h"
 #include "cmList.h"
 #include "cmListFileCache.h"
diff --git a/Source/cmStateDirectory.cxx b/Source/cmStateDirectory.cxx
index 8f5ea97994..773004621a 100644
--- a/Source/cmStateDirectory.cxx
+++ b/Source/cmStateDirectory.cxx
@@ -20,7 +20,6 @@
 #include "cmRange.h"
 #include "cmState.h"
 #include "cmStatePrivate.h"
-#include "cmStateTypes.h"
 #include "cmValue.h"
 
 static std::string const kBINARY_DIR = "BINARY_DIR";
diff --git a/Source/cmStdIoTerminal.cxx b/Source/cmStdIoTerminal.cxx
index 428f7c7fae..01f6dd452f 100644
--- a/Source/cmStdIoTerminal.cxx
+++ b/Source/cmStdIoTerminal.cxx
@@ -5,6 +5,7 @@
 #include <array>
 #include <functional>
 #include <iosfwd>
+#include <ostream>
 #include <string>
 #include <type_traits>
 
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 474597e9b3..1eed1006a9 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -4,6 +4,7 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
+#include <cstddef>
 #include <iosfwd>
 #include <memory>
 #include <set>
diff --git a/Source/cmTargetCompileDefinitionsCommand.cxx b/Source/cmTargetCompileDefinitionsCommand.cxx
index 95a3db9eaa..62c3a4eb19 100644
--- a/Source/cmTargetCompileDefinitionsCommand.cxx
+++ b/Source/cmTargetCompileDefinitionsCommand.cxx
@@ -2,6 +2,8 @@
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 #include "cmTargetCompileDefinitionsCommand.h"
 
+#include <cm/optional>
+
 #include "cmListFileCache.h"
 #include "cmMakefile.h"
 #include "cmMessageType.h"
diff --git a/Source/cmTargetCompileFeaturesCommand.cxx b/Source/cmTargetCompileFeaturesCommand.cxx
index 40c6c305b2..2d4f81f13b 100644
--- a/Source/cmTargetCompileFeaturesCommand.cxx
+++ b/Source/cmTargetCompileFeaturesCommand.cxx
@@ -9,8 +9,6 @@
 #include "cmStringAlgorithms.h"
 #include "cmTargetPropCommandBase.h"
 
-class cmTarget;
-
 namespace {
 
 class TargetCompileFeaturesImpl : public cmTargetPropCommandBase
diff --git a/Source/cmTargetIncludeDirectoriesCommand.cxx b/Source/cmTargetIncludeDirectoriesCommand.cxx
index c28a4ef5da..e6e0a56be5 100644
--- a/Source/cmTargetIncludeDirectoriesCommand.cxx
+++ b/Source/cmTargetIncludeDirectoriesCommand.cxx
@@ -4,6 +4,8 @@
 
 #include <set>
 
+#include <cm/optional>
+
 #include "cmGeneratorExpression.h"
 #include "cmListFileCache.h"
 #include "cmMakefile.h"
diff --git a/Source/cmTargetPrecompileHeadersCommand.cxx b/Source/cmTargetPrecompileHeadersCommand.cxx
index 9f763ae08b..5a57c06c12 100644
--- a/Source/cmTargetPrecompileHeadersCommand.cxx
+++ b/Source/cmTargetPrecompileHeadersCommand.cxx
@@ -4,6 +4,8 @@
 
 #include <utility>
 
+#include <cm/optional>
+
 #include "cmGeneratorExpression.h"
 #include "cmList.h"
 #include "cmListFileCache.h"
diff --git a/Source/cmTargetSourcesCommand.cxx b/Source/cmTargetSourcesCommand.cxx
index 2fe1a91317..7032a5669b 100644
--- a/Source/cmTargetSourcesCommand.cxx
+++ b/Source/cmTargetSourcesCommand.cxx
@@ -5,6 +5,7 @@
 #include <sstream>
 #include <utility>
 
+#include <cm/optional>
 #include <cm/string_view>
 #include <cmext/string_view>
 
diff --git a/Source/cmUVHandlePtr.cxx b/Source/cmUVHandlePtr.cxx
index ff42b58ce2..7e87fbeecc 100644
--- a/Source/cmUVHandlePtr.cxx
+++ b/Source/cmUVHandlePtr.cxx
@@ -14,9 +14,6 @@
 
 namespace cm {
 
-template <typename T>
-struct uv_handle_deleter;
-
 struct uv_loop_deleter
 {
   void operator()(uv_loop_t* loop) const;
diff --git a/Source/cmValue.cxx b/Source/cmValue.cxx
index df806cf26e..83d18b32c5 100644
--- a/Source/cmValue.cxx
+++ b/Source/cmValue.cxx
@@ -1,6 +1,7 @@
 
 #include "cmValue.h"
 
+#include <ostream>
 #include <string>
 
 #include <cmext/string_view>
diff --git a/Source/cmValue.h b/Source/cmValue.h
index 21ef188740..9151a29222 100644
--- a/Source/cmValue.h
+++ b/Source/cmValue.h
@@ -4,6 +4,7 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
+#include <cstddef>
 #include <iosfwd>
 #include <string>
 
diff --git a/Source/cmVariableWatchCommand.cxx b/Source/cmVariableWatchCommand.cxx
index c72c7de363..f5d47c6866 100644
--- a/Source/cmVariableWatchCommand.cxx
+++ b/Source/cmVariableWatchCommand.cxx
@@ -6,8 +6,6 @@
 #include <memory>
 #include <utility>
 
-#include <cm/string_view>
-
 #include "cmExecutionStatus.h"
 #include "cmListFileCache.h"
 #include "cmMakefile.h"
diff --git a/Source/cmWindowsRegistry.h b/Source/cmWindowsRegistry.h
index 1b831accbb..064e3fde5d 100644
--- a/Source/cmWindowsRegistry.h
+++ b/Source/cmWindowsRegistry.h
@@ -5,7 +5,6 @@
 #include "cmConfigure.h" // IWYU pragma: keep
 
 #include <cstdint> // IWYU pragma: keep
-#include <initializer_list>
 #include <string>
 #include <vector>
 
diff --git a/Source/cmWorkerPool.cxx b/Source/cmWorkerPool.cxx
index bf79c864b9..cae37a76c1 100644
--- a/Source/cmWorkerPool.cxx
+++ b/Source/cmWorkerPool.cxx
@@ -15,6 +15,8 @@
 
 #include <cm3p/uv.h>
 
+#include <sys/types.h>
+
 #include "cmRange.h"
 #include "cmStringAlgorithms.h"
 #include "cmSystemTools.h"
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index c15e28856c..3f2710d454 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -26,6 +26,8 @@
 #include <cmext/algorithm>
 #include <cmext/string_view>
 
+#include <sys/types.h>
+
 #include "cmsys/FStream.hxx"
 #include "cmsys/Glob.hxx"
 #include "cmsys/RegularExpression.hxx"
@@ -51,7 +53,7 @@
 #include "cmExternalMakefileProjectGenerator.h"
 #include "cmFileTimeCache.h"
 #include "cmGeneratorTarget.h"
-#include "cmGlobCacheEntry.h"
+#include "cmGlobCacheEntry.h" // IWYU pragma: keep
 #include "cmGlobalGenerator.h"
 #include "cmGlobalGeneratorFactory.h"
 #include "cmLinkLineComputer.h"
diff --git a/Source/cmake.h b/Source/cmake.h
index 2e754d8f83..f4c9ed4092 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -30,8 +30,6 @@
 #include "cmValue.h"
 
 #if !defined(CMAKE_BOOTSTRAP)
-#  include <type_traits>
-
 #  include <cm/optional>
 
 #  include <cm3p/json/value.h>
diff --git a/Tests/CMakeLib/testCMExtEnumSet.cxx b/Tests/CMakeLib/testCMExtEnumSet.cxx
index fc521088e9..52b5ecb9f2 100644
--- a/Tests/CMakeLib/testCMExtEnumSet.cxx
+++ b/Tests/CMakeLib/testCMExtEnumSet.cxx
@@ -1,6 +1,5 @@
-
 #include <cstdint>
-#include <initializer_list>
+#include <functional>
 #include <iostream>
 #include <iterator>
 #include <limits>
diff --git a/Tests/CMakeLib/testCTestBinPacker.cxx b/Tests/CMakeLib/testCTestBinPacker.cxx
index 1c0cf13566..334820028e 100644
--- a/Tests/CMakeLib/testCTestBinPacker.cxx
+++ b/Tests/CMakeLib/testCTestBinPacker.cxx
@@ -2,6 +2,7 @@
 #include <iostream>
 #include <map>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "cmCTestBinPacker.h"
diff --git a/Tests/CMakeLib/testCTestResourceAllocator.cxx b/Tests/CMakeLib/testCTestResourceAllocator.cxx
index 78adeb9330..1e048aa860 100644
--- a/Tests/CMakeLib/testCTestResourceAllocator.cxx
+++ b/Tests/CMakeLib/testCTestResourceAllocator.cxx
@@ -1,6 +1,7 @@
 #include <iostream>
 #include <map>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "cmCTestResourceAllocator.h"
diff --git a/Tests/CMakeLib/testCTestResourceSpec.cxx b/Tests/CMakeLib/testCTestResourceSpec.cxx
index dae810fc55..019168b36d 100644
--- a/Tests/CMakeLib/testCTestResourceSpec.cxx
+++ b/Tests/CMakeLib/testCTestResourceSpec.cxx
@@ -1,5 +1,7 @@
 #include <iostream>
+#include <map>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "cmCTestResourceSpec.h"
diff --git a/Tests/CMakeLib/testDebuggerBreakpointManager.cxx b/Tests/CMakeLib/testDebuggerBreakpointManager.cxx
index e1e86af734..3fff39e385 100644
--- a/Tests/CMakeLib/testDebuggerBreakpointManager.cxx
+++ b/Tests/CMakeLib/testDebuggerBreakpointManager.cxx
@@ -16,11 +16,12 @@
 
 #include "cmDebuggerBreakpointManager.h"
 #include "cmDebuggerSourceBreakpoint.h" // IWYU pragma: keep
-#include "cmListFileCache.h"
 
 #include "testCommon.h"
 #include "testDebugger.h"
 
+class cmListFileFunction;
+
 static bool testHandleBreakpointRequestBeforeFileIsLoaded()
 {
   // Arrange
diff --git a/Tests/CMakeLib/testDebuggerVariablesManager.cxx b/Tests/CMakeLib/testDebuggerVariablesManager.cxx
index bccff2f9e5..db8183c703 100644
--- a/Tests/CMakeLib/testDebuggerVariablesManager.cxx
+++ b/Tests/CMakeLib/testDebuggerVariablesManager.cxx
@@ -2,6 +2,7 @@
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 
 #include <memory>
+#include <string>
 #include <vector>
 
 #include <cm3p/cppdap/protocol.h>
diff --git a/Tests/CMakeLib/testList.cxx b/Tests/CMakeLib/testList.cxx
index 810ca913b7..983ff06ae6 100644
--- a/Tests/CMakeLib/testList.cxx
+++ b/Tests/CMakeLib/testList.cxx
@@ -1,6 +1,7 @@
 /* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 
+#include <memory>
 #include <stdexcept>
 #include <string>
 #include <utility>
diff --git a/Tests/CMakeLib/testSPDXSerializer.cxx b/Tests/CMakeLib/testSPDXSerializer.cxx
index b8ab923b7b..14f9f7e139 100644
--- a/Tests/CMakeLib/testSPDXSerializer.cxx
+++ b/Tests/CMakeLib/testSPDXSerializer.cxx
@@ -5,7 +5,6 @@
 #include <vector>
 
 #include <cm/optional>
-#include <cm/type_traits>
 
 #include <cm3p/json/reader.h>
 #include <cm3p/json/value.h>
diff --git a/Tests/CMakeLib/testString.cxx b/Tests/CMakeLib/testString.cxx
index b796eb7977..07ddc69143 100644
--- a/Tests/CMakeLib/testString.cxx
+++ b/Tests/CMakeLib/testString.cxx
@@ -1,6 +1,7 @@
 /* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 
+#include <cstddef>
 #include <cstring>
 #include <iterator>
 #include <sstream>
diff --git a/Tests/CMakeLib/testUVJobServerClient.cxx b/Tests/CMakeLib/testUVJobServerClient.cxx
index e9a567cc37..9fb2708fed 100644
--- a/Tests/CMakeLib/testUVJobServerClient.cxx
+++ b/Tests/CMakeLib/testUVJobServerClient.cxx
@@ -1,6 +1,7 @@
 #include <cassert>
 #include <cstddef>
 #include <deque>
+#include <functional>
 #include <iostream>
 #include <vector>
 
diff --git a/Tests/RunCMake/CTestResourceAllocation/ctresalloc.cxx b/Tests/RunCMake/CTestResourceAllocation/ctresalloc.cxx
index 2bb13864d5..57e584ec51 100644
--- a/Tests/RunCMake/CTestResourceAllocation/ctresalloc.cxx
+++ b/Tests/RunCMake/CTestResourceAllocation/ctresalloc.cxx
@@ -2,6 +2,7 @@
 #include <chrono>
 #include <cstddef> // IWYU pragma: keep
 #include <cstdlib>
+#include <functional>
 #include <iostream>
 #include <map>
 #include <set>
diff --git a/Utilities/IWYU/mapping.imp b/Utilities/IWYU/mapping.imp
index 51ec37a68b..02b9bed33c 100644
--- a/Utilities/IWYU/mapping.imp
+++ b/Utilities/IWYU/mapping.imp
@@ -23,36 +23,12 @@
   { include: [ "<wctype.h>", public, "<cwctype>", public ] },
 
   # HACK: check whether this can be removed with next iwyu release.
-  { include: [ "<bits/cxxabi_forced.h>", private, "<ctime>", public ] },
-  { include: [ "<bits/chrono.h>", private, "<chrono>", public ] },
-  { include: [ "<bits/exception.h>", private, "<exception>", public ] },
-  { include: [ "<bits/shared_ptr.h>", private, "<memory>", public ] },
-  { include: [ "<bits/std_function.h>", private, "<functional>", public ] },
-  { include: [ "<bits/refwrap.h>", private, "<functional>", public ] },
-  { include: [ "<bits/std_abs.h>", private, "<stdlib.h>", public ] },
-  { include: [ "<bits/stdint-intn.h>", private, "<stdint.h>", public ] },
-  { include: [ "<bits/stdint-uintn.h>", private, "<stdint.h>", public ] },
-  { include: [ "<bits/string_view.tcc>", private, "<string_view>", public ] },
-  { include: [ "<bits/time.h>", private, "<time.h>", public ] },
-  { include: [ "<bits/types/clock_t.h>", private, "<time.h>", public ] },
+  { include: [ "<bits/c++config.h>", private, "<cstddef>", public ] },
   { include: [ "<bits/types/mbstate_t.h>", private, "<wchar.h>", public ] },
-  { include: [ "<bits/types/struct_timespec.h>", private, "<time.h>", public ] },
-  { include: [ "<bits/types/struct_timeval.h>", private, "<time.h>", public ] },
-  { include: [ "<bits/types/struct_tm.h>", private, "<time.h>", public ] },
-  { include: [ "<bits/types/time_t.h>", private, "<time.h>", public ] },
 
   # HACK: check whether this can be removed with next iwyu release.
   { symbol: [ "__GLIBC__", private, "<stdlib.h>", public ] },
-
-  # HACK: iwyu wrongly thinks that including <iosfwd> is sufficient.
-  { symbol: [ "std::stringstream", private, "<sstream>", public ] },
-  { symbol: [ "std::istringstream", private, "<sstream>", public ] },
-  { symbol: [ "std::ostringstream", private, "<sstream>", public ] },
-
-  # HACK: iwyu attributes vector's usage of std::max to its caller.
-  # https://github.com/include-what-you-use/include-what-you-use/issues/908
-  { symbol: ["std::max", "private", "<algorithm>", "public" ] },
-  { symbol: ["std::max", "private", "<vector>", "public" ] },
+  { symbol: [ "std::pair", private, "<utility>", public ] },
 
   # Wrappers for 3rd-party libraries
   { include: [ "@<.*curl/curlver.h>", private, "<cm3p/curl/curl.h>", public ] },
@@ -63,8 +39,7 @@
   { include: [ "@<.*expat_external.h>", private, "<cm3p/expat.h>", public ] },
   { include: [ "@<.*zconf.h>", private, "<cm3p/zlib.h>", public ] },
   { include: [ "@<.*cm_zlib_mangle.h>", private, "<cm3p/zlib.h>", public ] },
-  # # System symbols used by libuv
-  { symbol: [ "ssize_t", private, "<cm3p/uv.h>", public ] },
+  { include: [ "<cmllpkgc/llpkgc__internal.h>", public, "<cmllpkgc/llpkgc.h>", public ] },
 
   { symbol: [ "std::ifstream", private, "\"cmsys/FStream.hxx\"", public ] },
   { symbol: [ "std::ofstream", private, "\"cmsys/FStream.hxx\"", public ] },
@@ -88,16 +63,15 @@
   { symbol: [ "major", private, "\"cmVersion.h\"", public ] },
   { symbol: [ "minor", private, "\"cmVersion.h\"", public ] },
 
-  { include: [ "<curses.h>", private, "\"cmCursesStandardIncludes.h\"", public ] },
+  { include: [ "<ncurses.h>", private, "\"cmCursesStandardIncludes.h\"", public ] },
   { include: [ "\"form.h\"", private, "\"cmCursesStandardIncludes.h\"", public ] },
-  { include: [ "<form.h>", private, "\"cmCursesStandardIncludes.h\"", public ] },
 
   # Help IWYU understand our explicit instantiation for cmStack.
   { symbol: [ "cmStack::cmStack<T, Stack, Mutable>", private, "\"cmStack.h\"", public ] },
-  { symbol: [ "cmStack<cmFindPackageCall, cmFindPackageStack, cmStackType::Mutable>::Empty", private, "\"cmStack.h\"", public ] },
-  { symbol: [ "cmStack<cmFindPackageCall, cmFindPackageStack, cmStackType::Mutable>::Top", private, "\"cmStack.h\"", public ] },
-  { symbol: [ "cmStack<cmFindPackageCall, cmFindPackageStack, cmStackType::Mutable>::Pop", private, "\"cmStack.h\"", public ] },
-  { symbol: [ "cmStack<cmFindPackageCall, cmFindPackageStack, cmStackType::Mutable>::Push", private, "\"cmStack.h\"", public ] },
+  { symbol: [ "cmStack<cmFindPackageCall, cmFindPackageStack>::Empty", private, "\"cmStack.h\"", public ] },
+  { symbol: [ "cmStack<cmFindPackageCall, cmFindPackageStack>::Top", private, "\"cmStack.h\"", public ] },
+  { symbol: [ "cmStack<cmFindPackageCall, cmFindPackageStack>::Pop", private, "\"cmStack.h\"", public ] },
+  { symbol: [ "cmStack<cmFindPackageCall, cmFindPackageStack>::Push", private, "\"cmStack.h\"", public ] },
 ]
 
 # vim: set ft=toml: