Remove Unused Project Includes and Forward-Declare Where a Type Is Only Referenced

Generated with include-what-you-use and applied conservatively. Only OrcaSlicer's own headers, the ones under src/ and tests/, are removed or forward-declared; standard-library and third-party includes are left alone. An include is removed only when both the Release and the Debug configuration leave it unused, never from inside a conditional block, and never from a file with platform-specific blocks, which only gain includes. Files whose only use of a header sits behind a feature or debug macro (libvgcode's OpenGL ES and marker code, the ARACHNE/TESTS_EXPORT_SVGS debug output) keep their includes.

clonable_ptr.hpp gains #pragma once; it had no include guard and was only safe while Config.hpp was its sole includer.

src/OrcaSlicer.cpp

@@ -140,6 +140,18 @@ using namespace nlohmann;
 #include "slic3r/GUI/Plater.hpp"
 #include "slic3r/GUI/GuiColor.hpp"
 #include <GLFW/glfw3.h>
+#include "libslic3r/AppConfig.hpp"
+#include "libslic3r/BuildVolume.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/Exception.hpp"
+#include "libslic3r/GCode/GCodeProcessor.hpp"
+#include "libslic3r/GCode/ToolOrdering.hpp"
+#include "libslic3r/ObjectID.hpp"
+#include "libslic3r/PresetBundle.hpp"
+#include "libslic3r/ProjectTask.hpp"
+#include "slic3r/GUI/GUI_ObjectList.hpp"
+#include "slic3r/GUI/I18N.hpp"
+#include "slic3r/GUI/Jobs/SendJob.hpp"
 
 #ifdef __WXGTK__
 #if __has_include(<X11/Xlib.h>)

src/OrcaSlicer.hpp

@@ -5,7 +5,6 @@
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/PrintConfig.hpp"
 #include "libslic3r/Format/bbs_3mf.hpp"
-#include "libslic3r/GCode/ThumbnailData.hpp"
 #include <set>
 #include <string>
 #include <vector>
@@ -13,6 +12,10 @@
 #include "libslic3r/Config.hpp"
 #include "libslic3r/Model.hpp"
 
+namespace Slic3r { class Preset; }
+namespace Slic3r { struct PlateBBoxData; }
+namespace Slic3r { struct ThumbnailData; }
+
 namespace Slic3r {
 
 namespace IO {

src/dev-utils/OrcaSlicer_profile_validator.cpp

@@ -57,6 +57,8 @@
 #include <iostream>
 #include <set>
 #include <string>
+#include "libslic3r/AppConfig.hpp"
+#include "libslic3r/Format/STEP.hpp"
 
 using namespace Slic3r;
 namespace po = boost::program_options;

src/dev-utils/profile_include_dump.cpp

@@ -26,6 +26,7 @@
 #include <stdexcept>
 #include <string>
 #include <vector>
+#include "libslic3r/PrintConfig.hpp"
 
 using namespace Slic3r;
 namespace fs = boost::filesystem;

src/libslic3r/Algorithm/RegionExpansion.cpp

@@ -20,6 +20,7 @@
 #include <numeric>
 #include <vector>
 #include <utility>
+#include "libslic3r/BoundingBox.hpp"
 
 namespace Slic3r {
 namespace Algorithm {

src/libslic3r/Arachne/SkeletalTrapezoidation.cpp

@@ -28,6 +28,8 @@
 #include "libslic3r/Arachne/SkeletalTrapezoidationJoint.hpp"
 #include "libslic3r/Arachne/utils/ExtrusionJunction.hpp"
 #include "libslic3r/Arachne/utils/ExtrusionLine.hpp"
+#include "libslic3r/Arachne/SkeletalTrapezoidationGraph.hpp"
+#include "libslic3r/Arachne/utils/PolygonsSegmentIndex.hpp"
 
 #ifndef NDEBUG
     #include "libslic3r/EdgeGrid.hpp"

src/libslic3r/Arachne/SkeletalTrapezoidation.hpp

@@ -11,7 +11,6 @@
 #include <list>
 #include <vector>
 
-#include "utils/HalfEdgeGraph.hpp"
 #include "utils/PolygonsSegmentIndex.hpp"
 #include "utils/ExtrusionJunction.hpp"
 #include "utils/ExtrusionLine.hpp"

src/libslic3r/Arachne/WallToolPaths.hpp

@@ -11,7 +11,6 @@
 #include <vector>
 #include <utility>
 
-#include "BeadingStrategy/BeadingStrategyFactory.hpp"
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Point.hpp"
 #include "utils/ExtrusionLine.hpp"

src/libslic3r/Arachne/utils/ExtrusionLine.cpp

@@ -14,7 +14,6 @@
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Point.hpp"
 #include "libslic3r/Arachne/utils/ExtrusionJunction.hpp"
-#include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/ExtrusionEntity.hpp"
 #include "libslic3r/Line.hpp"
 #include "libslic3r/Polygon.hpp"

src/libslic3r/Arachne/utils/ExtrusionLine.hpp

@@ -19,9 +19,7 @@
 #include "ExtrusionJunction.hpp"
 #include "../../Polyline.hpp"
 #include "../../Polygon.hpp"
-#include "../../BoundingBox.hpp"
 #include "../../ExtrusionEntity.hpp"
-#include "../../Flow.hpp"
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Point.hpp"
 

src/libslic3r/Arachne/utils/PolylineStitcher.cpp

@@ -4,7 +4,6 @@
 #include "PolylineStitcher.hpp"
 
 #include "ExtrusionLine.hpp"
-#include "libslic3r/Point.hpp"
 #include "libslic3r/Arachne/utils/PolygonsPointIndex.hpp"
 #include "libslic3r/Polygon.hpp"
 

src/libslic3r/Arachne/utils/PolylineStitcher.hpp

@@ -15,7 +15,6 @@
 
 #include "SparsePointGrid.hpp"
 #include "PolygonsPointIndex.hpp"
-#include "../../Polygon.hpp"
 #include "libslic3r/Point.hpp"
 #include "libslic3r/libslic3r.h"
 

src/libslic3r/Arrange.cpp

@@ -45,6 +45,7 @@
 #include <boost/log/trivial.hpp>
 #include <boost/multiprecision/integer.hpp>
 #include <boost/rational.hpp>
+#include "MultiMaterialSegmentation.hpp"
 
 namespace libnest2d {
 #if !defined(_MSC_VER) && defined(__SIZEOF_INT128__) && !defined(__APPLE__)

src/libslic3r/Brim.cpp

@@ -32,6 +32,11 @@
 #include <boost/log/trivial.hpp>
 #include <utility>
 #include <vector>
+#include "Config.hpp"
+#include "ExtrusionEntityCollection.hpp"
+#include "MultiMaterialSegmentation.hpp"
+#include "SurfaceCollection.hpp"
+#include "TriangleMesh.hpp"
 
 #ifndef NDEBUG
     // #define BRIM_DEBUG_TO_SVG

src/libslic3r/CAD/CadDocument.cpp

@@ -91,6 +91,10 @@
 #include <string>
 #include <vector>
 #include <utility>
+#include "libslic3r/Color.hpp"
+#include "libslic3r/TriangleMesh.hpp"
+
+class Geom2d_TrimmedCurve;
 
 namespace Slic3r {
 

src/libslic3r/CAD/SketchEngine.cpp

@@ -64,6 +64,8 @@
 #include <vector>
 #include <utility>
 
+class Geom_TrimmedCurve;
+
 namespace Slic3r {
 
 // Single source of truth for the weld tolerance the viewport and the kernel share.

src/libslic3r/CAD/SketchSolver.cpp

@@ -11,6 +11,7 @@
 #include <unordered_map>
 #include <vector>
 #include <utility>
+#include "libslic3r/Point.hpp"
 
 namespace Slic3r {
 

src/libslic3r/CAD/SketchSolver.hpp

@@ -6,9 +6,12 @@
 // hand-rolled SketchConstraints: full constraint set, real DoF counting, and
 // over-constrained (bad-constraint) detection. Solves on a fixed 2D XY workplane.
 
-#include "libslic3r/CAD/SketchEngine.hpp"
 #include <vector>
 
+namespace Slic3r { enum class SketchPointRole; }
+namespace Slic3r { struct SketchEntity; }
+namespace Slic3r { struct SketchEntityConstraintDef; }
+
 namespace Slic3r {
 
 struct SketchSolveResult {

src/libslic3r/Circle.cpp

@@ -5,10 +5,8 @@
 #include <cstddef>
 #include <utility>
 #include <math.h>
-#include "Geometry.hpp"
 #include "Point.hpp"
 #include "Line.hpp"
-#include "Polygon.hpp"
 #include "libslic3r.h"
 
 

src/libslic3r/Circle.hpp

@@ -2,10 +2,11 @@
 #define slic3r_Circle_hpp_
 
 #include "Point.hpp"
-#include "Line.hpp"
 #include "libslic3r.h"
 #include <cmath>
 
+namespace Slic3r { class Line; }
+
 namespace Slic3r {
 
 constexpr double ZERO_TOLERANCE = 0.000005;

src/libslic3r/ClipperUtils.cpp

@@ -12,7 +12,6 @@
 #include "ClipperUtils.hpp"
 #include "BoundingBox.hpp"
 #include "ExPolygon.hpp"
-#include "Geometry.hpp"
 #include "Point.hpp"
 #include "Polygon.hpp"
 #include "Polyline.hpp"
@@ -24,6 +23,7 @@
 #include <clipper2/clipper.h>
 #include <utility>
 #include <vector>
+#include "ExtrusionEntity.hpp"
 
 // #define CLIPPER_UTILS_DEBUG
 

src/libslic3r/ClipperZUtils.cpp

@@ -3,6 +3,7 @@
 
 #include <clipper2/clipper2_z.hpp>
 #include <cstddef>
+#include "Point.hpp"
 
 namespace Slic3r {
 namespace ClipperZUtils {

src/libslic3r/ClipperZUtils.hpp

@@ -13,6 +13,7 @@
 #include <libslic3r/ClipperUtils.hpp>
 #include <libslic3r/Point.hpp>
 #include <libslic3r/ExPolygon.hpp>
+#include "Polygon.hpp"
 
 namespace Slic3r {
 

src/libslic3r/ContourZ.cpp

@@ -14,6 +14,9 @@
 #include <math.h>
 #include <string>
 #include <utility>
+#include "Config.hpp"
+#include "Polyline.hpp"
+#include "PrintConfig.hpp"
 
 namespace Slic3r {
 

src/libslic3r/CustomGCode.cpp

@@ -1,7 +1,4 @@
 #include "CustomGCode.hpp"
-#include "Config.hpp"
-#include "GCode.hpp"
-#include "GCodeWriter.hpp"
 #include <vector>
 #include <utility>
 #include <cstddef>

src/libslic3r/CutSurface.hpp

@@ -6,7 +6,9 @@
 #include <vector>
 #include <admesh/stl.h> // indexed_triangle_set
 #include "ExPolygon.hpp"
-#include "Emboss.hpp" // IProjection
+
+namespace Slic3r::Emboss { class IProject3d; }
+namespace Slic3r::Emboss { class IProjection; }
 
 namespace Slic3r{
 

src/libslic3r/CutUtils.cpp

@@ -19,6 +19,7 @@
 #include <optional>
 #include <math.h>
 #include <cmath>
+#include "BoundingBox.hpp"
 
 namespace Slic3r {
 

src/libslic3r/ElephantFootCompensation.cpp

@@ -8,7 +8,6 @@
 #include "ElephantFootCompensation.hpp"
 #include "Flow.hpp"
 #include "Geometry.hpp"
-#include "SVG.hpp"
 #include "Utils.hpp"
 
 #include <algorithm>
@@ -19,6 +18,7 @@
 #include <utility>
 #include <math.h>
 #include <limits>
+#include "ExtrusionEntity.hpp"
 
 // #define CONTOUR_DISTANCE_DEBUG_SVG
 

src/libslic3r/ElephantFootCompensation.hpp

@@ -1,7 +1,6 @@
 #ifndef slic3r_ElephantFootCompensation_hpp_
 #define slic3r_ElephantFootCompensation_hpp_
 
-#include "libslic3r.h"
 #include "ExPolygon.hpp"
 #include <vector>
 

src/libslic3r/ExPolygon.cpp

@@ -1,6 +1,5 @@
 #include "BoundingBox.hpp"
 #include "ExPolygon.hpp"
-#include "Exception.hpp"
 #include "Geometry/MedialAxis.hpp"
 #include "Point.hpp"
 #include "MultiPoint.hpp"
@@ -8,7 +7,6 @@
 #include "Line.hpp"
 #include "ClipperUtils.hpp"
 #include "Polyline.hpp"
-#include "SVG.hpp"
 #include "libslic3r.h"
 #include <algorithm>
 #include <cassert>

src/libslic3r/ExPolygonsIndex.cpp

@@ -5,6 +5,7 @@
 #include <vector>
 #include <utility>
 #include <algorithm>
+#include "Polygon.hpp"
 using namespace Slic3r;
 
 // IMPROVE: use one dimensional vector for polygons offset with searching by std::lower_bound

src/libslic3r/Extruder.cpp

@@ -6,6 +6,7 @@
 #include <cassert>
 #include <algorithm>
 #include <cmath>
+#include "Config.hpp"
 
 namespace Slic3r {
 

src/libslic3r/Extruder.hpp

@@ -2,7 +2,6 @@
 #define slic3r_Extruder_hpp_
 
 #include "libslic3r.h"
-#include "Point.hpp"
 #include <vector>
 
 namespace Slic3r {

src/libslic3r/ExtrusionEntity.cpp

@@ -2,7 +2,6 @@
 #include "ExtrusionEntityCollection.hpp"
 #include "ExPolygon.hpp"
 #include "ClipperUtils.hpp"
-#include "Extruder.hpp"
 #include "Flow.hpp"
 #include <algorithm>
 #include <cassert>
@@ -21,6 +20,7 @@
 #include <string_view>
 #include "Utils.hpp"
 #include "libslic3r.h"
+#include "ArcFitter.hpp"
 
 #define L(s) (s)
 

src/libslic3r/ExtrusionEntityCollection.cpp

@@ -1,6 +1,5 @@
 #include "ExtrusionEntityCollection.hpp"
 #include "ExtrusionEntity.hpp"
-#include "Point.hpp"
 #include "Polygon.hpp"
 #include "ShortestPath.hpp"
 #include <algorithm>

src/libslic3r/ExtrusionSimulator.cpp

@@ -25,6 +25,7 @@
 #include "ExtrusionEntity.hpp"
 #include "libslic3r.h"
 #include "ExtrusionSimulator.hpp"
+#include "Polyline.hpp"
 
 #ifndef M_PI
 #define M_PI 3.1415926535897932384626433832795

src/libslic3r/ExtrusionSimulator.hpp

@@ -2,7 +2,6 @@
 #define slic3r_ExtrusionSimulator_hpp_
 
 #include "Point.hpp"
-#include "libslic3r.h"
 #include "ExtrusionEntity.hpp"
 #include "BoundingBox.hpp"
 

src/libslic3r/FaceDetector.cpp

@@ -2,7 +2,6 @@
 #include "BoundingBox.hpp"
 #include "TriangleMesh.hpp"
 #include "SLA/IndexedMesh.hpp"
-#include "Model.hpp"
 #include <cstdint>
 #include <cstddef>
 #include <unordered_set>

src/libslic3r/Feature/FuzzySkin/FuzzySkin.hpp

@@ -5,10 +5,12 @@
 #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 { class PerimeterGenerator; }
+namespace Slic3r { struct FuzzySkinConfig; }
+namespace Slic3r::Arachne { struct ExtrusionLine; }
+
 namespace Slic3r::Feature::FuzzySkin {
 
 void fuzzy_polyline(Points& poly, bool closed, coordf_t slice_z, const FuzzySkinConfig& cfg);

src/libslic3r/Feature/Interlocking/InterlockingGenerator.cpp

@@ -18,6 +18,10 @@
 #include <algorithm>
 #include <unordered_set>
 #include <vector>
+#include "libslic3r/Config.hpp"
+#include "libslic3r/Print.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/SurfaceCollection.hpp"
 
 namespace std {
 template<> struct hash<Slic3r::GridPoint3>

src/libslic3r/Feature/Interlocking/InterlockingGenerator.hpp

@@ -6,14 +6,15 @@
 
 #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>
+#include "libslic3r/MultiMaterialSegmentation.hpp"
+
+namespace Slic3r { class PrintObject; }
 
 namespace Slic3r {
 

src/libslic3r/Feature/Interlocking/VoxelUtils.cpp

@@ -10,13 +10,13 @@
 #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>
+#include "libslic3r/BoundingBox.hpp"
 
 namespace Slic3r
 {

src/libslic3r/Fill/Fill.cpp

@@ -41,6 +41,13 @@
 #include "libslic3r/Polygon.hpp"
 #include "libslic3r/Polyline.hpp"
 #include "libslic3r.h"
+#include "libslic3r/ExtrusionEntityCollection.hpp"
+#include "libslic3r/MultiMaterialSegmentation.hpp"
+#include "libslic3r/Slicing.hpp"
+#include "libslic3r/SurfaceCollection.hpp"
+
+namespace Slic3r::FillAdaptive { struct Octree; }
+namespace Slic3r::FillLightning { class Generator; }
 
 namespace Slic3r {
 

src/libslic3r/Fill/Fill3DHoneycomb.cpp

@@ -16,6 +16,7 @@
 #include "libslic3r/Polyline.hpp"
 #include <utility>
 #include "Fill3DHoneycomb.hpp"
+#include "libslic3r/Polygon.hpp"
 
 namespace Slic3r {
 

src/libslic3r/Fill/Fill3DHoneycomb.hpp

@@ -11,6 +11,8 @@
 #include "libslic3r/Point.hpp"
 #include "libslic3r/Polyline.hpp"
 
+namespace Slic3r { class Point; }
+
 namespace Slic3r {
 
 class Fill3DHoneycomb : public Fill

src/libslic3r/Fill/FillAdaptive.cpp

@@ -49,6 +49,10 @@
 #include <boost/geometry/geometries/point.hpp>
 #include <boost/geometry/geometries/segment.hpp>
 #include <boost/geometry/index/rtree.hpp>
+#include "libslic3r/Fill/FillAdaptive.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/SurfaceCollection.hpp"
 
 
 namespace Slic3r {

src/libslic3r/Fill/FillBase.cpp

@@ -48,6 +48,7 @@
 #include "libslic3r/Line.hpp"
 #include "libslic3r/Polygon.hpp"
 #include "libslic3r/Utils.hpp"
+#include "libslic3r/Flow.hpp"
 // #define INFILL_DEBUG_OUTPUT
 
 namespace Slic3r {

src/libslic3r/Fill/FillBase.hpp

@@ -24,10 +24,11 @@
 #include "../PrintConfig.hpp"
 #include "../Flow.hpp"
 #include "../ExtrusionEntity.hpp"
-#include "../ExtrusionEntityCollection.hpp"
-#include "../ShortestPath.hpp"
 #include "libslic3r/Polyline.hpp"
 #include "libslic3r/Polygon.hpp"
+#include "libslic3r/Point.hpp"
+
+namespace Slic3r { class ExtrusionEntityCollection; }
 
 namespace Slic3r {
 

src/libslic3r/Fill/FillConcentric.cpp

@@ -20,6 +20,7 @@
 #include <libslic3r/ShortestPath.hpp>
 #include <utility>
 #include <vector>
+#include "libslic3r/ExtrusionEntity.hpp"
 
 namespace Slic3r {
 

src/libslic3r/Fill/FillConcentric.hpp

@@ -4,9 +4,10 @@
 #include "libslic3r/ExPolygon.hpp"
 #include "FillBase.hpp"
 #include <utility>
-#include "libslic3r/Point.hpp"
 #include "libslic3r/Polyline.hpp"
 
+namespace Slic3r { class Point; }
+
 namespace Slic3r {
 
 class FillConcentric : public Fill

src/libslic3r/Fill/FillConcentricInternal.cpp

@@ -19,6 +19,11 @@
 #include <libslic3r/ShortestPath.hpp>
 #include <vector>
 #include <utility>
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/Flow.hpp"
+#include "libslic3r/PrintConfig.hpp"
+
+namespace Slic3r { class Surface; }
 
 namespace Slic3r {
 

src/libslic3r/Fill/FillConcentricInternal.hpp

@@ -4,6 +4,8 @@
 #include "libslic3r/ExtrusionEntity.hpp"
 #include "FillBase.hpp"
 
+namespace Slic3r { class Surface; }
+
 namespace Slic3r {
 
 class FillConcentricInternal : public Fill

src/libslic3r/Fill/FillCornerSmoothing.hpp

@@ -7,7 +7,6 @@
 #include <utility>
 #include <vector>
 
-#include "../libslic3r.h"
 #include "../Point.hpp"
 #include "../Polygon.hpp"
 #include "../Polyline.hpp"

src/libslic3r/Fill/FillCrossHatch.cpp

@@ -1,6 +1,4 @@
 #include "../ClipperUtils.hpp"
-#include "../ShortestPath.hpp"
-#include "../Surface.hpp"
 #include <algorithm>
 #include <cmath>
 #include <cstddef>
@@ -13,6 +11,7 @@
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Polyline.hpp"
 #include "FillCrossHatch.hpp"
+#include "libslic3r/Polygon.hpp"
 
 namespace Slic3r {
 

src/libslic3r/Fill/FillCrossHatch.hpp

@@ -4,13 +4,13 @@
 #include <map>
 #include <utility>
 
-#include "../libslic3r.h"
 
 #include "libslic3r/ExPolygon.hpp"
 #include "FillBase.hpp"
-#include "libslic3r/Point.hpp"
 #include "libslic3r/Polyline.hpp"
 
+namespace Slic3r { class Point; }
+
 namespace Slic3r {
 
 class FillCrossHatch : public Fill

src/libslic3r/Fill/FillGyroid.cpp

@@ -1,7 +1,5 @@
 #include "../ClipperUtils.hpp"
 #include "../MarchingSquares.hpp"
-#include "../ShortestPath.hpp"
-#include "../Surface.hpp"
 #include <cmath>
 #include <algorithm>
 #include <cstddef>
@@ -18,6 +16,7 @@
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Polyline.hpp"
 #include "FillGyroid.hpp"
+#include "libslic3r/Polygon.hpp"
 
 // ---------------------------------------------------------------------------
 // Marching-squares scalar field for the optimized gyroid branch.

src/libslic3r/Fill/FillGyroid.hpp

@@ -1,14 +1,14 @@
 #ifndef slic3r_FillGyroid_hpp_
 #define slic3r_FillGyroid_hpp_
 
-#include "../libslic3r.h"
 
 #include "libslic3r/ExPolygon.hpp"
 #include "FillBase.hpp"
 #include <utility>
-#include "libslic3r/Point.hpp"
 #include "libslic3r/Polyline.hpp"
 
+namespace Slic3r { class Point; }
+
 namespace Slic3r {
 
 class FillGyroid : public Fill

src/libslic3r/Fill/FillHoneycomb.cpp

@@ -1,6 +1,4 @@
 #include "../ClipperUtils.hpp"
-#include "../ShortestPath.hpp"
-#include "../Surface.hpp"
 
 #include "libslic3r/Fill/FillBase.hpp"
 #include "libslic3r/ExPolygon.hpp"
@@ -14,6 +12,7 @@
 #include <cstddef>
 #include <algorithm>
 #include "FillHoneycomb.hpp"
+#include "libslic3r/Polygon.hpp"
 
 namespace Slic3r {
 

src/libslic3r/Fill/FillLightning.cpp

@@ -1,6 +1,5 @@
 #include "../ClipperUtils.hpp"
 #include "../Print.hpp"
-#include "../ShortestPath.hpp"
 #include "libslic3r/ExPolygon.hpp"
 #include "libslic3r/Fill/Lightning/Layer.hpp"
 #include "FillBase.hpp"
@@ -13,6 +12,7 @@
 #include "libslic3r/libslic3r.h"
 #include <algorithm>
 #include <functional>
+#include "libslic3r/Fill/FillLightning.hpp"
 
 namespace Slic3r::FillLightning {
 

src/libslic3r/Fill/FillLightning.hpp

@@ -6,9 +6,10 @@
 #include <memory>
 #include <functional>
 #include <utility>
-#include "libslic3r/Point.hpp"
 #include "libslic3r/Polyline.hpp"
 
+namespace Slic3r { class Point; }
+
 namespace Slic3r {
 
 class PrintObject;

src/libslic3r/Fill/FillLine.cpp

@@ -1,7 +1,6 @@
 #include "../ClipperUtils.hpp"
 #include "../ExPolygon.hpp"
 #include "../ShortestPath.hpp"
-#include "../Surface.hpp"
 #include "libslic3r/Fill/FillBase.hpp"
 #include <utility>
 #include "libslic3r/Point.hpp"
@@ -15,6 +14,8 @@
 #include <cstdlib>
 
 #include "FillLine.hpp"
+#include "libslic3r/ExtrusionEntity.hpp"
+#include "libslic3r/Polygon.hpp"
 
 namespace Slic3r {
 

src/libslic3r/Fill/FillPlanePath.cpp

@@ -1,6 +1,5 @@
 #include "../ClipperUtils.hpp"
 #include "../ShortestPath.hpp"
-#include "../Surface.hpp"
 
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/Fill/FillBase.hpp"
@@ -18,6 +17,7 @@
 #include <cstddef>
 #include <type_traits>
 #include "FillPlanePath.hpp"
+#include "libslic3r/Config.hpp"
 
 namespace Slic3r {
 

src/libslic3r/Fill/FillRectilinear.cpp

@@ -24,7 +24,6 @@
 #include "../Geometry.hpp"
 #include "../Surface.hpp"
 #include "../ShortestPath.hpp"
-#include "../VariableWidth.hpp"
 
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/Fill/FillBase.hpp"

src/libslic3r/Fill/FillRectilinear.hpp

@@ -12,10 +12,11 @@
 #include <cstddef>
 #include <vector>
 #include <utility>
-#include "libslic3r/Flow.hpp"
 #include "libslic3r/Point.hpp"
 #include "libslic3r/Polygon.hpp"
 
+namespace Slic3r { class Flow; }
+
 namespace Slic3r {
 
 class PrintRegionConfig;

src/libslic3r/Fill/FillSpiralInset.cpp

@@ -1,7 +1,5 @@
 #include "../ClipperUtils.hpp"
 #include "../ExPolygon.hpp"
-#include "../Surface.hpp"
-#include "../VariableWidth.hpp"
 #include "Arachne/WallToolPaths.hpp"
 #include "libslic3r/Polygon.hpp"
 #include "libslic3r/Point.hpp"
@@ -22,6 +20,9 @@
 #include <math.h>
 #include <utility>
 #include <vector>
+#include "libslic3r/Arachne/utils/ExtrusionJunction.hpp"
+#include "libslic3r/ExtrusionEntity.hpp"
+#include "libslic3r/Line.hpp"
 
 namespace Slic3r {
 

src/libslic3r/Fill/FillSpiralInset.hpp

@@ -4,9 +4,10 @@
 #include "libslic3r/ExPolygon.hpp"
 #include "FillBase.hpp"
 #include <utility>
-#include "libslic3r/Point.hpp"
 #include "libslic3r/Polyline.hpp"
 
+namespace Slic3r { class Point; }
+
 namespace Slic3r {
 
 class FillSpiralInset : public Fill

src/libslic3r/Fill/FillTpmsD.hpp

@@ -3,7 +3,6 @@
 
 #include <utility>
 
-#include "libslic3r/libslic3r.h"
 #include "FillBase.hpp"
 #include "libslic3r/ExPolygon.hpp"
 #include "libslic3r/Polyline.hpp"

src/libslic3r/Fill/FillTpmsFK.cpp

@@ -16,6 +16,7 @@
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include "libslic3r/Polygon.hpp"
 
 namespace marchsq {
 using namespace Slic3r;

src/libslic3r/Fill/FillTpmsFK.hpp

@@ -3,7 +3,6 @@
 
 #include <utility>
 
-#include "libslic3r/libslic3r.h"
 #include "FillBase.hpp"
 #include "libslic3r/ExPolygon.hpp"
 #include "libslic3r/Polyline.hpp"

src/libslic3r/Fill/Lightning/Generator.cpp

@@ -30,6 +30,9 @@
 #include <cmath>
 #include <utility>
 #include <cassert>
+#include "libslic3r/Config.hpp"
+#include "libslic3r/MultiMaterialSegmentation.hpp"
+#include "libslic3r/SurfaceCollection.hpp"
 
 /* Possible future tasks/optimizations,etc.:
  * - Improve connecting heuristic to favor connecting to shorter trees

src/libslic3r/Fill/Lightning/Layer.cpp

@@ -14,7 +14,6 @@
 
 #include "../../ClipperUtils.hpp"
 #include "../../Geometry.hpp"
-#include "Utils.hpp"
 #include "libslic3r/libslic3r.h"
 
 #include <cassert>

src/libslic3r/Fill/Lightning/TreeNode.hpp

@@ -19,6 +19,7 @@
 #include "libslic3r/BoundingBox.hpp"
 #include "SVG.hpp"
 #include "libslic3r/libslic3r.h"
+#include "libslic3r/Line.hpp"
 
 //#define LIGHTNING_TREE_NODE_DEBUG_OUTPUT
 

src/libslic3r/Flow.cpp

@@ -1,7 +1,6 @@
 #include "Flow.hpp"
 #include "Exception.hpp"
 #include "Config.hpp"
-#include "I18N.hpp"
 #include "Print.hpp"
 #include "libslic3r.h"
 #include <cmath>
@@ -10,6 +9,7 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <string>
 #include <math.h>
+#include "PrintConfig.hpp"
 
 // Mark string for localization and translate.
 #define L(s) Slic3r::I18N::translate(s)

src/libslic3r/FlushVolCalc.cpp

@@ -4,7 +4,6 @@
 #include <math.h>
 #include "FlushVolPredictor.hpp"
 #include "slic3r/Utils/ColorSpaceConvert.hpp"
-#include "Utils.hpp"
 #include "FlushVolCalc.hpp"
 
 

src/libslic3r/Format/3mf.cpp

@@ -3,11 +3,9 @@
 #include "../Model.hpp"
 #include "../Utils.hpp"
 #include "../LocalesUtils.hpp"
-#include "../GCode.hpp"
 #include "../Geometry.hpp"
 #include "../GCode/ThumbnailData.hpp"
 #include "../Semver.hpp"
-#include "../Time.hpp"
 
 #include "../I18N.hpp"
 #include "libslic3r/Point.hpp"

src/libslic3r/Format/AMF.cpp

@@ -12,17 +12,10 @@
 
 #include <boost/nowide/cstdio.hpp>
 
-#include "../libslic3r.h"
 #include "../Exception.hpp"
 #include "../Model.hpp"
-#include "../GCode.hpp"
-#include "../PrintConfig.hpp"
-#include "../Utils.hpp"
-#include "../I18N.hpp"
 #include "../Geometry.hpp"
-#include "../CustomGCode.hpp"
 #include "../LocalesUtils.hpp"
-#include "libslic3r/Config.hpp"
 #include "libslic3r/Point.hpp"
 #include "libslic3r/TriangleMesh.hpp"
 

src/libslic3r/Format/OBJ.cpp

@@ -32,6 +32,7 @@
 
 //Translation
 #include "I18N.hpp"
+#include "libslic3r/Format/OBJ.hpp"
 #define _L(s) Slic3r::I18N::translate(s)
 
 namespace Slic3r {

src/libslic3r/Format/SL1.cpp

@@ -1,7 +1,6 @@
 #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"
@@ -35,7 +34,6 @@
 #include "libslic3r/SlicesToTriangleMesh.hpp"
 #include "libslic3r/MarchingSquares.hpp"
 #include "libslic3r/ClipperUtils.hpp"
-#include "libslic3r/MTUtils.hpp"
 #include "libslic3r/PrintConfig.hpp"
 #include "libslic3r/SLA/RasterBase.hpp"
 #include "libslic3r/miniz_extension.hpp"
@@ -50,6 +48,7 @@
 #include <string>
 #include <utility>
 #include <string_view>
+#include "libslic3r/SLA/Pad.hpp"
 
 namespace marchsq {
 

src/libslic3r/Format/STL.cpp

@@ -7,6 +7,7 @@
 #include <cstring>
 #include <string>
 #include <utility>
+#include "libslic3r/Format/STL.hpp"
 
 #ifdef _WIN32
 #define DIR_SEPARATOR '\\'

src/libslic3r/Format/bbs_3mf.cpp

@@ -113,6 +113,8 @@ namespace pt = boost::property_tree;
 #include "NSVGUtils.hpp"
 
 #include <fast_float/fast_float.h>
+#include "libslic3r/Format/bbs_3mf.hpp"
+#include "libslic3r/ProjectTask.hpp"
 
 // Slightly faster than sprintf("%.9g"), but there is an issue with the karma floating point formatter,
 // https://github.com/boostorg/spirit/pull/586

src/libslic3r/Format/svg.cpp

@@ -37,6 +37,7 @@
 #include "TopoDS.hxx"
 #include "BRepExtrema_SelfIntersection.hxx"
 #include "libslic3r/Polygon.hpp"
+#include "libslic3r/Polyline.hpp"
 
 namespace Slic3r {
 const double STEP_TRANS_CHORD_ERROR = 0.005;

src/libslic3r/GCode.cpp

@@ -132,6 +132,14 @@ using namespace std::literals::string_view_literals;
 #endif
 
 #include <assert.h>
+#include "AABBTreeLines.hpp"
+#include "Extruder.hpp"
+#include "ExtrusionEntityCollection.hpp"
+#include "FilamentMixer.hpp"
+#include "Format/STEP.hpp"
+#include "Model.hpp"
+#include "MultiNozzleUtils.hpp"
+#include "Slicing.hpp"
 
 namespace Slic3r {
 

src/libslic3r/GCode.hpp

@@ -4,10 +4,8 @@
 #include "ExtrusionEntity.hpp"
 #include "Polygon.hpp"
 #include "Config.hpp"
-#include "ExtrusionEntityCollection.hpp"
 #include "Print.hpp"
 #include "libslic3r.h"
-#include "ExPolygon.hpp"
 #include "GCodeWriter.hpp"
 #include "Layer.hpp"
 #include "Point.hpp"
@@ -22,7 +20,6 @@
 #include "GCode/WipeTower.hpp"
 #include "GCode/SeamPlacer.hpp"
 #include "GCode/GCodeProcessor.hpp"
-#include "EdgeGrid.hpp"
 #include "GCode/ThumbnailData.hpp"
 #include "libslic3r/ObjectID.hpp"
 #include "GCode/ExtrusionProcessor.hpp"
@@ -47,6 +44,10 @@
 #include <cfloat>
 #include <vector>
 #include <utility>
+#include "BoundingBox.hpp"
+#include "Polyline.hpp"
+
+namespace Slic3r { class ExtrusionEntityCollection; }
 
 namespace Slic3r {
 

src/libslic3r/GCode/AdaptivePAProcessor.cpp

@@ -18,6 +18,10 @@
 #include <cmath>
 #include <cctype>
 #include <string>
+#include "libslic3r/GCode/AdaptivePAProcessor.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/GCodeWriter.hpp"
+#include "libslic3r/PrintConfig.hpp"
 
 namespace Slic3r {
 

src/libslic3r/GCode/AvoidCrossingPerimeters.cpp

@@ -31,6 +31,11 @@
 #include <boost/range/adaptor/reversed.hpp>
 #include <vector>
 #include <utility>
+#include "libslic3r/GCode/AvoidCrossingPerimeters.hpp"
+#include "libslic3r/Extruder.hpp"
+#include "libslic3r/GCodeWriter.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/SurfaceCollection.hpp"
 
 namespace Slic3r {
 

src/libslic3r/GCode/AvoidCrossingPerimeters.hpp

@@ -1,13 +1,13 @@
 #ifndef slic3r_AvoidCrossingPerimeters_hpp_
 #define slic3r_AvoidCrossingPerimeters_hpp_
 
-#include "../libslic3r.h"
 #include "../ExPolygon.hpp"
 #include "../EdgeGrid.hpp"
 #include "libslic3r/Polyline.hpp"
 #include "libslic3r/Polygon.hpp"
 #include "libslic3r/BoundingBox.hpp"
 #include <vector>
+#include "libslic3r/MultiMaterialSegmentation.hpp"
 
 namespace Slic3r {
 

src/libslic3r/GCode/ConflictChecker.cpp

@@ -23,6 +23,7 @@
 #include <atomic>
 #include <utility>
 #include <vector>
+#include "libslic3r/Model.hpp"
 
 namespace Slic3r {
 

src/libslic3r/GCode/ConflictChecker.hpp

@@ -1,15 +1,12 @@
 #ifndef slic3r_ConflictChecker_hpp_
 #define slic3r_ConflictChecker_hpp_
 
-#include "../Utils.hpp"
-#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>
@@ -20,6 +17,8 @@
 #include <vector>
 #include <optional>
 
+namespace Slic3r { class ExtrusionEntityCollection; }
+
 namespace Slic3r {
 
 struct LineWithID

src/libslic3r/GCode/CoolingBuffer.cpp

@@ -29,6 +29,10 @@
 #endif
 
 #include <assert.h>
+#include "libslic3r/GCode/CoolingBuffer.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/GCodeWriter.hpp"
+#include "libslic3r/PrintConfig.hpp"
 
 namespace Slic3r {
 

src/libslic3r/GCode/CoolingBuffer.hpp

@@ -1,7 +1,6 @@
 #ifndef slic3r_CoolingBuffer_hpp_
 #define slic3r_CoolingBuffer_hpp_
 
-#include "../libslic3r.h"
 #include "../Point.hpp"
 #include <cstddef>
 #include <map>

src/libslic3r/GCode/FanMover.cpp

@@ -33,6 +33,8 @@
 #include <boost/log/trivial.hpp>
 #include <string>
 #include <string_view>
+#include "libslic3r/Config.hpp"
+#include "libslic3r/GCodeWriter.hpp"
 */
 
 

src/libslic3r/GCode/FanMover.hpp

@@ -2,11 +2,8 @@
 #define slic3r_GCode_FanMover_hpp_
 
 
-#include "../libslic3r.h"
-#include "../PrintConfig.hpp"
 #include "../ExtrusionEntity.hpp"
 
-#include "../Point.hpp"
 #include "../GCodeReader.hpp"
 #include "../GCodeWriter.hpp"
 #include <cstdint>

src/libslic3r/GCode/GCodeProcessor.cpp

@@ -3,7 +3,6 @@
 #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"
@@ -73,6 +72,8 @@
 #include <chrono>
 
 #include "Geometry/ArcWelder.hpp"
+#include "libslic3r/GCode/GCodeProcessor.hpp"
+#include "libslic3r/MultiNozzleUtils.hpp"
 
 static const float DEFAULT_TOOLPATH_WIDTH = 0.4f;
 static const float DEFAULT_TOOLPATH_HEIGHT = 0.2f;

src/libslic3r/GCode/OrderingStrategies.cpp

@@ -17,6 +17,7 @@
 #include <unordered_map>
 #include <utility>
 #include <vector>
+#include "libslic3r/Print.hpp"
 
 namespace Slic3r {
 

src/libslic3r/GCode/OrderingStrategies.hpp

@@ -3,10 +3,8 @@
 #ifndef slic3r_OrderingStrategies_hpp_
 #define slic3r_OrderingStrategies_hpp_
 
-#include "../libslic3r.h"
 #include "../Point.hpp"
 #include <cstddef>
-#include "libslic3r/PrintConfig.hpp"
 
 #ifndef SLIC3R_TEST_HARNESS
 #include "../Print.hpp"
@@ -17,6 +15,8 @@
 #include <utility>
 #include <vector>
 
+namespace Slic3r { enum class PrintOrder; }
+
 namespace Slic3r {
 
 // --- Path improvement (operate on index vectors into `centers`) ---

src/libslic3r/GCode/PreciseSeam.cpp

@@ -18,6 +18,10 @@
 #include <tbb/parallel_for.h>
 #include <vector>
 #include <utility>
+#include "libslic3r/Layer.hpp"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/Print.hpp"
+#include "libslic3r/Slicing.hpp"
 
 namespace Slic3r {
 namespace PreciseSeam {

src/libslic3r/GCode/PreciseSeam.hpp

@@ -10,11 +10,10 @@
 #include "libslic3r/Polygon.hpp"
 #include "libslic3r/Polyline.hpp"
 #include "libslic3r/Model.hpp"
-#include "libslic3r/Layer.hpp"
-#include "libslic3r/Print.hpp"
-#include "libslic3r/ClipperUtils.hpp"
 #include "SeamPlacer.hpp"
 
+namespace Slic3r { class Layer; }
+
 // CURRENT STATUS:
 // Strong modifiers (Center/Left/Right): only one intersection per perimeter is supported,
 // since there can be only one seam. Additional intersections are ignored.

src/libslic3r/GCode/PressureEqualizer.cpp

@@ -13,9 +13,7 @@
 #include <algorithm>
 #include <string>
 
-#include "../libslic3r.h"
 #include "../PrintConfig.hpp"
-#include "../LocalesUtils.hpp"
 #include "../GCode.hpp"
 
 #include "PressureEqualizer.hpp"
@@ -23,6 +21,8 @@
 #include "libslic3r/Exception.hpp"
 #include "fast_float/fast_float.h"
 #include "GCodeWriter.hpp"
+#include "libslic3r/GCode/PressureEqualizer.hpp"
+#include "libslic3r/Config.hpp"
 
 namespace Slic3r {
 

src/libslic3r/GCode/PressureEqualizer.hpp

@@ -1,7 +1,6 @@
 #ifndef slic3r_GCode_PressureEqualizer_hpp_
 #define slic3r_GCode_PressureEqualizer_hpp_
 
-#include "../libslic3r.h"
 #include "../ExtrusionEntity.hpp"
 #include "../PrintConfig.hpp"
 #include <string>

src/libslic3r/GCode/PrintExtents.cpp

@@ -20,6 +20,8 @@
 #include <Eigen/Geometry>
 #include <vector>
 #include <cstddef>
+#include "libslic3r/Config.hpp"
+#include "libslic3r/PrintConfig.hpp"
 
 namespace Slic3r {