diff --git a/include/FffGcodeWriter.h b/include/FffGcodeWriter.h
index e46f2b471c..7e5908e136 100644
--- a/include/FffGcodeWriter.h
+++ b/include/FffGcodeWriter.h
@@ -4,6 +4,9 @@
 #ifndef GCODE_WRITER_H
 #define GCODE_WRITER_H
 
+#include <fstream>
+#include <optional>
+
 #include "FanSpeedLayerTime.h"
 #include "LayerPlanBuffer.h"
 #include "gcodeExport.h"
@@ -12,9 +15,6 @@
 #include "utils/ExtrusionLine.h" //Processing variable-width paths.
 #include "utils/NoCopy.h"
 
-#include <fstream>
-#include <optional>
-
 namespace cura
 {
 
diff --git a/include/SupportInfillPart.h b/include/SupportInfillPart.h
index 70de71aecc..1767847cb7 100644
--- a/include/SupportInfillPart.h
+++ b/include/SupportInfillPart.h
@@ -4,12 +4,12 @@
 #ifndef SUPPORT_INFILL_PART_H
 #define SUPPORT_INFILL_PART_H
 
+#include <vector>
+
 #include "utils/AABB.h"
 #include "utils/ExtrusionLine.h"
 #include "utils/polygon.h"
 
-#include <vector>
-
 
 namespace cura
 {
diff --git a/include/pathPlanning/GCodePath.h b/include/pathPlanning/GCodePath.h
index 639e67bb85..da4efd30aa 100644
--- a/include/pathPlanning/GCodePath.h
+++ b/include/pathPlanning/GCodePath.h
@@ -4,6 +4,9 @@
 #ifndef PATH_PLANNING_G_CODE_PATH_H
 #define PATH_PLANNING_G_CODE_PATH_H
 
+#include <memory>
+#include <vector>
+
 #include "GCodePathConfig.h"
 #include "SpaceFillType.h"
 #include "TimeMaterialEstimates.h"
@@ -11,9 +14,6 @@
 #include "sliceDataStorage.h"
 #include "utils/IntPoint.h"
 
-#include <memory>
-#include <vector>
-
 namespace cura
 {
 
diff --git a/include/settings/PathConfigStorage.h b/include/settings/PathConfigStorage.h
index 4ba5bf2837..feafea23bf 100644
--- a/include/settings/PathConfigStorage.h
+++ b/include/settings/PathConfigStorage.h
@@ -4,14 +4,14 @@
 #ifndef SETTINGS_PATH_CONFIGS_H
 #define SETTINGS_PATH_CONFIGS_H
 
+#include <vector>
+
 #include "GCodePathConfig.h"
 #include "pathPlanning/SpeedDerivatives.h"
 #include "settings/MeshPathConfigs.h"
 #include "settings/types/LayerIndex.h"
 #include "utils/Coord_t.h"
 
-#include <vector>
-
 namespace cura
 {
 
diff --git a/src/LayerPlan.cpp b/src/LayerPlan.cpp
index 0da4344f6a..52305a9521 100644
--- a/src/LayerPlan.cpp
+++ b/src/LayerPlan.cpp
@@ -3,6 +3,15 @@
 
 #include "LayerPlan.h"
 
+#include <algorithm>
+#include <cstring>
+#include <numeric>
+#include <optional>
+
+#include <range/v3/algorithm/max_element.hpp>
+#include <scripta/logger.h>
+#include <spdlog/spdlog.h>
+
 #include "Application.h" //To communicate layer view data.
 #include "ExtruderTrain.h"
 #include "PathOrderMonotonic.h" //Monotonic ordering of skin lines.
@@ -20,15 +29,6 @@
 #include "utils/polygonUtils.h"
 #include "utils/section_type.h"
 
-#include <range/v3/algorithm/max_element.hpp>
-#include <scripta/logger.h>
-#include <spdlog/spdlog.h>
-
-#include <algorithm>
-#include <cstring>
-#include <numeric>
-#include <optional>
-
 namespace cura
 {
 
diff --git a/src/TreeSupport.cpp b/src/TreeSupport.cpp
index 9ce458d7f7..bf876ec582 100644
--- a/src/TreeSupport.cpp
+++ b/src/TreeSupport.cpp
@@ -3,6 +3,20 @@
 
 #include "TreeSupport.h"
 
+#include <chrono>
+#include <fstream>
+#include <optional>
+#include <stdio.h>
+#include <string>
+#include <thread>
+
+#include <range/v3/view/drop_last.hpp>
+#include <range/v3/view/enumerate.hpp>
+#include <range/v3/view/iota.hpp>
+#include <range/v3/view/reverse.hpp>
+#include <scripta/logger.h>
+#include <spdlog/spdlog.h>
+
 #include "Application.h" //To get settings.
 #include "TreeSupportTipGenerator.h"
 #include "TreeSupportUtils.h"
@@ -18,20 +32,6 @@
 #include "utils/polygonUtils.h" //For moveInside.
 #include "utils/section_type.h"
 
-#include <range/v3/view/drop_last.hpp>
-#include <range/v3/view/enumerate.hpp>
-#include <range/v3/view/iota.hpp>
-#include <range/v3/view/reverse.hpp>
-#include <scripta/logger.h>
-#include <spdlog/spdlog.h>
-
-#include <chrono>
-#include <fstream>
-#include <optional>
-#include <stdio.h>
-#include <string>
-#include <thread>
-
 namespace cura
 {
 
diff --git a/src/TreeSupportTipGenerator.cpp b/src/TreeSupportTipGenerator.cpp
index d362052739..094a819544 100644
--- a/src/TreeSupportTipGenerator.cpp
+++ b/src/TreeSupportTipGenerator.cpp
@@ -3,6 +3,17 @@
 
 #include "TreeSupportTipGenerator.h"
 
+#include <chrono>
+#include <fstream>
+#include <stdio.h>
+#include <string>
+
+#include <range/v3/view/drop_last.hpp>
+#include <range/v3/view/enumerate.hpp>
+#include <range/v3/view/iota.hpp>
+#include <range/v3/view/reverse.hpp>
+#include <spdlog/spdlog.h>
+
 #include "Application.h" //To get settings.
 #include "TreeSupportUtils.h"
 #include "infill/SierpinskiFillProvider.h"
@@ -13,17 +24,6 @@
 #include "utils/math.h" //For round_up_divide and PI.
 #include "utils/polygonUtils.h" //For moveInside.
 
-#include <range/v3/view/drop_last.hpp>
-#include <range/v3/view/enumerate.hpp>
-#include <range/v3/view/iota.hpp>
-#include <range/v3/view/reverse.hpp>
-#include <spdlog/spdlog.h>
-
-#include <chrono>
-#include <fstream>
-#include <stdio.h>
-#include <string>
-
 
 namespace cura
 {
diff --git a/src/support.cpp b/src/support.cpp
index 4f57ce44ee..1a641c208e 100644
--- a/src/support.cpp
+++ b/src/support.cpp
@@ -3,6 +3,21 @@
 
 #include "support.h"
 
+#include <cmath> // sqrt, round
+#include <deque>
+#include <fstream> // ifstream.good()
+#include <utility> // pair
+
+#include <range/v3/numeric/accumulate.hpp>
+#include <range/v3/view/drop.hpp>
+#include <range/v3/view/drop_last.hpp>
+#include <range/v3/view/enumerate.hpp>
+#include <range/v3/view/filter.hpp>
+#include <range/v3/view/slice.hpp>
+#include <range/v3/view/zip.hpp>
+#include <scripta/logger.h>
+#include <spdlog/spdlog.h>
+
 #include "Application.h" //To get settings.
 #include "BoostInterface.hpp"
 #include "ExtruderTrain.h"
@@ -24,21 +39,6 @@
 #include "utils/math.h"
 #include "utils/views/get.h"
 
-#include <range/v3/numeric/accumulate.hpp>
-#include <range/v3/view/drop.hpp>
-#include <range/v3/view/drop_last.hpp>
-#include <range/v3/view/enumerate.hpp>
-#include <range/v3/view/filter.hpp>
-#include <range/v3/view/slice.hpp>
-#include <range/v3/view/zip.hpp>
-#include <scripta/logger.h>
-#include <spdlog/spdlog.h>
-
-#include <cmath> // sqrt, round
-#include <deque>
-#include <fstream> // ifstream.good()
-#include <utility> // pair
-
 namespace cura
 {