diff --git a/GUI/View/SampleDesigner/CoreAndShellForm.cpp b/GUI/View/SampleDesigner/CoreAndShellForm.cpp
index 330182bfa5e3cdb64bddbda68f62cf5af9d0b8ce..c61fce2d4db8240fadf4f5c91a7468298a74aed2 100644
--- a/GUI/View/SampleDesigner/CoreAndShellForm.cpp
+++ b/GUI/View/SampleDesigner/CoreAndShellForm.cpp
@@ -12,12 +12,12 @@
 //
 //  ************************************************************************************************
 
+#include "GUI/View/SampleDesigner/CoreAndShellForm.h"
 #include "GUI/Model/CatSample/FormFactorItemCatalog.h"
 #include "GUI/Model/Sample/CoreAndShellItem.h"
 #include "GUI/Model/Sample/FormFactorItems.h"
 #include "GUI/Model/Sample/ParticleItem.h"
 #include "GUI/Util/ActionFactory.h"
-#include "GUI/View/SampleDesigner/CoreAndShellForm.h"
 #include "GUI/View/SampleDesigner/FormLayouter.h"
 #include "GUI/View/SampleDesigner/MaterialInplaceForm.h"
 #include "GUI/View/SampleDesigner/SampleEditorController.h"
diff --git a/GUI/View/SampleDesigner/ParticleForm.cpp b/GUI/View/SampleDesigner/ParticleForm.cpp
index 191803497f0198bf7a1ee36c8246afe379248906..7a726cb20353e9b9a068e3e43a5e9e37f6786c40 100644
--- a/GUI/View/SampleDesigner/ParticleForm.cpp
+++ b/GUI/View/SampleDesigner/ParticleForm.cpp
@@ -12,13 +12,13 @@
 //
 //  ************************************************************************************************
 
+#include "GUI/View/SampleDesigner/ParticleForm.h"
 #include "GUI/Model/CatSample/FormFactorItemCatalog.h"
 #include "GUI/Model/Sample/FormFactorItems.h"
 #include "GUI/Model/Sample/ParticleItem.h"
 #include "GUI/Util/ActionFactory.h"
 #include "GUI/View/SampleDesigner/FormLayouter.h"
 #include "GUI/View/SampleDesigner/MaterialInplaceForm.h"
-#include "GUI/View/SampleDesigner/ParticleForm.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
 #include <QAction>
 
diff --git a/Tests/Functional/Consistence/ConsistenceTests.cpp b/Tests/Functional/Consistence/ConsistenceTests.cpp
index 7db6ab0f776958f7f457a54f46383b28a21ea24e..04414010d5f170f20a016d3fe405f43826504f3c 100644
--- a/Tests/Functional/Consistence/ConsistenceTests.cpp
+++ b/Tests/Functional/Consistence/ConsistenceTests.cpp
@@ -21,8 +21,8 @@
 #include "Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h"
 #include "Sim/Simulation/ScatteringSimulation.h"
 #include "Sim/Simulation/SpecularSimulation.h"
-#include "Tests/SimFactory/MakeSimulations.h"
 #include "Tests/GTestWrapper/google_test.h"
+#include "Tests/SimFactory/MakeSimulations.h"
 #include <string>
 
 int compareTwoReferences(const std::string& name0, const std::string& name1, double limit);
diff --git a/Tests/Functional/Fitting/FitTests.cpp b/Tests/Functional/Fitting/FitTests.cpp
index 31ccec40c72cca7079923febb440b005e5865750..bac47e0be9ecbc7085646d3f2feda11c10068db5 100644
--- a/Tests/Functional/Fitting/FitTests.cpp
+++ b/Tests/Functional/Fitting/FitTests.cpp
@@ -26,8 +26,8 @@
 #include "Sim/Simulation/ScatteringSimulation.h"
 #include "Sim/Simulation/SpecularSimulation.h"
 #include "Tests/Functional/Fitting/SimfitTestPlan.h"
-#include "Tests/SimFactory/MakeSimulations.h"
 #include "Tests/GTestWrapper/google_test.h"
+#include "Tests/SimFactory/MakeSimulations.h"
 
 using mumufit::Parameter;
 using Units::deg;
diff --git a/Tests/Suite/Common/TestSuite.h b/Tests/Suite/Common/TestSuite.h
index 23279e07a2a7493e777dc739c7a6dc50f3b1e017..e98b48373bc55910d2503487f6a18d36b500a04f 100644
--- a/Tests/Suite/Common/TestSuite.h
+++ b/Tests/Suite/Common/TestSuite.h
@@ -26,8 +26,8 @@
 #include "Sample/StandardSamples/ExemplarySamples.h"
 #include "Sim/Background/ConstantBackground.h"
 #include "Sim/Simulation/includeSimulations.h"
-#include "Tests/SimFactory/MakeSimulations.h"
 #include "Tests/GTestWrapper/google_test.h"
+#include "Tests/SimFactory/MakeSimulations.h"
 
 // By defining DISABLE_DISTRIBUTION_TESTS in the project, tests which contain particle distributions
 // can be set do DISABLED. This is useful since the tests in here are the same for Core/Py/GUI, but