Re-Add libslic3r Includes After the Clipper2 2.0.1 Migration

Rebasing onto main took main's version of the files the Clipper2 migration rewrote, so their added includes are restored here, along with includes for main's new code. Clipper2's individual headers are now ignored by clang-tidy: they only build the Z variant through clipper2_z.hpp, which defines USINGZ first, so including clipper.core.h and the like directly broke ClipperZUtils.cpp.

.clang-tidy

@@ -14,7 +14,9 @@ CheckOptions:
   # admesh's stl.h, which the include path also exposes without its directory.
   # Clipper's own clipper.hpp is only included through libslic3r/clipper.hpp or
   # clipper_z.hpp, which configure it first, and Boost.Polygon's headers only
-  # work through boost/polygon/polygon.hpp or voronoi.hpp. minilzo's config
+  # work through boost/polygon/polygon.hpp or voronoi.hpp. Clipper2's headers
+  # are included through clipper2/clipper.h, or clipper2_z.hpp, which defines
+  # USINGZ first. minilzo's config
   # headers are internal to minilzo.h.
   # FFmpeg's C headers are left alone because they are only included inside
   # extern "C", which an inserted include would miss. OS-specific headers (GLib,
@@ -59,4 +61,5 @@ CheckOptions:
     png(lib)?conf\.h;
     mcut[/\\]platform\.h;
     boost[/\\]polygon[/\\].*;
+    clipper2[/\\]clipper\.(core|engine|offset|minkowski|rectclip|export|triangulation|version)\.h;
     lzo(conf|defs)\.h

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>

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>
 

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>

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 {

src/libslic3r/AStar.hpp

@@ -1,7 +1,11 @@
 #ifndef ASTAR_HPP
 #define ASTAR_HPP
 
+#include <cassert>
 #include <cmath> // std::isinf() is here
+#include <type_traits>
+#include <cstddef>
+#include <limits>
 #include <unordered_map>
 
 #include "libslic3r/MutablePriorityQueue.hpp"

src/libslic3r/Algorithm/LineSplit.cpp

@@ -1,8 +1,20 @@
 #include "LineSplit.hpp"
 
 #include "AABBTreeLines.hpp"
+#include "libslic3r/ClipperUtils.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
 

src/libslic3r/Algorithm/LineSplit.hpp

@@ -2,6 +2,12 @@
 #define SRC_LIBSLIC3R_ALGORITHM_LINE_SPLIT_HPP_
 
 #include "ClipperZUtils.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Point.hpp"
+#include <cstdint>
+#include <cstddef>
+#include <vector>
+#include "libslic3r/ExPolygon.hpp"
 
 namespace Slic3r {
 namespace Algorithm {

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 {

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 {

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>

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>

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"

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
 {

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 {

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

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"
 

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

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

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

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"

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

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"

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

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
 

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"

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
 {

src/libslic3r/Arachne/utils/ExtrusionLine.cpp

@@ -2,11 +2,17 @@
 //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/ClipperZUtils.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Point.hpp"
 #include "libslic3r/Arachne/utils/ExtrusionJunction.hpp"
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/ExtrusionEntity.hpp"

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 {

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"

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
 {

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"
 

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 {
 

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 {
 

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 {
 

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;

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
 {

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 {
 

src/libslic3r/ArcFitter.hpp

@@ -2,6 +2,9 @@
 #define slic3r_ArcFitter_hpp_
 
 #include "Circle.hpp"
+#include <cstddef>
+#include "Point.hpp"
+#include <vector>
 
 namespace Slic3r {
 

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

src/libslic3r/Arrange.hpp

@@ -2,8 +2,17 @@
 #define ARRANGE_HPP
 
 #include "ExPolygon.hpp"
+#include "Point.hpp"
+#include "Polygon.hpp"
 #include "PrintConfig.hpp"
 #include "Print.hpp"
+#include <cmath>
+#include "libslic3r.h"
+#include <vector>
+#include <string>
+#include <functional>
+#include <iostream>
+#include <ostream>
 
 #define BED_SHRINK_SEQ_PRINT 5
 

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>
 

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 {
 

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 {
 

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 {
 

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

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 {

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 {

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 {
 

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 {
 

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 {
 

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>

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 {
 

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>

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 {
 

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>
 

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 {
 

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 {
 

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 {
 

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>

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 {
 

src/libslic3r/CAD/ThreadStandards.cpp

@@ -1,4 +1,6 @@
 #include "libslic3r/CAD/ThreadStandards.hpp"
+#include <vector>
+#include <string>
 
 namespace Slic3r {
 

src/libslic3r/CSGMesh/CSGMesh.hpp

@@ -2,7 +2,11 @@
 #define CSGMESH_HPP
 
 #include <libslic3r/AnyPtr.hpp>
+#include <libslic3r/Point.hpp>
+#include <libslic3r/TriangleMesh.hpp>
 #include <admesh/stl.h>
+#include <string>
+#include <utility>
 
 namespace Slic3r { namespace csg {
 

src/libslic3r/CSGMesh/CSGMeshCopy.hpp

@@ -1,7 +1,11 @@
 #ifndef CSGMESHCOPY_HPP
 #define CSGMESHCOPY_HPP
 
+#include "libslic3r/AnyPtr.hpp"
 #include "CSGMesh.hpp"
+#include "libslic3r/libslic3r.h"
+#include <utility>
+#include <cstddef>
 
 namespace Slic3r { namespace csg {
 

src/libslic3r/CSGMesh/ModelToCSGMesh.hpp

@@ -3,9 +3,13 @@
 
 #include "CSGMesh.hpp"
 
+#include "libslic3r/Point.hpp"
+#include "libslic3r/TriangleMesh.hpp"
 #include "libslic3r/Model.hpp"
 #include "libslic3r/SLA/Hollowing.hpp"
 #include "libslic3r/MeshSplitImpl.hpp"
+#include <utility>
+#include <memory>
 
 namespace Slic3r { namespace csg {
 

src/libslic3r/CSGMesh/PerformCSGMeshBooleans.hpp

@@ -1,11 +1,17 @@
 #ifndef PERFORMCSGMESHBOOLEANS_HPP
 #define PERFORMCSGMESHBOOLEANS_HPP
 
+#include <cstddef>
 #include <stack>
+#include <utility>
+#include <tuple>
 #include <vector>
 
+#include <boost/log/trivial.hpp>
+
 #include "CSGMesh.hpp"
 
+#include "libslic3r/libslic3r.h"
 #include "libslic3r/Execution/ExecutionTBB.hpp"
 //#include "libslic3r/Execution/ExecutionSeq.hpp"
 #include "libslic3r/MeshBoolean.hpp"

src/libslic3r/CSGMesh/SliceCSGMesh.hpp

@@ -3,8 +3,16 @@
 
 #include "CSGMesh.hpp"
 
+#include <cstddef>
+#include <functional>
+#include <cassert>
 #include <stack>
+#include <vector>
+#include <utility>
 
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Execution/Execution.hpp"
 #include "libslic3r/TriangleMeshSlicer.hpp"
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/Execution/ExecutionTBB.hpp"

src/libslic3r/CSGMesh/TriangleMeshAdapter.hpp

@@ -3,6 +3,7 @@
 
 #include "CSGMesh.hpp"
 
+#include "libslic3r/Point.hpp"
 #include "libslic3r/TriangleMesh.hpp"
 
 namespace Slic3r { namespace csg {

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>

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

src/libslic3r/Circle.hpp

@@ -3,6 +3,8 @@
 
 #include "Point.hpp"
 #include "Line.hpp"
+#include "libslic3r.h"
+#include <cmath>
 
 namespace Slic3r {
 

src/libslic3r/ClipperUtils.cpp

@@ -1,14 +1,29 @@
 #include <algorithm>
 #include <array>
+#include <cstddef>
+#include <cstdint>
+#include <cstdlib>
+#include <cassert>
+#include <cmath>
 #include <limits>
 #include <numeric>
 #include <unordered_map>
 
 #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"
 
 #include <clipper2/clipper.h>
+#include <utility>
+#include <vector>
 
 // #define CLIPPER_UTILS_DEBUG
 

src/libslic3r/ClipperUtils.hpp

@@ -1,10 +1,17 @@
 #ifndef slic3r_ClipperUtils_hpp_
 #define slic3r_ClipperUtils_hpp_
 
+#include "Point.hpp"
+#include "Polyline.hpp"
+#include "Line.hpp"
 #include "libslic3r.h"
 #include "ExPolygon.hpp"
 #include "Polygon.hpp"
 #include "Surface.hpp"
+#include <cstddef>
+#include <iterator>
+#include <cassert>
+#include <vector>
 
 namespace Slic3r {
 

src/libslic3r/ClipperZUtils.cpp

@@ -1,6 +1,8 @@
 #include "ClipperZUtils.hpp"
+#include "ClipperUtils.hpp"
 
 #include <clipper2/clipper2_z.hpp>
+#include <cstddef>
 
 namespace Slic3r {
 namespace ClipperZUtils {

src/libslic3r/ClipperZUtils.hpp

@@ -1,8 +1,13 @@
 #ifndef slic3r_ClipperZUtils_hpp_
 #define slic3r_ClipperZUtils_hpp_
 
+#include "libslic3r.h"
+#include <cstddef>
+#include <algorithm>
+#include <cassert>
 #include <functional>
 #include <numeric>
+#include <utility>
 #include <vector>
 
 #include <libslic3r/ClipperUtils.hpp>

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;
 

src/libslic3r/ColorDecomposeRecipe.cpp

@@ -9,7 +9,9 @@
 #include <cstdio>
 #include <fstream>
 #include <limits>
+#include <string>
 #include <utility>
+#include <vector>
 
 namespace Slic3r {
 namespace {

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;

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"

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 {
 

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 {
 

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>
 

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

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"

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 {
 

src/libslic3r/CutUtils.hpp

@@ -5,6 +5,7 @@
 #include "Point.hpp"
 #include "Model.hpp"
 
+#include <optional>
 #include <vector>
 
 namespace Slic3r {

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"

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 {

src/libslic3r/ElephantFootCompensation.cpp

@@ -1,3 +1,6 @@
+#include "Point.hpp"
+#include "BoundingBox.hpp"
+#include "Polygon.hpp"
 #include "libslic3r.h"
 #include "ClipperUtils.hpp"
 #include "EdgeGrid.hpp"
@@ -8,8 +11,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
 

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

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

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 {

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 {
 

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 {

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 {
 

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>
 

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

src/libslic3r/ExPolygonsIndex.hpp

@@ -2,6 +2,8 @@
 #define slic3r_ExPolygonsIndex_hpp_
 
 #include "ExPolygon.hpp"
+#include <cstdint>
+#include <vector>
 namespace Slic3r {
 
 /// <summary>

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 {

src/libslic3r/Execution/Execution.hpp

@@ -1,6 +1,7 @@
 #ifndef EXECUTION_HPP
 #define EXECUTION_HPP
 
+#include <functional>
 #include <type_traits>
 #include <utility>
 #include <cstddef>