Fix includes

src/libslic3r/AABBMesh.hpp

@@ -13,6 +13,8 @@
 #include <vector>
 #include <cmath>
 #include <limits>
+#include <cassert>
+#include <cstddef>
 
 // There is an implementation of a hole-aware raycaster that was eventually
 // not used in production version. It is now hidden under following define

src/libslic3r/Algorithm/RegionExpansion.cpp

@@ -8,12 +8,13 @@
 #include <libslic3r/ClipperZUtils.hpp>
 #include <libslic3r/ClipperUtils.hpp>
 #include <libslic3r/Utils.hpp>
-#include <assert.h>
 #include <clipper/clipper_z.hpp>
 #include <numeric>
 #include <cmath>
 #include <iterator>
 #include <utility>
+#include <algorithm>
+#include <cassert>
 
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/ExPolygon.hpp"

src/libslic3r/Algorithm/RegionExpansion.hpp

@@ -12,6 +12,7 @@
 #include <cstdint>
 #include <algorithm>
 #include <vector>
+#include <cstddef>
 
 namespace Slic3r {
 namespace Algorithm {

src/libslic3r/Arachne/BeadingStrategy/BeadingStrategy.hpp

@@ -8,6 +8,7 @@
 #include <memory>
 #include <string>
 #include <vector>
+#include <cmath>
 
 #include "libslic3r/libslic3r.h"
 

src/libslic3r/Arachne/BeadingStrategy/BeadingStrategyFactory.hpp

@@ -5,6 +5,7 @@
 #define BEADING_STRATEGY_FACTORY_H
 
 #include <math.h>
+#include <cmath>
 
 #include "BeadingStrategy.hpp"
 #include "../../Point.hpp"

src/libslic3r/Arachne/BeadingStrategy/DistributedBeadingStrategy.cpp

@@ -1,9 +1,9 @@
 // Copyright (c) 2022 Ultimaker B.V.
 // CuraEngine is released under the terms of the AGPLv3 or higher.
-#include <assert.h>
 #include <numeric>
 #include <algorithm>
 #include <vector>
+#include <cassert>
 
 #include "DistributedBeadingStrategy.hpp"
 #include "libslic3r/Arachne/BeadingStrategy/BeadingStrategy.hpp"

src/libslic3r/Arachne/BeadingStrategy/LimitedBeadingStrategy.cpp

@@ -2,9 +2,9 @@
 //CuraEngine is released under the terms of the AGPLv3 or higher.
 
 #include <boost/log/trivial.hpp>
-#include <stddef.h>
 #include <cassert>
 #include <utility>
+#include <cstddef>
 
 #include "LimitedBeadingStrategy.hpp"
 #include "libslic3r/Point.hpp"

src/libslic3r/Arachne/PerimeterOrder.hpp

@@ -4,6 +4,7 @@
 #include <stddef.h>
 #include <limits>
 #include <vector>
+#include <cstddef>
 
 #include "libslic3r/Arachne/utils/ExtrusionLine.hpp"
 #include "libslic3r/BoundingBox.hpp"

src/libslic3r/Arachne/SkeletalTrapezoidation.cpp

@@ -4,8 +4,6 @@
 #include "SkeletalTrapezoidation.hpp"
 
 #include <boost/log/trivial.hpp>
-#include <assert.h>
-#include <stdlib.h>
 #include <boost/polygon/polygon.hpp>
 #include <queue>
 #include <algorithm>
@@ -13,6 +11,8 @@
 #include <cstdint>
 #include <limits>
 #include <utility>
+#include <cassert>
+#include <cstdlib>
 
 #include "libslic3r/Geometry/VoronoiUtils.hpp"
 #include "ankerl/unordered_dense.h"

src/libslic3r/Arachne/SkeletalTrapezoidationGraph.cpp

@@ -5,10 +5,10 @@
 
 #include <ankerl/unordered_dense.h>
 #include <boost/log/trivial.hpp>
-#include <assert.h>
-#include <stdint.h>
 #include <algorithm>
 #include <iostream>
+#include <cassert>
+#include <cinttypes>
 
 #include "../Line.hpp"
 #include "libslic3r/Arachne/SkeletalTrapezoidationEdge.hpp"

src/libslic3r/Arachne/WallToolPaths.cpp

@@ -1,12 +1,12 @@
 // Copyright (c) 2022 Ultimaker B.V.
 // CuraEngine is released under the terms of the AGPLv3 or higher.
 
-#include <assert.h>
-#include <math.h>
-#include <stdint.h>
 #include <algorithm> //For std::partition_copy and std::min_element.
 #include <limits>
 #include <memory>
+#include <cassert>
+#include <cinttypes>
+#include <cmath>
 
 #include "WallToolPaths.hpp"
 #include "SkeletalTrapezoidation.hpp"

src/libslic3r/Arachne/WallToolPaths.hpp

@@ -9,6 +9,7 @@
 #include <memory>
 #include <utility>
 #include <vector>
+#include <cstddef>
 
 #include "BeadingStrategy/BeadingStrategyFactory.hpp"
 #include "utils/ExtrusionLine.hpp"

src/libslic3r/Arachne/utils/ExtrusionLine.cpp

@@ -1,9 +1,9 @@
 //Copyright (c) 2020 Ultimaker B.V.
 //CuraEngine is released under the terms of the AGPLv3 or higher.
 
-#include <stdlib.h>
 #include <algorithm>
 #include <cmath>
+#include <cstdlib>
 
 #include "ExtrusionLine.hpp"
 #include "../../PerimeterGenerator.hpp"

src/libslic3r/Arachne/utils/ExtrusionLine.hpp

@@ -12,6 +12,9 @@
 #include <algorithm>
 #include <utility>
 #include <vector>
+#include <cassert>
+#include <cinttypes>
+#include <cstddef>
 
 #include "ExtrusionJunction.hpp"
 #include "../../Polyline.hpp"

src/libslic3r/Arachne/utils/PolylineStitcher.hpp

@@ -10,6 +10,8 @@
 #include <functional>
 #include <limits>
 #include <vector>
+#include <cinttypes>
+#include <cstddef>
 
 #include "SparsePointGrid.hpp"
 #include "PolygonsPointIndex.hpp"

src/libslic3r/Arachne/utils/SquareGrid.hpp

@@ -9,6 +9,7 @@
 #include <vector>
 #include <functional>
 #include <utility>
+#include <cinttypes>
 
 #include "../../Point.hpp"
 #include "libslic3r/libslic3r.h"

src/libslic3r/Arrange/Core/Beds.cpp

@@ -4,7 +4,7 @@
 ///|/
 #include "Beds.hpp"
 
-#include <algorithm>
+#include <cstdlib>
 
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/ExPolygon.hpp"

src/libslic3r/Arrange/Core/NFP/EdgeCache.hpp

@@ -11,6 +11,8 @@
 #include <vector>
 #include <algorithm>
 #include <cmath>
+#include <cassert>
+#include <cstddef>
 
 #include "libslic3r/Point.hpp"
 #include "libslic3r/Polygon.hpp"

src/libslic3r/Arrange/Core/NFP/NFP.cpp

@@ -24,7 +24,6 @@ namespace Slic3r { using LargeInt = boost::multiprecision::int128_t; }
 #endif
 
 #include <boost/rational.hpp>
-#include <assert.h>
 #include <algorithm>
 #include <array>
 #include <cstddef>
@@ -33,6 +32,7 @@ namespace Slic3r { using LargeInt = boost::multiprecision::int128_t; }
 #include <limits>
 #include <utility>
 #include <vector>
+#include <cassert>
 
 namespace Slic3r {
 

src/libslic3r/Arrange/Core/NFP/NFP.hpp

@@ -9,6 +9,7 @@
 #include <libslic3r/Arrange/Core/Beds.hpp>
 #include <stdint.h>
 #include <boost/variant.hpp>
+#include <cinttypes>
 
 #include "libslic3r/Point.hpp"
 #include "libslic3r/Polygon.hpp"

src/libslic3r/Arrange/Core/NFP/NFPConcave_CGAL.cpp

@@ -7,10 +7,10 @@
 #include <CGAL/Partition_traits_2.h>
 #include <CGAL/property_map.h>
 #include <CGAL/Polygon_vertical_decomposition_2.h>
-#include <stddef.h>
 #include <iterator>
 #include <utility>
 #include <vector>
+#include <cstddef>
 
 #include "NFP.hpp"
 #include "NFPConcave_CGAL.hpp"

src/libslic3r/Arrange/Core/NFP/NFPConcave_Tesselate.cpp

@@ -6,10 +6,10 @@
 
 #include <libslic3r/ClipperUtils.hpp>
 #include <libslic3r/Tesselate.hpp>
-#include <stddef.h>
 #include <algorithm>
 #include <iterator>
 #include <vector>
+#include <cstddef>
 
 #include "NFP.hpp"
 #include "libslic3r/ExPolygon.hpp"

src/libslic3r/Arrange/Items/ArrangeItem.hpp

@@ -17,6 +17,8 @@
 #include <type_traits>
 #include <utility>
 #include <vector>
+#include <cassert>
+#include <cstddef>
 
 #include "libslic3r/ExPolygon.hpp"
 #include "libslic3r/BoundingBox.hpp"

src/libslic3r/Arrange/Scene.hpp

@@ -17,6 +17,7 @@
 #include <type_traits>
 #include <utility>
 #include <vector>
+#include <cstddef>
 
 #include "libslic3r/ObjectID.hpp"
 #include "libslic3r/AnyPtr.hpp"

src/libslic3r/Arrange/SceneBuilder.cpp

@@ -10,6 +10,8 @@
 #include <cmath>
 #include <limits>
 #include <numeric>
+#include <cstdlib>
+#include <iterator>
 
 #include "libslic3r/Model.hpp"
 #include "libslic3r/Print.hpp"
@@ -23,6 +25,7 @@
 #include "libslic3r/SLA/Pad.hpp"
 #include "libslic3r/TriangleMesh.hpp"
 #include "libslic3r/TriangleMeshSlicer.hpp"
+#include "libslic3r/Arrange/Core/Beds.hpp"
 
 namespace Slic3r { namespace arr2 {
 

src/libslic3r/Arrange/SceneBuilder.hpp

@@ -14,6 +14,8 @@
 #include <type_traits>
 #include <utility>
 #include <vector>
+#include <cassert>
+#include <cstddef>
 
 #include "Scene.hpp"
 #include "Core/ArrangeItemTraits.hpp"

src/libslic3r/BoundingBox.cpp

@@ -9,7 +9,6 @@
 ///|/
 #include "BoundingBox.hpp"
 
-#include <assert.h>
 #include <algorithm>
 
 #include "libslic3r/Point.hpp"

src/libslic3r/BoundingBox.hpp

@@ -9,6 +9,9 @@
 #include <assert.h>
 #include <algorithm>
 #include <vector>
+#include <cassert>
+#include <cmath>
+#include <cstddef>
 
 #include "libslic3r.h"
 #include "Exception.hpp"

src/libslic3r/BranchingTree/BranchingTree.cpp

@@ -4,9 +4,9 @@
 ///|/
 #include "BranchingTree.hpp"
 
-#include <stddef.h>
 #include <optional>
 #include <algorithm>
+#include <cstddef>
 
 #include "PointCloud.hpp"
 #include "libslic3r/TriangleMesh.hpp"

src/libslic3r/BranchingTree/PointCloud.hpp

@@ -15,6 +15,8 @@
 #include <type_traits>
 #include <utility>
 #include <vector>
+#include <cassert>
+#include <cstdlib>
 
 #include "BranchingTree.hpp"
 //#include "libslic3r/Execution/Execution.hpp"

src/libslic3r/BridgeDetector.cpp

@@ -6,8 +6,8 @@
 ///|/
 #include "BridgeDetector.hpp"
 
-#include <stddef.h>
 #include <algorithm>
+#include <cstddef>
 
 #include "ClipperUtils.hpp"
 #include "Geometry.hpp"

src/libslic3r/Brim.cpp

@@ -4,11 +4,8 @@
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
 #include <boost/thread/lock_guard.hpp>
-#include <assert.h>
 #include <oneapi/tbb/blocked_range.h>
 #include <oneapi/tbb/parallel_for.h>
-#include <stddef.h>
-#include <stdint.h>
 #include <algorithm>
 #include <numeric>
 #include <unordered_set>
@@ -17,6 +14,9 @@
 #include <functional>
 #include <utility>
 #include <vector>
+#include <cassert>
+#include <cinttypes>
+#include <cstddef>
 
 #include "clipper/clipper_z.hpp"
 #include "ClipperUtils.hpp"

src/libslic3r/BuildVolume.cpp

@@ -5,11 +5,11 @@
 #include "BuildVolume.hpp"
 
 #include <boost/log/trivial.hpp>
-#include <assert.h>
-#include <stddef.h>
 #include <algorithm>
 #include <cmath>
 #include <limits>
+#include <cassert>
+#include <cstddef>
 
 #include "ClipperUtils.hpp"
 #include "Geometry/ConvexHull.hpp"

src/libslic3r/ClipperUtils.cpp

@@ -11,7 +11,6 @@
 ///|/
 #include "ClipperUtils.hpp"
 
-#include <stddef.h>
 #include <cmath>
 
 #include "ShortestPath.hpp"

src/libslic3r/ClipperUtils.hpp

@@ -13,6 +13,7 @@
 #include <iterator>
 #include <utility>
 #include <vector>
+#include <cassert>
 
 #include "libslic3r.h"
 #include "ExPolygon.hpp"
@@ -22,6 +23,7 @@
 #include "libslic3r/Line.hpp"
 #include "libslic3r/Point.hpp"
 #include "libslic3r/Polyline.hpp"
+#include "libslic3r/BoundingBox.hpp"
 
 #ifdef SLIC3R_USE_CLIPPER2
 

src/libslic3r/Color.cpp

@@ -2,9 +2,10 @@
 ///|/
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
-#include <stdio.h>
 #include <random>
 #include <cmath>
+#include <cstdio>
+#include <cstdlib>
 
 #include "Color.hpp"
 

src/libslic3r/Color.hpp

@@ -10,6 +10,7 @@
 #include <algorithm>
 #include <string>
 #include <vector>
+#include <cassert>
 
 #include "Point.hpp"
 

src/libslic3r/Config.cpp

@@ -20,7 +20,6 @@
 ///|/
 #include "Config.hpp"
 
-#include <assert.h>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
@@ -30,7 +29,6 @@
 #include <boost/nowide/fstream.hpp>
 #include <boost/nowide/cstdio.hpp>
 #include <boost/property_tree/ini_parser.hpp>
-#include <string.h>
 #include <LibBGCode/binarize/binarize.hpp>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/multi_index_container.hpp>
@@ -40,6 +38,8 @@
 #include <iomanip>
 #include <cstddef>
 #include <set>
+#include <cstdlib>
+#include <cstring>
 
 #include "format.hpp"
 #include "Utils.hpp"

src/libslic3r/Config.hpp

@@ -53,6 +53,9 @@
 #include <optional>
 #include <utility>
 #include <variant>
+#include <cassert>
+#include <cctype>
+#include <cfloat>
 
 #include "libslic3r.h"
 #include "clonable_ptr.hpp"

src/libslic3r/CustomGCode.cpp

@@ -4,7 +4,7 @@
 ///|/
 #include "CustomGCode.hpp"
 
-#include <assert.h>
+#include <cassert>
 
 #include "Config.hpp"
 #include "GCode.hpp"

src/libslic3r/CustomGCode.hpp

@@ -9,6 +9,7 @@
 #include <string>
 #include <vector>
 #include <utility>
+#include <cstddef>
 
 namespace Slic3r {
 

src/libslic3r/CutSurface.cpp

@@ -31,7 +31,6 @@ using namespace Slic3r;
 #include <CGAL/Exact_integer.h>
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/Cartesian_converter.h>
-#include <assert.h>
 #include <oneapi/tbb/blocked_range.h>
 #include <oneapi/tbb/parallel_for.h>
 #include <boost/property_map/property_map.hpp>
@@ -48,12 +47,12 @@ using namespace Slic3r;
 #include <set>
 #include <tuple>
 #include <utility>
+#include <cassert>
 
 #include "ExPolygonsIndex.hpp"
 // libslic3r
 #include "TriangleMesh.hpp" // its_merge
 #include "Utils.hpp" // next_highest_power_of_2
-#include "ClipperUtils.hpp" // union_ex + offset_ex
 #include "admesh/stl.h"
 #include "libslic3r/AABBTreeIndirect.hpp"
 #include "libslic3r/ClipperUtils.hpp"

src/libslic3r/CutUtils.cpp

@@ -6,12 +6,11 @@
 #include "CutUtils.hpp"
 
 #include <boost/log/trivial.hpp>
-#include <assert.h>
-#include <stddef.h>
-#include <Eigen/Geometry>
 #include <cmath>
 #include <string>
 #include <utility>
+#include <cassert>
+#include <cstddef>
 
 #include "Geometry.hpp"
 #include "libslic3r.h"

src/libslic3r/EdgeGrid.cpp

@@ -2,13 +2,12 @@
 ///|/
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
-#include <float.h>
-#include <math.h>
 #include <algorithm>
 #include <vector>
 #include <unordered_map>
 #include <cstdint>
 #include <set>
+#include <cfloat>
 
 #include "libslic3r.h"
 #include "ClipperUtils.hpp"
@@ -29,8 +28,6 @@
 #undef NDEBUG
 #endif
 
-#include <assert.h>
-
 namespace Slic3r {
 
 void EdgeGrid::Grid::create(const Polygons &polygons, coord_t resolution)

src/libslic3r/EdgeGrid.hpp

@@ -15,6 +15,9 @@
 #include <string>
 #include <utility>
 #include <vector>
+#include <cassert>
+#include <cinttypes>
+#include <cstdlib>
 
 #include "Point.hpp"
 #include "BoundingBox.hpp"

src/libslic3r/ElephantFootCompensation.cpp

@@ -2,13 +2,13 @@
 ///|/
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
-#include <stddef.h>
 #include <cmath>
 #include <cassert>
 #include <algorithm>
 #include <limits>
 #include <utility>
 #include <vector>
+#include <cstddef>
 
 #include "libslic3r.h"
 #include "ClipperUtils.hpp"

src/libslic3r/Emboss.hpp

@@ -18,6 +18,9 @@
 #include <map>
 #include <string>
 #include <utility>
+#include <cassert>
+#include <cinttypes>
+#include <cstddef>
 
 #include "Polygon.hpp"
 #include "ExPolygon.hpp"

src/libslic3r/ExPolygon.cpp

@@ -11,11 +11,11 @@
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
 #include <ankerl/unordered_dense.h>
-#include <string.h>
 #include <algorithm>
 #include <cassert>
 #include <cmath>
 #include <limits>
+#include <cstring>
 
 #include "BoundingBox.hpp"
 #include "ExPolygon.hpp"

src/libslic3r/ExPolygon.hpp

@@ -21,6 +21,8 @@
 #include <initializer_list>
 #include <iterator>
 #include <utility>
+#include <cassert>
+#include <cinttypes>
 
 #include "Point.hpp"
 #include "libslic3r.h"

src/libslic3r/ExPolygonsIndex.cpp

@@ -1,8 +1,8 @@
 #include "ExPolygonsIndex.hpp"
 
-#include <assert.h>
 #include <algorithm>
 #include <utility>
+#include <cassert>
 
 #include "libslic3r/ExPolygon.hpp"
 #include "libslic3r/Exception.hpp"

src/libslic3r/Extruder.cpp

@@ -9,9 +9,9 @@
 ///|/
 #include "Extruder.hpp"
 
-#include <assert.h>
-#include <math.h>
 #include <algorithm>
+#include <cassert>
+#include <cmath>
 
 #include "libslic3r/GCode/GCodeWriter.hpp"
 #include "PrintConfig.hpp"

src/libslic3r/ExtrusionEntity.cpp

@@ -11,7 +11,6 @@
 #include <iterator>
 
 #include "ExtrusionEntityCollection.hpp"
-#include "ExPolygon.hpp"
 #include "ClipperUtils.hpp"
 #include "Exception.hpp"
 #include "Flow.hpp"

src/libslic3r/ExtrusionEntity.hpp

@@ -17,6 +17,8 @@
 #include <limits>
 #include <utility>
 #include <vector>
+#include <cassert>
+#include <cstddef>
 
 #include "libslic3r.h"
 #include "ExtrusionRole.hpp"

src/libslic3r/ExtrusionEntityCollection.hpp

@@ -11,6 +11,7 @@
 #include <iterator>
 #include <utility>
 #include <vector>
+#include <cstddef>
 
 #include "libslic3r.h"
 #include "Exception.hpp"

src/libslic3r/ExtrusionSimulator.cpp

@@ -12,13 +12,13 @@
 #include <boost/geometry/geometries/point.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/multi_array.hpp>
-#include <string.h>
 #include <cmath>
 #include <cassert>
 #include <algorithm>
 #include <complex>
 #include <utility>
 #include <vector>
+#include <cstring>
 
 #include "libslic3r.h"
 #include "ExtrusionSimulator.hpp"

src/libslic3r/Fill/Fill.cpp

@@ -7,10 +7,7 @@
 ///|/
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
-#include <assert.h>
-#include <stdio.h>
 #include <oneapi/tbb/scalable_allocator.h>
-#include <stdint.h>
 #include <boost/container/vector.hpp>
 #include <memory>
 #include <algorithm>
@@ -19,6 +16,9 @@
 #include <set>
 #include <utility>
 #include <vector>
+#include <cassert>
+#include <cinttypes>
+#include <cstdlib>
 
 #include "../ClipperUtils.hpp"
 #include "../Geometry.hpp"
@@ -40,10 +40,10 @@
 #include "libslic3r/ExtrusionRole.hpp"
 #include "libslic3r/Flow.hpp"
 #include "libslic3r/LayerRegion.hpp"
-#include "libslic3r/MultiMaterialSegmentation.hpp"
 #include "libslic3r/Point.hpp"
 #include "libslic3r/Polyline.hpp"
 #include "libslic3r/libslic3r.h"
+#include "libslic3r/ShortestPath.hpp"
 
 namespace Slic3r {
 namespace FillAdaptive {

src/libslic3r/Fill/Fill3DHoneycomb.cpp

@@ -3,11 +3,11 @@
 ///|/
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
-#include <assert.h>
-#include <stddef.h>
 #include <algorithm>
 #include <cmath>
 #include <vector>
+#include <cassert>
+#include <cstddef>
 
 #include "../ClipperUtils.hpp"
 #include "../ShortestPath.hpp"

src/libslic3r/Fill/FillAdaptive.cpp

@@ -4,7 +4,6 @@
 ///|/
 // for indexed_triangle_set
 #include <admesh/stl.h>
-#include <assert.h>
 #include <boost/geometry/core/access.hpp>
 #include <boost/geometry/core/static_assert.hpp>
 #include <cstdlib>
@@ -15,6 +14,8 @@
 #include <iterator>
 #include <limits>
 #include <optional>
+#include <cassert>
+#include <complex>
 
 #include "../ClipperUtils.hpp"
 #include "../ExPolygon.hpp"
@@ -22,7 +23,6 @@
 #include "../Layer.hpp"
 #include "../Print.hpp"
 #include "../ShortestPath.hpp"
-#include "FillAdaptive.hpp"
 #include "libslic3r/Fill/FillAdaptive.hpp"
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/Fill/FillBase.hpp"

src/libslic3r/Fill/FillBase.cpp

@@ -7,15 +7,14 @@
 ///|/
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
-#include <stdio.h>
 #include <boost/log/trivial.hpp>
-#include <assert.h>
-#include <stdint.h>
-#include <stdlib.h>
 #include <numeric>
 #include <algorithm>
 #include <cmath>
 #include <limits>
+#include <cassert>
+#include <cinttypes>
+#include <cstdlib>
 
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/EdgeGrid.hpp"
@@ -38,6 +37,7 @@
 #include "FillEnsuring.hpp"
 #include "libslic3r/Config.hpp"
 #include "libslic3r/Line.hpp"
+#include "libslic3r/ShortestPath.hpp"
 
 // #define INFILL_DEBUG_OUTPUT
 

src/libslic3r/Fill/FillBase.hpp

@@ -21,6 +21,9 @@
 #include <string>
 #include <utility>
 #include <vector>
+#include <cfloat>
+#include <cmath>
+#include <cstddef>
 
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/BoundingBox.hpp"

src/libslic3r/Fill/FillConcentric.cpp

@@ -7,10 +7,10 @@
 ///|/
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
-#include <assert.h>
-#include <stddef.h>
 #include <algorithm>
 #include <vector>
+#include <cassert>
+#include <cstddef>
 
 #include "../ClipperUtils.hpp"
 #include "../ExPolygon.hpp"

src/libslic3r/Fill/FillEnsuring.cpp

@@ -5,14 +5,15 @@
 
 #include "FillEnsuring.hpp"
 
-#include <assert.h>
-#include <stdlib.h>
 #include <algorithm>
 #include <unordered_set>
 #include <vector>
 #include <cmath>
-#include <set>
 #include <utility>
+#include <cassert>
+#include <cstdlib>
+#include <iterator>
+#include <queue>
 
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/ShortestPath.hpp"

src/libslic3r/Fill/FillGyroid.cpp

@@ -3,10 +3,10 @@
 ///|/
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
-#include <stddef.h>
 #include <cmath>
 #include <algorithm>
 #include <vector>
+#include <cstddef>
 
 #include "../ClipperUtils.hpp"
 #include "../ShortestPath.hpp"

src/libslic3r/Fill/FillHoneycomb.hpp

@@ -14,6 +14,8 @@
 #include <stddef.h>
 #include <map>
 #include <utility>
+#include <cmath>
+#include <cstddef>
 
 #include "libslic3r/libslic3r.h"
 #include "FillBase.hpp"

src/libslic3r/Fill/FillLightning.cpp

@@ -4,7 +4,6 @@
 ///|/
 #include "../Print.hpp"
 #include "../ShortestPath.hpp"
-#include "FillLightning.hpp"
 #include "Lightning/Generator.hpp"
 #include "libslic3r/Fill/FillLightning.hpp"
 #include "libslic3r/Fill/FillBase.hpp"

src/libslic3r/Fill/FillLine.cpp

@@ -2,10 +2,10 @@
 ///|/
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
-#include <assert.h>
-#include <stdlib.h>
 #include <algorithm>
 #include <cmath>
+#include <cassert>
+#include <cstdlib>
 
 #include "../ClipperUtils.hpp"
 #include "../ExPolygon.hpp"

src/libslic3r/Fill/FillPlanePath.hpp

@@ -15,6 +15,8 @@
 #include <map>
 #include <algorithm>
 #include <utility>
+#include <cmath>
+#include <cstddef>
 
 #include "libslic3r/libslic3r.h"
 #include "FillBase.hpp"

src/libslic3r/Fill/FillRectilinear.cpp

@@ -7,7 +7,6 @@
 ///|/
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
-#include <stdlib.h>
 #include <boost/container/small_vector.hpp>
 #include <boost/log/trivial.hpp>
 #include <oneapi/tbb/scalable_allocator.h>
@@ -21,6 +20,7 @@
 #include <string>
 #include <utility>
 #include <vector>
+#include <cstdlib>
 
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/ExPolygon.hpp"

src/libslic3r/Fill/FillRectilinear.hpp

@@ -13,6 +13,7 @@
 
 #include <stddef.h>
 #include <initializer_list>
+#include <cstddef>
 
 #include "libslic3r/libslic3r.h"
 #include "FillBase.hpp"

src/libslic3r/Fill/Lightning/DistanceField.cpp

@@ -5,9 +5,9 @@
 
 #include <oneapi/tbb/blocked_range.h>
 #include <oneapi/tbb/parallel_for.h>
-#include <stdlib.h>
 #include <cmath>
 #include <utility>
+#include <cstdlib>
 
 #include "../FillRectilinear.hpp"
 #include "../../ClipperUtils.hpp"

src/libslic3r/Fill/Lightning/DistanceField.hpp

@@ -11,6 +11,9 @@
 #include <functional>
 #include <limits>
 #include <vector>
+#include <cassert>
+#include <cinttypes>
+#include <cstddef>
 
 #include "../../BoundingBox.hpp"
 #include "../../Point.hpp"

src/libslic3r/Fill/Lightning/Generator.cpp

@@ -3,10 +3,10 @@
 
 #include "Generator.hpp"
 
-#include <assert.h>
 #include <algorithm>
 #include <cmath>
 #include <utility>
+#include <cassert>
 
 #include "TreeNode.hpp"
 #include "../../ClipperUtils.hpp"

src/libslic3r/Fill/Lightning/Generator.hpp

@@ -8,6 +8,7 @@
 #include <functional>
 #include <memory>
 #include <vector>
+#include <cstddef>
 
 #include "Layer.hpp"
 #include "libslic3r/Polygon.hpp"

src/libslic3r/Fill/Lightning/Layer.cpp

@@ -3,15 +3,15 @@
 
 #include "Layer.hpp" //The class we're implementing.
 
-#include <assert.h>
 #include <oneapi/tbb/blocked_range.h>
 #include <oneapi/tbb/blocked_range2d.h>
 #include <oneapi/tbb/parallel_for.h>
-#include <stddef.h>
 #include <mutex>
 #include <algorithm>
 #include <limits>
 #include <utility>
+#include <cassert>
+#include <cstddef>
 
 #include "DistanceField.hpp"
 #include "TreeNode.hpp"

src/libslic3r/Fill/Lightning/TreeNode.cpp

@@ -3,10 +3,10 @@
 
 #include "TreeNode.hpp"
 
-#include <assert.h>
-#include <stdlib.h>
 #include <algorithm>
 #include <limits>
+#include <cassert>
+#include <cstdlib>
 
 #include "../../Geometry.hpp"
 #include "libslic3r/Line.hpp"

src/libslic3r/Fill/Lightning/TreeNode.hpp

@@ -11,6 +11,8 @@
 #include <optional>
 #include <vector>
 #include <utility>
+#include <cinttypes>
+#include <cstddef>
 
 #include "libslic3r/EdgeGrid.hpp"
 #include "libslic3r/Polygon.hpp"

src/libslic3r/Flow.cpp

@@ -10,7 +10,6 @@
 ///|/
 #include "Flow.hpp"
 
-#include <assert.h>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/format.hpp>
 #include <cmath>

src/libslic3r/Flow.hpp

@@ -12,6 +12,7 @@
 
 #include <assert.h>
 #include <string>
+#include <cassert>
 
 #include "libslic3r.h"
 #include "Config.hpp"

src/libslic3r/Format/AnycubicSLA.cpp

@@ -8,8 +8,6 @@
 
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/log/trivial.hpp>
-#include <assert.h>
-#include <stdio.h>
 #include <fstream> // IWYU pragma: keep
 #include <algorithm>
 #include <array>
@@ -19,6 +17,8 @@
 #include <iterator>
 #include <map>
 #include <vector>
+#include <cassert>
+#include <cstdio>
 
 #include "libslic3r/GCode/ThumbnailData.hpp"
 #include "libslic3r/SLA/RasterBase.hpp"

src/libslic3r/Format/AnycubicSLA.hpp

@@ -10,6 +10,7 @@
 #include <string>
 #include <memory>
 #include <utility>
+#include <cinttypes>
 
 #include "SLAArchiveWriter.hpp"
 #include "SLAArchiveFormatRegistry.hpp"

src/libslic3r/Format/OBJ.cpp

@@ -7,10 +7,10 @@
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
 #include <boost/log/trivial.hpp>
-#include <assert.h>
-#include <string.h>
 #include <string>
 #include <utility>
+#include <cassert>
+#include <cstring>
 
 #include "libslic3r/Model.hpp"
 #include "libslic3r/TriangleMesh.hpp"

src/libslic3r/Format/SL1_SVG.cpp

@@ -5,7 +5,6 @@
 #include "SL1_SVG.hpp"
 
 #include <LocalesUtils.hpp>
-#include <stddef.h>
 
 #include "libslic3r/SLA/RasterBase.hpp"
 #include "libslic3r/ClipperUtils.hpp"
@@ -27,6 +26,7 @@
 #include <iterator>
 #include <type_traits>
 #include <utility>
+#include <cstddef>
 
 #include "nanosvg/nanosvg.h"
 

src/libslic3r/Format/SLAArchiveWriter.hpp

@@ -9,6 +9,7 @@
 #include <vector>
 #include <memory>
 #include <string>
+#include <cstddef>
 
 #include "libslic3r/SLA/RasterBase.hpp"
 #include "libslic3r/Execution/ExecutionTBB.hpp"

src/libslic3r/Format/STL.cpp

@@ -7,9 +7,9 @@
 ///|/
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
-#include <string.h>
 #include <string>
 #include <utility>
+#include <cstring>
 
 #include "libslic3r/Model.hpp"
 #include "libslic3r/TriangleMesh.hpp"

src/libslic3r/Format/SVG.cpp

@@ -7,13 +7,12 @@
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
 #include <boost/log/trivial.hpp>
-#include <assert.h>
 #include <nanosvg/nanosvg.h>
-#include <stddef.h>
-#include <Eigen/Geometry>
 #include <memory>
 #include <string>
 #include <utility>
+#include <cassert>
+#include <cstddef>
 
 #include "libslic3r/Model.hpp"
 #include "libslic3r/TriangleMesh.hpp"

src/libslic3r/Format/objparser.cpp

@@ -2,17 +2,17 @@
 ///|/
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
-#include <stdlib.h>
-#include <string.h>
 #include <boost/log/trivial.hpp>
 #include <boost/nowide/cstdio.hpp>
 #include <LocalesUtils.hpp>
 #include <fast_float.h>
-#include <assert.h>
-#include <stdio.h>
 #include <new>
 #include <system_error>
 #include <utility>
+#include <cassert>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "objparser.hpp"
 

src/libslic3r/GCode/AvoidCrossingPerimeters.cpp

@@ -3,9 +3,6 @@
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
 #include <boost/range/adaptor/reversed.hpp>
-#include <assert.h>
-#include <math.h>
-#include <stddef.h>
 #include <boost/container_hash/hash.hpp>
 #include <boost/iterator/reverse_iterator.hpp>
 #include <unordered_set>
@@ -13,6 +10,9 @@
 #include <iterator>
 #include <limits>
 #include <utility>
+#include <cassert>
+#include <cmath>
+#include <cstddef>
 
 #include "../Layer.hpp"
 #include "../GCode.hpp"
@@ -22,13 +22,11 @@
 #include "../ExPolygon.hpp"
 #include "../Geometry.hpp"
 #include "../ClipperUtils.hpp"
-#include "AvoidCrossingPerimeters.hpp"
 #include "libslic3r/GCode/AvoidCrossingPerimeters.hpp"
 #include "libslic3r/Config.hpp"
 #include "libslic3r/Flow.hpp"
 #include "libslic3r/LayerRegion.hpp"
 #include "libslic3r/Line.hpp"
-#include "libslic3r/MultiMaterialSegmentation.hpp"
 #include "libslic3r/Point.hpp"
 #include "libslic3r/Surface.hpp"
 #include "libslic3r/Utils.hpp"

src/libslic3r/GCode/AvoidCrossingPerimeters.hpp

@@ -14,6 +14,7 @@
 #include "libslic3r/Layer.hpp"
 #include "libslic3r/Polygon.hpp"
 #include "libslic3r/Polyline.hpp"
+#include "libslic3r/ShortestPath.hpp"
 
 namespace Slic3r {
 

src/libslic3r/GCode/ConflictChecker.cpp

@@ -5,16 +5,17 @@
 ///|/
 #include "ConflictChecker.hpp"
 
-#include <assert.h>
-#include <float.h>
 #include <oneapi/tbb/blocked_range.h>
 #include <oneapi/tbb/concurrent_vector.h>
 #include <oneapi/tbb/parallel_for.h>
-#include <stdlib.h>
 #include <map>
 #include <functional>
 #include <cmath>
 #include <cstdint>
+#include <algorithm>
+#include <cassert>
+#include <cfloat>
+#include <cstdlib>
 
 #include "libslic3r/ExtrusionEntityCollection.hpp"
 #include "libslic3r/GCode/WipeTower.hpp"

src/libslic3r/GCode/CoolingBuffer.cpp

@@ -11,10 +11,6 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/log/trivial.hpp>
-#include <float.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
 #include <algorithm>
 #include <charconv>
 #include <cmath>
@@ -22,9 +18,13 @@
 #include <string_view>
 #include <system_error>
 #include <utility>
+#include <cassert>
+#include <cfloat>
+#include <cinttypes>
+#include <cstdio>
+#include <cstring>
 
 #include "../GCode.hpp"
-#include "CoolingBuffer.hpp"
 #include "libslic3r/GCode/CoolingBuffer.hpp"
 #include "libslic3r/Extruder.hpp"
 #include "libslic3r/GCode/GCodeWriter.hpp"
@@ -38,7 +38,6 @@
     #undef NDEBUG
 #endif
 
-#include <assert.h>
 #include <fast_float.h>
 
 namespace Slic3r {

src/libslic3r/GCode/CoolingBuffer.hpp

@@ -16,6 +16,7 @@
 #include <string>
 #include <array>
 #include <vector>
+#include <cstddef>
 
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Point.hpp"

src/libslic3r/GCode/ExtrusionOrder.cpp

@@ -1,6 +1,19 @@
 #include "ExtrusionOrder.hpp"
+
+#include <algorithm>
+#include <cassert>
+#include <cinttypes>
+
 #include "libslic3r/GCode/SmoothPath.hpp"
 #include "libslic3r/ShortestPath.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/ExtrusionEntity.hpp"
+#include "libslic3r/ExtrusionEntityCollection.hpp"
+#include "libslic3r/ExtrusionRole.hpp"
+#include "libslic3r/GCode/WipeTowerIntegration.hpp"
+#include "libslic3r/Geometry/ArcWelder.hpp"
+#include "libslic3r/LayerRegion.hpp"
+#include "libslic3r/Print.hpp"
 
 namespace Slic3r::GCode::ExtrusionOrder {
 

src/libslic3r/GCode/ExtrusionOrder.hpp

@@ -2,6 +2,11 @@
 #define slic3r_GCode_ExtrusionOrder_hpp_
 
 #include <vector>
+#include <cstddef>
+#include <functional>
+#include <map>
+#include <optional>
+#include <utility>
 
 #include "libslic3r/GCode/SmoothPath.hpp"
 #include "libslic3r/GCode/WipeTowerIntegration.hpp"
@@ -9,6 +14,22 @@
 #include "libslic3r/GCode/SeamPlacer.hpp"
 #include "libslic3r/Print.hpp"
 #include "libslic3r/ShortestPath.hpp"
+#include "libslic3r/GCode/ToolOrdering.hpp"
+#include "libslic3r/Layer.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
+
+namespace Slic3r {
+class ExtrusionEntity;
+class ExtrusionEntityReference;
+class Print;
+class PrintObject;
+class PrintRegion;
+namespace GCode {
+class WipeTowerIntegration;
+}  // namespace GCode
+struct PrintInstance;
+}  // namespace Slic3r
 
 namespace Slic3r::GCode {
 // Object and support extrusions of the same PrintObject at the same print_z.

src/libslic3r/GCode/ExtrusionProcessor.cpp

@@ -4,6 +4,7 @@
 #include <iterator>
 #include <map>
 #include <optional>
+#include <cstddef>
 
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/Config.hpp"

src/libslic3r/GCode/ExtrusionProcessor.hpp

@@ -19,6 +19,7 @@
 #include <utility>
 #include <vector>
 #include <functional>
+#include <cstdlib>
 
 #include "libslic3r/AABBTreeLines.hpp"
 #include "libslic3r/SupportSpotsGenerator.hpp"

src/libslic3r/GCode/FindReplace.cpp

@@ -5,7 +5,6 @@
 #include "FindReplace.hpp"
 
 #include <boost/algorithm/string/replace.hpp>
-#include <string.h>
 #include <boost/algorithm/string/find.hpp>
 #include <boost/range/iterator_range_core.hpp>
 #include <cctype> // isalpha
@@ -13,6 +12,7 @@
 #include <iterator>
 #include <tuple>
 #include <utility>
+#include <cstring>
 
 #include "../Utils.hpp"
 #include "libslic3r/Exception.hpp"

src/libslic3r/GCode/GCodeWriter.cpp

@@ -13,11 +13,11 @@
 ///|/
 #include "GCodeWriter.hpp"
 
-#include <assert.h>
-#include <stdint.h>
 #include <algorithm>
 #include <iostream>
 #include <string_view>
+#include <cassert>
+#include <cinttypes>
 
 #include "libslic3r/libslic3r.h"
 

src/libslic3r/GCode/GCodeWriter.hpp

@@ -17,6 +17,7 @@
 #include <array>
 #include <cmath>
 #include <vector>
+#include <cstring>
 
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Extruder.hpp"

src/libslic3r/GCode/LabelObjects.cpp

@@ -1,9 +1,9 @@
 #include "LabelObjects.hpp"
 
-#include <assert.h>
 #include <algorithm>
 #include <cstdio>
 #include <map>
+#include <cassert>
 
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/GCode/GCodeWriter.hpp"

src/libslic3r/GCode/ModelVisibility.cpp

@@ -2,8 +2,8 @@
 #include <igl/Hit.h>
 #include <oneapi/tbb/blocked_range.h>
 #include <oneapi/tbb/parallel_for.h>
-#include <stdlib.h>
 #include <cmath>
+#include <cstdlib>
 
 #include "libslic3r/ShortEdgeCollapse.hpp"
 #include "libslic3r/GCode/ModelVisibility.hpp"