make sure to include cmConfigure.h before cmStandardIncludes.h

72 files changed, 145 insertions, 1 deletions

diff --git a/Source/CPack/WiX/cmWIXRichTextFormatWriter.h b/Source/CPack/WiX/cmWIXRichTextFormatWriter.h
index acf1fa6f41..63a2ec0adc 100644
--- a/Source/CPack/WiX/cmWIXRichTextFormatWriter.h
+++ b/Source/CPack/WiX/cmWIXRichTextFormatWriter.h
@@ -13,6 +13,8 @@
 #ifndef cmWIXRichTextFormatWriter_h
 #define cmWIXRichTextFormatWriter_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include <cmsys/FStream.hxx>
diff --git a/Source/CPack/cmCPackComponentGroup.h b/Source/CPack/cmCPackComponentGroup.h
index 01a9e76f58..78b81b350b 100644
--- a/Source/CPack/cmCPackComponentGroup.h
+++ b/Source/CPack/cmCPackComponentGroup.h
@@ -13,6 +13,8 @@
 #ifndef cmCPackComponentGroup_h
 #define cmCPackComponentGroup_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 class cmCPackComponentGroup;
diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h
index 7b44df9cff..095397869e 100644
--- a/Source/CursesDialog/cmCursesStandardIncludes.h
+++ b/Source/CursesDialog/cmCursesStandardIncludes.h
@@ -12,6 +12,8 @@
 #ifndef cmCursesStandardIncludes_h
 #define cmCursesStandardIncludes_h
 
+#include <cmConfigure.h>
+
 #include "../cmStandardIncludes.h"
 
 #if defined(__sun__) && defined(__GNUC__)
diff --git a/Source/bindexplib.h b/Source/bindexplib.h
index 8661a4aabf..715808a532 100644
--- a/Source/bindexplib.h
+++ b/Source/bindexplib.h
@@ -13,6 +13,8 @@
 #ifndef bindexplib_h
 #define bindexplib_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 
diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index ee803c8e82..a6c71d2971 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -12,6 +12,8 @@
 #ifndef cmAlgorithms_h
 #define cmAlgorithms_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 inline bool cmHasLiteralPrefixImpl(const std::string& str1, const char* str2,
diff --git a/Source/cmCTest.h b/Source/cmCTest.h
index b6657c95ff..20f5caf18e 100644
--- a/Source/cmCTest.h
+++ b/Source/cmCTest.h
@@ -13,6 +13,8 @@
 #ifndef cmCTest_h
 #define cmCTest_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include "cmListFileCache.h"
diff --git a/Source/cmCallVisualStudioMacro.h b/Source/cmCallVisualStudioMacro.h
index e516fe2685..fd735cf499 100644
--- a/Source/cmCallVisualStudioMacro.h
+++ b/Source/cmCallVisualStudioMacro.h
@@ -12,6 +12,8 @@
 #ifndef cmCallVisualStudioMacro_h
 #define cmCallVisualStudioMacro_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 /** \class cmCallVisualStudioMacro
diff --git a/Source/cmCommandArgumentParserHelper.h b/Source/cmCommandArgumentParserHelper.h
index 97b706c322..1040ad3b8b 100644
--- a/Source/cmCommandArgumentParserHelper.h
+++ b/Source/cmCommandArgumentParserHelper.h
@@ -12,6 +12,8 @@
 #ifndef cmCommandArgumentParserHelper_h
 #define cmCommandArgumentParserHelper_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #define YYSTYPE cmCommandArgumentParserHelper::ParserType
diff --git a/Source/cmCommandArgumentsHelper.h b/Source/cmCommandArgumentsHelper.h
index 9133148816..19a6f8de4d 100644
--- a/Source/cmCommandArgumentsHelper.h
+++ b/Source/cmCommandArgumentsHelper.h
@@ -12,6 +12,8 @@
 #ifndef cmCommandArgumentsHelper_h
 #define cmCommandArgumentsHelper_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 class cmCommandArgumentsHelper;
diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in
index cb671ddea3..ccea22d686 100644
--- a/Source/cmConfigure.cmake.h.in
+++ b/Source/cmConfigure.cmake.h.in
@@ -12,7 +12,7 @@
 #ifndef cmConfigure_h
 #define cmConfigure_h
 
-#include <cmsys/Configure.hxx>
+#include <cmsys/Configure.hxx> // IWYU pragma: keep
 
 #ifdef _MSC_VER
 #pragma warning(disable : 4786)
diff --git a/Source/cmCryptoHash.h b/Source/cmCryptoHash.h
index 4e92b063e4..c51393d8b0 100644
--- a/Source/cmCryptoHash.h
+++ b/Source/cmCryptoHash.h
@@ -12,6 +12,8 @@
 #ifndef cmCryptoHash_h
 #define cmCryptoHash_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include <cm_auto_ptr.hxx>
diff --git a/Source/cmCurl.h b/Source/cmCurl.h
index 26bf94e090..c3a20533d5 100644
--- a/Source/cmCurl.h
+++ b/Source/cmCurl.h
@@ -12,6 +12,8 @@
 #ifndef cmCurl_h
 #define cmCurl_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include "cm_curl.h"
diff --git a/Source/cmCustomCommand.h b/Source/cmCustomCommand.h
index 34753f4050..152b3b9043 100644
--- a/Source/cmCustomCommand.h
+++ b/Source/cmCustomCommand.h
@@ -12,6 +12,8 @@
 #ifndef cmCustomCommand_h
 #define cmCustomCommand_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include "cmListFileCache.h"
diff --git a/Source/cmCustomCommandGenerator.h b/Source/cmCustomCommandGenerator.h
index a361153aec..66644d6f05 100644
--- a/Source/cmCustomCommandGenerator.h
+++ b/Source/cmCustomCommandGenerator.h
@@ -12,6 +12,8 @@
 #ifndef cmCustomCommandGenerator_h
 #define cmCustomCommandGenerator_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 class cmCustomCommand;
diff --git a/Source/cmDefinitions.h b/Source/cmDefinitions.h
index 8f1813c981..f22de79572 100644
--- a/Source/cmDefinitions.h
+++ b/Source/cmDefinitions.h
@@ -12,6 +12,8 @@
 #ifndef cmDefinitions_h
 #define cmDefinitions_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include "cmLinkedTree.h"
diff --git a/Source/cmDepends.h b/Source/cmDepends.h
index 0e1cbb9258..b9d47a67fc 100644
--- a/Source/cmDepends.h
+++ b/Source/cmDepends.h
@@ -12,6 +12,8 @@
 #ifndef cmDepends_h
 #define cmDepends_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 class cmFileTimeComparison;
diff --git a/Source/cmDependsJavaLexer.cxx b/Source/cmDependsJavaLexer.cxx
index f7676d9c27..5d644cef5b 100644
--- a/Source/cmDependsJavaLexer.cxx
+++ b/Source/cmDependsJavaLexer.cxx
@@ -1,3 +1,5 @@
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 #line 2 "cmDependsJavaLexer.cxx"
 
diff --git a/Source/cmDependsJavaParserHelper.h b/Source/cmDependsJavaParserHelper.h
index 6ff024563a..377d5846c0 100644
--- a/Source/cmDependsJavaParserHelper.h
+++ b/Source/cmDependsJavaParserHelper.h
@@ -12,6 +12,8 @@
 #ifndef cmDependsJavaParserHelper_h
 #define cmDependsJavaParserHelper_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #define YYSTYPE cmDependsJavaParserHelper::ParserType
diff --git a/Source/cmDocumentation.h b/Source/cmDocumentation.h
index ac36c8b0a8..c82e1d4669 100644
--- a/Source/cmDocumentation.h
+++ b/Source/cmDocumentation.h
@@ -12,6 +12,8 @@
 #ifndef _cmDocumentation_h
 #define _cmDocumentation_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include "cmDocumentationFormatter.h"
diff --git a/Source/cmDocumentationFormatter.h b/Source/cmDocumentationFormatter.h
index 7c4c35bd8d..7a931206b3 100644
--- a/Source/cmDocumentationFormatter.h
+++ b/Source/cmDocumentationFormatter.h
@@ -12,6 +12,8 @@
 #ifndef _cmDocumentationFormatter_h
 #define _cmDocumentationFormatter_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 /** This is just a helper class to make it build with MSVC 6.0.
diff --git a/Source/cmDynamicLoader.h b/Source/cmDynamicLoader.h
index 58d9ae9fcc..d9b89905f1 100644
--- a/Source/cmDynamicLoader.h
+++ b/Source/cmDynamicLoader.h
@@ -17,6 +17,8 @@
 #ifndef cmDynamicLoader_h
 #define cmDynamicLoader_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include <cmsys/DynamicLoader.hxx>
diff --git a/Source/cmExecutionStatus.h b/Source/cmExecutionStatus.h
index 800651407b..14e14543bf 100644
--- a/Source/cmExecutionStatus.h
+++ b/Source/cmExecutionStatus.h
@@ -12,6 +12,8 @@
 #ifndef cmExecutionStatus_h
 #define cmExecutionStatus_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 /** \class cmExecutionStatus
diff --git a/Source/cmExpandedCommandArgument.h b/Source/cmExpandedCommandArgument.h
index 1f8e405477..fa0eaa9bb1 100644
--- a/Source/cmExpandedCommandArgument.h
+++ b/Source/cmExpandedCommandArgument.h
@@ -12,6 +12,8 @@
 #ifndef cmExpandedCommandArgument_h
 #define cmExpandedCommandArgument_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 /** \class cmExpandedCommandArgument
diff --git a/Source/cmExprLexer.cxx b/Source/cmExprLexer.cxx
index 4704f03685..b16ec1aa91 100644
--- a/Source/cmExprLexer.cxx
+++ b/Source/cmExprLexer.cxx
@@ -1,3 +1,5 @@
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 #line 2 "/home/andy/vtk/CMake-bin/Source/cmExprLexer.cxx"
 
diff --git a/Source/cmExprParserHelper.h b/Source/cmExprParserHelper.h
index af0b9164a9..8e3d9964ce 100644
--- a/Source/cmExprParserHelper.h
+++ b/Source/cmExprParserHelper.h
@@ -12,6 +12,8 @@
 #ifndef cmExprParserHelper_h
 #define cmExprParserHelper_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #define YYSTYPE cmExprParserHelper::ParserType
diff --git a/Source/cmExternalMakefileProjectGenerator.h b/Source/cmExternalMakefileProjectGenerator.h
index 6ae553323a..7d10ce1a52 100644
--- a/Source/cmExternalMakefileProjectGenerator.h
+++ b/Source/cmExternalMakefileProjectGenerator.h
@@ -12,6 +12,8 @@
 #ifndef cmExternalMakefileProjectGenerator_h
 #define cmExternalMakefileProjectGenerator_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include "cmDocumentation.h"
diff --git a/Source/cmFileLock.h b/Source/cmFileLock.h
index 538b7162e3..38b90e1bf7 100644
--- a/Source/cmFileLock.h
+++ b/Source/cmFileLock.h
@@ -13,6 +13,8 @@
 #ifndef cmFileLock_h
 #define cmFileLock_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #if defined(_WIN32)
diff --git a/Source/cmFileLockPool.h b/Source/cmFileLockPool.h
index dc42e6ff38..a3883dab46 100644
--- a/Source/cmFileLockPool.h
+++ b/Source/cmFileLockPool.h
@@ -12,6 +12,8 @@
 #ifndef cmFileLockPool_h
 #define cmFileLockPool_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include <list>
diff --git a/Source/cmFileLockResult.h b/Source/cmFileLockResult.h
index d5ac354f20..10d4c13fd2 100644
--- a/Source/cmFileLockResult.h
+++ b/Source/cmFileLockResult.h
@@ -13,6 +13,8 @@
 #ifndef cmFileLockResult_h
 #define cmFileLockResult_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #if defined(_WIN32)
diff --git a/Source/cmFilePathUuid.h b/Source/cmFilePathUuid.h
index 42e89b1065..619c71b7d3 100644
--- a/Source/cmFilePathUuid.h
+++ b/Source/cmFilePathUuid.h
@@ -13,6 +13,8 @@
 #ifndef cmFilePathUuid_h
 #define cmFilePathUuid_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include <string>
diff --git a/Source/cmFileTimeComparison.h b/Source/cmFileTimeComparison.h
index 409bd64f21..52e974ccc4 100644
--- a/Source/cmFileTimeComparison.h
+++ b/Source/cmFileTimeComparison.h
@@ -12,6 +12,8 @@
 #ifndef cmFileTimeComparison_h
 #define cmFileTimeComparison_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 class cmFileTimeComparisonInternal;
diff --git a/Source/cmFortranParser.h b/Source/cmFortranParser.h
index 07e1b1c1c4..5f1c7acdf3 100644
--- a/Source/cmFortranParser.h
+++ b/Source/cmFortranParser.h
@@ -13,6 +13,8 @@
 #define cmFortranParser_h
 
 #if !defined(cmFortranLexer_cxx) && !defined(cmFortranParser_cxx)
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 #endif
 
diff --git a/Source/cmFunctionBlocker.h b/Source/cmFunctionBlocker.h
index c7e3b713a2..4a600e7fb1 100644
--- a/Source/cmFunctionBlocker.h
+++ b/Source/cmFunctionBlocker.h
@@ -12,6 +12,8 @@
 #ifndef cmFunctionBlocker_h
 #define cmFunctionBlocker_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include "cmExecutionStatus.h"
diff --git a/Source/cmGeneratedFileStream.h b/Source/cmGeneratedFileStream.h
index 3480c5bca8..e5e3320d03 100644
--- a/Source/cmGeneratedFileStream.h
+++ b/Source/cmGeneratedFileStream.h
@@ -12,6 +12,8 @@
 #ifndef cmGeneratedFileStream_h
 #define cmGeneratedFileStream_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include <cmsys/FStream.hxx>
diff --git a/Source/cmGeneratorExpression.h b/Source/cmGeneratorExpression.h
index 2f9160873d..75e69b4bc2 100644
--- a/Source/cmGeneratorExpression.h
+++ b/Source/cmGeneratorExpression.h
@@ -13,6 +13,8 @@
 #ifndef cmGeneratorExpression_h
 #define cmGeneratorExpression_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include "cmListFileCache.h"
diff --git a/Source/cmGeneratorExpressionDAGChecker.h b/Source/cmGeneratorExpressionDAGChecker.h
index 6b7fe9ae5b..e522728f26 100644
--- a/Source/cmGeneratorExpressionDAGChecker.h
+++ b/Source/cmGeneratorExpressionDAGChecker.h
@@ -12,6 +12,8 @@
 #ifndef cmGeneratorExpressionDAGChecker_h
 #define cmGeneratorExpressionDAGChecker_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include "cmGeneratorExpressionEvaluator.h"
diff --git a/Source/cmGeneratorExpressionLexer.h b/Source/cmGeneratorExpressionLexer.h
index 72ad7315bd..6bd336bced 100644
--- a/Source/cmGeneratorExpressionLexer.h
+++ b/Source/cmGeneratorExpressionLexer.h
@@ -12,6 +12,8 @@
 #ifndef cmGeneratorExpressionLexer_h
 #define cmGeneratorExpressionLexer_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include <vector>
diff --git a/Source/cmGhsMultiGpj.h b/Source/cmGhsMultiGpj.h
index b388455a1a..4d8a757d43 100644
--- a/Source/cmGhsMultiGpj.h
+++ b/Source/cmGhsMultiGpj.h
@@ -12,6 +12,8 @@
 #ifndef cmGhsMultiGpj_h
 #define cmGhsMultiGpj_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 class cmGeneratedFileStream;
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 089a63701c..dc80a33e40 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -13,6 +13,8 @@
 #ifndef cmGlobalGenerator_h
 #define cmGlobalGenerator_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include "cmExportSetMap.h" // For cmExportSetMap
diff --git a/Source/cmGlobalGeneratorFactory.h b/Source/cmGlobalGeneratorFactory.h
index 74d3145386..26bc2c0d56 100644
--- a/Source/cmGlobalGeneratorFactory.h
+++ b/Source/cmGlobalGeneratorFactory.h
@@ -13,6 +13,10 @@
 #ifndef cmGlobalGeneratorFactory_h
 #define cmGlobalGeneratorFactory_h
 
+#include <cmConfigure.h>
+
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 class cmake;
diff --git a/Source/cmGraphAdjacencyList.h b/Source/cmGraphAdjacencyList.h
index 5666d48f10..65bed5e828 100644
--- a/Source/cmGraphAdjacencyList.h
+++ b/Source/cmGraphAdjacencyList.h
@@ -12,6 +12,8 @@
 #ifndef cmGraphAdjacencyList_h
 #define cmGraphAdjacencyList_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 /**
diff --git a/Source/cmGraphVizWriter.h b/Source/cmGraphVizWriter.h
index c73d82d095..06437854ff 100644
--- a/Source/cmGraphVizWriter.h
+++ b/Source/cmGraphVizWriter.h
@@ -12,6 +12,8 @@
 #ifndef CMGRAPHVIZWRITER_H
 #define CMGRAPHVIZWRITER_H
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include "cmGeneratedFileStream.h"
diff --git a/Source/cmHexFileConverter.h b/Source/cmHexFileConverter.h
index 56fa9b1b83..06616a2841 100644
--- a/Source/cmHexFileConverter.h
+++ b/Source/cmHexFileConverter.h
@@ -12,6 +12,8 @@
 #ifndef cmHexFileConverter_h
 #define cmHexFileConverter_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 /** \class cmHexFileConverter
diff --git a/Source/cmIDEOptions.h b/Source/cmIDEOptions.h
index fac7d4e828..df0f82e9b2 100644
--- a/Source/cmIDEOptions.h
+++ b/Source/cmIDEOptions.h
@@ -12,6 +12,8 @@
 #ifndef cmIDEOptions_h
 #define cmIDEOptions_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include "cmIDEFlagTable.h"
diff --git a/Source/cmInstallCommandArguments.h b/Source/cmInstallCommandArguments.h
index 6ccb3e8684..2ef421fd72 100644
--- a/Source/cmInstallCommandArguments.h
+++ b/Source/cmInstallCommandArguments.h
@@ -13,6 +13,8 @@
 #ifndef cmInstallCommandArguments_h
 #define cmInstallCommandArguments_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include "cmCommandArgumentsHelper.h"
diff --git a/Source/cmLinkedTree.h b/Source/cmLinkedTree.h
index 6b3107444d..466aaa7d7e 100644
--- a/Source/cmLinkedTree.h
+++ b/Source/cmLinkedTree.h
@@ -12,6 +12,8 @@
 #ifndef cmLinkedTree_h
 #define cmLinkedTree_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include <assert.h>
diff --git a/Source/cmListFileCache.h b/Source/cmListFileCache.h
index cd4453680e..08b59ebd57 100644
--- a/Source/cmListFileCache.h
+++ b/Source/cmListFileCache.h
@@ -12,6 +12,8 @@
 #ifndef cmListFileCache_h
 #define cmListFileCache_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include "cmState.h"
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index fa4bb3065e..f7a4074f3e 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -12,6 +12,8 @@
 #ifndef cmLocalGenerator_h
 #define cmLocalGenerator_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include "cmOutputConverter.h"
diff --git a/Source/cmLocale.h b/Source/cmLocale.h
index f922c03419..f9bc45827e 100644
--- a/Source/cmLocale.h
+++ b/Source/cmLocale.h
@@ -12,6 +12,8 @@
 #ifndef cmLocale_h
 #define cmLocale_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include <locale.h>
diff --git a/Source/cmNinjaTypes.h b/Source/cmNinjaTypes.h
index 82a52202f9..d3816bb44e 100644
--- a/Source/cmNinjaTypes.h
+++ b/Source/cmNinjaTypes.h
@@ -13,6 +13,8 @@
 #ifndef cmNinjaTypes_h
 #define cmNinjaTypes_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 typedef std::vector<std::string> cmNinjaDeps;
diff --git a/Source/cmOSXBundleGenerator.h b/Source/cmOSXBundleGenerator.h
index 55a3c756ff..2dc1e4a441 100644
--- a/Source/cmOSXBundleGenerator.h
+++ b/Source/cmOSXBundleGenerator.h
@@ -12,6 +12,8 @@
 #ifndef cmOSXBundleGenerator_h
 #define cmOSXBundleGenerator_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include "cmSourceFile.h"
diff --git a/Source/cmObject.h b/Source/cmObject.h
index d883c52168..cb683f6853 100644
--- a/Source/cmObject.h
+++ b/Source/cmObject.h
@@ -12,6 +12,8 @@
 #ifndef cmObject_h
 #define cmObject_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 /** \class cmObject
diff --git a/Source/cmOrderDirectories.h b/Source/cmOrderDirectories.h
index 38e197c951..13823a18bd 100644
--- a/Source/cmOrderDirectories.h
+++ b/Source/cmOrderDirectories.h
@@ -12,6 +12,8 @@
 #ifndef cmOrderDirectories_h
 #define cmOrderDirectories_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include <cmsys/RegularExpression.hxx>
diff --git a/Source/cmOutputConverter.h b/Source/cmOutputConverter.h
index 9af96590ee..02468c83ab 100644
--- a/Source/cmOutputConverter.h
+++ b/Source/cmOutputConverter.h
@@ -12,6 +12,8 @@
 #ifndef cmOutputConverter_h
 #define cmOutputConverter_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include "cmGlobalGenerator.h"
diff --git a/Source/cmPathLabel.h b/Source/cmPathLabel.h
index 39fbec3d47..e06511093b 100644
--- a/Source/cmPathLabel.h
+++ b/Source/cmPathLabel.h
@@ -12,6 +12,8 @@
 #ifndef cmPathLabel_h
 #define cmPathLabel_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 /** \class cmPathLabel
diff --git a/Source/cmQtAutoGeneratorInitializer.h b/Source/cmQtAutoGeneratorInitializer.h
index b411597f7f..c5a7aba723 100644
--- a/Source/cmQtAutoGeneratorInitializer.h
+++ b/Source/cmQtAutoGeneratorInitializer.h
@@ -14,6 +14,8 @@
 #ifndef cmQtAutoGeneratorInitializer_h
 #define cmQtAutoGeneratorInitializer_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include <map>
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index fab2d1934b..ba439d462c 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -14,6 +14,8 @@
 #ifndef cmQtAutoGenerators_h
 #define cmQtAutoGenerators_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include <list>
diff --git a/Source/cmRST.h b/Source/cmRST.h
index 0e379b60d2..895901a7c9 100644
--- a/Source/cmRST.h
+++ b/Source/cmRST.h
@@ -12,6 +12,8 @@
 #ifndef _cmRST_h
 #define _cmRST_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include <cmsys/RegularExpression.hxx>
diff --git a/Source/cmScriptGenerator.h b/Source/cmScriptGenerator.h
index ef0766f6d1..4f4dd9ed6b 100644
--- a/Source/cmScriptGenerator.h
+++ b/Source/cmScriptGenerator.h
@@ -12,6 +12,8 @@
 #ifndef cmScriptGenerator_h
 #define cmScriptGenerator_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 class cmScriptGeneratorIndent
diff --git a/Source/cmSearchPath.h b/Source/cmSearchPath.h
index 65f703fe78..7624d03f51 100644
--- a/Source/cmSearchPath.h
+++ b/Source/cmSearchPath.h
@@ -12,6 +12,8 @@
 #ifndef cmSearchPath_h
 #define cmSearchPath_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 class cmFindCommon;
diff --git a/Source/cmSourceFileLocation.h b/Source/cmSourceFileLocation.h
index 79891732f3..d41f2bdfb9 100644
--- a/Source/cmSourceFileLocation.h
+++ b/Source/cmSourceFileLocation.h
@@ -12,6 +12,8 @@
 #ifndef cmSourceFileLocation_h
 #define cmSourceFileLocation_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 class cmMakefile;
diff --git a/Source/cmSourceGroup.h b/Source/cmSourceGroup.h
index 1f5232e604..c7f093f20f 100644
--- a/Source/cmSourceGroup.h
+++ b/Source/cmSourceGroup.h
@@ -12,6 +12,8 @@
 #ifndef cmSourceGroup_h
 #define cmSourceGroup_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include <cmsys/RegularExpression.hxx>
diff --git a/Source/cmTargetDepend.h b/Source/cmTargetDepend.h
index 954d8f622c..f30705dfdf 100644
--- a/Source/cmTargetDepend.h
+++ b/Source/cmTargetDepend.h
@@ -12,6 +12,8 @@
 #ifndef cmTargetDepend_h
 #define cmTargetDepend_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 class cmGeneratorTarget;
diff --git a/Source/cmTargetExport.h b/Source/cmTargetExport.h
index 2781337fe7..b3882c4323 100644
--- a/Source/cmTargetExport.h
+++ b/Source/cmTargetExport.h
@@ -12,6 +12,8 @@
 #ifndef cmTargetExport_h
 #define cmTargetExport_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 class cmGeneratorTarget;
diff --git a/Source/cmTimestamp.h b/Source/cmTimestamp.h
index 77e1f7ac14..3a72caaaa5 100644
--- a/Source/cmTimestamp.h
+++ b/Source/cmTimestamp.h
@@ -12,6 +12,8 @@
 #ifndef cmTimestamp_h
 #define cmTimestamp_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include <string>
diff --git a/Source/cmVisualStudio10TargetGenerator.h b/Source/cmVisualStudio10TargetGenerator.h
index 109a10040e..72a70dfebe 100644
--- a/Source/cmVisualStudio10TargetGenerator.h
+++ b/Source/cmVisualStudio10TargetGenerator.h
@@ -12,6 +12,8 @@
 #ifndef cmVisualStudioTargetGenerator_h
 #define cmVisualStudioTargetGenerator_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 class cmMakefile;
diff --git a/Source/cmVisualStudioSlnData.h b/Source/cmVisualStudioSlnData.h
index 4508370717..982b976323 100644
--- a/Source/cmVisualStudioSlnData.h
+++ b/Source/cmVisualStudioSlnData.h
@@ -12,6 +12,8 @@
 #ifndef cmVisualStudioSlnData_h
 #define cmVisualStudioSlnData_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 class cmSlnProjectEntry
diff --git a/Source/cmVisualStudioSlnParser.h b/Source/cmVisualStudioSlnParser.h
index b9f8a92482..62fd93699c 100644
--- a/Source/cmVisualStudioSlnParser.h
+++ b/Source/cmVisualStudioSlnParser.h
@@ -12,6 +12,8 @@
 #ifndef cmVisualStudioSlnParser_h
 #define cmVisualStudioSlnParser_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include <bitset>
diff --git a/Source/cmVisualStudioWCEPlatformParser.h b/Source/cmVisualStudioWCEPlatformParser.h
index 2b20eba935..ca58a9af1d 100644
--- a/Source/cmVisualStudioWCEPlatformParser.h
+++ b/Source/cmVisualStudioWCEPlatformParser.h
@@ -12,6 +12,8 @@
 #ifndef cmVisualStudioWCEPlatformParser_h
 #define cmVisualStudioWCEPlatformParser_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include "cmXMLParser.h"
diff --git a/Source/cmXCodeObject.h b/Source/cmXCodeObject.h
index ed917aff46..a0aa2b773a 100644
--- a/Source/cmXCodeObject.h
+++ b/Source/cmXCodeObject.h
@@ -12,6 +12,8 @@
 #ifndef cmXCodeObject_h
 #define cmXCodeObject_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 class cmGeneratorTarget;
diff --git a/Source/cmake.h b/Source/cmake.h
index dbe936ba44..91a23cdaf3 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -13,6 +13,8 @@
 #ifndef cmake_h
 #define cmake_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 #include "cmCacheManager.h"
diff --git a/Source/cmcmd.h b/Source/cmcmd.h
index 8da2103453..1096d0ce61 100644
--- a/Source/cmcmd.h
+++ b/Source/cmcmd.h
@@ -13,6 +13,8 @@
 #ifndef cmcmd_h
 #define cmcmd_h
 
+#include <cmConfigure.h>
+
 #include "cmStandardIncludes.h"
 
 class cmcmd