diff --git a/src/libslic3r/CSGMesh/CSGMesh.hpp b/src/libslic3r/CSGMesh/CSGMesh.hpp
index ea16eae52a..5f3eeeb34d 100644
--- a/src/libslic3r/CSGMesh/CSGMesh.hpp
+++ b/src/libslic3r/CSGMesh/CSGMesh.hpp
@@ -2,6 +2,8 @@
 #define CSGMESH_HPP
 
 #include <libslic3r/AnyPtr.hpp>
+#include <libslic3r/Point.hpp>
+#include <libslic3r/TriangleMesh.hpp>
 #include <admesh/stl.h>
 
 namespace Slic3r { namespace csg {
diff --git a/src/libslic3r/CSGMesh/CSGMeshCopy.hpp b/src/libslic3r/CSGMesh/CSGMeshCopy.hpp
index 78800f9bbb..5533f219dc 100644
--- a/src/libslic3r/CSGMesh/CSGMeshCopy.hpp
+++ b/src/libslic3r/CSGMesh/CSGMeshCopy.hpp
@@ -2,6 +2,7 @@
 #define CSGMESHCOPY_HPP
 
 #include "CSGMesh.hpp"
+#include "libslic3r/libslic3r.h"
 
 namespace Slic3r { namespace csg {
 
diff --git a/src/libslic3r/CSGMesh/PerformCSGMeshBooleans.hpp b/src/libslic3r/CSGMesh/PerformCSGMeshBooleans.hpp
index df4a603382..2bc6b5bbbd 100644
--- a/src/libslic3r/CSGMesh/PerformCSGMeshBooleans.hpp
+++ b/src/libslic3r/CSGMesh/PerformCSGMeshBooleans.hpp
@@ -4,6 +4,8 @@
 #include <stack>
 #include <vector>
 
+#include <boost/log/trivial.hpp>
+
 #include "CSGMesh.hpp"
 
 #include "libslic3r/Execution/ExecutionTBB.hpp"
diff --git a/src/libslic3r/Clipper2ZUtils.hpp b/src/libslic3r/Clipper2ZUtils.hpp
index b0891d1c63..d7d2684318 100644
--- a/src/libslic3r/Clipper2ZUtils.hpp
+++ b/src/libslic3r/Clipper2ZUtils.hpp
@@ -5,6 +5,7 @@
 #include <algorithm>
 
 #include <clipper2/clipper2_z.hpp>
+#include <libslic3r/ExPolygon.hpp>
 #include <libslic3r/Point.hpp>
 namespace Slic3r { namespace Clipper2ZUtils {
 
diff --git a/src/libslic3r/Format/3mf.hpp b/src/libslic3r/Format/3mf.hpp
index c46b4e5533..ec59aff307 100644
--- a/src/libslic3r/Format/3mf.hpp
+++ b/src/libslic3r/Format/3mf.hpp
@@ -1,6 +1,7 @@
 #ifndef slic3r_Format_3mf_hpp_
 #define slic3r_Format_3mf_hpp_
 #include <expat.h>
+#include <string>
 
 namespace Slic3r {
 // PrusaFileParser is used to check 3mf file is from Prusa
diff --git a/src/libslic3r/Format/AMF.hpp b/src/libslic3r/Format/AMF.hpp
index e48e424748..335d47d6fb 100644
--- a/src/libslic3r/Format/AMF.hpp
+++ b/src/libslic3r/Format/AMF.hpp
@@ -5,6 +5,7 @@ namespace Slic3r {
 
 class Model;
 class DynamicPrintConfig;
+struct ConfigSubstitutionContext;
 
 // Load the content of an amf file into the given model and configuration.
 extern bool load_amf(const char* path, DynamicPrintConfig* config, ConfigSubstitutionContext* config_substitutions, Model* model, bool* use_inches);
diff --git a/src/libslic3r/Format/OBJ.hpp b/src/libslic3r/Format/OBJ.hpp
index c103326af6..41d90af770 100644
--- a/src/libslic3r/Format/OBJ.hpp
+++ b/src/libslic3r/Format/OBJ.hpp
@@ -2,6 +2,10 @@
 #define slic3r_Format_OBJ_hpp_
 #include "libslic3r/Color.hpp"
 #include "objparser.hpp"
+#include "libslic3r/Point.hpp"
+#include <admesh/stl.h>
+#include <functional>
+#include <map>
 #include <unordered_map>
 namespace Slic3r {
 
diff --git a/src/libslic3r/Format/objparser.hpp b/src/libslic3r/Format/objparser.hpp
index e711bdf6f4..b34c0f3bf2 100644
--- a/src/libslic3r/Format/objparser.hpp
+++ b/src/libslic3r/Format/objparser.hpp
@@ -6,6 +6,7 @@
 #include <array>
 #include <unordered_map>
 #include <istream>
+#include <memory>
 
 namespace ObjParser {
 
diff --git a/src/libslic3r/Format/svg.hpp b/src/libslic3r/Format/svg.hpp
index 095251c32a..cf6c35137f 100644
--- a/src/libslic3r/Format/svg.hpp
+++ b/src/libslic3r/Format/svg.hpp
@@ -1,4 +1,7 @@
 #pragma once
+
+#include <string>
+
 namespace Slic3r {
 class Model;
 
diff --git a/src/libslic3r/GCode/AdaptivePAProcessor.hpp b/src/libslic3r/GCode/AdaptivePAProcessor.hpp
index 01aa2f1104..c662191536 100644
--- a/src/libslic3r/GCode/AdaptivePAProcessor.hpp
+++ b/src/libslic3r/GCode/AdaptivePAProcessor.hpp
@@ -11,12 +11,14 @@
 #include <regex>
 #include <memory>
 #include <map>
+#include <unordered_map>
 #include "AdaptivePAInterpolator.hpp"
 
 namespace Slic3r {
 
 // Forward declaration of GCode class
 class GCode;
+class PrintConfig;
 
 /**
  * @brief Class for processing G-code layers with adaptive pressure advance.
diff --git a/src/libslic3r/GCode/CoolingBuffer.hpp b/src/libslic3r/GCode/CoolingBuffer.hpp
index 742b8f78b7..553f226011 100644
--- a/src/libslic3r/GCode/CoolingBuffer.hpp
+++ b/src/libslic3r/GCode/CoolingBuffer.hpp
@@ -2,6 +2,7 @@
 #define slic3r_CoolingBuffer_hpp_
 
 #include "../libslic3r.h"
+#include "../Point.hpp"
 #include <map>
 #include <string>
 #include <cfloat>
@@ -10,6 +11,7 @@ namespace Slic3r {
 
 class GCode;
 class Layer;
+class PrintConfig;
 struct PerExtruderAdjustments;
 
 // A standalone G-code filter, to control cooling of the print.
diff --git a/src/libslic3r/GCode/PressureEqualizer.hpp b/src/libslic3r/GCode/PressureEqualizer.hpp
index 2f2982860e..b5e2052e5f 100644
--- a/src/libslic3r/GCode/PressureEqualizer.hpp
+++ b/src/libslic3r/GCode/PressureEqualizer.hpp
@@ -2,6 +2,7 @@
 #define slic3r_GCode_PressureEqualizer_hpp_
 
 #include "../libslic3r.h"
+#include "../ExtrusionEntity.hpp"
 #include "../PrintConfig.hpp"
 
 #include <queue>
diff --git a/src/libslic3r/GCodeSender.hpp b/src/libslic3r/GCodeSender.hpp
index 3a2055e54f..5d9dea66e1 100644
--- a/src/libslic3r/GCodeSender.hpp
+++ b/src/libslic3r/GCodeSender.hpp
@@ -6,6 +6,7 @@
 #include <string>
 #include <vector>
 #include <boost/asio.hpp>
+#include <boost/noncopyable.hpp>
 #include <boost/bind/bind.hpp>
 #include <boost/thread.hpp>
 
diff --git a/src/libslic3r/MarchingSquares.hpp b/src/libslic3r/MarchingSquares.hpp
index 7eb0b25806..0880f68877 100644
--- a/src/libslic3r/MarchingSquares.hpp
+++ b/src/libslic3r/MarchingSquares.hpp
@@ -7,6 +7,8 @@
 #include <vector>
 #include <algorithm>
 #include <cassert>
+#include <cstdio>
+#include <iomanip>
 
 // Marching squares
 //
diff --git a/src/libslic3r/MeasureUtils.hpp b/src/libslic3r/MeasureUtils.hpp
index 2fdac52443..f22f9d377d 100644
--- a/src/libslic3r/MeasureUtils.hpp
+++ b/src/libslic3r/MeasureUtils.hpp
@@ -1,8 +1,13 @@
 #ifndef Slic3r_MeasureUtils_hpp_
 #define Slic3r_MeasureUtils_hpp_
 
+#include <cmath>
+#include <cstddef>
+#include <cstdint>
 #include <initializer_list>
 
+#include "Point.hpp"
+
 namespace Slic3r {
 namespace Measure {
 
diff --git a/src/libslic3r/MutablePriorityQueue.hpp b/src/libslic3r/MutablePriorityQueue.hpp
index 2565f417f8..f06acaa93e 100644
--- a/src/libslic3r/MutablePriorityQueue.hpp
+++ b/src/libslic3r/MutablePriorityQueue.hpp
@@ -2,7 +2,11 @@
 #define slic3r_MutablePriorityQueue_hpp_
 
 #include <assert.h>
+#include <cstddef>
+#include <limits>
 #include <type_traits>
+#include <utility>
+#include <vector>
 constexpr auto InvalidQueueID = std::numeric_limits<size_t>::max();
 template<typename T, typename IndexSetter, typename LessPredicate, const bool ResetIndexWhenRemoved = false>
 class MutablePriorityQueue
diff --git a/src/libslic3r/TriangleMeshSlicer.hpp b/src/libslic3r/TriangleMeshSlicer.hpp
index 1f7bba9d27..351f3d1d02 100644
--- a/src/libslic3r/TriangleMeshSlicer.hpp
+++ b/src/libslic3r/TriangleMeshSlicer.hpp
@@ -3,6 +3,8 @@
 
 #include <functional>
 #include <vector>
+#include <admesh/stl.h>
+
 #include "Polygon.hpp"
 #include "ExPolygon.hpp"