summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
Diffstat (limited to 'Tests')
-rw-r--r--Tests/BuildDepends/Project/ninjadep.cpp3
-rw-r--r--Tests/BundleTest/BundleLib.cxx3
-rw-r--r--Tests/BundleTest/BundleTest.cxx3
-rw-r--r--Tests/BundleUtilities/framework.cpp1
-rw-r--r--Tests/BundleUtilities/module.cpp1
-rw-r--r--Tests/BundleUtilities/shared.cpp1
-rw-r--r--Tests/BundleUtilities/shared2.cpp1
-rw-r--r--Tests/CMakeCommands/target_include_directories/consumer.cpp1
-rw-r--r--Tests/CMakeCommands/target_link_libraries/cmp0022/cmp0022lib.h3
-rw-r--r--Tests/CMakeCommands/target_link_libraries/depB.cpp1
-rw-r--r--Tests/CMakeCommands/target_link_libraries/depC.h3
-rw-r--r--Tests/CMakeCommands/target_link_libraries/depD.h3
-rw-r--r--Tests/CMakeCommands/target_link_libraries/newsignature1.cpp1
-rw-r--r--Tests/CMakeCommands/target_link_libraries/targetA.cpp1
-rw-r--r--Tests/CMakeCommands/target_link_libraries/targetC.cpp3
-rw-r--r--Tests/CMakeLib/run_compile_commands.cxx3
-rw-r--r--Tests/CMakeLib/testAffinity.cxx4
-rw-r--r--Tests/CMakeLib/testArgumentParser.cxx11
-rw-r--r--Tests/CMakeLib/testEncoding.cxx3
-rw-r--r--Tests/CMakeLib/testGeneratedFileStream.cxx6
-rw-r--r--Tests/CMakeLib/testOptional.cxx6
-rw-r--r--Tests/CMakeLib/testRST.cxx9
-rw-r--r--Tests/CMakeLib/testRange.cxx4
-rw-r--r--Tests/CMakeLib/testString.cxx11
-rw-r--r--Tests/CMakeLib/testStringAlgorithms.cxx4
-rw-r--r--Tests/CMakeLib/testSystemTools.cxx3
-rw-r--r--Tests/CMakeLib/testUTF8.cxx3
-rw-r--r--Tests/CMakeLib/testUVProcessChain.cxx18
-rw-r--r--Tests/CMakeLib/testUVProcessChainHelper.cxx5
-rw-r--r--Tests/CMakeLib/testUVRAII.cxx4
-rw-r--r--Tests/CMakeLib/testUVStreambuf.cxx16
-rw-r--r--Tests/CMakeLib/testVisualStudioSlnParser.cxx4
-rw-r--r--Tests/CMakeLib/testXMLParser.cxx4
-rw-r--r--Tests/CMakeLib/testXMLSafe.cxx3
-rw-r--r--Tests/CMakeServerLib/testServerBuffering.cpp6
-rw-r--r--Tests/COnly/conly.c5
-rw-r--r--Tests/CPackComponents/mylib.cpp1
-rw-r--r--Tests/CPackComponentsDEB/mylib.cpp1
-rw-r--r--Tests/CPackComponentsForAll/mylib.cpp1
-rw-r--r--Tests/CPackWiXGenerator/mylib.cpp1
-rw-r--r--Tests/Complex/Executable/complex.cxx8
-rw-r--r--Tests/Complex/Library/testConly.c1
-rw-r--r--Tests/ComplexOneConfig/Executable/complex.cxx8
-rw-r--r--Tests/ComplexOneConfig/Library/testConly.c1
-rw-r--r--Tests/Cuda/Complex/dynamic.cu3
-rw-r--r--Tests/Cuda/ObjectLibrary/Conflicts/static.cu3
-rw-r--r--Tests/Cuda/ObjectLibrary/static.cu3
-rw-r--r--Tests/Cuda/ProperDeviceLibraries/main.cu3
-rw-r--r--Tests/Cuda/WithC/cuda.cu4
-rw-r--r--Tests/CudaOnly/GPUDebugFlag/main.cu3
-rw-r--r--Tests/CudaOnly/WithDefs/main.notcu4
-rw-r--r--Tests/ExportImport/Export/testSharedLibDepends.h3
-rw-r--r--Tests/ExportImport/Export/testSharedLibRequiredUser2.h3
-rw-r--r--Tests/ExportImport/Import/A/deps_iface.c9
-rw-r--r--Tests/ExternalProjectLocal/Step5/MathFunctions/mysqrt.cxx7
-rw-r--r--Tests/ExternalProjectLocal/Step5/tutorial.cxx3
-rw-r--r--Tests/FindGIF/Test/main.c3
-rw-r--r--Tests/FindGSL/rng/main.cc3
-rw-r--r--Tests/FindGTK2/cairomm/main.cpp8
-rw-r--r--Tests/FindGTK2/gtkmm/helloworld.cpp1
-rw-r--r--Tests/FindGTK2/gtkmm/main.cpp3
-rw-r--r--Tests/FindGTK2/sigc++/main.cpp1
-rw-r--r--Tests/FindGnuTLS/Test/main.c3
-rw-r--r--Tests/FindICU/Test/main.cpp7
-rw-r--r--Tests/FindProtobuf/Test/main-desc.cxx7
-rw-r--r--Tests/FindPython/NumPy/arraytest.c4
-rw-r--r--Tests/FindSQLite3/Test/main.c3
-rw-r--r--Tests/GoogleTest/Test/main1.cxx4
-rw-r--r--Tests/IncludeDirectories/SystemIncludeDirectories/consumer.cpp3
-rw-r--r--Tests/InterfaceLibrary/libsdir/sharedlib/sharedlib.h3
-rw-r--r--Tests/JavaJavah/B.cpp4
-rw-r--r--Tests/JavaJavah/C.cpp4
-rw-r--r--Tests/JavaNativeHeaders/D.cpp4
-rw-r--r--Tests/JavaNativeHeaders/E.cpp4
-rw-r--r--Tests/LoadCommand/CMakeCommands/cmTestCommand.c3
-rw-r--r--Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c3
-rw-r--r--Tests/MFC/mfc1/stdafx.h7
-rw-r--r--Tests/MacRuntimePath/A/framework.cpp1
-rw-r--r--Tests/MacRuntimePath/A/framework2.cpp1
-rw-r--r--Tests/MacRuntimePath/A/shared.cpp1
-rw-r--r--Tests/NewlineArgs/cxxonly.cxx4
-rw-r--r--Tests/Plugin/src/example_exe.cxx10
-rw-r--r--Tests/Plugin/src/example_mod_1.c1
-rw-r--r--Tests/Qt4Targets/main.cpp3
-rw-r--r--Tests/QtAutogen/AutogenOriginDependsOff/a_qt.cpp1
-rw-r--r--Tests/QtAutogen/AutogenOriginDependsOff/a_qt.hpp6
-rw-r--r--Tests/QtAutogen/AutogenOriginDependsOff/b_qt.cpp1
-rw-r--r--Tests/QtAutogen/AutogenOriginDependsOff/b_qt.hpp6
-rw-r--r--Tests/QtAutogen/AutogenOriginDependsOff/main.cpp3
-rw-r--r--Tests/QtAutogen/AutogenOriginDependsOn/testGenLib.hpp3
-rw-r--r--Tests/QtAutogen/Complex/Adir/libA.h4
-rw-r--r--Tests/QtAutogen/Complex/Bdir/libB.h4
-rw-r--r--Tests/QtAutogen/Complex/abc.cpp3
-rw-r--r--Tests/QtAutogen/Complex/abc_p.h4
-rw-r--r--Tests/QtAutogen/Complex/calwidget.cpp4
-rw-r--r--Tests/QtAutogen/Complex/codeeditor.cpp4
-rw-r--r--Tests/QtAutogen/Complex/debug_class.cpp1
-rw-r--r--Tests/QtAutogen/Complex/libC.h4
-rw-r--r--Tests/QtAutogen/Complex/main.cpp3
-rw-r--r--Tests/QtAutogen/Complex/second_widget.cpp1
-rw-r--r--Tests/QtAutogen/Complex/yaf.cpp3
-rw-r--r--Tests/QtAutogen/Complex/yaf_p.h4
-rw-r--r--Tests/QtAutogen/LowMinimumVersion/item.cpp1
-rw-r--r--Tests/QtAutogen/MacOsFW/test/testMacosFWLib.cpp3
-rw-r--r--Tests/QtAutogen/MocCMP0071/Obj.cpp1
-rw-r--r--Tests/QtAutogen/MocInclude/Common/InIncludes.in/SubOwnDot.cpp1
-rw-r--r--Tests/QtAutogen/MocInclude/Common/MixedSkipped.cpp1
-rw-r--r--Tests/QtAutogen/MocInclude/Common/None.cpp1
-rw-r--r--Tests/QtAutogen/MocInclude/Common/OtherUnderscore.cpp1
-rw-r--r--Tests/QtAutogen/MocInclude/Common/OtherUnderscoreExtra.cpp1
-rw-r--r--Tests/QtAutogen/MocInclude/Common/OtherUnderscoreSub.cpp1
-rw-r--r--Tests/QtAutogen/MocInclude/Common/OtherUnderscoreSubDir/SubExtra.cpp1
-rw-r--r--Tests/QtAutogen/MocInclude/Common/OwnDot.cpp1
-rw-r--r--Tests/QtAutogen/MocInclude/Common/OwnDotUnderscore.cpp1
-rw-r--r--Tests/QtAutogen/MocInclude/Common/OwnUnderscore.cpp1
-rw-r--r--Tests/QtAutogen/MocInclude/Relaxed/RObjB.cpp1
-rw-r--r--Tests/QtAutogen/MocInclude/Relaxed/RObjC.cpp1
-rw-r--r--Tests/QtAutogen/MocOnly/main.cpp3
-rw-r--r--Tests/QtAutogen/MocOsMacros/TestClass.cpp1
-rw-r--r--Tests/QtAutogen/MocOsMacros/main.cpp3
-rw-r--r--Tests/QtAutogen/ObjectLibrary/a/classa.cpp1
-rw-r--r--Tests/QtAutogen/ObjectLibrary/b/classb.cpp1
-rw-r--r--Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleA.hpp3
-rw-r--r--Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleB.hpp3
-rw-r--r--Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleC.hpp3
-rw-r--r--Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleD.hpp3
-rw-r--r--Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleEInclude.hpp3
-rw-r--r--Tests/QtAutogen/StaticLibraryCycle/a.cpp1
-rw-r--r--Tests/QtAutogen/StaticLibraryCycle/b.cpp1
-rw-r--r--Tests/QtAutogen/StaticLibraryCycle/c.cpp1
-rw-r--r--Tests/QtAutogen/UicInterface/libwidget.h3
-rw-r--r--Tests/QtAutogen/UicInterface/mywidget.h3
-rw-r--r--Tests/QtAutogen/UicSkipSource/skipUicGen.cpp1
-rw-r--r--Tests/QtAutogen/UicSkipSource/skipUicNoGen1.cpp1
-rw-r--r--Tests/QtAutogen/UicSkipSource/skipUicNoGen2.cpp1
-rw-r--r--Tests/RunCMake/AutoExportDll/hello.cxx1
-rw-r--r--Tests/RunCMake/AutoExportDll/say.cxx3
-rw-r--r--Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp10
-rw-r--r--Tests/RunCMake/PrecompileHeaders/foo.c1
-rw-r--r--Tests/SystemInformation/DumpInformation.cxx2
-rw-r--r--Tests/TestsWorkingDirectory/main.c3
-rw-r--r--Tests/VSExternalInclude/Lib2/lib2.cpp1
-rw-r--r--Tests/VSMidl/src/main.cpp3
-rw-r--r--Tests/VSNsightTegra/jni/second.c3
-rw-r--r--Tests/VSResource/main.cpp3
-rw-r--r--Tests/VSWinStorePhone/CxxDLL/cxxdll.cpp1
-rw-r--r--Tests/VSWinStorePhone/Direct3DApp1/pch.h3
-rw-r--r--Tests/VSXaml/App.xaml.cpp3
-rw-r--r--Tests/VSXaml/MainPage.xaml.cpp4
-rw-r--r--Tests/X11/HelloWorldX11.cxx1
150 files changed, 279 insertions, 209 deletions
diff --git a/Tests/BuildDepends/Project/ninjadep.cpp b/Tests/BuildDepends/Project/ninjadep.cpp
index e794448..d3447e2 100644
--- a/Tests/BuildDepends/Project/ninjadep.cpp
+++ b/Tests/BuildDepends/Project/ninjadep.cpp
@@ -1,6 +1,7 @@
-#include "dir/header.h"
#include <stdio.h>
+#include "dir/header.h"
+
int main()
{
printf("HEADER_STRING: %s\n", HEADER_STRING);
diff --git a/Tests/BundleTest/BundleLib.cxx b/Tests/BundleTest/BundleLib.cxx
index 2e4325c..b7fd70d 100644
--- a/Tests/BundleTest/BundleLib.cxx
+++ b/Tests/BundleTest/BundleLib.cxx
@@ -1,10 +1,9 @@
+#include <CoreFoundation/CoreFoundation.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <CoreFoundation/CoreFoundation.h>
-
int fileExists(char* filename)
{
#ifndef R_OK
diff --git a/Tests/BundleTest/BundleTest.cxx b/Tests/BundleTest/BundleTest.cxx
index a5e8f59..9b70e52 100644
--- a/Tests/BundleTest/BundleTest.cxx
+++ b/Tests/BundleTest/BundleTest.cxx
@@ -1,6 +1,5 @@
-#include <stdio.h>
-
#include <CoreFoundation/CoreFoundation.h>
+#include <stdio.h>
extern int foo(char* exec);
diff --git a/Tests/BundleUtilities/framework.cpp b/Tests/BundleUtilities/framework.cpp
index abda195..b5a95d8 100644
--- a/Tests/BundleUtilities/framework.cpp
+++ b/Tests/BundleUtilities/framework.cpp
@@ -1,5 +1,6 @@
#include "framework.h"
+
#include "stdio.h"
void framework()
diff --git a/Tests/BundleUtilities/module.cpp b/Tests/BundleUtilities/module.cpp
index 51730d9..64bc369 100644
--- a/Tests/BundleUtilities/module.cpp
+++ b/Tests/BundleUtilities/module.cpp
@@ -1,5 +1,6 @@
#include "module.h"
+
#include "shared2.h"
#include "stdio.h"
diff --git a/Tests/BundleUtilities/shared.cpp b/Tests/BundleUtilities/shared.cpp
index e5e7dc5..13791c2 100644
--- a/Tests/BundleUtilities/shared.cpp
+++ b/Tests/BundleUtilities/shared.cpp
@@ -1,5 +1,6 @@
#include "shared.h"
+
#include "stdio.h"
void shared()
diff --git a/Tests/BundleUtilities/shared2.cpp b/Tests/BundleUtilities/shared2.cpp
index 84af5d0..bed1904 100644
--- a/Tests/BundleUtilities/shared2.cpp
+++ b/Tests/BundleUtilities/shared2.cpp
@@ -1,5 +1,6 @@
#include "shared2.h"
+
#include "stdio.h"
void shared2()
diff --git a/Tests/CMakeCommands/target_include_directories/consumer.cpp b/Tests/CMakeCommands/target_include_directories/consumer.cpp
index 267b0a3..d349650 100644
--- a/Tests/CMakeCommands/target_include_directories/consumer.cpp
+++ b/Tests/CMakeCommands/target_include_directories/consumer.cpp
@@ -1,5 +1,6 @@
#include "consumer.h"
+
#include "common.h"
#include "cxx_only.h"
#include "interfaceinclude.h"
diff --git a/Tests/CMakeCommands/target_link_libraries/cmp0022/cmp0022lib.h b/Tests/CMakeCommands/target_link_libraries/cmp0022/cmp0022lib.h
index 3235b9b..e939013 100644
--- a/Tests/CMakeCommands/target_link_libraries/cmp0022/cmp0022lib.h
+++ b/Tests/CMakeCommands/target_link_libraries/cmp0022/cmp0022lib.h
@@ -1,6 +1,5 @@
-#include "cmp0022lib_export.h"
-
#include "cmp0022ifacelib.h"
+#include "cmp0022lib_export.h"
CMP0022Iface CMP0022LIB_EXPORT cmp0022();
diff --git a/Tests/CMakeCommands/target_link_libraries/depB.cpp b/Tests/CMakeCommands/target_link_libraries/depB.cpp
index 4f46552..276a91a 100644
--- a/Tests/CMakeCommands/target_link_libraries/depB.cpp
+++ b/Tests/CMakeCommands/target_link_libraries/depB.cpp
@@ -2,7 +2,6 @@
#include "depB.h"
#include "depA.h"
-
#include "libgenex.h"
int DepB::foo()
diff --git a/Tests/CMakeCommands/target_link_libraries/depC.h b/Tests/CMakeCommands/target_link_libraries/depC.h
index 01c9e06..af7bfa3 100644
--- a/Tests/CMakeCommands/target_link_libraries/depC.h
+++ b/Tests/CMakeCommands/target_link_libraries/depC.h
@@ -1,7 +1,6 @@
-#include "depc_export.h"
-
#include "depA.h"
+#include "depc_export.h"
struct DEPC_EXPORT DepC
{
diff --git a/Tests/CMakeCommands/target_link_libraries/depD.h b/Tests/CMakeCommands/target_link_libraries/depD.h
index d24ff5f..e3700c3 100644
--- a/Tests/CMakeCommands/target_link_libraries/depD.h
+++ b/Tests/CMakeCommands/target_link_libraries/depD.h
@@ -1,7 +1,6 @@
-#include "depd_export.h"
-
#include "depA.h"
+#include "depd_export.h"
struct DEPD_EXPORT DepD
{
diff --git a/Tests/CMakeCommands/target_link_libraries/newsignature1.cpp b/Tests/CMakeCommands/target_link_libraries/newsignature1.cpp
index 1caa516..b23b7a0 100644
--- a/Tests/CMakeCommands/target_link_libraries/newsignature1.cpp
+++ b/Tests/CMakeCommands/target_link_libraries/newsignature1.cpp
@@ -2,7 +2,6 @@
#include "depB.h"
#include "depC.h"
#include "depIfaceOnly.h"
-
#include "subdirlib.h"
int main(int, char**)
diff --git a/Tests/CMakeCommands/target_link_libraries/targetA.cpp b/Tests/CMakeCommands/target_link_libraries/targetA.cpp
index 1caa516..b23b7a0 100644
--- a/Tests/CMakeCommands/target_link_libraries/targetA.cpp
+++ b/Tests/CMakeCommands/target_link_libraries/targetA.cpp
@@ -2,7 +2,6 @@
#include "depB.h"
#include "depC.h"
#include "depIfaceOnly.h"
-
#include "subdirlib.h"
int main(int, char**)
diff --git a/Tests/CMakeCommands/target_link_libraries/targetC.cpp b/Tests/CMakeCommands/target_link_libraries/targetC.cpp
index cae02b9..11efb3d 100644
--- a/Tests/CMakeCommands/target_link_libraries/targetC.cpp
+++ b/Tests/CMakeCommands/target_link_libraries/targetC.cpp
@@ -1,7 +1,6 @@
-#include "depG.h"
-
#include "bar.h"
+#include "depG.h"
#include "foo.h"
#ifndef TEST_DEF
diff --git a/Tests/CMakeLib/run_compile_commands.cxx b/Tests/CMakeLib/run_compile_commands.cxx
index 4a79c80..2c77acc 100644
--- a/Tests/CMakeLib/run_compile_commands.cxx
+++ b/Tests/CMakeLib/run_compile_commands.cxx
@@ -1,6 +1,5 @@
#include "cmConfigure.h" // IWYU pragma: keep
-#include "cmsys/FStream.hxx"
#include <cstdlib>
#include <iostream>
#include <map>
@@ -8,6 +7,8 @@
#include <utility>
#include <vector>
+#include "cmsys/FStream.hxx"
+
#include "cmSystemTools.h"
class CompileCommandParser
diff --git a/Tests/CMakeLib/testAffinity.cxx b/Tests/CMakeLib/testAffinity.cxx
index 4b82280..6c68570 100644
--- a/Tests/CMakeLib/testAffinity.cxx
+++ b/Tests/CMakeLib/testAffinity.cxx
@@ -1,11 +1,11 @@
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
-#include "cmAffinity.h"
-
#include <cstddef>
#include <iostream>
#include <set>
+#include "cmAffinity.h"
+
int main()
{
std::set<size_t> cpus = cmAffinity::GetProcessorsAvailable();
diff --git a/Tests/CMakeLib/testArgumentParser.cxx b/Tests/CMakeLib/testArgumentParser.cxx
index 909f71b..20f98c2 100644
--- a/Tests/CMakeLib/testArgumentParser.cxx
+++ b/Tests/CMakeLib/testArgumentParser.cxx
@@ -1,16 +1,17 @@
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
-#include "cmArgumentParser.h"
-
-#include "cm_static_string_view.hxx"
-#include <cm/string_view>
-
#include <initializer_list>
#include <iostream>
#include <string>
#include <vector>
+#include <cm/string_view>
+
+#include "cm_static_string_view.hxx"
+
+#include "cmArgumentParser.h"
+
namespace {
struct Result
diff --git a/Tests/CMakeLib/testEncoding.cxx b/Tests/CMakeLib/testEncoding.cxx
index d608e86..4936898 100644
--- a/Tests/CMakeLib/testEncoding.cxx
+++ b/Tests/CMakeLib/testEncoding.cxx
@@ -1,7 +1,8 @@
-#include "cmsys/FStream.hxx"
#include <iostream>
#include <string>
+#include "cmsys/FStream.hxx"
+
#ifdef _WIN32
# include "cmsys/ConsoleBuf.hxx"
#endif
diff --git a/Tests/CMakeLib/testGeneratedFileStream.cxx b/Tests/CMakeLib/testGeneratedFileStream.cxx
index 1d2ec32..de44a0b 100644
--- a/Tests/CMakeLib/testGeneratedFileStream.cxx
+++ b/Tests/CMakeLib/testGeneratedFileStream.cxx
@@ -1,11 +1,11 @@
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
-#include "cmGeneratedFileStream.h"
-#include "cmSystemTools.h"
-
#include <iostream>
#include <string>
+#include "cmGeneratedFileStream.h"
+#include "cmSystemTools.h"
+
#define cmFailed(m1, m2) \
std::cout << "FAILED: " << (m1) << (m2) << "\n"; \
failed = 1
diff --git a/Tests/CMakeLib/testOptional.cxx b/Tests/CMakeLib/testOptional.cxx
index cefe9fa..3050332 100644
--- a/Tests/CMakeLib/testOptional.cxx
+++ b/Tests/CMakeLib/testOptional.cxx
@@ -1,10 +1,10 @@
-#include <cm/optional>
-#include <cm/utility>
-
#include <iostream>
#include <type_traits>
#include <vector>
+#include <cm/optional>
+#include <cm/utility>
+
class EventLogger;
class Event
diff --git a/Tests/CMakeLib/testRST.cxx b/Tests/CMakeLib/testRST.cxx
index 8891276..28d80a5 100644
--- a/Tests/CMakeLib/testRST.cxx
+++ b/Tests/CMakeLib/testRST.cxx
@@ -1,12 +1,13 @@
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
-#include "cmRST.h"
-#include "cmSystemTools.h"
-
-#include "cmsys/FStream.hxx"
#include <iostream>
#include <string>
+#include "cmsys/FStream.hxx"
+
+#include "cmRST.h"
+#include "cmSystemTools.h"
+
void reportLine(std::ostream& os, bool ret, std::string const& line, bool eol)
{
if (ret) {
diff --git a/Tests/CMakeLib/testRange.cxx b/Tests/CMakeLib/testRange.cxx
index b26b07b..4efe98e 100644
--- a/Tests/CMakeLib/testRange.cxx
+++ b/Tests/CMakeLib/testRange.cxx
@@ -1,12 +1,12 @@
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
-#include "cmRange.h"
-
#include <iostream>
#include <string>
#include <vector>
+#include "cmRange.h"
+
#define ASSERT_TRUE(x) \
do { \
if (!(x)) { \
diff --git a/Tests/CMakeLib/testString.cxx b/Tests/CMakeLib/testString.cxx
index 3b47a9c..d7b3200 100644
--- a/Tests/CMakeLib/testString.cxx
+++ b/Tests/CMakeLib/testString.cxx
@@ -1,11 +1,6 @@
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
-#include "cmString.hxx"
-
-#include "cm_static_string_view.hxx"
-#include <cm/string_view>
-
#include <cstddef>
#include <cstring>
#include <iostream>
@@ -16,6 +11,12 @@
#include <type_traits>
#include <utility>
+#include <cm/string_view>
+
+#include "cm_static_string_view.hxx"
+
+#include "cmString.hxx"
+
#define ASSERT_TRUE(x) \
do { \
if (!(x)) { \
diff --git a/Tests/CMakeLib/testStringAlgorithms.cxx b/Tests/CMakeLib/testStringAlgorithms.cxx
index 4e48f6e..63826cf 100644
--- a/Tests/CMakeLib/testStringAlgorithms.cxx
+++ b/Tests/CMakeLib/testStringAlgorithms.cxx
@@ -3,13 +3,13 @@
#include <cmConfigure.h> // IWYU pragma: keep
-#include <cm/string_view>
-
#include <iostream>
#include <sstream>
#include <string>
#include <vector>
+#include <cm/string_view>
+
#include "cmStringAlgorithms.h"
int testStringAlgorithms(int /*unused*/, char* /*unused*/ [])
diff --git a/Tests/CMakeLib/testSystemTools.cxx b/Tests/CMakeLib/testSystemTools.cxx
index 0a757df..92f5275 100644
--- a/Tests/CMakeLib/testSystemTools.cxx
+++ b/Tests/CMakeLib/testSystemTools.cxx
@@ -4,10 +4,11 @@
#include <cmConfigure.h> // IWYU pragma: keep
#include <iostream>
-#include <stddef.h>
#include <string>
#include <vector>
+#include <stddef.h>
+
#include "cmSystemTools.h"
#define cmPassed(m) std::cout << "Passed: " << (m) << "\n"
diff --git a/Tests/CMakeLib/testUTF8.cxx b/Tests/CMakeLib/testUTF8.cxx
index a0bb5cd..986f595 100644
--- a/Tests/CMakeLib/testUTF8.cxx
+++ b/Tests/CMakeLib/testUTF8.cxx
@@ -1,8 +1,9 @@
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
-#include <cm_utf8.h>
#include <stdio.h>
+#include <cm_utf8.h>
+
typedef char test_utf8_char[5];
static void test_utf8_char_print(test_utf8_char const c)
diff --git a/Tests/CMakeLib/testUVProcessChain.cxx b/Tests/CMakeLib/testUVProcessChain.cxx
index 8cee49d..71a1764 100644
--- a/Tests/CMakeLib/testUVProcessChain.cxx
+++ b/Tests/CMakeLib/testUVProcessChain.cxx
@@ -1,22 +1,20 @@
-#include "cmUVProcessChain.h"
-
-#include "cmGetPipes.h"
-#include "cmUVHandlePtr.h"
-#include "cmUVStreambuf.h"
-
-#include "cm_uv.h"
-
#include <algorithm>
+#include <csignal>
#include <functional>
#include <iostream>
#include <sstream>
#include <string>
#include <vector>
-#include <csignal>
-
#include <cm/memory>
+#include "cm_uv.h"
+
+#include "cmGetPipes.h"
+#include "cmUVHandlePtr.h"
+#include "cmUVProcessChain.h"
+#include "cmUVStreambuf.h"
+
struct ExpectedStatus
{
bool Finished;
diff --git a/Tests/CMakeLib/testUVProcessChainHelper.cxx b/Tests/CMakeLib/testUVProcessChainHelper.cxx
index a77ec90..9c25834 100644
--- a/Tests/CMakeLib/testUVProcessChainHelper.cxx
+++ b/Tests/CMakeLib/testUVProcessChainHelper.cxx
@@ -1,13 +1,12 @@
+#include <cctype>
#include <chrono>
+#include <cstdlib>
#include <iostream>
#include <set>
#include <sstream>
#include <string>
#include <thread>
-#include <cctype>
-#include <cstdlib>
-
std::string getStdin()
{
char buffer[1024];
diff --git a/Tests/CMakeLib/testUVRAII.cxx b/Tests/CMakeLib/testUVRAII.cxx
index 2aeaf2c..cb05ace 100644
--- a/Tests/CMakeLib/testUVRAII.cxx
+++ b/Tests/CMakeLib/testUVRAII.cxx
@@ -1,5 +1,3 @@
-#include "cmUVHandlePtr.h"
-
#include <chrono>
#include <iostream>
#include <thread>
@@ -7,6 +5,8 @@
#include "cm_uv.h"
+#include "cmUVHandlePtr.h"
+
static void signal_reset_fn(uv_async_t* handle)
{
auto ptr = static_cast<cm::uv_async_ptr*>(handle->data);
diff --git a/Tests/CMakeLib/testUVStreambuf.cxx b/Tests/CMakeLib/testUVStreambuf.cxx
index 39655f3..cd9c9d4 100644
--- a/Tests/CMakeLib/testUVStreambuf.cxx
+++ b/Tests/CMakeLib/testUVStreambuf.cxx
@@ -1,18 +1,16 @@
-#include "cmUVStreambuf.h"
-
-#include "cmGetPipes.h"
-#include "cmUVHandlePtr.h"
-
-#include "cm_uv.h"
-
+#include <cstring>
#include <iostream>
#include <string>
#include <vector>
-#include <cstring>
-
#include <stdint.h>
+#include "cm_uv.h"
+
+#include "cmGetPipes.h"
+#include "cmUVHandlePtr.h"
+#include "cmUVStreambuf.h"
+
#define TEST_STR_LINE_1 "This string must be exactly 128 characters long so"
#define TEST_STR_LINE_2 "that we can test CMake's std::streambuf integration"
#define TEST_STR_LINE_3 "with libuv's uv_stream_t."
diff --git a/Tests/CMakeLib/testVisualStudioSlnParser.cxx b/Tests/CMakeLib/testVisualStudioSlnParser.cxx
index c7fd585..3c06960 100644
--- a/Tests/CMakeLib/testVisualStudioSlnParser.cxx
+++ b/Tests/CMakeLib/testVisualStudioSlnParser.cxx
@@ -1,10 +1,10 @@
#include "testVisualStudioSlnParser.h"
+#include <iostream>
+
#include "cmVisualStudioSlnData.h"
#include "cmVisualStudioSlnParser.h"
-#include <iostream>
-
static bool parsedRight(cmVisualStudioSlnParser& parser,
const std::string& file, cmSlnData& data,
cmVisualStudioSlnParser::ParseResult expected =
diff --git a/Tests/CMakeLib/testXMLParser.cxx b/Tests/CMakeLib/testXMLParser.cxx
index d5e9764..8617cc1 100644
--- a/Tests/CMakeLib/testXMLParser.cxx
+++ b/Tests/CMakeLib/testXMLParser.cxx
@@ -1,9 +1,9 @@
#include "testXMLParser.h"
-#include "cmXMLParser.h"
-
#include <iostream>
+#include "cmXMLParser.h"
+
int testXMLParser(int /*unused*/, char* /*unused*/ [])
{
// TODO: Derive from parser and check attributes.
diff --git a/Tests/CMakeLib/testXMLSafe.cxx b/Tests/CMakeLib/testXMLSafe.cxx
index 21bb952..dc62eb9 100644
--- a/Tests/CMakeLib/testXMLSafe.cxx
+++ b/Tests/CMakeLib/testXMLSafe.cxx
@@ -4,9 +4,10 @@
#include "cmConfigure.h" // IWYU pragma: keep
#include <sstream>
-#include <stdio.h>
#include <string>
+#include <stdio.h>
+
#include "cmXMLSafe.h"
struct test_pair
diff --git a/Tests/CMakeServerLib/testServerBuffering.cpp b/Tests/CMakeServerLib/testServerBuffering.cpp
index 8b0b89b..6f22940 100644
--- a/Tests/CMakeServerLib/testServerBuffering.cpp
+++ b/Tests/CMakeServerLib/testServerBuffering.cpp
@@ -1,11 +1,11 @@
-#include "cmConnection.h"
-#include "cmServerConnection.h"
-
#include <iostream>
#include <memory>
#include <string>
#include <vector>
+#include "cmConnection.h"
+#include "cmServerConnection.h"
+
void print_error(const std::vector<std::string>& input,
const std::vector<std::string>& output)
{
diff --git a/Tests/COnly/conly.c b/Tests/COnly/conly.c
index 7bd8e8e..2ae8a1a 100644
--- a/Tests/COnly/conly.c
+++ b/Tests/COnly/conly.c
@@ -1,10 +1,9 @@
-#include "foo.h"
+#include <stdio.h>
+#include "foo.h"
#include "libc1.h"
#include "libc2.h"
-#include <stdio.h>
-
int main()
{
int class = 0;
diff --git a/Tests/CPackComponents/mylib.cpp b/Tests/CPackComponents/mylib.cpp
index 8ddac19..8d63071 100644
--- a/Tests/CPackComponents/mylib.cpp
+++ b/Tests/CPackComponents/mylib.cpp
@@ -1,4 +1,5 @@
#include "mylib.h"
+
#include "stdio.h"
void mylib_function()
diff --git a/Tests/CPackComponentsDEB/mylib.cpp b/Tests/CPackComponentsDEB/mylib.cpp
index 8ddac19..8d63071 100644
--- a/Tests/CPackComponentsDEB/mylib.cpp
+++ b/Tests/CPackComponentsDEB/mylib.cpp
@@ -1,4 +1,5 @@
#include "mylib.h"
+
#include "stdio.h"
void mylib_function()
diff --git a/Tests/CPackComponentsForAll/mylib.cpp b/Tests/CPackComponentsForAll/mylib.cpp
index 8ddac19..8d63071 100644
--- a/Tests/CPackComponentsForAll/mylib.cpp
+++ b/Tests/CPackComponentsForAll/mylib.cpp
@@ -1,4 +1,5 @@
#include "mylib.h"
+
#include "stdio.h"
void mylib_function()
diff --git a/Tests/CPackWiXGenerator/mylib.cpp b/Tests/CPackWiXGenerator/mylib.cpp
index 8ddac19..8d63071 100644
--- a/Tests/CPackWiXGenerator/mylib.cpp
+++ b/Tests/CPackWiXGenerator/mylib.cpp
@@ -1,4 +1,5 @@
#include "mylib.h"
+
#include "stdio.h"
void mylib_function()
diff --git a/Tests/Complex/Executable/complex.cxx b/Tests/Complex/Executable/complex.cxx
index 9ddf005..49e97d5 100644
--- a/Tests/Complex/Executable/complex.cxx
+++ b/Tests/Complex/Executable/complex.cxx
@@ -1,20 +1,22 @@
-#include "Aout.h"
-#include "ExtraSources/file1.h"
#include "cmTestConfigure.h"
#include "cmTestConfigureEscape.h"
#include "cmTestGeneratedHeader.h"
#include "cmVersion.h"
+
+#include "Aout.h"
+#include "ExtraSources/file1.h"
#include "file2.h"
#include "sharedFile.h"
extern "C" {
#include "testConly.h"
}
#include <iostream>
-#include <string.h>
#include <string>
#include <vector>
#include <stdio.h>
+#include <string.h>
+
#include <sys/stat.h>
#if !defined(S_ISDIR)
# define S_ISDIR(mode) ((mode)&_S_IFDIR)
diff --git a/Tests/Complex/Library/testConly.c b/Tests/Complex/Library/testConly.c
index a7d20b0..eb933a2 100644
--- a/Tests/Complex/Library/testConly.c
+++ b/Tests/Complex/Library/testConly.c
@@ -1,4 +1,5 @@
#include "testConly.h"
+
#include <stdio.h>
int CsharedFunction()
diff --git a/Tests/ComplexOneConfig/Executable/complex.cxx b/Tests/ComplexOneConfig/Executable/complex.cxx
index 5b50899..54c18f4 100644
--- a/Tests/ComplexOneConfig/Executable/complex.cxx
+++ b/Tests/ComplexOneConfig/Executable/complex.cxx
@@ -1,20 +1,22 @@
-#include "Aout.h"
-#include "ExtraSources/file1.h"
#include "cmTestConfigure.h"
#include "cmTestConfigureEscape.h"
#include "cmTestGeneratedHeader.h"
#include "cmVersion.h"
+
+#include "Aout.h"
+#include "ExtraSources/file1.h"
#include "file2.h"
#include "sharedFile.h"
extern "C" {
#include "testConly.h"
}
#include <iostream>
-#include <string.h>
#include <string>
#include <vector>
#include <stdio.h>
+#include <string.h>
+
#include <sys/stat.h>
#if !defined(S_ISDIR)
# define S_ISDIR(mode) ((mode)&_S_IFDIR)
diff --git a/Tests/ComplexOneConfig/Library/testConly.c b/Tests/ComplexOneConfig/Library/testConly.c
index a7d20b0..eb933a2 100644
--- a/Tests/ComplexOneConfig/Library/testConly.c
+++ b/Tests/ComplexOneConfig/Library/testConly.c
@@ -1,4 +1,5 @@
#include "testConly.h"
+
#include <stdio.h>
int CsharedFunction()
diff --git a/Tests/Cuda/Complex/dynamic.cu b/Tests/Cuda/Complex/dynamic.cu
index c3d8aff..9da8853 100644
--- a/Tests/Cuda/Complex/dynamic.cu
+++ b/Tests/Cuda/Complex/dynamic.cu
@@ -1,8 +1,9 @@
-#include <cuda.h>
#include <iostream>
#include <string>
+#include <cuda.h>
+
#ifdef _WIN32
# define EXPORT __declspec(dllexport)
#else
diff --git a/Tests/Cuda/ObjectLibrary/Conflicts/static.cu b/Tests/Cuda/ObjectLibrary/Conflicts/static.cu
index 586e8c6..30aa121 100644
--- a/Tests/Cuda/ObjectLibrary/Conflicts/static.cu
+++ b/Tests/Cuda/ObjectLibrary/Conflicts/static.cu
@@ -1,7 +1,8 @@
+#include <iostream>
+
#include <cuda.h>
#include <cuda_runtime.h>
-#include <iostream>
int __host__ cu2_sq_func(int x)
{
diff --git a/Tests/Cuda/ObjectLibrary/static.cu b/Tests/Cuda/ObjectLibrary/static.cu
index 37bb839..530a114 100644
--- a/Tests/Cuda/ObjectLibrary/static.cu
+++ b/Tests/Cuda/ObjectLibrary/static.cu
@@ -1,7 +1,8 @@
+#include <iostream>
+
#include <cuda.h>
#include <cuda_runtime.h>
-#include <iostream>
int __host__ cu1_sq_func(int x)
{
diff --git a/Tests/Cuda/ProperDeviceLibraries/main.cu b/Tests/Cuda/ProperDeviceLibraries/main.cu
index 8ceb0cc..397804c 100644
--- a/Tests/Cuda/ProperDeviceLibraries/main.cu
+++ b/Tests/Cuda/ProperDeviceLibraries/main.cu
@@ -1,7 +1,8 @@
+#include <iostream>
+
#include <cublas_v2.h>
#include <cuda_runtime.h>
-#include <iostream>
#if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
diff --git a/Tests/Cuda/WithC/cuda.cu b/Tests/Cuda/WithC/cuda.cu
index 06bd7b9..d1be2d4 100644
--- a/Tests/Cuda/WithC/cuda.cu
+++ b/Tests/Cuda/WithC/cuda.cu
@@ -1,7 +1,7 @@
-#include <cuda.h>
-
#include <iostream>
+#include <cuda.h>
+
extern "C" int use_cuda(void)
{
int nDevices = 0;
diff --git a/Tests/CudaOnly/GPUDebugFlag/main.cu b/Tests/CudaOnly/GPUDebugFlag/main.cu
index 1f3fc12..ced3789 100644
--- a/Tests/CudaOnly/GPUDebugFlag/main.cu
+++ b/Tests/CudaOnly/GPUDebugFlag/main.cu
@@ -1,6 +1,7 @@
+#include <iostream>
+
#include <cuda.h>
#include <cuda_runtime.h>
-#include <iostream>
static __global__ void debug_kernel(bool* has_debug)
{
diff --git a/Tests/CudaOnly/WithDefs/main.notcu b/Tests/CudaOnly/WithDefs/main.notcu
index 68a296b..a5f4ed6 100644
--- a/Tests/CudaOnly/WithDefs/main.notcu
+++ b/Tests/CudaOnly/WithDefs/main.notcu
@@ -1,7 +1,7 @@
-#include <cuda.h>
-#include <cuda_runtime.h>
#include <iostream>
+#include <cuda.h>
+#include <cuda_runtime.h>
#include <inc_cuda.h>
#ifndef INC_CUDA
# error "INC_CUDA not defined!"
diff --git a/Tests/ExportImport/Export/testSharedLibDepends.h b/Tests/ExportImport/Export/testSharedLibDepends.h
index e84fb54..73dafae 100644
--- a/Tests/ExportImport/Export/testSharedLibDepends.h
+++ b/Tests/ExportImport/Export/testSharedLibDepends.h
@@ -2,10 +2,9 @@
#ifndef TESTSHAREDLIBDEPENDS_H
#define TESTSHAREDLIBDEPENDS_H
-#include "testsharedlibdepends_export.h"
-
#include "renamed.h"
#include "testSharedLibRequired.h"
+#include "testsharedlibdepends_export.h"
struct TESTSHAREDLIBDEPENDS_EXPORT TestSharedLibDepends
{
diff --git a/Tests/ExportImport/Export/testSharedLibRequiredUser2.h b/Tests/ExportImport/Export/testSharedLibRequiredUser2.h
index a132940..e1c8a05 100644
--- a/Tests/ExportImport/Export/testSharedLibRequiredUser2.h
+++ b/Tests/ExportImport/Export/testSharedLibRequiredUser2.h
@@ -2,9 +2,8 @@
#ifndef TESTSHAREDLIBREQUIREDUSER2_H
#define TESTSHAREDLIBREQUIREDUSER2_H
-#include "testsharedlibrequireduser2_export.h"
-
#include "testSharedLibRequired.h"
+#include "testsharedlibrequireduser2_export.h"
struct TESTSHAREDLIBREQUIREDUSER2_EXPORT TestSharedLibRequiredUser2
{
diff --git a/Tests/ExportImport/Import/A/deps_iface.c b/Tests/ExportImport/Import/A/deps_iface.c
index e2d973c..afb1af0 100644
--- a/Tests/ExportImport/Import/A/deps_iface.c
+++ b/Tests/ExportImport/Import/A/deps_iface.c
@@ -1,9 +1,4 @@
-#include "testLibIncludeRequired1.h"
-#include "testLibIncludeRequired2.h"
-#include "testLibIncludeRequired6.h"
-#include "testLibIncludeRequired7.h"
-
#include "installIncludesTest.h"
#include "installIncludesTest2.h"
#include "installIncludesTest3.h"
@@ -12,6 +7,10 @@
#include "installIncludesTest6.h"
#include "installIncludesTest7.h"
#include "installIncludesTest8.h"
+#include "testLibIncludeRequired1.h"
+#include "testLibIncludeRequired2.h"
+#include "testLibIncludeRequired6.h"
+#include "testLibIncludeRequired7.h"
#ifndef testLibRequired_IFACE_DEFINE
# error Expected testLibRequired_IFACE_DEFINE
diff --git a/Tests/ExternalProjectLocal/Step5/MathFunctions/mysqrt.cxx b/Tests/ExternalProjectLocal/Step5/MathFunctions/mysqrt.cxx
index 458ed63..a44aba0 100644
--- a/Tests/ExternalProjectLocal/Step5/MathFunctions/mysqrt.cxx
+++ b/Tests/ExternalProjectLocal/Step5/MathFunctions/mysqrt.cxx
@@ -1,12 +1,13 @@
+#include <stdio.h>
+
#include "MathFunctions.h"
#include "TutorialConfig.h"
-#include <stdio.h>
// include the generated table
-#include "Table.h"
-
#include <math.h>
+#include "Table.h"
+
// a hack square root calculation using simple operations
double mysqrt(double x)
{
diff --git a/Tests/ExternalProjectLocal/Step5/tutorial.cxx b/Tests/ExternalProjectLocal/Step5/tutorial.cxx
index 37f6ac4..8d077b2 100644
--- a/Tests/ExternalProjectLocal/Step5/tutorial.cxx
+++ b/Tests/ExternalProjectLocal/Step5/tutorial.cxx
@@ -1,9 +1,10 @@
// A simple program that computes the square root of a number
-#include "TutorialConfig.h"
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
+#include "TutorialConfig.h"
+
#ifdef USE_MYMATH
# include "MathFunctions.h"
#endif
diff --git a/Tests/FindGIF/Test/main.c b/Tests/FindGIF/Test/main.c
index 4ed72ec..656a99c 100644
--- a/Tests/FindGIF/Test/main.c
+++ b/Tests/FindGIF/Test/main.c
@@ -1,9 +1,8 @@
#include <assert.h>
+#include <gif_lib.h>
#include <stdio.h>
#include <string.h>
-#include <gif_lib.h>
-
// GIFLIB before version 5 didn't know this macro
#ifndef GIFLIB_MAJOR
# define GIFLIB_MAJOR 4
diff --git a/Tests/FindGSL/rng/main.cc b/Tests/FindGSL/rng/main.cc
index af13125..050caac 100644
--- a/Tests/FindGSL/rng/main.cc
+++ b/Tests/FindGSL/rng/main.cc
@@ -1,6 +1,7 @@
-#include "gsl/gsl_rng.h"
#include <math.h>
+#include "gsl/gsl_rng.h"
+
int main()
{
// return code
diff --git a/Tests/FindGTK2/cairomm/main.cpp b/Tests/FindGTK2/cairomm/main.cpp
index 4432601..48e5e39 100644
--- a/Tests/FindGTK2/cairomm/main.cpp
+++ b/Tests/FindGTK2/cairomm/main.cpp
@@ -8,13 +8,13 @@
# define _USE_MATH_DEFINES
#endif
-#include <cairomm/context.h>
-#include <cairomm/surface.h>
-#include <cairommconfig.h>
+#include <cmath>
#include <iostream>
#include <string>
-#include <cmath>
+#include <cairomm/context.h>
+#include <cairomm/surface.h>
+#include <cairommconfig.h>
int main()
{
diff --git a/Tests/FindGTK2/gtkmm/helloworld.cpp b/Tests/FindGTK2/gtkmm/helloworld.cpp
index 5f4e0ae..45c9422 100644
--- a/Tests/FindGTK2/gtkmm/helloworld.cpp
+++ b/Tests/FindGTK2/gtkmm/helloworld.cpp
@@ -1,4 +1,5 @@
#include "helloworld.h"
+
#include <iostream>
HelloWorld::HelloWorld()
diff --git a/Tests/FindGTK2/gtkmm/main.cpp b/Tests/FindGTK2/gtkmm/main.cpp
index 1637da2..29e23fd 100644
--- a/Tests/FindGTK2/gtkmm/main.cpp
+++ b/Tests/FindGTK2/gtkmm/main.cpp
@@ -1,6 +1,7 @@
-#include "helloworld.h"
#include <gtkmm.h>
+#include "helloworld.h"
+
int main(int argc, char* argv[])
{
Gtk::Main kit(argc, argv);
diff --git a/Tests/FindGTK2/sigc++/main.cpp b/Tests/FindGTK2/sigc++/main.cpp
index e56b910..4dae4f4 100644
--- a/Tests/FindGTK2/sigc++/main.cpp
+++ b/Tests/FindGTK2/sigc++/main.cpp
@@ -1,6 +1,7 @@
// Taken from https://developer.gnome.org/libsigc++-tutorial/stable/ch02.html
#include <iostream>
+
#include <sigc++/sigc++.h>
class AlienDetector
diff --git a/Tests/FindGnuTLS/Test/main.c b/Tests/FindGnuTLS/Test/main.c
index 122fb2d..1105358 100644
--- a/Tests/FindGnuTLS/Test/main.c
+++ b/Tests/FindGnuTLS/Test/main.c
@@ -1,9 +1,8 @@
#include <assert.h>
+#include <gnutls/gnutls.h>
#include <stdio.h>
#include <string.h>
-#include <gnutls/gnutls.h>
-
int main()
{
// test the linker
diff --git a/Tests/FindICU/Test/main.cpp b/Tests/FindICU/Test/main.cpp
index 64cc5d3..606e94e 100644
--- a/Tests/FindICU/Test/main.cpp
+++ b/Tests/FindICU/Test/main.cpp
@@ -1,10 +1,9 @@
-#include <unicode/uclean.h>
-#include <unicode/ustring.h>
-#include <unicode/utypes.h>
-
#include <unicode/ucal.h>
+#include <unicode/uclean.h>
#include <unicode/ucnv.h>
#include <unicode/udat.h>
+#include <unicode/ustring.h>
+#include <unicode/utypes.h>
int main()
{
diff --git a/Tests/FindProtobuf/Test/main-desc.cxx b/Tests/FindProtobuf/Test/main-desc.cxx
index a26e562..dc768ab 100644
--- a/Tests/FindProtobuf/Test/main-desc.cxx
+++ b/Tests/FindProtobuf/Test/main-desc.cxx
@@ -1,11 +1,12 @@
#include <fstream>
-#include <google/protobuf/descriptor.h>
#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/dynamic_message.h>
-#include <google/protobuf/text_format.h>
#include <iostream>
#include <string>
+#include <google/protobuf/descriptor.h>
+#include <google/protobuf/dynamic_message.h>
+#include <google/protobuf/text_format.h>
+
int main(int argc, char* argv[])
{
std::ifstream fs;
diff --git a/Tests/FindPython/NumPy/arraytest.c b/Tests/FindPython/NumPy/arraytest.c
index db259e5..51db7bc 100644
--- a/Tests/FindPython/NumPy/arraytest.c
+++ b/Tests/FindPython/NumPy/arraytest.c
@@ -1,10 +1,10 @@
#include "Python.h"
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
-#include "numpy/arrayobject.h"
-
#include <math.h>
+#include "numpy/arrayobject.h"
+
static PyObject* vecsq(PyObject* self, PyObject* args);
static PyMethodDef arraytestMethods[] = { { "vecsq", vecsq, METH_VARARGS },
diff --git a/Tests/FindSQLite3/Test/main.c b/Tests/FindSQLite3/Test/main.c
index aeb4940..fb17c67 100644
--- a/Tests/FindSQLite3/Test/main.c
+++ b/Tests/FindSQLite3/Test/main.c
@@ -1,6 +1,5 @@
-#include <string.h>
-
#include <sqlite3.h>
+#include <string.h>
int main()
{
diff --git a/Tests/GoogleTest/Test/main1.cxx b/Tests/GoogleTest/Test/main1.cxx
index 03d604b..c353d91 100644
--- a/Tests/GoogleTest/Test/main1.cxx
+++ b/Tests/GoogleTest/Test/main1.cxx
@@ -1,7 +1,7 @@
-#include <gtest/gtest.h>
-
#include <string>
+#include <gtest/gtest.h>
+
namespace {
bool shouldFail = false;
}
diff --git a/Tests/IncludeDirectories/SystemIncludeDirectories/consumer.cpp b/Tests/IncludeDirectories/SystemIncludeDirectories/consumer.cpp
index be18ebf..a13f08f 100644
--- a/Tests/IncludeDirectories/SystemIncludeDirectories/consumer.cpp
+++ b/Tests/IncludeDirectories/SystemIncludeDirectories/consumer.cpp
@@ -1,7 +1,6 @@
-#include "upstream.h"
-
#include "config_iface.h"
+#include "upstream.h"
int consumer()
{
diff --git a/Tests/InterfaceLibrary/libsdir/sharedlib/sharedlib.h b/Tests/InterfaceLibrary/libsdir/sharedlib/sharedlib.h
index 5b3c7db..3e18941 100644
--- a/Tests/InterfaceLibrary/libsdir/sharedlib/sharedlib.h
+++ b/Tests/InterfaceLibrary/libsdir/sharedlib/sharedlib.h
@@ -2,9 +2,8 @@
#ifndef SHAREDLIB_H
#define SHAREDLIB_H
-#include "sharedlib_export.h"
-
#include "shareddependlib.h"
+#include "sharedlib_export.h"
struct SHAREDLIB_EXPORT SharedLibObject
{
diff --git a/Tests/JavaJavah/B.cpp b/Tests/JavaJavah/B.cpp
index 491107e..86d8aa8 100644
--- a/Tests/JavaJavah/B.cpp
+++ b/Tests/JavaJavah/B.cpp
@@ -1,9 +1,9 @@
+#include "B.h"
+
#include <jni.h>
#include <stdio.h>
-#include "B.h"
-
JNIEXPORT void JNICALL Java_B_printName(JNIEnv*, jobject)
{
printf("B\n");
diff --git a/Tests/JavaJavah/C.cpp b/Tests/JavaJavah/C.cpp
index 0a3178f..569eab5 100644
--- a/Tests/JavaJavah/C.cpp
+++ b/Tests/JavaJavah/C.cpp
@@ -1,9 +1,9 @@
+#include "C.h"
+
#include <jni.h>
#include <stdio.h>
-#include "C.h"
-
JNIEXPORT void JNICALL Java_C_printName(JNIEnv*, jobject)
{
printf("C\n");
diff --git a/Tests/JavaNativeHeaders/D.cpp b/Tests/JavaNativeHeaders/D.cpp
index 2a90a08..018386c 100644
--- a/Tests/JavaNativeHeaders/D.cpp
+++ b/Tests/JavaNativeHeaders/D.cpp
@@ -1,9 +1,9 @@
+#include "D.h"
+
#include <jni.h>
#include <stdio.h>
-#include "D.h"
-
JNIEXPORT void JNICALL Java_D_printName(JNIEnv*, jobject)
{
printf("D\n");
diff --git a/Tests/JavaNativeHeaders/E.cpp b/Tests/JavaNativeHeaders/E.cpp
index fb98946..3a8e0ac 100644
--- a/Tests/JavaNativeHeaders/E.cpp
+++ b/Tests/JavaNativeHeaders/E.cpp
@@ -1,9 +1,9 @@
+#include "E.h"
+
#include <jni.h>
#include <stdio.h>
-#include "E.h"
-
JNIEXPORT void JNICALL Java_E_printName(JNIEnv*, jobject)
{
printf("E\n");
diff --git a/Tests/LoadCommand/CMakeCommands/cmTestCommand.c b/Tests/LoadCommand/CMakeCommands/cmTestCommand.c
index 3558f89..99f0de9 100644
--- a/Tests/LoadCommand/CMakeCommands/cmTestCommand.c
+++ b/Tests/LoadCommand/CMakeCommands/cmTestCommand.c
@@ -1,8 +1,9 @@
-#include "cmCPluginAPI.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include "cmCPluginAPI.h"
+
typedef struct
{
char* LibraryName;
diff --git a/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c b/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c
index 3558f89..99f0de9 100644
--- a/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c
+++ b/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c
@@ -1,8 +1,9 @@
-#include "cmCPluginAPI.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include "cmCPluginAPI.h"
+
typedef struct
{
char* LibraryName;
diff --git a/Tests/MFC/mfc1/stdafx.h b/Tests/MFC/mfc1/stdafx.h
index 2680f26..b369085 100644
--- a/Tests/MFC/mfc1/stdafx.h
+++ b/Tests/MFC/mfc1/stdafx.h
@@ -61,11 +61,10 @@
// messages
#define _AFX_ALL_WARNINGS
-#include <afxdisp.h> // MFC Automation classes
-#include <afxext.h> // MFC extensions
-#include <afxwin.h> // MFC core and standard components
-
+#include <afxdisp.h> // MFC Automation classes
#include <afxdtctl.h> // MFC support for Internet Explorer 4 Common Controls
+#include <afxext.h> // MFC extensions
+#include <afxwin.h> // MFC core and standard components
#ifndef _AFX_NO_AFXCMN_SUPPORT
# include <afxcmn.h> // MFC support for Windows Common Controls
#endif // _AFX_NO_AFXCMN_SUPPORT
diff --git a/Tests/MacRuntimePath/A/framework.cpp b/Tests/MacRuntimePath/A/framework.cpp
index abda195..b5a95d8 100644
--- a/Tests/MacRuntimePath/A/framework.cpp
+++ b/Tests/MacRuntimePath/A/framework.cpp
@@ -1,5 +1,6 @@
#include "framework.h"
+
#include "stdio.h"
void framework()
diff --git a/Tests/MacRuntimePath/A/framework2.cpp b/Tests/MacRuntimePath/A/framework2.cpp
index d3c2c45..0a1beec 100644
--- a/Tests/MacRuntimePath/A/framework2.cpp
+++ b/Tests/MacRuntimePath/A/framework2.cpp
@@ -1,5 +1,6 @@
#include "framework2.h"
+
#include "stdio.h"
void framework2()
diff --git a/Tests/MacRuntimePath/A/shared.cpp b/Tests/MacRuntimePath/A/shared.cpp
index e5e7dc5..13791c2 100644
--- a/Tests/MacRuntimePath/A/shared.cpp
+++ b/Tests/MacRuntimePath/A/shared.cpp
@@ -1,5 +1,6 @@
#include "shared.h"
+
#include "stdio.h"
void shared()
diff --git a/Tests/NewlineArgs/cxxonly.cxx b/Tests/NewlineArgs/cxxonly.cxx
index 9e6f918..33b26dc 100644
--- a/Tests/NewlineArgs/cxxonly.cxx
+++ b/Tests/NewlineArgs/cxxonly.cxx
@@ -1,8 +1,8 @@
+#include <stdio.h>
+
#include "libcxx1.h"
#include "libcxx2.h"
-#include <stdio.h>
-
int main()
{
if (LibCxx1Class::Method() != 2.0) {
diff --git a/Tests/Plugin/src/example_exe.cxx b/Tests/Plugin/src/example_exe.cxx
index fd810a9..bc4c727 100644
--- a/Tests/Plugin/src/example_exe.cxx
+++ b/Tests/Plugin/src/example_exe.cxx
@@ -1,14 +1,12 @@
-#include "DynamicLoader.hxx"
-
-#include <example.h>
-
-#include <example_exe.h>
-
#include <iostream>
#include <string>
+#include <example.h>
+#include <example_exe.h>
#include <stdio.h>
+#include "DynamicLoader.hxx"
+
// Implement the ABI used by plugins.
extern "C" int example_exe_function()
{
diff --git a/Tests/Plugin/src/example_mod_1.c b/Tests/Plugin/src/example_mod_1.c
index 87b559d..2b740b8 100644
--- a/Tests/Plugin/src/example_mod_1.c
+++ b/Tests/Plugin/src/example_mod_1.c
@@ -1,5 +1,4 @@
#include <example.h>
-
#include <stdio.h>
#if defined(_WIN32)
diff --git a/Tests/Qt4Targets/main.cpp b/Tests/Qt4Targets/main.cpp
index f8eacdc..fc7f580 100644
--- a/Tests/Qt4Targets/main.cpp
+++ b/Tests/Qt4Targets/main.cpp
@@ -1,8 +1,7 @@
#include <QApplication>
-#include <QWidget>
-
#include <QString>
+#include <QWidget>
#ifndef QT_CORE_LIB
# error Expected QT_CORE_LIB
diff --git a/Tests/QtAutogen/AutogenOriginDependsOff/a_qt.cpp b/Tests/QtAutogen/AutogenOriginDependsOff/a_qt.cpp
index e498969..c7c6863 100644
--- a/Tests/QtAutogen/AutogenOriginDependsOff/a_qt.cpp
+++ b/Tests/QtAutogen/AutogenOriginDependsOff/a_qt.cpp
@@ -1,5 +1,6 @@
#include "a_qt.hpp"
+
#include <a_mc.hpp>
namespace a_qt {
diff --git a/Tests/QtAutogen/AutogenOriginDependsOff/a_qt.hpp b/Tests/QtAutogen/AutogenOriginDependsOff/a_qt.hpp
index e2387ee..fafc8a2 100644
--- a/Tests/QtAutogen/AutogenOriginDependsOff/a_qt.hpp
+++ b/Tests/QtAutogen/AutogenOriginDependsOff/a_qt.hpp
@@ -1,10 +1,12 @@
#ifndef A_QT_HPP
#define A_QT_HPP
-#include <QObject>
-#include <config.hpp>
#include <string>
+#include <config.hpp>
+
+#include <QObject>
+
namespace a_qt {
/// @brief A header local QObject based class
diff --git a/Tests/QtAutogen/AutogenOriginDependsOff/b_qt.cpp b/Tests/QtAutogen/AutogenOriginDependsOff/b_qt.cpp
index f72f6ca..c5adaeb 100644
--- a/Tests/QtAutogen/AutogenOriginDependsOff/b_qt.cpp
+++ b/Tests/QtAutogen/AutogenOriginDependsOff/b_qt.cpp
@@ -1,5 +1,6 @@
#include "b_qt.hpp"
+
#include <b_mc.hpp>
namespace b_qt {
diff --git a/Tests/QtAutogen/AutogenOriginDependsOff/b_qt.hpp b/Tests/QtAutogen/AutogenOriginDependsOff/b_qt.hpp
index d7f0311..b798e71 100644
--- a/Tests/QtAutogen/AutogenOriginDependsOff/b_qt.hpp
+++ b/Tests/QtAutogen/AutogenOriginDependsOff/b_qt.hpp
@@ -1,10 +1,12 @@
#ifndef B_QT_HPP
#define B_QT_HPP
-#include <QObject>
-#include <config.hpp>
#include <string>
+#include <config.hpp>
+
+#include <QObject>
+
namespace b_qt {
/// @brief A header local QObject based class
diff --git a/Tests/QtAutogen/AutogenOriginDependsOff/main.cpp b/Tests/QtAutogen/AutogenOriginDependsOff/main.cpp
index a3425f1..3fb6c70 100644
--- a/Tests/QtAutogen/AutogenOriginDependsOff/main.cpp
+++ b/Tests/QtAutogen/AutogenOriginDependsOff/main.cpp
@@ -1,7 +1,8 @@
+#include <string>
+
#include <a_qt.hpp>
#include <b_qt.hpp>
-#include <string>
int main()
{
diff --git a/Tests/QtAutogen/AutogenOriginDependsOn/testGenLib.hpp b/Tests/QtAutogen/AutogenOriginDependsOn/testGenLib.hpp
index 408335b..55457d2 100644
--- a/Tests/QtAutogen/AutogenOriginDependsOn/testGenLib.hpp
+++ b/Tests/QtAutogen/AutogenOriginDependsOn/testGenLib.hpp
@@ -1,9 +1,10 @@
#ifndef TEST3_HPP
#define TEST3_HPP
-#include "simpleLib.hpp"
#include <QObject>
+#include "simpleLib.hpp"
+
// This object triggers the AUTOMOC on this file
class LObject : public QObject
{
diff --git a/Tests/QtAutogen/Complex/Adir/libA.h b/Tests/QtAutogen/Complex/Adir/libA.h
index c4eb9f7..a8ca209 100644
--- a/Tests/QtAutogen/Complex/Adir/libA.h
+++ b/Tests/QtAutogen/Complex/Adir/libA.h
@@ -2,10 +2,10 @@
#ifndef LIBA_H
#define LIBA_H
-#include "liba_export.h"
-
#include <QObject>
+#include "liba_export.h"
+
class LIBA_EXPORT LibA : public QObject
{
Q_OBJECT
diff --git a/Tests/QtAutogen/Complex/Bdir/libB.h b/Tests/QtAutogen/Complex/Bdir/libB.h
index e4ab788..38dae87 100644
--- a/Tests/QtAutogen/Complex/Bdir/libB.h
+++ b/Tests/QtAutogen/Complex/Bdir/libB.h
@@ -2,10 +2,10 @@
#ifndef LIBB_H
#define LIBB_H
-#include "libb_export.h"
+#include <QObject>
#include "libA.h"
-#include <QObject>
+#include "libb_export.h"
class LIBB_EXPORT LibB : public QObject
{
diff --git a/Tests/QtAutogen/Complex/abc.cpp b/Tests/QtAutogen/Complex/abc.cpp
index 2929b92..4c7dc52 100644
--- a/Tests/QtAutogen/Complex/abc.cpp
+++ b/Tests/QtAutogen/Complex/abc.cpp
@@ -1,10 +1,11 @@
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
#include "abc.h"
-#include "abc_p.h"
#include <stdio.h>
+#include "abc_p.h"
+
class PrintAbc : public QObject
{
Q_OBJECT
diff --git a/Tests/QtAutogen/Complex/abc_p.h b/Tests/QtAutogen/Complex/abc_p.h
index be98487..1f6102c 100644
--- a/Tests/QtAutogen/Complex/abc_p.h
+++ b/Tests/QtAutogen/Complex/abc_p.h
@@ -3,10 +3,10 @@
#ifndef ABC_P_H
#define ABC_P_H
-#include <QObject>
-
#include <stdio.h>
+#include <QObject>
+
class AbcP : public QObject
{
Q_OBJECT
diff --git a/Tests/QtAutogen/Complex/calwidget.cpp b/Tests/QtAutogen/Complex/calwidget.cpp
index 8ce53f1..f58b182 100644
--- a/Tests/QtAutogen/Complex/calwidget.cpp
+++ b/Tests/QtAutogen/Complex/calwidget.cpp
@@ -38,6 +38,8 @@
**
****************************************************************************/
+#include "calwidget.h"
+
#include <QCalendarWidget>
#include <QCheckBox>
#include <QComboBox>
@@ -47,8 +49,6 @@
#include <QLabel>
#include <QTextCharFormat>
-#include "calwidget.h"
-
#include "ui_calwidget.h"
#ifdef UI_CALWIDGET_H
# error Definition of UI_CALWIDGET_H should be disabled by file option.
diff --git a/Tests/QtAutogen/Complex/codeeditor.cpp b/Tests/QtAutogen/Complex/codeeditor.cpp
index 0caf8a7..bb6f405 100644
--- a/Tests/QtAutogen/Complex/codeeditor.cpp
+++ b/Tests/QtAutogen/Complex/codeeditor.cpp
@@ -38,10 +38,10 @@
**
****************************************************************************/
-#include <QtGui>
-
#include "codeeditor.h"
+#include <QtGui>
+
CodeEditor::CodeEditor(QWidget* parent)
: QPlainTextEdit(parent)
{
diff --git a/Tests/QtAutogen/Complex/debug_class.cpp b/Tests/QtAutogen/Complex/debug_class.cpp
index 46b09e7..3aaf79a 100644
--- a/Tests/QtAutogen/Complex/debug_class.cpp
+++ b/Tests/QtAutogen/Complex/debug_class.cpp
@@ -1,5 +1,6 @@
#include "debug_class.h"
+
#include "ui_debug_class.h"
DebugClass::DebugClass(QWidget* parent)
diff --git a/Tests/QtAutogen/Complex/libC.h b/Tests/QtAutogen/Complex/libC.h
index 3bc2bad..51ea48d 100644
--- a/Tests/QtAutogen/Complex/libC.h
+++ b/Tests/QtAutogen/Complex/libC.h
@@ -2,10 +2,10 @@
#ifndef LIBC_H
#define LIBC_H
-#include "libc_export.h"
+#include <QObject>
#include "libB.h"
-#include <QObject>
+#include "libc_export.h"
class LIBC_EXPORT LibC : public QObject
{
diff --git a/Tests/QtAutogen/Complex/main.cpp b/Tests/QtAutogen/Complex/main.cpp
index b5b6ed1..12f649f 100644
--- a/Tests/QtAutogen/Complex/main.cpp
+++ b/Tests/QtAutogen/Complex/main.cpp
@@ -52,8 +52,9 @@
#include "xyz.h"
#include "yaf.h"
#ifdef TEST_DEBUG_CLASS
-# include "debug_class.h"
# include <iostream>
+
+# include "debug_class.h"
#endif
int main(int argv, char** args)
diff --git a/Tests/QtAutogen/Complex/second_widget.cpp b/Tests/QtAutogen/Complex/second_widget.cpp
index c575f10..9f51a80 100644
--- a/Tests/QtAutogen/Complex/second_widget.cpp
+++ b/Tests/QtAutogen/Complex/second_widget.cpp
@@ -1,5 +1,6 @@
#include "second_widget.h"
+
#include "ui_second_widget.h"
SecondWidget::SecondWidget(QWidget* parent)
diff --git a/Tests/QtAutogen/Complex/yaf.cpp b/Tests/QtAutogen/Complex/yaf.cpp
index 70e26aa..10448c1 100644
--- a/Tests/QtAutogen/Complex/yaf.cpp
+++ b/Tests/QtAutogen/Complex/yaf.cpp
@@ -1,10 +1,11 @@
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
#include "yaf.h"
-#include "yaf_p.h"
#include <stdio.h>
+#include "yaf_p.h"
+
Yaf::Yaf()
{
}
diff --git a/Tests/QtAutogen/Complex/yaf_p.h b/Tests/QtAutogen/Complex/yaf_p.h
index ea5eed6..48fdd30 100644
--- a/Tests/QtAutogen/Complex/yaf_p.h
+++ b/Tests/QtAutogen/Complex/yaf_p.h
@@ -3,10 +3,10 @@
#ifndef YAF_P_H
#define YAF_P_H
-#include <QObject>
-
#include <stdio.h>
+#include <QObject>
+
class YafP : public QObject
{
Q_OBJECT
diff --git a/Tests/QtAutogen/LowMinimumVersion/item.cpp b/Tests/QtAutogen/LowMinimumVersion/item.cpp
index e2f19b2..511a1ca 100644
--- a/Tests/QtAutogen/LowMinimumVersion/item.cpp
+++ b/Tests/QtAutogen/LowMinimumVersion/item.cpp
@@ -1,4 +1,5 @@
#include "item.hpp"
+
#include <ui_view.h>
class MocLocal : public QObject
diff --git a/Tests/QtAutogen/MacOsFW/test/testMacosFWLib.cpp b/Tests/QtAutogen/MacOsFW/test/testMacosFWLib.cpp
index 3476d61..edc9376 100644
--- a/Tests/QtAutogen/MacOsFW/test/testMacosFWLib.cpp
+++ b/Tests/QtAutogen/MacOsFW/test/testMacosFWLib.cpp
@@ -1,8 +1,9 @@
+#include "testMacosFWLib.h"
+
#include <QObject>
#include <QString>
#include "macos_fw_lib.h"
-#include "testMacosFWLib.h"
class TestMacosFWLib : public QObject
{
diff --git a/Tests/QtAutogen/MocCMP0071/Obj.cpp b/Tests/QtAutogen/MocCMP0071/Obj.cpp
index 1ae50ed..25a291d 100644
--- a/Tests/QtAutogen/MocCMP0071/Obj.cpp
+++ b/Tests/QtAutogen/MocCMP0071/Obj.cpp
@@ -1,4 +1,5 @@
#include "Obj.hpp"
+
#include "Obj_p.h"
ObjPrivate::ObjPrivate()
diff --git a/Tests/QtAutogen/MocInclude/Common/InIncludes.in/SubOwnDot.cpp b/Tests/QtAutogen/MocInclude/Common/InIncludes.in/SubOwnDot.cpp
index af35711..275754d 100644
--- a/Tests/QtAutogen/MocInclude/Common/InIncludes.in/SubOwnDot.cpp
+++ b/Tests/QtAutogen/MocInclude/Common/InIncludes.in/SubOwnDot.cpp
@@ -1,4 +1,5 @@
#include "SubOwnDot.hpp"
+
#include "SubOwnDot_p.hpp"
namespace InIncludes {
diff --git a/Tests/QtAutogen/MocInclude/Common/MixedSkipped.cpp b/Tests/QtAutogen/MocInclude/Common/MixedSkipped.cpp
index df08ff1..6919ebc 100644
--- a/Tests/QtAutogen/MocInclude/Common/MixedSkipped.cpp
+++ b/Tests/QtAutogen/MocInclude/Common/MixedSkipped.cpp
@@ -1,4 +1,5 @@
#include "MixedSkipped.hpp"
+
#include "MixedCustom.hpp"
class MixedSkippedLocal : public QObject
diff --git a/Tests/QtAutogen/MocInclude/Common/None.cpp b/Tests/QtAutogen/MocInclude/Common/None.cpp
index d01d5ec..286ddb6 100644
--- a/Tests/QtAutogen/MocInclude/Common/None.cpp
+++ b/Tests/QtAutogen/MocInclude/Common/None.cpp
@@ -1,4 +1,5 @@
#include "None.hpp"
+
#include "None_p.h"
NonePrivate::NonePrivate()
diff --git a/Tests/QtAutogen/MocInclude/Common/OtherUnderscore.cpp b/Tests/QtAutogen/MocInclude/Common/OtherUnderscore.cpp
index 219619f..df1c428 100644
--- a/Tests/QtAutogen/MocInclude/Common/OtherUnderscore.cpp
+++ b/Tests/QtAutogen/MocInclude/Common/OtherUnderscore.cpp
@@ -1,4 +1,5 @@
#include "OtherUnderscore.hpp"
+
#include "OtherUnderscoreExtra.hpp"
#include "OtherUnderscore_p.hpp"
diff --git a/Tests/QtAutogen/MocInclude/Common/OtherUnderscoreExtra.cpp b/Tests/QtAutogen/MocInclude/Common/OtherUnderscoreExtra.cpp
index 4ccf080..11ebd81 100644
--- a/Tests/QtAutogen/MocInclude/Common/OtherUnderscoreExtra.cpp
+++ b/Tests/QtAutogen/MocInclude/Common/OtherUnderscoreExtra.cpp
@@ -1,4 +1,5 @@
#include "OtherUnderscoreExtra.hpp"
+
#include "OtherUnderscoreExtra_p.hpp"
OtherUnderscoreExtraPrivate::OtherUnderscoreExtraPrivate()
diff --git a/Tests/QtAutogen/MocInclude/Common/OtherUnderscoreSub.cpp b/Tests/QtAutogen/MocInclude/Common/OtherUnderscoreSub.cpp
index 28850aa..712c540 100644
--- a/Tests/QtAutogen/MocInclude/Common/OtherUnderscoreSub.cpp
+++ b/Tests/QtAutogen/MocInclude/Common/OtherUnderscoreSub.cpp
@@ -1,4 +1,5 @@
#include "OtherUnderscoreSub.hpp"
+
#include "OtherUnderscoreSubDir/SubExtra.hpp"
#include "OtherUnderscoreSub_p.hpp"
diff --git a/Tests/QtAutogen/MocInclude/Common/OtherUnderscoreSubDir/SubExtra.cpp b/Tests/QtAutogen/MocInclude/Common/OtherUnderscoreSubDir/SubExtra.cpp
index e323ed8..22501e4 100644
--- a/Tests/QtAutogen/MocInclude/Common/OtherUnderscoreSubDir/SubExtra.cpp
+++ b/Tests/QtAutogen/MocInclude/Common/OtherUnderscoreSubDir/SubExtra.cpp
@@ -1,4 +1,5 @@
#include "SubExtra.hpp"
+
#include "SubExtra_p.hpp"
SubExtraPrivate::SubExtraPrivate()
diff --git a/Tests/QtAutogen/MocInclude/Common/OwnDot.cpp b/Tests/QtAutogen/MocInclude/Common/OwnDot.cpp
index 1cce272..b7b7d85 100644
--- a/Tests/QtAutogen/MocInclude/Common/OwnDot.cpp
+++ b/Tests/QtAutogen/MocInclude/Common/OwnDot.cpp
@@ -1,4 +1,5 @@
#include "OwnDot.hpp"
+
#include "OwnDot_p.h"
class OwnDotLocal : public QObject
diff --git a/Tests/QtAutogen/MocInclude/Common/OwnDotUnderscore.cpp b/Tests/QtAutogen/MocInclude/Common/OwnDotUnderscore.cpp
index 2a0b8ad..056c0db 100644
--- a/Tests/QtAutogen/MocInclude/Common/OwnDotUnderscore.cpp
+++ b/Tests/QtAutogen/MocInclude/Common/OwnDotUnderscore.cpp
@@ -1,4 +1,5 @@
#include "OwnDotUnderscore.hpp"
+
#include "OwnDotUnderscore_p.h"
class OwnDotUnderscoreLocal : public QObject
diff --git a/Tests/QtAutogen/MocInclude/Common/OwnUnderscore.cpp b/Tests/QtAutogen/MocInclude/Common/OwnUnderscore.cpp
index ebbcf45..cb8f12c 100644
--- a/Tests/QtAutogen/MocInclude/Common/OwnUnderscore.cpp
+++ b/Tests/QtAutogen/MocInclude/Common/OwnUnderscore.cpp
@@ -1,4 +1,5 @@
#include "OwnUnderscore.hpp"
+
#include "OwnUnderscore_p.h"
OwnUnderscorePrivate::OwnUnderscorePrivate()
diff --git a/Tests/QtAutogen/MocInclude/Relaxed/RObjB.cpp b/Tests/QtAutogen/MocInclude/Relaxed/RObjB.cpp
index c56d10f..57d7daf 100644
--- a/Tests/QtAutogen/MocInclude/Relaxed/RObjB.cpp
+++ b/Tests/QtAutogen/MocInclude/Relaxed/RObjB.cpp
@@ -1,4 +1,5 @@
#include "RObjB.hpp"
+
#include "RObjBExtra.hpp"
RObjBExtra::RObjBExtra()
diff --git a/Tests/QtAutogen/MocInclude/Relaxed/RObjC.cpp b/Tests/QtAutogen/MocInclude/Relaxed/RObjC.cpp
index 4ba32f5..3275216 100644
--- a/Tests/QtAutogen/MocInclude/Relaxed/RObjC.cpp
+++ b/Tests/QtAutogen/MocInclude/Relaxed/RObjC.cpp
@@ -1,4 +1,5 @@
#include "RObjC.hpp"
+
#include <QObject>
class RObjCPrivate : public QObject
diff --git a/Tests/QtAutogen/MocOnly/main.cpp b/Tests/QtAutogen/MocOnly/main.cpp
index b83b806..ec8da21 100644
--- a/Tests/QtAutogen/MocOnly/main.cpp
+++ b/Tests/QtAutogen/MocOnly/main.cpp
@@ -1,8 +1,9 @@
+#include <iostream>
+
#include "IncA.hpp"
#include "IncB.hpp"
#include "StyleA.hpp"
#include "StyleB.hpp"
-#include <iostream>
int main(int argv, char** args)
{
diff --git a/Tests/QtAutogen/MocOsMacros/TestClass.cpp b/Tests/QtAutogen/MocOsMacros/TestClass.cpp
index 13f8fd9..babc08b 100644
--- a/Tests/QtAutogen/MocOsMacros/TestClass.cpp
+++ b/Tests/QtAutogen/MocOsMacros/TestClass.cpp
@@ -1,4 +1,5 @@
#include "TestClass.hpp"
+
#include <iostream>
void TestClass::open()
diff --git a/Tests/QtAutogen/MocOsMacros/main.cpp b/Tests/QtAutogen/MocOsMacros/main.cpp
index f8eec3c..c427345 100644
--- a/Tests/QtAutogen/MocOsMacros/main.cpp
+++ b/Tests/QtAutogen/MocOsMacros/main.cpp
@@ -1,6 +1,7 @@
-#include "TestClass.hpp"
#include <QtGlobal>
+#include "TestClass.hpp"
+
int main()
{
TestClass a;
diff --git a/Tests/QtAutogen/ObjectLibrary/a/classa.cpp b/Tests/QtAutogen/ObjectLibrary/a/classa.cpp
index 4f08fda..a548652 100644
--- a/Tests/QtAutogen/ObjectLibrary/a/classa.cpp
+++ b/Tests/QtAutogen/ObjectLibrary/a/classa.cpp
@@ -1,4 +1,5 @@
#include "classa.h"
+
#include <QDebug>
void ClassA::slotDoSomething()
diff --git a/Tests/QtAutogen/ObjectLibrary/b/classb.cpp b/Tests/QtAutogen/ObjectLibrary/b/classb.cpp
index 26e0926..e5cc2e7 100644
--- a/Tests/QtAutogen/ObjectLibrary/b/classb.cpp
+++ b/Tests/QtAutogen/ObjectLibrary/b/classb.cpp
@@ -1,4 +1,5 @@
#include "classb.h"
+
#include <QDebug>
void ClassB::slotDoSomething()
diff --git a/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleA.hpp b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleA.hpp
index 35158a4..e1fdf0b 100644
--- a/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleA.hpp
+++ b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleA.hpp
@@ -1,9 +1,10 @@
#ifndef STYLEA_HPP
#define STYLEA_HPP
-#include "UtilityMacros.hpp"
#include <QStylePlugin>
+#include "UtilityMacros.hpp"
+
class StyleA : public QStylePlugin
{
Q_OBJECT
diff --git a/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleB.hpp b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleB.hpp
index 15b79c5..7550d0c 100644
--- a/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleB.hpp
+++ b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleB.hpp
@@ -1,9 +1,10 @@
#ifndef STYLEB_HPP
#define STYLEB_HPP
-#include "UtilityMacros.hpp"
#include <QStylePlugin>
+#include "UtilityMacros.hpp"
+
class StyleB : public QStylePlugin
{
Q_OBJECT
diff --git a/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleC.hpp b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleC.hpp
index b0a4115..ec71bec 100644
--- a/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleC.hpp
+++ b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleC.hpp
@@ -1,9 +1,10 @@
#ifndef STYLEC_HPP
#define STYLEC_HPP
-#include "UtilityMacros.hpp"
#include <QStylePlugin>
+#include "UtilityMacros.hpp"
+
class StyleC : public QStylePlugin
{
Q_OBJECT
diff --git a/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleD.hpp b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleD.hpp
index 9696aaa..3c093b9 100644
--- a/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleD.hpp
+++ b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleD.hpp
@@ -1,9 +1,10 @@
#ifndef STYLED_HPP
#define STYLED_HPP
-#include "UtilityMacros.hpp"
#include <QStylePlugin>
+#include "UtilityMacros.hpp"
+
class StyleD : public QStylePlugin
{
Q_OBJECT
diff --git a/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleEInclude.hpp b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleEInclude.hpp
index f9734db..5f10fb4 100644
--- a/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleEInclude.hpp
+++ b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleEInclude.hpp
@@ -1,9 +1,10 @@
#ifndef STYLEE_INCLUDE_HPP
#define STYLEE_INCLUDE_HPP
-#include "UtilityMacros.hpp"
#include <QStylePlugin>
+#include "UtilityMacros.hpp"
+
class StyleE : public QStylePlugin
{
Q_OBJECT
diff --git a/Tests/QtAutogen/StaticLibraryCycle/a.cpp b/Tests/QtAutogen/StaticLibraryCycle/a.cpp
index faa52e6..8dd1803 100644
--- a/Tests/QtAutogen/StaticLibraryCycle/a.cpp
+++ b/Tests/QtAutogen/StaticLibraryCycle/a.cpp
@@ -1,4 +1,5 @@
#include "a.h"
+
#include "b.h"
bool A::recursed = false;
diff --git a/Tests/QtAutogen/StaticLibraryCycle/b.cpp b/Tests/QtAutogen/StaticLibraryCycle/b.cpp
index a807d89..dee2617 100644
--- a/Tests/QtAutogen/StaticLibraryCycle/b.cpp
+++ b/Tests/QtAutogen/StaticLibraryCycle/b.cpp
@@ -1,4 +1,5 @@
#include "b.h"
+
#include "c.h"
B::B()
diff --git a/Tests/QtAutogen/StaticLibraryCycle/c.cpp b/Tests/QtAutogen/StaticLibraryCycle/c.cpp
index 7d427c2..2871f62 100644
--- a/Tests/QtAutogen/StaticLibraryCycle/c.cpp
+++ b/Tests/QtAutogen/StaticLibraryCycle/c.cpp
@@ -1,4 +1,5 @@
#include "c.h"
+
#include "a.h"
C::C()
diff --git a/Tests/QtAutogen/UicInterface/libwidget.h b/Tests/QtAutogen/UicInterface/libwidget.h
index a7ad14f..532ff1d 100644
--- a/Tests/QtAutogen/UicInterface/libwidget.h
+++ b/Tests/QtAutogen/UicInterface/libwidget.h
@@ -2,9 +2,10 @@
#ifndef LIBWIDGET_H
#define LIBWIDGET_H
-#include <QWidget>
#include <memory>
+#include <QWidget>
+
#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
# include <klocalizedstring.h>
#endif
diff --git a/Tests/QtAutogen/UicInterface/mywidget.h b/Tests/QtAutogen/UicInterface/mywidget.h
index 1d31ce7..320d433 100644
--- a/Tests/QtAutogen/UicInterface/mywidget.h
+++ b/Tests/QtAutogen/UicInterface/mywidget.h
@@ -2,9 +2,10 @@
#ifndef MYWIDGET_H
#define MYWIDGET_H
-#include <QWidget>
#include <memory>
+#include <QWidget>
+
#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
# include <klocalizedstring.h>
#endif
diff --git a/Tests/QtAutogen/UicSkipSource/skipUicGen.cpp b/Tests/QtAutogen/UicSkipSource/skipUicGen.cpp
index d2a55a6..ab3c454 100644
--- a/Tests/QtAutogen/UicSkipSource/skipUicGen.cpp
+++ b/Tests/QtAutogen/UicSkipSource/skipUicGen.cpp
@@ -1,5 +1,6 @@
#include "skipUicGen.hpp"
+
#include "ui_uigen2.h"
void skipGen()
diff --git a/Tests/QtAutogen/UicSkipSource/skipUicNoGen1.cpp b/Tests/QtAutogen/UicSkipSource/skipUicNoGen1.cpp
index f591a42..d648d94 100644
--- a/Tests/QtAutogen/UicSkipSource/skipUicNoGen1.cpp
+++ b/Tests/QtAutogen/UicSkipSource/skipUicNoGen1.cpp
@@ -1,5 +1,6 @@
#include "skipUicNoGen1.hpp"
+
#include "ui_nogen2.h"
void skipNoGen1()
diff --git a/Tests/QtAutogen/UicSkipSource/skipUicNoGen2.cpp b/Tests/QtAutogen/UicSkipSource/skipUicNoGen2.cpp
index 8c1c324..aca58a4 100644
--- a/Tests/QtAutogen/UicSkipSource/skipUicNoGen2.cpp
+++ b/Tests/QtAutogen/UicSkipSource/skipUicNoGen2.cpp
@@ -1,5 +1,6 @@
#include "skipUicNoGen2.hpp"
+
#include "ui_nogen2.h"
void skipNoGen2()
diff --git a/Tests/RunCMake/AutoExportDll/hello.cxx b/Tests/RunCMake/AutoExportDll/hello.cxx
index 533fd3e..74e7a4e 100644
--- a/Tests/RunCMake/AutoExportDll/hello.cxx
+++ b/Tests/RunCMake/AutoExportDll/hello.cxx
@@ -1,4 +1,5 @@
#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 c8bfcc7..654b5e0 100644
--- a/Tests/RunCMake/AutoExportDll/say.cxx
+++ b/Tests/RunCMake/AutoExportDll/say.cxx
@@ -1,5 +1,6 @@
-#include "hello.h"
#include <stdio.h>
+
+#include "hello.h"
#ifdef _MSC_VER
# include "windows.h"
#else
diff --git a/Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp b/Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp
index 7e3e0e4..ba77679 100644
--- a/Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp
+++ b/Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp
@@ -1,13 +1,13 @@
-#include "libshared.h"
-
-#include "libstatic.h"
-
#include <fstream>
#include <iostream>
-#include <stdlib.h>
#include <string>
+#include <stdlib.h>
+
+#include "libshared.h"
+#include "libstatic.h"
+
void compare(const char* refName, const char* testName)
{
std::ifstream ref;
diff --git a/Tests/RunCMake/PrecompileHeaders/foo.c b/Tests/RunCMake/PrecompileHeaders/foo.c
index 85ea230..eb88726 100644
--- a/Tests/RunCMake/PrecompileHeaders/foo.c
+++ b/Tests/RunCMake/PrecompileHeaders/foo.c
@@ -1,4 +1,5 @@
#include "foo.h"
+
#include "foo2.h"
int foo()
diff --git a/Tests/SystemInformation/DumpInformation.cxx b/Tests/SystemInformation/DumpInformation.cxx
index e0cc0ce..4328675 100644
--- a/Tests/SystemInformation/DumpInformation.cxx
+++ b/Tests/SystemInformation/DumpInformation.cxx
@@ -1,5 +1,7 @@
#include "DumpInformation.h"
+
#include <stdio.h>
+
#include <sys/stat.h>
void cmDumpInformationPrintFile(const char* name, FILE* fout)
diff --git a/Tests/TestsWorkingDirectory/main.c b/Tests/TestsWorkingDirectory/main.c
index 8755c0e..ca72f21 100644
--- a/Tests/TestsWorkingDirectory/main.c
+++ b/Tests/TestsWorkingDirectory/main.c
@@ -37,9 +37,10 @@ static const char* Getcwd(char* buf, unsigned int len)
#else
# include <fcntl.h>
-# include <sys/types.h>
# include <unistd.h>
+# include <sys/types.h>
+
static const char* Getcwd(char* buf, unsigned int len)
{
const char* ret = getcwd(buf, len);
diff --git a/Tests/VSExternalInclude/Lib2/lib2.cpp b/Tests/VSExternalInclude/Lib2/lib2.cpp
index adc2d29..3718017 100644
--- a/Tests/VSExternalInclude/Lib2/lib2.cpp
+++ b/Tests/VSExternalInclude/Lib2/lib2.cpp
@@ -1,5 +1,6 @@
#include "lib2.h"
+
#include "lib1.h"
int add1_and_mult2(int num)
diff --git a/Tests/VSMidl/src/main.cpp b/Tests/VSMidl/src/main.cpp
index 68089ad..ae114fe 100644
--- a/Tests/VSMidl/src/main.cpp
+++ b/Tests/VSMidl/src/main.cpp
@@ -1,6 +1,7 @@
+#include <test_i.c>
+
#include <stdio.h>
#include <test.h>
-#include <test_i.c>
int main(int argc, char** argv)
{
diff --git a/Tests/VSNsightTegra/jni/second.c b/Tests/VSNsightTegra/jni/second.c
index 12fcdb6..30bdc17 100644
--- a/Tests/VSNsightTegra/jni/second.c
+++ b/Tests/VSNsightTegra/jni/second.c
@@ -14,9 +14,10 @@
* limitations under the License.
*
*/
-#include "first.h"
#include <jni.h>
+#include "first.h"
+
jint Java_com_example_twolibs_TwoLibs_add(JNIEnv* env, jobject this, jint x,
jint y)
{
diff --git a/Tests/VSResource/main.cpp b/Tests/VSResource/main.cpp
index b2b5ac9..6de7adc 100644
--- a/Tests/VSResource/main.cpp
+++ b/Tests/VSResource/main.cpp
@@ -1,6 +1,7 @@
-#include <stdio.h>
#include <windows.h>
+#include <stdio.h>
+
extern int lib();
struct x
diff --git a/Tests/VSWinStorePhone/CxxDLL/cxxdll.cpp b/Tests/VSWinStorePhone/CxxDLL/cxxdll.cpp
index d82a792..1438e8a 100644
--- a/Tests/VSWinStorePhone/CxxDLL/cxxdll.cpp
+++ b/Tests/VSWinStorePhone/CxxDLL/cxxdll.cpp
@@ -1,4 +1,5 @@
#include "cxxdll.h"
+
#include <iostream>
void CxxDllClass::SomeMethod()
diff --git a/Tests/VSWinStorePhone/Direct3DApp1/pch.h b/Tests/VSWinStorePhone/Direct3DApp1/pch.h
index 78ebea3..d80cdb7 100644
--- a/Tests/VSWinStorePhone/Direct3DApp1/pch.h
+++ b/Tests/VSWinStorePhone/Direct3DApp1/pch.h
@@ -1,7 +1,8 @@
#pragma once
+#include <memory>
+
#include <DirectXMath.h>
#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 549b7ef..f9ae27e 100644
--- a/Tests/VSXaml/App.xaml.cpp
+++ b/Tests/VSXaml/App.xaml.cpp
@@ -3,9 +3,8 @@
// Implementation of the App class.
//
-#include "pch.h"
-
#include "MainPage.xaml.h"
+#include "pch.h"
using namespace VSXaml;
diff --git a/Tests/VSXaml/MainPage.xaml.cpp b/Tests/VSXaml/MainPage.xaml.cpp
index 51da237..f372772 100644
--- a/Tests/VSXaml/MainPage.xaml.cpp
+++ b/Tests/VSXaml/MainPage.xaml.cpp
@@ -3,10 +3,10 @@
// Implementation of the MainPage class.
//
-#include "pch.h"
-
#include "MainPage.xaml.h"
+#include "pch.h"
+
using namespace VSXaml;
using namespace Platform;
diff --git a/Tests/X11/HelloWorldX11.cxx b/Tests/X11/HelloWorldX11.cxx
index e59248b..f18f8c8 100644
--- a/Tests/X11/HelloWorldX11.cxx
+++ b/Tests/X11/HelloWorldX11.cxx
@@ -14,6 +14,7 @@
# define MAIN_H 1
# include <iostream>
+
# include <stdlib.h>
/* include the X library headers */