Format include directive blocks and ordering with clang-format

Sort include directives within each block (separated by a blank line) in
lexicographic order (except to prioritize `sys/types.h` first).  First
run `clang-format` with the config file:

    ---
    SortIncludes: false
    ...

Commit the result temporarily.  Then run `clang-format` again with:

    ---
    SortIncludes: true
    IncludeCategories:
      - Regex:    'sys/types.h'
        Priority: -1
    ...

Commit the result temporarily.  Start a new branch and cherry-pick the
second commit.  Manually resolve conflicts to preserve indentation of
re-ordered includes.  This cleans up the include ordering without
changing any other style.

Use the following command to run `clang-format`:

    $ git ls-files -z -- \
        '*.c' '*.cc' '*.cpp' '*.cxx' '*.h' '*.hh' '*.hpp' '*.hxx' |
      egrep -z -v '(Lexer|Parser|ParserHelper)\.' |
      egrep -z -v '^Source/cm_sha2' |
      egrep -z -v '^Source/(kwsys|CursesDialog/form)/' |
      egrep -z -v '^Utilities/(KW|cm).*/' |
      egrep -z -v '^Tests/Module/GenerateExportHeader' |
      egrep -z -v '^Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h' |
      xargs -0 clang-format -i

This selects source files that do not come from a third-party.

Inspired-by: Daniel Pfeifer <[email protected]>

Modules/CheckForPthreads.c

@@ -1,5 +1,5 @@
-#include <stdio.h>
 #include <pthread.h>
+#include <stdio.h>
 #include <unistd.h>
 
 void* runner(void*);

Source/CPack/IFW/cmCPackIFWGenerator.cxx

@@ -12,24 +12,24 @@
 
 #include "cmCPackIFWGenerator.h"
 
-#include "cmCPackIFWPackage.h"
 #include "cmCPackIFWInstaller.h"
+#include "cmCPackIFWPackage.h"
 
-#include <CPack/cmCPackLog.h>
 #include <CPack/cmCPackComponentGroup.h>
+#include <CPack/cmCPackLog.h>
 
-#include <cmsys/SystemTools.hxx>
-#include <cmsys/Glob.hxx>
 #include <cmsys/Directory.hxx>
+#include <cmsys/Glob.hxx>
 #include <cmsys/RegularExpression.hxx>
+#include <cmsys/SystemTools.hxx>
 
+#include <cmGeneratedFileStream.h>
 #include <cmGlobalGenerator.h>
-#include <cmSystemTools.h>
 #include <cmMakefile.h>
-#include <cmGeneratedFileStream.h>
-#include <cmXMLWriter.h>
-#include <cmVersionConfig.h>
+#include <cmSystemTools.h>
 #include <cmTimestamp.h>
+#include <cmVersionConfig.h>
+#include <cmXMLWriter.h>
 
 //----------------------------------------------------------------------------
 cmCPackIFWGenerator::cmCPackIFWGenerator()

Source/CPack/IFW/cmCPackIFWGenerator.h

@@ -15,8 +15,8 @@
 
 #include <CPack/cmCPackGenerator.h>
 
-#include "cmCPackIFWPackage.h"
 #include "cmCPackIFWInstaller.h"
+#include "cmCPackIFWPackage.h"
 
 class cmXMLWriter;
 

Source/CPack/OSXScriptLauncher.cxx

@@ -9,9 +9,9 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#include <cmsys/SystemTools.hxx>
-#include <cmsys/Process.h>
 #include <cmsys/FStream.hxx>
+#include <cmsys/Process.h>
+#include <cmsys/SystemTools.hxx>
 
 #include <iostream>
 

Source/CPack/WiX/cmCPackWIXGenerator.cxx

@@ -12,23 +12,23 @@
 
 #include "cmCPackWIXGenerator.h"
 
-#include <cmSystemTools.h>
-#include <cmGeneratedFileStream.h>
+#include <CPack/cmCPackComponentGroup.h>
+#include <CPack/cmCPackLog.h>
 #include <cmCryptoHash.h>
+#include <cmGeneratedFileStream.h>
 #include <cmInstalledFile.h>
-#include <CPack/cmCPackLog.h>
-#include <CPack/cmCPackComponentGroup.h>
+#include <cmSystemTools.h>
 
-#include "cmWIXSourceWriter.h"
 #include "cmWIXDirectoriesSourceWriter.h"
 #include "cmWIXFeaturesSourceWriter.h"
 #include "cmWIXFilesSourceWriter.h"
 #include "cmWIXRichTextFormatWriter.h"
+#include "cmWIXSourceWriter.h"
 
-#include <cmsys/SystemTools.hxx>
 #include <cmsys/Directory.hxx>
 #include <cmsys/Encoding.hxx>
 #include <cmsys/FStream.hxx>
+#include <cmsys/SystemTools.hxx>
 
 #include <rpc.h> // for GUID generation
 

Source/CPack/WiX/cmCPackWIXGenerator.h

@@ -18,8 +18,8 @@
 #include "cmWIXPatch.h"
 #include "cmWIXShortcut.h"
 
-#include <string>
 #include <map>
+#include <string>
 
 class cmWIXSourceWriter;
 class cmWIXDirectoriesSourceWriter;

Source/CPack/WiX/cmWIXAccessControlList.h

@@ -15,8 +15,8 @@
 
 #include "cmWIXSourceWriter.h"
 
-#include <cmInstalledFile.h>
 #include <CPack/cmCPackLog.h>
+#include <cmInstalledFile.h>
 
 class cmWIXAccessControlList
 {

Source/CPack/WiX/cmWIXFilesSourceWriter.h

@@ -15,8 +15,8 @@
 
 #include "cmWIXSourceWriter.h"
 
-#include "cmWIXShortcut.h"
 #include "cmWIXPatch.h"
+#include "cmWIXShortcut.h"
 
 #include <CPack/cmCPackGenerator.h>
 

Source/CPack/WiX/cmWIXPatch.h

@@ -13,8 +13,8 @@
 #ifndef cmWIXPatch_h
 #define cmWIXPatch_h
 
-#include "cmWIXSourceWriter.h"
 #include "cmWIXPatchParser.h"
+#include "cmWIXSourceWriter.h"
 
 #include <string>
 

Source/CPack/WiX/cmWIXShortcut.h

@@ -15,9 +15,9 @@
 
 #include <cmInstalledFile.h>
 
-#include <string>
 #include <map>
 #include <set>
+#include <string>
 #include <vector>
 
 class cmWIXFilesSourceWriter;

Source/CPack/WiX/cmWIXSourceWriter.h

@@ -17,8 +17,8 @@
 
 #include <cmsys/FStream.hxx>
 
-#include <vector>
 #include <string>
+#include <vector>
 
 /** \class cmWIXSourceWriter
  * \brief Helper class to generate XML WiX source files

Source/CPack/cmCPackArchiveGenerator.cxx

@@ -12,17 +12,17 @@
 
 #include "cmCPackArchiveGenerator.h"
 
-#include "cmake.h"
+#include "cmCPackLog.h"
+#include "cmGeneratedFileStream.h"
 #include "cmGlobalGenerator.h"
-#include "cmSystemTools.h"
 #include "cmMakefile.h"
-#include "cmGeneratedFileStream.h"
-#include "cmCPackLog.h"
+#include "cmSystemTools.h"
+#include "cmake.h"
 #include <errno.h>
 
-#include <cmsys/SystemTools.hxx>
-#include <cmsys/Directory.hxx>
 #include <cm_libarchive.h>
+#include <cmsys/Directory.hxx>
+#include <cmsys/SystemTools.hxx>
 
 //----------------------------------------------------------------------
 cmCPackArchiveGenerator::cmCPackArchiveGenerator(cmArchiveWrite::Compress t,

Source/CPack/cmCPackComponentGroup.cxx

@@ -14,8 +14,8 @@
 
 #include "cmSystemTools.h"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 //----------------------------------------------------------------------
 unsigned long cmCPackComponent::GetInstalledSize(

Source/CPack/cmCPackCygwinBinaryGenerator.cxx

@@ -12,12 +12,12 @@
 
 #include "cmCPackCygwinBinaryGenerator.h"
 
-#include "cmake.h"
+#include "cmCPackLog.h"
+#include "cmGeneratedFileStream.h"
 #include "cmGlobalGenerator.h"
-#include "cmSystemTools.h"
 #include "cmMakefile.h"
-#include "cmGeneratedFileStream.h"
-#include "cmCPackLog.h"
+#include "cmSystemTools.h"
+#include "cmake.h"
 
 #include <cmsys/SystemTools.hxx>
 

Source/CPack/cmCPackCygwinSourceGenerator.cxx

@@ -12,12 +12,12 @@
 
 #include "cmCPackCygwinSourceGenerator.h"
 
-#include "cmake.h"
+#include "cmCPackLog.h"
+#include "cmGeneratedFileStream.h"
 #include "cmGlobalGenerator.h"
-#include "cmSystemTools.h"
 #include "cmMakefile.h"
-#include "cmGeneratedFileStream.h"
-#include "cmCPackLog.h"
+#include "cmSystemTools.h"
+#include "cmake.h"
 
 #include <cmsys/SystemTools.hxx>
 
@@ -25,8 +25,8 @@
 // system tools because it is not implemented robustly enough to move
 // files across directories.
 #ifdef _WIN32
-# include <windows.h>
 # include <sys/stat.h>
+# include <windows.h>
 #endif
 
 //----------------------------------------------------------------------

Source/CPack/cmCPackDebGenerator.cxx

@@ -12,14 +12,14 @@
 
 #include "cmCPackDebGenerator.h"
 
-#include "cmSystemTools.h"
-#include "cmMakefile.h"
-#include "cmGeneratedFileStream.h"
-#include "cmCPackLog.h"
 #include "cmArchiveWrite.h"
+#include "cmCPackLog.h"
+#include "cmGeneratedFileStream.h"
+#include "cmMakefile.h"
+#include "cmSystemTools.h"
 
-#include <cmsys/SystemTools.hxx>
 #include <cmsys/Glob.hxx>
+#include <cmsys/SystemTools.hxx>
 
 #include <limits.h> // USHRT_MAX
 #include <sys/stat.h>
@@ -764,8 +764,8 @@ std::string cmCPackDebGenerator::GetComponentInstallDirNameSuffix(
 #include <sys/stat.h>
 
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 
 #define ARMAG           "!<arch>\n"        /* ar "magic number" */
 #define SARMAG          8                  /* strlen(ARMAG); */

Source/CPack/cmCPackDragNDropGenerator.cxx

@@ -13,11 +13,11 @@
 #include "cmCPackDragNDropGenerator.h"
 
 #include "cmCPackLog.h"
-#include "cmSystemTools.h"
 #include "cmGeneratedFileStream.h"
+#include "cmSystemTools.h"
 
-#include <cmsys/RegularExpression.hxx>
 #include <cmsys/FStream.hxx>
+#include <cmsys/RegularExpression.hxx>
 
 #include <iomanip>
 

Source/CPack/cmCPackGenerator.cxx

@@ -12,18 +12,18 @@
 
 #include "cmCPackGenerator.h"
 
-#include "cmMakefile.h"
+#include "cmCPackComponentGroup.h"
 #include "cmCPackLog.h"
-#include "cmake.h"
-#include "cmGlobalGenerator.h"
 #include "cmGeneratedFileStream.h"
-#include "cmCPackComponentGroup.h"
+#include "cmGlobalGenerator.h"
+#include "cmMakefile.h"
 #include "cmXMLSafe.h"
+#include "cmake.h"
 
-#include <cmsys/SystemTools.hxx>
-#include <cmsys/Glob.hxx>
-#include <cmsys/FStream.hxx>
 #include <algorithm>
+#include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
+#include <cmsys/SystemTools.hxx>
 #include <list>
 
 #if defined(__HAIKU__)

Source/CPack/cmCPackGeneratorFactory.cxx

@@ -12,22 +12,22 @@
 
 #include "cmCPackGeneratorFactory.h"
 
+#include "IFW/cmCPackIFWGenerator.h"
+#include "cmCPack7zGenerator.h"
 #include "cmCPackGenerator.h"
+#include "cmCPackNSISGenerator.h"
+#include "cmCPackSTGZGenerator.h"
 #include "cmCPackTGZGenerator.h"
 #include "cmCPackTXZGenerator.h"
 #include "cmCPackTarBZip2Generator.h"
 #include "cmCPackTarCompressGenerator.h"
 #include "cmCPackZIPGenerator.h"
-#include "cmCPack7zGenerator.h"
-#include "cmCPackSTGZGenerator.h"
-#include "cmCPackNSISGenerator.h"
-#include "IFW/cmCPackIFWGenerator.h"
 
 #ifdef __APPLE__
-#  include "cmCPackDragNDropGenerator.h"
-#  include "cmCPackBundleGenerator.h"
-#  include "cmCPackPackageMakerGenerator.h"
-#  include "cmCPackOSXX11Generator.h"
+#   include "cmCPackBundleGenerator.h"
+#   include "cmCPackDragNDropGenerator.h"
+#   include "cmCPackOSXX11Generator.h"
+#   include "cmCPackPackageMakerGenerator.h"
 #endif
 
 #ifdef __CYGWIN__
@@ -45,8 +45,8 @@
 #  include "WiX/cmCPackWIXGenerator.h"
 #endif
 
-#include "cmCPackLog.h"
 #include "cmAlgorithms.h"
+#include "cmCPackLog.h"
 
 
 //----------------------------------------------------------------------

Source/CPack/cmCPackNSISGenerator.cxx

@@ -12,17 +12,17 @@
 
 #include "cmCPackNSISGenerator.h"
 
+#include "cmCPackComponentGroup.h"
+#include "cmCPackLog.h"
+#include "cmGeneratedFileStream.h"
 #include "cmGlobalGenerator.h"
-#include "cmSystemTools.h"
 #include "cmMakefile.h"
-#include "cmGeneratedFileStream.h"
-#include "cmCPackLog.h"
-#include "cmCPackComponentGroup.h"
+#include "cmSystemTools.h"
 
-#include <cmsys/SystemTools.hxx>
-#include <cmsys/Glob.hxx>
 #include <cmsys/Directory.hxx>
+#include <cmsys/Glob.hxx>
 #include <cmsys/RegularExpression.hxx>
+#include <cmsys/SystemTools.hxx>
 
 /* NSIS uses different command line syntax on Windows and others */
 #ifdef _WIN32

Source/CPack/cmCPackOSXX11Generator.cxx

@@ -12,15 +12,15 @@
 
 #include "cmCPackOSXX11Generator.h"
 
-#include "cmake.h"
+#include "cmCPackLog.h"
+#include "cmGeneratedFileStream.h"
 #include "cmGlobalGenerator.h"
-#include "cmSystemTools.h"
 #include "cmMakefile.h"
-#include "cmGeneratedFileStream.h"
-#include "cmCPackLog.h"
+#include "cmSystemTools.h"
+#include "cmake.h"
 
-#include <cmsys/SystemTools.hxx>
 #include <cmsys/Glob.hxx>
+#include <cmsys/SystemTools.hxx>
 #include <sys/stat.h>
 
 //----------------------------------------------------------------------

Source/CPack/cmCPackPackageMakerGenerator.cxx

@@ -11,17 +11,17 @@
 ============================================================================*/
 #include "cmCPackPackageMakerGenerator.h"
 
-#include "cmake.h"
-#include "cmGlobalGenerator.h"
-#include "cmSystemTools.h"
-#include "cmMakefile.h"
-#include "cmGeneratedFileStream.h"
 #include "cmCPackComponentGroup.h"
 #include "cmCPackLog.h"
+#include "cmGeneratedFileStream.h"
+#include "cmGlobalGenerator.h"
+#include "cmMakefile.h"
+#include "cmSystemTools.h"
+#include "cmake.h"
 
-#include <cmsys/SystemTools.hxx>
-#include <cmsys/Glob.hxx>
 #include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
+#include <cmsys/SystemTools.hxx>
 
 #include <assert.h>
 

Source/CPack/cmCPackSTGZGenerator.cxx

@@ -12,14 +12,14 @@
 
 #include "cmCPackSTGZGenerator.h"
 
-#include "cmake.h"
+#include "cmCPackLog.h"
 #include "cmGlobalGenerator.h"
-#include "cmSystemTools.h"
 #include "cmMakefile.h"
-#include "cmCPackLog.h"
+#include "cmSystemTools.h"
+#include "cmake.h"
 
-#include <cmsys/FStream.hxx>
 #include <sys/types.h>
+#include <cmsys/FStream.hxx>
 #include <sys/stat.h>
 
 //----------------------------------------------------------------------

Source/CPack/cpack.cxx

@@ -12,19 +12,19 @@
 #include "cmSystemTools.h"
 
 // Need these for documentation support.
-#include "cmake.h"
-#include "cmDocumentation.h"
-#include "cmCPackGeneratorFactory.h"
 #include "cmCPackGenerator.h"
-#include "cmake.h"
+#include "cmCPackGeneratorFactory.h"
+#include "cmDocumentation.h"
 #include "cmGlobalGenerator.h"
 #include "cmMakefile.h"
+#include "cmake.h"
+#include "cmake.h"
 
 #include "cmCPackLog.h"
 
 #include <cmsys/CommandLineArguments.hxx>
-#include <cmsys/SystemTools.hxx>
 #include <cmsys/Encoding.hxx>
+#include <cmsys/SystemTools.hxx>
 
 //----------------------------------------------------------------------------
 static const char * cmDocumentationName[][2] =

Source/CTest/cmCTestBatchTestHandler.cxx

@@ -12,9 +12,9 @@
 
 #include "cmCTestBatchTestHandler.h"
 
+#include "cmCTest.h"
 #include "cmProcess.h"
 #include "cmStandardIncludes.h"
-#include "cmCTest.h"
 #include "cmSystemTools.h"
 #include <stdlib.h>
 

Source/CTest/cmCTestBatchTestHandler.h

@@ -15,9 +15,9 @@
 
 #include <cmStandardIncludes.h>
 
-#include <cmCTestTestHandler.h>
 #include <cmCTestMultiProcessHandler.h>
 #include <cmCTestRunTest.h>
+#include <cmCTestTestHandler.h>
 #include <cmsys/FStream.hxx>
 
 /** \class cmCTestBatchTestHandler

Source/CTest/cmCTestBuildAndTestHandler.cxx

@@ -12,12 +12,12 @@
 
 #include "cmCTestBuildAndTestHandler.h"
 
-#include "cmSystemTools.h"
 #include "cmCTest.h"
-#include "cmake.h"
+#include "cmCTestTestHandler.h"
 #include "cmGlobalGenerator.h"
+#include "cmSystemTools.h"
+#include "cmake.h"
 #include <cmsys/Process.h>
-#include "cmCTestTestHandler.h"
 
 //----------------------------------------------------------------------
 cmCTestBuildAndTestHandler::cmCTestBuildAndTestHandler()

Source/CTest/cmCTestBuildCommand.cxx

@@ -12,10 +12,10 @@
 #include "cmCTestBuildCommand.h"
 
 #include "cmCTest.h"
-#include "cmCTestGenericHandler.h"
 #include "cmCTestBuildHandler.h"
-#include "cmake.h"
+#include "cmCTestGenericHandler.h"
 #include "cmGlobalGenerator.h"
+#include "cmake.h"
 
 
 //----------------------------------------------------------------------------

Source/CTest/cmCTestBuildHandler.cxx

@@ -12,29 +12,29 @@
 
 #include "cmCTestBuildHandler.h"
 
+#include "cmAlgorithms.h"
 #include "cmCTest.h"
-#include "cmake.h"
-#include "cmMakefile.h"
-#include "cmGlobalGenerator.h"
+#include "cmFileTimeComparison.h"
 #include "cmGeneratedFileStream.h"
+#include "cmGlobalGenerator.h"
+#include "cmMakefile.h"
 #include "cmXMLWriter.h"
-#include "cmFileTimeComparison.h"
-#include "cmAlgorithms.h"
+#include "cmake.h"
 
 //#include <cmsys/RegularExpression.hxx>
-#include <cmsys/Process.h>
 #include <cmsys/Directory.hxx>
 #include <cmsys/FStream.hxx>
+#include <cmsys/Process.h>
 
 // used for sleep
 #ifdef _WIN32
 #include "windows.h"
 #endif
 
+#include <float.h>
+#include <math.h>
 #include <stdlib.h>
 #include <time.h>
-#include <math.h>
-#include <float.h>
 
 
 static const char* cmCTestErrorMatches[] = {

Source/CTest/cmCTestCVS.cxx

@@ -15,8 +15,8 @@
 #include "cmSystemTools.h"
 #include "cmXMLWriter.h"
 
-#include <cmsys/RegularExpression.hxx>
 #include <cmsys/FStream.hxx>
+#include <cmsys/RegularExpression.hxx>
 
 //----------------------------------------------------------------------------
 cmCTestCVS::cmCTestCVS(cmCTest* ct, std::ostream& log): cmCTestVC(ct, log)

Source/CTest/cmCTestConfigureCommand.cxx

@@ -11,9 +11,9 @@
 ============================================================================*/
 #include "cmCTestConfigureCommand.h"
 
-#include "cmGlobalGenerator.h"
 #include "cmCTest.h"
 #include "cmCTestGenericHandler.h"
+#include "cmGlobalGenerator.h"
 
 cmCTestConfigureCommand::cmCTestConfigureCommand()
 {

Source/CTest/cmCTestConfigureHandler.cxx

@@ -14,8 +14,8 @@
 
 #include "cmCTest.h"
 #include "cmGeneratedFileStream.h"
-#include "cmake.h"
 #include "cmXMLWriter.h"
+#include "cmake.h"
 #include <cmsys/Process.h>
 
 

Source/CTest/cmCTestCoverageHandler.cxx

@@ -11,28 +11,28 @@
 ============================================================================*/
 #include "cmCTestCoverageHandler.h"
 
-#include "cmParsePHPCoverage.h"
+#include "cmCTest.h"
+#include "cmGeneratedFileStream.h"
+#include "cmMakefile.h"
+#include "cmParseBlanketJSCoverage.h"
+#include "cmParseCacheCoverage.h"
 #include "cmParseCoberturaCoverage.h"
+#include "cmParseDelphiCoverage.h"
 #include "cmParseGTMCoverage.h"
-#include "cmParseCacheCoverage.h"
 #include "cmParseJacocoCoverage.h"
-#include "cmParseDelphiCoverage.h"
-#include "cmParseBlanketJSCoverage.h"
-#include "cmCTest.h"
-#include "cmake.h"
-#include "cmMakefile.h"
+#include "cmParsePHPCoverage.h"
 #include "cmSystemTools.h"
-#include "cmGeneratedFileStream.h"
 #include "cmXMLWriter.h"
+#include "cmake.h"
 
+#include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
 #include <cmsys/Process.h>
 #include <cmsys/RegularExpression.hxx>
-#include <cmsys/Glob.hxx>
-#include <cmsys/FStream.hxx>
 
-#include <stdlib.h>
-#include <math.h>
 #include <float.h>
+#include <math.h>
+#include <stdlib.h>
 
 #define SAFEDIV(x,y) (((y)!=0)?((x)/(y)):(0))
 

Source/CTest/cmCTestCurl.cxx

@@ -11,8 +11,8 @@
 ============================================================================*/
 #include "cmCTestCurl.h"
 
-#include "cmSystemTools.h"
 #include "cmCTest.h"
+#include "cmSystemTools.h"
 
 cmCTestCurl::cmCTestCurl(cmCTest* ctest)
 {

Source/CTest/cmCTestGIT.cxx

@@ -11,17 +11,17 @@
 ============================================================================*/
 #include "cmCTestGIT.h"
 
+#include "cmAlgorithms.h"
 #include "cmCTest.h"
 #include "cmSystemTools.h"
-#include "cmAlgorithms.h"
 
-#include <cmsys/RegularExpression.hxx>
-#include <cmsys/Process.h>
 #include <cmsys/FStream.hxx>
+#include <cmsys/Process.h>
+#include <cmsys/RegularExpression.hxx>
 
 #include <sys/types.h>
-#include <time.h>
 #include <ctype.h>
+#include <time.h>
 
 //----------------------------------------------------------------------------
 static unsigned int cmCTestGITVersion(unsigned int epic, unsigned int major,

Source/CTest/cmCTestLaunch.cxx

@@ -16,14 +16,14 @@
 #include "cmXMLWriter.h"
 #include "cmake.h"
 
+#include <cmsys/FStream.hxx>
 #include <cmsys/MD5.h>
 #include <cmsys/Process.h>
 #include <cmsys/RegularExpression.hxx>
-#include <cmsys/FStream.hxx>
 
 #ifdef _WIN32
-#include <io.h> // for _setmode
 #include <fcntl.h> // for _O_BINARY
+#include <io.h>    // for _setmode
 #include <stdio.h> // for std{out,err} and fileno
 #endif
 

Source/CTest/cmCTestMemCheckHandler.cxx

@@ -12,21 +12,21 @@
 
 #include "cmCTestMemCheckHandler.h"
 
-#include "cmXMLParser.h"
 #include "cmCTest.h"
-#include "cmake.h"
 #include "cmGeneratedFileStream.h"
-#include <cmsys/Process.h>
-#include <cmsys/RegularExpression.hxx>
-#include <cmsys/Base64.h>
-#include <cmsys/Glob.hxx>
-#include <cmsys/FStream.hxx>
 #include "cmMakefile.h"
+#include "cmXMLParser.h"
 #include "cmXMLWriter.h"
+#include "cmake.h"
+#include <cmsys/Base64.h>
+#include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
+#include <cmsys/Process.h>
+#include <cmsys/RegularExpression.hxx>
 
-#include <stdlib.h>
-#include <math.h>
 #include <float.h>
+#include <math.h>
+#include <stdlib.h>
 
 struct CatToErrorType
 {

Source/CTest/cmCTestMemCheckHandler.h

@@ -16,8 +16,8 @@
 #include "cmCTestTestHandler.h"
 
 #include "cmListFileCache.h"
-#include <vector>
 #include <string>
+#include <vector>
 
 class cmMakefile;
 class cmXMLWriter;

Source/CTest/cmCTestMultiProcessHandler.cxx

@@ -11,18 +11,18 @@
 ============================================================================*/
 #include "cmCTestMultiProcessHandler.h"
 
-#include "cmProcess.h"
-#include "cmStandardIncludes.h"
 #include "cmCTest.h"
 #include "cmCTestScriptHandler.h"
+#include "cmProcess.h"
+#include "cmStandardIncludes.h"
 #include "cmSystemTools.h"
-#include <stdlib.h>
-#include <stack>
-#include <list>
-#include <float.h>
-#include <math.h>
 #include <cmsys/FStream.hxx>
 #include <cmsys/SystemInformation.hxx>
+#include <float.h>
+#include <list>
+#include <math.h>
+#include <stack>
+#include <stdlib.h>
 
 class TestComparator
 {

Source/CTest/cmCTestP4.cxx

@@ -14,12 +14,12 @@
 #include "cmCTest.h"
 #include "cmSystemTools.h"
 
-#include <cmsys/RegularExpression.hxx>
 #include <cmsys/Process.h>
+#include <cmsys/RegularExpression.hxx>
 
 #include <sys/types.h>
-#include <time.h>
 #include <ctype.h>
+#include <time.h>
 
 //----------------------------------------------------------------------------
 cmCTestP4::cmCTestP4(cmCTest* ct, std::ostream& log):

Source/CTest/cmCTestP4.h

@@ -14,8 +14,8 @@
 
 #include "cmCTestGlobalVC.h"
 
-#include <vector>
 #include <map>
+#include <vector>
 
 /** \class cmCTestP4
  * \brief Interaction with the Perforce command-line tool

Source/CTest/cmCTestRunTest.cxx

@@ -12,8 +12,8 @@
 
 #include "cmCTestRunTest.h"
 
-#include "cmCTestMemCheckHandler.h"
 #include "cmCTest.h"
+#include "cmCTestMemCheckHandler.h"
 #include "cmSystemTools.h"
 #include "cm_curl.h"
 

Source/CTest/cmCTestScriptHandler.cxx

@@ -13,25 +13,25 @@
 #include "cmCTestScriptHandler.h"
 
 #include "cmCTest.h"
-#include "cmake.h"
 #include "cmFunctionBlocker.h"
-#include "cmMakefile.h"
-#include "cmGlobalGenerator.h"
 #include "cmGeneratedFileStream.h"
+#include "cmGlobalGenerator.h"
+#include "cmMakefile.h"
+#include "cmake.h"
 
 //#include <cmsys/RegularExpression.hxx>
-#include <cmsys/Process.h>
 #include <cmsys/Directory.hxx>
+#include <cmsys/Process.h>
 
 // used for sleep
 #ifdef _WIN32
 #include "windows.h"
 #endif
 
+#include <float.h>
+#include <math.h>
 #include <stdlib.h>
 #include <time.h>
-#include <math.h>
-#include <float.h>
 
 // needed for sleep
 #if !defined(_WIN32)

Source/CTest/cmCTestStartCommand.cxx

@@ -12,9 +12,9 @@
 #include "cmCTestStartCommand.h"
 
 #include "cmCTest.h"
-#include "cmGlobalGenerator.h"
 #include "cmCTestVC.h"
 #include "cmGeneratedFileStream.h"
+#include "cmGlobalGenerator.h"
 
 cmCTestStartCommand::cmCTestStartCommand()
 {

Source/CTest/cmCTestSubmitHandler.cxx

@@ -11,25 +11,25 @@
 ============================================================================*/
 #include "cmCTestSubmitHandler.h"
 
+#include "cmCTest.h"
 #include "cmCTestScriptHandler.h"
-#include "cmake.h"
+#include "cmGeneratedFileStream.h"
+#include "cmState.h"
 #include "cmSystemTools.h"
 #include "cmVersion.h"
-#include "cmGeneratedFileStream.h"
-#include "cmCTest.h"
 #include "cmXMLParser.h"
-#include "cmState.h"
+#include "cmake.h"
 
-#include <cmsys/Process.h>
 #include <cmsys/Base64.h>
+#include <cmsys/Process.h>
 
 // For XML-RPC submission
 #include "cm_xmlrpc.h"
 
 #include <cm_jsoncpp_reader.h>
 // For curl submission
-#include "cmCurl.h"
 #include "cmCTestCurl.h"
+#include "cmCurl.h"
 
 #include <sys/stat.h>
 

Source/CTest/cmCTestTestHandler.cxx

@@ -12,27 +12,27 @@
 
 #include "cmCTestTestHandler.h"
 
-#include "cmCTestMultiProcessHandler.h"
-#include "cmCTestBatchTestHandler.h"
 #include "cmCTest.h"
+#include "cmCTestBatchTestHandler.h"
+#include "cmCTestMultiProcessHandler.h"
 #include "cmCTestRunTest.h"
-#include "cmake.h"
+#include "cmCommand.h"
 #include "cmGeneratedFileStream.h"
-#include <cmsys/Process.h>
-#include <cmsys/RegularExpression.hxx>
-#include <cmsys/Base64.h>
-#include <cmsys/Directory.hxx>
-#include <cmsys/FStream.hxx>
-#include "cmMakefile.h"
 #include "cmGlobalGenerator.h"
-#include "cmCommand.h"
+#include "cmMakefile.h"
 #include "cmSystemTools.h"
 #include "cmXMLWriter.h"
 #include "cm_utf8.h"
+#include "cmake.h"
+#include <cmsys/Base64.h>
+#include <cmsys/Directory.hxx>
+#include <cmsys/FStream.hxx>
+#include <cmsys/Process.h>
+#include <cmsys/RegularExpression.hxx>
 
-#include <stdlib.h>
-#include <math.h>
 #include <float.h>
+#include <math.h>
+#include <stdlib.h>
 
 #include <set>
 

Source/CTest/cmCTestUpdateHandler.cxx

@@ -12,23 +12,23 @@
 
 #include "cmCTestUpdateHandler.h"
 
+#include "cmCLocaleEnvironmentScope.h"
 #include "cmCTest.h"
-#include "cmake.h"
-#include "cmMakefile.h"
+#include "cmGeneratedFileStream.h"
 #include "cmGlobalGenerator.h"
+#include "cmMakefile.h"
 #include "cmVersion.h"
-#include "cmGeneratedFileStream.h"
 #include "cmXMLParser.h"
 #include "cmXMLWriter.h"
-#include "cmCLocaleEnvironmentScope.h"
+#include "cmake.h"
 
-#include "cmCTestVC.h"
-#include "cmCTestCVS.h"
-#include "cmCTestSVN.h"
 #include "cmCTestBZR.h"
+#include "cmCTestCVS.h"
 #include "cmCTestGIT.h"
 #include "cmCTestHG.h"
 #include "cmCTestP4.h"
+#include "cmCTestSVN.h"
+#include "cmCTestVC.h"
 
 #include <cmsys/auto_ptr.hxx>
 
@@ -40,9 +40,9 @@
 #include "windows.h"
 #endif
 
-#include <stdlib.h>
-#include <math.h>
 #include <float.h>
+#include <math.h>
+#include <stdlib.h>
 
 //----------------------------------------------------------------------
 static const char* cmCTestUpdateHandlerUpdateStrings[] =

Source/CTest/cmParseBlanketJSCoverage.cxx

@@ -11,12 +11,12 @@
 ============================================================================*/
 #include "cmParseBlanketJSCoverage.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include "cmSystemTools.h"
 #include <cmsys/Directory.hxx>
-#include <cmsys/Glob.hxx>
 #include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
+#include <stdio.h>
+#include <stdlib.h>
 
 
 class cmParseBlanketJSCoverage::JSONParser

Source/CTest/cmParseCacheCoverage.cxx

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

Source/CTest/cmParseDelphiCoverage.cxx

@@ -1,12 +1,12 @@
 #include "cmParseDelphiCoverage.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include "cmSystemTools.h"
 #include "cmXMLParser.h"
 #include <cmsys/Directory.hxx>
-#include <cmsys/Glob.hxx>
 #include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
+#include <stdio.h>
+#include <stdlib.h>
 
 
 class cmParseDelphiCoverage::HTMLParser

Source/CTest/cmParseGTMCoverage.cxx

@@ -1,11 +1,11 @@
 #include "cmParseGTMCoverage.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include "cmSystemTools.h"
 #include <cmsys/Directory.hxx>
-#include <cmsys/Glob.hxx>
 #include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
+#include <stdio.h>
+#include <stdlib.h>
 
 
 cmParseGTMCoverage::cmParseGTMCoverage(cmCTestCoverageHandlerContainer& cont,

Source/CTest/cmParseJacocoCoverage.cxx

@@ -1,12 +1,12 @@
 #include "cmParseJacocoCoverage.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include "cmSystemTools.h"
 #include "cmXMLParser.h"
 #include <cmsys/Directory.hxx>
-#include <cmsys/Glob.hxx>
 #include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
+#include <stdio.h>
+#include <stdlib.h>
 
 
 class cmParseJacocoCoverage::XMLParser: public cmXMLParser

Source/CTest/cmParseMumpsCoverage.cxx

@@ -1,11 +1,11 @@
 #include "cmParseGTMCoverage.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include "cmSystemTools.h"
 #include <cmsys/Directory.hxx>
-#include <cmsys/Glob.hxx>
 #include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
+#include <stdio.h>
+#include <stdlib.h>
 
 
 cmParseMumpsCoverage::cmParseMumpsCoverage(

Source/CursesDialog/ccmake.cxx

@@ -11,9 +11,9 @@
 ============================================================================*/
 #include "cmCursesStandardIncludes.h"
 
+#include "../cmDocumentation.h"
 #include "../cmSystemTools.h"
 #include "../cmake.h"
-#include "../cmDocumentation.h"
 
 #include <signal.h>
 #include <sys/ioctl.h>

Source/CursesDialog/cmCursesCacheEntryComposite.cxx

@@ -11,16 +11,16 @@
 ============================================================================*/
 #include "cmCursesCacheEntryComposite.h"
 
-#include "cmCursesOptionsWidget.h"
-#include "cmCursesStringWidget.h"
-#include "cmCursesLabelWidget.h"
-#include "cmCursesBoolWidget.h"
-#include "cmCursesPathWidget.h"
-#include "cmCursesFilePathWidget.h"
-#include "cmCursesDummyWidget.h"
+#include "../cmState.h"
 #include "../cmSystemTools.h"
 #include "../cmake.h"
-#include "../cmState.h"
+#include "cmCursesBoolWidget.h"
+#include "cmCursesDummyWidget.h"
+#include "cmCursesFilePathWidget.h"
+#include "cmCursesLabelWidget.h"
+#include "cmCursesOptionsWidget.h"
+#include "cmCursesPathWidget.h"
+#include "cmCursesStringWidget.h"
 
 #include <assert.h>
 

Source/CursesDialog/cmCursesLongMessageForm.cxx

@@ -12,8 +12,8 @@
 #include "cmCursesLongMessageForm.h"
 
 #include "../cmSystemTools.h"
-#include "../cmake.h"
 #include "../cmVersion.h"
+#include "../cmake.h"
 #include "cmCursesMainForm.h"
 
 inline int ctrl(int z)

Source/CursesDialog/cmCursesMainForm.cxx

@@ -14,15 +14,15 @@
 #include "../cmSystemTools.h"
 #include "../cmVersion.h"
 #include "../cmake.h"
-#include "cmCursesStringWidget.h"
-#include "cmCursesLabelWidget.h"
+#include "cmAlgorithms.h"
 #include "cmCursesBoolWidget.h"
-#include "cmCursesPathWidget.h"
-#include "cmCursesFilePathWidget.h"
-#include "cmCursesDummyWidget.h"
 #include "cmCursesCacheEntryComposite.h"
+#include "cmCursesDummyWidget.h"
+#include "cmCursesFilePathWidget.h"
+#include "cmCursesLabelWidget.h"
 #include "cmCursesLongMessageForm.h"
-#include "cmAlgorithms.h"
+#include "cmCursesPathWidget.h"
+#include "cmCursesStringWidget.h"
 #include "cmState.h"
 
 

Source/QtDialog/AddCacheEntry.cxx

@@ -12,8 +12,8 @@
 
 #include "AddCacheEntry.h"
 
-#include <QMetaProperty>
 #include <QCompleter>
+#include <QMetaProperty>
 
 static const int NumTypes = 4;
 static const int DefaultTypeIndex = 0;

Source/QtDialog/AddCacheEntry.h

@@ -15,9 +15,9 @@
 
 #include "QCMake.h"
 
-#include <QWidget>
 #include <QCheckBox>
 #include <QStringList>
+#include <QWidget>
 
 #include "ui_AddCacheEntry.h"
 

Source/QtDialog/CMakeSetup.cxx

@@ -11,19 +11,19 @@
 ============================================================================*/
 #include "QCMake.h"  // include to disable MS warnings
 
+#include "CMakeSetupDialog.h"
+#include "cmAlgorithms.h"
+#include "cmDocumentation.h"
+#include "cmVersion.h"
+#include "cmake.h"
 #include <QApplication>
 #include <QDir>
-#include <QTranslator>
 #include <QLocale>
 #include <QTextCodec>
-#include "CMakeSetupDialog.h"
-#include "cmDocumentation.h"
-#include "cmake.h"
-#include "cmVersion.h"
-#include "cmAlgorithms.h"
+#include <QTranslator>
 #include <cmsys/CommandLineArguments.hxx>
-#include <cmsys/SystemTools.hxx>
 #include <cmsys/Encoding.hxx>
+#include <cmsys/SystemTools.hxx>
 
 //----------------------------------------------------------------------------
 static const char * cmDocumentationName[][2] =

Source/QtDialog/CMakeSetupDialog.cxx

@@ -12,28 +12,28 @@
 
 #include "CMakeSetupDialog.h"
 
-#include <QFileDialog>
-#include <QProgressBar>
-#include <QMessageBox>
-#include <QStatusBar>
-#include <QToolButton>
-#include <QDialogButtonBox>
 #include <QCloseEvent>
 #include <QCoreApplication>
-#include <QSettings>
+#include <QDialogButtonBox>
+#include <QDragEnterEvent>
+#include <QFileDialog>
+#include <QInputDialog>
+#include <QKeySequence>
 #include <QMenu>
 #include <QMenuBar>
-#include <QDragEnterEvent>
+#include <QMessageBox>
 #include <QMimeData>
-#include <QUrl>
+#include <QProgressBar>
+#include <QSettings>
 #include <QShortcut>
-#include <QKeySequence>
-#include <QInputDialog>
+#include <QStatusBar>
+#include <QToolButton>
+#include <QUrl>
 
-#include "QCMake.h"
-#include "QCMakeCacheView.h"
 #include "AddCacheEntry.h"
 #include "FirstConfigure.h"
+#include "QCMake.h"
+#include "QCMakeCacheView.h"
 #include "RegexExplorer.h"
 #include "WarningMessagesDialog.h"
 #include "cmSystemTools.h"

Source/QtDialog/CMakeSetupDialog.h

@@ -15,10 +15,10 @@
 
 #include "QCMake.h"
 
+#include "ui_CMakeSetupDialog.h"
+#include <QEventLoop>
 #include <QMainWindow>
 #include <QThread>
-#include <QEventLoop>
-#include "ui_CMakeSetupDialog.h"
 
 class QCMakeThread;
 class CMakeCacheModel;

Source/QtDialog/FirstConfigure.cxx

@@ -3,9 +3,9 @@
 
 #include "Compilers.h"
 
-#include <QSettings>
-#include <QRadioButton>
 #include <QComboBox>
+#include <QRadioButton>
+#include <QSettings>
 #include <QVBoxLayout>
 
 

Source/QtDialog/QCMake.cxx

@@ -12,12 +12,12 @@
 
 #include "QCMake.h"
 
-#include <QDir>
 #include <QCoreApplication>
+#include <QDir>
 
+#include "cmExternalMakefileProjectGenerator.h"
 #include "cmState.h"
 #include "cmSystemTools.h"
-#include "cmExternalMakefileProjectGenerator.h"
 
 #ifdef Q_OS_WIN
 #include "qt_windows.h"  // For SetErrorMode

Source/QtDialog/QCMake.h

@@ -22,13 +22,13 @@
 
 #include <vector>
 
+#include <QAtomicInt>
+#include <QList>
+#include <QMetaType>
 #include <QObject>
 #include <QString>
-#include <QVariant>
-#include <QList>
 #include <QStringList>
-#include <QMetaType>
-#include <QAtomicInt>
+#include <QVariant>
 
 /// struct to represent cmake properties in Qt
 /// Value is of type String or Bool

Source/QtDialog/QCMakeCacheView.cxx

@@ -12,14 +12,14 @@
 
 #include "QCMakeCacheView.h"
 
+#include <QApplication>
+#include <QEvent>
 #include <QHBoxLayout>
 #include <QHeaderView>
-#include <QEvent>
-#include <QStyle>
 #include <QKeyEvent>
-#include <QSortFilterProxyModel>
 #include <QMetaProperty>
-#include <QApplication>
+#include <QSortFilterProxyModel>
+#include <QStyle>
 
 #include "QCMakeWidgets.h"
 

Source/QtDialog/QCMakeCacheView.h

@@ -15,10 +15,10 @@
 
 #include "QCMake.h"
 
-#include <QTreeView>
+#include <QItemDelegate>
 #include <QSet>
 #include <QStandardItemModel>
-#include <QItemDelegate>
+#include <QTreeView>
 
 class QSortFilterProxyModel;
 class QCMakeCacheModel;

Source/QtDialog/QCMakeWidgets.cxx

@@ -13,10 +13,10 @@
 #include "QCMakeWidgets.h"
 
 #include <QDirModel>
-#include <QFileInfo>
 #include <QFileDialog>
-#include <QToolButton>
+#include <QFileInfo>
 #include <QResizeEvent>
+#include <QToolButton>
 
 QCMakeFileEditor::QCMakeFileEditor(QWidget* p, const QString& var)
   : QLineEdit(p), Variable(var)

Source/QtDialog/QCMakeWidgets.h

@@ -13,9 +13,9 @@
 #ifndef QCMakeWidgets_h
 #define QCMakeWidgets_h
 
-#include <QLineEdit>
 #include <QComboBox>
 #include <QCompleter>
+#include <QLineEdit>
 
 class QToolButton;
 

Source/QtDialog/RegexExplorer.h

@@ -13,9 +13,9 @@
 #ifndef RegexExplorer_h
 #define RegexExplorer_h
 
-#include <string>
-#include <cmsys/RegularExpression.hxx>
 #include <QDialog>
+#include <cmsys/RegularExpression.hxx>
+#include <string>
 
 #include "ui_RegexExplorer.h"
 

Source/QtDialog/WarningMessagesDialog.h

@@ -16,8 +16,8 @@
 #include <QDialog>
 #include <QWidget>
 
-#include "ui_WarningMessagesDialog.h"
 #include "QCMake.h"
+#include "ui_WarningMessagesDialog.h"
 
 /**
  * Dialog window for setting the warning message related options.

Source/bindexplib.cxx

@@ -72,11 +72,11 @@
 */
 #include "bindexplib.h"
 #include <cmsys/Encoding.hxx>
-#include <windows.h>
-#include <stdio.h>
-#include <string>
 #include <fstream>
 #include <iostream>
+#include <stdio.h>
+#include <string>
+#include <windows.h>
 
 typedef struct cmANON_OBJECT_HEADER_BIGOBJ {
    /* same as ANON_OBJECT_HEADER_V2 */

Source/cmAddLibraryCommand.cxx

@@ -11,8 +11,8 @@
 ============================================================================*/
 #include "cmAddLibraryCommand.h"
 
-#include "cmake.h"
 #include "cmState.h"
+#include "cmake.h"
 
 // cmLibraryCommand
 bool cmAddLibraryCommand

Source/cmArchiveWrite.cxx

@@ -11,12 +11,12 @@
 ============================================================================*/
 #include "cmArchiveWrite.h"
 
-#include "cmSystemTools.h"
 #include "cmLocale.h"
+#include "cmSystemTools.h"
+#include "cm_get_date.h"
+#include <cm_libarchive.h>
 #include <cmsys/Directory.hxx>
 #include <cmsys/FStream.hxx>
-#include <cm_libarchive.h>
-#include "cm_get_date.h"
 
 #ifndef __LA_SSIZE_T
 # define __LA_SSIZE_T la_ssize_t

Source/cmBootstrapCommands1.cxx

@@ -13,7 +13,6 @@
 // that CMake knows about at compile time.
 // This is sort of a boot strapping approach since you would
 // like to have CMake to build CMake.
-#include "cmCommands.h"
 #include "cmAddCustomCommandCommand.cxx"
 #include "cmAddCustomTargetCommand.cxx"
 #include "cmAddDefinitionsCommand.cxx"
@@ -27,6 +26,7 @@
 #include "cmCMakeMinimumRequired.cxx"
 #include "cmCMakePolicyCommand.cxx"
 #include "cmCommandArgumentsHelper.cxx"
+#include "cmCommands.h"
 #include "cmConfigureFileCommand.cxx"
 #include "cmContinueCommand.cxx"
 #include "cmCoreTryCompile.cxx"
@@ -42,9 +42,9 @@
 #include "cmEndWhileCommand.cxx"
 #include "cmExecProgramCommand.cxx"
 #include "cmExecuteProcessCommand.cxx"
+#include "cmFileCommand.cxx"
 #include "cmFindBase.cxx"
 #include "cmFindCommon.cxx"
-#include "cmFileCommand.cxx"
 #include "cmFindFileCommand.cxx"
 #include "cmFindLibraryCommand.cxx"
 #include "cmFindPackageCommand.cxx"
@@ -52,9 +52,9 @@
 #include "cmFindProgramCommand.cxx"
 #include "cmForEachCommand.cxx"
 #include "cmFunctionCommand.cxx"
+#include "cmParseArgumentsCommand.cxx"
 #include "cmPathLabel.cxx"
 #include "cmSearchPath.cxx"
-#include "cmParseArgumentsCommand.cxx"
 
 void GetBootstrapCommands1(std::vector<cmCommand*>& commands)
 {

Source/cmBootstrapCommands2.cxx

@@ -22,14 +22,15 @@
 #include "cmGetPropertyCommand.cxx"
 #include "cmGetSourceFilePropertyCommand.cxx"
 #include "cmGetTargetPropertyCommand.cxx"
+#include "cmGetTestPropertyCommand.cxx"
 #include "cmHexFileConverter.cxx"
 #include "cmIfCommand.cxx"
 #include "cmIncludeCommand.cxx"
 #include "cmIncludeDirectoryCommand.cxx"
 #include "cmIncludeRegularExpressionCommand.cxx"
-#include "cmInstallFilesCommand.cxx"
-#include "cmInstallCommandArguments.cxx"
 #include "cmInstallCommand.cxx"
+#include "cmInstallCommandArguments.cxx"
+#include "cmInstallFilesCommand.cxx"
 #include "cmInstallTargetsCommand.cxx"
 #include "cmLinkDirectoriesCommand.cxx"
 #include "cmListCommand.cxx"
@@ -48,7 +49,6 @@
 #include "cmSetSourceFilesPropertiesCommand.cxx"
 #include "cmSetTargetPropertiesCommand.cxx"
 #include "cmSetTestsPropertiesCommand.cxx"
-#include "cmGetTestPropertyCommand.cxx"
 #include "cmSiteNameCommand.cxx"
 #include "cmStringCommand.cxx"
 #include "cmSubdirCommand.cxx"

Source/cmCPackPropertiesGenerator.cxx

@@ -1,7 +1,7 @@
 #include "cmCPackPropertiesGenerator.h"
 
-#include "cmOutputConverter.h"
 #include "cmLocalGenerator.h"
+#include "cmOutputConverter.h"
 
 cmCPackPropertiesGenerator::cmCPackPropertiesGenerator(
   cmLocalGenerator* lg,

Source/cmCPackPropertiesGenerator.h

@@ -12,8 +12,8 @@
 #ifndef cmCPackPropertiesGenerator_h
 #define cmCPackPropertiesGenerator_h
 
-#include "cmScriptGenerator.h"
 #include "cmInstalledFile.h"
+#include "cmScriptGenerator.h"
 
 class cmLocalGenerator;
 

Source/cmCTest.cxx

@@ -13,24 +13,24 @@
 
 #include "cmCTest.h"
 
-#include "cmake.h"
-#include "cmMakefile.h"
-#include "cmGlobalGenerator.h"
-#include <cmsys/Base64.h>
-#include <cmsys/Directory.hxx>
-#include <cmsys/SystemInformation.hxx>
-#include <cmsys/FStream.hxx>
-#include "cmDynamicLoader.h"
-#include "cmGeneratedFileStream.h"
-#include "cmVersionMacros.h"
+#include "cmAlgorithms.h"
 #include "cmCTestCommand.h"
 #include "cmCTestStartCommand.h"
-#include "cmAlgorithms.h"
+#include "cmDynamicLoader.h"
+#include "cmGeneratedFileStream.h"
+#include "cmGlobalGenerator.h"
+#include "cmMakefile.h"
 #include "cmState.h"
+#include "cmVersionMacros.h"
 #include "cmXMLWriter.h"
+#include "cmake.h"
+#include <cmsys/Base64.h>
+#include <cmsys/Directory.hxx>
+#include <cmsys/FStream.hxx>
+#include <cmsys/SystemInformation.hxx>
 
-#include "cmCTestBuildHandler.h"
 #include "cmCTestBuildAndTestHandler.h"
+#include "cmCTestBuildHandler.h"
 #include "cmCTestConfigureHandler.h"
 #include "cmCTestCoverageHandler.h"
 #include "cmCTestMemCheckHandler.h"
@@ -42,14 +42,14 @@
 
 #include "cmVersion.h"
 
-#include <cmsys/RegularExpression.hxx>
-#include <cmsys/Process.h>
 #include <cmsys/Glob.hxx>
+#include <cmsys/Process.h>
+#include <cmsys/RegularExpression.hxx>
 
-#include <stdlib.h>
-#include <math.h>
-#include <float.h>
 #include <ctype.h>
+#include <float.h>
+#include <math.h>
+#include <stdlib.h>
 
 #include <cmsys/auto_ptr.hxx>
 

Source/cmCacheManager.cxx

@@ -11,14 +11,14 @@
 ============================================================================*/
 #include "cmCacheManager.h"
 
-#include "cmSystemTools.h"
 #include "cmGeneratedFileStream.h"
-#include "cmake.h"
+#include "cmSystemTools.h"
 #include "cmVersion.h"
+#include "cmake.h"
 
 #include <cmsys/Directory.hxx>
-#include <cmsys/Glob.hxx>
 #include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
 #include <cmsys/RegularExpression.hxx>
 
 cmCacheManager::cmCacheManager()

Source/cmCommand.h

@@ -14,9 +14,9 @@
 
 #include "cmObject.h"
 
+#include "cmCommandArgumentsHelper.h"
 #include "cmListFileCache.h"
 #include "cmMakefile.h"
-#include "cmCommandArgumentsHelper.h"
 
 /** \class cmCommand
  * \brief Superclass for all commands in CMake.

Source/cmComputeLinkDepends.cxx

@@ -11,13 +11,13 @@
 ============================================================================*/
 #include "cmComputeLinkDepends.h"
 
+#include "cmAlgorithms.h"
 #include "cmComputeComponentGraph.h"
-#include "cmLocalGenerator.h"
 #include "cmGlobalGenerator.h"
+#include "cmLocalGenerator.h"
 #include "cmMakefile.h"
 #include "cmTarget.h"
 #include "cmake.h"
-#include "cmAlgorithms.h"
 
 #include <assert.h>
 

Source/cmComputeLinkDepends.h

@@ -14,8 +14,8 @@
 
 #include "cmStandardIncludes.h"
 
-#include "cmLinkItem.h"
 #include "cmGraphAdjacencyList.h"
+#include "cmLinkItem.h"
 
 #include <queue>
 

Source/cmComputeLinkInformation.cxx

@@ -14,14 +14,14 @@
 #include "cmComputeLinkDepends.h"
 #include "cmOrderDirectories.h"
 
-#include "cmLocalGenerator.h"
+#include "cmAlgorithms.h"
+#include "cmGeneratorTarget.h"
 #include "cmGlobalGenerator.h"
-#include "cmState.h"
-#include "cmOutputConverter.h"
+#include "cmLocalGenerator.h"
 #include "cmMakefile.h"
-#include "cmGeneratorTarget.h"
+#include "cmOutputConverter.h"
+#include "cmState.h"
 #include "cmake.h"
-#include "cmAlgorithms.h"
 
 #include <ctype.h>
 

Source/cmComputeTargetDepends.cxx

@@ -15,9 +15,9 @@
 #include "cmGlobalGenerator.h"
 #include "cmLocalGenerator.h"
 #include "cmMakefile.h"
+#include "cmSourceFile.h"
 #include "cmState.h"
 #include "cmSystemTools.h"
-#include "cmSourceFile.h"
 #include "cmTarget.h"
 #include "cmake.h"
 

Source/cmConditionEvaluator.cxx

@@ -12,8 +12,8 @@
 
 #include "cmConditionEvaluator.h"
 
-#include "cmOutputConverter.h"
 #include "cmAlgorithms.h"
+#include "cmOutputConverter.h"
 
 static std::string const keyAND = "AND";
 static std::string const keyCOMMAND = "COMMAND";

Source/cmCoreTryCompile.cxx

@@ -11,11 +11,11 @@
 ============================================================================*/
 #include "cmCoreTryCompile.h"
 
-#include "cmake.h"
-#include "cmOutputConverter.h"
-#include "cmGlobalGenerator.h"
 #include "cmAlgorithms.h"
 #include "cmExportTryCompileFileGenerator.h"
+#include "cmGlobalGenerator.h"
+#include "cmOutputConverter.h"
+#include "cmake.h"
 #include <cmsys/Directory.hxx>
 
 #include <assert.h>

Source/cmCryptoHash.cxx

@@ -11,9 +11,9 @@
 ============================================================================*/
 #include "cmCryptoHash.h"
 
-#include <cmsys/MD5.h>
-#include <cmsys/FStream.hxx>
 #include "cm_sha2.h"
+#include <cmsys/FStream.hxx>
+#include <cmsys/MD5.h>
 
 //----------------------------------------------------------------------------
 cmsys::auto_ptr<cmCryptoHash> cmCryptoHash::New(const char* algo)

Source/cmCustomCommandGenerator.cxx

@@ -11,11 +11,11 @@
 ============================================================================*/
 #include "cmCustomCommandGenerator.h"
 
-#include "cmMakefile.h"
-#include "cmLocalGenerator.h"
 #include "cmCustomCommand.h"
-#include "cmOutputConverter.h"
 #include "cmGeneratorExpression.h"
+#include "cmLocalGenerator.h"
+#include "cmMakefile.h"
+#include "cmOutputConverter.h"
 
 //----------------------------------------------------------------------------
 cmCustomCommandGenerator::cmCustomCommandGenerator(

Source/cmDefinePropertyCommand.cxx

@@ -11,8 +11,8 @@
 ============================================================================*/
 #include "cmDefinePropertyCommand.h"
 
-#include "cmake.h"
 #include "cmState.h"
+#include "cmake.h"
 
 bool cmDefinePropertyCommand
 ::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)

Source/cmDepends.cxx

@@ -11,13 +11,13 @@
 ============================================================================*/
 #include "cmDepends.h"
 
+#include "cmFileTimeComparison.h"
+#include "cmGeneratedFileStream.h"
 #include "cmLocalGenerator.h"
 #include "cmMakefile.h"
-#include "cmGeneratedFileStream.h"
 #include "cmSystemTools.h"
-#include "cmFileTimeComparison.h"
-#include <string.h>
 #include <cmsys/FStream.hxx>
+#include <string.h>
 
 //----------------------------------------------------------------------------
 cmDepends::cmDepends(cmLocalGenerator* lg, const char* targetDir):

Source/cmDependsC.cxx

@@ -11,11 +11,11 @@
 ============================================================================*/
 #include "cmDependsC.h"
 
+#include "cmAlgorithms.h"
 #include "cmFileTimeComparison.h"
 #include "cmLocalGenerator.h"
 #include "cmMakefile.h"
 #include "cmSystemTools.h"
-#include "cmAlgorithms.h"
 #include <cmsys/FStream.hxx>
 
 #include <ctype.h> // isspace

Source/cmDependsFortran.cxx

@@ -11,14 +11,14 @@
 ============================================================================*/
 #include "cmDependsFortran.h"
 
-#include "cmSystemTools.h"
+#include "cmGeneratedFileStream.h"
 #include "cmLocalGenerator.h"
 #include "cmMakefile.h"
-#include "cmGeneratedFileStream.h"
+#include "cmSystemTools.h"
 
 #include "cmFortranParser.h" /* Interface to parser object.  */
-#include <cmsys/FStream.hxx>
 #include <assert.h>
+#include <cmsys/FStream.hxx>
 
 // TODO: Test compiler for the case of the mod file.  Some always
 // use lower case and some always use upper case.  I do not know if any

Source/cmDocumentation.cxx

@@ -11,14 +11,14 @@
 ============================================================================*/
 #include "cmDocumentation.h"
 
+#include "cmAlgorithms.h"
+#include "cmRST.h"
 #include "cmSystemTools.h"
 #include "cmVersion.h"
-#include "cmRST.h"
-#include "cmAlgorithms.h"
 
 #include <cmsys/Directory.hxx>
-#include <cmsys/Glob.hxx>
 #include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
 
 #include <ctype.h>
 

Source/cmELF.cxx

@@ -13,13 +13,13 @@
 
 #include "cmELF.h"
 
-#include <cmsys/auto_ptr.hxx>
 #include <cmsys/FStream.hxx>
+#include <cmsys/auto_ptr.hxx>
 
 // Include the ELF format information system header.
 #if defined(__OpenBSD__)
-# include <stdint.h>
 # include <elf_abi.h>
+# include <stdint.h>
 #elif defined(__HAIKU__)
 # include <elf32.h>
 # include <elf64.h>

Source/cmExportBuildFileGenerator.cxx

@@ -11,9 +11,9 @@
 ============================================================================*/
 #include "cmExportBuildFileGenerator.h"
 
-#include "cmLocalGenerator.h"
-#include "cmGlobalGenerator.h"
 #include "cmExportSet.h"
+#include "cmGlobalGenerator.h"
+#include "cmLocalGenerator.h"
 #include "cmTargetExport.h"
 
 //----------------------------------------------------------------------------

Source/cmExportCommand.cxx

@@ -11,12 +11,12 @@
 ============================================================================*/
 #include "cmExportCommand.h"
 
-#include "cmGlobalGenerator.h"
 #include "cmGeneratedFileStream.h"
+#include "cmGlobalGenerator.h"
 #include "cmake.h"
 
-#include <cmsys/RegularExpression.hxx>
 #include <cmsys/Encoding.hxx>
+#include <cmsys/RegularExpression.hxx>
 
 #include "cmExportBuildFileGenerator.h"
 

Source/cmExportFileGenerator.cxx

@@ -11,22 +11,22 @@
 ============================================================================*/
 #include "cmExportFileGenerator.h"
 
+#include "cmAlgorithms.h"
+#include "cmComputeLinkInformation.h"
 #include "cmExportSet.h"
 #include "cmGeneratedFileStream.h"
 #include "cmGlobalGenerator.h"
 #include "cmInstallExportGenerator.h"
 #include "cmLocalGenerator.h"
 #include "cmMakefile.h"
+#include "cmOutputConverter.h"
 #include "cmSystemTools.h"
 #include "cmTargetExport.h"
 #include "cmVersion.h"
-#include "cmComputeLinkInformation.h"
-#include "cmAlgorithms.h"
-#include "cmOutputConverter.h"
 
-#include <cmsys/auto_ptr.hxx>
-#include <cmsys/FStream.hxx>
 #include <assert.h>
+#include <cmsys/FStream.hxx>
+#include <cmsys/auto_ptr.hxx>
 
 //----------------------------------------------------------------------------
 static std::string cmExportFileGeneratorEscape(std::string const& str)

Source/cmExportFileGenerator.h

@@ -15,8 +15,8 @@
 #include "cmCommand.h"
 #include "cmGeneratorExpression.h"
 
-#include "cmVersionMacros.h"
 #include "cmVersion.h"
+#include "cmVersionMacros.h"
 
 #define STRINGIFY_HELPER(X) #X
 #define STRINGIFY(X) STRINGIFY_HELPER(X)

Source/cmExportInstallFileGenerator.cxx

@@ -11,15 +11,15 @@
 ============================================================================*/
 #include "cmExportInstallFileGenerator.h"
 
+#include "cmAlgorithms.h"
 #include "cmExportSet.h"
 #include "cmExportSetMap.h"
 #include "cmGeneratedFileStream.h"
 #include "cmGlobalGenerator.h"
-#include "cmLocalGenerator.h"
 #include "cmInstallExportGenerator.h"
 #include "cmInstallTargetGenerator.h"
+#include "cmLocalGenerator.h"
 #include "cmTargetExport.h"
-#include "cmAlgorithms.h"
 
 //----------------------------------------------------------------------------
 cmExportInstallFileGenerator