diff --git a/src/libslic3r/BeltBrim.cpp b/src/libslic3r/BeltBrim.cpp
index 45ef5d14c9..d77f163467 100644
--- a/src/libslic3r/BeltBrim.cpp
+++ b/src/libslic3r/BeltBrim.cpp
@@ -8,8 +8,22 @@
 #include "Print.hpp"
 #include "ShortestPath.hpp"
 #include "Support/BeltFloorContext.hpp"
+#include "BoundingBox.hpp"
+#include "ExPolygon.hpp"
+#include "ExtrusionEntity.hpp"
+#include "ExtrusionEntityCollection.hpp"
+#include "Point.hpp"
+#include "Polyline.hpp"
+#include "PrintConfig.hpp"
+#include "libslic3r.h"
 
 #include <algorithm>
+#include <cmath>
+#include <cstddef>
+#include <cstdint>
+#include <cstdlib>
+#include <utility>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/BeltBrim.hpp b/src/libslic3r/BeltBrim.hpp
index d6f0980bc8..ac4986c311 100644
--- a/src/libslic3r/BeltBrim.hpp
+++ b/src/libslic3r/BeltBrim.hpp
@@ -5,6 +5,7 @@
 #include "ExtrusionEntityCollection.hpp"
 #include "Point.hpp"
 #include "Polyline.hpp"
+#include "libslic3r.h"
 
 #include <cmath>
 #include <vector>
diff --git a/src/libslic3r/BeltGCode.cpp b/src/libslic3r/BeltGCode.cpp
index 20b19e41b0..a78c0cbfa6 100644
--- a/src/libslic3r/BeltGCode.cpp
+++ b/src/libslic3r/BeltGCode.cpp
@@ -3,6 +3,10 @@
 #include "GCode/BeltKinematics.hpp"
 #include "BeltTransform.hpp"
 #include "Print.hpp"
+#include "Point.hpp"
+#include "PrintConfig.hpp"
+#include "libslic3r.h"
+#include <cstdlib>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/BeltGCode.hpp b/src/libslic3r/BeltGCode.hpp
index c643c6b8b0..1631a7dc9c 100644
--- a/src/libslic3r/BeltGCode.hpp
+++ b/src/libslic3r/BeltGCode.hpp
@@ -1,6 +1,8 @@
 #pragma once
 
 #include "GCode.hpp"
+#include "Point.hpp"
+#include "Print.hpp"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/BeltPurge.cpp b/src/libslic3r/BeltPurge.cpp
index c4cbc83425..3b5c5571a6 100644
--- a/src/libslic3r/BeltPurge.cpp
+++ b/src/libslic3r/BeltPurge.cpp
@@ -27,12 +27,19 @@
 #include "format.hpp"
 #include "LocalesUtils.hpp"
 #include "libslic3r.h"
+#include "BeltBrim.hpp"
+#include "PrintBase.hpp"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 
 #include <boost/log/trivial.hpp>
+#include <cassert>
+#include <cstddef>
+#include <functional>
+#include <utility>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/BeltSliceStrategy.cpp b/src/libslic3r/BeltSliceStrategy.cpp
index 74d8566000..8892b4e5de 100644
--- a/src/libslic3r/BeltSliceStrategy.cpp
+++ b/src/libslic3r/BeltSliceStrategy.cpp
@@ -1,7 +1,11 @@
 #include "BeltSliceStrategy.hpp"
 #include "Model.hpp"
+#include "BeltTransform.hpp"
+#include "Point.hpp"
+#include "PrintConfig.hpp"
 
 #include <limits>
+#include <algorithm>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/BeltTransform.cpp b/src/libslic3r/BeltTransform.cpp
index db23e13417..0a59507ff2 100644
--- a/src/libslic3r/BeltTransform.cpp
+++ b/src/libslic3r/BeltTransform.cpp
@@ -1,7 +1,16 @@
 #include "BeltTransform.hpp"
 #include "Model.hpp"
+#include "BoundingBox.hpp"
+#include "Config.hpp"
+#include "Geometry.hpp"
+#include "Point.hpp"
+#include "PrintConfig.hpp"
+#include "libslic3r.h"
 
 #include <limits>
+#include <algorithm>
+#include <cmath>
+#include <cstdlib>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/BeltTransform.hpp b/src/libslic3r/BeltTransform.hpp
index ad5b6d6ffd..2fe725e1df 100644
--- a/src/libslic3r/BeltTransform.hpp
+++ b/src/libslic3r/BeltTransform.hpp
@@ -5,6 +5,7 @@
 #include "BoundingBox.hpp"
 #include "PrintConfig.hpp"
 #include "Geometry.hpp"
+#include "Config.hpp"
 
 #include <cmath>
 
diff --git a/src/libslic3r/FirstLayerPlane.cpp b/src/libslic3r/FirstLayerPlane.cpp
index f668ea774e..7642d42267 100644
--- a/src/libslic3r/FirstLayerPlane.cpp
+++ b/src/libslic3r/FirstLayerPlane.cpp
@@ -1,5 +1,9 @@
 #include "FirstLayerPlane.hpp"
 #include "BeltTransform.hpp"
+#include "BoundingBox.hpp"
+#include "Point.hpp"
+#include "PrintConfig.hpp"
+#include "libslic3r.h"
 
 #include <algorithm>
 #include <climits>
diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
index a911ad2534..7fefed0f87 100644
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@@ -106,6 +106,7 @@
 #include <vector>
 #include "calib.hpp"
 #include "libslic3r_version.h"
+#include "GCode/BeltKinematics.hpp"
 // Intel redesigned some TBB interface considerably when merging TBB with their oneAPI set of libraries, see GH #7332.
 // We are using quite an old TBB 2017 U7. Before we update our build servers, let's use the old API, which is deprecated in up to date TBB.
 #if ! defined(TBB_VERSION_MAJOR)
diff --git a/src/libslic3r/GCode.hpp b/src/libslic3r/GCode.hpp
index 76e5fc9a7e..3a08ffccec 100644
--- a/src/libslic3r/GCode.hpp
+++ b/src/libslic3r/GCode.hpp
@@ -48,8 +48,10 @@
 #include <cfloat>
 #include <vector>
 #include <utility>
+#include <cmath>
 #include "BoundingBox.hpp"
 #include "Polyline.hpp"
+#include "BeltBrim.hpp"
 
 namespace Slic3r { class ExtrusionEntityCollection; }
 
diff --git a/src/libslic3r/GCode/BeltBackTransform.cpp b/src/libslic3r/GCode/BeltBackTransform.cpp
index 6a25bbd408..4b247323cd 100644
--- a/src/libslic3r/GCode/BeltBackTransform.cpp
+++ b/src/libslic3r/GCode/BeltBackTransform.cpp
@@ -1,5 +1,7 @@
 #include "BeltBackTransform.hpp"
 #include "../BeltTransform.hpp"
+#include "../Point.hpp"
+#include "../PrintConfig.hpp"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/GCode/BeltKinematics.cpp b/src/libslic3r/GCode/BeltKinematics.cpp
index 155e18d32d..c36c088658 100644
--- a/src/libslic3r/GCode/BeltKinematics.cpp
+++ b/src/libslic3r/GCode/BeltKinematics.cpp
@@ -2,6 +2,8 @@
 #include "../BeltTransform.hpp"
 #include "../PrintConfig.hpp"
 #include "../GCodeWriter.hpp"
+#include "../Point.hpp"
+#include <memory>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/GCode/BeltKinematics.hpp b/src/libslic3r/GCode/BeltKinematics.hpp
index f145ecf3e9..8f10bd1074 100644
--- a/src/libslic3r/GCode/BeltKinematics.hpp
+++ b/src/libslic3r/GCode/BeltKinematics.hpp
@@ -4,6 +4,7 @@
 #include "MachineKinematics.hpp"
 #include "BeltBackTransform.hpp"
 #include "MachineFrameTransform.hpp"
+#include "../Point.hpp"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/GCode/MachineFrameTransform.cpp b/src/libslic3r/GCode/MachineFrameTransform.cpp
index af09ba7353..9159dbca67 100644
--- a/src/libslic3r/GCode/MachineFrameTransform.cpp
+++ b/src/libslic3r/GCode/MachineFrameTransform.cpp
@@ -1,5 +1,8 @@
 #include "MachineFrameTransform.hpp"
 #include "../Geometry.hpp"
+#include "../Point.hpp"
+#include "../PrintConfig.hpp"
+#include "../libslic3r.h"
 
 #include <cmath>
 
diff --git a/src/libslic3r/GCode/MachineKinematics.cpp b/src/libslic3r/GCode/MachineKinematics.cpp
index 05f5375aef..063020fe8a 100644
--- a/src/libslic3r/GCode/MachineKinematics.cpp
+++ b/src/libslic3r/GCode/MachineKinematics.cpp
@@ -1,4 +1,5 @@
 #include "MachineKinematics.hpp"
+#include "../Point.hpp"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/GCode/ToolOrdering.cpp b/src/libslic3r/GCode/ToolOrdering.cpp
index 38e03717d2..10b34123b6 100644
--- a/src/libslic3r/GCode/ToolOrdering.cpp
+++ b/src/libslic3r/GCode/ToolOrdering.cpp
@@ -18,6 +18,7 @@
 #include "Utils.hpp"
 #include "format.hpp"
 #include "I18N.hpp"
+#include "../BeltBrim.hpp"
 
 #include <boost/log/trivial.hpp>
 #include <vector>
diff --git a/src/libslic3r/GCodeWriter.cpp b/src/libslic3r/GCodeWriter.cpp
index 0065ddb1cc..a6e81dfe1e 100644
--- a/src/libslic3r/GCodeWriter.cpp
+++ b/src/libslic3r/GCodeWriter.cpp
@@ -33,6 +33,7 @@
 #include <sstream>
 #include <stdexcept>
 #include <math.h>
+#include <memory>
 
 #ifdef __APPLE__
     #include <boost/spirit/include/karma.hpp>
diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp
index 4762116c85..9dc9ff3cd3 100644
--- a/src/libslic3r/Print.cpp
+++ b/src/libslic3r/Print.cpp
@@ -106,6 +106,7 @@
 #include "Format/STEP.hpp"
 #include "PlaceholderParser.hpp"
 #include "SurfaceCollection.hpp"
+#include "BeltBrim.hpp"
 
 namespace fs = boost::filesystem;
 
diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp
index 352416cd13..417b472bd0 100644
--- a/src/libslic3r/PrintObject.cpp
+++ b/src/libslic3r/PrintObject.cpp
@@ -83,6 +83,7 @@
 #include "Fill/Lightning/Generator.hpp"
 #include "SurfaceCollection.hpp"
 #include "TriangleMesh.hpp"
+#include "BeltBrim.hpp"
 
 namespace Slic3r { enum class EnforcerBlockerType : int8_t; }
 
diff --git a/src/libslic3r/Support/BeltFloorContext.cpp b/src/libslic3r/Support/BeltFloorContext.cpp
index eb6cf3670c..26078413dd 100644
--- a/src/libslic3r/Support/BeltFloorContext.cpp
+++ b/src/libslic3r/Support/BeltFloorContext.cpp
@@ -1,7 +1,15 @@
 #include "BeltFloorContext.hpp"
+#include "../Point.hpp"
+#include "../Polygon.hpp"
+#include "../PrintConfig.hpp"
+#include "../Slicing.hpp"
+#include "../libslic3r.h"
 
 #include <cmath>
 #include <limits>
+#include <cstddef>
+#include <functional>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Support/BeltFloorContext.hpp b/src/libslic3r/Support/BeltFloorContext.hpp
index 3a45a6eba8..629dfce4b6 100644
--- a/src/libslic3r/Support/BeltFloorContext.hpp
+++ b/src/libslic3r/Support/BeltFloorContext.hpp
@@ -5,6 +5,9 @@
 #include "../Polygon.hpp"
 #include "../Slicing.hpp"
 #include "../PrintConfig.hpp"
+#include <cstddef>
+#include <functional>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Support/SupportCommon.hpp b/src/libslic3r/Support/SupportCommon.hpp
index 0ab4034b89..ca91ecc5ae 100644
--- a/src/libslic3r/Support/SupportCommon.hpp
+++ b/src/libslic3r/Support/SupportCommon.hpp
@@ -7,6 +7,8 @@
 #include "libslic3r/ExtrusionEntity.hpp"
 #include "SupportLayer.hpp"
 #include "SupportParameters.hpp"
+#include "../Point.hpp"
+#include "../libslic3r.h"
 #include <utility>
 #include <algorithm>
 #include <vector>
diff --git a/src/libslic3r/Support/TreeModelVolumes.cpp b/src/libslic3r/Support/TreeModelVolumes.cpp
index 897e9a4e4e..f3e322154a 100644
--- a/src/libslic3r/Support/TreeModelVolumes.cpp
+++ b/src/libslic3r/Support/TreeModelVolumes.cpp
@@ -20,6 +20,7 @@
 #include "../Utils.hpp"
 #include "../format.hpp"
 #include "libslic3r/libslic3r.h"
+#include "../PrintConfig.hpp"
 
 #include <cstddef>
 #include <algorithm>
diff --git a/src/libslic3r/calib.cpp b/src/libslic3r/calib.cpp
index 19c6019a33..cdf105fa69 100644
--- a/src/libslic3r/calib.cpp
+++ b/src/libslic3r/calib.cpp
@@ -19,6 +19,8 @@
 #include <iomanip>
 #include <vector>
 #include <cstddef>
+#include <memory>
+#include <utility>
 #include "clonable_ptr.hpp"
 
 namespace Slic3r {
diff --git a/src/libslic3r/calib.hpp b/src/libslic3r/calib.hpp
index df3b0e39a4..1f1c7844dc 100644
--- a/src/libslic3r/calib.hpp
+++ b/src/libslic3r/calib.hpp
@@ -6,6 +6,7 @@
 #include <string>
 #include <vector>
 #include <utility>
+#include <memory>
 #define calib_pressure_advance_dd
 
 #include "GCodeWriter.hpp"
diff --git a/src/slic3r/GUI/3DBed.cpp b/src/slic3r/GUI/3DBed.cpp
index 5ab4893ee1..b28f9c5d1c 100644
--- a/src/slic3r/GUI/3DBed.cpp
+++ b/src/slic3r/GUI/3DBed.cpp
@@ -39,6 +39,8 @@
 
 #if BOOST_VERSION >= 107800
 #include <boost/timer/timer.hpp>
+#include <algorithm>
+#include <cmath>
 #else
 #include <boost/timer.hpp>
 #endif
diff --git a/src/slic3r/GUI/BeltPurgeTower.cpp b/src/slic3r/GUI/BeltPurgeTower.cpp
index e90491a972..c18d549db1 100644
--- a/src/slic3r/GUI/BeltPurgeTower.cpp
+++ b/src/slic3r/GUI/BeltPurgeTower.cpp
@@ -13,6 +13,9 @@
 #include "libslic3r/TriangleMesh.hpp"
 #include "libslic3r/Geometry.hpp"
 #include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
 
 #include <algorithm>
 #include <cmath>
@@ -21,6 +24,10 @@
 #include <vector>
 
 #include <boost/log/trivial.hpp>
+#include <cstddef>
+#include <math.h>
+#include <string>
+#include <utility>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/ConfigManipulation.cpp b/src/slic3r/GUI/ConfigManipulation.cpp
index c549ee5122..0d1c141fa8 100644
--- a/src/slic3r/GUI/ConfigManipulation.cpp
+++ b/src/slic3r/GUI/ConfigManipulation.cpp
@@ -17,6 +17,7 @@
 #include "slic3r/GUI/GUI.hpp"
 #include "libslic3r/libslic3r.h"
 #include "slic3r/GUI/Field.hpp"
+#include "libslic3r/BeltBrim.hpp"
 #include <cstdlib>
 #include <set>
 #include <map>
diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp
index c886b7d65a..cec7f9507e 100644
--- a/src/slic3r/GUI/GCodeViewer.cpp
+++ b/src/slic3r/GUI/GCodeViewer.cpp
@@ -89,6 +89,7 @@
 #include <algorithm>
 #include <cmath>
 #include <chrono>
+#include <Eigen/Geometry>
 #include "libslic3r/AppConfig.hpp"
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/CutUtils.hpp"
diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index 91af95c6f1..6da56e3d90 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -121,6 +121,7 @@
 // This is the only place where we want to allow that, so define an override macro.
 #define SLIC3R_ALLOW_LIBSLIC3R_I18N_IN_SLIC3R
 #include "libslic3r/I18N.hpp"
+#include "libslic3r/Point.hpp"
 #undef SLIC3R_ALLOW_LIBSLIC3R_I18N_IN_SLIC3R
 #include "slic3r/GUI/I18N.hpp"
 
diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp
index afdef711f6..8b9ad1bae7 100644
--- a/src/slic3r/GUI/GUI_App.hpp
+++ b/src/slic3r/GUI/GUI_App.hpp
@@ -30,6 +30,7 @@
 #include "slic3r/GUI/Jobs/UpgradeNetworkJob.hpp"
 #include "slic3r/GUI/HttpServer.hpp"
 #include "../Utils/PrintHost.hpp"
+#include "libslic3r/Point.hpp"
 
 #include <vector>
 #include <utility>
diff --git a/src/slic3r/GUI/Jobs/ArrangeJob.cpp b/src/slic3r/GUI/Jobs/ArrangeJob.cpp
index 3044b83bb7..8f9d013bb6 100644
--- a/src/slic3r/GUI/Jobs/ArrangeJob.cpp
+++ b/src/slic3r/GUI/Jobs/ArrangeJob.cpp
@@ -38,7 +38,10 @@
 #include "libslic3r/LifecycleEvents.hpp"
 #include <optional>
 #include "libslic3r/Geometry.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/Config.hpp"
 #include <cmath>
+#include <string>
 
 #define SAVE_ARRANGE_POLY 0
 
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index 6fb1a1e008..3684020f8a 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -267,6 +267,7 @@
 #include <libslic3r/CutUtils.hpp>
 #include <wx/glcanvas.h>    // Needs to be last because reasons :-/
 #include <libslic3r/miniz_extension.hpp>
+#include <math.h>
 #include "WipeTowerDialog.hpp"
 #include "MixedFilamentDialog.hpp"
 #include "TextureImportDialog.hpp"
diff --git a/src/slic3r/GUI/calib_dlg.hpp b/src/slic3r/GUI/calib_dlg.hpp
index de6aedde0d..eb0c5c9c01 100644
--- a/src/slic3r/GUI/calib_dlg.hpp
+++ b/src/slic3r/GUI/calib_dlg.hpp
@@ -17,6 +17,7 @@
 #include <wx/checklst.h>
 #include <wx/event.h>
 #include <wx/radiobox.h>
+#include <wx/sizer.h>
 #include "libslic3r/calib.hpp"
 
 namespace Slic3r { namespace GUI {
diff --git a/tests/fff_print/test_gcode_processor.cpp b/tests/fff_print/test_gcode_processor.cpp
index 3998b65547..2d3aab2909 100644
--- a/tests/fff_print/test_gcode_processor.cpp
+++ b/tests/fff_print/test_gcode_processor.cpp
@@ -8,6 +8,9 @@
 
 #include <fstream>
 #include <string>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
 
 using namespace Slic3r;
 using Catch::Matchers::WithinAbs;
diff --git a/tests/fff_print/test_gcodewriter.cpp b/tests/fff_print/test_gcodewriter.cpp
index fae002b35a..b0f36c33d9 100644
--- a/tests/fff_print/test_gcodewriter.cpp
+++ b/tests/fff_print/test_gcodewriter.cpp
@@ -8,6 +8,7 @@
 #include "libslic3r/Point.hpp"
 #include "libslic3r/Config.hpp"
 #include "libslic3r/Extruder.hpp"
+#include "libslic3r/Geometry.hpp"
 #include "libslic3r/libslic3r.h"
 #include <map>
 #include <memory>
diff --git a/tests/fff_print/test_precise_seam.cpp b/tests/fff_print/test_precise_seam.cpp
index 5012ca0a00..d5e2709cdd 100644
--- a/tests/fff_print/test_precise_seam.cpp
+++ b/tests/fff_print/test_precise_seam.cpp
@@ -23,9 +23,11 @@
 #include "libslic3r/GCode/SeamPlacer.hpp"
 #include "libslic3r/GCodeReader.hpp"
 #include "libslic3r/TriangleMesh.hpp"
+#include "libslic3r/ExPolygon.hpp"
 #include <cstddef>
 #include <string>
 #include <string_view>
+#include <cstdlib>
 
 using namespace Slic3r;
 
diff --git a/tests/fff_print/test_skirt_brim.cpp b/tests/fff_print/test_skirt_brim.cpp
index 4c7cb8d391..537aac8528 100644
--- a/tests/fff_print/test_skirt_brim.cpp
+++ b/tests/fff_print/test_skirt_brim.cpp
@@ -30,6 +30,9 @@
 #include <map>
 #include <set>
 #include <sstream>
+#include <boost/algorithm/string/predicate.hpp>
+#include <initializer_list>
+#include <utility>
 
 #include "test_helpers.hpp" // get access to init_print, etc
 #include "libslic3r/BoundingBox.hpp"
@@ -38,6 +41,10 @@
 #include "libslic3r/ExtrusionEntityCollection.hpp"
 #include "libslic3r/ObjectID.hpp"
 #include "libslic3r/Print.hpp"
+#include "libslic3r/BeltBrim.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/ExtrusionEntity.hpp"
+#include "libslic3r/TriangleMesh.hpp"
 
 using namespace Slic3r::Test;
 using namespace Slic3r;
diff --git a/tests/libslic3r/test_arrange.cpp b/tests/libslic3r/test_arrange.cpp
index c85aa625fe..d8c675954a 100644
--- a/tests/libslic3r/test_arrange.cpp
+++ b/tests/libslic3r/test_arrange.cpp
@@ -14,6 +14,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/matchers/catch_matchers.hpp>
 #include <catch2/generators/catch_generators.hpp>
+#include <catch2/catch_message.hpp>
 #include "libslic3r/Arrange.hpp"
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/ClipperUtils.hpp"
diff --git a/tests/libslic3r/test_belt_brim.cpp b/tests/libslic3r/test_belt_brim.cpp
index d5e99dafaa..05c650a809 100644
--- a/tests/libslic3r/test_belt_brim.cpp
+++ b/tests/libslic3r/test_belt_brim.cpp
@@ -1,9 +1,21 @@
 #include <catch2/catch_all.hpp>
+#include <algorithm>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <cmath>
+#include <cstddef>
+#include <cstdlib>
+#include <utility>
+#include <vector>
 
 #include "libslic3r/BeltBrim.hpp"
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/libslic3r.h"
 
 using namespace Slic3r;