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 <daniel@pfeifer-mail.de>

214 files changed, 661 insertions, 661 deletions

diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.cxx b/Source/CPack/IFW/cmCPackIFWGenerator.cxx
index 50ac971..c10803c 100644
--- a/Source/CPack/IFW/cmCPackIFWGenerator.cxx
+++ b/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()
diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.h b/Source/CPack/IFW/cmCPackIFWGenerator.h
index 5770451..001c8c7 100644
--- a/Source/CPack/IFW/cmCPackIFWGenerator.h
+++ b/Source/CPack/IFW/cmCPackIFWGenerator.h
@@ -15,8 +15,8 @@
 
 #include <CPack/cmCPackGenerator.h>
 
-#include "cmCPackIFWPackage.h"
 #include "cmCPackIFWInstaller.h"
+#include "cmCPackIFWPackage.h"
 
 class cmXMLWriter;
 
diff --git a/Source/CPack/OSXScriptLauncher.cxx b/Source/CPack/OSXScriptLauncher.cxx
index c271517..b3ddeee 100644
--- a/Source/CPack/OSXScriptLauncher.cxx
+++ b/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>
 
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index ece327a..a98c684 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/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
 
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.h b/Source/CPack/WiX/cmCPackWIXGenerator.h
index 8372cd6..871527b 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.h
+++ b/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;
diff --git a/Source/CPack/WiX/cmWIXAccessControlList.h b/Source/CPack/WiX/cmWIXAccessControlList.h
index 54c2c19..7293995 100644
--- a/Source/CPack/WiX/cmWIXAccessControlList.h
+++ b/Source/CPack/WiX/cmWIXAccessControlList.h
@@ -15,8 +15,8 @@
 
 #include "cmWIXSourceWriter.h"
 
-#include <cmInstalledFile.h>
 #include <CPack/cmCPackLog.h>
+#include <cmInstalledFile.h>
 
 class cmWIXAccessControlList
 {
diff --git a/Source/CPack/WiX/cmWIXFilesSourceWriter.h b/Source/CPack/WiX/cmWIXFilesSourceWriter.h
index 9df955b..734f901 100644
--- a/Source/CPack/WiX/cmWIXFilesSourceWriter.h
+++ b/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>
 
diff --git a/Source/CPack/WiX/cmWIXPatch.h b/Source/CPack/WiX/cmWIXPatch.h
index 2f31a01..5b0eb3b 100644
--- a/Source/CPack/WiX/cmWIXPatch.h
+++ b/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>
 
diff --git a/Source/CPack/WiX/cmWIXShortcut.h b/Source/CPack/WiX/cmWIXShortcut.h
index 2a72394..598aa0d 100644
--- a/Source/CPack/WiX/cmWIXShortcut.h
+++ b/Source/CPack/WiX/cmWIXShortcut.h
@@ -15,9 +15,9 @@
 
 #include <cmInstalledFile.h>
 
-#include <string>
 #include <map>
 #include <set>
+#include <string>
 #include <vector>
 
 class cmWIXFilesSourceWriter;
diff --git a/Source/CPack/WiX/cmWIXSourceWriter.h b/Source/CPack/WiX/cmWIXSourceWriter.h
index be0c169..2bf9674 100644
--- a/Source/CPack/WiX/cmWIXSourceWriter.h
+++ b/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
diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx b/Source/CPack/cmCPackArchiveGenerator.cxx
index db985db..37e8bf0 100644
--- a/Source/CPack/cmCPackArchiveGenerator.cxx
+++ b/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,
diff --git a/Source/CPack/cmCPackComponentGroup.cxx b/Source/CPack/cmCPackComponentGroup.cxx
index 2d41e59..b847589 100644
--- a/Source/CPack/cmCPackComponentGroup.cxx
+++ b/Source/CPack/cmCPackComponentGroup.cxx
@@ -14,8 +14,8 @@
 
 #include "cmSystemTools.h"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 //----------------------------------------------------------------------
 unsigned long cmCPackComponent::GetInstalledSize(
diff --git a/Source/CPack/cmCPackCygwinBinaryGenerator.cxx b/Source/CPack/cmCPackCygwinBinaryGenerator.cxx
index 1f905c0..687689c 100644
--- a/Source/CPack/cmCPackCygwinBinaryGenerator.cxx
+++ b/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>
 
diff --git a/Source/CPack/cmCPackCygwinSourceGenerator.cxx b/Source/CPack/cmCPackCygwinSourceGenerator.cxx
index f5cb53c..d84b1ee 100644
--- a/Source/CPack/cmCPackCygwinSourceGenerator.cxx
+++ b/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
 
 //----------------------------------------------------------------------
diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx
index 9673942..9e17bc8 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/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); */
diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx
index eccc5cf..b9c9c85 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/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>
 
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 3eca280..6cc67e7 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/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__)
diff --git a/Source/CPack/cmCPackGeneratorFactory.cxx b/Source/CPack/cmCPackGeneratorFactory.cxx
index 4626142..669964d 100644
--- a/Source/CPack/cmCPackGeneratorFactory.cxx
+++ b/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"
 
 
 //----------------------------------------------------------------------
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx
index 5ba639f..eeb46fd 100644
--- a/Source/CPack/cmCPackNSISGenerator.cxx
+++ b/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
diff --git a/Source/CPack/cmCPackOSXX11Generator.cxx b/Source/CPack/cmCPackOSXX11Generator.cxx
index cde08b1..1d7ef69 100644
--- a/Source/CPack/cmCPackOSXX11Generator.cxx
+++ b/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>
 
 //----------------------------------------------------------------------
diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx b/Source/CPack/cmCPackPackageMakerGenerator.cxx
index 8fdc036..4f6238e 100644
--- a/Source/CPack/cmCPackPackageMakerGenerator.cxx
+++ b/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>
 
diff --git a/Source/CPack/cmCPackSTGZGenerator.cxx b/Source/CPack/cmCPackSTGZGenerator.cxx
index 68b893f..8a83666 100644
--- a/Source/CPack/cmCPackSTGZGenerator.cxx
+++ b/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>
 
 //----------------------------------------------------------------------
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index c08897f..813fb01 100644
--- a/Source/CPack/cpack.cxx
+++ b/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] =
diff --git a/Source/CTest/cmCTestBatchTestHandler.cxx b/Source/CTest/cmCTestBatchTestHandler.cxx
index e462d4a..41f4f12 100644
--- a/Source/CTest/cmCTestBatchTestHandler.cxx
+++ b/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>
 
diff --git a/Source/CTest/cmCTestBatchTestHandler.h b/Source/CTest/cmCTestBatchTestHandler.h
index 5ff0025..b0fc8d5 100644
--- a/Source/CTest/cmCTestBatchTestHandler.h
+++ b/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
diff --git a/Source/CTest/cmCTestBuildAndTestHandler.cxx b/Source/CTest/cmCTestBuildAndTestHandler.cxx
index 20d303d..52433da 100644
--- a/Source/CTest/cmCTestBuildAndTestHandler.cxx
+++ b/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()
diff --git a/Source/CTest/cmCTestBuildCommand.cxx b/Source/CTest/cmCTestBuildCommand.cxx
index 27e22c4..0cfcc64 100644
--- a/Source/CTest/cmCTestBuildCommand.cxx
+++ b/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"
 
 
 //----------------------------------------------------------------------------
diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx
index 0d74f48..1b31533 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/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[] = {
diff --git a/Source/CTest/cmCTestCVS.cxx b/Source/CTest/cmCTestCVS.cxx
index 0fb3fec..58d8689 100644
--- a/Source/CTest/cmCTestCVS.cxx
+++ b/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)
diff --git a/Source/CTest/cmCTestConfigureCommand.cxx b/Source/CTest/cmCTestConfigureCommand.cxx
index ba4dab2..8f15c6d 100644
--- a/Source/CTest/cmCTestConfigureCommand.cxx
+++ b/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()
 {
diff --git a/Source/CTest/cmCTestConfigureHandler.cxx b/Source/CTest/cmCTestConfigureHandler.cxx
index 2e8aeb9..e9f8f39 100644
--- a/Source/CTest/cmCTestConfigureHandler.cxx
+++ b/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>
 
 
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index b05496a..79eb346 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/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))
 
diff --git a/Source/CTest/cmCTestCurl.cxx b/Source/CTest/cmCTestCurl.cxx
index fb6cc00..0367d7d 100644
--- a/Source/CTest/cmCTestCurl.cxx
+++ b/Source/CTest/cmCTestCurl.cxx
@@ -11,8 +11,8 @@
 ============================================================================*/
 #include "cmCTestCurl.h"
 
-#include "cmSystemTools.h"
 #include "cmCTest.h"
+#include "cmSystemTools.h"
 
 cmCTestCurl::cmCTestCurl(cmCTest* ctest)
 {
diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx
index 1d6bdce..3ff12c1 100644
--- a/Source/CTest/cmCTestGIT.cxx
+++ b/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,
diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx
index 749a5be..03b06f8 100644
--- a/Source/CTest/cmCTestLaunch.cxx
+++ b/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
 
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index 3d0f16a..9e3ba57 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/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
 {
diff --git a/Source/CTest/cmCTestMemCheckHandler.h b/Source/CTest/cmCTestMemCheckHandler.h
index 01311b6..6232924 100644
--- a/Source/CTest/cmCTestMemCheckHandler.h
+++ b/Source/CTest/cmCTestMemCheckHandler.h
@@ -16,8 +16,8 @@
 #include "cmCTestTestHandler.h"
 
 #include "cmListFileCache.h"
-#include <vector>
 #include <string>
+#include <vector>
 
 class cmMakefile;
 class cmXMLWriter;
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index df6aff1..1434518 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/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
 {
diff --git a/Source/CTest/cmCTestP4.cxx b/Source/CTest/cmCTestP4.cxx
index 5e0c54a..f7c960c 100644
--- a/Source/CTest/cmCTestP4.cxx
+++ b/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):
diff --git a/Source/CTest/cmCTestP4.h b/Source/CTest/cmCTestP4.h
index 6f907d1..d666bd8 100644
--- a/Source/CTest/cmCTestP4.h
+++ b/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
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index 34ad2d0..5d159c1 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/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"
 
diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx
index ee15271..4485d34 100644
--- a/Source/CTest/cmCTestScriptHandler.cxx
+++ b/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)
diff --git a/Source/CTest/cmCTestStartCommand.cxx b/Source/CTest/cmCTestStartCommand.cxx
index 36576c5..4a38dc6 100644
--- a/Source/CTest/cmCTestStartCommand.cxx
+++ b/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()
 {
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index 3b682e3..6a65839 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/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>
 
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index f91fa5f..d8229da 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/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>
 
diff --git a/Source/CTest/cmCTestUpdateHandler.cxx b/Source/CTest/cmCTestUpdateHandler.cxx
index bf2f34a..b1b0a21 100644
--- a/Source/CTest/cmCTestUpdateHandler.cxx
+++ b/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[] =
diff --git a/Source/CTest/cmParseBlanketJSCoverage.cxx b/Source/CTest/cmParseBlanketJSCoverage.cxx
index 26dd425..1f1db3e 100644
--- a/Source/CTest/cmParseBlanketJSCoverage.cxx
+++ b/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
diff --git a/Source/CTest/cmParseCacheCoverage.cxx b/Source/CTest/cmParseCacheCoverage.cxx
index 38e0ac2..f838087 100644
--- a/Source/CTest/cmParseCacheCoverage.cxx
+++ b/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(
diff --git a/Source/CTest/cmParseDelphiCoverage.cxx b/Source/CTest/cmParseDelphiCoverage.cxx
index ed52626..09c4f02 100644
--- a/Source/CTest/cmParseDelphiCoverage.cxx
+++ b/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
diff --git a/Source/CTest/cmParseGTMCoverage.cxx b/Source/CTest/cmParseGTMCoverage.cxx
index 5692246..ae7dedb 100644
--- a/Source/CTest/cmParseGTMCoverage.cxx
+++ b/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,
diff --git a/Source/CTest/cmParseJacocoCoverage.cxx b/Source/CTest/cmParseJacocoCoverage.cxx
index f5386c9..d9c4ffb 100644
--- a/Source/CTest/cmParseJacocoCoverage.cxx
+++ b/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
diff --git a/Source/CTest/cmParseMumpsCoverage.cxx b/Source/CTest/cmParseMumpsCoverage.cxx
index 6567906..d0c7599 100644
--- a/Source/CTest/cmParseMumpsCoverage.cxx
+++ b/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(
diff --git a/Source/CursesDialog/ccmake.cxx b/Source/CursesDialog/ccmake.cxx
index 7bff0f0..b7c22b1 100644
--- a/Source/CursesDialog/ccmake.cxx
+++ b/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>
diff --git a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
index ace5c43..40c0eb6 100644
--- a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
+++ b/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>
 
diff --git a/Source/CursesDialog/cmCursesLongMessageForm.cxx b/Source/CursesDialog/cmCursesLongMessageForm.cxx
index cd8f3f1..776d828 100644
--- a/Source/CursesDialog/cmCursesLongMessageForm.cxx
+++ b/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)
diff --git a/Source/CursesDialog/cmCursesMainForm.cxx b/Source/CursesDialog/cmCursesMainForm.cxx
index 8c2a8b4..2aafc8b 100644
--- a/Source/CursesDialog/cmCursesMainForm.cxx
+++ b/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"
 
 
diff --git a/Source/QtDialog/AddCacheEntry.cxx b/Source/QtDialog/AddCacheEntry.cxx
index b575f75..efb2b65 100644
--- a/Source/QtDialog/AddCacheEntry.cxx
+++ b/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;
diff --git a/Source/QtDialog/AddCacheEntry.h b/Source/QtDialog/AddCacheEntry.h
index c327915..7c08af6 100644
--- a/Source/QtDialog/AddCacheEntry.h
+++ b/Source/QtDialog/AddCacheEntry.h
@@ -15,9 +15,9 @@
 
 #include "QCMake.h"
 
-#include <QWidget>
 #include <QCheckBox>
 #include <QStringList>
+#include <QWidget>
 
 #include "ui_AddCacheEntry.h"
 
diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
index 72adb8d..b44219f 100644
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/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] =
diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx
index f25f402..945739d 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/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"
diff --git a/Source/QtDialog/CMakeSetupDialog.h b/Source/QtDialog/CMakeSetupDialog.h
index eaac61c..f9624d1 100644
--- a/Source/QtDialog/CMakeSetupDialog.h
+++ b/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;
diff --git a/Source/QtDialog/FirstConfigure.cxx b/Source/QtDialog/FirstConfigure.cxx
index 64fe676..5c0af2b 100644
--- a/Source/QtDialog/FirstConfigure.cxx
+++ b/Source/QtDialog/FirstConfigure.cxx
@@ -3,9 +3,9 @@
 
 #include "Compilers.h"
 
-#include <QSettings>
-#include <QRadioButton>
 #include <QComboBox>
+#include <QRadioButton>
+#include <QSettings>
 #include <QVBoxLayout>
 
 
diff --git a/Source/QtDialog/QCMake.cxx b/Source/QtDialog/QCMake.cxx
index dd7c138..28be341 100644
--- a/Source/QtDialog/QCMake.cxx
+++ b/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
diff --git a/Source/QtDialog/QCMake.h b/Source/QtDialog/QCMake.h
index ca6f0f4..5cae06d 100644
--- a/Source/QtDialog/QCMake.h
+++ b/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
diff --git a/Source/QtDialog/QCMakeCacheView.cxx b/Source/QtDialog/QCMakeCacheView.cxx
index bae6a30..f64a78a 100644
--- a/Source/QtDialog/QCMakeCacheView.cxx
+++ b/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"
 
diff --git a/Source/QtDialog/QCMakeCacheView.h b/Source/QtDialog/QCMakeCacheView.h
index 5ac0966..5631b86 100644
--- a/Source/QtDialog/QCMakeCacheView.h
+++ b/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;
diff --git a/Source/QtDialog/QCMakeWidgets.cxx b/Source/QtDialog/QCMakeWidgets.cxx
index 41f98b5..7803ef3 100644
--- a/Source/QtDialog/QCMakeWidgets.cxx
+++ b/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)
diff --git a/Source/QtDialog/QCMakeWidgets.h b/Source/QtDialog/QCMakeWidgets.h
index 2207282..759b635 100644
--- a/Source/QtDialog/QCMakeWidgets.h
+++ b/Source/QtDialog/QCMakeWidgets.h
@@ -13,9 +13,9 @@
 #ifndef QCMakeWidgets_h
 #define QCMakeWidgets_h
 
-#include <QLineEdit>
 #include <QComboBox>
 #include <QCompleter>
+#include <QLineEdit>
 
 class QToolButton;
 
diff --git a/Source/QtDialog/RegexExplorer.h b/Source/QtDialog/RegexExplorer.h
index 2ac9c3e..3ac8a24 100644
--- a/Source/QtDialog/RegexExplorer.h
+++ b/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"
 
diff --git a/Source/QtDialog/WarningMessagesDialog.h b/Source/QtDialog/WarningMessagesDialog.h
index 6c274a7..4bb739c 100644
--- a/Source/QtDialog/WarningMessagesDialog.h
+++ b/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.
diff --git a/Source/bindexplib.cxx b/Source/bindexplib.cxx
index e7263ae..b179f83 100644
--- a/Source/bindexplib.cxx
+++ b/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 */
diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx
index 5296cbb..e40ecf4 100644
--- a/Source/cmAddLibraryCommand.cxx
+++ b/Source/cmAddLibraryCommand.cxx
@@ -11,8 +11,8 @@
 ============================================================================*/
 #include "cmAddLibraryCommand.h"
 
-#include "cmake.h"
 #include "cmState.h"
+#include "cmake.h"
 
 // cmLibraryCommand
 bool cmAddLibraryCommand
diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index e62a2ed..b06b2f5 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/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
diff --git a/Source/cmBootstrapCommands1.cxx b/Source/cmBootstrapCommands1.cxx
index 0782b3b..2de8770 100644
--- a/Source/cmBootstrapCommands1.cxx
+++ b/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)
 {
diff --git a/Source/cmBootstrapCommands2.cxx b/Source/cmBootstrapCommands2.cxx
index e522d8c..38d008d 100644
--- a/Source/cmBootstrapCommands2.cxx
+++ b/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"
diff --git a/Source/cmCPackPropertiesGenerator.cxx b/Source/cmCPackPropertiesGenerator.cxx
index 35b3d59..3eef55a 100644
--- a/Source/cmCPackPropertiesGenerator.cxx
+++ b/Source/cmCPackPropertiesGenerator.cxx
@@ -1,7 +1,7 @@
 #include "cmCPackPropertiesGenerator.h"
 
-#include "cmOutputConverter.h"
 #include "cmLocalGenerator.h"
+#include "cmOutputConverter.h"
 
 cmCPackPropertiesGenerator::cmCPackPropertiesGenerator(
   cmLocalGenerator* lg,
diff --git a/Source/cmCPackPropertiesGenerator.h b/Source/cmCPackPropertiesGenerator.h
index eec3df0..e54bcab 100644
--- a/Source/cmCPackPropertiesGenerator.h
+++ b/Source/cmCPackPropertiesGenerator.h
@@ -12,8 +12,8 @@
 #ifndef cmCPackPropertiesGenerator_h
 #define cmCPackPropertiesGenerator_h
 
-#include "cmScriptGenerator.h"
 #include "cmInstalledFile.h"
+#include "cmScriptGenerator.h"
 
 class cmLocalGenerator;
 
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 4ba15ac..1f07a07 100644
--- a/Source/cmCTest.cxx
+++ b/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>
 
diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index 2cda018..afa2ba7 100644
--- a/Source/cmCacheManager.cxx
+++ b/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()
diff --git a/Source/cmCommand.h b/Source/cmCommand.h
index d7f5c99..d5e394d 100644
--- a/Source/cmCommand.h
+++ b/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.
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 2796fdf..f546fc8 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/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>
 
diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index 9b0bfaa..ea23308 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -14,8 +14,8 @@
 
 #include "cmStandardIncludes.h"
 
-#include "cmLinkItem.h"
 #include "cmGraphAdjacencyList.h"
+#include "cmLinkItem.h"
 
 #include <queue>
 
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 50d8324..f88d58c 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/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>
 
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 586b5bf..7f12006 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/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"
 
diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx
index c43ec47..3711b9b 100644
--- a/Source/cmConditionEvaluator.cxx
+++ b/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";
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index c38429f..231c260 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/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>
diff --git a/Source/cmCryptoHash.cxx b/Source/cmCryptoHash.cxx
index 6616218..d1112f2 100644
--- a/Source/cmCryptoHash.cxx
+++ b/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)
diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index dc06678..5d3a1ce 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/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(
diff --git a/Source/cmDefinePropertyCommand.cxx b/Source/cmDefinePropertyCommand.cxx
index 0334948..47fc22e 100644
--- a/Source/cmDefinePropertyCommand.cxx
+++ b/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 &)
diff --git a/Source/cmDepends.cxx b/Source/cmDepends.cxx
index d419011..40b552b 100644
--- a/Source/cmDepends.cxx
+++ b/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):
diff --git a/Source/cmDependsC.cxx b/Source/cmDependsC.cxx
index 6cdd4c1..6bf815e 100644
--- a/Source/cmDependsC.cxx
+++ b/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
diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx
index 80f560f..a7909b2 100644
--- a/Source/cmDependsFortran.cxx
+++ b/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
diff --git a/Source/cmDocumentation.cxx b/Source/cmDocumentation.cxx
index 4f34755..81e6796 100644
--- a/Source/cmDocumentation.cxx
+++ b/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>
 
diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx
index 8d8e396..0e6f577 100644
--- a/Source/cmELF.cxx
+++ b/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>
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index dcb2187..87ea2c2 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/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"
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx
index 94e1d92..bbd07db 100644
--- a/Source/cmExportCommand.cxx
+++ b/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"
 
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index c005995..2b3ce14 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/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)
diff --git a/Source/cmExportFileGenerator.h b/Source/cmExportFileGenerator.h
index 18f0b00..9fc02a4 100644
--- a/Source/cmExportFileGenerator.h
+++ b/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)
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 71418e8..0ea24c1 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/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
diff --git a/Source/cmExportLibraryDependenciesCommand.cxx b/Source/cmExportLibraryDependenciesCommand.cxx
index 132df74..a715070 100644
--- a/Source/cmExportLibraryDependenciesCommand.cxx
+++ b/Source/cmExportLibraryDependenciesCommand.cxx
@@ -11,10 +11,10 @@
 ============================================================================*/
 #include "cmExportLibraryDependenciesCommand.h"
 
-#include "cmGlobalGenerator.h"
 #include "cmGeneratedFileStream.h"
-#include "cmake.h"
+#include "cmGlobalGenerator.h"
 #include "cmVersion.h"
+#include "cmake.h"
 
 #include <cmsys/auto_ptr.hxx>
 
diff --git a/Source/cmExportSet.cxx b/Source/cmExportSet.cxx
index e7739fb..83c4fdc 100644
--- a/Source/cmExportSet.cxx
+++ b/Source/cmExportSet.cxx
@@ -12,9 +12,9 @@
 
 #include "cmExportSet.h"
 
-#include "cmTargetExport.h"
 #include "cmAlgorithms.h"
 #include "cmLocalGenerator.h"
+#include "cmTargetExport.h"
 
 cmExportSet::~cmExportSet()
 {
diff --git a/Source/cmExportSetMap.cxx b/Source/cmExportSetMap.cxx
index b0021e7..d267cd3 100644
--- a/Source/cmExportSetMap.cxx
+++ b/Source/cmExportSetMap.cxx
@@ -12,8 +12,8 @@
 
 #include "cmExportSetMap.h"
 
-#include "cmExportSet.h"
 #include "cmAlgorithms.h"
+#include "cmExportSet.h"
 
 cmExportSet* cmExportSetMap::operator[](const std::string &name)
 {
diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index 83127e7..5bafa1c 100644
--- a/Source/cmExportTryCompileFileGenerator.cxx
+++ b/Source/cmExportTryCompileFileGenerator.cxx
@@ -13,9 +13,9 @@
 #include "cmExportTryCompileFileGenerator.h"
 
 #include "cmGeneratedFileStream.h"
+#include "cmGeneratorExpressionDAGChecker.h"
 #include "cmGlobalGenerator.h"
 #include "cmLocalGenerator.h"
-#include "cmGeneratorExpressionDAGChecker.h"
 
 //----------------------------------------------------------------------------
 cmExportTryCompileFileGenerator::cmExportTryCompileFileGenerator(
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 2d26cc3..f6be583 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -12,14 +12,14 @@
 ============================================================================*/
 #include "cmExtraCodeBlocksGenerator.h"
 
+#include "cmGeneratedFileStream.h"
 #include "cmGlobalUnixMakefileGenerator3.h"
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
-#include "cmake.h"
 #include "cmSourceFile.h"
-#include "cmGeneratedFileStream.h"
 #include "cmSystemTools.h"
 #include "cmXMLWriter.h"
+#include "cmake.h"
 
 #include <cmsys/SystemTools.hxx>
 
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index e2b84c6..6c7d5f6 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -13,19 +13,19 @@
 ============================================================================*/
 #include "cmExtraCodeLiteGenerator.h"
 
+#include "cmGeneratedFileStream.h"
 #include "cmGlobalUnixMakefileGenerator3.h"
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
-#include "cmake.h"
 #include "cmSourceFile.h"
-#include "cmGeneratedFileStream.h"
 #include "cmSystemTools.h"
+#include "cmake.h"
 
-#include <cmsys/SystemTools.hxx>
-#include <cmsys/SystemInformation.hxx>
-#include <cmsys/Directory.hxx>
 #include "cmStandardIncludes.h"
 #include "cmXMLWriter.h"
+#include <cmsys/Directory.hxx>
+#include <cmsys/SystemInformation.hxx>
+#include <cmsys/SystemTools.hxx>
 
 //----------------------------------------------------------------------------
 void cmExtraCodeLiteGenerator::GetDocumentation(cmDocumentationEntry& entry,
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 22b2f91..40cc904 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -13,18 +13,18 @@
 ============================================================================*/
 #include "cmExtraEclipseCDT4Generator.h"
 
+#include "cmGeneratedFileStream.h"
 #include "cmGlobalUnixMakefileGenerator3.h"
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
-#include "cmGeneratedFileStream.h"
+#include "cmSourceFile.h"
 #include "cmState.h"
 #include "cmTarget.h"
-#include "cmSourceFile.h"
 #include "cmXMLWriter.h"
 
 #include "cmSystemTools.h"
-#include <stdlib.h>
 #include <assert.h>
+#include <stdlib.h>
 
 static void AppendAttribute(cmXMLWriter& xml, const char* keyval)
 {
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index 8e60d50..4b779d8 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -12,13 +12,13 @@
 ============================================================================*/
 #include "cmExtraKateGenerator.h"
 
+#include "cmGeneratedFileStream.h"
 #include "cmGlobalUnixMakefileGenerator3.h"
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
-#include "cmake.h"
 #include "cmSourceFile.h"
-#include "cmGeneratedFileStream.h"
 #include "cmSystemTools.h"
+#include "cmake.h"
 
 #include <cmsys/SystemTools.hxx>
 
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index f84eeb0..a8367c4 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -12,7 +12,6 @@
 ============================================================================*/
 #include "cmExtraSublimeTextGenerator.h"
 
-#include "cmake.h"
 #include "cmGeneratedFileStream.h"
 #include "cmGeneratorTarget.h"
 #include "cmGlobalUnixMakefileGenerator3.h"
@@ -21,6 +20,7 @@
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
 #include "cmSystemTools.h"
+#include "cmake.h"
 
 #include <cmsys/SystemTools.hxx>
 
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 42922e1..035b97f 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -11,14 +11,14 @@
 ============================================================================*/
 #include "cmFileCommand.h"
 
+#include "cmAlgorithms.h"
+#include "cmCryptoHash.h"
 #include "cmCryptoHash.h"
-#include "cmake.h"
-#include "cmHexFileConverter.h"
-#include "cmInstallType.h"
 #include "cmFileTimeComparison.h"
 #include "cmGlobalGenerator.h"
-#include "cmCryptoHash.h"
-#include "cmAlgorithms.h"
+#include "cmHexFileConverter.h"
+#include "cmInstallType.h"
+#include "cmake.h"
 
 #include "cmTimestamp.h"
 
@@ -28,16 +28,16 @@
 #endif
 
 #undef GetCurrentDirectory
-#include <assert.h>
 #include <sys/types.h>
+#include <assert.h>
 #include <sys/stat.h>
 
-#include <cmsys/auto_ptr.hxx>
 #include <cmsys/Directory.hxx>
+#include <cmsys/Encoding.hxx>
+#include <cmsys/FStream.hxx>
 #include <cmsys/Glob.hxx>
 #include <cmsys/RegularExpression.hxx>
-#include <cmsys/FStream.hxx>
-#include <cmsys/Encoding.hxx>
+#include <cmsys/auto_ptr.hxx>
 
 // Table of permissions flags.
 #if defined(_WIN32) && !defined(__CYGWIN__)
diff --git a/Source/cmFileLock.cxx b/Source/cmFileLock.cxx
index e6aa5f4..0d41c53 100644
--- a/Source/cmFileLock.cxx
+++ b/Source/cmFileLock.cxx
@@ -12,8 +12,8 @@
 
 #include "cmFileLock.h"
 
-#include <assert.h>
 #include "cmFileLockResult.h"
+#include <assert.h>
 
 // Common implementation
 
diff --git a/Source/cmFileLockPool.cxx b/Source/cmFileLockPool.cxx
index 3710eb0..939a8f5 100644
--- a/Source/cmFileLockPool.cxx
+++ b/Source/cmFileLockPool.cxx
@@ -14,9 +14,9 @@
 
 #include <assert.h>
 
+#include "cmAlgorithms.h"
 #include "cmFileLock.h"
 #include "cmFileLockResult.h"
-#include "cmAlgorithms.h"
 
 cmFileLockPool::cmFileLockPool()
 {
diff --git a/Source/cmFileLockUnix.cxx b/Source/cmFileLockUnix.cxx
index 36a2d72..f5e77be 100644
--- a/Source/cmFileLockUnix.cxx
+++ b/Source/cmFileLockUnix.cxx
@@ -12,11 +12,11 @@
 
 #include "cmFileLock.h"
 
+#include "cmSystemTools.h"
 #include <errno.h> // errno
-#include <stdio.h> // SEEK_SET
 #include <fcntl.h>
+#include <stdio.h> // SEEK_SET
 #include <unistd.h>
-#include "cmSystemTools.h"
 
 cmFileLock::cmFileLock(): File(-1)
 {
diff --git a/Source/cmFileLockWin32.cxx b/Source/cmFileLockWin32.cxx
index dc65948..e40ae2c 100644
--- a/Source/cmFileLockWin32.cxx
+++ b/Source/cmFileLockWin32.cxx
@@ -12,8 +12,8 @@
 
 #include "cmFileLock.h"
 
-#include <windows.h> // CreateFileW
 #include "cmSystemTools.h"
+#include <windows.h> // CreateFileW
 
 cmFileLock::cmFileLock(): File(INVALID_HANDLE_VALUE)
 {
diff --git a/Source/cmFindCommon.cxx b/Source/cmFindCommon.cxx
index 1286a00..d70fa89 100644
--- a/Source/cmFindCommon.cxx
+++ b/Source/cmFindCommon.cxx
@@ -11,8 +11,8 @@
 ============================================================================*/
 #include "cmFindCommon.h"
 
-#include <functional>
 #include <algorithm>
+#include <functional>
 
 //----------------------------------------------------------------------------
 cmFindCommon::PathGroup cmFindCommon::PathGroup::All("ALL");
diff --git a/Source/cmFindCommon.h b/Source/cmFindCommon.h
index 3fefc8d..2b87427 100644
--- a/Source/cmFindCommon.h
+++ b/Source/cmFindCommon.h
@@ -13,8 +13,8 @@
 #define cmFindCommon_h
 
 #include "cmCommand.h"
-#include "cmSearchPath.h"
 #include "cmPathLabel.h"
+#include "cmSearchPath.h"
 
 /** \class cmFindCommon
  * \brief Base class for FIND_XXX implementations.
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 64176e7..97f1563 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -11,19 +11,19 @@
 ============================================================================*/
 #include "cmFindPackageCommand.h"
 
+#include "cmAlgorithms.h"
 #include <cmsys/Directory.hxx>
-#include <cmsys/RegularExpression.hxx>
 #include <cmsys/Encoding.hxx>
-#include "cmAlgorithms.h"
+#include <cmsys/RegularExpression.hxx>
 
 #ifdef CMAKE_BUILD_WITH_CMAKE
 #include "cmVariableWatch.h"
 #endif
 
 #if defined(__HAIKU__)
-#include <string.h>
 #include <FindDirectory.h>
 #include <StorageDefs.h>
+#include <string.h>
 #endif
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index 6796a01..d0ed28d 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -15,10 +15,10 @@
 #include "cmAlgorithms.h"
 #include "cmSystemTools.h"
 
+#include "cmGeneratorExpressionDAGChecker.h"
 #include "cmGeneratorExpressionEvaluator.h"
 #include "cmGeneratorExpressionLexer.h"
 #include "cmGeneratorExpressionParser.h"
-#include "cmGeneratorExpressionDAGChecker.h"
 
 //----------------------------------------------------------------------------
 cmGeneratorExpression::cmGeneratorExpression(
diff --git a/Source/cmGeneratorExpressionContext.h b/Source/cmGeneratorExpressionContext.h
index e802138..68cdf49 100644
--- a/Source/cmGeneratorExpressionContext.h
+++ b/Source/cmGeneratorExpressionContext.h
@@ -14,8 +14,8 @@
 
 #include "cmListFileCache.h"
 
-#include <set>
 #include <map>
+#include <set>
 #include <string>
 
 class cmGeneratorTarget;
diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx b/Source/cmGeneratorExpressionDAGChecker.cxx
index c3b0272..00a497c 100644
--- a/Source/cmGeneratorExpressionDAGChecker.cxx
+++ b/Source/cmGeneratorExpressionDAGChecker.cxx
@@ -12,8 +12,8 @@
 
 #include "cmGeneratorExpressionDAGChecker.h"
 
-#include "cmLocalGenerator.h"
 #include "cmAlgorithms.h"
+#include "cmLocalGenerator.h"
 
 //----------------------------------------------------------------------------
 cmGeneratorExpressionDAGChecker::cmGeneratorExpressionDAGChecker(
diff --git a/Source/cmGeneratorExpressionEvaluationFile.cxx b/Source/cmGeneratorExpressionEvaluationFile.cxx
index 4ac2a0d..5d8050b 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.cxx
+++ b/Source/cmGeneratorExpressionEvaluationFile.cxx
@@ -12,11 +12,11 @@
 
 #include "cmGeneratorExpressionEvaluationFile.h"
 
-#include "cmMakefile.h"
-#include "cmLocalGenerator.h"
+#include "cmGeneratedFileStream.h"
 #include "cmGlobalGenerator.h"
+#include "cmLocalGenerator.h"
+#include "cmMakefile.h"
 #include "cmSourceFile.h"
-#include "cmGeneratedFileStream.h"
 #include <cmsys/FStream.hxx>
 
 #include <assert.h>
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index 0fe864c..d9dd3b1 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -11,14 +11,14 @@
 ============================================================================*/
 #include "cmGeneratorExpressionEvaluator.h"
 
-#include "cmMakefile.h"
-#include "cmGeneratorExpressionParser.h"
-#include "cmGeneratorExpressionDAGChecker.h"
+#include "cmAlgorithms.h"
 #include "cmGeneratorExpression.h"
-#include "cmLocalGenerator.h"
+#include "cmGeneratorExpressionDAGChecker.h"
+#include "cmGeneratorExpressionParser.h"
 #include "cmGlobalGenerator.h"
+#include "cmLocalGenerator.h"
+#include "cmMakefile.h"
 #include "cmSourceFile.h"
-#include "cmAlgorithms.h"
 
 #include <cmsys/String.h>
 
diff --git a/Source/cmGeneratorExpressionEvaluator.h b/Source/cmGeneratorExpressionEvaluator.h
index ba27e5a..b60bb5d 100644
--- a/Source/cmGeneratorExpressionEvaluator.h
+++ b/Source/cmGeneratorExpressionEvaluator.h
@@ -16,8 +16,8 @@
 
 #include "cmListFileCache.h"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 struct cmGeneratorExpressionDAGChecker;
 struct cmGeneratorExpressionNode;
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 7f3d7d6..a9227b0 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -12,10 +12,10 @@
 
 #include "cmGeneratorExpressionNode.h"
 
-#include "cmGlobalGenerator.h"
 #include "cmAlgorithms.h"
-#include "cmOutputConverter.h"
+#include "cmGlobalGenerator.h"
 #include "cmMakefile.h"
+#include "cmOutputConverter.h"
 
 //----------------------------------------------------------------------------
 std::string cmGeneratorExpressionNode::EvaluateDependentExpression(
diff --git a/Source/cmGeneratorExpressionNode.h b/Source/cmGeneratorExpressionNode.h
index b803d12..2d66727 100644
--- a/Source/cmGeneratorExpressionNode.h
+++ b/Source/cmGeneratorExpressionNode.h
@@ -14,9 +14,9 @@
 
 #include "cmGeneratorExpression.h"
 
+#include "cmGeneratorExpressionDAGChecker.h"
 #include "cmGeneratorExpressionEvaluator.h"
 #include "cmGeneratorExpressionParser.h"
-#include "cmGeneratorExpressionDAGChecker.h"
 #include "cmLocalGenerator.h"
 #include "cmSourceFile.h"
 
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index d7c2782..f115d83 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -11,21 +11,21 @@
 ============================================================================*/
 #include "cmGeneratorTarget.h"
 
-#include "cmTarget.h"
-#include "cmMakefile.h"
-#include "cmLocalGenerator.h"
-#include "cmGlobalGenerator.h"
-#include "cmSourceFile.h"
-#include "cmGeneratorExpression.h"
-#include "cmGeneratorExpressionDAGChecker.h"
+#include "cmAlgorithms.h"
 #include "cmComputeLinkInformation.h"
 #include "cmCustomCommandGenerator.h"
-#include "cmAlgorithms.h"
+#include "cmGeneratorExpression.h"
+#include "cmGeneratorExpressionDAGChecker.h"
+#include "cmGlobalGenerator.h"
+#include "cmLocalGenerator.h"
+#include "cmMakefile.h"
+#include "cmSourceFile.h"
+#include "cmTarget.h"
 
 #include <queue>
 
-#include <errno.h>
 #include "assert.h"
+#include <errno.h>
 
 #if defined(CMAKE_BUILD_WITH_CMAKE)
 #include <cmsys/hash_set.hxx>
diff --git a/Source/cmGetCMakePropertyCommand.cxx b/Source/cmGetCMakePropertyCommand.cxx
index 1a91183..2be4dec 100644
--- a/Source/cmGetCMakePropertyCommand.cxx
+++ b/Source/cmGetCMakePropertyCommand.cxx
@@ -11,10 +11,10 @@
 ============================================================================*/
 #include "cmGetCMakePropertyCommand.h"
 
+#include "cmAlgorithms.h"
 #include "cmGlobalGenerator.h"
-#include "cmake.h"
 #include "cmState.h"
-#include "cmAlgorithms.h"
+#include "cmake.h"
 
 // cmGetCMakePropertyCommand
 bool cmGetCMakePropertyCommand
diff --git a/Source/cmGetPropertyCommand.cxx b/Source/cmGetPropertyCommand.cxx
index 617a811..bbeae4b 100644
--- a/Source/cmGetPropertyCommand.cxx
+++ b/Source/cmGetPropertyCommand.cxx
@@ -11,12 +11,12 @@
 ============================================================================*/
 #include "cmGetPropertyCommand.h"
 
-#include "cmake.h"
-#include "cmState.h"
-#include "cmTest.h"
 #include "cmGlobalGenerator.h"
-#include "cmSourceFile.h"
 #include "cmPropertyDefinition.h"
+#include "cmSourceFile.h"
+#include "cmState.h"
+#include "cmTest.h"
+#include "cmake.h"
 
 //----------------------------------------------------------------------------
 cmGetPropertyCommand::cmGetPropertyCommand()
diff --git a/Source/cmGetTestPropertyCommand.cxx b/Source/cmGetTestPropertyCommand.cxx
index bf34589..3d7a013 100644
--- a/Source/cmGetTestPropertyCommand.cxx
+++ b/Source/cmGetTestPropertyCommand.cxx
@@ -11,8 +11,8 @@
 ============================================================================*/
 #include "cmGetTestPropertyCommand.h"
 
-#include "cmake.h"
 #include "cmTest.h"
+#include "cmake.h"
 
 // cmGetTestPropertyCommand
 bool cmGetTestPropertyCommand
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index b7b122c..f845c59 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -11,12 +11,12 @@
 ============================================================================*/
 #include "cmGhsMultiTargetGenerator.h"
 
+#include "cmGeneratedFileStream.h"
 #include "cmGlobalGhsMultiGenerator.h"
 #include "cmLocalGhsMultiGenerator.h"
 #include "cmMakefile.h"
-#include "cmTarget.h"
-#include "cmGeneratedFileStream.h"
 #include "cmSourceFile.h"
+#include "cmTarget.h"
 #include <assert.h>
 #include <cmAlgorithms.h>
 
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 5040cfd..84ade25 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -18,31 +18,31 @@
 
 #include "cmGlobalGenerator.h"
 
-#include "cmLocalGenerator.h"
+#include "cmAlgorithms.h"
+#include "cmCPackPropertiesGenerator.h"
+#include "cmComputeTargetDepends.h"
+#include "cmExportBuildFileGenerator.h"
 #include "cmExternalMakefileProjectGenerator.h"
-#include "cmake.h"
-#include "cmState.h"
+#include "cmGeneratedFileStream.h"
+#include "cmGeneratorExpression.h"
+#include "cmGeneratorTarget.h"
+#include "cmInstallGenerator.h"
+#include "cmLocalGenerator.h"
 #include "cmMakefile.h"
 #include "cmQtAutoGeneratorInitializer.h"
 #include "cmSourceFile.h"
-#include "cmVersion.h"
+#include "cmState.h"
 #include "cmTargetExport.h"
-#include "cmComputeTargetDepends.h"
-#include "cmGeneratedFileStream.h"
-#include "cmGeneratorTarget.h"
-#include "cmGeneratorExpression.h"
-#include "cmExportBuildFileGenerator.h"
-#include "cmCPackPropertiesGenerator.h"
-#include "cmAlgorithms.h"
-#include "cmInstallGenerator.h"
+#include "cmVersion.h"
+#include "cmake.h"
 
 #include <cmsys/Directory.hxx>
 #include <cmsys/FStream.hxx>
 
 #if defined(CMAKE_BUILD_WITH_CMAKE)
-# include <cmsys/MD5.h>
 # include "cm_jsoncpp_value.h"
 # include "cm_jsoncpp_writer.h"
+# include <cmsys/MD5.h>
 #endif
 
 #include <stdlib.h> // required for atof
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 14c7d67..1576f09 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -15,13 +15,13 @@
 
 #include "cmStandardIncludes.h"
 
-#include "cmTarget.h" // For cmTargets
-#include "cmTargetDepend.h" // For cmTargetDependSet
-#include "cmSystemTools.h" // for cmSystemTools::OutputOption
 #include "cmExportSetMap.h" // For cmExportSetMap
-#include "cmGeneratorTarget.h"
 #include "cmGeneratorExpression.h"
+#include "cmGeneratorTarget.h"
 #include "cmState.h"
+#include "cmSystemTools.h"  // for cmSystemTools::OutputOption
+#include "cmTarget.h"       // For cmTargets
+#include "cmTargetDepend.h" // For cmTargetDependSet
 
 #if defined(CMAKE_BUILD_WITH_CMAKE)
 # include "cmFileLockPool.h"
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index e9a48c8..df7011c 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -11,13 +11,13 @@
 ============================================================================*/
 #include "cmGlobalGhsMultiGenerator.h"
 
+#include "cmGeneratedFileStream.h"
+#include "cmGhsMultiTargetGenerator.h"
 #include "cmLocalGhsMultiGenerator.h"
 #include "cmMakefile.h"
 #include "cmVersion.h"
-#include "cmGeneratedFileStream.h"
-#include "cmGhsMultiTargetGenerator.h"
-#include <cmsys/SystemTools.hxx>
 #include <cmAlgorithms.h>
+#include <cmsys/SystemTools.hxx>
 
 const char *cmGlobalGhsMultiGenerator::FILE_EXTENSION = ".gpj";
 const char *cmGlobalGhsMultiGenerator::DEFAULT_MAKE_PROGRAM = "gbuild";
diff --git a/Source/cmGlobalGhsMultiGenerator.h b/Source/cmGlobalGhsMultiGenerator.h
index b8d6ade..5de9d2b 100644
--- a/Source/cmGlobalGhsMultiGenerator.h
+++ b/Source/cmGlobalGhsMultiGenerator.h
@@ -14,8 +14,8 @@
 
 #include "cmGlobalGenerator.h"
 
-#include "cmGlobalGeneratorFactory.h"
 #include "cmGhsMultiGpj.h"
+#include "cmGlobalGeneratorFactory.h"
 
 class cmGeneratedFileStream;
 
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index 758caae..e2f1fc5 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -12,18 +12,18 @@
 ============================================================================*/
 #include "cmGlobalKdevelopGenerator.h"
 
+#include "cmGeneratedFileStream.h"
 #include "cmGlobalUnixMakefileGenerator3.h"
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
-#include "cmake.h"
 #include "cmSourceFile.h"
-#include "cmGeneratedFileStream.h"
 #include "cmSystemTools.h"
 #include "cmXMLWriter.h"
+#include "cmake.h"
 
-#include <cmsys/SystemTools.hxx>
 #include <cmsys/Directory.hxx>
 #include <cmsys/FStream.hxx>
+#include <cmsys/SystemTools.hxx>
 
 //----------------------------------------------------------------------------
 void cmGlobalKdevelopGenerator
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 88766fe..a8a7262 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -12,13 +12,13 @@
 ============================================================================*/
 #include "cmGlobalNinjaGenerator.h"
 
+#include "cmAlgorithms.h"
 #include "cmGeneratedFileStream.h"
 #include "cmGeneratorExpressionEvaluationFile.h"
 #include "cmGeneratorTarget.h"
 #include "cmLocalNinjaGenerator.h"
 #include "cmMakefile.h"
 #include "cmVersion.h"
-#include "cmAlgorithms.h"
 
 #include <algorithm>
 #include <assert.h>
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index e35aa2e..0098f1e 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -11,13 +11,13 @@
 ============================================================================*/
 #include "cmGlobalUnixMakefileGenerator3.h"
 
+#include "cmAlgorithms.h"
+#include "cmGeneratedFileStream.h"
+#include "cmGeneratorTarget.h"
 #include "cmLocalUnixMakefileGenerator3.h"
-#include "cmMakefileTargetGenerator.h"
 #include "cmMakefile.h"
+#include "cmMakefileTargetGenerator.h"
 #include "cmake.h"
-#include "cmGeneratedFileStream.h"
-#include "cmGeneratorTarget.h"
-#include "cmAlgorithms.h"
 
 cmGlobalUnixMakefileGenerator3::cmGlobalUnixMakefileGenerator3(cmake* cm)
   : cmGlobalCommonGenerator(cm)
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index ee5e605..22ffbcc 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -13,13 +13,13 @@
 
 #include "cmGlobalVisualStudio10Generator.h"
 
+#include "cmAlgorithms.h"
 #include "cmLocalVisualStudio10Generator.h"
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
 #include "cmVisualStudioSlnData.h"
 #include "cmVisualStudioSlnParser.h"
 #include "cmake.h"
-#include "cmAlgorithms.h"
 
 static const char vs10generatorName[] = "Visual Studio 10 2010";
 
diff --git a/Source/cmGlobalVisualStudio11Generator.cxx b/Source/cmGlobalVisualStudio11Generator.cxx
index 5eafe8a..de6fc43 100644
--- a/Source/cmGlobalVisualStudio11Generator.cxx
+++ b/Source/cmGlobalVisualStudio11Generator.cxx
@@ -11,9 +11,9 @@
 ============================================================================*/
 #include "cmGlobalVisualStudio11Generator.h"
 
+#include "cmAlgorithms.h"
 #include "cmLocalVisualStudio10Generator.h"
 #include "cmMakefile.h"
-#include "cmAlgorithms.h"
 
 static const char vs11generatorName[] = "Visual Studio 11 2012";
 
diff --git a/Source/cmGlobalVisualStudio12Generator.cxx b/Source/cmGlobalVisualStudio12Generator.cxx
index e92ab5b..bfd908f 100644
--- a/Source/cmGlobalVisualStudio12Generator.cxx
+++ b/Source/cmGlobalVisualStudio12Generator.cxx
@@ -11,9 +11,9 @@
 ============================================================================*/
 #include "cmGlobalVisualStudio12Generator.h"
 
+#include "cmAlgorithms.h"
 #include "cmLocalVisualStudio10Generator.h"
 #include "cmMakefile.h"
-#include "cmAlgorithms.h"
 
 static const char vs12generatorName[] = "Visual Studio 12 2013";
 
diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx
index df61503..893cc7b 100644
--- a/Source/cmGlobalVisualStudio14Generator.cxx
+++ b/Source/cmGlobalVisualStudio14Generator.cxx
@@ -11,9 +11,9 @@
 ============================================================================*/
 #include "cmGlobalVisualStudio14Generator.h"
 
+#include "cmAlgorithms.h"
 #include "cmLocalVisualStudio10Generator.h"
 #include "cmMakefile.h"
-#include "cmAlgorithms.h"
 
 static const char vs14generatorName[] = "Visual Studio 14 2015";
 
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 506d1a9..47ac66d 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -13,12 +13,12 @@
 
 #include "cmGlobalVisualStudio8Generator.h"
 
+#include "cmGeneratedFileStream.h"
 #include "cmLocalVisualStudio7Generator.h"
 #include "cmMakefile.h"
+#include "cmSourceFile.h"
 #include "cmVisualStudioWCEPlatformParser.h"
 #include "cmake.h"
-#include "cmGeneratedFileStream.h"
-#include "cmSourceFile.h"
 
 static const char vs8generatorName[] = "Visual Studio 8 2005";
 
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 9817b09..479b53c 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -12,6 +12,7 @@
 ============================================================================*/
 #include "cmGlobalVisualStudioGenerator.h"
 
+#include "cmAlgorithms.h"
 #include "cmCallVisualStudioMacro.h"
 #include "cmGeneratedFileStream.h"
 #include "cmGeneratorTarget.h"
@@ -20,7 +21,6 @@
 #include "cmSourceFile.h"
 #include "cmTarget.h"
 #include <cmsys/Encoding.hxx>
-#include "cmAlgorithms.h"
 
 //----------------------------------------------------------------------------
 cmGlobalVisualStudioGenerator::cmGlobalVisualStudioGenerator(cmake* cm)
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 6258341..19f7a74 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -11,18 +11,18 @@
 ============================================================================*/
 #include "cmGlobalXCodeGenerator.h"
 
-#include "cmLocalXCodeGenerator.h"
-#include "cmMakefile.h"
-#include "cmXCodeObject.h"
-#include "cmXCode21Object.h"
-#include "cmake.h"
-#include "cmGeneratedFileStream.h"
+#include "cmAlgorithms.h"
 #include "cmComputeLinkInformation.h"
-#include "cmSourceFile.h"
 #include "cmCustomCommandGenerator.h"
+#include "cmGeneratedFileStream.h"
 #include "cmGeneratorTarget.h"
 #include "cmGlobalGeneratorFactory.h"
-#include "cmAlgorithms.h"
+#include "cmLocalXCodeGenerator.h"
+#include "cmMakefile.h"
+#include "cmSourceFile.h"
+#include "cmXCode21Object.h"
+#include "cmXCodeObject.h"
+#include "cmake.h"
 
 #include <cmsys/auto_ptr.hxx>
 
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index 2a48ac8..c3b3613 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -14,8 +14,8 @@
 
 #include "cmGlobalGenerator.h"
 
-#include "cmXCodeObject.h"
 #include "cmCustomCommand.h"
+#include "cmXCodeObject.h"
 class cmGlobalGeneratorFactory;
 class cmSourceFile;
 class cmSourceGroup;
diff --git a/Source/cmGraphVizWriter.cxx b/Source/cmGraphVizWriter.cxx
index 5b7d229..76b6430 100644
--- a/Source/cmGraphVizWriter.cxx
+++ b/Source/cmGraphVizWriter.cxx
@@ -11,10 +11,10 @@
 ============================================================================*/
 #include "cmGraphVizWriter.h"
 
-#include "cmMakefile.h"
-#include "cmLocalGenerator.h"
-#include "cmGlobalGenerator.h"
 #include "cmGeneratedFileStream.h"
+#include "cmGlobalGenerator.h"
+#include "cmLocalGenerator.h"
+#include "cmMakefile.h"
 
 
 
diff --git a/Source/cmGraphVizWriter.h b/Source/cmGraphVizWriter.h
index 8b1438e..7914ca3 100644
--- a/Source/cmGraphVizWriter.h
+++ b/Source/cmGraphVizWriter.h
@@ -14,8 +14,8 @@
 
 #include "cmStandardIncludes.h"
 
-#include "cmLocalGenerator.h"
 #include "cmGeneratedFileStream.h"
+#include "cmLocalGenerator.h"
 #include <cmsys/RegularExpression.hxx>
 
 class cmGeneratorTarget;
diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx
index 1b8ba0b..37f03c5 100644
--- a/Source/cmIfCommand.cxx
+++ b/Source/cmIfCommand.cxx
@@ -11,14 +11,14 @@
 ============================================================================*/
 #include "cmIfCommand.h"
 
-#include "cmStringCommand.h"
 #include "cmOutputConverter.h"
+#include "cmStringCommand.h"
 
 #include "cmConditionEvaluator.h"
 
-#include <stdlib.h> // required for atof
-#include <list>
 #include <cmsys/RegularExpression.hxx>
+#include <list>
+#include <stdlib.h> // required for atof
 
 
 static std::string cmIfCommandError(
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index f70f252..d287568 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -11,14 +11,14 @@
 ============================================================================*/
 #include "cmInstallCommand.h"
 
+#include "cmExportSet.h"
+#include "cmInstallCommandArguments.h"
 #include "cmInstallDirectoryGenerator.h"
+#include "cmInstallExportGenerator.h"
 #include "cmInstallFilesGenerator.h"
 #include "cmInstallScriptGenerator.h"
 #include "cmInstallTargetGenerator.h"
-#include "cmInstallExportGenerator.h"
-#include "cmInstallCommandArguments.h"
 #include "cmTargetExport.h"
-#include "cmExportSet.h"
 
 #include <cmsys/Glob.hxx>
 
diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx
index 80fc054..a31c0c9 100644
--- a/Source/cmInstallExportGenerator.cxx
+++ b/Source/cmInstallExportGenerator.cxx
@@ -13,12 +13,12 @@
 
 #include <stdio.h>
 
-#include "cmake.h"
-#include "cmInstallTargetGenerator.h"
 #include "cmGeneratedFileStream.h"
-#include "cmMakefile.h"
-#include "cmLocalGenerator.h"
 #include "cmGlobalGenerator.h"
+#include "cmInstallTargetGenerator.h"
+#include "cmLocalGenerator.h"
+#include "cmMakefile.h"
+#include "cmake.h"
 
 #include "cmInstallFilesGenerator.h"
 
diff --git a/Source/cmInstallFilesGenerator.cxx b/Source/cmInstallFilesGenerator.cxx
index 3dd5528..9703562 100644
--- a/Source/cmInstallFilesGenerator.cxx
+++ b/Source/cmInstallFilesGenerator.cxx
@@ -12,9 +12,9 @@
 #include "cmInstallFilesGenerator.h"
 
 #include "cmGeneratorExpression.h"
+#include "cmLocalGenerator.h"
 #include "cmMakefile.h"
 #include "cmSystemTools.h"
-#include "cmLocalGenerator.h"
 
 //----------------------------------------------------------------------------
 cmInstallFilesGenerator
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 6a944bf..0010333 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -13,12 +13,12 @@
 
 #include "cmComputeLinkInformation.h"
 #include "cmGeneratorExpression.h"
+#include "cmGeneratorTarget.h"
+#include "cmGeneratorTarget.h"
 #include "cmGlobalGenerator.h"
 #include "cmLocalGenerator.h"
 #include "cmMakefile.h"
-#include "cmGeneratorTarget.h"
 #include "cmake.h"
-#include "cmGeneratorTarget.h"
 
 #include <assert.h>
 
diff --git a/Source/cmInstalledFile.cxx b/Source/cmInstalledFile.cxx
index 7025d0f..c5ac9eb 100644
--- a/Source/cmInstalledFile.cxx
+++ b/Source/cmInstalledFile.cxx
@@ -11,9 +11,9 @@
 ============================================================================*/
 #include "cmInstalledFile.h"
 
-#include "cmSystemTools.h"
-#include "cmMakefile.h"
 #include "cmAlgorithms.h"
+#include "cmMakefile.h"
+#include "cmSystemTools.h"
 
 //----------------------------------------------------------------------------
 cmInstalledFile::cmInstalledFile():
diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index 514bc05..05be9e5 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -11,14 +11,14 @@
 ============================================================================*/
 #include "cmListCommand.h"
 
+#include "cmAlgorithms.h"
 #include <cmsys/RegularExpression.hxx>
 #include <cmsys/SystemTools.hxx>
-#include "cmAlgorithms.h"
 
 #include <algorithm>
-#include <stdlib.h> // required for atoi
-#include <ctype.h>
 #include <assert.h>
+#include <ctype.h>
+#include <stdlib.h> // required for atoi
 //----------------------------------------------------------------------------
 bool cmListCommand
 ::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx
index 1cc66f4..5a16104 100644
--- a/Source/cmListFileCache.cxx
+++ b/Source/cmListFileCache.cxx
@@ -12,9 +12,9 @@
 #include "cmListFileCache.h"
 
 #include "cmListFileLexer.h"
+#include "cmMakefile.h"
 #include "cmOutputConverter.h"
 #include "cmSystemTools.h"
-#include "cmMakefile.h"
 #include "cmVersion.h"
 
 #include <cmsys/RegularExpression.hxx>
diff --git a/Source/cmLoadCacheCommand.cxx b/Source/cmLoadCacheCommand.cxx
index 6ade535..63fc00c 100644
--- a/Source/cmLoadCacheCommand.cxx
+++ b/Source/cmLoadCacheCommand.cxx
@@ -11,8 +11,8 @@
 ============================================================================*/
 #include "cmLoadCacheCommand.h"
 
-#include <cmsys/RegularExpression.hxx>
 #include <cmsys/FStream.hxx>
+#include <cmsys/RegularExpression.hxx>
 
 // cmLoadCacheCommand
 bool cmLoadCacheCommand
diff --git a/Source/cmLoadCommandCommand.cxx b/Source/cmLoadCommandCommand.cxx
index ed1adc0..14b70e4 100644
--- a/Source/cmLoadCommandCommand.cxx
+++ b/Source/cmLoadCommandCommand.cxx
@@ -11,8 +11,8 @@
 ============================================================================*/
 #include "cmLoadCommandCommand.h"
 
-#include "cmCPluginAPI.h"
 #include "cmCPluginAPI.cxx"
+#include "cmCPluginAPI.h"
 #include "cmDynamicLoader.h"
 
 #include <cmsys/DynamicLoader.hxx>
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index b93fc21..6c2ba05 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -11,22 +11,22 @@
 ============================================================================*/
 #include "cmLocalGenerator.h"
 
+#include "cmAlgorithms.h"
 #include "cmComputeLinkInformation.h"
+#include "cmCustomCommandGenerator.h"
 #include "cmGeneratedFileStream.h"
+#include "cmGeneratorExpressionEvaluationFile.h"
 #include "cmGlobalGenerator.h"
-#include "cmInstallGenerator.h"
 #include "cmInstallFilesGenerator.h"
-#include "cmGeneratorExpressionEvaluationFile.h"
+#include "cmInstallGenerator.h"
 #include "cmInstallScriptGenerator.h"
 #include "cmInstallTargetGenerator.h"
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
 #include "cmTest.h"
 #include "cmTestGenerator.h"
-#include "cmCustomCommandGenerator.h"
 #include "cmVersion.h"
 #include "cmake.h"
-#include "cmAlgorithms.h"
 
 #if defined(CMAKE_BUILD_WITH_CMAKE)
 # define CM_LG_ENCODE_OBJECT_NAMES
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index d9c68f9..0bad0d6 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -14,9 +14,9 @@
 
 #include "cmStandardIncludes.h"
 
+#include "cmOutputConverter.h"
 #include "cmState.h"
 #include "cmake.h"
-#include "cmOutputConverter.h"
 
 class cmMakefile;
 class cmGlobalGenerator;
diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx
index 91e75d3..f23f27d 100644
--- a/Source/cmLocalGhsMultiGenerator.cxx
+++ b/Source/cmLocalGhsMultiGenerator.cxx
@@ -11,11 +11,11 @@
 ============================================================================*/
 #include "cmLocalGhsMultiGenerator.h"
 
-#include "cmGlobalGhsMultiGenerator.h"
+#include "cmGeneratedFileStream.h"
 #include "cmGeneratorTarget.h"
-#include "cmMakefile.h"
 #include "cmGhsMultiTargetGenerator.h"
-#include "cmGeneratedFileStream.h"
+#include "cmGlobalGhsMultiGenerator.h"
+#include "cmMakefile.h"
 
 cmLocalGhsMultiGenerator::cmLocalGhsMultiGenerator(cmGlobalGenerator* gg,
                                                    cmMakefile* mf)
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 143c14e..c26065c 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -13,13 +13,13 @@
 #include "cmLocalNinjaGenerator.h"
 
 #include "cmCustomCommandGenerator.h"
-#include "cmMakefile.h"
+#include "cmGeneratedFileStream.h"
 #include "cmGlobalNinjaGenerator.h"
+#include "cmMakefile.h"
 #include "cmNinjaTargetGenerator.h"
-#include "cmGeneratedFileStream.h"
 #include "cmSourceFile.h"
-#include "cmake.h"
 #include "cmState.h"
+#include "cmake.h"
 
 #include <assert.h>
 
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index afdff33..2a0e07d 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -11,16 +11,16 @@
 ============================================================================*/
 #include "cmLocalUnixMakefileGenerator3.h"
 
+#include "cmAlgorithms.h"
+#include "cmCustomCommandGenerator.h"
+#include "cmFileTimeComparison.h"
 #include "cmGeneratedFileStream.h"
 #include "cmGlobalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
 #include "cmMakefileTargetGenerator.h"
 #include "cmSourceFile.h"
-#include "cmake.h"
 #include "cmVersion.h"
-#include "cmFileTimeComparison.h"
-#include "cmCustomCommandGenerator.h"
-#include "cmAlgorithms.h"
+#include "cmake.h"
 
 // Include dependency scanners for supported languages.  Only the
 // C/C++ scanner is needed for bootstrapping CMake.
@@ -30,11 +30,11 @@
 # include "cmDependsJava.h"
 #endif
 
-#include <cmsys/auto_ptr.hxx>
 #include <cmsys/Terminal.h>
+#include <cmsys/auto_ptr.hxx>
 
-#include <queue>
 #include <algorithm>
+#include <queue>
 
 //----------------------------------------------------------------------------
 // Escape special characters in Makefile dependency lines
diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index ce20c97..314fa0f 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -11,11 +11,11 @@
 ============================================================================*/
 #include "cmLocalVisualStudio10Generator.h"
 
+#include "cmGlobalVisualStudio10Generator.h"
 #include "cmMakefile.h"
 #include "cmVisualStudio10TargetGenerator.h"
-#include "cmGlobalVisualStudio10Generator.h"
-#include <cm_expat.h>
 #include "cmXMLParser.h"
+#include <cm_expat.h>
 
 class cmVS10XMLParser : public cmXMLParser
 {
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index de974c2..38b7ac3 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -11,15 +11,15 @@
 ============================================================================*/
 #include "cmLocalVisualStudio7Generator.h"
 
+#include "cmCustomCommandGenerator.h"
+#include "cmGeneratorTarget.h"
 #include "cmGlobalVisualStudio7Generator.h"
-#include "cmXMLParser.h"
-#include <cm_expat.h>
 #include "cmMakefile.h"
-#include "cmSystemTools.h"
 #include "cmSourceFile.h"
-#include "cmGeneratorTarget.h"
-#include "cmCustomCommandGenerator.h"
+#include "cmSystemTools.h"
+#include "cmXMLParser.h"
 #include "cmake.h"
+#include <cm_expat.h>
 
 #include "cmComputeLinkInformation.h"
 #include "cmGeneratedFileStream.h"
diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx
index a5b8f99..23e2bfd 100644
--- a/Source/cmLocalVisualStudioGenerator.cxx
+++ b/Source/cmLocalVisualStudioGenerator.cxx
@@ -11,11 +11,11 @@
 ============================================================================*/
 #include "cmLocalVisualStudioGenerator.h"
 
+#include "cmCustomCommandGenerator.h"
 #include "cmGlobalGenerator.h"
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
 #include "cmSystemTools.h"
-#include "cmCustomCommandGenerator.h"
 #include "windows.h"
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmLocalXCodeGenerator.cxx b/Source/cmLocalXCodeGenerator.cxx
index c837445..d563fe7 100644
--- a/Source/cmLocalXCodeGenerator.cxx
+++ b/Source/cmLocalXCodeGenerator.cxx
@@ -12,8 +12,8 @@
 #include "cmLocalXCodeGenerator.h"
 
 #include "cmGlobalXCodeGenerator.h"
-#include "cmSourceFile.h"
 #include "cmMakefile.h"
+#include "cmSourceFile.h"
 
 //----------------------------------------------------------------------------
 cmLocalXCodeGenerator::cmLocalXCodeGenerator(cmGlobalGenerator* gg,
diff --git a/Source/cmMachO.cxx b/Source/cmMachO.cxx
index 6210da3..bb4d4a1 100644
--- a/Source/cmMachO.cxx
+++ b/Source/cmMachO.cxx
@@ -16,8 +16,8 @@
 #include <cmsys/FStream.hxx>
 
 // Include the Mach-O format information system header.
-#include <mach-o/loader.h>
 #include <mach-o/fat.h>
+#include <mach-o/loader.h>
 
 /**
 
diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 71de7a7..36831fe 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -11,8 +11,8 @@
 ============================================================================*/
 #include "cmMacroCommand.h"
 
-#include "cmake.h"
 #include "cmAlgorithms.h"
+#include "cmake.h"
 
 // define the class for macro commands
 class cmMacroHelperCommand : public cmCommand
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 29b947c..3bc1181 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -11,37 +11,37 @@
 ============================================================================*/
 #include "cmMakefile.h"
 
-#include "cmVersion.h"
 #include "cmCommand.h"
-#include "cmSourceFile.h"
-#include "cmSourceFileLocation.h"
-#include "cmSystemTools.h"
-#include "cmGlobalGenerator.h"
+#include "cmCommandArgumentParserHelper.h"
 #include "cmCommands.h"
-#include "cmState.h"
-#include "cmOutputConverter.h"
 #include "cmFunctionBlocker.h"
+#include "cmGeneratorExpression.h"
 #include "cmGeneratorExpressionEvaluationFile.h"
+#include "cmGlobalGenerator.h"
 #include "cmListFileCache.h"
-#include "cmCommandArgumentParserHelper.h"
-#include "cmGeneratorExpression.h"
+#include "cmOutputConverter.h"
+#include "cmSourceFile.h"
+#include "cmSourceFileLocation.h"
+#include "cmState.h"
+#include "cmSystemTools.h"
 #include "cmTest.h"
+#include "cmVersion.h"
 #ifdef CMAKE_BUILD_WITH_CMAKE
 #  include "cmVariableWatch.h"
 #endif
+#include "cmAlgorithms.h"
 #include "cmInstallGenerator.h"
 #include "cmTestGenerator.h"
-#include "cmAlgorithms.h"
 #include "cmake.h"
 #include <stdlib.h> // required for atoi
 
-#include <cmsys/RegularExpression.hxx>
 #include <cmsys/FStream.hxx>
+#include <cmsys/RegularExpression.hxx>
 #include <cmsys/auto_ptr.hxx>
 
-#include <list>
-#include <ctype.h> // for isspace
 #include <assert.h>
+#include <ctype.h> // for isspace
+#include <list>
 
 // default is not to be building executables
 cmMakefile::cmMakefile(cmGlobalGenerator* globalGenerator,
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 0300d3f..fa5e9b4 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -14,22 +14,22 @@
 
 #include "cmStandardIncludes.h"
 
+#include "cmAlgorithms.h"
 #include "cmExecutionStatus.h"
+#include "cmExpandedCommandArgument.h"
 #include "cmListFileCache.h"
+#include "cmNewLineStyle.h"
+#include "cmState.h"
 #include "cmSystemTools.h"
 #include "cmTarget.h"
-#include "cmNewLineStyle.h"
-#include "cmExpandedCommandArgument.h"
 #include "cmake.h"
-#include "cmState.h"
-#include "cmAlgorithms.h"
 
 #if defined(CMAKE_BUILD_WITH_CMAKE)
 #include "cmSourceGroup.h"
 #endif
 
-#include <cmsys/auto_ptr.hxx>
 #include <cmsys/RegularExpression.hxx>
+#include <cmsys/auto_ptr.hxx>
 #if defined(CMAKE_BUILD_WITH_CMAKE)
 # ifdef CMake_HAVE_CXX11_UNORDERED_MAP
 #  include <unordered_map>
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 435844e..9ded69f 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -11,13 +11,13 @@
 ============================================================================*/
 #include "cmMakefileLibraryTargetGenerator.h"
 
+#include "cmAlgorithms.h"
 #include "cmGeneratedFileStream.h"
 #include "cmGlobalUnixMakefileGenerator3.h"
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
 #include "cmake.h"
-#include "cmAlgorithms.h"
 
 //----------------------------------------------------------------------------
 cmMakefileLibraryTargetGenerator
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 29708d9..e14f828 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -11,19 +11,19 @@
 ============================================================================*/
 #include "cmMakefileTargetGenerator.h"
 
-#include "cmGeneratorTarget.h"
+#include "cmAlgorithms.h"
+#include "cmComputeLinkInformation.h"
+#include "cmCustomCommandGenerator.h"
 #include "cmGeneratedFileStream.h"
+#include "cmGeneratorExpression.h"
+#include "cmGeneratorTarget.h"
 #include "cmGlobalGenerator.h"
 #include "cmGlobalUnixMakefileGenerator3.h"
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
-#include "cmake.h"
 #include "cmState.h"
-#include "cmComputeLinkInformation.h"
-#include "cmCustomCommandGenerator.h"
-#include "cmGeneratorExpression.h"
-#include "cmAlgorithms.h"
+#include "cmake.h"
 
 #include "cmMakefileExecutableTargetGenerator.h"
 #include "cmMakefileLibraryTargetGenerator.h"
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 3519400..0429421 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -12,18 +12,18 @@
 ============================================================================*/
 #include "cmNinjaNormalTargetGenerator.h"
 
-#include "cmLocalNinjaGenerator.h"
-#include "cmGlobalNinjaGenerator.h"
-#include "cmSourceFile.h"
+#include "cmAlgorithms.h"
+#include "cmCustomCommandGenerator.h"
 #include "cmGeneratedFileStream.h"
+#include "cmGeneratorTarget.h"
+#include "cmGlobalNinjaGenerator.h"
+#include "cmLocalNinjaGenerator.h"
 #include "cmMakefile.h"
 #include "cmOSXBundleGenerator.h"
-#include "cmGeneratorTarget.h"
-#include "cmCustomCommandGenerator.h"
-#include "cmAlgorithms.h"
+#include "cmSourceFile.h"
 
-#include <assert.h>
 #include <algorithm>
+#include <assert.h>
 #include <limits>
 
 #ifndef _WIN32
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 97ef00d..8830b8f 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -12,18 +12,18 @@
 ============================================================================*/
 #include "cmNinjaTargetGenerator.h"
 
-#include "cmGlobalNinjaGenerator.h"
-#include "cmLocalNinjaGenerator.h"
+#include "cmAlgorithms.h"
+#include "cmComputeLinkInformation.h"
+#include "cmCustomCommandGenerator.h"
 #include "cmGeneratedFileStream.h"
 #include "cmGeneratorTarget.h"
+#include "cmGlobalNinjaGenerator.h"
+#include "cmLocalNinjaGenerator.h"
+#include "cmMakefile.h"
 #include "cmNinjaNormalTargetGenerator.h"
 #include "cmNinjaUtilityTargetGenerator.h"
-#include "cmSystemTools.h"
-#include "cmMakefile.h"
-#include "cmComputeLinkInformation.h"
 #include "cmSourceFile.h"
-#include "cmCustomCommandGenerator.h"
-#include "cmAlgorithms.h"
+#include "cmSystemTools.h"
 
 #include <algorithm>
 
diff --git a/Source/cmNinjaTargetGenerator.h b/Source/cmNinjaTargetGenerator.h
index 40f96b4..8225a60 100644
--- a/Source/cmNinjaTargetGenerator.h
+++ b/Source/cmNinjaTargetGenerator.h
@@ -15,9 +15,9 @@
 
 #include "cmCommonTargetGenerator.h"
 
-#include "cmNinjaTypes.h"
 #include "cmGlobalNinjaGenerator.h"
 #include "cmLocalNinjaGenerator.h"
+#include "cmNinjaTypes.h"
 #include "cmOSXBundleGenerator.h"
 
 class cmTarget;
diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx
index c2162ce..735730e 100644
--- a/Source/cmNinjaUtilityTargetGenerator.cxx
+++ b/Source/cmNinjaUtilityTargetGenerator.cxx
@@ -13,11 +13,11 @@
 #include "cmNinjaUtilityTargetGenerator.h"
 
 #include "cmCustomCommand.h"
+#include "cmCustomCommandGenerator.h"
 #include "cmGeneratedFileStream.h"
 #include "cmGlobalNinjaGenerator.h"
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
-#include "cmCustomCommandGenerator.h"
 
 cmNinjaUtilityTargetGenerator::cmNinjaUtilityTargetGenerator(
     cmGeneratorTarget *target)
diff --git a/Source/cmOSXBundleGenerator.cxx b/Source/cmOSXBundleGenerator.cxx
index 6991d7b..9850728 100644
--- a/Source/cmOSXBundleGenerator.cxx
+++ b/Source/cmOSXBundleGenerator.cxx
@@ -11,9 +11,9 @@
 ============================================================================*/
 #include "cmOSXBundleGenerator.h"
 
+#include "cmLocalGenerator.h"
 #include "cmMakefile.h"
 #include "cmTarget.h"
-#include "cmLocalGenerator.h"
 
 #include <cassert>
 
diff --git a/Source/cmOSXBundleGenerator.h b/Source/cmOSXBundleGenerator.h
index 2400262..3952e95 100644
--- a/Source/cmOSXBundleGenerator.h
+++ b/Source/cmOSXBundleGenerator.h
@@ -16,8 +16,8 @@
 
 #include "cmSourceFile.h"
 
-#include <string>
 #include <set>
+#include <string>
 
 class cmTarget;
 class cmMakefile;
diff --git a/Source/cmOrderDirectories.cxx b/Source/cmOrderDirectories.cxx
index 61efd01..2e884e4 100644
--- a/Source/cmOrderDirectories.cxx
+++ b/Source/cmOrderDirectories.cxx
@@ -11,10 +11,10 @@
 ============================================================================*/
 #include "cmOrderDirectories.h"
 
+#include "cmAlgorithms.h"
 #include "cmGlobalGenerator.h"
 #include "cmSystemTools.h"
 #include "cmake.h"
-#include "cmAlgorithms.h"
 
 #include <assert.h>
 
diff --git a/Source/cmOutputConverter.cxx b/Source/cmOutputConverter.cxx
index 59fb2e9..3c5d2f4 100644
--- a/Source/cmOutputConverter.cxx
+++ b/Source/cmOutputConverter.cxx
@@ -16,8 +16,8 @@
 
 #include <assert.h>
 
-#include <string.h> /* strlen */
 #include <ctype.h>  /* isalpha */
+#include <string.h> /* strlen */
 
 cmOutputConverter::cmOutputConverter(cmState::Snapshot snapshot)
   : StateSnapshot(snapshot), LinkScriptShell(false)
diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx
index 68a9085..0432da5 100644
--- a/Source/cmPolicies.cxx
+++ b/Source/cmPolicies.cxx
@@ -1,15 +1,15 @@
 #include "cmPolicies.h"
 
-#include "cmake.h"
+#include "cmAlgorithms.h"
 #include "cmMakefile.h"
 #include "cmVersion.h"
 #include "cmVersionMacros.h"
-#include "cmAlgorithms.h"
+#include "cmake.h"
+#include <assert.h>
 #include <ctype.h>
 #include <map>
-#include <set>
 #include <queue>
-#include <assert.h>
+#include <set>
 
 static bool stringToId(const char* input, cmPolicies::PolicyID& pid)
 {
diff --git a/Source/cmPropertyDefinitionMap.cxx b/Source/cmPropertyDefinitionMap.cxx
index cfc4bc3..cba2b5a 100644
--- a/Source/cmPropertyDefinitionMap.cxx
+++ b/Source/cmPropertyDefinitionMap.cxx
@@ -11,8 +11,8 @@
 ============================================================================*/
 #include "cmPropertyDefinitionMap.h"
 
-#include "cmSystemTools.h"
 #include "cmDocumentationSection.h"
+#include "cmSystemTools.h"
 
 void cmPropertyDefinitionMap
 ::DefineProperty(const std::string& name, cmProperty::ScopeType scope,
diff --git a/Source/cmPropertyMap.cxx b/Source/cmPropertyMap.cxx
index e6b1529..2b25023 100644
--- a/Source/cmPropertyMap.cxx
+++ b/Source/cmPropertyMap.cxx
@@ -11,9 +11,9 @@
 ============================================================================*/
 #include "cmPropertyMap.h"
 
+#include "cmState.h"
 #include "cmSystemTools.h"
 #include "cmake.h"
-#include "cmState.h"
 
 #include <assert.h>
 
diff --git a/Source/cmQtAutoGeneratorInitializer.h b/Source/cmQtAutoGeneratorInitializer.h
index eaf140d..b411597 100644
--- a/Source/cmQtAutoGeneratorInitializer.h
+++ b/Source/cmQtAutoGeneratorInitializer.h
@@ -16,9 +16,9 @@
 
 #include "cmStandardIncludes.h"
 
+#include <map>
 #include <string>
 #include <vector>
-#include <map>
 
 class cmSourceFile;
 class cmGeneratorTarget;
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index f376caa..a55a3f3 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -13,18 +13,18 @@
 
 #include "cmQtAutoGenerators.h"
 
+#include "cmAlgorithms.h"
 #include "cmGlobalGenerator.h"
-#include "cmOutputConverter.h"
 #include "cmMakefile.h"
-#include "cmSystemTools.h"
+#include "cmOutputConverter.h"
 #include "cmState.h"
-#include "cmAlgorithms.h"
+#include "cmSystemTools.h"
 
 #include <sys/stat.h>
 
-#include <cmsys/Terminal.h>
-#include <cmsys/FStream.hxx>
 #include <assert.h>
+#include <cmsys/FStream.hxx>
+#include <cmsys/Terminal.h>
 
 #include <string.h>
 #if defined(__APPLE__)
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index 04d2860..315e915 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -17,9 +17,9 @@
 #include "cmStandardIncludes.h"
 
 #include <list>
-#include <vector>
-#include <string>
 #include <map>
+#include <string>
+#include <vector>
 
 class cmMakefile;
 
diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx
index cb61ed9..67667ea 100644
--- a/Source/cmRST.cxx
+++ b/Source/cmRST.cxx
@@ -11,8 +11,8 @@
 ============================================================================*/
 #include "cmRST.h"
 
-#include "cmSystemTools.h"
 #include "cmAlgorithms.h"
+#include "cmSystemTools.h"
 #include "cmVersion.h"
 #include <cmsys/FStream.hxx>
 #include <ctype.h>
diff --git a/Source/cmSearchPath.cxx b/Source/cmSearchPath.cxx
index 01781b2..70855b3 100644
--- a/Source/cmSearchPath.cxx
+++ b/Source/cmSearchPath.cxx
@@ -11,8 +11,8 @@
 ============================================================================*/
 #include "cmSearchPath.h"
 
-#include "cmFindCommon.h"
 #include "cmAlgorithms.h"
+#include "cmFindCommon.h"
 
 //----------------------------------------------------------------------------
 cmSearchPath::cmSearchPath(cmFindCommon* findCmd)
diff --git a/Source/cmSetPropertyCommand.cxx b/Source/cmSetPropertyCommand.cxx
index fc5c95a..fb13a19 100644
--- a/Source/cmSetPropertyCommand.cxx
+++ b/Source/cmSetPropertyCommand.cxx
@@ -11,9 +11,9 @@
 ============================================================================*/
 #include "cmSetPropertyCommand.h"
 
+#include "cmSetSourceFilesPropertiesCommand.h"
 #include "cmSetTargetPropertiesCommand.h"
 #include "cmSetTestsPropertiesCommand.h"
-#include "cmSetSourceFilesPropertiesCommand.h"
 
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmSetTestsPropertiesCommand.cxx b/Source/cmSetTestsPropertiesCommand.cxx
index 53dc5a8..70c34c4 100644
--- a/Source/cmSetTestsPropertiesCommand.cxx
+++ b/Source/cmSetTestsPropertiesCommand.cxx
@@ -11,8 +11,8 @@
 ============================================================================*/
 #include "cmSetTestsPropertiesCommand.h"
 
-#include "cmake.h"
 #include "cmTest.h"
+#include "cmake.h"
 
 // cmSetTestsPropertiesCommand
 bool cmSetTestsPropertiesCommand
diff --git a/Source/cmSourceFileLocation.cxx b/Source/cmSourceFileLocation.cxx
index 00d5d6a..988ddeb 100644
--- a/Source/cmSourceFileLocation.cxx
+++ b/Source/cmSourceFileLocation.cxx
@@ -11,10 +11,10 @@
 ============================================================================*/
 #include "cmSourceFileLocation.h"
 
-#include "cmMakefile.h"
+#include "cmAlgorithms.h"
 #include "cmGlobalGenerator.h"
+#include "cmMakefile.h"
 #include "cmSystemTools.h"
-#include "cmAlgorithms.h"
 
 #include "assert.h"
 
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 83cbf67..f80586e 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -35,23 +35,23 @@
 #include <cm_kwiml.h>
 
 #include <fstream>
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 #include <sstream>
 
 // we must have stl with the standard include style
-#include <vector>
-#include <string>
-#include <iterator>
 #include <algorithm>
 #include <functional>
+#include <iterator>
 #include <map>
 #include <set>
+#include <string>
+#include <vector>
 
 // include the "c" string header
-#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #if defined( _MSC_VER )
 typedef unsigned short mode_t;
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index f5d6378..a400def 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -11,12 +11,12 @@
 ============================================================================*/
 #include "cmState.h"
 
-#include "cmake.h"
-#include "cmVersion.h"
+#include "cmAlgorithms.h"
 #include "cmCacheManager.h"
 #include "cmCommand.h"
-#include "cmAlgorithms.h"
 #include "cmDefinitions.h"
+#include "cmVersion.h"
+#include "cmake.h"
 
 #include <assert.h>
 
diff --git a/Source/cmState.h b/Source/cmState.h
index 7b11034..705c1a8 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -14,11 +14,11 @@
 
 #include "cmStandardIncludes.h"
 
-#include "cmPropertyDefinitionMap.h"
-#include "cmPropertyMap.h"
-#include "cmLinkedTree.h"
 #include "cmAlgorithms.h"
+#include "cmLinkedTree.h"
 #include "cmPolicies.h"
+#include "cmPropertyDefinitionMap.h"
+#include "cmPropertyMap.h"
 
 class cmake;
 class cmCommand;
diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx
index 82c530c..e10e1ae 100644
--- a/Source/cmStringCommand.cxx
+++ b/Source/cmStringCommand.cxx
@@ -16,8 +16,8 @@
 #include <cmsys/RegularExpression.hxx>
 #include <cmsys/SystemTools.hxx>
 
-#include <stdlib.h> // required for atoi
 #include <ctype.h>
+#include <stdlib.h> // required for atoi
 #include <time.h>
 
 #include <cmTimestamp.h>
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 2cf2546..3177a84 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -12,20 +12,20 @@
 #include "cmSystemTools.h"
 
 #include "cmAlgorithms.h"
+#include <assert.h>
 #include <ctype.h>
 #include <errno.h>
-#include <time.h>
-#include <string.h>
 #include <stdlib.h>
-#include <assert.h>
+#include <string.h>
+#include <time.h>
 #ifdef __QNX__
 # include <malloc.h> /* for malloc/free on QNX */
 #endif
+#include <cmsys/Directory.hxx>
+#include <cmsys/Encoding.hxx>
 #include <cmsys/Glob.hxx>
 #include <cmsys/RegularExpression.hxx>
-#include <cmsys/Directory.hxx>
 #include <cmsys/System.h>
-#include <cmsys/Encoding.hxx>
 #if defined(CMAKE_BUILD_WITH_CMAKE)
 # include "cmArchiveWrite.h"
 # include "cmLocale.h"
@@ -42,11 +42,11 @@
   // include wincrypt.h after windows.h
 # include <wincrypt.h>
 #else
-# include <sys/time.h>
 # include <sys/types.h>
+# include <sys/time.h>
+# include <sys/wait.h>
 # include <unistd.h>
 # include <utime.h>
-# include <sys/wait.h>
 #endif
 
 #if defined(__APPLE__)
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index d444675..d311750 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -14,8 +14,8 @@
 
 #include "cmStandardIncludes.h"
 
-#include <cmsys/SystemTools.hxx>
 #include <cmsys/Process.h>
+#include <cmsys/SystemTools.hxx>
 
 class cmSystemToolsFileTime;
 
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 275dd6f..fe14af6 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -11,22 +11,22 @@
 ============================================================================*/
 #include "cmTarget.h"
 
-#include "cmake.h"
-#include "cmMakefile.h"
-#include "cmSourceFile.h"
-#include "cmOutputConverter.h"
-#include "cmGlobalGenerator.h"
+#include "cmAlgorithms.h"
 #include "cmComputeLinkInformation.h"
-#include "cmListFileCache.h"
 #include "cmGeneratorExpression.h"
 #include "cmGeneratorExpressionDAGChecker.h"
-#include "cmAlgorithms.h"
+#include "cmGlobalGenerator.h"
+#include "cmListFileCache.h"
+#include "cmMakefile.h"
+#include "cmOutputConverter.h"
+#include "cmSourceFile.h"
+#include "cmake.h"
+#include <assert.h>
 #include <cmsys/RegularExpression.hxx>
+#include <errno.h>
 #include <map>
 #include <set>
 #include <stdlib.h> // required for atof
-#include <assert.h>
-#include <errno.h>
 #if defined(CMAKE_BUILD_WITH_CMAKE)
 #include <cmsys/hash_set.hxx>
 #define UNORDERED_SET cmsys::hash_set
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index b398043..262cc9b 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -15,9 +15,9 @@
 #include "cmStandardIncludes.h"
 
 #include "cmCustomCommand.h"
-#include "cmPropertyMap.h"
-#include "cmPolicies.h"
 #include "cmListFileCache.h"
+#include "cmPolicies.h"
+#include "cmPropertyMap.h"
 
 #include <cmsys/auto_ptr.hxx>
 #if defined(CMAKE_BUILD_WITH_CMAKE)
diff --git a/Source/cmTest.cxx b/Source/cmTest.cxx
index 812e4d3..7182122 100644
--- a/Source/cmTest.cxx
+++ b/Source/cmTest.cxx
@@ -13,8 +13,8 @@
 
 #include "cmSystemTools.h"
 
-#include "cmake.h"
 #include "cmMakefile.h"
+#include "cmake.h"
 
 //----------------------------------------------------------------------------
 cmTest::cmTest(cmMakefile* mf)
diff --git a/Source/cmTest.h b/Source/cmTest.h
index 44a2d00..46013af 100644
--- a/Source/cmTest.h
+++ b/Source/cmTest.h
@@ -15,8 +15,8 @@
 #include "cmStandardIncludes.h"
 
 #include "cmCustomCommand.h"
-#include "cmPropertyMap.h"
 #include "cmListFileCache.h"
+#include "cmPropertyMap.h"
 class cmMakefile;
 
 /** \class cmTest
diff --git a/Source/cmTestGenerator.cxx b/Source/cmTestGenerator.cxx
index b411f15..5790fa6 100644
--- a/Source/cmTestGenerator.cxx
+++ b/Source/cmTestGenerator.cxx
@@ -12,8 +12,8 @@
 #include "cmTestGenerator.h"
 
 #include "cmGeneratorExpression.h"
-#include "cmOutputConverter.h"
 #include "cmLocalGenerator.h"
+#include "cmOutputConverter.h"
 #include "cmSystemTools.h"
 #include "cmTest.h"
 
diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx
index 1c795c4..7d1ba32 100644
--- a/Source/cmTimestamp.cxx
+++ b/Source/cmTimestamp.cxx
@@ -11,12 +11,12 @@
 ============================================================================*/
 #include "cmTimestamp.h"
 
-#include <cstring>
 #include <cstdlib>
+#include <cstring>
 
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <sstream>
+#include <sys/stat.h>
 
 //----------------------------------------------------------------------------
 std::string cmTimestamp::CurrentTime(
diff --git a/Source/cmUseMangledMesaCommand.cxx b/Source/cmUseMangledMesaCommand.cxx
index 057b67e..f30071e 100644
--- a/Source/cmUseMangledMesaCommand.cxx
+++ b/Source/cmUseMangledMesaCommand.cxx
@@ -13,8 +13,8 @@
 
 #include "cmSystemTools.h"
 
-#include <cmsys/RegularExpression.hxx>
 #include <cmsys/FStream.hxx>
+#include <cmsys/RegularExpression.hxx>
 
 bool cmUseMangledMesaCommand
 ::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
diff --git a/Source/cmUuid.cxx b/Source/cmUuid.cxx
index e2d0049..5f8935f 100644
--- a/Source/cmUuid.cxx
+++ b/Source/cmUuid.cxx
@@ -13,8 +13,8 @@
 
 #include <string.h>
 
-#include <cmsys/MD5.h>
 #include "cm_sha2.h"
+#include <cmsys/MD5.h>
 
 cmUuid::cmUuid()
 {
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 7ff9f04..b4bdb2a 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -11,36 +11,36 @@
 ============================================================================*/
 #include "cmVisualStudio10TargetGenerator.h"
 
-#include "windows.h"
-#include "cmGlobalVisualStudio10Generator.h"
-#include "cmGeneratorTarget.h"
 #include "cmComputeLinkInformation.h"
+#include "cmCustomCommandGenerator.h"
 #include "cmGeneratedFileStream.h"
+#include "cmGeneratorTarget.h"
+#include "cmGlobalVisualStudio10Generator.h"
+#include "cmLocalVisualStudio7Generator.h"
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
-#include "cmVisualStudioGeneratorOptions.h"
-#include "cmLocalVisualStudio7Generator.h"
-#include "cmCustomCommandGenerator.h"
 #include "cmVS10CLFlagTable.h"
-#include "cmVS10RCFlagTable.h"
-#include "cmVS10LinkFlagTable.h"
 #include "cmVS10LibFlagTable.h"
+#include "cmVS10LinkFlagTable.h"
 #include "cmVS10MASMFlagTable.h"
+#include "cmVS10RCFlagTable.h"
 #include "cmVS11CLFlagTable.h"
-#include "cmVS11RCFlagTable.h"
-#include "cmVS11LinkFlagTable.h"
 #include "cmVS11LibFlagTable.h"
+#include "cmVS11LinkFlagTable.h"
 #include "cmVS11MASMFlagTable.h"
+#include "cmVS11RCFlagTable.h"
 #include "cmVS12CLFlagTable.h"
-#include "cmVS12RCFlagTable.h"
-#include "cmVS12LinkFlagTable.h"
 #include "cmVS12LibFlagTable.h"
+#include "cmVS12LinkFlagTable.h"
 #include "cmVS12MASMFlagTable.h"
+#include "cmVS12RCFlagTable.h"
 #include "cmVS14CLFlagTable.h"
-#include "cmVS14RCFlagTable.h"
-#include "cmVS14LinkFlagTable.h"
 #include "cmVS14LibFlagTable.h"
+#include "cmVS14LinkFlagTable.h"
 #include "cmVS14MASMFlagTable.h"
+#include "cmVS14RCFlagTable.h"
+#include "cmVisualStudioGeneratorOptions.h"
+#include "windows.h"
 
 #include <cmsys/auto_ptr.hxx>
 
diff --git a/Source/cmXMLSafe.cxx b/Source/cmXMLSafe.cxx
index 4ad05ca..e76ee52 100644
--- a/Source/cmXMLSafe.cxx
+++ b/Source/cmXMLSafe.cxx
@@ -16,8 +16,8 @@
 #include <iostream>
 #include <sstream>
 
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
 
 //----------------------------------------------------------------------------
 cmXMLSafe::cmXMLSafe(const char* s):
diff --git a/Source/cmXMLSafe.h b/Source/cmXMLSafe.h
index 981359a..7cf34ba 100644
--- a/Source/cmXMLSafe.h
+++ b/Source/cmXMLSafe.h
@@ -14,8 +14,8 @@
 
 #include <cmsys/Configure.hxx>
 
-#include <string>
 #include <iosfwd>
+#include <string>
 
 /** \class cmXMLSafe
  * \brief Write strings to XML with proper escapes
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index f336384..da6e59e 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -11,17 +11,17 @@
 ============================================================================*/
 #include "cmake.h"
 
-#include "cmMakefile.h"
-#include "cmLocalGenerator.h"
-#include "cmExternalMakefileProjectGenerator.h"
-#include "cmCommands.h"
+#include "cmAlgorithms.h"
 #include "cmCommand.h"
+#include "cmCommands.h"
+#include "cmDocumentationFormatter.h"
+#include "cmExternalMakefileProjectGenerator.h"
 #include "cmFileTimeComparison.h"
+#include "cmLocalGenerator.h"
+#include "cmMakefile.h"
 #include "cmSourceFile.h"
-#include "cmTest.h"
-#include "cmDocumentationFormatter.h"
-#include "cmAlgorithms.h"
 #include "cmState.h"
+#include "cmTest.h"
 
 #if defined(CMAKE_BUILD_WITH_CMAKE)
 # include "cmGraphVizWriter.h"
@@ -29,9 +29,9 @@
 # include <cmsys/SystemInformation.hxx>
 #endif
 
+#include <cmsys/FStream.hxx>
 #include <cmsys/Glob.hxx>
 #include <cmsys/RegularExpression.hxx>
-#include <cmsys/FStream.hxx>
 
 // only build kdevelop generator on non-windows platforms
 // when not bootstrapping cmake
@@ -52,17 +52,17 @@
 // include the generator
 #if defined(_WIN32) && !defined(__CYGWIN__)
 #  if !defined(CMAKE_BOOT_MINGW)
-#    include "cmGlobalVisualStudio71Generator.h"
-#    include "cmGlobalVisualStudio8Generator.h"
-#    include "cmGlobalVisualStudio9Generator.h"
+#    include "cmGlobalBorlandMakefileGenerator.h"
+#    include "cmGlobalGhsMultiGenerator.h"
+#    include "cmGlobalJOMMakefileGenerator.h"
+#    include "cmGlobalNMakeMakefileGenerator.h"
 #    include "cmGlobalVisualStudio10Generator.h"
 #    include "cmGlobalVisualStudio11Generator.h"
 #    include "cmGlobalVisualStudio12Generator.h"
 #    include "cmGlobalVisualStudio14Generator.h"
-#    include "cmGlobalBorlandMakefileGenerator.h"
-#    include "cmGlobalNMakeMakefileGenerator.h"
-#    include "cmGlobalJOMMakefileGenerator.h"
-#    include "cmGlobalGhsMultiGenerator.h"
+#    include "cmGlobalVisualStudio71Generator.h"
+#    include "cmGlobalVisualStudio8Generator.h"
+#    include "cmGlobalVisualStudio9Generator.h"
 #    define CMAKE_HAVE_VS_GENERATORS
 #  endif
 #  include "cmGlobalMSYSMakefileGenerator.h"
@@ -81,8 +81,8 @@
 #if !defined(CMAKE_BOOT_MINGW)
 # include "cmExtraCodeBlocksGenerator.h"
 #endif
-#include "cmExtraSublimeTextGenerator.h"
 #include "cmExtraKateGenerator.h"
+#include "cmExtraSublimeTextGenerator.h"
 
 #ifdef CMAKE_USE_KDEVELOP
 # include "cmGlobalKdevelopGenerator.h"
@@ -100,8 +100,8 @@
 #    define CMAKE_USE_XCODE 1
 #  endif
 #  include <sys/types.h>
-#  include <sys/time.h>
 #  include <sys/resource.h>
+#  include <sys/time.h>
 #endif
 
 #include <sys/stat.h> // struct stat
diff --git a/Source/cmake.h b/Source/cmake.h
index 8fb4195..e41ba56 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -15,11 +15,11 @@
 
 #include "cmStandardIncludes.h"
 
-#include "cmListFileCache.h"
-#include "cmSystemTools.h"
-#include "cmInstalledFile.h"
 #include "cmCacheManager.h"
+#include "cmInstalledFile.h"
+#include "cmListFileCache.h"
 #include "cmState.h"
+#include "cmSystemTools.h"
 
 class cmGlobalGeneratorFactory;
 class cmGlobalGenerator;
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index 600cc1a..785fd90 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -12,19 +12,19 @@
 // include these first, otherwise there will be problems on Windows
 // with GetCurrentDirectory() being redefined
 #ifdef CMAKE_BUILD_WITH_CMAKE
-#include "cmDynamicLoader.h"
 #include "cmDocumentation.h"
+#include "cmDynamicLoader.h"
 #endif
 
-#include "cmake.h"
-#include "cmcmd.h"
-#include "cmState.h"
-#include "cmListFileCache.h"
-#include "cmSourceFile.h"
+#include "cmAlgorithms.h"
 #include "cmGlobalGenerator.h"
+#include "cmListFileCache.h"
 #include "cmLocalGenerator.h"
 #include "cmMakefile.h"
-#include "cmAlgorithms.h"
+#include "cmSourceFile.h"
+#include "cmState.h"
+#include "cmake.h"
+#include "cmcmd.h"
 #include <cmsys/Encoding.hxx>
 
 #ifdef CMAKE_BUILD_WITH_CMAKE
diff --git a/Source/cmakexbuild.cxx b/Source/cmakexbuild.cxx
index 03059f5..1385ff7 100644
--- a/Source/cmakexbuild.cxx
+++ b/Source/cmakexbuild.cxx
@@ -11,8 +11,8 @@
 ============================================================================*/
 #include "cmStandardIncludes.h"
 
-#include <cmsys/Process.h>
 #include "cmSystemTools.h"
+#include <cmsys/Process.h>
 
 // This is a wrapper program for xcodebuild
 // it calls xcodebuild, and does two things
diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx
index 3f3ec4d..644da1d 100644
--- a/Source/cmcldeps.cxx
+++ b/Source/cmcldeps.cxx
@@ -22,8 +22,8 @@
 #include <cmSystemTools.h>
 #include <cmsys/Encoding.hxx>
 
-#include <windows.h>
 #include <sstream>
+#include <windows.h>
 
 // We don't want any wildcard expansion.
 // See http://msdn.microsoft.com/en-us/library/zay8tzh6(v=vs.85).aspx
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 2b153bd..1f92b67 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -11,20 +11,20 @@
 ============================================================================*/
 #include "cmcmd.h"
 
-#include "cmMakefile.h"
-#include "cmLocalGenerator.h"
+#include "cmAlgorithms.h"
 #include "cmGlobalGenerator.h"
+#include "cmLocalGenerator.h"
+#include "cmMakefile.h"
 #include "cmQtAutoGenerators.h"
 #include "cmVersion.h"
-#include "cmAlgorithms.h"
 
 #if defined(CMAKE_BUILD_WITH_CMAKE)
 # include "cmDependsFortran.h" // For -E cmake_copy_f90_mod callback.
 #endif
 
 #include <cmsys/Directory.hxx>
-#include <cmsys/Process.h>
 #include <cmsys/FStream.hxx>
+#include <cmsys/Process.h>
 #include <cmsys/Terminal.h>
 
 #if defined(CMAKE_HAVE_VS_GENERATORS)
diff --git a/Source/ctest.cxx b/Source/ctest.cxx
index 7fa6aed..5c80487 100644
--- a/Source/ctest.cxx
+++ b/Source/ctest.cxx
@@ -13,11 +13,11 @@
 #include "cmSystemTools.h"
 
 // Need these for documentation support.
-#include "cmake.h"
 #include "cmDocumentation.h"
+#include "cmake.h"
 
-#include "CTest/cmCTestScriptHandler.h"
 #include "CTest/cmCTestLaunch.h"
+#include "CTest/cmCTestScriptHandler.h"
 #include "cmsys/Encoding.hxx"
 
 //----------------------------------------------------------------------------