diff --git a/Modules/CMakeTestWatcomVersion.c b/Modules/CMakeTestWatcomVersion.c
deleted file mode 100644
index 0343fb1279afc93601a8cc619e49cae33d6728c7..0000000000000000000000000000000000000000
--- a/Modules/CMakeTestWatcomVersion.c
+++ /dev/null
@@ -1 +0,0 @@
-VERSION=__WATCOMC__
diff --git a/Modules/CheckForPthreads.c b/Modules/CheckForPthreads.c
index 344c81beeb23c3ffe33d53737e759069e05b7c3e..9629a66f033d9c6f164f71452b27577b1494ef6a 100644
--- a/Modules/CheckForPthreads.c
+++ b/Modules/CheckForPthreads.c
@@ -1,5 +1,5 @@
-#include <stdio.h>
 #include <pthread.h>
+#include <stdio.h>
 #include <unistd.h>
 
 void* runner(void*);
diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.cxx b/Source/CPack/IFW/cmCPackIFWGenerator.cxx
index 50ac971d13f66184382a23a1a1d12aba60a8700e..c10803cc5e69eac1adab1c77b13a92c41bc43b1c 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 5770451eee9c3ca3de0646fe5887d5a7a53ee088..001c8c7821a87028d45fb83b52fd00879418c316 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 c271517f13f867e791d30bee0e243c36e72d349e..b3ddeee356288556e2409f186cc0333f00c6aa7a 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 ece327a41fe3fd12ad9529d34b729b307ec07b73..a98c684068404e4b065417f1b39498691b5267e2 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 3f66b2c023550d4432a09d117b55c1a2fd897068..871527b83f7bb542f4032c0ef6c1677bab07d72f 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.h
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.h
@@ -13,13 +13,13 @@
 #ifndef cmCPackWIXGenerator_h
 #define cmCPackWIXGenerator_h
 
+#include <CPack/cmCPackGenerator.h>
+
 #include "cmWIXPatch.h"
 #include "cmWIXShortcut.h"
 
-#include <CPack/cmCPackGenerator.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 20902f768a95d6823009b2b9f1325ac2b523f7d8..72939958bd086fa17427a32deb07b806af050250 100644
--- a/Source/CPack/WiX/cmWIXAccessControlList.h
+++ b/Source/CPack/WiX/cmWIXAccessControlList.h
@@ -13,11 +13,11 @@
 #ifndef cmWIXAccessControlList_h
 #define cmWIXAccessControlList_h
 
-#include <cmInstalledFile.h>
-#include <CPack/cmCPackLog.h>
-
 #include "cmWIXSourceWriter.h"
 
+#include <CPack/cmCPackLog.h>
+#include <cmInstalledFile.h>
+
 class cmWIXAccessControlList
 {
 public:
diff --git a/Source/CPack/WiX/cmWIXFeaturesSourceWriter.h b/Source/CPack/WiX/cmWIXFeaturesSourceWriter.h
index 76704175505058ec3f50145e0a948146341a2b6b..ff12e6c4acae14e7db426cc3e1cac57ab9947ce4 100644
--- a/Source/CPack/WiX/cmWIXFeaturesSourceWriter.h
+++ b/Source/CPack/WiX/cmWIXFeaturesSourceWriter.h
@@ -14,6 +14,7 @@
 #define cmWIXFeaturesSourceWriter_h
 
 #include "cmWIXSourceWriter.h"
+
 #include <CPack/cmCPackGenerator.h>
 
 /** \class cmWIXFeaturesSourceWriter
diff --git a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
index d4698a7642c1cdba7ace64cd9b28ae3cdb465730..446ce9639aed8c9b384893f01f9a38a54b96503e 100644
--- a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
+++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
@@ -11,6 +11,7 @@
 ============================================================================*/
 
 #include "cmWIXFilesSourceWriter.h"
+
 #include "cmWIXAccessControlList.h"
 
 #include <cmInstalledFile.h>
diff --git a/Source/CPack/WiX/cmWIXFilesSourceWriter.h b/Source/CPack/WiX/cmWIXFilesSourceWriter.h
index c48bc15ba9a81e75d0a2470b00488dc14c06001c..734f9011eebd84b5c23a7ebede2c8bc9f6832e0f 100644
--- a/Source/CPack/WiX/cmWIXFilesSourceWriter.h
+++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.h
@@ -14,8 +14,9 @@
 #define cmWIXFilesSourceWriter_h
 
 #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 2f31a013ea2703b0b0147f6a72fb0ab924b316ac..5b0eb3b7c178e04674bb9cf7f4753511b66c8f00 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/cmWIXPatchParser.h b/Source/CPack/WiX/cmWIXPatchParser.h
index acaeae3642d3304eba2176fed9ac84cab2940cf2..42c0787f82d7952b56cf4c41118da85896dd57d8 100644
--- a/Source/CPack/WiX/cmWIXPatchParser.h
+++ b/Source/CPack/WiX/cmWIXPatchParser.h
@@ -13,10 +13,10 @@
 #ifndef cmCPackWIXPatchParser_h
 #define cmCPackWIXPatchParser_h
 
-#include <cmXMLParser.h>
-
 #include <CPack/cmCPackLog.h>
 
+#include <cmXMLParser.h>
+
 #include <map>
 #include <list>
 
diff --git a/Source/CPack/WiX/cmWIXRichTextFormatWriter.h b/Source/CPack/WiX/cmWIXRichTextFormatWriter.h
index f6327fbd5d92e2775833cdd9191144c2833ca6f8..acf1fa6f41212d18d95cff8d1e95f738504355ef 100644
--- a/Source/CPack/WiX/cmWIXRichTextFormatWriter.h
+++ b/Source/CPack/WiX/cmWIXRichTextFormatWriter.h
@@ -13,6 +13,8 @@
 #ifndef cmWIXRichTextFormatWriter_h
 #define cmWIXRichTextFormatWriter_h
 
+#include "cmStandardIncludes.h"
+
 #include <cmsys/FStream.hxx>
 
 /** \class cmWIXRichtTextFormatWriter
diff --git a/Source/CPack/WiX/cmWIXShortcut.h b/Source/CPack/WiX/cmWIXShortcut.h
index 5945e4367392665f366acba7097cfb91f97f4eeb..598aa0d320d89427a100b3e65dab37581ca14870 100644
--- a/Source/CPack/WiX/cmWIXShortcut.h
+++ b/Source/CPack/WiX/cmWIXShortcut.h
@@ -13,13 +13,13 @@
 #ifndef cmWIXShortcut_h
 #define cmWIXShortcut_h
 
-#include <string>
+#include <cmInstalledFile.h>
+
 #include <map>
 #include <set>
+#include <string>
 #include <vector>
 
-#include <cmInstalledFile.h>
-
 class cmWIXFilesSourceWriter;
 
 struct cmWIXShortcut
diff --git a/Source/CPack/WiX/cmWIXSourceWriter.cxx b/Source/CPack/WiX/cmWIXSourceWriter.cxx
index 63acb278fc08c32ec8b47f0bae0f299f2982063d..2e5194c20fc694d4cf21270b7f3879cc4df1057d 100644
--- a/Source/CPack/WiX/cmWIXSourceWriter.cxx
+++ b/Source/CPack/WiX/cmWIXSourceWriter.cxx
@@ -10,8 +10,6 @@
   See the License for more information.
 ============================================================================*/
 
-#include "cmStandardIncludes.h"
-
 #include "cmWIXSourceWriter.h"
 
 #include <CPack/cmCPackGenerator.h>
diff --git a/Source/CPack/WiX/cmWIXSourceWriter.h b/Source/CPack/WiX/cmWIXSourceWriter.h
index 9e303f0d8c0e33f9346ab47cabe693353f1efb1d..2bf96746b394d59b22ce6895e3bcab94d887b297 100644
--- a/Source/CPack/WiX/cmWIXSourceWriter.h
+++ b/Source/CPack/WiX/cmWIXSourceWriter.h
@@ -13,11 +13,12 @@
 #ifndef cmWIXSourceWriter_h
 #define cmWIXSourceWriter_h
 
-#include <vector>
-#include <string>
+#include <CPack/cmCPackLog.h>
+
 #include <cmsys/FStream.hxx>
 
-#include <CPack/cmCPackLog.h>
+#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 db985db813dafeb387ed2e93b1bbc3f9d6bdf552..37e8bf02e4293b7d706505b64af052e39b59c81d 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/cmCPackArchiveGenerator.h b/Source/CPack/cmCPackArchiveGenerator.h
index 16e7632de4f2d4b3ed492e52b84166faa4ed2ba7..8b0733959ad7fc14f01a2258935b2b311c3fb1c8 100644
--- a/Source/CPack/cmCPackArchiveGenerator.h
+++ b/Source/CPack/cmCPackArchiveGenerator.h
@@ -13,9 +13,10 @@
 #ifndef cmCPackArchiveGenerator_h
 #define cmCPackArchiveGenerator_h
 
-#include "cmArchiveWrite.h"
 #include "cmCPackGenerator.h"
 
+#include "cmArchiveWrite.h"
+
 
 /** \class cmCPackArchiveGenerator
  * \brief A generator base for libarchive generation.
diff --git a/Source/CPack/cmCPackBundleGenerator.cxx b/Source/CPack/cmCPackBundleGenerator.cxx
index b2d70194498b9753b58e34a5b391f34fe18d5f16..e86667d5dddeb459a6dfe0da66e7b19a9deb90a3 100644
--- a/Source/CPack/cmCPackBundleGenerator.cxx
+++ b/Source/CPack/cmCPackBundleGenerator.cxx
@@ -11,6 +11,7 @@
 ============================================================================*/
 
 #include "cmCPackBundleGenerator.h"
+
 #include "cmCPackLog.h"
 #include "cmSystemTools.h"
 
diff --git a/Source/CPack/cmCPackComponentGroup.cxx b/Source/CPack/cmCPackComponentGroup.cxx
index fd20e9b20d14a673444fd1c69a3685bc60e6f533..b84758956ffdd296173b0924e211ca455d3f3ba7 100644
--- a/Source/CPack/cmCPackComponentGroup.cxx
+++ b/Source/CPack/cmCPackComponentGroup.cxx
@@ -11,9 +11,11 @@
 ============================================================================*/
 
 #include "cmCPackComponentGroup.h"
+
 #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 1f905c0302c5e5dac0569ff641d783a280c756ac..687689c2025cc31b524ee025a26b26b51a70a3b1 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 f5cb53cc99277de052786da1d8513664c2bd501d..d84b1eede8700b4d634ffade23ad8deec849d9f4 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 13c8d8f6cbb8cff6d94959afaa375aecf1be8b29..9e17bc836c2a7c65bd53df621473cd51e329b785 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -9,16 +9,17 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
+
 #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>
@@ -763,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/cmCPackDebGenerator.h b/Source/CPack/cmCPackDebGenerator.h
index d678cfacf386ed862f809ab8fa2b7924d10734a5..3d945dd2abfd4260ba0c7c613524468897bc86cf 100644
--- a/Source/CPack/cmCPackDebGenerator.h
+++ b/Source/CPack/cmCPackDebGenerator.h
@@ -13,7 +13,6 @@
 #ifndef cmCPackDebGenerator_h
 #define cmCPackDebGenerator_h
 
-
 #include "cmCPackGenerator.h"
 
 /** \class cmCPackDebGenerator
diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx
index d6de77df92518590a92536c94ff3e74104c875e6..b9c9c85bed67b83cef8c7d3ab15b0cbd11cd90ef 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@@ -11,12 +11,13 @@
 ============================================================================*/
 
 #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 3eca280cce82540e29c1f78176f4e9e5d119b5c8..6cc67e7fe4de2cf20a91f91fe8979b722eeff25d 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/cmCPackGenerator.h b/Source/CPack/cmCPackGenerator.h
index 907bb1ee15c453582616c5d1732e9c10bec6013a..3a53d0522bda4845835c3b6e67d364844fe9b9ea 100644
--- a/Source/CPack/cmCPackGenerator.h
+++ b/Source/CPack/cmCPackGenerator.h
@@ -14,6 +14,7 @@
 #define cmCPackGenerator_h
 
 #include "cmObject.h"
+
 #include "cmSystemTools.h"
 #include <map>
 #include <vector>
diff --git a/Source/CPack/cmCPackGeneratorFactory.cxx b/Source/CPack/cmCPackGeneratorFactory.cxx
index 46261427d15fcea4671cfd26f81686f76bbaaeb0..669964da906f80d32668f82bb8a53ef17659d6c1 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 5ba639fee9b88c3e1cf1ce42c2425a91ea07bcdf..eeb46fdff9ceed8c06aac16b046eea140d1a98b4 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/cmCPackNSISGenerator.h b/Source/CPack/cmCPackNSISGenerator.h
index c7b2ce10847721525c32a174b26a63a158137701..ab8ece472ba80d29dba666f01fa667cf28954691 100644
--- a/Source/CPack/cmCPackNSISGenerator.h
+++ b/Source/CPack/cmCPackNSISGenerator.h
@@ -13,8 +13,8 @@
 #ifndef cmCPackNSISGenerator_h
 #define cmCPackNSISGenerator_h
 
-
 #include "cmCPackGenerator.h"
+
 #include <set>
 
 /** \class cmCPackNSISGenerator
diff --git a/Source/CPack/cmCPackOSXX11Generator.cxx b/Source/CPack/cmCPackOSXX11Generator.cxx
index 8940f54155b399fe3933eabf4e65f14647e14670..1d7ef69b5e1030a6fbb13c819d69e500e4989581 100644
--- a/Source/CPack/cmCPackOSXX11Generator.cxx
+++ b/Source/CPack/cmCPackOSXX11Generator.cxx
@@ -9,17 +9,18 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
+
 #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 8fdc03660edb0c96daaac528cd3c0e4b6b6cea17..4f6238e364047cafb18fbf659732bf2e52a1f9eb 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/cmCPackPackageMakerGenerator.h b/Source/CPack/cmCPackPackageMakerGenerator.h
index 7d349c6626c06b6c5c07b655fdbe8b5d82776ae1..4e8ff03b4e2d85ddac3abc7fd09d8d984df678df 100644
--- a/Source/CPack/cmCPackPackageMakerGenerator.h
+++ b/Source/CPack/cmCPackPackageMakerGenerator.h
@@ -13,7 +13,6 @@
 #ifndef cmCPackPackageMakerGenerator_h
 #define cmCPackPackageMakerGenerator_h
 
-
 #include "cmCPackGenerator.h"
 
 class cmCPackComponent;
diff --git a/Source/CPack/cmCPackRPMGenerator.cxx b/Source/CPack/cmCPackRPMGenerator.cxx
index 71ab3a0d539958b6ecce3560ac6e0aba40e82575..706f43a680629d74f3d2bcfebd78d1a489ada1a9 100644
--- a/Source/CPack/cmCPackRPMGenerator.cxx
+++ b/Source/CPack/cmCPackRPMGenerator.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmCPackRPMGenerator.h"
+
 #include "cmCPackLog.h"
 #include "cmSystemTools.h"
 
diff --git a/Source/CPack/cmCPackRPMGenerator.h b/Source/CPack/cmCPackRPMGenerator.h
index a7722bc58f327d506006f20f4642cc9511f9a2c6..a4a1ba87a3df742d20594a564a18f9d136e2636f 100644
--- a/Source/CPack/cmCPackRPMGenerator.h
+++ b/Source/CPack/cmCPackRPMGenerator.h
@@ -13,7 +13,6 @@
 #ifndef cmCPackRPMGenerator_h
 #define cmCPackRPMGenerator_h
 
-
 #include "cmCPackGenerator.h"
 
 /** \class cmCPackRPMGenerator
diff --git a/Source/CPack/cmCPackSTGZGenerator.cxx b/Source/CPack/cmCPackSTGZGenerator.cxx
index 68b893f6fb1ed05f8a7bcbf7dbad07f7b9d6f029..8a83666fa4507b240242927cd08e089c42a98609 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/cmCPackSTGZGenerator.h b/Source/CPack/cmCPackSTGZGenerator.h
index ccceec806243df729ff6c12aec668968abfb7591..08152b5b22012c75895c29c9ad04a1f69cf76169 100644
--- a/Source/CPack/cmCPackSTGZGenerator.h
+++ b/Source/CPack/cmCPackSTGZGenerator.h
@@ -13,7 +13,6 @@
 #ifndef cmCPackSTGZGenerator_h
 #define cmCPackSTGZGenerator_h
 
-
 #include "cmCPackTGZGenerator.h"
 
 /** \class cmCPackSTGZGenerator
diff --git a/Source/CPack/cmCPackTarBZip2Generator.cxx b/Source/CPack/cmCPackTarBZip2Generator.cxx
index 9ff588b3ff75c18f120d5154779bd11164611cbd..da16737d4d8062806f97e53a7652adc611d5cc2a 100644
--- a/Source/CPack/cmCPackTarBZip2Generator.cxx
+++ b/Source/CPack/cmCPackTarBZip2Generator.cxx
@@ -11,6 +11,7 @@
 ============================================================================*/
 
 #include "cmCPackTarBZip2Generator.h"
+
 //----------------------------------------------------------------------
 cmCPackTarBZip2Generator::cmCPackTarBZip2Generator()
  :cmCPackArchiveGenerator(cmArchiveWrite::CompressBZip2,
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index c08897fa425f96efc9c607b51e4e777753d6c41a..813fb0159b77f3f9f847e7cfe45b832394927b6d 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 d62c260d6423e2f24bb567f6d2c51adda9c00221..41f4f1254e0b7e2c7a88ef3e97b9d4f27cdd5590 100644
--- a/Source/CTest/cmCTestBatchTestHandler.cxx
+++ b/Source/CTest/cmCTestBatchTestHandler.cxx
@@ -11,9 +11,10 @@
 ============================================================================*/
 
 #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 e0c6e48d524b0d09a0a89ea41ba4b8ceaae690f3..b0fc8d56ae070d8929eb12e877433d15202d74a7 100644
--- a/Source/CTest/cmCTestBatchTestHandler.h
+++ b/Source/CTest/cmCTestBatchTestHandler.h
@@ -14,9 +14,10 @@
 #define cmCTestBatchTestHandler_h
 
 #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 20d303d82739b2145919585ca9a8203e0e1c6c33..52433da6eaeaa386f094283267fef175c3ded2f2 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 27e22c4c724faf19ff428a6cbf66aff885860f02..0cfcc64b2afd4fe446d51b79811edf6c4df9894c 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 0d74f48f22e0a6d2b67035fe2b5ac3a643007b9b..1b31533d8b1c739f6c302a33ed465a019354451f 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/cmCTestBuildHandler.h b/Source/CTest/cmCTestBuildHandler.h
index 2e9b92a70cf5e444ac5c95e0a787e268f7b243eb..9231170211524d24aea7ea387124fdee6c6df053 100644
--- a/Source/CTest/cmCTestBuildHandler.h
+++ b/Source/CTest/cmCTestBuildHandler.h
@@ -13,8 +13,8 @@
 #ifndef cmCTestBuildHandler_h
 #define cmCTestBuildHandler_h
 
-
 #include "cmCTestGenericHandler.h"
+
 #include "cmListFileCache.h"
 
 #include <cmsys/RegularExpression.hxx>
diff --git a/Source/CTest/cmCTestCVS.cxx b/Source/CTest/cmCTestCVS.cxx
index 0fb3fec5778655e8646328cd203fbe13b14725f5..58d86891e2db7b416e86ed52af7b79f8761a9e01 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 ba4dab235d72da4f1a9d7f1cd6b5810fdf36156d..8f15c6d2e55de2ae6bd99501218f2be582660ecc 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 2e8aeb9563ba2ee9302b3ad37ed1b486eea5b30b..e9f8f3928fd5fef3f91e2f712107d04cb539232c 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/cmCTestConfigureHandler.h b/Source/CTest/cmCTestConfigureHandler.h
index d880bd7df6e31afe4d2254c2f73a67256811dabf..4c1a96b02d82e42f55400e50cf792c6eef0ba23c 100644
--- a/Source/CTest/cmCTestConfigureHandler.h
+++ b/Source/CTest/cmCTestConfigureHandler.h
@@ -13,8 +13,8 @@
 #ifndef cmCTestConfigureHandler_h
 #define cmCTestConfigureHandler_h
 
-
 #include "cmCTestGenericHandler.h"
+
 #include "cmListFileCache.h"
 
 /** \class cmCTestConfigureHandler
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index fd62696701c0c3a2ad2f69cd2210399ceccf2c64..79eb3460a2a77838873a27695ef9a1a17d8583ab 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -10,28 +10,29 @@
   See the License for more information.
 ============================================================================*/
 #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/cmCTestCoverageHandler.h b/Source/CTest/cmCTestCoverageHandler.h
index 7102d1e671ecff9e34608c3c1de80af6b92c4ffb..c91a2d7dbc319ed12a746cf8682e33cf016dde9f 100644
--- a/Source/CTest/cmCTestCoverageHandler.h
+++ b/Source/CTest/cmCTestCoverageHandler.h
@@ -13,8 +13,8 @@
 #ifndef cmCTestCoverageHandler_h
 #define cmCTestCoverageHandler_h
 
-
 #include "cmCTestGenericHandler.h"
+
 #include "cmListFileCache.h"
 
 #include <cmsys/RegularExpression.hxx>
diff --git a/Source/CTest/cmCTestCurl.cxx b/Source/CTest/cmCTestCurl.cxx
index fb6cc007f8df249c5f00f400793ea06d61aac873..0367d7d9569922d4b5b43a97d185942e52d55ed7 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 1d6bdcea11b9f935b11ba2263b4f7a37d673f515..3ff12c18f89a746c8a4dc548e10b5c98ee9cfa99 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/cmCTestGenericHandler.cxx b/Source/CTest/cmCTestGenericHandler.cxx
index ad79ba2b170baf20d234a0623a6651a27fcbccf4..7eccb9c436429f3dff5ca449311cadba1a1a6884 100644
--- a/Source/CTest/cmCTestGenericHandler.cxx
+++ b/Source/CTest/cmCTestGenericHandler.cxx
@@ -11,6 +11,7 @@
 ============================================================================*/
 
 #include "cmCTestGenericHandler.h"
+
 #include "cmSystemTools.h"
 
 #include "cmCTest.h"
diff --git a/Source/CTest/cmCTestGenericHandler.h b/Source/CTest/cmCTestGenericHandler.h
index 4b7ae7901a64199f99596739081e1521398604ff..7a7e03431b5b07477c0e7c166feb3f47971426ee 100644
--- a/Source/CTest/cmCTestGenericHandler.h
+++ b/Source/CTest/cmCTestGenericHandler.h
@@ -13,8 +13,8 @@
 #ifndef cmCTestGenericHandler_h
 #define cmCTestGenericHandler_h
 
-
 #include "cmObject.h"
+
 #include "cmCTest.h"
 #include "cmSystemTools.h" //OutputOption
 
diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx
index 749a5beec2d2734168b8ea2af14b1eac1ab8708a..03b06f87ce25c1f5d26f3beaab5c490dd5d5a73e 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/cmCTestLaunch.h b/Source/CTest/cmCTestLaunch.h
index b13e4847b92fc9c5a7e85344c559a17b6fb1268e..1a908a3fd42fa99e34c3f0d0a049989013635dc3 100644
--- a/Source/CTest/cmCTestLaunch.h
+++ b/Source/CTest/cmCTestLaunch.h
@@ -13,6 +13,7 @@
 #define cmCTestLaunch_h
 
 #include "cmStandardIncludes.h"
+
 #include <cmsys/RegularExpression.hxx>
 
 class cmXMLWriter;
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index acf527acdfac410f39af20e181c37945e0cda475..9e3ba576baf4bd997fc6a34c360a147ed728b7b4 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -11,21 +11,22 @@
 ============================================================================*/
 
 #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 f1ac794dc811a12be6cc3b455aab3b000269d0a3..62329245c5c8538352ab9bde6b00692e65bd5bb3 100644
--- a/Source/CTest/cmCTestMemCheckHandler.h
+++ b/Source/CTest/cmCTestMemCheckHandler.h
@@ -13,12 +13,11 @@
 #ifndef cmCTestMemCheckHandler_h
 #define cmCTestMemCheckHandler_h
 
-
 #include "cmCTestTestHandler.h"
-#include "cmStandardIncludes.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 7c7f5dfe2d5802bffc8f55259e698acaece1cb6b..143451842234a7c8945e49eb882d2dac51d303ea 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -10,18 +10,19 @@
   See the License for more information.
 ============================================================================*/
 #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/cmCTestMultiProcessHandler.h b/Source/CTest/cmCTestMultiProcessHandler.h
index ed3e155a0869ccc5ed61a8099318527e55d79546..64e56e605b9d3cea7fd8149b8d450ccd4ec48d2a 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.h
+++ b/Source/CTest/cmCTestMultiProcessHandler.h
@@ -12,8 +12,8 @@
 #ifndef cmCTestMultiProcessHandler_h
 #define cmCTestMultiProcessHandler_h
 
-#include <cmStandardIncludes.h>
 #include <cmCTestTestHandler.h>
+
 #include <cmCTestRunTest.h>
 
 /** \class cmCTestMultiProcessHandler
diff --git a/Source/CTest/cmCTestP4.cxx b/Source/CTest/cmCTestP4.cxx
index 5e0c54a3f3b066a8691f9f5da340139d9582a3c0..f7c960c53b42768d6d6adca2fd66d06eff051cdb 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 7a53475fd850b9ab46cf0e1fdd9107f9473b4052..d666bd813464e8cb34634b8ca81f3cb024b0a327 100644
--- a/Source/CTest/cmCTestP4.h
+++ b/Source/CTest/cmCTestP4.h
@@ -13,8 +13,9 @@
 #define cmCTestP4_h
 
 #include "cmCTestGlobalVC.h"
-#include <vector>
+
 #include <map>
+#include <vector>
 
 /** \class cmCTestP4
  * \brief Interaction with the Perforce command-line tool
diff --git a/Source/CTest/cmCTestReadCustomFilesCommand.cxx b/Source/CTest/cmCTestReadCustomFilesCommand.cxx
index 3b9d5527a87ddca50e9607196e5bd83c712e2f7e..5db01f98d07cd4ea2063eb6aeb8e1c53aeb4ce20 100644
--- a/Source/CTest/cmCTestReadCustomFilesCommand.cxx
+++ b/Source/CTest/cmCTestReadCustomFilesCommand.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmCTestReadCustomFilesCommand.h"
+
 #include "cmCTest.h"
 
 bool cmCTestReadCustomFilesCommand
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index f329e7719ebcabae2086fec5fa72cd7ecb440543..5d159c19ff283fa69cdef2a5c6449ba463f48e53 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -11,8 +11,9 @@
 ============================================================================*/
 
 #include "cmCTestRunTest.h"
-#include "cmCTestMemCheckHandler.h"
+
 #include "cmCTest.h"
+#include "cmCTestMemCheckHandler.h"
 #include "cmSystemTools.h"
 #include "cm_curl.h"
 
diff --git a/Source/CTest/cmCTestRunTest.h b/Source/CTest/cmCTestRunTest.h
index 3b5c83160a774f2c2a3d4da1727260cf0fb336d1..5f3467a874409e4c67ffc667d6405e8c08bd7a74 100644
--- a/Source/CTest/cmCTestRunTest.h
+++ b/Source/CTest/cmCTestRunTest.h
@@ -12,8 +12,8 @@
 #ifndef cmCTestRunTest_h
 #define cmCTestRunTest_h
 
-#include <cmStandardIncludes.h>
 #include <cmCTestTestHandler.h>
+
 #include <cmProcess.h>
 
 /** \class cmRunTest
diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx
index ee15271a05145442e8cc9cf186edc64fbbbd771c..4485d34b923ae91e1694109a73209e2b4f1b903d 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/cmCTestScriptHandler.h b/Source/CTest/cmCTestScriptHandler.h
index c9d0b6a3c7823fa1fb3ba0ad1aef7955dd7aef35..2b66f7049aace38232bc5328f1d10f05688cb926 100644
--- a/Source/CTest/cmCTestScriptHandler.h
+++ b/Source/CTest/cmCTestScriptHandler.h
@@ -13,8 +13,8 @@
 #ifndef cmCTestScriptHandler_h
 #define cmCTestScriptHandler_h
 
-
 #include "cmCTestGenericHandler.h"
+
 #include "cmListFileCache.h"
 
 class cmMakefile;
diff --git a/Source/CTest/cmCTestStartCommand.cxx b/Source/CTest/cmCTestStartCommand.cxx
index 36576c540a339f87c1b00c3cb341995808e7c237..4a38dc67cc7a6a6dabe25959d120ae9aed2b505a 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/cmCTestSubmitCommand.h b/Source/CTest/cmCTestSubmitCommand.h
index 19e8eafb5616be2fbc3150836eb5fb1c0a7a15d3..ebc8c364176fdffb25ee660ab18935bd1c63f2a0 100644
--- a/Source/CTest/cmCTestSubmitCommand.h
+++ b/Source/CTest/cmCTestSubmitCommand.h
@@ -13,6 +13,7 @@
 #define cmCTestSubmitCommand_h
 
 #include "cmCTestHandlerCommand.h"
+
 #include "cmCTest.h"
 
 /** \class cmCTestSubmit
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index 833cad6f0d53f8a68a433e9b34abc797a4dc86f7..6a65839f835b07aace886eabb4130509a6a3bcd7 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -10,25 +10,26 @@
   See the License for more information.
 ============================================================================*/
 #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 59ed98eb02f91b13cb6a5b4a50b41399e795b62a..d8229da76cd20186ff395f2a408169c1b9b9e5af 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -11,27 +11,28 @@
 ============================================================================*/
 
 #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/cmCTestTestHandler.h b/Source/CTest/cmCTestTestHandler.h
index d12c2b64379177654fc7c7ff0ce365e3fe9e67f3..28338dd63db4e932f05b971fd6e065b1780644ff 100644
--- a/Source/CTest/cmCTestTestHandler.h
+++ b/Source/CTest/cmCTestTestHandler.h
@@ -13,8 +13,8 @@
 #ifndef cmCTestTestHandler_h
 #define cmCTestTestHandler_h
 
-
 #include "cmCTestGenericHandler.h"
+
 #include <cmsys/RegularExpression.hxx>
 
 class cmMakefile;
diff --git a/Source/CTest/cmCTestUpdateHandler.cxx b/Source/CTest/cmCTestUpdateHandler.cxx
index bf2f34ac748ae5a66dad204143d80f1b67ecf794..b1b0a21f9b81176890fbbb3db9825ae343129818 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/cmCTestUpdateHandler.h b/Source/CTest/cmCTestUpdateHandler.h
index d2423c0d5f68b60e80957a1ea0976984867c29b6..463703c3d82e4a7634cab4ef11cb9f0162187db6 100644
--- a/Source/CTest/cmCTestUpdateHandler.h
+++ b/Source/CTest/cmCTestUpdateHandler.h
@@ -13,8 +13,8 @@
 #ifndef cmCTestUpdateHandler_h
 #define cmCTestUpdateHandler_h
 
-
 #include "cmCTestGenericHandler.h"
+
 #include "cmListFileCache.h"
 
 /** \class cmCTestUpdateHandler
diff --git a/Source/CTest/cmCTestUploadCommand.h b/Source/CTest/cmCTestUploadCommand.h
index 4a07608d25cce07bd32174254571aefe6dede67f..18022543cd73d83b80e95f4cd6484bebbcebaa13 100644
--- a/Source/CTest/cmCTestUploadCommand.h
+++ b/Source/CTest/cmCTestUploadCommand.h
@@ -13,6 +13,7 @@
 #define cmCTestUploadCommand_h
 
 #include "cmCTestHandlerCommand.h"
+
 #include "cmCTest.h"
 
 /** \class cmCTestUpload
diff --git a/Source/CTest/cmParseBlanketJSCoverage.cxx b/Source/CTest/cmParseBlanketJSCoverage.cxx
index 1edd01f4863e2305ed0e0acace7da01b93f942f4..1f1db3eafcdc3d3a2623ded3ee54f4fcfa129e18 100644
--- a/Source/CTest/cmParseBlanketJSCoverage.cxx
+++ b/Source/CTest/cmParseBlanketJSCoverage.cxx
@@ -9,14 +9,14 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#include "cmStandardIncludes.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include "cmSystemTools.h"
 #include "cmParseBlanketJSCoverage.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/cmParseBlanketJSCoverage.h b/Source/CTest/cmParseBlanketJSCoverage.h
index fc1d477474c78e085fb2bcc81eeb2e0848b4ec3d..d34492d84e2d97578c8c0f170b4ee1ac87f32d62 100644
--- a/Source/CTest/cmParseBlanketJSCoverage.h
+++ b/Source/CTest/cmParseBlanketJSCoverage.h
@@ -13,7 +13,6 @@
 #ifndef cmParseBlanketJSCoverage_h
 #define cmParseBlanketJSCoverage_h
 
-#include "cmStandardIncludes.h"
 #include "cmCTestCoverageHandler.h"
 
 
diff --git a/Source/CTest/cmParseCacheCoverage.cxx b/Source/CTest/cmParseCacheCoverage.cxx
index 92bf88eafc11ab7556cf49064bea6556bbcf2359..f8380871f084b88ee29fe560823bb0c2c3f13f96 100644
--- a/Source/CTest/cmParseCacheCoverage.cxx
+++ b/Source/CTest/cmParseCacheCoverage.cxx
@@ -1,11 +1,11 @@
-#include "cmStandardIncludes.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include "cmSystemTools.h"
 #include "cmParseCacheCoverage.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/cmParseCoberturaCoverage.cxx b/Source/CTest/cmParseCoberturaCoverage.cxx
index 515d041f02076fa70aa2446814b9606bcc3dad0c..5b4a37660c2740fc30797ab59eda5f8d36883f07 100644
--- a/Source/CTest/cmParseCoberturaCoverage.cxx
+++ b/Source/CTest/cmParseCoberturaCoverage.cxx
@@ -1,7 +1,7 @@
-#include "cmStandardIncludes.h"
+#include "cmParseCoberturaCoverage.h"
+
 #include "cmSystemTools.h"
 #include "cmXMLParser.h"
-#include "cmParseCoberturaCoverage.h"
 #include <cmsys/Directory.hxx>
 #include <cmsys/FStream.hxx>
 
diff --git a/Source/CTest/cmParseCoberturaCoverage.h b/Source/CTest/cmParseCoberturaCoverage.h
index ff5954dd1aec5da7ac2d603128e485353dc9cdcf..c3e3ec98e6752a0416df1ac519c4d5fd923766f0 100644
--- a/Source/CTest/cmParseCoberturaCoverage.h
+++ b/Source/CTest/cmParseCoberturaCoverage.h
@@ -13,7 +13,6 @@
 #ifndef cmParseCoberturaCoverage_h
 #define cmParseCoberturaCoverage_h
 
-#include "cmStandardIncludes.h"
 #include "cmCTestCoverageHandler.h"
 
 /** \class cmParsePythonCoverage
diff --git a/Source/CTest/cmParseDelphiCoverage.cxx b/Source/CTest/cmParseDelphiCoverage.cxx
index e453fe16700eda38d3082f1c21e40cf345b2d43e..09c4f02b01648fadbab91fc493c0ef5b0a996021 100644
--- a/Source/CTest/cmParseDelphiCoverage.cxx
+++ b/Source/CTest/cmParseDelphiCoverage.cxx
@@ -1,12 +1,12 @@
-#include "cmStandardIncludes.h"
-#include <stdio.h>
-#include <stdlib.h>
+#include "cmParseDelphiCoverage.h"
+
 #include "cmSystemTools.h"
 #include "cmXMLParser.h"
-#include "cmParseDelphiCoverage.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/cmParseDelphiCoverage.h b/Source/CTest/cmParseDelphiCoverage.h
index 018340b2ed04523dc52cc621deb611ea1733b5f2..2c3f3b31fb190c229ef375aeb258f5d703794ee1 100644
--- a/Source/CTest/cmParseDelphiCoverage.h
+++ b/Source/CTest/cmParseDelphiCoverage.h
@@ -13,7 +13,6 @@
 #ifndef cmParseDelphiCoverage_h
 #define cmParseDelphiCoverage_h
 
-#include "cmStandardIncludes.h"
 #include "cmCTestCoverageHandler.h"
 
 
diff --git a/Source/CTest/cmParseGTMCoverage.cxx b/Source/CTest/cmParseGTMCoverage.cxx
index f3f80084db51dfb07ea5476b9aa9a6561d60c49e..ae7dedbfa4eb006e49ccbdcb5c9015b617b066a1 100644
--- a/Source/CTest/cmParseGTMCoverage.cxx
+++ b/Source/CTest/cmParseGTMCoverage.cxx
@@ -1,11 +1,11 @@
-#include "cmStandardIncludes.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include "cmSystemTools.h"
 #include "cmParseGTMCoverage.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 47e3b3267c01fd9df91d1d633b0ace404f05001a..d9c4ffb4119679aef77561404c3baa8514e287d7 100644
--- a/Source/CTest/cmParseJacocoCoverage.cxx
+++ b/Source/CTest/cmParseJacocoCoverage.cxx
@@ -1,12 +1,12 @@
-#include "cmStandardIncludes.h"
-#include <stdio.h>
-#include <stdlib.h>
+#include "cmParseJacocoCoverage.h"
+
 #include "cmSystemTools.h"
 #include "cmXMLParser.h"
-#include "cmParseJacocoCoverage.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/cmParseJacocoCoverage.h b/Source/CTest/cmParseJacocoCoverage.h
index dad05a32e4541c6fd08778a7769da358fe888585..cf86508fd857cf614bd9369dd6c882f267380882 100644
--- a/Source/CTest/cmParseJacocoCoverage.h
+++ b/Source/CTest/cmParseJacocoCoverage.h
@@ -13,7 +13,6 @@
 #ifndef cmParseJacocoCoverage_h
 #define cmParseJacocoCoverage_h
 
-#include "cmStandardIncludes.h"
 #include "cmCTestCoverageHandler.h"
 
 
diff --git a/Source/CTest/cmParseMumpsCoverage.cxx b/Source/CTest/cmParseMumpsCoverage.cxx
index 225e704d90e64dff29b008b97a6e4b06b8d3dacb..d0c7599d25db3b401b25cf48db2fed73b2c6e35c 100644
--- a/Source/CTest/cmParseMumpsCoverage.cxx
+++ b/Source/CTest/cmParseMumpsCoverage.cxx
@@ -1,11 +1,11 @@
-#include "cmStandardIncludes.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include "cmSystemTools.h"
 #include "cmParseGTMCoverage.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/CTest/cmParseMumpsCoverage.h b/Source/CTest/cmParseMumpsCoverage.h
index bc71891688bf2b9af38264c2622854f8efaab4c4..ab957b88bf7e92d89baa0504ed969c1ddfd660fd 100644
--- a/Source/CTest/cmParseMumpsCoverage.h
+++ b/Source/CTest/cmParseMumpsCoverage.h
@@ -13,7 +13,6 @@
 #ifndef cmParseMumpsCoverage_h
 #define cmParseMumpsCoverage_h
 
-#include "cmStandardIncludes.h"
 #include "cmCTestCoverageHandler.h"
 
 /** \class cmParseMumpsCoverage
diff --git a/Source/CTest/cmParsePHPCoverage.cxx b/Source/CTest/cmParsePHPCoverage.cxx
index c7f5a684d1f9be85a909c5b72bd9ced786296f09..7c2901ed21ecbb310ead0acd7573642186f7bb98 100644
--- a/Source/CTest/cmParsePHPCoverage.cxx
+++ b/Source/CTest/cmParsePHPCoverage.cxx
@@ -1,6 +1,6 @@
-#include "cmStandardIncludes.h"
-#include "cmSystemTools.h"
 #include "cmParsePHPCoverage.h"
+
+#include "cmSystemTools.h"
 #include <cmsys/Directory.hxx>
 #include <cmsys/FStream.hxx>
 
diff --git a/Source/CTest/cmParsePHPCoverage.h b/Source/CTest/cmParsePHPCoverage.h
index 92a76347f1b3a73b8ebb372c2b3974fe162f11db..706d0366fc73e73430ff5fbdb7f70d2230b1a1e4 100644
--- a/Source/CTest/cmParsePHPCoverage.h
+++ b/Source/CTest/cmParsePHPCoverage.h
@@ -13,7 +13,6 @@
 #ifndef cmParsePHPCoverage_h
 #define cmParsePHPCoverage_h
 
-#include "cmStandardIncludes.h"
 #include "cmCTestCoverageHandler.h"
 
 /** \class cmParsePHPCoverage
diff --git a/Source/CTest/cmProcess.cxx b/Source/CTest/cmProcess.cxx
index 6441886486d4bc4c01202162598634673de2e571..c9a4618451b31203f33c9b61b0355291dfce7d41 100644
--- a/Source/CTest/cmProcess.cxx
+++ b/Source/CTest/cmProcess.cxx
@@ -11,6 +11,7 @@
 ============================================================================*/
 
 #include <cmProcess.h>
+
 #include <cmSystemTools.h>
 
 cmProcess::cmProcess()
diff --git a/Source/CTest/cmProcess.h b/Source/CTest/cmProcess.h
index c9fd859996def68608bccdd53ec93081d28c89e5..326456e6637337f05b98c29f02f6483a4817be48 100644
--- a/Source/CTest/cmProcess.h
+++ b/Source/CTest/cmProcess.h
@@ -12,8 +12,8 @@
 #ifndef cmProcess_h
 #define cmProcess_h
 
-
 #include "cmStandardIncludes.h"
+
 #include <cmsys/Process.h>
 
 
diff --git a/Source/CursesDialog/ccmake.cxx b/Source/CursesDialog/ccmake.cxx
index 5236e57d56dd9d2108f3a7501fc2e6f1d4a3c1f1..b7c22b109599146f09139f8861408128c05dee0f 100644
--- a/Source/CursesDialog/ccmake.cxx
+++ b/Source/CursesDialog/ccmake.cxx
@@ -9,15 +9,16 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
+#include "cmCursesStandardIncludes.h"
+
+#include "../cmDocumentation.h"
 #include "../cmSystemTools.h"
 #include "../cmake.h"
-#include "../cmDocumentation.h"
 
 #include <signal.h>
 #include <sys/ioctl.h>
 
 #include "cmCursesMainForm.h"
-#include "cmCursesStandardIncludes.h"
 #include <cmsys/Encoding.hxx>
 
 #include <form.h>
diff --git a/Source/CursesDialog/cmCursesBoolWidget.cxx b/Source/CursesDialog/cmCursesBoolWidget.cxx
index 29d9cb23bb64ff3a586ad7989124993f8d20da41..0529b7823d5935f9f9a15e7228bd0fc7a78c9c7b 100644
--- a/Source/CursesDialog/cmCursesBoolWidget.cxx
+++ b/Source/CursesDialog/cmCursesBoolWidget.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmCursesBoolWidget.h"
+
 #include "cmCursesMainForm.h"
 
 cmCursesBoolWidget::cmCursesBoolWidget(int width, int height,
diff --git a/Source/CursesDialog/cmCursesBoolWidget.h b/Source/CursesDialog/cmCursesBoolWidget.h
index 8a57c73daa04c12accdfeb1436f6b32224007f27..65a8ddb8520fe6ff1f392f51136b273e2391d426 100644
--- a/Source/CursesDialog/cmCursesBoolWidget.h
+++ b/Source/CursesDialog/cmCursesBoolWidget.h
@@ -13,6 +13,7 @@
 #define cmCursesBoolWidget_h
 
 #include "cmCursesWidget.h"
+
 class cmCursesMainForm;
 
 class cmCursesBoolWidget : public cmCursesWidget
diff --git a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
index 7e09242124eb671faae317f26673ace166005e2b..40c0eb6ef2f9294fa2e0d934cdaeaaeb5c364187 100644
--- a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
+++ b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
@@ -10,16 +10,17 @@
   See the License for more information.
 ============================================================================*/
 #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/cmCursesForm.h b/Source/CursesDialog/cmCursesForm.h
index 9837f5aa3494ed536b94afcb718d8bbe383f75d1..2c4549451f2dec02fdaa42014368afb6f03f0fa5 100644
--- a/Source/CursesDialog/cmCursesForm.h
+++ b/Source/CursesDialog/cmCursesForm.h
@@ -12,8 +12,8 @@
 #ifndef cmCursesForm_h
 #define cmCursesForm_h
 
-#include "../cmStandardIncludes.h"
 #include "cmCursesStandardIncludes.h"
+
 #include <cmsys/FStream.hxx>
 
 class cmCursesForm
diff --git a/Source/CursesDialog/cmCursesLabelWidget.h b/Source/CursesDialog/cmCursesLabelWidget.h
index 98170f581813f8a36804fe3ff747e19ba9cc6b9a..c31a58cac03f5aa681a568a3b754d5a1ada33f1f 100644
--- a/Source/CursesDialog/cmCursesLabelWidget.h
+++ b/Source/CursesDialog/cmCursesLabelWidget.h
@@ -13,7 +13,6 @@
 #define cmCursesLabelWidget_h
 
 #include "cmCursesWidget.h"
-#include "cmCursesStandardIncludes.h"
 
 class cmCursesMainForm;
 
diff --git a/Source/CursesDialog/cmCursesLongMessageForm.cxx b/Source/CursesDialog/cmCursesLongMessageForm.cxx
index 6144ddc2b85e643d5c4958d780831861dd9f8fd2..776d828a9a748987a86b805b49181f26b6f84fb6 100644
--- a/Source/CursesDialog/cmCursesLongMessageForm.cxx
+++ b/Source/CursesDialog/cmCursesLongMessageForm.cxx
@@ -9,10 +9,11 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
+#include "cmCursesLongMessageForm.h"
+
 #include "../cmSystemTools.h"
-#include "../cmake.h"
 #include "../cmVersion.h"
-#include "cmCursesLongMessageForm.h"
+#include "../cmake.h"
 #include "cmCursesMainForm.h"
 
 inline int ctrl(int z)
diff --git a/Source/CursesDialog/cmCursesLongMessageForm.h b/Source/CursesDialog/cmCursesLongMessageForm.h
index 6e37eeadea84de693e655657568688aebda2b7d4..e9bd542c49e266850ef5b914f1d7fd3ec55abe9a 100644
--- a/Source/CursesDialog/cmCursesLongMessageForm.h
+++ b/Source/CursesDialog/cmCursesLongMessageForm.h
@@ -12,10 +12,10 @@
 #ifndef cmCursesLongMessageForm_h
 #define cmCursesLongMessageForm_h
 
-#include "../cmStandardIncludes.h"
-#include "cmCursesForm.h"
 #include "cmCursesStandardIncludes.h"
 
+#include "cmCursesForm.h"
+
 class cmCursesCacheEntryComposite;
 
 class cmCursesLongMessageForm : public cmCursesForm
diff --git a/Source/CursesDialog/cmCursesMainForm.cxx b/Source/CursesDialog/cmCursesMainForm.cxx
index a2fc2c0caddf6ae25940afb78ba76029a63fa80e..2aafc8b34c87da3f306f0b2d463eafb577290575 100644
--- a/Source/CursesDialog/cmCursesMainForm.cxx
+++ b/Source/CursesDialog/cmCursesMainForm.cxx
@@ -9,19 +9,20 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
+#include "cmCursesMainForm.h"
+
 #include "../cmSystemTools.h"
 #include "../cmVersion.h"
 #include "../cmake.h"
-#include "cmCursesMainForm.h"
-#include "cmCursesStringWidget.h"
-#include "cmCursesLabelWidget.h"
+#include "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/CursesDialog/cmCursesMainForm.h b/Source/CursesDialog/cmCursesMainForm.h
index 255c823be630388b01775cb10605e10e12f25308..9a80ba20c60ff556c8e1d5b4d650e586522d5248 100644
--- a/Source/CursesDialog/cmCursesMainForm.h
+++ b/Source/CursesDialog/cmCursesMainForm.h
@@ -12,10 +12,11 @@
 #ifndef cmCursesMainForm_h
 #define cmCursesMainForm_h
 
-#include "../cmStandardIncludes.h"
-#include "cmCursesForm.h"
 #include "cmCursesStandardIncludes.h"
 
+#include "../cmState.h"
+#include "cmCursesForm.h"
+
 class cmCursesCacheEntryComposite;
 class cmCursesWidget;
 class cmake;
diff --git a/Source/CursesDialog/cmCursesOptionsWidget.cxx b/Source/CursesDialog/cmCursesOptionsWidget.cxx
index 30110a496a80cee3d543439533a124ac89331783..05aeab1cd93e4c66a7756c3c3b4a8ba21fc040a1 100644
--- a/Source/CursesDialog/cmCursesOptionsWidget.cxx
+++ b/Source/CursesDialog/cmCursesOptionsWidget.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmCursesOptionsWidget.h"
+
 #include "cmCursesMainForm.h"
 
 inline int ctrl(int z)
diff --git a/Source/CursesDialog/cmCursesOptionsWidget.h b/Source/CursesDialog/cmCursesOptionsWidget.h
index 324014eaeec5db0a8b89817ce18a06126655a9f9..ba359d3bb535f50c2f0fe66fe5146140cd4bac10 100644
--- a/Source/CursesDialog/cmCursesOptionsWidget.h
+++ b/Source/CursesDialog/cmCursesOptionsWidget.h
@@ -13,6 +13,7 @@
 #define cmCursesOptionsWidget_h
 
 #include "cmCursesWidget.h"
+
 class cmCursesMainForm;
 
 class cmCursesOptionsWidget : public cmCursesWidget
diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h
index 6047ec579b0792662d3ce9970cb62ba662701a8e..69a05b2ee747cc197efd43e7780f528aff8721d4 100644
--- a/Source/CursesDialog/cmCursesStandardIncludes.h
+++ b/Source/CursesDialog/cmCursesStandardIncludes.h
@@ -11,6 +11,9 @@
 ============================================================================*/
 #ifndef cmCursesStandardIncludes_h
 #define cmCursesStandardIncludes_h
+
+#include "../cmStandardIncludes.h"
+
 #if defined(__sun__) && defined(__GNUC__)
  #define _MSE_INT_H
 #endif
diff --git a/Source/CursesDialog/cmCursesStringWidget.cxx b/Source/CursesDialog/cmCursesStringWidget.cxx
index 1c832ddfd0b72ae83ea1bef574ea4b98396b36c6..6bd7b4500e73d17d67a1e3cd48f53ec0783a14f2 100644
--- a/Source/CursesDialog/cmCursesStringWidget.cxx
+++ b/Source/CursesDialog/cmCursesStringWidget.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmCursesStringWidget.h"
+
 #include "cmCursesMainForm.h"
 
 inline int ctrl(int z)
diff --git a/Source/CursesDialog/cmCursesWidget.h b/Source/CursesDialog/cmCursesWidget.h
index 7bbdff109da0ce4e9553e74d0ab6ce89b02d4293..1f53786e0b8e91a6df2f11932b1e50c7e6d161f4 100644
--- a/Source/CursesDialog/cmCursesWidget.h
+++ b/Source/CursesDialog/cmCursesWidget.h
@@ -12,9 +12,10 @@
 #ifndef cmCursesWidget_h
 #define cmCursesWidget_h
 
-#include "../cmState.h"
 #include "cmCursesStandardIncludes.h"
 
+#include "../cmState.h"
+
 class cmCursesMainForm;
 
 class cmCursesWidget
diff --git a/Source/QtDialog/AddCacheEntry.cxx b/Source/QtDialog/AddCacheEntry.cxx
index 3881045bdd6d426b80d3d06f4684f71d745ae411..efb2b6555b4fecd090e2816c61d7fa4aa3ceda9b 100644
--- a/Source/QtDialog/AddCacheEntry.cxx
+++ b/Source/QtDialog/AddCacheEntry.cxx
@@ -11,8 +11,9 @@
 ============================================================================*/
 
 #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 38c3a7444c858c4722e044f96c355285084e86a2..7c08af6a8487798f29d29f04514507856dfbc0f3 100644
--- a/Source/QtDialog/AddCacheEntry.h
+++ b/Source/QtDialog/AddCacheEntry.h
@@ -13,11 +13,12 @@
 #ifndef AddCacheEntry_h
 #define AddCacheEntry_h
 
-#include <QWidget>
+#include "QCMake.h"
+
 #include <QCheckBox>
 #include <QStringList>
+#include <QWidget>
 
-#include "QCMake.h"
 #include "ui_AddCacheEntry.h"
 
 class AddCacheEntry : public QWidget, public Ui::AddCacheEntry
diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
index cff4f6f531a3697cec258bea8b30e636c560b157..b44219fdd04562e08bc355c0d6b350f4e659e886 100644
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@@ -10,19 +10,20 @@
   See the License for more information.
 ============================================================================*/
 #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 2fc4fafdc4a0959c3d2c7d8b9e0b8edb3c16b25e..945739d8f6c1713dca2d852b0aaeae7cf1b9fd3b 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -11,28 +11,29 @@
 ============================================================================*/
 
 #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 4b53b1cbdade2801baa1f0953df46253369c1f9e..f9624d1d9f996c4e1871d06b82281227eb20b3e6 100644
--- a/Source/QtDialog/CMakeSetupDialog.h
+++ b/Source/QtDialog/CMakeSetupDialog.h
@@ -14,10 +14,11 @@
 #define CMakeSetupDialog_h
 
 #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/Compilers.h b/Source/QtDialog/Compilers.h
index 3f7b83411a7dec2de22be25fba1047600f447c41..ee898861bbc05607c03fe8619186a6003a804b19 100644
--- a/Source/QtDialog/Compilers.h
+++ b/Source/QtDialog/Compilers.h
@@ -4,6 +4,7 @@
 #define COMPILERS_HPP
 
 #include <QWidget>
+
 #include <ui_Compilers.h>
 
 class Compilers : public QWidget, public Ui::Compilers
diff --git a/Source/QtDialog/FirstConfigure.cxx b/Source/QtDialog/FirstConfigure.cxx
index 61aad72e02246715f8b8fb0dae7352d8ca74607b..5c0af2b36dc01d231ab7f4a19d6f0dc84e923a88 100644
--- a/Source/QtDialog/FirstConfigure.cxx
+++ b/Source/QtDialog/FirstConfigure.cxx
@@ -1,10 +1,11 @@
 
 #include "FirstConfigure.h"
+
 #include "Compilers.h"
 
-#include <QSettings>
-#include <QRadioButton>
 #include <QComboBox>
+#include <QRadioButton>
+#include <QSettings>
 #include <QVBoxLayout>
 
 
diff --git a/Source/QtDialog/FirstConfigure.h b/Source/QtDialog/FirstConfigure.h
index 09952b6509f447810de53827576bf5f0978e578f..3c574d4f09b19d51001a48a207f994af6104efd5 100644
--- a/Source/QtDialog/FirstConfigure.h
+++ b/Source/QtDialog/FirstConfigure.h
@@ -4,7 +4,9 @@
 
 #include <QWizard>
 #include <QWizardPage>
+
 #include "cmake.h"
+
 #include "ui_Compilers.h"
 #include "ui_CrossCompiler.h"
 
diff --git a/Source/QtDialog/QCMake.cxx b/Source/QtDialog/QCMake.cxx
index dd7c1387a07c55b92601fd0236b05151ce59fd16..28be341665bd4c33959fef49f1076076acc0bd6b 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 8942e7c909f3e4381b5cf4287f0cc0995ea5648a..5cae06d4aa64626133004bb13690621369527a52 100644
--- a/Source/QtDialog/QCMake.h
+++ b/Source/QtDialog/QCMake.h
@@ -12,6 +12,9 @@
 
 #ifndef QCMake_h
 #define QCMake_h
+
+#include "cmake.h"
+
 #ifdef _MSC_VER
 #pragma warning ( disable : 4127 )
 #pragma warning ( disable : 4512 )
@@ -19,15 +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 "cmake.h"
+#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 bae6a30a74551f1d03f06d826f0e1675e6ccd49a..f64a78a29593a4a2d9cb99c145f83ccde1d36192 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 41f0bd87cbce50b0e939ede3191861690d137517..5631b8615d011f05cd52038531a6a2ba7131822c 100644
--- a/Source/QtDialog/QCMakeCacheView.h
+++ b/Source/QtDialog/QCMakeCacheView.h
@@ -14,10 +14,11 @@
 #define QCMakeCacheView_h
 
 #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 41f98b5d248c9b42d07f05a77b8b1ccd14e819bf..7803ef3078a476318daf7e6cae389cddf1181282 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 8f58df2bb59b5f714ca5e47f8d581297c10629bf..759b635bee954dccc51443ed05309fa00aac44ba 100644
--- a/Source/QtDialog/QCMakeWidgets.h
+++ b/Source/QtDialog/QCMakeWidgets.h
@@ -13,9 +13,10 @@
 #ifndef QCMakeWidgets_h
 #define QCMakeWidgets_h
 
-#include <QLineEdit>
 #include <QComboBox>
 #include <QCompleter>
+#include <QLineEdit>
+
 class QToolButton;
 
 // common widgets for Qt based CMake
diff --git a/Source/QtDialog/RegexExplorer.h b/Source/QtDialog/RegexExplorer.h
index 2ac9c3e2eeb07475581c720fb041c71fa26e0aa3..3ac8a24950213f46a7231287834fdb7ee0801de9 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 6c274a71d91e990a9087c31dc511b8e97f3e51af..4bb739c484e0aaac138845e866cf071072905298 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 e7263aeadfff52232a48c271f591b0dca334371a..b179f834884ea8d304322e331c4140b99582cf5b 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/cmAddDependenciesCommand.cxx b/Source/cmAddDependenciesCommand.cxx
index 01e525311e832c5e786dd30ce1548bb4e85066af..3b28359487ef1a56f64f9c7e988f00e2a772de32 100644
--- a/Source/cmAddDependenciesCommand.cxx
+++ b/Source/cmAddDependenciesCommand.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmAddDependenciesCommand.h"
+
 #include "cmGlobalGenerator.h"
 
 // cmDependenciesCommand
diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx
index 5296cbb365b26f59ef0e55ae71559ec5d6c5d6fd..e40ecf4ffea9d4b8191cf010d17652cbeba599a0 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 e62a2ed11b188ab5d8d435ec42452084c7b3851c..b06b2f5f019cb3e24b8b852af084f13f9547eb40 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/cmAuxSourceDirectoryCommand.cxx b/Source/cmAuxSourceDirectoryCommand.cxx
index 92ac07dfdc5245a294be10bcaff746c2b018c333..07cb295b5cafb891bd6a6912dd4a456d0da0ea1c 100644
--- a/Source/cmAuxSourceDirectoryCommand.cxx
+++ b/Source/cmAuxSourceDirectoryCommand.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmAuxSourceDirectoryCommand.h"
+
 #include "cmSourceFile.h"
 
 #include <cmsys/Directory.hxx>
diff --git a/Source/cmBootstrapCommands1.cxx b/Source/cmBootstrapCommands1.cxx
index 0782b3ba79ff75be9b8e1cf505a320cf8a575aaa..2de877014688654fa718f87201ae7d3fbb08de25 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 e522d8c795728f736b2219e988d3d91b0872c73f..38d008d28eee92966698627d3d92778aed86d894 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 35b3d59dc377ba0d92335135386370e738307b7b..3eef55a8a380ea396f1b39d7676c7eba823ff740 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 eec3df092d96796d13ff4031762e2ba3489d1c00..e54bcab3535e5ca9887cce5921bc2918507c013d 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/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index fb78446dc0f0c785c518e7bd3052b74998291712..b203a226d67c9fa436053f82a80dbbd7e4475271 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -14,8 +14,9 @@
    these routines just manipulate arguments and then call the associated
    methods on the CMake classes. */
 
-#include "cmMakefile.h"
 #include "cmCPluginAPI.h"
+
+#include "cmMakefile.h"
 #include "cmVersion.h"
 
 #include "cmSourceFile.h"
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index f3e7121f7fd48a41e88f708aa4e7124a98603fa6..1f07a07c93ab2b6d1d34e763d2248aa75efada81 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -12,24 +12,25 @@
 #include "cmCurl.h" // include before anything that includes windows.h
 
 #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"
@@ -41,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/cmCTest.h b/Source/cmCTest.h
index 73c28075230bd3abff5e02f46dd313cafcb7143d..07081fc9c6f44fa19eb6658d3216c9a2d97f8598 100644
--- a/Source/cmCTest.h
+++ b/Source/cmCTest.h
@@ -14,6 +14,7 @@
 #define cmCTest_h
 
 #include "cmStandardIncludes.h"
+
 #include "cmListFileCache.h"
 #include <time.h>
 
diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index 7466c299aa7128559540578923e539d79f565a80..afa2ba75b0d770e150b00fd1df204d9f86869a93 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -9,16 +9,16 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-
 #include "cmCacheManager.h"
-#include "cmSystemTools.h"
+
 #include "cmGeneratedFileStream.h"
-#include "cmake.h"
+#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/cmCacheManager.h b/Source/cmCacheManager.h
index 6f063ebbcbfbdb49977c04a3a30fefd807e0fd3c..614ff69de52991c0ad2c73d231838d86586343d8 100644
--- a/Source/cmCacheManager.h
+++ b/Source/cmCacheManager.h
@@ -13,6 +13,7 @@
 #define cmCacheManager_h
 
 #include "cmStandardIncludes.h"
+
 #include "cmPropertyMap.h"
 #include "cmState.h"
 
diff --git a/Source/cmCallVisualStudioMacro.cxx b/Source/cmCallVisualStudioMacro.cxx
index 0e0483892a738d2b2b6db804635f50f6c82db920..636a827373253db17a8b16f9b4d14c103e05e0e6 100644
--- a/Source/cmCallVisualStudioMacro.cxx
+++ b/Source/cmCallVisualStudioMacro.cxx
@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-
 #include "cmCallVisualStudioMacro.h"
+
 #include "cmSystemTools.h"
 
 
diff --git a/Source/cmCommand.h b/Source/cmCommand.h
index 59bc396f335cbc9df46e56dfc43b0d352fd02eb1..d5e394d5e80e1cf098641831502947e531b258fb 100644
--- a/Source/cmCommand.h
+++ b/Source/cmCommand.h
@@ -13,9 +13,10 @@
 #define cmCommand_h
 
 #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/cmCommands.h b/Source/cmCommands.h
index 7a94423a49394783504754b9afb9c95ba24f2f78..0786a6427fe219fdec189da5015bbd5e42819cb2 100644
--- a/Source/cmCommands.h
+++ b/Source/cmCommands.h
@@ -11,6 +11,7 @@
 ============================================================================*/
 #ifndef cmCommands_h
 #define cmCommands_h
+
 #include "cmStandardIncludes.h"
 
 #include <vector>
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 2796fdf6655061bad5abe70fa484c4d593d917bf..f546fc8039a128b6d622bc2db5771a1cf55e9a95 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 f10e4e435b5f4155050369691506fb49efcb3241..ea23308d265a12d39ce1b7a1316c82f71380fc66 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -13,9 +13,9 @@
 #define cmComputeLinkDepends_h
 
 #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 50d8324383d3a35e37c18713f0543a2aef68b311..f88d58ce5a6ae1cc610c1dc28e7451b4c3387f26 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 586b5bfb1bc5df94c5827591e5893e7a1bcf0e59..7f12006f5a43d2721a812522099f1cbe9034c407 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 07c9dd620558c38417b5a9eda993f0f3d8b97c10..3711b9bed1b683c56f9ff0de4cd2623ff610ac90 100644
--- a/Source/cmConditionEvaluator.cxx
+++ b/Source/cmConditionEvaluator.cxx
@@ -11,8 +11,9 @@
 ============================================================================*/
 
 #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 cfd31b261257eda0d3838f92fc9e5411b295751f..231c260c23c0a947111cbc4516ceed9c54ea5b37 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -10,11 +10,12 @@
   See the License for more information.
 ============================================================================*/
 #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/cmCreateTestSourceList.cxx b/Source/cmCreateTestSourceList.cxx
index e67099193aea4f573d395bf483a6a7e06087e14e..65eee3474f05fc1f5b305080cc5c07f68a3a9535 100644
--- a/Source/cmCreateTestSourceList.cxx
+++ b/Source/cmCreateTestSourceList.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmCreateTestSourceList.h"
+
 #include "cmSourceFile.h"
 
 // cmCreateTestSourceList
diff --git a/Source/cmCryptoHash.cxx b/Source/cmCryptoHash.cxx
index 66162181ee151d89c4e575ee84514f717f353836..d1112f2f7bd500f2bc02984358bcc60369b90a03 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/cmCurl.cxx b/Source/cmCurl.cxx
index 4f3d89083f14bbf51e53e2d6e7be331f62b96dac..35a68c0d9dbaea1ed24916d1426491335f80ea36 100644
--- a/Source/cmCurl.cxx
+++ b/Source/cmCurl.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmCurl.h"
+
 #include "cmSystemTools.h"
 
 // curl versions before 7.21.5 did not provide this error code
diff --git a/Source/cmCurl.h b/Source/cmCurl.h
index 0c5609ca7724e3948d40b176428daa504622e1e3..2bc54cd60d6eb3ed712408f77292f848df580a38 100644
--- a/Source/cmCurl.h
+++ b/Source/cmCurl.h
@@ -12,10 +12,10 @@
 #ifndef cmCurl_h
 #define cmCurl_h
 
-#include <cmsys/Configure.h>
-#include "cm_curl.h"
 #include "cmStandardIncludes.h"
 
+#include "cm_curl.h"
+
 std::string cmCurlSetCAInfo(::CURL *curl, const char* cafile = 0);
 
 #endif
diff --git a/Source/cmCustomCommand.h b/Source/cmCustomCommand.h
index f9b38c3c4a405871fb0aebff8ab37f1f89fbab97..03704973446966b61f41d299e35c0fc14436bd07 100644
--- a/Source/cmCustomCommand.h
+++ b/Source/cmCustomCommand.h
@@ -13,6 +13,7 @@
 #define cmCustomCommand_h
 
 #include "cmStandardIncludes.h"
+
 #include "cmListFileCache.h"
 class cmMakefile;
 
diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index dc06678cf05f3f50c5e62a60c13eeb71e28df227..5d3a1cecca50b7dfd3c4a1d8fa78c5aad8679b5c 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 0efc7fcf589c5137959ccfbd96aac7a1d001a40f..47fc22e011904ec2d446be5cb5453807b6874def 100644
--- a/Source/cmDefinePropertyCommand.cxx
+++ b/Source/cmDefinePropertyCommand.cxx
@@ -10,8 +10,9 @@
   See the License for more information.
 ============================================================================*/
 #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 d4190112d4d0448bf477ca9122b3c515fd8b697f..40b552b9800b64f18252e5bb13ba0130201f7edd 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 6cdd4c13d5d8376f31a1c94ee68d010938efcd8e..6bf815ec27763dc5b7122521c84256f23cfa9b30 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/cmDependsC.h b/Source/cmDependsC.h
index 07d3c21f3403d552cbb945817e120a031906b6ae..cf0a4231a295765cbd69654890d6fae4f76bd509 100644
--- a/Source/cmDependsC.h
+++ b/Source/cmDependsC.h
@@ -13,6 +13,7 @@
 #define cmDependsC_h
 
 #include "cmDepends.h"
+
 #include <cmsys/RegularExpression.hxx>
 #include <queue>
 
diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx
index 80f560f316e7aba9919ca2c284f3ee9d7fe2fa56..a7909b264248064e4406b6b7733bc96dea524967 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 4f3475536e1bbb905061b14befa4590fb3b27d20..81e67962e53f483f2d256ac418c22f2b86dfaa8c 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/cmDocumentation.h b/Source/cmDocumentation.h
index b6c5fde7e2c1b968f56e154a7053afcfb1813f76..a1d73f5a643fd8dabe8859c23222051fc0cbed5d 100644
--- a/Source/cmDocumentation.h
+++ b/Source/cmDocumentation.h
@@ -13,6 +13,7 @@
 #define _cmDocumentation_h
 
 #include "cmStandardIncludes.h"
+
 #include "cmDocumentationFormatter.h"
 #include "cmDocumentationSection.h"
 #include "cmake.h"
diff --git a/Source/cmDocumentationSection.h b/Source/cmDocumentationSection.h
index d796da84b6079fc69b3a72df2eafa50f732f0f81..66b94c24b7d7b720a8d5c4f331046d0657169dc2 100644
--- a/Source/cmDocumentationSection.h
+++ b/Source/cmDocumentationSection.h
@@ -12,7 +12,6 @@
 #ifndef _cmDocumentationSection_h
 #define _cmDocumentationSection_h
 
-#include "cmStandardIncludes.h"
 #include "cmDocumentationFormatter.h"
 
 // Low-level interface for custom documents:
diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx
index b480cd53b2555e959a113b130cc35b012b4007d7..0e6f577afda28eaa15bdc3fb1f1896253324f2cf 100644
--- a/Source/cmELF.cxx
+++ b/Source/cmELF.cxx
@@ -10,15 +10,16 @@
   See the License for more information.
 ============================================================================*/
 #include "cmStandardIncludes.h" // to get CMAKE_USE_ELF_PARSER first
+
 #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/cmEndIfCommand.cxx b/Source/cmEndIfCommand.cxx
index 0ac09de72742ccc06f9cbc4ed2d1260a67e06f95..05f23c4f1d1469449cc6163d8686a6226fc73b1c 100644
--- a/Source/cmEndIfCommand.cxx
+++ b/Source/cmEndIfCommand.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmEndIfCommand.h"
+
 #include <stdlib.h> // required for atof
 bool cmEndIfCommand::InitialPass(std::vector<std::string> const&,
                                  cmExecutionStatus &)
diff --git a/Source/cmExecProgramCommand.cxx b/Source/cmExecProgramCommand.cxx
index 41785c2b0a015759e69e89a749ae6e7d6a9d5384..110973754c13e335441a199d11bd28d605afff84 100644
--- a/Source/cmExecProgramCommand.cxx
+++ b/Source/cmExecProgramCommand.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmExecProgramCommand.h"
+
 #include "cmSystemTools.h"
 
 #include <cmsys/Process.h>
diff --git a/Source/cmExecuteProcessCommand.cxx b/Source/cmExecuteProcessCommand.cxx
index a371390514194bed1789ace1e2ba275d2f3549dd..1731b910eef72235ee67dcb1dbf23e9258ca388c 100644
--- a/Source/cmExecuteProcessCommand.cxx
+++ b/Source/cmExecuteProcessCommand.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmExecuteProcessCommand.h"
+
 #include "cmSystemTools.h"
 
 #include <cmsys/Process.h>
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index dcb21876cc4108cafc6ccfbdf9f5d000be0cbaeb..87ea2c234e15c8cc4970dfe516c11a5641e01730 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 4eec66a3397546f8ea3e99987b52a5a65dc3231f..bbd07db787fc194bd7b2c255a630180a8118bf10 100644
--- a/Source/cmExportCommand.cxx
+++ b/Source/cmExportCommand.cxx
@@ -10,12 +10,13 @@
   See the License for more information.
 ============================================================================*/
 #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 c005995f76b1f68a8209eb43c614efedfcc5b60d..2b3ce148c496e2df11a40c0ecc08546dcc58ae10 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 18f0b009aa6c7b0fbf3514cd86ffaff8dc01a597..9fc02a486be5294d171cc9a260026d77730a5812 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 71418e825dc6cce8877683256a34fb93e1ce11c8..0ea24c1accef3c7de8eb5cc5cec084555a14fa6a 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 21d961fbc48fb978cd853433067d6d107b522d62..a71507020326b6d68c2dfda07c8a8fd8ed0c6f68 100644
--- a/Source/cmExportLibraryDependenciesCommand.cxx
+++ b/Source/cmExportLibraryDependenciesCommand.cxx
@@ -10,10 +10,11 @@
   See the License for more information.
 ============================================================================*/
 #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 0059b6400712dbacb4996da4294e6dd5fbcc5157..83c4fdc12875d37ec0c08c1dc7305c26782caec0 100644
--- a/Source/cmExportSet.cxx
+++ b/Source/cmExportSet.cxx
@@ -11,9 +11,10 @@
 ============================================================================*/
 
 #include "cmExportSet.h"
-#include "cmTargetExport.h"
+
 #include "cmAlgorithms.h"
 #include "cmLocalGenerator.h"
+#include "cmTargetExport.h"
 
 cmExportSet::~cmExportSet()
 {
diff --git a/Source/cmExportSet.h b/Source/cmExportSet.h
index d780a228c12b1409b8089c4389ea028c8d0c09d4..a3359ace0c5d153d35a6d6cb9bdbfccc9e7b58f1 100644
--- a/Source/cmExportSet.h
+++ b/Source/cmExportSet.h
@@ -13,6 +13,7 @@
 #define cmExportSet_h
 
 #include "cmSystemTools.h"
+
 class cmTargetExport;
 class cmInstallExportGenerator;
 class cmLocalGenerator;
diff --git a/Source/cmExportSetMap.cxx b/Source/cmExportSetMap.cxx
index cf431c60c2ba142ce049412999b49d9abbe682d2..d267cd364bdc6dd87f0a5c752d35ab359904fa5d 100644
--- a/Source/cmExportSetMap.cxx
+++ b/Source/cmExportSetMap.cxx
@@ -11,8 +11,9 @@
 ============================================================================*/
 
 #include "cmExportSetMap.h"
-#include "cmExportSet.h"
+
 #include "cmAlgorithms.h"
+#include "cmExportSet.h"
 
 cmExportSet* cmExportSetMap::operator[](const std::string &name)
 {
diff --git a/Source/cmExportSetMap.h b/Source/cmExportSetMap.h
index 965046ceff399621a7f8d81438ec6e45186bedb0..87f2060847d32a90ecb4f04bd4134a5ff6436c66 100644
--- a/Source/cmExportSetMap.h
+++ b/Source/cmExportSetMap.h
@@ -13,6 +13,7 @@
 #define cmExportSetMap_h
 
 #include "cmSystemTools.h"
+
 class cmExportSet;
 
 /// A name -> cmExportSet map with overloaded operator[].
diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index 83127e7ed9c027aad9197a99b054fd2aa904a12d..5bafa1cb6f6bd712c3b72dc97e1721fd786b77c1 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/cmExternalMakefileProjectGenerator.cxx b/Source/cmExternalMakefileProjectGenerator.cxx
index 9264671a36c5afda80154d622dce55f516669167..cdf02927f868f88209f9ea31be53843520c2374d 100644
--- a/Source/cmExternalMakefileProjectGenerator.cxx
+++ b/Source/cmExternalMakefileProjectGenerator.cxx
@@ -9,10 +9,11 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#include <assert.h>
 
 #include "cmExternalMakefileProjectGenerator.h"
 
+#include <assert.h>
+
 void cmExternalMakefileProjectGenerator
 ::EnableLanguage(std::vector<std::string> const&,
                  cmMakefile *, bool)
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 52512a811c000459194cc8f9f706b011b1c84c4d..f6be583cc6a538458db1ca3c4b99676a1a363683 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -11,14 +11,15 @@
   See the License for more information.
 ============================================================================*/
 #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 9fc7b1eec51ffa52cdae3de1020cb4f70da77f8e..6c7d5f6e6da3c8bf15e44e3a1a303455736142c7 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -12,19 +12,20 @@
   See the License for more information.
 ============================================================================*/
 #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 9e67301fd8fcfeb686152f4ccc65dc633b507f0b..40cc90466dd6c66fabf0f93cc6c3d3421fa91715 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -12,18 +12,19 @@
   See the License for more information.
 ============================================================================*/
 #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 ff5d3ab5fbb19512acecd64c0ed68047e42216e9..4b779d813c1cb9949b3646b6daac37301780bf87 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -11,13 +11,14 @@
   See the License for more information.
 ============================================================================*/
 #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 92d38b95c736e4a5d1294785c6ac4ed675ab5dc4..a8367c4f9461c26ee0e41c0787381bf0bd4e7b3a 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -11,7 +11,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmExtraSublimeTextGenerator.h"
-#include "cmake.h"
+
 #include "cmGeneratedFileStream.h"
 #include "cmGeneratorTarget.h"
 #include "cmGlobalUnixMakefileGenerator3.h"
@@ -20,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 b0a61b2c3d274b202fecbb20a4bdd56ea7c547c1..035b97ff960ac2d27fe99052d7f96a6f8dd2299d 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -10,14 +10,15 @@
   See the License for more information.
 ============================================================================*/
 #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"
 
@@ -27,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 e6aa5f49d5416bba4d1af13c0c768a8e09939a29..0d41c53c543163052dcbf3bb38e979f17793e98e 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 3710eb03029f09344c671981b25c86de90c726e5..939a8f5371f4242e018bf3b9cf267be978a24177 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 36a2d728877a3223ade374f4ce28b8a4f7a6a884..f5e77be2ec5134203c9153c0d845ebbc53a96d22 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 dc65948bd23fbd35a182b9d725c7458178cf683e..e40ae2c2990e2c95b8510470c3451efb07b2adde 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 913985fdb548023f70960e54866da470e4815637..d70fa8924490816b6d537fa73fc46563da1ce7af 100644
--- a/Source/cmFindCommon.cxx
+++ b/Source/cmFindCommon.cxx
@@ -10,8 +10,9 @@
   See the License for more information.
 ============================================================================*/
 #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 3fefc8da5a9b295758143e403ace0e28e0e9f56f..2b874272269c3c8c651a7f9214844b79c692a69d 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/cmFindFileCommand.cxx b/Source/cmFindFileCommand.cxx
index 615e7c1d2942a2012e06e2ae9aa98e4ad613d2a2..a6666ba85b7bc38713585d90a43bb3448d98bad3 100644
--- a/Source/cmFindFileCommand.cxx
+++ b/Source/cmFindFileCommand.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmFindFileCommand.h"
+
 #include "cmSystemTools.h"
 
 cmFindFileCommand::cmFindFileCommand()
diff --git a/Source/cmFindLibraryCommand.cxx b/Source/cmFindLibraryCommand.cxx
index e7696af402dc41a0c5adc0f9e9a237c0bb886db5..91c7b5cdf1472b9ba73ac6f9731a3b41c22e3b10 100644
--- a/Source/cmFindLibraryCommand.cxx
+++ b/Source/cmFindLibraryCommand.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmFindLibraryCommand.h"
+
 #include <cmsys/Directory.hxx>
 
 cmFindLibraryCommand::cmFindLibraryCommand()
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 64176e7fb2078fad55b00bf60e3ea00e5eeafcec..97f1563660fe4d6fdb17f7502db904ac8f4d292f 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/cmFindProgramCommand.cxx b/Source/cmFindProgramCommand.cxx
index 219ad48b5ce296d7892c147cdc3100251a45db9a..1734c01300a1474ea2418cf217063b75bf36b2d8 100644
--- a/Source/cmFindProgramCommand.cxx
+++ b/Source/cmFindProgramCommand.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmFindProgramCommand.h"
+
 #include <stdlib.h>
 
 #if defined(__APPLE__)
diff --git a/Source/cmForEachCommand.h b/Source/cmForEachCommand.h
index 36e88088f33d877e0d1b216b68eb2f1137822cd7..027b8cb9c118ed31ca38df5c8481d8413160ed11 100644
--- a/Source/cmForEachCommand.h
+++ b/Source/cmForEachCommand.h
@@ -13,6 +13,7 @@
 #define cmForEachCommand_h
 
 #include "cmCommand.h"
+
 #include "cmFunctionBlocker.h"
 #include "cmListFileCache.h"
 
diff --git a/Source/cmFunctionBlocker.h b/Source/cmFunctionBlocker.h
index a3b80781d96dd0700022bc3336f230c84b126334..d0d52cedaf5c22878eda45b407ec7405ef81cee8 100644
--- a/Source/cmFunctionBlocker.h
+++ b/Source/cmFunctionBlocker.h
@@ -13,6 +13,7 @@
 #define cmFunctionBlocker_h
 
 #include "cmStandardIncludes.h"
+
 #include "cmExecutionStatus.h"
 #include "cmListFileCache.h"
 class cmMakefile;
diff --git a/Source/cmFunctionCommand.h b/Source/cmFunctionCommand.h
index 2df435e711243fdfd612550b6c21adb7cd018121..1a5ce59037203b64cc694494022091c6540169cb 100644
--- a/Source/cmFunctionCommand.h
+++ b/Source/cmFunctionCommand.h
@@ -13,6 +13,7 @@
 #define cmFunctionCommand_h
 
 #include "cmCommand.h"
+
 #include "cmFunctionBlocker.h"
 
 class cmFunctionFunctionBlocker : public cmFunctionBlocker
diff --git a/Source/cmGeneratedFileStream.h b/Source/cmGeneratedFileStream.h
index 8df3e1a985aa8224d926bb89b5bb29e4444ce286..cb397c146102754ffdc723f2dd1be7745df5b714 100644
--- a/Source/cmGeneratedFileStream.h
+++ b/Source/cmGeneratedFileStream.h
@@ -13,6 +13,7 @@
 #define cmGeneratedFileStream_h
 
 #include "cmStandardIncludes.h"
+
 #include <cmsys/FStream.hxx>
 
 // This is the first base class of cmGeneratedFileStream.  It will be
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index 6796a011fbdf9eeb73a69abebe3b7c7323682673..d0ed28dba112ea236b8bce5f7fbfe046d7d3417d 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/cmGeneratorExpression.h b/Source/cmGeneratorExpression.h
index efd381b5309f054b2270b377f9feade3f0237cae..001f2dfb3b45d73e4b09b00306b8e4c06acc4adc 100644
--- a/Source/cmGeneratorExpression.h
+++ b/Source/cmGeneratorExpression.h
@@ -14,6 +14,7 @@
 #define cmGeneratorExpression_h
 
 #include "cmStandardIncludes.h"
+
 #include "cmListFileCache.h"
 
 #include <cmsys/RegularExpression.hxx>
diff --git a/Source/cmGeneratorExpressionContext.cxx b/Source/cmGeneratorExpressionContext.cxx
index 5c9462f0caec3404db9a908a17ad9476b9409439..b3bcb50c85b2ad5da8a90a5450a2c3e89ed42c4e 100644
--- a/Source/cmGeneratorExpressionContext.cxx
+++ b/Source/cmGeneratorExpressionContext.cxx
@@ -11,6 +11,7 @@
 ============================================================================*/
 
 #include "cmGeneratorExpressionContext.h"
+
 #include "cmGeneratorTarget.h"
 
 cmGeneratorExpressionContext::cmGeneratorExpressionContext(
diff --git a/Source/cmGeneratorExpressionContext.h b/Source/cmGeneratorExpressionContext.h
index e802138bc740068abb8475586a87458c4db63f57..68cdf49264ca9ea4542acdb9be4f5a1c830ed138 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 c3b0272ed92ddd0a2d8e93fe4ef8c3e060b75a8b..00a497c70522766750d32c7f201e6f89fef9c87c 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 4ac2a0d0e20fdea1e79af9a1f80d339271884857..5d8050b83c879c081f24ae714dbc5c542039a25a 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/cmGeneratorExpressionEvaluationFile.h b/Source/cmGeneratorExpressionEvaluationFile.h
index ad41274cad45a7a6253433e5e481ca56f1235af5..f34dadc669f3f8632d5b4a17a2f3bac4a24cfdbb 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.h
+++ b/Source/cmGeneratorExpressionEvaluationFile.h
@@ -12,12 +12,11 @@
 #ifndef cmGeneratorExpressionEvaluationFile_h
 #define cmGeneratorExpressionEvaluationFile_h
 
-#include "cmStandardIncludes.h"
+#include "cmGeneratorExpression.h"
+
 #include <sys/types.h>
 #include <cmsys/auto_ptr.hxx>
 
-#include "cmGeneratorExpression.h"
-
 class cmLocalGenerator;
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index af94bcc695697f8df3731e01a0c0d8e3d7f8d5d9..d9dd3b16ace31800fc41a62d1ffe12b4c8bf7281 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -9,16 +9,16 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#include "cmMakefile.h"
-
 #include "cmGeneratorExpressionEvaluator.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 407f83f195e94aebb7d812e66e9676e9c3cc65b6..b60bb5dcf835884048f62538208211855161b53a 100644
--- a/Source/cmGeneratorExpressionEvaluator.h
+++ b/Source/cmGeneratorExpressionEvaluator.h
@@ -12,11 +12,12 @@
 #ifndef cmGeneratorExpressionEvaluator_h
 #define cmGeneratorExpressionEvaluator_h
 
-#include "cmListFileCache.h"
 #include "cmGeneratorExpressionContext.h"
 
-#include <vector>
+#include "cmListFileCache.h"
+
 #include <string>
+#include <vector>
 
 struct cmGeneratorExpressionDAGChecker;
 struct cmGeneratorExpressionNode;
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 32b2f825185a45d3de2d7375493afc8445f55cda..a9227b0cf50d69249a88057f28cad28190bd91e7 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -11,10 +11,11 @@
 ============================================================================*/
 
 #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 854811b99e9d464b71b213e91ab9449adac4ba63..2d66727f33b882d0c992d57d4634f838e5ca0ee7 100644
--- a/Source/cmGeneratorExpressionNode.h
+++ b/Source/cmGeneratorExpressionNode.h
@@ -12,10 +12,11 @@
 #ifndef cmGeneratorExpressionNode_h
 #define cmGeneratorExpressionNode_h
 
+#include "cmGeneratorExpression.h"
+
+#include "cmGeneratorExpressionDAGChecker.h"
 #include "cmGeneratorExpressionEvaluator.h"
 #include "cmGeneratorExpressionParser.h"
-#include "cmGeneratorExpressionDAGChecker.h"
-#include "cmGeneratorExpression.h"
 #include "cmLocalGenerator.h"
 #include "cmSourceFile.h"
 
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index d7c2782019987df407d10f561ab2066dac7991b2..f115d83f96743b965f1b94e025c869f7e1c3173b 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 1a91183d422cfd2a3e68f2f293aefa9751b8c8a1..2be4dec9dad43e7f4acf4d477d11d2304751026b 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/cmGetFilenameComponentCommand.cxx b/Source/cmGetFilenameComponentCommand.cxx
index 0f56c8e8fcd7946fee538b1ae98208987783bfa7..2026a454756f309e43ab1bda264e6ff846334a00 100644
--- a/Source/cmGetFilenameComponentCommand.cxx
+++ b/Source/cmGetFilenameComponentCommand.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmGetFilenameComponentCommand.h"
+
 #include "cmSystemTools.h"
 
 // cmGetFilenameComponentCommand
diff --git a/Source/cmGetPropertyCommand.cxx b/Source/cmGetPropertyCommand.cxx
index 617a8116e16c5e356a10128133a16783b4d7b94b..bbeae4bebfbca21bdd665966281d9923ba7f8f8b 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 bf34589f40835f53749b7ab93958f8b8574c0e52..3d7a013fa8f332817b1d9388d9fe9fe9b4772871 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/cmGhsMultiGpj.h b/Source/cmGhsMultiGpj.h
index 91ff0f4a50fdc763eb1b4c4b44f05a6c528932a4..862b63c820066ec26445bd1a10266fad56dee6eb 100644
--- a/Source/cmGhsMultiGpj.h
+++ b/Source/cmGhsMultiGpj.h
@@ -12,6 +12,8 @@
 #ifndef cmGhsMultiGpj_h
 #define cmGhsMultiGpj_h
 
+#include "cmStandardIncludes.h"
+
 class cmGeneratedFileStream;
 
 class GhsMultiGpj
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index 12e2eee01f23adfc4efb7a9e7a1a4d12c830a581..f845c5975136e7aaffb6278cda7aa327c3ad0e8f 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -10,12 +10,13 @@
   See the License for more information.
 ============================================================================*/
 #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/cmGhsMultiTargetGenerator.h b/Source/cmGhsMultiTargetGenerator.h
index 3a13600514cb24b7e8efdab34d5672a3eda3811f..93761f2d9642b0dfefccaeda9dca2f744620a40d 100644
--- a/Source/cmGhsMultiTargetGenerator.h
+++ b/Source/cmGhsMultiTargetGenerator.h
@@ -12,10 +12,10 @@
 #ifndef cmGhsMultiTargetGenerator_h
 #define cmGhsMultiTargetGenerator_h
 
-#include "cmStandardIncludes.h"
-#include "cmTarget.h"
 #include "cmGhsMultiGpj.h"
 
+#include "cmTarget.h"
+
 class cmGeneratedFileStream;
 class cmGlobalGhsMultiGenerator;
 class cmLocalGhsMultiGenerator;
diff --git a/Source/cmGlobalBorlandMakefileGenerator.cxx b/Source/cmGlobalBorlandMakefileGenerator.cxx
index 40e8d2901ac86bb44de4ab7e3ee721adf1f22196..374cc88247c0ff74aad8f79d4226e0a20eb564c8 100644
--- a/Source/cmGlobalBorlandMakefileGenerator.cxx
+++ b/Source/cmGlobalBorlandMakefileGenerator.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmGlobalBorlandMakefileGenerator.h"
+
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
 #include "cmake.h"
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 1d0ade47b1fc3d2d48fed6af845f1044edff85af..84ade253b1ca8df322c55f12850e335b9469080c 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -17,31 +17,32 @@
 #endif
 
 #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 14c7d678279fff250335c5bbb5216536d8d68777..1576f09bdd20c9b2ad3ede46f880539175c087ba 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 1bcbd26adca33b3f552cbda3cb734cc3232c686d..df7011ccdae6e6a511844a89d41f6fca4ff7fbeb 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -10,13 +10,14 @@
   See the License for more information.
 ============================================================================*/
 #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 6f86c5d4e31b5949eb6328b9c8309b952e3d1ef6..5de9d2bd7268f12231689418b3068ed111e515bd 100644
--- a/Source/cmGlobalGhsMultiGenerator.h
+++ b/Source/cmGlobalGhsMultiGenerator.h
@@ -12,9 +12,10 @@
 #ifndef cmGhsMultiGenerator_h
 #define cmGhsMultiGenerator_h
 
-#include "cmGlobalGeneratorFactory.h"
 #include "cmGlobalGenerator.h"
+
 #include "cmGhsMultiGpj.h"
+#include "cmGlobalGeneratorFactory.h"
 
 class cmGeneratedFileStream;
 
diff --git a/Source/cmGlobalJOMMakefileGenerator.cxx b/Source/cmGlobalJOMMakefileGenerator.cxx
index 3f33f91fca303dc13f7364f95865e2bce7cbce5f..31cd2d356ab5fbfa49e819967c0ff16f76129a8a 100644
--- a/Source/cmGlobalJOMMakefileGenerator.cxx
+++ b/Source/cmGlobalJOMMakefileGenerator.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmGlobalJOMMakefileGenerator.h"
+
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
 
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index b4f7670848cb46439c9fbfa641789cbbf8314df0..e2f1fc5601d22c0951d32424277793abd6355178 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -11,18 +11,19 @@
   See the License for more information.
 ============================================================================*/
 #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/cmGlobalMSYSMakefileGenerator.cxx b/Source/cmGlobalMSYSMakefileGenerator.cxx
index 9a6f3ba45150c87da1bedc6599aec7d6ab4e00e7..a2b0bd10a2ee7130135666947778c951a5b95efe 100644
--- a/Source/cmGlobalMSYSMakefileGenerator.cxx
+++ b/Source/cmGlobalMSYSMakefileGenerator.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmGlobalMSYSMakefileGenerator.h"
+
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
 #include "cmake.h"
diff --git a/Source/cmGlobalMinGWMakefileGenerator.cxx b/Source/cmGlobalMinGWMakefileGenerator.cxx
index b6e52d7bc852d59f01da9c59eff863391734d0c6..c965f57dc88f9b56cce288a02673c437fa06bcd0 100644
--- a/Source/cmGlobalMinGWMakefileGenerator.cxx
+++ b/Source/cmGlobalMinGWMakefileGenerator.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmGlobalMinGWMakefileGenerator.h"
+
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
 
diff --git a/Source/cmGlobalNMakeMakefileGenerator.cxx b/Source/cmGlobalNMakeMakefileGenerator.cxx
index 7c570a627307adb9c0cc3fffb0edd060d7ec0d40..0a9f64424bcf6f171ec5a0dc6896e5a61864921e 100644
--- a/Source/cmGlobalNMakeMakefileGenerator.cxx
+++ b/Source/cmGlobalNMakeMakefileGenerator.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmGlobalNMakeMakefileGenerator.h"
+
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
 
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index fadb0cf8279008ab38b02b2550c48c3149876f41..a8a7262ae3dc7d30aaf92a7d5b3f530a39038551 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -10,14 +10,15 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
+#include "cmGlobalNinjaGenerator.h"
+
+#include "cmAlgorithms.h"
 #include "cmGeneratedFileStream.h"
 #include "cmGeneratorExpressionEvaluationFile.h"
 #include "cmGeneratorTarget.h"
-#include "cmGlobalNinjaGenerator.h"
 #include "cmLocalNinjaGenerator.h"
 #include "cmMakefile.h"
 #include "cmVersion.h"
-#include "cmAlgorithms.h"
 
 #include <algorithm>
 #include <assert.h>
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index 3093a11137421811ab6cbfc7a6ee0b8ecc66ac94..56e2bdbd52b33f2e6c5a1afa555ba1a2fed119ae 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -11,11 +11,12 @@
   See the License for more information.
 ============================================================================*/
 #ifndef cmGlobalNinjaGenerator_h
-#  define cmGlobalNinjaGenerator_h
+#define cmGlobalNinjaGenerator_h
 
-#  include "cmGlobalCommonGenerator.h"
-#  include "cmGlobalGeneratorFactory.h"
-#  include "cmNinjaTypes.h"
+#include "cmGlobalCommonGenerator.h"
+
+#include "cmGlobalGeneratorFactory.h"
+#include "cmNinjaTypes.h"
 
 //#define NINJA_GEN_VERBOSE_FILES
 
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index ce7815d7d9bff3d1bfc0cfa1b333f4dbaf561c0d..0098f1e93f26f9dcea04b249166ee7399396f92b 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -10,13 +10,14 @@
   See the License for more information.
 ============================================================================*/
 #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/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h
index 0591a5a5931bdc38f579144d9a815bc1d763bd28..b035df4429aa379caf2bc7f9225a5536e660c5da 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -13,6 +13,7 @@
 #define cmGlobalUnixMakefileGenerator3_h
 
 #include "cmGlobalCommonGenerator.h"
+
 #include "cmGlobalGeneratorFactory.h"
 
 class cmGeneratedFileStream;
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index c24e7f510cbbd2f2a54b54240bbddb38de5c62d7..22ffbcc54898600881d048c1da11d5eb712ea313 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -10,14 +10,16 @@
   See the License for more information.
 ============================================================================*/
 #include "windows.h" // this must be first to define GetCurrentDirectory
+
 #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 9b00357753d8c236c5bf2f1b70b521c70a93a12f..de6fc43c8b8680315ca23b627bf070723efd865b 100644
--- a/Source/cmGlobalVisualStudio11Generator.cxx
+++ b/Source/cmGlobalVisualStudio11Generator.cxx
@@ -10,9 +10,10 @@
   See the License for more information.
 ============================================================================*/
 #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 568d4d7ff69fba55f8b3c9632e90ec7f2a3734fa..bfd908fd329368af3a623a7456d89bdc84fb943c 100644
--- a/Source/cmGlobalVisualStudio12Generator.cxx
+++ b/Source/cmGlobalVisualStudio12Generator.cxx
@@ -10,9 +10,10 @@
   See the License for more information.
 ============================================================================*/
 #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 c058f8ce427c8db5019cb562ddcdbf142c5fdae1..893cc7b13d3f3f7f8071248247e4edc6c9bc9cbb 100644
--- a/Source/cmGlobalVisualStudio14Generator.cxx
+++ b/Source/cmGlobalVisualStudio14Generator.cxx
@@ -10,9 +10,10 @@
   See the License for more information.
 ============================================================================*/
 #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/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index dd1f2e4807830ffdb2b4799ced5616f94c63a9af..0ca4db17250d4f6da0ece1fd888d6c73d593f7ab 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -10,7 +10,9 @@
   See the License for more information.
 ============================================================================*/
 #include "windows.h" // this must be first to define GetCurrentDirectory
+
 #include "cmGlobalVisualStudio71Generator.h"
+
 #include "cmLocalVisualStudio7Generator.h"
 #include "cmMakefile.h"
 #include "cmake.h"
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index ba498ef2b9cd65973e457e473a1a077104773904..058183cf878419b448d2a180ada626e572e32c15 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -10,8 +10,9 @@
   See the License for more information.
 ============================================================================*/
 #include "windows.h" // this must be first to define GetCurrentDirectory
-#include <assert.h>
+
 #include "cmGlobalVisualStudio7Generator.h"
+
 #include "cmGeneratedFileStream.h"
 #include "cmLocalVisualStudio7Generator.h"
 #include "cmMakefile.h"
@@ -19,6 +20,8 @@
 #include "cmake.h"
 #include <cmsys/Encoding.hxx>
 
+#include <assert.h>
+
 //----------------------------------------------------------------------------
 static cmVS7FlagTable cmVS7ExtraFlagTable[] =
 {
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index 02f9809d7fdec49c3f2a7b8824150fb8791acf67..a360bd96cdf537d8139f72a96fa1c6d61bbfae26 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -13,6 +13,7 @@
 #define cmGlobalVisualStudio7Generator_h
 
 #include "cmGlobalVisualStudioGenerator.h"
+
 #include "cmGlobalGeneratorFactory.h"
 
 class cmTarget;
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 5c50530451034ba2165f4b0070801f0ff4bab33d..47ac66da7ad591df6fcfe8da49a02857d1703388 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -10,13 +10,15 @@
   See the License for more information.
 ============================================================================*/
 #include "windows.h" // this must be first to define GetCurrentDirectory
+
 #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/cmGlobalVisualStudio9Generator.cxx b/Source/cmGlobalVisualStudio9Generator.cxx
index da6ffaebab7c8a0228430c2ff3c02385874ed809..c2ef332b497035b9150406664fb91cc23474aafb 100644
--- a/Source/cmGlobalVisualStudio9Generator.cxx
+++ b/Source/cmGlobalVisualStudio9Generator.cxx
@@ -10,7 +10,9 @@
   See the License for more information.
 ============================================================================*/
 #include "windows.h" // this must be first to define GetCurrentDirectory
+
 #include "cmGlobalVisualStudio9Generator.h"
+
 #include "cmLocalVisualStudio7Generator.h"
 #include "cmMakefile.h"
 #include "cmVisualStudioWCEPlatformParser.h"
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 9817b09dfaa76bccc5a44c6b8393e6285434cda1..479b53c8ef43d7fbcd644d93fcc7cb8ab07564e8 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/cmGlobalWatcomWMakeGenerator.cxx b/Source/cmGlobalWatcomWMakeGenerator.cxx
index 153773fcb263f7148afd7569d3bf9c938c99d92a..63f82bbb24155f054b2e08982c14608965b71d03 100644
--- a/Source/cmGlobalWatcomWMakeGenerator.cxx
+++ b/Source/cmGlobalWatcomWMakeGenerator.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmGlobalWatcomWMakeGenerator.h"
+
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
 
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 755c8a68c13a81507e615520b09c8ae445fb86d7..19f7a74341c0abfdc7a6ab50c5baca0e429a4a13 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -10,18 +10,19 @@
   See the License for more information.
 ============================================================================*/
 #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 f7bfb26c42ec7be6e57fb7a298dec626b1ae4ce6..c3b361337aa449ad3cfc316b3d77a7df11fa10f9 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -13,8 +13,9 @@
 #define cmGlobalXCodeGenerator_h
 
 #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 448306fe4fd0a5f14d104ccd4ec8d366cd04006e..76b6430e03db72c3a4c8f69d63fbd916359e3219 100644
--- a/Source/cmGraphVizWriter.cxx
+++ b/Source/cmGraphVizWriter.cxx
@@ -10,10 +10,11 @@
   See the License for more information.
 ============================================================================*/
 #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 90d31d3bee3c32a8a96c39899c2f76280103971e..7914ca350b6a56d68298604a9bd878fc3afa6a70 100644
--- a/Source/cmGraphVizWriter.h
+++ b/Source/cmGraphVizWriter.h
@@ -1,5 +1,3 @@
-#ifndef CMGRAPHVIZWRITER_H
-#define CMGRAPHVIZWRITER_H
 /*============================================================================
   CMake - Cross Platform Makefile Generator
   Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
@@ -11,9 +9,13 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
+#ifndef CMGRAPHVIZWRITER_H
+#define CMGRAPHVIZWRITER_H
+
 #include "cmStandardIncludes.h"
-#include "cmLocalGenerator.h"
+
 #include "cmGeneratedFileStream.h"
+#include "cmLocalGenerator.h"
 #include <cmsys/RegularExpression.hxx>
 
 class cmGeneratorTarget;
diff --git a/Source/cmHexFileConverter.h b/Source/cmHexFileConverter.h
index e11d74a2fe631bdadabdd6aaf6638492813c45cc..89b85337586d3de4097363c39fe4e877fb1258ea 100644
--- a/Source/cmHexFileConverter.h
+++ b/Source/cmHexFileConverter.h
@@ -12,6 +12,8 @@
 #ifndef cmHexFileConverter_h
 #define cmHexFileConverter_h
 
+#include "cmStandardIncludes.h"
+
 /** \class cmHexFileConverter
  * \brief Can detects Intel Hex and Motorola S-record files and convert them
  *        to binary files.
diff --git a/Source/cmIDEOptions.h b/Source/cmIDEOptions.h
index 73860164d682767f386d88127ae365567ca6e6ad..8c985c78b1fbdbe754a22d6a21740b8d6679f5ed 100644
--- a/Source/cmIDEOptions.h
+++ b/Source/cmIDEOptions.h
@@ -13,6 +13,7 @@
 #define cmIDEOptions_h
 
 #include "cmStandardIncludes.h"
+
 #include "cmIDEFlagTable.h"
 
 /** \class cmIDEOptions
diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx
index fc54ca5aa5ea57f17477d256e2dd0f56ca08f4e2..37f03c5c636d96518b07674e076ec19c1b833c0a 100644
--- a/Source/cmIfCommand.cxx
+++ b/Source/cmIfCommand.cxx
@@ -10,14 +10,15 @@
   See the License for more information.
 ============================================================================*/
 #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/cmIfCommand.h b/Source/cmIfCommand.h
index 689efce65631730e7d865c50d4191debfa23f97f..9054a0bf3b93f866fe9a41acc9b6973fad28050d 100644
--- a/Source/cmIfCommand.h
+++ b/Source/cmIfCommand.h
@@ -13,6 +13,7 @@
 #define cmIfCommand_h
 
 #include "cmCommand.h"
+
 #include "cmFunctionBlocker.h"
 
 class cmIfFunctionBlocker : public cmFunctionBlocker
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index f70f2521a8452afdccd2f6652fb43a178e31c71f..d287568bdaf3a3f62d5e9e4bf13465b7b3662b9a 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/cmInstallCommandArguments.cxx b/Source/cmInstallCommandArguments.cxx
index 6ded365acefd31fbdda3e4b74a9f80bde76a0fd9..57f5f31581266d41c7aff999c2f540b848e99af8 100644
--- a/Source/cmInstallCommandArguments.cxx
+++ b/Source/cmInstallCommandArguments.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmInstallCommandArguments.h"
+
 #include "cmSystemTools.h"
 
 // Table of valid permissions.
diff --git a/Source/cmInstallCommandArguments.h b/Source/cmInstallCommandArguments.h
index 694f1ed52a69d34799f8591150a12317270f94a4..e83a39753a96243dd350c191b5bd32e1b2786181 100644
--- a/Source/cmInstallCommandArguments.h
+++ b/Source/cmInstallCommandArguments.h
@@ -14,6 +14,7 @@
 #define cmInstallCommandArguments_h
 
 #include "cmStandardIncludes.h"
+
 #include "cmCommandArgumentsHelper.h"
 
 class cmInstallCommandArguments
diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx
index 80fc054601743730af9fd9f3a23bb491e3fd62d5..a31c0c979d10e5bdf6291a70486ceadb157fcdf7 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 3dd5528af12911806f557fc78c56f2b177545982..97035628e688525e89e6b1efad289350caf29bfc 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/cmInstallProgramsCommand.cxx b/Source/cmInstallProgramsCommand.cxx
index b6d0c453c6eb9fbe3914f7749a806893701d324e..790215dc38470d20167b5e16fd307d920d73082c 100644
--- a/Source/cmInstallProgramsCommand.cxx
+++ b/Source/cmInstallProgramsCommand.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmInstallProgramsCommand.h"
+
 #include "cmInstallFilesGenerator.h"
 // cmExecutableCommand
 bool cmInstallProgramsCommand
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 6a944bfe2841e397578e6e00a339463b6f48612c..0010333294987cf323eae92ecf75c07fe5d4b61f 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 fa5e81528ed0f0b0f902b7ef2890b9c301781276..c5ac9eb8456b8c3b4c3ee40e22323e60e6256afb 100644
--- a/Source/cmInstalledFile.cxx
+++ b/Source/cmInstalledFile.cxx
@@ -10,9 +10,10 @@
   See the License for more information.
 ============================================================================*/
 #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 15a1af560d7993cb3d3edce0c4db965d91aa2047..05be9e5476a56f7c809ce48fad518f5e6066c5e2 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -10,14 +10,15 @@
   See the License for more information.
 ============================================================================*/
 #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 1cc66f47a9c21148c23f1d7b9db0457511df69c9..5a161045dbae63ff101dc8cb31a529d94bc0fdfd 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 6ade5354227d6e91c81bfa1ed5aac2dab9c32b8b..63fc00ce81d260b6e618349fd2cc882ac180677d 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 403f7fcc849310f06385b73324f2304461f519c0..14b70e413ba04182330d2ce0532a29033a071ea3 100644
--- a/Source/cmLoadCommandCommand.cxx
+++ b/Source/cmLoadCommandCommand.cxx
@@ -10,8 +10,9 @@
   See the License for more information.
 ============================================================================*/
 #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 b93fc21e591d3efe00777471e46673330a945895..6c2ba052314c950c53ba26670c57579624800494 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 b673a85cc05e5f20d547bc0d7c8135706f7d41bc..0bad0d6934ca14421b330df68111f3f82c489853 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -13,9 +13,10 @@
 #define cmLocalGenerator_h
 
 #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 a77a75e022e8c3efb8d43698ff5684e280404cf9..f23f27d64e3f5a67d6daa4a4cd188b1a2c7743a0 100644
--- a/Source/cmLocalGhsMultiGenerator.cxx
+++ b/Source/cmLocalGhsMultiGenerator.cxx
@@ -10,11 +10,12 @@
   See the License for more information.
 ============================================================================*/
 #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 030b094e1a5044ce0adecbd93b1ef24f6075048d..c26065c228eba422b48dc61557029890c9a4f2a5 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -11,14 +11,15 @@
   See the License for more information.
 ============================================================================*/
 #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/cmLocalNinjaGenerator.h b/Source/cmLocalNinjaGenerator.h
index 5e1d6f20d432f6bd0842820feeb023d0482d5e3b..9746a3c7a7b4416056f2a5ea9bfb65480e51f306 100644
--- a/Source/cmLocalNinjaGenerator.h
+++ b/Source/cmLocalNinjaGenerator.h
@@ -11,10 +11,11 @@
   See the License for more information.
 ============================================================================*/
 #ifndef cmLocalNinjaGenerator_h
-#  define cmLocalNinjaGenerator_h
+#define cmLocalNinjaGenerator_h
 
-#  include "cmLocalCommonGenerator.h"
-#  include "cmNinjaTypes.h"
+#include "cmLocalCommonGenerator.h"
+
+#include "cmNinjaTypes.h"
 
 class cmCustomCommandGenerator;
 class cmGlobalNinjaGenerator;
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index afdff337eeafa74db641734a5f23e2f362258211..2a0e07d31bdb514af1853a25d5edecdfec5d9b45 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 d0784add2e0da4dabbd5017c4a95d5660920e13d..314fa0fc0c111b440f31743577a07233538cc06e 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -10,11 +10,13 @@
   See the License for more information.
 ============================================================================*/
 #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
 {
   public:
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 2f66517ead76fc4ddc6c23944605817933d11c11..38b7ac339a52ee7da652d84b4ae1d835562ab53e 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -9,16 +9,17 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#include "cmGlobalVisualStudio7Generator.h"
 #include "cmLocalVisualStudio7Generator.h"
-#include "cmXMLParser.h"
-#include <cm_expat.h>
+
+#include "cmCustomCommandGenerator.h"
+#include "cmGeneratorTarget.h"
+#include "cmGlobalVisualStudio7Generator.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/cmLocalVisualStudio7Generator.h b/Source/cmLocalVisualStudio7Generator.h
index 562f4852b7ed90f20440286058b3f3852815f874..5d9a6340cb1e9cca79faafec1005aa641978db39 100644
--- a/Source/cmLocalVisualStudio7Generator.h
+++ b/Source/cmLocalVisualStudio7Generator.h
@@ -13,6 +13,7 @@
 #define cmLocalVisualStudio7Generator_h
 
 #include "cmLocalVisualStudioGenerator.h"
+
 #include "cmVisualStudioGeneratorOptions.h"
 
 class cmSourceFile;
diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx
index 561f9a136faf08d80031a2df110be6f497b310e6..23e2bfd179807107b399ac56b5fa969723ab67e0 100644
--- a/Source/cmLocalVisualStudioGenerator.cxx
+++ b/Source/cmLocalVisualStudioGenerator.cxx
@@ -10,11 +10,12 @@
   See the License for more information.
 ============================================================================*/
 #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/cmLocalVisualStudioGenerator.h b/Source/cmLocalVisualStudioGenerator.h
index f95eefaed4ad0effd69767bb4a832ce4552d5b1a..caffff704ad38fa31bd540e9ad81afc117fc4891 100644
--- a/Source/cmLocalVisualStudioGenerator.h
+++ b/Source/cmLocalVisualStudioGenerator.h
@@ -13,6 +13,7 @@
 #define cmLocalVisualStudioGenerator_h
 
 #include "cmLocalGenerator.h"
+
 #include "cmGlobalVisualStudioGenerator.h"
 
 #include <cmsys/auto_ptr.hxx>
diff --git a/Source/cmLocalXCodeGenerator.cxx b/Source/cmLocalXCodeGenerator.cxx
index aec260366030ddf933087c5312652ace2ef772e2..d563fe78faa200735a748400c7c660692fbcea13 100644
--- a/Source/cmLocalXCodeGenerator.cxx
+++ b/Source/cmLocalXCodeGenerator.cxx
@@ -10,9 +10,10 @@
   See the License for more information.
 ============================================================================*/
 #include "cmLocalXCodeGenerator.h"
+
 #include "cmGlobalXCodeGenerator.h"
-#include "cmSourceFile.h"
 #include "cmMakefile.h"
+#include "cmSourceFile.h"
 
 //----------------------------------------------------------------------------
 cmLocalXCodeGenerator::cmLocalXCodeGenerator(cmGlobalGenerator* gg,
diff --git a/Source/cmLocale.h b/Source/cmLocale.h
index 727f0f5d40c19a6352a560f17d26e44d0d1eb999..69640f6c564ce0742d150d7c936a7877c1132d6c 100644
--- a/Source/cmLocale.h
+++ b/Source/cmLocale.h
@@ -12,6 +12,8 @@
 #ifndef cmLocale_h
 #define cmLocale_h
 
+#include "cmStandardIncludes.h"
+
 #include <locale.h>
 
 class cmLocaleRAII
diff --git a/Source/cmMachO.cxx b/Source/cmMachO.cxx
index 1607845d7522e6a6ac426e913b2ccecda68c18b2..bb4d4a1cc6a4863f4eab75a7cddf90af03d3a484 100644
--- a/Source/cmMachO.cxx
+++ b/Source/cmMachO.cxx
@@ -10,13 +10,14 @@
   See the License for more information.
 ============================================================================*/
 #include "cmStandardIncludes.h" // to get CMAKE_USE_MACH_PARSER first
+
 #include "cmMachO.h"
 
 #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 71de7a7230314ca38f3765bc2153c5217aa69b45..36831fe110a33ace01e3bbab475bc9ad12d90a3c 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/cmMacroCommand.h b/Source/cmMacroCommand.h
index 5c1cc000af8ce9b1e679a3622fae7f7c1840595b..6f1ae9e4b005e9223a01200339c860d81e69ce45 100644
--- a/Source/cmMacroCommand.h
+++ b/Source/cmMacroCommand.h
@@ -13,6 +13,7 @@
 #define cmMacroCommand_h
 
 #include "cmCommand.h"
+
 #include "cmFunctionBlocker.h"
 
 class cmMacroFunctionBlocker : public cmFunctionBlocker
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index f01ff74bc9a1fe5d5292c2ae13f7373d0736a13f..3bc118148bb1eb7965a363b6dc0f6582e6c1f9c7 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -10,37 +10,38 @@
   See the License for more information.
 ============================================================================*/
 #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 089a83d128eb7900d94f4762fc48395b84517834..fa5e9b4889c0a7dcbd1a23359f660d833ae9683d 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -12,22 +12,24 @@
 #ifndef cmMakefile_h
 #define cmMakefile_h
 
+#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 435844e31482ef016a399afa0809fc26a4ae2a9a..9ded69f3e0532226dc8272e0e95a7cfb5a209229 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 29708d95b93017cb531268c68ea7c69433d3d3c0..e14f828e210ab13a9b4569c534d8f5fc64ccd596 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 322f37d2f1ae7dc5d6471ab615a6f2e4691b314b..0429421d4323b9492eb92aacf1169b65773afb07 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -11,18 +11,19 @@
   See the License for more information.
 ============================================================================*/
 #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/cmNinjaNormalTargetGenerator.h b/Source/cmNinjaNormalTargetGenerator.h
index 556ed5e136a34b1ce072db01d9e05dedae208d82..300618ce3db931793eb60f1f58127a56565536ae 100644
--- a/Source/cmNinjaNormalTargetGenerator.h
+++ b/Source/cmNinjaNormalTargetGenerator.h
@@ -11,13 +11,13 @@
   See the License for more information.
 ============================================================================*/
 #ifndef cmNinjaNormalTargetGenerator_h
-#  define cmNinjaNormalTargetGenerator_h
+#define cmNinjaNormalTargetGenerator_h
 
-#  include "cmNinjaTargetGenerator.h"
-#  include "cmNinjaTypes.h"
-#  include "cmStandardIncludes.h"
+#include "cmNinjaTargetGenerator.h"
 
-#  include <set>
+#include "cmNinjaTypes.h"
+
+#include <set>
 
 class cmSourceFile;
 class cmOSXBundleGenerator;
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index fd1d16dc5b62bc7425ba12d77ffb07400d0f5fcb..8830b8f3a65e5d245feac535bbc910936f48e0f6 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -11,18 +11,19 @@
   See the License for more information.
 ============================================================================*/
 #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 371bc3cc688e20b8fc23a8e72dfcf334e20f5cd1..8225a60f4cd19fb818ade2abb43ae45b3c2b31b7 100644
--- a/Source/cmNinjaTargetGenerator.h
+++ b/Source/cmNinjaTargetGenerator.h
@@ -15,10 +15,9 @@
 
 #include "cmCommonTargetGenerator.h"
 
-#include "cmStandardIncludes.h"
-#include "cmNinjaTypes.h"
 #include "cmGlobalNinjaGenerator.h"
 #include "cmLocalNinjaGenerator.h"
+#include "cmNinjaTypes.h"
 #include "cmOSXBundleGenerator.h"
 
 class cmTarget;
diff --git a/Source/cmNinjaTypes.h b/Source/cmNinjaTypes.h
index 498f6b63985f5c64c4682e792dec5928aa8eb01f..82a52202f90366ad7b0a4bf70835e69069d333ec 100644
--- a/Source/cmNinjaTypes.h
+++ b/Source/cmNinjaTypes.h
@@ -11,7 +11,9 @@
   See the License for more information.
 ============================================================================*/
 #ifndef cmNinjaTypes_h
-#  define cmNinjaTypes_h
+#define cmNinjaTypes_h
+
+#include "cmStandardIncludes.h"
 
 typedef std::vector<std::string> cmNinjaDeps;
 typedef std::map<std::string, std::string> cmNinjaVars;
diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx
index ac66fcd008482bfa9078cf90227186be00ce18e7..735730e3461c43c85d1609cffa33efb430213bfe 100644
--- a/Source/cmNinjaUtilityTargetGenerator.cxx
+++ b/Source/cmNinjaUtilityTargetGenerator.cxx
@@ -11,12 +11,13 @@
   See the License for more information.
 ============================================================================*/
 #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/cmNinjaUtilityTargetGenerator.h b/Source/cmNinjaUtilityTargetGenerator.h
index add0291a53352ffd49e03778956196c377878278..fec294696712317cabde60b05acf49d969dd6d54 100644
--- a/Source/cmNinjaUtilityTargetGenerator.h
+++ b/Source/cmNinjaUtilityTargetGenerator.h
@@ -11,10 +11,11 @@
   See the License for more information.
 ============================================================================*/
 #ifndef cmNinjaUtilityTargetGenerator_h
-#  define cmNinjaUtilityTargetGenerator_h
+#define cmNinjaUtilityTargetGenerator_h
 
-#  include "cmNinjaTargetGenerator.h"
-#  include "cmNinjaTypes.h"
+#include "cmNinjaTargetGenerator.h"
+
+#include "cmNinjaTypes.h"
 
 class cmSourceFile;
 
diff --git a/Source/cmOSXBundleGenerator.cxx b/Source/cmOSXBundleGenerator.cxx
index 934e1986a63cf975ffd28c633fd379863cf51890..98507280067ce9f0e988f6af1047ae3b083ac279 100644
--- a/Source/cmOSXBundleGenerator.cxx
+++ b/Source/cmOSXBundleGenerator.cxx
@@ -10,9 +10,10 @@
   See the License for more information.
 ============================================================================*/
 #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 f945c15a8c9537e83b9da3b462c5cc8bf10ab429..3952e9509cbc03da71eb845aca8e531a19a8d0dc 100644
--- a/Source/cmOSXBundleGenerator.h
+++ b/Source/cmOSXBundleGenerator.h
@@ -13,10 +13,11 @@
 #define cmOSXBundleGenerator_h
 
 #include "cmStandardIncludes.h"
+
 #include "cmSourceFile.h"
 
-#include <string>
 #include <set>
+#include <string>
 
 class cmTarget;
 class cmMakefile;
diff --git a/Source/cmOrderDirectories.cxx b/Source/cmOrderDirectories.cxx
index 61efd01e4b33eb0afa15e4f59c8372ef3ab05fde..2e884e4ff0c7e04c7627403caa41aa9b841cee8a 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 59fb2e9e152f9be40a454917e55d16b61acfc169..3c5d2f4ec2ec7bf9c523975948430c40387a7d92 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/cmOutputRequiredFilesCommand.cxx b/Source/cmOutputRequiredFilesCommand.cxx
index 54208acbe6bd3b7e7cf6c922c3d92341faaf08a6..3b98c877266a746783ec149977dd90dc32152f4a 100644
--- a/Source/cmOutputRequiredFilesCommand.cxx
+++ b/Source/cmOutputRequiredFilesCommand.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmOutputRequiredFilesCommand.h"
+
 #include "cmAlgorithms.h"
 #include <cmsys/FStream.hxx>
 
diff --git a/Source/cmParseArgumentsCommand.cxx b/Source/cmParseArgumentsCommand.cxx
index ca76c889dd33edc9be58465b6c4cd559a7134c72..7fc8ae4173f00bdc256a340bc12566b1c7ea2dfa 100644
--- a/Source/cmParseArgumentsCommand.cxx
+++ b/Source/cmParseArgumentsCommand.cxx
@@ -12,6 +12,7 @@
 ============================================================================*/
 
 #include "cmParseArgumentsCommand.h"
+
 #include "cmAlgorithms.h"
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx
index bce69c56b63364ba26cd93e9747407428458281c..0432da5cd64c1df0ae7b2e33f658fcbf0eda7af0 100644
--- a/Source/cmPolicies.cxx
+++ b/Source/cmPolicies.cxx
@@ -1,14 +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/cmProperty.cxx b/Source/cmProperty.cxx
index ef57068ad55909514a1cf58c5a41e063271e954e..4cdf650f1950629b6577c5124d8c689e15f23ae7 100644
--- a/Source/cmProperty.cxx
+++ b/Source/cmProperty.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmProperty.h"
+
 #include "cmSystemTools.h"
 
 void cmProperty::Set(const char *value)
diff --git a/Source/cmPropertyDefinition.cxx b/Source/cmPropertyDefinition.cxx
index 1af967c9440767bf4103c87144438641e8681fe2..9bb812e99df973bbf021f3cb1fc7a86f40c51fdc 100644
--- a/Source/cmPropertyDefinition.cxx
+++ b/Source/cmPropertyDefinition.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmPropertyDefinition.h"
+
 #include "cmSystemTools.h"
 
 void cmPropertyDefinition
diff --git a/Source/cmPropertyDefinitionMap.cxx b/Source/cmPropertyDefinitionMap.cxx
index 776fad1dca645a0fd31a894e7ac9143288027b5c..cba2b5a2161cc8831ab2eae2dae766e4d5733bb1 100644
--- a/Source/cmPropertyDefinitionMap.cxx
+++ b/Source/cmPropertyDefinitionMap.cxx
@@ -10,8 +10,9 @@
   See the License for more information.
 ============================================================================*/
 #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 ef09dbcf08392853aba7ccef1489da073bcd3c13..2b2502329d8ab0c71fe6cdf2a93fcdde9334f4e1 100644
--- a/Source/cmPropertyMap.cxx
+++ b/Source/cmPropertyMap.cxx
@@ -10,9 +10,10 @@
   See the License for more information.
 ============================================================================*/
 #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 eaf140d26b778364f9f9bd3b2ec01509877452a8..b411597f7fe024ea8090abf8a81aa50047914d25 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 07fc239cf2994d7d18ff39b95d94ca5b53ddcc77..a55a3f3710bf1a4c02e140ed966925f15d7372a0 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -11,26 +11,26 @@
   See the License for more information.
 ============================================================================*/
 
+#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__)
 #include <unistd.h>
 #endif
 
-#include "cmQtAutoGenerators.h"
-
 static bool requiresMocing(const std::string& text, std::string &macroName)
 {
   // this simple check is much much faster than the regexp
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index e46e0fc36bf86f8896c2c2923be3c0817d8f3189..315e9155d3bff88b3fc2606caba3476d98b6131c 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -14,10 +14,12 @@
 #ifndef cmQtAutoGenerators_h
 #define cmQtAutoGenerators_h
 
+#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 cb61ed9958aa4f008576ddce4c7c8317ed8a7c48..67667ea0b86886cc8c3f4d94c34558f6c7d22d60 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 c9cc81737ac9ae65593ddea30f98233844274112..70855b32a310cba76f35fb7239120f0e30df2c9e 100644
--- a/Source/cmSearchPath.cxx
+++ b/Source/cmSearchPath.cxx
@@ -9,10 +9,10 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-
 #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 17ad475bf1c2fb1b6a88fb181750558ef69b0544..fb13a19e272f3de89ccbd8ecfd3fbeade0b630b2 100644
--- a/Source/cmSetPropertyCommand.cxx
+++ b/Source/cmSetPropertyCommand.cxx
@@ -10,9 +10,10 @@
   See the License for more information.
 ============================================================================*/
 #include "cmSetPropertyCommand.h"
+
+#include "cmSetSourceFilesPropertiesCommand.h"
 #include "cmSetTargetPropertiesCommand.h"
 #include "cmSetTestsPropertiesCommand.h"
-#include "cmSetSourceFilesPropertiesCommand.h"
 
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmSetTargetPropertiesCommand.cxx b/Source/cmSetTargetPropertiesCommand.cxx
index b1c13ac966692e597ee22692776c2cdf965a4deb..b4c58d45dfd0abf46360ccc0a7d3586a56808f73 100644
--- a/Source/cmSetTargetPropertiesCommand.cxx
+++ b/Source/cmSetTargetPropertiesCommand.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmSetTargetPropertiesCommand.h"
+
 #include "cmGlobalGenerator.h"
 
 // cmSetTargetPropertiesCommand
diff --git a/Source/cmSetTestsPropertiesCommand.cxx b/Source/cmSetTestsPropertiesCommand.cxx
index 53dc5a8a672d8aa7cbc915bede46d6ab3c3ceddf..70c34c441194fd3a6187cfafae4a0d116870188d 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/cmSourceFile.h b/Source/cmSourceFile.h
index 1433b54f00ef5dcc11357859c1015abfb556aaad..e5e2ab935efdfbc4a6c0cce68b9657c25367394d 100644
--- a/Source/cmSourceFile.h
+++ b/Source/cmSourceFile.h
@@ -13,6 +13,7 @@
 #define cmSourceFile_h
 
 #include "cmSourceFileLocation.h"
+
 #include "cmCustomCommand.h"
 #include "cmPropertyMap.h"
 
diff --git a/Source/cmSourceFileLocation.cxx b/Source/cmSourceFileLocation.cxx
index 00d5d6afe2132ea73cfafdb0d54cff715ec2b5a9..988ddebb86427207cd5d70f71b02c55501c71533 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/cmSourceGroup.h b/Source/cmSourceGroup.h
index e8cf519d4f16c69a952d6b67d5fa149f02c469e1..316d7253361082c93c279d783e062caa5019641e 100644
--- a/Source/cmSourceGroup.h
+++ b/Source/cmSourceGroup.h
@@ -13,6 +13,7 @@
 #define cmSourceGroup_h
 
 #include "cmStandardIncludes.h"
+
 #include <cmsys/RegularExpression.hxx>
 
 class cmSourceFile;
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 272c1361dc8bcb7e5c55f638e6090a2068467990..f80586e1ad07622bdb907af9806b67182d5b2b25 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -17,6 +17,7 @@
 #define cmStandardIncludes_h
 
 #include <cmConfigure.h>
+
 #include <cmsys/Configure.hxx>
 
 #ifdef _MSC_VER
@@ -34,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 f5d63784ffa4bec89e2ca7a92c029138438644b1..a400def0f041bfbe6e94472feba8292fd033e4c7 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 7ead7e02e3e84944c99812837fabe46923cbc299..705c1a81855f02721dd34044cddfedae4581844a 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -13,11 +13,12 @@
 #define cmState_h
 
 #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 3c027a0f4df83957977a9566550e8604e58ebe0c..e10e1aebb0a71dc8856492f5337c107c336fcdd2 100644
--- a/Source/cmStringCommand.cxx
+++ b/Source/cmStringCommand.cxx
@@ -10,13 +10,14 @@
   See the License for more information.
 ============================================================================*/
 #include "cmStringCommand.h"
+
 #include "cmCryptoHash.h"
 
 #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 9af54bffcafc3eda9d93b749c637114e24022173..3177a84f9cea9bc36c42b4a33990c12869d8c16b 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -9,23 +9,23 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-
 #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"
@@ -39,13 +39,14 @@
 
 #if defined(_WIN32)
 # include <windows.h>
+  // 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 d4446753962d5de9f3d526fbfc911c9b119f007f..d311750a562a5cc5d1e29b4fc1d9b75dba7f13f6 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 e1183568358b8c8dfa1bd14bdb9fdd770edb968f..fe14af6096a99470804cb16c98f8878590bfb979 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -10,22 +10,23 @@
   See the License for more information.
 ============================================================================*/
 #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 4e97c2c0eba578afd72d336883f51340468d6360..262cc9b64ada0ca23c6a265f34c47c259edf78f7 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -12,10 +12,12 @@
 #ifndef cmTarget_h
 #define cmTarget_h
 
+#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 6fcd0dc95b8af044dafdad301b77e98eced95c81..7182122d657a11d72878ecb6b86d071cb153e066 100644
--- a/Source/cmTest.cxx
+++ b/Source/cmTest.cxx
@@ -10,10 +10,11 @@
   See the License for more information.
 ============================================================================*/
 #include "cmTest.h"
+
 #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 ca88afecd2339f6fb7b39276f6b84fbea4199399..46013af04f23f7aaf8e6140fb1a476795310be9b 100644
--- a/Source/cmTest.h
+++ b/Source/cmTest.h
@@ -12,9 +12,11 @@
 #ifndef cmTest_h
 #define cmTest_h
 
+#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 b411f15e46e6f028406ed46d0855eda3d00e2844..5790fa696e57485bcf6557a419ca925f5cded6a2 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 1c795c4ff0072fbf4eee950df25fefdf0c382293..7d1ba3231ac85cc96dc067aa485c3af203236bcd 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/cmTimestamp.h b/Source/cmTimestamp.h
index 7c4b2166e89b90b5a1b3da53c860a9ad6afa7186..72d5cc2ee93c5c6ae3f50738cbc403a6bbdc39a6 100644
--- a/Source/cmTimestamp.h
+++ b/Source/cmTimestamp.h
@@ -12,6 +12,8 @@
 #ifndef cmTimestamp_h
 #define cmTimestamp_h
 
+#include "cmStandardIncludes.h"
+
 #include <string>
 #include <time.h>
 
diff --git a/Source/cmTryRunCommand.cxx b/Source/cmTryRunCommand.cxx
index d4a36c9820b6f9f1cba951d905c1b9822f07e591..fdc914201d1bc759d911d75ae0f154fb35f494e8 100644
--- a/Source/cmTryRunCommand.cxx
+++ b/Source/cmTryRunCommand.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmTryRunCommand.h"
+
 #include "cmTryCompileCommand.h"
 #include <cmsys/FStream.hxx>
 
diff --git a/Source/cmUseMangledMesaCommand.cxx b/Source/cmUseMangledMesaCommand.cxx
index 2ee664fd1d0261cbd4ac4ea2d837f1bcac328546..f30071ec1daf1e87970ee48bd41aff9fab4a5fd1 100644
--- a/Source/cmUseMangledMesaCommand.cxx
+++ b/Source/cmUseMangledMesaCommand.cxx
@@ -10,10 +10,11 @@
   See the License for more information.
 ============================================================================*/
 #include "cmUseMangledMesaCommand.h"
+
 #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 e2d0049ebee94b20a8559686258825a52e35aa1d..5f8935f2afd8173864368685d5d1cbaad2c68a10 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/cmVariableRequiresCommand.cxx b/Source/cmVariableRequiresCommand.cxx
index 1d33db13c37969d0728543e9371f238765d9cf54..a830842aa694f997ab7f2dc6d6576665854fc9f3 100644
--- a/Source/cmVariableRequiresCommand.cxx
+++ b/Source/cmVariableRequiresCommand.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmVariableRequiresCommand.h"
+
 #include "cmState.h"
 
 // cmLibraryCommand
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 31873b5ccce9663029fd174ae83158e7a02a0bcc..b4bdb2ad6e703f15452870126dfdccf46700fdb8 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -9,37 +9,38 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#include "windows.h"
 #include "cmVisualStudio10TargetGenerator.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/cmVisualStudio10TargetGenerator.h b/Source/cmVisualStudio10TargetGenerator.h
index 044e0ddee0e986656e8b67476d34f16c59a3f85f..6c946c9e8604f842d913bdb740cef673e691bfab 100644
--- a/Source/cmVisualStudio10TargetGenerator.h
+++ b/Source/cmVisualStudio10TargetGenerator.h
@@ -11,6 +11,7 @@
 ============================================================================*/
 #ifndef cmVisualStudioTargetGenerator_h
 #define cmVisualStudioTargetGenerator_h
+
 #include "cmStandardIncludes.h"
 
 class cmMakefile;
diff --git a/Source/cmVisualStudioGeneratorOptions.cxx b/Source/cmVisualStudioGeneratorOptions.cxx
index bd4eb69862ce7e37e2ccd8a23f9f05b0a9981386..142e36f9d45bce5ad3be0ae3de279f2042c83003 100644
--- a/Source/cmVisualStudioGeneratorOptions.cxx
+++ b/Source/cmVisualStudioGeneratorOptions.cxx
@@ -1,4 +1,5 @@
 #include "cmVisualStudioGeneratorOptions.h"
+
 #include "cmOutputConverter.h"
 #include "cmSystemTools.h"
 #include "cmVisualStudio10TargetGenerator.h"
diff --git a/Source/cmVisualStudioWCEPlatformParser.cxx b/Source/cmVisualStudioWCEPlatformParser.cxx
index ca226fb50c3f61ef62a3a378a68a0bddd0d43107..b6ee7546ace0f1b82deb608f89d8161d6de7c635 100644
--- a/Source/cmVisualStudioWCEPlatformParser.cxx
+++ b/Source/cmVisualStudioWCEPlatformParser.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmVisualStudioWCEPlatformParser.h"
+
 #include "cmGlobalVisualStudioGenerator.h"
 #include "cmXMLParser.h"
 
diff --git a/Source/cmVisualStudioWCEPlatformParser.h b/Source/cmVisualStudioWCEPlatformParser.h
index 042df014222c51d5ced64a0e791ca29b562e78a6..14f8df8ebc9b303958c14f2423fbd881e4cca10b 100644
--- a/Source/cmVisualStudioWCEPlatformParser.h
+++ b/Source/cmVisualStudioWCEPlatformParser.h
@@ -11,6 +11,7 @@
 ============================================================================*/
 #ifndef cmVisualStudioWCEPlatformParser_h
 #define cmVisualStudioWCEPlatformParser_h
+
 #include "cmStandardIncludes.h"
 
 #include "cmXMLParser.h"
diff --git a/Source/cmWhileCommand.cxx b/Source/cmWhileCommand.cxx
index 7bb78bf8a9c5438ad86509c23383a6c8f1e32d67..5fdccaa1c2ed9677e78ef88b87f38781e595fdd0 100644
--- a/Source/cmWhileCommand.cxx
+++ b/Source/cmWhileCommand.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmWhileCommand.h"
+
 #include "cmConditionEvaluator.h"
 
 cmWhileFunctionBlocker::cmWhileFunctionBlocker(cmMakefile* mf):
diff --git a/Source/cmWhileCommand.h b/Source/cmWhileCommand.h
index 85a0bd327b03c19dcb28701d299f5b65f970467f..902c55ac03035999e5522455bec85fe7eed2ed4d 100644
--- a/Source/cmWhileCommand.h
+++ b/Source/cmWhileCommand.h
@@ -13,6 +13,7 @@
 #define cmWhileCommand_h
 
 #include "cmCommand.h"
+
 #include "cmFunctionBlocker.h"
 #include "cmListFileCache.h"
 
diff --git a/Source/cmWriteFileCommand.cxx b/Source/cmWriteFileCommand.cxx
index cc9f2200347801a865e40914a72a97031a0fe086..d52d6b5d6a443c1b757cc209c837b5c6596fb1aa 100644
--- a/Source/cmWriteFileCommand.cxx
+++ b/Source/cmWriteFileCommand.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmWriteFileCommand.h"
+
 #include <cmsys/FStream.hxx>
 
 #include <sys/types.h>
diff --git a/Source/cmXCode21Object.cxx b/Source/cmXCode21Object.cxx
index 3973540bf59970add0875603cee84579ef67a4c1..bd055e58e5d8cc142c7cc4ccb038456a540d4e53 100644
--- a/Source/cmXCode21Object.cxx
+++ b/Source/cmXCode21Object.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmXCode21Object.h"
+
 #include "cmSystemTools.h"
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx
index 911e154993dec13b1948ced89b3f68b961182a66..87b2e8942b8973b9cdbd0bf4c245d81a09dfcb58 100644
--- a/Source/cmXCodeObject.cxx
+++ b/Source/cmXCodeObject.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmXCodeObject.h"
+
 #include "cmSystemTools.h"
 
 #include <CoreFoundation/CoreFoundation.h> // CFUUIDCreate
diff --git a/Source/cmXCodeObject.h b/Source/cmXCodeObject.h
index 2d876da8ff9939a26bcf4ff859455ef68af6bad8..d00cf0fbd260ffb91781f3c560d04fbe7653aaf2 100644
--- a/Source/cmXCodeObject.h
+++ b/Source/cmXCodeObject.h
@@ -13,6 +13,7 @@
 #define cmXCodeObject_h
 
 #include "cmStandardIncludes.h"
+
 class cmGeneratorTarget;
 
 class cmXCodeObject
diff --git a/Source/cmXMLParser.cxx b/Source/cmXMLParser.cxx
index 1d3e0e9379caaef76b0d687ed8e52cd33e786e9f..6a24faa33a742fe610aefb959571ffd7e737c296 100644
--- a/Source/cmXMLParser.cxx
+++ b/Source/cmXMLParser.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmXMLParser.h"
+
 #include <cmsys/FStream.hxx>
 
 #include <cm_expat.h>
diff --git a/Source/cmXMLSafe.cxx b/Source/cmXMLSafe.cxx
index 4ad05ca31617bedb22a51b6d30688035d89831e0..e76ee52925cf40acb43b649912c0688554985f70 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 ead2e014c5f22f45a664c83e8a2d40d36d77ee81..7cf34bac94e1441e04e8bceb974d8c7f9570efa8 100644
--- a/Source/cmXMLSafe.h
+++ b/Source/cmXMLSafe.h
@@ -13,8 +13,9 @@
 #define cmXMLSafe_h
 
 #include <cmsys/Configure.hxx>
-#include <string>
+
 #include <iosfwd>
+#include <string>
 
 /** \class cmXMLSafe
  * \brief Write strings to XML with proper escapes
diff --git a/Source/cmXMLWriter.cxx b/Source/cmXMLWriter.cxx
index 6a9172ac71b587a807709f7535351d54673ba133..ec2646759b97487c8c96227f593a8338df23a692 100644
--- a/Source/cmXMLWriter.cxx
+++ b/Source/cmXMLWriter.cxx
@@ -10,6 +10,7 @@
   See the License for more information.
 ============================================================================*/
 #include "cmXMLWriter.h"
+
 #include "cmXMLSafe.h"
 
 #include <cassert>
diff --git a/Source/cmXMLWriter.h b/Source/cmXMLWriter.h
index 308305960f1c92867b45afd80cf116c9de2ee53e..8fedcd43269204f947da6d70b19be2646d401ed3 100644
--- a/Source/cmXMLWriter.h
+++ b/Source/cmXMLWriter.h
@@ -13,6 +13,7 @@
 #define cmXMLWiter_h
 
 #include "cmStandardIncludes.h"
+
 #include "cmXMLSafe.h"
 
 #include <ostream>
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 8e3380f56b2329b57a94d45dc07972b9db0beae5..da6e59e3689759d12e36728983310c9b1ecc03cf 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -10,17 +10,18 @@
   See the License for more information.
 ============================================================================*/
 #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"
@@ -28,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
@@ -51,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"
@@ -80,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"
@@ -99,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 8644dda1c3151f3968906ede9e3a5a93f18e3bb1..e41ba5699abcf3a28ae852f31ad05c354840d7c7 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -13,11 +13,13 @@
 #ifndef cmake_h
 #define cmake_h
 
-#include "cmListFileCache.h"
-#include "cmSystemTools.h"
-#include "cmInstalledFile.h"
+#include "cmStandardIncludes.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 600cc1a91488179c3281915b0928f35b92797e68..785fd9066893c80ef4e00bc74250eadd5bc9db60 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 9aaeeaa4d7b0830824420c6466030af761ecfaf3..1385ff7221a9b9aa90b48eed7d9392ab9335eea3 100644
--- a/Source/cmakexbuild.cxx
+++ b/Source/cmakexbuild.cxx
@@ -9,9 +9,10 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#include <cmsys/Process.h>
 #include "cmStandardIncludes.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 f3c6059b1c24e92fca8d59ae54388012fa3933b1..644da1dfef1cf2ec1b9bc27cd912cc776f476e82 100644
--- a/Source/cmcldeps.cxx
+++ b/Source/cmcldeps.cxx
@@ -19,12 +19,12 @@
 // /showIncludes is equivalent to -MD, not -MMD, that is, system headers are
 // included.
 
-
-#include <windows.h>
-#include <sstream>
 #include <cmSystemTools.h>
 #include <cmsys/Encoding.hxx>
 
+#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
 void _setargv() {}
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 19f38862870df60a6cc32104b9628114e42affed..22c6a0657c1632b6fbd7e4b7f6da487d243b5572 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -10,20 +10,21 @@
   See the License for more information.
 ============================================================================*/
 #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 7fa6aed8e276f0b742daa05a4684ee27a5204d66..5c80487a429ac9de88456a4c721bc29e13027060 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"
 
 //----------------------------------------------------------------------------
diff --git a/Tests/BuildDepends/Project/bar.cxx b/Tests/BuildDepends/Project/bar.cxx
index dadf93d6b973d857d4ca1fd1627f1e69874874ba..c4adbf8e64c808e03a023288e110c4e6e336cdc1 100644
--- a/Tests/BuildDepends/Project/bar.cxx
+++ b/Tests/BuildDepends/Project/bar.cxx
@@ -1,7 +1,7 @@
+#include <noregen.h>
+#include <regen.h>
 #include <stdio.h>
 #include <string.h>
-#include <regen.h>
-#include <noregen.h>
 
 int main(int argc, char** argv)
 {
diff --git a/Tests/BuildDepends/Project/ninjadep.cpp b/Tests/BuildDepends/Project/ninjadep.cpp
index 8d61336137f2161366370594dc5528346f684679..5498b177ba774ec9108e829ef3e10afd8bb70cec 100644
--- a/Tests/BuildDepends/Project/ninjadep.cpp
+++ b/Tests/BuildDepends/Project/ninjadep.cpp
@@ -1,5 +1,5 @@
-#include <stdio.h>
 #include "dir/header.h"
+#include <stdio.h>
 
 int main() {
   printf("HEADER_STRING: %s\n", HEADER_STRING);
diff --git a/Tests/BuildDepends/Project/zot.cxx b/Tests/BuildDepends/Project/zot.cxx
index 775fd3b438370cfc1442959660752d3bda15ce68..186554b82e80c90dfdc71e68ad7e01f1c7bb6bb4 100644
--- a/Tests/BuildDepends/Project/zot.cxx
+++ b/Tests/BuildDepends/Project/zot.cxx
@@ -1,6 +1,6 @@
+#include <stdio.h>
 #include <zot.hxx>
 #include <zot_custom.hxx>
-#include <stdio.h>
 
 const char* zot_macro_dir_f();
 const char* zot_macro_tgt_f();
diff --git a/Tests/BundleTest/BundleLib.cxx b/Tests/BundleTest/BundleLib.cxx
index 37bc178d63b25e492afbc2bc6d1fd7fda55262ad..54f9534d02ac394860bde6be9db35bc077350fb4 100644
--- a/Tests/BundleTest/BundleLib.cxx
+++ b/Tests/BundleTest/BundleLib.cxx
@@ -1,6 +1,6 @@
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 #include <CoreFoundation/CoreFoundation.h>
diff --git a/Tests/BundleUtilities/module.cpp b/Tests/BundleUtilities/module.cpp
index ee1b542fb3cee0a708caa70a27788d32ac802e67..51730d9de3aa4fb265a7336fe9c59043021445d4 100644
--- a/Tests/BundleUtilities/module.cpp
+++ b/Tests/BundleUtilities/module.cpp
@@ -1,7 +1,7 @@
 
 #include "module.h"
-#include "stdio.h"
 #include "shared2.h"
+#include "stdio.h"
 
 void module()
 {
diff --git a/Tests/CMakeCommands/target_include_directories/consumer.cpp b/Tests/CMakeCommands/target_include_directories/consumer.cpp
index 649510ce082bbd399fba5d1e9dbab7fa9e4d692c..9e1656a9773ccd31b059172e2e4d1fb769e2138b 100644
--- a/Tests/CMakeCommands/target_include_directories/consumer.cpp
+++ b/Tests/CMakeCommands/target_include_directories/consumer.cpp
@@ -1,9 +1,9 @@
 
+#include "consumer.h"
 #include "common.h"
-#include "publicinclude.h"
 #include "interfaceinclude.h"
+#include "publicinclude.h"
 #include "relative_dir.h"
-#include "consumer.h"
 #ifdef TEST_LANG_DEFINES
   #include "cxx_only.h"
 #endif
diff --git a/Tests/CMakeCommands/target_link_libraries/targetC.cpp b/Tests/CMakeCommands/target_link_libraries/targetC.cpp
index a4ef6369d03e62394b6a3e274967dd2d20a20130..35426605df7feb8e3bac86dcac192de81b29660c 100644
--- a/Tests/CMakeCommands/target_link_libraries/targetC.cpp
+++ b/Tests/CMakeCommands/target_link_libraries/targetC.cpp
@@ -1,8 +1,8 @@
 
 #include "depG.h"
 
-#include "foo.h"
 #include "bar.h"
+#include "foo.h"
 
 #ifndef TEST_DEF
 #error Expected TEST_DEF definition
diff --git a/Tests/CMakeLib/testUTF8.cxx b/Tests/CMakeLib/testUTF8.cxx
index 4ab96cf01e455e4ae74641c17d0205afdf8fa1cc..204a71739187032856dd3877329d343461da3c4e 100644
--- a/Tests/CMakeLib/testUTF8.cxx
+++ b/Tests/CMakeLib/testUTF8.cxx
@@ -11,8 +11,8 @@
 ============================================================================*/
 #include <cm_utf8.h>
 
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
 
 typedef char test_utf8_char[5];
 
diff --git a/Tests/CompileDefinitions/runtest.c b/Tests/CompileDefinitions/runtest.c
index 02d2cadb0c99cbf99bf778b3d7b80f7cfc0418fd..c2d51aaf0c2bcfae689710d54102fc8aec7fa3fa 100644
--- a/Tests/CompileDefinitions/runtest.c
+++ b/Tests/CompileDefinitions/runtest.c
@@ -1,6 +1,6 @@
-#include <string.h>
-#include <stdio.h>
 #include <ctype.h>
+#include <stdio.h>
+#include <string.h>
 
 #ifndef BUILD_CONFIG_NAME
 # error "BUILD_CONFIG_NAME not defined!"
diff --git a/Tests/Complex/Executable/complex.cxx b/Tests/Complex/Executable/complex.cxx
index ec222a5acef0947e9c2ca3a062de347fce9fc894..8d538db8a35581816f68a0775bb362e8dbcea8d4 100644
--- a/Tests/Complex/Executable/complex.cxx
+++ b/Tests/Complex/Executable/complex.cxx
@@ -1,18 +1,18 @@
+#include "Aout.h"
+#include "ExtraSources/file1.h"
 #include "cmTestConfigure.h"
 #include "cmTestConfigureEscape.h"
 #include "cmTestGeneratedHeader.h"
 #include "cmVersion.h"
-#include "ExtraSources/file1.h"
-#include "Aout.h"
 #include "file2.h"
 #include "sharedFile.h"
 extern "C" {
 #include "testConly.h"
 }
-#include <vector>
-#include <string>
 #include <iostream>
 #include <string.h>
+#include <string>
+#include <vector>
 
 #include <stdio.h>
 #include <sys/stat.h>
diff --git a/Tests/ComplexOneConfig/Executable/complex.cxx b/Tests/ComplexOneConfig/Executable/complex.cxx
index ec222a5acef0947e9c2ca3a062de347fce9fc894..8d538db8a35581816f68a0775bb362e8dbcea8d4 100644
--- a/Tests/ComplexOneConfig/Executable/complex.cxx
+++ b/Tests/ComplexOneConfig/Executable/complex.cxx
@@ -1,18 +1,18 @@
+#include "Aout.h"
+#include "ExtraSources/file1.h"
 #include "cmTestConfigure.h"
 #include "cmTestConfigureEscape.h"
 #include "cmTestGeneratedHeader.h"
 #include "cmVersion.h"
-#include "ExtraSources/file1.h"
-#include "Aout.h"
 #include "file2.h"
 #include "sharedFile.h"
 extern "C" {
 #include "testConly.h"
 }
-#include <vector>
-#include <string>
 #include <iostream>
 #include <string.h>
+#include <string>
+#include <vector>
 
 #include <stdio.h>
 #include <sys/stat.h>
diff --git a/Tests/ExportImport/Export/testSharedLibDepends.h b/Tests/ExportImport/Export/testSharedLibDepends.h
index 8b2f84eb348a3e8ca25be7dea15cf5513001ef6e..e84fb545440a91ee5dd7e1ab6b93b7ddbd5fbfe3 100644
--- a/Tests/ExportImport/Export/testSharedLibDepends.h
+++ b/Tests/ExportImport/Export/testSharedLibDepends.h
@@ -4,8 +4,8 @@
 
 #include "testsharedlibdepends_export.h"
 
-#include "testSharedLibRequired.h"
 #include "renamed.h"
+#include "testSharedLibRequired.h"
 
 struct TESTSHAREDLIBDEPENDS_EXPORT TestSharedLibDepends
 {
diff --git a/Tests/ExportImport/Import/A/deps_shared_iface.cpp b/Tests/ExportImport/Import/A/deps_shared_iface.cpp
index d5e4de3c0a02bbe719af78892f946db10a437909..0c5cb7fd70725b2b67d1fcc29624122ab564b7e0 100644
--- a/Tests/ExportImport/Import/A/deps_shared_iface.cpp
+++ b/Tests/ExportImport/Import/A/deps_shared_iface.cpp
@@ -21,8 +21,8 @@
 #endif
 
 #ifdef TEST_SUBDIR_LIB
-#include "subdir.h"
 #include "renamed.h"
+#include "subdir.h"
 #endif
 
 #ifdef DO_GNU_TESTS
diff --git a/Tests/FindGSL/rng/main.cc b/Tests/FindGSL/rng/main.cc
index 72543be779d9377681b030974ad6813bda2e29c8..e1e0a4778bca18ab9b1b0fba9fb22f13fac5eb58 100644
--- a/Tests/FindGSL/rng/main.cc
+++ b/Tests/FindGSL/rng/main.cc
@@ -1,5 +1,5 @@
-#include <math.h>
 #include "gsl/gsl_rng.h"
+#include <math.h>
 
 int main()
 {
diff --git a/Tests/FindGTK2/cairomm/main.cpp b/Tests/FindGTK2/cairomm/main.cpp
index ea8f1065cc79ff06ae363d511ecf02b77ad072eb..0db3a042141f1e9882cd45328273656046487871 100644
--- a/Tests/FindGTK2/cairomm/main.cpp
+++ b/Tests/FindGTK2/cairomm/main.cpp
@@ -8,11 +8,11 @@
 #define _USE_MATH_DEFINES
 #endif
 
-#include <string>
-#include <iostream>
-#include <cairommconfig.h>
 #include <cairomm/context.h>
 #include <cairomm/surface.h>
+#include <cairommconfig.h>
+#include <iostream>
+#include <string>
 
 #include <cmath>
 
diff --git a/Tests/FindGTK2/gtkmm/main.cpp b/Tests/FindGTK2/gtkmm/main.cpp
index 5ff64d113ae5f85e52ccd0d496c5e8579095ffcd..566a4bd0af27339f805d07a822bc481a55439e43 100644
--- a/Tests/FindGTK2/gtkmm/main.cpp
+++ b/Tests/FindGTK2/gtkmm/main.cpp
@@ -1,5 +1,5 @@
-#include <gtkmm.h>
 #include "helloworld.h"
+#include <gtkmm.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/Tests/FindGTK2/sigc++/main.cpp b/Tests/FindGTK2/sigc++/main.cpp
index 78428e76bfaa2a20ec04552451cba4b33c2052f7..ccf415e4813433b648fc0a96c7b9a2d4cc1fdf3f 100644
--- a/Tests/FindGTK2/sigc++/main.cpp
+++ b/Tests/FindGTK2/sigc++/main.cpp
@@ -1,8 +1,7 @@
 // Taken from https://developer.gnome.org/libsigc++-tutorial/stable/ch02.html
 
-
-#include <sigc++/sigc++.h>
 #include <iostream>
+#include <sigc++/sigc++.h>
 
 class AlienDetector
 {
diff --git a/Tests/FindLTTngUST/Test/main.c b/Tests/FindLTTngUST/Test/main.c
index ac775a0c4a8e2a065abe539972f399a47fb4a420..1f313c1a9bc20346cf5cb048e8de7c50d1e8b02e 100644
--- a/Tests/FindLTTngUST/Test/main.c
+++ b/Tests/FindLTTngUST/Test/main.c
@@ -1,7 +1,7 @@
 #include <assert.h>
-#include <string.h>
-#include <stdio.h>
 #include <lttng/ust-version.h>
+#include <stdio.h>
+#include <string.h>
 
 #ifdef CMAKE_LTTNGUST_HAS_TRACEF
 #include <lttng/tracef.h>
diff --git a/Tests/FindPNG/Test/main.c b/Tests/FindPNG/Test/main.c
index 27e14786bb973485c0a01e0bf63712e604cecd13..06d943d1b554977828c4f2e11d41ce76255dd648 100644
--- a/Tests/FindPNG/Test/main.c
+++ b/Tests/FindPNG/Test/main.c
@@ -1,6 +1,6 @@
 #include <assert.h>
-#include <string.h>
 #include <png.h>
+#include <string.h>
 
 int main()
 {
diff --git a/Tests/FindPackageModeMakefileTest/main.cpp b/Tests/FindPackageModeMakefileTest/main.cpp
index e5f9134ce928ea39143404bda5b8d1a1f2ab8724..db1ffb19ed9e88bc798e81901d3f728dda58d935 100644
--- a/Tests/FindPackageModeMakefileTest/main.cpp
+++ b/Tests/FindPackageModeMakefileTest/main.cpp
@@ -1,5 +1,5 @@
-#include <stdio.h>
 #include <foo.h>
+#include <stdio.h>
 
 int main()
 {
diff --git a/Tests/FindXalanC/Test/main.cxx b/Tests/FindXalanC/Test/main.cxx
index 3b4a2df8eef3e391048f2b6344fa3d2f72147def..7d0f42cf4a732b3e3870753607140417ee2c3588 100644
--- a/Tests/FindXalanC/Test/main.cxx
+++ b/Tests/FindXalanC/Test/main.cxx
@@ -1,5 +1,5 @@
-#include <xercesc/util/PlatformUtils.hpp>
 #include <xalanc/XalanTransformer/XalanTransformer.hpp>
+#include <xercesc/util/PlatformUtils.hpp>
 
 int main()
 {
diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp b/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp
index aed0bde46b421ecd5d760942fc044b7f77a356bd..2ee05e2eedf6fc2b979e25730ccf73ad79fb4731 100644
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp
@@ -1,17 +1,17 @@
 
+#include "arguments.h"
+#include "bang.h"
 #include "bar.h"
 #include "bat.h"
-#include "foo.h"
 #include "baz.h"
-#include "bang.h"
 #include "bing.h"
 #include "bung.h"
-#include "ting.h"
-#include "arguments.h"
+#include "common.h"
+#include "foo.h"
 #include "list.h"
-#include "target.h"
 #include "prefix_foo_bar_bat.h"
-#include "common.h"
+#include "target.h"
+#include "ting.h"
 
 int main(int, char**)
 {
diff --git a/Tests/LoadCommand/CMakeCommands/cmTestCommand.c b/Tests/LoadCommand/CMakeCommands/cmTestCommand.c
index fc04934dd990c4a00af5b49aee719254d308f4a5..eac121d41ccd7c049864b4d818a9be96cb41f023 100644
--- a/Tests/LoadCommand/CMakeCommands/cmTestCommand.c
+++ b/Tests/LoadCommand/CMakeCommands/cmTestCommand.c
@@ -1,7 +1,7 @@
 #include "cmCPluginAPI.h"
-#include <string.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 typedef struct
 {
diff --git a/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c b/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c
index fc04934dd990c4a00af5b49aee719254d308f4a5..eac121d41ccd7c049864b4d818a9be96cb41f023 100644
--- a/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c
+++ b/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c
@@ -1,7 +1,7 @@
 #include "cmCPluginAPI.h"
-#include <string.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 typedef struct
 {
diff --git a/Tests/MFC/mfc1/ChildFrm.cpp b/Tests/MFC/mfc1/ChildFrm.cpp
index b04c4f2314dd9a8d00ae378b15374a317c3bfd69..889ccebecd77c2134e66a9d90b6de51591182845 100644
--- a/Tests/MFC/mfc1/ChildFrm.cpp
+++ b/Tests/MFC/mfc1/ChildFrm.cpp
@@ -1,6 +1,8 @@
 // ChildFrm.cpp : implementation of the CChildFrame class
 //
+
 #include "stdafx.h"
+
 #include "mfc1.h"
 
 #include "ChildFrm.h"
diff --git a/Tests/MFC/mfc1/MainFrm.cpp b/Tests/MFC/mfc1/MainFrm.cpp
index 44554bf4c8d5c3b8bcf5698ce4802e81f954ab35..222c3dae396db375568b059fb88fe179878d1180 100644
--- a/Tests/MFC/mfc1/MainFrm.cpp
+++ b/Tests/MFC/mfc1/MainFrm.cpp
@@ -2,6 +2,7 @@
 //
 
 #include "stdafx.h"
+
 #include "mfc1.h"
 
 #include "MainFrm.h"
diff --git a/Tests/MFC/mfc1/mfc1.cpp b/Tests/MFC/mfc1/mfc1.cpp
index 9530cd2b94d3fb7f14b92f34bc732f5351329fe2..1777d7f29bf2718f1402a434e57e00beb50a1268 100644
--- a/Tests/MFC/mfc1/mfc1.cpp
+++ b/Tests/MFC/mfc1/mfc1.cpp
@@ -2,8 +2,9 @@
 //
 
 #include "stdafx.h"
-#include "mfc1.h"
+
 #include "MainFrm.h"
+#include "mfc1.h"
 
 #include "ChildFrm.h"
 #include "mfc1Doc.h"
diff --git a/Tests/MFC/mfc1/mfc1Doc.cpp b/Tests/MFC/mfc1/mfc1Doc.cpp
index 8767052ed2420fefab14ce7c9d4ca47db96bde8a..db76b060d99aa47a10ba76873fcab78799bcc562 100644
--- a/Tests/MFC/mfc1/mfc1Doc.cpp
+++ b/Tests/MFC/mfc1/mfc1Doc.cpp
@@ -2,6 +2,7 @@
 //
 
 #include "stdafx.h"
+
 #include "mfc1.h"
 
 #include "mfc1Doc.h"
diff --git a/Tests/MFC/mfc1/mfc1View.cpp b/Tests/MFC/mfc1/mfc1View.cpp
index 06c765230f8a07fbcb9fc5faad89160c4c455fd9..800030216ed4e79a7cf8d543e3d6c9949ee51b7f 100644
--- a/Tests/MFC/mfc1/mfc1View.cpp
+++ b/Tests/MFC/mfc1/mfc1View.cpp
@@ -2,6 +2,7 @@
 //
 
 #include "stdafx.h"
+
 #include "mfc1.h"
 
 #include "mfc1Doc.h"
diff --git a/Tests/MFC/mfc1/stdafx.h b/Tests/MFC/mfc1/stdafx.h
index 35a678dcdef7a6e1ef9f2024db5da6b93019332a..654a23f485cba90e11763798e6c6ec2062eaadc7 100644
--- a/Tests/MFC/mfc1/stdafx.h
+++ b/Tests/MFC/mfc1/stdafx.h
@@ -46,9 +46,9 @@
 // turns off MFC's hiding of some common and often safely ignored warning messages
 #define _AFX_ALL_WARNINGS
 
-#include <afxwin.h>         // MFC core and standard components
-#include <afxext.h>         // MFC extensions
-#include <afxdisp.h>        // MFC Automation classes
+#include <afxdisp.h> // MFC Automation classes
+#include <afxext.h>  // MFC extensions
+#include <afxwin.h>  // MFC core and standard components
 
 #include <afxdtctl.h>		// MFC support for Internet Explorer 4 Common Controls
 #ifndef _AFX_NO_AFXCMN_SUPPORT
diff --git a/Tests/OutOfSource/OutOfSourceSubdir/simple.cxx b/Tests/OutOfSource/OutOfSourceSubdir/simple.cxx
index d88c311f8e7a396ac87f7f132233d55b92829b27..69d7c82d152f35c2c2833d323bf6ca133076d433 100644
--- a/Tests/OutOfSource/OutOfSourceSubdir/simple.cxx
+++ b/Tests/OutOfSource/OutOfSourceSubdir/simple.cxx
@@ -1,8 +1,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "testlib.h"
 #include "testdp.h"
+#include "testlib.h"
 
 extern int simple();
 #ifndef NO_DEEPSRC
diff --git a/Tests/Plugin/src/example_exe.cxx b/Tests/Plugin/src/example_exe.cxx
index 12d92041aabb9195109511da838051b363e1d5ed..393bb680c085f4a0ebada89287533f906ce793e6 100644
--- a/Tests/Plugin/src/example_exe.cxx
+++ b/Tests/Plugin/src/example_exe.cxx
@@ -2,8 +2,8 @@
 
 #include <example_exe.h>
 
-#include <kwsys/DynamicLoader.hxx>
 #include <iostream>
+#include <kwsys/DynamicLoader.hxx>
 #include <string>
 
 #include <stdio.h>
diff --git a/Tests/Preprocess/preprocess.c b/Tests/Preprocess/preprocess.c
index 16209acf49be8329b2ebe18b9ff9f2ed0bae2ba6..af5eae672285a9da0e104c75a815fb86a59e753b 100644
--- a/Tests/Preprocess/preprocess.c
+++ b/Tests/Preprocess/preprocess.c
@@ -3,8 +3,8 @@
 #include FILE_PATH
 #include TARGET_PATH
 
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
 
 int check_defines_C(void)
 {
diff --git a/Tests/Preprocess/preprocess.cxx b/Tests/Preprocess/preprocess.cxx
index 27b6ac89a656c77e464a1af9836069629149192e..d1681036f03ee031902628a8abe74486936ed368 100644
--- a/Tests/Preprocess/preprocess.cxx
+++ b/Tests/Preprocess/preprocess.cxx
@@ -3,8 +3,8 @@
 #include FILE_PATH
 #include TARGET_PATH
 
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
 
 extern "C" int check_defines_C(void);
 
diff --git a/Tests/Qt4Deploy/testdeploy.cpp b/Tests/Qt4Deploy/testdeploy.cpp
index 8b9c8d6fa512a51917a3c16dc31abd7ac10c09ba..255453a40e7168f142a0e7693aeeb274fd8af2ea 100644
--- a/Tests/Qt4Deploy/testdeploy.cpp
+++ b/Tests/Qt4Deploy/testdeploy.cpp
@@ -1,7 +1,7 @@
 #include <QCoreApplication>
-#include <QSqlDatabase>
-#include <QLibraryInfo>
 #include <QDebug>
+#include <QLibraryInfo>
+#include <QSqlDatabase>
 #include <QStringList>
 
 int main(int argc, char** argv)
diff --git a/Tests/QtAutogen/Bdir/libB.h b/Tests/QtAutogen/Bdir/libB.h
index 510c17f8fe902f6996810866723850b4b22d82b5..746b67a67a95fb41ad1d90b279bf06d8e848c10b 100644
--- a/Tests/QtAutogen/Bdir/libB.h
+++ b/Tests/QtAutogen/Bdir/libB.h
@@ -4,8 +4,8 @@
 
 #include "libb_export.h"
 
-#include <QObject>
 #include "libA.h"
+#include <QObject>
 
 class LIBB_EXPORT LibB : public QObject
 {
diff --git a/Tests/QtAutogen/calwidget.cpp b/Tests/QtAutogen/calwidget.cpp
index 5f59994b7bc242893043b5f355cc002b99d889f5..0e314cd6a9ce0fc2aafa193c4a02fc3d00fe287b 100644
--- a/Tests/QtAutogen/calwidget.cpp
+++ b/Tests/QtAutogen/calwidget.cpp
@@ -38,13 +38,13 @@
  **
  ****************************************************************************/
 
+ #include <QCalendarWidget>
+ #include <QCheckBox>
  #include <QComboBox>
+ #include <QDateEdit>
  #include <QGridLayout>
- #include <QLabel>
  #include <QGroupBox>
- #include <QCheckBox>
- #include <QDateEdit>
- #include <QCalendarWidget>
+ #include <QLabel>
  #include <QTextCharFormat>
 
  #include "calwidget.h"
diff --git a/Tests/QtAutogen/codeeditor.h b/Tests/QtAutogen/codeeditor.h
index 56e9e79239a6ee760d0753fcff3732b66e9b6de4..fd79a2ac43d2ff79e70b7380e53d39f9cb0bfda3 100644
--- a/Tests/QtAutogen/codeeditor.h
+++ b/Tests/QtAutogen/codeeditor.h
@@ -41,8 +41,8 @@
  #ifndef CODEEDITOR_H
  #define CODEEDITOR_H
 
- #include <QPlainTextEdit>
  #include <QObject>
+ #include <QPlainTextEdit>
 
  class QPaintEvent;
  class QResizeEvent;
diff --git a/Tests/QtAutogen/libC.h b/Tests/QtAutogen/libC.h
index 4fb4a2cf4ce829e62bb6d2c485ec08e71b9dba3c..6682576d182a1fb53fc9993f7e0b9a557f0172c9 100644
--- a/Tests/QtAutogen/libC.h
+++ b/Tests/QtAutogen/libC.h
@@ -4,8 +4,8 @@
 
 #include "libc_export.h"
 
-#include <QObject>
 #include "libB.h"
+#include <QObject>
 
 class LIBC_EXPORT LibC : public QObject
 {
diff --git a/Tests/QtAutogen/main.cpp b/Tests/QtAutogen/main.cpp
index eb596650e5723cb3712901d9b3b83fbf8b9f8107..1636cd443c9fcc7e156943fbf63fa2dbe3ed824a 100644
--- a/Tests/QtAutogen/main.cpp
+++ b/Tests/QtAutogen/main.cpp
@@ -41,16 +41,16 @@
 #include <QCoreApplication>
 #include <QTimer>
 
-#include "codeeditor.h"
+#include "abc.h"
+#include "blub.h"
 #include "calwidget.h"
+#include "codeeditor.h"
 #include "foo.h"
-#include "blub.h"
+#include "libC.h"
+#include "resourcetester.h"
 #include "sub/bar.h"
-#include "abc.h"
 #include "xyz.h"
 #include "yaf.h"
-#include "libC.h"
-#include "resourcetester.h"
 #ifdef TEST_DEBUG_CLASS
 #include "debug_class.h"
 #include <iostream>
diff --git a/Tests/QtAutogen/resourcetester.cpp b/Tests/QtAutogen/resourcetester.cpp
index 043ec75fc3fdcf19d98c8d709ef6440f599bd228..75ae28f8f41acc3875740e98563b70e94dd840d1 100644
--- a/Tests/QtAutogen/resourcetester.cpp
+++ b/Tests/QtAutogen/resourcetester.cpp
@@ -1,8 +1,8 @@
 
 #include "resourcetester.h"
 
-#include <QDebug>
 #include <QApplication>
+#include <QDebug>
 #include <QFile>
 #include <QTimer>
 
diff --git a/Tests/QtAutogen/same_name/ccc/item.cpp b/Tests/QtAutogen/same_name/ccc/item.cpp
index 2584881e40357c2a537894ba2e15c0a1ea610e47..12c71d0fa7f1cc1b706f2d7754b4f4df54372dd5 100644
--- a/Tests/QtAutogen/same_name/ccc/item.cpp
+++ b/Tests/QtAutogen/same_name/ccc/item.cpp
@@ -22,5 +22,5 @@ MocTest::go()
 }
 
 // Include own moc files
-#include "moc_item.cpp"
 #include "item.moc"
+#include "moc_item.cpp"
diff --git a/Tests/QtAutogen/same_name/main.cpp b/Tests/QtAutogen/same_name/main.cpp
index 166466e3279adce32ceb649132c9ba91983eb105..fc77a9902ce8833a5be14ae627b30c16a407f693 100644
--- a/Tests/QtAutogen/same_name/main.cpp
+++ b/Tests/QtAutogen/same_name/main.cpp
@@ -1,7 +1,7 @@
-#include "aaa/item.hpp"
 #include "aaa/bbb/item.hpp"
-#include "bbb/item.hpp"
+#include "aaa/item.hpp"
 #include "bbb/aaa/item.hpp"
+#include "bbb/item.hpp"
 #include "ccc/item.hpp"
 
 int main(int argv, char **args)
diff --git a/Tests/RunCMake/AutoExportDll/hello.cxx b/Tests/RunCMake/AutoExportDll/hello.cxx
index 3933fc114d8d3863efd09bf0b5ece1bf0f94fba9..4196948f6f0587396219cfbbb7e3a53a1f1cdb69 100644
--- a/Tests/RunCMake/AutoExportDll/hello.cxx
+++ b/Tests/RunCMake/AutoExportDll/hello.cxx
@@ -1,5 +1,5 @@
-#include <stdio.h>
 #include "hello.h"
+#include <stdio.h>
 int Hello::Data = 0;
 void Hello::real()
 {
diff --git a/Tests/RunCMake/AutoExportDll/say.cxx b/Tests/RunCMake/AutoExportDll/say.cxx
index 655b3c21a20fffb643359e8c865902148eeec855..0d78d4be8983bd16923db5ee73f2ff300cc83c83 100644
--- a/Tests/RunCMake/AutoExportDll/say.cxx
+++ b/Tests/RunCMake/AutoExportDll/say.cxx
@@ -1,5 +1,5 @@
-#include <stdio.h>
 #include "hello.h"
+#include <stdio.h>
 #ifdef _MSC_VER
 #include "windows.h"
 #else
diff --git a/Tests/StagingPrefix/Consumer/main.cpp b/Tests/StagingPrefix/Consumer/main.cpp
index 612ee05a91c4d329e76b7509675628bcb91486ff..5c0202d25491277a5b9da9d5affc72a7bfaf348c 100644
--- a/Tests/StagingPrefix/Consumer/main.cpp
+++ b/Tests/StagingPrefix/Consumer/main.cpp
@@ -1,6 +1,6 @@
 
-#include "foo.h"
 #include "bar.h"
+#include "foo.h"
 
 int main(int, char **)
 {
diff --git a/Tests/StringFileTest/StringFile.cxx b/Tests/StringFileTest/StringFile.cxx
index 9eba6bff97058730813b575b127df969254e8f33..073e30c33f71739e93360498641be04e80565e06 100644
--- a/Tests/StringFileTest/StringFile.cxx
+++ b/Tests/StringFileTest/StringFile.cxx
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <string.h>
+
 #include "OutputFile.h"
 
 int main(int, char*[])
diff --git a/Tests/TestsWorkingDirectory/main.c b/Tests/TestsWorkingDirectory/main.c
index 19f2f14afd7eed95a60e65603239d3ebfa2bb8d1..3616f8e3423d4f396b47591b30cb97a7a217afb1 100644
--- a/Tests/TestsWorkingDirectory/main.c
+++ b/Tests/TestsWorkingDirectory/main.c
@@ -5,8 +5,8 @@
 
 #if defined(_WIN32) && (defined(_MSC_VER) || defined(__WATCOMC__) || defined(__BORLANDC__) || defined(__MINGW32__))
 
-#include <io.h>
 #include <direct.h>
+#include <io.h>
 
 #if defined(__WATCOMC__)
 #include <direct.h>
diff --git a/Tests/Tutorial/Step1/tutorial.cxx b/Tests/Tutorial/Step1/tutorial.cxx
index 8ab6dc3067e50f624758fb0cf8df94817db37917..a3584c475ae1d080c86e3136d15dc833e9e64e78 100644
--- a/Tests/Tutorial/Step1/tutorial.cxx
+++ b/Tests/Tutorial/Step1/tutorial.cxx
@@ -1,8 +1,8 @@
 // A simple program that computes the square root of a number
+#include "TutorialConfig.h"
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <math.h>
-#include "TutorialConfig.h"
 
 int main (int argc, char *argv[])
 {
diff --git a/Tests/Tutorial/Step2/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step2/MathFunctions/mysqrt.cxx
index 62523f69fb0825de8f79a0716d6e8bcc1c1d971f..0f7c10605d1560f1bdbb5e7b116180c6625eafbf 100644
--- a/Tests/Tutorial/Step2/MathFunctions/mysqrt.cxx
+++ b/Tests/Tutorial/Step2/MathFunctions/mysqrt.cxx
@@ -1,5 +1,5 @@
-#include <stdio.h>
 #include "MathFunctions.h"
+#include <stdio.h>
 
 // a hack square root calculation using simple operations
 double mysqrt(double x)
diff --git a/Tests/Tutorial/Step2/tutorial.cxx b/Tests/Tutorial/Step2/tutorial.cxx
index c27da0b8478fdeea288c7e27e8be4735c6c00c86..af88dad465893bd650bacf9c438a1b831a1b7577 100644
--- a/Tests/Tutorial/Step2/tutorial.cxx
+++ b/Tests/Tutorial/Step2/tutorial.cxx
@@ -1,8 +1,8 @@
 // A simple program that computes the square root of a number
+#include "TutorialConfig.h"
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <math.h>
-#include "TutorialConfig.h"
 
 #ifdef USE_MYMATH
 #include "MathFunctions.h"
diff --git a/Tests/Tutorial/Step3/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step3/MathFunctions/mysqrt.cxx
index 62523f69fb0825de8f79a0716d6e8bcc1c1d971f..0f7c10605d1560f1bdbb5e7b116180c6625eafbf 100644
--- a/Tests/Tutorial/Step3/MathFunctions/mysqrt.cxx
+++ b/Tests/Tutorial/Step3/MathFunctions/mysqrt.cxx
@@ -1,5 +1,5 @@
-#include <stdio.h>
 #include "MathFunctions.h"
+#include <stdio.h>
 
 // a hack square root calculation using simple operations
 double mysqrt(double x)
diff --git a/Tests/Tutorial/Step3/tutorial.cxx b/Tests/Tutorial/Step3/tutorial.cxx
index c27da0b8478fdeea288c7e27e8be4735c6c00c86..af88dad465893bd650bacf9c438a1b831a1b7577 100644
--- a/Tests/Tutorial/Step3/tutorial.cxx
+++ b/Tests/Tutorial/Step3/tutorial.cxx
@@ -1,8 +1,8 @@
 // A simple program that computes the square root of a number
+#include "TutorialConfig.h"
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <math.h>
-#include "TutorialConfig.h"
 
 #ifdef USE_MYMATH
 #include "MathFunctions.h"
diff --git a/Tests/Tutorial/Step4/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step4/MathFunctions/mysqrt.cxx
index d081d11d20a83d5e07b2f9bc3552f4a82a989fdf..bbd08fa0d3adde2b99f6fdf823e58d8c8faaea22 100644
--- a/Tests/Tutorial/Step4/MathFunctions/mysqrt.cxx
+++ b/Tests/Tutorial/Step4/MathFunctions/mysqrt.cxx
@@ -1,6 +1,6 @@
-#include <stdio.h>
 #include "MathFunctions.h"
 #include "TutorialConfig.h"
+#include <stdio.h>
 
 #include <math.h>
 
diff --git a/Tests/Tutorial/Step4/tutorial.cxx b/Tests/Tutorial/Step4/tutorial.cxx
index c27da0b8478fdeea288c7e27e8be4735c6c00c86..af88dad465893bd650bacf9c438a1b831a1b7577 100644
--- a/Tests/Tutorial/Step4/tutorial.cxx
+++ b/Tests/Tutorial/Step4/tutorial.cxx
@@ -1,8 +1,8 @@
 // A simple program that computes the square root of a number
+#include "TutorialConfig.h"
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <math.h>
-#include "TutorialConfig.h"
 
 #ifdef USE_MYMATH
 #include "MathFunctions.h"
diff --git a/Tests/Tutorial/Step5/MathFunctions/MakeTable.cxx b/Tests/Tutorial/Step5/MathFunctions/MakeTable.cxx
index ef98d5fdcb5a7befcbd2fd56128f18040241798c..a23feeb6207fa74cc138d49aea930e6e3e1bd9c9 100644
--- a/Tests/Tutorial/Step5/MathFunctions/MakeTable.cxx
+++ b/Tests/Tutorial/Step5/MathFunctions/MakeTable.cxx
@@ -1,6 +1,6 @@
 // A simple program that builds a sqrt table
-#include <stdio.h>
 #include <math.h>
+#include <stdio.h>
 
 int main (int argc, char *argv[])
 {
diff --git a/Tests/Tutorial/Step5/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step5/MathFunctions/mysqrt.cxx
index 1f9b88719119cc87e2930e82ed7434f36145cd9a..a488af6a3d52bffbd178ba418397bd21421305b6 100644
--- a/Tests/Tutorial/Step5/MathFunctions/mysqrt.cxx
+++ b/Tests/Tutorial/Step5/MathFunctions/mysqrt.cxx
@@ -1,6 +1,6 @@
-#include <stdio.h>
 #include "MathFunctions.h"
 #include "TutorialConfig.h"
+#include <stdio.h>
 
 // include the generated table
 #include "Table.h"
diff --git a/Tests/Tutorial/Step5/tutorial.cxx b/Tests/Tutorial/Step5/tutorial.cxx
index c27da0b8478fdeea288c7e27e8be4735c6c00c86..af88dad465893bd650bacf9c438a1b831a1b7577 100644
--- a/Tests/Tutorial/Step5/tutorial.cxx
+++ b/Tests/Tutorial/Step5/tutorial.cxx
@@ -1,8 +1,8 @@
 // A simple program that computes the square root of a number
+#include "TutorialConfig.h"
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <math.h>
-#include "TutorialConfig.h"
 
 #ifdef USE_MYMATH
 #include "MathFunctions.h"
diff --git a/Tests/Tutorial/Step6/MathFunctions/MakeTable.cxx b/Tests/Tutorial/Step6/MathFunctions/MakeTable.cxx
index ef98d5fdcb5a7befcbd2fd56128f18040241798c..a23feeb6207fa74cc138d49aea930e6e3e1bd9c9 100644
--- a/Tests/Tutorial/Step6/MathFunctions/MakeTable.cxx
+++ b/Tests/Tutorial/Step6/MathFunctions/MakeTable.cxx
@@ -1,6 +1,6 @@
 // A simple program that builds a sqrt table
-#include <stdio.h>
 #include <math.h>
+#include <stdio.h>
 
 int main (int argc, char *argv[])
 {
diff --git a/Tests/Tutorial/Step6/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step6/MathFunctions/mysqrt.cxx
index 1f9b88719119cc87e2930e82ed7434f36145cd9a..a488af6a3d52bffbd178ba418397bd21421305b6 100644
--- a/Tests/Tutorial/Step6/MathFunctions/mysqrt.cxx
+++ b/Tests/Tutorial/Step6/MathFunctions/mysqrt.cxx
@@ -1,6 +1,6 @@
-#include <stdio.h>
 #include "MathFunctions.h"
 #include "TutorialConfig.h"
+#include <stdio.h>
 
 // include the generated table
 #include "Table.h"
diff --git a/Tests/Tutorial/Step6/tutorial.cxx b/Tests/Tutorial/Step6/tutorial.cxx
index c27da0b8478fdeea288c7e27e8be4735c6c00c86..af88dad465893bd650bacf9c438a1b831a1b7577 100644
--- a/Tests/Tutorial/Step6/tutorial.cxx
+++ b/Tests/Tutorial/Step6/tutorial.cxx
@@ -1,8 +1,8 @@
 // A simple program that computes the square root of a number
+#include "TutorialConfig.h"
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <math.h>
-#include "TutorialConfig.h"
 
 #ifdef USE_MYMATH
 #include "MathFunctions.h"
diff --git a/Tests/Tutorial/Step7/MathFunctions/MakeTable.cxx b/Tests/Tutorial/Step7/MathFunctions/MakeTable.cxx
index ef98d5fdcb5a7befcbd2fd56128f18040241798c..a23feeb6207fa74cc138d49aea930e6e3e1bd9c9 100644
--- a/Tests/Tutorial/Step7/MathFunctions/MakeTable.cxx
+++ b/Tests/Tutorial/Step7/MathFunctions/MakeTable.cxx
@@ -1,6 +1,6 @@
 // A simple program that builds a sqrt table
-#include <stdio.h>
 #include <math.h>
+#include <stdio.h>
 
 int main (int argc, char *argv[])
 {
diff --git a/Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx
index 1f9b88719119cc87e2930e82ed7434f36145cd9a..a488af6a3d52bffbd178ba418397bd21421305b6 100644
--- a/Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx
+++ b/Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx
@@ -1,6 +1,6 @@
-#include <stdio.h>
 #include "MathFunctions.h"
 #include "TutorialConfig.h"
+#include <stdio.h>
 
 // include the generated table
 #include "Table.h"
diff --git a/Tests/Tutorial/Step7/tutorial.cxx b/Tests/Tutorial/Step7/tutorial.cxx
index c27da0b8478fdeea288c7e27e8be4735c6c00c86..af88dad465893bd650bacf9c438a1b831a1b7577 100644
--- a/Tests/Tutorial/Step7/tutorial.cxx
+++ b/Tests/Tutorial/Step7/tutorial.cxx
@@ -1,8 +1,8 @@
 // A simple program that computes the square root of a number
+#include "TutorialConfig.h"
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <math.h>
-#include "TutorialConfig.h"
 
 #ifdef USE_MYMATH
 #include "MathFunctions.h"
diff --git a/Tests/VSResource/main.cpp b/Tests/VSResource/main.cpp
index ccf700c42d06d8cb2c51eca71315a1f4fb7a478c..f8372b70b5842f0bdddef9152c94c16b828407ee 100644
--- a/Tests/VSResource/main.cpp
+++ b/Tests/VSResource/main.cpp
@@ -1,5 +1,5 @@
-#include <windows.h>
 #include <stdio.h>
+#include <windows.h>
 
 extern int lib();
 
diff --git a/Tests/VSWinStorePhone/Direct3DApp1/CubeRenderer.cpp b/Tests/VSWinStorePhone/Direct3DApp1/CubeRenderer.cpp
index f4827f2d67444857276088aa0f1a494fb915e810..7632388128ac4f532ae0d648b91e9b532cc5ec11 100644
--- a/Tests/VSWinStorePhone/Direct3DApp1/CubeRenderer.cpp
+++ b/Tests/VSWinStorePhone/Direct3DApp1/CubeRenderer.cpp
@@ -1,4 +1,5 @@
 #include "pch.h"
+
 #include "CubeRenderer.h"
 
 using namespace DirectX;
diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp
index 3dbb97f105b644a3b6318ac72088166bbf117cb0..41ca124b34a9a14b57f608208846b23941f369fb 100644
--- a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp
+++ b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp
@@ -1,6 +1,7 @@
 #include "pch.h"
-#include "Direct3DApp1.h"
+
 #include "BasicTimer.h"
+#include "Direct3DApp1.h"
 
 using namespace Windows::ApplicationModel;
 using namespace Windows::ApplicationModel::Core;
diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.h b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.h
index 40b69a1734ef5b8e80cf580a3f24b5785d32fb23..6861e44acd93eb31e451d4645a810a12f4284275 100644
--- a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.h
+++ b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "pch.h"
+
 #include "CubeRenderer.h"
 
 ref class Direct3DApp1 sealed : public Windows::ApplicationModel::Core::IFrameworkView
diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DBase.cpp b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DBase.cpp
index 46727b5ff36e70ebe3052e5b0297591e42a5bc6d..f09c8daef2c6dc2ef6e040c76cc9d7d97f9c35e4 100644
--- a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DBase.cpp
+++ b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DBase.cpp
@@ -1,4 +1,5 @@
 #include "pch.h"
+
 #include "Direct3DBase.h"
 
 using namespace DirectX;
diff --git a/Tests/VSWinStorePhone/Direct3DApp1/DirectXHelper.h b/Tests/VSWinStorePhone/Direct3DApp1/DirectXHelper.h
index d411a9b8152c7a2cc7a0467c00a354c2a454a21c..3434ba9ea86bd3cb7e7857c5799ed28871ea69b0 100644
--- a/Tests/VSWinStorePhone/Direct3DApp1/DirectXHelper.h
+++ b/Tests/VSWinStorePhone/Direct3DApp1/DirectXHelper.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <wrl/client.h>
 #include <ppl.h>
 #include <ppltasks.h>
+#include <wrl/client.h>
 
 namespace DX
 {
diff --git a/Tests/VSWinStorePhone/Direct3DApp1/pch.h b/Tests/VSWinStorePhone/Direct3DApp1/pch.h
index 2302e66ba720461ac807aaab6f30ef4922b2b0e1..78ebea34721bb9c9510e1506d938a519bec16618 100644
--- a/Tests/VSWinStorePhone/Direct3DApp1/pch.h
+++ b/Tests/VSWinStorePhone/Direct3DApp1/pch.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <wrl/client.h>
-#include <d3d11_1.h>
 #include <DirectXMath.h>
-#include <memory>
 #include <agile.h>
+#include <d3d11_1.h>
+#include <memory>
+#include <wrl/client.h>
diff --git a/Tests/VSXaml/App.xaml.cpp b/Tests/VSXaml/App.xaml.cpp
index 334dc1f9c4125842665fd747d7f9a6a276078b15..2cb2b3284d7be55637a1fe9909ba07f6d3fc7cbd 100644
--- a/Tests/VSXaml/App.xaml.cpp
+++ b/Tests/VSXaml/App.xaml.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "pch.h"
+
 #include "MainPage.xaml.h"
 
 using namespace VSXaml;
@@ -122,4 +123,4 @@ void App::OnSuspending(Object^ sender, SuspendingEventArgs^ e)
 void App::OnNavigationFailed(Platform::Object ^sender, Windows::UI::Xaml::Navigation::NavigationFailedEventArgs ^e)
 {
 	throw ref new FailureException("Failed to load Page " + e->SourcePageType.Name);
-}
\ No newline at end of file
+}
diff --git a/Tests/VSXaml/MainPage.xaml.cpp b/Tests/VSXaml/MainPage.xaml.cpp
index d0a64e8b2a9f28827a5396d30d66738bce633662..63f2decf82137904dab8b497ae21f15e301f391d 100644
--- a/Tests/VSXaml/MainPage.xaml.cpp
+++ b/Tests/VSXaml/MainPage.xaml.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "pch.h"
+
 #include "MainPage.xaml.h"
 
 using namespace VSXaml;
diff --git a/Tests/Wrapping/qtwrappingmain.cxx b/Tests/Wrapping/qtwrappingmain.cxx
index fabecfc72017b3abbb9823a918d33d9badab83f5..55c7952bacc5b0c0e08aa1a3cb6c60564d829d95 100644
--- a/Tests/Wrapping/qtwrappingmain.cxx
+++ b/Tests/Wrapping/qtwrappingmain.cxx
@@ -1,9 +1,9 @@
-#include <qapplication.h>
 #include "qtwrapping.h"
+#include <qapplication.h>
 
 #ifndef _WIN32
-# include <stdlib.h>
 # include <stdio.h>
+# include <stdlib.h>
 #endif
 
 int main(int argc, char *argv[])
diff --git a/Tests/X11/HelloWorldX11.cxx b/Tests/X11/HelloWorldX11.cxx
index f2b8bdd473b6f003e93f59d4746f00211c476947..27ab843b6a2564896dfbc4b60f4a5d4d61a9c47b 100644
--- a/Tests/X11/HelloWorldX11.cxx
+++ b/Tests/X11/HelloWorldX11.cxx
@@ -19,8 +19,8 @@
 
 /* include the X library headers */
 #include <X11/Xlib.h>
-#include <X11/Xutil.h>
 #include <X11/Xos.h>
+#include <X11/Xutil.h>
 
 class Main {
 
diff --git a/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp b/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp
index dad1ae511403c06ffb6225caed5a217c4f7b9693..d4f628cb9320fabd413e07b50c1dc6248b19b953 100644
--- a/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp
+++ b/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp
@@ -1,4 +1,5 @@
 #include <windows.h>
+
 #include <msi.h>
 #include <msiquery.h>