diff --git a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
index 446ce9639..2833d53df 100644
--- a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
+++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
@@ -17,6 +17,7 @@
 #include <cmInstalledFile.h>
 
 #include <sys/types.h>
+// include sys/stat.h after sys/types.h
 #include <sys/stat.h>
 
 cmWIXFilesSourceWriter::cmWIXFilesSourceWriter(cmCPackLog* logger,
diff --git a/Source/CPack/WiX/cmWIXPatchParser.h b/Source/CPack/WiX/cmWIXPatchParser.h
index 42c0787f8..8ce4026ba 100644
--- a/Source/CPack/WiX/cmWIXPatchParser.h
+++ b/Source/CPack/WiX/cmWIXPatchParser.h
@@ -17,8 +17,8 @@
 
 #include <cmXMLParser.h>
 
-#include <map>
 #include <list>
+#include <map>
 
 struct cmWIXPatchNode
 {
diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx
index 9e17bc836..794955f18 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -761,6 +761,7 @@ std::string cmCPackDebGenerator::GetComponentInstallDirNameSuffix(
  */
 
 #include <sys/types.h>
+// include sys/stat.h after sys/types.h
 #include <sys/stat.h>
 
 #include <stdio.h>
diff --git a/Source/CPack/cmCPackSTGZGenerator.cxx b/Source/CPack/cmCPackSTGZGenerator.cxx
index 8a83666fa..4a8754e53 100644
--- a/Source/CPack/cmCPackSTGZGenerator.cxx
+++ b/Source/CPack/cmCPackSTGZGenerator.cxx
@@ -18,8 +18,10 @@
 #include "cmSystemTools.h"
 #include "cmake.h"
 
-#include <sys/types.h>
 #include <cmsys/FStream.hxx>
+
+#include <sys/types.h>
+// include sys/stat.h after sys/types.h
 #include <sys/stat.h>
 
 //----------------------------------------------------------------------
diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx
index 3ff12c18f..19d869c37 100644
--- a/Source/CTest/cmCTestGIT.cxx
+++ b/Source/CTest/cmCTestGIT.cxx
@@ -19,8 +19,8 @@
 #include <cmsys/Process.h>
 #include <cmsys/RegularExpression.hxx>
 
-#include <sys/types.h>
 #include <ctype.h>
+#include <sys/types.h>
 #include <time.h>
 
 //----------------------------------------------------------------------------
diff --git a/Source/CTest/cmCTestP4.cxx b/Source/CTest/cmCTestP4.cxx
index f7c960c53..b801cfc16 100644
--- a/Source/CTest/cmCTestP4.cxx
+++ b/Source/CTest/cmCTestP4.cxx
@@ -17,8 +17,8 @@
 #include <cmsys/Process.h>
 #include <cmsys/RegularExpression.hxx>
 
-#include <sys/types.h>
 #include <ctype.h>
+#include <sys/types.h>
 #include <time.h>
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmCommandArgumentParserHelper.cxx b/Source/cmCommandArgumentParserHelper.cxx
index 15ab74609..0b2fd81eb 100644
--- a/Source/cmCommandArgumentParserHelper.cxx
+++ b/Source/cmCommandArgumentParserHelper.cxx
@@ -11,10 +11,10 @@
 ============================================================================*/
 #include "cmCommandArgumentParserHelper.h"
 
-#include "cmSystemTools.h"
 #include "cmMakefile.h"
-#include "cmState.h"
 #include "cmOutputConverter.h"
+#include "cmState.h"
+#include "cmSystemTools.h"
 
 #include "cmCommandArgumentLexer.h"
 
diff --git a/Source/cmDependsJavaParserHelper.cxx b/Source/cmDependsJavaParserHelper.cxx
index 3c0232574..51a1cb4c5 100644
--- a/Source/cmDependsJavaParserHelper.cxx
+++ b/Source/cmDependsJavaParserHelper.cxx
@@ -11,8 +11,8 @@
 ============================================================================*/
 #include "cmDependsJavaParserHelper.h"
 
-#include "cmSystemTools.h"
 #include "cmDependsJavaLexer.h"
+#include "cmSystemTools.h"
 #include <cmsys/FStream.hxx>
 
 int cmDependsJava_yyparse( yyscan_t yyscanner );
diff --git a/Source/cmExprParserHelper.cxx b/Source/cmExprParserHelper.cxx
index 6016c4cce..c5ecde422 100644
--- a/Source/cmExprParserHelper.cxx
+++ b/Source/cmExprParserHelper.cxx
@@ -11,8 +11,8 @@
 ============================================================================*/
 #include "cmExprParserHelper.h"
 
-#include "cmSystemTools.h"
 #include "cmMakefile.h"
+#include "cmSystemTools.h"
 
 #include "cmExprLexer.h"
 
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 035b97ff9..575051e61 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -28,8 +28,10 @@
 #endif
 
 #undef GetCurrentDirectory
-#include <sys/types.h>
 #include <assert.h>
+
+#include <sys/types.h>
+// include sys/stat.h after sys/types.h
 #include <sys/stat.h>
 
 #include <cmsys/Directory.hxx>
diff --git a/Source/cmGeneratorExpressionEvaluationFile.h b/Source/cmGeneratorExpressionEvaluationFile.h
index f34dadc66..b8c824b6b 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.h
+++ b/Source/cmGeneratorExpressionEvaluationFile.h
@@ -14,8 +14,8 @@
 
 #include "cmGeneratorExpression.h"
 
-#include <sys/types.h>
 #include <cmsys/auto_ptr.hxx>
+#include <sys/types.h>
 
 class cmLocalGenerator;
 
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 3177a84f9..68c1eb892 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -42,8 +42,8 @@
   // include wincrypt.h after windows.h
 # include <wincrypt.h>
 #else
-# include <sys/types.h>
 # include <sys/time.h>
+# include <sys/types.h>
 # include <sys/wait.h>
 # include <unistd.h>
 # include <utime.h>
diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx
index 7d1ba3231..b5c9d8e78 100644
--- a/Source/cmTimestamp.cxx
+++ b/Source/cmTimestamp.cxx
@@ -13,9 +13,10 @@
 
 #include <cstdlib>
 #include <cstring>
+#include <sstream>
 
 #include <sys/types.h>
-#include <sstream>
+// include sys/stat.h after sys/types.h
 #include <sys/stat.h>
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmWriteFileCommand.cxx b/Source/cmWriteFileCommand.cxx
index d52d6b5d6..c4468f334 100644
--- a/Source/cmWriteFileCommand.cxx
+++ b/Source/cmWriteFileCommand.cxx
@@ -14,6 +14,7 @@
 #include <cmsys/FStream.hxx>
 
 #include <sys/types.h>
+// include sys/stat.h after sys/types.h
 #include <sys/stat.h>
 
 // cmLibraryCommand
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index da6e59e36..f176cc10d 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -99,11 +99,12 @@
 #    include "cmGlobalXCodeGenerator.h"
 #    define CMAKE_USE_XCODE 1
 #  endif
-#  include <sys/types.h>
 #  include <sys/resource.h>
 #  include <sys/time.h>
 #endif
 
+#include <sys/types.h>
+// include sys/stat.h after sys/types.h
 #include <sys/stat.h> // struct stat
 
 #include <list>
diff --git a/Tests/Plugin/src/example_exe.cxx b/Tests/Plugin/src/example_exe.cxx
index 393bb680c..fd23e8f3c 100644
--- a/Tests/Plugin/src/example_exe.cxx
+++ b/Tests/Plugin/src/example_exe.cxx
@@ -1,9 +1,10 @@
+#include <kwsys/DynamicLoader.hxx>
+
 #include <example.h>
 
 #include <example_exe.h>
 
 #include <iostream>
-#include <kwsys/DynamicLoader.hxx>
 #include <string>
 
 #include <stdio.h>
diff --git a/Tests/TestsWorkingDirectory/main.c b/Tests/TestsWorkingDirectory/main.c
index 3616f8e34..d4b760c2f 100644
--- a/Tests/TestsWorkingDirectory/main.c
+++ b/Tests/TestsWorkingDirectory/main.c
@@ -38,8 +38,8 @@ static const char* Getcwd(char* buf, unsigned int len)
 }
 
 #else
-#include <sys/types.h>
 #include <fcntl.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 static const char* Getcwd(char* buf, unsigned int len)