diff --git a/src/libslic3r/AABBMesh.hpp b/src/libslic3r/AABBMesh.hpp
index 2392013623..406e4a686c 100644
--- a/src/libslic3r/AABBMesh.hpp
+++ b/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
diff --git a/src/libslic3r/Algorithm/RegionExpansion.cpp b/src/libslic3r/Algorithm/RegionExpansion.cpp
index 89bfa4905b..8cd0ff0f54 100644
--- a/src/libslic3r/Algorithm/RegionExpansion.cpp
+++ b/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"
diff --git a/src/libslic3r/Algorithm/RegionExpansion.hpp b/src/libslic3r/Algorithm/RegionExpansion.hpp
index 0c99459c69..531bf3cdba 100644
--- a/src/libslic3r/Algorithm/RegionExpansion.hpp
+++ b/src/libslic3r/Algorithm/RegionExpansion.hpp
@@ -12,6 +12,7 @@
 #include <cstdint>
 #include <algorithm>
 #include <vector>
+#include <cstddef>
 
 namespace Slic3r {
 namespace Algorithm {
diff --git a/src/libslic3r/Arachne/BeadingStrategy/BeadingStrategy.hpp b/src/libslic3r/Arachne/BeadingStrategy/BeadingStrategy.hpp
index 18fd501254..0a08f5d2d0 100644
--- a/src/libslic3r/Arachne/BeadingStrategy/BeadingStrategy.hpp
+++ b/src/libslic3r/Arachne/BeadingStrategy/BeadingStrategy.hpp
@@ -8,6 +8,7 @@
 #include <memory>
 #include <string>
 #include <vector>
+#include <cmath>
 
 #include "libslic3r/libslic3r.h"
 
diff --git a/src/libslic3r/Arachne/BeadingStrategy/BeadingStrategyFactory.hpp b/src/libslic3r/Arachne/BeadingStrategy/BeadingStrategyFactory.hpp
index 9d04d636ed..e24a85e5c5 100644
--- a/src/libslic3r/Arachne/BeadingStrategy/BeadingStrategyFactory.hpp
+++ b/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"
diff --git a/src/libslic3r/Arachne/BeadingStrategy/DistributedBeadingStrategy.cpp b/src/libslic3r/Arachne/BeadingStrategy/DistributedBeadingStrategy.cpp
index 60d0d86144..7234015ae2 100644
--- a/src/libslic3r/Arachne/BeadingStrategy/DistributedBeadingStrategy.cpp
+++ b/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"
diff --git a/src/libslic3r/Arachne/BeadingStrategy/LimitedBeadingStrategy.cpp b/src/libslic3r/Arachne/BeadingStrategy/LimitedBeadingStrategy.cpp
index 4903cb0a73..24e04c3f26 100644
--- a/src/libslic3r/Arachne/BeadingStrategy/LimitedBeadingStrategy.cpp
+++ b/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"
diff --git a/src/libslic3r/Arachne/PerimeterOrder.hpp b/src/libslic3r/Arachne/PerimeterOrder.hpp
index 27e896fc3d..20d8a3da58 100644
--- a/src/libslic3r/Arachne/PerimeterOrder.hpp
+++ b/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"
diff --git a/src/libslic3r/Arachne/SkeletalTrapezoidation.cpp b/src/libslic3r/Arachne/SkeletalTrapezoidation.cpp
index 6d95241b03..588afb1c22 100644
--- a/src/libslic3r/Arachne/SkeletalTrapezoidation.cpp
+++ b/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"
diff --git a/src/libslic3r/Arachne/SkeletalTrapezoidationGraph.cpp b/src/libslic3r/Arachne/SkeletalTrapezoidationGraph.cpp
index 1ecb8bd96d..f7a30c32db 100644
--- a/src/libslic3r/Arachne/SkeletalTrapezoidationGraph.cpp
+++ b/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"
diff --git a/src/libslic3r/Arachne/WallToolPaths.cpp b/src/libslic3r/Arachne/WallToolPaths.cpp
index 59c56be077..cf95b9edec 100644
--- a/src/libslic3r/Arachne/WallToolPaths.cpp
+++ b/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"
diff --git a/src/libslic3r/Arachne/WallToolPaths.hpp b/src/libslic3r/Arachne/WallToolPaths.hpp
index cceb6191ad..b56d1e0a89 100644
--- a/src/libslic3r/Arachne/WallToolPaths.hpp
+++ b/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"
diff --git a/src/libslic3r/Arachne/utils/ExtrusionLine.cpp b/src/libslic3r/Arachne/utils/ExtrusionLine.cpp
index 77fa1f6577..c597ac2939 100644
--- a/src/libslic3r/Arachne/utils/ExtrusionLine.cpp
+++ b/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"
diff --git a/src/libslic3r/Arachne/utils/ExtrusionLine.hpp b/src/libslic3r/Arachne/utils/ExtrusionLine.hpp
index 7f00bcdfc6..32bbc96a19 100644
--- a/src/libslic3r/Arachne/utils/ExtrusionLine.hpp
+++ b/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"
diff --git a/src/libslic3r/Arachne/utils/PolylineStitcher.hpp b/src/libslic3r/Arachne/utils/PolylineStitcher.hpp
index ad05a7799d..7f547f4f23 100644
--- a/src/libslic3r/Arachne/utils/PolylineStitcher.hpp
+++ b/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"
diff --git a/src/libslic3r/Arachne/utils/SquareGrid.hpp b/src/libslic3r/Arachne/utils/SquareGrid.hpp
index 8372bfe494..ff45d85354 100644
--- a/src/libslic3r/Arachne/utils/SquareGrid.hpp
+++ b/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"
diff --git a/src/libslic3r/Arrange/Core/Beds.cpp b/src/libslic3r/Arrange/Core/Beds.cpp
index 48c9c5a935..657522a593 100644
--- a/src/libslic3r/Arrange/Core/Beds.cpp
+++ b/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"
diff --git a/src/libslic3r/Arrange/Core/NFP/EdgeCache.hpp b/src/libslic3r/Arrange/Core/NFP/EdgeCache.hpp
index 6a087adda0..5fc349bbf1 100644
--- a/src/libslic3r/Arrange/Core/NFP/EdgeCache.hpp
+++ b/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"
diff --git a/src/libslic3r/Arrange/Core/NFP/NFP.cpp b/src/libslic3r/Arrange/Core/NFP/NFP.cpp
index 44ddacfcee..c3174b38d9 100644
--- a/src/libslic3r/Arrange/Core/NFP/NFP.cpp
+++ b/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 {
 
diff --git a/src/libslic3r/Arrange/Core/NFP/NFP.hpp b/src/libslic3r/Arrange/Core/NFP/NFP.hpp
index fc28925385..ae4139280d 100644
--- a/src/libslic3r/Arrange/Core/NFP/NFP.hpp
+++ b/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"
diff --git a/src/libslic3r/Arrange/Core/NFP/NFPConcave_CGAL.cpp b/src/libslic3r/Arrange/Core/NFP/NFPConcave_CGAL.cpp
index 12f8f2db16..b0fc7d3e16 100644
--- a/src/libslic3r/Arrange/Core/NFP/NFPConcave_CGAL.cpp
+++ b/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"
diff --git a/src/libslic3r/Arrange/Core/NFP/NFPConcave_Tesselate.cpp b/src/libslic3r/Arrange/Core/NFP/NFPConcave_Tesselate.cpp
index f2c260f66f..f47145b5ae 100644
--- a/src/libslic3r/Arrange/Core/NFP/NFPConcave_Tesselate.cpp
+++ b/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"
diff --git a/src/libslic3r/Arrange/Items/ArrangeItem.hpp b/src/libslic3r/Arrange/Items/ArrangeItem.hpp
index 5f2f62f443..8fa3a12d49 100644
--- a/src/libslic3r/Arrange/Items/ArrangeItem.hpp
+++ b/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"
diff --git a/src/libslic3r/Arrange/Scene.hpp b/src/libslic3r/Arrange/Scene.hpp
index 004f4eaed8..ca3d2af617 100644
--- a/src/libslic3r/Arrange/Scene.hpp
+++ b/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"
diff --git a/src/libslic3r/Arrange/SceneBuilder.cpp b/src/libslic3r/Arrange/SceneBuilder.cpp
index 786232b1de..35a9189623 100644
--- a/src/libslic3r/Arrange/SceneBuilder.cpp
+++ b/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 {
 
diff --git a/src/libslic3r/Arrange/SceneBuilder.hpp b/src/libslic3r/Arrange/SceneBuilder.hpp
index 8a11a17361..2167718f7e 100644
--- a/src/libslic3r/Arrange/SceneBuilder.hpp
+++ b/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"
diff --git a/src/libslic3r/BoundingBox.cpp b/src/libslic3r/BoundingBox.cpp
index a0c88c2375..f005f40036 100644
--- a/src/libslic3r/BoundingBox.cpp
+++ b/src/libslic3r/BoundingBox.cpp
@@ -9,7 +9,6 @@
 ///|/
 #include "BoundingBox.hpp"
 
-#include <assert.h>
 #include <algorithm>
 
 #include "libslic3r/Point.hpp"
diff --git a/src/libslic3r/BoundingBox.hpp b/src/libslic3r/BoundingBox.hpp
index a8e27b99d5..4978f9b2ad 100644
--- a/src/libslic3r/BoundingBox.hpp
+++ b/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"
diff --git a/src/libslic3r/BranchingTree/BranchingTree.cpp b/src/libslic3r/BranchingTree/BranchingTree.cpp
index 91b79f9ce3..f4e25ee66e 100644
--- a/src/libslic3r/BranchingTree/BranchingTree.cpp
+++ b/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"
diff --git a/src/libslic3r/BranchingTree/PointCloud.hpp b/src/libslic3r/BranchingTree/PointCloud.hpp
index e37d03f078..ad0efae047 100644
--- a/src/libslic3r/BranchingTree/PointCloud.hpp
+++ b/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"
diff --git a/src/libslic3r/BridgeDetector.cpp b/src/libslic3r/BridgeDetector.cpp
index 648bf0c697..de1473c24a 100644
--- a/src/libslic3r/BridgeDetector.cpp
+++ b/src/libslic3r/BridgeDetector.cpp
@@ -6,8 +6,8 @@
 ///|/
 #include "BridgeDetector.hpp"
 
-#include <stddef.h>
 #include <algorithm>
+#include <cstddef>
 
 #include "ClipperUtils.hpp"
 #include "Geometry.hpp"
diff --git a/src/libslic3r/Brim.cpp b/src/libslic3r/Brim.cpp
index f4873e0184..90bc408a5a 100644
--- a/src/libslic3r/Brim.cpp
+++ b/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"
diff --git a/src/libslic3r/BuildVolume.cpp b/src/libslic3r/BuildVolume.cpp
index cebc884b74..ecbf719c2a 100644
--- a/src/libslic3r/BuildVolume.cpp
+++ b/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"
diff --git a/src/libslic3r/ClipperUtils.cpp b/src/libslic3r/ClipperUtils.cpp
index c7417b657d..86653598b0 100644
--- a/src/libslic3r/ClipperUtils.cpp
+++ b/src/libslic3r/ClipperUtils.cpp
@@ -11,7 +11,6 @@
 ///|/
 #include "ClipperUtils.hpp"
 
-#include <stddef.h>
 #include <cmath>
 
 #include "ShortestPath.hpp"
diff --git a/src/libslic3r/ClipperUtils.hpp b/src/libslic3r/ClipperUtils.hpp
index a192b7c34e..00931e5268 100644
--- a/src/libslic3r/ClipperUtils.hpp
+++ b/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
 
diff --git a/src/libslic3r/Color.cpp b/src/libslic3r/Color.cpp
index 9221860497..ac8a750a91 100644
--- a/src/libslic3r/Color.cpp
+++ b/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"
 
diff --git a/src/libslic3r/Color.hpp b/src/libslic3r/Color.hpp
index 6678c1ff01..a9e9c9f212 100644
--- a/src/libslic3r/Color.hpp
+++ b/src/libslic3r/Color.hpp
@@ -10,6 +10,7 @@
 #include <algorithm>
 #include <string>
 #include <vector>
+#include <cassert>
 
 #include "Point.hpp"
 
diff --git a/src/libslic3r/Config.cpp b/src/libslic3r/Config.cpp
index 4fcd01b481..fafd38fdd7 100644
--- a/src/libslic3r/Config.cpp
+++ b/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"
diff --git a/src/libslic3r/Config.hpp b/src/libslic3r/Config.hpp
index df8ff88a49..9d3d19362e 100644
--- a/src/libslic3r/Config.hpp
+++ b/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"
diff --git a/src/libslic3r/CustomGCode.cpp b/src/libslic3r/CustomGCode.cpp
index a56d5545a3..a83064bffe 100644
--- a/src/libslic3r/CustomGCode.cpp
+++ b/src/libslic3r/CustomGCode.cpp
@@ -4,7 +4,7 @@
 ///|/
 #include "CustomGCode.hpp"
 
-#include <assert.h>
+#include <cassert>
 
 #include "Config.hpp"
 #include "GCode.hpp"
diff --git a/src/libslic3r/CustomGCode.hpp b/src/libslic3r/CustomGCode.hpp
index 515a07fcb4..93e3f3c3ec 100644
--- a/src/libslic3r/CustomGCode.hpp
+++ b/src/libslic3r/CustomGCode.hpp
@@ -9,6 +9,7 @@
 #include <string>
 #include <vector>
 #include <utility>
+#include <cstddef>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/CutSurface.cpp b/src/libslic3r/CutSurface.cpp
index 14e2df76e2..57dfb85608 100644
--- a/src/libslic3r/CutSurface.cpp
+++ b/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"
diff --git a/src/libslic3r/CutUtils.cpp b/src/libslic3r/CutUtils.cpp
index ccd2081fd4..148bc3d5de 100644
--- a/src/libslic3r/CutUtils.cpp
+++ b/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"
diff --git a/src/libslic3r/EdgeGrid.cpp b/src/libslic3r/EdgeGrid.cpp
index 28ba3d80d9..d0dd4233d7 100644
--- a/src/libslic3r/EdgeGrid.cpp
+++ b/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)
diff --git a/src/libslic3r/EdgeGrid.hpp b/src/libslic3r/EdgeGrid.hpp
index a48ac4b96e..780a1a0696 100644
--- a/src/libslic3r/EdgeGrid.hpp
+++ b/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"
diff --git a/src/libslic3r/ElephantFootCompensation.cpp b/src/libslic3r/ElephantFootCompensation.cpp
index 1e6ed8b5b5..e18101a6a6 100644
--- a/src/libslic3r/ElephantFootCompensation.cpp
+++ b/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"
diff --git a/src/libslic3r/Emboss.hpp b/src/libslic3r/Emboss.hpp
index 9cae18909f..68f3082fc8 100644
--- a/src/libslic3r/Emboss.hpp
+++ b/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"
diff --git a/src/libslic3r/ExPolygon.cpp b/src/libslic3r/ExPolygon.cpp
index 3f40c3bd6b..4b52f7e5b9 100644
--- a/src/libslic3r/ExPolygon.cpp
+++ b/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"
diff --git a/src/libslic3r/ExPolygon.hpp b/src/libslic3r/ExPolygon.hpp
index 4bcd18f643..a389683e70 100644
--- a/src/libslic3r/ExPolygon.hpp
+++ b/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"
diff --git a/src/libslic3r/ExPolygonsIndex.cpp b/src/libslic3r/ExPolygonsIndex.cpp
index 6f29eff607..c627b9b690 100644
--- a/src/libslic3r/ExPolygonsIndex.cpp
+++ b/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"
diff --git a/src/libslic3r/Extruder.cpp b/src/libslic3r/Extruder.cpp
index 7ee2ac21ea..b6f9eab5bb 100644
--- a/src/libslic3r/Extruder.cpp
+++ b/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"
diff --git a/src/libslic3r/ExtrusionEntity.cpp b/src/libslic3r/ExtrusionEntity.cpp
index 5a0ff7e2a7..8bca4224bd 100644
--- a/src/libslic3r/ExtrusionEntity.cpp
+++ b/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"
diff --git a/src/libslic3r/ExtrusionEntity.hpp b/src/libslic3r/ExtrusionEntity.hpp
index 0c704b65ce..391926cec3 100644
--- a/src/libslic3r/ExtrusionEntity.hpp
+++ b/src/libslic3r/ExtrusionEntity.hpp
@@ -17,6 +17,8 @@
 #include <limits>
 #include <utility>
 #include <vector>
+#include <cassert>
+#include <cstddef>
 
 #include "libslic3r.h"
 #include "ExtrusionRole.hpp"
diff --git a/src/libslic3r/ExtrusionEntityCollection.hpp b/src/libslic3r/ExtrusionEntityCollection.hpp
index c1c175b89f..b247dbf2dd 100644
--- a/src/libslic3r/ExtrusionEntityCollection.hpp
+++ b/src/libslic3r/ExtrusionEntityCollection.hpp
@@ -11,6 +11,7 @@
 #include <iterator>
 #include <utility>
 #include <vector>
+#include <cstddef>
 
 #include "libslic3r.h"
 #include "Exception.hpp"
diff --git a/src/libslic3r/ExtrusionSimulator.cpp b/src/libslic3r/ExtrusionSimulator.cpp
index 78669acba5..5158c59b5c 100644
--- a/src/libslic3r/ExtrusionSimulator.cpp
+++ b/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"
diff --git a/src/libslic3r/Fill/Fill.cpp b/src/libslic3r/Fill/Fill.cpp
index 96d59d9632..14d7197acb 100644
--- a/src/libslic3r/Fill/Fill.cpp
+++ b/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 {
diff --git a/src/libslic3r/Fill/Fill3DHoneycomb.cpp b/src/libslic3r/Fill/Fill3DHoneycomb.cpp
index f40d4795f8..2f40be1460 100644
--- a/src/libslic3r/Fill/Fill3DHoneycomb.cpp
+++ b/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"
diff --git a/src/libslic3r/Fill/FillAdaptive.cpp b/src/libslic3r/Fill/FillAdaptive.cpp
index 8fbd0c6d6e..23c4115f67 100644
--- a/src/libslic3r/Fill/FillAdaptive.cpp
+++ b/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"
diff --git a/src/libslic3r/Fill/FillBase.cpp b/src/libslic3r/Fill/FillBase.cpp
index 91f0cfc7cb..0575e27e48 100644
--- a/src/libslic3r/Fill/FillBase.cpp
+++ b/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
 
diff --git a/src/libslic3r/Fill/FillBase.hpp b/src/libslic3r/Fill/FillBase.hpp
index 6b26baf00b..ed9cc31b85 100644
--- a/src/libslic3r/Fill/FillBase.hpp
+++ b/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"
diff --git a/src/libslic3r/Fill/FillConcentric.cpp b/src/libslic3r/Fill/FillConcentric.cpp
index 9c41b42eb5..0555b9eb72 100644
--- a/src/libslic3r/Fill/FillConcentric.cpp
+++ b/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"
diff --git a/src/libslic3r/Fill/FillEnsuring.cpp b/src/libslic3r/Fill/FillEnsuring.cpp
index c2f479ac9b..c32214a52c 100644
--- a/src/libslic3r/Fill/FillEnsuring.cpp
+++ b/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"
diff --git a/src/libslic3r/Fill/FillGyroid.cpp b/src/libslic3r/Fill/FillGyroid.cpp
index da3f3aadd5..583ca22aef 100644
--- a/src/libslic3r/Fill/FillGyroid.cpp
+++ b/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"
diff --git a/src/libslic3r/Fill/FillHoneycomb.hpp b/src/libslic3r/Fill/FillHoneycomb.hpp
index f061be4a87..8286bda183 100644
--- a/src/libslic3r/Fill/FillHoneycomb.hpp
+++ b/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"
diff --git a/src/libslic3r/Fill/FillLightning.cpp b/src/libslic3r/Fill/FillLightning.cpp
index 2ca07725d7..b46f3314a2 100644
--- a/src/libslic3r/Fill/FillLightning.cpp
+++ b/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"
diff --git a/src/libslic3r/Fill/FillLine.cpp b/src/libslic3r/Fill/FillLine.cpp
index 7da6dd1c7e..f09c6a7116 100644
--- a/src/libslic3r/Fill/FillLine.cpp
+++ b/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"
diff --git a/src/libslic3r/Fill/FillPlanePath.hpp b/src/libslic3r/Fill/FillPlanePath.hpp
index bd1aa223fa..3a7bcad85f 100644
--- a/src/libslic3r/Fill/FillPlanePath.hpp
+++ b/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"
diff --git a/src/libslic3r/Fill/FillRectilinear.cpp b/src/libslic3r/Fill/FillRectilinear.cpp
index 1b11f2df2f..37244c7ceb 100644
--- a/src/libslic3r/Fill/FillRectilinear.cpp
+++ b/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"
diff --git a/src/libslic3r/Fill/FillRectilinear.hpp b/src/libslic3r/Fill/FillRectilinear.hpp
index b66b223860..1bca772b2a 100644
--- a/src/libslic3r/Fill/FillRectilinear.hpp
+++ b/src/libslic3r/Fill/FillRectilinear.hpp
@@ -13,6 +13,7 @@
 
 #include <stddef.h>
 #include <initializer_list>
+#include <cstddef>
 
 #include "libslic3r/libslic3r.h"
 #include "FillBase.hpp"
diff --git a/src/libslic3r/Fill/Lightning/DistanceField.cpp b/src/libslic3r/Fill/Lightning/DistanceField.cpp
index 4f07dc2ee7..3cb2c6ebfb 100644
--- a/src/libslic3r/Fill/Lightning/DistanceField.cpp
+++ b/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"
diff --git a/src/libslic3r/Fill/Lightning/DistanceField.hpp b/src/libslic3r/Fill/Lightning/DistanceField.hpp
index 5150e27f3f..f3bf5e7a85 100644
--- a/src/libslic3r/Fill/Lightning/DistanceField.hpp
+++ b/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"
diff --git a/src/libslic3r/Fill/Lightning/Generator.cpp b/src/libslic3r/Fill/Lightning/Generator.cpp
index 4715f67375..7753117063 100644
--- a/src/libslic3r/Fill/Lightning/Generator.cpp
+++ b/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"
diff --git a/src/libslic3r/Fill/Lightning/Generator.hpp b/src/libslic3r/Fill/Lightning/Generator.hpp
index 03fe10a2df..5173376804 100644
--- a/src/libslic3r/Fill/Lightning/Generator.hpp
+++ b/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"
diff --git a/src/libslic3r/Fill/Lightning/Layer.cpp b/src/libslic3r/Fill/Lightning/Layer.cpp
index 6f64a28305..f054c96ad8 100644
--- a/src/libslic3r/Fill/Lightning/Layer.cpp
+++ b/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"
diff --git a/src/libslic3r/Fill/Lightning/TreeNode.cpp b/src/libslic3r/Fill/Lightning/TreeNode.cpp
index 1d664e0182..cd659fd66a 100644
--- a/src/libslic3r/Fill/Lightning/TreeNode.cpp
+++ b/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"
diff --git a/src/libslic3r/Fill/Lightning/TreeNode.hpp b/src/libslic3r/Fill/Lightning/TreeNode.hpp
index 0c73f20fba..7468639798 100644
--- a/src/libslic3r/Fill/Lightning/TreeNode.hpp
+++ b/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"
diff --git a/src/libslic3r/Flow.cpp b/src/libslic3r/Flow.cpp
index aa64f45c37..bd6fb3d457 100644
--- a/src/libslic3r/Flow.cpp
+++ b/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>
diff --git a/src/libslic3r/Flow.hpp b/src/libslic3r/Flow.hpp
index a953d14249..128c2fc2c0 100644
--- a/src/libslic3r/Flow.hpp
+++ b/src/libslic3r/Flow.hpp
@@ -12,6 +12,7 @@
 
 #include <assert.h>
 #include <string>
+#include <cassert>
 
 #include "libslic3r.h"
 #include "Config.hpp"
diff --git a/src/libslic3r/Format/AnycubicSLA.cpp b/src/libslic3r/Format/AnycubicSLA.cpp
index e694220a31..66bff5743c 100644
--- a/src/libslic3r/Format/AnycubicSLA.cpp
+++ b/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"
diff --git a/src/libslic3r/Format/AnycubicSLA.hpp b/src/libslic3r/Format/AnycubicSLA.hpp
index 172bd71e5b..db8b7346de 100644
--- a/src/libslic3r/Format/AnycubicSLA.hpp
+++ b/src/libslic3r/Format/AnycubicSLA.hpp
@@ -10,6 +10,7 @@
 #include <string>
 #include <memory>
 #include <utility>
+#include <cinttypes>
 
 #include "SLAArchiveWriter.hpp"
 #include "SLAArchiveFormatRegistry.hpp"
diff --git a/src/libslic3r/Format/OBJ.cpp b/src/libslic3r/Format/OBJ.cpp
index 5bc95dd04d..ac78bbe3b6 100644
--- a/src/libslic3r/Format/OBJ.cpp
+++ b/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"
diff --git a/src/libslic3r/Format/SL1_SVG.cpp b/src/libslic3r/Format/SL1_SVG.cpp
index 27cb18a827..e5af3ece35 100644
--- a/src/libslic3r/Format/SL1_SVG.cpp
+++ b/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"
 
diff --git a/src/libslic3r/Format/SLAArchiveWriter.hpp b/src/libslic3r/Format/SLAArchiveWriter.hpp
index 8b6863a55b..90240a489f 100644
--- a/src/libslic3r/Format/SLAArchiveWriter.hpp
+++ b/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"
diff --git a/src/libslic3r/Format/STL.cpp b/src/libslic3r/Format/STL.cpp
index 94c558963f..250fa1dcc1 100644
--- a/src/libslic3r/Format/STL.cpp
+++ b/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"
diff --git a/src/libslic3r/Format/SVG.cpp b/src/libslic3r/Format/SVG.cpp
index 1642614b9e..a0f0898edb 100644
--- a/src/libslic3r/Format/SVG.cpp
+++ b/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"
diff --git a/src/libslic3r/Format/objparser.cpp b/src/libslic3r/Format/objparser.cpp
index e38ec65365..ee73d7e6c6 100644
--- a/src/libslic3r/Format/objparser.cpp
+++ b/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"
 
diff --git a/src/libslic3r/GCode/AvoidCrossingPerimeters.cpp b/src/libslic3r/GCode/AvoidCrossingPerimeters.cpp
index aa35e6d846..fe7f97bd77 100644
--- a/src/libslic3r/GCode/AvoidCrossingPerimeters.cpp
+++ b/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"
diff --git a/src/libslic3r/GCode/AvoidCrossingPerimeters.hpp b/src/libslic3r/GCode/AvoidCrossingPerimeters.hpp
index 3db3c313a1..6db5e3ed4c 100644
--- a/src/libslic3r/GCode/AvoidCrossingPerimeters.hpp
+++ b/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 {
 
diff --git a/src/libslic3r/GCode/ConflictChecker.cpp b/src/libslic3r/GCode/ConflictChecker.cpp
index de92aa38e9..8c5f639419 100644
--- a/src/libslic3r/GCode/ConflictChecker.cpp
+++ b/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"
diff --git a/src/libslic3r/GCode/CoolingBuffer.cpp b/src/libslic3r/GCode/CoolingBuffer.cpp
index 815f28c728..1a52e22aaa 100644
--- a/src/libslic3r/GCode/CoolingBuffer.cpp
+++ b/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 {
diff --git a/src/libslic3r/GCode/CoolingBuffer.hpp b/src/libslic3r/GCode/CoolingBuffer.hpp
index 6028c14dca..c488e5899c 100644
--- a/src/libslic3r/GCode/CoolingBuffer.hpp
+++ b/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"
diff --git a/src/libslic3r/GCode/ExtrusionOrder.cpp b/src/libslic3r/GCode/ExtrusionOrder.cpp
index b6d95a7c63..f116148294 100644
--- a/src/libslic3r/GCode/ExtrusionOrder.cpp
+++ b/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 {
 
diff --git a/src/libslic3r/GCode/ExtrusionOrder.hpp b/src/libslic3r/GCode/ExtrusionOrder.hpp
index 436be2fe7b..93c4f50519 100644
--- a/src/libslic3r/GCode/ExtrusionOrder.hpp
+++ b/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.
diff --git a/src/libslic3r/GCode/ExtrusionProcessor.cpp b/src/libslic3r/GCode/ExtrusionProcessor.cpp
index be1bd1af8e..f5232d2799 100644
--- a/src/libslic3r/GCode/ExtrusionProcessor.cpp
+++ b/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"
diff --git a/src/libslic3r/GCode/ExtrusionProcessor.hpp b/src/libslic3r/GCode/ExtrusionProcessor.hpp
index d283388d8a..5609e688a6 100644
--- a/src/libslic3r/GCode/ExtrusionProcessor.hpp
+++ b/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"
diff --git a/src/libslic3r/GCode/FindReplace.cpp b/src/libslic3r/GCode/FindReplace.cpp
index 5f7dc369a3..dd19c0a95b 100644
--- a/src/libslic3r/GCode/FindReplace.cpp
+++ b/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"
diff --git a/src/libslic3r/GCode/GCodeWriter.cpp b/src/libslic3r/GCode/GCodeWriter.cpp
index dd290d9c89..eda530cb3c 100644
--- a/src/libslic3r/GCode/GCodeWriter.cpp
+++ b/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"
 
diff --git a/src/libslic3r/GCode/GCodeWriter.hpp b/src/libslic3r/GCode/GCodeWriter.hpp
index ce4d6411f8..4d598f5796 100644
--- a/src/libslic3r/GCode/GCodeWriter.hpp
+++ b/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"
diff --git a/src/libslic3r/GCode/LabelObjects.cpp b/src/libslic3r/GCode/LabelObjects.cpp
index abf30df471..cabb5e4484 100644
--- a/src/libslic3r/GCode/LabelObjects.cpp
+++ b/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"
diff --git a/src/libslic3r/GCode/ModelVisibility.cpp b/src/libslic3r/GCode/ModelVisibility.cpp
index de3aa5fb42..0bc327e795 100644
--- a/src/libslic3r/GCode/ModelVisibility.cpp
+++ b/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"
diff --git a/src/libslic3r/GCode/ModelVisibility.hpp b/src/libslic3r/GCode/ModelVisibility.hpp
index 5bf4492418..da12b81623 100644
--- a/src/libslic3r/GCode/ModelVisibility.hpp
+++ b/src/libslic3r/GCode/ModelVisibility.hpp
@@ -4,6 +4,7 @@
 #include <stddef.h>
 #include <functional>
 #include <vector>
+#include <cstddef>
 
 #include "libslic3r/KDTreeIndirect.hpp"
 #include "libslic3r/Point.hpp"
diff --git a/src/libslic3r/GCode/PressureEqualizer.cpp b/src/libslic3r/GCode/PressureEqualizer.cpp
index 39a389bb27..acd8019b94 100644
--- a/src/libslic3r/GCode/PressureEqualizer.cpp
+++ b/src/libslic3r/GCode/PressureEqualizer.cpp
@@ -4,8 +4,6 @@
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
 #include <fast_float.h>
-#include <ctype.h>
-#include <stdlib.h>
 #include <boost/algorithm/string/predicate.hpp>
 #include <cstring>
 #include <algorithm>
@@ -13,10 +11,11 @@
 #include <iosfwd>
 #include <iterator>
 #include <limits>
+#include <cctype>
+#include <cstdlib>
 
 #include "libslic3r/PrintConfig.hpp"
 #include "libslic3r/GCode.hpp"
-#include "PressureEqualizer.hpp"
 #include "GCodeWriter.hpp"
 #include "libslic3r/GCode/PressureEqualizer.hpp"
 #include "libslic3r/Exception.hpp"
diff --git a/src/libslic3r/GCode/PressureEqualizer.hpp b/src/libslic3r/GCode/PressureEqualizer.hpp
index 432e0e245f..0480f011e7 100644
--- a/src/libslic3r/GCode/PressureEqualizer.hpp
+++ b/src/libslic3r/GCode/PressureEqualizer.hpp
@@ -13,6 +13,8 @@
 #include <cmath>
 #include <string>
 #include <vector>
+#include <cassert>
+#include <cstddef>
 
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/PrintConfig.hpp"
diff --git a/src/libslic3r/GCode/PrintExtents.cpp b/src/libslic3r/GCode/PrintExtents.cpp
index 7f200f13c9..cbcf2e6363 100644
--- a/src/libslic3r/GCode/PrintExtents.cpp
+++ b/src/libslic3r/GCode/PrintExtents.cpp
@@ -8,10 +8,9 @@
 // to decide whether to pause the print after the priming towers are extruded
 // to let the operator remove them from the print bed.
 
-#include <stddef.h>
-#include <Eigen/Geometry>
 #include <algorithm>
 #include <vector>
+#include <cstddef>
 
 #include "../BoundingBox.hpp"
 #include "../ExtrusionEntity.hpp"
diff --git a/src/libslic3r/GCode/RetractWhenCrossingPerimeters.cpp b/src/libslic3r/GCode/RetractWhenCrossingPerimeters.cpp
index 1de5cf9358..b81a32f051 100644
--- a/src/libslic3r/GCode/RetractWhenCrossingPerimeters.cpp
+++ b/src/libslic3r/GCode/RetractWhenCrossingPerimeters.cpp
@@ -2,8 +2,8 @@
 ///|/
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
-#include <assert.h>
 #include <algorithm>
+#include <cassert>
 
 #include "../ClipperUtils.hpp"
 #include "../Layer.hpp"
diff --git a/src/libslic3r/GCode/SeamGeometry.cpp b/src/libslic3r/GCode/SeamGeometry.cpp
index 1b581476bc..054f5c03a4 100644
--- a/src/libslic3r/GCode/SeamGeometry.cpp
+++ b/src/libslic3r/GCode/SeamGeometry.cpp
@@ -1,10 +1,10 @@
 #include "libslic3r/GCode/SeamGeometry.hpp"
 
-#include <stdint.h>
 #include <numeric>
 #include <cmath>
 #include <iterator>
 #include <limits>
+#include <cinttypes>
 
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/Layer.hpp"
diff --git a/src/libslic3r/GCode/SeamGeometry.hpp b/src/libslic3r/GCode/SeamGeometry.hpp
index d11f5db5ef..9b4849a3a2 100644
--- a/src/libslic3r/GCode/SeamGeometry.hpp
+++ b/src/libslic3r/GCode/SeamGeometry.hpp
@@ -22,6 +22,7 @@
 
 namespace Slic3r {
 class Layer;
+
 namespace AABBTreeLines {
 template <typename LineType> class LinesDistancer;
 }  // namespace AABBTreeLines
diff --git a/src/libslic3r/GCode/SmoothPath.cpp b/src/libslic3r/GCode/SmoothPath.cpp
index 233b7caf55..54ba3c1af2 100644
--- a/src/libslic3r/GCode/SmoothPath.cpp
+++ b/src/libslic3r/GCode/SmoothPath.cpp
@@ -1,10 +1,10 @@
 #include "SmoothPath.hpp"
 
-#include <assert.h>
 #include <algorithm>
 #include <cmath>
 #include <iterator>
 #include <utility>
+#include <cassert>
 
 #include "../ExtrusionEntity.hpp"
 #include "../ExtrusionEntityCollection.hpp"
diff --git a/src/libslic3r/GCode/SpiralVase.cpp b/src/libslic3r/GCode/SpiralVase.cpp
index 6dbfea94f5..f86022e7ab 100644
--- a/src/libslic3r/GCode/SpiralVase.cpp
+++ b/src/libslic3r/GCode/SpiralVase.cpp
@@ -8,8 +8,8 @@
 ///|/
 #include "SpiralVase.hpp"
 
-#include <stddef.h>
 #include <utility>
+#include <cstddef>
 
 #include "libslic3r/AABBTreeLines.hpp"
 #include "libslic3r/GCode/GCodeWriter.hpp"
diff --git a/src/libslic3r/GCode/ToolOrdering.cpp b/src/libslic3r/GCode/ToolOrdering.cpp
index 8a7466dba2..5749de768d 100644
--- a/src/libslic3r/GCode/ToolOrdering.cpp
+++ b/src/libslic3r/GCode/ToolOrdering.cpp
@@ -4,7 +4,6 @@
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
 #include "libslic3r/Print.hpp"
-#include "ToolOrdering.hpp"
 #include "libslic3r/Layer.hpp"
 #include "libslic3r/GCode/ToolOrdering.hpp"
 #include "libslic3r/CustomGCode.hpp"
@@ -26,10 +25,10 @@
 
 #include <boost/log/trivial.hpp>
 #include <libslic3r/libslic3r.h>
-#include <string.h>
 #include <cassert>
 #include <limits>
 #include <cmath>
+#include <cstring>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/GCode/ToolOrdering.hpp b/src/libslic3r/GCode/ToolOrdering.hpp
index 39999f55b3..4b494637ef 100644
--- a/src/libslic3r/GCode/ToolOrdering.hpp
+++ b/src/libslic3r/GCode/ToolOrdering.hpp
@@ -16,6 +16,7 @@
 #include <algorithm>
 #include <map>
 #include <vector>
+#include <cinttypes>
 
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/PrintConfig.hpp"
@@ -26,6 +27,7 @@ class Print;
 class PrintObject;
 class LayerTools;
 class ToolOrdering;
+
 namespace CustomGCode {
 struct Item;
 }  // namespace CustomGCode
diff --git a/src/libslic3r/GCode/Travels.cpp b/src/libslic3r/GCode/Travels.cpp
index f88aa50a1e..9da69b99e0 100644
--- a/src/libslic3r/GCode/Travels.cpp
+++ b/src/libslic3r/GCode/Travels.cpp
@@ -1,13 +1,13 @@
 #include "Travels.hpp"
 
-#include <assert.h>
-#include <stdint.h>
 #include <boost/math/special_functions/pow.hpp>
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <tuple>
 #include <utility>
+#include <cassert>
+#include <cinttypes>
 
 #include "libslic3r/PrintConfig.hpp"
 #include "libslic3r/Layer.hpp"
@@ -18,11 +18,11 @@
 #include "libslic3r/ExtrusionEntity.hpp"
 #include "libslic3r/ExtrusionEntityCollection.hpp"
 #include "libslic3r/LayerRegion.hpp"
-#include "libslic3r/MultiMaterialSegmentation.hpp"
 #include "libslic3r/Polygon.hpp"
 #include "libslic3r/Polyline.hpp"
 #include "libslic3r/libslic3r.h"
 #include "tcbspan/span.hpp"
+#include "libslic3r/ShortestPath.hpp"
 
 namespace Slic3r::GCode {
 
diff --git a/src/libslic3r/GCode/Travels.hpp b/src/libslic3r/GCode/Travels.hpp
index 2b109b3c98..ce59c8fadc 100644
--- a/src/libslic3r/GCode/Travels.hpp
+++ b/src/libslic3r/GCode/Travels.hpp
@@ -19,6 +19,7 @@
 #include "libslic3r/AABBTreeLines.hpp"
 #include "libslic3r/Line.hpp"
 #include "libslic3r/Point.hpp"
+#include "libslic3r/GCode/ExtrusionOrder.hpp"
 
 // Forward declarations.
 namespace Slic3r {
diff --git a/src/libslic3r/GCode/Wipe.cpp b/src/libslic3r/GCode/Wipe.cpp
index a895d07f04..64fe113203 100644
--- a/src/libslic3r/GCode/Wipe.cpp
+++ b/src/libslic3r/GCode/Wipe.cpp
@@ -1,11 +1,10 @@
 #include "Wipe.hpp"
 
-#include <stdint.h>
 #include <string_view>
-#include <Eigen/Geometry>
 #include <algorithm>
 #include <cmath>
 #include <iterator>
+#include <cinttypes>
 
 #include "../GCode.hpp"
 #include "libslic3r/Extruder.hpp"
diff --git a/src/libslic3r/GCode/Wipe.hpp b/src/libslic3r/GCode/Wipe.hpp
index e90135d5a8..666eb6a7d0 100644
--- a/src/libslic3r/GCode/Wipe.hpp
+++ b/src/libslic3r/GCode/Wipe.hpp
@@ -7,6 +7,7 @@
 #include <string>
 #include <utility>
 #include <vector>
+#include <cmath>
 
 #include "SmoothPath.hpp"
 #include "../Geometry/ArcWelder.hpp"
diff --git a/src/libslic3r/GCode/WipeTower.cpp b/src/libslic3r/GCode/WipeTower.cpp
index 7a5c7243b7..95e60a062a 100644
--- a/src/libslic3r/GCode/WipeTower.cpp
+++ b/src/libslic3r/GCode/WipeTower.cpp
@@ -9,12 +9,13 @@
 
 #include <LocalesUtils.hpp>
 #include <boost/algorithm/string/predicate.hpp>
-#include <stdio.h>
 #include <cassert>
 #include <vector>
 #include <numeric>
 #include <memory>
 #include <sstream>
+#include <cstdio>
+#include <cstdlib>
 
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/GCode/GCodeProcessor.hpp"
diff --git a/src/libslic3r/GCode/WipeTower.hpp b/src/libslic3r/GCode/WipeTower.hpp
index 579b44a8f9..6b57c7b7b7 100644
--- a/src/libslic3r/GCode/WipeTower.hpp
+++ b/src/libslic3r/GCode/WipeTower.hpp
@@ -13,6 +13,7 @@
 #include <algorithm>
 #include <limits>
 #include <vector>
+#include <cstddef>
 
 #include "libslic3r/Point.hpp"
 
diff --git a/src/libslic3r/GCode/WipeTowerIntegration.cpp b/src/libslic3r/GCode/WipeTowerIntegration.cpp
index b36dc9de94..0b82e030c7 100644
--- a/src/libslic3r/GCode/WipeTowerIntegration.cpp
+++ b/src/libslic3r/GCode/WipeTowerIntegration.cpp
@@ -1,15 +1,14 @@
 #include "WipeTowerIntegration.hpp"
 
-#include <assert.h>
-#include <stddef.h>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/trim.hpp>
-#include <Eigen/Geometry>
 #include <cmath>
 #include <iomanip>
 #include <istream>
 #include <iterator>
 #include <utility>
+#include <cassert>
+#include <cstdlib>
 
 #include "libslic3r/GCode.hpp"
 #include "libslic3r/libslic3r.h"
diff --git a/src/libslic3r/GCode/WipeTowerIntegration.hpp b/src/libslic3r/GCode/WipeTowerIntegration.hpp
index a0b8254757..adc76b0185 100644
--- a/src/libslic3r/GCode/WipeTowerIntegration.hpp
+++ b/src/libslic3r/GCode/WipeTowerIntegration.hpp
@@ -3,6 +3,9 @@
 
 #include <string>
 #include <vector>
+#include <cmath>
+#include <cstddef>
+#include <optional>
 
 #include "WipeTower.hpp"
 #include "../PrintConfig.hpp"
diff --git a/src/libslic3r/GCodeReader.cpp b/src/libslic3r/GCodeReader.cpp
index b4fe9a37bc..cf050955a9 100644
--- a/src/libslic3r/GCodeReader.cpp
+++ b/src/libslic3r/GCodeReader.cpp
@@ -6,10 +6,11 @@
 
 #include <boost/nowide/cstdio.hpp>
 #include <fast_float.h>
-#include <assert.h>
-#include <stdio.h>
 #include <iostream>
 #include <iomanip>
+#include <cassert>
+#include <cstdio>
+#include <cstdlib>
 
 #include "Utils.hpp"
 #include "libslic3r/PrintConfig.hpp"
diff --git a/src/libslic3r/GCodeReader.hpp b/src/libslic3r/GCodeReader.hpp
index 1f3a0fbfb0..66ac162838 100644
--- a/src/libslic3r/GCodeReader.hpp
+++ b/src/libslic3r/GCodeReader.hpp
@@ -14,6 +14,8 @@
 #include <string_view>
 #include <utility>
 #include <vector>
+#include <cinttypes>
+#include <cstring>
 
 #include "libslic3r.h"
 #include "PrintConfig.hpp"
diff --git a/src/libslic3r/Geometry.cpp b/src/libslic3r/Geometry.cpp
index 5e5c3b84cc..1df8c57c84 100644
--- a/src/libslic3r/Geometry.cpp
+++ b/src/libslic3r/Geometry.cpp
@@ -20,8 +20,8 @@
 #include <cmath>
 #include <utility>
 #include <vector>
-#include <Eigen/SVD>
 #include <array>
+#include <complex>
 
 #include "libslic3r.h"
 #include "Geometry.hpp"
diff --git a/src/libslic3r/Geometry.hpp b/src/libslic3r/Geometry.hpp
index 1bcae53124..4b1fc1ce86 100644
--- a/src/libslic3r/Geometry.hpp
+++ b/src/libslic3r/Geometry.hpp
@@ -27,6 +27,9 @@
 #include <string>
 #include <utility>
 #include <vector>
+#include <cassert>
+#include <cinttypes>
+#include <cstdlib>
 
 #include "libslic3r.h"
 #include "BoundingBox.hpp"
diff --git a/src/libslic3r/Geometry/ArcWelder.hpp b/src/libslic3r/Geometry/ArcWelder.hpp
index f8c6da2768..477f535eb4 100644
--- a/src/libslic3r/Geometry/ArcWelder.hpp
+++ b/src/libslic3r/Geometry/ArcWelder.hpp
@@ -12,9 +12,14 @@
 #include <type_traits>
 #include <utility>
 #include <vector>
+#include <cassert>
+#include <cinttypes>
+#include <complex>
+#include <cstddef>
 
 #include "../Point.hpp"
 #include "libslic3r/libslic3r.h"
+#include "libslic3r/Point.hpp"
 
 namespace Slic3r { namespace Geometry { namespace ArcWelder {
 
diff --git a/src/libslic3r/Geometry/Circle.hpp b/src/libslic3r/Geometry/Circle.hpp
index 15fd3a90f0..94f756133a 100644
--- a/src/libslic3r/Geometry/Circle.hpp
+++ b/src/libslic3r/Geometry/Circle.hpp
@@ -12,9 +12,13 @@
 #include <iterator>
 #include <optional>
 #include <type_traits>
+#include <cassert>
+#include <complex>
+#include <cstddef>
 
 #include "../Point.hpp"
 #include "libslic3r/libslic3r.h"
+#include "libslic3r/Point.hpp"
 
 namespace Slic3r { namespace Geometry {
 
diff --git a/src/libslic3r/Geometry/ConvexHull.cpp b/src/libslic3r/Geometry/ConvexHull.cpp
index d10916ec94..aa9bd50b6f 100644
--- a/src/libslic3r/Geometry/ConvexHull.cpp
+++ b/src/libslic3r/Geometry/ConvexHull.cpp
@@ -3,9 +3,9 @@
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
 #include <boost/multiprecision/integer.hpp>
-#include <assert.h>
-#include <stddef.h>
-#include <stdint.h>
+#include <cassert>
+#include <cinttypes>
+#include <cstddef>
 
 #include "ConvexHull.hpp"
 #include "libslic3r/BoundingBox.hpp"
diff --git a/src/libslic3r/Geometry/MedialAxis.cpp b/src/libslic3r/Geometry/MedialAxis.cpp
index 35d2a51df5..9410b29352 100644
--- a/src/libslic3r/Geometry/MedialAxis.cpp
+++ b/src/libslic3r/Geometry/MedialAxis.cpp
@@ -5,10 +5,9 @@
 #include "MedialAxis.hpp"
 
 #include <boost/log/trivial.hpp>
-#include <assert.h>
-#include <math.h>
 #include <boost/polygon/polygon.hpp>
-#include <algorithm>
+#include <cassert>
+#include <cmath>
 
 #include "VoronoiOffset.hpp"
 #include "libslic3r/ClipperUtils.hpp"
diff --git a/src/libslic3r/Geometry/MedialAxis.hpp b/src/libslic3r/Geometry/MedialAxis.hpp
index 37f58f4486..86e5ad91a2 100644
--- a/src/libslic3r/Geometry/MedialAxis.hpp
+++ b/src/libslic3r/Geometry/MedialAxis.hpp
@@ -8,6 +8,7 @@
 #include <stddef.h>
 #include <utility>
 #include <vector>
+#include <cstddef>
 
 #include "Voronoi.hpp"
 #include "../ExPolygon.hpp"
diff --git a/src/libslic3r/Geometry/Voronoi.cpp b/src/libslic3r/Geometry/Voronoi.cpp
index 219426f355..4f7173e5c2 100644
--- a/src/libslic3r/Geometry/Voronoi.cpp
+++ b/src/libslic3r/Geometry/Voronoi.cpp
@@ -1,8 +1,7 @@
 #include "Voronoi.hpp"
 
 #include <boost/log/trivial.hpp>
-#include <assert.h>
-#include <stddef.h>
+#include <cassert>
 
 #include "libslic3r/Arachne/utils/PolygonsSegmentIndex.hpp"
 #include "libslic3r/Geometry/VoronoiUtils.hpp"
diff --git a/src/libslic3r/Geometry/VoronoiOffset.cpp b/src/libslic3r/Geometry/VoronoiOffset.cpp
index 659f0790e4..dc25a1ade9 100644
--- a/src/libslic3r/Geometry/VoronoiOffset.cpp
+++ b/src/libslic3r/Geometry/VoronoiOffset.cpp
@@ -4,14 +4,14 @@
 ///|/
 // Polygon offsetting using Voronoi diagram prodiced by boost::polygon.
 
-#include <assert.h>
-#include <stddef.h>
 #include <cmath>
 #include <algorithm>
 #include <array>
 #include <limits>
 #include <tuple>
 #include <utility>
+#include <cassert>
+#include <cstdlib>
 
 #include "libslic3r/Geometry.hpp"
 #include "VoronoiOffset.hpp"
diff --git a/src/libslic3r/Geometry/VoronoiUtils.cpp b/src/libslic3r/Geometry/VoronoiUtils.cpp
index e56f901bc8..f140782891 100644
--- a/src/libslic3r/Geometry/VoronoiUtils.cpp
+++ b/src/libslic3r/Geometry/VoronoiUtils.cpp
@@ -2,12 +2,12 @@
 #include <libslic3r/Arachne/utils/PolygonsSegmentIndex.hpp>
 #include <libslic3r/MultiMaterialSegmentation.hpp>
 #include <libslic3r/Geometry.hpp>
-#include <assert.h>
-#include <stdlib.h>
 #include <cmath>
 #include <cstdint>
 #include <utility>
 #include <vector>
+#include <cassert>
+#include <cstdlib>
 
 #include "VoronoiUtils.hpp"
 #include "libslic3r/Exception.hpp"
diff --git a/src/libslic3r/Geometry/VoronoiUtilsCgal.cpp b/src/libslic3r/Geometry/VoronoiUtilsCgal.cpp
index f7b21e0f57..057105fc2f 100644
--- a/src/libslic3r/Geometry/VoronoiUtilsCgal.cpp
+++ b/src/libslic3r/Geometry/VoronoiUtilsCgal.cpp
@@ -5,9 +5,9 @@
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Arr_segment_traits_2.h>
 #include <CGAL/Surface_sweep_2_algorithms.h>
-#include <assert.h>
 #include <boost/variant/get.hpp>
 #include <vector>
+#include <cassert>
 
 #include "libslic3r/Geometry/Voronoi.hpp"
 #include "libslic3r/Geometry/VoronoiUtils.hpp"
diff --git a/src/libslic3r/IntersectionPoints.hpp b/src/libslic3r/IntersectionPoints.hpp
index f0a6c3b2a5..14ba73f2b4 100644
--- a/src/libslic3r/IntersectionPoints.hpp
+++ b/src/libslic3r/IntersectionPoints.hpp
@@ -7,6 +7,7 @@
 
 #include <stdint.h>
 #include <vector>
+#include <cinttypes>
 
 #include "ExPolygon.hpp"
 #include "libslic3r/Line.hpp"
diff --git a/src/libslic3r/Layer.cpp b/src/libslic3r/Layer.cpp
index df88b5aa3c..2a8ce5d7be 100644
--- a/src/libslic3r/Layer.cpp
+++ b/src/libslic3r/Layer.cpp
@@ -11,12 +11,12 @@
 #include "Layer.hpp"
 
 #include <boost/log/trivial.hpp>
-#include <assert.h>
 #include <clipper/clipper_z.hpp>
 #include <cstdint>
 #include <iterator>
 #include <numeric>
 #include <tuple>
+#include <cassert>
 
 #include "ClipperZUtils.hpp"
 #include "ClipperUtils.hpp"
diff --git a/src/libslic3r/Layer.hpp b/src/libslic3r/Layer.hpp
index c71fe9dc89..a145c568ff 100644
--- a/src/libslic3r/Layer.hpp
+++ b/src/libslic3r/Layer.hpp
@@ -20,6 +20,8 @@
 #include <string>
 #include <utility>
 #include <vector>
+#include <cinttypes>
+#include <cstddef>
 
 #include "Line.hpp"
 #include "libslic3r.h"
diff --git a/src/libslic3r/LayerRegion.cpp b/src/libslic3r/LayerRegion.cpp
index a2067dfc6b..0ce03b2595 100644
--- a/src/libslic3r/LayerRegion.cpp
+++ b/src/libslic3r/LayerRegion.cpp
@@ -4,9 +4,6 @@
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
 #include <boost/log/trivial.hpp>
-#include <assert.h>
-#include <stddef.h>
-#include <stdint.h>
 #include <algorithm>
 #include <string>
 #include <map>
@@ -14,10 +11,9 @@
 #include <cmath>
 #include <initializer_list>
 #include <iterator>
-#include <optional>
-#include <stdexcept>
 #include <utility>
 #include <vector>
+#include <cstddef>
 
 #include "ExPolygon.hpp"
 #include "Flow.hpp"
@@ -42,6 +38,7 @@
 #include "libslic3r/SurfaceCollection.hpp"
 #include "libslic3r/Utils.hpp"
 #include "libslic3r/libslic3r.h"
+#include "LayerRegion.hpp"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/LayerRegion.hpp b/src/libslic3r/LayerRegion.hpp
index d22d08ed40..7f6038900c 100644
--- a/src/libslic3r/LayerRegion.hpp
+++ b/src/libslic3r/LayerRegion.hpp
@@ -7,6 +7,8 @@
 #include <string>
 #include <utility>
 #include <vector>
+#include <cassert>
+#include <cinttypes>
 
 #include "BoundingBox.hpp"
 #include "ExtrusionEntityCollection.hpp"
diff --git a/src/libslic3r/Line.cpp b/src/libslic3r/Line.cpp
index 1596b34e72..535fb9b1bc 100644
--- a/src/libslic3r/Line.cpp
+++ b/src/libslic3r/Line.cpp
@@ -8,9 +8,10 @@
 ///|/
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
-#include <string.h>
 #include <cmath>
 #include <limits>
+#include <cstdlib>
+#include <cstring>
 
 #include "Geometry.hpp"
 #include "Line.hpp"
diff --git a/src/libslic3r/Line.hpp b/src/libslic3r/Line.hpp
index f53479a9f2..081117c775 100644
--- a/src/libslic3r/Line.hpp
+++ b/src/libslic3r/Line.hpp
@@ -15,6 +15,7 @@
 #include <cmath>
 #include <utility>
 #include <vector>
+#include <complex>
 
 #include "libslic3r.h"
 #include "Point.hpp"
diff --git a/src/libslic3r/Measure.cpp b/src/libslic3r/Measure.cpp
index 60db9aad82..db235e6980 100644
--- a/src/libslic3r/Measure.cpp
+++ b/src/libslic3r/Measure.cpp
@@ -4,13 +4,13 @@
 ///|/
 #include <oneapi/tbb/blocked_range.h>
 #include <oneapi/tbb/parallel_for.h>
-#include <stdint.h>
 #include <boost/container/small_vector.hpp>
 #include <algorithm>
 #include <array>
 #include <iterator>
 #include <limits>
 #include <set>
+#include <cinttypes>
 
 #include "libslic3r/libslic3r.h"
 #include "Measure.hpp"
diff --git a/src/libslic3r/Measure.hpp b/src/libslic3r/Measure.hpp
index 80395a3a06..0f90800b00 100644
--- a/src/libslic3r/Measure.hpp
+++ b/src/libslic3r/Measure.hpp
@@ -13,6 +13,8 @@
 #include <tuple>
 #include <utility>
 #include <vector>
+#include <cassert>
+#include <cstdlib>
 
 #include "Point.hpp"
 #include "libslic3r/libslic3r.h"
diff --git a/src/libslic3r/MeshBoolean.cpp b/src/libslic3r/MeshBoolean.cpp
index 7c464a26fa..c192662d9e 100644
--- a/src/libslic3r/MeshBoolean.cpp
+++ b/src/libslic3r/MeshBoolean.cpp
@@ -13,7 +13,6 @@
 // Include igl first. It defines "L" macro which then clashes with our localization
 #include <igl/copyleft/cgal/mesh_boolean.h> // IWYU pragma: keep
 #include <igl/MeshBooleanType.h>
-#include <signal.h>
 #include <boost/property_map/property_map.hpp>
 
 #undef L
@@ -25,6 +24,8 @@
 #include <CGAL/Cartesian_converter.h>
 #include <algorithm>
 #include <set>
+#include <csignal>
+#include <map>
 
 namespace Slic3r {
 namespace MeshBoolean {
diff --git a/src/libslic3r/MeshBoolean.hpp b/src/libslic3r/MeshBoolean.hpp
index f580b505f6..d4f67a72d3 100644
--- a/src/libslic3r/MeshBoolean.hpp
+++ b/src/libslic3r/MeshBoolean.hpp
@@ -13,6 +13,7 @@
 #include <vector>
 
 #include "admesh/stl.h"
+#include "libslic3r/Point.hpp"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/MeshNormals.cpp b/src/libslic3r/MeshNormals.cpp
index 35434ae90a..39a8d7780a 100644
--- a/src/libslic3r/MeshNormals.cpp
+++ b/src/libslic3r/MeshNormals.cpp
@@ -5,11 +5,11 @@
 #include "MeshNormals.hpp"
 
 #include <boost/container/small_vector.hpp>
-#include <assert.h>
-#include <stddef.h>
 #include <numeric>
 #include <algorithm>
 #include <cmath>
+#include <cassert>
+#include <cstddef>
 
 #include "libslic3r/AABBMesh.hpp"
 #include "libslic3r/Execution/Execution.hpp"
diff --git a/src/libslic3r/MinAreaBoundingBox.cpp b/src/libslic3r/MinAreaBoundingBox.cpp
index 1c2b1db78d..fa8cb0bbcd 100644
--- a/src/libslic3r/MinAreaBoundingBox.cpp
+++ b/src/libslic3r/MinAreaBoundingBox.cpp
@@ -6,7 +6,6 @@
 
 #include <libslic3r/ExPolygon.hpp>
 #include <libslic3r/BoundingBox.hpp>
-#include <stdint.h>
 
 #if defined(_MSC_VER) && defined(__clang__)
 #define BOOST_NO_CXX17_HDR_STRING_VIEW
@@ -22,6 +21,8 @@
 #include <libnest2d/backends/libslic3r/geometries.hpp> // IWYU pragma: keep
 #include <libnest2d/utils/rotcalipers.hpp>
 #include <cmath>
+#include <cinttypes>
+#include <cstdlib>
 
 #include "libnest2d/common.hpp"
 #include "libnest2d/geometry_traits.hpp"
diff --git a/src/libslic3r/ModelArrange.hpp b/src/libslic3r/ModelArrange.hpp
index f402ef8433..3044a2e156 100644
--- a/src/libslic3r/ModelArrange.hpp
+++ b/src/libslic3r/ModelArrange.hpp
@@ -8,6 +8,7 @@
 #include <libslic3r/Arrange/Scene.hpp>
 #include <stddef.h>
 #include <vector>
+#include <cstddef>
 
 #include "libslic3r/Arrange/Core/Beds.hpp"
 
@@ -15,6 +16,7 @@ namespace Slic3r {
 
 class Model;
 class ModelInstance;
+
 namespace arr2 {
 class ArrangeSettingsView;
 }  // namespace arr2
diff --git a/src/libslic3r/MultiMaterialSegmentation.cpp b/src/libslic3r/MultiMaterialSegmentation.cpp
index 04b6acbc2d..a846de55c5 100644
--- a/src/libslic3r/MultiMaterialSegmentation.cpp
+++ b/src/libslic3r/MultiMaterialSegmentation.cpp
@@ -4,15 +4,12 @@
 ///|/
 #include <boost/log/trivial.hpp>
 #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 <boost/container_hash/hash.hpp>
 #include <utility>
 #include <unordered_set>
 #include <mutex>
-#include <Eigen/Geometry>
 #include <algorithm>
 #include <array>
 #include <cmath>
@@ -20,6 +17,8 @@
 #include <limits>
 #include <queue>
 #include <vector>
+#include <cassert>
+#include <cstdlib>
 
 #include "BoundingBox.hpp"
 #include "ClipperUtils.hpp"
@@ -44,6 +43,7 @@
 #include "libslic3r/TriangleSelector.hpp"
 #include "libslic3r/Utils.hpp"
 #include "libslic3r/libslic3r.h"
+#include "MultiMaterialSegmentation.hpp"
 
 //#define MM_SEGMENTATION_DEBUG_GRAPH
 //#define MM_SEGMENTATION_DEBUG_REGIONS
diff --git a/src/libslic3r/MultiPoint.cpp b/src/libslic3r/MultiPoint.cpp
index 7de92d4c1b..a5498c2118 100644
--- a/src/libslic3r/MultiPoint.cpp
+++ b/src/libslic3r/MultiPoint.cpp
@@ -5,10 +5,10 @@
 ///|/
 #include "MultiPoint.hpp"
 
-#include <stdlib.h>
 #include <cmath>
 #include <limits>
 #include <queue>
+#include <cstdlib>
 
 #include "BoundingBox.hpp"
 #include "libslic3r/Point.hpp"
diff --git a/src/libslic3r/MultiPoint.hpp b/src/libslic3r/MultiPoint.hpp
index 34ca063af8..22f99608cc 100644
--- a/src/libslic3r/MultiPoint.hpp
+++ b/src/libslic3r/MultiPoint.hpp
@@ -16,10 +16,15 @@
 #include <initializer_list>
 #include <iterator>
 #include <utility>
+#include <cassert>
+#include <cinttypes>
+#include <cmath>
+#include <cstddef>
 
 #include "libslic3r.h"
 #include "Line.hpp"
 #include "Point.hpp"
+#include "libslic3r/Point.hpp"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/MutablePolygon.cpp b/src/libslic3r/MutablePolygon.cpp
index d7388bc9e6..078aa6b3bc 100644
--- a/src/libslic3r/MutablePolygon.cpp
+++ b/src/libslic3r/MutablePolygon.cpp
@@ -4,9 +4,9 @@
 ///|/
 #include "MutablePolygon.hpp"
 
-#include <math.h>
 #include <cstdint>
 #include <utility>
+#include <cmath>
 
 #include "libslic3r.h"
 #include "libslic3r/Point.hpp"
diff --git a/src/libslic3r/MutablePolygon.hpp b/src/libslic3r/MutablePolygon.hpp
index 2ad5866138..aea3580576 100644
--- a/src/libslic3r/MutablePolygon.hpp
+++ b/src/libslic3r/MutablePolygon.hpp
@@ -11,6 +11,9 @@
 #include <algorithm>
 #include <initializer_list>
 #include <vector>
+#include <cassert>
+#include <cinttypes>
+#include <cstddef>
 
 #include "Point.hpp"
 #include "Polygon.hpp"
diff --git a/src/libslic3r/NSVGUtils.cpp b/src/libslic3r/NSVGUtils.cpp
index 9e162a46f9..ecfdc34de6 100644
--- a/src/libslic3r/NSVGUtils.cpp
+++ b/src/libslic3r/NSVGUtils.cpp
@@ -5,14 +5,13 @@
 #include "NSVGUtils.hpp"
 
 #include <boost/nowide/fstream.hpp>
-#include <assert.h>
 #include <nanosvg/nanosvg.h>
-#include <string.h>
 #include <array>
 #include <algorithm>
 #include <sstream>
+#include <cassert>
+#include <cstring>
 
-#include "ClipperUtils.hpp"
 #include "Emboss.hpp" // heal for shape
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/EmbossShape.hpp"
diff --git a/src/libslic3r/NSVGUtils.hpp b/src/libslic3r/NSVGUtils.hpp
index e508b8b712..c4ef34588e 100644
--- a/src/libslic3r/NSVGUtils.hpp
+++ b/src/libslic3r/NSVGUtils.hpp
@@ -10,6 +10,7 @@
 #include <string>
 #include <sstream>
 #include <cmath>
+#include <cstddef>
 
 #include "Polygon.hpp"
 #include "ExPolygon.hpp"
diff --git a/src/libslic3r/NormalUtils.cpp b/src/libslic3r/NormalUtils.cpp
index 213306c5b6..98be279554 100644
--- a/src/libslic3r/NormalUtils.cpp
+++ b/src/libslic3r/NormalUtils.cpp
@@ -4,8 +4,8 @@
 ///|/
 #include "NormalUtils.hpp"
 
-#include <stddef.h>
 #include <cmath>
+#include <cstddef>
 
 #include "libslic3r/Exception.hpp"
 #include "libslic3r/Point.hpp"
diff --git a/src/libslic3r/ObjectID.hpp b/src/libslic3r/ObjectID.hpp
index a4cc9a9e61..c225092b9a 100644
--- a/src/libslic3r/ObjectID.hpp
+++ b/src/libslic3r/ObjectID.hpp
@@ -10,6 +10,8 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <cereal/cereal.hpp>
+#include <cinttypes>
+#include <cstddef>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/OpenVDBUtils.cpp b/src/libslic3r/OpenVDBUtils.cpp
index 1eed9c1085..9a73a3138e 100644
--- a/src/libslic3r/OpenVDBUtils.cpp
+++ b/src/libslic3r/OpenVDBUtils.cpp
@@ -18,7 +18,6 @@
 #include <openvdb/math/Vec3.h>
 #include <openvdb/math/Vec4.h>
 #include <openvdb/tools/Morphology.h>
-#include <stddef.h>
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif // _MSC_VER
@@ -27,11 +26,11 @@
 #include <openvdb/tools/Composite.h>
 #include <openvdb/tools/LevelSetRebuild.h>
 #include <openvdb/tools/FastSweeping.h>
-#include <Eigen/Geometry>
 #include <algorithm>
 #include <optional>
 #include <utility>
 #include <vector>
+#include <cstddef>
 
 #include "libslic3r/TriangleMesh.hpp"
 #include "libslic3r/libslic3r.h"
diff --git a/src/libslic3r/PNGReadWrite.cpp b/src/libslic3r/PNGReadWrite.cpp
index a4f4b9f5c9..f8b3696834 100644
--- a/src/libslic3r/PNGReadWrite.cpp
+++ b/src/libslic3r/PNGReadWrite.cpp
@@ -10,12 +10,12 @@
 #include <png.h>
 #include <boost/log/trivial.hpp>
 #include <boost/nowide/cstdio.hpp>
-#include <assert.h>
 #include <pngconf.h>
 #include <pnglibconf.h>
-#include <setjmp.h>
-#include <string.h>
 #include <cstdio>
+#include <cassert>
+#include <csetjmp>
+#include <cstring>
 
 namespace Slic3r { namespace png {
 
diff --git a/src/libslic3r/PNGReadWrite.hpp b/src/libslic3r/PNGReadWrite.hpp
index bf8286d965..0e8432581a 100644
--- a/src/libslic3r/PNGReadWrite.hpp
+++ b/src/libslic3r/PNGReadWrite.hpp
@@ -12,6 +12,7 @@
 #include <istream>
 #include <cstdint>
 #include <algorithm>
+#include <cstddef>
 
 namespace Slic3r { namespace png {
 
diff --git a/src/libslic3r/PlaceholderParser.cpp b/src/libslic3r/PlaceholderParser.cpp
index 3e5b75f895..a62639883c 100644
--- a/src/libslic3r/PlaceholderParser.cpp
+++ b/src/libslic3r/PlaceholderParser.cpp
@@ -16,6 +16,10 @@
 #include <cmath>
 #include <iterator>
 #include <utility>
+#include <cassert>
+#include <cinttypes>
+#include <cstdio>
+#include <cstdlib>
 
 #include "Exception.hpp"
 #include "Flow.hpp"
@@ -43,10 +47,6 @@
 #endif
 
 #include <boost/nowide/convert.hpp>
-#include <assert.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/cstdint.hpp>
 #include <boost/fusion/container/vector/vector.hpp>
diff --git a/src/libslic3r/Point.cpp b/src/libslic3r/Point.cpp
index 431f529bf8..96a3ff0ee7 100644
--- a/src/libslic3r/Point.cpp
+++ b/src/libslic3r/Point.cpp
@@ -12,9 +12,8 @@
 ///|/
 #include "Point.hpp"
 
-#include <stdint.h>
-#include <string.h>
 #include <algorithm>
+#include <cstring>
 
 #include "Int128.hpp"
 #include "BoundingBox.hpp"
diff --git a/src/libslic3r/Point.hpp b/src/libslic3r/Point.hpp
index a9c5c7408d..e8d7377b62 100644
--- a/src/libslic3r/Point.hpp
+++ b/src/libslic3r/Point.hpp
@@ -28,9 +28,11 @@
 #include <optional>
 #include <type_traits>
 #include <utility>
+#include <cassert>
 
 #include "libslic3r.h"
 #include "LocalesUtils.hpp"
+#include "libslic3r/Point.hpp"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Polygon.cpp b/src/libslic3r/Polygon.cpp
index 7887fa9af9..a91401a684 100644
--- a/src/libslic3r/Polygon.cpp
+++ b/src/libslic3r/Polygon.cpp
@@ -10,13 +10,12 @@
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
 #include <ankerl/unordered_dense.h>
-#include <stdint.h>
-#include <string.h>
 #include <cmath>
 #include <limits>
+#include <cinttypes>
+#include <cstring>
 
 #include "BoundingBox.hpp"
-#include "ClipperUtils.hpp"
 #include "Exception.hpp"
 #include "Polygon.hpp"
 #include "Polyline.hpp"
diff --git a/src/libslic3r/Polygon.hpp b/src/libslic3r/Polygon.hpp
index f9d2d50e2a..c7d59f35d8 100644
--- a/src/libslic3r/Polygon.hpp
+++ b/src/libslic3r/Polygon.hpp
@@ -21,6 +21,8 @@
 #include <initializer_list>
 #include <iterator>
 #include <utility>
+#include <cassert>
+#include <cmath>
 
 #include "libslic3r.h"
 #include "Line.hpp"
diff --git a/src/libslic3r/PolygonTrimmer.cpp b/src/libslic3r/PolygonTrimmer.cpp
index bc3a3a2e5f..70aceaead3 100644
--- a/src/libslic3r/PolygonTrimmer.cpp
+++ b/src/libslic3r/PolygonTrimmer.cpp
@@ -4,7 +4,7 @@
 ///|/
 #include "PolygonTrimmer.hpp"
 
-#include <assert.h>
+#include <cassert>
 
 #include "EdgeGrid.hpp"
 #include "Geometry.hpp"
diff --git a/src/libslic3r/Polyline.cpp b/src/libslic3r/Polyline.cpp
index dbf4838f78..6eccbc3800 100644
--- a/src/libslic3r/Polyline.cpp
+++ b/src/libslic3r/Polyline.cpp
@@ -10,10 +10,10 @@
 ///|/
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
-#include <assert.h>
 #include <utility>
 #include <cmath>
 #include <limits>
+#include <cassert>
 
 #include "BoundingBox.hpp"
 #include "Polyline.hpp"
diff --git a/src/libslic3r/Polyline.hpp b/src/libslic3r/Polyline.hpp
index ec13b8e2c3..fd96930792 100644
--- a/src/libslic3r/Polyline.hpp
+++ b/src/libslic3r/Polyline.hpp
@@ -18,6 +18,7 @@
 #include <initializer_list>
 #include <iterator>
 #include <utility>
+#include <cstddef>
 
 #include "libslic3r.h"
 #include "Line.hpp"
diff --git a/src/libslic3r/PrincipalComponents2D.cpp b/src/libslic3r/PrincipalComponents2D.cpp
index f519cf9211..f5fe32658e 100644
--- a/src/libslic3r/PrincipalComponents2D.cpp
+++ b/src/libslic3r/PrincipalComponents2D.cpp
@@ -4,9 +4,9 @@
 ///|/
 #include "PrincipalComponents2D.hpp"
 
-#include <stdlib.h>
 #include <cmath>
 #include <vector>
+#include <cstdlib>
 
 #include "Point.hpp"
 #include "libslic3r/Polygon.hpp"
diff --git a/src/libslic3r/PrintApply.cpp b/src/libslic3r/PrintApply.cpp
index f89f161550..eaf593aade 100644
--- a/src/libslic3r/PrintApply.cpp
+++ b/src/libslic3r/PrintApply.cpp
@@ -2,10 +2,7 @@
 ///|/
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
-#include <assert.h>
-#include <stddef.h>
 #include <cfloat>
-#include <Eigen/Geometry>
 #include <algorithm>
 #include <array>
 #include <cmath>
@@ -17,6 +14,8 @@
 #include <string>
 #include <utility>
 #include <vector>
+#include <cassert>
+#include <cstddef>
 
 #include "Model.hpp"
 #include "Print.hpp"
diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp
index a889d28f48..3ba266ed9f 100644
--- a/src/libslic3r/PrintObject.cpp
+++ b/src/libslic3r/PrintObject.cpp
@@ -7,15 +7,12 @@
 ///|/
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
-#include <float.h>
 #include <oneapi/tbb/blocked_range.h>
 #include <oneapi/tbb/concurrent_vector.h>
 #include <oneapi/tbb/parallel_for.h>
 #include <boost/log/trivial.hpp>
-#include <assert.h>
 #include <algorithm>
 #include <cmath>
-#include <cstddef>
 #include <functional>
 #include <map>
 #include <string>
@@ -24,10 +21,13 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <Eigen/Geometry>
 #include <array>
 #include <initializer_list>
 #include <memory>
+#include <cassert>
+#include <cfloat>
+#include <chrono>
+#include <cstdlib>
 
 #include "AABBTreeLines.hpp"
 #include "ExPolygon.hpp"
@@ -39,7 +39,6 @@
 #include "Polyline.hpp"
 #include "Print.hpp"
 #include "BoundingBox.hpp"
-#include "ClipperUtils.hpp"
 #include "Geometry.hpp"
 #include "I18N.hpp"
 #include "Layer.hpp"
@@ -65,6 +64,7 @@
 #include "libslic3r/MultiMaterialSegmentation.hpp"
 #include "libslic3r/TriangleSelector.hpp"
 #include "tcbspan/span.hpp"
+#include "libslic3r/Point.hpp"
 
 using namespace std::literals;
 
diff --git a/src/libslic3r/PrintObjectSlice.cpp b/src/libslic3r/PrintObjectSlice.cpp
index e2d7f1e610..04fcde0152 100644
--- a/src/libslic3r/PrintObjectSlice.cpp
+++ b/src/libslic3r/PrintObjectSlice.cpp
@@ -3,17 +3,16 @@
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
 #include <boost/log/trivial.hpp>
-#include <assert.h>
 #include <oneapi/tbb/blocked_range.h>
 #include <oneapi/tbb/parallel_for.h>
-#include <stddef.h>
-#include <Eigen/Geometry>
 #include <algorithm>
 #include <functional>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
+#include <cassert>
+#include <cstddef>
 
 #include "ClipperUtils.hpp"
 #include "ElephantFootCompensation.hpp"
diff --git a/src/libslic3r/PrintRegion.cpp b/src/libslic3r/PrintRegion.cpp
index 8af89a4637..d3819f714b 100644
--- a/src/libslic3r/PrintRegion.cpp
+++ b/src/libslic3r/PrintRegion.cpp
@@ -4,10 +4,10 @@
 ///|/
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
-#include <math.h>
-#include <stddef.h>
 #include <algorithm>
 #include <vector>
+#include <cmath>
+#include <cstddef>
 
 #include "Exception.hpp"
 #include "Print.hpp"
diff --git a/src/libslic3r/QuadricEdgeCollapse.cpp b/src/libslic3r/QuadricEdgeCollapse.cpp
index d93c3d9ec6..56bdeb8d3e 100644
--- a/src/libslic3r/QuadricEdgeCollapse.cpp
+++ b/src/libslic3r/QuadricEdgeCollapse.cpp
@@ -4,13 +4,10 @@
 ///|/
 #include "QuadricEdgeCollapse.hpp"
 
-#include <assert.h>
 #include <oneapi/tbb/blocked_range.h>
 #include <oneapi/tbb/parallel_for.h>
-#include <stddef.h>
 #include <tuple>
 #include <optional>
-#include <Eigen/Geometry>
 #include <algorithm>
 #include <array>
 #include <cmath>
@@ -18,6 +15,8 @@
 #include <limits>
 #include <utility>
 #include <vector>
+#include <cassert>
+#include <cstddef>
 
 #include "MutablePriorityQueue.hpp"
 #include "admesh/stl.h"
diff --git a/src/libslic3r/SLA/BranchingTreeSLA.cpp b/src/libslic3r/SLA/BranchingTreeSLA.cpp
index 5e8db164b6..7535ea92c4 100644
--- a/src/libslic3r/SLA/BranchingTreeSLA.cpp
+++ b/src/libslic3r/SLA/BranchingTreeSLA.cpp
@@ -4,7 +4,6 @@
 ///|/
 #include "BranchingTreeSLA.hpp"
 
-#include <stddef.h>
 #include <boost/container/vector.hpp>
 #include <boost/geometry.hpp>
 #include <boost/log/trivial.hpp>
@@ -14,6 +13,7 @@
 #include <optional>
 #include <utility>
 #include <vector>
+#include <cstddef>
 
 #include "libslic3r/Execution/ExecutionTBB.hpp"
 #include "libslic3r/KDTreeIndirect.hpp"
diff --git a/src/libslic3r/SLA/Clustering.cpp b/src/libslic3r/SLA/Clustering.cpp
index 03c081ee25..28a909898b 100644
--- a/src/libslic3r/SLA/Clustering.cpp
+++ b/src/libslic3r/SLA/Clustering.cpp
@@ -7,11 +7,10 @@
 #include <libslic3r/SLA/SpatIndex.hpp>
 #include <libslic3r/BoostAdapter.hpp> // IWYU pragma: keep
 #include <boost/geometry.hpp>
+#include <boost/geometry/index/rtree.hpp>
 #include <iterator>
 #include <utility>
 
-#include "boost/geometry/index/rtree.hpp"
-
 namespace Slic3r { namespace sla {
 
 namespace bgi = boost::geometry::index;
diff --git a/src/libslic3r/SLA/Clustering.hpp b/src/libslic3r/SLA/Clustering.hpp
index 1068120f58..7da876dec0 100644
--- a/src/libslic3r/SLA/Clustering.hpp
+++ b/src/libslic3r/SLA/Clustering.hpp
@@ -13,6 +13,9 @@
 #include <algorithm>
 #include <array>
 #include <functional>
+#include <cstddef>
+
+#include "libslic3r/Point.hpp"
 
 namespace Slic3r { namespace sla {
 
diff --git a/src/libslic3r/SLA/ConcaveHull.cpp b/src/libslic3r/SLA/ConcaveHull.cpp
index 73d144fefc..e66f082d27 100644
--- a/src/libslic3r/SLA/ConcaveHull.cpp
+++ b/src/libslic3r/SLA/ConcaveHull.cpp
@@ -4,7 +4,6 @@
 ///|/
 #include <libslic3r/SLA/ConcaveHull.hpp>
 #include <libslic3r/SLA/SpatIndex.hpp>
-#include <libslic3r/ClipperUtils.hpp>
 #include <cmath>
 #include <iterator>
 #include <limits>
diff --git a/src/libslic3r/SLA/DefaultSupportTree.cpp b/src/libslic3r/SLA/DefaultSupportTree.cpp
index 49751521c2..905c33be06 100644
--- a/src/libslic3r/SLA/DefaultSupportTree.cpp
+++ b/src/libslic3r/SLA/DefaultSupportTree.cpp
@@ -8,14 +8,14 @@
 #include <libslic3r/SLA/Clustering.hpp>
 #include <libslic3r/MeshNormals.hpp>
 #include <libslic3r/Execution/ExecutionTBB.hpp>
-#include <assert.h>
-#include <stddef.h>
 #include <boost/log/trivial.hpp>
 #include <cmath>
 #include <functional>
 #include <iterator>
 #include <set>
 #include <string>
+#include <cassert>
+#include <cstddef>
 
 #include "libslic3r/Geometry.hpp"
 #include "libslic3r/Optimize/Optimizer.hpp"
diff --git a/src/libslic3r/SLA/DefaultSupportTree.hpp b/src/libslic3r/SLA/DefaultSupportTree.hpp
index a1d5c5ee8b..a280dc7c10 100644
--- a/src/libslic3r/SLA/DefaultSupportTree.hpp
+++ b/src/libslic3r/SLA/DefaultSupportTree.hpp
@@ -21,6 +21,7 @@
 #include "libslic3r/SLA/Pad.hpp"
 #include "libslic3r/SLA/SupportTree.hpp"
 #include "libslic3r/SLA/SupportTreeBuilder.hpp"
+#include "libslic3r/Point.hpp"
 
 namespace Slic3r { namespace sla {
 
diff --git a/src/libslic3r/SLA/Hollowing.cpp b/src/libslic3r/SLA/Hollowing.cpp
index b566cedaf3..7b0c223d2a 100644
--- a/src/libslic3r/SLA/Hollowing.cpp
+++ b/src/libslic3r/SLA/Hollowing.cpp
@@ -14,8 +14,6 @@
 #include <libslic3r/MeshBoolean.hpp>
 #include <boost/log/trivial.hpp>
 #include <libslic3r/I18N.hpp>
-#include <assert.h>
-#include <stdint.h>
 #include <functional>
 #include <numeric>
 #include <unordered_set>
@@ -23,6 +21,8 @@
 #include <cmath>
 #include <mutex>
 #include <string>
+#include <cassert>
+#include <cinttypes>
 
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/Exception.hpp"
diff --git a/src/libslic3r/SLA/Hollowing.hpp b/src/libslic3r/SLA/Hollowing.hpp
index fa5cc6ff65..585109f596 100644
--- a/src/libslic3r/SLA/Hollowing.hpp
+++ b/src/libslic3r/SLA/Hollowing.hpp
@@ -16,6 +16,7 @@
 #include <functional>
 #include <utility>
 #include <vector>
+#include <cstddef>
 
 #include "admesh/stl.h"
 #include "libslic3r/CSGMesh/CSGMesh.hpp"
diff --git a/src/libslic3r/SLA/Pad.cpp b/src/libslic3r/SLA/Pad.cpp
index c299ae8f82..c911389515 100644
--- a/src/libslic3r/SLA/Pad.cpp
+++ b/src/libslic3r/SLA/Pad.cpp
@@ -7,9 +7,9 @@
 //#include <libslic3r/SLA/Contour3D.hpp>
 #include <libslic3r/TriangleMeshSlicer.hpp>
 #include <boost/log/trivial.hpp>
-#include <stddef.h>
 #include <algorithm>
 #include <utility>
+#include <cstdlib>
 
 #include "ConcaveHull.hpp"
 #include "libslic3r/ClipperUtils.hpp"
diff --git a/src/libslic3r/SLA/RasterBase.cpp b/src/libslic3r/SLA/RasterBase.cpp
index 2c82992490..a8d637f27a 100644
--- a/src/libslic3r/SLA/RasterBase.cpp
+++ b/src/libslic3r/SLA/RasterBase.cpp
@@ -13,6 +13,7 @@
 #include <algorithm>
 #include <cmath>
 #include <iterator>
+#include <cstdlib>
 
 #include "agg/agg_gamma_functions.h"
 
diff --git a/src/libslic3r/SLA/RasterBase.hpp b/src/libslic3r/SLA/RasterBase.hpp
index b640c1fadd..f7b42c0631 100644
--- a/src/libslic3r/SLA/RasterBase.hpp
+++ b/src/libslic3r/SLA/RasterBase.hpp
@@ -16,6 +16,7 @@
 #include <cstdint>
 #include <functional>
 #include <string>
+#include <cstddef>
 
 #include "libslic3r/Point.hpp"
 #include "libslic3r/libslic3r.h"
diff --git a/src/libslic3r/SLA/RasterToPolygons.cpp b/src/libslic3r/SLA/RasterToPolygons.cpp
index 1737e41f91..c4c12d82b4 100644
--- a/src/libslic3r/SLA/RasterToPolygons.cpp
+++ b/src/libslic3r/SLA/RasterToPolygons.cpp
@@ -4,11 +4,11 @@
 ///|/
 #include "RasterToPolygons.hpp"
 
-#include <stddef.h>
-#include <stdint.h>
 #include <algorithm>
 #include <utility>
 #include <vector>
+#include <cinttypes>
+#include <cstddef>
 
 #include "AGGRaster.hpp"
 #include "libslic3r/MarchingSquares.hpp"
diff --git a/src/libslic3r/SLA/Rotfinder.cpp b/src/libslic3r/SLA/Rotfinder.cpp
index c53ba492ed..27ff154a82 100644
--- a/src/libslic3r/SLA/Rotfinder.cpp
+++ b/src/libslic3r/SLA/Rotfinder.cpp
@@ -6,16 +6,15 @@
 #include <libslic3r/Execution/ExecutionTBB.hpp>
 #include <libslic3r/Optimize/BruteforceOptimizer.hpp>
 #include <libslic3r/Geometry.hpp>
-#include <stddef.h>
-#include <stdint.h>
 #include <limits>
 #include <thread>
-#include <Eigen/Geometry>
 #include <algorithm>
 #include <array>
 #include <cmath>
 #include <iterator>
 #include <vector>
+#include <cinttypes>
+#include <cstdlib>
 
 #include "libslic3r/PrintConfig.hpp"
 #include "admesh/stl.h"
diff --git a/src/libslic3r/SLA/SpatIndex.cpp b/src/libslic3r/SLA/SpatIndex.cpp
index 9d9ac26ce9..370c3ba396 100644
--- a/src/libslic3r/SLA/SpatIndex.cpp
+++ b/src/libslic3r/SLA/SpatIndex.cpp
@@ -7,6 +7,7 @@
 // for concave hull merging decisions
 #include <libslic3r/BoostAdapter.hpp> // IWYU pragma: keep
 #include <boost/geometry.hpp>
+#include <boost/geometry/index/rtree.hpp>
 #include <iterator>
 
 #ifdef _MSC_VER
@@ -15,7 +16,6 @@
 #pragma warning(disable: 4267)
 #endif
 
-#include "boost/geometry/index/rtree.hpp"
 #include "libslic3r/BoundingBox.hpp"
 
 #ifdef _MSC_VER
diff --git a/src/libslic3r/SLA/SpatIndex.hpp b/src/libslic3r/SLA/SpatIndex.hpp
index 342b72ee79..1ad061e194 100644
--- a/src/libslic3r/SLA/SpatIndex.hpp
+++ b/src/libslic3r/SLA/SpatIndex.hpp
@@ -12,6 +12,9 @@
 #include <vector>
 #include <Eigen/Geometry>
 #include <functional>
+#include <cstddef>
+
+#include "libslic3r/Point.hpp"
 
 namespace Slic3r {
 namespace sla {
diff --git a/src/libslic3r/SLA/SupportPointGenerator.cpp b/src/libslic3r/SLA/SupportPointGenerator.cpp
index 98b7ee0aac..227cc61c16 100644
--- a/src/libslic3r/SLA/SupportPointGenerator.cpp
+++ b/src/libslic3r/SLA/SupportPointGenerator.cpp
@@ -2,11 +2,12 @@
 ///|/
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
-#include <assert.h>
 #include <random>
 #include <cstdlib>
 #include <limits>
 #include <numeric>
+#include <algorithm>
+#include <cassert>
 
 #include "SupportPointGenerator.hpp"
 #include "libslic3r/Execution/ExecutionTBB.hpp"
@@ -21,6 +22,7 @@
 #include "libslic3r/AABBMesh.hpp"
 #include "libslic3r/Execution/Execution.hpp"
 #include "libslic3r/SLA/SupportPoint.hpp"
+#include "libslic3r/BoundingBox.hpp"
 
 namespace Slic3r {
 namespace sla {
diff --git a/src/libslic3r/SLA/SupportPointGenerator.hpp b/src/libslic3r/SLA/SupportPointGenerator.hpp
index be8de14923..734c09bef1 100644
--- a/src/libslic3r/SLA/SupportPointGenerator.hpp
+++ b/src/libslic3r/SLA/SupportPointGenerator.hpp
@@ -19,6 +19,7 @@
 #include <unordered_map>
 #include <utility>
 #include <vector>
+#include <cinttypes>
 
 #include "libslic3r/ExPolygon.hpp"
 #include "libslic3r/Polygon.hpp"
diff --git a/src/libslic3r/SLA/SupportTree.cpp b/src/libslic3r/SLA/SupportTree.cpp
index 3dcb2f1178..288459b574 100644
--- a/src/libslic3r/SLA/SupportTree.cpp
+++ b/src/libslic3r/SLA/SupportTree.cpp
@@ -14,9 +14,9 @@
 #include <libslic3r/MTUtils.hpp>
 #include <libslic3r/TriangleMeshSlicer.hpp>
 #include <boost/log/trivial.hpp>
-#include <stddef.h>
 #include <chrono>
 #include <iterator>
+#include <cstddef>
 
 #include "libslic3r/Point.hpp"
 #include "libslic3r/SLA/JobController.hpp"
diff --git a/src/libslic3r/SLA/SupportTree.hpp b/src/libslic3r/SLA/SupportTree.hpp
index 136210bc86..df2119b5ef 100644
--- a/src/libslic3r/SLA/SupportTree.hpp
+++ b/src/libslic3r/SLA/SupportTree.hpp
@@ -16,6 +16,7 @@
 #include <vector>
 #include <memory>
 #include <algorithm>
+#include <cmath>
 
 #include "admesh/stl.h"
 
diff --git a/src/libslic3r/SLA/SupportTreeBuilder.hpp b/src/libslic3r/SLA/SupportTreeBuilder.hpp
index 3678a613e1..84c76ecd2b 100644
--- a/src/libslic3r/SLA/SupportTreeBuilder.hpp
+++ b/src/libslic3r/SLA/SupportTreeBuilder.hpp
@@ -17,6 +17,8 @@
 #include <mutex>
 #include <utility>
 #include <vector>
+#include <cassert>
+#include <cstddef>
 
 #include "admesh/stl.h"
 #include "libslic3r/Point.hpp"
diff --git a/src/libslic3r/SLA/SupportTreeMesher.cpp b/src/libslic3r/SLA/SupportTreeMesher.cpp
index 9ee17249a9..0b73ddb4e4 100644
--- a/src/libslic3r/SLA/SupportTreeMesher.cpp
+++ b/src/libslic3r/SLA/SupportTreeMesher.cpp
@@ -4,8 +4,9 @@
 ///|/
 #include "SupportTreeMesher.hpp"
 
-#include <assert.h>
 #include <cmath>
+#include <cassert>
+#include <cstdlib>
 
 namespace Slic3r { namespace sla {
 
diff --git a/src/libslic3r/SLA/SupportTreeMesher.hpp b/src/libslic3r/SLA/SupportTreeMesher.hpp
index 584d3e3f2f..960152aecf 100644
--- a/src/libslic3r/SLA/SupportTreeMesher.hpp
+++ b/src/libslic3r/SLA/SupportTreeMesher.hpp
@@ -7,6 +7,7 @@
 
 #include <stddef.h>
 #include <tuple>
+#include <cstddef>
 
 #include "libslic3r/Point.hpp"
 #include "libslic3r/SLA/SupportTreeBuilder.hpp"
diff --git a/src/libslic3r/SLA/ZCorrection.hpp b/src/libslic3r/SLA/ZCorrection.hpp
index ed32efbe56..5d9198b2a4 100644
--- a/src/libslic3r/SLA/ZCorrection.hpp
+++ b/src/libslic3r/SLA/ZCorrection.hpp
@@ -5,6 +5,7 @@
 #include <algorithm>
 #include <map>
 #include <vector>
+#include <cstddef>
 
 #include "libslic3r/ExPolygon.hpp"
 #include "libslic3r/Execution/Execution.hpp"
diff --git a/src/libslic3r/SLAPrintSteps.cpp b/src/libslic3r/SLAPrintSteps.cpp
index ceb23b5b50..ff3a74cfb8 100644
--- a/src/libslic3r/SLAPrintSteps.cpp
+++ b/src/libslic3r/SLAPrintSteps.cpp
@@ -18,7 +18,6 @@
 #include <libslic3r/OpenVDBUtils.hpp>
 #include <libslic3r/QuadricEdgeCollapse.hpp>
 #include <libslic3r/ClipperUtils.hpp>
-#include <assert.h>
 #include <chrono>
 #include <algorithm>
 #include <array>
@@ -33,6 +32,7 @@
 #include <set>
 #include <tuple>
 #include <vector>
+#include <cassert>
 //#include <libslic3r/ShortEdgeCollapse.hpp>
 
 #include <boost/log/trivial.hpp>
diff --git a/src/libslic3r/SLAPrintSteps.hpp b/src/libslic3r/SLAPrintSteps.hpp
index afa0309f55..a1e50842c7 100644
--- a/src/libslic3r/SLAPrintSteps.hpp
+++ b/src/libslic3r/SLAPrintSteps.hpp
@@ -12,6 +12,7 @@
 #include <random>
 #include <string>
 #include <utility>
+#include <cstddef>
 
 #include "admesh/stl.h"
 #include "libslic3r/libslic3r.h"
diff --git a/src/libslic3r/SVG.cpp b/src/libslic3r/SVG.cpp
index e6a5c1512e..01909354ef 100644
--- a/src/libslic3r/SVG.cpp
+++ b/src/libslic3r/SVG.cpp
@@ -11,9 +11,9 @@
 #include "SVG.hpp"
 
 #include <boost/nowide/cstdio.hpp>
-#include <math.h>
 #include <iostream>
 #include <algorithm>
+#include <cmath>
 
 #include "libslic3r/ExPolygon.hpp"
 #include "libslic3r/Line.hpp"
diff --git a/src/libslic3r/SVG.hpp b/src/libslic3r/SVG.hpp
index 066b88ff40..1de7f495c6 100644
--- a/src/libslic3r/SVG.hpp
+++ b/src/libslic3r/SVG.hpp
@@ -14,6 +14,7 @@
 #include <string>
 #include <utility>
 #include <vector>
+#include <cstdio>
 
 #include "libslic3r.h"
 #include "libslic3r/clipper.hpp"
diff --git a/src/libslic3r/Semver.hpp b/src/libslic3r/Semver.hpp
index 00fdf6d721..a3c5638beb 100644
--- a/src/libslic3r/Semver.hpp
+++ b/src/libslic3r/Semver.hpp
@@ -16,6 +16,7 @@
 #include <ostream>
 #include <stdexcept>
 #include <limits>
+#include <cstdlib>
 
 #include "Exception.hpp"
 
diff --git a/src/libslic3r/ShortEdgeCollapse.hpp b/src/libslic3r/ShortEdgeCollapse.hpp
index d18e9c765c..b6cdd16fc7 100644
--- a/src/libslic3r/ShortEdgeCollapse.hpp
+++ b/src/libslic3r/ShortEdgeCollapse.hpp
@@ -6,6 +6,7 @@
 #define SRC_LIBSLIC3R_SHORTEDGECOLLAPSE_HPP_
 
 #include <stddef.h>
+#include <cstddef>
 
 #include "libslic3r/TriangleMesh.hpp"
 
diff --git a/src/libslic3r/ShortestPath.cpp b/src/libslic3r/ShortestPath.cpp
index 3297d424df..31303ddeae 100644
--- a/src/libslic3r/ShortestPath.cpp
+++ b/src/libslic3r/ShortestPath.cpp
@@ -10,15 +10,14 @@
 
 #include <cmath>
 #include <cassert>
-#include <Eigen/Geometry>
 #include <iterator>
 #include <limits>
+#include <algorithm>
 
 #include "ShortestPath.hpp"
 #include "KDTreeIndirect.hpp"
 #include "MutablePriorityQueue.hpp"
 #include "Print.hpp"
-#include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/ExtrusionEntity.hpp"
 #include "libslic3r/ExtrusionEntityCollection.hpp"
 #include "libslic3r/Line.hpp"
diff --git a/src/libslic3r/ShortestPath.hpp b/src/libslic3r/ShortestPath.hpp
index 01a4e6b8d0..644018bd14 100644
--- a/src/libslic3r/ShortestPath.hpp
+++ b/src/libslic3r/ShortestPath.hpp
@@ -8,6 +8,7 @@
 #include <stddef.h>
 #include <utility>
 #include <vector>
+#include <cstddef>
 
 #include "libslic3r.h"
 #include "ExtrusionEntity.hpp"
diff --git a/src/libslic3r/SlicesToTriangleMesh.cpp b/src/libslic3r/SlicesToTriangleMesh.cpp
index d6bec4a57c..9f80b4e079 100644
--- a/src/libslic3r/SlicesToTriangleMesh.cpp
+++ b/src/libslic3r/SlicesToTriangleMesh.cpp
@@ -3,8 +3,8 @@
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
 #include <boost/log/trivial.hpp>
-#include <assert.h>
-#include <stddef.h>
+#include <cassert>
+#include <cstddef>
 
 #include "SlicesToTriangleMesh.hpp"
 #include "libslic3r/Execution/ExecutionTBB.hpp"
diff --git a/src/libslic3r/Slicing.hpp b/src/libslic3r/Slicing.hpp
index 39b28fb260..6015769b89 100644
--- a/src/libslic3r/Slicing.hpp
+++ b/src/libslic3r/Slicing.hpp
@@ -14,6 +14,7 @@
 #include <type_traits>
 #include <vector>
 #include <utility>
+#include <cassert>
 
 #include "Point.hpp"
 #include "libslic3r.h"
diff --git a/src/libslic3r/SlicingAdaptive.cpp b/src/libslic3r/SlicingAdaptive.cpp
index aec64497d8..4a0606926c 100644
--- a/src/libslic3r/SlicingAdaptive.cpp
+++ b/src/libslic3r/SlicingAdaptive.cpp
@@ -2,10 +2,10 @@
 ///|/
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
-#include <assert.h>
 #include <cfloat>
 #include <algorithm>
 #include <cmath>
+#include <cassert>
 
 #include "libslic3r.h"
 #include "Model.hpp"
diff --git a/src/libslic3r/SlicingAdaptive.hpp b/src/libslic3r/SlicingAdaptive.hpp
index b8a3ab6ee5..e306d47cde 100644
--- a/src/libslic3r/SlicingAdaptive.hpp
+++ b/src/libslic3r/SlicingAdaptive.hpp
@@ -10,6 +10,7 @@
 #include <stddef.h>
 #include <utility>
 #include <vector>
+#include <cstddef>
 
 #include "Slicing.hpp"
 #include "admesh/stl.h"
diff --git a/src/libslic3r/Subdivide.cpp b/src/libslic3r/Subdivide.cpp
index 20b57e090a..6e25ef8d3f 100644
--- a/src/libslic3r/Subdivide.cpp
+++ b/src/libslic3r/Subdivide.cpp
@@ -4,8 +4,6 @@
 ///|/
 #include "Subdivide.hpp"
 
-#include <assert.h>
-#include <stdlib.h>
 #include <algorithm>
 #include <cmath>
 #include <map>
@@ -13,6 +11,8 @@
 #include <tuple>
 #include <utility>
 #include <vector>
+#include <cassert>
+#include <cstddef>
 
 #include "Point.hpp"
 
diff --git a/src/libslic3r/Support/OrganicSupport.cpp b/src/libslic3r/Support/OrganicSupport.cpp
index ef634d241f..f7065eee0a 100644
--- a/src/libslic3r/Support/OrganicSupport.cpp
+++ b/src/libslic3r/Support/OrganicSupport.cpp
@@ -7,8 +7,6 @@
 #include <oneapi/tbb/blocked_range.h>
 #include <oneapi/tbb/parallel_for.h>
 #include <oneapi/tbb/partitioner.h>
-#include <stddef.h>
-#include <stdint.h>
 #include <boost/container/small_vector.hpp>
 #include <boost/container/vector.hpp>
 #include <cassert>
@@ -18,6 +16,8 @@
 #include <limits>
 #include <optional>
 #include <utility>
+#include <cinttypes>
+#include <cstddef>
 
 #include "../AABBTreeLines.hpp"
 #include "../ClipperUtils.hpp"
diff --git a/src/libslic3r/Support/SupportCommon.cpp b/src/libslic3r/Support/SupportCommon.cpp
index 4b2444ff82..26bd31ea63 100644
--- a/src/libslic3r/Support/SupportCommon.cpp
+++ b/src/libslic3r/Support/SupportCommon.cpp
@@ -5,13 +5,13 @@
 #include <boost/container/static_vector.hpp>
 #include <oneapi/tbb/blocked_range.h>
 #include <oneapi/tbb/parallel_for.h>
-#include <stddef.h>
 #include <boost/log/trivial.hpp>
 #include <cmath>
 #include <initializer_list>
 #include <limits>
 #include <memory>
 #include <unordered_map>
+#include <cstdlib>
 
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/ClipperZUtils.hpp" // IWYU pragma: keep
diff --git a/src/libslic3r/Support/SupportMaterial.cpp b/src/libslic3r/Support/SupportMaterial.cpp
index 805a29b1d5..0ef19d29f9 100644
--- a/src/libslic3r/Support/SupportMaterial.cpp
+++ b/src/libslic3r/Support/SupportMaterial.cpp
@@ -11,12 +11,9 @@
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
 #include <boost/log/trivial.hpp>
-#include <float.h>
 #include <oneapi/tbb/blocked_range.h>
 #include <oneapi/tbb/parallel_for.h>
 #include <oneapi/tbb/task_group.h>
-#include <stddef.h>
-#include <stdint.h>
 #include <cmath>
 #include <memory>
 #include <algorithm>
@@ -24,6 +21,9 @@
 #include <numeric>
 #include <tuple>
 #include <utility>
+#include <cfloat>
+#include <cinttypes>
+#include <cstdlib>
 
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/ExtrusionEntityCollection.hpp"
diff --git a/src/libslic3r/Support/SupportParameters.cpp b/src/libslic3r/Support/SupportParameters.cpp
index b691a99f89..3086aa9159 100644
--- a/src/libslic3r/Support/SupportParameters.cpp
+++ b/src/libslic3r/Support/SupportParameters.cpp
@@ -2,8 +2,8 @@
 ///|/
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
-#include <assert.h>
 #include <algorithm>
+#include <cassert>
 
 #include "../Print.hpp"
 #include "../PrintConfig.hpp"
diff --git a/src/libslic3r/Support/SupportParameters.hpp b/src/libslic3r/Support/SupportParameters.hpp
index fb07bcf6fa..1ce6b83ce8 100644
--- a/src/libslic3r/Support/SupportParameters.hpp
+++ b/src/libslic3r/Support/SupportParameters.hpp
@@ -7,6 +7,8 @@
 
 #include <math.h>
 #include <stddef.h>
+#include <cmath>
+#include <cstddef>
 
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Flow.hpp"
diff --git a/src/libslic3r/Support/TreeModelVolumes.cpp b/src/libslic3r/Support/TreeModelVolumes.cpp
index 9fff0b971e..e2613dad08 100644
--- a/src/libslic3r/Support/TreeModelVolumes.cpp
+++ b/src/libslic3r/Support/TreeModelVolumes.cpp
@@ -13,7 +13,6 @@
 #include "TreeModelVolumes.hpp"
 
 #include <boost/log/trivial.hpp>
-#include <math.h>
 #include <oneapi/tbb/blocked_range.h>
 #include <oneapi/tbb/parallel_for.h>
 #include <oneapi/tbb/task_arena.h>
@@ -24,10 +23,11 @@
 #include <numeric>
 #include <string>
 #include <unordered_map>
+#include <cmath>
+#include <string_view>
 
 #include "TreeSupportCommon.hpp"
 #include "../BuildVolume.hpp"
-#include "../ClipperUtils.hpp"
 #include "../Layer.hpp"
 #include "../Point.hpp"
 #include "../Print.hpp"
diff --git a/src/libslic3r/Support/TreeModelVolumes.hpp b/src/libslic3r/Support/TreeModelVolumes.hpp
index 66e12076de..5f3b2f7022 100644
--- a/src/libslic3r/Support/TreeModelVolumes.hpp
+++ b/src/libslic3r/Support/TreeModelVolumes.hpp
@@ -24,6 +24,9 @@
 #include <optional>
 #include <utility>
 #include <vector>
+#include <cassert>
+#include <cinttypes>
+#include <cstddef>
 
 #include "TreeSupportCommon.hpp"
 #include "../Point.hpp"
diff --git a/src/libslic3r/Support/TreeSupport.cpp b/src/libslic3r/Support/TreeSupport.cpp
index e5aa62e9ae..75fc31a558 100644
--- a/src/libslic3r/Support/TreeSupport.cpp
+++ b/src/libslic3r/Support/TreeSupport.cpp
@@ -12,13 +12,11 @@
 
 #include "TreeSupport.hpp"
 
-#include <stdio.h>
 #include <boost/log/trivial.hpp>
 #include <oneapi/tbb/blocked_range.h>
 #include <oneapi/tbb/parallel_for.h>
 #include <oneapi/tbb/partitioner.h>
 #include <oneapi/tbb/task_arena.h>
-#include <stdlib.h>
 #include <cassert>
 #include <chrono>
 #include <optional>
@@ -32,13 +30,13 @@
 #include <ratio>
 #include <tuple>
 #include <unordered_set>
+#include <cstdlib>
 
 #include "TreeSupportCommon.hpp"
 #include "SupportCommon.hpp"
 #include "OrganicSupport.hpp"
 #include "../AABBTreeIndirect.hpp"
 #include "../BuildVolume.hpp"
-#include "../ClipperUtils.hpp"
 #include "../EdgeGrid.hpp"
 #include "../Layer.hpp"
 #include "../Print.hpp"
diff --git a/src/libslic3r/Support/TreeSupport.hpp b/src/libslic3r/Support/TreeSupport.hpp
index 451d54574b..aa93685859 100644
--- a/src/libslic3r/Support/TreeSupport.hpp
+++ b/src/libslic3r/Support/TreeSupport.hpp
@@ -23,6 +23,7 @@
 #include <limits>
 #include <utility>
 #include <vector>
+#include <cstddef>
 
 #include "SupportLayer.hpp"
 #include "TreeModelVolumes.hpp"
diff --git a/src/libslic3r/Support/TreeSupportCommon.cpp b/src/libslic3r/Support/TreeSupportCommon.cpp
index 02f1148a48..ea3e675220 100644
--- a/src/libslic3r/Support/TreeSupportCommon.cpp
+++ b/src/libslic3r/Support/TreeSupportCommon.cpp
@@ -12,8 +12,8 @@
 
 #include "TreeSupportCommon.hpp"
 
-#include <stdio.h>
 #include <limits>
+#include <cstdio>
 
 #include "libslic3r/Flow.hpp"
 #include "libslic3r/Print.hpp"
diff --git a/src/libslic3r/Support/TreeSupportCommon.hpp b/src/libslic3r/Support/TreeSupportCommon.hpp
index 28d5d8dc37..b81f033a3f 100644
--- a/src/libslic3r/Support/TreeSupportCommon.hpp
+++ b/src/libslic3r/Support/TreeSupportCommon.hpp
@@ -22,6 +22,9 @@
 #include <mutex>
 #include <utility>
 #include <vector>
+#include <cassert>
+#include <cmath>
+#include <cstddef>
 
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Polygon.hpp"
diff --git a/src/libslic3r/SupportSpotsGenerator.cpp b/src/libslic3r/SupportSpotsGenerator.cpp
index f3481dad9b..f735d77d31 100644
--- a/src/libslic3r/SupportSpotsGenerator.cpp
+++ b/src/libslic3r/SupportSpotsGenerator.cpp
@@ -4,12 +4,10 @@
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
 #include "SupportSpotsGenerator.hpp"
-#include <fstream>
 
 #include <boost/log/trivial.hpp>
 #include <oneapi/tbb/concurrent_vector.h>
 #include <oneapi/tbb/parallel_for.h>
-#include <assert.h>
 #include <oneapi/tbb/blocked_range.h>
 #include <algorithm>
 #include <cmath>
@@ -19,9 +17,9 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <Eigen/Core>
 #include <iostream>
 #include <stdexcept>
+#include <cassert>
 
 #include "BoundingBox.hpp"
 #include "ExPolygon.hpp"
diff --git a/src/libslic3r/Surface.hpp b/src/libslic3r/Surface.hpp
index 5aba2309cd..8e7663afa4 100644
--- a/src/libslic3r/Surface.hpp
+++ b/src/libslic3r/Surface.hpp
@@ -16,6 +16,7 @@
 #include <iterator>
 #include <utility>
 #include <vector>
+#include <cstddef>
 
 #include "libslic3r.h"
 #include "ExPolygon.hpp"
diff --git a/src/libslic3r/SurfaceCollection.cpp b/src/libslic3r/SurfaceCollection.cpp
index 2188d8339c..fdca025ad2 100644
--- a/src/libslic3r/SurfaceCollection.cpp
+++ b/src/libslic3r/SurfaceCollection.cpp
@@ -6,8 +6,8 @@
 ///|/
 #include "SurfaceCollection.hpp"
 
-#include <stdio.h>
 #include <algorithm>
+#include <cstdio>
 
 #include "BoundingBox.hpp"
 #include "SVG.hpp"
diff --git a/src/libslic3r/SurfaceCollection.hpp b/src/libslic3r/SurfaceCollection.hpp
index 03d79909ed..7451d3c3e9 100644
--- a/src/libslic3r/SurfaceCollection.hpp
+++ b/src/libslic3r/SurfaceCollection.hpp
@@ -10,6 +10,7 @@
 #include <initializer_list>
 #include <vector>
 #include <utility>
+#include <cstddef>
 
 #include "libslic3r.h"
 #include "Surface.hpp"
diff --git a/src/libslic3r/Tesselate.cpp b/src/libslic3r/Tesselate.cpp
index b802c4133b..b436f3fecc 100644
--- a/src/libslic3r/Tesselate.cpp
+++ b/src/libslic3r/Tesselate.cpp
@@ -5,11 +5,11 @@
 #include "Tesselate.hpp"
 
 #include <glu-libtess.h>
-#include <assert.h>
-#include <string.h>
 #include <algorithm>
 #include <deque>
 #include <utility>
+#include <cassert>
+#include <cstring>
 
 #include "ExPolygon.hpp"
 #include "admesh/stl.h"
diff --git a/src/libslic3r/Thread.cpp b/src/libslic3r/Thread.cpp
index b5e61ad724..04a34923ab 100644
--- a/src/libslic3r/Thread.cpp
+++ b/src/libslic3r/Thread.cpp
@@ -13,16 +13,16 @@
 	#endif // __APPLE__
 #endif
 
-#include <assert.h>
 #include <oneapi/tbb/blocked_range.h>
 #include <oneapi/tbb/parallel_for.h>
 #include <oneapi/tbb/task_arena.h>
-#include <stddef.h>
 #include <condition_variable>
 #include <mutex>
 #include <thread>
 #include <algorithm>
 #include <ostream>
+#include <cassert>
+#include <cstddef>
 
 #include "Thread.hpp"
 #include "Utils.hpp"
diff --git a/src/libslic3r/Timer.hpp b/src/libslic3r/Timer.hpp
index 43e7bf0c30..aca00d2f22 100644
--- a/src/libslic3r/Timer.hpp
+++ b/src/libslic3r/Timer.hpp
@@ -9,6 +9,7 @@
 #include <string>
 #include <chrono>
 #include <string_view>
+#include <cinttypes>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/TriangleMesh.cpp b/src/libslic3r/TriangleMesh.cpp
index 12224aa91a..f9a94bd9a9 100644
--- a/src/libslic3r/TriangleMesh.cpp
+++ b/src/libslic3r/TriangleMesh.cpp
@@ -19,7 +19,6 @@
 #include <boost/log/trivial.hpp>
 #include <boost/nowide/cstdio.hpp>
 #include <boost/predef/other/endian.h>
-#include <assert.h>
 #include <libqhull_r/user_r.h>
 #include <libqhullcpp/QhullFacet.h>
 #include <libqhullcpp/QhullPoint.h>
@@ -27,16 +26,15 @@
 #include <oneapi/tbb/blocked_range.h>
 #include <oneapi/tbb/concurrent_vector.h>
 #include <oneapi/tbb/parallel_for.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <cmath>
 #include <vector>
 #include <utility>
 #include <algorithm>
-#include <Eigen/Core>
 #include <iterator>
 #include <map>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "TriangleMesh.hpp"
 #include "TriangleMeshSlicer.hpp"
diff --git a/src/libslic3r/TriangleMesh.hpp b/src/libslic3r/TriangleMesh.hpp
index 176c39abb6..34dc6cedae 100644
--- a/src/libslic3r/TriangleMesh.hpp
+++ b/src/libslic3r/TriangleMesh.hpp
@@ -22,6 +22,9 @@
 #include <Eigen/Geometry>
 #include <array>
 #include <utility>
+#include <cassert>
+#include <cinttypes>
+#include <cstddef>
 
 #include "libslic3r.h"
 #include "BoundingBox.hpp"
@@ -29,6 +32,7 @@
 #include "Point.hpp"
 #include "Polygon.hpp"
 #include "ExPolygon.hpp"
+#include "libslic3r/Point.hpp"
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/TriangleMeshSlicer.cpp b/src/libslic3r/TriangleMeshSlicer.cpp
index 2a07085a15..fd1d419c49 100644
--- a/src/libslic3r/TriangleMeshSlicer.cpp
+++ b/src/libslic3r/TriangleMeshSlicer.cpp
@@ -11,13 +11,12 @@
 #include <cmath>
 #include <mutex>
 #include <utility>
-#include <Eigen/Geometry>
 #include <array>
-#include <cstddef>
 #include <iterator>
 #include <limits>
+#include <cassert>
+#include <cstdlib>
 
-#include "ClipperUtils.hpp"
 #include "Tesselate.hpp"
 #include "TriangleMesh.hpp"
 #include "TriangleMeshSlicer.hpp"
@@ -38,7 +37,6 @@
 // #define SLIC3R_TRIANGLEMESH_DEBUG
 #endif
 
-#include <assert.h>
 #include <boost/thread/lock_guard.hpp>
 
 #if defined(__cpp_lib_hardware_interference_size) && ! defined(__APPLE__)
diff --git a/src/libslic3r/TriangleMeshSlicer.hpp b/src/libslic3r/TriangleMeshSlicer.hpp
index 9d9a9e0183..f346542c96 100644
--- a/src/libslic3r/TriangleMeshSlicer.hpp
+++ b/src/libslic3r/TriangleMeshSlicer.hpp
@@ -9,6 +9,8 @@
 #include <stdint.h>
 #include <functional>
 #include <vector>
+#include <cinttypes>
+#include <cstddef>
 
 #include "Polygon.hpp"
 #include "ExPolygon.hpp"
diff --git a/src/libslic3r/TriangleSelector.cpp b/src/libslic3r/TriangleSelector.cpp
index 29188a23cf..bd33cbc2fd 100644
--- a/src/libslic3r/TriangleSelector.cpp
+++ b/src/libslic3r/TriangleSelector.cpp
@@ -5,10 +5,10 @@
 #include "TriangleSelector.hpp"
 
 #include <boost/container/small_vector.hpp>
-#include <string.h>
 #include <boost/container/vector.hpp>
 #include <cmath>
 #include <queue>
+#include <cstring>
 
 #include "libslic3r/Geometry.hpp"
 #include "libslic3r/Point.hpp"
diff --git a/src/libslic3r/TriangleSelector.hpp b/src/libslic3r/TriangleSelector.hpp
index 541f686bf6..778c89f52b 100644
--- a/src/libslic3r/TriangleSelector.hpp
+++ b/src/libslic3r/TriangleSelector.hpp
@@ -17,6 +17,9 @@
 #include <memory>
 #include <utility>
 #include <vector>
+#include <cassert>
+#include <cinttypes>
+#include <cstddef>
 
 #include "Point.hpp"
 #include "TriangleMesh.hpp"
diff --git a/src/libslic3r/TriangleSetSampling.hpp b/src/libslic3r/TriangleSetSampling.hpp
index 002f4fc955..bf74b66827 100644
--- a/src/libslic3r/TriangleSetSampling.hpp
+++ b/src/libslic3r/TriangleSetSampling.hpp
@@ -8,6 +8,7 @@
 #include <admesh/stl.h>
 #include <stddef.h>
 #include <vector>
+#include <cstddef>
 
 #include "libslic3r/Point.hpp"
 
diff --git a/src/libslic3r/Triangulation.cpp b/src/libslic3r/Triangulation.cpp
index 22befe2628..2c68639a68 100644
--- a/src/libslic3r/Triangulation.cpp
+++ b/src/libslic3r/Triangulation.cpp
@@ -8,11 +8,11 @@
 #include <CGAL/Constrained_Delaunay_triangulation_2.h>
 #include <CGAL/Triangulation_vertex_base_with_info_2.h>
 #include <CGAL/spatial_sort.h>
-#include <assert.h>
-#include <stddef.h>
-#include <stdint.h>
 #include <boost/variant/get.hpp>
 #include <limits>
+#include <algorithm>
+#include <cassert>
+#include <cstddef>
 
 #include "IntersectionPoints.hpp"
 #include "libslic3r/ExPolygon.hpp"
diff --git a/src/libslic3r/Zipper.cpp b/src/libslic3r/Zipper.cpp
index eef8007ef5..15df218dc6 100644
--- a/src/libslic3r/Zipper.cpp
+++ b/src/libslic3r/Zipper.cpp
@@ -3,7 +3,7 @@
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
 #include <boost/log/trivial.hpp>
-#include <string.h>
+#include <cstring>
 
 #include "Exception.hpp"
 #include "Zipper.hpp"
diff --git a/src/libslic3r/Zipper.hpp b/src/libslic3r/Zipper.hpp
index cb581fe9d1..6bd8c8c7db 100644
--- a/src/libslic3r/Zipper.hpp
+++ b/src/libslic3r/Zipper.hpp
@@ -11,6 +11,7 @@
 #include <memory>
 #include <type_traits>
 #include <utility>
+#include <cstddef>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/miniz_extension.cpp b/src/libslic3r/miniz_extension.cpp
index 01a23fd6b2..fad5dbede9 100644
--- a/src/libslic3r/miniz_extension.cpp
+++ b/src/libslic3r/miniz_extension.cpp
@@ -2,7 +2,7 @@
 ///|/
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
-#include <stdio.h>
+#include <cstdio>
 
 #include "miniz_extension.hpp"
 #include "miniz.h"
diff --git a/src/slic3r/GUI/CameraUtils.cpp b/src/slic3r/GUI/CameraUtils.cpp
index 032a476247..7bf8e16f8d 100644
--- a/src/slic3r/GUI/CameraUtils.cpp
+++ b/src/slic3r/GUI/CameraUtils.cpp
@@ -6,12 +6,11 @@
 
 #include <igl/project.h> // IWYU pragma: keep
 #include <igl/unproject.h> // IWYU pragma: keep
-#include <assert.h>
-#include <math.h>
-#include <stddef.h>
-#include <Eigen/Geometry>
 #include <algorithm>
 #include <limits>
+#include <cassert>
+#include <cmath>
+#include <cstddef>
 
 #include "slic3r/GUI/3DScene.hpp" // GLVolume
 #include "libslic3r/Geometry/ConvexHull.hpp"
diff --git a/src/slic3r/GUI/CameraUtils.hpp b/src/slic3r/GUI/CameraUtils.hpp
index 6f67b40aee..3d1f7ee79a 100644
--- a/src/slic3r/GUI/CameraUtils.hpp
+++ b/src/slic3r/GUI/CameraUtils.hpp
@@ -13,6 +13,7 @@
 
 namespace Slic3r {
 class GLVolume;
+
 namespace GUI {
 struct Camera;
 }  // namespace GUI
diff --git a/src/slic3r/GUI/DoubleSliderForLayers.cpp b/src/slic3r/GUI/DoubleSliderForLayers.cpp
index ff2ff6c119..163d8477ac 100644
--- a/src/slic3r/GUI/DoubleSliderForLayers.cpp
+++ b/src/slic3r/GUI/DoubleSliderForLayers.cpp
@@ -7,13 +7,13 @@
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/split.hpp>
-#include <stdio.h>
 #include <boost/algorithm/string/constants.hpp>
 #include <boost/format.hpp>
 #include <cmath>
 #include <algorithm>
 #include <array>
 #include <set>
+#include <cstdio>
 
 #include "libslic3r/Utils.hpp"  // -> get_time_dhms()
 #include "libslic3r/format.hpp" // -> format()
diff --git a/src/slic3r/GUI/GLShader.cpp b/src/slic3r/GUI/GLShader.cpp
index 8521d533d6..e6165d1dae 100644
--- a/src/slic3r/GUI/GLShader.cpp
+++ b/src/slic3r/GUI/GLShader.cpp
@@ -8,9 +8,9 @@
 #include <boost/nowide/fstream.hpp>
 #include <GL/glew.h>
 #include <boost/log/trivial.hpp>
-#include <string.h>
 #include <cassert>
 #include <algorithm>
+#include <cstring>
 
 #include "GLShader.hpp"
 #include "3DScene.hpp"
diff --git a/src/slic3r/GUI/GLShader.hpp b/src/slic3r/GUI/GLShader.hpp
index 238365b00e..6dfb151261 100644
--- a/src/slic3r/GUI/GLShader.hpp
+++ b/src/slic3r/GUI/GLShader.hpp
@@ -15,6 +15,7 @@
 #include <initializer_list>
 #include <utility>
 #include <vector>
+#include <cstddef>
 
 #include "libslic3r/Point.hpp"
 
diff --git a/src/slic3r/GUI/ImGuiPureWrap.cpp b/src/slic3r/GUI/ImGuiPureWrap.cpp
index abcad86063..d7a802fd5b 100644
--- a/src/slic3r/GUI/ImGuiPureWrap.cpp
+++ b/src/slic3r/GUI/ImGuiPureWrap.cpp
@@ -7,9 +7,6 @@
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/nowide/convert.hpp>
-#include <assert.h>
-#include <stddef.h>
-#include <stdint.h>
 
 #ifndef IMGUI_DEFINE_MATH_OPERATORS
 #define IMGUI_DEFINE_MATH_OPERATORS
@@ -18,6 +15,9 @@
 #include <algorithm>
 #include <cmath>
 #include <limits>
+#include <cassert>
+#include <cinttypes>
+#include <cstddef>
 
 namespace ImGuiPureWrap {
 
diff --git a/src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.cpp b/src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.cpp
index 81007fded3..2db0b1f9b0 100644
--- a/src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.cpp
+++ b/src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.cpp
@@ -2,13 +2,12 @@
 ///|/
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
-#include <assert.h>
-#include <stdint.h>
-#include <Eigen/Geometry>
 #include <algorithm>
 #include <cmath>
 #include <cstring>
 #include <iterator>
+#include <cassert>
+#include <cinttypes>
 
 #include "libslic3r/libslic3r.h"
 #include "LibVGCodeWrapper.hpp"
@@ -26,6 +25,7 @@
 #include "libslic3r/PrintConfig.hpp"
 #include "../../src/libvgcode/include/GCodeInputData.hpp"
 #include "../../src/libvgcode/include/PathVertex.hpp"
+#include "libvgcode/include/Types.hpp"
 
 namespace libvgcode {
 class Viewer;
diff --git a/src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.hpp b/src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.hpp
index a4b21e2745..f7b4a406d5 100644
--- a/src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.hpp
+++ b/src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.hpp
@@ -9,12 +9,12 @@
 #include <../../src/libvgcode/include/PathVertex.hpp>
 #include <../../src/libvgcode/include/GCodeInputData.hpp>
 #include <../../src/libvgcode/include/ColorRange.hpp>
-#include "../../src/libvgcode/include/Types.hpp"
-
 #include <stddef.h>
 #include <string>
 #include <vector>
+#include <cstddef>
 
+#include "../../src/libvgcode/include/Types.hpp"
 #include "libslic3r/Color.hpp"
 #include "libslic3r/GCode/GCodeProcessor.hpp"
 #include "slic3r/GUI/GUI_Preview.hpp"
@@ -24,6 +24,7 @@
 
 namespace Slic3r {
 class Print;
+
 namespace CustomGCode {
 struct Item;
 }  // namespace CustomGCode
diff --git a/src/slic3r/GUI/TickCodesManager.cpp b/src/slic3r/GUI/TickCodesManager.cpp
index d1b681c42a..d87f2305e6 100644
--- a/src/slic3r/GUI/TickCodesManager.cpp
+++ b/src/slic3r/GUI/TickCodesManager.cpp
@@ -4,9 +4,9 @@
 ///|/
 #include "TickCodesManager.hpp"
 
-#include <math.h>
 #include <algorithm>
 #include <random>
+#include <cmath>
 
 #include "I18N.hpp"
 #include "libslic3r/Print.hpp"
diff --git a/src/slic3r/GUI/TickCodesManager.hpp b/src/slic3r/GUI/TickCodesManager.hpp
index bf440b696a..3a4863bb2f 100644
--- a/src/slic3r/GUI/TickCodesManager.hpp
+++ b/src/slic3r/GUI/TickCodesManager.hpp
@@ -11,6 +11,7 @@
 #include <vector>
 #include <set>
 #include <string>
+#include <cstddef>
 
 #include "libslic3r/CustomGCode.hpp"
 
diff --git a/src/slic3r/GUI/WebViewPlatformUtilsLinux.cpp b/src/slic3r/GUI/WebViewPlatformUtilsLinux.cpp
index 674a916508..a3b7c7bea2 100644
--- a/src/slic3r/GUI/WebViewPlatformUtilsLinux.cpp
+++ b/src/slic3r/GUI/WebViewPlatformUtilsLinux.cpp
@@ -1,7 +1,10 @@
-#include "WebViewPlatformUtils.hpp"
-#include <unordered_map>
-#include <memory>
 #include <webkit2/webkit2.h>
+#include <wx/defs.h>
+#include <wx/webview.h>
+#include <unordered_map>
+#include <string>
+
+#include "WebViewPlatformUtils.hpp"
 
 
 namespace Slic3r::GUI {
diff --git a/src/slic3r/GUI/Widgets/BitmapToggleButton.cpp b/src/slic3r/GUI/Widgets/BitmapToggleButton.cpp
index 0ef3eb38eb..d29eb77938 100644
--- a/src/slic3r/GUI/Widgets/BitmapToggleButton.cpp
+++ b/src/slic3r/GUI/Widgets/BitmapToggleButton.cpp
@@ -8,8 +8,6 @@
 
 #include "wx/window.h"
 
-class wxWindow;
-
 BitmapToggleButton::BitmapToggleButton(wxWindow* parent, const wxString& label, wxWindowID id)
 {
     const long style = wxBORDER_NONE | wxBU_EXACTFIT | wxBU_LEFT;
diff --git a/src/slic3r/GUI/Widgets/BitmapToggleButton.hpp b/src/slic3r/GUI/Widgets/BitmapToggleButton.hpp
index 736010cb1d..c6b6b954ef 100644
--- a/src/slic3r/GUI/Widgets/BitmapToggleButton.hpp
+++ b/src/slic3r/GUI/Widgets/BitmapToggleButton.hpp
@@ -5,6 +5,7 @@
 #include <stddef.h>
 #include <wx/defs.h>
 #include <wx/string.h>
+#include <cstddef>
 
 class wxWindow;
 
diff --git a/src/slic3r/GUI/Widgets/StateColor.cpp b/src/slic3r/GUI/Widgets/StateColor.cpp
index 939af0d841..019755e088 100644
--- a/src/slic3r/GUI/Widgets/StateColor.cpp
+++ b/src/slic3r/GUI/Widgets/StateColor.cpp
@@ -1,6 +1,6 @@
 #include "StateColor.hpp"
 
-#include <stddef.h>
+#include <cstddef>
 
 StateColor::StateColor(wxColour const &color) { append(color, 0); }
 
diff --git a/src/slic3r/Utils/FontConfigHelp.cpp b/src/slic3r/Utils/FontConfigHelp.cpp
index 74952c214d..9df80a3ae6 100644
--- a/src/slic3r/Utils/FontConfigHelp.cpp
+++ b/src/slic3r/Utils/FontConfigHelp.cpp
@@ -4,12 +4,12 @@
 ///|/
 #include "FontConfigHelp.hpp"
 
-#include <stddef.h>
 #include <wx/buffer.h>
 #include <wx/chartype.h>
 #include <wx/defs.h>
 #include <wx/string.h>
 #include <optional>
+#include <cstddef>
 
 #ifdef EXIST_FONT_CONFIG_INCLUDE
 
diff --git a/src/slic3r/Utils/Secrets.cpp b/src/slic3r/Utils/Secrets.cpp
index 5ca28aba4e..48f385e65c 100644
--- a/src/slic3r/Utils/Secrets.cpp
+++ b/src/slic3r/Utils/Secrets.cpp
@@ -1,5 +1,6 @@
 #include "Secrets.hpp"
-#include <stdio.h>
+
+#include <cstdio>
 #if wxUSE_SECRETSTORE 
 #include <wx/secretstore.h>
 #endif
diff --git a/src/slic3r/Utils/UndoRedo.cpp b/src/slic3r/Utils/UndoRedo.cpp
index 97e01273f2..09da831879 100644
--- a/src/slic3r/Utils/UndoRedo.cpp
+++ b/src/slic3r/Utils/UndoRedo.cpp
@@ -10,16 +10,15 @@
 #include <cereal/types/utility.hpp> // IWYU pragma: keep
 #include <cereal/types/vector.hpp> // IWYU pragma: keep
 #include <cereal/archives/binary.hpp> // IWYU pragma: keep
-#include <string.h>
 #include <boost/format.hpp>
 #include <cereal/cereal.hpp>
 #include <algorithm>
 #include <fstream>
 #include <memory>
 #include <cassert>
-#include <cstddef>
 #include <map>
 #include <type_traits>
+#include <cstring>
 
 #define CEREAL_FUTURE_EXPERIMENTAL
 #include <cereal/archives/adapters.hpp>
diff --git a/src/slic3r/Utils/UndoRedo.hpp b/src/slic3r/Utils/UndoRedo.hpp
index b66be9109b..880293dc10 100644
--- a/src/slic3r/Utils/UndoRedo.hpp
+++ b/src/slic3r/Utils/UndoRedo.hpp
@@ -15,6 +15,8 @@
 #include <vector>
 #include <cassert>
 #include <utility>
+#include <cinttypes>
+#include <cstddef>
 
 typedef double                          coordf_t;
 typedef std::pair<coordf_t, coordf_t>   t_layer_height_range;