diff --git a/src/libslic3r/AABBMesh.cpp b/src/libslic3r/AABBMesh.cpp
index be026f69d7..bcd34546ed 100644
--- a/src/libslic3r/AABBMesh.cpp
+++ b/src/libslic3r/AABBMesh.cpp
@@ -1,10 +1,19 @@
 #include "AABBMesh.hpp"
+#include "Point.hpp"
+#include <Eigen/Core>
 #include <Execution/ExecutionTBB.hpp>
 
+#include <igl/Hit.h>
+#include <cstddef>
+#include <cassert>
+#include <cmath>
+#include <algorithm>
 #include <libslic3r/AABBTreeIndirect.hpp>
 #include <libslic3r/TriangleMesh.hpp>
 
+#include <limits>
 #include <numeric>
+#include <vector>
 
 #ifdef SLIC3R_HOLE_RAYCASTER
 #include <libslic3r/SLA/Hollowing.hpp>
diff --git a/src/libslic3r/AABBMesh.hpp b/src/libslic3r/AABBMesh.hpp
index 9998f504b5..c9195b2105 100644
--- a/src/libslic3r/AABBMesh.hpp
+++ b/src/libslic3r/AABBMesh.hpp
@@ -1,6 +1,10 @@
 #ifndef PRUSASLICER_AABBMESH_H
 #define PRUSASLICER_AABBMESH_H
 
+#include <cstddef>
+#include <limits>
+#include <cmath>
+#include <cassert>
 #include <memory>
 #include <vector>
 
diff --git a/src/libslic3r/AABBTreeIndirect.hpp b/src/libslic3r/AABBTreeIndirect.hpp
index 483ca8efc4..5fd83e0be9 100644
--- a/src/libslic3r/AABBTreeIndirect.hpp
+++ b/src/libslic3r/AABBTreeIndirect.hpp
@@ -6,15 +6,20 @@
 #ifndef slic3r_AABBTreeIndirect_hpp_
 #define slic3r_AABBTreeIndirect_hpp_
 
+#include <Eigen/Core>
 #include <algorithm>
+#include <cstddef>
+#include <cassert>
 #include <limits>
 #include <type_traits>
+#include <utility>
 #include <vector>
 
 #include <Eigen/Geometry>
 
 #include "BoundingBox.hpp"
 #include "Utils.hpp" // for next_highest_power_of_2()
+#include "libslic3r.h"
 
 // Definition of the ray intersection hit structure.
 #include <igl/Hit.h>
diff --git a/src/libslic3r/AABBTreeLines.hpp b/src/libslic3r/AABBTreeLines.hpp
index 52c4cdf545..de0c88aeb1 100644
--- a/src/libslic3r/AABBTreeLines.hpp
+++ b/src/libslic3r/AABBTreeLines.hpp
@@ -6,9 +6,15 @@
 #include "libslic3r.h"
 #include "libslic3r/AABBTreeIndirect.hpp"
 #include "libslic3r/Line.hpp"
+#include <Eigen/Core>
 #include <algorithm>
+#include <cassert>
 #include <cmath>
+#include <cstddef>
+#include <tuple>
+#include <limits>
 #include <type_traits>
+#include <utility>
 #include <vector>
 
 namespace Slic3r {
diff --git a/src/libslic3r/Algorithm/LineSplit.cpp b/src/libslic3r/Algorithm/LineSplit.cpp
index 9e359b76ea..3760ccdc6d 100644
--- a/src/libslic3r/Algorithm/LineSplit.cpp
+++ b/src/libslic3r/Algorithm/LineSplit.cpp
@@ -1,8 +1,19 @@
 #include "LineSplit.hpp"
 
 #include "AABBTreeLines.hpp"
+#include "libslic3r/ClipperZUtils.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Line.hpp"
+#include "libslic3r/ExPolygon.hpp"
 #include "SVG.hpp"
 #include "Utils.hpp"
+#include <limits>
+#include "libslic3r/libslic3r.h"
+#include <algorithm>
+#include <cstddef>
+#include <cassert>
+#include <vector>
+#include <utility>
 
 //#define DEBUG_SPLIT_LINE
 
diff --git a/src/libslic3r/Algorithm/LineSplit.hpp b/src/libslic3r/Algorithm/LineSplit.hpp
index e12113fa6c..102f48d8a8 100644
--- a/src/libslic3r/Algorithm/LineSplit.hpp
+++ b/src/libslic3r/Algorithm/LineSplit.hpp
@@ -2,6 +2,11 @@
 #define SRC_LIBSLIC3R_ALGORITHM_LINE_SPLIT_HPP_
 
 #include "ClipperZUtils.hpp"
+#include "libslic3r/Point.hpp"
+#include <cstdint>
+#include <cstddef>
+#include <vector>
+#include "libslic3r/ExPolygon.hpp"
 
 namespace Slic3r {
 namespace Algorithm {
diff --git a/src/libslic3r/Algorithm/RegionExpansion.cpp b/src/libslic3r/Algorithm/RegionExpansion.cpp
index 6a77c470e7..f355167bbe 100644
--- a/src/libslic3r/Algorithm/RegionExpansion.cpp
+++ b/src/libslic3r/Algorithm/RegionExpansion.cpp
@@ -1,11 +1,25 @@
 #include "RegionExpansion.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/Polygon.hpp"
 
+#include <algorithm>
+#include <cmath>
+#include <cstddef>
+#include <cassert>
+#include <iterator>
+#include <cstdint>
 #include <libslic3r/AABBTreeIndirect.hpp>
 #include <libslic3r/ClipperZUtils.hpp>
 #include <libslic3r/ClipperUtils.hpp>
 #include <libslic3r/Utils.hpp>
 
+#include <math.h>
 #include <numeric>
+#include <vector>
+#include <utility>
 
 namespace Slic3r {
 namespace Algorithm {
diff --git a/src/libslic3r/Algorithm/RegionExpansion.hpp b/src/libslic3r/Algorithm/RegionExpansion.hpp
index eb99674902..e94906862c 100644
--- a/src/libslic3r/Algorithm/RegionExpansion.hpp
+++ b/src/libslic3r/Algorithm/RegionExpansion.hpp
@@ -1,10 +1,12 @@
 #ifndef SRC_LIBSLIC3R_ALGORITHM_REGION_EXPANSION_HPP_
 #define SRC_LIBSLIC3R_ALGORITHM_REGION_EXPANSION_HPP_
 
+#include <cstddef>
 #include <cstdint>
 #include <libslic3r/Point.hpp>
 #include <libslic3r/Polygon.hpp>
 #include <libslic3r/ExPolygon.hpp>
+#include <vector>
 
 namespace Slic3r {
 namespace Algorithm {
diff --git a/src/libslic3r/AnyPtr.hpp b/src/libslic3r/AnyPtr.hpp
index c40d10093e..7c0f28b834 100644
--- a/src/libslic3r/AnyPtr.hpp
+++ b/src/libslic3r/AnyPtr.hpp
@@ -1,6 +1,7 @@
 #ifndef ANYPTR_HPP
 #define ANYPTR_HPP
 
+#include <boost/variant/variant.hpp>
 #include <memory>
 #include <type_traits>
 #include <boost/variant.hpp>
diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp
index d639604f51..d77aff60b9 100644
--- a/src/libslic3r/AppConfig.cpp
+++ b/src/libslic3r/AppConfig.cpp
@@ -1,3 +1,8 @@
+#include "Technologies.hpp"
+#include "Config.hpp"
+#include "PrintConfig.hpp"
+#include "calib.hpp"
+#include "Semver.hpp"
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Utils.hpp"
 #include "libslic3r/Format/DRC.hpp"
@@ -9,9 +14,18 @@
 #include "LocalesUtils.hpp"
 #include "Thread.hpp"
 #include "format.hpp"
+#include "libslic3r_version.h"
 #include "nlohmann/json.hpp"
 
 #include <algorithm>
+#include <string>
+#include <exception>
+#include <boost/none.hpp>
+#include <cstddef>
+#include <system_error>
+#include <chrono>
+#include <map>
+#include <cstring>
 #include <utility>
 #include <vector>
 #include <stdexcept>
diff --git a/src/libslic3r/AppConfig.hpp b/src/libslic3r/AppConfig.hpp
index 1bf6e730d0..4abf1011d1 100644
--- a/src/libslic3r/AppConfig.hpp
+++ b/src/libslic3r/AppConfig.hpp
@@ -5,8 +5,11 @@
 #include <chrono>
 #include <map>
 #include <string>
+#include "LocalesUtils.hpp"
 #include "nlohmann/json.hpp"
 #include <boost/algorithm/string/trim_all.hpp>
+#include <utility>
+#include <vector>
 
 #include "libslic3r/Config.hpp"
 #include "libslic3r/Semver.hpp"
diff --git a/src/libslic3r/Arachne/BeadingStrategy/BeadingStrategy.cpp b/src/libslic3r/Arachne/BeadingStrategy/BeadingStrategy.cpp
index 5ade0c9207..119ff8dd99 100644
--- a/src/libslic3r/Arachne/BeadingStrategy/BeadingStrategy.cpp
+++ b/src/libslic3r/Arachne/BeadingStrategy/BeadingStrategy.cpp
@@ -2,7 +2,9 @@
 //CuraEngine is released under the terms of the AGPLv3 or higher.
 
 #include "BeadingStrategy.hpp"
+#include "libslic3r/libslic3r.h"
 #include "libslic3r/Point.hpp"
+#include <vector>
 
 namespace Slic3r::Arachne
 {
diff --git a/src/libslic3r/Arachne/BeadingStrategy/BeadingStrategyFactory.cpp b/src/libslic3r/Arachne/BeadingStrategy/BeadingStrategyFactory.cpp
index d6cb1331c1..242d54e63b 100644
--- a/src/libslic3r/Arachne/BeadingStrategy/BeadingStrategyFactory.cpp
+++ b/src/libslic3r/Arachne/BeadingStrategy/BeadingStrategyFactory.cpp
@@ -12,6 +12,7 @@
 #include "DistributedBeadingStrategy.hpp"
 #include "RedistributeBeadingStrategy.hpp"
 #include "OuterWallInsetBeadingStrategy.hpp"
+#include "libslic3r/libslic3r.h"
 #include "libslic3r/Arachne/BeadingStrategy/BeadingStrategy.hpp"
 
 namespace Slic3r::Arachne {
diff --git a/src/libslic3r/Arachne/BeadingStrategy/DistributedBeadingStrategy.cpp b/src/libslic3r/Arachne/BeadingStrategy/DistributedBeadingStrategy.cpp
index 7234015ae2..966682e054 100644
--- a/src/libslic3r/Arachne/BeadingStrategy/DistributedBeadingStrategy.cpp
+++ b/src/libslic3r/Arachne/BeadingStrategy/DistributedBeadingStrategy.cpp
@@ -6,6 +6,7 @@
 #include <cassert>
 
 #include "DistributedBeadingStrategy.hpp"
+#include "libslic3r/libslic3r.h"
 #include "libslic3r/Arachne/BeadingStrategy/BeadingStrategy.hpp"
 
 namespace Slic3r::Arachne
diff --git a/src/libslic3r/Arachne/BeadingStrategy/LimitedBeadingStrategy.cpp b/src/libslic3r/Arachne/BeadingStrategy/LimitedBeadingStrategy.cpp
index 24e04c3f26..0c570bf307 100644
--- a/src/libslic3r/Arachne/BeadingStrategy/LimitedBeadingStrategy.cpp
+++ b/src/libslic3r/Arachne/BeadingStrategy/LimitedBeadingStrategy.cpp
@@ -3,10 +3,12 @@
 
 #include <boost/log/trivial.hpp>
 #include <cassert>
+#include <string>
 #include <utility>
 #include <cstddef>
 
 #include "LimitedBeadingStrategy.hpp"
+#include "libslic3r/libslic3r.h"
 #include "libslic3r/Point.hpp"
 #include "libslic3r/Arachne/BeadingStrategy/BeadingStrategy.hpp"
 
diff --git a/src/libslic3r/Arachne/BeadingStrategy/OuterWallInsetBeadingStrategy.cpp b/src/libslic3r/Arachne/BeadingStrategy/OuterWallInsetBeadingStrategy.cpp
index ac9edb1dba..1b7bd7e342 100644
--- a/src/libslic3r/Arachne/BeadingStrategy/OuterWallInsetBeadingStrategy.cpp
+++ b/src/libslic3r/Arachne/BeadingStrategy/OuterWallInsetBeadingStrategy.cpp
@@ -6,6 +6,7 @@
 #include <algorithm>
 #include <utility>
 
+#include "libslic3r/libslic3r.h"
 #include "libslic3r/Arachne/BeadingStrategy/BeadingStrategy.hpp"
 
 namespace Slic3r::Arachne
diff --git a/src/libslic3r/Arachne/BeadingStrategy/RedistributeBeadingStrategy.cpp b/src/libslic3r/Arachne/BeadingStrategy/RedistributeBeadingStrategy.cpp
index 7307781840..e6a3c337ae 100644
--- a/src/libslic3r/Arachne/BeadingStrategy/RedistributeBeadingStrategy.cpp
+++ b/src/libslic3r/Arachne/BeadingStrategy/RedistributeBeadingStrategy.cpp
@@ -7,6 +7,7 @@
 #include <numeric>
 #include <utility>
 
+#include "libslic3r/libslic3r.h"
 #include "libslic3r/Arachne/BeadingStrategy/BeadingStrategy.hpp"
 
 namespace Slic3r::Arachne
diff --git a/src/libslic3r/Arachne/BeadingStrategy/WideningBeadingStrategy.cpp b/src/libslic3r/Arachne/BeadingStrategy/WideningBeadingStrategy.cpp
index ab8b070604..0ceb2d9dd3 100644
--- a/src/libslic3r/Arachne/BeadingStrategy/WideningBeadingStrategy.cpp
+++ b/src/libslic3r/Arachne/BeadingStrategy/WideningBeadingStrategy.cpp
@@ -4,8 +4,11 @@
 #include "WideningBeadingStrategy.hpp"
 
 #include <algorithm>
+#include <string>
 #include <utility>
+#include <vector>
 
+#include "libslic3r/libslic3r.h"
 #include "libslic3r/Arachne/BeadingStrategy/BeadingStrategy.hpp"
 
 namespace Slic3r::Arachne
diff --git a/src/libslic3r/Arachne/SkeletalTrapezoidation.cpp b/src/libslic3r/Arachne/SkeletalTrapezoidation.cpp
index da5c7357c1..82ca92e090 100644
--- a/src/libslic3r/Arachne/SkeletalTrapezoidation.cpp
+++ b/src/libslic3r/Arachne/SkeletalTrapezoidation.cpp
@@ -10,10 +10,18 @@
 #include <cmath>
 #include <cstdint>
 #include <limits>
+#include <math.h>
+#include <list>
+#include <memory>
 #include <utility>
 #include <cassert>
 #include <cstdlib>
+#include <vector>
 
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Arachne/BeadingStrategy/BeadingStrategy.hpp"
 #include "libslic3r/Geometry/VoronoiUtils.hpp"
 #include "ankerl/unordered_dense.h"
 #include "libslic3r/Arachne/SkeletalTrapezoidationEdge.hpp"
diff --git a/src/libslic3r/Arachne/SkeletalTrapezoidationEdge.hpp b/src/libslic3r/Arachne/SkeletalTrapezoidationEdge.hpp
index e0d3fe81d2..9eced8be93 100644
--- a/src/libslic3r/Arachne/SkeletalTrapezoidationEdge.hpp
+++ b/src/libslic3r/Arachne/SkeletalTrapezoidationEdge.hpp
@@ -4,10 +4,12 @@
 #ifndef SKELETAL_TRAPEZOIDATION_EDGE_H
 #define SKELETAL_TRAPEZOIDATION_EDGE_H
 
+#include <cassert>
 #include <memory> // smart pointers
 #include <list>
 #include <vector>
 
+#include "libslic3r/libslic3r.h"
 #include "utils/ExtrusionJunction.hpp"
 
 namespace Slic3r::Arachne
diff --git a/src/libslic3r/Arachne/SkeletalTrapezoidationGraph.cpp b/src/libslic3r/Arachne/SkeletalTrapezoidationGraph.cpp
index f7a30c32db..4621a04616 100644
--- a/src/libslic3r/Arachne/SkeletalTrapezoidationGraph.cpp
+++ b/src/libslic3r/Arachne/SkeletalTrapezoidationGraph.cpp
@@ -6,11 +6,17 @@
 #include <ankerl/unordered_dense.h>
 #include <boost/log/trivial.hpp>
 #include <algorithm>
+#include <cstdint>
 #include <iostream>
 #include <cassert>
 #include <cinttypes>
+#include <optional>
+#include <utility>
 
 #include "../Line.hpp"
+#include "libslic3r/Arachne/utils/HalfEdge.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Arachne/utils/HalfEdgeNode.hpp"
 #include "libslic3r/Arachne/SkeletalTrapezoidationEdge.hpp"
 #include "libslic3r/Arachne/SkeletalTrapezoidationJoint.hpp"
 #include "libslic3r/Point.hpp"
diff --git a/src/libslic3r/Arachne/SkeletalTrapezoidationJoint.hpp b/src/libslic3r/Arachne/SkeletalTrapezoidationJoint.hpp
index 346d511165..3eab9c0916 100644
--- a/src/libslic3r/Arachne/SkeletalTrapezoidationJoint.hpp
+++ b/src/libslic3r/Arachne/SkeletalTrapezoidationJoint.hpp
@@ -6,6 +6,7 @@
 
 #include <memory> // smart pointers
 
+#include "libslic3r/libslic3r.h"
 #include "libslic3r/Arachne/BeadingStrategy/BeadingStrategy.hpp"
 
 namespace Slic3r::Arachne
diff --git a/src/libslic3r/Arachne/WallToolPaths.cpp b/src/libslic3r/Arachne/WallToolPaths.cpp
index 724016bcb1..6a63399ce8 100644
--- a/src/libslic3r/Arachne/WallToolPaths.cpp
+++ b/src/libslic3r/Arachne/WallToolPaths.cpp
@@ -2,12 +2,31 @@
 // CuraEngine is released under the terms of the AGPLv3 or higher.
 
 #include <algorithm> //For std::partition_copy and std::min_element.
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+#include <cassert>
+#include <cmath>
+#include <math.h>
+#include <limits>
 #include <unordered_set>
 
 #include "WallToolPaths.hpp"
 
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Arachne/utils/ExtrusionLine.hpp"
+#include "libslic3r/Line.hpp"
+#include "libslic3r/Arachne/utils/PolygonsPointIndex.hpp"
+#include "libslic3r/Flow.hpp"
+#include "libslic3r/Arachne/BeadingStrategy/BeadingStrategyFactory.hpp"
+#include "libslic3r/Arachne/utils/ExtrusionJunction.hpp"
+#include "libslic3r/Arachne/utils/SparsePointGrid.hpp"
+#include "libslic3r/Arachne/utils/SquareGrid.hpp"
 #include "SkeletalTrapezoidation.hpp"
 #include "../ClipperUtils.hpp"
+#include "libslic3r/libslic3r.h"
 #include "utils/linearAlg2D.hpp"
 #include "EdgeGrid.hpp"
 #include "utils/SparseLineGrid.hpp"
@@ -17,6 +36,8 @@
 #include "Utils.hpp"
 
 #include <boost/log/trivial.hpp>
+#include <utility>
+#include <vector>
 
 //#define ARACHNE_STITCH_PATCH_DEBUG
 
diff --git a/src/libslic3r/Arachne/WallToolPaths.hpp b/src/libslic3r/Arachne/WallToolPaths.hpp
index d7120a088c..cfec7284eb 100644
--- a/src/libslic3r/Arachne/WallToolPaths.hpp
+++ b/src/libslic3r/Arachne/WallToolPaths.hpp
@@ -4,10 +4,16 @@
 #ifndef CURAENGINE_WALLTOOLPATHS_H
 #define CURAENGINE_WALLTOOLPATHS_H
 
+#include <cstddef>
+#include <boost/container_hash/hash.hpp>
 #include <memory>
 #include <ankerl/unordered_dense.h>
+#include <vector>
+#include <utility>
 
 #include "BeadingStrategy/BeadingStrategyFactory.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Point.hpp"
 #include "utils/ExtrusionLine.hpp"
 #include "../Polygon.hpp"
 #include "../PrintConfig.hpp"
diff --git a/src/libslic3r/Arachne/utils/ExtrusionJunction.hpp b/src/libslic3r/Arachne/utils/ExtrusionJunction.hpp
index 625bf9b727..aebfd81347 100644
--- a/src/libslic3r/Arachne/utils/ExtrusionJunction.hpp
+++ b/src/libslic3r/Arachne/utils/ExtrusionJunction.hpp
@@ -6,6 +6,9 @@
 #define UTILS_EXTRUSION_JUNCTION_H
 
 #include "../../Point.hpp"
+#include "libslic3r/libslic3r.h"
+#include <cstddef>
+#include <vector>
 
 namespace Slic3r::Arachne
 {
diff --git a/src/libslic3r/Arachne/utils/ExtrusionLine.cpp b/src/libslic3r/Arachne/utils/ExtrusionLine.cpp
index 66bb707ebe..8cd13c3240 100644
--- a/src/libslic3r/Arachne/utils/ExtrusionLine.cpp
+++ b/src/libslic3r/Arachne/utils/ExtrusionLine.cpp
@@ -2,11 +2,16 @@
 //CuraEngine is released under the terms of the AGPLv3 or higher.
 
 #include <algorithm>
+#include <cassert>
 #include <cmath>
+#include <cstdint>
 #include <cstdlib>
+#include <vector>
 
 #include "ExtrusionLine.hpp"
 #include "../../VariableWidth.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Point.hpp"
 #include "libslic3r/Arachne/utils/ExtrusionJunction.hpp"
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/ExtrusionEntity.hpp"
diff --git a/src/libslic3r/Arachne/utils/ExtrusionLine.hpp b/src/libslic3r/Arachne/utils/ExtrusionLine.hpp
index 72e008cef1..b8d08eaec8 100644
--- a/src/libslic3r/Arachne/utils/ExtrusionLine.hpp
+++ b/src/libslic3r/Arachne/utils/ExtrusionLine.hpp
@@ -22,6 +22,7 @@
 #include "../../BoundingBox.hpp"
 #include "../../ExtrusionEntity.hpp"
 #include "../../Flow.hpp"
+#include "libslic3r/libslic3r.h"
 #include "libslic3r/Point.hpp"
 
 namespace Slic3r {
diff --git a/src/libslic3r/Arachne/utils/PolygonsPointIndex.hpp b/src/libslic3r/Arachne/utils/PolygonsPointIndex.hpp
index 04f017f86a..2ac32b9366 100644
--- a/src/libslic3r/Arachne/utils/PolygonsPointIndex.hpp
+++ b/src/libslic3r/Arachne/utils/PolygonsPointIndex.hpp
@@ -4,6 +4,9 @@
 #ifndef UTILS_POLYGONS_POINT_INDEX_H
 #define UTILS_POLYGONS_POINT_INDEX_H
 
+#include <utility>
+#include <functional>
+#include <cstddef>
 #include <vector>
 
 #include "../../Point.hpp"
diff --git a/src/libslic3r/Arachne/utils/PolygonsSegmentIndex.hpp b/src/libslic3r/Arachne/utils/PolygonsSegmentIndex.hpp
index 3258b41c7d..2df641c085 100644
--- a/src/libslic3r/Arachne/utils/PolygonsSegmentIndex.hpp
+++ b/src/libslic3r/Arachne/utils/PolygonsSegmentIndex.hpp
@@ -6,7 +6,10 @@
 
 #include <vector>
 
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Point.hpp"
 #include "PolygonsPointIndex.hpp"
+#include "libslic3r/libslic3r.h"
 
 namespace Slic3r::Arachne
 {
diff --git a/src/libslic3r/Arachne/utils/PolylineStitcher.cpp b/src/libslic3r/Arachne/utils/PolylineStitcher.cpp
index 0abf63ac10..e011e5db51 100644
--- a/src/libslic3r/Arachne/utils/PolylineStitcher.cpp
+++ b/src/libslic3r/Arachne/utils/PolylineStitcher.cpp
@@ -4,6 +4,7 @@
 #include "PolylineStitcher.hpp"
 
 #include "ExtrusionLine.hpp"
+#include "libslic3r/Point.hpp"
 #include "libslic3r/Arachne/utils/PolygonsPointIndex.hpp"
 #include "libslic3r/Polygon.hpp"
 
diff --git a/src/libslic3r/Arachne/utils/SparseGrid.hpp b/src/libslic3r/Arachne/utils/SparseGrid.hpp
index 45876fb9a7..ce5bac81bc 100644
--- a/src/libslic3r/Arachne/utils/SparseGrid.hpp
+++ b/src/libslic3r/Arachne/utils/SparseGrid.hpp
@@ -6,11 +6,14 @@
 #define UTILS_SPARSE_GRID_H
 
 #include <cassert>
+#include <unordered_map>
+#include <cstddef>
 #include <vector>
 #include <functional>
 
 #include "../../Point.hpp"
 #include "SquareGrid.hpp"
+#include "libslic3r/libslic3r.h"
 
 namespace Slic3r::Arachne {
 
diff --git a/src/libslic3r/Arachne/utils/SparseLineGrid.hpp b/src/libslic3r/Arachne/utils/SparseLineGrid.hpp
index 0b38988f92..be3c430749 100644
--- a/src/libslic3r/Arachne/utils/SparseLineGrid.hpp
+++ b/src/libslic3r/Arachne/utils/SparseLineGrid.hpp
@@ -6,10 +6,15 @@
 #define UTILS_SPARSE_LINE_GRID_H
 
 #include <cassert>
+#include <cstddef>
+#include <utility>
+#include <unordered_map>
 #include <vector>
 #include <functional>
 
+#include "libslic3r/Point.hpp"
 #include "SparseGrid.hpp"
+#include "libslic3r/libslic3r.h"
 
 namespace Slic3r::Arachne {
 
diff --git a/src/libslic3r/Arachne/utils/SparsePointGrid.hpp b/src/libslic3r/Arachne/utils/SparsePointGrid.hpp
index 127380b3eb..ba1898a0ae 100644
--- a/src/libslic3r/Arachne/utils/SparsePointGrid.hpp
+++ b/src/libslic3r/Arachne/utils/SparsePointGrid.hpp
@@ -6,9 +6,13 @@
 #define UTILS_SPARSE_POINT_GRID_H
 
 #include <cassert>
+#include <cstddef>
+#include <cstdint>
 #include <vector>
 
+#include "libslic3r/Point.hpp"
 #include "SparseGrid.hpp"
+#include "libslic3r/libslic3r.h"
 
 namespace Slic3r::Arachne {
 
diff --git a/src/libslic3r/Arachne/utils/SquareGrid.cpp b/src/libslic3r/Arachne/utils/SquareGrid.cpp
index 1af9910426..dcbd018f1b 100644
--- a/src/libslic3r/Arachne/utils/SquareGrid.cpp
+++ b/src/libslic3r/Arachne/utils/SquareGrid.cpp
@@ -4,7 +4,11 @@
 #include "SquareGrid.hpp"
 
 #include <cassert>
+#include <cstdint>
+#include <utility>
+#include <functional>
 
+#include "libslic3r/libslic3r.h"
 #include "libslic3r/Point.hpp"
 
 using namespace Slic3r::Arachne;
diff --git a/src/libslic3r/Arachne/utils/linearAlg2D.hpp b/src/libslic3r/Arachne/utils/linearAlg2D.hpp
index 599d3fa835..632032da8f 100644
--- a/src/libslic3r/Arachne/utils/linearAlg2D.hpp
+++ b/src/libslic3r/Arachne/utils/linearAlg2D.hpp
@@ -5,6 +5,9 @@
 #define UTILS_LINEAR_ALG_2D_H
 
 #include "../../Point.hpp"
+#include <cstdint>
+#include <math.h>
+#include <cmath>
 
 namespace Slic3r::Arachne::LinearAlg2D
 {
diff --git a/src/libslic3r/ArcFitter.cpp b/src/libslic3r/ArcFitter.cpp
index 46dd12931e..8bd1bc4fe6 100644
--- a/src/libslic3r/ArcFitter.cpp
+++ b/src/libslic3r/ArcFitter.cpp
@@ -1,8 +1,14 @@
 #include "ArcFitter.hpp"
+#include "Point.hpp"
+#include "Circle.hpp"
+#include "MultiPoint.hpp"
 #include "Polyline.hpp"
+#include "libslic3r.h"
 
 #include <cmath>
 #include <cassert>
+#include <vector>
+#include <cstddef>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/ArcFitter.hpp b/src/libslic3r/ArcFitter.hpp
index f2b2ee49d8..03d38abc85 100644
--- a/src/libslic3r/ArcFitter.hpp
+++ b/src/libslic3r/ArcFitter.hpp
@@ -2,6 +2,9 @@
 #define slic3r_ArcFitter_hpp_
 
 #include "Circle.hpp"
+#include <cstddef>
+#include "Point.hpp"
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Arrange.cpp b/src/libslic3r/Arrange.cpp
index fd496537f4..b9728060f7 100644
--- a/src/libslic3r/Arrange.cpp
+++ b/src/libslic3r/Arrange.cpp
@@ -1,9 +1,28 @@
 #include "Arrange.hpp"
+#include "ExPolygon.hpp"
+#include "Point.hpp"
 #include "Print.hpp"
 #include "BoundingBox.hpp"
+#include "PrintConfig.hpp"
 #include "libslic3r.h"
 
+#include <Eigen/Core>
+#include <boost/geometry/index/parameters.hpp>
+#include <functional>
+#include <algorithm>
+#include <cstdlib>
+#include <cmath>
+#include <cstddef>
+#include <boost/geometry/algorithms/convert.hpp>
+#include <array>
+#include <boost/geometry/index/predicates.hpp>
+#include <iterator>
+#include <exception>
 #include <libnest2d/backends/libslic3r/geometries.hpp>
+#include "libnest2d/common.hpp"
+#include "libnest2d/geometry_traits_nfp.hpp"
+#include "libnest2d/nester.hpp"
+#include "libnest2d/geometry_traits.hpp"
 #include <libnest2d/optimizers/nlopt/subplex.hpp>
 #include <libnest2d/placers/nfpplacer.hpp>
 #include <libnest2d/selections/firstfit.hpp>
@@ -13,6 +32,11 @@
 #include <ClipperUtils.hpp>
 
 #include <boost/geometry/index/rtree.hpp>
+#include <utility>
+#include <vector>
+#include <tuple>
+#include <set>
+#include <string>
 
 #if defined(_MSC_VER) && defined(__clang__)
 #define BOOST_NO_CXX17_HDR_STRING_VIEW
diff --git a/src/libslic3r/BoundingBox.cpp b/src/libslic3r/BoundingBox.cpp
index cf5441dace..dc4f461dc7 100644
--- a/src/libslic3r/BoundingBox.cpp
+++ b/src/libslic3r/BoundingBox.cpp
@@ -1,5 +1,8 @@
 #include "BoundingBox.hpp"
+#include "Point.hpp"
 #include "Polygon.hpp"
+#include "libslic3r.h"
+#include <Eigen/Core>
 #include <algorithm>
 #include <assert.h>
 
diff --git a/src/libslic3r/BoundingBox.hpp b/src/libslic3r/BoundingBox.hpp
index 8aac3f1cb9..03f6a8f9bb 100644
--- a/src/libslic3r/BoundingBox.hpp
+++ b/src/libslic3r/BoundingBox.hpp
@@ -5,7 +5,10 @@
 #include "Exception.hpp"
 #include "Point.hpp"
 #include "Polygon.hpp"
+#include <cassert>
+#include <cstddef>
 #include <ostream>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/BridgeDetector.cpp b/src/libslic3r/BridgeDetector.cpp
index 321e066a8a..ad1b8bb6fb 100644
--- a/src/libslic3r/BridgeDetector.cpp
+++ b/src/libslic3r/BridgeDetector.cpp
@@ -1,7 +1,18 @@
 #include "BridgeDetector.hpp"
+#include "BoundingBox.hpp"
 #include "ClipperUtils.hpp"
+#include "ExPolygon.hpp"
 #include "Geometry.hpp"
+#include "libslic3r.h"
+#include "Polygon.hpp"
+#include "Line.hpp"
+#include "Polyline.hpp"
+#include "Point.hpp"
 #include <algorithm>
+#include <utility>
+#include <vector>
+#include <cstddef>
+#include <cmath>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/BridgeDetector.hpp b/src/libslic3r/BridgeDetector.hpp
index 1e5bb1a101..85982ed91c 100644
--- a/src/libslic3r/BridgeDetector.hpp
+++ b/src/libslic3r/BridgeDetector.hpp
@@ -9,7 +9,14 @@
 #include "PrincipalComponents2D.hpp"
 #include "libslic3r.h"
 #include "ExPolygon.hpp"
+#include <cmath>
+#include <cstdlib>
+#include <limits>
 #include <string>
+#include <vector>
+#include <tuple>
+#include <unordered_map>
+#include <utility>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Brim.cpp b/src/libslic3r/Brim.cpp
index 8ba4dfb596..f48723cfef 100644
--- a/src/libslic3r/Brim.cpp
+++ b/src/libslic3r/Brim.cpp
@@ -1,18 +1,37 @@
+#include "BoundingBox.hpp"
+#include "BrimEarsPoint.hpp"
 #include "ClipperUtils.hpp"
 #include "EdgeGrid.hpp"
+#include "ExPolygon.hpp"
+#include "Flow.hpp"
+#include "Geometry.hpp"
+#include "ExtrusionEntity.hpp"
 #include "Layer.hpp"
+#include "Point.hpp"
+#include "ObjectID.hpp"
+#include "Polygon.hpp"
+#include "Line.hpp"
+#include "MultiPoint.hpp"
+#include "Polyline.hpp"
 #include "Print.hpp"
+#include "PrintBase.hpp"
 #include "ShortestPath.hpp"
 #include "libslic3r.h"
 #include "PrintConfig.hpp"
 #include "MaterialType.hpp"
 #include "Model.hpp"
 #include <algorithm>
+#include <cstddef>
+#include <cmath>
 #include <cstdint>
 #include <limits>
+#include <map>
+#include <string>
 #include <tbb/parallel_for.h>
 
 #include <boost/log/trivial.hpp>
+#include <utility>
+#include <vector>
 
 #ifndef NDEBUG
     // #define BRIM_DEBUG_TO_SVG
diff --git a/src/libslic3r/Brim.hpp b/src/libslic3r/Brim.hpp
index 0603af20cc..9279b1e023 100644
--- a/src/libslic3r/Brim.hpp
+++ b/src/libslic3r/Brim.hpp
@@ -4,8 +4,10 @@
 #include "ExPolygon.hpp"
 #include "ObjectID.hpp"
 #include "Point.hpp"
+#include "Polygon.hpp"
 
 #include<map>
+#include <utility>
 #include<vector>
 
 namespace Slic3r {
diff --git a/src/libslic3r/BrimEarsPoint.hpp b/src/libslic3r/BrimEarsPoint.hpp
index a859d54f23..020b03475a 100644
--- a/src/libslic3r/BrimEarsPoint.hpp
+++ b/src/libslic3r/BrimEarsPoint.hpp
@@ -1,7 +1,10 @@
 #ifndef BRIMEARSPOINT_HPP
 #define BRIMEARSPOINT_HPP
 
+#include <cstdlib>
+#include "libslic3r.h"
 #include <libslic3r/Point.hpp>
+#include <vector>
 
 
 namespace Slic3r {
diff --git a/src/libslic3r/BuildVolume.cpp b/src/libslic3r/BuildVolume.cpp
index 15e6668bae..eb5a447249 100644
--- a/src/libslic3r/BuildVolume.cpp
+++ b/src/libslic3r/BuildVolume.cpp
@@ -1,11 +1,24 @@
 #include "BuildVolume.hpp"
+#include "BoundingBox.hpp"
 #include "ClipperUtils.hpp"
+#include "Polygon.hpp"
+#include "Geometry/Circle.hpp"
+#include "ExtrusionEntity.hpp"
 #include "TriangleMesh.hpp"
 #include "Geometry/ConvexHull.hpp"
 #include "GCode/GCodeProcessor.hpp"
 #include "Point.hpp"
+#include "libslic3r.h"
 
+#include <algorithm>
 #include <boost/log/trivial.hpp>
+#include <vector>
+#include <cassert>
+#include <cstdlib>
+#include <limits>
+#include <utility>
+#include <cstddef>
+#include <string_view>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/BuildVolume.hpp b/src/libslic3r/BuildVolume.hpp
index 6f53fdd704..8c53242fe8 100644
--- a/src/libslic3r/BuildVolume.hpp
+++ b/src/libslic3r/BuildVolume.hpp
@@ -5,9 +5,13 @@
 #include "Geometry/Circle.hpp"
 #include "Polygon.hpp"
 #include "BoundingBox.hpp"
+#include "libslic3r.h"
 #include <admesh/stl.h>
 
+#include <array>
 #include <string_view>
+#include <vector>
+#include <utility>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/CAD/CadDocument.cpp b/src/libslic3r/CAD/CadDocument.cpp
index ea20ffd966..b4a89f6a69 100644
--- a/src/libslic3r/CAD/CadDocument.cpp
+++ b/src/libslic3r/CAD/CadDocument.cpp
@@ -1,8 +1,14 @@
 #include "libslic3r/CAD/CadDocument.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/CAD/SketchEngine.hpp"
+#include "libslic3r/CAD/GeometryEngine.hpp"
 #include "libslic3r/CAD/SketchConstraints.hpp"
 #include "libslic3r/CAD/SketchSolver.hpp"
 #include "libslic3r/CAD/SketchImport.hpp"   // transform_regions for imported art
 
+#include <Standard_Handle.hxx>
+#include <TopAbs_ShapeEnum.hxx>
+#include <Standard_TypeDef.hxx>
 #include <array>
 
 #include <Standard_Failure.hxx>
@@ -26,6 +32,10 @@
 #include <BRepOffsetAPI_DraftAngle.hxx>
 #include <Bnd_Box.hxx>
 #include <BRepBndLib.hxx>
+#include <functional>
+#include <exception>
+#include <cstdint>
+#include <cereal/cereal.hpp>
 #include <gp_Pln.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <BRepPrimAPI_MakeCylinder.hxx>
@@ -69,12 +79,18 @@
 #include <cmath>
 #include <cctype>
 #include <cstdio>
+#include <math.h>
+#include <map>
+#include <set>
 #include <stdexcept>
 #include <algorithm>
 #include <sstream>
 
 #include <cereal/archives/binary.hpp>
 #include <BRepTools.hxx>
+#include <string>
+#include <vector>
+#include <utility>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/CAD/CadDocument.hpp b/src/libslic3r/CAD/CadDocument.hpp
index f62536384a..216be818bd 100644
--- a/src/libslic3r/CAD/CadDocument.hpp
+++ b/src/libslic3r/CAD/CadDocument.hpp
@@ -1,16 +1,20 @@
 #ifndef slic3r_CadDocument_hpp_
 #define slic3r_CadDocument_hpp_
 
+#include "libslic3r/Point.hpp"
 #include "libslic3r/TriangleMesh.hpp"
 #include "libslic3r/CAD/SketchEngine.hpp"
 #include "libslic3r/CAD/GeometryEngine.hpp"   // FaceGroup
 #include "libslic3r/Color.hpp"            // ColorRGBA (per-body display colour override)
 
+#include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Wire.hxx>
 #include <cereal/cereal.hpp>
 #include <cereal/types/vector.hpp>
 #include <cereal/types/string.hpp>
+#include <cstdint>
+#include <cstddef>
 #include <map>
 #include <cereal/types/map.hpp>
 #include <string>
diff --git a/src/libslic3r/CAD/GeometryEngine.cpp b/src/libslic3r/CAD/GeometryEngine.cpp
index 2b923938c2..1e5896e67a 100644
--- a/src/libslic3r/CAD/GeometryEngine.cpp
+++ b/src/libslic3r/CAD/GeometryEngine.cpp
@@ -1,12 +1,25 @@
 #include "libslic3r/CAD/GeometryEngine.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/TriangleMesh.hpp"
 
 #include <BRepMesh_IncrementalMesh.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_Surface.hxx>
 #include <BRepLProp_SLProps.hxx>
+#include <TopAbs_ShapeEnum.hxx>
+#include <cstddef>
+#include <algorithm>
+#include <GeomAbs_SurfaceType.hxx>
+#include <TopAbs_Orientation.hxx>
+#include <Standard_Handle.hxx>
+#include <cstdint>
+#include <Poly_Triangle.hxx>
+#include <GeomAbs_CurveType.hxx>
 #include <gp_Cylinder.hxx>
 #include <BRepFilletAPI_MakeFillet.hxx>
 #include <BRepFilletAPI_MakeChamfer.hxx>
+#include <math.h>
+#include <gp_Mat.hxx>
 #include <stdexcept>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
@@ -43,6 +56,9 @@
 #include <array>
 #include <map>
 #include <cmath>
+#include <vector>
+#include <string>
+#include <utility>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/CAD/GeometryEngine.hpp b/src/libslic3r/CAD/GeometryEngine.hpp
index f27a0f2f17..6c0fb51daf 100644
--- a/src/libslic3r/CAD/GeometryEngine.hpp
+++ b/src/libslic3r/CAD/GeometryEngine.hpp
@@ -1,6 +1,7 @@
 #ifndef slic3r_GeometryEngine_hpp_
 #define slic3r_GeometryEngine_hpp_
 
+#include "libslic3r/Point.hpp"
 #include "libslic3r/TriangleMesh.hpp"
 
 #include <BRepPrimAPI_MakeBox.hxx>
@@ -8,6 +9,8 @@
 #include <BRepPrimAPI_MakeSphere.hxx>
 #include <BRepPrimAPI_MakeCone.hxx>
 #include <BRepPrimAPI_MakeTorus.hxx>
+#include <TopoDS_Shape.hxx>
+#include <array>
 #include <gp_Ax2.hxx>
 #include <TopoDS_Solid.hxx>
 #include <TopoDS_Face.hxx>
diff --git a/src/libslic3r/CAD/SketchConstraints.cpp b/src/libslic3r/CAD/SketchConstraints.cpp
index 003afb4d63..acc82a0e42 100644
--- a/src/libslic3r/CAD/SketchConstraints.cpp
+++ b/src/libslic3r/CAD/SketchConstraints.cpp
@@ -1,6 +1,11 @@
 #include "libslic3r/CAD/SketchConstraints.hpp"
+#include "libslic3r/Point.hpp"
+#include <Eigen/Core>
 #include <Eigen/Dense>
+#include <algorithm>
 #include <cmath>
+#include <cstddef>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/CAD/SketchConstraints.hpp b/src/libslic3r/CAD/SketchConstraints.hpp
index 88bcadc403..10c3efacc4 100644
--- a/src/libslic3r/CAD/SketchConstraints.hpp
+++ b/src/libslic3r/CAD/SketchConstraints.hpp
@@ -2,6 +2,7 @@
 #define slic3r_SketchConstraints_hpp_
 
 #include "libslic3r/Point.hpp"
+#include <Eigen/Core>
 #include <vector>
 #include <Eigen/Dense>
 
diff --git a/src/libslic3r/CAD/SketchEngine.cpp b/src/libslic3r/CAD/SketchEngine.cpp
index 5cc36ce648..ba92fa88bb 100644
--- a/src/libslic3r/CAD/SketchEngine.cpp
+++ b/src/libslic3r/CAD/SketchEngine.cpp
@@ -1,7 +1,18 @@
 #include "libslic3r/CAD/SketchEngine.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/TriangleMesh.hpp"
 
+#include <Standard_Handle.hxx>
+#include <GeomAbs_SurfaceType.hxx>
+#include <GeomAbs_JoinType.hxx>
+#include <TopAbs_ShapeEnum.hxx>
+#include <Standard_TypeDef.hxx>
+#include <TopAbs_Orientation.hxx>
+#include <Poly_Triangle.hxx>
+#include <TopAbs_State.hxx>
 #include <algorithm>
 #include <cmath>
+#include <cstddef>
 #include <limits>
 
 #include <BRepBuilderAPI_MakeWire.hxx>
@@ -47,8 +58,11 @@
 #include <TopoDS_Wire.hxx>
 #include <GeomAPI_IntCS.hxx>
 #include <map>
+#include <math.h>
 #include <tuple>
 #include <stdexcept>
+#include <vector>
+#include <utility>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/CAD/SketchImport.cpp b/src/libslic3r/CAD/SketchImport.cpp
index 7140776603..32bcc608d3 100644
--- a/src/libslic3r/CAD/SketchImport.cpp
+++ b/src/libslic3r/CAD/SketchImport.cpp
@@ -1,5 +1,8 @@
 #include "libslic3r/CAD/SketchImport.hpp"
 
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/EmbossShape.hpp"
 #include "libslic3r/Emboss.hpp"
 #include "libslic3r/NSVGUtils.hpp"
 #include "libslic3r/ExPolygon.hpp"
@@ -9,6 +12,11 @@
 
 #include <algorithm>
 #include <limits>
+#include <vector>
+#include <string>
+#include <memory>
+#include <utility>
+#include <nanosvg/nanosvg.h>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/CAD/SketchInference.cpp b/src/libslic3r/CAD/SketchInference.cpp
index cfeb2cd509..eca56ee5c1 100644
--- a/src/libslic3r/CAD/SketchInference.cpp
+++ b/src/libslic3r/CAD/SketchInference.cpp
@@ -1,7 +1,13 @@
 #include "libslic3r/CAD/SketchInference.hpp"
+#include "libslic3r/CAD/SketchEngine.hpp"
+#include "libslic3r/Point.hpp"
 
 #include <algorithm>
 #include <cmath>
+#include <vector>
+#include <cstddef>
+#include <optional>
+#include <math.h>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/CAD/SketchInference.hpp b/src/libslic3r/CAD/SketchInference.hpp
index be51f0240e..eb30af184a 100644
--- a/src/libslic3r/CAD/SketchInference.hpp
+++ b/src/libslic3r/CAD/SketchInference.hpp
@@ -1,7 +1,9 @@
 #ifndef slic3r_SketchInference_hpp_
 #define slic3r_SketchInference_hpp_
 
+#include "libslic3r/Point.hpp"
 #include "libslic3r/CAD/SketchEngine.hpp"
+#include <math.h>
 #include <vector>
 #include <optional>
 #include <cmath>
diff --git a/src/libslic3r/CAD/SketchSolver.cpp b/src/libslic3r/CAD/SketchSolver.cpp
index 952f9de16f..03033d061e 100644
--- a/src/libslic3r/CAD/SketchSolver.cpp
+++ b/src/libslic3r/CAD/SketchSolver.cpp
@@ -1,5 +1,7 @@
 #include "libslic3r/CAD/SketchSolver.hpp"
+#include "libslic3r/CAD/SketchEngine.hpp"
 
+#include <math.h>
 #include <slvs.h>
 
 #include <cmath>
@@ -7,6 +9,8 @@
 #include <functional>
 #include <map>
 #include <unordered_map>
+#include <vector>
+#include <utility>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/CAD/ThreadStandards.cpp b/src/libslic3r/CAD/ThreadStandards.cpp
index 2d113d01e6..11b6b24d8f 100644
--- a/src/libslic3r/CAD/ThreadStandards.cpp
+++ b/src/libslic3r/CAD/ThreadStandards.cpp
@@ -1,4 +1,6 @@
 #include "libslic3r/CAD/ThreadStandards.hpp"
+#include <vector>
+#include <string>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Channel.hpp b/src/libslic3r/Channel.hpp
index 68369af638..8ed9da9a88 100644
--- a/src/libslic3r/Channel.hpp
+++ b/src/libslic3r/Channel.hpp
@@ -1,6 +1,9 @@
 #ifndef slic3r_Channel_hpp_
 #define slic3r_Channel_hpp_
 
+#include <boost/optional/optional.hpp>
+#include <boost/none.hpp>
+#include <cstddef>
 #include <memory>
 #include <deque>
 #include <condition_variable>
diff --git a/src/libslic3r/Circle.cpp b/src/libslic3r/Circle.cpp
index c277a67795..8d09ba8f89 100644
--- a/src/libslic3r/Circle.cpp
+++ b/src/libslic3r/Circle.cpp
@@ -2,8 +2,14 @@
 
 #include <cmath>
 #include <cassert>
+#include <cstddef>
+#include <utility>
+#include <math.h>
 #include "Geometry.hpp"
+#include "Point.hpp"
+#include "Line.hpp"
 #include "Polygon.hpp"
+#include "libslic3r.h"
 
 
 //BBS: Refer to ArcWelderLib for the arc fitting functions
diff --git a/src/libslic3r/Circle.hpp b/src/libslic3r/Circle.hpp
index c06b197e19..388c7488ea 100644
--- a/src/libslic3r/Circle.hpp
+++ b/src/libslic3r/Circle.hpp
@@ -3,6 +3,8 @@
 
 #include "Point.hpp"
 #include "Line.hpp"
+#include "libslic3r.h"
+#include <cmath>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Clipper2Utils.cpp b/src/libslic3r/Clipper2Utils.cpp
index f119fc3924..eccc788fc3 100644
--- a/src/libslic3r/Clipper2Utils.cpp
+++ b/src/libslic3r/Clipper2Utils.cpp
@@ -1,6 +1,14 @@
 #include "Clipper2Utils.hpp"
+#include "Polyline.hpp"
+#include "clipper2/clipper.core.h"
+#include "Point.hpp"
+#include "ExPolygon.hpp"
+#include "clipper2/clipper.engine.h"
+#include "clipper2/clipper.offset.h"
 #include "libslic3r.h"
 #include "clipper2/clipper.h"
+#include <utility>
+#include <cstddef>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Clipper2Utils.hpp b/src/libslic3r/Clipper2Utils.hpp
index 2b4b0fb2ef..751b14d281 100644
--- a/src/libslic3r/Clipper2Utils.hpp
+++ b/src/libslic3r/Clipper2Utils.hpp
@@ -4,7 +4,9 @@
 #include "ExPolygon.hpp"
 #include "Polygon.hpp"
 #include "Polyline.hpp"
+#include "clipper2/clipper.core.h"
 #include "clipper2/clipper.h"
+#include "clipper2/clipper.offset.h"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/ClipperUtils.cpp b/src/libslic3r/ClipperUtils.cpp
index ea19eeb559..62b2b1472d 100644
--- a/src/libslic3r/ClipperUtils.cpp
+++ b/src/libslic3r/ClipperUtils.cpp
@@ -1,10 +1,25 @@
+#include <cstddef>
+#include <algorithm>
+#include <cstdlib>
+#include <cassert>
+#include <cmath>
 #include <limits>
 #include <numeric>
 #include <unordered_map>
+#include <utility>
+#include <vector>
 
 #include "ClipperUtils.hpp"
+#include "BoundingBox.hpp"
+#include "ExPolygon.hpp"
 #include "Geometry.hpp"
+#include "Point.hpp"
+#include "Polygon.hpp"
+#include "Polyline.hpp"
+#include "Line.hpp"
 #include "ShortestPath.hpp"
+#include "libslic3r.h"
+#include "Surface.hpp"
 
 // #define CLIPPER_UTILS_DEBUG
 
diff --git a/src/libslic3r/ClipperUtils.hpp b/src/libslic3r/ClipperUtils.hpp
index 5ed161c27a..5802e121ee 100644
--- a/src/libslic3r/ClipperUtils.hpp
+++ b/src/libslic3r/ClipperUtils.hpp
@@ -1,11 +1,18 @@
 #ifndef slic3r_ClipperUtils_hpp_
 #define slic3r_ClipperUtils_hpp_
 
+#include "Point.hpp"
+#include "Polyline.hpp"
+#include "Line.hpp"
 #include "libslic3r.h"
 #include "clipper.hpp"
 #include "ExPolygon.hpp"
 #include "Polygon.hpp"
 #include "Surface.hpp"
+#include <cstddef>
+#include <iterator>
+#include <cassert>
+#include <vector>
 
 // import these wherever we're included
 using Slic3r::ClipperLib::jtMiter;
diff --git a/src/libslic3r/ClipperZUtils.hpp b/src/libslic3r/ClipperZUtils.hpp
index 7465bd31a4..4b36d83d74 100644
--- a/src/libslic3r/ClipperZUtils.hpp
+++ b/src/libslic3r/ClipperZUtils.hpp
@@ -1,7 +1,12 @@
 #ifndef slic3r_ClipperZUtils_hpp_
 #define slic3r_ClipperZUtils_hpp_
 
+#include "libslic3r.h"
+#include <cstddef>
+#include <algorithm>
+#include <cassert>
 #include <numeric>
+#include <utility>
 #include <vector>
 
 #include <clipper/clipper_z.hpp>
diff --git a/src/libslic3r/Color.cpp b/src/libslic3r/Color.cpp
index d7208d40fc..bb08b7c75b 100644
--- a/src/libslic3r/Color.cpp
+++ b/src/libslic3r/Color.cpp
@@ -1,7 +1,15 @@
 #include "libslic3r.h"
 #include "Color.hpp"
 
+#include <cstddef>
+#include <cstdlib>
+#include <cassert>
+#include <algorithm>
+#include <cmath>
+#include <cstdio>
 #include <random>
+#include <string>
+#include <vector>
 
 static const float INV_255 = 1.0f / 255.0f;
 
diff --git a/src/libslic3r/ColorDecomposeRecipe.cpp b/src/libslic3r/ColorDecomposeRecipe.cpp
index f2ceb1860a..6aa09f01d2 100644
--- a/src/libslic3r/ColorDecomposeRecipe.cpp
+++ b/src/libslic3r/ColorDecomposeRecipe.cpp
@@ -9,7 +9,9 @@
 #include <cstdio>
 #include <fstream>
 #include <limits>
+#include <string>
 #include <utility>
+#include <vector>
 
 namespace Slic3r {
 namespace {
diff --git a/src/libslic3r/Config.cpp b/src/libslic3r/Config.cpp
index df2030b575..38c5b30118 100644
--- a/src/libslic3r/Config.cpp
+++ b/src/libslic3r/Config.cpp
@@ -1,4 +1,6 @@
 #include "Config.hpp"
+#include "Exception.hpp"
+#include "Point.hpp"
 #include "format.hpp"
 #include "Utils.hpp"
 #include "LocalesUtils.hpp"
@@ -6,7 +8,20 @@
 
 #include <algorithm>
 #include <assert.h>
+#include <cmath>
+#include <boost/algorithm/string/join.hpp>
+#include <cstdlib>
+#include <exception>
+#include <cctype>
+#include <boost/algorithm/string/trim.hpp>
 #include <fstream>
+#include <functional>
+#include <set>
+#include <initializer_list>
+#include <map>
+#include <list>
+#include <optional>
+#include <memory>
 #include <sstream>
 #include <iostream>
 #include <iomanip>
@@ -26,8 +41,15 @@
 #include <boost/nowide/fstream.hpp>
 #include <boost/property_tree/ini_parser.hpp>
 #include <boost/format.hpp>
+#include <stdexcept>
 #include <string.h>
+#include <string>
+#include <vector>
+#include <utility>
+#include <system_error>
 //BBS: add json support
+#include "libslic3r.h"
+#include "libslic3r_version.h"
 #include "nlohmann/json.hpp"
 
 using namespace nlohmann;
diff --git a/src/libslic3r/Config.hpp b/src/libslic3r/Config.hpp
index 9818887c1d..9d76262ec6 100644
--- a/src/libslic3r/Config.hpp
+++ b/src/libslic3r/Config.hpp
@@ -3,6 +3,11 @@
 
 #include <assert.h>
 #include <algorithm>
+#include <boost/container_hash/hash.hpp>
+#include <cctype>
+#include <initializer_list>
+#include <limits>
+#include <cmath>
 #include <map>
 #include <climits>
 #include <cfloat>
@@ -10,10 +15,15 @@
 #include <cstdlib>
 #include <functional>
 #include <iostream>
+#include <memory>
 #include <optional>
+#include <sstream>
+#include <set>
 #include <stdexcept>
 #include <string>
+#include <utility>
 #include <vector>
+#include "LocalesUtils.hpp"
 #include "libslic3r.h"
 #include "clonable_ptr.hpp"
 #include "Exception.hpp"
diff --git a/src/libslic3r/ContourZ.cpp b/src/libslic3r/ContourZ.cpp
index f4a5fc049a..8751bcca58 100644
--- a/src/libslic3r/ContourZ.cpp
+++ b/src/libslic3r/ContourZ.cpp
@@ -2,14 +2,18 @@
 #include "ExtrusionEntity.hpp"
 #include "ExtrusionEntityCollection.hpp"
 #include "Layer.hpp"
+#include "Line.hpp"
 #include "Point.hpp"
 #include "Print.hpp"
 #include "SLA/IndexedMesh.hpp"
 #include "libslic3r.h"
+#include <Eigen/Core>
 #include <cfloat>
 #include <cmath>
 #include <initializer_list>
+#include <math.h>
 #include <string>
+#include <utility>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/CustomGCode.cpp b/src/libslic3r/CustomGCode.cpp
index acd7089c05..a78bc2a111 100644
--- a/src/libslic3r/CustomGCode.cpp
+++ b/src/libslic3r/CustomGCode.cpp
@@ -2,6 +2,10 @@
 #include "Config.hpp"
 #include "GCode.hpp"
 #include "GCodeWriter.hpp"
+#include <vector>
+#include <utility>
+#include <cstddef>
+#include <cassert>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/CustomGCode.hpp b/src/libslic3r/CustomGCode.hpp
index 7d8c7d9982..a4ed244dc5 100644
--- a/src/libslic3r/CustomGCode.hpp
+++ b/src/libslic3r/CustomGCode.hpp
@@ -1,7 +1,10 @@
 #ifndef slic3r_CustomGCode_hpp_
 #define slic3r_CustomGCode_hpp_
 
+#include <map>
+#include <cstddef>
 #include <string>
+#include <utility>
 #include <vector>
 #include <nlohmann/json.hpp>
 
diff --git a/src/libslic3r/CutSurface.cpp b/src/libslic3r/CutSurface.cpp
index 606a5b8aaa..b24c1e796c 100644
--- a/src/libslic3r/CutSurface.cpp
+++ b/src/libslic3r/CutSurface.cpp
@@ -1,4 +1,38 @@
 #include "CutSurface.hpp"
+#include "libslic3r/Emboss.hpp"
+#include <vector>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Surface_mesh/Surface_mesh.h>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include <cstdint>
+#include <limits>
+#include <string>
+#include <utility>
+#include "libslic3r/BoundingBox.hpp"
+#include <cstddef>
+#include "libslic3r/Polygon.hpp"
+#include <cassert>
+#include <array>
+#include <cmath>
+#include <math.h>
+#include <algorithm>
+#include <queue>
+#include <CGAL/enum.h>
+#include <CGAL/Kernel/global_functions_3.h>
+#include <CGAL/Named_function_parameters.h>
+#include "libslic3r/AABBTreeIndirect.hpp"
+#include <cstdlib>
+#include "libslic3r/libslic3r.h"
+#include <boost/property_map/property_map.hpp>
+#include <CGAL/Polygon_mesh_processing/self_intersections.h>
+#include <CGAL/AABB_face_graph_triangle_primitive.h>
+#include <CGAL/AABB_traits.h>
+#include <CGAL/AABB_tree.h>
+#include <CGAL/boost/graph/graph_traits_Surface_mesh.h>
+#include <iterator>
+#include <optional>
+#include <CGAL/Surface_mesh/IO/OFF.h>
 
 /// models_input.obj - Check transormation of model to each others
 /// projection_center.obj - circle representing center of projection with correct distance
diff --git a/src/libslic3r/CutSurface.hpp b/src/libslic3r/CutSurface.hpp
index 9f4e3159cf..33b0d88697 100644
--- a/src/libslic3r/CutSurface.hpp
+++ b/src/libslic3r/CutSurface.hpp
@@ -1,6 +1,8 @@
 #ifndef slic3r_CutSurface_hpp_
 #define slic3r_CutSurface_hpp_
 
+#include "libslic3r/BoundingBox.hpp"
+#include <string>
 #include <vector>
 #include <admesh/stl.h> // indexed_triangle_set
 #include "ExPolygon.hpp"
diff --git a/src/libslic3r/CutUtils.cpp b/src/libslic3r/CutUtils.cpp
index f8b1483773..e5cb3cc6f1 100644
--- a/src/libslic3r/CutUtils.cpp
+++ b/src/libslic3r/CutUtils.cpp
@@ -1,13 +1,24 @@
 
 #include "CutUtils.hpp"
 #include "Geometry.hpp"
+#include "Point.hpp"
+#include "TriangleMesh.hpp"
 #include "libslic3r.h"
 #include "Model.hpp"
 #include "TriangleMeshSlicer.hpp"
 #include "TriangleSelector.hpp"
 #include "ObjectID.hpp"
 
+#include <algorithm>
 #include <boost/log/trivial.hpp>
+#include <cassert>
+#include <string>
+#include <vector>
+#include <utility>
+#include <cstddef>
+#include <optional>
+#include <math.h>
+#include <cmath>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/CutUtils.hpp b/src/libslic3r/CutUtils.hpp
index b7f31d7b9a..37f30308b6 100644
--- a/src/libslic3r/CutUtils.hpp
+++ b/src/libslic3r/CutUtils.hpp
@@ -5,6 +5,7 @@
 #include "Point.hpp"
 #include "Model.hpp"
 
+#include <optional>
 #include <vector>
 
 namespace Slic3r {
diff --git a/src/libslic3r/EdgeGrid.cpp b/src/libslic3r/EdgeGrid.cpp
index 93bf7d48ec..c6e003505a 100644
--- a/src/libslic3r/EdgeGrid.cpp
+++ b/src/libslic3r/EdgeGrid.cpp
@@ -1,10 +1,21 @@
 #include <algorithm>
+#include <cstddef>
+#include <cstdlib>
+#include <cstdint>
+#include <utility>
+#include <cmath>
+#include <set>
 #include <vector>
 #include <float.h>
 #include <unordered_map>
 
 #include <png.h>
 
+#include "Polygon.hpp"
+#include "Point.hpp"
+#include "Polyline.hpp"
+#include "ExPolygon.hpp"
+#include "Line.hpp"
 #include "libslic3r.h"
 #include "ClipperUtils.hpp"
 #include "EdgeGrid.hpp"
diff --git a/src/libslic3r/EdgeGrid.hpp b/src/libslic3r/EdgeGrid.hpp
index 6bbed1e9fa..971d23ead6 100644
--- a/src/libslic3r/EdgeGrid.hpp
+++ b/src/libslic3r/EdgeGrid.hpp
@@ -1,12 +1,24 @@
 #ifndef slic3r_EdgeGrid_hpp_
 #define slic3r_EdgeGrid_hpp_
 
+#include <cstddef>
+#include <cassert>
+#include <limits>
+#include <cstdlib>
+#include <algorithm>
 #include <stdint.h>
 #include <math.h>
+#include <vector>
+#include <utility>
+#include <string>
 
+#include "Line.hpp"
 #include "Point.hpp"
 #include "BoundingBox.hpp"
 #include "ExPolygon.hpp"
+#include "libslic3r.h"
+#include "Polygon.hpp"
+#include "Polyline.hpp"
 
 namespace Slic3r {
 namespace EdgeGrid {
diff --git a/src/libslic3r/ElephantFootCompensation.cpp b/src/libslic3r/ElephantFootCompensation.cpp
index 0adff1ba4e..93a2a37916 100644
--- a/src/libslic3r/ElephantFootCompensation.cpp
+++ b/src/libslic3r/ElephantFootCompensation.cpp
@@ -1,3 +1,6 @@
+#include "Point.hpp"
+#include "BoundingBox.hpp"
+#include "Polygon.hpp"
 #include "clipper/clipper_z.hpp"
 
 #include "libslic3r.h"
@@ -10,8 +13,14 @@
 #include "SVG.hpp"
 #include "Utils.hpp"
 
+#include <algorithm>
 #include <cmath>
 #include <cassert>
+#include <cstddef>
+#include <vector>
+#include <utility>
+#include <math.h>
+#include <limits>
 
 // #define CONTOUR_DISTANCE_DEBUG_SVG
 
diff --git a/src/libslic3r/Emboss.cpp b/src/libslic3r/Emboss.cpp
index 38c035806c..42d87f6936 100644
--- a/src/libslic3r/Emboss.cpp
+++ b/src/libslic3r/Emboss.cpp
@@ -1,12 +1,35 @@
+#include <cmath>
+#include <cassert>
+#include <algorithm>
+#include <functional>
+#include <iterator>
+#include <cstdint>
+#include <memory>
+#include <cstdio>
+#include <cctype>
+#include <limits>
+#include <math.h>
+#include <Eigen/Geometry>
+#include <Eigen/Core>
 #include <numeric>
 #include "Emboss.hpp"
+#include <optional>
 #include <stdio.h>
 #include <numeric>
 #include <cstdlib>
 #include <boost/nowide/convert.hpp>
 #include <boost/log/trivial.hpp>
 #include <ClipperUtils.hpp> // union_ex + for boldness(polygon extend(offset))
+#include "ExPolygon.hpp"
+#include <vector>
+#include "AABBTreeIndirect.hpp"
+#include <utility>
+#include "EmbossShape.hpp"
+#include <string>
 #include "IntersectionPoints.hpp"
+#include "Polygon.hpp"
+#include "TextConfiguration.hpp"
+#include "Point.hpp"
 
 #define STB_TRUETYPE_IMPLEMENTATION // force following include to generate implementation
 #include "imgui/imstb_truetype.h" // stbtt_fontinfo
diff --git a/src/libslic3r/Emboss.hpp b/src/libslic3r/Emboss.hpp
index 506e703b2a..934bc10fc4 100644
--- a/src/libslic3r/Emboss.hpp
+++ b/src/libslic3r/Emboss.hpp
@@ -1,11 +1,19 @@
 #ifndef slic3r_Emboss_hpp_
 #define slic3r_Emboss_hpp_
 
+#include <string>
+#include <map>
+#include <utility>
+#include <cassert>
+#include <cstddef>
+#include <functional>
+#include <cstdint>
 #include <vector>
 #include <set>
 #include <optional>
 #include <memory>
 #include <admesh/stl.h> // indexed_triangle_set
+#include "Point.hpp"
 #include "Polygon.hpp"
 #include "ExPolygon.hpp"
 #include "EmbossShape.hpp" // ExPolygonsWithIds
diff --git a/src/libslic3r/EmbossShape.hpp b/src/libslic3r/EmbossShape.hpp
index 3e4a950037..490844bdef 100644
--- a/src/libslic3r/EmbossShape.hpp
+++ b/src/libslic3r/EmbossShape.hpp
@@ -9,9 +9,11 @@
 #include <cereal/types/vector.hpp>
 #include <cereal/types/optional.hpp>
 #include <cereal/archives/binary.hpp>
+#include <vector>
 #include "Point.hpp" // Transform3d
 #include "ExPolygon.hpp"
 #include "ExPolygonSerialize.hpp"
+#include "libslic3r.h"
 #include "nanosvg/nanosvg.h" // NSVGimage
 
 namespace Slic3r {
diff --git a/src/libslic3r/ExPolygon.cpp b/src/libslic3r/ExPolygon.cpp
index 185e925084..f34b07b7cb 100644
--- a/src/libslic3r/ExPolygon.cpp
+++ b/src/libslic3r/ExPolygon.cpp
@@ -2,13 +2,23 @@
 #include "ExPolygon.hpp"
 #include "Exception.hpp"
 #include "Geometry/MedialAxis.hpp"
+#include "Point.hpp"
+#include "MultiPoint.hpp"
 #include "Polygon.hpp"
 #include "Line.hpp"
 #include "ClipperUtils.hpp"
+#include "Polyline.hpp"
 #include "SVG.hpp"
+#include "libslic3r.h"
 #include <algorithm>
 #include <cassert>
+#include <limits>
+#include <cstddef>
+#include <cmath>
+#include <cstdlib>
 #include <list>
+#include <utility>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/ExPolygon.hpp b/src/libslic3r/ExPolygon.hpp
index ce7ebe892f..d695171d1e 100644
--- a/src/libslic3r/ExPolygon.hpp
+++ b/src/libslic3r/ExPolygon.hpp
@@ -1,10 +1,17 @@
 #ifndef slic3r_ExPolygon_hpp_
 #define slic3r_ExPolygon_hpp_
 
+#include "Line.hpp"
 #include "Point.hpp"
 #include "libslic3r.h"
 #include "Polygon.hpp"
 #include "Polyline.hpp"
+#include <utility>
+#include <initializer_list>
+#include <cstddef>
+#include <cstdint>
+#include <cassert>
+#include <iterator>
 #include <vector>
 
 namespace Slic3r {
diff --git a/src/libslic3r/ExPolygonCollection.hpp b/src/libslic3r/ExPolygonCollection.hpp
index 35e1eef4eb..ecef053ebc 100644
--- a/src/libslic3r/ExPolygonCollection.hpp
+++ b/src/libslic3r/ExPolygonCollection.hpp
@@ -1,10 +1,13 @@
 #ifndef slic3r_ExPolygonCollection_hpp_
 #define slic3r_ExPolygonCollection_hpp_
 
+#include "Point.hpp"
+#include "Polygon.hpp"
 #include "libslic3r.h"
 #include "ExPolygon.hpp"
 #include "Line.hpp"
 #include "Polyline.hpp"
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/ExPolygonSerialize.hpp b/src/libslic3r/ExPolygonSerialize.hpp
index 712d4706d5..58d12093e6 100644
--- a/src/libslic3r/ExPolygonSerialize.hpp
+++ b/src/libslic3r/ExPolygonSerialize.hpp
@@ -3,6 +3,7 @@
 
 #include "ExPolygon.hpp"
 #include "Point.hpp" // Cereal serialization of Point
+#include "Polygon.hpp"
 #include <cereal/cereal.hpp>
 #include <cereal/types/vector.hpp>
 
diff --git a/src/libslic3r/ExPolygonsIndex.cpp b/src/libslic3r/ExPolygonsIndex.cpp
index 976531799f..296d43a198 100644
--- a/src/libslic3r/ExPolygonsIndex.cpp
+++ b/src/libslic3r/ExPolygonsIndex.cpp
@@ -1,4 +1,10 @@
 #include "ExPolygonsIndex.hpp"
+#include "ExPolygon.hpp"
+#include <cstdint>
+#include <cassert>
+#include <vector>
+#include <utility>
+#include <algorithm>
 using namespace Slic3r;
 
 // IMPROVE: use one dimensional vector for polygons offset with searching by std::lower_bound
diff --git a/src/libslic3r/ExPolygonsIndex.hpp b/src/libslic3r/ExPolygonsIndex.hpp
index b46fd50890..317fb5f731 100644
--- a/src/libslic3r/ExPolygonsIndex.hpp
+++ b/src/libslic3r/ExPolygonsIndex.hpp
@@ -2,6 +2,8 @@
 #define slic3r_ExPolygonsIndex_hpp_
 
 #include "ExPolygon.hpp"
+#include <cstdint>
+#include <vector>
 namespace Slic3r {
 
 /// <summary>
diff --git a/src/libslic3r/Exception.hpp b/src/libslic3r/Exception.hpp
index d271a25052..5297af8ff2 100644
--- a/src/libslic3r/Exception.hpp
+++ b/src/libslic3r/Exception.hpp
@@ -1,7 +1,9 @@
 #ifndef _libslic3r_Exception_h_
 #define _libslic3r_Exception_h_
 
+#include <cstddef>
 #include <stdexcept>
+#include <string>
 #include <vector>
 
 namespace Slic3r {
diff --git a/src/libslic3r/Execution/Execution.hpp b/src/libslic3r/Execution/Execution.hpp
index 62e49cfeb3..9620d9b11d 100644
--- a/src/libslic3r/Execution/Execution.hpp
+++ b/src/libslic3r/Execution/Execution.hpp
@@ -1,6 +1,7 @@
 #ifndef EXECUTION_HPP
 #define EXECUTION_HPP
 
+#include <functional>
 #include <type_traits>
 #include <utility>
 #include <cstddef>
diff --git a/src/libslic3r/Execution/ExecutionSeq.hpp b/src/libslic3r/Execution/ExecutionSeq.hpp
index 321d65631b..56afa6aaf4 100644
--- a/src/libslic3r/Execution/ExecutionSeq.hpp
+++ b/src/libslic3r/Execution/ExecutionSeq.hpp
@@ -1,6 +1,9 @@
 #ifndef EXECUTIONSEQ_HPP
 #define EXECUTIONSEQ_HPP
 
+#include <type_traits>
+#include "libslic3r/libslic3r.h"
+#include <cstddef>
 #ifdef PRUSASLICER_USE_EXECUTION_STD // Conflicts with our version of TBB
 #include <execution>
 #endif
diff --git a/src/libslic3r/Execution/ExecutionTBB.hpp b/src/libslic3r/Execution/ExecutionTBB.hpp
index 2250b8e322..4881c7b59c 100644
--- a/src/libslic3r/Execution/ExecutionTBB.hpp
+++ b/src/libslic3r/Execution/ExecutionTBB.hpp
@@ -1,14 +1,17 @@
 #ifndef EXECUTIONTBB_HPP
 #define EXECUTIONTBB_HPP
 
+#include <cstddef>
 #include <mutex>
 
 #include <tbb/spin_mutex.h>
 #include <tbb/parallel_for.h>
 #include <tbb/parallel_reduce.h>
 #include <tbb/task_arena.h>
+#include <type_traits>
 
 #include "Execution.hpp"
+#include "libslic3r/libslic3r.h"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Extruder.cpp b/src/libslic3r/Extruder.cpp
index b1b6ca347a..bffdf6771c 100644
--- a/src/libslic3r/Extruder.cpp
+++ b/src/libslic3r/Extruder.cpp
@@ -1,5 +1,11 @@
 #include "Extruder.hpp"
+#include "Exception.hpp"
 #include "PrintConfig.hpp"
+#include <vector>
+#include "libslic3r.h"
+#include <cassert>
+#include <algorithm>
+#include <cmath>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Extruder.hpp b/src/libslic3r/Extruder.hpp
index aa023ea040..94e083c86b 100644
--- a/src/libslic3r/Extruder.hpp
+++ b/src/libslic3r/Extruder.hpp
@@ -3,6 +3,7 @@
 
 #include "libslic3r.h"
 #include "Point.hpp"
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/ExtrusionEntity.cpp b/src/libslic3r/ExtrusionEntity.cpp
index bd45150a15..a3590814f7 100644
--- a/src/libslic3r/ExtrusionEntity.cpp
+++ b/src/libslic3r/ExtrusionEntity.cpp
@@ -4,10 +4,23 @@
 #include "ClipperUtils.hpp"
 #include "Extruder.hpp"
 #include "Flow.hpp"
+#include <algorithm>
+#include <cassert>
 #include <cmath>
+#include <cstddef>
+#include <functional>
 #include <limits>
 #include <sstream>
+#include "Point.hpp"
+#include "Polyline.hpp"
+#include "Polygon.hpp"
+#include <utility>
+#include <vector>
+#include "Line.hpp"
+#include <string>
+#include <string_view>
 #include "Utils.hpp"
+#include "libslic3r.h"
 
 #define L(s) (s)
 
diff --git a/src/libslic3r/ExtrusionEntity.hpp b/src/libslic3r/ExtrusionEntity.hpp
index de80247bce..d7dac99364 100644
--- a/src/libslic3r/ExtrusionEntity.hpp
+++ b/src/libslic3r/ExtrusionEntity.hpp
@@ -1,13 +1,19 @@
 #ifndef slic3r_ExtrusionEntity_hpp_
 #define slic3r_ExtrusionEntity_hpp_
 
+#include "Point.hpp"
 #include "libslic3r.h"
 #include "Polygon.hpp"
 #include "Polyline.hpp"
 
 #include <assert.h>
+#include <cstdint>
+#include <string>
+#include <cstddef>
 #include <string_view>
 #include <numeric>
+#include <vector>
+#include <utility>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/ExtrusionEntityCollection.cpp b/src/libslic3r/ExtrusionEntityCollection.cpp
index 9a37ff3ac1..0141e3d5e8 100644
--- a/src/libslic3r/ExtrusionEntityCollection.cpp
+++ b/src/libslic3r/ExtrusionEntityCollection.cpp
@@ -1,7 +1,12 @@
 #include "ExtrusionEntityCollection.hpp"
+#include "ExtrusionEntity.hpp"
+#include "Point.hpp"
+#include "Polygon.hpp"
 #include "ShortestPath.hpp"
 #include <algorithm>
 #include <cmath>
+#include <cstddef>
+#include <limits>
 #include <map>
 
 namespace Slic3r {
diff --git a/src/libslic3r/ExtrusionEntityCollection.hpp b/src/libslic3r/ExtrusionEntityCollection.hpp
index 13727869fe..664ad1ddcd 100644
--- a/src/libslic3r/ExtrusionEntityCollection.hpp
+++ b/src/libslic3r/ExtrusionEntityCollection.hpp
@@ -1,9 +1,16 @@
 #ifndef slic3r_ExtrusionEntityCollection_hpp_
 #define slic3r_ExtrusionEntityCollection_hpp_
 
+#include "Point.hpp"
+#include "Polygon.hpp"
+#include "Polyline.hpp"
 #include "libslic3r.h"
 #include "Exception.hpp"
 #include "ExtrusionEntity.hpp"
+#include <utility>
+#include <algorithm>
+#include <iterator>
+#include <cstddef>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/ExtrusionSimulator.cpp b/src/libslic3r/ExtrusionSimulator.cpp
index 4bf54edea9..bb9179a7e2 100644
--- a/src/libslic3r/ExtrusionSimulator.cpp
+++ b/src/libslic3r/ExtrusionSimulator.cpp
@@ -3,6 +3,9 @@
 //#undef SLIC3R_DEBUG
 //#define NDEBUG
 
+#include <boost/geometry/core/cs.hpp>
+#include <algorithm>
+#include <boost/multi_array/base.hpp>
 #include <cmath>
 #include <cassert>
 
@@ -12,7 +15,14 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 
 #include <boost/multi_array.hpp>
+#include <cstring>
+#include <vector>
+#include <cstddef>
+#include <utility>
 
+#include "Point.hpp"
+#include "BoundingBox.hpp"
+#include "ExtrusionEntity.hpp"
 #include "libslic3r.h"
 #include "ExtrusionSimulator.hpp"
 
diff --git a/src/libslic3r/ExtrusionSimulator.hpp b/src/libslic3r/ExtrusionSimulator.hpp
index 040406766d..33629d79e6 100644
--- a/src/libslic3r/ExtrusionSimulator.hpp
+++ b/src/libslic3r/ExtrusionSimulator.hpp
@@ -1,6 +1,7 @@
 #ifndef slic3r_ExtrusionSimulator_hpp_
 #define slic3r_ExtrusionSimulator_hpp_
 
+#include "Point.hpp"
 #include "libslic3r.h"
 #include "ExtrusionEntity.hpp"
 #include "BoundingBox.hpp"
diff --git a/src/libslic3r/FaceDetector.cpp b/src/libslic3r/FaceDetector.cpp
index 5eb5ca762c..a631822d9e 100644
--- a/src/libslic3r/FaceDetector.cpp
+++ b/src/libslic3r/FaceDetector.cpp
@@ -1,8 +1,13 @@
 #include "FaceDetector.hpp"
+#include "BoundingBox.hpp"
 #include "TriangleMesh.hpp"
 #include "SLA/IndexedMesh.hpp"
 #include "Model.hpp"
+#include <cstdint>
+#include <cstddef>
 #include <unordered_set>
+#include <vector>
+#include <utility>
 
 namespace Slic3r {
 static const double BBOX_OFFSET = 2.0;
diff --git a/src/libslic3r/FaceDetector.hpp b/src/libslic3r/FaceDetector.hpp
index b4d9d78985..190877ecec 100644
--- a/src/libslic3r/FaceDetector.hpp
+++ b/src/libslic3r/FaceDetector.hpp
@@ -2,6 +2,7 @@
 #define slic3r_FaceDetector_hpp_
 
 #include "Point.hpp"
+#include <vector>
 
 namespace Slic3r {
 class ModelObject;
diff --git a/src/libslic3r/Feature/FuzzySkin/FuzzySkin.cpp b/src/libslic3r/Feature/FuzzySkin/FuzzySkin.cpp
index be86e92245..c580cc3c0f 100644
--- a/src/libslic3r/Feature/FuzzySkin/FuzzySkin.cpp
+++ b/src/libslic3r/Feature/FuzzySkin/FuzzySkin.cpp
@@ -1,5 +1,19 @@
+#include <libnoise/module/modulebase.h>
+#include <memory>
+#include <algorithm>
+#include <math.h>
+#include <cmath>
+#include <cstddef>
+#include <limits>
+#include <cstdlib>
+#include <optional>
 #include <random>
+#include <thread>
+#include <utility>
+#include <vector>
 
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Surface.hpp"
 #include "libslic3r/Algorithm/LineSplit.hpp"
 #include "libslic3r/Arachne/utils/ExtrusionJunction.hpp"
 #include "libslic3r/Arachne/utils/ExtrusionLine.hpp"
diff --git a/src/libslic3r/Feature/FuzzySkin/FuzzySkin.hpp b/src/libslic3r/Feature/FuzzySkin/FuzzySkin.hpp
index ab0c491b38..ec5069a49c 100644
--- a/src/libslic3r/Feature/FuzzySkin/FuzzySkin.hpp
+++ b/src/libslic3r/Feature/FuzzySkin/FuzzySkin.hpp
@@ -1,9 +1,13 @@
 #ifndef libslic3r_FuzzySkin_hpp_
 #define libslic3r_FuzzySkin_hpp_
 
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Polygon.hpp"
 #include "libslic3r/Arachne/utils/ExtrusionJunction.hpp"
 #include "libslic3r/Arachne/utils/ExtrusionLine.hpp"
 #include "libslic3r/PerimeterGenerator.hpp"
+#include <cstddef>
 
 namespace Slic3r::Feature::FuzzySkin {
 
diff --git a/src/libslic3r/Feature/Interlocking/InterlockingGenerator.cpp b/src/libslic3r/Feature/Interlocking/InterlockingGenerator.cpp
index 726ee2ffd8..9e2fb7fa47 100644
--- a/src/libslic3r/Feature/Interlocking/InterlockingGenerator.cpp
+++ b/src/libslic3r/Feature/Interlocking/InterlockingGenerator.cpp
@@ -2,8 +2,22 @@
 // CuraEngine is released under the terms of the AGPLv3 or higher.
 
 #include "InterlockingGenerator.hpp"
+#include "libslic3r/Feature/Interlocking/VoxelUtils.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Geometry.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Flow.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Surface.hpp"
+#include "libslic3r/ExPolygon.hpp"
 #include "libslic3r/ClipperUtils.hpp"
 #include "Layer.hpp"
+#include <functional>
+#include <cstddef>
+#include <utility>
+#include <algorithm>
+#include <unordered_set>
+#include <vector>
 
 namespace std {
 template<> struct hash<Slic3r::GridPoint3>
diff --git a/src/libslic3r/Feature/Interlocking/InterlockingGenerator.hpp b/src/libslic3r/Feature/Interlocking/InterlockingGenerator.hpp
index e6b79f9bc8..b06c8a10c8 100644
--- a/src/libslic3r/Feature/Interlocking/InterlockingGenerator.hpp
+++ b/src/libslic3r/Feature/Interlocking/InterlockingGenerator.hpp
@@ -4,8 +4,16 @@
 #ifndef INTERLOCKING_GENERATOR_HPP
 #define INTERLOCKING_GENERATOR_HPP
 
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/ExPolygon.hpp"
 #include "libslic3r/Print.hpp"
 #include "VoxelUtils.hpp"
+#include <functional>
+#include <cstddef>
+#include <utility>
+#include <unordered_set>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Feature/Interlocking/VoxelUtils.cpp b/src/libslic3r/Feature/Interlocking/VoxelUtils.cpp
index 303473ae48..6e33ddaca7 100644
--- a/src/libslic3r/Feature/Interlocking/VoxelUtils.cpp
+++ b/src/libslic3r/Feature/Interlocking/VoxelUtils.cpp
@@ -2,9 +2,21 @@
 // CuraEngine is released under the terms of the AGPLv3 or higher.
 
 #include "VoxelUtils.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Fill/FillBase.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Polyline.hpp"
 #include "libslic3r/Geometry.hpp"
 #include "libslic3r/Fill/FillRectilinear.hpp"
 #include "libslic3r/Surface.hpp"
+#include <functional>
+#include <limits>
+#include <cassert>
+#include <memory>
+#include <utility>
 
 namespace Slic3r
 {
diff --git a/src/libslic3r/Feature/Interlocking/VoxelUtils.hpp b/src/libslic3r/Feature/Interlocking/VoxelUtils.hpp
index 0348b69598..dc571c06ea 100644
--- a/src/libslic3r/Feature/Interlocking/VoxelUtils.hpp
+++ b/src/libslic3r/Feature/Interlocking/VoxelUtils.hpp
@@ -4,8 +4,13 @@
 #ifndef UTILS_VOXEL_UTILS_H
 #define UTILS_VOXEL_UTILS_H
 
+#include <cstddef>
+#include <cassert>
 #include <functional>
+#include <vector>
 
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
 #include "libslic3r/Polygon.hpp"
 #include "libslic3r/ExPolygon.hpp"
 
diff --git a/src/libslic3r/FilamentGroup.cpp b/src/libslic3r/FilamentGroup.cpp
index 07a4cc2449..5536a13282 100644
--- a/src/libslic3r/FilamentGroup.cpp
+++ b/src/libslic3r/FilamentGroup.cpp
@@ -1,11 +1,34 @@
 #include "FilamentGroup.hpp"
+#include "FilamentGroupUtils.hpp"
 #include "GCode/ToolOrderUtils.hpp"
 #include "FlushVolPredictor.hpp"
+#include "MultiNozzleUtils.hpp"
+#include "PrintConfig.hpp"
+#include "libslic3r.h"
 #include <queue>
+#include <cstdint>
+#include <cstddef>
+#include <optional>
+#include <functional>
+#include <map>
+#include <algorithm>
+#include <limits>
+#include <cmath>
+#include <memory>
+#include <numeric>
+#include <cstdlib>
+#include <iterator>
+#include <deque>
 #include <random>
 #include <cassert>
+#include <set>
 #include <sstream>
 #include <boost/log/trivial.hpp>
+#include <vector>
+#include <utility>
+#include <unordered_map>
+#include <unordered_set>
+#include <string>
 
 namespace Slic3r
 {
diff --git a/src/libslic3r/FilamentGroup.hpp b/src/libslic3r/FilamentGroup.hpp
index 9172685bee..b090a22fe0 100644
--- a/src/libslic3r/FilamentGroup.hpp
+++ b/src/libslic3r/FilamentGroup.hpp
@@ -2,14 +2,21 @@
 #define FILAMENT_GROUP_HPP
 
 #include <chrono>
+#include <functional>
 #include <memory>
 #include <numeric>
+#include <optional>
 #include <set>
 #include <map>
+#include <string>
+#include <unordered_map>
+#include <utility>
 #include <vector>
 #include <queue>
 #include "GCode/ToolOrderUtils.hpp"
 #include "FilamentGroupUtils.hpp"
+#include "PrintConfig.hpp"
+#include "MultiNozzleUtils.hpp"
 
 const static int DEFAULT_CLUSTER_SIZE = 16;
 
diff --git a/src/libslic3r/FilamentGroupUtils.cpp b/src/libslic3r/FilamentGroupUtils.cpp
index c0cd747025..7402341806 100644
--- a/src/libslic3r/FilamentGroupUtils.cpp
+++ b/src/libslic3r/FilamentGroupUtils.cpp
@@ -1,6 +1,22 @@
 #include "FilamentGroupUtils.hpp"
+#include <cassert>
+#include <ios>
+#include <iomanip>
+#include <map>
+#include <cstddef>
+#include "PrintConfig.hpp"
+#include "Config.hpp"
+#include <algorithm>
+#include <iterator>
+#include "libslic3r.h"
+#include "MultiNozzleUtils.hpp"
 #include <regex>
+#include <set>
 #include <sstream>
+#include <string>
+#include <vector>
+#include <utility>
+#include <unordered_map>
 
 namespace Slic3r
 {
diff --git a/src/libslic3r/FilamentGroupUtils.hpp b/src/libslic3r/FilamentGroupUtils.hpp
index f0865a93c6..a73a562e90 100644
--- a/src/libslic3r/FilamentGroupUtils.hpp
+++ b/src/libslic3r/FilamentGroupUtils.hpp
@@ -1,6 +1,9 @@
 #ifndef FILAMENT_GROUP_UTILS_HPP
 #define FILAMENT_GROUP_UTILS_HPP
 
+#include <set>
+#include <unordered_map>
+#include <utility>
 #include <vector>
 #include <map>
 #include <string>
diff --git a/src/libslic3r/FilamentMixer.cpp b/src/libslic3r/FilamentMixer.cpp
index 66640498e6..51952c94c9 100644
--- a/src/libslic3r/FilamentMixer.cpp
+++ b/src/libslic3r/FilamentMixer.cpp
@@ -5,12 +5,17 @@
 #include <cctype>
 #include <cmath>
 #include <cstdio>
+#include <exception>
 #include <limits>
+#include <map>
 #include <set>
 #include <sstream>
 #include <numeric>
 
 #include <boost/log/trivial.hpp>
+#include <string>
+#include <vector>
+#include <utility>
 
 #include "ColorDecomposeRecipe.hpp"
 #include "FilamentMixerModel.hpp"
diff --git a/src/libslic3r/FilamentMixer.hpp b/src/libslic3r/FilamentMixer.hpp
index 81ddd29e46..5ea4484437 100644
--- a/src/libslic3r/FilamentMixer.hpp
+++ b/src/libslic3r/FilamentMixer.hpp
@@ -1,6 +1,7 @@
 #ifndef SLIC3R_FILAMENT_MIXER_HPP
 #define SLIC3R_FILAMENT_MIXER_HPP
 
+#include <cstddef>
 #include <limits>
 #include <map>
 #include <set>
diff --git a/src/libslic3r/FileParserError.hpp b/src/libslic3r/FileParserError.hpp
index b7e63d84e0..4777ee8a79 100644
--- a/src/libslic3r/FileParserError.hpp
+++ b/src/libslic3r/FileParserError.hpp
@@ -1,8 +1,10 @@
 #ifndef slic3r_FileParserError_hpp_
 #define slic3r_FileParserError_hpp_
 
+#include "Exception.hpp"
 #include "libslic3r.h"
 
+#include <sstream>
 #include <string>
 #include <boost/filesystem/path.hpp>
 #include <stdexcept>
diff --git a/src/libslic3r/Fill/Fill.cpp b/src/libslic3r/Fill/Fill.cpp
index a09c69fc5e..505081ab79 100644
--- a/src/libslic3r/Fill/Fill.cpp
+++ b/src/libslic3r/Fill/Fill.cpp
@@ -1,6 +1,19 @@
+#include <algorithm>
 #include <assert.h>
+#include <regex>
+#include <cstdlib>
+#include <cmath>
+#include <iterator>
+#include <math.h>
+#include <set>
+#include <map>
 #include <stdio.h>
 #include <memory>
+#include <string>
+#include <vector>
+#include <queue>
+#include <unordered_set>
+#include <utility>
 
 #include "../ClipperUtils.hpp"
 #include "../Geometry.hpp"
@@ -10,14 +23,23 @@
 #include "../Surface.hpp"
 
 #include "AABBTreeLines.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/BoundingBox.hpp"
 #include "ExtrusionEntity.hpp"
 #include "Fill.hpp"
+#include "libslic3r/Fill/FillBase.hpp"
 #include "FillRectilinear.hpp"
 #include "FillLightning.hpp"
 #include "FillConcentricInternal.hpp"
 #include "FillTpmsD.hpp"
 #include "FillTpmsFK.hpp"
 #include "FillConcentric.hpp"
+#include "libslic3r/Flow.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Line.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Polyline.hpp"
 #include "libslic3r.h"
 
 namespace Slic3r {
diff --git a/src/libslic3r/Fill/Fill.hpp b/src/libslic3r/Fill/Fill.hpp
index b183cf0253..138321fd0a 100644
--- a/src/libslic3r/Fill/Fill.hpp
+++ b/src/libslic3r/Fill/Fill.hpp
@@ -1,9 +1,11 @@
 #ifndef slic3r_Fill_hpp_
 #define slic3r_Fill_hpp_
 
+#include <cstddef>
 #include <memory.h>
 #include <float.h>
 #include <stdint.h>
+#include <string>
 
 #include "../libslic3r.h"
 #include "../PrintConfig.hpp"
diff --git a/src/libslic3r/Fill/Fill3DHoneycomb.cpp b/src/libslic3r/Fill/Fill3DHoneycomb.cpp
index ad5f8918fd..5a390fa517 100644
--- a/src/libslic3r/Fill/Fill3DHoneycomb.cpp
+++ b/src/libslic3r/Fill/Fill3DHoneycomb.cpp
@@ -1,8 +1,20 @@
 #include "../ClipperUtils.hpp"
 #include "../ShortestPath.hpp"
 #include "../Surface.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/BoundingBox.hpp"
 #include "FillBase.hpp"
 #include "FillCornerSmoothing.hpp"
+#include "libslic3r/libslic3r.h"
+#include <cstdlib>
+#include <vector>
+#include <cstddef>
+#include "libslic3r/Point.hpp"
+#include <cassert>
+#include <cmath>
+#include <algorithm>
+#include "libslic3r/Polyline.hpp"
+#include <utility>
 #include "Fill3DHoneycomb.hpp"
 
 namespace Slic3r {
diff --git a/src/libslic3r/Fill/Fill3DHoneycomb.hpp b/src/libslic3r/Fill/Fill3DHoneycomb.hpp
index 2d6664ddf4..2ad6f79a7c 100644
--- a/src/libslic3r/Fill/Fill3DHoneycomb.hpp
+++ b/src/libslic3r/Fill/Fill3DHoneycomb.hpp
@@ -2,10 +2,14 @@
 #define slic3r_Fill3DHoneycomb_hpp_
 
 #include <map>
+#include <utility>
 
 #include "../libslic3r.h"
 
+#include "libslic3r/ExPolygon.hpp"
 #include "FillBase.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polyline.hpp"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Fill/FillAdaptive.cpp b/src/libslic3r/Fill/FillAdaptive.cpp
index 809eddb218..927e2c86a3 100644
--- a/src/libslic3r/Fill/FillAdaptive.cpp
+++ b/src/libslic3r/Fill/FillAdaptive.cpp
@@ -6,18 +6,40 @@
 #include "../Layer.hpp"
 #include "../Print.hpp"
 #include "../ShortestPath.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Flow.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/Line.hpp"
+#include "libslic3r/Fill/FillBase.hpp"
 
 #include "FillAdaptive.hpp"
 
 // for indexed_triangle_set
+#include <Eigen/Geometry>
+#include <Eigen/Core>
 #include <admesh/stl.h>
 
+#include <array>
+#include <cassert>
+#include <boost/geometry/core/cs.hpp>
+#include <boost/geometry/index/parameters.hpp>
+#include <boost/geometry/index/predicates.hpp>
+#include <boost/geometry/core/access.hpp>
 #include <cstdlib>
 #include <cmath>
 #include <algorithm>
 #include <functional>
+#include <math.h>
+#include <limits>
+#include <iterator>
 #include <numeric>
+#include <optional>
 #include <tuple>
+#include <vector>
+#include <utility>
 
 // Boost pool: Don't use mutexes to synchronize memory allocation.
 #define BOOST_POOL_NO_MT
diff --git a/src/libslic3r/Fill/FillAdaptive.hpp b/src/libslic3r/Fill/FillAdaptive.hpp
index de0768b26e..9b424133a2 100644
--- a/src/libslic3r/Fill/FillAdaptive.hpp
+++ b/src/libslic3r/Fill/FillAdaptive.hpp
@@ -11,7 +11,17 @@
 #ifndef slic3r_FillAdaptive_hpp_
 #define slic3r_FillAdaptive_hpp_
 
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/ExPolygon.hpp"
 #include "FillBase.hpp"
+#include <memory>
+#include <utility>
+#include <Eigen/Geometry>
+#include <vector>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/Line.hpp"
 
 struct indexed_triangle_set;
 
diff --git a/src/libslic3r/Fill/FillBase.cpp b/src/libslic3r/Fill/FillBase.cpp
index f4615dc640..57dcb0d715 100644
--- a/src/libslic3r/Fill/FillBase.cpp
+++ b/src/libslic3r/Fill/FillBase.cpp
@@ -1,7 +1,16 @@
+#include <algorithm>
+#include <cassert>
+#include <cfloat>
+#include <math.h>
+#include <limits>
+#include <cstdint>
 #include <stdio.h>
 #include <numeric>
 
 #include <cmath>
+#include <string>
+#include <vector>
+#include <utility>
 #include "../ClipperUtils.hpp"
 #include "../Clipper2Utils.hpp"
 #include "../EdgeGrid.hpp"
@@ -14,6 +23,12 @@
 #include "../VariableWidth.hpp"
 
 #include "FillBase.hpp"
+#include "libslic3r/Exception.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/ExtrusionEntity.hpp"
+#include "libslic3r/ExtrusionEntityCollection.hpp"
+#include "libslic3r/BoundingBox.hpp"
 #include "FillConcentric.hpp"
 #include "FillSpiralInset.hpp"
 #include "FillHoneycomb.hpp"
@@ -29,6 +44,13 @@
 // BBS: new infill pattern header
 #include "FillConcentricInternal.hpp"
 #include "FillCrossHatch.hpp"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/ShortestPath.hpp"
+#include "libslic3r/Line.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Utils.hpp"
+#include "clipper2/clipper.core.h"
+#include "clipper2/clipper.offset.h"
 // #define INFILL_DEBUG_OUTPUT
 
 namespace Slic3r {
diff --git a/src/libslic3r/Fill/FillBase.hpp b/src/libslic3r/Fill/FillBase.hpp
index d50c29b332..0ccce102ad 100644
--- a/src/libslic3r/Fill/FillBase.hpp
+++ b/src/libslic3r/Fill/FillBase.hpp
@@ -2,12 +2,18 @@
 #define slic3r_FillBase_hpp_
 
 #include <assert.h>
+#include <map>
+#include <cstddef>
+#include <math.h>
 #include <memory.h>
 #include <float.h>
 #include <stdint.h>
 #include <stdexcept>
 
+#include <string>
 #include <type_traits>
+#include <utility>
+#include <vector>
 
 #include "../libslic3r.h"
 #include "../BoundingBox.hpp"
@@ -20,6 +26,8 @@
 #include "../ExtrusionEntity.hpp"
 #include "../ExtrusionEntityCollection.hpp"
 #include "../ShortestPath.hpp"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/Polygon.hpp"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Fill/FillConcentric.cpp b/src/libslic3r/Fill/FillConcentric.cpp
index 044fee042e..6a70200b34 100644
--- a/src/libslic3r/Fill/FillConcentric.cpp
+++ b/src/libslic3r/Fill/FillConcentric.cpp
@@ -5,8 +5,21 @@
 #include "Arachne/WallToolPaths.hpp"
 
 #include "FillConcentric.hpp"
+#include "libslic3r/Fill/FillBase.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/Arachne/utils/ExtrusionLine.hpp"
 #include "FillCornerSmoothing.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Polygon.hpp"
+#include <algorithm>
+#include "libslic3r/PrintConfig.hpp"
+#include <cstddef>
+#include <cassert>
 #include <libslic3r/ShortestPath.hpp>
+#include <utility>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Fill/FillConcentric.hpp b/src/libslic3r/Fill/FillConcentric.hpp
index 56040d848d..43273131db 100644
--- a/src/libslic3r/Fill/FillConcentric.hpp
+++ b/src/libslic3r/Fill/FillConcentric.hpp
@@ -1,7 +1,11 @@
 #ifndef slic3r_FillConcentric_hpp_
 #define slic3r_FillConcentric_hpp_
 
+#include "libslic3r/ExPolygon.hpp"
 #include "FillBase.hpp"
+#include <utility>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polyline.hpp"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Fill/FillConcentricInternal.cpp b/src/libslic3r/Fill/FillConcentricInternal.cpp
index d565992ea1..49b21935f3 100644
--- a/src/libslic3r/Fill/FillConcentricInternal.cpp
+++ b/src/libslic3r/Fill/FillConcentricInternal.cpp
@@ -3,9 +3,22 @@
 #include "../Surface.hpp"
 #include "../VariableWidth.hpp"
 #include "Arachne/WallToolPaths.hpp"
+#include "libslic3r/Fill/FillBase.hpp"
+#include "libslic3r/ExtrusionEntity.hpp"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Arachne/utils/ExtrusionLine.hpp"
+#include "libslic3r/ExtrusionEntityCollection.hpp"
 
 #include "FillConcentricInternal.hpp"
+#include <cassert>
+#include <cstddef>
+#include <algorithm>
 #include <libslic3r/ShortestPath.hpp>
+#include <vector>
+#include <utility>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Fill/FillConcentricInternal.hpp b/src/libslic3r/Fill/FillConcentricInternal.hpp
index 2c93eb5ee9..f78e9e1cb1 100644
--- a/src/libslic3r/Fill/FillConcentricInternal.hpp
+++ b/src/libslic3r/Fill/FillConcentricInternal.hpp
@@ -1,6 +1,7 @@
 #ifndef slic3r_FillConcentricInternal_hpp_
 #define slic3r_FillConcentricInternal_hpp_
 
+#include "libslic3r/ExtrusionEntity.hpp"
 #include "FillBase.hpp"
 
 namespace Slic3r {
diff --git a/src/libslic3r/Fill/FillCornerSmoothing.cpp b/src/libslic3r/Fill/FillCornerSmoothing.cpp
index dbce39d572..f87de98293 100644
--- a/src/libslic3r/Fill/FillCornerSmoothing.cpp
+++ b/src/libslic3r/Fill/FillCornerSmoothing.cpp
@@ -1,6 +1,16 @@
+#include <algorithm>
 #include <array>
+#include <cstddef>
+#include <vector>
+#include <utility>
+#include <cmath>
+#include <cstdlib>
 
 #include "FillCornerSmoothing.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/Polygon.hpp"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Fill/FillCornerSmoothing.hpp b/src/libslic3r/Fill/FillCornerSmoothing.hpp
index 7f2ead229a..b59cf26237 100644
--- a/src/libslic3r/Fill/FillCornerSmoothing.hpp
+++ b/src/libslic3r/Fill/FillCornerSmoothing.hpp
@@ -4,6 +4,7 @@
 #include <array>
 #include <cmath>
 #include <functional>
+#include <utility>
 #include <vector>
 
 #include "../libslic3r.h"
diff --git a/src/libslic3r/Fill/FillCrossHatch.cpp b/src/libslic3r/Fill/FillCrossHatch.cpp
index 98be5ef46b..c70a8a5320 100644
--- a/src/libslic3r/Fill/FillCrossHatch.cpp
+++ b/src/libslic3r/Fill/FillCrossHatch.cpp
@@ -1,9 +1,17 @@
 #include "../ClipperUtils.hpp"
 #include "../ShortestPath.hpp"
 #include "../Surface.hpp"
+#include <algorithm>
 #include <cmath>
+#include <cstddef>
+#include <utility>
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/BoundingBox.hpp"
 #include "FillBase.hpp"
 #include "FillCornerSmoothing.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Polyline.hpp"
 #include "FillCrossHatch.hpp"
 
 namespace Slic3r {
diff --git a/src/libslic3r/Fill/FillCrossHatch.hpp b/src/libslic3r/Fill/FillCrossHatch.hpp
index 34c46116eb..0fdc16644a 100644
--- a/src/libslic3r/Fill/FillCrossHatch.hpp
+++ b/src/libslic3r/Fill/FillCrossHatch.hpp
@@ -2,10 +2,14 @@
 #define slic3r_FillCrossHatch_hpp_
 
 #include <map>
+#include <utility>
 
 #include "../libslic3r.h"
 
+#include "libslic3r/ExPolygon.hpp"
 #include "FillBase.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polyline.hpp"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Fill/FillGyroid.cpp b/src/libslic3r/Fill/FillGyroid.cpp
index c9a108573d..de748d4893 100644
--- a/src/libslic3r/Fill/FillGyroid.cpp
+++ b/src/libslic3r/Fill/FillGyroid.cpp
@@ -4,9 +4,19 @@
 #include "../Surface.hpp"
 #include <cmath>
 #include <algorithm>
+#include <cstddef>
 #include <iostream>
 #include <limits>
+#include "libslic3r/BoundingBox.hpp"
+#include <vector>
+#include "libslic3r/Execution/ExecutionTBB.hpp"
+#include <math.h>
+#include <utility>
+#include "libslic3r/ExPolygon.hpp"
 #include "FillBase.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Polyline.hpp"
 #include "FillGyroid.hpp"
 
 // ---------------------------------------------------------------------------
diff --git a/src/libslic3r/Fill/FillGyroid.hpp b/src/libslic3r/Fill/FillGyroid.hpp
index 751a7c2570..2599662403 100644
--- a/src/libslic3r/Fill/FillGyroid.hpp
+++ b/src/libslic3r/Fill/FillGyroid.hpp
@@ -3,7 +3,11 @@
 
 #include "../libslic3r.h"
 
+#include "libslic3r/ExPolygon.hpp"
 #include "FillBase.hpp"
+#include <utility>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polyline.hpp"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Fill/FillHoneycomb.cpp b/src/libslic3r/Fill/FillHoneycomb.cpp
index 82679541da..594ff3fbba 100644
--- a/src/libslic3r/Fill/FillHoneycomb.cpp
+++ b/src/libslic3r/Fill/FillHoneycomb.cpp
@@ -2,7 +2,17 @@
 #include "../ShortestPath.hpp"
 #include "../Surface.hpp"
 
+#include "libslic3r/Fill/FillBase.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/BoundingBox.hpp"
 #include "FillCornerSmoothing.hpp"
+#include <utility>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/libslic3r.h"
+#include <cmath>
+#include <cstddef>
+#include <algorithm>
 #include "FillHoneycomb.hpp"
 
 namespace Slic3r {
diff --git a/src/libslic3r/Fill/FillHoneycomb.hpp b/src/libslic3r/Fill/FillHoneycomb.hpp
index 55be423854..fd1fe039de 100644
--- a/src/libslic3r/Fill/FillHoneycomb.hpp
+++ b/src/libslic3r/Fill/FillHoneycomb.hpp
@@ -1,11 +1,17 @@
 #ifndef slic3r_FillHoneycomb_hpp_
 #define slic3r_FillHoneycomb_hpp_
 
+#include <cstddef>
 #include <map>
+#include <utility>
+#include <math.h>
 
 #include "../libslic3r.h"
 
+#include "libslic3r/ExPolygon.hpp"
 #include "FillBase.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polyline.hpp"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Fill/FillLightning.cpp b/src/libslic3r/Fill/FillLightning.cpp
index 77031b42e0..9f6200a88e 100644
--- a/src/libslic3r/Fill/FillLightning.cpp
+++ b/src/libslic3r/Fill/FillLightning.cpp
@@ -1,10 +1,18 @@
 #include "../ClipperUtils.hpp"
 #include "../Print.hpp"
 #include "../ShortestPath.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/Fill/Lightning/Layer.hpp"
 #include "FillBase.hpp"
 #include "FillCornerSmoothing.hpp"
 #include "FillLightning.hpp"
 #include "Lightning/Generator.hpp"
+#include <utility>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/libslic3r.h"
+#include <algorithm>
+#include <functional>
 
 namespace Slic3r::FillLightning {
 
diff --git a/src/libslic3r/Fill/FillLightning.hpp b/src/libslic3r/Fill/FillLightning.hpp
index 74aa159b0b..8ad15b5c2a 100644
--- a/src/libslic3r/Fill/FillLightning.hpp
+++ b/src/libslic3r/Fill/FillLightning.hpp
@@ -1,7 +1,13 @@
 #ifndef slic3r_FillLightning_hpp_
 #define slic3r_FillLightning_hpp_
 
+#include "libslic3r/ExPolygon.hpp"
 #include "FillBase.hpp"
+#include <memory>
+#include <functional>
+#include <utility>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polyline.hpp"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Fill/FillLine.cpp b/src/libslic3r/Fill/FillLine.cpp
index 5d548e5dbb..f46c102131 100644
--- a/src/libslic3r/Fill/FillLine.cpp
+++ b/src/libslic3r/Fill/FillLine.cpp
@@ -2,6 +2,17 @@
 #include "../ExPolygon.hpp"
 #include "../ShortestPath.hpp"
 #include "../Surface.hpp"
+#include "libslic3r/Fill/FillBase.hpp"
+#include <utility>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polyline.hpp"
+#include <cassert>
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/Line.hpp"
+#include <cmath>
+#include <cstddef>
+#include <cstdlib>
 
 #include "FillLine.hpp"
 
diff --git a/src/libslic3r/Fill/FillLine.hpp b/src/libslic3r/Fill/FillLine.hpp
index 4ad9ca49a4..73633716dc 100644
--- a/src/libslic3r/Fill/FillLine.hpp
+++ b/src/libslic3r/Fill/FillLine.hpp
@@ -3,7 +3,12 @@
 
 #include "../libslic3r.h"
 
+#include "libslic3r/ExPolygon.hpp"
 #include "FillBase.hpp"
+#include <utility>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/Line.hpp"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Fill/FillPlanePath.cpp b/src/libslic3r/Fill/FillPlanePath.cpp
index 577aef0600..2ee2b1ef3a 100644
--- a/src/libslic3r/Fill/FillPlanePath.cpp
+++ b/src/libslic3r/Fill/FillPlanePath.cpp
@@ -2,7 +2,21 @@
 #include "../ShortestPath.hpp"
 #include "../Surface.hpp"
 
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/Fill/FillBase.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/ExtrusionEntity.hpp"
 #include "FillCornerSmoothing.hpp"
+#include "libslic3r/Point.hpp"
+#include <utility>
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/libslic3r.h"
+#include <cmath>
+#include <algorithm>
+#include <math.h>
+#include <cstddef>
+#include <type_traits>
 #include "FillPlanePath.hpp"
 
 namespace Slic3r {
diff --git a/src/libslic3r/Fill/FillPlanePath.hpp b/src/libslic3r/Fill/FillPlanePath.hpp
index a1e9068ca9..d24d9df9f4 100644
--- a/src/libslic3r/Fill/FillPlanePath.hpp
+++ b/src/libslic3r/Fill/FillPlanePath.hpp
@@ -1,11 +1,17 @@
 #ifndef slic3r_FillPlanePath_hpp_
 #define slic3r_FillPlanePath_hpp_
 
+#include <cstddef>
+#include <cmath>
 #include <map>
+#include <utility>
 
 #include "../libslic3r.h"
 
+#include "libslic3r/ExPolygon.hpp"
 #include "FillBase.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polyline.hpp"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Fill/FillRectilinear.cpp b/src/libslic3r/Fill/FillRectilinear.cpp
index 998cfd9a7e..d761eb249b 100644
--- a/src/libslic3r/Fill/FillRectilinear.cpp
+++ b/src/libslic3r/Fill/FillRectilinear.cpp
@@ -1,3 +1,8 @@
+#include <numeric>
+#include <math.h>
+#include <initializer_list>
+#include <array>
+#include <map>
 #include <stdlib.h>
 #include <stdint.h>
 
@@ -10,6 +15,9 @@
 #include <boost/log/trivial.hpp>
 #include <boost/static_assert.hpp>
 #include <boost/math/constants/constants.hpp>
+#include <vector>
+#include <utility>
+#include <string>
 
 #include "../ClipperUtils.hpp"
 #include "../ExPolygon.hpp"
@@ -18,7 +26,17 @@
 #include "../ShortestPath.hpp"
 #include "../VariableWidth.hpp"
 
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/Fill/FillBase.hpp"
+#include "libslic3r/ExtrusionEntity.hpp"
+#include "libslic3r/ExtrusionEntityCollection.hpp"
 #include "FillCornerSmoothing.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/Utils.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Flow.hpp"
 #include "FillRectilinear.hpp"
 
 // #define SLIC3R_DEBUG
diff --git a/src/libslic3r/Fill/FillRectilinear.hpp b/src/libslic3r/Fill/FillRectilinear.hpp
index adb9ef5131..a4453ad2d0 100644
--- a/src/libslic3r/Fill/FillRectilinear.hpp
+++ b/src/libslic3r/Fill/FillRectilinear.hpp
@@ -3,7 +3,18 @@
 
 #include "../libslic3r.h"
 
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/ExtrusionEntity.hpp"
+#include "libslic3r/ExPolygon.hpp"
 #include "FillBase.hpp"
+#include "libslic3r/Polyline.hpp"
+#include <initializer_list>
+#include <cstddef>
+#include <vector>
+#include <utility>
+#include "libslic3r/Flow.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polygon.hpp"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Fill/FillSpiralInset.cpp b/src/libslic3r/Fill/FillSpiralInset.cpp
index e6323c2572..8f663df340 100644
--- a/src/libslic3r/Fill/FillSpiralInset.cpp
+++ b/src/libslic3r/Fill/FillSpiralInset.cpp
@@ -3,12 +3,25 @@
 #include "../Surface.hpp"
 #include "../VariableWidth.hpp"
 #include "Arachne/WallToolPaths.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/Arachne/utils/ExtrusionLine.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Fill/FillBase.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/BoundingBox.hpp"
 
 #include "FillSpiralInset.hpp"
 
 #include <algorithm>
+#include <cassert>
 #include <cmath>
+#include <cstddef>
 #include <functional>
+#include <math.h>
+#include <utility>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Fill/FillSpiralInset.hpp b/src/libslic3r/Fill/FillSpiralInset.hpp
index eb799ec2f3..8b95657b4b 100644
--- a/src/libslic3r/Fill/FillSpiralInset.hpp
+++ b/src/libslic3r/Fill/FillSpiralInset.hpp
@@ -1,7 +1,11 @@
 #ifndef slic3r_FillSpiralInset_hpp_
 #define slic3r_FillSpiralInset_hpp_
 
+#include "libslic3r/ExPolygon.hpp"
 #include "FillBase.hpp"
+#include <utility>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polyline.hpp"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Fill/FillTpmsD.cpp b/src/libslic3r/Fill/FillTpmsD.cpp
index 06e0302e8d..bb1a338691 100644
--- a/src/libslic3r/Fill/FillTpmsD.cpp
+++ b/src/libslic3r/Fill/FillTpmsD.cpp
@@ -1,10 +1,15 @@
 #include <cmath>
 #include <algorithm>
+#include <utility>
+#include <math.h>
+#include <cstddef>
 #include <vector>
 //#include <cstddef>
 
 #include "../ClipperUtils.hpp"
 #include "../ShortestPath.hpp"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/ExPolygon.hpp"
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/Fill/FillBase.hpp"
 #include "libslic3r/Point.hpp"
diff --git a/src/libslic3r/Fill/FillTpmsFK.cpp b/src/libslic3r/Fill/FillTpmsFK.cpp
index 66ed1cbc84..a48a63f3d0 100644
--- a/src/libslic3r/Fill/FillTpmsFK.cpp
+++ b/src/libslic3r/Fill/FillTpmsFK.cpp
@@ -1,8 +1,17 @@
 #include "../ClipperUtils.hpp"
 #include "../MarchingSquares.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/Execution/ExecutionTBB.hpp"
+#include "libslic3r/Fill/FillBase.hpp"
+#include "libslic3r/ExPolygon.hpp"
 #include "FillTpmsFK.hpp"
 #include <cmath>
 #include <algorithm>
+#include <cstddef>
+#include <math.h>
 #include <vector>
 #include <unordered_map>
 #include <unordered_set>
diff --git a/src/libslic3r/Fill/Lightning/DistanceField.cpp b/src/libslic3r/Fill/Lightning/DistanceField.cpp
index 65da94b839..73d74cef03 100644
--- a/src/libslic3r/Fill/Lightning/DistanceField.cpp
+++ b/src/libslic3r/Fill/Lightning/DistanceField.cpp
@@ -4,8 +4,22 @@
 #include "DistanceField.hpp" //Class we're implementing.
 #include "../FillRectilinear.hpp"
 #include "../../ClipperUtils.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Line.hpp"
 
+#include <cstdint>
+#include <cstddef>
+#include <limits>
+#include <algorithm>
+#include <cmath>
+#include <cassert>
+#include <cstdlib>
 #include <tbb/parallel_for.h>
+#include <utility>
 
 #ifdef LIGHTNING_DISTANCE_FIELD_DEBUG_OUTPUT
 #include "../../SVG.hpp"
diff --git a/src/libslic3r/Fill/Lightning/DistanceField.hpp b/src/libslic3r/Fill/Lightning/DistanceField.hpp
index 007ac235e5..737c432824 100644
--- a/src/libslic3r/Fill/Lightning/DistanceField.hpp
+++ b/src/libslic3r/Fill/Lightning/DistanceField.hpp
@@ -7,6 +7,13 @@
 #include "../../BoundingBox.hpp"
 #include "../../Point.hpp"
 #include "../../Polygon.hpp"
+#include "libslic3r/libslic3r.h"
+#include <cstddef>
+#include <cstdint>
+#include <vector>
+#include <functional>
+#include <limits>
+#include <cassert>
 
 //#define LIGHTNING_DISTANCE_FIELD_DEBUG_OUTPUT
 
diff --git a/src/libslic3r/Fill/Lightning/Generator.cpp b/src/libslic3r/Fill/Lightning/Generator.cpp
index c638610aa5..c35eb3250f 100644
--- a/src/libslic3r/Fill/Lightning/Generator.cpp
+++ b/src/libslic3r/Fill/Lightning/Generator.cpp
@@ -2,6 +2,15 @@
 //CuraEngine is released under the terms of the AGPLv3 or higher.
 
 #include "Generator.hpp"
+#include "libslic3r/SVG.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Flow.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Surface.hpp"
+#include "libslic3r/Fill/Lightning/Layer.hpp"
+#include "libslic3r/EdgeGrid.hpp"
 #include "TreeNode.hpp"
 
 #include "../../ClipperUtils.hpp"
@@ -9,6 +18,18 @@
 #include "../../Print.hpp"
 
 #include "ExPolygon.hpp"
+#include <string>
+#include <cstdlib>
+#include <ctime>
+#include <cstddef>
+#include <functional>
+#include <vector>
+#include <algorithm>
+#include "libslic3r/libslic3r.h"
+#include <math.h>
+#include <cmath>
+#include <utility>
+#include <cassert>
 
 /* Possible future tasks/optimizations,etc.:
  * - Improve connecting heuristic to favor connecting to shorter trees
diff --git a/src/libslic3r/Fill/Lightning/Generator.hpp b/src/libslic3r/Fill/Lightning/Generator.hpp
index 79110fb8dd..18be848b9e 100644
--- a/src/libslic3r/Fill/Lightning/Generator.hpp
+++ b/src/libslic3r/Fill/Lightning/Generator.hpp
@@ -4,8 +4,12 @@
 #ifndef LIGHTNING_GENERATOR_H
 #define LIGHTNING_GENERATOR_H
 
+#include "libslic3r/BoundingBox.hpp"
 #include "Layer.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/libslic3r.h"
 
+#include <cstddef>
 #include <functional>
 #include <memory>
 #include <vector>
diff --git a/src/libslic3r/Fill/Lightning/Layer.cpp b/src/libslic3r/Fill/Lightning/Layer.cpp
index 4a30a95f45..f461888a14 100644
--- a/src/libslic3r/Fill/Lightning/Layer.cpp
+++ b/src/libslic3r/Fill/Lightning/Layer.cpp
@@ -3,16 +3,31 @@
 
 #include "Layer.hpp" //The class we're implementing.
 
+#include "libslic3r/BoundingBox.hpp"
 #include "DistanceField.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/EdgeGrid.hpp"
+#include "libslic3r/Line.hpp"
+#include "libslic3r/Polyline.hpp"
 #include "TreeNode.hpp"
 
 #include "../../ClipperUtils.hpp"
 #include "../../Geometry.hpp"
 #include "Utils.hpp"
+#include "libslic3r/libslic3r.h"
 
+#include <cassert>
+#include <functional>
+#include <cstddef>
+#include <limits>
+#include <algorithm>
+#include <optional>
 #include <tbb/parallel_for.h>
 #include <tbb/blocked_range2d.h>
 #include <mutex>
+#include <utility>
+#include <vector>
 
 namespace Slic3r::FillLightning {
 
diff --git a/src/libslic3r/Fill/Lightning/Layer.hpp b/src/libslic3r/Fill/Lightning/Layer.hpp
index e8c0a38b4d..378dc354b2 100644
--- a/src/libslic3r/Fill/Lightning/Layer.hpp
+++ b/src/libslic3r/Fill/Lightning/Layer.hpp
@@ -6,7 +6,12 @@
 
 #include "../../EdgeGrid.hpp"
 #include "../../Polygon.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Polyline.hpp"
 
+#include <functional>
 #include <memory>
 #include <vector>
 #include <list>
diff --git a/src/libslic3r/Fill/Lightning/TreeNode.cpp b/src/libslic3r/Fill/Lightning/TreeNode.cpp
index 3d57ebae4a..780fecbd03 100644
--- a/src/libslic3r/Fill/Lightning/TreeNode.cpp
+++ b/src/libslic3r/Fill/Lightning/TreeNode.cpp
@@ -4,6 +4,22 @@
 #include "TreeNode.hpp"
 
 #include "../../Geometry.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Point.hpp"
+#include <cstddef>
+#include <cassert>
+#include <vector>
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/EdgeGrid.hpp"
+#include <functional>
+#include <optional>
+#include <algorithm>
+#include <limits>
+#include <cstdint>
+#include "libslic3r/Line.hpp"
+#include "libslic3r/Polyline.hpp"
+#include <random>
+#include <utility>
 
 namespace Slic3r::FillLightning {
 
diff --git a/src/libslic3r/Fill/Lightning/TreeNode.hpp b/src/libslic3r/Fill/Lightning/TreeNode.hpp
index 95559524ba..c82ca3f2b6 100644
--- a/src/libslic3r/Fill/Lightning/TreeNode.hpp
+++ b/src/libslic3r/Fill/Lightning/TreeNode.hpp
@@ -4,6 +4,8 @@
 #ifndef LIGHTNING_TREE_NODE_H
 #define LIGHTNING_TREE_NODE_H
 
+#include <cstdint>
+#include <cstddef>
 #include <functional>
 #include <memory>
 #include <optional>
@@ -12,7 +14,11 @@
 
 #include "../../EdgeGrid.hpp"
 #include "../../Polygon.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/BoundingBox.hpp"
 #include "SVG.hpp"
+#include "libslic3r/libslic3r.h"
 
 //#define LIGHTNING_TREE_NODE_DEBUG_OUTPUT
 
diff --git a/src/libslic3r/Flow.cpp b/src/libslic3r/Flow.cpp
index 80912362ce..13ee73973e 100644
--- a/src/libslic3r/Flow.cpp
+++ b/src/libslic3r/Flow.cpp
@@ -1,10 +1,15 @@
 #include "Flow.hpp"
+#include "Exception.hpp"
+#include "Config.hpp"
 #include "I18N.hpp"
 #include "Print.hpp"
+#include "libslic3r.h"
 #include <cmath>
 #include <assert.h>
 
 #include <boost/algorithm/string/predicate.hpp>
+#include <string>
+#include <math.h>
 
 // Mark string for localization and translate.
 #define L(s) Slic3r::I18N::translate(s)
diff --git a/src/libslic3r/Flow.hpp b/src/libslic3r/Flow.hpp
index 79cb1b324d..14d20a41c7 100644
--- a/src/libslic3r/Flow.hpp
+++ b/src/libslic3r/Flow.hpp
@@ -5,6 +5,8 @@
 #include "Config.hpp"
 #include "Exception.hpp"
 #include "ExtrusionEntity.hpp"
+#include <string>
+#include <cassert>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/FlushVolCalc.cpp b/src/libslic3r/FlushVolCalc.cpp
index 635328f5ab..daeaf587c6 100644
--- a/src/libslic3r/FlushVolCalc.cpp
+++ b/src/libslic3r/FlushVolCalc.cpp
@@ -1,5 +1,8 @@
+#include <algorithm>
 #include <cmath>
 #include <assert.h>
+#include <math.h>
+#include "FlushVolPredictor.hpp"
 #include "slic3r/Utils/ColorSpaceConvert.hpp"
 #include "Utils.hpp"
 #include "FlushVolCalc.hpp"
diff --git a/src/libslic3r/FlushVolPredictor.cpp b/src/libslic3r/FlushVolPredictor.cpp
index dc39284b5f..e18b726c1f 100644
--- a/src/libslic3r/FlushVolPredictor.cpp
+++ b/src/libslic3r/FlushVolPredictor.cpp
@@ -1,9 +1,19 @@
 #include "FlushVolPredictor.hpp"
 #include "Utils.hpp"
+#include <cstdint>
+#include <algorithm>
+#include <cassert>
 #include <fstream>
+#include <math.h>
+#include <limits>
+#include <ios>
 #include <sstream>
 #include <cmath>
 #include <optional>
+#include <tuple>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 namespace FlushPredict
 {
diff --git a/src/libslic3r/Format/3mf.cpp b/src/libslic3r/Format/3mf.cpp
index 738f1f5f6f..2f457f634d 100644
--- a/src/libslic3r/Format/3mf.cpp
+++ b/src/libslic3r/Format/3mf.cpp
@@ -10,10 +10,37 @@
 #include "../Time.hpp"
 
 #include "../I18N.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/TriangleMesh.hpp"
+#include "libslic3r/Slicing.hpp"
+#include "libslic3r/SLA/SupportPoint.hpp"
+#include "libslic3r/SLA/Hollowing.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r_version.h"
+#include "libslic3r/PrintConfig.hpp"
 
 #include "3mf.hpp"
 
+#include <cstring>
+#include <boost/spirit/home/qi/parse.hpp>
+#include <boost/spirit/home/qi/numeric/int.hpp>
+#include <cstdlib>
+#include <boost/algorithm/string/constants.hpp>
+#include <cstddef>
+#include <boost/optional/optional.hpp>
+#include <cassert>
+#include <algorithm>
+#include <exception>
+#include <cstdio>
+#include <iomanip>
+#include <cstdint>
+#include <boost/spirit/home/karma/generate.hpp>
+#include <boost/spirit/home/support/common_terminals.hpp>
+#include <boost/spirit/home/karma.hpp>
 #include <limits>
+#include <miniz.h>
+#include <map>
+#include <sstream>
 #include <stdexcept>
 
 #include <boost/algorithm/string/classification.hpp>
@@ -28,6 +55,9 @@
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/xml_parser.hpp>
 #include <boost/foreach.hpp>
+#include <string>
+#include <vector>
+#include <utility>
 namespace pt = boost::property_tree;
 
 #include <expat.h>
diff --git a/src/libslic3r/Format/AMF.cpp b/src/libslic3r/Format/AMF.cpp
index c5c9904e87..abf6953855 100644
--- a/src/libslic3r/Format/AMF.cpp
+++ b/src/libslic3r/Format/AMF.cpp
@@ -1,4 +1,10 @@
+#include <cstdlib>
+#include <algorithm>
+#include <cstdio>
+#include <exception>
+#include <boost/algorithm/string/predicate.hpp>
 #include <limits>
+#include <miniz.h>
 #include <string.h>
 #include <map>
 #include <string>
@@ -16,11 +22,16 @@
 #include "../Geometry.hpp"
 #include "../CustomGCode.hpp"
 #include "../LocalesUtils.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/TriangleMesh.hpp"
 
 #include "AMF.hpp"
 
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/xml_parser.hpp>
+#include <vector>
+#include <utility>
 namespace pt = boost::property_tree;
 
 #include <boost/filesystem/operations.hpp>
diff --git a/src/libslic3r/Format/AssimpImport.cpp b/src/libslic3r/Format/AssimpImport.cpp
index f0ae99506a..0ab728f305 100644
--- a/src/libslic3r/Format/AssimpImport.cpp
+++ b/src/libslic3r/Format/AssimpImport.cpp
@@ -4,21 +4,30 @@
 #include "ResourcePathUtils.hpp"
 
 #include <assimp/Importer.hpp>
+#include <assimp/color4.h>
 #include <assimp/config.h>
 #include <assimp/material.h>
+#include <assimp/mesh.h>
 #include <assimp/postprocess.h>
 #include <assimp/scene.h>
 
+#include <assimp/texture.h>
+#include <assimp/types.h>
+#include <assimp/vector3.h>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/path.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/nowide/fstream.hpp>
 
 #include <array>
+#include <cstddef>
 #include <cstdint>
+#include <ios>
 #include <limits>
 #include <sstream>
 #include <string>
+#include <utility>
 #include <vector>
 
 namespace Slic3r {
diff --git a/src/libslic3r/Format/DRC.cpp b/src/libslic3r/Format/DRC.cpp
index c07655f69b..1cf9c13565 100644
--- a/src/libslic3r/Format/DRC.cpp
+++ b/src/libslic3r/Format/DRC.cpp
@@ -1,3 +1,15 @@
+#include <draco/core/decoder_buffer.h>
+#include <draco/compression/config/compression_shared.h>
+#include <draco/core/status.h>
+#include <draco/attributes/point_attribute.h>
+#include <draco/attributes/geometry_attribute.h>
+#include <boost/log/trivial.hpp>
+#include <draco/attributes/geometry_indices.h>
+#include <cstdint>
+#include <exception>
+#include <draco/core/draco_types.h>
+#include <draco/core/encoder_buffer.h>
+#include <cstdio>
 #include <string>
 #include <utility>
 #include <cstring>
@@ -9,6 +21,7 @@
 #include <draco/compression/decode.h>
 #include <draco/io/mesh_io.h>
 #include <draco/mesh/mesh.h>
+#include <vector>
 using namespace draco;
 
 #include "libslic3r/Model.hpp"
diff --git a/src/libslic3r/Format/OBJ.cpp b/src/libslic3r/Format/OBJ.cpp
index 8242f2c0c9..db24ebec0b 100644
--- a/src/libslic3r/Format/OBJ.cpp
+++ b/src/libslic3r/Format/OBJ.cpp
@@ -2,15 +2,27 @@
 #include "../Model.hpp"
 #include "../TriangleMesh.hpp"
 #include "../TexturePainting.hpp"
+#include "libslic3r/Color.hpp"
+#include "libslic3r/Point.hpp"
 #include "ResourcePathUtils.hpp"
 
 #include "OBJ.hpp"
 #include "objparser.hpp"
 
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <cstddef>
+#include <algorithm>
+#include <cassert>
+#include <array>
+#include <cstring>
+#include <map>
+#include <ios>
 #include <string>
 
 #include <boost/log/trivial.hpp>
 #include <boost/nowide/fstream.hpp>
+#include <utility>
 
 #ifdef _WIN32
 #define DIR_SEPARATOR '\\'
diff --git a/src/libslic3r/Format/ResourcePathUtils.hpp b/src/libslic3r/Format/ResourcePathUtils.hpp
index d82b92bd45..eccfcba84f 100644
--- a/src/libslic3r/Format/ResourcePathUtils.hpp
+++ b/src/libslic3r/Format/ResourcePathUtils.hpp
@@ -2,6 +2,9 @@
 #define slic3r_Format_ResourcePathUtils_hpp_
 
 #include <algorithm>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/directory.hpp>
 #include <cctype>
 #include <cstddef>
 #include <string>
diff --git a/src/libslic3r/Format/SL1.cpp b/src/libslic3r/Format/SL1.cpp
index 5796c108e5..15589e79b4 100644
--- a/src/libslic3r/Format/SL1.cpp
+++ b/src/libslic3r/Format/SL1.cpp
@@ -1,13 +1,34 @@
 #include "SL1.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/Config.hpp"
 #include "GCode/ThumbnailData.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Utils.hpp"
 #include "libslic3r/Time.hpp"
 
+#include <boost/algorithm/string/case_conv.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+#include <algorithm>
+#include <array>
 #include <boost/log/trivial.hpp>
 #include <boost/filesystem.hpp>
 
 #include "libslic3r/Zipper.hpp"
 #include "libslic3r/SLAPrint.hpp"
 
+#include <cstdint>
+#include <cstddef>
+#include <miniz.h>
+#include <functional>
+#include <cctype>
+#include <mutex>
+#include <cmath>
+#include <map>
+#include <cassert>
+#include <memory>
+#include <exception>
 #include <sstream>
 
 #include "libslic3r/Exception.hpp"
@@ -20,10 +41,15 @@
 #include "libslic3r/miniz_extension.hpp"
 #include "libslic3r/PNGReadWrite.hpp"
 #include "libslic3r/LocalesUtils.hpp"
+#include "libslic3r_version.h"
 
 #include <boost/property_tree/ini_parser.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/algorithm/string.hpp>
+#include <vector>
+#include <string>
+#include <utility>
+#include <string_view>
 
 namespace marchsq {
 
diff --git a/src/libslic3r/Format/SL1.hpp b/src/libslic3r/Format/SL1.hpp
index 6fb4405c90..ad6b51f7d9 100644
--- a/src/libslic3r/Format/SL1.hpp
+++ b/src/libslic3r/Format/SL1.hpp
@@ -1,8 +1,17 @@
 #ifndef ARCHIVETRAITS_HPP
 #define ARCHIVETRAITS_HPP
 
+#include <memory>
+#include <functional>
+#include <stdexcept>
 #include <string>
+#include <utility>
 
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/SLA/RasterBase.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Exception.hpp"
 #include "libslic3r/Zipper.hpp"
 #include "libslic3r/SLAPrint.hpp"
 
diff --git a/src/libslic3r/Format/STEP.cpp b/src/libslic3r/Format/STEP.cpp
index 8305174e73..611648bc5a 100644
--- a/src/libslic3r/Format/STEP.cpp
+++ b/src/libslic3r/Format/STEP.cpp
@@ -1,10 +1,30 @@
 #include "../libslic3r.h"
 #include "../Model.hpp"
 #include "../TriangleMesh.hpp"
+#include "libslic3r/Exception.hpp"
+#include "libslic3r/Utils.hpp"
+#include "libslic3r/Point.hpp"
 #include "libslic3r/Thread.hpp"
 
 #include "STEP.hpp"
 
+#include <boost/filesystem/path.hpp>
+#include <ios>
+#include <ostream>
+#include <cstddef>
+#include <Standard_Handle.hxx>
+#include <Standard_TypeDef.hxx>
+#include <TopAbs_ShapeEnum.hxx>
+#include <atomic>
+#include <IFSelect_ReturnStatus.hxx>
+#include <boost/chrono/duration.hpp>
+#include <cstring>
+#include <Poly_Triangulation.hxx>
+#include <cstdint>
+#include <gp_Trsf.hxx>
+#include <gp_Pnt.hxx>
+#include <TopAbs_Orientation.hxx>
+#include <Poly_Triangle.hxx>
 #include <string>
 #include <boost/nowide/cstdio.hpp>
 #include <boost/nowide/iostream.hpp>
@@ -12,6 +32,8 @@
 
 #include <tbb/blocked_range.h>
 #include <tbb/parallel_for.h>
+#include <vector>
+#include <utility>
 
 #ifdef _WIN32
 #define DIR_SEPARATOR '\\'
diff --git a/src/libslic3r/Format/STEP.hpp b/src/libslic3r/Format/STEP.hpp
index 336fd79766..7587bbad4e 100644
--- a/src/libslic3r/Format/STEP.hpp
+++ b/src/libslic3r/Format/STEP.hpp
@@ -13,6 +13,7 @@ namespace fs = boost::filesystem;
 namespace Slic3r {
 
 class TriangleMesh;
+class Model;
 class ModelObject;
 
 // load step stage
diff --git a/src/libslic3r/Format/STL.cpp b/src/libslic3r/Format/STL.cpp
index 1888f5cd18..55489af976 100644
--- a/src/libslic3r/Format/STL.cpp
+++ b/src/libslic3r/Format/STL.cpp
@@ -4,7 +4,9 @@
 
 #include "STL.hpp"
 
+#include <cstring>
 #include <string>
+#include <utility>
 
 #ifdef _WIN32
 #define DIR_SEPARATOR '\\'
diff --git a/src/libslic3r/Format/ZipperArchiveImport.cpp b/src/libslic3r/Format/ZipperArchiveImport.cpp
index 657e420bbc..3f690e42da 100644
--- a/src/libslic3r/Format/ZipperArchiveImport.cpp
+++ b/src/libslic3r/Format/ZipperArchiveImport.cpp
@@ -1,12 +1,25 @@
 #include "ZipperArchiveImport.hpp"
 
+#include "libslic3r/Config.hpp"
+#include "libslic3r/LocalesUtils.hpp"
 #include "libslic3r/miniz_extension.hpp"
 #include "libslic3r/Exception.hpp"
 #include "libslic3r/PrintConfig.hpp"
 
+#include <boost/algorithm/string/case_conv.hpp>
+#include <algorithm>
+#include <boost/algorithm/string/predicate.hpp>
 #include <boost/property_tree/ini_parser.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/algorithm/string.hpp>
+#include <miniz.h>
+#include <string>
+#include <cstddef>
+#include <sstream>
+#include <vector>
+#include <cstdint>
+#include <utility>
+#include <functional>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Format/ZipperArchiveImport.hpp b/src/libslic3r/Format/ZipperArchiveImport.hpp
index adddcacd40..18cbb78209 100644
--- a/src/libslic3r/Format/ZipperArchiveImport.hpp
+++ b/src/libslic3r/Format/ZipperArchiveImport.hpp
@@ -1,12 +1,14 @@
 #ifndef ZIPPERARCHIVEIMPORT_HPP
 #define ZIPPERARCHIVEIMPORT_HPP
 
+#include <utility>
 #include <vector>
 #include <string>
 #include <cstdint>
 
 #include <boost/property_tree/ptree.hpp>
 
+#include "libslic3r/Config.hpp"
 #include "libslic3r/PrintConfig.hpp"
 
 namespace Slic3r {
diff --git a/src/libslic3r/Format/bbs_3mf.cpp b/src/libslic3r/Format/bbs_3mf.cpp
index 160c169d69..fb4c877a04 100644
--- a/src/libslic3r/Format/bbs_3mf.cpp
+++ b/src/libslic3r/Format/bbs_3mf.cpp
@@ -12,10 +12,61 @@
 #include "../Time.hpp"
 
 #include "../I18N.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/GCode/GCodeProcessor.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/MultiNozzleUtils.hpp"
+#include "libslic3r/TriangleMesh.hpp"
+#include "libslic3r/ObjectID.hpp"
+#include "libslic3r/Slicing.hpp"
+#include "libslic3r/BrimEarsPoint.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/CustomGCode.hpp"
+#include "libslic3r_version.h"
 
 #include "bbs_3mf.hpp"
 
+#include <boost/assert/source_location.hpp>
+#include <ios>
+#include <cstring>
+#include <boost/spirit/home/qi/parse.hpp>
+#include <boost/spirit/home/qi/numeric/int.hpp>
+#include <cstdlib>
+#include <cstddef>
+#include <boost/algorithm/string/constants.hpp>
+#include <algorithm>
+#include <boost/thread/lock_types.hpp>
+#include <cassert>
+#include <boost/optional/optional.hpp>
+#include <istream>
+#include <functional>
+#include <boost/algorithm/string/find.hpp>
+#include <cstdio>
+#include <exception>
+#include <boost/filesystem/fstream.hpp>
+#include <cstdint>
+#include <boost/spirit/home/karma/generate.hpp>
+#include <boost/spirit/home/support/common_terminals.hpp>
+#include <boost/spirit/home/karma.hpp>
+#include <deque>
+#include <boost/filesystem/directory.hpp>
+#include <boost/thread/lock_guard.hpp>
+#include <boost/date_time/posix_time/posix_time_duration.hpp>
+#include <boost/date_time/posix_time/posix_time_types.hpp>
+#include <boost/date_time/posix_time/ptime.hpp>
+#include <boost/thread/thread_time.hpp>
+#include <boost/core/ref.hpp>
+#include <boost/assign/list_of.hpp>
+#include <cmath>
 #include <limits>
+#include <miniz.h>
+#include <ostream>
+#include <sstream>
+#include <set>
+#include <memory>
+#include <optional>
+#include <map>
+#include <list>
 #include <stdexcept>
 #include <iomanip>
 #include <regex>
@@ -39,6 +90,10 @@
 #include <boost/property_tree/xml_parser.hpp>
 #include <boost/foreach.hpp>
 #include <openssl/md5.h>
+#include <string>
+#include <vector>
+#include <utility>
+#include <string_view>
 
 namespace pt = boost::property_tree;
 
diff --git a/src/libslic3r/Format/bbs_3mf.hpp b/src/libslic3r/Format/bbs_3mf.hpp
index 768ae7bcfe..489870b8fc 100644
--- a/src/libslic3r/Format/bbs_3mf.hpp
+++ b/src/libslic3r/Format/bbs_3mf.hpp
@@ -2,9 +2,21 @@
 #define BBS_3MF_hpp_
 
 #include "../GCode/ThumbnailData.hpp"
+#include "libslic3r/MultiNozzleUtils.hpp"
+#include "libslic3r/Semver.hpp"
 #include "libslic3r/ProjectTask.hpp"
 #include "libslic3r/GCode/GCodeProcessor.hpp"
+#include <cstddef>
 #include <functional>
+#include <string>
+#include <set>
+#include <utility>
+#include <vector>
+#include <map>
+#include <unordered_map>
+#include <optional>
+#include <type_traits>
+#include <istream>
 
 namespace Slic3r {
 class Model;
diff --git a/src/libslic3r/Format/objparser.cpp b/src/libslic3r/Format/objparser.cpp
index c5f33a7d0a..5146a21e80 100644
--- a/src/libslic3r/Format/objparser.cpp
+++ b/src/libslic3r/Format/objparser.cpp
@@ -1,8 +1,16 @@
+#include <cassert>
+#include <memory>
+#include <cstdio>
+#include <new>
+#include <istream>
 #include <stdlib.h>
 #include <string.h>
 
 #include <boost/log/trivial.hpp>
 #include <boost/nowide/cstdio.hpp>
+#include <string>
+#include <vector>
+#include <utility>
 
 #include "objparser.hpp"
 
diff --git a/src/libslic3r/Format/svg.cpp b/src/libslic3r/Format/svg.cpp
index 7b720e62ef..59c2102782 100644
--- a/src/libslic3r/Format/svg.cpp
+++ b/src/libslic3r/Format/svg.cpp
@@ -1,3 +1,5 @@
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Format/STEP.hpp"
 #include "libslic3r/ClipperUtils.hpp"
 #include "../libslic3r.h"
 #include "../Model.hpp"
@@ -6,9 +8,23 @@
 #include "svg.hpp"
 #include "nanosvg/nanosvg.h"
 
+#include <cstdlib>
+#include <cstddef>
+#include <TopAbs_ShapeEnum.hxx>
+#include <TopLoc_Location.hxx>
+#include <Standard_Handle.hxx>
+#include <Poly_Triangulation.hxx>
+#include <BRep_Tool.hxx>
+#include <cstdint>
+#include <Standard_TypeDef.hxx>
+#include <gp_Trsf.hxx>
+#include <TopAbs_Orientation.hxx>
+#include <Poly_Triangle.hxx>
 #include <string>
 
 #include <boost/log/trivial.hpp>
+#include <vector>
+#include <utility>
 
 #include "BRepBuilderAPI_MakeWire.hxx"
 #include "BRepBuilderAPI_MakeEdge.hxx"
diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
index 4c02cae7b4..cae610c555 100644
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@@ -1,9 +1,31 @@
+#include "ArcFitter.hpp"
 #include "BoundingBox.hpp"
+#include "Circle.hpp"
 #include "Config.hpp"
+#include "GCode/GCodeProcessor.hpp"
+#include "Flow.hpp"
+#include "GCode/ThumbnailData.hpp"
+#include "GCode/ToolOrdering.hpp"
+#include "GCode/SpiralVase.hpp"
+#include "GCode/PressureEqualizer.hpp"
+#include "GCode/SmallAreaInfillFlowCompensator.hpp"
+#include "GCode/CoolingBuffer.hpp"
+#include "GCode/AdaptivePAProcessor.hpp"
+#include "CustomGCode.hpp"
+#include "GCode/TimelapsePosPicker.hpp"
+#include "ExPolygon.hpp"
 #include "GCode/WipePathHelpers.hpp"
+#include "GCodeReader.hpp"
 #include "GCodeWriter.hpp"
+#include "Point.hpp"
+#include "Line.hpp"
+#include "ObjectID.hpp"
+#include "Layer.hpp"
 #include "Polygon.hpp"
+#include "Polyline.hpp"
+#include "PrintBase.hpp"
 #include "PrintConfig.hpp"
+#include "enum_bitmask.hpp"
 #include "libslic3r.h"
 #include "I18N.hpp"
 #include "GCode.hpp"
@@ -26,16 +48,39 @@
 #include "libslic3r/format.hpp"
 #include "Time.hpp"
 #include "GCode/ExtrusionProcessor.hpp"
+#include <Eigen/Geometry>
+#include <Shiny/ShinyMacros.h>
 #include <algorithm>
+#include <cctype>
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/path.hpp>
 #include <cfloat>
 #include <cmath>
+#include <cstdio>
+#include <cstdint>
+#include <cstdarg>
 #include <cstdlib>
 #include <chrono>
+#include <iomanip>
+#include <cstring>
+#include <exception>
+#include <functional>
 #include <iostream>
 #include <iterator>
+#include <limits>
+#include <map>
 #include <math.h>
+#include <memory>
+#include <sstream>
+#include <stdexcept>
+#include <set>
+#include <optional>
 #include <stdlib.h>
 #include <string>
+#include <system_error>
+#include <unordered_set>
+#include <type_traits>
 #include <utility>
 #include <string_view>
 
@@ -54,7 +99,9 @@
 #include "SVG.hpp"
 
 #include <tbb/parallel_for.h>
+#include <vector>
 #include "calib.hpp"
+#include "libslic3r_version.h"
 // 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 29a8ae5a34..f03ebd8405 100644
--- a/src/libslic3r/GCode.hpp
+++ b/src/libslic3r/GCode.hpp
@@ -1,6 +1,11 @@
 #ifndef slic3r_GCode_hpp_
 #define slic3r_GCode_hpp_
 
+#include "ExtrusionEntity.hpp"
+#include "Polygon.hpp"
+#include "Config.hpp"
+#include "ExtrusionEntityCollection.hpp"
+#include "Print.hpp"
 #include "libslic3r.h"
 #include "ExPolygon.hpp"
 #include "GCodeWriter.hpp"
@@ -28,12 +33,20 @@
 #include "GCode/AdaptivePAProcessor.hpp"
 
 #include "GCode/TimelapsePosPicker.hpp"
+#include "libslic3r_version.h"
 
+#include <cstddef>
+#include <limits>
+#include <cstdio>
+#include <array>
+#include <cstdlib>
 #include <memory>
 #include <map>
 #include <set>
 #include <string>
 #include <cfloat>
+#include <vector>
+#include <utility>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/GCode/AdaptivePAInterpolator.cpp b/src/libslic3r/GCode/AdaptivePAInterpolator.cpp
index 2681ab13b2..5d86420ad2 100644
--- a/src/libslic3r/GCode/AdaptivePAInterpolator.cpp
+++ b/src/libslic3r/GCode/AdaptivePAInterpolator.cpp
@@ -4,10 +4,16 @@
 // Implementation file for the AdaptivePAInterpolator class, providing methods to parse data and perform PA interpolation.
 
 #include "AdaptivePAInterpolator.hpp"
+#include <map>
+#include "libslic3r/GCode/PchipInterpolatorHelper.hpp"
+#include <exception>
 #include <stdexcept>
 #include <cmath>
 #include <algorithm>
 #include <sstream>
+#include <string>
+#include <vector>
+#include <utility>
 
 /**
  * @brief Parses the input data and sets up the interpolators.
diff --git a/src/libslic3r/GCode/AdaptivePAProcessor.cpp b/src/libslic3r/GCode/AdaptivePAProcessor.cpp
index 8145db3b9f..21bd308853 100644
--- a/src/libslic3r/GCode/AdaptivePAProcessor.cpp
+++ b/src/libslic3r/GCode/AdaptivePAProcessor.cpp
@@ -4,11 +4,20 @@
 // Implementation of the AdaptivePAProcessor class, responsible for processing G-code layers with adaptive pressure advance.
 
 #include "../GCode.hpp"
+#include "libslic3r/GCode/AdaptivePAInterpolator.hpp"
+#include "libslic3r/libslic3r.h"
 #include "AdaptivePAProcessor.hpp"
+#include <memory>
+#include <cstddef>
+#include <regex>
+#include <iosfwd>
+#include <algorithm>
+#include <exception>
 #include <sstream>
 #include <iostream>
 #include <cmath>
 #include <cctype>
+#include <string>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/GCode/AvoidCrossingPerimeters.cpp b/src/libslic3r/GCode/AvoidCrossingPerimeters.cpp
index 21f02b3462..62c2ae61fd 100644
--- a/src/libslic3r/GCode/AvoidCrossingPerimeters.cpp
+++ b/src/libslic3r/GCode/AvoidCrossingPerimeters.cpp
@@ -7,11 +7,30 @@
 #include "../Geometry.hpp"
 #include "../ClipperUtils.hpp"
 #include "../SVG.hpp"
+#include "libslic3r/Line.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Utils.hpp"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/Flow.hpp"
+#include "libslic3r/Surface.hpp"
+#include "libslic3r/Config.hpp"
 #include "AvoidCrossingPerimeters.hpp"
 
+#include <cstddef>
+#include <boost/container_hash/hash.hpp>
+#include <cassert>
+#include <limits>
+#include <algorithm>
+#include <iterator>
+#include <cmath>
+#include <math.h>
 #include <numeric>
 #include <unordered_set>
 #include <boost/range/adaptor/reversed.hpp>
+#include <vector>
+#include <utility>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/GCode/AvoidCrossingPerimeters.hpp b/src/libslic3r/GCode/AvoidCrossingPerimeters.hpp
index a348eed786..53e2942d3b 100644
--- a/src/libslic3r/GCode/AvoidCrossingPerimeters.hpp
+++ b/src/libslic3r/GCode/AvoidCrossingPerimeters.hpp
@@ -4,6 +4,10 @@
 #include "../libslic3r.h"
 #include "../ExPolygon.hpp"
 #include "../EdgeGrid.hpp"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/GCode/ConflictChecker.cpp b/src/libslic3r/GCode/ConflictChecker.cpp
index e8f533be7c..70b58423fa 100644
--- a/src/libslic3r/GCode/ConflictChecker.cpp
+++ b/src/libslic3r/GCode/ConflictChecker.cpp
@@ -1,11 +1,28 @@
 #include "ConflictChecker.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Line.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/ExtrusionEntityCollection.hpp"
+#include "libslic3r/ExtrusionEntity.hpp"
+#include "libslic3r/Layer.hpp"
+#include "libslic3r/Print.hpp"
+#include "libslic3r/GCode/GCodeProcessor.hpp"
 
+#include <cstdint>
+#include <cstdlib>
+#include <cfloat>
+#include <cassert>
+#include <optional>
+#include <cstddef>
+#include <algorithm>
 #include <tbb/parallel_for.h>
 #include <tbb/concurrent_vector.h>
 
 #include <map>
 #include <functional>
 #include <atomic>
+#include <utility>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/GCode/ConflictChecker.hpp b/src/libslic3r/GCode/ConflictChecker.hpp
index a10b969431..50a126b89a 100644
--- a/src/libslic3r/GCode/ConflictChecker.hpp
+++ b/src/libslic3r/GCode/ConflictChecker.hpp
@@ -5,8 +5,18 @@
 #include "../Model.hpp"
 #include "../Print.hpp"
 #include "../Layer.hpp"
+#include "libslic3r/Line.hpp"
+#include "libslic3r/ExtrusionEntity.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/ExtrusionEntityCollection.hpp"
+#include "libslic3r/GCode/GCodeProcessor.hpp"
 
 #include <queue>
+#include <utility>
+#include <algorithm>
+#include <iterator>
+#include <string>
 #include <vector>
 #include <optional>
 
diff --git a/src/libslic3r/GCode/CoolingBuffer.cpp b/src/libslic3r/GCode/CoolingBuffer.cpp
index 7f6e9c67d5..6524b3ce38 100644
--- a/src/libslic3r/GCode/CoolingBuffer.cpp
+++ b/src/libslic3r/GCode/CoolingBuffer.cpp
@@ -1,12 +1,26 @@
 #include "../GCode.hpp"
+#include "libslic3r/Extruder.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Circle.hpp"
 #include "CoolingBuffer.hpp"
+#include <algorithm>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/log/trivial.hpp>
+#include <cstddef>
+#include <cstdlib>
+#include <cmath>
+#include <charconv>
+#include <cstring>
+#include <cstdio>
 #include <iostream>
 #include <float.h>
+#include <string>
 #include <system_error>
 #include <unordered_map>
+#include <vector>
+#include <utility>
 
 #if 0
     #define DEBUG
diff --git a/src/libslic3r/GCode/ElegooGCodeProcessorHelper.cpp b/src/libslic3r/GCode/ElegooGCodeProcessorHelper.cpp
index cac53637a5..1b086e4f47 100644
--- a/src/libslic3r/GCode/ElegooGCodeProcessorHelper.cpp
+++ b/src/libslic3r/GCode/ElegooGCodeProcessorHelper.cpp
@@ -1,10 +1,13 @@
 #include "GCodeProcessor.hpp"
 
+#include "libslic3r/GCodeReader.hpp"
 #include "libslic3r/libslic3r.h"
 
 #include <algorithm>
 #include <cctype>
 #include <cmath>
+#include <cstddef>
+#include <math.h>
 #include <string_view>
 
 namespace Slic3r {
diff --git a/src/libslic3r/GCode/ExtrusionProcessor.hpp b/src/libslic3r/GCode/ExtrusionProcessor.hpp
index 8ed829aa6e..7cc886bfe9 100644
--- a/src/libslic3r/GCode/ExtrusionProcessor.hpp
+++ b/src/libslic3r/GCode/ExtrusionProcessor.hpp
@@ -15,7 +15,10 @@
 #include "../ClipperUtils.hpp"
 #include "../Flow.hpp"
 #include "../Config.hpp"
+#include "libslic3r/Line.hpp"
+#include "libslic3r/ExPolygon.hpp"
 
+#include <Eigen/Core>
 #include <algorithm>
 #include <cmath>
 #include <cstddef>
diff --git a/src/libslic3r/GCode/FanMover.cpp b/src/libslic3r/GCode/FanMover.cpp
index 9d77d1d04c..211e7d7ebd 100644
--- a/src/libslic3r/GCode/FanMover.cpp
+++ b/src/libslic3r/GCode/FanMover.cpp
@@ -1,10 +1,23 @@
 #include "FanMover.hpp"
 
+#include "libslic3r/ExtrusionEntity.hpp"
 #include "GCodeReader.hpp"
 
+#include <cstddef>
+#include <cerrno>
+#include <cstdlib>
+#include <algorithm>
+#include <cstdint>
+#include <cmath>
+#include <cassert>
+#include <cctype>
 #include <iomanip>
 /*
+#include <ios>
+#include <list>
+#include <iterator>
 #include <memory.h>
+#include <sstream>
 #include <string.h>
 #include <float.h>
 
@@ -12,8 +25,12 @@
 #include "../PrintConfig.hpp"
 #include "../Utils.hpp"
 #include "Print.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/libslic3r.h"
 
 #include <boost/log/trivial.hpp>
+#include <string>
+#include <string_view>
 */
 
 
diff --git a/src/libslic3r/GCode/FanMover.hpp b/src/libslic3r/GCode/FanMover.hpp
index 17addd855c..b3a6fcb309 100644
--- a/src/libslic3r/GCode/FanMover.hpp
+++ b/src/libslic3r/GCode/FanMover.hpp
@@ -9,7 +9,12 @@
 #include "../Point.hpp"
 #include "../GCodeReader.hpp"
 #include "../GCodeWriter.hpp"
+#include <cstdint>
+#include <list>
+#include <algorithm>
 #include <regex>
+#include <string>
+#include <string_view>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/GCode/GCodeProcessor.cpp b/src/libslic3r/GCode/GCodeProcessor.cpp
index e03be228d0..760a04eb4d 100644
--- a/src/libslic3r/GCode/GCodeProcessor.cpp
+++ b/src/libslic3r/GCode/GCodeProcessor.cpp
@@ -1,14 +1,30 @@
+#include "libslic3r/Config.hpp"
+#include "libslic3r/CustomGCode.hpp"
+#include "libslic3r/Exception.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/CommonDefs.hpp"
+#include "libslic3r/ArcFitter.hpp"
 #include "ExtrusionEntity.hpp"
+#include "libslic3r/GCodeReader.hpp"
 #include "GCodeWriter.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/PrintBase.hpp"
+#include "libslic3r/Polygon.hpp"
 #include "PrintConfig.hpp"
+#include "libslic3r/TriangleSelector.hpp"
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Utils.hpp"
 #include "libslic3r/Print.hpp"
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/LocalesUtils.hpp"
 #include "libslic3r/format.hpp"
+#include "libslic3r_version.h"
 #include "GCodeProcessor.hpp"
 
+#include <algorithm>
+#include <array>
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/constants.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/split.hpp>
@@ -16,15 +32,38 @@
 #include <boost/nowide/cstdio.hpp>
 #include <boost/filesystem/path.hpp>
 
+#include <cstddef>
+#include <cmath>
+#include <exception>
+#include <deque>
+#include <cstdio>
+#include <cstring>
+#include <cctype>
+#include <cstdlib>
+#include <climits>
 #include <fast_float/fast_float.h>
 
 #include <float.h>
 #include <assert.h>
+#include <memory>
+#include <optional>
+#include <iterator>
+#include <functional>
+#include <math.h>
+#include <map>
+#include <limits>
+#include <fstream>
 #include <regex>
+#include <set>
 #include <sstream>
 #include <charconv>
 #include <string>
+#include <string_view>
 #include <system_error>
+#include <vector>
+#include <type_traits>
+#include <unordered_map>
+#include <unordered_set>
 
 #if __has_include(<charconv>)
     #include <charconv>
diff --git a/src/libslic3r/GCode/GCodeProcessor.hpp b/src/libslic3r/GCode/GCodeProcessor.hpp
index 192a80a43d..cde789cb6c 100644
--- a/src/libslic3r/GCode/GCodeProcessor.hpp
+++ b/src/libslic3r/GCode/GCodeProcessor.hpp
@@ -1,6 +1,11 @@
 #ifndef slic3r_GCodeProcessor_hpp_
 #define slic3r_GCodeProcessor_hpp_
 
+#include "libslic3r/CommonDefs.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/ArcFitter.hpp"
 #include "libslic3r/GCodeReader.hpp"
 #include "libslic3r/Point.hpp"
 #include "libslic3r/ExtrusionEntity.hpp"
@@ -8,8 +13,17 @@
 #include "libslic3r/CustomGCode.hpp"
 #include "libslic3r/MultiNozzleUtils.hpp"
 
+#include <cstddef>
+#include <cassert>
 #include <cstdint>
 #include <array>
+#include <unordered_map>
+#include <utility>
+#include <map>
+#include <memory>
+#include <functional>
+#include <cstdlib>
+#include <set>
 #include <vector>
 #include <mutex>
 #include <string>
diff --git a/src/libslic3r/GCode/OrderingStrategies.cpp b/src/libslic3r/GCode/OrderingStrategies.cpp
index 2ba9ae5490..73cb90f461 100644
--- a/src/libslic3r/GCode/OrderingStrategies.cpp
+++ b/src/libslic3r/GCode/OrderingStrategies.cpp
@@ -4,9 +4,14 @@
 #include "OrderingStrategies.hpp"
 #include "../Geometry.hpp"
 #include "../ShortestPath.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/PrintConfig.hpp"
 
 #include <algorithm>
 #include <cmath>
+#include <cstddef>
+#include <cstdint>
+#include <iterator>
 #include <limits>
 #include <numeric>
 #include <unordered_map>
diff --git a/src/libslic3r/GCode/OrderingStrategies.hpp b/src/libslic3r/GCode/OrderingStrategies.hpp
index 598eac8130..4e6d766b37 100644
--- a/src/libslic3r/GCode/OrderingStrategies.hpp
+++ b/src/libslic3r/GCode/OrderingStrategies.hpp
@@ -5,6 +5,8 @@
 
 #include "../libslic3r.h"
 #include "../Point.hpp"
+#include <cstddef>
+#include "libslic3r/PrintConfig.hpp"
 
 #ifndef SLIC3R_TEST_HARNESS
 #include "../Print.hpp"
diff --git a/src/libslic3r/GCode/PchipInterpolatorHelper.cpp b/src/libslic3r/GCode/PchipInterpolatorHelper.cpp
index 44baa6cbf7..b01a23edb5 100644
--- a/src/libslic3r/GCode/PchipInterpolatorHelper.cpp
+++ b/src/libslic3r/GCode/PchipInterpolatorHelper.cpp
@@ -4,9 +4,13 @@
 // Implementation file for the PchipInterpolatorHelper class
 
 #include "PchipInterpolatorHelper.hpp"
+#include <cstddef>
+#include <iterator>
 #include <stdexcept>
 #include <cmath>
 #include <algorithm>
+#include <vector>
+#include <utility>
 
 /**
  * @brief Constructs the PCHIP interpolator with given data points.
diff --git a/src/libslic3r/GCode/PreciseSeam.cpp b/src/libslic3r/GCode/PreciseSeam.cpp
index 378ab2d2d3..b8eb5ea270 100644
--- a/src/libslic3r/GCode/PreciseSeam.cpp
+++ b/src/libslic3r/GCode/PreciseSeam.cpp
@@ -1,9 +1,23 @@
 #include "PreciseSeam.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Model.hpp"
+#include "libslic3r/ClipperUtils.hpp"
 #include "SeamPlacer.hpp"
+#include "libslic3r/libslic3r.h"
 #include "libslic3r/BoundingBox.hpp"
 #include <algorithm>
+#include <atomic>
 #include <boost/log/trivial.hpp>
+#include <optional>
+#include <cstddef>
+#include <limits>
+#include <iterator>
+#include <cassert>
+#include <cmath>
 #include <tbb/parallel_for.h>
+#include <vector>
+#include <utility>
 
 namespace Slic3r {
 namespace PreciseSeam {
diff --git a/src/libslic3r/GCode/PreciseSeam.hpp b/src/libslic3r/GCode/PreciseSeam.hpp
index d5c1e98952..f4f75c37bf 100644
--- a/src/libslic3r/GCode/PreciseSeam.hpp
+++ b/src/libslic3r/GCode/PreciseSeam.hpp
@@ -2,9 +2,11 @@
 #define slic3r_PreciseSeam_hpp_
 
 #include <atomic>
+#include <cstddef>
 #include <optional>
 #include <vector>
 #include <unordered_map>
+#include "libslic3r/Point.hpp"
 #include "libslic3r/Polygon.hpp"
 #include "libslic3r/Polyline.hpp"
 #include "libslic3r/Model.hpp"
diff --git a/src/libslic3r/GCode/PressureEqualizer.cpp b/src/libslic3r/GCode/PressureEqualizer.cpp
index 3db54ca2af..44ca576933 100644
--- a/src/libslic3r/GCode/PressureEqualizer.cpp
+++ b/src/libslic3r/GCode/PressureEqualizer.cpp
@@ -1,8 +1,17 @@
+#include <cassert>
+#include <cstdlib>
+#include <boost/algorithm/string/predicate.hpp>
+#include <cctype>
+#include <cmath>
+#include <array>
 #include <iostream>
+#include <math.h>
+#include <limits>
 #include <memory.h>
 #include <cstring>
 #include <cfloat>
 #include <algorithm>
+#include <string>
 
 #include "../libslic3r.h"
 #include "../PrintConfig.hpp"
@@ -10,6 +19,8 @@
 #include "../GCode.hpp"
 
 #include "PressureEqualizer.hpp"
+#include "libslic3r/ExtrusionEntity.hpp"
+#include "libslic3r/Exception.hpp"
 #include "fast_float/fast_float.h"
 #include "GCodeWriter.hpp"
 
diff --git a/src/libslic3r/GCode/PrintExtents.cpp b/src/libslic3r/GCode/PrintExtents.cpp
index 9008adaa9a..71bc826258 100644
--- a/src/libslic3r/GCode/PrintExtents.cpp
+++ b/src/libslic3r/GCode/PrintExtents.cpp
@@ -10,7 +10,16 @@
 #include "../Print.hpp"
 
 #include "PrintExtents.hpp"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Exception.hpp"
+#include "libslic3r/Geometry.hpp"
 #include "WipeTower.hpp"
+#include "libslic3r/libslic3r.h"
+#include <algorithm>
+#include <Eigen/Geometry>
+#include <vector>
+#include <cstddef>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/GCode/RetractWhenCrossingPerimeters.cpp b/src/libslic3r/GCode/RetractWhenCrossingPerimeters.cpp
index 776091adfb..32994741d4 100644
--- a/src/libslic3r/GCode/RetractWhenCrossingPerimeters.cpp
+++ b/src/libslic3r/GCode/RetractWhenCrossingPerimeters.cpp
@@ -1,6 +1,15 @@
 #include "../ClipperUtils.hpp"
 #include "../Layer.hpp"
 #include "../Polyline.hpp"
+#include "libslic3r/Surface.hpp"
+#include <vector>
+#include "libslic3r/AABBTreeIndirect.hpp"
+#include <cstddef>
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/libslic3r.h"
+#include <cassert>
+#include "libslic3r/Polygon.hpp"
 
 #include "RetractWhenCrossingPerimeters.hpp"
 
diff --git a/src/libslic3r/GCode/RetractWhenCrossingPerimeters.hpp b/src/libslic3r/GCode/RetractWhenCrossingPerimeters.hpp
index fb624d7f90..e6029ce7f1 100644
--- a/src/libslic3r/GCode/RetractWhenCrossingPerimeters.hpp
+++ b/src/libslic3r/GCode/RetractWhenCrossingPerimeters.hpp
@@ -4,6 +4,7 @@
 #include <vector>
 
 #include "../AABBTreeIndirect.hpp"
+#include "libslic3r/libslic3r.h"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/GCode/SeamPlacer.cpp b/src/libslic3r/GCode/SeamPlacer.cpp
index d527ec6aa9..720339f746 100644
--- a/src/libslic3r/GCode/SeamPlacer.cpp
+++ b/src/libslic3r/GCode/SeamPlacer.cpp
@@ -1,15 +1,38 @@
 #include "SeamPlacer.hpp"
 
+#include "libslic3r/Point.hpp"
+#include "libslic3r/AABBTreeIndirect.hpp"
+#include "libslic3r/Model.hpp"
+#include "libslic3r/Flow.hpp"
+#include "libslic3r/Line.hpp"
+#include "libslic3r/ExPolygon.hpp"
 #include "Polygon.hpp"
+#include "libslic3r/PrintBase.hpp"
 #include "PrintConfig.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/TriangleMesh.hpp"
+#include "libslic3r/TriangleSelector.hpp"
 #include "tbb/parallel_for.h"
 #include "tbb/blocked_range.h"
 #include "tbb/parallel_reduce.h"
+#include <atomic>
 #include <boost/log/trivial.hpp>
+#include <cmath>
+#include <cstdlib>
+#include <cstddef>
+#include <igl/Hit.h>
+#include <optional>
+#include <cassert>
+#include <functional>
+#include <numeric>
+#include <memory>
 #include <random>
 #include <algorithm>
 #include <queue>
+#include <string>
 #include <unordered_map>
+#include <vector>
+#include <utility>
 
 #include "libslic3r/AABBTreeLines.hpp"
 #include "libslic3r/KDTreeIndirect.hpp"
diff --git a/src/libslic3r/GCode/SeamPlacer.hpp b/src/libslic3r/GCode/SeamPlacer.hpp
index 9855b4f4aa..cbf2c73fbe 100644
--- a/src/libslic3r/GCode/SeamPlacer.hpp
+++ b/src/libslic3r/GCode/SeamPlacer.hpp
@@ -1,12 +1,17 @@
 #ifndef libslic3r_SeamPlacer_hpp_
 #define libslic3r_SeamPlacer_hpp_
 
+#include <cstddef>
+#include <functional>
 #include <limits>
 #include <optional>
+#include <unordered_map>
+#include <utility>
 #include <vector>
 #include <memory>
 #include <atomic>
 
+#include "libslic3r/Point.hpp"
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/ExtrusionEntity.hpp"
 #include "libslic3r/Polygon.hpp"
diff --git a/src/libslic3r/GCode/SmallAreaInfillFlowCompensator.cpp b/src/libslic3r/GCode/SmallAreaInfillFlowCompensator.cpp
index 20377cfe8d..fec0e4aa88 100644
--- a/src/libslic3r/GCode/SmallAreaInfillFlowCompensator.cpp
+++ b/src/libslic3r/GCode/SmallAreaInfillFlowCompensator.cpp
@@ -6,16 +6,26 @@
 // Based on original work by Alexander Þór licensed under the GPLv3:
 // https://github.com/Alexander-T-Moss/Small-Area-Flow-Comp
 
+#include <cmath>
+#include <limits>
+#include <exception>
 #include <math.h>
 #include <cstring>
 #include <cfloat>
+#include <ostream>
+#include <memory>
 #include <regex>
 
 #include "../libslic3r.h"
 #include "../PrintConfig.hpp"
+#include "libslic3r/Exception.hpp"
+#include "libslic3r/GCode/PchipInterpolatorHelper.hpp"
+#include "libslic3r/ExtrusionEntity.hpp"
 
 #include "SmallAreaInfillFlowCompensator.hpp"
 #include <boost/log/trivial.hpp>
+#include <sstream>
+#include <string>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/GCode/SmallAreaInfillFlowCompensator.hpp b/src/libslic3r/GCode/SmallAreaInfillFlowCompensator.hpp
index de1df98170..2139e7f438 100644
--- a/src/libslic3r/GCode/SmallAreaInfillFlowCompensator.hpp
+++ b/src/libslic3r/GCode/SmallAreaInfillFlowCompensator.hpp
@@ -6,6 +6,7 @@
 #include "../ExtrusionEntity.hpp"
 #include "PchipInterpolatorHelper.hpp"
 #include <memory>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/GCode/SpiralVase.cpp b/src/libslic3r/GCode/SpiralVase.cpp
index 2c39bda4f7..d96f99de4f 100644
--- a/src/libslic3r/GCode/SpiralVase.cpp
+++ b/src/libslic3r/GCode/SpiralVase.cpp
@@ -1,8 +1,13 @@
 #include "SpiralVase.hpp"
 #include "GCode.hpp"
+#include "libslic3r/libslic3r.h"
+#include <algorithm>
+#include <cstddef>
 #include <sstream>
 #include <cmath>
 #include <limits>
+#include <vector>
+#include <string>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/GCode/SpiralVase.hpp b/src/libslic3r/GCode/SpiralVase.hpp
index f28b4c5f55..b1e7c79f7e 100644
--- a/src/libslic3r/GCode/SpiralVase.hpp
+++ b/src/libslic3r/GCode/SpiralVase.hpp
@@ -3,6 +3,10 @@
 
 #include "../libslic3r.h"
 #include "../GCodeReader.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include <cstddef>
+#include <string>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/GCode/ThumbnailData.cpp b/src/libslic3r/GCode/ThumbnailData.cpp
index d895c0d95f..a86d10c4a4 100644
--- a/src/libslic3r/GCode/ThumbnailData.cpp
+++ b/src/libslic3r/GCode/ThumbnailData.cpp
@@ -1,4 +1,5 @@
 #include "ThumbnailData.hpp"
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/GCode/ThumbnailData.hpp b/src/libslic3r/GCode/ThumbnailData.hpp
index bc37ad40c4..f112000273 100644
--- a/src/libslic3r/GCode/ThumbnailData.hpp
+++ b/src/libslic3r/GCode/ThumbnailData.hpp
@@ -1,7 +1,10 @@
 #ifndef slic3r_ThumbnailData_hpp_
 #define slic3r_ThumbnailData_hpp_
 
+#include <functional>
+#include <string>
 #include <vector>
+#include "libslic3r/libslic3r.h"
 #include "libslic3r/Point.hpp"
 #include "nlohmann/json.hpp"
 
diff --git a/src/libslic3r/GCode/Thumbnails.cpp b/src/libslic3r/GCode/Thumbnails.cpp
index 526ba82498..9d32b0b63b 100644
--- a/src/libslic3r/GCode/Thumbnails.cpp
+++ b/src/libslic3r/GCode/Thumbnails.cpp
@@ -1,11 +1,27 @@
 #include "Thumbnails.hpp"
 #include "../miniz_extension.hpp"
+#include "libslic3r/GCode/ThumbnailData.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/enum_bitmask.hpp"
 #include "format.hpp"
 
 #include <boost/algorithm/string/case_conv.hpp>
 #include <qoi/qoi.h>
+#include <cstdlib>
+#include <cstring>
+#include <cstddef>
+#include <cstdint>
+#include <ios>
 #include <jpeglib.h>
 #include <jerror.h>
+#include <miniz.h>
+#include <string_view>
+#include <memory>
+#include <sstream>
+#include <string>
+#include <utility>
 #include <vector>
 #include <boost/algorithm/string.hpp>
 
diff --git a/src/libslic3r/GCode/Thumbnails.hpp b/src/libslic3r/GCode/Thumbnails.hpp
index bcee02fea1..fd72973bac 100644
--- a/src/libslic3r/GCode/Thumbnails.hpp
+++ b/src/libslic3r/GCode/Thumbnails.hpp
@@ -4,9 +4,13 @@
 #include "../Point.hpp"
 #include "../PrintConfig.hpp"
 #include "../enum_bitmask.hpp"
+#include "libslic3r/Config.hpp"
 #include "ThumbnailData.hpp"
 #include "../enum_bitmask.hpp"
 
+#include <cstddef>
+#include <string>
+#include <utility>
 #include <vector>
 #include <memory>
 #include <string_view>
diff --git a/src/libslic3r/GCode/TimelapsePosPicker.cpp b/src/libslic3r/GCode/TimelapsePosPicker.cpp
index 364624a88c..fded08c1ce 100644
--- a/src/libslic3r/GCode/TimelapsePosPicker.cpp
+++ b/src/libslic3r/GCode/TimelapsePosPicker.cpp
@@ -1,6 +1,23 @@
 #include "ClipperUtils.hpp"
 #include "TimelapsePosPicker.hpp"
+#include "libslic3r/ExPolygon.hpp"
 #include "Layer.hpp"
+#include "libslic3r/Point.hpp"
+#include <cstdlib>
+#include "libslic3r/PrintConfig.hpp"
+#include <optional>
+#include <vector>
+#include <cstddef>
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Polygon.hpp"
+#include <utility>
+#include <algorithm>
+#include "libslic3r/Print.hpp"
+#include <cmath>
+#include <queue>
+#include <limits>
+#include "libslic3r/Utils.hpp"
+#include "libslic3r/Polyline.hpp"
 
 constexpr int FILTER_THRESHOLD = 5;
 constexpr int MAX_CANDIDATE_SIZE = 5;
diff --git a/src/libslic3r/GCode/TimelapsePosPicker.hpp b/src/libslic3r/GCode/TimelapsePosPicker.hpp
index 9ed6b14fc7..af102e6340 100644
--- a/src/libslic3r/GCode/TimelapsePosPicker.hpp
+++ b/src/libslic3r/GCode/TimelapsePosPicker.hpp
@@ -1,7 +1,11 @@
 #ifndef TIMELAPSE_POS_PICKER_HPP
 #define TIMELAPSE_POS_PICKER_HPP
 
+#include <optional>
+#include <unordered_map>
 #include <vector>
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/Point.hpp"
 #include "libslic3r/ExPolygon.hpp"
 #include "libslic3r/Print.hpp"
diff --git a/src/libslic3r/GCode/ToolOrderUtils.cpp b/src/libslic3r/GCode/ToolOrderUtils.cpp
index 4a67477d24..b64042a23f 100644
--- a/src/libslic3r/GCode/ToolOrderUtils.cpp
+++ b/src/libslic3r/GCode/ToolOrderUtils.cpp
@@ -1,9 +1,23 @@
 #include "ToolOrderUtils.hpp"
+#include "libslic3r/MultiNozzleUtils.hpp"
 #include <queue>
+#include <algorithm>
+#include <cassert>
+#include <cstddef>
+#include <optional>
+#include <memory>
+#include <limits>
+#include <functional>
+#include <boost/multiprecision/fwd.hpp>
+#include <iterator>
 #include <set>
 #include <map>
 #include <cmath>
 #include <boost/multiprecision/cpp_int.hpp>
+#include <vector>
+#include <unordered_map>
+#include <utility>
+#include <unordered_set>
 
 namespace Slic3r
 {
diff --git a/src/libslic3r/GCode/ToolOrderUtils.hpp b/src/libslic3r/GCode/ToolOrderUtils.hpp
index 7b103531b1..db24545f33 100644
--- a/src/libslic3r/GCode/ToolOrderUtils.hpp
+++ b/src/libslic3r/GCode/ToolOrderUtils.hpp
@@ -1,6 +1,7 @@
 #ifndef TOOL_ORDER_UTILS_HPP
 #define TOOL_ORDER_UTILS_HPP
 
+#include <utility>
 #include <vector>
 #include <optional>
 #include <functional>
diff --git a/src/libslic3r/GCode/ToolOrdering.cpp b/src/libslic3r/GCode/ToolOrdering.cpp
index 5026323d54..38532a2f67 100644
--- a/src/libslic3r/GCode/ToolOrdering.cpp
+++ b/src/libslic3r/GCode/ToolOrdering.cpp
@@ -1,4 +1,9 @@
+#include "libslic3r/Exception.hpp"
+#include "libslic3r/CustomGCode.hpp"
+#include "libslic3r/Config.hpp"
 #include "ExtrusionEntity.hpp"
+#include "libslic3r/ObjectID.hpp"
+#include "libslic3r/FilamentGroup.hpp"
 #include "Print.hpp"
 #include "ToolOrdering.hpp"
 #include "Layer.hpp"
@@ -9,11 +14,23 @@
 #include "MultiNozzleUtils.hpp"
 #include "FilamentMixer.hpp"
 #include "LocalesUtils.hpp"
+#include "libslic3r/PrintConfig.hpp"
 #include "Utils.hpp"
 #include "format.hpp"
 #include "I18N.hpp"
 
 #include <boost/log/trivial.hpp>
+#include <vector>
+#include <string>
+#include <utility>
+#include <cmath>
+#include <cstdlib>
+#include <optional>
+#include <functional>
+#include <exception>
+#include <memory>
+#include <tuple>
+#include <iostream>
 
 // #define SLIC3R_DEBUG
 
diff --git a/src/libslic3r/GCode/ToolOrdering.hpp b/src/libslic3r/GCode/ToolOrdering.hpp
index 1b8ce190d7..70b55fdb33 100644
--- a/src/libslic3r/GCode/ToolOrdering.hpp
+++ b/src/libslic3r/GCode/ToolOrdering.hpp
@@ -5,11 +5,19 @@
 
 #include "../libslic3r.h"
 
+#include <cstdint>
+#include <cstddef>
+#include <algorithm>
 #include <functional>
 #include <map>
+#include <tuple>
+#include <set>
+#include <unordered_map>
+#include <string>
 #include <utility>
 
 #include <boost/container/small_vector.hpp>
+#include <vector>
 #include "../FilamentGroup.hpp"
 #include "../FilamentMixer.hpp"
 #include "../MultiNozzleUtils.hpp"
diff --git a/src/libslic3r/GCode/WipePathHelpers.cpp b/src/libslic3r/GCode/WipePathHelpers.cpp
index d785a16a8c..2c2ef7ff74 100644
--- a/src/libslic3r/GCode/WipePathHelpers.cpp
+++ b/src/libslic3r/GCode/WipePathHelpers.cpp
@@ -1,12 +1,19 @@
 #include "WipePathHelpers.hpp"
 
 #include "../AABBTreeLines.hpp"
+#include "libslic3r/ExtrusionEntity.hpp"
+#include "libslic3r/Line.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
 
 #include <algorithm>
 #include <cassert>
 #include <cmath>
+#include <cstddef>
 #include <limits>
+#include <optional>
 #include <tuple>
+#include <utility>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/GCode/WipePathHelpers.hpp b/src/libslic3r/GCode/WipePathHelpers.hpp
index 616e5dc88b..17c0dfa238 100644
--- a/src/libslic3r/GCode/WipePathHelpers.hpp
+++ b/src/libslic3r/GCode/WipePathHelpers.hpp
@@ -5,6 +5,7 @@
 #include "../ExtrusionEntity.hpp"
 #include "../Polyline.hpp"
 #include "../Line.hpp"
+#include "libslic3r/Point.hpp"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/GCode/WipeTower.cpp b/src/libslic3r/GCode/WipeTower.cpp
index a700ada09f..cef86313ba 100644
--- a/src/libslic3r/GCode/WipeTower.cpp
+++ b/src/libslic3r/GCode/WipeTower.cpp
@@ -1,16 +1,39 @@
 #include "WipeTower.hpp"
 
+#include <algorithm>
 #include <cassert>
+#include <cstddef>
+#include <cmath>
+#include <cstdlib>
+#include <cstdio>
 #include <iostream>
+#include <map>
+#include <string>
+#include <utility>
+#include <limits>
+#include <math.h>
+#include <unordered_map>
+#include <unordered_set>
 #include <vector>
 #include <numeric>
 #include <sstream>
 #include <iomanip>
+#include "libslic3r/Circle.hpp"
+#include "libslic3r/ExtrusionEntity.hpp"
+#include "libslic3r/ArcFitter.hpp"
 #include "GCodeProcessor.hpp"
 #include "BoundingBox.hpp"
 #include "ClipperUtils.hpp"
+#include "libslic3r/Line.hpp"
 #include "LocalesUtils.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/MultiNozzleUtils.hpp"
+#include "libslic3r/TriangleMesh.hpp"
 #include "Triangulation.hpp"
+#include "libslic3r/libslic3r.h"
 
 
 namespace Slic3r
diff --git a/src/libslic3r/GCode/WipeTower.hpp b/src/libslic3r/GCode/WipeTower.hpp
index 8ea7f848ef..dd000737c7 100644
--- a/src/libslic3r/GCode/WipeTower.hpp
+++ b/src/libslic3r/GCode/WipeTower.hpp
@@ -2,16 +2,23 @@
 #define WipeTower_
 
 #include <cmath>
+#include <map>
+#include <cstddef>
+#include <math.h>
+#include <limits>
 #include <string>
 #include <sstream>
+#include <unordered_map>
 #include <utility>
 #include <algorithm>
 
+#include "libslic3r/libslic3r.h"
 #include "libslic3r/Point.hpp"
 #include "libslic3r/Polygon.hpp"
 #include "libslic3r/Polyline.hpp"
 #include "libslic3r/TriangleMesh.hpp"
 #include <unordered_set>
+#include <vector>
 #include "libslic3r/MultiNozzleUtils.hpp"
 namespace Slic3r
 {
diff --git a/src/libslic3r/GCode/WipeTower2.cpp b/src/libslic3r/GCode/WipeTower2.cpp
index a576172a39..9b92f4c26a 100644
--- a/src/libslic3r/GCode/WipeTower2.cpp
+++ b/src/libslic3r/GCode/WipeTower2.cpp
@@ -1,22 +1,44 @@
 // Orca: WipeTower2 for all non bbl printers, support all MMU device and toolchanger.
 #include "WipeTower2.hpp"
 
+#include <algorithm>
+#include <Eigen/Geometry>
 #include <cassert>
+#include <cmath>
+#include <cstdlib>
+#include <cstddef>
+#include <cstdio>
 #include <iostream>
+#include <map>
+#include <string>
+#include <math.h>
+#include <limits>
+#include <utility>
 #include <vector>
 #include <numeric>
 #include <memory>
 #include <sstream>
 #include <iomanip>
 
+#include "libslic3r/Circle.hpp"
+#include "libslic3r/ArcFitter.hpp"
 #include "ClipperUtils.hpp"
+#include "libslic3r/ExtrusionEntity.hpp"
+#include "libslic3r/GCode/WipeTower.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/Fill/FillBase.hpp"
 #include "GCodeProcessor.hpp"
 #include "BoundingBox.hpp"
+#include "libslic3r/Line.hpp"
 #include "LocalesUtils.hpp"
 #include "Geometry.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polyline.hpp"
 #include "PrintConfig.hpp"
 #include "Surface.hpp"
 #include "Fill/FillRectilinear.hpp"
+#include "libslic3r/libslic3r.h"
 
 #include <boost/algorithm/string/predicate.hpp>
 
diff --git a/src/libslic3r/GCode/WipeTower2.hpp b/src/libslic3r/GCode/WipeTower2.hpp
index 02ce15672b..408a5f6607 100644
--- a/src/libslic3r/GCode/WipeTower2.hpp
+++ b/src/libslic3r/GCode/WipeTower2.hpp
@@ -4,10 +4,14 @@
 #define WipeTower2_
 
 #include <cmath>
+#include <cstddef>
+#include <limits>
+#include <math.h>
 #include <string>
 #include <sstream>
 #include <utility>
 #include <algorithm>
+#include <vector>
 
 #include "libslic3r/Point.hpp"
 #include "libslic3r/Polygon.hpp"
diff --git a/src/libslic3r/GCode/WipeTowerEstimate.cpp b/src/libslic3r/GCode/WipeTowerEstimate.cpp
index ac1508d9c0..223850d4f0 100644
--- a/src/libslic3r/GCode/WipeTowerEstimate.cpp
+++ b/src/libslic3r/GCode/WipeTowerEstimate.cpp
@@ -1,5 +1,6 @@
 #include "WipeTowerEstimate.hpp"
 
+#include "libslic3r/Polygon.hpp"
 #include "WipeTower.hpp"
 #include "WipeTower2.hpp"
 #include "../Config.hpp"
@@ -8,7 +9,9 @@
 
 #include <algorithm>
 #include <cmath>
+#include <cstddef>
 #include <set>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/GCodeReader.cpp b/src/libslic3r/GCodeReader.cpp
index 17510800c5..10c3be600f 100644
--- a/src/libslic3r/GCodeReader.cpp
+++ b/src/libslic3r/GCodeReader.cpp
@@ -1,18 +1,30 @@
 #include "GCodeReader.hpp"
+#include <Shiny/ShinyMacros.h>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/nowide/fstream.hpp>
 #include <boost/nowide/cstdio.hpp>
+#include <cassert>
+#include <cstddef>
+#include <cstdio>
+#include <cctype>
+#include <cstdlib>
 #include <fstream>
 #include <iostream>
 #include <iomanip>
+#include "PrintConfig.hpp"
 #include "Utils.hpp"
 
 #include "LocalesUtils.hpp"
+#include "libslic3r.h"
 
 #include <Shiny/Shiny.h>
 #include <fast_float/fast_float.h>
+#include <utility>
+#include <vector>
+#include <string_view>
+#include <sstream>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/GCodeReader.hpp b/src/libslic3r/GCodeReader.hpp
index 12b9dc98e2..591fe41e6b 100644
--- a/src/libslic3r/GCodeReader.hpp
+++ b/src/libslic3r/GCodeReader.hpp
@@ -3,10 +3,14 @@
 
 #include "libslic3r.h"
 #include <cmath>
+#include <cstdint>
 #include <cstdlib>
+#include <cstring>
 #include <functional>
 #include <string>
 #include <string_view>
+#include <utility>
+#include <vector>
 #include "PrintConfig.hpp"
 
 namespace Slic3r {
diff --git a/src/libslic3r/GCodeWriter.cpp b/src/libslic3r/GCodeWriter.cpp
index 0e80cc1fb7..667271bcd1 100644
--- a/src/libslic3r/GCodeWriter.cpp
+++ b/src/libslic3r/GCodeWriter.cpp
@@ -1,16 +1,36 @@
 #include "GCodeWriter.hpp"
+#include "Config.hpp"
 #include "CustomGCode.hpp"
+#include "Extruder.hpp"
 #include "I18N.hpp"
+#include "Point.hpp"
+#include "Polygon.hpp"
 #include "PrintConfig.hpp"
 #include "ClipperUtils.hpp"
 #include "Geometry/ArcWelder.hpp"
 #include "Line.hpp"
+#include "libslic3r.h"
 #include <algorithm>
+#include <cmath>
+#include <cstddef>
+#include <cstdlib>
+#include <array>
+#include <cstdint>
+#include <charconv>
+#include <cstring>
 #include <iomanip>
 #include <iostream>
+#include <iterator>
+#include <limits>
 #include <map>
 #include <assert.h>
 #include <GCode/GCodeProcessor.hpp>
+#include <string>
+#include <vector>
+#include <utility>
+#include <sstream>
+#include <stdexcept>
+#include <math.h>
 
 #ifdef __APPLE__
     #include <boost/spirit/include/karma.hpp>
diff --git a/src/libslic3r/GCodeWriter.hpp b/src/libslic3r/GCodeWriter.hpp
index 8247ab757a..a07765a873 100644
--- a/src/libslic3r/GCodeWriter.hpp
+++ b/src/libslic3r/GCodeWriter.hpp
@@ -2,8 +2,14 @@
 #define slic3r_GCodeWriter_hpp_
 
 #include "libslic3r.h"
+#include <cstddef>
+#include <cassert>
+#include <array>
+#include <cmath>
+#include <cstring>
 #include <string>
 #include <charconv>
+#include <vector>
 #include "Extruder.hpp"
 #include "Point.hpp"
 #include "Polygon.hpp"
diff --git a/src/libslic3r/Geometry.cpp b/src/libslic3r/Geometry.cpp
index 69aff57c9a..15f6b75a55 100644
--- a/src/libslic3r/Geometry.cpp
+++ b/src/libslic3r/Geometry.cpp
@@ -1,3 +1,7 @@
+#include "Point.hpp"
+#include "Polygon.hpp"
+#include "MultiPoint.hpp"
+#include "BoundingBox.hpp"
 #include "libslic3r.h"
 #include "Exception.hpp"
 #include "Geometry.hpp"
@@ -5,13 +9,22 @@
 #include "ExPolygon.hpp"
 #include "Line.hpp"
 #include "clipper.hpp"
+#include <Eigen/Core>
+#include <Eigen/Geometry>
+#include <Eigen/SVD>
 #include <algorithm>
+#include <boost/algorithm/string/constants.hpp>
+#include <array>
 #include <cassert>
 #include <cmath>
+#include <cstddef>
+#include <cstdlib>
+#include <cstdint>
 #include <list>
 #include <map>
 #include <numeric>
 #include <set>
+#include <string>
 #include <utility>
 #include <stack>
 #include <vector>
diff --git a/src/libslic3r/Geometry.hpp b/src/libslic3r/Geometry.hpp
index e610a9ed4f..cb148e596a 100644
--- a/src/libslic3r/Geometry.hpp
+++ b/src/libslic3r/Geometry.hpp
@@ -9,7 +9,18 @@
 #include "Polyline.hpp"
 
 // Serialization through the Cereal library
+#include <cassert>
+#include <Eigen/Core>
+#include <Eigen/Geometry>
 #include <cereal/access.hpp>
+#include <cstdint>
+#include <cstddef>
+#include <cstdlib>
+#include <utility>
+#include <vector>
+#include <type_traits>
+#include <string>
+#include <cmath>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Geometry/ArcWelder.hpp b/src/libslic3r/Geometry/ArcWelder.hpp
index 184a2d6c7c..aee893fae6 100644
--- a/src/libslic3r/Geometry/ArcWelder.hpp
+++ b/src/libslic3r/Geometry/ArcWelder.hpp
@@ -1,7 +1,9 @@
 #ifndef slic3r_Geometry_ArcWelder_hpp_
 #define slic3r_Geometry_ArcWelder_hpp_
 
+#include <Eigen/Core>
 #include <assert.h>
+#include <math.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <Eigen/Geometry>
diff --git a/src/libslic3r/Geometry/Bicubic.hpp b/src/libslic3r/Geometry/Bicubic.hpp
index 98c6f8bb29..2121947e94 100644
--- a/src/libslic3r/Geometry/Bicubic.hpp
+++ b/src/libslic3r/Geometry/Bicubic.hpp
@@ -1,7 +1,9 @@
 #ifndef BICUBIC_HPP
 #define BICUBIC_HPP
 
+#include <Eigen/Core>
 #include <algorithm>
+#include <cstddef>
 #include <vector>
 #include <cmath>
 
diff --git a/src/libslic3r/Geometry/Circle.cpp b/src/libslic3r/Geometry/Circle.cpp
index 6796671954..f8dc0d273d 100644
--- a/src/libslic3r/Geometry/Circle.cpp
+++ b/src/libslic3r/Geometry/Circle.cpp
@@ -1,10 +1,19 @@
 #include "Circle.hpp"
 
 #include "../Polygon.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
 
+#include <cstddef>
+#include <iterator>
+#include <algorithm>
+#include <cstdlib>
+#include <cmath>
+#include <limits>
 #include <numeric>
 #include <random>
 #include <boost/log/trivial.hpp>
+#include <vector>
 
 namespace Slic3r { namespace Geometry {
 
diff --git a/src/libslic3r/Geometry/Circle.hpp b/src/libslic3r/Geometry/Circle.hpp
index 653102e2ab..8f8655df65 100644
--- a/src/libslic3r/Geometry/Circle.hpp
+++ b/src/libslic3r/Geometry/Circle.hpp
@@ -2,8 +2,13 @@
 #define slic3r_Geometry_Circle_hpp_
 
 #include "../Point.hpp"
+#include "libslic3r/libslic3r.h"
 
+#include <Eigen/Core>
 #include <Eigen/Geometry>
+#include <cassert>
+#include <cstddef>
+#include <utility>
 
 namespace Slic3r { namespace Geometry {
 
diff --git a/src/libslic3r/Geometry/ConvexHull.cpp b/src/libslic3r/Geometry/ConvexHull.cpp
index b8bf5eb696..80617c0caf 100644
--- a/src/libslic3r/Geometry/ConvexHull.cpp
+++ b/src/libslic3r/Geometry/ConvexHull.cpp
@@ -1,9 +1,19 @@
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polyline.hpp"
 #include "libslic3r.h"
 #include "ConvexHull.hpp"
 #include "BoundingBox.hpp"
 #include "../Geometry.hpp"
 
+#include <algorithm>
+#include <boost/multiprecision/fwd.hpp>
 #include <boost/multiprecision/integer.hpp>
+#include <cassert>
+#include <utility>
+#include <cstddef>
+#include <cstdint>
+#include <vector>
 
 namespace Slic3r { namespace Geometry {
 
diff --git a/src/libslic3r/Geometry/ConvexHull.hpp b/src/libslic3r/Geometry/ConvexHull.hpp
index eb0be4fe1f..f8bac380e8 100644
--- a/src/libslic3r/Geometry/ConvexHull.hpp
+++ b/src/libslic3r/Geometry/ConvexHull.hpp
@@ -1,9 +1,12 @@
 #ifndef slic3r_Geometry_ConvexHull_hpp_
 #define slic3r_Geometry_ConvexHull_hpp_
 
+#include <utility>
 #include <vector>
 
 #include "../Polygon.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polyline.hpp"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Geometry/Curves.hpp b/src/libslic3r/Geometry/Curves.hpp
index f4a5a0067e..e9c4bef40c 100644
--- a/src/libslic3r/Geometry/Curves.hpp
+++ b/src/libslic3r/Geometry/Curves.hpp
@@ -4,7 +4,13 @@
 #include "libslic3r/Point.hpp"
 #include "Bicubic.hpp"
 
+#include <Eigen/Core>
+#include <cstddef>
+#include <cassert>
+#include <algorithm>
 #include <iostream>
+#include <vector>
+#include <utility>
 
 //#define LSQR_DEBUG
 
diff --git a/src/libslic3r/Geometry/MedialAxis.cpp b/src/libslic3r/Geometry/MedialAxis.cpp
index 7fece75e63..9d05ec9867 100644
--- a/src/libslic3r/Geometry/MedialAxis.cpp
+++ b/src/libslic3r/Geometry/MedialAxis.cpp
@@ -5,7 +5,11 @@
 #include <boost/polygon/polygon.hpp>
 #include <cassert>
 #include <cmath>
+#include <utility>
+#include <cstddef>
 
+#include "libslic3r/Line.hpp"
+#include "libslic3r/Polyline.hpp"
 #include "VoronoiOffset.hpp"
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/ExPolygon.hpp"
diff --git a/src/libslic3r/Geometry/Voronoi.cpp b/src/libslic3r/Geometry/Voronoi.cpp
index 4f7173e5c2..7d59e2d2b8 100644
--- a/src/libslic3r/Geometry/Voronoi.cpp
+++ b/src/libslic3r/Geometry/Voronoi.cpp
@@ -2,7 +2,12 @@
 
 #include <boost/log/trivial.hpp>
 #include <cassert>
+#include <vector>
+#include <iterator>
+#include <cstddef>
 
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
 #include "libslic3r/Arachne/utils/PolygonsSegmentIndex.hpp"
 #include "libslic3r/Geometry/VoronoiUtils.hpp"
 #include "libslic3r/Geometry/VoronoiUtilsCgal.hpp"
diff --git a/src/libslic3r/Geometry/VoronoiOffset.cpp b/src/libslic3r/Geometry/VoronoiOffset.cpp
index 70c45dfb25..aeaf883c72 100644
--- a/src/libslic3r/Geometry/VoronoiOffset.cpp
+++ b/src/libslic3r/Geometry/VoronoiOffset.cpp
@@ -8,7 +8,11 @@
 #include <utility>
 #include <cassert>
 #include <cstdlib>
+#include <vector>
 
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Line.hpp"
+#include "libslic3r/Polygon.hpp"
 #include "libslic3r/Geometry.hpp"
 #include "VoronoiOffset.hpp"
 #include "libslic3r/libslic3r.h"
diff --git a/src/libslic3r/Geometry/VoronoiUtils.cpp b/src/libslic3r/Geometry/VoronoiUtils.cpp
index f140782891..d0ad07cc7e 100644
--- a/src/libslic3r/Geometry/VoronoiUtils.cpp
+++ b/src/libslic3r/Geometry/VoronoiUtils.cpp
@@ -1,4 +1,5 @@
 #include <boost/log/trivial.hpp>
+#include <iterator>
 #include <libslic3r/Arachne/utils/PolygonsSegmentIndex.hpp>
 #include <libslic3r/MultiMaterialSegmentation.hpp>
 #include <libslic3r/Geometry.hpp>
@@ -10,6 +11,10 @@
 #include <cstdlib>
 
 #include "VoronoiUtils.hpp"
+#include "libslic3r/Geometry/Voronoi.hpp"
+#include "libslic3r/Arachne/utils/PolygonsPointIndex.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
 #include "libslic3r/Exception.hpp"
 #include "libslic3r/Line.hpp"
 
diff --git a/src/libslic3r/Geometry/VoronoiUtilsCgal.cpp b/src/libslic3r/Geometry/VoronoiUtilsCgal.cpp
index 28a648851d..e1ae432f36 100644
--- a/src/libslic3r/Geometry/VoronoiUtilsCgal.cpp
+++ b/src/libslic3r/Geometry/VoronoiUtilsCgal.cpp
@@ -1,9 +1,18 @@
 // Needed since the CGAL headers are not self-contained.
+#include <CGAL/Simple_cartesian.h>
+#include <CGAL/Interval_nt.h>
+#include <CGAL/Cartesian_converter.h>
+#include <CGAL/Filtered_kernel.h>
+#include <CGAL/Kernel/Type_equality_wrapper.h>
+#include <CGAL/Filtered_predicate.h>
+#include <CGAL/enum.h>
+#include <CGAL/Kernel/global_functions_2.h>
 #include <boost/next_prior.hpp>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Arr_segment_traits_2.h>
 #include <CGAL/Surface_sweep_2_algorithms.h>
 #include <boost/variant/get.hpp>
+#include <iterator>
 #include <vector>
 #include <cassert>
 
diff --git a/src/libslic3r/Geometry/VoronoiVisualUtils.hpp b/src/libslic3r/Geometry/VoronoiVisualUtils.hpp
index c89d59bf9a..a27645c159 100644
--- a/src/libslic3r/Geometry/VoronoiVisualUtils.hpp
+++ b/src/libslic3r/Geometry/VoronoiVisualUtils.hpp
@@ -1,14 +1,26 @@
 #ifndef slic3r_VoronoiVisualUtils_hpp_
 #define slic3r_VoronoiVisualUtils_hpp_
 
+#include <cassert>
+#include <cstddef>
+#include <cstdio>
+#include <algorithm>
+#include <cmath>
 #include <stack>
 
 #include <libslic3r/Geometry.hpp>
 #include <libslic3r/Line.hpp>
 #include <libslic3r/Polygon.hpp>
 #include <libslic3r/SVG.hpp>
+#include <vector>
+#include <utility>
+#include <string>
 
+#include "libslic3r/Geometry/Voronoi.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/BoundingBox.hpp"
 #include "VoronoiOffset.hpp"
+#include "libslic3r/libslic3r.h"
 
 namespace boost { namespace polygon {
 
diff --git a/src/libslic3r/InstanceLock.cpp b/src/libslic3r/InstanceLock.cpp
index 1fa71b572a..7cacdef0cb 100644
--- a/src/libslic3r/InstanceLock.cpp
+++ b/src/libslic3r/InstanceLock.cpp
@@ -1,7 +1,11 @@
 #include "InstanceLock.hpp"
 
+#include <chrono>
+#include <exception>
 #include <map>
 #include <memory>
+#include <mutex>
+#include <string>
 #include <system_error>
 #include <thread>
 
diff --git a/src/libslic3r/IntersectionPoints.cpp b/src/libslic3r/IntersectionPoints.cpp
index 888285f834..7db77d0787 100644
--- a/src/libslic3r/IntersectionPoints.cpp
+++ b/src/libslic3r/IntersectionPoints.cpp
@@ -1,5 +1,10 @@
 #include "IntersectionPoints.hpp"
+#include <cstdint>
 #include <libslic3r/AABBTreeLines.hpp>
+#include "libslic3r/Line.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/ExPolygon.hpp"
 
 //NOTE: using CGAL SweepLines is slower !!! (example in git history)
 
diff --git a/src/libslic3r/IntersectionPoints.hpp b/src/libslic3r/IntersectionPoints.hpp
index 49694c8a8e..89b36224df 100644
--- a/src/libslic3r/IntersectionPoints.hpp
+++ b/src/libslic3r/IntersectionPoints.hpp
@@ -2,6 +2,11 @@
 #define slic3r_IntersectionPoints_hpp_
 
 #include "ExPolygon.hpp"
+#include <cstdint>
+#include "libslic3r/Point.hpp"
+#include <vector>
+#include "libslic3r/Line.hpp"
+#include "libslic3r/Polygon.hpp"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/JumpPointSearch.hpp b/src/libslic3r/JumpPointSearch.hpp
index 86eeb9ce6a..b5fbf6aaf0 100644
--- a/src/libslic3r/JumpPointSearch.hpp
+++ b/src/libslic3r/JumpPointSearch.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include "Line.hpp"
 #ifndef SRC_LIBSLIC3R_JUMPPOINTSEARCH_HPP_
 #define SRC_LIBSLIC3R_JUMPPOINTSEARCH_HPP_
 
diff --git a/src/libslic3r/KDTreeIndirect.hpp b/src/libslic3r/KDTreeIndirect.hpp
index 37c10827b1..d334a2ad64 100644
--- a/src/libslic3r/KDTreeIndirect.hpp
+++ b/src/libslic3r/KDTreeIndirect.hpp
@@ -4,10 +4,15 @@
 #define slic3r_KDTreeIndirect_hpp_
 
 #include <algorithm>
+#include <cstddef>
+#include <cassert>
+#include <array>
 #include <limits>
+#include <utility>
 #include <vector>
 
 #include "Utils.hpp" // for next_highest_power_of_2()
+#include "libslic3r.h"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/LayOnFace.cpp b/src/libslic3r/LayOnFace.cpp
index 1112f9d2fe..3cc5c2fdce 100644
--- a/src/libslic3r/LayOnFace.cpp
+++ b/src/libslic3r/LayOnFace.cpp
@@ -3,11 +3,17 @@
 #include "Geometry.hpp"
 #include "Geometry/ConvexHull.hpp"
 #include "Model.hpp"
+#include "Point.hpp"
 #include "TriangleMesh.hpp"
+#include "libslic3r.h"
 
+#include <Eigen/Geometry>
 #include <algorithm>
 #include <cmath>
+#include <cstddef>
 #include <numeric>
+#include <vector>
+#include <utility>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/LayOnFace.hpp b/src/libslic3r/LayOnFace.hpp
index 1a5e92a15e..6a9242e5c6 100644
--- a/src/libslic3r/LayOnFace.hpp
+++ b/src/libslic3r/LayOnFace.hpp
@@ -2,6 +2,7 @@
 
 #include "Point.hpp"
 
+#include <cstddef>
 #include <vector>
 
 namespace Slic3r {
diff --git a/src/libslic3r/Layer.cpp b/src/libslic3r/Layer.cpp
index 7bdef5a4ff..7f27012dc4 100644
--- a/src/libslic3r/Layer.cpp
+++ b/src/libslic3r/Layer.cpp
@@ -1,12 +1,28 @@
 #include "Layer.hpp"
 #include "ClipperUtils.hpp"
+#include "Polygon.hpp"
+#include "Point.hpp"
+#include "ExPolygon.hpp"
+#include "ExtrusionEntity.hpp"
+#include "Exception.hpp"
+#include "Flow.hpp"
 #include "Print.hpp"
 #include "Fill/Fill.hpp"
+#include "PrintConfig.hpp"
 #include "ShortestPath.hpp"
 #include "SVG.hpp"
 #include "BoundingBox.hpp"
+#include "Surface.hpp"
+#include "libslic3r.h"
+#include "Utils.hpp"
 
+#include <algorithm>
 #include <boost/log/trivial.hpp>
+#include <vector>
+#include <cstddef>
+#include <utility>
+#include <cassert>
+#include <map>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Layer.hpp b/src/libslic3r/Layer.hpp
index 9be6b86139..600e4c4062 100644
--- a/src/libslic3r/Layer.hpp
+++ b/src/libslic3r/Layer.hpp
@@ -1,12 +1,21 @@
 #ifndef slic3r_Layer_hpp_
 #define slic3r_Layer_hpp_
 
+#include "Polyline.hpp"
+#include "Polygon.hpp"
+#include "ExtrusionEntity.hpp"
+#include "Line.hpp"
 #include "libslic3r.h"
 #include "BoundingBox.hpp"
 #include "Flow.hpp"
 #include "SurfaceCollection.hpp"
 #include "ExtrusionEntityCollection.hpp"
 #include "BoundingBox.hpp"
+#include <vector>
+#include <cstddef>
+#include <algorithm>
+#include <string>
+#include <functional>
 namespace Slic3r {
 
 class ExPolygon;
diff --git a/src/libslic3r/LayerRegion.cpp b/src/libslic3r/LayerRegion.cpp
index 6f868ba095..0d69de1a8b 100644
--- a/src/libslic3r/LayerRegion.cpp
+++ b/src/libslic3r/LayerRegion.cpp
@@ -1,20 +1,44 @@
+#include "Flow.hpp"
+#include "Config.hpp"
+#include "ExPolygon.hpp"
+#include "ExtrusionEntity.hpp"
+#include "Exception.hpp"
 #include "Layer.hpp"
 #include "BridgeDetector.hpp"
 #include "ClipperUtils.hpp"
 #include "Geometry.hpp"
+#include "Line.hpp"
 #include "PerimeterGenerator.hpp"
 #include "Point.hpp"
+#include "Polygon.hpp"
+#include "Polyline.hpp"
 #include "Print.hpp"
+#include "PrintConfig.hpp"
 #include "Surface.hpp"
 #include "BoundingBox.hpp"
 #include "SVG.hpp"
 #include "Algorithm/RegionExpansion.hpp"
+#include "libslic3r.h"
+#include "Utils.hpp"
 
+#include <cmath>
+#include <array>
+#include <cstddef>
+#include <initializer_list>
+#include <algorithm>
+#include <cstdint>
+#include <optional>
+#include <iterator>
+#include <stdexcept>
+#include <math.h>
+#include <cassert>
 #include <string>
 #include <map>
 
 #include <boost/log/trivial.hpp>
 #include <boost/algorithm/clamp.hpp>
+#include <utility>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Line.cpp b/src/libslic3r/Line.cpp
index 94453e18f7..5c40e48e63 100644
--- a/src/libslic3r/Line.cpp
+++ b/src/libslic3r/Line.cpp
@@ -1,8 +1,13 @@
 #include "Geometry.hpp"
 #include "Line.hpp"
+#include "Point.hpp"
 #include "Polyline.hpp"
+#include <Eigen/Core>
+#include "libslic3r.h"
 #include <algorithm>
 #include <cmath>
+#include <cstring>
+#include <limits>
 #include <sstream>
 
 namespace Slic3r {
diff --git a/src/libslic3r/Line.hpp b/src/libslic3r/Line.hpp
index d8240702b2..f75ef7fc66 100644
--- a/src/libslic3r/Line.hpp
+++ b/src/libslic3r/Line.hpp
@@ -4,7 +4,10 @@
 #include "libslic3r.h"
 #include "Point.hpp"
 
+#include <cmath>
 #include <type_traits>
+#include <vector>
+#include <utility>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/LocalesUtils.cpp b/src/libslic3r/LocalesUtils.cpp
index 9c81511dc5..ead94faeb4 100644
--- a/src/libslic3r/LocalesUtils.cpp
+++ b/src/libslic3r/LocalesUtils.cpp
@@ -1,4 +1,10 @@
 #include "LocalesUtils.hpp"
+#include <locale.h>
+#include <cstdio>
+#include <string_view>
+#include <cstddef>
+#include <string>
+#include <ios>
 
 #ifdef _WIN32
     #include <charconv>
diff --git a/src/libslic3r/LocalesUtils.hpp b/src/libslic3r/LocalesUtils.hpp
index d7e59f5ded..c212a72e69 100644
--- a/src/libslic3r/LocalesUtils.hpp
+++ b/src/libslic3r/LocalesUtils.hpp
@@ -1,6 +1,7 @@
 #ifndef slic3r_LocalesUtils_hpp_
 #define slic3r_LocalesUtils_hpp_
 
+#include <cstddef>
 #include <string>
 #include <clocale>
 #include <iomanip>
diff --git a/src/libslic3r/MTUtils.hpp b/src/libslic3r/MTUtils.hpp
index ab99ea5f68..b1099e1439 100644
--- a/src/libslic3r/MTUtils.hpp
+++ b/src/libslic3r/MTUtils.hpp
@@ -1,7 +1,9 @@
 #ifndef MTUTILS_HPP
 #define MTUTILS_HPP
 
+#include <array>
 #include <atomic>       // for std::atomic_flag and memory orders
+#include <cstddef>
 #include <mutex>        // for std::lock_guard
 #include <functional>   // for std::function
 #include <utility>      // for std::forward
diff --git a/src/libslic3r/MaterialType.cpp b/src/libslic3r/MaterialType.cpp
index dc65b6d23c..18e27dbe46 100644
--- a/src/libslic3r/MaterialType.cpp
+++ b/src/libslic3r/MaterialType.cpp
@@ -1,6 +1,8 @@
 #include "MaterialType.hpp"
 
 #include <algorithm>
+#include <vector>
+#include <string>
 
 namespace Slic3r {
 namespace {
diff --git a/src/libslic3r/Measure.cpp b/src/libslic3r/Measure.cpp
index ad34752685..e2ef912f37 100644
--- a/src/libslic3r/Measure.cpp
+++ b/src/libslic3r/Measure.cpp
@@ -1,3 +1,5 @@
+#include "Point.hpp"
+#include "TriangleMesh.hpp"
 #include "libslic3r/libslic3r.h"
 #include "Measure.hpp"
 #include "MeasureUtils.hpp"
@@ -6,8 +8,28 @@
 #include "libslic3r/SurfaceMesh.hpp"
 
 
+#include <cstdlib>
+#include <limits>
+#include <array>
+#include <cstddef>
+#include <algorithm>
+#include <cassert>
+#include <boost/container/small_vector.hpp>
+#include <Eigen/Geometry>
+#include <cmath>
+#include <math.h>
+#include <iterator>
+#include <memory>
+#include <iostream>
+#include <Eigen/Core>
+#include <cstdint>
 #include <numeric>
+#include <optional>
+#include <set>
 #include <tbb/parallel_for.h>
+#include <tuple>
+#include <vector>
+#include <utility>
 
 #define DEBUG_EXTRACT_ALL_FEATURES_AT_ONCE 0
 
diff --git a/src/libslic3r/Measure.hpp b/src/libslic3r/Measure.hpp
index 0374c5d4aa..2980afe324 100644
--- a/src/libslic3r/Measure.hpp
+++ b/src/libslic3r/Measure.hpp
@@ -1,10 +1,17 @@
 #ifndef Slic3r_Measure_hpp_
 #define Slic3r_Measure_hpp_
 
+#include <cassert>
+#include <cstdlib>
+#include <cstddef>
 #include <optional>
 #include <memory>
+#include <utility>
+#include <tuple>
+#include <vector>
 
 #include "Point.hpp"
+#include "libslic3r.h"
 
 struct indexed_triangle_set;
 
diff --git a/src/libslic3r/MeshBoolean.cpp b/src/libslic3r/MeshBoolean.cpp
index 4d9dda0c2e..2a05378f58 100644
--- a/src/libslic3r/MeshBoolean.cpp
+++ b/src/libslic3r/MeshBoolean.cpp
@@ -3,6 +3,37 @@
 #include "libslic3r/TriangleMesh.hpp"
 #include "libslic3r/TryCatchSignal.hpp"
 #include "libslic3r/format.hpp"
+#include <Eigen/Core>
+#include <cstddef>
+#include <utility>
+#include <igl/MeshBooleanType.h>
+#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Surface_mesh/Surface_mesh.h>
+#include <string>
+#include <fstream>
+#include <array>
+#include <vector>
+#include "libslic3r/Point.hpp"
+#include <memory>
+#include <CGAL/boost/graph/graph_traits_Surface_mesh.h>
+#include <CGAL/boost/graph/helpers.h>
+#include <boost/property_map/property_map.hpp>
+#include <CGAL/Named_function_parameters.h>
+#include <exception>
+#include <optional>
+#include <CGAL/Polygon_mesh_processing/measure.h>
+#include <csignal>
+#include <CGAL/Polygon_mesh_processing/self_intersections.h>
+#include <iterator>
+#include <CGAL/Polygon_mesh_processing/triangulate_hole.h>
+#include <CGAL/Polygon_mesh_processing/stitch_borders.h>
+#include <CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h>
+#include <CGAL/Polygon_mesh_processing/repair_degeneracies.h>
+#include <CGAL/Polygon_mesh_processing/manifoldness.h>
+#include <cstdint>
+#include <map>
+#include <algorithm>
 #undef PI
 
 #include <boost/next_prior.hpp>
diff --git a/src/libslic3r/MeshBoolean.hpp b/src/libslic3r/MeshBoolean.hpp
index c307d1528b..6ced9b4646 100644
--- a/src/libslic3r/MeshBoolean.hpp
+++ b/src/libslic3r/MeshBoolean.hpp
@@ -1,9 +1,13 @@
 #ifndef libslic3r_MeshBoolean_hpp_
 #define libslic3r_MeshBoolean_hpp_
 
+#include <Eigen/Core>
+#include "libslic3r/Point.hpp"
 #include <memory>
 #include <exception>
 #include <optional>
+#include <utility>
+#include <string>
 #include <vector>
 
 #include <libslic3r/TriangleMesh.hpp>
diff --git a/src/libslic3r/MeshSplitImpl.hpp b/src/libslic3r/MeshSplitImpl.hpp
index 9fa87d2a9e..1805dc36ba 100644
--- a/src/libslic3r/MeshSplitImpl.hpp
+++ b/src/libslic3r/MeshSplitImpl.hpp
@@ -2,6 +2,15 @@
 #define MESHSPLITIMPL_HPP
 
 // Disable meaningless boost warning on MSVC
+#include <vector>
+#include "Point.hpp"
+#include <algorithm>
+#include <cstddef>
+#include <cassert>
+#include <utility>
+#include <limits>
+#include "libslic3r.h"
+#include <iterator>
 #ifdef _MSC_VER
 #pragma warning( push )
 #pragma warning( disable : 4805 )
diff --git a/src/libslic3r/MinAreaBoundingBox.cpp b/src/libslic3r/MinAreaBoundingBox.cpp
index 51fd8a45e7..ccc2eb981b 100644
--- a/src/libslic3r/MinAreaBoundingBox.cpp
+++ b/src/libslic3r/MinAreaBoundingBox.cpp
@@ -1,5 +1,12 @@
 #include "MinAreaBoundingBox.hpp"
+#include "Point.hpp"
+#include "libslic3r.h"
 
+#include <cstdint>
+#include "libnest2d/common.hpp"
+#include <cmath>
+#include <cstdlib>
+#include "libnest2d/geometry_traits.hpp"
 #include <libslic3r/ExPolygon.hpp>
 
 #if defined(_MSC_VER) && defined(__clang__)
diff --git a/src/libslic3r/MinimumSpanningTree.cpp b/src/libslic3r/MinimumSpanningTree.cpp
index 88555e70ee..0134c6b1a3 100644
--- a/src/libslic3r/MinimumSpanningTree.cpp
+++ b/src/libslic3r/MinimumSpanningTree.cpp
@@ -1,7 +1,12 @@
 #include "MinimumSpanningTree.hpp"
 
+#include <cstddef>
 #include <iterator>
 #include <algorithm>
+#include "Point.hpp"
+#include <vector>
+#include <unordered_map>
+#include <utility>
 #include "libslic3r.h"
 
 namespace Slic3r
diff --git a/src/libslic3r/Model.cpp b/src/libslic3r/Model.cpp
index fbc299cf72..24a77ce716 100644
--- a/src/libslic3r/Model.cpp
+++ b/src/libslic3r/Model.cpp
@@ -1,4 +1,21 @@
 #include "Model.hpp"
+#include "calib.hpp"
+#include "Format/STEP.hpp"
+#include "TriangleMesh.hpp"
+#include "Semver.hpp"
+#include "Format/OBJ.hpp"
+#include "Config.hpp"
+#include "Format/STL.hpp"
+#include "Format/objparser.hpp"
+#include "CustomGCode.hpp"
+#include "PrintConfig.hpp"
+#include "ObjectID.hpp"
+#include "BoundingBox.hpp"
+#include "Point.hpp"
+#include "Utils.hpp"
+#include "Polygon.hpp"
+#include "SLA/SupportPoint.hpp"
+#include "TextureDisplacement.hpp"
 #include "libslic3r.h"
 #include "BuildVolume.hpp"
 #include "TexturePainting.hpp"
@@ -23,7 +40,17 @@
 
 #include "libslic3r/Geometry/ConvexHull.hpp"
 
+#include <Eigen/Core>
 #include <algorithm>
+#include <cstddef>
+#include <cassert>
+#include <cstdlib>
+#include <ctime>
+#include <boost/filesystem/operations.hpp>
+#include <boost/lexical_cast.hpp>
+#include <exception>
+#include <cmath>
+#include <array>
 #include <float.h>
 
 #include <boost/algorithm/string/predicate.hpp>
@@ -35,6 +62,21 @@
 #include "SVG.hpp"
 #include <Eigen/Dense>
 #include <functional>
+#include <vector>
+#include <string>
+#include <map>
+#include <utility>
+#include <memory>
+#include <iterator>
+#include <limits>
+#include <sstream>
+#include <iomanip>
+#include <set>
+#include <optional>
+#include <iostream>
+#include <ios>
+#include <ostream>
+#include <initializer_list>
 #include "GCodeWriter.hpp"
 
 // BBS: for segment
diff --git a/src/libslic3r/Model.hpp b/src/libslic3r/Model.hpp
index 895ea30d09..6ef00c8587 100644
--- a/src/libslic3r/Model.hpp
+++ b/src/libslic3r/Model.hpp
@@ -1,6 +1,9 @@
 #ifndef slic3r_Model_hpp_
 #define slic3r_Model_hpp_
 
+#include "BoundingBox.hpp"
+#include "Polygon.hpp"
+#include "Semver.hpp"
 #include "libslic3r.h"
 #include "enum_bitmask.hpp"
 #include "Geometry.hpp"
@@ -30,6 +33,13 @@
 #include "Format/OBJ.hpp"
 
 #include <array>
+#include <cereal/access.hpp>
+#include <cereal/types/base_class.hpp>
+#include <cassert>
+#include <cstddef>
+#include <iterator>
+#include <initializer_list>
+#include <cereal/specialize.hpp>
 #include <map>
 #include <memory>
 #include <string>
diff --git a/src/libslic3r/ModelArrange.cpp b/src/libslic3r/ModelArrange.cpp
index 95167565aa..df95b92b99 100644
--- a/src/libslic3r/ModelArrange.cpp
+++ b/src/libslic3r/ModelArrange.cpp
@@ -1,9 +1,19 @@
 #include "ModelArrange.hpp"
 
+#include <cstddef>
+#include <algorithm>
+#include <iterator>
 #include <libslic3r/Model.hpp>
 #include <libslic3r/Geometry/ConvexHull.hpp>
 #include <libslic3r/Print.hpp>
+#include "Arrange.hpp"
+#include <utility>
+#include "Config.hpp"
+#include <set>
+#include <string>
 #include "MTUtils.hpp"
+#include "Point.hpp"
+#include "PrintConfig.hpp"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/ModelArrange.hpp b/src/libslic3r/ModelArrange.hpp
index e389eea5f0..b7a31dea8d 100644
--- a/src/libslic3r/ModelArrange.hpp
+++ b/src/libslic3r/ModelArrange.hpp
@@ -1,7 +1,13 @@
 #ifndef MODELARRANGE_HPP
 #define MODELARRANGE_HPP
 
+#include <functional>
+#include <cstddef>
 #include <libslic3r/Arrange.hpp>
+#include <vector>
+#include "Exception.hpp"
+#include <string>
+#include "Point.hpp"
 #include "libslic3r/PrintConfig.hpp"
 #include "libslic3r/Model.hpp"
 
diff --git a/src/libslic3r/MultiMaterialSegmentation.cpp b/src/libslic3r/MultiMaterialSegmentation.cpp
index 6f80f7b759..d69de2f58c 100644
--- a/src/libslic3r/MultiMaterialSegmentation.cpp
+++ b/src/libslic3r/MultiMaterialSegmentation.cpp
@@ -1,13 +1,40 @@
+#include "MultiMaterialSegmentation.hpp"
 #include "BoundingBox.hpp"
 #include "ClipperUtils.hpp"
+#include "Config.hpp"
 #include "EdgeGrid.hpp"
+#include "Geometry/VoronoiOffset.hpp"
+#include "Geometry/Voronoi.hpp"
+#include "Flow.hpp"
+#include "ExPolygon.hpp"
 #include "Layer.hpp"
+#include "Point.hpp"
+#include "Polygon.hpp"
+#include "Line.hpp"
+#include "Model.hpp"
 #include "Print.hpp"
 #include "Geometry/VoronoiVisualUtils.hpp"
 #include "Geometry/VoronoiUtils.hpp"
 #include "MutablePolygon.hpp"
+#include "Utils.hpp"
+#include "PrintConfig.hpp"
+#include "TriangleSelector.hpp"
+#include "TriangleMeshSlicer.hpp"
+#include "Surface.hpp"
 #include "format.hpp"
+#include "libslic3r.h"
 
+#include <cmath>
+#include <cstddef>
+#include <list>
+#include <cassert>
+#include <algorithm>
+#include <cstdlib>
+#include <boost/container_hash/hash.hpp>
+#include <math.h>
+#include <functional>
+#include <array>
+#include <limits>
 #include <utility>
 #include <unordered_set>
 
@@ -15,6 +42,8 @@
 #include <tbb/parallel_for.h>
 #include <mutex>
 #include <boost/thread/lock_guard.hpp>
+#include <vector>
+#include <queue>
 
 //#define MM_SEGMENTATION_DEBUG_GRAPH
 //#define MM_SEGMENTATION_DEBUG_REGIONS
diff --git a/src/libslic3r/MultiMaterialSegmentation.hpp b/src/libslic3r/MultiMaterialSegmentation.hpp
index ee7b07c0d8..8f42a006c9 100644
--- a/src/libslic3r/MultiMaterialSegmentation.hpp
+++ b/src/libslic3r/MultiMaterialSegmentation.hpp
@@ -1,9 +1,15 @@
 #ifndef slic3r_MultiMaterialSegmentation_hpp_
 #define slic3r_MultiMaterialSegmentation_hpp_
 
+#include <functional>
 #include <utility>
 #include <vector>
 
+#include <boost/polygon/polygon.hpp>
+
+#include "Line.hpp"
+#include "Point.hpp"
+
 namespace Slic3r {
 
 class ExPolygon;
diff --git a/src/libslic3r/MultiNozzleUtils.cpp b/src/libslic3r/MultiNozzleUtils.cpp
index d5ce550536..5fc3d3de17 100644
--- a/src/libslic3r/MultiNozzleUtils.cpp
+++ b/src/libslic3r/MultiNozzleUtils.cpp
@@ -1,12 +1,22 @@
 #include "MultiNozzleUtils.hpp"
+#include "PrintConfig.hpp"
+#include "Config.hpp"
 #include "Utils.hpp"
 #include "ProjectTask.hpp" // Slic3r::FilamentInfo (StaticNozzleGroupResult / load_nozzle_infos_with_compatibility)
 #include <algorithm>
+#include <cstddef>
+#include <exception>
 #include <iomanip>
+#include <map>
+#include <set>
+#include <optional>
 #include <sstream>
+#include <string>
 #include <unordered_map>
 #include <unordered_set>
 #include <boost/log/trivial.hpp>
+#include <vector>
+#include <utility>
 
 // Multi-nozzle support.
 
diff --git a/src/libslic3r/MultiNozzleUtils.hpp b/src/libslic3r/MultiNozzleUtils.hpp
index 5ae56e497d..f59dad6761 100644
--- a/src/libslic3r/MultiNozzleUtils.hpp
+++ b/src/libslic3r/MultiNozzleUtils.hpp
@@ -1,6 +1,8 @@
 #ifndef MULTI_NOZZLE_UTILS_HPP
 #define MULTI_NOZZLE_UTILS_HPP
 
+#include <string>
+#include <cstddef>
 #include <vector>
 #include <map>
 #include <optional>
diff --git a/src/libslic3r/MultiPoint.cpp b/src/libslic3r/MultiPoint.cpp
index 694d3ea9d0..cda57c6cd8 100644
--- a/src/libslic3r/MultiPoint.cpp
+++ b/src/libslic3r/MultiPoint.cpp
@@ -1,5 +1,16 @@
 #include "MultiPoint.hpp"
 #include "BoundingBox.hpp"
+#include "Point.hpp"
+#include "libslic3r.h"
+#include <cmath>
+#include "Line.hpp"
+#include <limits>
+#include <cstddef>
+#include <utility>
+#include <cassert>
+#include <vector>
+#include <cstdlib>
+#include <algorithm>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/MultiPoint.hpp b/src/libslic3r/MultiPoint.hpp
index 096230d22c..82d6d5884b 100644
--- a/src/libslic3r/MultiPoint.hpp
+++ b/src/libslic3r/MultiPoint.hpp
@@ -3,6 +3,10 @@
 
 #include "libslic3r.h"
 #include <algorithm>
+#include <utility>
+#include <initializer_list>
+#include <cmath>
+#include <cstddef>
 #include <vector>
 #include "Line.hpp"
 #include "Point.hpp"
diff --git a/src/libslic3r/MutablePolygon.cpp b/src/libslic3r/MutablePolygon.cpp
index bdc2d91376..60484dc3aa 100644
--- a/src/libslic3r/MutablePolygon.cpp
+++ b/src/libslic3r/MutablePolygon.cpp
@@ -1,6 +1,11 @@
 #include "MutablePolygon.hpp"
 #include "Line.hpp"
+#include "Point.hpp"
 #include "libslic3r.h"
+#include <cmath>
+#include <cstdint>
+#include <cassert>
+#include <utility>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/MutablePolygon.hpp b/src/libslic3r/MutablePolygon.hpp
index e4741186ff..31322583e3 100644
--- a/src/libslic3r/MutablePolygon.hpp
+++ b/src/libslic3r/MutablePolygon.hpp
@@ -4,6 +4,13 @@
 #include "Point.hpp"
 #include "Polygon.hpp"
 #include "ExPolygon.hpp"
+#include <cstdint>
+#include <cassert>
+#include <cstddef>
+#include <initializer_list>
+#include <vector>
+#include <algorithm>
+#include "libslic3r.h"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/NSVGUtils.cpp b/src/libslic3r/NSVGUtils.cpp
index e27a6738e2..9beeea310c 100644
--- a/src/libslic3r/NSVGUtils.cpp
+++ b/src/libslic3r/NSVGUtils.cpp
@@ -1,11 +1,24 @@
 #include "NSVGUtils.hpp"
 #include <array>
+#include <cassert>
 #include <charconv> // to_chars
 
 #include <boost/nowide/iostream.hpp>
 #include <boost/nowide/fstream.hpp>
+#include <nanosvg/nanosvg.h>
+#include <cstddef>
+#include <string>
+#include <memory>
+#include <sstream>
+#include <cstring>
+#include <cmath>
 #include "ClipperUtils.hpp"
 #include "Emboss.hpp" // heal for shape
+#include "Polygon.hpp"
+#include "Polyline.hpp"
+#include "EmbossShape.hpp"
+#include "Point.hpp"
+#include "libslic3r.h"
 
 namespace {    
 using namespace Slic3r; // Polygon
diff --git a/src/libslic3r/NSVGUtils.hpp b/src/libslic3r/NSVGUtils.hpp
index 8d6a3bc3ef..846c4adfb8 100644
--- a/src/libslic3r/NSVGUtils.hpp
+++ b/src/libslic3r/NSVGUtils.hpp
@@ -1,12 +1,16 @@
 #ifndef slic3r_NSVGUtils_hpp_
 #define slic3r_NSVGUtils_hpp_
 
+#include <cmath>
+#include <cstddef>
 #include <memory>
 #include <string>
 #include <sstream>
+#include "Point.hpp"
 #include "Polygon.hpp"
 #include "ExPolygon.hpp"
 #include "EmbossShape.hpp" // ExPolygonsWithIds
+#include "libslic3r.h"
 #include "nanosvg/nanosvg.h"    // load SVG file
 
 // Helper function to work with nano svg
diff --git a/src/libslic3r/NormalUtils.cpp b/src/libslic3r/NormalUtils.cpp
index 8619b749a2..1499d25f22 100644
--- a/src/libslic3r/NormalUtils.cpp
+++ b/src/libslic3r/NormalUtils.cpp
@@ -1,4 +1,9 @@
 #include "NormalUtils.hpp"
+#include "Point.hpp"
+#include <vector>
+#include <cstddef>
+#include <cmath>
+#include <math.h>
 
 using namespace Slic3r;
 
diff --git a/src/libslic3r/NormalUtils.hpp b/src/libslic3r/NormalUtils.hpp
index 8dcd0c0290..1811957381 100644
--- a/src/libslic3r/NormalUtils.hpp
+++ b/src/libslic3r/NormalUtils.hpp
@@ -3,6 +3,7 @@
 
 #include "Point.hpp"
 #include "Model.hpp"
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/ObjColorUtils.cpp b/src/libslic3r/ObjColorUtils.cpp
index 3761267401..536078a083 100644
--- a/src/libslic3r/ObjColorUtils.cpp
+++ b/src/libslic3r/ObjColorUtils.cpp
@@ -1,4 +1,6 @@
 #include "ObjColorUtils.hpp"
+#include <vector>
+#include "Color.hpp"
 
 bool obj_color_deal_algo(std::vector<Slic3r::RGBA> & input_colors,
                          std::vector<Slic3r::RGBA> & cluster_colors_from_algo,
diff --git a/src/libslic3r/ObjColorUtils.hpp b/src/libslic3r/ObjColorUtils.hpp
index b587c80848..46163c8b44 100644
--- a/src/libslic3r/ObjColorUtils.hpp
+++ b/src/libslic3r/ObjColorUtils.hpp
@@ -1,6 +1,13 @@
 #pragma once
+#include <cmath>
+#include <array>
 #include <iostream>
 #include <ctime>
+#include <opencv2/core/mat.hpp>
+#include <opencv2/core/matx.hpp>
+#include <opencv2/core.hpp>
+#include <vector>
+#include <opencv2/imgproc.hpp>
 
 #include "opencv2/opencv.hpp"
 #include "libslic3r/Color.hpp"
diff --git a/src/libslic3r/ObjectID.cpp b/src/libslic3r/ObjectID.cpp
index 7177c47fec..c8f4f5409f 100644
--- a/src/libslic3r/ObjectID.cpp
+++ b/src/libslic3r/ObjectID.cpp
@@ -1,4 +1,5 @@
 #include "ObjectID.hpp"
+#include <cstddef>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/ObjectID.hpp b/src/libslic3r/ObjectID.hpp
index 56042bbaa3..6adc1078f0 100644
--- a/src/libslic3r/ObjectID.hpp
+++ b/src/libslic3r/ObjectID.hpp
@@ -4,6 +4,7 @@
 #include <cereal/access.hpp>
 #include <cereal/types/base_class.hpp>
 #include <cstddef>
+#include <cstdint>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/OpenVDBUtils.cpp b/src/libslic3r/OpenVDBUtils.cpp
index c72607f14f..a7d28dfa4f 100644
--- a/src/libslic3r/OpenVDBUtils.cpp
+++ b/src/libslic3r/OpenVDBUtils.cpp
@@ -1,5 +1,17 @@
 #ifndef NOMINMAX
 #define NOMINMAX
+#include <cstddef>
+#include <openvdb/Types.h>
+#include <Eigen/Core>
+#include "Point.hpp"
+#include <openvdb/openvdb.h>
+#include <openvdb/math/Transform.h>
+#include <vector>
+#include "TriangleMesh.hpp"
+#include <algorithm>
+#include "libslic3r.h"
+#include <utility>
+#include <openvdb/Metadata.h>
 #endif
 #include "OpenVDBUtils.hpp"
 
diff --git a/src/libslic3r/OpenVDBUtils.hpp b/src/libslic3r/OpenVDBUtils.hpp
index f4441ba964..badd19d377 100644
--- a/src/libslic3r/OpenVDBUtils.hpp
+++ b/src/libslic3r/OpenVDBUtils.hpp
@@ -1,7 +1,10 @@
 #ifndef OPENVDBUTILS_HPP
 #define OPENVDBUTILS_HPP
 
+#include "Point.hpp"
 #include <libslic3r/TriangleMesh.hpp>
+#include <openvdb/Types.h>
+#include <openvdb/math/Transform.h>
 
 #ifdef _MSC_VER
 // Suppress warning C4146 in include/gmp.h(2177,31): unary minus operator applied to unsigned type, result still unsigned 
diff --git a/src/libslic3r/Optimize/BruteforceOptimizer.hpp b/src/libslic3r/Optimize/BruteforceOptimizer.hpp
index 2daef538e7..6aa4308f99 100644
--- a/src/libslic3r/Optimize/BruteforceOptimizer.hpp
+++ b/src/libslic3r/Optimize/BruteforceOptimizer.hpp
@@ -1,7 +1,12 @@
 #ifndef BRUTEFORCEOPTIMIZER_HPP
 #define BRUTEFORCEOPTIMIZER_HPP
 
+#include <cstddef>
+#include <array>
+#include <cmath>
+#include <functional>
 #include <libslic3r/Optimize/Optimizer.hpp>
+#include <limits>
 
 namespace Slic3r { namespace opt {
 
diff --git a/src/libslic3r/Optimize/NLoptOptimizer.hpp b/src/libslic3r/Optimize/NLoptOptimizer.hpp
index f5d3140463..6e1649f701 100644
--- a/src/libslic3r/Optimize/NLoptOptimizer.hpp
+++ b/src/libslic3r/Optimize/NLoptOptimizer.hpp
@@ -1,6 +1,12 @@
 #ifndef NLOPTOPTIMIZER_HPP
 #define NLOPTOPTIMIZER_HPP
 
+#include <type_traits>
+#include <tuple>
+#include <cstddef>
+#include <cassert>
+#include <array>
+#include <cmath>
 #ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable: 4244)
diff --git a/src/libslic3r/Optimize/Optimizer.hpp b/src/libslic3r/Optimize/Optimizer.hpp
index 8ae55c61c5..ce5bb5bad6 100644
--- a/src/libslic3r/Optimize/Optimizer.hpp
+++ b/src/libslic3r/Optimize/Optimizer.hpp
@@ -1,6 +1,7 @@
 #ifndef OPTIMIZER_HPP
 #define OPTIMIZER_HPP
 
+#include <cstddef>
 #include <utility>
 #include <tuple>
 #include <array>
diff --git a/src/libslic3r/Orient.cpp b/src/libslic3r/Orient.cpp
index 7d54048176..b72401f36b 100644
--- a/src/libslic3r/Orient.cpp
+++ b/src/libslic3r/Orient.cpp
@@ -1,10 +1,30 @@
 #include "Orient.hpp"
 #include "Geometry.hpp"
+#include <Eigen/Core>
+#include <ios>
+#include <iomanip>
+#include "TriangleMesh.hpp"
+#include "Point.hpp"
+#include <functional>
+#include <cmath>
+#include "libslic3r.h"
+#include <cstddef>
+#include <iostream>
+#include <algorithm>
+#include <cstdlib>
+#include "Model.hpp"
+#include "PrintConfig.hpp"
 #include <numeric>
 #include <ClipperUtils.hpp>
 #include <boost/geometry/index/rtree.hpp>
 #include <boost/log/trivial.hpp>
+#include <string>
+#include <sstream>
+#include <ostream>
 #include <tbb/parallel_for.h>
+#include <vector>
+#include <unordered_map>
+#include <utility>
 
 #if defined(_MSC_VER) && defined(__clang__)
 #define BOOST_NO_CXX17_HDR_STRING_VIEW
diff --git a/src/libslic3r/Orient.hpp b/src/libslic3r/Orient.hpp
index 370f23d4fb..6839665e01 100644
--- a/src/libslic3r/Orient.hpp
+++ b/src/libslic3r/Orient.hpp
@@ -1,7 +1,14 @@
 #ifndef ORIENT_HPP
 #define ORIENT_HPP
 
+#include "TriangleMesh.hpp"
+#include "Point.hpp"
+#include "PrintConfig.hpp"
 #include "libslic3r/Model.hpp"
+#include <string>
+#include <functional>
+#include <Eigen/Core>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/PNGReadWrite.cpp b/src/libslic3r/PNGReadWrite.cpp
index 9f6a8b739d..1f29de646b 100644
--- a/src/libslic3r/PNGReadWrite.cpp
+++ b/src/libslic3r/PNGReadWrite.cpp
@@ -1,5 +1,9 @@
 #include "PNGReadWrite.hpp"
 
+#include <cstdint>
+#include <csetjmp>
+#include <cstring>
+#include <cassert>
 #include <memory>
 
 #include <cstdio>
@@ -8,6 +12,8 @@
 #include <boost/format.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/nowide/cstdio.hpp>
+#include <vector>
+#include <string>
 
 namespace Slic3r { namespace png {
 
diff --git a/src/libslic3r/PNGReadWrite.hpp b/src/libslic3r/PNGReadWrite.hpp
index 9a27fed490..c2d2149e1f 100644
--- a/src/libslic3r/PNGReadWrite.hpp
+++ b/src/libslic3r/PNGReadWrite.hpp
@@ -1,6 +1,8 @@
 #ifndef PNGREAD_HPP
 #define PNGREAD_HPP
 
+#include <cstddef>
+#include <algorithm>
 #include <cstdint>
 #include <vector>
 #include <string>
diff --git a/src/libslic3r/ParameterUtils.cpp b/src/libslic3r/ParameterUtils.cpp
index 2e7b0d1d3c..f2f3669124 100644
--- a/src/libslic3r/ParameterUtils.cpp
+++ b/src/libslic3r/ParameterUtils.cpp
@@ -1,5 +1,10 @@
 #include "ParameterUtils.hpp"
+#include "PrintConfig.hpp"
 #include <cassert>
+#include <vector>
+#include <cstddef>
+#include <utility>
+#include <string>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/ParameterUtils.hpp b/src/libslic3r/ParameterUtils.hpp
index 795e7ff619..bf475c16bd 100644
--- a/src/libslic3r/ParameterUtils.hpp
+++ b/src/libslic3r/ParameterUtils.hpp
@@ -1,6 +1,8 @@
 #ifndef slic3r_Parameter_Utils_hpp_
 #define slic3r_Parameter_Utils_hpp_
 
+#include <utility>
+#include <string>
 #include <vector>
 #include <map>
 #include "PrintConfig.hpp"
diff --git a/src/libslic3r/PerimeterGenerator.cpp b/src/libslic3r/PerimeterGenerator.cpp
index 1f1f1289e5..64f3f784c0 100644
--- a/src/libslic3r/PerimeterGenerator.cpp
+++ b/src/libslic3r/PerimeterGenerator.cpp
@@ -1,22 +1,40 @@
 #include "PerimeterGenerator.hpp"
 #include "AABBTreeLines.hpp"
+#include "Arachne/utils/ExtrusionLine.hpp"
+#include "Arachne/utils/ExtrusionJunction.hpp"
 #include "BridgeDetector.hpp"
 #include "ClipperUtils.hpp"
+#include "ExPolygon.hpp"
 #include "ExtrusionEntity.hpp"
 #include "ExtrusionEntityCollection.hpp"
 #include "Feature/FuzzySkin/FuzzySkin.hpp"
+#include "Polygon.hpp"
+#include "Polyline.hpp"
+#include "Point.hpp"
+#include "Flow.hpp"
 #include "PrintConfig.hpp"
 #include "ShortestPath.hpp"
+#include "Surface.hpp"
 #include "VariableWidth.hpp"
 #include "Arachne/WallToolPaths.hpp"
 #include "Geometry/ConvexHull.hpp"
 #include "ExPolygonCollection.hpp"
 #include "Geometry.hpp"
 #include "Line.hpp"
+#include <algorithm>
 #include <cmath>
 #include <cassert>
+#include <cstddef>
+#include <limits>
+#include <iterator>
+#include <map>
+#include <unordered_map>
+#include <tuple>
 #include <unordered_set>
 #include <thread>
+#include <vector>
+#include "libslic3r.h"
+#include <utility>
 #include "libslic3r/AABBTreeLines.hpp"
 #include "Print.hpp"
 static const int overhang_sampling_number = 6;
diff --git a/src/libslic3r/PerimeterGenerator.hpp b/src/libslic3r/PerimeterGenerator.hpp
index cd49b4acdd..c4d5b06095 100644
--- a/src/libslic3r/PerimeterGenerator.hpp
+++ b/src/libslic3r/PerimeterGenerator.hpp
@@ -1,8 +1,15 @@
 #ifndef slic3r_PerimeterGenerator_hpp_
 #define slic3r_PerimeterGenerator_hpp_
 
+#include "ExtrusionEntityCollection.hpp"
+#include "Point.hpp"
+#include "Surface.hpp"
 #include "libslic3r.h"
+#include <functional>
+#include <cstddef>
+#include <boost/container_hash/hash.hpp>
 #include <optional>
+#include <utility>
 #include <vector>
 #include "Layer.hpp"
 #include "Flow.hpp"
diff --git a/src/libslic3r/PlaceholderParser.cpp b/src/libslic3r/PlaceholderParser.cpp
index 1d7abcd5de..8bddfc1f10 100644
--- a/src/libslic3r/PlaceholderParser.cpp
+++ b/src/libslic3r/PlaceholderParser.cpp
@@ -1,12 +1,52 @@
 #include "PlaceholderParser.hpp"
+#include "Config.hpp"
 #include "Exception.hpp"
 #include "Flow.hpp"
+#include "PrintConfig.hpp"
+#include "Point.hpp"
 #include "Utils.hpp"
+#include "libslic3r_version.h"
+#include <cassert>
+#include <boost/range/iterator_range_core.hpp>
+#include <cmath>
+#include <cstdlib>
+#include <boost/throw_exception.hpp>
+#include <boost/spirit/home/support/info.hpp>
+#include <algorithm>
+#include <cstdio>
+#include <boost/algorithm/string/predicate.hpp>
+#include "libslic3r.h"
+#include <boost/spirit/home/qi/numeric/real_policies.hpp>
+#include <boost/spirit/home/qi/parser.hpp>
+#include <boost/assert/source_location.hpp>
+#include <boost/spirit/home/qi/nonterminal/grammar.hpp>
+#include <boost/spirit/home/qi/nonterminal/rule.hpp>
+#include <boost/spirit/home/support/common_terminals.hpp>
+#include <boost/spirit/home/qi/auxiliary/eps.hpp>
+#include <boost/spirit/home/qi/directive/raw.hpp>
+#include <boost/spirit/home/qi/char/char.hpp>
+#include <boost/spirit/home/qi/directive/lexeme.hpp>
+#include <boost/spirit/home/qi/directive/no_skip.hpp>
+#include <boost/spirit/home/qi/numeric/real.hpp>
+#include <boost/spirit/repository/home/qi/primitive/iter_pos.hpp>
+#include <boost/spirit/repository/home/qi/directive/distinct.hpp>
+#include <boost/spirit/home/qi/copy.hpp>
+#include <boost/spirit/home/qi/action/action.hpp>
+#include <boost/spirit/home/qi/nonterminal/error_handler.hpp>
+#include <boost/spirit/home/qi/nonterminal/debug_handler.hpp>
+#include <boost/spirit/home/qi/string/symbols.hpp>
+#include <boost/spirit/home/qi/parse.hpp>
 #include <cstring>
 #include <ctime>
 #include <iomanip>
+#include <random>
+#include <set>
+#include <memory>
+#include <iterator>
 #include <sstream>
 #include <map>
+#include <vector>
+#include <utility>
 #ifdef _MSC_VER
     #include <stdlib.h>  // provides **_environ
 #else
diff --git a/src/libslic3r/PlaceholderParser.hpp b/src/libslic3r/PlaceholderParser.hpp
index e32a4de9dc..962517a252 100644
--- a/src/libslic3r/PlaceholderParser.hpp
+++ b/src/libslic3r/PlaceholderParser.hpp
@@ -1,8 +1,10 @@
 #ifndef slic3r_PlaceholderParser_hpp_
 #define slic3r_PlaceholderParser_hpp_
 
+#include "Config.hpp"
 #include "libslic3r.h"
 #include <map>
+#include <memory>
 #include <random>
 #include <set>
 #include <string>
diff --git a/src/libslic3r/Platform.cpp b/src/libslic3r/Platform.cpp
index d2ca27fa96..35a30712d9 100644
--- a/src/libslic3r/Platform.cpp
+++ b/src/libslic3r/Platform.cpp
@@ -2,6 +2,11 @@
 
 #include <boost/log/trivial.hpp>
 #include <boost/filesystem/operations.hpp>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
+#include <string>
+#include <cassert>
 
 #if defined(__APPLE__)
 #include <sys/types.h>
diff --git a/src/libslic3r/Point.cpp b/src/libslic3r/Point.cpp
index 9a2c2b14cd..e3ac888ede 100644
--- a/src/libslic3r/Point.cpp
+++ b/src/libslic3r/Point.cpp
@@ -5,7 +5,14 @@
 #include "Polyline.hpp"
 #include "Int128.hpp"
 #include "BoundingBox.hpp"
+#include <Eigen/Core>
+#include "libslic3r.h"
 #include <algorithm>
+#include <vector>
+#include <cstring>
+#include <cmath>
+#include <cstddef>
+#include <ostream>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Point.hpp b/src/libslic3r/Point.hpp
index 21e5355fc5..6b8c1a81d7 100644
--- a/src/libslic3r/Point.hpp
+++ b/src/libslic3r/Point.hpp
@@ -2,7 +2,18 @@
 #define slic3r_Point_hpp_
 
 #include "libslic3r.h"
+#include <Eigen/Core>
+#include <algorithm>
+#include <cassert>
 #include <cstddef>
+#include <cstdint>
+#include <type_traits>
+#include <iterator>
+#include <ostream>
+#include <utility>
+#include <limits>
+#include <optional>
+#include <functional>
 #include <vector>
 #include <cmath>
 #include <string>
diff --git a/src/libslic3r/Polygon.cpp b/src/libslic3r/Polygon.cpp
index 77ff30fb40..640724aac1 100644
--- a/src/libslic3r/Polygon.cpp
+++ b/src/libslic3r/Polygon.cpp
@@ -2,9 +2,22 @@
 #include "ClipperUtils.hpp"
 #include "Exception.hpp"
 #include "Polygon.hpp"
+#include "Line.hpp"
+#include "Point.hpp"
+#include "MultiPoint.hpp"
 #include "Polyline.hpp"
+#include "libslic3r.h"
 
+#include <cassert>
+#include <algorithm>
+#include <Eigen/Core>
 #include <cmath>
+#include <cstddef>
+#include <utility>
+#include <limits>
+#include <vector>
+#include <cstdint>
+#include <math.h>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Polygon.hpp b/src/libslic3r/Polygon.hpp
index 34ca214cf3..af6bc63d57 100644
--- a/src/libslic3r/Polygon.hpp
+++ b/src/libslic3r/Polygon.hpp
@@ -2,6 +2,13 @@
 #define slic3r_Polygon_hpp_
 
 #include "libslic3r.h"
+#include <initializer_list>
+#include <utility>
+#include <cstddef>
+#include <algorithm>
+#include <iterator>
+#include <cmath>
+#include <cassert>
 #include <vector>
 #include <string>
 #include "Line.hpp"
diff --git a/src/libslic3r/PolygonTrimmer.cpp b/src/libslic3r/PolygonTrimmer.cpp
index 2c4e06fc58..a9cdafc73b 100644
--- a/src/libslic3r/PolygonTrimmer.cpp
+++ b/src/libslic3r/PolygonTrimmer.cpp
@@ -1,6 +1,11 @@
 #include "PolygonTrimmer.hpp"
 #include "EdgeGrid.hpp"
 #include "Geometry.hpp"
+#include "Polygon.hpp"
+#include <cassert>
+#include "Point.hpp"
+#include "libslic3r.h"
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/PolygonTrimmer.hpp b/src/libslic3r/PolygonTrimmer.hpp
index 93e94e303f..4f0608169b 100644
--- a/src/libslic3r/PolygonTrimmer.hpp
+++ b/src/libslic3r/PolygonTrimmer.hpp
@@ -1,6 +1,7 @@
 #ifndef slic3r_PolygonTrimmer_hpp_
 #define slic3r_PolygonTrimmer_hpp_
 
+#include "Point.hpp"
 #include "libslic3r.h"
 #include <vector>
 #include <string>
diff --git a/src/libslic3r/Polyline.cpp b/src/libslic3r/Polyline.cpp
index 98a5366ecf..278522bfd9 100644
--- a/src/libslic3r/Polyline.cpp
+++ b/src/libslic3r/Polyline.cpp
@@ -1,11 +1,21 @@
+#include "ArcFitter.hpp"
 #include "BoundingBox.hpp"
 #include "Polyline.hpp"
 #include "Exception.hpp"
 #include "ExPolygon.hpp"
 #include "Line.hpp"
+#include "Point.hpp"
+#include "MultiPoint.hpp"
 #include "Polygon.hpp"
+#include <cstddef>
+#include <algorithm>
+#include <cmath>
+#include "libslic3r.h"
+#include <cassert>
 #include <iostream>
+#include <limits>
 #include <utility>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Polyline.hpp b/src/libslic3r/Polyline.hpp
index f52c3c9bbd..29c795db33 100644
--- a/src/libslic3r/Polyline.hpp
+++ b/src/libslic3r/Polyline.hpp
@@ -1,10 +1,16 @@
 #ifndef slic3r_Polyline_hpp_
 #define slic3r_Polyline_hpp_
 
+#include "Point.hpp"
 #include "libslic3r.h"
 #include "Line.hpp"
 #include "MultiPoint.hpp"
+#include <initializer_list>
+#include <cstddef>
+#include <algorithm>
+#include <iterator>
 #include <string>
+#include <utility>
 #include <vector>
 //BBS: new necessary header file
 #include "ArcFitter.hpp"
diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp
index 9ba142dd21..5c87b6b03e 100644
--- a/src/libslic3r/Preset.cpp
+++ b/src/libslic3r/Preset.cpp
@@ -1,4 +1,30 @@
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/file_status.hpp>
+#include <boost/uuid/name_generator_sha1.hpp>
+#include <boost/optional/optional.hpp>
+#include <boost/filesystem/directory.hpp>
+#include <boost/algorithm/string/trim.hpp>
+#include <boost/algorithm/string/erase.hpp>
+#include <boost/algorithm/string/case_conv.hpp>
 #include <cassert>
+#include <string>
+#include <cstddef>
+#include <iterator>
+#include <vector>
+#include <map>
+#include <utility>
+#include <cstdlib>
+#include <ostream>
+#include <system_error>
+#include <set>
+#include <exception>
+#include <cstdio>
+#include <functional>
+#include <optional>
+#include <deque>
+#include <regex>
+#include <initializer_list>
 
 #include "Config.hpp"
 #include "Exception.hpp"
@@ -7,6 +33,9 @@
 #include "AppConfig.hpp"
 #include "LocalesUtils.hpp"
 #include "ParallelResolve.hpp"
+#include "Semver.hpp"
+#include "PrintConfig.hpp"
+#include "libslic3r_version.h"
 
 #ifdef _MSC_VER
     #define WIN32_LEAN_AND_MEAN
diff --git a/src/libslic3r/Preset.hpp b/src/libslic3r/Preset.hpp
index 0134681f9f..2b1fb372af 100644
--- a/src/libslic3r/Preset.hpp
+++ b/src/libslic3r/Preset.hpp
@@ -1,7 +1,13 @@
 #ifndef slic3r_Preset_hpp_
 #define slic3r_Preset_hpp_
 
+#include <cstddef>
+#include <cassert>
+#include <cmath>
+#include <algorithm>
 #include <deque>
+#include <map>
+#include <limits>
 #include <set>
 #include <string>
 #include <unordered_map>
@@ -12,10 +18,14 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/property_tree/ptree_fwd.hpp>
+#include <vector>
+#include <utility>
 
+#include "Config.hpp"
 #include "PrintConfig.hpp"
 #include "Semver.hpp"
 #include "ProjectTask.hpp"
+#include "libslic3r.h"
 
 //BBS: change system directories
 #define PRESET_SYSTEM_DIR      "system"
diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp
index c7c31918a5..87ffa1a822 100644
--- a/src/libslic3r/PresetBundle.cpp
+++ b/src/libslic3r/PresetBundle.cpp
@@ -1,16 +1,45 @@
 #include <atomic>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/directory.hpp>
+#include <boost/uuid/uuid.hpp>
+#include <boost/optional/optional.hpp>
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/lexical_cast.hpp>
+#include <boost/algorithm/string/join.hpp>
+#include <boost/algorithm/string/case_conv.hpp>
+#include <boost/algorithm/string/replace.hpp>
+#include <boost/algorithm/string/trim.hpp>
 #include <cassert>
+#include <cctype>
 #include <chrono>
+#include <cstdio>
+#include <cstdint>
+#include <cmath>
 #include <ctime>
+#include <optional>
+#include <exception>
+#include <memory>
+#include <initializer_list>
+#include <map>
+#include <iterator>
+#include <functional>
+#include <limits>
 #include <sstream>
 
 #include "PresetBundle.hpp"
 
+#include "Config.hpp"
+#include "Exception.hpp"
+#include "AppConfig.hpp"
 #include "ParallelResolve.hpp"
+#include "Preset.hpp"
 #include "PresetCacheFormat.hpp"
 #include "PrintConfig.hpp"
 #include "PublishSettings.hpp"
 #include "FilamentMixer.hpp"
+#include "Semver.hpp"
 #include "libslic3r.h"
 #include "I18N.hpp"
 #include "Utils.hpp"
@@ -25,6 +54,11 @@
 #include <numeric>
 #include <set>
 #include <fstream>
+#include <string>
+#include <tuple>
+#include <stdexcept>
+#include <unordered_map>
+#include <system_error>
 #include <unordered_set>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/clamp.hpp>
@@ -43,6 +77,8 @@
 #include <tbb/parallel_for.h>
 #include <tbb/task_group.h>
 #include <tbb/partitioner.h>
+#include <vector>
+#include <utility>
 
 // Mark string for localization and translate.
 #define L(s) Slic3r::I18N::translate(s)
diff --git a/src/libslic3r/PresetBundle.hpp b/src/libslic3r/PresetBundle.hpp
index e09ce9dcb5..46d81a9052 100644
--- a/src/libslic3r/PresetBundle.hpp
+++ b/src/libslic3r/PresetBundle.hpp
@@ -1,16 +1,23 @@
 #ifndef slic3r_PresetBundle_hpp_
 #define slic3r_PresetBundle_hpp_
 
+#include "Config.hpp"
 #include "Preset.hpp"
 #include "PresetCacheFormat.hpp"
 #include "AppConfig.hpp"
+#include "PrintConfig.hpp"
 #include "PublishSettings.hpp"
+#include "Semver.hpp"
 #include "enum_bitmask.hpp"
 
+#include <climits>
+#include <functional>
+#include <cstddef>
 #include <memory>
 #include <map>
 #include <set>
 #include <shared_mutex>
+#include <string>
 #include <tuple>
 #include <unordered_map>
 #include <optional>
@@ -18,6 +25,8 @@
 #include <atomic>
 #include <boost/filesystem/path.hpp>
 #include <unordered_set>
+#include <vector>
+#include <utility>
 
 #define DEFAULT_USER_FOLDER_NAME "default"
 #define BUNDLE_STRUCTURE_JSON_NAME "bundle_structure.json"
diff --git a/src/libslic3r/PresetCacheFormat.cpp b/src/libslic3r/PresetCacheFormat.cpp
index a45bcb77ac..01e634a581 100644
--- a/src/libslic3r/PresetCacheFormat.cpp
+++ b/src/libslic3r/PresetCacheFormat.cpp
@@ -1,9 +1,20 @@
 #include "libslic3r/PresetCacheFormat.hpp"
 
 #include <algorithm>
+#include <cstdint>
+#include <cereal/archives/binary.hpp>
+#include <cstddef>
+#include <cereal/details/helpers.hpp>
+#include <cereal/cereal.hpp>
+#include <ios>
+#include <exception>
+#include <boost/filesystem/operations.hpp>
 #include <memory>
 #include <sstream>
 #include <stdexcept>
+#include <string>
+#include <string_view>
+#include <system_error>
 #include <utility>
 
 #include <boost/crc.hpp>
@@ -14,7 +25,12 @@
 #include <boost/nowide/fstream.hpp>
 #include <cereal/types/map.hpp>
 #include <cereal/types/set.hpp>
+#include <vector>
 
+#include "Config.hpp"
+#include "PrintConfig.hpp"
+#include "Semver.hpp"
+#include "Preset.hpp"
 #include "libslic3r/Utils.hpp"
 
 namespace Slic3r {
diff --git a/src/libslic3r/PresetCacheFormat.hpp b/src/libslic3r/PresetCacheFormat.hpp
index 52c40bea21..8ad1c5bde5 100644
--- a/src/libslic3r/PresetCacheFormat.hpp
+++ b/src/libslic3r/PresetCacheFormat.hpp
@@ -1,6 +1,7 @@
 #ifndef slic3r_PresetCacheFormat_hpp_
 #define slic3r_PresetCacheFormat_hpp_
 
+#include <cstddef>
 #include <cstdint>
 #include <string>
 #include <unordered_map>
diff --git a/src/libslic3r/PrincipalComponents2D.cpp b/src/libslic3r/PrincipalComponents2D.cpp
index 7bdf793157..6d88320286 100644
--- a/src/libslic3r/PrincipalComponents2D.cpp
+++ b/src/libslic3r/PrincipalComponents2D.cpp
@@ -1,5 +1,11 @@
 #include "PrincipalComponents2D.hpp"
 #include "Point.hpp"
+#include <tuple>
+#include <cstdlib>
+#include "Polygon.hpp"
+#include <cstddef>
+#include "libslic3r.h"
+#include <cmath>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/PrincipalComponents2D.hpp b/src/libslic3r/PrincipalComponents2D.hpp
index dc8897a7a7..adf8e77a20 100644
--- a/src/libslic3r/PrincipalComponents2D.hpp
+++ b/src/libslic3r/PrincipalComponents2D.hpp
@@ -3,7 +3,9 @@
 
 #include "AABBTreeLines.hpp"
 #include "BoundingBox.hpp"
+#include "Point.hpp"
 #include "libslic3r.h"
+#include <tuple>
 #include <vector>
 #include "Polygon.hpp"
 
diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp
index 5f5592cfce..6e11f8bc2d 100644
--- a/src/libslic3r/Print.cpp
+++ b/src/libslic3r/Print.cpp
@@ -1,3 +1,52 @@
+#include "PrintBase.hpp"
+#include <utility>
+#include <string>
+#include <mutex>
+#include <vector>
+#include "libslic3r.h"
+#include "calib.hpp"
+#include <cassert>
+#include "CustomGCode.hpp"
+#include "ObjectID.hpp"
+#include <cstddef>
+#include "Point.hpp"
+#include "Polygon.hpp"
+#include "Geometry.hpp"
+#include <map>
+#include <cmath>
+#include <Eigen/Geometry>
+#include <set>
+#include "Slicing.hpp"
+#include <cstdlib>
+#include "TriangleSelector.hpp"
+#include "GCode/AdaptivePAProcessor.hpp"
+#include <exception>
+#include <ostream>
+#include "ExPolygon.hpp"
+#include "Layer.hpp"
+#include "FilamentGroup.hpp"
+#include <memory>
+#include "FilamentGroupUtils.hpp"
+#include "MultiNozzleUtils.hpp"
+#include <chrono>
+#include <optional>
+#include "GCode/GCodeProcessor.hpp"
+#include "GCode/ThumbnailData.hpp"
+#include "ExtrusionEntity.hpp"
+#include <math.h>
+#include "CommonDefs.hpp"
+#include <ios>
+#include <iomanip>
+#include <tuple>
+#include "Surface.hpp"
+#include "Circle.hpp"
+#include "Polyline.hpp"
+#include "ArcFitter.hpp"
+#include <cstdio>
+#include <boost/filesystem/operations.hpp>
+#include <boost/thread/lock_types.hpp>
+#include <iterator>
+#include "TriangleMesh.hpp"
 #ifdef _WIN32
 // Keep this first. A header below reaches boost/regex, whose w32_regex_traits
 // needs the Win32 types declared already.
diff --git a/src/libslic3r/Print.hpp b/src/libslic3r/Print.hpp
index f185962b1e..6cbe5650c3 100644
--- a/src/libslic3r/Print.hpp
+++ b/src/libslic3r/Print.hpp
@@ -1,6 +1,14 @@
 #ifndef slic3r_Print_hpp_
 #define slic3r_Print_hpp_
 
+#include "Config.hpp"
+#include "Model.hpp"
+#include "Polygon.hpp"
+#include "Fill/FillBase.hpp"
+#include "Polyline.hpp"
+#include "ExtrusionEntity.hpp"
+#include "Geometry.hpp"
+#include "CommonDefs.hpp"
 #include "PrintBase.hpp"
 #include "Fill/FillAdaptive.hpp"
 #include "Fill/FillLightning.hpp"
@@ -9,7 +17,9 @@
 #include "ExtrusionEntityCollection.hpp"
 #include "Flow.hpp"
 #include "Point.hpp"
+#include "PrintConfig.hpp"
 #include "Slicing.hpp"
+#include "TriangleMesh.hpp"
 #include "TriangleMeshSlicer.hpp"
 #include "GCode/ToolOrdering.hpp"
 #include "GCode/WipeTower.hpp"
@@ -18,13 +28,25 @@
 #include "GCode/GCodeProcessor.hpp"
 #include "MultiMaterialSegmentation.hpp"
 #include "ObjectID.hpp"
+#include "TriangleSelector.hpp"
 #include "libslic3r.h"
 
 #include <Eigen/Geometry>
 
+#include <cstddef>
+#include <cmath>
+#include <algorithm>
 #include <functional>
+#include <memory>
+#include <map>
+#include <math.h>
+#include <optional>
 #include <set>
+#include <string>
+#include <tuple>
 #include <unordered_map>
+#include <vector>
+#include <utility>
 
 #include "calib.hpp"
 
diff --git a/src/libslic3r/PrintApply.cpp b/src/libslic3r/PrintApply.cpp
index 21e2251b65..dd39e4c344 100644
--- a/src/libslic3r/PrintApply.cpp
+++ b/src/libslic3r/PrintApply.cpp
@@ -1,10 +1,35 @@
 #include "ClipperUtils.hpp"
+#include "Geometry.hpp"
+#include "CustomGCode.hpp"
+#include "Config.hpp"
 #include "Model.hpp"
+#include "Point.hpp"
+#include "Polygon.hpp"
 #include "Print.hpp"
 #include "FilamentMixer.hpp"
+#include "Slicing.hpp"
+#include "libslic3r.h"
+#include "PrintConfig.hpp"
+#include "PrintBase.hpp"
+#include "libslic3r_version.h"
+#include "TriangleSelector.hpp"
 
+#include <algorithm>
+#include <array>
 #include <boost/log/trivial.hpp>
+#include <cassert>
 #include <cfloat>
+#include <utility>
+#include <vector>
+#include <cstddef>
+#include <initializer_list>
+#include <set>
+#include <cstdlib>
+#include <functional>
+#include <memory>
+#include <unordered_set>
+#include <unordered_map>
+#include <mutex>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/PrintBase.cpp b/src/libslic3r/PrintBase.cpp
index 4448c12c76..7b022c8c84 100644
--- a/src/libslic3r/PrintBase.cpp
+++ b/src/libslic3r/PrintBase.cpp
@@ -1,11 +1,23 @@
+#include "Config.hpp"
 #include "Exception.hpp"
 #include "PrintBase.hpp"
 
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/log/trivial.hpp>
+#include <cstddef>
+#include <string>
+#include <vector>
+#include <stdexcept>
+#include <mutex>
+#include <functional>
 
 #include "I18N.hpp"
+#include "Model.hpp"
+#include "libslic3r.h"
+#include "libslic3r_version.h"
+#include "PlaceholderParser.hpp"
 
 //! macro used to mark string used at localization,
 //! return same string
diff --git a/src/libslic3r/PrintBase.hpp b/src/libslic3r/PrintBase.hpp
index f1b158e51f..7e2b17e48f 100644
--- a/src/libslic3r/PrintBase.hpp
+++ b/src/libslic3r/PrintBase.hpp
@@ -1,8 +1,15 @@
 #ifndef slic3r_PrintBase_hpp_
 #define slic3r_PrintBase_hpp_
 
+#include "Config.hpp"
+#include "Polygon.hpp"
 #include "libslic3r.h"
+#include <exception>
+#include <cstddef>
+#include <cassert>
+#include <initializer_list>
 #include <set>
+#include <utility>
 #include <vector>
 #include <string>
 #include <functional>
diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index d4d0c90272..5a3faab8d1 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -1,13 +1,34 @@
 #include "PrintConfig.hpp"
+#include "CommonDefs.hpp"
+#include "Point.hpp"
+#include "Polygon.hpp"
 #include "PrintConfigConstants.hpp"
 #include "ClipperUtils.hpp"
 #include "Config.hpp"
 #include "FilamentMixer.hpp"
 #include "MaterialType.hpp"
 #include "I18N.hpp"
+#include "enum_bitmask.hpp"
 #include "format.hpp"
 
 #include "GCode/Thumbnails.hpp"
+#include <cstddef>
+#include <algorithm>
+#include <cassert>
+#include <map>
+#include <boost/algorithm/string/classification.hpp>
+#include <iterator>
+#include <cstdlib>
+#include "libslic3r.h"
+#include <boost/algorithm/string/predicate.hpp>
+#include <cmath>
+#include <boost/algorithm/string/constants.hpp>
+#include <limits>
+#include <memory>
+#include <boost/preprocessor/cat.hpp>
+#include <boost/preprocessor/seq/for_each.hpp>
+#include <boost/preprocessor/tuple/to_seq.hpp>
+#include <cstdint>
 #include <set>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/algorithm/string/replace.hpp>
@@ -18,6 +39,11 @@
 #include <boost/log/trivial.hpp>
 #include <boost/thread.hpp>
 #include <float.h>
+#include <string>
+#include <vector>
+#include <utility>
+#include <sstream>
+#include <unordered_map>
 
 namespace {
 std::set<std::string> SplitStringAndRemoveDuplicateElement(const std::string &str, const std::string &separator)
diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp
index 3430de96fb..80ebc5fbc7 100644
--- a/src/libslic3r/PrintConfig.hpp
+++ b/src/libslic3r/PrintConfig.hpp
@@ -16,10 +16,13 @@
 #ifndef slic3r_PrintConfig_hpp_
 #define slic3r_PrintConfig_hpp_
 
+#include "Point.hpp"
 #include "libslic3r.h"
 #include "CommonDefs.hpp"
 #include "Config.hpp"
 #include "Polygon.hpp"
+#include <boost/container_hash/hash.hpp>
+#include <algorithm>
 #include <boost/preprocessor/facilities/empty.hpp>
 #include <boost/preprocessor/punctuation/comma_if.hpp>
 #include <boost/preprocessor/seq/for_each.hpp>
@@ -27,6 +30,19 @@
 #include <boost/preprocessor/stringize.hpp>
 #include <boost/preprocessor/tuple/elem.hpp>
 #include <boost/preprocessor/tuple/to_seq.hpp>
+#include <set>
+#include <unordered_map>
+#include <string>
+#include <vector>
+#include <map>
+#include <utility>
+#include <cstddef>
+#include <cassert>
+#include <cstdint>
+#include <cereal/access.hpp>
+#include <cmath>
+#include <cereal/specialize.hpp>
+#include <stdexcept>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp
index 3b7e889472..f401e9ec96 100644
--- a/src/libslic3r/PrintObject.cpp
+++ b/src/libslic3r/PrintObject.cpp
@@ -1,6 +1,12 @@
+#include "ExPolygon.hpp"
+#include "Config.hpp"
 #include "Exception.hpp"
+#include "Line.hpp"
+#include "Flow.hpp"
 #include "Model.hpp"
 #include "Point.hpp"
+#include "Polygon.hpp"
+#include "Polyline.hpp"
 #include "Print.hpp"
 #include "BoundingBox.hpp"
 #include "ClipperUtils.hpp"
@@ -10,6 +16,7 @@
 #include "I18N.hpp"
 #include "Layer.hpp"
 #include "MutablePolygon.hpp"
+#include "PrintBase.hpp"
 #include "PrintConfig.hpp"
 #include "SLA/IndexedMesh.hpp"
 #include "Support/SupportMaterial.hpp"
@@ -19,24 +26,49 @@
 #include "Slicing.hpp"
 #include "Tesselate.hpp"
 #include "TriangleMeshSlicer.hpp"
+#include "TriangleSelector.hpp"
 #include "Utils.hpp"
 #include "Fill/FillAdaptive.hpp"
 #include "Fill/Fill.hpp"
 #include "Fill/FillLightning.hpp"
 #include "Format/STL.hpp"
+#include "clipper2/clipper.offset.h"
 #include "format.hpp"
 #include "AABBTreeIndirect.hpp"
 #include "AABBTreeLines.hpp"
+#include "libslic3r.h"
 
+#include <algorithm>
+#include <cmath>
+#include <chrono>
+#include <Shiny/ShinyMacros.h>
+#include <boost/date_time/posix_time/ptime.hpp>
+#include <boost/date_time/posix_time/posix_time_types.hpp>
+#include <array>
 #include <cstddef>
+#include <cstdlib>
+#include <cstdint>
 #include <float.h>
+#include <functional>
+#include <ios>
+#include <iomanip>
+#include <initializer_list>
 #include <iterator>
+#include <memory>
+#include <limits>
+#include <map>
+#include <math.h>
 #include <mutex>
+#include <set>
+#include <optional>
+#include <ratio>
 #include <string>
 #include <oneapi/tbb/blocked_range.h>
 #include <oneapi/tbb/concurrent_vector.h>
 #include <oneapi/tbb/parallel_for.h>
 #include <string_view>
+#include <tuple>
+#include <unordered_set>
 #include <utility>
 
 #include <boost/log/trivial.hpp>
@@ -46,6 +78,7 @@
 #include <tbb/concurrent_unordered_set.h>
 
 #include <Shiny/Shiny.h>
+#include <vector>
 
 using namespace std::literals;
 
diff --git a/src/libslic3r/PrintObjectSlice.cpp b/src/libslic3r/PrintObjectSlice.cpp
index 14bd65c9cf..43a9b703a0 100644
--- a/src/libslic3r/PrintObjectSlice.cpp
+++ b/src/libslic3r/PrintObjectSlice.cpp
@@ -1,16 +1,42 @@
+#include <algorithm>
 #include <boost/log/trivial.hpp>
 
+#include <cstddef>
+#include <functional>
+#include <cassert>
+#include <cstdlib>
+#include <memory>
+#include <math.h>
+#include <cmath>
+#include <iterator>
 #include <tbb/parallel_for.h>
+#include <vector>
+#include <utility>
 
+#include "BoundingBox.hpp"
 #include "ClipperUtils.hpp"
 #include "ElephantFootCompensation.hpp"
+#include "ExPolygon.hpp"
 #include "Exception.hpp"
+#include "Flow.hpp"
 #include "I18N.hpp"
 #include "Layer.hpp"
+#include "Model.hpp"
 #include "MultiMaterialSegmentation.hpp"
+#include "ObjectID.hpp"
+#include "Point.hpp"
+#include "Polygon.hpp"
 #include "Print.hpp"
 //BBS
+#include "PrintConfig.hpp"
+#include "PrintBase.hpp"
 #include "ShortestPath.hpp"
+#include "libslic3r.h"
+#include "TriangleMeshSlicer.hpp"
+#include "TriangleMesh.hpp"
+#include "Slicing.hpp"
+#include "Surface.hpp"
+#include "Utils.hpp"
 #include "libslic3r/Feature/Interlocking/InterlockingGenerator.hpp"
 
 //! macro used to mark string used at localization, return same string
diff --git a/src/libslic3r/PrintRegion.cpp b/src/libslic3r/PrintRegion.cpp
index 5c08de8b36..52018223ca 100644
--- a/src/libslic3r/PrintRegion.cpp
+++ b/src/libslic3r/PrintRegion.cpp
@@ -1,5 +1,13 @@
+#include "Config.hpp"
 #include "Exception.hpp"
+#include "Flow.hpp"
 #include "Print.hpp"
+#include <cstddef>
+#include "PrintConfig.hpp"
+#include "libslic3r.h"
+#include <cmath>
+#include <vector>
+#include <algorithm>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/ProjectTask.cpp b/src/libslic3r/ProjectTask.cpp
index fe5fd36a45..33be040999 100644
--- a/src/libslic3r/ProjectTask.cpp
+++ b/src/libslic3r/ProjectTask.cpp
@@ -4,6 +4,11 @@
 #include "ProjectTask.hpp"
 
 
+#include <map>
+#include <string>
+#include <sstream>
+#include <boost/none.hpp>
+#include <boost/optional/optional.hpp>
 #include <thread>
 #include <mutex>
 #include <codecvt>
diff --git a/src/libslic3r/ProjectTask.hpp b/src/libslic3r/ProjectTask.hpp
index fd9dd2db3b..47eaa37dcc 100644
--- a/src/libslic3r/ProjectTask.hpp
+++ b/src/libslic3r/ProjectTask.hpp
@@ -1,6 +1,7 @@
 #ifndef slic3r_ProjectTask_hpp_
 #define slic3r_ProjectTask_hpp_
 
+#include <functional>
 #include <map>
 #include <vector>
 #include <string>
diff --git a/src/libslic3r/PublishSettings.cpp b/src/libslic3r/PublishSettings.cpp
index 6d28cc0af3..435c8e44eb 100644
--- a/src/libslic3r/PublishSettings.cpp
+++ b/src/libslic3r/PublishSettings.cpp
@@ -1,5 +1,6 @@
 #include "PublishSettings.hpp"
 
+#include "Config.hpp"
 #include "PresetBundle.hpp"
 #include "Preset.hpp"
 #include "PrintConfig.hpp"
@@ -8,8 +9,11 @@
 #include <boost/log/trivial.hpp>
 #include <boost/algorithm/string/trim.hpp>
 
+#include <cstddef>
 #include <map>
 #include <set>
+#include <string>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/QuadricEdgeCollapse.cpp b/src/libslic3r/QuadricEdgeCollapse.cpp
index 5d0e3c17e8..27f820e453 100644
--- a/src/libslic3r/QuadricEdgeCollapse.cpp
+++ b/src/libslic3r/QuadricEdgeCollapse.cpp
@@ -1,8 +1,22 @@
 #include "QuadricEdgeCollapse.hpp"
+#include <cstddef>
+#include <algorithm>
+#include <functional>
+#include <cstdint>
+#include <array>
+#include <limits>
+#include <cmath>
+#include <cassert>
+#include <cstdlib>
+#include <iterator>
 #include <tuple>
 #include <optional>
 #include "MutablePriorityQueue.hpp"
+#include "libslic3r.h"
+#include "Point.hpp"
 #include <tbb/parallel_for.h>
+#include <vector>
+#include <utility>
 
 using namespace Slic3r;
 
diff --git a/src/libslic3r/SLA/AGGRaster.hpp b/src/libslic3r/SLA/AGGRaster.hpp
index 7c8e71c2ae..52c95eae5b 100644
--- a/src/libslic3r/SLA/AGGRaster.hpp
+++ b/src/libslic3r/SLA/AGGRaster.hpp
@@ -1,7 +1,14 @@
 #ifndef AGGRASTER_HPP
 #define AGGRASTER_HPP
 
+#include <cassert>
+#include <cstdint>
+#include <cstddef>
+#include <agg/agg_gamma_functions.h>
 #include <libslic3r/SLA/RasterBase.hpp>
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
 #include "libslic3r/ExPolygon.hpp"
 
 // For rasterizing
@@ -15,6 +22,8 @@
 #include <agg/agg_scanline_p.h>
 #include <agg/agg_rasterizer_scanline_aa.h>
 #include <agg/agg_path_storage.h>
+#include <vector>
+#include <type_traits>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/SLA/BoostAdapter.hpp b/src/libslic3r/SLA/BoostAdapter.hpp
index 13e0465b14..d5487808a7 100644
--- a/src/libslic3r/SLA/BoostAdapter.hpp
+++ b/src/libslic3r/SLA/BoostAdapter.hpp
@@ -1,10 +1,22 @@
 #ifndef SLA_BOOSTADAPTER_HPP
 #define SLA_BOOSTADAPTER_HPP
 
+#include <boost/geometry/core/tag.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/core/coordinate_type.hpp>
+#include "libslic3r/libslic3r.h"
+#include <boost/geometry/core/coordinate_system.hpp>
+#include <boost/geometry/core/cs.hpp>
+#include <boost/geometry/core/coordinate_dimension.hpp>
+#include <cstddef>
+#include <boost/geometry/core/access.hpp>
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/range/value_type.hpp>
 #include <libslic3r/Point.hpp>
 #include <libslic3r/BoundingBox.hpp>
 
 #include <boost/geometry.hpp>
+#include <vector>
 
 namespace boost {
 namespace geometry {
diff --git a/src/libslic3r/SLA/Clustering.cpp b/src/libslic3r/SLA/Clustering.cpp
index 41ff1d4f09..010ce5d6e1 100644
--- a/src/libslic3r/SLA/Clustering.cpp
+++ b/src/libslic3r/SLA/Clustering.cpp
@@ -1,8 +1,16 @@
 #include "Clustering.hpp"
 #include "boost/geometry/index/rtree.hpp"
 
+#include <boost/geometry/index/parameters.hpp>
+#include <functional>
+#include <algorithm>
+#include <iterator>
+#include <boost/geometry/index/predicates.hpp>
+#include <Eigen/Core>
 #include <libslic3r/SLA/SpatIndex.hpp>
 #include <libslic3r/SLA/BoostAdapter.hpp>
+#include <vector>
+#include <utility>
 
 namespace Slic3r { namespace sla {
 
diff --git a/src/libslic3r/SLA/Clustering.hpp b/src/libslic3r/SLA/Clustering.hpp
index 269ec28822..0f1e113b22 100644
--- a/src/libslic3r/SLA/Clustering.hpp
+++ b/src/libslic3r/SLA/Clustering.hpp
@@ -1,6 +1,11 @@
 #ifndef SLA_CLUSTERING_HPP
 #define SLA_CLUSTERING_HPP
 
+#include <functional>
+#include <Eigen/Core>
+#include <algorithm>
+#include <array>
+#include <cstddef>
 #include <vector>
 
 #include <libslic3r/Point.hpp>
diff --git a/src/libslic3r/SLA/ConcaveHull.hpp b/src/libslic3r/SLA/ConcaveHull.hpp
index dccdafd18c..5c697c2595 100644
--- a/src/libslic3r/SLA/ConcaveHull.hpp
+++ b/src/libslic3r/SLA/ConcaveHull.hpp
@@ -1,6 +1,10 @@
 #ifndef SLA_CONCAVEHULL_HPP
 #define SLA_CONCAVEHULL_HPP
 
+#include "libslic3r/Polygon.hpp"
+#include <functional>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
 #include <libslic3r/ExPolygon.hpp>
 
 namespace Slic3r {
diff --git a/src/libslic3r/SLA/Concurrency.hpp b/src/libslic3r/SLA/Concurrency.hpp
index 7299101b31..35e30d88d7 100644
--- a/src/libslic3r/SLA/Concurrency.hpp
+++ b/src/libslic3r/SLA/Concurrency.hpp
@@ -3,6 +3,8 @@
 
 // FIXME: Deprecated
 
+#include "libslic3r/Execution/Execution.hpp"
+#include <cstddef>
 #include <libslic3r/Execution/ExecutionSeq.hpp>
 #include <libslic3r/Execution/ExecutionTBB.hpp>
 
diff --git a/src/libslic3r/SLA/Hollowing.cpp b/src/libslic3r/SLA/Hollowing.cpp
index f50cdbced2..d21744a026 100644
--- a/src/libslic3r/SLA/Hollowing.cpp
+++ b/src/libslic3r/SLA/Hollowing.cpp
@@ -1,5 +1,20 @@
+#include "libslic3r/SLA/JobController.hpp"
+#include <cassert>
+#include <Eigen/Geometry>
+#include "libslic3r/libslic3r.h"
+#include <cmath>
+#include <array>
+#include "libslic3r/Point.hpp"
+#include <cstddef>
+#include <cstdlib>
+#include "libslic3r/ExPolygon.hpp"
+#include <algorithm>
+#include "libslic3r/SLA/Concurrency.hpp"
 #include <functional>
+#include <limits>
+#include <mutex>
 #include <numeric>
+#include <openvdb/openvdb.h>
 #include <optional>
 
 #include <libslic3r/OpenVDBUtils.hpp>
@@ -15,6 +30,8 @@
 
 #include <libslic3r/MTUtils.hpp>
 #include <libslic3r/I18N.hpp>
+#include <utility>
+#include <vector>
 
 //! macro used to mark string used at localization,
 //! return same string
diff --git a/src/libslic3r/SLA/Hollowing.hpp b/src/libslic3r/SLA/Hollowing.hpp
index f6beaadb24..fd06f93a34 100644
--- a/src/libslic3r/SLA/Hollowing.hpp
+++ b/src/libslic3r/SLA/Hollowing.hpp
@@ -1,9 +1,17 @@
 #ifndef SLA_HOLLOWING_HPP
 #define SLA_HOLLOWING_HPP
 
+#include "libslic3r/Point.hpp"
+#include <array>
+#include <cstddef>
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/ExPolygon.hpp"
+#include <functional>
 #include <memory>
 #include <libslic3r/TriangleMesh.hpp>
 #include <libslic3r/SLA/JobController.hpp>
+#include <utility>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/SLA/IndexedMesh.cpp b/src/libslic3r/SLA/IndexedMesh.cpp
index 65d9d90b34..d17f9497fc 100644
--- a/src/libslic3r/SLA/IndexedMesh.cpp
+++ b/src/libslic3r/SLA/IndexedMesh.cpp
@@ -1,10 +1,24 @@
 #include "IndexedMesh.hpp"
+#include "libslic3r/BoundingBox.hpp"
 #include "Concurrency.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
 
+#include <igl/Hit.h>
+#include <Eigen/Core>
+#include <cstddef>
+#include <cassert>
+#include <cmath>
+#include <algorithm>
+#include <Eigen/Geometry>
+#include <cstdlib>
+#include <functional>
 #include <libslic3r/AABBTreeIndirect.hpp>
 #include <libslic3r/TriangleMesh.hpp>
 
+#include <limits>
 #include <numeric>
+#include <vector>
 
 #ifdef SLIC3R_HOLE_RAYCASTER
 #include <libslic3r/SLA/Hollowing.hpp>
diff --git a/src/libslic3r/SLA/IndexedMesh.hpp b/src/libslic3r/SLA/IndexedMesh.hpp
index bb2dee034c..b377064115 100644
--- a/src/libslic3r/SLA/IndexedMesh.hpp
+++ b/src/libslic3r/SLA/IndexedMesh.hpp
@@ -1,6 +1,12 @@
 #ifndef SLA_INDEXEDMESH_H
 #define SLA_INDEXEDMESH_H
 
+#include <Eigen/Core>
+#include <cstddef>
+#include <limits>
+#include <cmath>
+#include <cassert>
+#include <functional>
 #include <memory>
 #include <vector>
 
diff --git a/src/libslic3r/SLA/Pad.cpp b/src/libslic3r/SLA/Pad.cpp
index 447a416341..0a4ce7ec3d 100644
--- a/src/libslic3r/SLA/Pad.cpp
+++ b/src/libslic3r/SLA/Pad.cpp
@@ -1,3 +1,5 @@
+#include <cstddef>
+#include <cmath>
 #include <libslic3r/SLA/Pad.hpp>
 #include <libslic3r/SLA/SpatIndex.hpp>
 #include <libslic3r/SLA/BoostAdapter.hpp>
@@ -6,6 +8,9 @@
 
 #include "ConcaveHull.hpp"
 
+#include "libslic3r/Point.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/TriangleMesh.hpp"
 #include "boost/log/trivial.hpp"
 #include "ClipperUtils.hpp"
 #include "Tesselate.hpp"
@@ -19,7 +24,11 @@
 #include "SVG.hpp"
 
 #include "I18N.hpp"
+#include "libslic3r/libslic3r.h"
 #include <boost/log/trivial.hpp>
+#include <utility>
+#include <vector>
+#include <string>
 
 //! macro used to mark string used at localization,
 //! return same string
diff --git a/src/libslic3r/SLA/RasterBase.cpp b/src/libslic3r/SLA/RasterBase.cpp
index 7240b198da..dadfa23e96 100644
--- a/src/libslic3r/SLA/RasterBase.cpp
+++ b/src/libslic3r/SLA/RasterBase.cpp
@@ -1,13 +1,25 @@
 #ifndef SLARASTER_CPP
 #define SLARASTER_CPP
 
+#include <cstddef>
+#include <cstdint>
+#include <algorithm>
+#include <cstdlib>
+#include <agg/agg_gamma_functions.h>
 #include <functional>
 
+#include <iterator>
+#include <ios>
 #include <libslic3r/SLA/RasterBase.hpp>
 #include <libslic3r/SLA/AGGRaster.hpp>
 
 // minz image write:
+#include <memory>
 #include <miniz.h>
+#include <vector>
+#include <utility>
+#include <ostream>
+#include <string>
 
 namespace Slic3r { namespace sla {
 
diff --git a/src/libslic3r/SLA/RasterBase.hpp b/src/libslic3r/SLA/RasterBase.hpp
index 33d39eafbd..44b7c0dccd 100644
--- a/src/libslic3r/SLA/RasterBase.hpp
+++ b/src/libslic3r/SLA/RasterBase.hpp
@@ -1,8 +1,13 @@
 #ifndef SLA_RASTERBASE_HPP
 #define SLA_RASTERBASE_HPP
 
+#include <cstddef>
+#include <functional>
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Point.hpp"
 #include <ostream>
 #include <memory>
+#include <string>
 #include <vector>
 #include <array>
 #include <utility>
diff --git a/src/libslic3r/SLA/RasterToPolygons.cpp b/src/libslic3r/SLA/RasterToPolygons.cpp
index e05a721cd8..88620831d8 100644
--- a/src/libslic3r/SLA/RasterToPolygons.cpp
+++ b/src/libslic3r/SLA/RasterToPolygons.cpp
@@ -1,9 +1,18 @@
 #include "RasterToPolygons.hpp"
 
 #include "AGGRaster.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/libslic3r.h"
 #include "libslic3r/MarchingSquares.hpp"
 #include "MTUtils.hpp"
 #include "ClipperUtils.hpp"
+#include <cstdint>
+#include <cstddef>
+#include <algorithm>
+#include <vector>
+#include <utility>
 
 namespace marchsq {
 
diff --git a/src/libslic3r/SLA/RasterToPolygons.hpp b/src/libslic3r/SLA/RasterToPolygons.hpp
index 5320887c8f..1f78865603 100644
--- a/src/libslic3r/SLA/RasterToPolygons.hpp
+++ b/src/libslic3r/SLA/RasterToPolygons.hpp
@@ -1,6 +1,7 @@
 #ifndef RASTERTOPOLYGONS_HPP
 #define RASTERTOPOLYGONS_HPP
 
+#include "libslic3r/Point.hpp"
 #include "libslic3r/ExPolygon.hpp"
 
 namespace Slic3r {
diff --git a/src/libslic3r/SLA/ReprojectPointsOnMesh.hpp b/src/libslic3r/SLA/ReprojectPointsOnMesh.hpp
index 3ad7d62b1e..881a0a0e22 100644
--- a/src/libslic3r/SLA/ReprojectPointsOnMesh.hpp
+++ b/src/libslic3r/SLA/ReprojectPointsOnMesh.hpp
@@ -7,7 +7,9 @@
 #include "IndexedMesh.hpp"
 #include "libslic3r/Model.hpp"
 
+#include <cstddef>
 #include <tbb/parallel_for.h>
+#include <vector>
 
 namespace Slic3r { namespace sla {
 
diff --git a/src/libslic3r/SLA/Rotfinder.cpp b/src/libslic3r/SLA/Rotfinder.cpp
index 196646dc9e..8134fb1d6c 100644
--- a/src/libslic3r/SLA/Rotfinder.cpp
+++ b/src/libslic3r/SLA/Rotfinder.cpp
@@ -1,3 +1,10 @@
+#include <array>
+#include <cstddef>
+#include <cmath>
+#include <cstdlib>
+#include <cstdint>
+#include <algorithm>
+#include <iterator>
 #include <limits>
 
 #include <libslic3r/SLA/Rotfinder.hpp>
@@ -8,12 +15,19 @@
 #include <libslic3r/Optimize/BruteforceOptimizer.hpp>
 #include <libslic3r/Optimize/NLoptOptimizer.hpp>
 
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Execution/Execution.hpp"
+#include "libslic3r/Model.hpp"
+#include "libslic3r/Optimize/Optimizer.hpp"
+#include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/SLAPrint.hpp"
 #include "libslic3r/PrintConfig.hpp"
 
 #include <libslic3r/Geometry.hpp>
 
 #include <thread>
+#include <vector>
 
 namespace Slic3r { namespace sla {
 
diff --git a/src/libslic3r/SLA/Rotfinder.hpp b/src/libslic3r/SLA/Rotfinder.hpp
index d632419fb3..ba0f23b310 100644
--- a/src/libslic3r/SLA/Rotfinder.hpp
+++ b/src/libslic3r/SLA/Rotfinder.hpp
@@ -5,6 +5,7 @@
 #include <array>
 
 #include <libslic3r/Point.hpp>
+#include <utility>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/SLA/SpatIndex.cpp b/src/libslic3r/SLA/SpatIndex.cpp
index d95ba55bee..3e36b4943e 100644
--- a/src/libslic3r/SLA/SpatIndex.cpp
+++ b/src/libslic3r/SLA/SpatIndex.cpp
@@ -1,7 +1,15 @@
 #include "SpatIndex.hpp"
+#include "libslic3r/BoundingBox.hpp"
 
 // for concave hull merging decisions
+#include <boost/geometry/index/parameters.hpp>
+#include <functional>
+#include <boost/geometry/index/predicates.hpp>
+#include <iterator>
+#include <cstddef>
 #include <libslic3r/SLA/BoostAdapter.hpp>
+#include <utility>
+#include <vector>
 
 #ifdef _MSC_VER
 #pragma warning(push)
diff --git a/src/libslic3r/SLA/SpatIndex.hpp b/src/libslic3r/SLA/SpatIndex.hpp
index ef059d3ae6..a35806800c 100644
--- a/src/libslic3r/SLA/SpatIndex.hpp
+++ b/src/libslic3r/SLA/SpatIndex.hpp
@@ -1,6 +1,9 @@
 #ifndef SLA_SPATINDEX_HPP
 #define SLA_SPATINDEX_HPP
 
+#include <Eigen/Core>
+#include <functional>
+#include <cstddef>
 #include <memory>
 #include <utility>
 #include <vector>
diff --git a/src/libslic3r/SLA/SupportPoint.hpp b/src/libslic3r/SLA/SupportPoint.hpp
index 71849a3643..6c2cf88075 100644
--- a/src/libslic3r/SLA/SupportPoint.hpp
+++ b/src/libslic3r/SLA/SupportPoint.hpp
@@ -1,7 +1,11 @@
 #ifndef SLA_SUPPORTPOINT_HPP
 #define SLA_SUPPORTPOINT_HPP
 
+#include <Eigen/Core>
+#include <cstdlib>
+#include "libslic3r/libslic3r.h"
 #include <libslic3r/Point.hpp>
+#include <vector>
 
 namespace Slic3r { namespace sla {
 
diff --git a/src/libslic3r/SLA/SupportPointGenerator.cpp b/src/libslic3r/SLA/SupportPointGenerator.cpp
index 7c6c8d1f6b..a1b69e15f4 100644
--- a/src/libslic3r/SLA/SupportPointGenerator.cpp
+++ b/src/libslic3r/SLA/SupportPointGenerator.cpp
@@ -1,6 +1,15 @@
 //#include "igl/random_points_on_mesh.h"
 //#include "igl/AABB.h"
 
+#include <functional>
+#include <cstddef>
+#include <cassert>
+#include <cmath>
+#include <math.h>
+#include <algorithm>
+#include <numeric>
+#include <cstdlib>
+#include <limits>
 #include <tbb/parallel_for.h>
 
 #include "SupportPointGenerator.hpp"
@@ -8,6 +17,9 @@
 #include "Concurrency.hpp"
 #include "Model.hpp"
 #include "ExPolygon.hpp"
+#include "libslic3r/SLA/IndexedMesh.hpp"
+#include "libslic3r/SLA/SupportPoint.hpp"
+#include "libslic3r/Polygon.hpp"
 #include "SVG.hpp"
 #include "Point.hpp"
 #include "ClipperUtils.hpp"
@@ -17,6 +29,9 @@
 
 #include <iostream>
 #include <random>
+#include <vector>
+#include <utility>
+#include <unordered_map>
 
 namespace Slic3r {
 namespace sla {
diff --git a/src/libslic3r/SLA/SupportPointGenerator.hpp b/src/libslic3r/SLA/SupportPointGenerator.hpp
index 17daed9f30..e48fa05335 100644
--- a/src/libslic3r/SLA/SupportPointGenerator.hpp
+++ b/src/libslic3r/SLA/SupportPointGenerator.hpp
@@ -1,6 +1,13 @@
 #ifndef SLA_SUPPORTPOINTGENERATOR_HPP
 #define SLA_SUPPORTPOINTGENERATOR_HPP
 
+#include "libslic3r/ExPolygon.hpp"
+#include <functional>
+#include "libslic3r/Polygon.hpp"
+#include <cstddef>
+#include "libslic3r/libslic3r.h"
+#include <cmath>
+#include <cstdint>
 #include <random>
 
 #include <libslic3r/SLA/SupportPoint.hpp>
@@ -11,6 +18,9 @@
 #include <libslic3r/Point.hpp>
 
 #include <boost/container/small_vector.hpp>
+#include <vector>
+#include <unordered_map>
+#include <utility>
 
 // #define SLA_SUPPORTPOINTGEN_DEBUG
 
diff --git a/src/libslic3r/SLA/SupportTree.cpp b/src/libslic3r/SLA/SupportTree.cpp
index a0f88ed608..4de28ca45b 100644
--- a/src/libslic3r/SLA/SupportTree.cpp
+++ b/src/libslic3r/SLA/SupportTree.cpp
@@ -3,6 +3,12 @@
  *
  */
 
+#include "libslic3r/TriangleMesh.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/libslic3r.h"
+#include <algorithm>
+#include <cstddef>
+#include <iterator>
 #include <numeric>
 #include <libslic3r/SLA/SupportTree.hpp>
 #include <libslic3r/SLA/SpatIndex.hpp>
@@ -18,6 +24,8 @@
 #include <libnest2d/optimizers/nlopt/subplex.hpp>
 #include <boost/log/trivial.hpp>
 #include <libslic3r/I18N.hpp>
+#include <vector>
+#include <utility>
 
 //! macro used to mark string used at localization,
 //! return same string
diff --git a/src/libslic3r/SLA/SupportTreeBuilder.cpp b/src/libslic3r/SLA/SupportTreeBuilder.cpp
index 4080c4fc3f..68a8a70eb6 100644
--- a/src/libslic3r/SLA/SupportTreeBuilder.cpp
+++ b/src/libslic3r/SLA/SupportTreeBuilder.cpp
@@ -1,5 +1,19 @@
 #ifndef NOMINMAX
 #define NOMINMAX
+#include "libslic3r/SLA/SpatIndex.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/SLA/Pad.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/MTUtils.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/TriangleMesh.hpp"
+#include <utility>
+#include <mutex>
+#include <cassert>
+#include <cstddef>
+#include <algorithm>
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/SLA/SupportTree.hpp"
 #endif
 
 #include <libslic3r/SLA/SupportTreeBuilder.hpp>
diff --git a/src/libslic3r/SLA/SupportTreeBuildsteps.cpp b/src/libslic3r/SLA/SupportTreeBuildsteps.cpp
index cff92b5b89..923d0f924f 100644
--- a/src/libslic3r/SLA/SupportTreeBuildsteps.cpp
+++ b/src/libslic3r/SLA/SupportTreeBuildsteps.cpp
@@ -1,8 +1,31 @@
+#include "libslic3r/Optimize/Optimizer.hpp"
+#include "libslic3r/SLA/SupportTree.hpp"
+#include "libslic3r/SLA/IndexedMesh.hpp"
+#include "libslic3r/SLA/SupportTreeBuilder.hpp"
+#include "libslic3r/SLA/SupportPoint.hpp"
+#include <array>
+#include <functional>
+#include <cstddef>
+#include "libslic3r/SLA/Concurrency.hpp"
+#include "libslic3r/libslic3r.h"
+#include <algorithm>
+#include <cmath>
+#include <cstdlib>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/SLA/Clustering.hpp"
+#include <Eigen/Core>
+#include <cassert>
+#include <iterator>
 #include <libslic3r/SLA/SupportTreeBuildsteps.hpp>
 
 #include <libslic3r/SLA/SpatIndex.hpp>
 #include <libslic3r/Optimize/NLoptOptimizer.hpp>
 #include <boost/log/trivial.hpp>
+#include <string>
+#include <mutex>
+#include <optional>
+#include <vector>
+#include <set>
 
 namespace Slic3r {
 namespace sla {
diff --git a/src/libslic3r/SLA/SupportTreeMesher.cpp b/src/libslic3r/SLA/SupportTreeMesher.cpp
index 17f57f4578..0732a7ab23 100644
--- a/src/libslic3r/SLA/SupportTreeMesher.cpp
+++ b/src/libslic3r/SLA/SupportTreeMesher.cpp
@@ -1,4 +1,13 @@
 #include "SupportTreeMesher.hpp"
+#include "libslic3r/libslic3r.h"
+#include <cmath>
+#include <vector>
+#include <cstddef>
+#include <cstdlib>
+#include "libslic3r/Point.hpp"
+#include <Eigen/Geometry>
+#include <cassert>
+#include "libslic3r/TriangleMesh.hpp"
 
 namespace Slic3r { namespace sla {
 
diff --git a/src/libslic3r/SLA/SupportTreeMesher.hpp b/src/libslic3r/SLA/SupportTreeMesher.hpp
index 63ccc5fce3..e914bcea36 100644
--- a/src/libslic3r/SLA/SupportTreeMesher.hpp
+++ b/src/libslic3r/SLA/SupportTreeMesher.hpp
@@ -1,10 +1,14 @@
 #ifndef SUPPORTTREEMESHER_HPP
 #define SUPPORTTREEMESHER_HPP
 
+#include "libslic3r/libslic3r.h"
 #include "libslic3r/Point.hpp"
 
 #include "libslic3r/SLA/SupportTreeBuilder.hpp"
 #include "libslic3r/TriangleMesh.hpp"
+#include <tuple>
+#include <cstddef>
+#include <Eigen/Geometry>
 //#include "libslic3r/SLA/Contour3D.hpp"
 
 namespace Slic3r { namespace sla {
diff --git a/src/libslic3r/SLAPrint.cpp b/src/libslic3r/SLAPrint.cpp
index eb37ca578c..336143c764 100644
--- a/src/libslic3r/SLAPrint.cpp
+++ b/src/libslic3r/SLAPrint.cpp
@@ -1,17 +1,42 @@
 #include "SLAPrint.hpp"
+#include "PrintConfig.hpp"
+#include "SLA/SupportTree.hpp"
+#include "SLA/Pad.hpp"
+#include "Point.hpp"
+#include "Model.hpp"
+#include "ObjectID.hpp"
+#include "Config.hpp"
+#include "PrintBase.hpp"
+#include "SLA/SupportPoint.hpp"
+#include "Polygon.hpp"
+#include "ExPolygon.hpp"
+#include "SLA/Hollowing.hpp"
 #include "SLAPrintSteps.hpp"
 
 #include "ClipperUtils.hpp"
 #include "Geometry.hpp"
 #include "MTUtils.hpp"
 #include "Thread.hpp"
+#include "libslic3r.h"
+#include "Utils.hpp"
 
+#include <mutex>
+#include <Eigen/Geometry>
+#include <cassert>
+#include <algorithm>
+#include <set>
+#include <cstddef>
+#include <array>
+#include <cmath>
+#include <exception>
 #include <unordered_set>
 #include <numeric>
 
 #include <tbb/parallel_for.h>
 #include <boost/filesystem/path.hpp>
 #include <boost/log/trivial.hpp>
+#include <vector>
+#include <utility>
 
 // #define SLAPRINT_DO_BENCHMARK
 
diff --git a/src/libslic3r/SLAPrint.hpp b/src/libslic3r/SLAPrint.hpp
index 0eaa44a754..7b863f7380 100644
--- a/src/libslic3r/SLAPrint.hpp
+++ b/src/libslic3r/SLAPrint.hpp
@@ -1,15 +1,35 @@
 #ifndef slic3r_SLAPrint_hpp_
 #define slic3r_SLAPrint_hpp_
 
+#include <cstddef>
+#include <cmath>
+#include <algorithm>
 #include <cstdint>
+#include <limits>
+#include <memory>
+#include <functional>
 #include <mutex>
+#include "ObjectID.hpp"
+#include <vector>
+#include "ExPolygon.hpp"
+#include <type_traits>
+#include "Config.hpp"
+#include <string>
+#include "Polygon.hpp"
+#include <utility>
 #include "PrintBase.hpp"
+#include "PrintConfig.hpp"
+#include "SLA/Hollowing.hpp"
+#include "SLA/JobController.hpp"
+#include "SLA/Pad.hpp"
 #include "SLA/RasterBase.hpp"
+#include "SLA/SupportPoint.hpp"
 #include "SLA/SupportTree.hpp"
 #include "Execution/ExecutionTBB.hpp"
 #include "Point.hpp"
 #include "MTUtils.hpp"
 #include "Zipper.hpp"
+#include "libslic3r.h"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/SLAPrintSteps.cpp b/src/libslic3r/SLAPrintSteps.cpp
index 04c65644d0..51c2e6ef9f 100644
--- a/src/libslic3r/SLAPrintSteps.cpp
+++ b/src/libslic3r/SLAPrintSteps.cpp
@@ -1,3 +1,13 @@
+#include <array>
+#include <string>
+#include <cstddef>
+#include <cassert>
+#include <algorithm>
+#include <cstdint>
+#include <cstdlib>
+#include <cmath>
+#include <mutex>
+#include <numeric>
 #include <unordered_set>
 
 #include <libslic3r/Exception.hpp>
@@ -18,8 +28,23 @@
 #include <libslic3r/ClipperUtils.hpp>
 
 #include <boost/log/trivial.hpp>
+#include <vector>
+#include <utility>
 
+#include "ExPolygon.hpp"
+#include "Execution/ExecutionTBB.hpp"
 #include "I18N.hpp"
+#include "SLAPrint.hpp"
+#include "Point.hpp"
+#include "libslic3r.h"
+#include "SLA/Hollowing.hpp"
+#include "TriangleMesh.hpp"
+#include "Line.hpp"
+#include "Model.hpp"
+#include "SLA/SupportPoint.hpp"
+#include "SLA/JobController.hpp"
+#include "SLA/SupportTree.hpp"
+#include "SLA/RasterBase.hpp"
 
 //! macro used to mark string used at localization,
 //! return same string
diff --git a/src/libslic3r/SLAPrintSteps.hpp b/src/libslic3r/SLAPrintSteps.hpp
index 19b64d4a98..8d1ca12179 100644
--- a/src/libslic3r/SLAPrintSteps.hpp
+++ b/src/libslic3r/SLAPrintSteps.hpp
@@ -1,12 +1,15 @@
 #ifndef SLAPRINTSTEPS_HPP
 #define SLAPRINTSTEPS_HPP
 
+#include <cstddef>
+#include "libslic3r.h"
 #include <random>
 
 #include <libslic3r/SLAPrint.hpp>
 
 #include <libslic3r/SLA/Hollowing.hpp>
 #include <libslic3r/SLA/SupportTree.hpp>
+#include <string>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/SVG.cpp b/src/libslic3r/SVG.cpp
index 9ccddcd4f2..239bcd2532 100644
--- a/src/libslic3r/SVG.cpp
+++ b/src/libslic3r/SVG.cpp
@@ -1,8 +1,28 @@
 #include "SVG.hpp"
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/exception.hpp>
+#include <cstdio>
+#include "BoundingBox.hpp"
+#include "libslic3r.h"
+#include "Line.hpp"
+#include "Point.hpp"
+#include <cmath>
+#include "ExPolygon.hpp"
+#include "Polygon.hpp"
+#include "Surface.hpp"
+#include "Polyline.hpp"
+#include "MultiPoint.hpp"
+#include <cstddef>
+#include <algorithm>
 #include <iostream>
 
 #include <boost/filesystem.hpp>
 #include <boost/nowide/cstdio.hpp>
+#include <string>
+#include <sstream>
+#include <vector>
+#include <utility>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/SVG.hpp b/src/libslic3r/SVG.hpp
index 5f57961053..51209062a6 100644
--- a/src/libslic3r/SVG.hpp
+++ b/src/libslic3r/SVG.hpp
@@ -1,12 +1,21 @@
 #ifndef slic3r_SVG_hpp_
 #define slic3r_SVG_hpp_
 
+#include "Point.hpp"
+#include "Polygon.hpp"
+#include "Polyline.hpp"
+#include "MultiPoint.hpp"
 #include "libslic3r.h"
 #include "clipper.hpp"
 #include "ExPolygon.hpp"
 #include "Line.hpp"
 #include "TriangleMesh.hpp"
 #include "Surface.hpp"
+#include <string>
+#include <cstddef>
+#include <cstdio>
+#include <vector>
+#include <utility>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Semver.cpp b/src/libslic3r/Semver.cpp
index 5d36b39f72..f052ba6bdb 100644
--- a/src/libslic3r/Semver.cpp
+++ b/src/libslic3r/Semver.cpp
@@ -1,4 +1,6 @@
+#include "Semver.hpp"
 #include "libslic3r.h"
+#include "libslic3r_version.h"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Semver.hpp b/src/libslic3r/Semver.hpp
index d3683b4eb8..7c79f404ce 100644
--- a/src/libslic3r/Semver.hpp
+++ b/src/libslic3r/Semver.hpp
@@ -1,12 +1,17 @@
 #ifndef slic3r_Semver_hpp_
 #define slic3r_Semver_hpp_
 
+#include <boost/optional/optional.hpp>
+#include <boost/none.hpp>
+#include <limits>
+#include <cstdlib>
 #include <string>
 #include <cstring>
 #include <ostream>
 #include <stdexcept>
 #include <boost/optional.hpp>
 #include <boost/format.hpp>
+#include <utility>
 
 #include "semver/semver.h"
 
diff --git a/src/libslic3r/Shape/TextShape.cpp b/src/libslic3r/Shape/TextShape.cpp
index 4f32b9d857..cc7a7d555d 100644
--- a/src/libslic3r/Shape/TextShape.cpp
+++ b/src/libslic3r/Shape/TextShape.cpp
@@ -4,13 +4,36 @@
 
 #include "TextShape.hpp"
 
+#include <map>
+#include <Standard_Handle.hxx>
+#include <TColStd_SequenceOfHAsciiString.hxx>
+#include <cstddef>
+#include <Font_SystemFont.hxx>
+#include <Font_FontAspect.hxx>
+#include <gp_Ax3.hxx>
+#include <gp.hxx>
+#include <gp_Pnt.hxx>
+#include <Graphic3d_HorizontalTextAlignment.hxx>
+#include <Graphic3d_VerticalTextAlignment.hxx>
+#include <Font_StrictLevel.hxx>
+#include <Font_TextFormatter.hxx>
+#include <NCollection_UtfIterator.hxx>
+#include <TopAbs_ShapeEnum.hxx>
+#include <Poly_Triangulation.hxx>
+#include <cstdint>
+#include <gp_Trsf.hxx>
+#include <TopAbs_Orientation.hxx>
+#include <Poly_Triangle.hxx>
 #include <string>
+#include <utility>
 #include <vector>
 
+#include "libslic3r/Point.hpp"
 #include "Standard_TypeDef.hxx"
 #include "STEPCAFControl_Reader.hxx"
 #include "BRepMesh_IncrementalMesh.hxx"
 #include "Interface_Static.hxx"
+#include "libslic3r/Utils.hpp"
 #include "XCAFDoc_DocumentTool.hxx"
 #include "XCAFDoc_ShapeTool.hxx"
 #include "XCAFApp_Application.hxx"
diff --git a/src/libslic3r/Shape/TextShape.hpp b/src/libslic3r/Shape/TextShape.hpp
index d093c2da42..28abf4d7ea 100644
--- a/src/libslic3r/Shape/TextShape.hpp
+++ b/src/libslic3r/Shape/TextShape.hpp
@@ -2,6 +2,9 @@
 #define slic3r_Text_Shape_hpp_
 
 #include "libslic3r/TriangleMesh.hpp"
+#include <vector>
+#include <string>
+#include <map>
 
 namespace Slic3r {
 class TriangleMesh;
diff --git a/src/libslic3r/ShortEdgeCollapse.cpp b/src/libslic3r/ShortEdgeCollapse.cpp
index 3397daf55c..59637b4dae 100644
--- a/src/libslic3r/ShortEdgeCollapse.cpp
+++ b/src/libslic3r/ShortEdgeCollapse.cpp
@@ -1,10 +1,14 @@
 #include "ShortEdgeCollapse.hpp"
+#include "Point.hpp"
+#include "TriangleMesh.hpp"
 #include "libslic3r/NormalUtils.hpp"
 
+#include <cstddef>
 #include <unordered_map>
 #include <unordered_set>
 #include <random>
 #include <algorithm>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/ShortEdgeCollapse.hpp b/src/libslic3r/ShortEdgeCollapse.hpp
index e6f1822c89..f62a082828 100644
--- a/src/libslic3r/ShortEdgeCollapse.hpp
+++ b/src/libslic3r/ShortEdgeCollapse.hpp
@@ -2,6 +2,7 @@
 #define SRC_LIBSLIC3R_SHORTEDGECOLLAPSE_HPP_
 
 #include "libslic3r/TriangleMesh.hpp"
+#include <cstddef>
 
 namespace Slic3r{
 
diff --git a/src/libslic3r/ShortestPath.cpp b/src/libslic3r/ShortestPath.cpp
index 08f973e20b..eba95cd61d 100644
--- a/src/libslic3r/ShortestPath.cpp
+++ b/src/libslic3r/ShortestPath.cpp
@@ -1,3 +1,18 @@
+#include "ExtrusionEntity.hpp"
+#include <vector>
+#include <utility>
+#include <cstddef>
+#include "Point.hpp"
+#include <limits>
+#include <algorithm>
+#include <memory>
+#include "ExPolygon.hpp"
+#include "BoundingBox.hpp"
+#include <Eigen/Core>
+#include "Polyline.hpp"
+#include <iterator>
+#include "Line.hpp"
+#include "libslic3r.h"
 #if 0
 	#pragma optimize("", off)
 	#undef NDEBUG
diff --git a/src/libslic3r/ShortestPath.hpp b/src/libslic3r/ShortestPath.hpp
index c7a61d99ee..a340b0b26a 100644
--- a/src/libslic3r/ShortestPath.hpp
+++ b/src/libslic3r/ShortestPath.hpp
@@ -1,10 +1,12 @@
 #ifndef slic3r_ShortestPath_hpp_
 #define slic3r_ShortestPath_hpp_
 
+#include "Polyline.hpp"
 #include "libslic3r.h"
 #include "ExtrusionEntity.hpp"
 #include "Point.hpp"
 
+#include <cstddef>
 #include <memory>
 #include <utility>
 #include <vector>
diff --git a/src/libslic3r/SlicesToTriangleMesh.cpp b/src/libslic3r/SlicesToTriangleMesh.cpp
index 3b55cf066b..a536bc0d5e 100644
--- a/src/libslic3r/SlicesToTriangleMesh.cpp
+++ b/src/libslic3r/SlicesToTriangleMesh.cpp
@@ -1,14 +1,21 @@
+#include <cstddef>
+#include <cassert>
 #include <numeric>
 
 #include "SlicesToTriangleMesh.hpp"
 
 //#include "libslic3r/MTUtils.hpp"
+#include "Polygon.hpp"
+#include "Point.hpp"
+#include "TriangleMesh.hpp"
+#include "Execution/Execution.hpp"
 #include "libslic3r/Execution/ExecutionTBB.hpp"
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/Tesselate.hpp"
 
 #include <tbb/parallel_for.h>
 #include <tbb/parallel_reduce.h>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/SlicesToTriangleMesh.hpp b/src/libslic3r/SlicesToTriangleMesh.hpp
index 57b540d9fb..f3177a7622 100644
--- a/src/libslic3r/SlicesToTriangleMesh.hpp
+++ b/src/libslic3r/SlicesToTriangleMesh.hpp
@@ -3,6 +3,7 @@
 
 #include "libslic3r/TriangleMesh.hpp"
 #include "libslic3r/ExPolygon.hpp"
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Slicing.cpp b/src/libslic3r/Slicing.cpp
index c8c37a5a79..92bdac10e3 100644
--- a/src/libslic3r/Slicing.cpp
+++ b/src/libslic3r/Slicing.cpp
@@ -1,5 +1,13 @@
+#include <algorithm>
+#include <cmath>
+#include <cstddef>
+#include <cstdlib>
 #include <limits>
+#include <vector>
+#include <utility>
+#include <math.h>
 
+#include "Point.hpp"
 #include "libslic3r.h"
 #include "Slicing.hpp"
 #include "SlicingAdaptive.hpp"
diff --git a/src/libslic3r/Slicing.hpp b/src/libslic3r/Slicing.hpp
index f735ec5518..59ae27c8dd 100644
--- a/src/libslic3r/Slicing.hpp
+++ b/src/libslic3r/Slicing.hpp
@@ -3,10 +3,12 @@
 #ifndef slic3r_Slicing_hpp_
 #define slic3r_Slicing_hpp_
 
+#include <cassert>
 #include <cstring>
 #include <map>
 #include <set>
 #include <type_traits>
+#include <utility>
 #include <vector>
 
 #include "libslic3r.h"
diff --git a/src/libslic3r/SlicingAdaptive.cpp b/src/libslic3r/SlicingAdaptive.cpp
index 30ff67bba5..65600b4005 100644
--- a/src/libslic3r/SlicingAdaptive.cpp
+++ b/src/libslic3r/SlicingAdaptive.cpp
@@ -3,8 +3,14 @@
 #include "TriangleMesh.hpp"
 #include "SlicingAdaptive.hpp"
 
+#include <algorithm>
 #include <boost/log/trivial.hpp>
+#include <cassert>
 #include <cfloat>
+#include <cmath>
+#include <utility>
+#include <cstdlib>
+#include <cstddef>
 
 // Based on the work of Florens Waserfall (@platch on github)
 // and his paper
diff --git a/src/libslic3r/SlicingAdaptive.hpp b/src/libslic3r/SlicingAdaptive.hpp
index a296553d62..99479bb8b6 100644
--- a/src/libslic3r/SlicingAdaptive.hpp
+++ b/src/libslic3r/SlicingAdaptive.hpp
@@ -5,6 +5,9 @@
 
 #include "Slicing.hpp"
 #include "admesh/stl.h"
+#include <cstddef>
+#include <utility>
+#include <vector>
 
 namespace Slic3r
 {
diff --git a/src/libslic3r/StreamUtils.hpp b/src/libslic3r/StreamUtils.hpp
index 78a9ac7335..d3c6823a8f 100644
--- a/src/libslic3r/StreamUtils.hpp
+++ b/src/libslic3r/StreamUtils.hpp
@@ -6,6 +6,7 @@
 #include "Polygon.hpp"
 #include "Polyline.hpp"
 #include "ExPolygon.hpp"
+#include <ostream>
 #include <sstream>
 #include <vector>
 
diff --git a/src/libslic3r/Support/SupportCommon.cpp b/src/libslic3r/Support/SupportCommon.cpp
index e734608803..48fc4b50e9 100644
--- a/src/libslic3r/Support/SupportCommon.cpp
+++ b/src/libslic3r/Support/SupportCommon.cpp
@@ -7,6 +7,13 @@
 #include "../MutablePolygon.hpp"
 #include "../Geometry.hpp"
 #include "../Point.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Slicing.hpp"
+#include "libslic3r/ExtrusionEntity.hpp"
+#include "libslic3r/Surface.hpp"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/Utils.hpp"
 #include "clipper/clipper_z.hpp"
 
 #include <cmath>
@@ -14,11 +21,20 @@
 #include <boost/log/trivial.hpp>
 
 #include <algorithm>
+#include <cstddef>
+#include <limits>
+#include <memory>
+#include <math.h>
+#include <initializer_list>
 #include <tbb/parallel_for.h>
+#include <utility>
+#include <vector>
+#include <unordered_map>
 
 #include "SupportCommon.hpp"
 #include "SupportLayer.hpp"
 #include "SupportParameters.hpp"
+#include "libslic3r/libslic3r.h"
 
 // #define SLIC3R_DEBUG
 
diff --git a/src/libslic3r/Support/SupportCommon.hpp b/src/libslic3r/Support/SupportCommon.hpp
index 531daaa0a8..e6f5b3e1ef 100644
--- a/src/libslic3r/Support/SupportCommon.hpp
+++ b/src/libslic3r/Support/SupportCommon.hpp
@@ -4,8 +4,16 @@
 #include "../Layer.hpp"
 #include "../Polygon.hpp"
 #include "../Print.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Slicing.hpp"
+#include "libslic3r/ExtrusionEntity.hpp"
+#include "libslic3r/Flow.hpp"
+#include "libslic3r/Fill/FillBase.hpp"
 #include "SupportLayer.hpp"
 #include "SupportParameters.hpp"
+#include <utility>
+#include <algorithm>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Support/SupportLayer.hpp b/src/libslic3r/Support/SupportLayer.hpp
index 64e3be99e7..46b41df35a 100644
--- a/src/libslic3r/Support/SupportLayer.hpp
+++ b/src/libslic3r/Support/SupportLayer.hpp
@@ -1,8 +1,12 @@
 #ifndef slic3r_SupportLayer_hpp_
 #define slic3r_SupportLayer_hpp_
 
+#include <memory>
+#include <cstddef>
 #include <oneapi/tbb/scalable_allocator.h>
 #include <oneapi/tbb/spin_mutex.h>
+#include <utility>
+#include <vector>
 // for Slic3r::deque
 #include "../libslic3r.h"
 #include "../ClipperUtils.hpp"
diff --git a/src/libslic3r/Support/SupportMaterial.cpp b/src/libslic3r/Support/SupportMaterial.cpp
index a955eb5ca7..30a5063211 100644
--- a/src/libslic3r/Support/SupportMaterial.cpp
+++ b/src/libslic3r/Support/SupportMaterial.cpp
@@ -1,22 +1,48 @@
 #include "ClipperUtils.hpp"
+#include "libslic3r/ExPolygon.hpp"
 #include "ExtrusionEntity.hpp"
 #include "ExtrusionEntityCollection.hpp"
+#include "libslic3r/Flow.hpp"
 #include "Layer.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Polyline.hpp"
 #include "Print.hpp"
 #include "SupportMaterial.hpp"
+#include "libslic3r/Slicing.hpp"
+#include "libslic3r/Support/SupportLayer.hpp"
+#include "libslic3r/PrintConfig.hpp"
 #include "SupportCommon.hpp"
 #include "Geometry.hpp"
 #include "Point.hpp"
 #include "MutablePolygon.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Surface.hpp"
+#include "libslic3r/TriangleSelector.hpp"
 
+#include <agg/agg_rendering_buffer.h>
+#include <agg/agg_renderer_base.h>
+#include <algorithm>
+#include <cfloat>
 #include <cmath>
+#include <iterator>
+#include <cstdint>
+#include <cstddef>
+#include <deque>
+#include <initializer_list>
+#include <limits>
+#include <map>
 #include <memory>
 #include <boost/log/trivial.hpp>
 #include <boost/container/static_vector.hpp>
 
+#include <set>
+#include <numeric>
 #include <tbb/parallel_for.h>
 #include <tbb/spin_mutex.h>
 #include <tbb/task_group.h>
+#include <vector>
+#include <utility>
+#include <tuple>
 
 #define SUPPORT_USE_AGG_RASTERIZER
 
diff --git a/src/libslic3r/Support/SupportParameters.hpp b/src/libslic3r/Support/SupportParameters.hpp
index e9151c0c95..98ae39a02e 100644
--- a/src/libslic3r/Support/SupportParameters.hpp
+++ b/src/libslic3r/Support/SupportParameters.hpp
@@ -4,6 +4,8 @@
 #include <boost/log/trivial.hpp>
 #include "../libslic3r.h"
 #include "../Flow.hpp"
+#include "../Layer.hpp"
+#include "../Print.hpp"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Support/SupportSpotsGenerator.cpp b/src/libslic3r/Support/SupportSpotsGenerator.cpp
index 6fb4908e67..a3c312ee15 100644
--- a/src/libslic3r/Support/SupportSpotsGenerator.cpp
+++ b/src/libslic3r/Support/SupportSpotsGenerator.cpp
@@ -4,6 +4,7 @@
 #include "ExPolygon.hpp"
 #include "ExtrusionEntity.hpp"
 #include "ExtrusionEntityCollection.hpp"
+#include "libslic3r/Flow.hpp"
 #include "GCode/ExtrusionProcessor.hpp"
 #include "Line.hpp"
 #include "Point.hpp"
@@ -20,6 +21,7 @@
 #include "tbb/parallel_reduce.h"
 #include <algorithm>
 #include <boost/log/trivial.hpp>
+#include <cassert>
 #include <cmath>
 #include <cstddef>
 #include <cstdio>
diff --git a/src/libslic3r/Support/SupportSpotsGenerator.hpp b/src/libslic3r/Support/SupportSpotsGenerator.hpp
index 615158dabb..e3c3245d47 100644
--- a/src/libslic3r/Support/SupportSpotsGenerator.hpp
+++ b/src/libslic3r/Support/SupportSpotsGenerator.hpp
@@ -8,6 +8,8 @@
 #include "MaterialType.hpp"
 #include <boost/log/trivial.hpp>
 #include <cstddef>
+#include <string>
+#include <utility>
 #include <vector>
 
 
diff --git a/src/libslic3r/Support/TreeSupport.cpp b/src/libslic3r/Support/TreeSupport.cpp
index 519b6e826e..a59b6a7816 100644
--- a/src/libslic3r/Support/TreeSupport.cpp
+++ b/src/libslic3r/Support/TreeSupport.cpp
@@ -1,6 +1,31 @@
+#include <boost/date_time/posix_time/ptime.hpp>
+#include <boost/date_time/posix_time/posix_time_types.hpp>
+#include <cassert>
 #include <chrono>
+#include <cstddef>
+#include <cstdint>
+#include <limits>
+#include <map>
+#include <list>
+#include <cstdlib>
+#include <cmath>
+#include <deque>
+#include <iterator>
 #include <math.h>
 
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Surface.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/Line.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Geometry.hpp"
+#include "libslic3r/TriangleSelector.hpp"
+#include "libslic3r/ExtrusionEntity.hpp"
+#include "libslic3r/Flow.hpp"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/Support/SupportParameters.hpp"
+#include "libslic3r/Utils.hpp"
 #include "format.hpp"
 #include "ClipperUtils.hpp"
 #include "Fill/FillBase.hpp"
@@ -14,10 +39,17 @@
 #include "TreeSupportCommon.hpp"
 #include "TreeSupport.hpp"
 #include "TreeSupport3D.hpp"
+#include "libslic3r/libslic3r.h"
 #include <libnest2d/backends/libslic3r/geometries.hpp>
 #include <libnest2d/placers/nfpplacer.hpp>
 
 
+#include <string>
+#include <sstream>
+#include <ratio>
+#include <memory>
+#include <set>
+#include <mutex>
 #include <tbb/blocked_range.h>
 #include <tbb/concurrent_unordered_set.h>
 #include <tbb/concurrent_vector.h>
@@ -26,6 +58,11 @@
 
 #include <boost/log/trivial.hpp>
 #include <algorithm>
+#include <vector>
+#include <unordered_set>
+#include <utility>
+#include <tuple>
+#include <unordered_map>
 
 #ifndef M_PI
 #define M_PI 3.1415926535897932384626433832795
diff --git a/src/libslic3r/Support/TreeSupport.hpp b/src/libslic3r/Support/TreeSupport.hpp
index bd5a154e26..e0da1f40c7 100644
--- a/src/libslic3r/Support/TreeSupport.hpp
+++ b/src/libslic3r/Support/TreeSupport.hpp
@@ -1,12 +1,26 @@
 #ifndef TREESUPPORT_H
 #define TREESUPPORT_H
 
+#include <cstddef>
+#include <cmath>
 #include <forward_list>
+#include <list>
+#include <memory>
+#include <unordered_map>
+#include <functional>
+#include <map>
+#include <math.h>
 #include <unordered_set>
+#include <vector>
+#include <utility>
 #include "ExPolygon.hpp"
 #include "Point.hpp"
+#include "libslic3r/Polygon.hpp"
 #include "Slicing.hpp"
 #include "MinimumSpanningTree.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Support/TreeSupportCommon.hpp"
+#include "libslic3r/Support/SupportParameters.hpp"
 #include "tbb/concurrent_unordered_map.h"
 #include "Flow.hpp"
 #include "PrintConfig.hpp"
diff --git a/src/libslic3r/Support/TreeSupport3D.hpp b/src/libslic3r/Support/TreeSupport3D.hpp
index a333edb962..65a5e22975 100644
--- a/src/libslic3r/Support/TreeSupport3D.hpp
+++ b/src/libslic3r/Support/TreeSupport3D.hpp
@@ -9,6 +9,8 @@
 #ifndef slic3r_TreeSupport_hpp
 #define slic3r_TreeSupport_hpp
 
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Layer.hpp"
 #include "SupportLayer.hpp"
 #include "TreeModelVolumes.hpp"
 #include "TreeSupportCommon.hpp"
@@ -16,8 +18,16 @@
 #include "../BoundingBox.hpp"
 #include "../Point.hpp"
 #include "../Utils.hpp"
+#include "libslic3r/libslic3r.h"
 
 #include <boost/container/small_vector.hpp>
+#include <cstdint>
+#include <limits>
+#include <cstddef>
+#include <utility>
+#include <deque>
+#include <vector>
+#include <functional>
 
 
 // #define TREE_SUPPORT_SHOW_ERRORS
diff --git a/src/libslic3r/Surface.cpp b/src/libslic3r/Surface.cpp
index 58ac7294cc..cb7d0d4674 100644
--- a/src/libslic3r/Surface.cpp
+++ b/src/libslic3r/Surface.cpp
@@ -1,6 +1,11 @@
 #include "BoundingBox.hpp"
 #include "Surface.hpp"
+#include "Polygon.hpp"
+#include "Point.hpp"
+#include "ExPolygon.hpp"
 #include "SVG.hpp"
+#include <cstddef>
+#include "libslic3r.h"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Surface.hpp b/src/libslic3r/Surface.hpp
index b63c283251..1849e3462a 100644
--- a/src/libslic3r/Surface.hpp
+++ b/src/libslic3r/Surface.hpp
@@ -1,8 +1,16 @@
 #ifndef slic3r_Surface_hpp_
 #define slic3r_Surface_hpp_
 
+#include "Polygon.hpp"
+#include "Line.hpp"
+#include "Point.hpp"
 #include "libslic3r.h"
 #include "ExPolygon.hpp"
+#include <utility>
+#include <vector>
+#include <cstddef>
+#include <algorithm>
+#include <iterator>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/SurfaceCollection.cpp b/src/libslic3r/SurfaceCollection.cpp
index 83015c3e6a..47109b9965 100644
--- a/src/libslic3r/SurfaceCollection.cpp
+++ b/src/libslic3r/SurfaceCollection.cpp
@@ -1,8 +1,18 @@
 #include "SurfaceCollection.hpp"
 #include "BoundingBox.hpp"
+#include "ExPolygon.hpp"
+#include "Polygon.hpp"
+#include "Point.hpp"
 #include "SVG.hpp"
+#include "Surface.hpp"
 
+#include <initializer_list>
+#include <algorithm>
+#include <cstddef>
+#include <cstdio>
 #include <map>
+#include <vector>
+#include <utility>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/SurfaceMesh.hpp b/src/libslic3r/SurfaceMesh.hpp
index 82dff2e22d..221c584697 100644
--- a/src/libslic3r/SurfaceMesh.hpp
+++ b/src/libslic3r/SurfaceMesh.hpp
@@ -2,8 +2,13 @@
 #define slic3r_SurfaceMesh_hpp_
 
 #include <admesh/stl.h>
+#include <cassert>
+#include <cstddef>
+#include <algorithm>
 #include <libslic3r/TriangleMesh.hpp>
+#include <vector>
 
+#include "Point.hpp"
 #include "boost/container/small_vector.hpp"
 
 namespace Slic3r {
diff --git a/src/libslic3r/Tesselate.cpp b/src/libslic3r/Tesselate.cpp
index febb3d0e74..be7087a311 100644
--- a/src/libslic3r/Tesselate.cpp
+++ b/src/libslic3r/Tesselate.cpp
@@ -1,8 +1,17 @@
 #include "Tesselate.hpp"
 
 #include "ExPolygon.hpp"
+#include "Point.hpp"
+#include "libslic3r.h"
 
+#include <cstddef>
+#include <algorithm>
+#include <cassert>
+#include <cstring>
+#include <deque>
 #include <glu-libtess.h>
+#include <vector>
+#include <utility>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Tesselate.hpp b/src/libslic3r/Tesselate.hpp
index 2dbe6caa10..f9effa242d 100644
--- a/src/libslic3r/Tesselate.hpp
+++ b/src/libslic3r/Tesselate.hpp
@@ -4,6 +4,7 @@
 #include <vector>
 
 #include "Point.hpp"
+#include "libslic3r.h"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/TextConfiguration.hpp b/src/libslic3r/TextConfiguration.hpp
index 40c8c836ac..753cec71ba 100644
--- a/src/libslic3r/TextConfiguration.hpp
+++ b/src/libslic3r/TextConfiguration.hpp
@@ -1,6 +1,7 @@
 #ifndef slic3r_TextConfiguration_hpp_
 #define slic3r_TextConfiguration_hpp_
 
+#include <utility>
 #include <vector>
 #include <string>
 #include <optional>
@@ -9,6 +10,7 @@
 #include <cereal/types/string.hpp>
 #include <cereal/archives/binary.hpp>
 #include "Point.hpp" // Transform3d
+#include "libslic3r.h"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/TextureBake/TextureBakeDebug.cpp b/src/libslic3r/TextureBake/TextureBakeDebug.cpp
index 9465080e21..7b3538da72 100644
--- a/src/libslic3r/TextureBake/TextureBakeDebug.cpp
+++ b/src/libslic3r/TextureBake/TextureBakeDebug.cpp
@@ -1,11 +1,19 @@
 #include "TextureBakeDebug.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/TextureBake/TextureBakeIndex.hpp"
 
 #include <algorithm>
+#include <boost/filesystem/operations.hpp>
+#include <cctype>
 #include <cinttypes>
+#include <cstdint>
 #include <cstdio>
 
 #include <boost/filesystem.hpp>
 #include <boost/log/trivial.hpp>
+#include <vector>
+#include <utility>
+#include <string>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/TextureBake/TextureBakeDebug.hpp b/src/libslic3r/TextureBake/TextureBakeDebug.hpp
index 5c6d987e44..b0cf0c1952 100644
--- a/src/libslic3r/TextureBake/TextureBakeDebug.hpp
+++ b/src/libslic3r/TextureBake/TextureBakeDebug.hpp
@@ -18,8 +18,10 @@
 #include <cstddef>
 #include <cstdint>
 #include <string>
+#include <utility>
 #include <vector>
 
+#include "libslic3r/Point.hpp"
 #include "TextureBakeIndex.hpp"
 
 namespace Slic3r {
diff --git a/src/libslic3r/TextureBake/TextureBakeDecimate.cpp b/src/libslic3r/TextureBake/TextureBakeDecimate.cpp
index ee335cff3c..c03607e99c 100644
--- a/src/libslic3r/TextureBake/TextureBakeDecimate.cpp
+++ b/src/libslic3r/TextureBake/TextureBakeDecimate.cpp
@@ -1,8 +1,13 @@
 #include "TextureBakeDecimate.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/TextureBake/TextureBakeIndex.hpp"
 
 #include <algorithm>
 #include <array>
 #include <cmath>
+#include <cstddef>
+#include <cstdint>
+#include <functional>
 #include <limits>
 #include <queue>
 
@@ -10,6 +15,7 @@
 
 #include <tbb/blocked_range.h>
 #include <tbb/parallel_for.h>
+#include <vector>
 
 namespace Slic3r {
 namespace TextureBake {
diff --git a/src/libslic3r/TextureBake/TextureBakeDecimate.hpp b/src/libslic3r/TextureBake/TextureBakeDecimate.hpp
index 5579778050..8b31dbb642 100644
--- a/src/libslic3r/TextureBake/TextureBakeDecimate.hpp
+++ b/src/libslic3r/TextureBake/TextureBakeDecimate.hpp
@@ -10,6 +10,7 @@
 // Flat-face harvesting: the loop keeps going past the triangle target while each collapse's error
 // stays under an absolute bound, so flat faces that cost nothing to remove are not left behind.
 
+#include <cstddef>
 #include <cstdint>
 #include <functional>
 #include <vector>
diff --git a/src/libslic3r/TextureBake/TextureBakeDisplace.cpp b/src/libslic3r/TextureBake/TextureBakeDisplace.cpp
index 6e306b1c43..7dee94de99 100644
--- a/src/libslic3r/TextureBake/TextureBakeDisplace.cpp
+++ b/src/libslic3r/TextureBake/TextureBakeDisplace.cpp
@@ -1,11 +1,18 @@
 #include "TextureBakeDisplace.hpp"
+#include "libslic3r/TextureBake/TextureBakeIndex.hpp"
+#include "libslic3r/Point.hpp"
 
 #include <algorithm>
 #include <cmath>
+#include <cstddef>
+#include <cstdint>
 #include <limits>
 
+#include <math.h>
 #include <tbb/blocked_range.h>
 #include <tbb/parallel_for.h>
+#include <vector>
+#include <utility>
 
 namespace Slic3r {
 namespace TextureBake {
diff --git a/src/libslic3r/TextureBake/TextureBakeDisplace.hpp b/src/libslic3r/TextureBake/TextureBakeDisplace.hpp
index eee6ca0626..76e70d3bc5 100644
--- a/src/libslic3r/TextureBake/TextureBakeDisplace.hpp
+++ b/src/libslic3r/TextureBake/TextureBakeDisplace.hpp
@@ -13,6 +13,7 @@
 #include <functional>
 #include <vector>
 
+#include "libslic3r/Point.hpp"
 #include "TextureBakeIndex.hpp"
 
 namespace Slic3r {
diff --git a/src/libslic3r/TextureBake/TextureBakeFlip.cpp b/src/libslic3r/TextureBake/TextureBakeFlip.cpp
index f4d9997f71..8f7000a878 100644
--- a/src/libslic3r/TextureBake/TextureBakeFlip.cpp
+++ b/src/libslic3r/TextureBake/TextureBakeFlip.cpp
@@ -1,13 +1,20 @@
 #include "TextureBakeFlip.hpp"
+#include "libslic3r/TextureBake/TextureBakeIndex.hpp"
+#include "libslic3r/TextureBake/TextureBakeDisplace.hpp"
+#include "libslic3r/Point.hpp"
 
 #include <algorithm>
 #include <array>
 #include <cmath>
+#include <cstdint>
+#include <cstddef>
 #include <limits>
 
 #include <tbb/blocked_range.h>
 #include <tbb/parallel_for.h>
 #include <tbb/parallel_sort.h>
+#include <vector>
+#include <utility>
 
 namespace Slic3r {
 namespace TextureBake {
diff --git a/src/libslic3r/TextureBake/TextureBakeFlip.hpp b/src/libslic3r/TextureBake/TextureBakeFlip.hpp
index 02701bbced..a1057a344a 100644
--- a/src/libslic3r/TextureBake/TextureBakeFlip.hpp
+++ b/src/libslic3r/TextureBake/TextureBakeFlip.hpp
@@ -16,6 +16,7 @@
 // flat regions cost nothing; a non-planar quad (a model crease) is never touched, nor is one whose
 // triangles belong to different source faces or straddle the painted boundary.
 
+#include <cstddef>
 #include <cstdint>
 #include <vector>
 
diff --git a/src/libslic3r/TextureBake/TextureBakeIndex.cpp b/src/libslic3r/TextureBake/TextureBakeIndex.cpp
index ac7234774b..75839c746b 100644
--- a/src/libslic3r/TextureBake/TextureBakeIndex.cpp
+++ b/src/libslic3r/TextureBake/TextureBakeIndex.cpp
@@ -1,6 +1,9 @@
 #include "TextureBakeIndex.hpp"
+#include "libslic3r/Point.hpp"
 
 #include <algorithm>
+#include <vector>
+#include <cstddef>
 
 namespace Slic3r {
 namespace TextureBake {
diff --git a/src/libslic3r/TextureBake/TextureBakeIndex.hpp b/src/libslic3r/TextureBake/TextureBakeIndex.hpp
index 2b1dd72395..6fbfa4f831 100644
--- a/src/libslic3r/TextureBake/TextureBakeIndex.hpp
+++ b/src/libslic3r/TextureBake/TextureBakeIndex.hpp
@@ -11,7 +11,9 @@
 
 #include <algorithm>
 #include <cmath>
+#include <cstddef>
 #include <cstdint>
+#include <utility>
 #include <vector>
 
 #include "../Point.hpp"
diff --git a/src/libslic3r/TextureBake/TextureBakeMesh.cpp b/src/libslic3r/TextureBake/TextureBakeMesh.cpp
index 6f6d72218d..caf6e22d36 100644
--- a/src/libslic3r/TextureBake/TextureBakeMesh.cpp
+++ b/src/libslic3r/TextureBake/TextureBakeMesh.cpp
@@ -1,6 +1,11 @@
 #include "TextureBakeMesh.hpp"
+#include "libslic3r/TextureBake/TextureBakeIndex.hpp"
+#include "libslic3r/Point.hpp"
 
 #include <algorithm>
+#include <vector>
+#include <cstdint>
+#include <cstddef>
 
 namespace Slic3r {
 namespace TextureBake {
diff --git a/src/libslic3r/TextureBake/TextureBakeMesh.hpp b/src/libslic3r/TextureBake/TextureBakeMesh.hpp
index b4e3ced5fe..860aa1445d 100644
--- a/src/libslic3r/TextureBake/TextureBakeMesh.hpp
+++ b/src/libslic3r/TextureBake/TextureBakeMesh.hpp
@@ -5,6 +5,8 @@
 
 #include "TextureBakeIndex.hpp"
 #include "../TriangleMesh.hpp"
+#include <vector>
+#include <cstdint>
 
 namespace Slic3r {
 namespace TextureBake {
diff --git a/src/libslic3r/TextureBake/TextureBakePipeline.cpp b/src/libslic3r/TextureBake/TextureBakePipeline.cpp
index 2b678905b1..b44ae837bc 100644
--- a/src/libslic3r/TextureBake/TextureBakePipeline.cpp
+++ b/src/libslic3r/TextureBake/TextureBakePipeline.cpp
@@ -1,8 +1,21 @@
 #include "TextureBakePipeline.hpp"
 
+#include <cstddef>
+#include <cstdint>
+#include <math.h>
+#include <ratio>
 #include <tbb/blocked_range.h>
 #include <tbb/parallel_for.h>
 
+#include "libslic3r/TextureBake/TextureBakeIndex.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/TextureBake/TextureBakeDisplace.hpp"
+#include "libslic3r/TextureBake/TextureBakeSubdivide.hpp"
+#include "libslic3r/TextureBake/TextureBakeRegularize.hpp"
+#include "libslic3r/TextureBake/TextureBakeRelocate.hpp"
+#include "libslic3r/TextureBake/TextureBakeFlip.hpp"
+#include "libslic3r/TextureBake/TextureBakeDecimate.hpp"
+#include "libslic3r/TextureBake/TextureBakeRepair.hpp"
 #include "TextureBakeDebug.hpp"
 
 #include <algorithm>
@@ -11,6 +24,8 @@
 #include <string>
 
 #include <boost/log/trivial.hpp>
+#include <vector>
+#include <utility>
 
 namespace Slic3r {
 namespace TextureBake {
diff --git a/src/libslic3r/TextureBake/TextureBakePipeline.hpp b/src/libslic3r/TextureBake/TextureBakePipeline.hpp
index e230cf0d49..43429ce22f 100644
--- a/src/libslic3r/TextureBake/TextureBakePipeline.hpp
+++ b/src/libslic3r/TextureBake/TextureBakePipeline.hpp
@@ -13,10 +13,12 @@
 // Decimation and repair are export-only - decimation drops the output-to-input face mapping a bake
 // needs to carry per-face data forward.
 
+#include <cstddef>
 #include <cstdint>
 #include <functional>
 #include <vector>
 
+#include "libslic3r/Point.hpp"
 #include "TextureBakeDecimate.hpp"
 #include "TextureBakeDisplace.hpp"
 #include "TextureBakeIndex.hpp"
diff --git a/src/libslic3r/TextureBake/TextureBakeRegularize.cpp b/src/libslic3r/TextureBake/TextureBakeRegularize.cpp
index 3028d8bee9..fb32eb7712 100644
--- a/src/libslic3r/TextureBake/TextureBakeRegularize.cpp
+++ b/src/libslic3r/TextureBake/TextureBakeRegularize.cpp
@@ -1,11 +1,18 @@
 #include "TextureBakeRegularize.hpp"
+#include "libslic3r/TextureBake/TextureBakeIndex.hpp"
+#include "libslic3r/Point.hpp"
 
 #include <algorithm>
 #include <cmath>
+#include <cstddef>
+#include <cstdint>
+#include <iterator>
 #include <limits>
 
 #include <tbb/blocked_range.h>
 #include <tbb/parallel_for.h>
+#include <vector>
+#include <utility>
 
 namespace Slic3r {
 namespace TextureBake {
diff --git a/src/libslic3r/TextureBake/TextureBakeRegularize.hpp b/src/libslic3r/TextureBake/TextureBakeRegularize.hpp
index 350666783a..b6cd5eedc3 100644
--- a/src/libslic3r/TextureBake/TextureBakeRegularize.hpp
+++ b/src/libslic3r/TextureBake/TextureBakeRegularize.hpp
@@ -12,6 +12,7 @@
 // flattened); and the link condition must hold, or the result would be non-manifold. Boundary and
 // non-manifold edges are skipped outright. Rounds repeat until one achieves nothing.
 
+#include <cstddef>
 #include <cstdint>
 #include <vector>
 
diff --git a/src/libslic3r/TextureBake/TextureBakeRelocate.cpp b/src/libslic3r/TextureBake/TextureBakeRelocate.cpp
index 5ea33b353b..405ea8e286 100644
--- a/src/libslic3r/TextureBake/TextureBakeRelocate.cpp
+++ b/src/libslic3r/TextureBake/TextureBakeRelocate.cpp
@@ -1,11 +1,17 @@
 #include "TextureBakeRelocate.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/TextureBake/TextureBakeIndex.hpp"
+#include "libslic3r/TextureBake/TextureBakeDisplace.hpp"
 
 #include <algorithm>
 #include <cmath>
+#include <cstdint>
+#include <cstddef>
 #include <limits>
 
 #include <tbb/blocked_range.h>
 #include <tbb/parallel_for.h>
+#include <vector>
 
 namespace Slic3r {
 namespace TextureBake {
diff --git a/src/libslic3r/TextureBake/TextureBakeRelocate.hpp b/src/libslic3r/TextureBake/TextureBakeRelocate.hpp
index cd674d03ae..36ca059dde 100644
--- a/src/libslic3r/TextureBake/TextureBakeRelocate.hpp
+++ b/src/libslic3r/TextureBake/TextureBakeRelocate.hpp
@@ -21,6 +21,7 @@
 // Vertices in flat regions have no gradient to speak of and are left alone, so the pass costs nothing
 // where there is nothing to align.
 
+#include <cstddef>
 #include <cstdint>
 #include <functional>
 #include <vector>
diff --git a/src/libslic3r/TextureBake/TextureBakeRepair.cpp b/src/libslic3r/TextureBake/TextureBakeRepair.cpp
index 438e0ea25d..49f427d461 100644
--- a/src/libslic3r/TextureBake/TextureBakeRepair.cpp
+++ b/src/libslic3r/TextureBake/TextureBakeRepair.cpp
@@ -1,10 +1,16 @@
 #include "TextureBakeRepair.hpp"
+#include "libslic3r/TextureBake/TextureBakeIndex.hpp"
+#include "libslic3r/Point.hpp"
 
 #include <algorithm>
 #include <array>
 #include <cmath>
+#include <cstdint>
+#include <cstddef>
 #include <unordered_map>
 #include <unordered_set>
+#include <vector>
+#include <utility>
 
 namespace Slic3r {
 namespace TextureBake {
diff --git a/src/libslic3r/TextureBake/TextureBakeRepair.hpp b/src/libslic3r/TextureBake/TextureBakeRepair.hpp
index 35e9f50b06..07d5323059 100644
--- a/src/libslic3r/TextureBake/TextureBakeRepair.hpp
+++ b/src/libslic3r/TextureBake/TextureBakeRepair.hpp
@@ -7,6 +7,7 @@
 // one incident face on one side, which a slicer reads as an open boundary. This splits the offending
 // face into a fan so every on-edge vertex becomes a real corner.
 
+#include <cstddef>
 #include <cstdint>
 #include <vector>
 
diff --git a/src/libslic3r/TextureBake/TextureBakeSubdivide.cpp b/src/libslic3r/TextureBake/TextureBakeSubdivide.cpp
index 6b882b1fc8..967f88381a 100644
--- a/src/libslic3r/TextureBake/TextureBakeSubdivide.cpp
+++ b/src/libslic3r/TextureBake/TextureBakeSubdivide.cpp
@@ -1,12 +1,20 @@
 #include "TextureBakeSubdivide.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/TextureBake/TextureBakeIndex.hpp"
 
 #include <algorithm>
 #include <cmath>
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <math.h>
 #include <unordered_map>
 
 #include <tbb/blocked_range.h>
 #include <tbb/parallel_for.h>
 #include <tbb/parallel_reduce.h>
+#include <vector>
+#include <utility>
 
 namespace Slic3r {
 namespace TextureBake {
diff --git a/src/libslic3r/TextureBake/TextureBakeSubdivide.hpp b/src/libslic3r/TextureBake/TextureBakeSubdivide.hpp
index 743c74eb49..0120160345 100644
--- a/src/libslic3r/TextureBake/TextureBakeSubdivide.hpp
+++ b/src/libslic3r/TextureBake/TextureBakeSubdivide.hpp
@@ -8,9 +8,12 @@
 // The 1->4 case is what keeps the tessellation regular - its children are similar to the parent. An
 // irregular one shows up after displacement as adjacent triangles tilting alternately, i.e. noise.
 
+#include <cstddef>
+#include <cstdint>
 #include <functional>
 #include <vector>
 
+#include "libslic3r/Point.hpp"
 #include "TextureBakeIndex.hpp"
 
 namespace Slic3r {
diff --git a/src/libslic3r/TextureDisplacement.cpp b/src/libslic3r/TextureDisplacement.cpp
index 862c6c9044..46a7cb18b4 100644
--- a/src/libslic3r/TextureDisplacement.cpp
+++ b/src/libslic3r/TextureDisplacement.cpp
@@ -1,7 +1,10 @@
 #include "TextureDisplacement.hpp"
 
+#include <Eigen/Core>
+#include <Eigen/Geometry>
 #include <algorithm>
 #include <array>
+#include <cstdint>
 #include <cstdio>
 #include <cstdlib>
 #include <functional>
@@ -11,10 +14,13 @@
 #include <iterator>
 #include <limits>
 #include <map>
+#include <memory>
+#include <math.h>
 #include <mutex>
 #include <numeric>
 #include <optional>
 #include <queue>
+#include <ratio>
 #include <string>
 #include <tuple>
 #include <unordered_map>
@@ -27,11 +33,16 @@
 #include <tbb/parallel_sort.h>
 
 #include <boost/log/trivial.hpp>
+#include <utility>
+#include <vector>
 
 #include "AABBTreeIndirect.hpp"
 #include "MeshBoolean.hpp"
 #include "Model.hpp"
 #include "PNGReadWrite.hpp"
+#include "Point.hpp"
+#include "TriangleMesh.hpp"
+#include "TextureBake/TextureBakeDisplace.hpp"
 #include "TriangleSelector.hpp"
 #include "TextureBake/TextureBakeDebug.hpp"
 #include "TextureBake/TextureBakeMesh.hpp"
diff --git a/src/libslic3r/TextureDisplacement.hpp b/src/libslic3r/TextureDisplacement.hpp
index e97178abca..afe6a42911 100644
--- a/src/libslic3r/TextureDisplacement.hpp
+++ b/src/libslic3r/TextureDisplacement.hpp
@@ -1,10 +1,13 @@
 #ifndef slic3r_TextureDisplacement_hpp_
 #define slic3r_TextureDisplacement_hpp_
 
+#include <cstddef>
+#include <Eigen/Core>
 #include <cstdint>
 #include <functional>
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <cereal/cereal.hpp>
diff --git a/src/libslic3r/TexturePainting.cpp b/src/libslic3r/TexturePainting.cpp
index 9f83f282cd..e44f870b5d 100644
--- a/src/libslic3r/TexturePainting.cpp
+++ b/src/libslic3r/TexturePainting.cpp
@@ -1,9 +1,15 @@
 #include "TexturePainting.hpp"
 
 #include <algorithm>
+#include <array>
 #include <cmath>
+#include <cstddef>
+#include <cstring>
 #include <map>
+#include <opencv2/core/mat.hpp>
+#include <opencv2/core/matx.hpp>
 #include <set>
+#include <string>
 #include <utility>
 
 #include <opencv2/core.hpp>
@@ -11,11 +17,15 @@
 #include <opencv2/imgproc.hpp>
 
 #include <boost/log/trivial.hpp>
+#include <vector>
 
+#include "Point.hpp"
+#include "TextureToColor/Callbacks.hpp"
 #include "TextureToColor/TextureToColor.hpp"
 #include "TextureToColor/ColorUtils.hpp"
 
 #include "Model.hpp"
+#include "TextureToColor/TriMesh.hpp"
 #include "TriangleMesh.hpp"
 #include "TriangleSelector.hpp"
 
diff --git a/src/libslic3r/TextureToColor/CgalUtils.hpp b/src/libslic3r/TextureToColor/CgalUtils.hpp
index 109d454827..1782530bcb 100644
--- a/src/libslic3r/TextureToColor/CgalUtils.hpp
+++ b/src/libslic3r/TextureToColor/CgalUtils.hpp
@@ -1,8 +1,10 @@
 #pragma once
+#include "libslic3r/Point.hpp"
 #include "TriMesh.hpp"
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/Polygon_mesh_processing/repair.h>
+#include <CGAL/Surface_mesh/Surface_mesh.h>
 #include <chrono>
 #include <cstdio>
 #include <map>
diff --git a/src/libslic3r/TextureToColor/ColorUtils.cpp b/src/libslic3r/TextureToColor/ColorUtils.cpp
index 7127a5d364..a32b4848b2 100644
--- a/src/libslic3r/TextureToColor/ColorUtils.cpp
+++ b/src/libslic3r/TextureToColor/ColorUtils.cpp
@@ -1,12 +1,26 @@
 #include "ColorUtils.hpp"
 
+#include <CGAL/Aff_transformation_3.h>
+#include <CGAL/boost/graph/graph_traits_Surface_mesh.h>
+#include <Eigen/Core>
+#include <CGAL/Surface_mesh/Surface_mesh.h>
+#include <CGAL/Origin.h>
+#include <CGAL/centroid.h>
+#include <CGAL/Named_function_parameters.h>
+#include <CGAL/boost/graph/helpers.h>
+#include <Eigen/Eigenvalues>
+#include <CGAL/Polygon_mesh_processing/measure.h>
 #include <algorithm>
 #include <array>
 #include <atomic>
 #include <chrono>
 #include <cmath>
 #include <cstdio>
+#include <fstream>
+#include <functional>
 #include <iostream>
+#include <limits>
+#include <map>
 #include <numeric>
 
 #include <boost/next_prior.hpp>
@@ -23,11 +37,19 @@
 #include <CGAL/Polygon_mesh_processing/self_intersections.h>
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/mesh_segmentation.h>
+#include <string>
 #include <tbb/parallel_for.h>
 
 #include "CgalUtils.hpp"
+#include "TriMesh.hpp"
+#include "libslic3r/Point.hpp"
 #include "libslic3r/AABBTreeIndirect.hpp"
 #include <boost/log/trivial.hpp>
+#include <vector>
+#include <utility>
+#include <unordered_map>
+#include <unordered_set>
+#include <queue>
 
 namespace Slic3r { namespace tex2color {
 namespace color_utils {
diff --git a/src/libslic3r/TextureToColor/ColorUtils.hpp b/src/libslic3r/TextureToColor/ColorUtils.hpp
index 05849109f4..89e6095923 100644
--- a/src/libslic3r/TextureToColor/ColorUtils.hpp
+++ b/src/libslic3r/TextureToColor/ColorUtils.hpp
@@ -1,7 +1,12 @@
 #pragma once
 
 #include "Callbacks.hpp"
+#include "libslic3r/Point.hpp"
 #include "TriMesh.hpp"
+#include <array>
+#include <cstddef>
+#include <vector>
+#include <functional>
 
 namespace Slic3r { namespace tex2color {
 
diff --git a/src/libslic3r/TextureToColor/Repair.hpp b/src/libslic3r/TextureToColor/Repair.hpp
index 44dc30c144..092c0623fb 100644
--- a/src/libslic3r/TextureToColor/Repair.hpp
+++ b/src/libslic3r/TextureToColor/Repair.hpp
@@ -4,18 +4,22 @@
 #include "Callbacks.hpp"
 #include <CGAL/Polygon_mesh_processing/border.h>
 #include <CGAL/Polygon_mesh_processing/manifoldness.h>
+#include <CGAL/Polygon_mesh_processing/repair_degeneracies.h>
 #include <CGAL/Polygon_mesh_processing/repair_polygon_soup.h>
 #include <CGAL/Polygon_mesh_processing/repair.h>
 #include <CGAL/Polygon_mesh_processing/orient_polygon_soup.h>
 #include <CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h>
 #include <CGAL/Polygon_mesh_processing/stitch_borders.h>
 #include <CGAL/Polygon_mesh_processing/triangulate_hole.h>
+#include <CGAL/boost/graph/graph_traits_Surface_mesh.h>
 #include <boost/log/trivial.hpp>
 #include <algorithm>
 #include <chrono>
 #include <cstddef>
+#include <iterator>
 #include <memory>
 #include <utility>
+#include <vector>
 
 namespace Slic3r { namespace tex2color {
 
diff --git a/src/libslic3r/TextureToColor/TextureToColor.cpp b/src/libslic3r/TextureToColor/TextureToColor.cpp
index e5dde36714..15a2a641af 100644
--- a/src/libslic3r/TextureToColor/TextureToColor.cpp
+++ b/src/libslic3r/TextureToColor/TextureToColor.cpp
@@ -1,5 +1,12 @@
 #include "TextureToColor.hpp"
 
+#include <string>
+#include <cstddef>
+#include <limits>
+#include <opencv2/core/mat.hpp>
+#include <algorithm>
+#include <memory>
+#include <ratio>
 #include <tbb/parallel_for.h>
 #include <array>
 #include <atomic>
@@ -9,14 +16,20 @@
 #include <functional>
 
 #include <boost/next_prior.hpp>
+#include "Callbacks.hpp"
 #include "CgalUtils.hpp"
 #include "ColorUtils.hpp"
+#include "TriMesh.hpp"
+#include "libslic3r/Point.hpp"
 #include "libslic3r/TriangleMesh.hpp"
 #include <filesystem>
 #include <fstream>
 #include "Repair.hpp"
 #include "libslic3r/AABBTreeIndirect.hpp"
 #include <boost/log/trivial.hpp>
+#include <vector>
+#include <utility>
+#include <unordered_map>
 
 namespace Slic3r { namespace tex2color {
 
diff --git a/src/libslic3r/TextureToColor/TextureToColor.hpp b/src/libslic3r/TextureToColor/TextureToColor.hpp
index 019a113fc4..a88fe2086e 100644
--- a/src/libslic3r/TextureToColor/TextureToColor.hpp
+++ b/src/libslic3r/TextureToColor/TextureToColor.hpp
@@ -1,10 +1,15 @@
 #pragma once
 
 #include "Callbacks.hpp"
+#include "libslic3r/Point.hpp"
 #include "TriMesh.hpp"
 #include "opencv2/core.hpp"
+#include <cstddef>
+#include <array>
 #include <functional>
+#include <opencv2/core/mat.hpp>
 #include <string>
+#include <vector>
 
 namespace Slic3r { namespace tex2color {
 
diff --git a/src/libslic3r/TextureToColor/TriMesh.hpp b/src/libslic3r/TextureToColor/TriMesh.hpp
index d557ae1d2e..63d5286ab7 100644
--- a/src/libslic3r/TextureToColor/TriMesh.hpp
+++ b/src/libslic3r/TextureToColor/TriMesh.hpp
@@ -1,5 +1,8 @@
 #pragma once
 #include <admesh/stl.h>
+#include <vector>
+#include <utility>
+#include <cstddef>
 #include "Point.hpp"
 
 namespace Slic3r { namespace tex2color {
diff --git a/src/libslic3r/Thread.cpp b/src/libslic3r/Thread.cpp
index edd7c2a3d0..e0d839153e 100644
--- a/src/libslic3r/Thread.cpp
+++ b/src/libslic3r/Thread.cpp
@@ -1,3 +1,10 @@
+#include <optional>
+#include <string>
+#include <cstddef>
+#include <cassert>
+#include <sstream>
+#include <locale.h>
+#include <clocale>
 #ifdef _WIN32
 	#include <windows.h>
 	#include <boost/nowide/convert.hpp>
diff --git a/src/libslic3r/Thread.hpp b/src/libslic3r/Thread.hpp
index c407159072..e40cae5f26 100644
--- a/src/libslic3r/Thread.hpp
+++ b/src/libslic3r/Thread.hpp
@@ -1,6 +1,7 @@
 #ifndef GUI_THREAD_HPP
 #define GUI_THREAD_HPP
 
+#include <optional>
 #include <utility>
 #include <string>
 #include <thread>
diff --git a/src/libslic3r/Time.cpp b/src/libslic3r/Time.cpp
index 81b9af49e2..a9f3f07352 100644
--- a/src/libslic3r/Time.cpp
+++ b/src/libslic3r/Time.cpp
@@ -1,6 +1,10 @@
 #include "Time.hpp"
 
 #include <iomanip>
+#include <ostream>
+#include <istream>
+#include <ios>
+#include <locale>
 #include <sstream>
 #include <chrono>
 #include <cassert>
@@ -8,6 +12,8 @@
 #include <cstdio>
 #include <cctype>
 #include <cstring>
+#include <string>
+#include <time.h>
 
 #ifdef _MSC_VER
 #include <map>
diff --git a/src/libslic3r/Timer.cpp b/src/libslic3r/Timer.cpp
index 91f3b0f09e..1a81210c58 100644
--- a/src/libslic3r/Timer.cpp
+++ b/src/libslic3r/Timer.cpp
@@ -1,5 +1,7 @@
 #include "Timer.hpp"
 #include <boost/log/trivial.hpp>
+#include <string>
+#include <chrono>
 
 using namespace std::chrono;
 
diff --git a/src/libslic3r/Timer.hpp b/src/libslic3r/Timer.hpp
index 01f73a9b3e..e122c6cb1d 100644
--- a/src/libslic3r/Timer.hpp
+++ b/src/libslic3r/Timer.hpp
@@ -1,8 +1,10 @@
 #ifndef libslic3r_Timer_hpp_
 #define libslic3r_Timer_hpp_
 
+#include <cstdint>
 #include <string>
 #include <chrono>
+#include <string_view>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/TriangleMesh.cpp b/src/libslic3r/TriangleMesh.cpp
index 9e08e6f1e0..2f047e4e7f 100644
--- a/src/libslic3r/TriangleMesh.cpp
+++ b/src/libslic3r/TriangleMesh.cpp
@@ -1,5 +1,7 @@
+#include "BoundingBox.hpp"
 #include "Exception.hpp"
 #include "TriangleMesh.hpp"
+#include "Polygon.hpp"
 #include "TriangleMeshSlicer.hpp"
 #include "MeshSplitImpl.hpp"
 #include "ClipperUtils.hpp"
@@ -11,13 +13,26 @@
 #include "CutUtils.hpp"
 #include "Utils.hpp"
 #include "Format/STL.hpp"
+#include "libslic3r.h"
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <iterator>
+#include <Eigen/Geometry>
+#include <libqhull_r/libqhull_r.h>
+#include <cstdio>
+#include <cstring>
 #include <libqhullcpp/Qhull.h>
 #include <libqhullcpp/QhullFacetList.h>
+#include <libqhullcpp/QhullVertex.h>
+#include <libqhullcpp/QhullPoint.h>
 #include <libqhullcpp/QhullVertexSet.h>
 
 #include <cmath>
 #include <deque>
 #include <queue>
+#include <map>
+#include <math.h>
 #include <vector>
 #include <utility>
 #include <algorithm>
diff --git a/src/libslic3r/TriangleMesh.hpp b/src/libslic3r/TriangleMesh.hpp
index b963671ce9..8c82bac52f 100644
--- a/src/libslic3r/TriangleMesh.hpp
+++ b/src/libslic3r/TriangleMesh.hpp
@@ -3,6 +3,11 @@
 
 #include "libslic3r.h"
 #include <admesh/stl.h>
+#include <cstdint>
+#include <cstddef>
+#include <cassert>
+#include <array>
+#include <cereal/specialize.hpp>
 #include <functional>
 #include <vector>
 #include "BoundingBox.hpp"
diff --git a/src/libslic3r/TriangleMeshDeal.cpp b/src/libslic3r/TriangleMeshDeal.cpp
index 4ea3030e51..7ecfc362d1 100644
--- a/src/libslic3r/TriangleMeshDeal.cpp
+++ b/src/libslic3r/TriangleMeshDeal.cpp
@@ -1,5 +1,7 @@
 #include "TriangleMeshDeal.hpp"
+#include "TriangleMesh.hpp"
 
+#include <Eigen/Core>
 #include <igl/loop.h>
 #undef NDEBUG
 #include <assert.h>
diff --git a/src/libslic3r/TriangleMeshSlicer.cpp b/src/libslic3r/TriangleMeshSlicer.cpp
index 4ff18165cb..81108b68a2 100644
--- a/src/libslic3r/TriangleMeshSlicer.cpp
+++ b/src/libslic3r/TriangleMeshSlicer.cpp
@@ -1,16 +1,29 @@
 #include "ClipperUtils.hpp"
+#include "ExPolygon.hpp"
 #include "Geometry.hpp"
+#include "Point.hpp"
+#include "Line.hpp"
+#include "MultiPoint.hpp"
+#include "Polygon.hpp"
 #include "Tesselate.hpp"
 #include "TriangleMesh.hpp"
 #include "TriangleMeshSlicer.hpp"
 #include "Utils.hpp"
 // BBS
 #include "MeshBoolean.hpp"
+#include "libslic3r.h"
 
 #include <algorithm>
+#include <array>
 #include <cmath>
+#include <cstdint>
+#include <cstddef>
 #include <deque>
 #include <queue>
+#include <iterator>
+#include <limits>
+#include <functional>
+#include <map>
 #include <mutex>
 #include <tuple>
 #include <utility>
@@ -18,6 +31,7 @@
 #include <boost/log/trivial.hpp>
 
 #include <tbb/parallel_for.h>
+#include <vector>
 
 #ifndef NDEBUG
 //    #define EXPENSIVE_DEBUG_CHECKS
diff --git a/src/libslic3r/TriangleSelector.cpp b/src/libslic3r/TriangleSelector.cpp
index 4d6007530f..7314b00082 100644
--- a/src/libslic3r/TriangleSelector.cpp
+++ b/src/libslic3r/TriangleSelector.cpp
@@ -1,12 +1,31 @@
 #include "TriangleSelector.hpp"
+#include "Geometry.hpp"
 #include "Model.hpp"
 #include "AABBTreeIndirect.hpp"
+#include "Point.hpp"
+#include "libslic3r.h"
+#include "Utils.hpp"
+#include "TriangleMesh.hpp"
 
+#include <algorithm>
+#include <array>
+#include <Eigen/Geometry>
+#include <Eigen/Core>
 #include <boost/container/small_vector.hpp>
 #include <boost/log/trivial.hpp>
+#include <cmath>
+#include <cassert>
 #include <cstddef>
+#include <cstring>
+#include <cstdint>
+#include <cstdlib>
 #include <functional>
+#include <memory>
+#include <optional>
 #include <tbb/parallel_for.h>
+#include <utility>
+#include <vector>
+#include <queue>
 
 #ifndef NDEBUG
 //    #define EXPENSIVE_DEBUG_CHECKS
diff --git a/src/libslic3r/TriangleSelector.hpp b/src/libslic3r/TriangleSelector.hpp
index 344e88cb99..3dd2efdaf0 100644
--- a/src/libslic3r/TriangleSelector.hpp
+++ b/src/libslic3r/TriangleSelector.hpp
@@ -4,7 +4,18 @@
 // #define PRUSASLICER_TRIANGLE_SELECTOR_DEBUG
 
 
+#include <array>
+#include <cassert>
+#include <cereal/access.hpp>
+#include <algorithm>
 #include <cfloat>
+#include <cstdint>
+#include <cstddef>
+#include <vector>
+#include <memory>
+#include <utility>
+#include <optional>
+#include <functional>
 #include "Point.hpp"
 #include "TriangleMesh.hpp"
 
diff --git a/src/libslic3r/TriangleSetSampling.cpp b/src/libslic3r/TriangleSetSampling.cpp
index bb03ff6d75..6ab4290ee6 100644
--- a/src/libslic3r/TriangleSetSampling.cpp
+++ b/src/libslic3r/TriangleSetSampling.cpp
@@ -1,8 +1,13 @@
 #include "TriangleSetSampling.hpp"
+#include <cstddef>
+#include "Point.hpp"
+#include <algorithm>
+#include <cmath>
 #include <map>
 #include <random>
 #include <tbb/parallel_for.h>
 #include <tbb/blocked_range.h>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/TriangleSetSampling.hpp b/src/libslic3r/TriangleSetSampling.hpp
index 28a661d76f..ba20a932eb 100644
--- a/src/libslic3r/TriangleSetSampling.hpp
+++ b/src/libslic3r/TriangleSetSampling.hpp
@@ -2,6 +2,8 @@
 #define SRC_LIBSLIC3R_TRIANGLESETSAMPLING_HPP_
 
 #include <admesh/stl.h>
+#include <vector>
+#include <cstddef>
 #include "libslic3r/Point.hpp"
 
 namespace Slic3r {
diff --git a/src/libslic3r/Triangulation.cpp b/src/libslic3r/Triangulation.cpp
index f290442bf1..63a5b30fe5 100644
--- a/src/libslic3r/Triangulation.cpp
+++ b/src/libslic3r/Triangulation.cpp
@@ -1,10 +1,27 @@
 #include "Triangulation.hpp"
 #include "IntersectionPoints.hpp"
+#include <algorithm>
+#include <CGAL/Constrained_triangulation_face_base_2.h>
+#include <CGAL/Triangulation_data_structure_2.h>
+#include <CGAL/Constrained_triangulation_2.h>
+#include <CGAL/Spatial_sort_traits_adapter_2.h>
+#include <CGAL/property_map.h>
 #include <boost/next_prior.hpp>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Constrained_Delaunay_triangulation_2.h>
 #include <CGAL/Triangulation_vertex_base_with_info_2.h>
 #include <CGAL/spatial_sort.h>
+#include <cstdint>
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Point.hpp"
+#include <utility>
+#include "libslic3r/Line.hpp"
+#include <cassert>
+#include <vector>
+#include <cstddef>
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/ExPolygon.hpp"
+#include <limits>
 
 using namespace Slic3r;
 namespace priv{
diff --git a/src/libslic3r/Triangulation.hpp b/src/libslic3r/Triangulation.hpp
index 6a168d1d20..261f76bba5 100644
--- a/src/libslic3r/Triangulation.hpp
+++ b/src/libslic3r/Triangulation.hpp
@@ -1,6 +1,8 @@
 #ifndef libslic3r_Triangulation_hpp_
 #define libslic3r_Triangulation_hpp_
 
+#include <utility>
+#include <cstdint>
 #include <vector>
 #include <set>
 #include <libslic3r/Point.hpp>
diff --git a/src/libslic3r/Utils.hpp b/src/libslic3r/Utils.hpp
index d142afae92..cc84b93939 100644
--- a/src/libslic3r/Utils.hpp
+++ b/src/libslic3r/Utils.hpp
@@ -1,9 +1,23 @@
 #ifndef slic3r_Utils_hpp_
 #define slic3r_Utils_hpp_
 
+#include <cstddef>
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+#include <cstdint>
+#include <cstdio>
+#include <boost/date_time/posix_time/posix_time_types.hpp>
+#include <boost/date_time/posix_time/posix_time_duration.hpp>
+#include <boost/date_time/posix_time/posix_time_io.hpp>
+#include <algorithm>
 #include <iomanip>
+#include <limits>
 #include <locale>
 #include <set>
+#include <string>
+#include <sstream>
+#include <stdexcept>
 #include <utility>
 #include <functional>
 #include <type_traits>
@@ -19,6 +33,7 @@
 #include "boost/date_time/posix_time/ptime.hpp"
 
 #include <openssl/md5.h>
+#include <vector>
 
 #include "libslic3r.h"
 #include "Semver.hpp"
diff --git a/src/libslic3r/VariableWidth.cpp b/src/libslic3r/VariableWidth.cpp
index c00fc13bdf..db8f0bc373 100644
--- a/src/libslic3r/VariableWidth.cpp
+++ b/src/libslic3r/VariableWidth.cpp
@@ -1,4 +1,16 @@
 #include "VariableWidth.hpp"
+#include "ExtrusionEntity.hpp"
+#include "Polyline.hpp"
+#include "Flow.hpp"
+#include "Line.hpp"
+#include <cassert>
+#include "libslic3r.h"
+#include "Point.hpp"
+#include <cmath>
+#include <vector>
+#include <cstddef>
+#include <utility>
+#include <algorithm>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Zipper.cpp b/src/libslic3r/Zipper.cpp
index aa0c6409e7..4e7e53a1b5 100644
--- a/src/libslic3r/Zipper.cpp
+++ b/src/libslic3r/Zipper.cpp
@@ -1,9 +1,14 @@
+#include <cstring>
+#include <cstddef>
 #include <exception>
 
 #include "Exception.hpp"
 #include "Zipper.hpp"
 #include "miniz_extension.hpp"
 #include <boost/log/trivial.hpp>
+#include <string>
+#include <miniz.h>
+#include <utility>
 #include "I18N.hpp"
 
 //! macro used to mark string used at localization,
diff --git a/src/libslic3r/Zipper.hpp b/src/libslic3r/Zipper.hpp
index bbaf2f05e7..dbd1fb9cc0 100644
--- a/src/libslic3r/Zipper.hpp
+++ b/src/libslic3r/Zipper.hpp
@@ -1,9 +1,11 @@
 #ifndef ZIPPER_HPP
 #define ZIPPER_HPP
 
+#include <cstddef>
 #include <cstdint>
 #include <string>
 #include <memory>
+#include <type_traits>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/calib.cpp b/src/libslic3r/calib.cpp
index 99625ca196..dd6d8592b7 100644
--- a/src/libslic3r/calib.cpp
+++ b/src/libslic3r/calib.cpp
@@ -1,9 +1,23 @@
 #include "calib.hpp"
 #include "BoundingBox.hpp"
 #include "Config.hpp"
+#include "Flow.hpp"
+#include "GCodeWriter.hpp"
+#include "GCode/GCodeProcessor.hpp"
+#include "CustomGCode.hpp"
 #include "Model.hpp"
 #include "GCode.hpp"
+#include "PrintConfig.hpp"
+#include <algorithm>
+#include "Point.hpp"
+#include "libslic3r.h"
 #include <cmath>
+#include <string>
+#include <sstream>
+#include <math.h>
+#include <iomanip>
+#include <vector>
+#include <cstddef>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/calib.hpp b/src/libslic3r/calib.hpp
index abca5e79dc..fd22d4a08f 100644
--- a/src/libslic3r/calib.hpp
+++ b/src/libslic3r/calib.hpp
@@ -1,5 +1,11 @@
 #pragma once
+#include "Point.hpp"
+#include <math.h>
+#include <cmath>
+#include <cstddef>
 #include <string>
+#include <vector>
+#include <utility>
 #define calib_pressure_advance_dd
 
 #include "GCodeWriter.hpp"
diff --git a/src/libslic3r/format.hpp b/src/libslic3r/format.hpp
index c3747677b0..7f3385c3d7 100644
--- a/src/libslic3r/format.hpp
+++ b/src/libslic3r/format.hpp
@@ -14,6 +14,7 @@
 // boost::format may convert to string, see slic3r/GUI/I18N.hpp for a "cook" function to convert wxString to UTF8.
 
 #include <boost/format.hpp>
+#include <string>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/libslic3r.h b/src/libslic3r/libslic3r.h
index c339da566a..bc32a8c60f 100644
--- a/src/libslic3r/libslic3r.h
+++ b/src/libslic3r/libslic3r.h
@@ -2,6 +2,12 @@
 #define _libslic3r_h_
 
 #include "libslic3r_version.h"
+#include <deque>
+#include <iterator>
+#include <functional>
+#include <initializer_list>
+#include <limits>
+#include <utility>
 #define SLIC3R_APP_FULL_NAME "Orca Slicer"
 #define GCODEVIEWER_APP_NAME "OrcaSlicer G-code Viewer"
 #define GCODEVIEWER_APP_KEY  "OrcaSlicerGcodeViewer"
diff --git a/src/libslic3r/miniz_extension.cpp b/src/libslic3r/miniz_extension.cpp
index 4d9b528267..33f24a9a55 100644
--- a/src/libslic3r/miniz_extension.cpp
+++ b/src/libslic3r/miniz_extension.cpp
@@ -1,3 +1,8 @@
+#include <cstddef>
+#include <cstdio>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/file_status.hpp>
 #include <exception>
 #include <cstdint>
 
@@ -6,6 +11,9 @@
 
 #include <boost/filesystem.hpp>
 #include <boost/log/trivial.hpp>
+#include <string>
+#include <miniz.h>
+#include <stdio.h>
 
 #if defined(_MSC_VER) || defined(__MINGW64__)
 #include "boost/nowide/cstdio.hpp"
diff --git a/src/libslic3r/utils.cpp b/src/libslic3r/utils.cpp
index 849d309563..6205f11219 100644
--- a/src/libslic3r/utils.cpp
+++ b/src/libslic3r/utils.cpp
@@ -1,11 +1,43 @@
 #include "Utils.hpp"
+#include "Exception.hpp"
 #include "I18N.hpp"
 
 #include <atomic>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/log/sinks/sync_frontend.hpp>
+#include <boost/log/keywords/severity.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/exception.hpp>
+#include <cstdio>
+#include <boost/log/keywords/file_name.hpp>
+#include <boost/log/keywords/rotation_size.hpp>
+#include <boost/log/keywords/format.hpp>
+#include <boost/log/expressions/formatters/stream.hpp>
+#include <boost/log/expressions/attr.hpp>
+#include <boost/log/expressions/formatters/date_time.hpp>
+#include <boost/date_time/posix_time/ptime.hpp>
+#include <boost/log/attributes/current_thread_id.hpp>
+#include <boost/log/expressions/message.hpp>
+#include <boost/log/keywords/auto_flush.hpp>
+#include <initializer_list>
+#include <boost/filesystem/file_status.hpp>
+#include <cstdint>
+#include <boost/filesystem/directory.hpp>
+#include <fstream>
+#include <iosfwd>
+#include <cstring>
+#include <cassert>
+#include <boost/locale/conversion.hpp>
+#include <iterator>
+#include <functional>
+#include <exception>
 #include <locale>
 #include <ctime>
 #include <cstdarg>
 #include <iostream>
+#include <map>
+#include <openssl/md5.h>
+#include <set>
 #include <stdio.h>
 #include <filesystem>
 #include <sstream>
@@ -14,7 +46,12 @@
 #include <iomanip>
 #include <algorithm>
 #include <cmath>
+#include <string>
+#include <system_error>
+#include <string_view>
+#include <vector>
 
+#include "Semver.hpp"
 #include "format.hpp"
 #include "Platform.hpp"
 #include "Time.hpp"
@@ -23,6 +60,7 @@
 // (get_version_from_json) and the preset cache stamp (VendorCacheFile).
 #include "Preset.hpp"
 #include "PresetCacheFormat.hpp"
+#include "libslic3r_version.h"
 
 #ifdef __APPLE__
 #include "MacUtils.hpp"