diff --git a/Base/Py/PyUtils.cpp b/Base/Py/PyUtils.cpp
index 94a803ad6bed8f1b1db9cf1582d322c911c5e9bf..4c5749041c1385a42a570dd4212b16942f6416ad 100644
--- a/Base/Py/PyUtils.cpp
+++ b/Base/Py/PyUtils.cpp
@@ -14,8 +14,8 @@
 
 #ifdef BORNAGAIN_PYTHON
 
-#include "Base/Py/PyUtil.h"
 #include "Base/Py/PyCore.h"
+#include "Base/Py/PyUtil.h"
 #include "Base/Util/Assert.h"
 #include "Base/Util/SysUtil.h"
 #include <iostream>
diff --git a/Base/Util/FileSystemUtils.cpp b/Base/Util/FileSystemUtils.cpp
index b4424f62846472c612e188b12e3a61b2af5c8c13..00580225a419a26b11ea550506a15ce0dca5cd55 100644
--- a/Base/Util/FileSystemUtils.cpp
+++ b/Base/Util/FileSystemUtils.cpp
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#include "Base/Util/FileSystemUtil.h"
 #include "Base/Util/Assert.h"
+#include "Base/Util/FileSystemUtil.h"
 #include "Base/Util/StringUtil.h"
 #include <codecvt> //
 #include <filesystem>
diff --git a/Device/Data/ArrayUtils.cpp b/Device/Data/ArrayUtils.cpp
index beca06cc878e81a3b15cd53232740154095ef7b0..cef60ee7d2c2196662cfdd4e142861f17a2487a1 100644
--- a/Device/Data/ArrayUtils.cpp
+++ b/Device/Data/ArrayUtils.cpp
@@ -12,9 +12,9 @@
 //
 //  ************************************************************************************************
 
-#include "Device/Data/ArrayUtil.h"
 #include "Base/Axis/FixedBinAxis.h"
 #include "Base/Util/Assert.h"
+#include "Device/Data/ArrayUtil.h"
 #include "Device/Data/Datafield.h"
 #include <stdexcept>
 
diff --git a/Device/Data/DataUtils.cpp b/Device/Data/DataUtils.cpp
index f41c14a817321c64914c51c01d49b3922203e6f9..0a1cfe68578350c7b67bda42eb16788da351a155 100644
--- a/Device/Data/DataUtils.cpp
+++ b/Device/Data/DataUtils.cpp
@@ -12,13 +12,13 @@
 //
 //  ************************************************************************************************
 
-#include "Device/Data/DataUtil.h"
 #include "Base/Axis/Bin.h"
 #include "Base/Axis/FixedBinAxis.h"
 #include "Base/Axis/Frame.h"
 #include "Base/Math/FourierTransform.h"
 #include "Base/Util/Assert.h"
 #include "Device/Data/ArrayUtil.h"
+#include "Device/Data/DataUtil.h"
 #include "Device/Data/Datafield.h"
 #include <algorithm>
 #include <cmath>
diff --git a/Device/IO/DataFormatUtils.cpp b/Device/IO/DataFormatUtils.cpp
index 76df5216d8c652c6ab08950fbcaaa3e687b9bf77..7592f68ebaa8a56601d7a85a29def435dea481b8 100644
--- a/Device/IO/DataFormatUtils.cpp
+++ b/Device/IO/DataFormatUtils.cpp
@@ -12,13 +12,13 @@
 //
 //  ************************************************************************************************
 
-#include "Device/IO/DataFormatUtil.h"
 #include "Base/Axis/DiscreteAxis.h"
 #include "Base/Axis/FixedBinAxis.h"
 #include "Base/Axis/HistoAxis.h"
 #include "Base/Util/FileSystemUtil.h"
 #include "Base/Util/StringUtil.h"
 #include "Device/Data/Datafield.h"
+#include "Device/IO/DataFormatUtil.h"
 #include <functional>
 #include <iostream>
 #include <iterator>
diff --git a/GUI/Model/Data/JobItemUtils.cpp b/GUI/Model/Data/JobItemUtils.cpp
index c4517a217470c13c2533eab66a98f09c1febd083..f06b395efda9bff97549495ab464fb6f6c0850cb 100644
--- a/GUI/Model/Data/JobItemUtils.cpp
+++ b/GUI/Model/Data/JobItemUtils.cpp
@@ -12,11 +12,11 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Model/Data/JobItemUtil.h"
 #include "Device/Coord/ICoordSystem.h"
 #include "Device/Data/Datafield.h"
 #include "Device/Histo/SimulationResult.h"
 #include "GUI/Model/Data/DataItem.h"
+#include "GUI/Model/Data/JobItemUtil.h"
 #include "GUI/Model/Device/InstrumentItems.h"
 #include "GUI/Support/Util/CoordName.h"
 
diff --git a/GUI/Model/Model/ParameterTreeUtils.cpp b/GUI/Model/Model/ParameterTreeUtils.cpp
index 1b2f32b931392f2bfff6091b225d7be8d96f0f71..252e4dee55a728b0d2a11271e3c42ad16139e088 100644
--- a/GUI/Model/Model/ParameterTreeUtils.cpp
+++ b/GUI/Model/Model/ParameterTreeUtils.cpp
@@ -12,7 +12,6 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Model/Model/ParameterTreeUtil.h"
 #include "GUI/Model/Descriptor/DistributionItems.h"
 #include "GUI/Model/Device/BackgroundItems.h"
 #include "GUI/Model/Device/BeamAngleItems.h"
@@ -25,6 +24,7 @@
 #include "GUI/Model/Device/SphericalDetectorItem.h"
 #include "GUI/Model/Job/JobItem.h"
 #include "GUI/Model/Job/ParameterTreeItems.h"
+#include "GUI/Model/Model/ParameterTreeUtil.h"
 #include "GUI/Model/Sample/CompoundItem.h"
 #include "GUI/Model/Sample/CoreAndShellItem.h"
 #include "GUI/Model/Sample/LayerItem.h"
diff --git a/GUI/Support/Util/StyleUtils.cpp b/GUI/Support/Util/StyleUtils.cpp
index 3704443769a5bf22ef84e5d37aa6e6613aafa0fc..de210adf670fd58472125664b4174d33a622baf4 100644
--- a/GUI/Support/Util/StyleUtils.cpp
+++ b/GUI/Support/Util/StyleUtils.cpp
@@ -12,9 +12,9 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Support/Util/StyleUtil.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Support/Util/DesignerHelper.h"
+#include "GUI/Support/Util/StyleUtil.h"
 #include <QApplication>
 #include <QBoxLayout>
 #include <QDialog>
diff --git a/GUI/View/Import/ImportDataUtils.cpp b/GUI/View/Import/ImportDataUtils.cpp
index 40d30cd031f4a965eb54259304b0f3e0b3b19da9..ad2ef9e185c57e171adb29fca8157e35a72370e8 100644
--- a/GUI/View/Import/ImportDataUtils.cpp
+++ b/GUI/View/Import/ImportDataUtils.cpp
@@ -12,11 +12,11 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Import/ImportDataUtil.h"
 #include "Device/Data/Datafield.h"
 #include "Device/IO/DataFormatUtil.h"
 #include "GUI/Model/Data/RealItem.h"
 #include "GUI/Support/IO/ImportDataInfo.h"
+#include "GUI/View/Import/ImportDataUtil.h"
 #include "GUI/View/Loaders/QREDataLoader.h"
 #include <QApplication>
 #include <QMessageBox>
diff --git a/GUI/View/Numeric/NumWidgetUtils.cpp b/GUI/View/Numeric/NumWidgetUtils.cpp
index a4e3838c6b302495944e2209d9f74d7b2c82c09a..b4b063106a611e6a429345e0f0bfb6f54436ee95 100644
--- a/GUI/View/Numeric/NumWidgetUtils.cpp
+++ b/GUI/View/Numeric/NumWidgetUtils.cpp
@@ -12,9 +12,9 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Numeric/NumWidgetUtil.h"
 #include "GUI/Model/Data/ComboProperty.h"
 #include "GUI/View/Numeric/DoubleSpinBox.h"
+#include "GUI/View/Numeric/NumWidgetUtil.h"
 #include "GUI/View/Numeric/NumberUtil.h"
 #include "GUI/View/Numeric/ScientificSpinBox.h"
 #include <QCheckBox>
diff --git a/GUI/View/PlotUtil/RangeUtils.cpp b/GUI/View/PlotUtil/RangeUtils.cpp
index 6c285a3f8b825b5206362e249d42ccc3d75d7c0e..9d4310fa04fed678e804f1ba7c0230ff9a1141e7 100644
--- a/GUI/View/PlotUtil/RangeUtils.cpp
+++ b/GUI/View/PlotUtil/RangeUtils.cpp
@@ -12,12 +12,12 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/PlotUtil/RangeUtil.h"
 #include "GUI/Model/Axis/AxisItems.h"
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Data/SpecularDataItem.h"
 #include "GUI/Support/Util/Error.h"
 #include "GUI/Support/Util/StyleUtil.h"
+#include "GUI/View/PlotUtil/RangeUtil.h"
 #include <qcustomplot.h>
 
 namespace {
diff --git a/GUI/View/SampleDesigner/LayerEditorUtils.cpp b/GUI/View/SampleDesigner/LayerEditorUtils.cpp
index 902366960c61df85848a4f97f8884f5e28041d78..85011fb73be606a3ab3531c6abe72eb5539c8d38 100644
--- a/GUI/View/SampleDesigner/LayerEditorUtils.cpp
+++ b/GUI/View/SampleDesigner/LayerEditorUtils.cpp
@@ -12,7 +12,6 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/SampleDesigner/LayerEditorUtil.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Sample/CompoundItem.h"
 #include "GUI/Model/Sample/CoreAndShellItem.h"
@@ -25,6 +24,7 @@
 #include "GUI/View/SampleDesigner/CompoundForm.h"
 #include "GUI/View/SampleDesigner/CoreAndShellForm.h"
 #include "GUI/View/SampleDesigner/FormLayouter.h"
+#include "GUI/View/SampleDesigner/LayerEditorUtil.h"
 #include "GUI/View/SampleDesigner/MesocrystalForm.h"
 #include "GUI/View/SampleDesigner/ParticleForm.h"
 #include <QLabel>
diff --git a/Img3D/Build/BuilderUtils.cpp b/Img3D/Build/BuilderUtils.cpp
index c290f0629429e9117bc5599e1a735efa67af307d..d76959e9533f8c8e5da46c8fb085de0eb88e7302 100644
--- a/Img3D/Build/BuilderUtils.cpp
+++ b/Img3D/Build/BuilderUtils.cpp
@@ -12,9 +12,9 @@
 //
 //  ************************************************************************************************
 
-#include "Img3D/Build/BuilderUtil.h"
 #include "Base/Const/Units.h"
 #include "Base/Util/Assert.h"
+#include "Img3D/Build/BuilderUtil.h"
 #include "Img3D/Build/Particle3DContainer.h"
 #include "Img3D/Model/ParticleFromFF.h"
 #include "Img3D/Model/Particles.h"
diff --git a/Sample/Material/MaterialUtils.cpp b/Sample/Material/MaterialUtils.cpp
index bf922b59891172ecbd1e5029a987ef0138f12428..f0c6806f707af9fb3f3f8a4f1d7b19ca9fbc213d 100644
--- a/Sample/Material/MaterialUtils.cpp
+++ b/Sample/Material/MaterialUtils.cpp
@@ -12,12 +12,12 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/Material/MaterialUtil.h"
 #include "Base/Const/PhysicalConstants.h"
 #include "Base/Spin/SpinMatrix.h"
 #include "Base/Util/Assert.h"
 #include "Sample/Material/IMaterialImpl.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
+#include "Sample/Material/MaterialUtil.h"
 
 using PhysConsts::g_factor_n;
 using PhysConsts::h_bar;
diff --git a/Sample/Multilayer/MultilayerUtils.cpp b/Sample/Multilayer/MultilayerUtils.cpp
index b67640b60239a83e566fbc31495e00c84daccad5..f49b73b1d996512a2bb11cb0cd780003d6d6eaa2 100644
--- a/Sample/Multilayer/MultilayerUtils.cpp
+++ b/Sample/Multilayer/MultilayerUtils.cpp
@@ -12,11 +12,11 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/Multilayer/MultilayerUtil.h"
 #include "Base/Util/Assert.h"
 #include "Sample/Interface/LayerInterface.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
+#include "Sample/Multilayer/MultilayerUtil.h"
 
 const LayerRoughness* SampleUtils::Multilayer::LayerTopRoughness(const MultiLayer& sample, size_t i)
 {
diff --git a/Sim/Fitting/ObjectiveMetricUtils.cpp b/Sim/Fitting/ObjectiveMetricUtils.cpp
index 806ad5ff0f2fec431ceabc7270ecbca6215ffd3e..538fbebaa4b516fcd2fc443998754f7597b90427 100644
--- a/Sim/Fitting/ObjectiveMetricUtils.cpp
+++ b/Sim/Fitting/ObjectiveMetricUtils.cpp
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#include "Sim/Fitting/ObjectiveMetricUtil.h"
 #include "Sim/Fitting/ObjectiveMetric.h"
+#include "Sim/Fitting/ObjectiveMetricUtil.h"
 #include <algorithm>
 #include <cmath>
 #include <map>
diff --git a/Tests/Unit/Base/FileSystemUtilsTest.cpp b/Tests/Unit/Base/FileSystemUtilsTest.cpp
index 2c9b3b6bf21d263dd772a024324019cb44bb822b..e67e67b30c1d0a113a1b831824867d750f3d9c4d 100644
--- a/Tests/Unit/Base/FileSystemUtilsTest.cpp
+++ b/Tests/Unit/Base/FileSystemUtilsTest.cpp
@@ -1,5 +1,5 @@
-#include "Base/Util/FileSystemUtil.h"
 #include "BATesting.h"
+#include "Base/Util/FileSystemUtil.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include <filesystem>
 #include <fstream>
diff --git a/Tests/Unit/Base/StringUtilsTest.cpp b/Tests/Unit/Base/StringUtilsTest.cpp
index d841fc067549df36bfcb78c83ab8362b44542d06..ec60f3ce8b71d7a9db93abc0096a4dd19fc08a0e 100644
--- a/Tests/Unit/Base/StringUtilsTest.cpp
+++ b/Tests/Unit/Base/StringUtilsTest.cpp
@@ -1,5 +1,5 @@
-#include "Base/Util/StringUtil.h"
 #include "BATesting.h"
+#include "Base/Util/StringUtil.h"
 #include "Tests/GTestWrapper/google_test.h"
 
 TEST(StringUtilsTest, toInt)
diff --git a/Tests/Unit/Device/ArrayUtilsTest.cpp b/Tests/Unit/Device/ArrayUtilsTest.cpp
index 7eaeccea207de4a1e0aaa99f08a65d2b711d7bc3..7ef8f9005aa168a715b7c9b5b4f99b05891e1262 100644
--- a/Tests/Unit/Device/ArrayUtilsTest.cpp
+++ b/Tests/Unit/Device/ArrayUtilsTest.cpp
@@ -1,5 +1,5 @@
-#include "Device/Data/ArrayUtil.h"
 #include "Base/Axis/FixedBinAxis.h"
+#include "Device/Data/ArrayUtil.h"
 #include "Device/Data/Datafield.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include <vector>