diff --git a/src/libslic3r/AStar.hpp b/src/libslic3r/AStar.hpp
index a7d9e7b8f9..e79295c503 100644
--- a/src/libslic3r/AStar.hpp
+++ b/src/libslic3r/AStar.hpp
@@ -1,7 +1,11 @@
 #ifndef ASTAR_HPP
 #define ASTAR_HPP
 
+#include <cassert>
 #include <cmath> // std::isinf() is here
+#include <type_traits>
+#include <cstddef>
+#include <limits>
 #include <unordered_map>
 
 #include "libslic3r/MutablePriorityQueue.hpp"
diff --git a/src/libslic3r/Arrange.hpp b/src/libslic3r/Arrange.hpp
index ad125aee7d..ea89640a7b 100644
--- a/src/libslic3r/Arrange.hpp
+++ b/src/libslic3r/Arrange.hpp
@@ -2,8 +2,17 @@
 #define ARRANGE_HPP
 
 #include "ExPolygon.hpp"
+#include "Point.hpp"
+#include "Polygon.hpp"
 #include "PrintConfig.hpp"
 #include "Print.hpp"
+#include <cmath>
+#include "libslic3r.h"
+#include <vector>
+#include <string>
+#include <functional>
+#include <iostream>
+#include <ostream>
 
 #define BED_SHRINK_SEQ_PRINT 5
 
diff --git a/src/libslic3r/CSGMesh/CSGMesh.hpp b/src/libslic3r/CSGMesh/CSGMesh.hpp
index 5f3eeeb34d..bb5060b0d3 100644
--- a/src/libslic3r/CSGMesh/CSGMesh.hpp
+++ b/src/libslic3r/CSGMesh/CSGMesh.hpp
@@ -5,6 +5,8 @@
 #include <libslic3r/Point.hpp>
 #include <libslic3r/TriangleMesh.hpp>
 #include <admesh/stl.h>
+#include <string>
+#include <utility>
 
 namespace Slic3r { namespace csg {
 
diff --git a/src/libslic3r/CSGMesh/CSGMeshCopy.hpp b/src/libslic3r/CSGMesh/CSGMeshCopy.hpp
index 5533f219dc..f00b24b535 100644
--- a/src/libslic3r/CSGMesh/CSGMeshCopy.hpp
+++ b/src/libslic3r/CSGMesh/CSGMeshCopy.hpp
@@ -1,8 +1,11 @@
 #ifndef CSGMESHCOPY_HPP
 #define CSGMESHCOPY_HPP
 
+#include "libslic3r/AnyPtr.hpp"
 #include "CSGMesh.hpp"
 #include "libslic3r/libslic3r.h"
+#include <utility>
+#include <cstddef>
 
 namespace Slic3r { namespace csg {
 
diff --git a/src/libslic3r/CSGMesh/ModelToCSGMesh.hpp b/src/libslic3r/CSGMesh/ModelToCSGMesh.hpp
index 5963b29109..2dcd2eef2e 100644
--- a/src/libslic3r/CSGMesh/ModelToCSGMesh.hpp
+++ b/src/libslic3r/CSGMesh/ModelToCSGMesh.hpp
@@ -3,9 +3,13 @@
 
 #include "CSGMesh.hpp"
 
+#include "libslic3r/Point.hpp"
+#include "libslic3r/TriangleMesh.hpp"
 #include "libslic3r/Model.hpp"
 #include "libslic3r/SLA/Hollowing.hpp"
 #include "libslic3r/MeshSplitImpl.hpp"
+#include <utility>
+#include <memory>
 
 namespace Slic3r { namespace csg {
 
diff --git a/src/libslic3r/CSGMesh/PerformCSGMeshBooleans.hpp b/src/libslic3r/CSGMesh/PerformCSGMeshBooleans.hpp
index 2bc6b5bbbd..091621ab84 100644
--- a/src/libslic3r/CSGMesh/PerformCSGMeshBooleans.hpp
+++ b/src/libslic3r/CSGMesh/PerformCSGMeshBooleans.hpp
@@ -1,13 +1,17 @@
 #ifndef PERFORMCSGMESHBOOLEANS_HPP
 #define PERFORMCSGMESHBOOLEANS_HPP
 
+#include <cstddef>
 #include <stack>
+#include <utility>
+#include <tuple>
 #include <vector>
 
 #include <boost/log/trivial.hpp>
 
 #include "CSGMesh.hpp"
 
+#include "libslic3r/libslic3r.h"
 #include "libslic3r/Execution/ExecutionTBB.hpp"
 //#include "libslic3r/Execution/ExecutionSeq.hpp"
 #include "libslic3r/MeshBoolean.hpp"
diff --git a/src/libslic3r/CSGMesh/SliceCSGMesh.hpp b/src/libslic3r/CSGMesh/SliceCSGMesh.hpp
index 9d7b9a077d..165e9af2b6 100644
--- a/src/libslic3r/CSGMesh/SliceCSGMesh.hpp
+++ b/src/libslic3r/CSGMesh/SliceCSGMesh.hpp
@@ -3,8 +3,16 @@
 
 #include "CSGMesh.hpp"
 
+#include <cstddef>
+#include <functional>
+#include <cassert>
 #include <stack>
+#include <vector>
+#include <utility>
 
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Execution/Execution.hpp"
 #include "libslic3r/TriangleMeshSlicer.hpp"
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/Execution/ExecutionTBB.hpp"
diff --git a/src/libslic3r/CSGMesh/TriangleMeshAdapter.hpp b/src/libslic3r/CSGMesh/TriangleMeshAdapter.hpp
index 81b05b0463..d5586823fb 100644
--- a/src/libslic3r/CSGMesh/TriangleMeshAdapter.hpp
+++ b/src/libslic3r/CSGMesh/TriangleMeshAdapter.hpp
@@ -3,6 +3,7 @@
 
 #include "CSGMesh.hpp"
 
+#include "libslic3r/Point.hpp"
 #include "libslic3r/TriangleMesh.hpp"
 
 namespace Slic3r { namespace csg {
diff --git a/src/libslic3r/Format/OBJ.hpp b/src/libslic3r/Format/OBJ.hpp
index 41d90af770..0767ddd87d 100644
--- a/src/libslic3r/Format/OBJ.hpp
+++ b/src/libslic3r/Format/OBJ.hpp
@@ -4,9 +4,12 @@
 #include "objparser.hpp"
 #include "libslic3r/Point.hpp"
 #include <admesh/stl.h>
+#include <array>
 #include <functional>
 #include <map>
+#include <string>
 #include <unordered_map>
+#include <vector>
 namespace Slic3r {
 
 class TriangleMesh;
diff --git a/src/libslic3r/Format/STEP.hpp b/src/libslic3r/Format/STEP.hpp
index 7587bbad4e..5563a690c8 100644
--- a/src/libslic3r/Format/STEP.hpp
+++ b/src/libslic3r/Format/STEP.hpp
@@ -3,10 +3,19 @@
 #include "XCAFDoc_DocumentTool.hxx"
 #include "XCAFApp_Application.hxx"
 #include "XCAFDoc_ShapeTool.hxx"
+#include <Standard_TypeDef.hxx>
+#include <Standard_Handle.hxx>
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem.hpp>
 #include <Message_ProgressIndicator.hxx>
 #include <atomic>
+#include <functional>
+#include <string>
+#include <iostream>
+#include <ios>
+#include <iomanip>
+#include <ostream>
+#include <vector>
 
 namespace fs = boost::filesystem;
 
diff --git a/src/libslic3r/GCode/CoolingBuffer.hpp b/src/libslic3r/GCode/CoolingBuffer.hpp
index 553f226011..0f7e27b14f 100644
--- a/src/libslic3r/GCode/CoolingBuffer.hpp
+++ b/src/libslic3r/GCode/CoolingBuffer.hpp
@@ -3,9 +3,11 @@
 
 #include "../libslic3r.h"
 #include "../Point.hpp"
+#include <cstddef>
 #include <map>
 #include <string>
 #include <cfloat>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/GCode/FanMover.cpp b/src/libslic3r/GCode/FanMover.cpp
index 211e7d7ebd..cb5fc310ee 100644
--- a/src/libslic3r/GCode/FanMover.cpp
+++ b/src/libslic3r/GCode/FanMover.cpp
@@ -1,5 +1,7 @@
 #include "FanMover.hpp"
 
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/libslic3r.h"
 #include "libslic3r/ExtrusionEntity.hpp"
 #include "GCodeReader.hpp"
 
diff --git a/src/libslic3r/GCode/PressureEqualizer.hpp b/src/libslic3r/GCode/PressureEqualizer.hpp
index b5e2052e5f..be8e0e77fe 100644
--- a/src/libslic3r/GCode/PressureEqualizer.hpp
+++ b/src/libslic3r/GCode/PressureEqualizer.hpp
@@ -4,6 +4,12 @@
 #include "../libslic3r.h"
 #include "../ExtrusionEntity.hpp"
 #include "../PrintConfig.hpp"
+#include <string>
+#include <cstddef>
+#include <vector>
+#include <cmath>
+#include <algorithm>
+#include <cassert>
 
 #include <queue>
 
diff --git a/src/libslic3r/GCodeSender.hpp b/src/libslic3r/GCodeSender.hpp
index 5d9dea66e1..e9f97e2a29 100644
--- a/src/libslic3r/GCodeSender.hpp
+++ b/src/libslic3r/GCodeSender.hpp
@@ -3,6 +3,13 @@
 
 #include "libslic3r.h"
 #include <queue>
+#include <boost/core/noncopyable.hpp>
+#include <cstddef>
+#include <boost/asio/io_service.hpp>
+#include <boost/asio/serial_port.hpp>
+#include <boost/asio/streambuf.hpp>
+#include <list>
+#include <deque>
 #include <string>
 #include <vector>
 #include <boost/asio.hpp>
diff --git a/src/libslic3r/MarchingSquares.hpp b/src/libslic3r/MarchingSquares.hpp
index 0880f68877..e123dd14e0 100644
--- a/src/libslic3r/MarchingSquares.hpp
+++ b/src/libslic3r/MarchingSquares.hpp
@@ -2,6 +2,10 @@
 #define MARCHINGSQUARES_HPP
 
 #include "Execution/ExecutionTBB.hpp"
+#include <ostream>
+#include "libslic3r/Execution/Execution.hpp"
+#include <array>
+#include <iterator>
 #include <type_traits>
 #include <cstdint>
 #include <vector>
diff --git a/src/libslic3r/MeasureUtils.hpp b/src/libslic3r/MeasureUtils.hpp
index f22f9d377d..5e34c6fdf8 100644
--- a/src/libslic3r/MeasureUtils.hpp
+++ b/src/libslic3r/MeasureUtils.hpp
@@ -1,10 +1,12 @@
 #ifndef Slic3r_MeasureUtils_hpp_
 #define Slic3r_MeasureUtils_hpp_
 
+#include <algorithm>
 #include <cmath>
 #include <cstddef>
 #include <cstdint>
 #include <initializer_list>
+#include <vector>
 
 #include "Point.hpp"
 
diff --git a/src/libslic3r/MultiMaterialSegmentation.hpp b/src/libslic3r/MultiMaterialSegmentation.hpp
index 8f42a006c9..6b230e8cad 100644
--- a/src/libslic3r/MultiMaterialSegmentation.hpp
+++ b/src/libslic3r/MultiMaterialSegmentation.hpp
@@ -1,6 +1,7 @@
 #ifndef slic3r_MultiMaterialSegmentation_hpp_
 #define slic3r_MultiMaterialSegmentation_hpp_
 
+#include <cstddef>
 #include <functional>
 #include <utility>
 #include <vector>
@@ -9,6 +10,7 @@
 
 #include "Line.hpp"
 #include "Point.hpp"
+#include "libslic3r.h"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/SLA/ConcaveHull.cpp b/src/libslic3r/SLA/ConcaveHull.cpp
index 2484fda2ff..8d361fc5b5 100644
--- a/src/libslic3r/SLA/ConcaveHull.cpp
+++ b/src/libslic3r/SLA/ConcaveHull.cpp
@@ -1,3 +1,10 @@
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
+#include <algorithm>
+#include <iterator>
+#include "libslic3r/Polygon.hpp"
+#include <cmath>
+#include "libslic3r/ExPolygon.hpp"
 #include <libslic3r/SLA/ConcaveHull.hpp>
 #include <libslic3r/SLA/SpatIndex.hpp>
 
@@ -5,6 +12,8 @@
 #include <libslic3r/ClipperUtils.hpp>
 
 #include <boost/log/trivial.hpp>
+#include <limits>
+#include <vector>
 
 namespace Slic3r {
 namespace sla {
diff --git a/src/libslic3r/SLA/SupportTree.hpp b/src/libslic3r/SLA/SupportTree.hpp
index a5e283b0dd..7511b0aaa5 100644
--- a/src/libslic3r/SLA/SupportTree.hpp
+++ b/src/libslic3r/SLA/SupportTree.hpp
@@ -1,6 +1,7 @@
 #ifndef SLA_SUPPORTTREE_HPP
 #define SLA_SUPPORTTREE_HPP
 
+#include <math.h>
 #include <vector>
 #include <memory>
 #include <Eigen/Geometry>
diff --git a/src/libslic3r/SLA/SupportTreeBuilder.hpp b/src/libslic3r/SLA/SupportTreeBuilder.hpp
index df5484e3dd..de0170d854 100644
--- a/src/libslic3r/SLA/SupportTreeBuilder.hpp
+++ b/src/libslic3r/SLA/SupportTreeBuilder.hpp
@@ -1,12 +1,18 @@
 #ifndef SLA_SUPPORTTREEBUILDER_HPP
 #define SLA_SUPPORTTREEBUILDER_HPP
 
+#include "libslic3r/Point.hpp"
+#include <cstddef>
+#include <cassert>
+#include "libslic3r/libslic3r.h"
 #include <libslic3r/SLA/Concurrency.hpp>
 #include <libslic3r/SLA/SupportTree.hpp>
 //#include <libslic3r/SLA/Contour3D.hpp>
 #include <libslic3r/TriangleMesh.hpp>
 #include <libslic3r/SLA/Pad.hpp>
 #include <libslic3r/MTUtils.hpp>
+#include <vector>
+#include <mutex>
 
 namespace Slic3r {
 namespace sla {
diff --git a/src/libslic3r/SLA/SupportTreeBuildsteps.hpp b/src/libslic3r/SLA/SupportTreeBuildsteps.hpp
index 478e2df1fe..850f35bdeb 100644
--- a/src/libslic3r/SLA/SupportTreeBuildsteps.hpp
+++ b/src/libslic3r/SLA/SupportTreeBuildsteps.hpp
@@ -1,12 +1,30 @@
 #ifndef SLASUPPORTTREEALGORITHM_H
 #define SLASUPPORTTREEALGORITHM_H
 
+#include "libslic3r/Point.hpp"
+#include <cmath>
+#include <array>
+#include <cstddef>
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/SLA/Concurrency.hpp"
+#include <climits>
+#include <cassert>
+#include "libslic3r/SLA/SupportTree.hpp"
+#include "libslic3r/SLA/IndexedMesh.hpp"
+#include "libslic3r/SLA/SupportPoint.hpp"
+#include "libslic3r/SLA/Pad.hpp"
 #include <cstdint>
+#include <cstdlib>
+#include <mutex>
+#include <map>
 #include <optional>
 
 #include <libslic3r/SLA/SupportTreeBuilder.hpp>
 #include <libslic3r/SLA/Clustering.hpp>
 #include <libslic3r/SLA/SpatIndex.hpp>
+#include <utility>
+#include <tuple>
+#include <vector>
 
 namespace Slic3r {
 namespace sla {
diff --git a/src/libslic3r/Support/SupportMaterial.hpp b/src/libslic3r/Support/SupportMaterial.hpp
index 6d5355dab1..1d5bec31b5 100644
--- a/src/libslic3r/Support/SupportMaterial.hpp
+++ b/src/libslic3r/Support/SupportMaterial.hpp
@@ -2,11 +2,14 @@
 #define slic3r_SupportMaterial_hpp_
 
 #include "Flow.hpp"
+#include "libslic3r/Polygon.hpp"
 #include "PrintConfig.hpp"
 #include "Slicing.hpp"
 #include "Fill/FillBase.hpp"
 #include "SupportLayer.hpp"
 #include "SupportParameters.hpp"
+#include <vector>
+#include "libslic3r/libslic3r.h"
 namespace Slic3r {
 
 class PrintObject;
diff --git a/src/libslic3r/Support/SupportParameters.hpp b/src/libslic3r/Support/SupportParameters.hpp
index 98ae39a02e..ebf2cc2f4e 100644
--- a/src/libslic3r/Support/SupportParameters.hpp
+++ b/src/libslic3r/Support/SupportParameters.hpp
@@ -1,11 +1,20 @@
 #ifndef slic3r_SupportParameters_hpp_
 #define slic3r_SupportParameters_hpp_
 
+#include <algorithm>
 #include <boost/log/trivial.hpp>
+#include <cstddef>
+#include <cassert>
+#include <math.h>
+#include <limits>
 #include "../libslic3r.h"
 #include "../Flow.hpp"
 #include "../Layer.hpp"
 #include "../Print.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Slicing.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Geometry.hpp"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Support/TreeModelVolumes.cpp b/src/libslic3r/Support/TreeModelVolumes.cpp
index e933ac3c1b..5d1a3bdb20 100644
--- a/src/libslic3r/Support/TreeModelVolumes.cpp
+++ b/src/libslic3r/Support/TreeModelVolumes.cpp
@@ -7,6 +7,8 @@
 // CuraEngine is released under the terms of the AGPLv3 or higher.
 
 #include "TreeModelVolumes.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/ExPolygon.hpp"
 #include "TreeSupportCommon.hpp"
 
 #include "../BuildVolume.hpp"
@@ -18,13 +20,26 @@
 #include "../PrintConfig.hpp"
 #include "../Utils.hpp"
 #include "../format.hpp"
+#include "libslic3r/libslic3r.h"
 
+#include <cstddef>
+#include <algorithm>
+#include <cassert>
+#include <limits>
+#include <functional>
+#include <chrono>
+#include <optional>
+#include <numeric>
+#include <cmath>
 #include <string_view>
 
 #include <boost/log/trivial.hpp>
 
 #include <tbb/parallel_for.h>
 #include <tbb/task_group.h>
+#include <vector>
+#include <unordered_map>
+#include <utility>
 
 namespace Slic3r::TreeSupport3D
 {
diff --git a/src/libslic3r/Support/TreeModelVolumes.hpp b/src/libslic3r/Support/TreeModelVolumes.hpp
index eff4cadcaf..b2c1226dfe 100644
--- a/src/libslic3r/Support/TreeModelVolumes.hpp
+++ b/src/libslic3r/Support/TreeModelVolumes.hpp
@@ -9,16 +9,25 @@
 #ifndef slic3r_TreeModelVolumes_hpp
 #define slic3r_TreeModelVolumes_hpp
 
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <cassert>
+#include <map>
 #include <mutex>
+#include <optional>
 #include <unordered_map>
 
 #include <boost/functional/hash.hpp>
+#include <vector>
+#include <utility>
 
 #include "TreeSupportCommon.hpp"
 
 #include "../Point.hpp"
 #include "../Polygon.hpp"
 #include "../PrintConfig.hpp"
+#include "libslic3r/libslic3r.h"
 
 namespace Slic3r
 {
diff --git a/src/libslic3r/Support/TreeSupport3D.cpp b/src/libslic3r/Support/TreeSupport3D.cpp
index c9fceabaea..096bf91664 100644
--- a/src/libslic3r/Support/TreeSupport3D.cpp
+++ b/src/libslic3r/Support/TreeSupport3D.cpp
@@ -12,20 +12,46 @@
 #include "BuildVolume.hpp"
 #include "ClipperUtils.hpp"
 #include "EdgeGrid.hpp"
+#include "libslic3r/ExPolygon.hpp"
 #include "Fill/Fill.hpp"
+#include "libslic3r/Flow.hpp"
+#include "libslic3r/Fill/FillBase.hpp"
 #include "Layer.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Line.hpp"
 #include "Print.hpp"
 #include "MultiPoint.hpp"
 #include "Polygon.hpp"
 #include "Polyline.hpp"
 #include "MutablePolygon.hpp"
+#include "libslic3r/Support/TreeSupportCommon.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Support/TreeModelVolumes.hpp"
+#include "libslic3r/Support/SupportParameters.hpp"
+#include "libslic3r/Support/SupportLayer.hpp"
 #include "SupportCommon.hpp"
+#include "libslic3r/Surface.hpp"
 #include "TriangleMeshSlicer.hpp"
 #include "TreeSupport.hpp"
 #include "I18N.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Utils.hpp"
 
+#include <algorithm>
+#include <Eigen/Geometry>
+#include <atomic>
 #include <cassert>
 #include <chrono>
+#include <cstdint>
+#include <functional>
+#include <cstdlib>
+#include <cmath>
+#include <limits>
+#include <memory>
+#include <math.h>
+#include <mutex>
+#include <numeric>
+#include <iterator>
 #include <optional>
 #include <stdio.h>
 #include <string>
@@ -36,6 +62,10 @@
 #include <tbb/parallel_for.h>
 #include <tbb/parallel_for_each.h>
 #include <tbb/spin_mutex.h>
+#include <vector>
+#include <utility>
+#include <unordered_set>
+#include <tuple>
 
 #if defined(TREE_SUPPORT_SHOW_ERRORS) && defined(_WIN32)
     #define TREE_SUPPORT_SHOW_ERRORS_WIN32
diff --git a/src/libslic3r/Support/TreeSupportCommon.hpp b/src/libslic3r/Support/TreeSupportCommon.hpp
index fb08a1a928..97a0e31eb3 100644
--- a/src/libslic3r/Support/TreeSupportCommon.hpp
+++ b/src/libslic3r/Support/TreeSupportCommon.hpp
@@ -11,10 +11,28 @@
 
 #include "../libslic3r.h"
 #include "../Polygon.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Slicing.hpp"
+#include "libslic3r/Print.hpp"
+#include "libslic3r/Flow.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Support/SupportParameters.hpp"
+#include "libslic3r/Support/SupportLayer.hpp"
 #include "SupportCommon.hpp"
+#include "libslic3r/Utils.hpp"
 
 #include <algorithm>
+#include <cstddef>
+#include <math.h>
+#include <cmath>
+#include <limits>
+#include <cassert>
+#include <cstdio>
+#include <iterator>
+#include <mutex>
 #include <string_view>
+#include <vector>
+#include <utility>
 
 namespace Slic3r
 {
diff --git a/src/libslic3r/SurfaceCollection.hpp b/src/libslic3r/SurfaceCollection.hpp
index 1895516aa2..3b6316e0a4 100644
--- a/src/libslic3r/SurfaceCollection.hpp
+++ b/src/libslic3r/SurfaceCollection.hpp
@@ -1,9 +1,13 @@
 #ifndef slic3r_SurfaceCollection_hpp_
 #define slic3r_SurfaceCollection_hpp_
 
+#include "Polygon.hpp"
+#include "ExPolygon.hpp"
 #include "libslic3r.h"
 #include "Surface.hpp"
+#include <cstddef>
 #include <initializer_list>
+#include <utility>
 #include <vector>
 
 namespace Slic3r {
diff --git a/src/libslic3r/TriangleMeshSlicer.hpp b/src/libslic3r/TriangleMeshSlicer.hpp
index 6646429536..aa1b020716 100644
--- a/src/libslic3r/TriangleMeshSlicer.hpp
+++ b/src/libslic3r/TriangleMeshSlicer.hpp
@@ -1,10 +1,14 @@
 #ifndef slic3r_TriangleMeshSlicer_hpp_
 #define slic3r_TriangleMeshSlicer_hpp_
 
+#include <cstdint>
+#include <cstddef>
 #include <functional>
+#include <utility>
 #include <vector>
 #include <admesh/stl.h>
 
+#include "Point.hpp"
 #include "Polygon.hpp"
 #include "ExPolygon.hpp"
 
diff --git a/src/libslic3r/TriangulateWall.hpp b/src/libslic3r/TriangulateWall.hpp
index fcdb842f9b..fcc67e29b2 100644
--- a/src/libslic3r/TriangulateWall.hpp
+++ b/src/libslic3r/TriangulateWall.hpp
@@ -1,7 +1,11 @@
 #ifndef TRIANGULATEWALL_HPP
 #define TRIANGULATEWALL_HPP
 
+#include "Point.hpp"
 #include "libslic3r/Polygon.hpp"
+#include <cstddef>
+#include <utility>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/VariableWidth.hpp b/src/libslic3r/VariableWidth.hpp
index f6eca97089..7b8f1f4b0a 100644
--- a/src/libslic3r/VariableWidth.hpp
+++ b/src/libslic3r/VariableWidth.hpp
@@ -4,6 +4,8 @@
 #include "Polygon.hpp"
 #include "ExtrusionEntity.hpp"
 #include "Flow.hpp"
+#include "Polyline.hpp"
+#include <vector>
 
 namespace Slic3r {
     ExtrusionMultiPath thick_polyline_to_multi_path(const ThickPolyline& thick_polyline, ExtrusionRole role, const Flow& flow, const float tolerance, const float merge_tolerance);