Source: Stabilize include order

Each source file has a logical first include file.  Include it in an
isolated block so that tools that sort includes do not move them.

Source/CPack/WiX/cmCPackWIXGenerator.h

@@ -13,11 +13,11 @@
 #ifndef cmCPackWIXGenerator_h
 #define cmCPackWIXGenerator_h
 
+#include <CPack/cmCPackGenerator.h>
+
 #include "cmWIXPatch.h"
 #include "cmWIXShortcut.h"
 
-#include <CPack/cmCPackGenerator.h>
-
 #include <string>
 #include <map>
 

Source/CPack/WiX/cmWIXAccessControlList.h

@@ -13,11 +13,11 @@
 #ifndef cmWIXAccessControlList_h
 #define cmWIXAccessControlList_h
 
+#include "cmWIXSourceWriter.h"
+
 #include <cmInstalledFile.h>
 #include <CPack/cmCPackLog.h>
 
-#include "cmWIXSourceWriter.h"
-
 class cmWIXAccessControlList
 {
 public:

Source/CPack/WiX/cmWIXFeaturesSourceWriter.h

@@ -14,6 +14,7 @@
 #define cmWIXFeaturesSourceWriter_h
 
 #include "cmWIXSourceWriter.h"
+
 #include <CPack/cmCPackGenerator.h>
 
 /** \class cmWIXFeaturesSourceWriter

Source/CPack/WiX/cmWIXFilesSourceWriter.cxx

@@ -11,6 +11,7 @@
 ============================================================================*/
 
 #include "cmWIXFilesSourceWriter.h"
+
 #include "cmWIXAccessControlList.h"
 
 #include <cmInstalledFile.h>

Source/CPack/WiX/cmWIXFilesSourceWriter.h

@@ -14,6 +14,7 @@
 #define cmWIXFilesSourceWriter_h
 
 #include "cmWIXSourceWriter.h"
+
 #include "cmWIXShortcut.h"
 #include "cmWIXPatch.h"
 

Source/CPack/WiX/cmWIXPatchParser.h

@@ -13,10 +13,10 @@
 #ifndef cmCPackWIXPatchParser_h
 #define cmCPackWIXPatchParser_h
 
-#include <cmXMLParser.h>
-
 #include <CPack/cmCPackLog.h>
 
+#include <cmXMLParser.h>
+
 #include <map>
 #include <list>
 

Source/CPack/WiX/cmWIXRichTextFormatWriter.h

@@ -13,6 +13,8 @@
 #ifndef cmWIXRichTextFormatWriter_h
 #define cmWIXRichTextFormatWriter_h
 
+#include "cmStandardIncludes.h"
+
 #include <cmsys/FStream.hxx>
 
 /** \class cmWIXRichtTextFormatWriter

Source/CPack/WiX/cmWIXShortcut.h

@@ -13,13 +13,13 @@
 #ifndef cmWIXShortcut_h
 #define cmWIXShortcut_h
 
+#include <cmInstalledFile.h>
+
 #include <string>
 #include <map>
 #include <set>
 #include <vector>
 
-#include <cmInstalledFile.h>
-
 class cmWIXFilesSourceWriter;
 
 struct cmWIXShortcut

Source/CPack/WiX/cmWIXSourceWriter.cxx

@@ -10,8 +10,6 @@
   See the License for more information.
 ============================================================================*/
 
-#include "cmStandardIncludes.h"
-
 #include "cmWIXSourceWriter.h"
 
 #include <CPack/cmCPackGenerator.h>

Source/CPack/WiX/cmWIXSourceWriter.h

@@ -13,11 +13,12 @@
 #ifndef cmWIXSourceWriter_h
 #define cmWIXSourceWriter_h
 
-#include <vector>
+#include <CPack/cmCPackLog.h>
-#include <string>
+
 #include <cmsys/FStream.hxx>
 
-#include <CPack/cmCPackLog.h>
+#include <vector>
+#include <string>
 
 /** \class cmWIXSourceWriter
  * \brief Helper class to generate XML WiX source files

Source/CPack/cmCPackArchiveGenerator.h

@@ -13,9 +13,10 @@
 #ifndef cmCPackArchiveGenerator_h
 #define cmCPackArchiveGenerator_h
 
-#include "cmArchiveWrite.h"
 #include "cmCPackGenerator.h"
 
+#include "cmArchiveWrite.h"
+
 
 /** \class cmCPackArchiveGenerator
  * \brief A generator base for libarchive generation.

Source/CPack/cmCPackBundleGenerator.cxx

@@ -11,6 +11,7 @@
 ============================================================================*/
 
 #include "cmCPackBundleGenerator.h"
+
 #include "cmCPackLog.h"
 #include "cmSystemTools.h"
 

Source/CPack/cmCPackComponentGroup.cxx

@@ -11,7 +11,9 @@
 ============================================================================*/
 
 #include "cmCPackComponentGroup.h"
+
 #include "cmSystemTools.h"
+
 #include <vector>
 #include <string>
 

Source/CPack/cmCPackDebGenerator.cxx

@@ -9,6 +9,7 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
+
 #include "cmCPackDebGenerator.h"
 
 #include "cmSystemTools.h"

Source/CPack/cmCPackDebGenerator.h

@@ -13,7 +13,6 @@
 #ifndef cmCPackDebGenerator_h
 #define cmCPackDebGenerator_h
 
-
 #include "cmCPackGenerator.h"
 
 /** \class cmCPackDebGenerator

Source/CPack/cmCPackDragNDropGenerator.cxx

@@ -11,6 +11,7 @@
 ============================================================================*/
 
 #include "cmCPackDragNDropGenerator.h"
+
 #include "cmCPackLog.h"
 #include "cmSystemTools.h"
 #include "cmGeneratedFileStream.h"

Source/CPack/cmCPackGenerator.h

@@ -14,6 +14,7 @@
 #define cmCPackGenerator_h
 
 #include "cmObject.h"
+
 #include "cmSystemTools.h"
 #include <map>
 #include <vector>

Source/CPack/cmCPackNSISGenerator.h

@@ -13,8 +13,8 @@
 #ifndef cmCPackNSISGenerator_h
 #define cmCPackNSISGenerator_h
 
-
 #include "cmCPackGenerator.h"
+
 #include <set>
 
 /** \class cmCPackNSISGenerator

Source/CPack/cmCPackOSXX11Generator.cxx

@@ -9,6 +9,7 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
+
 #include "cmCPackOSXX11Generator.h"
 
 #include "cmake.h"

Source/CPack/cmCPackPackageMakerGenerator.h

@@ -13,7 +13,6 @@
 #ifndef cmCPackPackageMakerGenerator_h
 #define cmCPackPackageMakerGenerator_h
 
-
 #include "cmCPackGenerator.h"
 
 class cmCPackComponent;

Source/CPack/cmCPackRPMGenerator.cxx

@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmCPackRPMGenerator.h"
+
 #include "cmCPackLog.h"
 #include "cmSystemTools.h"
 

Source/CPack/cmCPackRPMGenerator.h

@@ -13,7 +13,6 @@
 #ifndef cmCPackRPMGenerator_h
 #define cmCPackRPMGenerator_h
 
-
 #include "cmCPackGenerator.h"
 
 /** \class cmCPackRPMGenerator

Source/CPack/cmCPackSTGZGenerator.h

@@ -13,7 +13,6 @@
 #ifndef cmCPackSTGZGenerator_h
 #define cmCPackSTGZGenerator_h
 
-
 #include "cmCPackTGZGenerator.h"
 
 /** \class cmCPackSTGZGenerator

Source/CPack/cmCPackTarBZip2Generator.cxx

@@ -11,6 +11,7 @@
 ============================================================================*/
 
 #include "cmCPackTarBZip2Generator.h"
+
 //----------------------------------------------------------------------
 cmCPackTarBZip2Generator::cmCPackTarBZip2Generator()
  :cmCPackArchiveGenerator(cmArchiveWrite::CompressBZip2,

Source/CTest/cmCTestBatchTestHandler.cxx

@@ -11,6 +11,7 @@
 ============================================================================*/
 
 #include "cmCTestBatchTestHandler.h"
+
 #include "cmProcess.h"
 #include "cmStandardIncludes.h"
 #include "cmCTest.h"

Source/CTest/cmCTestBatchTestHandler.h

@@ -14,6 +14,7 @@
 #define cmCTestBatchTestHandler_h
 
 #include <cmStandardIncludes.h>
+
 #include <cmCTestTestHandler.h>
 #include <cmCTestMultiProcessHandler.h>
 #include <cmCTestRunTest.h>

Source/CTest/cmCTestBuildHandler.h

@@ -13,8 +13,8 @@
 #ifndef cmCTestBuildHandler_h
 #define cmCTestBuildHandler_h
 
-
 #include "cmCTestGenericHandler.h"
+
 #include "cmListFileCache.h"
 
 #include <cmsys/RegularExpression.hxx>

Source/CTest/cmCTestConfigureHandler.h

@@ -13,8 +13,8 @@
 #ifndef cmCTestConfigureHandler_h
 #define cmCTestConfigureHandler_h
 
-
 #include "cmCTestGenericHandler.h"
+
 #include "cmListFileCache.h"
 
 /** \class cmCTestConfigureHandler

Source/CTest/cmCTestCoverageHandler.cxx

@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmCTestCoverageHandler.h"
+
 #include "cmParsePHPCoverage.h"
 #include "cmParseCoberturaCoverage.h"
 #include "cmParseGTMCoverage.h"

Source/CTest/cmCTestCoverageHandler.h

@@ -13,8 +13,8 @@
 #ifndef cmCTestCoverageHandler_h
 #define cmCTestCoverageHandler_h
 
-
 #include "cmCTestGenericHandler.h"
+
 #include "cmListFileCache.h"
 
 #include <cmsys/RegularExpression.hxx>

Source/CTest/cmCTestGenericHandler.cxx

@@ -11,6 +11,7 @@
 ============================================================================*/
 
 #include "cmCTestGenericHandler.h"
+
 #include "cmSystemTools.h"
 
 #include "cmCTest.h"

Source/CTest/cmCTestGenericHandler.h

@@ -13,8 +13,8 @@
 #ifndef cmCTestGenericHandler_h
 #define cmCTestGenericHandler_h
 
-
 #include "cmObject.h"
+
 #include "cmCTest.h"
 #include "cmSystemTools.h" //OutputOption
 

Source/CTest/cmCTestLaunch.h

@@ -13,6 +13,7 @@
 #define cmCTestLaunch_h
 
 #include "cmStandardIncludes.h"
+
 #include <cmsys/RegularExpression.hxx>
 
 class cmXMLWriter;

Source/CTest/cmCTestMemCheckHandler.cxx

@@ -11,6 +11,7 @@
 ============================================================================*/
 
 #include "cmCTestMemCheckHandler.h"
+
 #include "cmXMLParser.h"
 #include "cmCTest.h"
 #include "cmake.h"

Source/CTest/cmCTestMemCheckHandler.h

@@ -13,9 +13,8 @@
 #ifndef cmCTestMemCheckHandler_h
 #define cmCTestMemCheckHandler_h
 
-
 #include "cmCTestTestHandler.h"
-#include "cmStandardIncludes.h"
+
 #include "cmListFileCache.h"
 #include <vector>
 #include <string>

Source/CTest/cmCTestMultiProcessHandler.cxx

@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmCTestMultiProcessHandler.h"
+
 #include "cmProcess.h"
 #include "cmStandardIncludes.h"
 #include "cmCTest.h"

Source/CTest/cmCTestMultiProcessHandler.h

@@ -12,8 +12,8 @@
 #ifndef cmCTestMultiProcessHandler_h
 #define cmCTestMultiProcessHandler_h
 
-#include <cmStandardIncludes.h>
 #include <cmCTestTestHandler.h>
+
 #include <cmCTestRunTest.h>
 
 /** \class cmCTestMultiProcessHandler

Source/CTest/cmCTestP4.h

@@ -13,6 +13,7 @@
 #define cmCTestP4_h
 
 #include "cmCTestGlobalVC.h"
+
 #include <vector>
 #include <map>
 

Source/CTest/cmCTestReadCustomFilesCommand.cxx

@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmCTestReadCustomFilesCommand.h"
+
 #include "cmCTest.h"
 
 bool cmCTestReadCustomFilesCommand

Source/CTest/cmCTestRunTest.cxx

@@ -11,6 +11,7 @@
 ============================================================================*/
 
 #include "cmCTestRunTest.h"
+
 #include "cmCTestMemCheckHandler.h"
 #include "cmCTest.h"
 #include "cmSystemTools.h"

Source/CTest/cmCTestRunTest.h

@@ -12,8 +12,8 @@
 #ifndef cmCTestRunTest_h
 #define cmCTestRunTest_h
 
-#include <cmStandardIncludes.h>
 #include <cmCTestTestHandler.h>
+
 #include <cmProcess.h>
 
 /** \class cmRunTest

Source/CTest/cmCTestScriptHandler.h

@@ -13,8 +13,8 @@
 #ifndef cmCTestScriptHandler_h
 #define cmCTestScriptHandler_h
 
-
 #include "cmCTestGenericHandler.h"
+
 #include "cmListFileCache.h"
 
 class cmMakefile;

Source/CTest/cmCTestSubmitCommand.h

@@ -13,6 +13,7 @@
 #define cmCTestSubmitCommand_h
 
 #include "cmCTestHandlerCommand.h"
+
 #include "cmCTest.h"
 
 /** \class cmCTestSubmit

Source/CTest/cmCTestSubmitHandler.cxx

@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmCTestSubmitHandler.h"
+
 #include "cmCTestScriptHandler.h"
 #include "cmake.h"
 #include "cmSystemTools.h"

Source/CTest/cmCTestTestHandler.cxx

@@ -11,6 +11,7 @@
 ============================================================================*/
 
 #include "cmCTestTestHandler.h"
+
 #include "cmCTestMultiProcessHandler.h"
 #include "cmCTestBatchTestHandler.h"
 #include "cmCTest.h"

Source/CTest/cmCTestTestHandler.h

@@ -13,8 +13,8 @@
 #ifndef cmCTestTestHandler_h
 #define cmCTestTestHandler_h
 
-
 #include "cmCTestGenericHandler.h"
+
 #include <cmsys/RegularExpression.hxx>
 
 class cmMakefile;

Source/CTest/cmCTestUpdateHandler.h

@@ -13,8 +13,8 @@
 #ifndef cmCTestUpdateHandler_h
 #define cmCTestUpdateHandler_h
 
-
 #include "cmCTestGenericHandler.h"
+
 #include "cmListFileCache.h"
 
 /** \class cmCTestUpdateHandler

Source/CTest/cmCTestUploadCommand.h

@@ -13,6 +13,7 @@
 #define cmCTestUploadCommand_h
 
 #include "cmCTestHandlerCommand.h"
+
 #include "cmCTest.h"
 
 /** \class cmCTestUpload

Source/CTest/cmParseBlanketJSCoverage.cxx

@@ -9,11 +9,11 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#include "cmStandardIncludes.h"
+#include "cmParseBlanketJSCoverage.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include "cmSystemTools.h"
-#include "cmParseBlanketJSCoverage.h"
 #include <cmsys/Directory.hxx>
 #include <cmsys/Glob.hxx>
 #include <cmsys/FStream.hxx>

Source/CTest/cmParseBlanketJSCoverage.h

@@ -13,7 +13,6 @@
 #ifndef cmParseBlanketJSCoverage_h
 #define cmParseBlanketJSCoverage_h
 
-#include "cmStandardIncludes.h"
 #include "cmCTestCoverageHandler.h"
 
 

Source/CTest/cmParseCacheCoverage.cxx

@@ -1,8 +1,8 @@
-#include "cmStandardIncludes.h"
+#include "cmParseCacheCoverage.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include "cmSystemTools.h"
-#include "cmParseCacheCoverage.h"
 #include <cmsys/Directory.hxx>
 #include <cmsys/Glob.hxx>
 #include <cmsys/FStream.hxx>

Source/CTest/cmParseCoberturaCoverage.cxx

@@ -1,7 +1,7 @@
-#include "cmStandardIncludes.h"
+#include "cmParseCoberturaCoverage.h"
+
 #include "cmSystemTools.h"
 #include "cmXMLParser.h"
-#include "cmParseCoberturaCoverage.h"
 #include <cmsys/Directory.hxx>
 #include <cmsys/FStream.hxx>
 

Source/CTest/cmParseCoberturaCoverage.h

@@ -13,7 +13,6 @@
 #ifndef cmParseCoberturaCoverage_h
 #define cmParseCoberturaCoverage_h
 
-#include "cmStandardIncludes.h"
 #include "cmCTestCoverageHandler.h"
 
 /** \class cmParsePythonCoverage

Source/CTest/cmParseDelphiCoverage.cxx

@@ -1,9 +1,9 @@
-#include "cmStandardIncludes.h"
+#include "cmParseDelphiCoverage.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include "cmSystemTools.h"
 #include "cmXMLParser.h"
-#include "cmParseDelphiCoverage.h"
 #include <cmsys/Directory.hxx>
 #include <cmsys/Glob.hxx>
 #include <cmsys/FStream.hxx>

Source/CTest/cmParseDelphiCoverage.h

@@ -13,7 +13,6 @@
 #ifndef cmParseDelphiCoverage_h
 #define cmParseDelphiCoverage_h
 
-#include "cmStandardIncludes.h"
 #include "cmCTestCoverageHandler.h"
 
 

Source/CTest/cmParseGTMCoverage.cxx

@@ -1,8 +1,8 @@
-#include "cmStandardIncludes.h"
+#include "cmParseGTMCoverage.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include "cmSystemTools.h"
-#include "cmParseGTMCoverage.h"
 #include <cmsys/Directory.hxx>
 #include <cmsys/Glob.hxx>
 #include <cmsys/FStream.hxx>

Source/CTest/cmParseJacocoCoverage.cxx

@@ -1,9 +1,9 @@
-#include "cmStandardIncludes.h"
+#include "cmParseJacocoCoverage.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include "cmSystemTools.h"
 #include "cmXMLParser.h"
-#include "cmParseJacocoCoverage.h"
 #include <cmsys/Directory.hxx>
 #include <cmsys/Glob.hxx>
 #include <cmsys/FStream.hxx>

Source/CTest/cmParseJacocoCoverage.h

@@ -13,7 +13,6 @@
 #ifndef cmParseJacocoCoverage_h
 #define cmParseJacocoCoverage_h
 
-#include "cmStandardIncludes.h"
 #include "cmCTestCoverageHandler.h"
 
 

Source/CTest/cmParseMumpsCoverage.cxx

@@ -1,8 +1,8 @@
-#include "cmStandardIncludes.h"
+#include "cmParseGTMCoverage.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include "cmSystemTools.h"
-#include "cmParseGTMCoverage.h"
 #include <cmsys/Directory.hxx>
 #include <cmsys/Glob.hxx>
 #include <cmsys/FStream.hxx>

Source/CTest/cmParseMumpsCoverage.h

@@ -13,7 +13,6 @@
 #ifndef cmParseMumpsCoverage_h
 #define cmParseMumpsCoverage_h
 
-#include "cmStandardIncludes.h"
 #include "cmCTestCoverageHandler.h"
 
 /** \class cmParseMumpsCoverage

Source/CTest/cmParsePHPCoverage.cxx

@@ -1,6 +1,6 @@
-#include "cmStandardIncludes.h"
-#include "cmSystemTools.h"
 #include "cmParsePHPCoverage.h"
+
+#include "cmSystemTools.h"
 #include <cmsys/Directory.hxx>
 #include <cmsys/FStream.hxx>
 

Source/CTest/cmParsePHPCoverage.h

@@ -13,7 +13,6 @@
 #ifndef cmParsePHPCoverage_h
 #define cmParsePHPCoverage_h
 
-#include "cmStandardIncludes.h"
 #include "cmCTestCoverageHandler.h"
 
 /** \class cmParsePHPCoverage

Source/CTest/cmProcess.cxx

@@ -11,6 +11,7 @@
 ============================================================================*/
 
 #include <cmProcess.h>
+
 #include <cmSystemTools.h>
 
 cmProcess::cmProcess()

Source/CTest/cmProcess.h

@@ -12,8 +12,8 @@
 #ifndef cmProcess_h
 #define cmProcess_h
 
-
 #include "cmStandardIncludes.h"
+
 #include <cmsys/Process.h>
 
 

Source/CursesDialog/ccmake.cxx

@@ -9,6 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
+#include "cmCursesStandardIncludes.h"
+
 #include "../cmSystemTools.h"
 #include "../cmake.h"
 #include "../cmDocumentation.h"
@@ -17,7 +19,6 @@
 #include <sys/ioctl.h>
 
 #include "cmCursesMainForm.h"
-#include "cmCursesStandardIncludes.h"
 #include <cmsys/Encoding.hxx>
 
 #include <form.h>

Source/CursesDialog/cmCursesBoolWidget.cxx

@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmCursesBoolWidget.h"
+
 #include "cmCursesMainForm.h"
 
 cmCursesBoolWidget::cmCursesBoolWidget(int width, int height,

Source/CursesDialog/cmCursesBoolWidget.h

@@ -13,6 +13,7 @@
 #define cmCursesBoolWidget_h
 
 #include "cmCursesWidget.h"
+
 class cmCursesMainForm;
 
 class cmCursesBoolWidget : public cmCursesWidget

Source/CursesDialog/cmCursesCacheEntryComposite.cxx

@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmCursesCacheEntryComposite.h"
+
 #include "cmCursesOptionsWidget.h"
 #include "cmCursesStringWidget.h"
 #include "cmCursesLabelWidget.h"

Source/CursesDialog/cmCursesForm.h

@@ -12,8 +12,8 @@
 #ifndef cmCursesForm_h
 #define cmCursesForm_h
 
-#include "../cmStandardIncludes.h"
 #include "cmCursesStandardIncludes.h"
+
 #include <cmsys/FStream.hxx>
 
 class cmCursesForm

Source/CursesDialog/cmCursesLabelWidget.h

@@ -13,7 +13,6 @@
 #define cmCursesLabelWidget_h
 
 #include "cmCursesWidget.h"
-#include "cmCursesStandardIncludes.h"
 
 class cmCursesMainForm;
 

Source/CursesDialog/cmCursesLongMessageForm.cxx

@@ -9,10 +9,11 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
+#include "cmCursesLongMessageForm.h"
+
 #include "../cmSystemTools.h"
 #include "../cmake.h"
 #include "../cmVersion.h"
-#include "cmCursesLongMessageForm.h"
 #include "cmCursesMainForm.h"
 
 inline int ctrl(int z)

Source/CursesDialog/cmCursesLongMessageForm.h

@@ -12,10 +12,10 @@
 #ifndef cmCursesLongMessageForm_h
 #define cmCursesLongMessageForm_h
 
-#include "../cmStandardIncludes.h"
-#include "cmCursesForm.h"
 #include "cmCursesStandardIncludes.h"
 
+#include "cmCursesForm.h"
+
 class cmCursesCacheEntryComposite;
 
 class cmCursesLongMessageForm : public cmCursesForm

Source/CursesDialog/cmCursesMainForm.cxx

@@ -9,10 +9,11 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
+#include "cmCursesMainForm.h"
+
 #include "../cmSystemTools.h"
 #include "../cmVersion.h"
 #include "../cmake.h"
-#include "cmCursesMainForm.h"
 #include "cmCursesStringWidget.h"
 #include "cmCursesLabelWidget.h"
 #include "cmCursesBoolWidget.h"

Source/CursesDialog/cmCursesMainForm.h

@@ -12,10 +12,10 @@
 #ifndef cmCursesMainForm_h
 #define cmCursesMainForm_h
 
-#include "../cmStandardIncludes.h"
+#include "cmCursesStandardIncludes.h"
+
 #include "../cmState.h"
 #include "cmCursesForm.h"
-#include "cmCursesStandardIncludes.h"
 
 class cmCursesCacheEntryComposite;
 class cmCursesWidget;

Source/CursesDialog/cmCursesOptionsWidget.cxx

@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmCursesOptionsWidget.h"
+
 #include "cmCursesMainForm.h"
 
 inline int ctrl(int z)

Source/CursesDialog/cmCursesOptionsWidget.h

@@ -13,6 +13,7 @@
 #define cmCursesOptionsWidget_h
 
 #include "cmCursesWidget.h"
+
 class cmCursesMainForm;
 
 class cmCursesOptionsWidget : public cmCursesWidget

Source/CursesDialog/cmCursesStandardIncludes.h

@@ -11,6 +11,9 @@
 ============================================================================*/
 #ifndef cmCursesStandardIncludes_h
 #define cmCursesStandardIncludes_h
+
+#include "../cmStandardIncludes.h"
+
 #if defined(__sun__) && defined(__GNUC__)
  #define _MSE_INT_H
 #endif

Source/CursesDialog/cmCursesStringWidget.cxx

@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmCursesStringWidget.h"
+
 #include "cmCursesMainForm.h"
 
 inline int ctrl(int z)

Source/CursesDialog/cmCursesWidget.h

@@ -12,9 +12,10 @@
 #ifndef cmCursesWidget_h
 #define cmCursesWidget_h
 
-#include "../cmState.h"
 #include "cmCursesStandardIncludes.h"
 
+#include "../cmState.h"
+
 class cmCursesMainForm;
 
 class cmCursesWidget

Source/QtDialog/AddCacheEntry.cxx

@@ -11,6 +11,7 @@
 ============================================================================*/
 
 #include "AddCacheEntry.h"
+
 #include <QMetaProperty>
 #include <QCompleter>
 

Source/QtDialog/AddCacheEntry.h

@@ -13,11 +13,12 @@
 #ifndef AddCacheEntry_h
 #define AddCacheEntry_h
 
+#include "QCMake.h"
+
 #include <QWidget>
 #include <QCheckBox>
 #include <QStringList>
 
-#include "QCMake.h"
 #include "ui_AddCacheEntry.h"
 
 class AddCacheEntry : public QWidget, public Ui::AddCacheEntry

Source/QtDialog/CMakeSetup.cxx

@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "QCMake.h"  // include to disable MS warnings
+
 #include <QApplication>
 #include <QDir>
 #include <QTranslator>

Source/QtDialog/CMakeSetupDialog.cxx

@@ -11,6 +11,7 @@
 ============================================================================*/
 
 #include "CMakeSetupDialog.h"
+
 #include <QFileDialog>
 #include <QProgressBar>
 #include <QMessageBox>

Source/QtDialog/CMakeSetupDialog.h

@@ -14,6 +14,7 @@
 #define CMakeSetupDialog_h
 
 #include "QCMake.h"
+
 #include <QMainWindow>
 #include <QThread>
 #include <QEventLoop>

Source/QtDialog/Compilers.h

@@ -4,6 +4,7 @@
 #define COMPILERS_HPP
 
 #include <QWidget>
+
 #include <ui_Compilers.h>
 
 class Compilers : public QWidget, public Ui::Compilers

Source/QtDialog/FirstConfigure.cxx

@@ -1,5 +1,6 @@
 
 #include "FirstConfigure.h"
+
 #include "Compilers.h"
 
 #include <QSettings>

Source/QtDialog/FirstConfigure.h

@@ -4,7 +4,9 @@
 
 #include <QWizard>
 #include <QWizardPage>
+
 #include "cmake.h"
+
 #include "ui_Compilers.h"
 #include "ui_CrossCompiler.h"
 

Source/QtDialog/QCMake.h

@@ -12,6 +12,9 @@
 
 #ifndef QCMake_h
 #define QCMake_h
+
+#include "cmake.h"
+
 #ifdef _MSC_VER
 #pragma warning ( disable : 4127 )
 #pragma warning ( disable : 4512 )
@@ -27,8 +30,6 @@
 #include <QMetaType>
 #include <QAtomicInt>
 
-#include "cmake.h"
-
 /// struct to represent cmake properties in Qt
 /// Value is of type String or Bool
 struct QCMakeProperty

Source/QtDialog/QCMakeCacheView.h

@@ -14,6 +14,7 @@
 #define QCMakeCacheView_h
 
 #include "QCMake.h"
+
 #include <QTreeView>
 #include <QSet>
 #include <QStandardItemModel>

Source/QtDialog/QCMakeWidgets.h

@@ -16,6 +16,7 @@
 #include <QLineEdit>
 #include <QComboBox>
 #include <QCompleter>
+
 class QToolButton;
 
 // common widgets for Qt based CMake

Source/cmAddDependenciesCommand.cxx

@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmAddDependenciesCommand.h"
+
 #include "cmGlobalGenerator.h"
 
 // cmDependenciesCommand

Source/cmAuxSourceDirectoryCommand.cxx

@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmAuxSourceDirectoryCommand.h"
+
 #include "cmSourceFile.h"
 
 #include <cmsys/Directory.hxx>

Source/cmCPluginAPI.cxx

@@ -14,8 +14,9 @@
    these routines just manipulate arguments and then call the associated
    methods on the CMake classes. */
 
-#include "cmMakefile.h"
 #include "cmCPluginAPI.h"
+
+#include "cmMakefile.h"
 #include "cmVersion.h"
 
 #include "cmSourceFile.h"

Source/cmCTest.cxx

@@ -12,6 +12,7 @@
 #include "cmCurl.h" // include before anything that includes windows.h
 
 #include "cmCTest.h"
+
 #include "cmake.h"
 #include "cmMakefile.h"
 #include "cmGlobalGenerator.h"

Source/cmCTest.h

@@ -14,6 +14,7 @@
 #define cmCTest_h
 
 #include "cmStandardIncludes.h"
+
 #include "cmListFileCache.h"
 #include <time.h>
 

Source/cmCacheManager.cxx

@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-
 #include "cmCacheManager.h"
+
 #include "cmSystemTools.h"
 #include "cmGeneratedFileStream.h"
 #include "cmake.h"

Source/cmCacheManager.h

@@ -13,6 +13,7 @@
 #define cmCacheManager_h
 
 #include "cmStandardIncludes.h"
+
 #include "cmPropertyMap.h"
 #include "cmState.h"
 

Source/cmCallVisualStudioMacro.cxx

@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-
 #include "cmCallVisualStudioMacro.h"
+
 #include "cmSystemTools.h"
 
 

Source/cmCommand.h

@@ -13,6 +13,7 @@
 #define cmCommand_h
 
 #include "cmObject.h"
+
 #include "cmListFileCache.h"
 #include "cmMakefile.h"
 #include "cmCommandArgumentsHelper.h"

Source/cmCommands.h

@@ -11,6 +11,7 @@
 ============================================================================*/
 #ifndef cmCommands_h
 #define cmCommands_h
+
 #include "cmStandardIncludes.h"
 
 #include <vector>