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.

tests/fff_print/fff_print_tests.cpp

@@ -1,4 +1,3 @@
-#include "libslic3r/libslic3r.h"
 #define NANOSVG_IMPLEMENTATION
 #include "nanosvg/nanosvg.h"
 #define NANOSVGRAST_IMPLEMENTATION

tests/fff_print/test_extrusion_entity.cpp

@@ -11,8 +11,9 @@
 #include "libslic3r/ExtrusionEntity.hpp"
 #include "libslic3r/Point.hpp"
 #include "libslic3r/libslic3r.h"
+#include "libslic3r/Line.hpp"
+#include "libslic3r/Polyline.hpp"
 
-#include "test_helpers.hpp"
 
 using namespace Slic3r;
 

tests/fff_print/test_extrusion_processor.cpp

@@ -32,6 +32,7 @@
 #include <string>
 #include <string_view>
 #include <vector>
+#include <catch2/interfaces/catch_interfaces_capture.hpp>
 
 using namespace Slic3r;
 using namespace Slic3r::Test;

tests/fff_print/test_flow.cpp

@@ -9,9 +9,6 @@
 #include "test_helpers.hpp" // get access to init_print, etc
 
 #include "libslic3r/Config.hpp"
-#include "libslic3r/Model.hpp"
-#include "libslic3r/Config.hpp"
-#include "libslic3r/GCodeReader.hpp"
 #include "libslic3r/Flow.hpp"
 #include "libslic3r/libslic3r.h"
 

tests/fff_print/test_gcode_timing.cpp

@@ -4,7 +4,6 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/matchers/catch_matchers.hpp>
 #include <catch2/catch_message.hpp>
-#include "libslic3r/libslic3r.h"
 #include "libslic3r/GCode/GCodeProcessor.hpp"
 #include "libslic3r/MultiNozzleUtils.hpp"
 #include "libslic3r/PrintConfig.hpp"
@@ -15,7 +14,6 @@
 #include <cstddef>
 #include <fstream>
 #include <iomanip>
-#include "libslic3r/ExtrusionEntity.hpp"
 #include <ios>
 #include <map>
 #include <math.h>
@@ -23,6 +21,9 @@
 #include <sstream>
 #include <string>
 #include <vector>
+#include "libslic3r/Config.hpp"
+
+namespace Slic3r { enum ExtrusionRole : uint8_t; }
 
 using namespace Slic3r;
 using Catch::Matchers::WithinAbs;

tests/fff_print/test_gcodewriter.cpp

@@ -36,6 +36,7 @@
 #include <boost/filesystem.hpp>
 
 #include "test_helpers.hpp"
+#include "libslic3r/Arrange.hpp"
 
 using namespace Slic3r;
 using namespace Slic3r::Test;

tests/fff_print/test_helpers.cpp

@@ -5,8 +5,6 @@
 #include "libslic3r/GCodeReader.hpp"
 #include "libslic3r/Config.hpp"
 #include "libslic3r/Print.hpp"
-#include "libslic3r/Format/OBJ.hpp"
-#include "libslic3r/Format/STL.hpp"
 
 #include <algorithm>
 #include <cstdlib>
@@ -488,6 +486,14 @@ std::vector<std::string> role_sequence(const std::string &gcode, const std::vect
 } } // namespace Slic3r::Test
 
 #include <catch2/catch_all.hpp>
+#include "libslic3r/Arrange.hpp"
+#include "libslic3r/Model.hpp"
+#include "libslic3r/Arrange.hpp"
+#include "libslic3r/Model.hpp"
+#include "libslic3r/Arrange.hpp"
+#include "libslic3r/Model.hpp"
+#include "libslic3r/Arrange.hpp"
+#include "libslic3r/Model.hpp"
 
 SCENARIO("init_print functionality", "[test_helpers]") {
 	GIVEN("A default config") {

tests/fff_print/test_model.cpp

@@ -15,6 +15,8 @@
 
 #include "test_helpers.hpp"
 #include "test_utils.hpp"
+#include "libslic3r/Arrange.hpp"
+#include "libslic3r/Print.hpp"
 
 using namespace Slic3r;
 using namespace Slic3r::Test;

tests/fff_print/test_print.cpp

@@ -43,6 +43,9 @@
 #include <string_view>
 #include <utility>
 #include <vector>
+#include "libslic3r/ObjectID.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/SurfaceCollection.hpp"
 
 using namespace Slic3r;
 using namespace Slic3r::Test;

tests/fff_print/test_printobject.cpp

@@ -35,6 +35,9 @@
 #include <string>
 #include <utility>
 #include <vector>
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/ExtrusionEntityCollection.hpp"
+#include "libslic3r/SurfaceCollection.hpp"
 
 using namespace Slic3r;
 using namespace Slic3r::Test;

tests/fff_print/test_seam_placer.cpp

@@ -22,6 +22,10 @@
 #include "libslic3r/ExtrusionEntity.hpp"
 #include "libslic3r/Polyline.hpp"
 #include "libslic3r/libslic3r.h"
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/ExtrusionEntityCollection.hpp"
+#include "libslic3r/ObjectID.hpp"
+#include "libslic3r/Print.hpp"
 
 using namespace Slic3r;
 

tests/fff_print/test_skirt_brim.cpp

@@ -7,7 +7,6 @@
 #include <catch2/matchers/catch_matchers.hpp>
 #include <catch2/matchers/catch_matchers_floating_point.hpp>
 #include "libslic3r/GCodeReader.hpp"
-#include "libslic3r/Config.hpp"
 #include "libslic3r/Geometry.hpp"
 #include "libslic3r/Geometry/ConvexHull.hpp"
 #include "libslic3r/Layer.hpp"
@@ -27,6 +26,12 @@
 #include <string_view>
 
 #include "test_helpers.hpp" // get access to init_print, etc
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/BrimEarsPoint.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/ExtrusionEntityCollection.hpp"
+#include "libslic3r/ObjectID.hpp"
+#include "libslic3r/Print.hpp"
 
 using namespace Slic3r::Test;
 using namespace Slic3r;

tests/fff_print/test_slicing_pipeline_hook.cpp

@@ -496,6 +496,9 @@ TEST_CASE("refreshing lslices after a slice mutation makes islands track the geo
 }
 
 #include <random>   // deterministic RNG for the fuzzy-skin analogue below
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/SurfaceCollection.hpp"
 
 // Fuzzy skin applied to the slice contours at the Slice boundary, matching what the Fuzzy
 // Slices sample (sandboxes/orca_fuzzy_slices_plugin_any.py) does: resample every ring at

tests/fff_print/test_support_material.cpp

@@ -30,6 +30,8 @@
 // Not self-contained: its inline constructor uses PrintObject, PrintRegion, SlicingParameters and
 // Geometry, so it must follow the headers (pulled in via test_helpers.hpp) that define them.
 #include "libslic3r/Support/SupportParameters.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/Print.hpp"
 
 using namespace Slic3r::Test;
 using namespace Slic3r;

tests/fff_print/test_texture_displacement.cpp

@@ -24,6 +24,7 @@
 #include "libslic3r/TriangleSelector.hpp"
 
 #include "test_helpers.hpp"
+#include "libslic3r/TriangleMesh.hpp"
 
 using namespace Slic3r;
 using namespace Slic3r::Test;

tests/fff_print/test_tree_support.cpp

@@ -14,6 +14,8 @@
 #include "libslic3r/TriangleMesh.hpp"
 
 #include "test_helpers.hpp"
+#include "libslic3r/ExtrusionEntityCollection.hpp"
+#include "libslic3r/Print.hpp"
 
 using namespace Slic3r::Test;
 using namespace Slic3r;

tests/fff_print/test_trianglemesh.cpp

@@ -4,8 +4,6 @@
 #include "libslic3r/TriangleMesh.hpp"
 #include "libslic3r/TriangleMeshSlicer.hpp"
 #include "libslic3r/Point.hpp"
-#include "libslic3r/Config.hpp"
-#include "libslic3r/Model.hpp"
 #include "libslic3r/libslic3r.h"
 
 #include <algorithm>
@@ -17,9 +15,10 @@
 #include <vector>
 #include <math.h>
 #include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/MultiMaterialSegmentation.hpp"
 
 //#include "test_options.hpp"
-#include "test_helpers.hpp"
 
 using namespace Slic3r;
 using namespace std;

tests/fff_print/test_wipe.cpp

@@ -29,6 +29,7 @@
 #include "libslic3r/Layer.hpp"
 
 #include "test_helpers.hpp"
+#include "libslic3r/Polyline.hpp"
 
 using namespace Slic3r;
 using namespace Slic3r::Test;

tests/fff_print/test_wipe_tower.cpp

@@ -25,6 +25,8 @@
 #include "libslic3r/PrintConfig.hpp"
 
 #include "test_helpers.hpp"
+#include "libslic3r/PrintBase.hpp"
+#include "libslic3r/TriangleMesh.hpp"
 
 using namespace Slic3r;
 using namespace Slic3r::Test;

tests/filament_group/filament_group_regression_main.cpp

@@ -28,6 +28,7 @@
 #include <vector>
 #include <algorithm>
 #include <numeric>
+#include "libslic3r/MultiNozzleUtils.hpp"
 
 namespace fs = std::filesystem;
 using namespace Slic3r;

tests/libnest2d/libnest2d_tests.cpp

@@ -6,6 +6,9 @@
 
 #include <catch2/catch_test_macros.hpp>
 #include "libnest2d_test_utils.hpp"
+#include "libnest2d/backends/libslic3r/geometries.hpp"
+#include "libnest2d/placers/nfpplacer.hpp"
+#include "libslic3r/Point.hpp"
 
 using namespace libnest2d;
 

tests/libnest2d/test_geometry.cpp

@@ -21,6 +21,9 @@
 #include <catch2/catch_test_macros.hpp>
 #include "libnest2d_test_utils.hpp"
 #include "printer_parts.hpp"
+#include "libnest2d/nester.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polygon.hpp"
 
 using namespace libnest2d;
 

tests/libnest2d/test_nfp.cpp

@@ -13,6 +13,8 @@
 #include <catch2/matchers/catch_matchers.hpp>
 #include <catch2/matchers/catch_matchers_floating_point.hpp>
 #include "libnest2d_test_utils.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/Point.hpp"
 
 using namespace libnest2d;
 

tests/libnest2d/test_nfp_placer.cpp

@@ -9,6 +9,11 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/generators/catch_generators.hpp>
 #include "libnest2d_test_utils.hpp"
+#include "libnest2d/backends/libslic3r/geometries.hpp"
+#include "libnest2d/nester.hpp"
+#include "libnest2d/placers/nfpplacer.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/Point.hpp"
 
 using namespace libnest2d;
 

tests/libslic3r/test_aabbindirect.cpp

@@ -1,13 +1,13 @@
 #include <catch2/catch_all.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/catch_approx.hpp>
-#include "test_utils.hpp"
 
 #include <igl/Hit.h>
 #include <cstddef>
 #include <libslic3r/TriangleMesh.hpp>
 #include <libslic3r/AABBTreeIndirect.hpp>
 #include <vector>
+#include "libslic3r/Point.hpp"
 
 using namespace Slic3r;
 

tests/libslic3r/test_arachne_walls.cpp

@@ -42,6 +42,7 @@
 #include "libslic3r/Arachne/utils/ExtrusionJunction.hpp"
 #include "libslic3r/PerimeterGenerator.hpp"
 #include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Layer.hpp"
 
 using namespace Slic3r;
 using namespace Slic3r::Arachne;

tests/libslic3r/test_arrange.cpp

@@ -20,6 +20,7 @@
 #include "libslic3r/ExPolygon.hpp"
 #include "libslic3r/Print.hpp"
 #include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/MultiMaterialSegmentation.hpp"
 
 using namespace Slic3r;
 using namespace Slic3r::arrangement;

tests/libslic3r/test_buildvolume.cpp

@@ -6,6 +6,7 @@
 #include <catch2/matchers/catch_matchers.hpp>
 #include <catch2/matchers/catch_matchers_floating_point.hpp>
 #include "libslic3r/BuildVolume.hpp"
+#include "libslic3r/BoundingBox.hpp"
 
 using namespace Slic3r;
 

tests/libslic3r/test_caddocument.cpp

@@ -55,6 +55,8 @@
 #include <gp_Trsf.hxx>
 #include <gp_Vec.hxx>
 #include <cereal/archives/binary.hpp>
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/Point.hpp"
 
 using namespace Slic3r;
 using Catch::Approx;   // Catch2 v3 scopes Approx under Catch:: (v2 had it unqualified)

tests/libslic3r/test_calib.cpp

@@ -12,6 +12,7 @@
 #include "libslic3r/Model.hpp"
 #include "libslic3r/TriangleMesh.hpp"
 #include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Point.hpp"
 
 using namespace Slic3r;
 

tests/libslic3r/test_clipper_utils.cpp

@@ -15,7 +15,7 @@
 #include <catch2/catch_approx.hpp>
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/ExPolygon.hpp"
-#include "libslic3r/SVG.hpp"
+#include "libslic3r/Point.hpp"
 
 using namespace Slic3r;
 

tests/libslic3r/test_config.cpp

@@ -29,6 +29,7 @@
 #include <sstream>
 #include <vector>
 #include <utility>
+#include <catch2/matchers/catch_matchers_vector.hpp>
 
 namespace fs = boost::filesystem;
 

tests/libslic3r/test_fill_corner_smoothing.cpp

@@ -10,7 +10,6 @@
 #include <catch2/catch_test_macros.hpp>
 #include "libslic3r/Fill/FillCornerSmoothing.hpp"
 #include "libslic3r/Polyline.hpp"
-#include "libslic3r/libslic3r.h"
 
 using namespace Slic3r;
 

tests/libslic3r/test_geometry.cpp

@@ -28,6 +28,7 @@
 #include <string>
 #include <unordered_set>
 #include <vector>
+#include "libnest2d/backends/libslic3r/geometries.hpp"
 
 using namespace Slic3r;
 

tests/libslic3r/test_lay_on_face.cpp

@@ -12,6 +12,7 @@
 #include <catch2/generators/catch_generators.hpp>
 #include "libslic3r/LayOnFace.hpp"
 #include "libslic3r/Model.hpp"
+#include "libslic3r/BoundingBox.hpp"
 
 using namespace Slic3r;
 using Catch::Matchers::WithinAbs;

tests/libslic3r/test_marchingsquares.cpp

@@ -38,10 +38,9 @@
 #include <libslic3r/ClipperUtils.hpp>
 
 #include <libslic3r/TriangleMeshSlicer.hpp>
-#include <libslic3r/TriangulateWall.hpp>
-#include <libslic3r/Tesselate.hpp>
 #include <libslic3r/SlicesToTriangleMesh.hpp>
 #include <libslic3r/StreamUtils.hpp>
+#include <catch2/interfaces/catch_interfaces_capture.hpp>
 
 using namespace Slic3r;
 using namespace Catch::Matchers;

tests/libslic3r/test_meshboolean.cpp

@@ -1,7 +1,6 @@
 #include <catch2/catch_all.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/catch_approx.hpp>
-#include "test_utils.hpp"
 
 #include <libslic3r/TriangleMesh.hpp>
 #include <libslic3r/MeshBoolean.hpp>

tests/libslic3r/test_model.cpp

@@ -6,6 +6,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 #include "libslic3r/Model.hpp"
+#include "libslic3r/Geometry.hpp"
 
 using namespace Slic3r;
 

tests/libslic3r/test_multimaterial_segmentation.cpp

@@ -9,10 +9,10 @@
 #include <catch2/generators/catch_generators.hpp>
 #include <catch2/matchers/catch_matchers.hpp>
 #include <catch2/matchers/catch_matchers_floating_point.hpp>
-#include "libslic3r/Line.hpp"
 #include "libslic3r/Flow.hpp"
 #include "libslic3r/MultiMaterialSegmentation.hpp"
 #include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Config.hpp"
 
 using namespace Slic3r;
 

tests/libslic3r/test_optimizers.cpp

@@ -1,11 +1,9 @@
 #include <catch2/catch_all.hpp>
 #include <catch2/catch_test_macros.hpp>
-#include "test_utils.hpp"
 
 #include <cstdlib>
 #include <libslic3r/Optimize/BruteforceOptimizer.hpp>
 
-#include <libslic3r/Optimize/NLoptOptimizer.hpp>
 #include "libslic3r/Optimize/Optimizer.hpp"
 #include "libslic3r/libslic3r.h"
 

tests/libslic3r/test_ordering_strategies.cpp

@@ -16,6 +16,7 @@
 
 #include <algorithm>
 #include <unordered_set>
+#include <catch2/catch_approx.hpp>
 
 using namespace Slic3r;
 

tests/libslic3r/test_polygon.cpp

@@ -6,6 +6,8 @@
 #include <catch2/catch_test_macros.hpp>
 #include "libslic3r/Point.hpp"
 #include "libslic3r/Polygon.hpp"
+#include "libslic3r/Line.hpp"
+#include "libslic3r/Polyline.hpp"
 
 using namespace Slic3r;
 

tests/libslic3r/test_precise_seam_3mf.cpp

@@ -25,6 +25,7 @@
 #include <string>
 #include <utility>
 #include <vector>
+#include "libslic3r/Point.hpp"
 
 using namespace Slic3r;
 

tests/libslic3r/test_sketchconstraints.cpp

@@ -8,6 +8,7 @@
 #include <vector>
 #include "libslic3r/CAD/SketchConstraints.hpp"
 #include "libslic3r/CAD/SketchEngine.hpp"
+#include "libslic3r/Point.hpp"
 
 using namespace Slic3r;
 

tests/libslic3r/test_sketchedit.cpp

@@ -11,6 +11,7 @@
 #include <TopAbs.hxx>
 #include <math.h>
 #include <vector>
+#include "libslic3r/Point.hpp"
 
 using namespace Slic3r;
 

tests/libslic3r/test_toolordering_nozzle_group.cpp

@@ -26,6 +26,7 @@
 #include <vector>
 
 #include <boost/filesystem.hpp>
+#include "libslic3r/Point.hpp"
 
 // H2C/A2L multi-nozzle filament grouping core.
 //

tests/libslic3r/test_trianglemesh_slicer.cpp

@@ -10,6 +10,9 @@
 #include <catch2/catch_test_macros.hpp>
 #include "libslic3r/TriangleMesh.hpp"
 #include "libslic3r/TriangleMeshSlicer.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polygon.hpp"
+#include <catch2/catch_test_macros.hpp>
 
 using namespace Slic3r;
 

tests/libslic3r/test_wipe_path.cpp

@@ -20,6 +20,7 @@
 #include <vector>
 #include <utility>
 #include <optional>
+#include "libslic3r/ArcFitter.hpp"
 
 using namespace Slic3r;
 using Slic3r::AABBTreeLines::LinesDistancer;

tests/libslic3r/test_wipe_tower.cpp

@@ -18,6 +18,7 @@
 #include "libslic3r/GCode/WipeTower2.hpp"
 #include "libslic3r/Print.hpp"
 #include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Config.hpp"
 
 using namespace Slic3r;
 using Catch::Matchers::WithinAbs;

tests/libslic3r/test_wipe_tower_estimate.cpp

@@ -21,6 +21,7 @@
 #include <numeric>
 #include <string>
 #include <vector>
+#include "libslic3r/clonable_ptr.hpp"
 
 using namespace Slic3r;
 using Catch::Matchers::WithinAbs;

tests/sla_print/sla_print_tests.cpp

@@ -27,8 +27,9 @@
 
 #include <libslic3r/TriangleMeshSlicer.hpp>
 #include <libslic3r/SLA/SupportTreeMesher.hpp>
-#include <libslic3r/SLA/Concurrency.hpp>
 #include <vector>
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/ExtrusionEntity.hpp"
 
 namespace {
 

tests/sla_print/sla_print_tests_main.cpp

@@ -1,4 +1,3 @@
-#include "libslic3r/libslic3r.h"
 #define NANOSVG_IMPLEMENTATION
 #include "nanosvg/nanosvg.h"
 #define NANOSVGRAST_IMPLEMENTATION

tests/sla_print/sla_raycast_tests.cpp

@@ -2,16 +2,13 @@
 #include <catch2/catch_all.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/catch_approx.hpp>
-#include "test_utils.hpp"
 
 #include "libslic3r/Point.hpp"
 #include <cstdlib>
 #include <cmath>
-#include <libslic3r/SLA/IndexedMesh.hpp>
 #include <libslic3r/SLA/Hollowing.hpp>
 #include <utility>
 
-#include "sla_test_utils.hpp"
 
 using namespace Slic3r;
 

tests/sla_print/sla_supptgen_tests.cpp

@@ -5,7 +5,6 @@
 
 #include <cstddef>
 #include <iterator>
-#include <libslic3r/ExPolygon.hpp>
 #include <libslic3r/BoundingBox.hpp>
 #include "libslic3r/TriangleMesh.hpp"
 #include "libslic3r/libslic3r.h"

tests/sla_print/sla_test_utils.cpp

@@ -34,6 +34,7 @@
 #include "libslic3r/SLA/ConcaveHull.hpp"
 #include "libslic3r/SLA/RasterBase.hpp"
 #include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/Line.hpp"
 
 void test_support_model_collision(const std::string          &obj_filename,
                                   const sla::SupportTreeConfig   &input_supportcfg,

tests/sla_print/sla_test_utils.hpp

@@ -3,7 +3,6 @@
 
 #include <catch2/catch_all.hpp>
 #include <catch2/catch_test_macros.hpp>
-#include "test_utils.hpp"
 
 // Debug
 #include <cstddef>
@@ -12,7 +11,6 @@
 #include <cstdint>
 #include <fstream>
 #include <string>
-#include "libslic3r/SLA/SupportTree.hpp"
 #include "libslic3r/SLA/Hollowing.hpp"
 #include <unordered_map>
 #include <random>
@@ -23,20 +21,17 @@
 #include <vector>
 #include <utility>
 
-#include "libslic3r/libslic3r.h"
-#include "libslic3r/Format/OBJ.hpp"
-#include "libslic3r/SLAPrint.hpp"
 #include "libslic3r/TriangleMesh.hpp"
-#include "libslic3r/SLA/Pad.hpp"
 #include "libslic3r/SLA/SupportTreeBuilder.hpp"
 #include "libslic3r/SLA/SupportTreeBuildsteps.hpp"
 #include "libslic3r/SLA/SupportPointGenerator.hpp"
-#include "libslic3r/SLA/AGGRaster.hpp"
-#include "libslic3r/SLA/ConcaveHull.hpp"
-#include "libslic3r/MTUtils.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/ExtrusionEntity.hpp"
+
+namespace Slic3r::sla { class RasterGrayscaleAA; }
+namespace Slic3r::sla { struct PadConfig; }
+namespace Slic3r::sla { struct SupportTreeConfig; }
 
-#include "libslic3r/SVG.hpp"
-#include "libslic3r/Format/OBJ.hpp"
 
 using namespace Slic3r;
 

tests/slic3rutils/test_dev_mapping.cpp

@@ -28,6 +28,8 @@
 #include "slic3r/GUI/DeviceCore/DevFilaSystem.h"
 
 #include <nlohmann/json.hpp>
+#include "slic3r/GUI/DeviceCore/DevFilaSwitch.h"
+#include "slic3r/GUI/DeviceCore/DevUtil.h"
 
 using json = nlohmann::json;
 using namespace Slic3r;

tests/slic3rutils/test_plugin_capability_config.cpp

@@ -1,7 +1,6 @@
 #include <catch2/catch_all.hpp>
 
 #include <exception>
-#include <libslic3r/Utils.hpp>
 #include <slic3r/plugin/PluginConfig.hpp>
 #include <slic3r/plugin/PluginManager.hpp>
 #include <slic3r/plugin/PythonInterpreter.hpp>
@@ -20,6 +19,7 @@
 
 #include <memory>
 #include <string>
+#include <pybind11/cast.h>
 
 namespace py = pybind11;
 using namespace Slic3r;

tests/slic3rutils/test_plugin_cloud_metadata.cpp

@@ -3,7 +3,6 @@
 #include <catch2/catch_all.hpp>
 
 #include <ios>
-#include <libslic3r/Utils.hpp>
 #include <slic3r/plugin/PluginConfig.hpp>
 #include <slic3r/plugin/PluginDescriptor.hpp>
 #include <slic3r/plugin/PluginFsUtils.hpp>

tests/slic3rutils/test_plugin_config.cpp

@@ -3,9 +3,7 @@
 #include <catch2/catch_all.hpp>
 
 #include <ios>
-#include <libslic3r/Utils.hpp>
 #include <slic3r/plugin/PluginConfig.hpp>
-#include <slic3r/plugin/PluginManager.hpp>
 
 #include <catch2/catch_test_macros.hpp>
 #include "plugin_test_utils.hpp"

tests/slic3rutils/test_plugin_host_api.cpp

@@ -7,7 +7,6 @@
 #include <slic3r/GUI/DockPanel.hpp>
 #include <slic3r/GUI/AuiPaneLayout.hpp>
 #include <slic3r/GUI/Widgets/WebHosting.hpp>
-#include <slic3r/plugin/PythonPluginBridge.hpp>
 
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/catch_message.hpp>
@@ -25,6 +24,11 @@
 
 #include <wx/string.h>
 #include <wx/uri.h>
+#include "libslic3r/ObjectID.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Preset.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include <pybind11/detail/common.h>
 
 namespace py = pybind11;
 

tests/slic3rutils/test_plugin_install.cpp

@@ -3,7 +3,6 @@
 #include <catch2/catch_all.hpp>
 
 #include <ios>
-#include <libslic3r/Utils.hpp>
 #include <slic3r/plugin/PluginLoader.hpp>
 #include <slic3r/plugin/PluginDescriptor.hpp>
 #include <slic3r/plugin/PluginFsUtils.hpp>

tests/slic3rutils/test_plugin_lifecycle.cpp

@@ -4,7 +4,6 @@
 
 #include <ios>
 #include <libslic3r/LifecycleEvents.hpp>
-#include <libslic3r/Utils.hpp>
 #include <memory>
 #include <slic3r/Utils/NetworkAgentFactory.hpp>
 #include <slic3r/plugin/PluginDescriptor.hpp>

tests/slic3rutils/test_plugin_printer_agent.cpp

@@ -18,6 +18,7 @@
 #include <pybind11/pytypes.h>
 #include <pybind11/eval.h>
 #include <pybind11/gil.h>
+#include <pybind11/cast.h>
 
 namespace py = pybind11;
 using namespace Slic3r;

tests/slic3rutils/test_precise_seam_plugin.cpp

@@ -10,6 +10,8 @@
 
 #include <pybind11/embed.h>
 #include <array>
+#include <pybind11/detail/common.h>
+#include <pybind11/pybind11.h>
 
 namespace py = pybind11;
 using namespace Slic3r;

tests/slic3rutils/test_printer_agent.cpp

@@ -1,10 +1,7 @@
 #include <catch2/catch_all.hpp>
 
 #include <memory>
-#include "slic3r/Utils/ICloudServiceAgent.hpp"
-#include "slic3r/Utils/IPrinterAgent.hpp"
 #include <slic3r/Utils/NetworkAgentFactory.hpp>
-#include <slic3r/plugin/PythonPluginBridge.hpp>
 
 #include <catch2/catch_test_macros.hpp>
 #include <pybind11/pytypes.h>
@@ -15,6 +12,10 @@
 #include <pybind11/pybind11.h>
 
 #include <string>
+#include <pybind11/cast.h>
+
+namespace Slic3r { class ICloudServiceAgent; }
+namespace Slic3r { class IPrinterAgent; }
 
 using namespace Slic3r;
 namespace py = pybind11;

tests/slic3rutils/test_printhost.cpp

@@ -18,6 +18,7 @@
 #include "libslic3r/LifecycleEvents.hpp"
 #include "slic3r/Utils/PrintHost.hpp"
 #include "slic3r/Utils/Flashforge.hpp"
+#include "slic3r/Utils/Http.hpp"
 
 using namespace Slic3r;
 

tests/slic3rutils/test_scene_benchmark.cpp

@@ -9,6 +9,9 @@
 #include <numeric>
 #include <random>
 #include <vector>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
 
 using Catch::Matchers::WithinAbs;
 using Slic3r::GUI::frame_time_stats;

tests/slic3rutils/test_slicing_pipeline_bindings.cpp

@@ -147,6 +147,10 @@ TEST_CASE("orca.slicing is workflow-only: context exposes raw print/object; view
 #include <boost/filesystem.hpp>
 #include <boost/nowide/fstream.hpp>
 #include <sstream>
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/Polyline.hpp"
+#include <pybind11/detail/common.h>
+#include <pybind11/detail/descr.h>
 
 // psGCodePostProcess is the merged post-processing seam: no live Print (print/object are None), the
 // plugin edits the file at ctx.gcode_path in place, and ctx.config_value() falls back to the config

tests/slic3rutils/test_slicing_pipeline_config.cpp

@@ -8,7 +8,6 @@
 #include "libslic3r/Model.hpp"
 #include "libslic3r/PrintConfig.hpp"
 #include "libslic3r/Config.hpp"
-#include <libslic3r/Utils.hpp>
 #include <slic3r/plugin/PluginConfig.hpp>
 #include "slic3r/plugin/PluginFsUtils.hpp"
 #include <slic3r/plugin/PluginManager.hpp>

tests/slic3rutils/test_web_media_controller.cpp

@@ -15,6 +15,11 @@
 #include <string>
 #include <vector>
 
+class wxColour;
+class wxPoint;
+class wxSize;
+class wxWindow;
+
 using namespace Slic3r;
 using namespace Slic3r::GUI;