diff --git a/.clang-tidy b/.clang-tidy
index a670e9e1b1..f45561badb 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -7,9 +7,15 @@ CheckOptions:
   misc-include-cleaner.UnusedIncludes: false
   # Headers that declare a symbol but are not the one to include: per-platform
   # implementations of wxWidgets and Boost.Thread (a Linux run would suggest the
-  # GTK or pthread one), library internals and forward declarations, CPython's
-  # headers behind Python.h, curl's behind curl.h, oneTBB's behind tbb/, and
+  # GTK or pthread one), library internals and forward declarations (MSVC's STL
+  # __msvc_* and the Windows UCRT's corecrt_* included), CPython's headers behind
+  # Python.h (python3.x/ on Linux and macOS, libpython/include/ on Windows),
+  # curl's behind curl.h, oneTBB's behind tbb/, and
   # admesh's stl.h, which the include path also exposes without its directory.
+  # Clipper's own clipper.hpp is only included through libslic3r/clipper.hpp or
+  # clipper_z.hpp, which configure it first, and Boost.Polygon's headers only
+  # work through boost/polygon/polygon.hpp or voronoi.hpp. minilzo's config
+  # headers are internal to minilzo.h.
   # FFmpeg's C headers are left alone because they are only included inside
   # extern "C", which an inserted include would miss. OS-specific headers (GLib,
   # GTK, D-Bus, POSIX, the Windows SDK) are only used inside platform #if blocks,
@@ -23,7 +29,11 @@ CheckOptions:
     .*[/\\]impl[/\\].*;
     .*_fwd\.hpp;
     python3\.[0-9]+[/\\].*;
+    libpython[/\\]include[/\\].*;
     bits[/\\].*;
+    corecrt_.*\.h;
+    __msvc_.*\.hpp;
+    boost[/\\]multiprecision[/\\]fwd\.hpp;
     imconfig\.h;
     expat_external\.h;
     admesh[/\\]stl\.h;
@@ -44,4 +54,9 @@ CheckOptions:
     fcntl\.h;
     termios\.h;
     [/\\](um|shared)[/\\].*;
-    sal\.h
+    sal\.h;
+    clipper[/\\]clipper\.hpp;
+    png(lib)?conf\.h;
+    mcut[/\\]platform\.h;
+    boost[/\\]polygon[/\\].*;
+    lzo(conf|defs)\.h
diff --git a/src/OrcaSlicer.cpp b/src/OrcaSlicer.cpp
index 87352f505e..992a9c9bc2 100644
--- a/src/OrcaSlicer.cpp
+++ b/src/OrcaSlicer.cpp
@@ -20,6 +20,49 @@
     #endif /* SLIC3R_GUI */
 #endif /* WIN32 */
 
+#include <map>
+#include <vector>
+#include "libslic3r/PrintBase.hpp"
+#include "slic3r/Utils/json_diff.hpp"
+#include <boost/date_time/posix_time/posix_time_duration.hpp>
+#include <cerrno>
+#include <utility>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/fstream.hpp>
+#include "libslic3r/LocalesUtils.hpp"
+#include <fstream>
+#include <exception>
+#include <set>
+#include "libslic3r/Color.hpp"
+#include "libslic3r/TriangleSelector.hpp"
+#include <algorithm>
+#include "libslic3r/Format/bbs_3mf.hpp"
+#include <cstdlib>
+#include <stdlib.h>
+#include <stdexcept>
+#include "libslic3r/Point.hpp"
+#include "libslic3r_version.h"
+#include "libslic3r/Semver.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/CustomGCode.hpp"
+#include <memory>
+#include <sstream>
+#include <iomanip>
+#include <iterator>
+#include "libslic3r/ClipperUtils.hpp"
+#include "libslic3r/GCode/WipeTowerEstimate.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <functional>
+#include "libslic3r/Arrange.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/GCode/ThumbnailData.hpp"
+#include "slic3r/GUI/3DScene.hpp"
+#include "slic3r/GUI/GLShader.hpp"
+#include <cassert>
+#include <boost/filesystem/exception.hpp>
+#include <signal.h>
+
 #include <cstdio>
 #include <string>
 #include <cstring>
diff --git a/src/OrcaSlicer.hpp b/src/OrcaSlicer.hpp
index 380607e95f..9aceee4a20 100644
--- a/src/OrcaSlicer.hpp
+++ b/src/OrcaSlicer.hpp
@@ -1,7 +1,14 @@
 #ifndef SLIC3R_HPP
 #define SLIC3R_HPP
 
+#include <map>
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Format/bbs_3mf.hpp"
+#include "libslic3r/GCode/ThumbnailData.hpp"
 #include <set>
+#include <string>
+#include <vector>
 
 #include "libslic3r/Config.hpp"
 #include "libslic3r/Model.hpp"
diff --git a/src/dev-utils/OrcaSlicer_profile_validator.cpp b/src/dev-utils/OrcaSlicer_profile_validator.cpp
index c328c565c8..bbfa53c262 100644
--- a/src/dev-utils/OrcaSlicer_profile_validator.cpp
+++ b/src/dev-utils/OrcaSlicer_profile_validator.cpp
@@ -8,6 +8,28 @@
 #define NANOSVGRAST_IMPLEMENTATION
 #include "nanosvg/nanosvgrast.h"
 
+#include <vector>
+#include <boost/filesystem/path.hpp>
+#include <map>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include <utility>
+#include "libslic3r/CustomGCode.hpp"
+#include <iterator>
+#include <boost/smart_ptr/make_shared_object.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/log/core/record_view.hpp>
+#include <boost/log/expressions/message.hpp>
+#include <cstddef>
+#include <exception>
+#include "libslic3r/PlaceholderParser.hpp"
+#include <boost/program_options/options_description.hpp>
+#include <boost/program_options/value_semantic.hpp>
+#include <boost/program_options/variables_map.hpp>
+#include <boost/program_options/errors.hpp>
+
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/GCode.hpp"
 #include "libslic3r/GCode/WipeTower.hpp"
diff --git a/src/dev-utils/encoding-check.cpp b/src/dev-utils/encoding-check.cpp
index 2a645e2ab2..0eb390f161 100644
--- a/src/dev-utils/encoding-check.cpp
+++ b/src/dev-utils/encoding-check.cpp
@@ -1,3 +1,4 @@
+#include <iosfwd>
 #include <vector>
 #include <iostream>
 #include <fstream>
diff --git a/src/dev-utils/generate_system_cache.cpp b/src/dev-utils/generate_system_cache.cpp
index 017db79836..7baa11a8a0 100644
--- a/src/dev-utils/generate_system_cache.cpp
+++ b/src/dev-utils/generate_system_cache.cpp
@@ -4,9 +4,19 @@
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/directory.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/program_options.hpp>
+#include <boost/program_options/options_description.hpp>
+#include <boost/program_options/value_semantic.hpp>
+#include <boost/program_options/variables_map.hpp>
+#include <boost/program_options/errors.hpp>
+#include <exception>
+#include <cstddef>
 #include <iostream>
+#include <memory>
+#include "libslic3r/Config.hpp"
 
 using namespace Slic3r;
 namespace fs = boost::filesystem;
diff --git a/src/dev-utils/profile_include_dump.cpp b/src/dev-utils/profile_include_dump.cpp
index f2486dedfc..6561027f70 100644
--- a/src/dev-utils/profile_include_dump.cpp
+++ b/src/dev-utils/profile_include_dump.cpp
@@ -11,13 +11,19 @@
 #include "libslic3r/Utils.hpp"
 
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <boost/nowide/fstream.hpp>
 #include "nlohmann/json.hpp"
 
 #include <algorithm>
+#include <cstddef>
+#include <exception>
 #include <iostream>
+#include "libslic3r/Config.hpp"
 #include <map>
 #include <set>
+#include <stdexcept>
 #include <string>
 #include <vector>
 
diff --git a/src/libvgcode/include/ColorPrint.hpp b/src/libvgcode/include/ColorPrint.hpp
index 071b93a708..bbae9284a5 100644
--- a/src/libvgcode/include/ColorPrint.hpp
+++ b/src/libvgcode/include/ColorPrint.hpp
@@ -6,6 +6,8 @@
 #define VGCODE_COLORPRINT_HPP
 
 #include "../include/Types.hpp"
+#include <cstdint>
+#include <array>
 
 namespace libvgcode {
 
diff --git a/src/libvgcode/include/ColorRange.hpp b/src/libvgcode/include/ColorRange.hpp
index e6c83cb21d..ce34c3de7b 100644
--- a/src/libvgcode/include/ColorRange.hpp
+++ b/src/libvgcode/include/ColorRange.hpp
@@ -7,7 +7,10 @@
 
 #include "../include/Types.hpp"
 
+#include <array>
 #include <cfloat>
+#include <vector>
+#include <cstddef>
 
 namespace libvgcode {
 
diff --git a/src/libvgcode/include/GCodeInputData.hpp b/src/libvgcode/include/GCodeInputData.hpp
index 5085322e37..a0057230e7 100644
--- a/src/libvgcode/include/GCodeInputData.hpp
+++ b/src/libvgcode/include/GCodeInputData.hpp
@@ -6,6 +6,8 @@
 #define VGCODE_GCODEINPUTDATA_HPP
 
 #include "PathVertex.hpp"
+#include <vector>
+#include "Types.hpp"
 
 namespace libvgcode {
 
diff --git a/src/libvgcode/include/PathVertex.hpp b/src/libvgcode/include/PathVertex.hpp
index f5704d5376..8f24d6a440 100644
--- a/src/libvgcode/include/PathVertex.hpp
+++ b/src/libvgcode/include/PathVertex.hpp
@@ -7,7 +7,9 @@
 
 #include "Types.hpp"
 
+#include <array>
 #include <cfloat>
+#include <cstdint>
 
 namespace libvgcode {
 
diff --git a/src/libvgcode/include/Types.hpp b/src/libvgcode/include/Types.hpp
index 099f622dc3..1c3b50208a 100644
--- a/src/libvgcode/include/Types.hpp
+++ b/src/libvgcode/include/Types.hpp
@@ -5,6 +5,7 @@
 #ifndef VGCODE_TYPES_HPP
 #define VGCODE_TYPES_HPP
 
+#include <cstddef>
 #define VGCODE_ENABLE_COG_AND_TOOL_MARKERS 0
 
 #include <array>
diff --git a/src/libvgcode/include/Viewer.hpp b/src/libvgcode/include/Viewer.hpp
index 458bc4b69f..a714bf1756 100644
--- a/src/libvgcode/include/Viewer.hpp
+++ b/src/libvgcode/include/Viewer.hpp
@@ -7,7 +7,10 @@
 
 #include "Types.hpp"
 
+#include <cstddef>
+#include <cstdint>
 #include <string>
+#include <vector>
 
 namespace libvgcode {
 
diff --git a/src/libvgcode/src/Bitset.hpp b/src/libvgcode/src/Bitset.hpp
index eebe297262..75dbe5580b 100644
--- a/src/libvgcode/src/Bitset.hpp
+++ b/src/libvgcode/src/Bitset.hpp
@@ -6,6 +6,9 @@
 #define VGCODE_BITSET_HPP
 
 #include <atomic>
+#include <cstddef>
+#include <type_traits>
+#include <utility>
 #include <vector>
 
 namespace libvgcode {
diff --git a/src/libvgcode/src/ColorRange.cpp b/src/libvgcode/src/ColorRange.cpp
index 1ba0dfc526..86a034fffe 100644
--- a/src/libvgcode/src/ColorRange.cpp
+++ b/src/libvgcode/src/ColorRange.cpp
@@ -7,8 +7,13 @@
 #include "Utils.hpp"
 
 #include <algorithm>
+#include <array>
 #include <assert.h>
+#include <cfloat>
 #include <cmath>
+#include "../include/Types.hpp"
+#include <cstddef>
+#include <vector>
 
 namespace libvgcode {
 
diff --git a/src/libvgcode/src/ExtrusionRoles.cpp b/src/libvgcode/src/ExtrusionRoles.cpp
index e38886c57b..bac4eac60e 100644
--- a/src/libvgcode/src/ExtrusionRoles.cpp
+++ b/src/libvgcode/src/ExtrusionRoles.cpp
@@ -3,6 +3,11 @@
 ///|/ libvgcode is released under the terms of the AGPLv3 or higher
 ///|/
 #include "ExtrusionRoles.hpp"
+#include "../include/Types.hpp"
+#include <array>
+#include <utility>
+#include <cstddef>
+#include <vector>
 
 namespace libvgcode {
 
diff --git a/src/libvgcode/src/ExtrusionRoles.hpp b/src/libvgcode/src/ExtrusionRoles.hpp
index ee949fbf0d..5ab06cef94 100644
--- a/src/libvgcode/src/ExtrusionRoles.hpp
+++ b/src/libvgcode/src/ExtrusionRoles.hpp
@@ -7,7 +7,10 @@
 
 #include "../include/Types.hpp"
 
+#include <array>
+#include <cstddef>
 #include <map>
+#include <vector>
 
 namespace libvgcode {
 
diff --git a/src/libvgcode/src/Layers.cpp b/src/libvgcode/src/Layers.cpp
index 16a2e38fcd..5e52bc7aa9 100644
--- a/src/libvgcode/src/Layers.cpp
+++ b/src/libvgcode/src/Layers.cpp
@@ -9,6 +9,11 @@
 
 #include <assert.h>
 #include <algorithm>
+#include "../include/Types.hpp"
+#include <cstdint>
+#include <cstddef>
+#include <vector>
+#include <iterator>
 
 namespace libvgcode {
 
diff --git a/src/libvgcode/src/Layers.hpp b/src/libvgcode/src/Layers.hpp
index bf3386016c..e55d1f04af 100644
--- a/src/libvgcode/src/Layers.hpp
+++ b/src/libvgcode/src/Layers.hpp
@@ -6,6 +6,11 @@
 #define VGCODE_LAYERS_HPP
 
 #include "Range.hpp"
+#include <cstdint>
+#include <cstddef>
+#include "../include/Types.hpp"
+#include <array>
+#include <vector>
 
 namespace libvgcode {
 
diff --git a/src/libvgcode/src/OpenGLUtils.cpp b/src/libvgcode/src/OpenGLUtils.cpp
index bc39b29a4d..c6617af506 100644
--- a/src/libvgcode/src/OpenGLUtils.cpp
+++ b/src/libvgcode/src/OpenGLUtils.cpp
@@ -10,6 +10,7 @@
 #include <cctype>
 #include <stdio.h>
 #include <cstring>
+#include <string>
 
 namespace libvgcode {
 
diff --git a/src/libvgcode/src/OptionTemplate.cpp b/src/libvgcode/src/OptionTemplate.cpp
index 316897ad3b..cc2b39a5ec 100644
--- a/src/libvgcode/src/OptionTemplate.cpp
+++ b/src/libvgcode/src/OptionTemplate.cpp
@@ -6,6 +6,9 @@
 #include "OpenGLUtils.hpp"
 #include "Utils.hpp"
 
+#include <cstdint>
+#include "../include/Types.hpp"
+#include <cstddef>
 #include <vector>
 #include <algorithm>
 #include <cmath>
diff --git a/src/libvgcode/src/PathVertex.cpp b/src/libvgcode/src/PathVertex.cpp
index ed1569bc36..e157f20ff7 100644
--- a/src/libvgcode/src/PathVertex.cpp
+++ b/src/libvgcode/src/PathVertex.cpp
@@ -3,6 +3,7 @@
 ///|/ libvgcode is released under the terms of the AGPLv3 or higher
 ///|/
 #include "../include/PathVertex.hpp"
+#include "../include/Types.hpp"
 
 namespace libvgcode {
 
diff --git a/src/libvgcode/src/Range.cpp b/src/libvgcode/src/Range.cpp
index 4d8df12f3d..5ef4570d1f 100644
--- a/src/libvgcode/src/Range.cpp
+++ b/src/libvgcode/src/Range.cpp
@@ -5,6 +5,7 @@
 #include "Range.hpp"
 
 #include <algorithm>
+#include "../include/Types.hpp"
 
 namespace libvgcode {
 
diff --git a/src/libvgcode/src/SegmentTemplate.cpp b/src/libvgcode/src/SegmentTemplate.cpp
index 9d9872aa3b..f925e0a860 100644
--- a/src/libvgcode/src/SegmentTemplate.cpp
+++ b/src/libvgcode/src/SegmentTemplate.cpp
@@ -5,6 +5,7 @@
 #include "SegmentTemplate.hpp"
 #include "OpenGLUtils.hpp"
 
+#include <cstddef>
 #include <cstdint>
 #include <array>
 
diff --git a/src/libvgcode/src/Settings.hpp b/src/libvgcode/src/Settings.hpp
index b3aa371c4a..fe205531f2 100644
--- a/src/libvgcode/src/Settings.hpp
+++ b/src/libvgcode/src/Settings.hpp
@@ -7,6 +7,8 @@
 
 #include "../include/Types.hpp"
 
+#include <array>
+#include <cstddef>
 #include <map>
 
 namespace libvgcode {
diff --git a/src/libvgcode/src/ToolMarker.cpp b/src/libvgcode/src/ToolMarker.cpp
index 3e595faec0..f4447fe9ad 100644
--- a/src/libvgcode/src/ToolMarker.cpp
+++ b/src/libvgcode/src/ToolMarker.cpp
@@ -7,6 +7,7 @@
 #include "Utils.hpp"
 
 #include <cmath>
+#include "../include/Types.hpp"
 
 #if VGCODE_ENABLE_COG_AND_TOOL_MARKERS
 
diff --git a/src/libvgcode/src/Types.cpp b/src/libvgcode/src/Types.cpp
index 2aa8a40e9d..1badfae81b 100644
--- a/src/libvgcode/src/Types.cpp
+++ b/src/libvgcode/src/Types.cpp
@@ -5,6 +5,7 @@
 #include "../include/Types.hpp"
 
 #include <algorithm>
+#include <cstdint>
 
 namespace libvgcode {
 
diff --git a/src/libvgcode/src/Utils.cpp b/src/libvgcode/src/Utils.cpp
index aee2cd4875..46ed6a336c 100644
--- a/src/libvgcode/src/Utils.cpp
+++ b/src/libvgcode/src/Utils.cpp
@@ -6,6 +6,9 @@
 
 #include <assert.h>
 #include <cmath>
+#include "../include/Types.hpp"
+#include <vector>
+#include <cstdint>
 
 namespace libvgcode {
 
diff --git a/src/libvgcode/src/Utils.hpp b/src/libvgcode/src/Utils.hpp
index 84c3deb3c5..4db67e426f 100644
--- a/src/libvgcode/src/Utils.hpp
+++ b/src/libvgcode/src/Utils.hpp
@@ -6,6 +6,8 @@
 #define VGCODE_UTILS_HPP
 
 #include "../include/Types.hpp"
+#include <vector>
+#include <cstdint>
 
 #ifdef _WIN32
 #define STDVEC_MEMSIZE(NAME, TYPE) NAME.capacity() * ((sizeof(TYPE) + __alignof(TYPE) - 1) / __alignof(TYPE)) * __alignof(TYPE)
diff --git a/src/libvgcode/src/ViewRange.cpp b/src/libvgcode/src/ViewRange.cpp
index ea2f1e916e..b5657da1b7 100644
--- a/src/libvgcode/src/ViewRange.cpp
+++ b/src/libvgcode/src/ViewRange.cpp
@@ -3,6 +3,7 @@
 ///|/ libvgcode is released under the terms of the AGPLv3 or higher
 ///|/
 #include "ViewRange.hpp"
+#include "../include/Types.hpp"
 
 namespace libvgcode {
 
diff --git a/src/libvgcode/src/ViewRange.hpp b/src/libvgcode/src/ViewRange.hpp
index b9356fc760..7d5f9eb32e 100644
--- a/src/libvgcode/src/ViewRange.hpp
+++ b/src/libvgcode/src/ViewRange.hpp
@@ -6,6 +6,7 @@
 #define VGCODE_VIEWRANGE_HPP
 
 #include "Range.hpp"
+#include "../include/Types.hpp"
 
 namespace libvgcode {
 
diff --git a/src/libvgcode/src/Viewer.cpp b/src/libvgcode/src/Viewer.cpp
index 089f1f7e7b..b082a6e29d 100644
--- a/src/libvgcode/src/Viewer.cpp
+++ b/src/libvgcode/src/Viewer.cpp
@@ -4,6 +4,12 @@
 ///|/
 #include "../include/Viewer.hpp"
 #include "ViewerImpl.hpp"
+#include <string>
+#include <utility>
+#include "../include/Types.hpp"
+#include <cstddef>
+#include <vector>
+#include <cstdint>
 
 namespace libvgcode {
 
diff --git a/src/libvgcode/src/ViewerImpl.cpp b/src/libvgcode/src/ViewerImpl.cpp
index ee38594817..8dc908d6d8 100644
--- a/src/libvgcode/src/ViewerImpl.cpp
+++ b/src/libvgcode/src/ViewerImpl.cpp
@@ -9,14 +9,26 @@
 #include "OpenGLUtils.hpp"
 #include "Utils.hpp"
 
+#include <cstdint>
+#include "../include/Types.hpp"
+#include <array>
+#include "../include/PathVertex.hpp"
+#include "Bitset.hpp"
+#include "../include/ColorPrint.hpp"
+#include <cfloat>
+#include <iterator>
 #include <map>
 #include <assert.h>
+#include <optional>
 #include <stdexcept>
 #include <cstdio>
 #include <string>
 #include <algorithm>
 #include <cmath>
 #include <numeric>
+#include <type_traits>
+#include <vector>
+#include <utility>
 
 namespace libvgcode {
 
diff --git a/src/libvgcode/src/ViewerImpl.hpp b/src/libvgcode/src/ViewerImpl.hpp
index 335fb5ef52..0877e6265b 100644
--- a/src/libvgcode/src/ViewerImpl.hpp
+++ b/src/libvgcode/src/ViewerImpl.hpp
@@ -8,6 +8,12 @@
 #include "Settings.hpp"
 #include "SegmentTemplate.hpp"
 #include "OptionTemplate.hpp"
+#include "../include/Types.hpp"
+#include <vector>
+#include <cstddef>
+#include <cstdint>
+#include <map>
+#include <array>
 #if VGCODE_ENABLE_COG_AND_TOOL_MARKERS
 #include "CogMarker.hpp"
 #include "ToolMarker.hpp"
diff --git a/src/slic3r/Config/Snapshot.cpp b/src/slic3r/Config/Snapshot.cpp
index a7135eac6f..cf568432dc 100644
--- a/src/slic3r/Config/Snapshot.cpp
+++ b/src/slic3r/Config/Snapshot.cpp
@@ -1,5 +1,21 @@
 #include "Snapshot.hpp"
 
+#include <fstream>
+#include <stdexcept>
+#include <cstdio>
+#include <algorithm>
+#include <ios>
+#include <ostream>
+#include <string>
+#include <cassert>
+#include <map>
+#include <set>
+#include <boost/filesystem/directory.hpp>
+#include <cstring>
+#include <boost/filesystem/file_status.hpp>
+#include "libslic3r/Exception.hpp"
+#include "slic3r/Config/Version.hpp"
+#include <exception>
 #include <time.h>
 
 #include <boost/algorithm/string/predicate.hpp>
@@ -26,7 +42,10 @@
 #include "../GUI/MainFrame.hpp"
 #include "../GUI/MsgDialog.hpp"
 
+#include <vector>
+#include <utility>
 #include <wx/richmsgdlg.h>
+#include <wx/string.h>
 
 #define SLIC3R_SNAPSHOTS_DIR "snapshots"
 #define SLIC3R_SNAPSHOT_FILE "snapshot.ini"
diff --git a/src/slic3r/Config/Snapshot.hpp b/src/slic3r/Config/Snapshot.hpp
index f453006338..96a0c33771 100644
--- a/src/slic3r/Config/Snapshot.hpp
+++ b/src/slic3r/Config/Snapshot.hpp
@@ -1,6 +1,8 @@
 #ifndef slic3r_GUI_Snapshot_
 #define slic3r_GUI_Snapshot_
 
+#include <ctime>
+#include <cstddef>
 #include <map>
 #include <set>
 #include <string>
diff --git a/src/slic3r/Config/Version.cpp b/src/slic3r/Config/Version.cpp
index 092594ce51..f25577c9dc 100644
--- a/src/slic3r/Config/Version.cpp
+++ b/src/slic3r/Config/Version.cpp
@@ -1,9 +1,21 @@
 #include "Version.hpp"
 
+#include <boost/filesystem/path.hpp>
+#include <boost/optional/optional.hpp>
+#include <algorithm>
+#include <boost/filesystem/directory.hpp>
 #include <cctype>
 
 #include <boost/filesystem/operations.hpp>
 #include <boost/nowide/fstream.hpp>
+#include "libslic3r/Semver.hpp"
+#include <cstring>
+#include <string>
+#include <cstddef>
+#include <vector>
+#include <stdexcept>
+#include <utility>
+#include "libslic3r/Exception.hpp"
 
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Config.hpp"
diff --git a/src/slic3r/Config/Version.hpp b/src/slic3r/Config/Version.hpp
index 8249573dec..5e10e9ab95 100644
--- a/src/slic3r/Config/Version.hpp
+++ b/src/slic3r/Config/Version.hpp
@@ -1,6 +1,7 @@
 #ifndef slic3r_GUI_ConfigIndex_
 #define slic3r_GUI_ConfigIndex_
 
+#include <cstddef>
 #include <string>
 #include <vector>
 
diff --git a/src/slic3r/GUI/2DBed.cpp b/src/slic3r/GUI/2DBed.cpp
index 3257d05adc..4bf71c2d50 100644
--- a/src/slic3r/GUI/2DBed.cpp
+++ b/src/slic3r/GUI/2DBed.cpp
@@ -18,6 +18,7 @@
 #include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
 #include "slic3r/GUI/Widgets/StateColor.hpp"
 #include <wx/dcbuffer.h>
+#include <wx/event.h>
 #include <wx/panel.h>
 #include <wx/wx.h>
 #include <wx/gdicmn.h>
diff --git a/src/slic3r/GUI/AMSMaterialsSetting.cpp b/src/slic3r/GUI/AMSMaterialsSetting.cpp
index 08e7d7a056..66e87ac3af 100644
--- a/src/slic3r/GUI/AMSMaterialsSetting.cpp
+++ b/src/slic3r/GUI/AMSMaterialsSetting.cpp
@@ -12,6 +12,7 @@
 #include <sstream>
 #include <ios>
 #include <iomanip>
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include "slic3r/GUI/GUI_Utils.hpp"
 #include "slic3r/GUI/Widgets/Button.hpp"
diff --git a/src/slic3r/GUI/AMSMaterialsSetting.hpp b/src/slic3r/GUI/AMSMaterialsSetting.hpp
index 79880a6ec5..0ecc8809be 100644
--- a/src/slic3r/GUI/AMSMaterialsSetting.hpp
+++ b/src/slic3r/GUI/AMSMaterialsSetting.hpp
@@ -16,6 +16,7 @@
 #include "Widgets/TextInput.hpp"
 #include "Widgets/HyperLink.hpp"
 #include "slic3r/Utils/CalibUtils.hpp"
+#include <wx/anybutton.h>
 #include <wx/colour.h>
 #include <vector>
 #include <wx/checklst.h>
diff --git a/src/slic3r/GUI/AMSSetting.cpp b/src/slic3r/GUI/AMSSetting.cpp
index d967fa37ab..f953dd115a 100644
--- a/src/slic3r/GUI/AMSSetting.cpp
+++ b/src/slic3r/GUI/AMSSetting.cpp
@@ -12,6 +12,7 @@
 #include "slic3r/GUI/Widgets/AnimaController.hpp"
 #include "slic3r/GUI/Widgets/Label.hpp"
 #include "slic3r/GUI/Widgets/ComboBox.hpp"
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <wx/gdicmn.h>
 #include "slic3r/GUI/GUI_Utils.hpp"
diff --git a/src/slic3r/GUI/AMSSetting.hpp b/src/slic3r/GUI/AMSSetting.hpp
index 24467f8d13..1d6b559981 100644
--- a/src/slic3r/GUI/AMSSetting.hpp
+++ b/src/slic3r/GUI/AMSSetting.hpp
@@ -12,6 +12,7 @@
 #include "Widgets/CheckBox.hpp"
 
 #include "slic3r/GUI/DeviceCore/DevFilaAmsSetting.h"
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <wx/gdicmn.h>
 #include <wx/dialog.h>
diff --git a/src/slic3r/GUI/CAD/DesignCanvas.cpp b/src/slic3r/GUI/CAD/DesignCanvas.cpp
index 517fbcee63..1abfd81feb 100644
--- a/src/slic3r/GUI/CAD/DesignCanvas.cpp
+++ b/src/slic3r/GUI/CAD/DesignCanvas.cpp
@@ -18,6 +18,7 @@
 #include <cstdio>
 #include <cstdlib>
 
+#include <wx/colour.h>
 #include <wx/event.h>
 #include <wx/gdicmn.h>
 #include "libslic3r/CAD/SketchEngine.hpp"
diff --git a/src/slic3r/GUI/CAD/DesignPanel.cpp b/src/slic3r/GUI/CAD/DesignPanel.cpp
index 59e3aaac8e..d61d0aa11f 100644
--- a/src/slic3r/GUI/CAD/DesignPanel.cpp
+++ b/src/slic3r/GUI/CAD/DesignPanel.cpp
@@ -34,6 +34,7 @@
 #include <map>
 #include <math.h>
 #include <set>
+#include <wx/accel.h>
 #include <wx/event.h>
 #include <wx/gdicmn.h>
 #include <wx/chartype.h>
diff --git a/src/slic3r/GUI/CalibrationPanel.hpp b/src/slic3r/GUI/CalibrationPanel.hpp
index f427b37871..adf03e4be9 100644
--- a/src/slic3r/GUI/CalibrationPanel.hpp
+++ b/src/slic3r/GUI/CalibrationPanel.hpp
@@ -6,6 +6,24 @@
 #include "Lazy.hpp"
 #include "SelectMachinePop.hpp"
 #include "Widgets/SideTools.hpp"
+#include <wx/string.h>
+#include "libslic3r/calib.hpp"
+#include <wx/panel.h>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "slic3r/GUI/DeviceManager.hpp"
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <wx/dc.h>
+#include "slic3r/GUI/Widgets/PopupWindow.hpp"
+#include <cstddef>
+#include <wx/sizer.h>
+#include <wx/scrolwin.h>
+#include <wx/timer.h>
+#include <vector>
+#include <string>
+#include <memory>
+#include <map>
+#include "slic3r/GUI/StagedBuild.hpp"
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/CapsuleButton.hpp b/src/slic3r/GUI/CapsuleButton.hpp
index ac23f174e8..f8afdddabb 100644
--- a/src/slic3r/GUI/CapsuleButton.hpp
+++ b/src/slic3r/GUI/CapsuleButton.hpp
@@ -3,6 +3,7 @@
 
 #include "wxExtensions.hpp"
 #include "Widgets/Label.hpp"
+#include <wx/anybutton.h>
 #include <wx/panel.h>
 #include <wx/checklst.h>
 #include <wx/string.h>
diff --git a/src/slic3r/GUI/ConfigExceptions.hpp b/src/slic3r/GUI/ConfigExceptions.hpp
index 181442d4e3..e3c5b08cea 100644
--- a/src/slic3r/GUI/ConfigExceptions.hpp
+++ b/src/slic3r/GUI/ConfigExceptions.hpp
@@ -1,4 +1,8 @@
 #include <exception> 
+#include <stdexcept>
+
+#include "libslic3r/Exception.hpp"
+
 namespace Slic3r {
 
 class ConfigError : public Slic3r::RuntimeError { 
diff --git a/src/slic3r/GUI/ConfigManipulation.cpp b/src/slic3r/GUI/ConfigManipulation.cpp
index 91c5f211e1..48c0cd0d5f 100644
--- a/src/slic3r/GUI/ConfigManipulation.cpp
+++ b/src/slic3r/GUI/ConfigManipulation.cpp
@@ -24,6 +24,7 @@
 #include <string>
 #include <vector>
 #include <wx/msgdlg.h>
+#include <wx/string.h>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.cpp b/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.cpp
index f02007593a..151d53810b 100644
--- a/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.cpp
+++ b/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.cpp
@@ -13,6 +13,7 @@
 #include "slic3r/GUI/Widgets/StateColor.hpp"
 
 
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <wx/colour.h>
 #include <wx/dcclient.h>
diff --git a/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.hpp b/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.hpp
index 34cd85e692..dcc7654b41 100644
--- a/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.hpp
+++ b/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.hpp
@@ -18,6 +18,7 @@
 #include "libslic3r/ProjectTask.hpp"
 #include <string>
 #include <tuple>
+#include <wx/anybutton.h>
 #include <wx/panel.h>
 #include <wx/checklst.h>
 #include <wx/gdicmn.h>
diff --git a/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp b/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp
index 5014743f2d..462fcf892e 100644
--- a/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp
+++ b/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp
@@ -14,6 +14,7 @@
 #include "slic3r/GUI/Widgets/StateColor.hpp"
 
 
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include "slic3r/GUI/Widgets/Label.hpp"
 #include <string>
diff --git a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.h b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.h
index 16cd311120..c433973e44 100644
--- a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.h
+++ b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.h
@@ -14,9 +14,16 @@
 #include "slic3r/GUI/Widgets/StaticBox.hpp"
 #include "slic3r/GUI/Widgets/AnimaController.hpp"
 
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <string>
+#include <vector>
+#include <unordered_map>
 #include <wx/panel.h>
 #include <wx/simplebook.h>
 #include <memory>
+#include <wx/string.h>
+#include <wx/sizer.h>
 
 // Previous definitions
 class Button;
diff --git a/src/slic3r/GUI/ExtrusionCalibration.cpp b/src/slic3r/GUI/ExtrusionCalibration.cpp
index e15470e462..a2d14fa370 100644
--- a/src/slic3r/GUI/ExtrusionCalibration.cpp
+++ b/src/slic3r/GUI/ExtrusionCalibration.cpp
@@ -6,6 +6,7 @@
 #include <algorithm>
 #include "I18N.hpp"
 #include <boost/log/trivial.hpp>
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include "slic3r/GUI/GUI_Utils.hpp"
 #include "slic3r/GUI/wxExtensions.hpp"
diff --git a/src/slic3r/GUI/ExtrusionCalibration.hpp b/src/slic3r/GUI/ExtrusionCalibration.hpp
index cbee1b56b1..3b500373da 100644
--- a/src/slic3r/GUI/ExtrusionCalibration.hpp
+++ b/src/slic3r/GUI/ExtrusionCalibration.hpp
@@ -16,6 +16,7 @@
 #include "ParamsDialog.hpp"
 #include "GUI_App.hpp"
 #include "wx/hyperlink.h"
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <wx/string.h>
 #include <string>
diff --git a/src/slic3r/GUI/GUI_AuxiliaryList.hpp b/src/slic3r/GUI/GUI_AuxiliaryList.hpp
index 8604259371..88bab94a3d 100644
--- a/src/slic3r/GUI/GUI_AuxiliaryList.hpp
+++ b/src/slic3r/GUI/GUI_AuxiliaryList.hpp
@@ -6,10 +6,14 @@
 #include <set>
 
 #include <wx/bitmap.h>
+#include <wx/button.h>
 #include <wx/dataview.h>
+#include <wx/event.h>
 #include <wx/menu.h>
 #include <wx/file.h>
 #include <wx/dir.h>
+#include <wx/window.h>
+#include <wx/string.h>
 
 #include "AuxiliaryDataViewModel.hpp"
 
diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp
index e2226b3d3e..38633dc86a 100644
--- a/src/slic3r/GUI/GUI_ObjectList.cpp
+++ b/src/slic3r/GUI/GUI_ObjectList.cpp
@@ -67,6 +67,7 @@
 #include <functional>
 #include <boost/algorithm/string.hpp>
 #include <boost/log/trivial.hpp>
+#include <wx/arrstr.h>
 #include <wx/dc.h>
 #include <wx/gdicmn.h>
 #include <wx/colour.h>
diff --git a/src/slic3r/GUI/GUI_ObjectTableSettings.cpp b/src/slic3r/GUI/GUI_ObjectTableSettings.cpp
index fbca655a24..949abfcb13 100644
--- a/src/slic3r/GUI/GUI_ObjectTableSettings.cpp
+++ b/src/slic3r/GUI/GUI_ObjectTableSettings.cpp
@@ -15,6 +15,7 @@
 #include "I18N.hpp"
 #include "ConfigManipulation.hpp"
 
+#include <wx/arrstr.h>
 #include <wx/event.h>
 #include <memory>
 #include <cstddef>
diff --git a/src/slic3r/GUI/GUI_ObjectTableSettings.hpp b/src/slic3r/GUI/GUI_ObjectTableSettings.hpp
index 24e3d427a9..490df76a75 100644
--- a/src/slic3r/GUI/GUI_ObjectTableSettings.hpp
+++ b/src/slic3r/GUI/GUI_ObjectTableSettings.hpp
@@ -1,15 +1,21 @@
 #ifndef slic3r_GUI_ObjectTableSettings_hpp_
 #define slic3r_GUI_ObjectTableSettings_hpp_
 
+#include <map>
 #include <memory>
+#include <string>
 #include <vector>
+#include <wx/event.h>
 #include <wx/panel.h>
+#include <wx/sizer.h>
 #include "wxExtensions.hpp"
+#include "libslic3r/PrintConfig.hpp"
 
 class wxBoxSizer;
 
 namespace Slic3r {
 class DynamicPrintConfig;
+class ModelObject;
 class ModelConfig;
 namespace GUI {
 class ConfigOptionsGroup;
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
index ebd0821ded..69999155af 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
@@ -32,6 +32,7 @@
 #include "slic3r/GUI/3DScene.hpp"
 #include "libslic3r/Config.hpp"
 #include "libslic3r/Line.hpp"
+#include <wx/string.h>
 #include <wx/utils.h>
 #include "libslic3r/TriangleMesh.hpp"
 #include "slic3r/GUI/MeshUtils.hpp"
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
index 5bf94c7d77..38aeb26bdf 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
@@ -75,6 +75,7 @@
 #include <boost/filesystem/operations.hpp>
 #include "slic3r/GUI/Jobs/Worker.hpp"
 #include <cfloat>
+#include <wx/string.h>
 #ifndef IMGUI_DEFINE_MATH_OPERATORS
 #define IMGUI_DEFINE_MATH_OPERATORS
 #endif
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
index bed2c42267..87ffbb762f 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
@@ -25,6 +25,7 @@
 #include "libslic3r/Geometry.hpp"
 #include <wx/intl.h>
 #include "libslic3r/Model.hpp"
+#include <wx/string.h>
 #include <wx/utils.h>
 
 namespace Slic3r {
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp b/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
index a223749b6c..56c0944da9 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
@@ -24,6 +24,7 @@
 #include "slic3r/GUI/GLShader.hpp"
 #include <utility>
 #include "libslic3r/Geometry.hpp"
+#include <wx/string.h>
 #include <wx/utils.h>
 
 namespace Slic3r {
diff --git a/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.hpp b/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.hpp
index 84ff8ebe62..e43a129734 100644
--- a/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.hpp
+++ b/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.hpp
@@ -1,11 +1,16 @@
 #ifndef slic3r_GizmoObjectManipulation_hpp_
 #define slic3r_GizmoObjectManipulation_hpp_
 
+#include <cstddef>
 #include <memory>
 
 #include "libslic3r/Point.hpp"
 #include "libslic3r/Geometry.hpp"
 #include <float.h>
+#include <string>
+#include <vector>
+#include <utility>
+#include <wx/string.h>
 
 #include "slic3r/GUI/GUI_Geometry.hpp"
 
@@ -14,6 +19,7 @@
 namespace Slic3r {
 namespace GUI {
 
+class ImGuiWrapper;
 class Selection;
 class GLCanvas3D;
 
diff --git a/src/slic3r/GUI/Jobs/PlaterWorker.hpp b/src/slic3r/GUI/Jobs/PlaterWorker.hpp
index f22bd6d511..9b149ab91b 100644
--- a/src/slic3r/GUI/Jobs/PlaterWorker.hpp
+++ b/src/slic3r/GUI/Jobs/PlaterWorker.hpp
@@ -1,13 +1,26 @@
 #ifndef PLATERWORKER_HPP
 #define PLATERWORKER_HPP
 
+#include <future>
+#include <functional>
+#include <exception>
+#include <boost/log/trivial.hpp>
+#include <ios>
 #include <map>
 #include <chrono>
 
 #include "Worker.hpp"
 #include "BusyCursorJob.hpp"
 
+#include "slic3r/GUI/Jobs/Job.hpp"
+#include <memory>
+#include <string>
+#include <utility>
+#include <wx/app.h>
+#include <wx/event.h>
+
 #include "slic3r/GUI/GUI.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
 #include "slic3r/GUI/I18N.hpp"
 
 namespace Slic3r { namespace GUI {
diff --git a/src/slic3r/GUI/Jobs/SLAImportDialog.hpp b/src/slic3r/GUI/Jobs/SLAImportDialog.hpp
index 5bb101b74a..68ad749726 100644
--- a/src/slic3r/GUI/Jobs/SLAImportDialog.hpp
+++ b/src/slic3r/GUI/Jobs/SLAImportDialog.hpp
@@ -3,7 +3,14 @@
 
 #include "SLAImportJob.hpp"
 
+#include <vector>
+#include <algorithm>
+#include "libslic3r/Point.hpp"
+#include <string>
 #include <wx/dialog.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/filedlg.h>
 #include <wx/stattext.h>
 #include <wx/combobox.h>
 #include <wx/filename.h>
diff --git a/src/slic3r/GUI/KBShortcutsDialog.cpp b/src/slic3r/GUI/KBShortcutsDialog.cpp
index 92051d116e..903ce4c43a 100644
--- a/src/slic3r/GUI/KBShortcutsDialog.cpp
+++ b/src/slic3r/GUI/KBShortcutsDialog.cpp
@@ -34,6 +34,7 @@
 #include "Widgets/StaticLine.hpp"
 #include "Widgets/TabCtrl.hpp"
 #include <wx/notebook.h>
+#include <wx/string.h>
 #include <wx/wx.h>
 #include <wx/treebase.h>
 #include <wx/simplebook.h>
diff --git a/src/slic3r/GUI/MarkdownTip.cpp b/src/slic3r/GUI/MarkdownTip.cpp
index 70422a4232..9a80870fe0 100644
--- a/src/slic3r/GUI/MarkdownTip.cpp
+++ b/src/slic3r/GUI/MarkdownTip.cpp
@@ -16,6 +16,7 @@
 #include <boost/log/trivial.hpp>
 #include <cstddef>
 #include <wx/display.h>
+#include <wx/gdicmn.h>
 #include <wx/popupwin.h>
 #include <wx/sizer.h>
 #include <wx/timer.h>
diff --git a/src/slic3r/GUI/MultiChoiceDialog.cpp b/src/slic3r/GUI/MultiChoiceDialog.cpp
index e106d7869f..e78f5d1856 100644
--- a/src/slic3r/GUI/MultiChoiceDialog.cpp
+++ b/src/slic3r/GUI/MultiChoiceDialog.cpp
@@ -2,6 +2,7 @@
 
 #include "GUI_App.hpp"
 #include "MainFrame.hpp"
+#include <wx/anybutton.h>
 #include <wx/string.h>
 #include <wx/arrstr.h>
 #include "slic3r/GUI/GUI_Utils.hpp"
diff --git a/src/slic3r/GUI/PartSkipCommon.hpp b/src/slic3r/GUI/PartSkipCommon.hpp
index bd158edbf8..ae7ad6f6a5 100644
--- a/src/slic3r/GUI/PartSkipCommon.hpp
+++ b/src/slic3r/GUI/PartSkipCommon.hpp
@@ -1,6 +1,8 @@
 #ifndef PARTSKIPCOMMON_H
 #define PARTSKIPCOMMON_H
 
+#include <utility>
+#include <vector>
 
 namespace Slic3r { namespace GUI {
     
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index 43a8b9a6a1..158991a92f 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -6,6 +6,7 @@
 #include "libslic3r/Config.hpp"
 #include "libslic3r_version.h"
 
+#include <boost/assert/source_location.hpp>
 #include <boost/optional/optional.hpp>
 #include <cmath>
 #include <boost/algorithm/string/join.hpp>
diff --git a/src/slic3r/GUI/SavePresetDialog.cpp b/src/slic3r/GUI/SavePresetDialog.cpp
index 7aff669668..7f280debf5 100644
--- a/src/slic3r/GUI/SavePresetDialog.cpp
+++ b/src/slic3r/GUI/SavePresetDialog.cpp
@@ -21,6 +21,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/log/trivial.hpp>
 
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <wx/gdicmn.h>
 #include <wx/event.h>
diff --git a/src/slic3r/GUI/SavePresetDialog.hpp b/src/slic3r/GUI/SavePresetDialog.hpp
index 10cf25883b..3bbeeb0cde 100644
--- a/src/slic3r/GUI/SavePresetDialog.hpp
+++ b/src/slic3r/GUI/SavePresetDialog.hpp
@@ -12,6 +12,7 @@
 #include "Widgets/Label.hpp"
 #include "Widgets/TextInput.hpp"
 #include <string>
+#include <wx/anybutton.h>
 #include <wx/sizer.h>
 #include <wx/checklst.h>
 #include <vector>
diff --git a/src/slic3r/GUI/SendToPrinter.cpp b/src/slic3r/GUI/SendToPrinter.cpp
index 7a44305e4e..3ab630b404 100644
--- a/src/slic3r/GUI/SendToPrinter.cpp
+++ b/src/slic3r/GUI/SendToPrinter.cpp
@@ -16,6 +16,7 @@
 #include "Jobs/BoostThreadWorker.hpp"
 #include "Jobs/PlaterWorker.hpp"
 
+#include <wx/containr.h>
 #include <wx/event.h>
 #include <map>
 #include <string>
diff --git a/src/slic3r/GUI/TabButton.cpp b/src/slic3r/GUI/TabButton.cpp
index 3469c9c980..f7c1a55d7c 100644
--- a/src/slic3r/GUI/TabButton.cpp
+++ b/src/slic3r/GUI/TabButton.cpp
@@ -2,6 +2,7 @@
 #include "Widgets/Label.hpp"
 
 #include "slic3r/GUI/Widgets/StaticBox.hpp"
+#include <wx/anybutton.h>
 #include <wx/colour.h>
 #include <utility>
 #include "slic3r/GUI/wxExtensions.hpp"
diff --git a/src/slic3r/GUI/UpgradePanel.cpp b/src/slic3r/GUI/UpgradePanel.cpp
index 485ac48b99..ca20f4edb1 100644
--- a/src/slic3r/GUI/UpgradePanel.cpp
+++ b/src/slic3r/GUI/UpgradePanel.cpp
@@ -11,6 +11,7 @@
 #include <slic3r/GUI/Widgets/SideTools.hpp>
 #include <slic3r/GUI/Widgets/Label.hpp>
 #include <slic3r/GUI/I18N.hpp>
+#include <wx/anybutton.h>
 #include <wx/colour.h>
 #include <unordered_map>
 #include <wx/string.h>
diff --git a/src/slic3r/GUI/UpgradePanel.hpp b/src/slic3r/GUI/UpgradePanel.hpp
index 2e0245e40e..c67ec0bbc3 100644
--- a/src/slic3r/GUI/UpgradePanel.hpp
+++ b/src/slic3r/GUI/UpgradePanel.hpp
@@ -2,6 +2,7 @@
 #define slic3r_UpgradePanel_hpp_
 
 #include "slic3r/GUI/wxExtensions.hpp"
+#include <wx/anybutton.h>
 #include <wx/event.h>
 #include <wx/gdicmn.h>
 #include <wx/dynarray.h>
diff --git a/src/slic3r/GUI/Widgets/AMSControl.cpp b/src/slic3r/GUI/Widgets/AMSControl.cpp
index 8a5f03b7ad..1abe045942 100644
--- a/src/slic3r/GUI/Widgets/AMSControl.cpp
+++ b/src/slic3r/GUI/Widgets/AMSControl.cpp
@@ -11,6 +11,7 @@
 #include "slic3r/GUI/DeviceCore/DevFilaSystem.h"
 #include "slic3r/GUI/DeviceCore/DevFilaSwitch.h"
 
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <wx/gdicmn.h>
 #include "slic3r/GUI/AmsMappingPopup.hpp"
diff --git a/src/slic3r/GUI/Widgets/AMSControl.hpp b/src/slic3r/GUI/Widgets/AMSControl.hpp
index 4f44d7a1e7..f4c83667c2 100644
--- a/src/slic3r/GUI/Widgets/AMSControl.hpp
+++ b/src/slic3r/GUI/Widgets/AMSControl.hpp
@@ -9,6 +9,7 @@
 #include "../DeviceManager.hpp"
 #include "slic3r/GUI/Event.hpp"
 #include "slic3r/GUI/AmsMappingPopup.hpp"
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <wx/gdicmn.h>
 #include <string>
diff --git a/src/slic3r/GUI/Widgets/AMSItem.cpp b/src/slic3r/GUI/Widgets/AMSItem.cpp
index 96ca92494d..303b4221bb 100644
--- a/src/slic3r/GUI/Widgets/AMSItem.cpp
+++ b/src/slic3r/GUI/Widgets/AMSItem.cpp
@@ -12,6 +12,7 @@
 #include "slic3r/GUI/DeviceCore/DevConfig.h"
 #include "slic3r/GUI/DeviceCore/DevManager.h"
 
+#include <wx/anybutton.h>
 #include <wx/colour.h>
 #include <wx/event.h>
 #include "slic3r/GUI/Event.hpp"
diff --git a/src/slic3r/GUI/Widgets/AMSItem.hpp b/src/slic3r/GUI/Widgets/AMSItem.hpp
index e84ba64d98..55c0a3ca8d 100644
--- a/src/slic3r/GUI/Widgets/AMSItem.hpp
+++ b/src/slic3r/GUI/Widgets/AMSItem.hpp
@@ -9,6 +9,7 @@
 #include "slic3r/GUI/Event.hpp"
 #include "slic3r/GUI/AmsMappingPopup.hpp"
 #include <string>
+#include <wx/anybutton.h>
 #include <wx/colour.h>
 #include <vector>
 #include "slic3r/GUI/DeviceCore/DevDefs.h"
diff --git a/src/slic3r/GUI/Widgets/AnimaController.cpp b/src/slic3r/GUI/Widgets/AnimaController.cpp
index a73c6d8e50..0267650e1d 100644
--- a/src/slic3r/GUI/Widgets/AnimaController.cpp
+++ b/src/slic3r/GUI/Widgets/AnimaController.cpp
@@ -1,5 +1,6 @@
 #include "AnimaController.hpp"
 
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <vector>
 #include <string>
diff --git a/src/slic3r/GUI/Widgets/AnimaController.hpp b/src/slic3r/GUI/Widgets/AnimaController.hpp
index e32eae6fb7..a1ddb7bc74 100644
--- a/src/slic3r/GUI/Widgets/AnimaController.hpp
+++ b/src/slic3r/GUI/Widgets/AnimaController.hpp
@@ -3,6 +3,7 @@
 
 #include "../wxExtensions.hpp"
 #include "Label.hpp"
+#include <wx/anybutton.h>
 #include <wx/panel.h>
 #include <wx/checklst.h>
 #include <vector>
diff --git a/src/slic3r/GUI/Widgets/Button.cpp b/src/slic3r/GUI/Widgets/Button.cpp
index 7010dbd91c..54e720feb4 100644
--- a/src/slic3r/GUI/Widgets/Button.cpp
+++ b/src/slic3r/GUI/Widgets/Button.cpp
@@ -3,6 +3,7 @@
 
 #include "slic3r/GUI/Widgets/StaticBox.hpp"
 #include <utility>
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <vector>
 #include <wx/colour.h>
diff --git a/src/slic3r/GUI/Widgets/Button.hpp b/src/slic3r/GUI/Widgets/Button.hpp
index cee2eb15b6..b4b1e24bb2 100644
--- a/src/slic3r/GUI/Widgets/Button.hpp
+++ b/src/slic3r/GUI/Widgets/Button.hpp
@@ -3,6 +3,7 @@
 
 #include "../wxExtensions.hpp"
 #include "StaticBox.hpp"
+#include <wx/anybutton.h>
 #include <wx/gdicmn.h>
 #include "slic3r/GUI/Widgets/StateColor.hpp"
 #include <wx/string.h>
diff --git a/src/slic3r/GUI/Widgets/CheckBox.cpp b/src/slic3r/GUI/Widgets/CheckBox.cpp
index f019f18784..c36a53d8af 100644
--- a/src/slic3r/GUI/Widgets/CheckBox.cpp
+++ b/src/slic3r/GUI/Widgets/CheckBox.cpp
@@ -1,6 +1,7 @@
 #include "CheckBox.hpp"
 
 #include "../wxExtensions.hpp"
+#include <wx/anybutton.h>
 #include <wx/gdicmn.h>
 #include <wx/checklst.h>
 #include <wx/tglbtn.h>
diff --git a/src/slic3r/GUI/Widgets/CheckBox.hpp b/src/slic3r/GUI/Widgets/CheckBox.hpp
index 3ad3dac2c4..bab691eb53 100644
--- a/src/slic3r/GUI/Widgets/CheckBox.hpp
+++ b/src/slic3r/GUI/Widgets/CheckBox.hpp
@@ -3,6 +3,7 @@
 
 #include "../wxExtensions.hpp"
 
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <wx/tglbtn.h>
 
diff --git a/src/slic3r/GUI/Widgets/CheckList.cpp b/src/slic3r/GUI/Widgets/CheckList.cpp
index 2b8dcac75e..a9c5c15be4 100644
--- a/src/slic3r/GUI/Widgets/CheckList.cpp
+++ b/src/slic3r/GUI/Widgets/CheckList.cpp
@@ -2,6 +2,7 @@
 
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/I18N.hpp"
+#include <wx/anybutton.h>
 #include <wx/arrstr.h>
 #include <wx/checklst.h>
 #include <wx/sizer.h>
diff --git a/src/slic3r/GUI/Widgets/CheckList.hpp b/src/slic3r/GUI/Widgets/CheckList.hpp
index 9e5ae4c9e1..5518b10fd0 100644
--- a/src/slic3r/GUI/Widgets/CheckList.hpp
+++ b/src/slic3r/GUI/Widgets/CheckList.hpp
@@ -6,6 +6,7 @@
 #include "Label.hpp"
 #include "TextInput.hpp"
 
+#include <wx/anybutton.h>
 #include <wx/arrstr.h>
 #include <wx/checklst.h>
 #include <wx/dynarray.h>
diff --git a/src/slic3r/GUI/Widgets/ComboBox.cpp b/src/slic3r/GUI/Widgets/ComboBox.cpp
index 7d507789f5..20998eda0a 100644
--- a/src/slic3r/GUI/Widgets/ComboBox.cpp
+++ b/src/slic3r/GUI/Widgets/ComboBox.cpp
@@ -8,6 +8,7 @@
 #include <vector>
 #include <wx/arrstr.h>
 #include <cstddef>
+#include <wx/containr.h>
 #include <wx/dcgraph.h>
 #include <wx/textctrl.h>
 #include <wx/string.h>
diff --git a/src/slic3r/GUI/Widgets/ComboBox.hpp b/src/slic3r/GUI/Widgets/ComboBox.hpp
index f13bc876c4..1dae23b85d 100644
--- a/src/slic3r/GUI/Widgets/ComboBox.hpp
+++ b/src/slic3r/GUI/Widgets/ComboBox.hpp
@@ -3,6 +3,7 @@
 
 #include "TextInput.hpp"
 #include "DropDown.hpp"
+#include <wx/containr.h>
 #include <wx/ctrlsub.h>
 #include <vector>
 #include <wx/string.h>
diff --git a/src/slic3r/GUI/Widgets/FanControl.cpp b/src/slic3r/GUI/Widgets/FanControl.cpp
index 3ffaf59141..e4f039307b 100644
--- a/src/slic3r/GUI/Widgets/FanControl.cpp
+++ b/src/slic3r/GUI/Widgets/FanControl.cpp
@@ -6,6 +6,7 @@
 #include "../MsgDialog.hpp"
 #include "json_diff.hpp"
 
+#include <wx/anybutton.h>
 #include <wx/event.h>
 #include <wx/checklst.h>
 #include <wx/gdicmn.h>
diff --git a/src/slic3r/GUI/Widgets/FanControl.hpp b/src/slic3r/GUI/Widgets/FanControl.hpp
index b97c9a4d27..e5eb49ed45 100644
--- a/src/slic3r/GUI/Widgets/FanControl.hpp
+++ b/src/slic3r/GUI/Widgets/FanControl.hpp
@@ -9,6 +9,7 @@
 #include "../SelectMachine.hpp"
 #include "../DeviceManager.hpp"
 #include "slic3r/GUI/Event.hpp"
+#include <wx/anybutton.h>
 #include <wx/gdicmn.h>
 #include <wx/checklst.h>
 #include <wx/event.h>
diff --git a/src/slic3r/GUI/Widgets/FilamentLoad.cpp b/src/slic3r/GUI/Widgets/FilamentLoad.cpp
index 712c103826..11541a95a3 100644
--- a/src/slic3r/GUI/Widgets/FilamentLoad.cpp
+++ b/src/slic3r/GUI/Widgets/FilamentLoad.cpp
@@ -5,6 +5,7 @@
 #include "../GUI_App.hpp"
 #include "../DeviceCore/DevFilaSystem.h"
 
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <wx/gdicmn.h>
 #include "slic3r/GUI/Widgets/StepCtrl.hpp"
diff --git a/src/slic3r/GUI/Widgets/FilamentLoad.hpp b/src/slic3r/GUI/Widgets/FilamentLoad.hpp
index 257e92d21c..2c516987fc 100644
--- a/src/slic3r/GUI/Widgets/FilamentLoad.hpp
+++ b/src/slic3r/GUI/Widgets/FilamentLoad.hpp
@@ -8,6 +8,7 @@
 #include "../DeviceManager.hpp"
 #include "slic3r/GUI/Event.hpp"
 #include "slic3r/GUI/AmsMappingPopup.hpp"
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <wx/gdicmn.h>
 #include <map>
diff --git a/src/slic3r/GUI/Widgets/ImageSwitchButton.cpp b/src/slic3r/GUI/Widgets/ImageSwitchButton.cpp
index 9915795af5..80e7e85c66 100644
--- a/src/slic3r/GUI/Widgets/ImageSwitchButton.cpp
+++ b/src/slic3r/GUI/Widgets/ImageSwitchButton.cpp
@@ -4,6 +4,7 @@
 #include "../wxExtensions.hpp"
 
 #include "slic3r/GUI/I18N.hpp"
+#include <wx/anybutton.h>
 #include <wx/colour.h>
 #include <utility>
 #include <wx/checklst.h>
diff --git a/src/slic3r/GUI/Widgets/RadioBox.cpp b/src/slic3r/GUI/Widgets/RadioBox.cpp
index 93e8f63b91..5b4af4e7b5 100644
--- a/src/slic3r/GUI/Widgets/RadioBox.cpp
+++ b/src/slic3r/GUI/Widgets/RadioBox.cpp
@@ -1,6 +1,7 @@
 #include "RadioBox.hpp"
 
 #include "../wxExtensions.hpp"
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <wx/gdicmn.h>
 
diff --git a/src/slic3r/GUI/Widgets/RadioGroup.hpp b/src/slic3r/GUI/Widgets/RadioGroup.hpp
index 6f25190431..ce6499c727 100644
--- a/src/slic3r/GUI/Widgets/RadioGroup.hpp
+++ b/src/slic3r/GUI/Widgets/RadioGroup.hpp
@@ -3,6 +3,7 @@
 
 #include "../wxExtensions.hpp"
 
+#include <wx/anybutton.h>
 #include <wx/panel.h>
 #include <wx/string.h>
 #include <wx/checklst.h>
diff --git a/src/slic3r/GUI/Widgets/RoundedRectangle.cpp b/src/slic3r/GUI/Widgets/RoundedRectangle.cpp
index 5b5cd98076..d53f176ac3 100644
--- a/src/slic3r/GUI/Widgets/RoundedRectangle.cpp
+++ b/src/slic3r/GUI/Widgets/RoundedRectangle.cpp
@@ -1,5 +1,6 @@
 #include "RoundedRectangle.hpp"
 #include "../wxExtensions.hpp"
+#include <wx/anybutton.h>
 #include <wx/colour.h>
 #include <wx/checklst.h>
 #include <wx/dcgraph.h>
diff --git a/src/slic3r/GUI/Widgets/ScrolledWindow.hpp b/src/slic3r/GUI/Widgets/ScrolledWindow.hpp
index a430dec423..cb497d1015 100644
--- a/src/slic3r/GUI/Widgets/ScrolledWindow.hpp
+++ b/src/slic3r/GUI/Widgets/ScrolledWindow.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include <wx/control.h>
 #include <wx/scrolwin.h>
 #include <wx/gdicmn.h>
 #include <wx/event.h>
diff --git a/src/slic3r/GUI/Widgets/SideButton.cpp b/src/slic3r/GUI/Widgets/SideButton.cpp
index e9fe493621..54b75f1e14 100644
--- a/src/slic3r/GUI/Widgets/SideButton.cpp
+++ b/src/slic3r/GUI/Widgets/SideButton.cpp
@@ -3,6 +3,7 @@
 
 #include <vector>
 #include "slic3r/GUI/Widgets/StateHandler.hpp"
+#include <wx/colour.h>
 #include <wx/dc.h>
 #include <wx/dcclient.h>
 #include <wx/dcgraph.h>
diff --git a/src/slic3r/GUI/Widgets/SideTools.hpp b/src/slic3r/GUI/Widgets/SideTools.hpp
index 81c42ecef0..94af1e64c9 100644
--- a/src/slic3r/GUI/Widgets/SideTools.hpp
+++ b/src/slic3r/GUI/Widgets/SideTools.hpp
@@ -8,6 +8,7 @@
 #include <wx/gdicmn.h>
 #include <wx/dcclient.h>
 #include <wx/panel.h>
+#include <wx/string.h>
 #include <wx/timer.h>
 #include "Button.hpp"
 #include "Label.hpp"
diff --git a/src/slic3r/GUI/Widgets/SpinInput.cpp b/src/slic3r/GUI/Widgets/SpinInput.cpp
index 3077304947..80c000fe46 100644
--- a/src/slic3r/GUI/Widgets/SpinInput.cpp
+++ b/src/slic3r/GUI/Widgets/SpinInput.cpp
@@ -6,6 +6,7 @@
 #include "slic3r/GUI/Widgets/StaticBox.hpp"
 #include <utility>
 #include "slic3r/GUI/Widgets/StateHandler.hpp"
+#include <wx/containr.h>
 #include <wx/dcclient.h>
 #include <wx/dc.h>
 #include <wx/dcgraph.h>
diff --git a/src/slic3r/GUI/Widgets/StaticBox.cpp b/src/slic3r/GUI/Widgets/StaticBox.cpp
index 87a1d26827..5b18f733c9 100644
--- a/src/slic3r/GUI/Widgets/StaticBox.cpp
+++ b/src/slic3r/GUI/Widgets/StaticBox.cpp
@@ -1,6 +1,7 @@
 #include "StaticBox.hpp"
 #include "../GUI.hpp"
 #include <utility>
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <wx/colour.h>
 #include <wx/dc.h>
diff --git a/src/slic3r/GUI/Widgets/StaticBox.hpp b/src/slic3r/GUI/Widgets/StaticBox.hpp
index b7662ff670..7c8d7c50ee 100644
--- a/src/slic3r/GUI/Widgets/StaticBox.hpp
+++ b/src/slic3r/GUI/Widgets/StaticBox.hpp
@@ -4,6 +4,7 @@
 #include "../wxExtensions.hpp"
 #include "StateHandler.hpp"
 
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <wx/gdicmn.h>
 #include "slic3r/GUI/Widgets/StateColor.hpp"
diff --git a/src/slic3r/GUI/Widgets/StaticLine.cpp b/src/slic3r/GUI/Widgets/StaticLine.cpp
index f574a5b739..61602d520d 100644
--- a/src/slic3r/GUI/Widgets/StaticLine.cpp
+++ b/src/slic3r/GUI/Widgets/StaticLine.cpp
@@ -2,6 +2,7 @@
 #include "Label.hpp"
 #include "StateColor.hpp"
 
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <wx/dc.h>
 #include <wx/dcclient.h>
diff --git a/src/slic3r/GUI/Widgets/StepCtrl.cpp b/src/slic3r/GUI/Widgets/StepCtrl.cpp
index 34ce8506de..e50db7c821 100644
--- a/src/slic3r/GUI/Widgets/StepCtrl.cpp
+++ b/src/slic3r/GUI/Widgets/StepCtrl.cpp
@@ -1,6 +1,7 @@
 #include "StepCtrl.hpp"
 #include "Label.hpp"
 
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include "slic3r/GUI/Widgets/StaticBox.hpp"
 #include <utility>
diff --git a/src/slic3r/GUI/Widgets/StepCtrl.hpp b/src/slic3r/GUI/Widgets/StepCtrl.hpp
index d568443eaa..3b5abdab57 100644
--- a/src/slic3r/GUI/Widgets/StepCtrl.hpp
+++ b/src/slic3r/GUI/Widgets/StepCtrl.hpp
@@ -2,6 +2,7 @@
 #define slic3r_GUI_StepCtrlBase_hpp_
 
 #include "StaticBox.hpp"
+#include <wx/anybutton.h>
 #include <wx/event.h>
 #include "slic3r/GUI/Widgets/StateColor.hpp"
 #include <vector>
diff --git a/src/slic3r/GUI/Widgets/SwitchButton.hpp b/src/slic3r/GUI/Widgets/SwitchButton.hpp
index e4ef0005ad..24fcf59981 100644
--- a/src/slic3r/GUI/Widgets/SwitchButton.hpp
+++ b/src/slic3r/GUI/Widgets/SwitchButton.hpp
@@ -7,6 +7,7 @@
 
 #include <cstddef>
 #include <vector>
+#include <wx/anybutton.h>
 #include <wx/event.h>
 #include <wx/checklst.h>
 #include <wx/colour.h>
diff --git a/src/slic3r/GUI/Widgets/TabCtrl.cpp b/src/slic3r/GUI/Widgets/TabCtrl.cpp
index 66ff926d25..7c39cdd3f4 100644
--- a/src/slic3r/GUI/Widgets/TabCtrl.cpp
+++ b/src/slic3r/GUI/Widgets/TabCtrl.cpp
@@ -1,6 +1,7 @@
 #include "TabCtrl.hpp"
 
 #include "slic3r/GUI/Widgets/StaticBox.hpp"
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <cstddef>
 #include <utility>
diff --git a/src/slic3r/GUI/Widgets/TabCtrl.hpp b/src/slic3r/GUI/Widgets/TabCtrl.hpp
index 80ac49da0a..f80a1aa08c 100644
--- a/src/slic3r/GUI/Widgets/TabCtrl.hpp
+++ b/src/slic3r/GUI/Widgets/TabCtrl.hpp
@@ -2,6 +2,7 @@
 #define slic3r_GUI_TabCtrl_hpp_
 
 #include "Button.hpp"
+#include <wx/anybutton.h>
 #include <wx/event.h>
 #include "slic3r/GUI/Widgets/StaticBox.hpp"
 #include <vector>
diff --git a/src/slic3r/GUI/Widgets/TempInput.cpp b/src/slic3r/GUI/Widgets/TempInput.cpp
index 99f50269ed..5890c702ac 100644
--- a/src/slic3r/GUI/Widgets/TempInput.cpp
+++ b/src/slic3r/GUI/Widgets/TempInput.cpp
@@ -5,6 +5,7 @@
 #include "slic3r/GUI/Widgets/StaticBox.hpp"
 #include <utility>
 #include <string>
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include "slic3r/GUI/Widgets/StateHandler.hpp"
 #include <wx/dcclient.h>
diff --git a/src/slic3r/GUI/Widgets/TempInput.hpp b/src/slic3r/GUI/Widgets/TempInput.hpp
index 8560576b96..3ca55e558c 100644
--- a/src/slic3r/GUI/Widgets/TempInput.hpp
+++ b/src/slic3r/GUI/Widgets/TempInput.hpp
@@ -2,6 +2,7 @@
 #define slic3r_GUI_TempInput_hpp_
 
 #include "../wxExtensions.hpp"
+#include <wx/anybutton.h>
 #include <wx/event.h>
 #include <wx/containr.h>
 #include <wx/gdicmn.h>
diff --git a/src/slic3r/GUI/Widgets/TextCtrl.h b/src/slic3r/GUI/Widgets/TextCtrl.h
index 3f3ab2b4de..2d57c38146 100644
--- a/src/slic3r/GUI/Widgets/TextCtrl.h
+++ b/src/slic3r/GUI/Widgets/TextCtrl.h
@@ -1,3 +1,5 @@
+#include <wx/textctrl.h>
+
 #ifdef __WXMSW__
 class TextCtrl : public wxTextCtrl
 {
diff --git a/src/slic3r/GUI/Widgets/TextInput.cpp b/src/slic3r/GUI/Widgets/TextInput.cpp
index 0ed38ff8de..e3670cbaed 100644
--- a/src/slic3r/GUI/Widgets/TextInput.cpp
+++ b/src/slic3r/GUI/Widgets/TextInput.cpp
@@ -7,6 +7,7 @@
 #include <utility>
 #include <cassert>
 #include "slic3r/GUI/Widgets/StateHandler.hpp"
+#include <wx/containr.h>
 #include <wx/dc.h>
 #include <algorithm>
 #include <wx/dcclient.h>
diff --git a/src/slic3r/GUI/WipeTowerDialog.hpp b/src/slic3r/GUI/WipeTowerDialog.hpp
index 91944cfc78..6f6af5f59d 100644
--- a/src/slic3r/GUI/WipeTowerDialog.hpp
+++ b/src/slic3r/GUI/WipeTowerDialog.hpp
@@ -1,8 +1,16 @@
 #ifndef _WIPE_TOWER_DIALOG_H_
 #define _WIPE_TOWER_DIALOG_H_
 
+#include <string>
+#include <vector>
+#include <wx/colour.h>
+#include <cstddef>
 #include <wx/dialog.h>
+#include <wx/panel.h>
+#include <wx/event.h>
+#include <wx/string.h>
 #include <wx/webview.h>
+#include "libslic3r/FlushVolCalc.hpp"
 #include "libslic3r/PrintConfig.hpp"
 #include "Widgets/SpinInput.hpp"
 
diff --git a/src/slic3r/GUI/calib_dlg.cpp b/src/slic3r/GUI/calib_dlg.cpp
index 48ea425cf0..24abe219bc 100644
--- a/src/slic3r/GUI/calib_dlg.cpp
+++ b/src/slic3r/GUI/calib_dlg.cpp
@@ -6,6 +6,7 @@
 #include <sstream>
 #include <iterator>
 #include "slic3r/GUI/Widgets/CheckBox.hpp"
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include "libslic3r/Config.hpp"
 #include <cstddef>
diff --git a/src/slic3r/GUI/calib_dlg.hpp b/src/slic3r/GUI/calib_dlg.hpp
index da6e9ee7c5..81d6b15200 100644
--- a/src/slic3r/GUI/calib_dlg.hpp
+++ b/src/slic3r/GUI/calib_dlg.hpp
@@ -13,6 +13,7 @@
 #include "Widgets/RadioGroup.hpp"
 #include "GUI_App.hpp"
 #include "wx/hyperlink.h"
+#include <wx/anybutton.h>
 #include <wx/checklst.h>
 #include <wx/event.h>
 #include <wx/radiobox.h>
diff --git a/src/slic3r/Utils/3DPrinterOS.cpp b/src/slic3r/Utils/3DPrinterOS.cpp
old mode 100755
new mode 100644
index 081afb667c..29b6bd63f8
--- a/src/slic3r/Utils/3DPrinterOS.cpp
+++ b/src/slic3r/Utils/3DPrinterOS.cpp
@@ -1,7 +1,12 @@
 #include "3DPrinterOS.hpp"
 
 #include <algorithm>
+#include "slic3r/GUI/Widgets/DropDown.hpp"
+#include <memory>
+#include <boost/filesystem/operations.hpp>
+#include <boost/optional/optional.hpp>
 #include <sstream>
+#include <string>
 #include <system_error>
 #include <exception>
 #include <boost/format.hpp>
@@ -11,12 +16,16 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <nlohmann/json.hpp>
 
+#include <wx/arrstr.h>
+#include <wx/gdicmn.h>
+#include <utility>
 #include <wx/progdlg.h>
 #include <wx/string.h>
 #include <wx/event.h>
 #include <wx/dialog.h>
 #include <wx/radiobut.h>
 
+#include "PrintHost.hpp"
 #include "libslic3r/PrintConfig.hpp"
 #include "libslic3r/Utils.hpp"
 #include "slic3r/GUI/I18N.hpp"
@@ -30,6 +39,8 @@
 
 #include "Http.hpp"
 #include <wx/busyinfo.h>
+#include <wx/timer.h>
+#include <wx/utils.h>
 
 
 using json = nlohmann::json;
diff --git a/src/slic3r/Utils/3DPrinterOS.hpp b/src/slic3r/Utils/3DPrinterOS.hpp
old mode 100755
new mode 100644
index 8c8e4ca6dc..02cc81ee6f
--- a/src/slic3r/Utils/3DPrinterOS.hpp
+++ b/src/slic3r/Utils/3DPrinterOS.hpp
@@ -1,6 +1,7 @@
 #ifndef slic3r_3DPrinterOS_hpp_
 #define slic3r_3DPrinterOS_hpp_
 
+#include <boost/optional/optional.hpp>
 #include <string>
 #include <wx/string.h>
 #include <boost/optional.hpp>
diff --git a/src/slic3r/Utils/ASCIIFolding.cpp b/src/slic3r/Utils/ASCIIFolding.cpp
index 016c30fcde..acf6f96fc9 100644
--- a/src/slic3r/Utils/ASCIIFolding.cpp
+++ b/src/slic3r/Utils/ASCIIFolding.cpp
@@ -1,10 +1,13 @@
 #include "ASCIIFolding.hpp"
 
+#include <iterator>
+#include <cstddef>
 #include <stdio.h>
 #include <string.h>
 #include <locale>
 #include <boost/locale/encoding_utf.hpp>
 #include <regex>
+#include <string>
 
 namespace Slic3r {
 
diff --git a/src/slic3r/Utils/AstroBox.cpp b/src/slic3r/Utils/AstroBox.cpp
index 61f9f96c33..6904b56920 100644
--- a/src/slic3r/Utils/AstroBox.cpp
+++ b/src/slic3r/Utils/AstroBox.cpp
@@ -1,6 +1,7 @@
 #include "AstroBox.hpp"
 
 #include <algorithm>
+#include <boost/optional/optional.hpp>
 #include <sstream>
 #include <exception>
 #include <boost/format.hpp>
@@ -9,8 +10,11 @@
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 
+#include <utility>
 #include <wx/progdlg.h>
+#include <wx/string.h>
 
+#include "PrintHost.hpp"
 #include "libslic3r/PrintConfig.hpp"
 #include "slic3r/GUI/I18N.hpp"
 #include "slic3r/GUI/GUI.hpp"
diff --git a/src/slic3r/Utils/AstroBox.hpp b/src/slic3r/Utils/AstroBox.hpp
index 72ab273228..04bbb00b67 100644
--- a/src/slic3r/Utils/AstroBox.hpp
+++ b/src/slic3r/Utils/AstroBox.hpp
@@ -1,6 +1,7 @@
 #ifndef slic3r_AstroBox_hpp_
 #define slic3r_AstroBox_hpp_
 
+#include <boost/optional/optional.hpp>
 #include <string>
 #include <wx/string.h>
 #include <boost/optional.hpp>
diff --git a/src/slic3r/Utils/BBLCloudServiceAgent.cpp b/src/slic3r/Utils/BBLCloudServiceAgent.cpp
index 801ad1cf57..8943a01914 100644
--- a/src/slic3r/Utils/BBLCloudServiceAgent.cpp
+++ b/src/slic3r/Utils/BBLCloudServiceAgent.cpp
@@ -2,12 +2,21 @@
 #include "BBLNetworkPlugin.hpp"
 
 #include <boost/log/trivial.hpp>
+#include "CloudProvider.hpp"
 #include "Http.hpp"
+#include "bambu_networking.hpp"
+#include "ICloudServiceAgent.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
 
+#include <map>
+#include <functional>
+#include "libslic3r/ProjectTask.hpp"
 #include <sstream>
 #include <boost/algorithm/string/replace.hpp>
 #include <nlohmann/json.hpp>
+#include <string>
+#include <wx/utils.h>
+#include <vector>
 
 using json = nlohmann::json;
 
diff --git a/src/slic3r/Utils/BBLCloudServiceAgent.hpp b/src/slic3r/Utils/BBLCloudServiceAgent.hpp
index 9f03f0b839..8ca07377ee 100644
--- a/src/slic3r/Utils/BBLCloudServiceAgent.hpp
+++ b/src/slic3r/Utils/BBLCloudServiceAgent.hpp
@@ -1,9 +1,14 @@
 #ifndef __BBL_CLOUD_SERVICE_AGENT_HPP__
 #define __BBL_CLOUD_SERVICE_AGENT_HPP__
 
+#include "CloudProvider.hpp"
 #include "ICloudServiceAgent.hpp"
+#include "bambu_networking.hpp"
+#include <functional>
+#include "libslic3r/ProjectTask.hpp"
 #include <string>
 #include <map>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/slic3r/Utils/BBLNetworkPlugin.cpp b/src/slic3r/Utils/BBLNetworkPlugin.cpp
index d795abf354..94ac57aaf0 100644
--- a/src/slic3r/Utils/BBLNetworkPlugin.cpp
+++ b/src/slic3r/Utils/BBLNetworkPlugin.cpp
@@ -1,11 +1,22 @@
 #include "BBLNetworkPlugin.hpp"
 #include "NetworkAgent.hpp"
 
+#include <mutex>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <exception>
+#include <boost/filesystem/file_status.hpp>
+#include <set>
+#include <algorithm>
 #include <stdio.h>
 #include <stdlib.h>
 #include <boost/log/trivial.hpp>
 #include <boost/format.hpp>
 #include <boost/filesystem.hpp>
+#include "bambu_networking.hpp"
+#include <string>
+#include <vector>
+#include <utility>
 #include "libslic3r/Utils.hpp"
 #include "slic3r/Utils/FileTransferUtils.hpp"
 
diff --git a/src/slic3r/Utils/BBLNetworkPlugin.hpp b/src/slic3r/Utils/BBLNetworkPlugin.hpp
index 3788568e37..8541f90bce 100644
--- a/src/slic3r/Utils/BBLNetworkPlugin.hpp
+++ b/src/slic3r/Utils/BBLNetworkPlugin.hpp
@@ -3,6 +3,7 @@
 
 #include "bambu_networking.hpp"
 #include "libslic3r/ProjectTask.hpp"
+#include "libslic3r/AppConfig.hpp"
 #include <string>
 #include <memory>
 #include <vector>
diff --git a/src/slic3r/Utils/BBLPrinterAgent.cpp b/src/slic3r/Utils/BBLPrinterAgent.cpp
index 4e2015d5d7..0e468b642b 100644
--- a/src/slic3r/Utils/BBLPrinterAgent.cpp
+++ b/src/slic3r/Utils/BBLPrinterAgent.cpp
@@ -3,6 +3,7 @@
 #include "IPrinterAgent.hpp"
 #include "NetworkAgentFactory.hpp"
 #include "NetworkAgent.hpp"
+#include "bambu_networking.hpp"
 #include "libslic3r/Utils.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/DeviceCore/DevManager.h"
@@ -10,9 +11,14 @@
 #include <boost/format.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/nowide/fstream.hpp>
+#include <exception>
+#include <functional>
 #include <nlohmann/json.hpp>
 #include <cmath>
 #include <slic3r/GUI/DeviceManager.hpp>
+#include <string>
+#include <utility>
+#include <vector>
 using json = nlohmann::json;
 
 #include <type_traits>
diff --git a/src/slic3r/Utils/BBLPrinterAgent.hpp b/src/slic3r/Utils/BBLPrinterAgent.hpp
index 4398602976..89315219c0 100644
--- a/src/slic3r/Utils/BBLPrinterAgent.hpp
+++ b/src/slic3r/Utils/BBLPrinterAgent.hpp
@@ -3,9 +3,12 @@
 
 #include "IPrinterAgent.hpp"
 #include "ICloudServiceAgent.hpp"
+#include "bambu_networking.hpp"
+#include <functional>
 #include <string>
 #include <memory>
 #include <nlohmann/json.hpp>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/slic3r/Utils/Bonjour.cpp b/src/slic3r/Utils/Bonjour.cpp
index 0bff5b526c..e67d3f0240 100644
--- a/src/slic3r/Utils/Bonjour.cpp
+++ b/src/slic3r/Utils/Bonjour.cpp
@@ -1,8 +1,29 @@
 #include "Bonjour.hpp"
 
+#include <boost/optional/optional.hpp>
+#include <boost/asio/ip/udp.hpp>
+#include <cstddef>
+#include <boost/none.hpp>
+#include <boost/asio/ip/address_v4.hpp>
+#include <boost/asio/ip/address_v6.hpp>
+#include <boost/asio/ip/address.hpp>
+#include <boost/asio/io_service.hpp>
+#include <boost/asio/ip/multicast.hpp>
+#include <boost/asio/buffer.hpp>
+#include <boost/asio/placeholders.hpp>
+#include <cassert>
+#include <cctype>
+#include <boost/asio/ip/host_name.hpp>
+#include <boost/asio/deadline_timer.hpp>
 #include <cstdint>
 #include <algorithm>
 #include <array>
+#include <utility>
+#include <ostream>
+#include <iterator>
+#include <memory>
+#include <exception>
+#include <functional>
 #include <vector>
 #include <string>
 #include <map>
diff --git a/src/slic3r/Utils/Bonjour.hpp b/src/slic3r/Utils/Bonjour.hpp
index 3ef8f0e1a2..e267575f74 100644
--- a/src/slic3r/Utils/Bonjour.hpp
+++ b/src/slic3r/Utils/Bonjour.hpp
@@ -1,8 +1,16 @@
 #ifndef slic3r_Bonjour_hpp_
 #define slic3r_Bonjour_hpp_
 
+#include <boost/asio/ip/address_v4.hpp>
+#include <boost/asio/ip/address_v6.hpp>
+#include <boost/optional/optional.hpp>
+#include <cstddef>
+#include <boost/asio/ip/udp.hpp>
+#include <boost/asio/io_service.hpp>
+#include <cassert>
 #include <cstdint>
 #include <memory>
+#include <ostream>
 #include <string>
 #include <set>
 #include <unordered_map>
@@ -13,6 +21,8 @@
 #include <boost/optional.hpp>
 #include <boost/system/error_code.hpp>
 #include <boost/shared_ptr.hpp>
+#include <vector>
+#include <utility>
 
 namespace Slic3r {
 
diff --git a/src/slic3r/Utils/CalibUtils.cpp b/src/slic3r/Utils/CalibUtils.cpp
index 462f8c2712..82686cb7c7 100644
--- a/src/slic3r/Utils/CalibUtils.cpp
+++ b/src/slic3r/Utils/CalibUtils.cpp
@@ -6,6 +6,7 @@
 #include "NetworkAgent.hpp"
 #include "../GUI/Jobs/ProgressIndicator.hpp"
 #include "../GUI/PartPlate.hpp"
+#include "json_diff.hpp"
 #include "libslic3r/CutUtils.hpp"
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/Utils.hpp"
@@ -22,6 +23,41 @@
 #include "../GUI/DeviceCore/DevStorage.h"
 #include "libslic3r/FlushVolCalc.hpp"
 #include "../GUI/Plater.hpp"
+#include <memory>
+#include "slic3r/GUI/Jobs/Worker.hpp"
+#include <string>
+#include <vector>
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/Flow.hpp"
+#include <cstddef>
+#include "libslic3r/ParameterUtils.hpp"
+#include <cmath>
+#include <algorithm>
+#include <cassert>
+#include "libslic3r/calib.hpp"
+#include <wx/string.h>
+#include "libslic3r/CommonDefs.hpp"
+#include <cstdlib>
+#include <boost/log/trivial.hpp>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Geometry.hpp"
+#include "libslic3r/Format/bbs_3mf.hpp"
+#include "libslic3r/Semver.hpp"
+#include <array>
+#include "libslic3r/BoundingBox.hpp"
+#include <wx/colour.h>
+#include "libslic3r/libslic3r.h"
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include "libslic3r/PrintBase.hpp"
+#include "libslic3r/GCode/ThumbnailData.hpp"
+#include "libslic3r/ProjectTask.hpp"
+#include "slic3r/GUI/3DScene.hpp"
+#include "libslic3r/Color.hpp"
+#include "slic3r/GUI/GLShader.hpp"
+#include "slic3r/GUI/OpenGLManager.hpp"
+#include <utility>
+#include "slic3r/GUI/Jobs/PrintJob.hpp"
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/Utils/CalibUtils.hpp b/src/slic3r/Utils/CalibUtils.hpp
index 1060a7d3d9..00b9e0020c 100644
--- a/src/slic3r/Utils/CalibUtils.hpp
+++ b/src/slic3r/Utils/CalibUtils.hpp
@@ -3,6 +3,11 @@
 #include "../GUI/DeviceManager.hpp"
 #include "../GUI/Jobs/PrintJob.hpp"
 #include "slic3r/GUI/Jobs/Worker.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include <string>
+#include <memory>
+#include <wx/string.h>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/slic3r/Utils/ColorSpaceConvert.cpp b/src/slic3r/Utils/ColorSpaceConvert.cpp
index 176bd29304..63ebc6b7b8 100644
--- a/src/slic3r/Utils/ColorSpaceConvert.cpp
+++ b/src/slic3r/Utils/ColorSpaceConvert.cpp
@@ -2,6 +2,12 @@
 
 #include <algorithm>
 #include <boost/algorithm/string.hpp>
+#include <tuple>
+#include <math.h>
+#include <string>
+#include <vector>
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/classification.hpp>
 #include <wx/colordlg.h>
 #include <cmath>
 
diff --git a/src/slic3r/Utils/CrealityHostDiscovery.cpp b/src/slic3r/Utils/CrealityHostDiscovery.cpp
index a3256794e2..556309ef30 100644
--- a/src/slic3r/Utils/CrealityHostDiscovery.cpp
+++ b/src/slic3r/Utils/CrealityHostDiscovery.cpp
@@ -4,9 +4,13 @@
 #include "Http.hpp"
 
 #include <boost/log/trivial.hpp>
+#include <exception>
 #include <nlohmann/json.hpp>
 
 #include <algorithm>
+#include <string>
+#include <vector>
+#include <utility>
 
 namespace Slic3r {
 
diff --git a/src/slic3r/Utils/CrealityPrint.cpp b/src/slic3r/Utils/CrealityPrint.cpp
index 323db56ff6..20e702ba54 100644
--- a/src/slic3r/Utils/CrealityPrint.cpp
+++ b/src/slic3r/Utils/CrealityPrint.cpp
@@ -1,6 +1,20 @@
 #include "CrealityPrint.hpp"
 
 #include <algorithm>
+#include <boost/asio/io_context.hpp>
+#include <boost/beast/websocket/stream.hpp>
+#include <boost/beast/core/tcp_stream.hpp>
+#include <boost/beast/core/stream_traits.hpp>
+#include <chrono>
+#include <boost/beast/websocket/stream_base.hpp>
+#include <boost/beast/websocket/rfc6455.hpp>
+#include <boost/beast/http/field.hpp>
+#include <boost/beast/version.hpp>
+#include <boost/asio/buffer.hpp>
+#include <boost/beast/core/flat_buffer.hpp>
+#include <boost/beast/core/error.hpp>
+#include <boost/asio/error.hpp>
+#include <boost/beast/core/buffers_to_string.hpp>
 #include <map>
 #include <unordered_set>
 #include <sstream>
@@ -16,8 +30,11 @@
 #include <boost/nowide/convert.hpp>
 
 #include <curl/curl.h>
+#include <utility>
+#include <vector>
 #include <wx/progdlg.h>
 
+#include "PrintHost.hpp"
 #include "slic3r/GUI/GUI.hpp"
 #include "slic3r/GUI/I18N.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
@@ -37,6 +54,7 @@
 
 #include <fstream>
 #include <nlohmann/json.hpp>
+#include <wx/string.h>
 using json = nlohmann::json;
 using std::to_string;
 
diff --git a/src/slic3r/Utils/CrealityPrintAgent.cpp b/src/slic3r/Utils/CrealityPrintAgent.cpp
index 4730903c59..10f6a51c5d 100644
--- a/src/slic3r/Utils/CrealityPrintAgent.cpp
+++ b/src/slic3r/Utils/CrealityPrintAgent.cpp
@@ -1,16 +1,23 @@
 #include "CrealityPrintAgent.hpp"
 #include "CrealityPrint.hpp"
+#include "MoonrakerPrinterAgent.hpp"
+#include "IPrinterAgent.hpp"
 #include "libslic3r/PresetBundle.hpp"
 #include "libslic3r/PrintConfig.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
 
 #include <boost/log/trivial.hpp>
+#include "libslic3r/Config.hpp"
+#include <exception>
 #include <nlohmann/json.hpp>
 
 #include <algorithm>
 #include <cctype>
 #include <map>
 #include <set>
+#include <string>
+#include <vector>
+#include <utility>
 
 using json = nlohmann::json;
 
diff --git a/src/slic3r/Utils/CrealityPrintAgent.hpp b/src/slic3r/Utils/CrealityPrintAgent.hpp
index cf22d104ec..3b925c5d21 100644
--- a/src/slic3r/Utils/CrealityPrintAgent.hpp
+++ b/src/slic3r/Utils/CrealityPrintAgent.hpp
@@ -1,6 +1,7 @@
 #ifndef __CREALITY_PRINT_AGENT_HPP__
 #define __CREALITY_PRINT_AGENT_HPP__
 
+#include "IPrinterAgent.hpp"
 #include "MoonrakerPrinterAgent.hpp"
 
 #include <string>
diff --git a/src/slic3r/Utils/Duet.cpp b/src/slic3r/Utils/Duet.cpp
index e26a493131..592e198808 100644
--- a/src/slic3r/Utils/Duet.cpp
+++ b/src/slic3r/Utils/Duet.cpp
@@ -1,6 +1,7 @@
 #include "Duet.hpp"
 
 #include <algorithm>
+#include <cassert>
 #include <ctime>
 #include <boost/filesystem/path.hpp>
 #include <boost/format.hpp>
@@ -8,14 +9,17 @@
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/json_parser.hpp>
 
+#include <utility>
 #include <wx/frame.h>
 #include <wx/event.h>
 #include <wx/progdlg.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
+#include <wx/string.h>
 #include <wx/textctrl.h>
 #include <wx/checkbox.h>
 
+#include "PrintHost.hpp"
 #include "libslic3r/PrintConfig.hpp"
 #include "slic3r/GUI/GUI.hpp"
 #include "slic3r/GUI/I18N.hpp"
diff --git a/src/slic3r/Utils/ESP3D.cpp b/src/slic3r/Utils/ESP3D.cpp
index 5c10862118..0fc28cfcaf 100644
--- a/src/slic3r/Utils/ESP3D.cpp
+++ b/src/slic3r/Utils/ESP3D.cpp
@@ -12,14 +12,17 @@
 #include <boost/asio.hpp>
 #include <boost/algorithm/string.hpp>
 
+#include <utility>
 #include <wx/frame.h>
 #include <wx/event.h>
 #include <wx/progdlg.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
+#include <wx/string.h>
 #include <wx/textctrl.h>
 #include <wx/checkbox.h>
 
+#include "PrintHost.hpp"
 #include "libslic3r/PrintConfig.hpp"
 #include "slic3r/GUI/GUI.hpp"
 #include "slic3r/GUI/I18N.hpp"
diff --git a/src/slic3r/Utils/ElegooLink.cpp b/src/slic3r/Utils/ElegooLink.cpp
index 64ff4a9455..fb74a384d1 100644
--- a/src/slic3r/Utils/ElegooLink.cpp
+++ b/src/slic3r/Utils/ElegooLink.cpp
@@ -1,8 +1,19 @@
 #include "ElegooLink.hpp"
 
 #include <algorithm>
+#include "libslic3r/Utils.hpp"
+#include <boost/optional/optional.hpp>
+#include <cstddef>
+#include <ios>
+#include <boost/uuid/random_generator.hpp>
+#include <chrono>
+#include <cctype>
+#include "libslic3r/PrintConfig.hpp"
+#include <iostream>
 #include <map>
 #include <mutex>
+#include <regex>
+#include <ostream>
 #include <sstream>
 #include <exception>
 #include <boost/format.hpp>
@@ -20,8 +31,15 @@
 
 #include <curl/curl.h>
 
+#include <string>
+#include <utility>
+#include <thread>
+#include <vector>
 #include <wx/progdlg.h>
 
+#include "OctoPrint.hpp"
+#include "PrintHost.hpp"
+#include "WebSocketClient.hpp"
 #include "slic3r/GUI/GUI.hpp"
 #include "slic3r/GUI/I18N.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
diff --git a/src/slic3r/Utils/ElegooLink.hpp b/src/slic3r/Utils/ElegooLink.hpp
index a60d2de1b3..9072fd5c78 100644
--- a/src/slic3r/Utils/ElegooLink.hpp
+++ b/src/slic3r/Utils/ElegooLink.hpp
@@ -1,6 +1,9 @@
 #ifndef slic3r_ElegooLink_hpp_
 #define slic3r_ElegooLink_hpp_
 
+#include <boost/optional/optional.hpp>
+#include <cstddef>
+#include <boost/filesystem/path.hpp>
 #include <string>
 #include <wx/string.h>
 #include <boost/optional.hpp>
diff --git a/src/slic3r/Utils/EmbossStyleManager.cpp b/src/slic3r/Utils/EmbossStyleManager.cpp
index 5e777e2f29..5f03bd5df3 100644
--- a/src/slic3r/Utils/EmbossStyleManager.cpp
+++ b/src/slic3r/Utils/EmbossStyleManager.cpp
@@ -1,4 +1,19 @@
 #include "EmbossStyleManager.hpp"
+#include <imgui.h>
+#include <functional>
+#include "libslic3r/TextConfiguration.hpp"
+#include <cstddef>
+#include <boost/assign/list_of.hpp>
+#include <cassert>
+#include <limits>
+#include <memory>
+#include "libslic3r/Emboss.hpp"
+#include "libslic3r/Point.hpp"
+#include <cstdint>
+#include <cstdlib>
+#include <map>
+#include <cmath>
+#include "libslic3r/EmbossShape.hpp"
 #include <optional>
 #include <glad/gl.h> // Imgui texture
 #include <imgui/imgui_internal.h> // ImTextCharFromUtf8
@@ -12,6 +27,13 @@
 
 #include <boost/assign.hpp>
 #include <boost/bimap.hpp>
+#include <string>
+#include <string_view>
+#include <utility>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "slic3r/GUI/Jobs/Worker.hpp"
+#include <vector>
+#include "slic3r/GUI/OpenGLManager.hpp"
 
 using namespace Slic3r;
 using namespace Slic3r::Emboss;
diff --git a/src/slic3r/Utils/EmbossStyleManager.hpp b/src/slic3r/Utils/EmbossStyleManager.hpp
index 171f6fb1aa..76be39ac04 100644
--- a/src/slic3r/Utils/EmbossStyleManager.hpp
+++ b/src/slic3r/Utils/EmbossStyleManager.hpp
@@ -1,11 +1,15 @@
 #ifndef slic3r_EmbossStyleManager_hpp_
 #define slic3r_EmbossStyleManager_hpp_
 
+#include <cstddef>
+#include <limits>
+#include "libslic3r/Point.hpp"
 #include <memory>
 #include <optional>
 #include <string>
 #include <functional>
 #include <imgui/imgui.h>
+#include <vector>
 #include <wx/font.h>
 #include <glad/gl.h>
 #include <libslic3r/BoundingBox.hpp>
diff --git a/src/slic3r/Utils/FileHelp.cpp b/src/slic3r/Utils/FileHelp.cpp
index bd67dab46f..12c1d5728f 100644
--- a/src/slic3r/Utils/FileHelp.cpp
+++ b/src/slic3r/Utils/FileHelp.cpp
@@ -1,6 +1,11 @@
 #include "FileHelp.hpp"
+#include <algorithm>
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/exception.hpp>
 #include <boost/log/trivial.hpp>
+#include <string>
+#include <cstdint>
 namespace Slic3r {
     namespace Utils {
 
diff --git a/src/slic3r/Utils/FileTransferUtils.cpp b/src/slic3r/Utils/FileTransferUtils.cpp
index 822ccdf09d..e56cdc1551 100644
--- a/src/slic3r/Utils/FileTransferUtils.cpp
+++ b/src/slic3r/Utils/FileTransferUtils.cpp
@@ -1,3 +1,9 @@
+#include <string>
+#include <stdexcept>
+#include <utility>
+#include <vector>
+#include <cstddef>
+#include <cstdint>
 #include <wx/wx.h>
 #include <type_traits>
 #include "FileTransferUtils.hpp"
diff --git a/src/slic3r/Utils/FixModelByCgal.cpp b/src/slic3r/Utils/FixModelByCgal.cpp
index 9d973844bb..237a4b9dc6 100644
--- a/src/slic3r/Utils/FixModelByCgal.cpp
+++ b/src/slic3r/Utils/FixModelByCgal.cpp
@@ -1,14 +1,26 @@
 #include "FixModelByCgal.hpp"
 
+#include <algorithm>
 #include <atomic>
 #include <chrono>
 #include <cmath>
 #include <condition_variable>
+#include "libslic3r/TriangleMesh.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
+#include <exception>
+#include <cstddef>
+#include "libslic3r/Exception.hpp"
 #include <limits>
 #include <mutex>
+#include "slic3r/GUI/Widgets/ProgressDialog.hpp"
+#include <optional>
 #include <string>
 #include <thread>
+#include <utility>
 #include <vector>
+#include <wx/string.h>
 
 #include "libslic3r/MeshBoolean.hpp"
 #include "libslic3r/Model.hpp"
diff --git a/src/slic3r/Utils/FixModelByCgal.hpp b/src/slic3r/Utils/FixModelByCgal.hpp
index 61c8c91087..03bec43f47 100644
--- a/src/slic3r/Utils/FixModelByCgal.hpp
+++ b/src/slic3r/Utils/FixModelByCgal.hpp
@@ -2,6 +2,7 @@
 #define slic3r_GUI_Utils_FixModelByCgal_hpp_
 
 #include <string>
+#include <wx/string.h>
 #include "../GUI/Widgets/ProgressDialog.hpp"
 
 namespace Slic3r {
diff --git a/src/slic3r/Utils/FlashAir.cpp b/src/slic3r/Utils/FlashAir.cpp
index f2d66fd012..557604cffc 100644
--- a/src/slic3r/Utils/FlashAir.cpp
+++ b/src/slic3r/Utils/FlashAir.cpp
@@ -7,14 +7,17 @@
 #include <boost/log/trivial.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 
+#include <utility>
 #include <wx/frame.h>
 #include <wx/event.h>
 #include <wx/progdlg.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
+#include <wx/string.h>
 #include <wx/textctrl.h>
 #include <wx/checkbox.h>
 
+#include "PrintHost.hpp"
 #include "libslic3r/PrintConfig.hpp"
 #include "slic3r/GUI/GUI.hpp"
 #include "slic3r/GUI/I18N.hpp"
diff --git a/src/slic3r/Utils/Flashforge.cpp b/src/slic3r/Utils/Flashforge.cpp
index a042a889ae..5f639c3e5f 100644
--- a/src/slic3r/Utils/Flashforge.cpp
+++ b/src/slic3r/Utils/Flashforge.cpp
@@ -1,8 +1,22 @@
 #include "Flashforge.hpp"
 #include <algorithm>
 #include <array>
+#include <boost/algorithm/string/trim.hpp>
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/ip/tcp.hpp>
+#include <boost/asio/ip/host_name.hpp>
+#include <boost/asio/ip/udp.hpp>
+#include <boost/asio/socket_base.hpp>
+#include <boost/asio/buffer.hpp>
+#include <boost/asio/ip/address_v4.hpp>
+#include <boost/asio/error.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <ctime>
 #include <chrono>
+#include <string>
+#include "libslic3r/Config.hpp"
+#include <exception>
+#include <ios>
 #include <thread>
 #include <sstream>
 #include <fstream>
@@ -16,11 +30,14 @@
 #include <boost/asio.hpp>
 #include <boost/algorithm/string.hpp>
 
+#include <vector>
+#include <utility>
 #include <wx/frame.h>
 #include <wx/event.h>
 #include <wx/progdlg.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
+#include <wx/string.h>
 #include <wx/textctrl.h>
 #include <wx/checkbox.h>
 
@@ -28,6 +45,7 @@
 #include <curl/curl.h>
 #include <nlohmann/json.hpp>
 
+#include "PrintHost.hpp"
 #include "libslic3r/PrintConfig.hpp"
 #include "slic3r/GUI/GUI.hpp"
 #include "slic3r/GUI/I18N.hpp"
diff --git a/src/slic3r/Utils/FontConfigHelp.cpp b/src/slic3r/Utils/FontConfigHelp.cpp
index 15beca07ba..f3280ad83d 100644
--- a/src/slic3r/Utils/FontConfigHelp.cpp
+++ b/src/slic3r/Utils/FontConfigHelp.cpp
@@ -1,4 +1,11 @@
 #include "FontConfigHelp.hpp"
+#include <optional>
+#include <string>
+#include <wx/string.h>
+#include <wx/buffer.h>
+#include <wx/chartype.h>
+#include <wx/font.h>
+#include <cstddef>
 
 #ifdef EXIST_FONT_CONFIG_INCLUDE
 
diff --git a/src/slic3r/Utils/FontConfigHelp.hpp b/src/slic3r/Utils/FontConfigHelp.hpp
index d2d7738767..ca69b7719e 100644
--- a/src/slic3r/Utils/FontConfigHelp.hpp
+++ b/src/slic3r/Utils/FontConfigHelp.hpp
@@ -1,6 +1,7 @@
 #ifndef slic3r_FontConfigHelp_hpp_
 #define slic3r_FontConfigHelp_hpp_
 
+#include <string>
 #ifdef __linux__
 #define EXIST_FONT_CONFIG_INCLUDE
 #endif
diff --git a/src/slic3r/Utils/HexFile.cpp b/src/slic3r/Utils/HexFile.cpp
index a13fcab02b..76e1f998bf 100644
--- a/src/slic3r/Utils/HexFile.cpp
+++ b/src/slic3r/Utils/HexFile.cpp
@@ -1,9 +1,15 @@
 #include "HexFile.hpp"
 
+#include <cstddef>
+#include <boost/filesystem/path.hpp>
+#include <ostream>
+#include <exception>
 #include <sstream>
 #include <boost/filesystem/fstream.hpp>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/ini_parser.hpp>
+#include <string>
+#include <utility>
 
 namespace fs = boost::filesystem;
 namespace pt = boost::property_tree;
diff --git a/src/slic3r/Utils/Http.cpp b/src/slic3r/Utils/Http.cpp
index 363ca0ecf6..552c0b6a39 100644
--- a/src/slic3r/Utils/Http.cpp
+++ b/src/slic3r/Utils/Http.cpp
@@ -1,8 +1,23 @@
 #include "Http.hpp"
+#include "libslic3r_version.h"
 
+#include <algorithm>
 #include <atomic>
+#include <boost/filesystem/operations.hpp>
+#include <cassert>
 #include <cstdlib>
+#include <curl/curlver.h>
+#include <fstream>
 #include <functional>
+#include <memory>
+#include <string>
+#include <stdlib.h>
+#include <map>
+#include <mutex>
+#include <ios>
+#include "libslic3r/Exception.hpp"
+#include <iterator>
+#include <ostream>
 #include <thread>
 #include <deque>
 #include <sstream>
@@ -14,6 +29,7 @@
 #include <boost/log/trivial.hpp>
 
 #include <curl/curl.h>
+#include <utility>
 
 #ifdef OPENSSL_CERT_OVERRIDE
 #include <openssl/x509.h>
diff --git a/src/slic3r/Utils/Http.hpp b/src/slic3r/Utils/Http.hpp
index a44a95e605..d8fa012124 100644
--- a/src/slic3r/Utils/Http.hpp
+++ b/src/slic3r/Utils/Http.hpp
@@ -1,8 +1,10 @@
 #ifndef __Http_hpp__
 #define __Http_hpp__
 
+#include <cstddef>
 #include <map>
 #include <memory>
+#include <ostream>
 #include <string>
 #include <functional>
 #include <boost/filesystem/path.hpp>
diff --git a/src/slic3r/Utils/InstanceID.cpp b/src/slic3r/Utils/InstanceID.cpp
index d4a903e276..d683138e2e 100644
--- a/src/slic3r/Utils/InstanceID.cpp
+++ b/src/slic3r/Utils/InstanceID.cpp
@@ -1,7 +1,10 @@
 #include "InstanceID.hpp"
 
 #include <algorithm>
+#include <boost/algorithm/string/trim.hpp>
+#include <boost/algorithm/string/case_conv.hpp>
 #include <cctype>
+#include <ios>
 #include <mutex>
 #include <optional>
 #include <string>
diff --git a/src/slic3r/Utils/MKS.cpp b/src/slic3r/Utils/MKS.cpp
index ced7af9c9f..6a27c7c7ce 100644
--- a/src/slic3r/Utils/MKS.cpp
+++ b/src/slic3r/Utils/MKS.cpp
@@ -12,14 +12,18 @@
 #include <boost/asio.hpp>
 #include <boost/algorithm/string.hpp>
 
+#include <utility>
 #include <wx/frame.h>
 #include <wx/event.h>
 #include <wx/progdlg.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
+#include <wx/string.h>
 #include <wx/textctrl.h>
 #include <wx/checkbox.h>
 
+#include "TCPConsole.hpp"
+#include "PrintHost.hpp"
 #include "libslic3r/PrintConfig.hpp"
 #include "slic3r/GUI/GUI.hpp"
 #include "slic3r/GUI/I18N.hpp"
diff --git a/src/slic3r/Utils/MeshInspect.cpp b/src/slic3r/Utils/MeshInspect.cpp
index 0a60358278..dd8e5c88a0 100644
--- a/src/slic3r/Utils/MeshInspect.cpp
+++ b/src/slic3r/Utils/MeshInspect.cpp
@@ -3,11 +3,17 @@
 #include "libslic3r/LayOnFace.hpp"
 #include "libslic3r/Model.hpp"
 
+#include "libslic3r/Point.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include <cstddef>
 #include <nlohmann/json.hpp>
 
 #include <algorithm>
 #include <cmath>
 #include <ostream>
+#include <vector>
+#include <string>
+#include <utility>
 
 namespace Slic3r {
 namespace MeshInspect {
diff --git a/src/slic3r/Utils/MeshInspect.hpp b/src/slic3r/Utils/MeshInspect.hpp
index 0f53b41c4a..b908d568ba 100644
--- a/src/slic3r/Utils/MeshInspect.hpp
+++ b/src/slic3r/Utils/MeshInspect.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstddef>
 #include <iosfwd>
 #include <string>
 #include <vector>
diff --git a/src/slic3r/Utils/Moonraker.cpp b/src/slic3r/Utils/Moonraker.cpp
index 73fdb8486a..f8692a8bb8 100644
--- a/src/slic3r/Utils/Moonraker.cpp
+++ b/src/slic3r/Utils/Moonraker.cpp
@@ -1,12 +1,17 @@
 #include "Moonraker.hpp"
 
+#include <exception>
 #include <sstream>
 
 #include <boost/format.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/json_parser.hpp>
+#include <wx/string.h>
+#include <utility>
+#include <wx/arrstr.h>
 
+#include "PrintHost.hpp"
 #include "libslic3r/PrintConfig.hpp"
 #include "slic3r/GUI/I18N.hpp"
 #include "slic3r/GUI/GUI.hpp"
diff --git a/src/slic3r/Utils/MoonrakerPrinterAgent.cpp b/src/slic3r/Utils/MoonrakerPrinterAgent.cpp
index 5d75955a1e..96570b656b 100644
--- a/src/slic3r/Utils/MoonrakerPrinterAgent.cpp
+++ b/src/slic3r/Utils/MoonrakerPrinterAgent.cpp
@@ -1,6 +1,7 @@
 #include "MoonrakerPrinterAgent.hpp"
 #include "Http.hpp"
 #include "IPrinterAgent.hpp"
+#include "bambu_networking.hpp"
 #include "libslic3r/Preset.hpp"
 #include "libslic3r/PresetBundle.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
@@ -11,18 +12,44 @@
 #include "../GUI/DeviceCore/DevFirmware.h"
 #include "nlohmann/json.hpp"
 #include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/algorithm/string/case_conv.hpp>
+#include <boost/algorithm/string/trim.hpp>
+#include <boost/asio/buffer.hpp>
 #include <boost/asio/connect.hpp>
+#include <boost/asio/io_context.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/beast/core.hpp>
+#include <boost/beast/core/tcp_stream.hpp>
+#include <boost/beast/http/field.hpp>
+#include <boost/beast/core/flat_buffer.hpp>
+#include <boost/beast/core/error.hpp>
+#include <boost/beast/core/buffers_to_string.hpp>
 #include <boost/beast/websocket.hpp>
+#include <boost/beast/websocket/stream.hpp>
+#include <boost/beast/websocket/stream_base.hpp>
+#include <boost/beast/websocket/rfc6455.hpp>
+#include <boost/beast/websocket/error.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <boost/log/trivial.hpp>
 #include <algorithm>
 #include <chrono>
 #include <cstdint>
 #include <cctype>
+#include <ios>
+#include <functional>
+#include <exception>
 #include <map>
+#include <string>
+#include <mutex>
+#include <memory>
+#include <sstream>
+#include <set>
 #include <thread>
+#include <vector>
+#include <utility>
 
 namespace {
 
diff --git a/src/slic3r/Utils/MoonrakerPrinterAgent.hpp b/src/slic3r/Utils/MoonrakerPrinterAgent.hpp
index a25a088ada..a733d4dfb2 100644
--- a/src/slic3r/Utils/MoonrakerPrinterAgent.hpp
+++ b/src/slic3r/Utils/MoonrakerPrinterAgent.hpp
@@ -3,7 +3,11 @@
 
 #include "IPrinterAgent.hpp"
 #include "ICloudServiceAgent.hpp"
+#include "bambu_networking.hpp"
 
+#include <functional>
+#include <cstdint>
+#include <atomic>
 #include <memory>
 #include <mutex>
 #include <set>
@@ -11,6 +15,7 @@
 #include <thread>
 
 #include <nlohmann/json.hpp>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/slic3r/Utils/NetworkAgent.cpp b/src/slic3r/Utils/NetworkAgent.cpp
index 1f7705658e..4e5154fd42 100644
--- a/src/slic3r/Utils/NetworkAgent.cpp
+++ b/src/slic3r/Utils/NetworkAgent.cpp
@@ -1,11 +1,24 @@
 #include "NetworkAgent.hpp"
 
+#include <map>
+#include <memory>
+#include <cstdint>
+#include <exception>
+#include <functional>
+#include "libslic3r/ProjectTask.hpp"
 #include <stdlib.h>
 
 #include <boost/log/trivial.hpp>
 #include <nlohmann/json.hpp>
+#include <string>
+#include <vector>
+#include <utility>
+#include "CloudProvider.hpp"
+#include "ICloudServiceAgent.hpp"
+#include "ICameraSignalingChannel.hpp"
 #include "IPrinterAgent.hpp"
 #include "BBLNetworkPlugin.hpp"
+#include "bambu_networking.hpp"
 
 namespace Slic3r {
 
diff --git a/src/slic3r/Utils/NetworkAgent.hpp b/src/slic3r/Utils/NetworkAgent.hpp
index f93178db8b..c7813f2bb7 100644
--- a/src/slic3r/Utils/NetworkAgent.hpp
+++ b/src/slic3r/Utils/NetworkAgent.hpp
@@ -1,12 +1,15 @@
 #ifndef __NETWORK_Agent_HPP__
 #define __NETWORK_Agent_HPP__
 
+#include "CloudProvider.hpp"
+#include "ICameraSignalingChannel.hpp"
 #include "bambu_networking.hpp"
 
 #include "libslic3r/ProjectTask.hpp"
 #include "ICloudServiceAgent.hpp"
 #include "IPrinterAgent.hpp"
 
+#include <functional>
 #include <map>
 #include <atomic>
 #include <cstdint>
diff --git a/src/slic3r/Utils/NetworkAgentFactory.cpp b/src/slic3r/Utils/NetworkAgentFactory.cpp
index e2e58b7510..3d87a3eec9 100644
--- a/src/slic3r/Utils/NetworkAgentFactory.cpp
+++ b/src/slic3r/Utils/NetworkAgentFactory.cpp
@@ -1,4 +1,5 @@
 #include "NetworkAgentFactory.hpp"
+#include "CloudProvider.hpp"
 #include "IPrinterAgent.hpp"
 #include "ICloudServiceAgent.hpp"
 #include "BBLPrinterAgent.hpp"
@@ -13,13 +14,18 @@
 #include <boost/log/trivial.hpp>
 #include <chrono>
 #include <map>
+#include <memory>
 #include <mutex>
+#include <string>
 #include <utility>
 #include <slic3r/GUI/GUI_App.hpp>
 #include <slic3r/GUI/I18N.hpp>
 #include <slic3r/plugin/PluginDescriptor.hpp>
 #include <slic3r/plugin/PythonPluginInterface.hpp>
+#include <vector>
+#include <wx/app.h>
 #include <wx/msgdlg.h>
+#include <wx/string.h>
 
 namespace Slic3r {
 namespace {
diff --git a/src/slic3r/Utils/NetworkAgentFactory.hpp b/src/slic3r/Utils/NetworkAgentFactory.hpp
index a055b19493..0053a42466 100644
--- a/src/slic3r/Utils/NetworkAgentFactory.hpp
+++ b/src/slic3r/Utils/NetworkAgentFactory.hpp
@@ -1,6 +1,7 @@
 #ifndef __NETWORK_AGENT_FACTORY_HPP__
 #define __NETWORK_AGENT_FACTORY_HPP__
 
+#include "CloudProvider.hpp"
 #include "ICloudServiceAgent.hpp"
 #include "IPrinterAgent.hpp"
 #include "NetworkAgent.hpp"
@@ -11,6 +12,7 @@
 #include <memory>
 #include <string>
 #include <functional>
+#include <utility>
 #include <vector>
 
 namespace Slic3r {
diff --git a/src/slic3r/Utils/Obico.cpp b/src/slic3r/Utils/Obico.cpp
index 92d748b496..9dabd91467 100644
--- a/src/slic3r/Utils/Obico.cpp
+++ b/src/slic3r/Utils/Obico.cpp
@@ -1,6 +1,8 @@
 #include "Obico.hpp"
 
 #include <algorithm>
+#include "libslic3r/Exception.hpp"
+#include <boost/property_tree/exceptions.hpp>
 #include <sstream>
 #include <exception>
 #include <boost/format.hpp>
@@ -14,8 +16,12 @@
 #include <boost/nowide/convert.hpp>
 
 #include <curl/curl.h>
+#include <utility>
+#include <wx/arrstr.h>
 #include <wx/progdlg.h>
+#include <wx/string.h>
 
+#include "PrintHost.hpp"
 #include "slic3r/GUI/GUI.hpp"
 #include "slic3r/GUI/I18N.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
diff --git a/src/slic3r/Utils/OctoPrint.cpp b/src/slic3r/Utils/OctoPrint.cpp
index fa57b7b527..a39b300d79 100644
--- a/src/slic3r/Utils/OctoPrint.cpp
+++ b/src/slic3r/Utils/OctoPrint.cpp
@@ -1,6 +1,10 @@
 #include "OctoPrint.hpp"
 
 #include <algorithm>
+#include <boost/optional/optional.hpp>
+#include "libslic3r/Config.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Exception.hpp"
 #include <sstream>
 #include <exception>
 #include <boost/format.hpp>
@@ -14,8 +18,14 @@
 
 #include <curl/curl.h>
 
+#include <string>
+#include <utility>
+#include <wx/arrstr.h>
+#include <vector>
 #include <wx/progdlg.h>
+#include <wx/string.h>
 
+#include "PrintHost.hpp"
 #include "slic3r/GUI/GUI.hpp"
 #include "slic3r/GUI/I18N.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
diff --git a/src/slic3r/Utils/OctoPrint.hpp b/src/slic3r/Utils/OctoPrint.hpp
index ad7e8c411e..b2dbe11cff 100644
--- a/src/slic3r/Utils/OctoPrint.hpp
+++ b/src/slic3r/Utils/OctoPrint.hpp
@@ -1,6 +1,7 @@
 #ifndef slic3r_OctoPrint_hpp_
 #define slic3r_OctoPrint_hpp_
 
+#include <boost/optional/optional.hpp>
 #include <string>
 #include <wx/string.h>
 #include <boost/optional.hpp>
diff --git a/src/slic3r/Utils/OrcaCloudServiceAgent.cpp b/src/slic3r/Utils/OrcaCloudServiceAgent.cpp
index 1618bff548..2cebdb8ab9 100644
--- a/src/slic3r/Utils/OrcaCloudServiceAgent.cpp
+++ b/src/slic3r/Utils/OrcaCloudServiceAgent.cpp
@@ -1,21 +1,37 @@
 #include "OrcaCloudServiceAgent.hpp"
+#include "CloudProvider.hpp"
 #include "Http.hpp"
+#include "bambu_networking.hpp"
+#include "ICloudServiceAgent.hpp"
 #include "libslic3r/Utils.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
 #include "libslic3r/AppConfig.hpp"
 
+#include <atomic>
 #include <boost/asio.hpp>
+#include <boost/asio/ip/tcp.hpp>
+#include <boost/asio/io_context.hpp>
 #include <boost/beast/core/detail/base64.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <boost/log/trivial.hpp>
+#include <boost/uuid/name_generator_sha1.hpp>
 #include <boost/uuid/uuid.hpp>
 #include <boost/uuid/uuid_generators.hpp>
 #include <boost/uuid/uuid_io.hpp>
 
+#include <chrono>
+#include <cstdio>
 #include <exception>
+#include <functional>
 #include <iostream>
+#include <iterator>
 #include <libslic3r/Platform.hpp>
+#include <map>
+#include "libslic3r/Preset.hpp"
+#include "libslic3r/ProjectTask.hpp"
 #include <memory>
+#include <mutex>
 #include <nlohmann/json.hpp>
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
@@ -32,7 +48,11 @@
 #include <sstream>
 
 #include <string>
+#include <system_error>
+#include <thread>
+#include <unordered_map>
 #include <utility>
+#include <vector>
 #include <wx/filename.h>
 #include <wx/filefn.h>
 #include <wx/secretstore.h>
diff --git a/src/slic3r/Utils/OrcaCloudServiceAgent.hpp b/src/slic3r/Utils/OrcaCloudServiceAgent.hpp
index 7e060da84a..458aa55fcd 100644
--- a/src/slic3r/Utils/OrcaCloudServiceAgent.hpp
+++ b/src/slic3r/Utils/OrcaCloudServiceAgent.hpp
@@ -1,9 +1,12 @@
 #ifndef __ORCA_CLOUD_SERVICE_AGENT_HPP__
 #define __ORCA_CLOUD_SERVICE_AGENT_HPP__
 
+#include "CloudProvider.hpp"
 #include "ICameraSignalingChannel.hpp"
 #include "ICloudServiceAgent.hpp"
+#include "bambu_networking.hpp"
 #include <cstdlib>
+#include "libslic3r/ProjectTask.hpp"
 #include <string>
 #include <map>
 #include <mutex>
@@ -13,6 +16,7 @@
 #include <memory>
 #include <thread>
 #include <unordered_map>
+#include <utility>
 #include <vector>
 #include <nlohmann/json.hpp>
 
diff --git a/src/slic3r/Utils/OrcaPrinterAgent.cpp b/src/slic3r/Utils/OrcaPrinterAgent.cpp
index 987cc0efdb..cb8b38acc8 100644
--- a/src/slic3r/Utils/OrcaPrinterAgent.cpp
+++ b/src/slic3r/Utils/OrcaPrinterAgent.cpp
@@ -1,6 +1,11 @@
 #include "OrcaPrinterAgent.hpp"
 #include "IPrinterAgent.hpp"
 #include "NetworkAgentFactory.hpp"
+#include <string>
+#include <utility>
+#include <memory>
+#include <mutex>
+#include "bambu_networking.hpp"
 
 namespace Slic3r {
 
diff --git a/src/slic3r/Utils/OrcaPrinterAgent.hpp b/src/slic3r/Utils/OrcaPrinterAgent.hpp
index 7d2a75fe0f..a56b2c8dda 100644
--- a/src/slic3r/Utils/OrcaPrinterAgent.hpp
+++ b/src/slic3r/Utils/OrcaPrinterAgent.hpp
@@ -3,6 +3,7 @@
 
 #include "IPrinterAgent.hpp"
 #include "ICloudServiceAgent.hpp"
+#include "bambu_networking.hpp"
 #include <string>
 #include <mutex>
 #include <memory>
diff --git a/src/slic3r/Utils/PaintCLI.cpp b/src/slic3r/Utils/PaintCLI.cpp
index d99dc0b450..2bf2b9728a 100644
--- a/src/slic3r/Utils/PaintCLI.cpp
+++ b/src/slic3r/Utils/PaintCLI.cpp
@@ -5,9 +5,13 @@
 #include "libslic3r/TriangleMesh.hpp"
 #include "libslic3r/TriangleSelector.hpp"
 
+#include "libslic3r/Point.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include <cstddef>
 #include <nlohmann/json.hpp>
 
 #include <cmath>
+#include <ostream>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/src/slic3r/Utils/PresetUpdater.cpp b/src/slic3r/Utils/PresetUpdater.cpp
index 5bbe779970..1df0edf8fa 100644
--- a/src/slic3r/Utils/PresetUpdater.cpp
+++ b/src/slic3r/Utils/PresetUpdater.cpp
@@ -1,12 +1,23 @@
 #include "PresetUpdater.hpp"
 
 #include <algorithm>
+#include <boost/algorithm/string/case_conv.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/algorithm/string/trim.hpp>
 #include <boost/filesystem/directory.hpp>
+#include <boost/filesystem/file_status.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/nowide/fstream.hpp>
+#include <exception>
 #include <functional>
 #include <atomic>
+#include "libslic3r/Exception.hpp"
+#include <map>
+#include <ios>
+#include "libslic3r/AppConfig.hpp"
+#include "libslic3r/Preset.hpp"
+#include "libslic3r/Config.hpp"
 #include <set>
 #include <string>
 #include <thread>
@@ -24,8 +35,10 @@
 
 #include <vector>
 #include <wx/app.h>
+#include <wx/event.h>
 #include <wx/msgdlg.h>
 
+#include "json_diff.hpp"
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/format.hpp"
 #include "libslic3r/Utils.hpp"
diff --git a/src/slic3r/Utils/PresetUpdater.hpp b/src/slic3r/Utils/PresetUpdater.hpp
index ccb0902fd5..22571e52d9 100644
--- a/src/slic3r/Utils/PresetUpdater.hpp
+++ b/src/slic3r/Utils/PresetUpdater.hpp
@@ -4,6 +4,7 @@
 #include <functional>
 #include <memory>
 #include <set>
+#include <string>
 #include <vector>
 
 #include <wx/event.h>
diff --git a/src/slic3r/Utils/PrintHost.cpp b/src/slic3r/Utils/PrintHost.cpp
index 2eeb78a975..2b3c4d181d 100644
--- a/src/slic3r/Utils/PrintHost.cpp
+++ b/src/slic3r/Utils/PrintHost.cpp
@@ -1,5 +1,17 @@
 #include "PrintHost.hpp"
 
+#include <boost/optional/optional.hpp>
+#include "libslic3r/Config.hpp"
+#include <string>
+#include <boost/algorithm/string/predicate.hpp>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <cstddef>
+#include <boost/filesystem/path.hpp>
+#include <utility>
+#include <memory>
+#include <boost/filesystem/operations.hpp>
+#include "libslic3r/LifecycleEvents.hpp"
+#include "slic3r/GUI/GUI_App.hpp"
 #include <vector>
 #include <thread>
 #include <exception>
@@ -11,6 +23,7 @@
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/json_parser.hpp>
 
+#include <wx/event.h>
 #include <wx/string.h>
 #include <wx/app.h>
 #include <wx/arrstr.h>
diff --git a/src/slic3r/Utils/PrintHost.hpp b/src/slic3r/Utils/PrintHost.hpp
index cf197ede07..771eb7732a 100644
--- a/src/slic3r/Utils/PrintHost.hpp
+++ b/src/slic3r/Utils/PrintHost.hpp
@@ -1,12 +1,14 @@
 #ifndef slic3r_PrintHost_hpp_
 #define slic3r_PrintHost_hpp_
 
+#include <cstddef>
 #include <memory>
 #include <set>
 #include <string>
 #include <functional>
 #include <boost/filesystem/path.hpp>
 
+#include <utility>
 #include <wx/string.h>
 
 #include <libslic3r/enum_bitmask.hpp>
diff --git a/src/slic3r/Utils/Process.cpp b/src/slic3r/Utils/Process.cpp
index 96da521114..150e838489 100644
--- a/src/slic3r/Utils/Process.cpp
+++ b/src/slic3r/Utils/Process.cpp
@@ -1,5 +1,6 @@
 #include "Process.hpp"
 
+#include <cstdlib>
 #include <libslic3r/AppConfig.hpp>
 
 #include "../GUI/GUI.hpp"
@@ -13,6 +14,11 @@
 
 #include <boost/filesystem.hpp>
 #include <boost/log/trivial.hpp>
+#include <vector>
+#include <string>
+#include <wx/utils.h>
+#include <wx/filedlg.h>
+#include <wx/string.h>
 
 // For starting another OrcaSlicer instance on OSX.
 // Fails to compile on Windows on the build server.
diff --git a/src/slic3r/Utils/QidiPrinterAgent.cpp b/src/slic3r/Utils/QidiPrinterAgent.cpp
index 4a90ec3771..06499e1092 100644
--- a/src/slic3r/Utils/QidiPrinterAgent.cpp
+++ b/src/slic3r/Utils/QidiPrinterAgent.cpp
@@ -1,13 +1,22 @@
 #include "QidiPrinterAgent.hpp"
 #include "Http.hpp"
+#include "MoonrakerPrinterAgent.hpp"
+#include "IPrinterAgent.hpp"
 #include "libslic3r/PresetBundle.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
 
 #include "nlohmann/json.hpp"
 #include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/trim.hpp>
+#include <boost/algorithm/string/case_conv.hpp>
 #include <boost/log/trivial.hpp>
 #include <cctype>
+#include "libslic3r/Preset.hpp"
+#include <map>
 #include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
 
 using json = nlohmann::json;
 
diff --git a/src/slic3r/Utils/QidiPrinterAgent.hpp b/src/slic3r/Utils/QidiPrinterAgent.hpp
index ce7b4cda0d..5f4cfc3a7e 100644
--- a/src/slic3r/Utils/QidiPrinterAgent.hpp
+++ b/src/slic3r/Utils/QidiPrinterAgent.hpp
@@ -1,6 +1,7 @@
 #ifndef __QIDI_PRINTER_AGENT_HPP__
 #define __QIDI_PRINTER_AGENT_HPP__
 
+#include "IPrinterAgent.hpp"
 #include "MoonrakerPrinterAgent.hpp"
 
 #include <map>
diff --git a/src/slic3r/Utils/RaycastManager.cpp b/src/slic3r/Utils/RaycastManager.cpp
index 62c7a922d7..dba5ae1a54 100644
--- a/src/slic3r/Utils/RaycastManager.cpp
+++ b/src/slic3r/Utils/RaycastManager.cpp
@@ -1,5 +1,17 @@
 #include "RaycastManager.hpp"
+#include "libslic3r/Model.hpp"
+#include "libslic3r/AABBMesh.hpp"
+#include <cstddef>
+#include "libslic3r/Point.hpp"
+#include <algorithm>
+#include <optional>
+#include <array>
+#include <iterator>
+#include <memory>
+#include "slic3r/GUI/SceneRaycaster.hpp"
+#include "slic3r/GUI/3DScene.hpp"
 #include <utility>
+#include <vector>
 
 #include "slic3r/GUI/GLCanvas3D.hpp"
 #include "slic3r/GUI/Camera.hpp"
diff --git a/src/slic3r/Utils/RaycastManager.hpp b/src/slic3r/Utils/RaycastManager.hpp
index 4e143ba5dd..0c62ecaacc 100644
--- a/src/slic3r/Utils/RaycastManager.hpp
+++ b/src/slic3r/Utils/RaycastManager.hpp
@@ -1,8 +1,13 @@
 #ifndef slic3r_RaycastManager_hpp_
 #define slic3r_RaycastManager_hpp_
 
+#include <cstddef>
+#include <Eigen/Core>
+#include <algorithm>
 #include <memory> // unique_ptr
 #include <optional>
+#include <utility>
+#include <vector>
 #include "libslic3r/AABBMesh.hpp" // Structure to cast rays
 #include "libslic3r/Point.hpp" // Transform3d
 #include "libslic3r/ObjectID.hpp"
diff --git a/src/slic3r/Utils/Repetier.cpp b/src/slic3r/Utils/Repetier.cpp
index a524f29b71..ae269cac4f 100644
--- a/src/slic3r/Utils/Repetier.cpp
+++ b/src/slic3r/Utils/Repetier.cpp
@@ -1,6 +1,9 @@
 #include "Repetier.hpp"
 
 #include <algorithm>
+#include <boost/optional/optional.hpp>
+#include "libslic3r/Exception.hpp"
+#include <boost/property_tree/exceptions.hpp>
 #include <sstream>
 #include <exception>
 #include <boost/foreach.hpp>
@@ -10,9 +13,13 @@
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 
+#include <utility>
+#include <wx/arrstr.h>
 #include <wx/progdlg.h>
+#include <wx/string.h>
 
 
+#include "PrintHost.hpp"
 #include "libslic3r/PrintConfig.hpp"
 #include "slic3r/GUI/I18N.hpp"
 #include "slic3r/GUI/GUI.hpp"
diff --git a/src/slic3r/Utils/Serial.cpp b/src/slic3r/Utils/Serial.cpp
index f8c03ceb26..2b64330826 100644
--- a/src/slic3r/Utils/Serial.cpp
+++ b/src/slic3r/Utils/Serial.cpp
@@ -3,7 +3,19 @@
 #include "libslic3r/Exception.hpp"
 
 #include <algorithm>
+#include <boost/optional/optional.hpp>
+#include <boost/none.hpp>
+#include <initializer_list>
+#include <boost/filesystem/directory.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/asio/io_service.hpp>
+#include <boost/asio/serial_port.hpp>
+#include <boost/asio/serial_port_base.hpp>
+#include <boost/system/system_error.hpp>
+#include <cstring>
+#include <cerrno>
 #include <string>
+#include <utility>
 #include <vector>
 #include <chrono>
 #include <thread>
diff --git a/src/slic3r/Utils/Serial.hpp b/src/slic3r/Utils/Serial.hpp
index 8bad75b315..c5c4d19fc5 100644
--- a/src/slic3r/Utils/Serial.hpp
+++ b/src/slic3r/Utils/Serial.hpp
@@ -1,6 +1,9 @@
 #ifndef slic3r_GUI_Utils_Serial_hpp_
 #define slic3r_GUI_Utils_Serial_hpp_
 
+#include <utility>
+#include <boost/asio/serial_port.hpp>
+#include <boost/asio/io_service.hpp>
 #include <vector>
 #include <string>
 #include <boost/system/error_code.hpp>
diff --git a/src/slic3r/Utils/SimplyPrint.cpp b/src/slic3r/Utils/SimplyPrint.cpp
index a3edfd98ee..5c68878986 100644
--- a/src/slic3r/Utils/SimplyPrint.cpp
+++ b/src/slic3r/Utils/SimplyPrint.cpp
@@ -1,10 +1,36 @@
 #include "SimplyPrint.hpp"
 
+#include <boost/asio/ip/basic_endpoint.hpp>
+#include <cstdint>
+#include <ios>
+#include <iomanip>
+#include <cstdlib>
+#include <algorithm>
+#include <iterator>
+#include <boost/algorithm/string/join.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <exception>
+#include <boost/log/trivial.hpp>
+#include <boost/nowide/cstdio.hpp>
+#include <functional>
+#include <cstddef>
+#include <cmath>
+#include <cassert>
+#include <boost/filesystem/fstream.hpp>
 #include <openssl/sha.h>
 #include <boost/beast/core/detail/base64.hpp>
 #include <boost/nowide/fstream.hpp>
 #include <boost/filesystem.hpp>
+#include <string>
+#include <sstream>
+#include <vector>
+#include <utility>
+#include "slic3r/GUI/Jobs/OAuthJob.hpp"
+#include <ostream>
+#include <wx/string.h>
+#include <wx/utils.h>
 
+#include "PrintHost.hpp"
 #include "nlohmann/json.hpp"
 #include "libslic3r/Utils.hpp"
 #include "slic3r/GUI/I18N.hpp"
diff --git a/src/slic3r/Utils/SimplyPrint.hpp b/src/slic3r/Utils/SimplyPrint.hpp
index 3804324724..83ff64378e 100644
--- a/src/slic3r/Utils/SimplyPrint.hpp
+++ b/src/slic3r/Utils/SimplyPrint.hpp
@@ -3,6 +3,11 @@
 
 #include "PrintHost.hpp"
 #include "slic3r/GUI/Jobs/OAuthJob.hpp"
+#include <string>
+#include <map>
+#include <functional>
+#include <boost/filesystem/path.hpp>
+#include <wx/string.h>
 
 namespace Slic3r {
 
diff --git a/src/slic3r/Utils/SnapmakerPrinterAgent.cpp b/src/slic3r/Utils/SnapmakerPrinterAgent.cpp
index 6039eb260f..a237d1b2b1 100644
--- a/src/slic3r/Utils/SnapmakerPrinterAgent.cpp
+++ b/src/slic3r/Utils/SnapmakerPrinterAgent.cpp
@@ -1,10 +1,17 @@
 #include "SnapmakerPrinterAgent.hpp"
 #include "Http.hpp"
+#include "MoonrakerPrinterAgent.hpp"
+#include "IPrinterAgent.hpp"
 #include "libslic3r/PresetBundle.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
 
 #include "nlohmann/json.hpp"
 #include <boost/log/trivial.hpp>
+#include <vector>
+#include <string>
+#include "libslic3r/Preset.hpp"
+#include <cstddef>
+#include <utility>
 
 using json = nlohmann::json;
 
diff --git a/src/slic3r/Utils/SnapmakerPrinterAgent.hpp b/src/slic3r/Utils/SnapmakerPrinterAgent.hpp
index d49fe21239..39b642081b 100644
--- a/src/slic3r/Utils/SnapmakerPrinterAgent.hpp
+++ b/src/slic3r/Utils/SnapmakerPrinterAgent.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "IPrinterAgent.hpp"
 #include "MoonrakerPrinterAgent.hpp"
 
 #include <string>
diff --git a/src/slic3r/Utils/TCPConsole.cpp b/src/slic3r/Utils/TCPConsole.cpp
index 25802e3908..78d4624abc 100644
--- a/src/slic3r/Utils/TCPConsole.cpp
+++ b/src/slic3r/Utils/TCPConsole.cpp
@@ -1,14 +1,21 @@
+#include <boost/algorithm/string/trim.hpp>
+#include <boost/algorithm/string/case_conv.hpp>
 #include <boost/asio/buffer.hpp>
+#include <boost/asio/error.hpp>
 #include <boost/asio/io_context.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/read_until.hpp>
 #include <boost/asio/steady_timer.hpp>
 #include <boost/asio/write.hpp>
 #include <boost/bind/bind.hpp>
+#include <boost/bind/placeholders.hpp>
 #include <boost/format.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/algorithm/string.hpp>
 
+#include <cstddef>
+#include <chrono>
+#include <exception>
 #include <iostream>
 #include <string>
 #include <thread>
diff --git a/src/slic3r/Utils/TCPConsole.hpp b/src/slic3r/Utils/TCPConsole.hpp
index e94e130a9e..4ec766faa4 100644
--- a/src/slic3r/Utils/TCPConsole.hpp
+++ b/src/slic3r/Utils/TCPConsole.hpp
@@ -1,6 +1,9 @@
 #ifndef slic3r_Utils_TCPConsole_hpp_
 #define slic3r_Utils_TCPConsole_hpp_
 
+#include <chrono>
+#include <cstddef>
+#include <boost/asio/io_context.hpp>
 #include <string>
 #include <deque>
 #include <boost/system/error_code.hpp>
@@ -8,6 +11,7 @@
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/streambuf.hpp>
 #include "SerialMessage.hpp"
+#include "SerialMessageType.hpp"
 
 namespace Slic3r {
 namespace Utils {
diff --git a/src/slic3r/Utils/UltiMaker.cpp b/src/slic3r/Utils/UltiMaker.cpp
index badb69d209..fefd8ec786 100644
--- a/src/slic3r/Utils/UltiMaker.cpp
+++ b/src/slic3r/Utils/UltiMaker.cpp
@@ -1,6 +1,10 @@
 #include "UltiMaker.hpp"
 
 #include <algorithm>
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/algorithm/string/replace.hpp>
+#include <cstdio>
+#include <cassert>
 #include <ctime>
 #include <boost/filesystem/path.hpp>
 #include <boost/format.hpp>
@@ -8,14 +12,20 @@
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/json_parser.hpp>
 
+#include <utility>
+#include <exception>
+#include <sstream>
+#include <fstream>
 #include <wx/frame.h>
 #include <wx/event.h>
 #include <wx/progdlg.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
+#include <wx/string.h>
 #include <wx/textctrl.h>
 #include <wx/checkbox.h>
 
+#include "PrintHost.hpp"
 #include "libslic3r/PrintConfig.hpp"
 #include "slic3r/GUI/GUI.hpp"
 #include "slic3r/GUI/I18N.hpp"
diff --git a/src/slic3r/Utils/UndoRedo.cpp b/src/slic3r/Utils/UndoRedo.cpp
index 8e7bd703c3..2cdefefbb4 100644
--- a/src/slic3r/Utils/UndoRedo.cpp
+++ b/src/slic3r/Utils/UndoRedo.cpp
@@ -1,9 +1,18 @@
 #include "UndoRedo.hpp"
 
 #include <algorithm>
+#include <cstring>
+#include <cstdint>
+#include <cereal/specialize.hpp>
+#include <boost/log/trivial.hpp>
 #include <iostream>
 #include <fstream>
+#include <map>
+#include "libslic3r/Exception.hpp"
 #include <memory>
+#include <string>
+#include <sstream>
+#include <type_traits>
 #include <typeinfo>
 #include <cassert>
 #include <cstddef>
@@ -14,6 +23,8 @@
 #include <cereal/types/utility.hpp>
 #include <cereal/types/vector.hpp>
 #include <cereal/archives/binary.hpp>
+#include <vector>
+#include <utility>
 #define CEREAL_FUTURE_EXPERIMENTAL
 #include <cereal/archives/adapters.hpp>
 
diff --git a/src/slic3r/Utils/UndoRedo.hpp b/src/slic3r/Utils/UndoRedo.hpp
index 9042d60a4b..4a5aaca9c1 100644
--- a/src/slic3r/Utils/UndoRedo.hpp
+++ b/src/slic3r/Utils/UndoRedo.hpp
@@ -2,8 +2,11 @@
 #define slic3r_Utils_UndoRedo_hpp_
 
 #include <algorithm>
+#include <cstddef>
+#include <cstdint>
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 #include <cassert>
 
diff --git a/src/slic3r/Utils/WebSocketClient.hpp b/src/slic3r/Utils/WebSocketClient.hpp
index 2660231794..f85c3e15fa 100644
--- a/src/slic3r/Utils/WebSocketClient.hpp
+++ b/src/slic3r/Utils/WebSocketClient.hpp
@@ -1,9 +1,18 @@
 #ifndef _WEB_SOCKET_CLIENT_HPP_
 #define _WEB_SOCKET_CLIENT_HPP_
+#include <boost/asio/buffer.hpp>
+#include <boost/asio/io_context.hpp>
 #include <boost/beast/core.hpp>
+#include <boost/beast/http/field.hpp>
+#include <boost/beast/core/flat_buffer.hpp>
+#include <boost/beast/core/buffers_to_string.hpp>
 #include <boost/beast/websocket.hpp>
 #include <boost/asio/connect.hpp>
 #include <boost/asio/ip/tcp.hpp>
+#include <boost/beast/websocket/rfc6455.hpp>
+#include <exception>
+#include <boost/beast/websocket/stream_base.hpp>
+#include <boost/beast/websocket/stream.hpp>
 #include <iostream>
 #include <string>
 #include <chrono>
diff --git a/src/slic3r/Utils/WxFontUtils.cpp b/src/slic3r/Utils/WxFontUtils.cpp
index a536e65912..4d28fa54c0 100644
--- a/src/slic3r/Utils/WxFontUtils.cpp
+++ b/src/slic3r/Utils/WxFontUtils.cpp
@@ -1,6 +1,15 @@
 #include "WxFontUtils.hpp"
 #include <boost/assign.hpp>
+#include <boost/assign/list_of.hpp>
 #include <boost/log/trivial.hpp>
+#include <memory>
+#include "libslic3r/Emboss.hpp"
+#include <string>
+#include "libslic3r/TextConfiguration.hpp"
+#include <wx/font.h>
+#include <string_view>
+#include <wx/dc.h>
+#include <vector>
 #include "libslic3r/Utils.hpp"
 
 #if defined(__APPLE__)
diff --git a/src/slic3r/Utils/WxFontUtils.hpp b/src/slic3r/Utils/WxFontUtils.hpp
index 51c8605ff0..7a9448fbe9 100644
--- a/src/slic3r/Utils/WxFontUtils.hpp
+++ b/src/slic3r/Utils/WxFontUtils.hpp
@@ -1,8 +1,10 @@
 #ifndef slic3r_WxFontUtils_hpp_
 #define slic3r_WxFontUtils_hpp_
 
+#include "libslic3r/TextConfiguration.hpp"
 #include <memory>
 #include <optional>
+#include <string>
 #include <string_view>
 #include <boost/bimap.hpp>
 #include <wx/dc.h>
diff --git a/src/slic3r/Utils/bambu_networking.hpp b/src/slic3r/Utils/bambu_networking.hpp
index c514daffff..30c33c6c73 100644
--- a/src/slic3r/Utils/bambu_networking.hpp
+++ b/src/slic3r/Utils/bambu_networking.hpp
@@ -1,6 +1,7 @@
 #ifndef __BAMBU_NETWORKING_HPP__
 #define __BAMBU_NETWORKING_HPP__
 
+#include <cstddef>
 #include <string>
 #include <functional>
 #include <map>
diff --git a/src/slic3r/Utils/minilzo_extension.cpp b/src/slic3r/Utils/minilzo_extension.cpp
index 07031cd1af..eca2ee0a7f 100644
--- a/src/slic3r/Utils/minilzo_extension.cpp
+++ b/src/slic3r/Utils/minilzo_extension.cpp
@@ -1,3 +1,4 @@
+#include <cstdint>
 #include <exception>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/slic3r/Utils/wxInspectorPlugins/CustomWidgetsPlugin.cpp b/src/slic3r/Utils/wxInspectorPlugins/CustomWidgetsPlugin.cpp
index df1b495bff..a35aceafeb 100644
--- a/src/slic3r/Utils/wxInspectorPlugins/CustomWidgetsPlugin.cpp
+++ b/src/slic3r/Utils/wxInspectorPlugins/CustomWidgetsPlugin.cpp
@@ -8,8 +8,16 @@
 #include "slic3r/GUI/Widgets/Label.hpp"
 #include "slic3r/GUI/Widgets/LabeledStaticBox.hpp"
 
+#include <wx/string.h>
+#include <wx/rtti.h>
+#include <wx/object.h>
+#include <wx/vector.h>
+#include <wx/inspector/plugin.h>
+#include <wx/inspector/object.h>
+#include <wx/colour.h>
 #include <wx/window.h>
 #include <wx/tglbtn.h>
+#include <wx/wxcrtvararg.h>
 
 wxString CustomWidgetsPlugin::GetName() const
 {
diff --git a/src/slic3r/Utils/wxInspectorPlugins/CustomWidgetsPlugin.hpp b/src/slic3r/Utils/wxInspectorPlugins/CustomWidgetsPlugin.hpp
index 083ed8a74c..1430677a7d 100644
--- a/src/slic3r/Utils/wxInspectorPlugins/CustomWidgetsPlugin.hpp
+++ b/src/slic3r/Utils/wxInspectorPlugins/CustomWidgetsPlugin.hpp
@@ -1,6 +1,10 @@
 #pragma once
 
+#include <wx/inspector/object.h>
 #include <wx/inspector/plugin.h>
+#include <wx/string.h>
+#include <wx/rtti.h>
+#include <wx/vector.h>
 
 class CustomWidgetsPlugin : public wxInspector::wxInspectorPlugin
 {
diff --git a/src/slic3r/Utils/wxInspectorPlugins/DPIAwarePlugin.cpp b/src/slic3r/Utils/wxInspectorPlugins/DPIAwarePlugin.cpp
index f52a5d4313..ee81e3e7fa 100644
--- a/src/slic3r/Utils/wxInspectorPlugins/DPIAwarePlugin.cpp
+++ b/src/slic3r/Utils/wxInspectorPlugins/DPIAwarePlugin.cpp
@@ -2,8 +2,15 @@
 
 #include "slic3r/GUI/GUI_Utils.hpp" // DPIFrame, DPIDialog, DPIAware<P>
 
+#include <wx/vector.h>
+#include <wx/inspector/plugin.h>
+#include <wx/string.h>
+#include <wx/rtti.h>
+#include <wx/object.h>
+#include <wx/inspector/object.h>
 #include <wx/window.h>
 #include <wx/crt.h>
+#include <wx/wxcrtvararg.h>
 
 namespace {
 
diff --git a/src/slic3r/Utils/wxInspectorPlugins/DPIAwarePlugin.hpp b/src/slic3r/Utils/wxInspectorPlugins/DPIAwarePlugin.hpp
index 5d78342967..d1df7fe4aa 100644
--- a/src/slic3r/Utils/wxInspectorPlugins/DPIAwarePlugin.hpp
+++ b/src/slic3r/Utils/wxInspectorPlugins/DPIAwarePlugin.hpp
@@ -1,6 +1,10 @@
 #pragma once
 
+#include <wx/inspector/object.h>
 #include <wx/inspector/plugin.h>
+#include <wx/string.h>
+#include <wx/rtti.h>
+#include <wx/vector.h>
 
 class DPIAwarePlugin : public wxInspector::wxInspectorPlugin
 {
diff --git a/src/slic3r/plugin/CloudPluginService.cpp b/src/slic3r/plugin/CloudPluginService.cpp
index 6b72da3293..b6af332dbc 100644
--- a/src/slic3r/plugin/CloudPluginService.cpp
+++ b/src/slic3r/plugin/CloudPluginService.cpp
@@ -4,9 +4,13 @@
 #include "slic3r/Utils/Http.hpp"
 
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/nowide/fstream.hpp>
 #include <cstddef>
+#include <memory>
+#include <ios>
 #include <slic3r/plugin/PluginDescriptor.hpp>
 #include <string>
 #include <unordered_map>
diff --git a/src/slic3r/plugin/PluginAuditManager.cpp b/src/slic3r/plugin/PluginAuditManager.cpp
index 4d69a4f761..bd75ad2459 100644
--- a/src/slic3r/plugin/PluginAuditManager.cpp
+++ b/src/slic3r/plugin/PluginAuditManager.cpp
@@ -3,24 +3,33 @@
 #include "../Utils/OrcaCloudServiceAgent.hpp"
 #include "libslic3r/Utils.hpp"
 #include "libslic3r/libslic3r.h" // GCODEVIEWER_APP_KEY, and SLIC3R_APP_KEY via libslic3r_version.h
+#include "libslic3r_version.h"
 
 #include <boost/algorithm/string/predicate.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <boost/log/trivial.hpp>
 
 #include <algorithm>
 #include <cctype>
 #include <cstdlib>
 #include <future>
+#include <mutex>
+#include <memory>
 #include <slic3r/GUI/BindDialog.hpp>
 #include <slic3r/GUI/GUI_App.hpp>
 #include <slic3r/plugin/PluginFsUtils.hpp>
 #include <slic3r/plugin/PluginManager.hpp>
+#include <string>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
 #include <vector>
+#include <wx/app.h>
 #include <wx/event.h>
 #include <wx/msgdlg.h>
+#include <wx/string.h>
+#include <wx/thread.h>
 
 namespace Slic3r {
 
diff --git a/src/slic3r/plugin/PluginAuditManager.hpp b/src/slic3r/plugin/PluginAuditManager.hpp
index 153f9d6107..76ac5cdd18 100644
--- a/src/slic3r/plugin/PluginAuditManager.hpp
+++ b/src/slic3r/plugin/PluginAuditManager.hpp
@@ -2,6 +2,7 @@
 #define slic3r_PluginAuditManager_hpp_
 
 // Via pybind11 so this file requests the same python3xx.lib as everything else.
+#include <boost/filesystem/path.hpp>
 #include <pybind11/conduit/wrap_include_python_h.h>
 #include <memory>
 #include <mutex>
diff --git a/src/slic3r/plugin/PluginBindingUtils.hpp b/src/slic3r/plugin/PluginBindingUtils.hpp
index 52050ed561..7572777c43 100644
--- a/src/slic3r/plugin/PluginBindingUtils.hpp
+++ b/src/slic3r/plugin/PluginBindingUtils.hpp
@@ -1,8 +1,11 @@
 #pragma once
+#include "libslic3r/libslic3r.h"
 #include <pybind11/pybind11.h>
 #include <pybind11/numpy.h>
 #include "libslic3r/Config.hpp"   // ConfigBase
 #include "libslic3r/Point.hpp"    // Point/Point3 packing asserts, Vec3d, Transform3d
+#include <pybind11/pytypes.h>
+#include <pybind11/cast.h>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/src/slic3r/plugin/PluginConfig.cpp b/src/slic3r/plugin/PluginConfig.cpp
index 14d24fabe1..685d295206 100644
--- a/src/slic3r/plugin/PluginConfig.cpp
+++ b/src/slic3r/plugin/PluginConfig.cpp
@@ -1,24 +1,38 @@
 #include "PluginConfig.hpp"
 
 #include <algorithm>
+#include <boost/filesystem/operations.hpp>
 #include <boost/format.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/nowide/fstream.hpp>
 
+#include <exception>
 #include <libslic3r/Config.hpp>
+#include "libslic3r/Preset.hpp"
 #include <libslic3r/PresetBundle.hpp>
 #include <libslic3r/PrintConfig.hpp>
+#include <optional>
+#include <set>
+#include <mutex>
+#include "libslic3r/Utils.hpp"
+#include "libslic3r/libslic3r.h"
 #include <slic3r/GUI/GUI.hpp>
 #include <slic3r/GUI/GUI_App.hpp>
 #include <slic3r/GUI/I18N.hpp>
 #include <slic3r/GUI/format.hpp>
+#include "slic3r/plugin/PluginDescriptor.hpp"
 #include <slic3r/plugin/PluginLoader.hpp>
 #include <slic3r/plugin/PluginManager.hpp>
 #include <slic3r/plugin/PythonInterpreter.hpp>
 #include <slic3r/plugin/PythonPluginInterface.hpp>
 #include <stdexcept>
 
+#include <string>
+#include <utility>
+#include <system_error>
+#include <vector>
 #include <wx/app.h>
+#include <wx/busycursor.h>
 #include <wx/utils.h>
 
 namespace Slic3r {
diff --git a/src/slic3r/plugin/PluginConfig.hpp b/src/slic3r/plugin/PluginConfig.hpp
index 523173af68..8f39b4a40e 100644
--- a/src/slic3r/plugin/PluginConfig.hpp
+++ b/src/slic3r/plugin/PluginConfig.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <boost/filesystem/path.hpp>
 #include <libslic3r/Utils.hpp>
 #include <boost/filesystem.hpp>
 #include <nlohmann/json.hpp>
diff --git a/src/slic3r/plugin/PluginDescriptor.hpp b/src/slic3r/plugin/PluginDescriptor.hpp
index b0d2d214c3..9e55a89e59 100644
--- a/src/slic3r/plugin/PluginDescriptor.hpp
+++ b/src/slic3r/plugin/PluginDescriptor.hpp
@@ -4,6 +4,7 @@
 
 #include <algorithm>
 #include <cctype>
+#include <cstddef>
 #include <map>
 #include <optional>
 #include <string>
diff --git a/src/slic3r/plugin/PluginFsUtils.cpp b/src/slic3r/plugin/PluginFsUtils.cpp
index 4d6aabe3d3..e3b1bc3bee 100644
--- a/src/slic3r/plugin/PluginFsUtils.cpp
+++ b/src/slic3r/plugin/PluginFsUtils.cpp
@@ -4,16 +4,24 @@
 #include "libslic3r/miniz_extension.hpp"
 
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/directory.hpp>
+#include <boost/filesystem/file_status.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/nowide/fstream.hpp>
 
 #include "PluginAuditManager.hpp"
 #include "PythonInterpreter.hpp"
 
+#include <exception>
+#include <miniz.h>
 #include <nlohmann/json.hpp>
 
 #include <chrono>
 #include <filesystem>
+#include <string>
+#include "slic3r/plugin/PluginDescriptor.hpp"
 #include <utility>
 #include <algorithm>
 #include <cctype>
diff --git a/src/slic3r/plugin/PluginFsUtils.hpp b/src/slic3r/plugin/PluginFsUtils.hpp
index 5b62e9f7f1..80174a68bd 100644
--- a/src/slic3r/plugin/PluginFsUtils.hpp
+++ b/src/slic3r/plugin/PluginFsUtils.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "PluginDescriptor.hpp"
+#include <pybind11/pytypes.h>
 
 #include <nlohmann/json.hpp>
 #include <pybind11/pybind11.h>
@@ -9,6 +10,7 @@
 
 #include <cstdint>
 #include <string>
+#include <utility>
 #include <vector>
 
 #define PLUGIN_SUBSCRIBED_DIR "_subscribed"
diff --git a/src/slic3r/plugin/PluginHooks.cpp b/src/slic3r/plugin/PluginHooks.cpp
index 2d84df5fdb..36c7f9292d 100644
--- a/src/slic3r/plugin/PluginHooks.cpp
+++ b/src/slic3r/plugin/PluginHooks.cpp
@@ -13,7 +13,10 @@
 
 #include <boost/log/trivial.hpp>
 
+#include <exception>
+#include <cstddef>
 #include <memory>
+#include "slic3r/plugin/PluginDescriptor.hpp"
 #include <string>
 #include <stdexcept>
 
diff --git a/src/slic3r/plugin/PluginLoader.cpp b/src/slic3r/plugin/PluginLoader.cpp
index 0c45564f1b..9da76b9109 100644
--- a/src/slic3r/plugin/PluginLoader.cpp
+++ b/src/slic3r/plugin/PluginLoader.cpp
@@ -11,9 +11,26 @@
 #include "libslic3r/Utils.hpp"
 
 #include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/case_conv.hpp>
+#include <boost/algorithm/string/join.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/directory.hpp>
+#include <boost/filesystem/file_status.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/process.hpp>
+#include "slic3r/plugin/PluginDescriptor.hpp"
+#include <optional>
+#include <vector>
+#include <memory>
+#include "slic3r/plugin/PythonPluginInterface.hpp"
+#include <cstddef>
+#include <functional>
+#include <boost/process/pipe.hpp>
+#include <boost/process/args.hpp>
+#include <boost/process/io.hpp>
+#include <system_error>
 #ifdef _WIN32
 #include <boost/process/windows.hpp>
 #endif
diff --git a/src/slic3r/plugin/PluginManager.cpp b/src/slic3r/plugin/PluginManager.cpp
index 022f85eb1f..c064622b17 100644
--- a/src/slic3r/plugin/PluginManager.cpp
+++ b/src/slic3r/plugin/PluginManager.cpp
@@ -1,8 +1,14 @@
 #include "PluginManager.hpp"
 
+#include <atomic>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <exception>
+#include <functional>
+#include "libslic3r/LifecycleEvents.hpp"
 #include <libslic3r/Utils.hpp>
 #include <memory>
+#include <optional>
 #include <pybind11/embed.h>
 
 #include "PluginFsUtils.hpp"
@@ -21,14 +27,19 @@
 #include <algorithm>
 #include <chrono>
 #include <mutex>
+#include "slic3r/plugin/CloudPluginService.hpp"
 #include <slic3r/plugin/PluginConfig.hpp>
 #include <slic3r/plugin/PluginDescriptor.hpp>
 #include <slic3r/plugin/PluginLoader.hpp>
 #include <slic3r/plugin/PythonPluginInterface.hpp>
 #include <slic3r/plugin/pluginTypes/script/ScriptPluginCapability.hpp>
+#include <stdexcept>
 #include <thread>
+#include <unordered_set>
 #include <utility>
 #include <vector>
+#include <wx/app.h>
+#include <wx/thread.h>
 
 namespace Slic3r {
 namespace {
diff --git a/src/slic3r/plugin/PluginManager.hpp b/src/slic3r/plugin/PluginManager.hpp
index 891f787bf2..bd7a495a67 100644
--- a/src/slic3r/plugin/PluginManager.hpp
+++ b/src/slic3r/plugin/PluginManager.hpp
@@ -1,9 +1,11 @@
 #ifndef slic3r_PluginManager_hpp_
 #define slic3r_PluginManager_hpp_
 
+#include <atomic>
 #include <boost/filesystem/path.hpp>
 
 #include <algorithm>
+#include <boost/log/trivial.hpp>
 #include <chrono>
 #include <condition_variable>
 #include <functional>
@@ -13,9 +15,11 @@
 #include <memory>
 #include <mutex>
 #include <optional>
+#include "slic3r/plugin/PluginFsUtils.hpp"
 #include <slic3r/plugin/PythonPluginInterface.hpp>
 #include <string>
 #include <unordered_set>
+#include <utility>
 #include <vector>
 
 #include <pybind11/embed.h>
diff --git a/src/slic3r/plugin/PluginResolver.cpp b/src/slic3r/plugin/PluginResolver.cpp
index 6e72929c63..6b8ca9a417 100644
--- a/src/slic3r/plugin/PluginResolver.cpp
+++ b/src/slic3r/plugin/PluginResolver.cpp
@@ -11,9 +11,15 @@
 #include "../GUI/NotificationManager.hpp"
 
 #include <boost/log/trivial.hpp>
+#include <cstddef>
 #include <libslic3r/Config.hpp>
+#include "libslic3r/Preset.hpp"
 #include <libslic3r/PresetBundle.hpp>
+#include <memory>
 #include <slic3r/plugin/PluginLoader.hpp>
+#include <string>
+#include "slic3r/plugin/PythonPluginInterface.hpp"
+#include <utility>
 #include <vector>
 #include <wx/utils.h>
 
diff --git a/src/slic3r/plugin/PyPluginTrampoline.hpp b/src/slic3r/plugin/PyPluginTrampoline.hpp
index 4c77f1ba9c..915c578353 100644
--- a/src/slic3r/plugin/PyPluginTrampoline.hpp
+++ b/src/slic3r/plugin/PyPluginTrampoline.hpp
@@ -1,17 +1,22 @@
 #ifndef slic3r_PyPluginTrampoline_hpp_
 #define slic3r_PyPluginTrampoline_hpp_
 
+#include "libslic3r/LifecycleEvents.hpp"
 #include <pybind11/embed.h>
 
 #include <boost/log/trivial.hpp>
 
 #include <optional>
 #include <stdexcept>
+#include <string>
 
 #include "PythonPluginInterface.hpp"
 #include "PythonInterpreter.hpp"
 #include "PluginFsUtils.hpp"
 #include "PluginAuditManager.hpp"
+#include <pybind11/pybind11.h>
+#include <pybind11/gil.h>
+#include <pybind11/pytypes.h>
 
 // Trampoline variants of pybind11's override macros. Every C++->Python plugin call crosses a
 // trampoline method, so this single boundary is where we (1) log the full Python traceback and
diff --git a/src/slic3r/plugin/PythonInterpreter.cpp b/src/slic3r/plugin/PythonInterpreter.cpp
index d82bf52a13..6d1afc1ba1 100644
--- a/src/slic3r/plugin/PythonInterpreter.cpp
+++ b/src/slic3r/plugin/PythonInterpreter.cpp
@@ -2,9 +2,15 @@
 #include "GeneratedConfig.hpp"
 #include "libslic3r/Utils.hpp"
 #include "PluginAuditManager.hpp"
+#include <atomic>
+#include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/path.hpp>
+#include <cstdlib>
+#include <memory>
+#include <exception>
 #include <pytypedefs.h>
 #include "PluginFsUtils.hpp"
+#include <pybind11/pybind11.h>
 
 #include <pybind11/embed.h>
 
@@ -16,7 +22,10 @@
 #include <ctime>
 #include <iomanip>
 #include <mutex>
+#include <shared_mutex>
 #include <sstream>
+#include <utility>
+#include <string>
 #include <vector>
 
 namespace Slic3r {
diff --git a/src/slic3r/plugin/PythonInterpreter.hpp b/src/slic3r/plugin/PythonInterpreter.hpp
index e15aa91598..2c499283cc 100644
--- a/src/slic3r/plugin/PythonInterpreter.hpp
+++ b/src/slic3r/plugin/PythonInterpreter.hpp
@@ -2,6 +2,7 @@
 #define slic3r_PythonInterpreter_hpp_
 
 // Via pybind11 so this file requests the same python3xx.lib as everything else.
+#include <cstddef>
 #include <pybind11/conduit/wrap_include_python_h.h>
 #include <pytypedefs.h>
 #include <atomic>
diff --git a/src/slic3r/plugin/PythonPluginBridge.cpp b/src/slic3r/plugin/PythonPluginBridge.cpp
index a88695005c..6cf747810f 100644
--- a/src/slic3r/plugin/PythonPluginBridge.cpp
+++ b/src/slic3r/plugin/PythonPluginBridge.cpp
@@ -3,15 +3,19 @@
 #include <algorithm>
 #include <boost/log/trivial.hpp>
 #include <exception>
+#include "libslic3r/LifecycleEvents.hpp"
 #include <memory>
 #include <mutex>
 #include <slic3r/plugin/PluginAuditManager.hpp>
+#include "slic3r/plugin/PythonPluginInterface.hpp"
 #include <string>
 #include <unordered_map>
 
 #include <pybind11/embed.h>
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
+#include <vector>
+#include <utility>
 
 #include "PythonInterpreter.hpp"
 #include "PluginFsUtils.hpp"
@@ -23,6 +27,8 @@
 #include "pluginTypes/pages/PagesPluginCapability.hpp"
 #include "pluginTypes/script/ScriptPluginCapability.hpp"
 #include "pluginTypes/slicingPipeline/SlicingPipelinePluginCapability.hpp"
+#include <pybind11/pytypes.h>
+#include <pybind11/gil.h>
 
 namespace py = pybind11;
 
diff --git a/src/slic3r/plugin/host/PluginHost.cpp b/src/slic3r/plugin/host/PluginHost.cpp
index 2830d6f276..ae56bc575c 100644
--- a/src/slic3r/plugin/host/PluginHost.cpp
+++ b/src/slic3r/plugin/host/PluginHost.cpp
@@ -1,10 +1,12 @@
 #include "PluginHost.hpp"
 #include "PluginHostBindings.hpp"
 #include "PluginHostUi.hpp"
+#include <pybind11/pybind11.h>
 #include <slic3r/plugin/PluginAuditManager.hpp>
 #include <slic3r/plugin/PluginManager.hpp>
 
 #include <stdexcept>
+#include <string>
 
 namespace Slic3r {
 
diff --git a/src/slic3r/plugin/host/PluginHostApp.cpp b/src/slic3r/plugin/host/PluginHostApp.cpp
index 75acd4cc7b..668e99c7ff 100644
--- a/src/slic3r/plugin/host/PluginHostApp.cpp
+++ b/src/slic3r/plugin/host/PluginHostApp.cpp
@@ -1,4 +1,5 @@
 #include "PluginHostBindings.hpp"
+#include <pybind11/pybind11.h>
 
 #include <libslic3r/Model.hpp>
 #include <libslic3r/PresetBundle.hpp>
@@ -8,6 +9,8 @@
 
 #include <memory>
 #include <stdexcept>
+#include <wx/app.h>
+#include <string>
 
 namespace py = pybind11;
 
diff --git a/src/slic3r/plugin/host/PluginHostGeometry.cpp b/src/slic3r/plugin/host/PluginHostGeometry.cpp
index 646dffb5d4..14db01cc4c 100644
--- a/src/slic3r/plugin/host/PluginHostGeometry.cpp
+++ b/src/slic3r/plugin/host/PluginHostGeometry.cpp
@@ -1,10 +1,18 @@
 #include "PluginHostBindings.hpp"
+#include <pybind11/pytypes.h>
+#include <pybind11/numpy.h>
+#include <pybind11/pybind11.h>
+#include <pybind11/cast.h>
 #include "slic3r/plugin/PluginBindingUtils.hpp"
 
+#include <cstddef>
 #include <libslic3r/BoundingBox.hpp>
 #include <libslic3r/ClipperUtils.hpp> // offset/offset_ex/union_ex/diff_ex/intersection_ex
 #include <libslic3r/ExPolygon.hpp>
 
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Point.hpp"
 #include <pybind11/stl.h>
 
 #include <string>
diff --git a/src/slic3r/plugin/host/PluginHostMesh.cpp b/src/slic3r/plugin/host/PluginHostMesh.cpp
index 28da5c3afc..8799278bd5 100644
--- a/src/slic3r/plugin/host/PluginHostMesh.cpp
+++ b/src/slic3r/plugin/host/PluginHostMesh.cpp
@@ -1,11 +1,18 @@
 #include "PluginHostBindings.hpp"
 #include "PluginHostMesh.hpp"
+#include <pybind11/pybind11.h>
+#include <pybind11/pytypes.h>
+#include <pybind11/cast.h>
 #include "slic3r/plugin/PluginBindingUtils.hpp"
 
+#include "libslic3r/TriangleMesh.hpp"
+#include "libslic3r/Point.hpp"
+#include <cstddef>
 #include <pybind11/numpy.h>
 
 #include <cstdint>
 #include <memory>
+#include <utility>
 #include <vector>
 
 namespace py = pybind11;
diff --git a/src/slic3r/plugin/host/PluginHostModel.cpp b/src/slic3r/plugin/host/PluginHostModel.cpp
index 3da1c2ae6f..357e37808d 100644
--- a/src/slic3r/plugin/host/PluginHostModel.cpp
+++ b/src/slic3r/plugin/host/PluginHostModel.cpp
@@ -1,7 +1,11 @@
 #include "PluginHostBindings.hpp"
 #include "PluginHostMesh.hpp"
+#include <pybind11/pybind11.h>
+#include <pybind11/pytypes.h>
+#include <pybind11/cast.h>
 #include "slic3r/plugin/PluginBindingUtils.hpp"
 
+#include <cstddef>
 #include <libslic3r/Model.hpp>
 
 #include <pybind11/stl.h>
diff --git a/src/slic3r/plugin/host/PluginHostPresets.cpp b/src/slic3r/plugin/host/PluginHostPresets.cpp
index fffe9e64cf..6e10e3f282 100644
--- a/src/slic3r/plugin/host/PluginHostPresets.cpp
+++ b/src/slic3r/plugin/host/PluginHostPresets.cpp
@@ -1,9 +1,14 @@
 #include "PluginHostBindings.hpp"
+#include <pybind11/pytypes.h>
+#include <pybind11/cast.h>
+#include <pybind11/pybind11.h>
 #include "slic3r/plugin/PluginBindingUtils.hpp"
 
+#include <cstddef>
 #include <libslic3r/Preset.hpp>
 #include <libslic3r/PresetBundle.hpp>
 
+#include <memory>
 #include <pybind11/stl.h>
 
 #include <string>
diff --git a/src/slic3r/plugin/host/PluginHostSlicing.cpp b/src/slic3r/plugin/host/PluginHostSlicing.cpp
index 30e7b45138..fb2c02eaac 100644
--- a/src/slic3r/plugin/host/PluginHostSlicing.cpp
+++ b/src/slic3r/plugin/host/PluginHostSlicing.cpp
@@ -1,4 +1,7 @@
 #include "PluginHostBindings.hpp"
+#include <pybind11/pybind11.h>
+#include <pybind11/cast.h>
+#include <pybind11/pytypes.h>
 #include "slic3r/plugin/PluginBindingUtils.hpp"
 
 #include "libslic3r/BoundingBox.hpp"
@@ -10,8 +13,12 @@
 #include "libslic3r/Layer.hpp"      // LayerRegion, Layer, SupportLayer
 #include "libslic3r/Print.hpp"      // PrintRegion, PrintObject, Print
 
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Model.hpp"
 #include <pybind11/stl.h>
 #include <memory>
+#include <string>
 #include <vector>
 
 namespace py = pybind11;
diff --git a/src/slic3r/plugin/host/PluginHostUi.cpp b/src/slic3r/plugin/host/PluginHostUi.cpp
index ed501f0249..54de1df0d6 100644
--- a/src/slic3r/plugin/host/PluginHostUi.cpp
+++ b/src/slic3r/plugin/host/PluginHostUi.cpp
@@ -1,9 +1,14 @@
 #include "PluginHostUi.hpp"
 
+#include <pybind11/pytypes.h>
+#include <pybind11/gil.h>
+#include <pybind11/cast.h>
 #include "slic3r/plugin/PluginAuditManager.hpp"
 #include "slic3r/plugin/PythonInterpreter.hpp" // PythonGILState
 #include "slic3r/plugin/PluginFsUtils.hpp"   // json_to_py / py_to_json
 
+#include <functional>
+#include <exception>
 #include <slic3r/GUI/GUI_App.hpp>
 #include <slic3r/GUI/MainFrame.hpp>
 #include <slic3r/GUI/MsgDialog.hpp>
@@ -18,8 +23,14 @@
 
 #include <boost/log/trivial.hpp>
 
+#include <utility>
+#include <string>
 #include <wx/app.h>
 #include <wx/defs.h>
+#include <wx/thread.h>
+#include <wx/toplevel.h>
+#include <wx/event.h>
+#include <wx/progdlg.h>
 #include <wx/window.h>
 
 #include <algorithm>
diff --git a/src/slic3r/plugin/host/PluginPages.cpp b/src/slic3r/plugin/host/PluginPages.cpp
index eb8b3332b9..680b573bd7 100644
--- a/src/slic3r/plugin/host/PluginPages.cpp
+++ b/src/slic3r/plugin/host/PluginPages.cpp
@@ -9,16 +9,30 @@
 
 #include <algorithm>
 
+#include <atomic>
 #include <boost/filesystem/path.hpp>
 #include <boost/log/trivial.hpp>
+#include <memory>
+#include <exception>
+#include <cstddef>
 #include <nlohmann/json.hpp>
 
+#include "slic3r/plugin/pluginTypes/pages/PagesPluginCapability.hpp"
+#include "slic3r/GUI/WebPanel.hpp"
+#include <optional>
+#include "slic3r/plugin/PythonPluginInterface.hpp"
 #include <stdexcept>
+#include <string>
+#include <wx/app.h>
+#include <vector>
 #include <wx/bookctrl.h>
+#include <wx/event.h>
 #include <wx/menu.h>
 #include <wx/sizer.h>
 
 #include <utility>
+#include <wx/webview.h>
+#include <wx/string.h>
 
 namespace Slic3r {
 namespace {
diff --git a/src/slic3r/plugin/host/PluginPages.hpp b/src/slic3r/plugin/host/PluginPages.hpp
index 59d34fe9ff..c0dd74b94d 100644
--- a/src/slic3r/plugin/host/PluginPages.hpp
+++ b/src/slic3r/plugin/host/PluginPages.hpp
@@ -12,6 +12,7 @@
 #include <vector>
 
 #include <wx/bitmap.h>
+#include <wx/string.h>
 #include <wx/webview.h>
 
 class Notebook;
diff --git a/src/slic3r/plugin/pluginTypes/pages/PagesPluginCapability.cpp b/src/slic3r/plugin/pluginTypes/pages/PagesPluginCapability.cpp
index e009f4426f..e6ab45246b 100644
--- a/src/slic3r/plugin/pluginTypes/pages/PagesPluginCapability.cpp
+++ b/src/slic3r/plugin/pluginTypes/pages/PagesPluginCapability.cpp
@@ -2,10 +2,17 @@
 #include "PagesPluginCapabilityTrampoline.hpp"
 
 #include "../../PluginFsUtils.hpp"
+#include <pybind11/pytypes.h>
+#include <pybind11/cast.h>
 
 #include <boost/log/trivial.hpp>
+#include <memory>
+#include <functional>
+#include <mutex>
 #include <pybind11/pybind11.h>
 
+#include "slic3r/plugin/PythonPluginInterface.hpp"
+#include <string>
 #include <utility>
 
 namespace py = pybind11;
diff --git a/src/slic3r/plugin/pluginTypes/pages/PagesPluginCapabilityTrampoline.hpp b/src/slic3r/plugin/pluginTypes/pages/PagesPluginCapabilityTrampoline.hpp
index f6e13c981b..24b98bea24 100644
--- a/src/slic3r/plugin/pluginTypes/pages/PagesPluginCapabilityTrampoline.hpp
+++ b/src/slic3r/plugin/pluginTypes/pages/PagesPluginCapabilityTrampoline.hpp
@@ -3,8 +3,14 @@
 #include "PagesPluginCapability.hpp"
 #include "../../PluginFsUtils.hpp"
 #include "../../PyPluginTrampoline.hpp"
+#include <pybind11/pytypes.h>
+#include <pybind11/pybind11.h>
 
 #include <nlohmann/json.hpp>
+#include <string>
+#include "slic3r/plugin/PythonPluginInterface.hpp"
+#include "slic3r/plugin/PythonInterpreter.hpp"
+#include <stdexcept>
 
 namespace Slic3r {
 
diff --git a/src/slic3r/plugin/pluginTypes/printerAgent/PrinterAgentPluginCapability.cpp b/src/slic3r/plugin/pluginTypes/printerAgent/PrinterAgentPluginCapability.cpp
index d0c88404fe..eac19199bf 100644
--- a/src/slic3r/plugin/pluginTypes/printerAgent/PrinterAgentPluginCapability.cpp
+++ b/src/slic3r/plugin/pluginTypes/printerAgent/PrinterAgentPluginCapability.cpp
@@ -2,11 +2,16 @@
 #include "PrinterAgentPluginCapabilityTrampoline.hpp"
 
 #include "IPrinterAgent.hpp"
+#include <pybind11/cast.h>
+#include "slic3r/Utils/bambu_networking.hpp"
 
+#include <memory>
 #include <pybind11/functional.h>
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
+#include <string>
+#include "slic3r/plugin/PythonPluginInterface.hpp"
 #include <utility>
 
 namespace py = pybind11;
diff --git a/src/slic3r/plugin/pluginTypes/printerAgent/PrinterAgentPluginCapability.hpp b/src/slic3r/plugin/pluginTypes/printerAgent/PrinterAgentPluginCapability.hpp
index d33cee7afe..e106a35f52 100644
--- a/src/slic3r/plugin/pluginTypes/printerAgent/PrinterAgentPluginCapability.hpp
+++ b/src/slic3r/plugin/pluginTypes/printerAgent/PrinterAgentPluginCapability.hpp
@@ -4,6 +4,8 @@
 #include "../../PythonPluginInterface.hpp"
 
 #include "IPrinterAgent.hpp"
+#include <pybind11/pybind11.h>
+#include "slic3r/Utils/bambu_networking.hpp"
 
 #include <memory>
 #include <string>
diff --git a/src/slic3r/plugin/pluginTypes/printerAgent/PrinterAgentPluginCapabilityTrampoline.hpp b/src/slic3r/plugin/pluginTypes/printerAgent/PrinterAgentPluginCapabilityTrampoline.hpp
index 2e15523430..790f6e3ac6 100644
--- a/src/slic3r/plugin/pluginTypes/printerAgent/PrinterAgentPluginCapabilityTrampoline.hpp
+++ b/src/slic3r/plugin/pluginTypes/printerAgent/PrinterAgentPluginCapabilityTrampoline.hpp
@@ -5,9 +5,16 @@
 #include "../../PyPluginTrampoline.hpp"
 
 #include "IPrinterAgent.hpp"
+#include "slic3r/Utils/bambu_networking.hpp"
 #include "pybind11/pybind11.h"
+#include <exception>
+#include <functional>
+#include <pybind11/pytypes.h>
+#include <boost/log/trivial.hpp>
 #include <slic3r/plugin/PluginAuditManager.hpp>
+#include "slic3r/plugin/PythonInterpreter.hpp"
 #include <slic3r/plugin/PythonPluginInterface.hpp>
+#include <stdexcept>
 #include <string>
 
 #include <type_traits>
diff --git a/src/slic3r/plugin/pluginTypes/script/ScriptPluginCapability.cpp b/src/slic3r/plugin/pluginTypes/script/ScriptPluginCapability.cpp
index 712ba9b653..f9ff379cf8 100644
--- a/src/slic3r/plugin/pluginTypes/script/ScriptPluginCapability.cpp
+++ b/src/slic3r/plugin/pluginTypes/script/ScriptPluginCapability.cpp
@@ -3,8 +3,10 @@
 #include "ScriptPluginCapabilityTrampoline.hpp"
 
 #include <boost/log/trivial.hpp>
+#include <memory>
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
+#include "slic3r/plugin/PythonPluginInterface.hpp"
 
 namespace py = pybind11;
 
diff --git a/src/slic3r/plugin/pluginTypes/script/ScriptPluginCapability.hpp b/src/slic3r/plugin/pluginTypes/script/ScriptPluginCapability.hpp
index fb1319e560..59055d7c8f 100644
--- a/src/slic3r/plugin/pluginTypes/script/ScriptPluginCapability.hpp
+++ b/src/slic3r/plugin/pluginTypes/script/ScriptPluginCapability.hpp
@@ -2,6 +2,7 @@
 #define slic3r_ScriptPluginCapability_hpp_
 
 #include "../../PythonPluginInterface.hpp"
+#include <pybind11/pybind11.h>
 
 namespace Slic3r {
 class ScriptPluginCapability : public PluginCapabilityInterface
diff --git a/src/slic3r/plugin/pluginTypes/script/ScriptPluginCapabilityTrampoline.hpp b/src/slic3r/plugin/pluginTypes/script/ScriptPluginCapabilityTrampoline.hpp
index 62958a89d9..dc90001c57 100644
--- a/src/slic3r/plugin/pluginTypes/script/ScriptPluginCapabilityTrampoline.hpp
+++ b/src/slic3r/plugin/pluginTypes/script/ScriptPluginCapabilityTrampoline.hpp
@@ -3,6 +3,8 @@
 
 #include "ScriptPluginCapability.hpp"
 #include "../../PyPluginTrampoline.hpp"
+#include "slic3r/plugin/PythonPluginInterface.hpp"
+#include <pybind11/pybind11.h>
 
 namespace Slic3r {
 class PyScriptPluginCapabilityTrampoline : public PyPluginCommonTrampoline<ScriptPluginCapability>
diff --git a/src/slic3r/plugin/pluginTypes/slicingPipeline/SlicingPipelinePluginCapability.cpp b/src/slic3r/plugin/pluginTypes/slicingPipeline/SlicingPipelinePluginCapability.cpp
index d2e630242d..ed2a6aeecf 100644
--- a/src/slic3r/plugin/pluginTypes/slicingPipeline/SlicingPipelinePluginCapability.cpp
+++ b/src/slic3r/plugin/pluginTypes/slicingPipeline/SlicingPipelinePluginCapability.cpp
@@ -1,7 +1,14 @@
 #include "SlicingPipelinePluginCapability.hpp"
 #include "SlicingPipelinePluginCapabilityTrampoline.hpp"
+#include <pybind11/pybind11.h>
+#include <pybind11/cast.h>
+#include <pybind11/pytypes.h>
 #include "slic3r/plugin/PluginBindingUtils.hpp" // config_value_or_none
 #include "libslic3r/libslic3r.h"    // unscale<>, live SCALING_FACTOR
+#include "libslic3r/Print.hpp"
+#include <string>
+#include "slic3r/plugin/PythonPluginInterface.hpp"
+#include <memory>
 
 namespace py = pybind11;
 namespace Slic3r {
diff --git a/src/slic3r/plugin/pluginTypes/slicingPipeline/SlicingPipelinePluginCapability.hpp b/src/slic3r/plugin/pluginTypes/slicingPipeline/SlicingPipelinePluginCapability.hpp
index da0dbcbcbd..6bad90817f 100644
--- a/src/slic3r/plugin/pluginTypes/slicingPipeline/SlicingPipelinePluginCapability.hpp
+++ b/src/slic3r/plugin/pluginTypes/slicingPipeline/SlicingPipelinePluginCapability.hpp
@@ -1,6 +1,7 @@
 #pragma once
 #include "slic3r/plugin/PythonPluginInterface.hpp"
 #include "libslic3r/Print.hpp"      // SlicingPipelineStepPlugin, Print, PrintObject
+#include "libslic3r/PrintConfig.hpp"
 #include <pybind11/pybind11.h>
 #include <map>
 #include <string>
diff --git a/src/slic3r/plugin/pluginTypes/slicingPipeline/SlicingPipelinePluginCapabilityTrampoline.hpp b/src/slic3r/plugin/pluginTypes/slicingPipeline/SlicingPipelinePluginCapabilityTrampoline.hpp
index 5c9d527e42..82312c4200 100644
--- a/src/slic3r/plugin/pluginTypes/slicingPipeline/SlicingPipelinePluginCapabilityTrampoline.hpp
+++ b/src/slic3r/plugin/pluginTypes/slicingPipeline/SlicingPipelinePluginCapabilityTrampoline.hpp
@@ -1,8 +1,10 @@
 #pragma once
 #include "SlicingPipelinePluginCapability.hpp"
+#include <pybind11/pybind11.h>
 #include "slic3r/plugin/PyPluginTrampoline.hpp"
 #include "slic3r/plugin/PluginAuditManager.hpp"
 #include <boost/filesystem.hpp>
+#include "slic3r/plugin/PythonPluginInterface.hpp"
 
 namespace Slic3r {
 class PySlicingPipelinePluginCapabilityTrampoline : public PyPluginCommonTrampoline<SlicingPipelinePluginCapability> {
diff --git a/tests/fff_print/test_cooling.cpp b/tests/fff_print/test_cooling.cpp
index a21ff236ce..4ae9649197 100644
--- a/tests/fff_print/test_cooling.cpp
+++ b/tests/fff_print/test_cooling.cpp
@@ -1,10 +1,16 @@
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_test_macros.hpp>
 #include "test_helpers.hpp"
 
 #include <algorithm>
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/TriangleMesh.hpp"
+#include "libslic3r/libslic3r.h"
 #include <sstream>
 #include <string>
+#include <utility>
 #include <vector>
 
 using namespace Slic3r;
diff --git a/tests/fff_print/test_extrusion_entity.cpp b/tests/fff_print/test_extrusion_entity.cpp
index 57bc7e81e6..5b18b3ece5 100644
--- a/tests/fff_print/test_extrusion_entity.cpp
+++ b/tests/fff_print/test_extrusion_entity.cpp
@@ -1,7 +1,12 @@
+#include <algorithm>
 #include <catch2/catch_all.hpp>
 
 #include <cstdlib>
+#include <vector>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
 #include "libslic3r/ExtrusionEntityCollection.hpp"
 #include "libslic3r/ExtrusionEntity.hpp"
 #include "libslic3r/Point.hpp"
diff --git a/tests/fff_print/test_extrusion_processor.cpp b/tests/fff_print/test_extrusion_processor.cpp
index 47f9a62ecf..a3499a71b5 100644
--- a/tests/fff_print/test_extrusion_processor.cpp
+++ b/tests/fff_print/test_extrusion_processor.cpp
@@ -1,5 +1,11 @@
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_message.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <catch2/benchmark/catch_benchmark.hpp>
 #include "libslic3r/AABBTreeLines.hpp"
 #include "libslic3r/GCode/ExtrusionProcessor.hpp"
 #include "libslic3r/GCodeReader.hpp"
@@ -9,7 +15,15 @@
 
 #include <algorithm>
 #include <cmath>
+#include <functional>
+#include "libslic3r/Line.hpp"
+#include "libslic3r/Point.hpp"
+#include <cstddef>
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Print.hpp"
+#include "libslic3r/Model.hpp"
 #include <string>
+#include <string_view>
 #include <vector>
 
 using namespace Slic3r;
diff --git a/tests/fff_print/test_fill.cpp b/tests/fff_print/test_fill.cpp
index 0efaba023d..7247503824 100644
--- a/tests/fff_print/test_fill.cpp
+++ b/tests/fff_print/test_fill.cpp
@@ -2,13 +2,35 @@
 
 #include <algorithm>
 #include <cmath>
+#include <cstddef>
+#include <cstdint>
 #include <functional>
+#include "libslic3r/Fill/FillBase.hpp"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/Surface.hpp"
+#include "libslic3r/Point.hpp"
+#include <iterator>
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/ExtrusionEntity.hpp"
+#include "libslic3r/Line.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/TriangleMesh.hpp"
+#include <limits>
+#include "libslic3r/Model.hpp"
 #include <map>
+#include <memory>
+#include <math.h>
 #include <numeric>
 #include <sstream>
 #include <string>
+#include <utility>
 #include <vector>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_message.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/AABBTreeLines.hpp"
 #include "libslic3r/Fill/Fill.hpp"
diff --git a/tests/fff_print/test_flow.cpp b/tests/fff_print/test_flow.cpp
index 6025bb9b56..f0579c675f 100644
--- a/tests/fff_print/test_flow.cpp
+++ b/tests/fff_print/test_flow.cpp
@@ -1,8 +1,11 @@
 #include <catch2/catch_all.hpp>
 
+#include <cmath>
 #include <numeric>
 #include <sstream>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_approx.hpp>
 #include "test_helpers.hpp" // get access to init_print, etc
 
 #include "libslic3r/Config.hpp"
diff --git a/tests/fff_print/test_gcode_timing.cpp b/tests/fff_print/test_gcode_timing.cpp
index 8c08fc4f03..45a71cdd92 100644
--- a/tests/fff_print/test_gcode_timing.cpp
+++ b/tests/fff_print/test_gcode_timing.cpp
@@ -1,5 +1,9 @@
 #include <catch2/catch_all.hpp>
 
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/catch_message.hpp>
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/GCode/GCodeProcessor.hpp"
 #include "libslic3r/MultiNozzleUtils.hpp"
@@ -8,9 +12,13 @@
 #include "test_utils.hpp"
 
 #include <cmath>
+#include <cstddef>
 #include <fstream>
 #include <iomanip>
+#include "libslic3r/ExtrusionEntity.hpp"
+#include <ios>
 #include <map>
+#include <math.h>
 #include <memory>
 #include <sstream>
 #include <string>
diff --git a/tests/fff_print/test_gcodeprocessor.cpp b/tests/fff_print/test_gcodeprocessor.cpp
index 402a4757e1..6914ec4df9 100644
--- a/tests/fff_print/test_gcodeprocessor.cpp
+++ b/tests/fff_print/test_gcodeprocessor.cpp
@@ -1,5 +1,7 @@
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/GCode/GCodeProcessor.hpp"
 
diff --git a/tests/fff_print/test_gcodewriter.cpp b/tests/fff_print/test_gcodewriter.cpp
index d3a0722fc1..992204d716 100644
--- a/tests/fff_print/test_gcodewriter.cpp
+++ b/tests/fff_print/test_gcodewriter.cpp
@@ -1,14 +1,28 @@
+#include <boost/filesystem/operations.hpp>
 #include <catch2/catch_all.hpp>
 
 #include <algorithm>
 #include <cstdlib>
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/Extruder.hpp"
+#include "libslic3r/libslic3r.h"
 #include <map>
 #include <memory>
 #include <set>
 #include <sstream>
 #include <string>
+#include <utility>
 #include <vector>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_string.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <catch2/catch_message.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include "nlohmann/json.hpp"
 
 #include "libslic3r/GCodeReader.hpp"
diff --git a/tests/fff_print/test_helpers.cpp b/tests/fff_print/test_helpers.cpp
index 89f9f9fdd1..c131b10f83 100644
--- a/tests/fff_print/test_helpers.cpp
+++ b/tests/fff_print/test_helpers.cpp
@@ -1,5 +1,6 @@
 #include "test_helpers.hpp"
 
+#include <catch2/catch_test_macros.hpp>
 #include "libslic3r/TriangleMesh.hpp"
 #include "libslic3r/GCodeReader.hpp"
 #include "libslic3r/Config.hpp"
@@ -7,11 +8,23 @@
 #include "libslic3r/Format/OBJ.hpp"
 #include "libslic3r/Format/STL.hpp"
 
+#include <algorithm>
 #include <cstdlib>
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Exception.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include <initializer_list>
+#include "libslic3r/Point.hpp"
+#include <fstream>
+#include <iterator>
+#include <set>
 #include <string>
 
 #include <boost/filesystem.hpp>
 #include <libslic3r/ModelArrange.hpp>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 #include "test_utils.hpp"
 
diff --git a/tests/fff_print/test_helpers.hpp b/tests/fff_print/test_helpers.hpp
index cbdc90c3d9..1ffc08c64e 100644
--- a/tests/fff_print/test_helpers.hpp
+++ b/tests/fff_print/test_helpers.hpp
@@ -8,6 +8,10 @@
 #include "libslic3r/Print.hpp"
 #include "libslic3r/TriangleMesh.hpp"
 
+#include "libslic3r/libslic3r.h"
+#include <cstddef>
+#include "libslic3r/PrintConfig.hpp"
+#include <initializer_list>
 #include <set>
 #include <string>
 #include <unordered_map>
diff --git a/tests/fff_print/test_mixed_filament.cpp b/tests/fff_print/test_mixed_filament.cpp
index 25b426c210..bfa8985fd4 100644
--- a/tests/fff_print/test_mixed_filament.cpp
+++ b/tests/fff_print/test_mixed_filament.cpp
@@ -1,5 +1,16 @@
+#include <algorithm>
 #include <catch2/catch_all.hpp>
+#include "libslic3r/PrintConfig.hpp"
+#include <string>
+#include <cstddef>
+#include "libslic3r/Model.hpp"
+#include <vector>
+#include "libslic3r/Config.hpp"
+#include "libslic3r/TriangleMesh.hpp"
+#include "libslic3r/PrintBase.hpp"
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_message.hpp>
 #include "libslic3r/GCode/ToolOrdering.hpp"
 #include "libslic3r/MultiNozzleUtils.hpp"
 #include "libslic3r/Print.hpp"
diff --git a/tests/fff_print/test_model.cpp b/tests/fff_print/test_model.cpp
index 27bf539373..9e2c0790b3 100644
--- a/tests/fff_print/test_model.cpp
+++ b/tests/fff_print/test_model.cpp
@@ -1,10 +1,17 @@
+#include <boost/filesystem/operations.hpp>
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_test_macros.hpp>
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Model.hpp"
 #include "libslic3r/ModelArrange.hpp"
 
 #include <boost/filesystem.hpp>
+#include "libslic3r/TriangleMesh.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include <vector>
+#include "libslic3r/Point.hpp"
+#include <cstddef>
 
 #include "test_helpers.hpp"
 #include "test_utils.hpp"
diff --git a/tests/fff_print/test_multifilament.cpp b/tests/fff_print/test_multifilament.cpp
index 445b1c0694..9b9cae23db 100644
--- a/tests/fff_print/test_multifilament.cpp
+++ b/tests/fff_print/test_multifilament.cpp
@@ -1,5 +1,8 @@
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
+#include <catch2/catch_message.hpp>
 #include "libslic3r/GCode/GCodeProcessor.hpp"
 #include "libslic3r/GCodeReader.hpp"
 
@@ -12,6 +15,11 @@
 #include <cstdio>
 #include <cstdlib>
 #include <fstream>
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/Model.hpp"
+#include "libslic3r/TriangleMesh.hpp"
+#include "libslic3r/Print.hpp"
 #include <limits>
 #include <optional>
 #include <set>
diff --git a/tests/fff_print/test_perimeters.cpp b/tests/fff_print/test_perimeters.cpp
index 459ba0a178..6ab3473e3c 100644
--- a/tests/fff_print/test_perimeters.cpp
+++ b/tests/fff_print/test_perimeters.cpp
@@ -1,5 +1,10 @@
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
+#include <catch2/catch_message.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
 #include "libslic3r/ExtrusionEntity.hpp"
 #include "libslic3r/ExtrusionEntityCollection.hpp"
 #include "libslic3r/Layer.hpp"
@@ -10,8 +15,15 @@
 
 #include <algorithm>
 #include <cmath>
+#include "libslic3r/PrintConfig.hpp"
+#include <cstddef>
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/Point.hpp"
 #include <limits>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "test_helpers.hpp"
diff --git a/tests/fff_print/test_precise_seam.cpp b/tests/fff_print/test_precise_seam.cpp
index d324a91626..0dd422f0f5 100644
--- a/tests/fff_print/test_precise_seam.cpp
+++ b/tests/fff_print/test_precise_seam.cpp
@@ -1,9 +1,24 @@
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <catch2/catch_message.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include "test_helpers.hpp"
 #include "libslic3r/GCode/PreciseSeam.hpp"
 
 #include <algorithm>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Model.hpp"
+#include "libslic3r/Print.hpp"
+#include "libslic3r/Layer.hpp"
+#include <vector>
+#include <utility>
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/GCode/SeamPlacer.hpp"
+#include <cstddef>
 
 using namespace Slic3r;
 
diff --git a/tests/fff_print/test_print.cpp b/tests/fff_print/test_print.cpp
index 4176256021..9417934276 100644
--- a/tests/fff_print/test_print.cpp
+++ b/tests/fff_print/test_print.cpp
@@ -8,6 +8,20 @@
 #include <Windows.h>
 #endif
 
+#include <catch2/catch_test_macros.hpp>
+#include <string>
+#include <catch2/generators/catch_generators.hpp>
+#include <catch2/generators/catch_generators_range.hpp>
+#include <catch2/catch_message.hpp>
+#include "libslic3r/PrintConfig.hpp"
+#include <cstddef>
+#include "libslic3r/Surface.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/PrintBase.hpp"
+#include "libslic3r/TriangleMesh.hpp"
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+
 #include <catch2/catch_all.hpp>
 
 #include "libslic3r/libslic3r.h"
diff --git a/tests/fff_print/test_printobject.cpp b/tests/fff_print/test_printobject.cpp
index a373a1ad39..6671dabc4b 100644
--- a/tests/fff_print/test_printobject.cpp
+++ b/tests/fff_print/test_printobject.cpp
@@ -1,5 +1,11 @@
+#include <algorithm>
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <catch2/generators/catch_generators.hpp>
+#include <catch2/catch_message.hpp>
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Print.hpp"
 #include "libslic3r/Layer.hpp"
@@ -10,7 +16,20 @@
 #include "test_helpers.hpp"
 
 #include <cmath>
+#include <cstddef>
 #include <iterator>
+#include "libslic3r/TriangleMesh.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Model.hpp"
+#include "libslic3r/Geometry.hpp"
+#include "libslic3r/Surface.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/Line.hpp"
+#include "libslic3r/ExtrusionEntity.hpp"
+#include "libslic3r/BoundingBox.hpp"
 #include <map>
 #include <set>
 #include <string>
diff --git a/tests/fff_print/test_seam_placer.cpp b/tests/fff_print/test_seam_placer.cpp
index 81b7cd806c..40bbbdd117 100644
--- a/tests/fff_print/test_seam_placer.cpp
+++ b/tests/fff_print/test_seam_placer.cpp
@@ -1,5 +1,10 @@
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
+#include <catch2/catch_message.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
 #include "test_helpers.hpp"
 #include "libslic3r/GCode/SeamPlacer.hpp"
 #include "libslic3r/Layer.hpp"
@@ -7,6 +12,16 @@
 
 #include <algorithm>
 #include <cmath>
+#include "libslic3r/Model.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/TriangleMesh.hpp"
+#include <utility>
+#include <cstddef>
+#include "libslic3r/Point.hpp"
+#include <vector>
+#include "libslic3r/ExtrusionEntity.hpp"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/libslic3r.h"
 
 using namespace Slic3r;
 
diff --git a/tests/fff_print/test_skirt_brim.cpp b/tests/fff_print/test_skirt_brim.cpp
index 17a79a7828..d04b32361e 100644
--- a/tests/fff_print/test_skirt_brim.cpp
+++ b/tests/fff_print/test_skirt_brim.cpp
@@ -1,5 +1,11 @@
+#include <algorithm>
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
+#include <catch2/catch_message.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
 #include "libslic3r/GCodeReader.hpp"
 #include "libslic3r/Config.hpp"
 #include "libslic3r/Geometry.hpp"
@@ -9,6 +15,16 @@
 #include <boost/algorithm/string.hpp>
 
 #include <cmath>
+#include <cstddef>
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polyline.hpp"
+#include <string>
+#include "libslic3r/Model.hpp"
+#include <vector>
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/libslic3r.h"
+#include <string_view>
 
 #include "test_helpers.hpp" // get access to init_print, etc
 
diff --git a/tests/fff_print/test_slicing_pipeline_hook.cpp b/tests/fff_print/test_slicing_pipeline_hook.cpp
index d7ebd1fd60..8b328e5dde 100644
--- a/tests/fff_print/test_slicing_pipeline_hook.cpp
+++ b/tests/fff_print/test_slicing_pipeline_hook.cpp
@@ -1,4 +1,14 @@
 #include <catch2/catch_test_macros.hpp>
+#include "libslic3r/Config.hpp"
+#include "libslic3r/Model.hpp"
+#include <cstddef>
+#include <string>
+#include "libslic3r/Surface.hpp"
+#include <utility>
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Point.hpp"
+#include <catch2/matchers/catch_matchers.hpp>
+#include "libslic3r/ExtrusionEntity.hpp"
 #include "libslic3r/PrintConfig.hpp"
 #include "test_helpers.hpp"
 using namespace Slic3r;
diff --git a/tests/fff_print/test_support_material.cpp b/tests/fff_print/test_support_material.cpp
index 97a9cea9e1..d311130094 100644
--- a/tests/fff_print/test_support_material.cpp
+++ b/tests/fff_print/test_support_material.cpp
@@ -1,12 +1,28 @@
+#include <algorithm>
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_message.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include "libslic3r/GCodeReader.hpp"
 #include "libslic3r/Layer.hpp"
 
 #include <cmath>
+#include <cstddef>
+#include "libslic3r/TriangleMesh.hpp"
+#include "libslic3r/PrintBase.hpp"
+#include "libslic3r/Model.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/PrintConfig.hpp"
 #include <map>
+#include <math.h>
 #include <mutex>
 #include <set>
+#include <string>
+#include <string_view>
+#include <utility>
 #include <vector>
 
 #include "test_helpers.hpp" // get access to init_print, etc
diff --git a/tests/fff_print/test_texture_displacement.cpp b/tests/fff_print/test_texture_displacement.cpp
index 459a42d185..87047af618 100644
--- a/tests/fff_print/test_texture_displacement.cpp
+++ b/tests/fff_print/test_texture_displacement.cpp
@@ -1,10 +1,22 @@
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <catch2/catch_all.hpp>
 
+#include <cstddef>
+#include <cstdint>
 #include <fstream>
+#include <ios>
 #include <iterator>
 
 #include <boost/filesystem.hpp>
+#include <memory>
+#include <vector>
+#include <utility>
+#include <string>
+#include "libslic3r/PrintConfig.hpp"
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include "libslic3r/Model.hpp"
 #include "libslic3r/PNGReadWrite.hpp"
 #include "libslic3r/Print.hpp"
diff --git a/tests/fff_print/test_tree_support.cpp b/tests/fff_print/test_tree_support.cpp
index fbb40bb8f3..677cf4359f 100644
--- a/tests/fff_print/test_tree_support.cpp
+++ b/tests/fff_print/test_tree_support.cpp
@@ -1,7 +1,15 @@
 #include <catch2/catch_all.hpp>
 
 #include <algorithm>
+#include <initializer_list>
+#include "libslic3r/Config.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Point.hpp"
+#include <cstddef>
+#include "libslic3r/libslic3r.h"
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_message.hpp>
 #include "libslic3r/Layer.hpp"
 #include "libslic3r/TriangleMesh.hpp"
 
diff --git a/tests/fff_print/test_trianglemesh.cpp b/tests/fff_print/test_trianglemesh.cpp
index b21f6299fd..722732e207 100644
--- a/tests/fff_print/test_trianglemesh.cpp
+++ b/tests/fff_print/test_trianglemesh.cpp
@@ -1,5 +1,6 @@
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_test_macros.hpp>
 #include "libslic3r/TriangleMesh.hpp"
 #include "libslic3r/TriangleMeshSlicer.hpp"
 #include "libslic3r/Point.hpp"
@@ -8,8 +9,14 @@
 #include "libslic3r/libslic3r.h"
 
 #include <algorithm>
+#include <cstdlib>
+#include <cstddef>
+#include <cmath>
 #include <future>
 #include <chrono>
+#include <vector>
+#include <math.h>
+#include "libslic3r/ExPolygon.hpp"
 
 //#include "test_options.hpp"
 #include "test_helpers.hpp"
diff --git a/tests/fff_print/test_wipe.cpp b/tests/fff_print/test_wipe.cpp
index 46ee0d6441..63cd847ccb 100644
--- a/tests/fff_print/test_wipe.cpp
+++ b/tests/fff_print/test_wipe.cpp
@@ -2,11 +2,27 @@
 
 #include <algorithm>
 #include <cmath>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
+#include <cstddef>
+#include "libslic3r/TriangleMesh.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/ExtrusionEntity.hpp"
+#include "libslic3r/Model.hpp"
+#include "libslic3r/Print.hpp"
+#include "libslic3r/calib.hpp"
+#include "libslic3r/ExtrusionEntityCollection.hpp"
 #include <map>
 #include <string>
 #include <string_view>
+#include <utility>
 #include <vector>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
+#include <catch2/catch_message.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
 #include "libslic3r/GCode/GCodeProcessor.hpp"
 #include "libslic3r/GCodeReader.hpp"
 #include "libslic3r/PrintConfig.hpp"
diff --git a/tests/fff_print/test_wipe_tower.cpp b/tests/fff_print/test_wipe_tower.cpp
index 014eab6f8b..da3cbe2502 100644
--- a/tests/fff_print/test_wipe_tower.cpp
+++ b/tests/fff_print/test_wipe_tower.cpp
@@ -1,8 +1,23 @@
+#include <algorithm>
 #include <catch2/catch_all.hpp>
 
+#include "libslic3r/Config.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polygon.hpp"
+#include <cstddef>
+#include "libslic3r/Model.hpp"
+#include "libslic3r/Print.hpp"
 #include <string>
 #include <vector>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators_range.hpp>
+#include <catch2/catch_message.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <catch2/generators/catch_generators.hpp>
+#include <catch2/matchers/catch_matchers_string.hpp>
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/GCode/GCodeProcessor.hpp"
diff --git a/tests/filament_group/fg_test_evaluator.hpp b/tests/filament_group/fg_test_evaluator.hpp
index 00a2e1a6f5..ceec7cf154 100644
--- a/tests/filament_group/fg_test_evaluator.hpp
+++ b/tests/filament_group/fg_test_evaluator.hpp
@@ -2,13 +2,18 @@
 #define FG_TEST_EVALUATOR_HPP
 
 #include "fg_test_serialization.hpp"
+#include <cstddef>
 #include <libslic3r/FilamentGroup.hpp>
 #include <libslic3r/GCode/ToolOrderUtils.hpp>
 #include <libslic3r/MultiNozzleUtils.hpp>
 
 #include <chrono>
+#include <map>
+#include <ratio>
 #include <sstream>
+#include <string>
 #include <unordered_set>
+#include <vector>
 
 namespace Slic3r {
 namespace FGTest {
diff --git a/tests/filament_group/fg_test_serialization.hpp b/tests/filament_group/fg_test_serialization.hpp
index 5f59da619c..fa0ab3c9ff 100644
--- a/tests/filament_group/fg_test_serialization.hpp
+++ b/tests/filament_group/fg_test_serialization.hpp
@@ -1,6 +1,7 @@
 #ifndef FG_TEST_SERIALIZATION_HPP
 #define FG_TEST_SERIALIZATION_HPP
 
+#include <cstdio>
 #include <nlohmann/json.hpp>
 #include <libslic3r/FilamentGroup.hpp>
 #include <libslic3r/FilamentGroupUtils.hpp>
@@ -10,6 +11,7 @@
 #include <fstream>
 #include <optional>
 #include <string>
+#include <utility>
 #include <vector>
 #include <set>
 #include <map>
diff --git a/tests/filament_group/fg_test_utils.hpp b/tests/filament_group/fg_test_utils.hpp
index 2d2864bf10..b493e44607 100644
--- a/tests/filament_group/fg_test_utils.hpp
+++ b/tests/filament_group/fg_test_utils.hpp
@@ -2,9 +2,16 @@
 #define FG_TEST_UTILS_HPP
 
 #include "fg_test_serialization.hpp"
+#include "libslic3r/FilamentGroupUtils.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/FilamentGroup.hpp"
+#include <iterator>
 #include <random>
 #include <algorithm>
 #include <cassert>
+#include <vector>
+#include <set>
+#include <string>
 
 namespace Slic3r {
 namespace FGTest {
diff --git a/tests/filament_group/filament_group_regression_main.cpp b/tests/filament_group/filament_group_regression_main.cpp
index b2cc4bd178..c8933e6b6e 100644
--- a/tests/filament_group/filament_group_regression_main.cpp
+++ b/tests/filament_group/filament_group_regression_main.cpp
@@ -11,13 +11,19 @@
 
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_message.hpp>
+#include <catch2/generators/catch_generators.hpp>
+#include <catch2/generators/catch_generators_range.hpp>
 #include "fg_test_serialization.hpp"
 #include "fg_test_evaluator.hpp"
 #include "fg_test_utils.hpp"
 
+#include <cstddef>
 #include <filesystem>
 #include <iostream>
 #include <fstream>
+#include "libslic3r/FilamentGroup.hpp"
 #include <string>
 #include <vector>
 #include <algorithm>
diff --git a/tests/libnest2d/libnest2d_test_utils.hpp b/tests/libnest2d/libnest2d_test_utils.hpp
index 55f184f60c..b9f8510a8a 100644
--- a/tests/libnest2d/libnest2d_test_utils.hpp
+++ b/tests/libnest2d/libnest2d_test_utils.hpp
@@ -8,7 +8,10 @@
 // it here and include this header from every libnest2d test file.
 
 #include <cstdint>
+#include <iostream>
 
+#include "libnest2d/common.hpp"
+#include "libnest2d/geometry_traits_nfp.hpp"
 #include <libnest2d/libnest2d.hpp>
 #include <libnest2d/utils/rotcalipers.hpp>
 
diff --git a/tests/libnest2d/libnest2d_tests.cpp b/tests/libnest2d/libnest2d_tests.cpp
index 1657d45601..f5e3263b89 100644
--- a/tests/libnest2d/libnest2d_tests.cpp
+++ b/tests/libnest2d/libnest2d_tests.cpp
@@ -1,5 +1,10 @@
 #include <catch2/catch_all.hpp>
+#include "libnest2d/libnest2d.hpp"
+#include <vector>
+#include <cstddef>
+#include "libnest2d/nester.hpp"
 
+#include <catch2/catch_test_macros.hpp>
 #include "libnest2d_test_utils.hpp"
 
 using namespace libnest2d;
diff --git a/tests/libnest2d/printer_parts.hpp b/tests/libnest2d/printer_parts.hpp
index 075e32a837..07a3e9153d 100644
--- a/tests/libnest2d/printer_parts.hpp
+++ b/tests/libnest2d/printer_parts.hpp
@@ -1,6 +1,7 @@
 #ifndef PRINTER_PARTS_H
 #define PRINTER_PARTS_H
 
+#include "libnest2d/backends/libslic3r/geometries.hpp"
 #include <vector>
 #include <libnest2d/libnest2d.hpp>
 
diff --git a/tests/libnest2d/test_geometry.cpp b/tests/libnest2d/test_geometry.cpp
index 9c58a299e4..e32c47042a 100644
--- a/tests/libnest2d/test_geometry.cpp
+++ b/tests/libnest2d/test_geometry.cpp
@@ -1,5 +1,24 @@
+#include <algorithm>
+#include <boost/rational.hpp>
+#include <boost/multiprecision/fwd.hpp>
 #include <catch2/catch_all.hpp>
+#include <vector>
+#include "libnest2d/libnest2d.hpp"
+#include "libnest2d/geometry_traits.hpp"
+#include "libnest2d/backends/libslic3r/geometries.hpp"
+#include "libnest2d/common.hpp"
+#include <type_traits>
+#include <cstdlib>
+#include "libnest2d/placers/nfpplacer.hpp"
+#include <cmath>
+#include <cstdint>
+#include <limits>
+#include <iterator>
+#include "libnest2d/utils/rotcalipers.hpp"
 
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include "libnest2d_test_utils.hpp"
 #include "printer_parts.hpp"
 
diff --git a/tests/libnest2d/test_nfp.cpp b/tests/libnest2d/test_nfp.cpp
index 1b5c5d3a1c..fdb43f7bfa 100644
--- a/tests/libnest2d/test_nfp.cpp
+++ b/tests/libnest2d/test_nfp.cpp
@@ -1,5 +1,17 @@
+#include <algorithm>
 #include <catch2/catch_all.hpp>
+#include "libnest2d/libnest2d.hpp"
+#include <vector>
+#include "libnest2d/geometry_traits.hpp"
+#include "libnest2d/backends/libslic3r/geometries.hpp"
+#include "libnest2d/geometry_traits_nfp.hpp"
+#include "libnest2d/utils/boost_alg.hpp"
+#include "libnest2d/placers/nfpplacer.hpp"
+#include <iterator>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
 #include "libnest2d_test_utils.hpp"
 
 using namespace libnest2d;
diff --git a/tests/libnest2d/test_nfp_placer.cpp b/tests/libnest2d/test_nfp_placer.cpp
index 4446333f5d..02b711ec9d 100644
--- a/tests/libnest2d/test_nfp_placer.cpp
+++ b/tests/libnest2d/test_nfp_placer.cpp
@@ -1,5 +1,13 @@
 #include <catch2/catch_all.hpp>
+#include "libnest2d/libnest2d.hpp"
+#include <vector>
+#include <cstddef>
+#include "libnest2d/geometry_traits.hpp"
+#include "libnest2d/common.hpp"
 
+#include <catch2/catch_message.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include "libnest2d_test_utils.hpp"
 
 using namespace libnest2d;
diff --git a/tests/libslic3r/libslic3r_tests.cpp b/tests/libslic3r/libslic3r_tests.cpp
index a46b69d124..178a869648 100644
--- a/tests/libslic3r/libslic3r_tests.cpp
+++ b/tests/libslic3r/libslic3r_tests.cpp
@@ -1,5 +1,10 @@
 #include <catch2/catch_all.hpp>
+#include <vector>
+#include "libslic3r/libslic3r.h"
+#include <string>
+#include <cstdio>
 
+#include <catch2/catch_test_macros.hpp>
 #include "libslic3r/Utils.hpp"
 #define NANOSVG_IMPLEMENTATION
 #include "nanosvg/nanosvg.h"
diff --git a/tests/libslic3r/test_3mf.cpp b/tests/libslic3r/test_3mf.cpp
index 846caf5432..a8fd1eb888 100644
--- a/tests/libslic3r/test_3mf.cpp
+++ b/tests/libslic3r/test_3mf.cpp
@@ -1,4 +1,9 @@
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
+#include <catch2/catch_message.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
 #include "libslic3r/Model.hpp"
 #include "libslic3r/Format/3mf.hpp"
 #include "libslic3r/Format/bbs_3mf.hpp"
@@ -14,6 +19,15 @@
 
 #include "test_utils.hpp"
 
+#include "libslic3r/Config.hpp"
+#include "libslic3r/Geometry.hpp"
+#include <cstddef>
+#include <miniz.h>
+#include "libslic3r/TriangleMesh.hpp"
+#include "libslic3r/TriangleSelector.hpp"
+#include <memory>
+#include <cstdint>
+#include <ios>
 #include <nlohmann/json.hpp>
 
 #include <boost/filesystem/operations.hpp>
@@ -25,8 +39,12 @@
 #include <catch2/catch_tostring.hpp>
 #include <Eigen/Core>
 #include <Eigen/Geometry>
+#include <string>
+#include <sstream>
 #include <type_traits> // for std::enable_if_t
 #include <typeinfo>    // for typeid
+#include <vector>
+#include <utility>
 
 namespace Catch {
     template <typename T>
diff --git a/tests/libslic3r/test_aabbindirect.cpp b/tests/libslic3r/test_aabbindirect.cpp
index 122e4756f1..e97b8d193b 100644
--- a/tests/libslic3r/test_aabbindirect.cpp
+++ b/tests/libslic3r/test_aabbindirect.cpp
@@ -1,8 +1,13 @@
 #include <catch2/catch_all.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_approx.hpp>
 #include "test_utils.hpp"
 
+#include <igl/Hit.h>
+#include <cstddef>
 #include <libslic3r/TriangleMesh.hpp>
 #include <libslic3r/AABBTreeIndirect.hpp>
+#include <vector>
 
 using namespace Slic3r;
 
diff --git a/tests/libslic3r/test_appconfig.cpp b/tests/libslic3r/test_appconfig.cpp
index d3811c9827..3eb35d7490 100644
--- a/tests/libslic3r/test_appconfig.cpp
+++ b/tests/libslic3r/test_appconfig.cpp
@@ -1,5 +1,6 @@
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_test_macros.hpp>
 #include "libslic3r/AppConfig.hpp"
 
 using namespace Slic3r;
diff --git a/tests/libslic3r/test_arachne_walls.cpp b/tests/libslic3r/test_arachne_walls.cpp
index 2b6580ed11..be4df5d3b1 100644
--- a/tests/libslic3r/test_arachne_walls.cpp
+++ b/tests/libslic3r/test_arachne_walls.cpp
@@ -17,6 +17,9 @@
 
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
+#include <catch2/catch_message.hpp>
 #include "libslic3r/Arachne/WallToolPaths.hpp"
 #include "libslic3r/Arachne/SkeletalTrapezoidation.hpp"
 #include "libslic3r/Arachne/utils/ExtrusionLine.hpp"
@@ -31,6 +34,14 @@
 
 #include <algorithm>
 #include <cmath>
+#include <cstddef>
+#include "libslic3r/libslic3r.h"
+#include <vector>
+#include <utility>
+#include <math.h>
+#include "libslic3r/Arachne/utils/ExtrusionJunction.hpp"
+#include "libslic3r/PerimeterGenerator.hpp"
+#include "libslic3r/PrintConfig.hpp"
 
 using namespace Slic3r;
 using namespace Slic3r::Arachne;
diff --git a/tests/libslic3r/test_arrange.cpp b/tests/libslic3r/test_arrange.cpp
index 3906cba8ba..2f8df3166a 100644
--- a/tests/libslic3r/test_arrange.cpp
+++ b/tests/libslic3r/test_arrange.cpp
@@ -1,5 +1,19 @@
+#include <algorithm>
 #include <catch2/catch_all.hpp>
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Point.hpp"
+#include <string>
+#include "libslic3r/Config.hpp"
+#include <vector>
+#include <limits>
+#include <cstddef>
+#include <cmath>
 
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include "libslic3r/Arrange.hpp"
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/ClipperUtils.hpp"
diff --git a/tests/libslic3r/test_bambu_networking.cpp b/tests/libslic3r/test_bambu_networking.cpp
index 5cf55030f8..ec16e96c19 100644
--- a/tests/libslic3r/test_bambu_networking.cpp
+++ b/tests/libslic3r/test_bambu_networking.cpp
@@ -1,5 +1,6 @@
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_test_macros.hpp>
 #include "slic3r/Utils/bambu_networking.hpp"
 
 using namespace Slic3r;
diff --git a/tests/libslic3r/test_buildvolume.cpp b/tests/libslic3r/test_buildvolume.cpp
index b2e8040d68..3438f7517f 100644
--- a/tests/libslic3r/test_buildvolume.cpp
+++ b/tests/libslic3r/test_buildvolume.cpp
@@ -1,5 +1,10 @@
 #include <catch2/catch_all.hpp>
+#include <vector>
+#include "libslic3r/Point.hpp"
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
 #include "libslic3r/BuildVolume.hpp"
 
 using namespace Slic3r;
diff --git a/tests/libslic3r/test_caddocument.cpp b/tests/libslic3r/test_caddocument.cpp
index d69ada09b6..afb4acf409 100644
--- a/tests/libslic3r/test_caddocument.cpp
+++ b/tests/libslic3r/test_caddocument.cpp
@@ -1,4 +1,23 @@
+#include <catch2/catch_message.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_approx.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <Standard_TypeDef.hxx>
+#include <algorithm>
+#include <TopAbs_ShapeEnum.hxx>
+#include <GeomAbs_CurveType.hxx>
 #include <catch2/catch_all.hpp>   // mainline OrcaSlicer ships Catch2 v3 (v2 was catch2/catch.hpp)
+#include <vector>
+#include <math.h>
+#include <utility>
+#include <sstream>
+#include <cstdint>
+#include <ios>
+#include <iterator>
+#include "libslic3r/TriangleMesh.hpp"
+#include <exception>
+#include <string>
 
 // Substring assertions, spelled so this file compiles UNCHANGED on both forks.
 // Catch2 v2 (Snapmaker) spells it Matchers::Contains; v3 (orca_cad / mainline) spells it
diff --git a/tests/libslic3r/test_calib.cpp b/tests/libslic3r/test_calib.cpp
index 0092a7dedd..81fa59ff93 100644
--- a/tests/libslic3r/test_calib.cpp
+++ b/tests/libslic3r/test_calib.cpp
@@ -1,9 +1,13 @@
 #include <catch2/catch_all.hpp>
 
 #include <algorithm>
+#include "libslic3r/CustomGCode.hpp"
 #include <sstream>
 #include <string>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
 #include "libslic3r/calib.hpp"
 #include "libslic3r/Model.hpp"
 #include "libslic3r/TriangleMesh.hpp"
diff --git a/tests/libslic3r/test_clipper_offset.cpp b/tests/libslic3r/test_clipper_offset.cpp
index ecf14a60c8..7a816a2174 100644
--- a/tests/libslic3r/test_clipper_offset.cpp
+++ b/tests/libslic3r/test_clipper_offset.cpp
@@ -1,8 +1,15 @@
 #include <catch2/catch_all.hpp>
 
+#include <cmath>
 #include <iostream>
 #include <boost/filesystem.hpp>
+#include "libslic3r/libslic3r.h"
+#include <vector>
+#include "libslic3r/Polygon.hpp"
+#include <math.h>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_approx.hpp>
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/ExPolygon.hpp"
 #include "libslic3r/SVG.hpp"
diff --git a/tests/libslic3r/test_clipper_utils.cpp b/tests/libslic3r/test_clipper_utils.cpp
index ddec07089b..3b32bba7cf 100644
--- a/tests/libslic3r/test_clipper_utils.cpp
+++ b/tests/libslic3r/test_clipper_utils.cpp
@@ -1,9 +1,17 @@
+#include <algorithm>
 #include <catch2/catch_all.hpp>
 
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Polyline.hpp"
+#include <cstddef>
+#include "libslic3r/libslic3r.h"
 #include <numeric>
 #include <iostream>
 #include <boost/filesystem.hpp>
+#include <vector>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_approx.hpp>
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/ExPolygon.hpp"
 #include "libslic3r/SVG.hpp"
diff --git a/tests/libslic3r/test_config.cpp b/tests/libslic3r/test_config.cpp
index d7803f300b..bb51735bfe 100644
--- a/tests/libslic3r/test_config.cpp
+++ b/tests/libslic3r/test_config.cpp
@@ -1,5 +1,10 @@
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_message.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include "libslic3r/PrintConfig.hpp"
 #include "libslic3r/PrintConfigConstants.hpp"
 #include "libslic3r/LocalesUtils.hpp"
@@ -13,9 +18,16 @@
 
 #include <boost/filesystem.hpp>
 #include <boost/nowide/fstream.hpp>
+#include "libslic3r/Config.hpp"
+#include <memory>
+#include <map>
+#include <iterator>
 #include <nlohmann/json.hpp>
 
+#include <set>
 #include <sstream>
+#include <vector>
+#include <utility>
 
 using namespace Slic3r;
 
diff --git a/tests/libslic3r/test_config_variant_expansion.cpp b/tests/libslic3r/test_config_variant_expansion.cpp
index f30ad985e3..240a6e25fa 100644
--- a/tests/libslic3r/test_config_variant_expansion.cpp
+++ b/tests/libslic3r/test_config_variant_expansion.cpp
@@ -1,5 +1,15 @@
 #include <catch2/catch_all.hpp>
+#include "libslic3r/Config.hpp"
+#include <string>
+#include <vector>
+#include <set>
+#include <cmath>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_vector.hpp>
+#include <catch2/generators/catch_generators.hpp>
+#include <catch2/catch_approx.hpp>
 #include "libslic3r/PrintConfig.hpp"
 #include "libslic3r/Preset.hpp"
 
diff --git a/tests/libslic3r/test_drc.cpp b/tests/libslic3r/test_drc.cpp
index 917fd5c714..06a329e4e3 100644
--- a/tests/libslic3r/test_drc.cpp
+++ b/tests/libslic3r/test_drc.cpp
@@ -1,12 +1,21 @@
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_test_macros.hpp>
 #include "libslic3r/Format/DRC.hpp"
 #include "libslic3r/TriangleMesh.hpp"
 
 #include <boost/nowide/fstream.hpp>
 
+#include <draco/attributes/geometry_attribute.h>
+#include <cstdint>
+#include <draco/attributes/geometry_indices.h>
+#include <draco/compression/config/compression_shared.h>
 #include <draco/compression/encode.h>
+#include <draco/core/draco_types.h>
+#include <draco/core/encoder_buffer.h>
 #include <draco/mesh/mesh.h>
+#include <string>
+#include <ios>
 
 #include "test_utils.hpp"
 
diff --git a/tests/libslic3r/test_elephant_foot_compensation.cpp b/tests/libslic3r/test_elephant_foot_compensation.cpp
index ab9700a305..6388dab184 100644
--- a/tests/libslic3r/test_elephant_foot_compensation.cpp
+++ b/tests/libslic3r/test_elephant_foot_compensation.cpp
@@ -2,7 +2,11 @@
 
 #include <iostream>
 #include <boost/filesystem.hpp>
+#include "libslic3r/Point.hpp"
+#include <vector>
+#include "libslic3r/libslic3r.h"
 
+#include <catch2/catch_test_macros.hpp>
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/ElephantFootCompensation.hpp"
 #include "libslic3r/ExPolygon.hpp"
diff --git a/tests/libslic3r/test_filament_mixer.cpp b/tests/libslic3r/test_filament_mixer.cpp
index ade0c910dc..f43a8e7588 100644
--- a/tests/libslic3r/test_filament_mixer.cpp
+++ b/tests/libslic3r/test_filament_mixer.cpp
@@ -1,5 +1,13 @@
 #include <catch2/catch_all.hpp>
+#include <vector>
+#include <cstddef>
+#include "libslic3r/Config.hpp"
+#include <string>
+#include <cstdlib>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
 #include "libslic3r/FilamentMixer.hpp"
 #include "libslic3r/PrintConfig.hpp"
 
diff --git a/tests/libslic3r/test_fill_corner_smoothing.cpp b/tests/libslic3r/test_fill_corner_smoothing.cpp
index a9e752f250..ebad09e9e5 100644
--- a/tests/libslic3r/test_fill_corner_smoothing.cpp
+++ b/tests/libslic3r/test_fill_corner_smoothing.cpp
@@ -2,8 +2,12 @@
 
 #include <algorithm>
 #include <cmath>
+#include "libslic3r/Point.hpp"
+#include <cstddef>
+#include "libslic3r/Polygon.hpp"
 #include <limits>
 
+#include <catch2/catch_test_macros.hpp>
 #include "libslic3r/Fill/FillCornerSmoothing.hpp"
 #include "libslic3r/Polyline.hpp"
 #include "libslic3r/libslic3r.h"
diff --git a/tests/libslic3r/test_fill_plane_path.cpp b/tests/libslic3r/test_fill_plane_path.cpp
index 7fc7f4a6b0..e28d74b4fc 100644
--- a/tests/libslic3r/test_fill_plane_path.cpp
+++ b/tests/libslic3r/test_fill_plane_path.cpp
@@ -2,9 +2,18 @@
 
 #include <algorithm>
 #include <cmath>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Fill/FillBase.hpp"
+#include <cstddef>
+#include <iterator>
+#include "libslic3r/Config.hpp"
 #include <limits>
 #include <utility>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
 #include "libslic3r/Fill/FillPlanePath.hpp"
 #include "libslic3r/PrintConfig.hpp"
 
diff --git a/tests/libslic3r/test_geometry.cpp b/tests/libslic3r/test_geometry.cpp
index b4bbe86cc6..6f12b1113a 100644
--- a/tests/libslic3r/test_geometry.cpp
+++ b/tests/libslic3r/test_geometry.cpp
@@ -1,5 +1,8 @@
+#include <algorithm>
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_message.hpp>
 #include "libslic3r/Point.hpp"
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/Polygon.hpp"
@@ -17,7 +20,14 @@
 
 #include "../libnest2d/printer_parts.hpp"
 
+#include "libslic3r/libslic3r.h"
+#include <cstddef>
+#include <cstdlib>
+#include <math.h>
+#include <functional>
+#include <string>
 #include <unordered_set>
+#include <vector>
 
 using namespace Slic3r;
 
diff --git a/tests/libslic3r/test_hollowing.cpp b/tests/libslic3r/test_hollowing.cpp
index dc39b47373..6e1baef4cc 100644
--- a/tests/libslic3r/test_hollowing.cpp
+++ b/tests/libslic3r/test_hollowing.cpp
@@ -1,7 +1,10 @@
 #include <iostream>
 #include <fstream>
 #include <catch2/catch_all.hpp>
+#include "libslic3r/TriangleMesh.hpp"
+#include "libslic3r/libslic3r.h"
 
+#include <catch2/catch_test_macros.hpp>
 #include "libslic3r/SLA/Hollowing.hpp"
 
 #include "test_utils.hpp"
diff --git a/tests/libslic3r/test_indexed_triangle_set.cpp b/tests/libslic3r/test_indexed_triangle_set.cpp
index 43116936d3..c65bf589a8 100644
--- a/tests/libslic3r/test_indexed_triangle_set.cpp
+++ b/tests/libslic3r/test_indexed_triangle_set.cpp
@@ -1,8 +1,17 @@
+#include <cmath>
+#include <cstddef>
+#include <cstdint>
 #include <iostream>
 #include <fstream>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
+#include <limits>
 #include <random>
 #include <catch2/catch_all.hpp>
+#include <vector>
+#include <string>
 
+#include <catch2/catch_test_macros.hpp>
 #include "libslic3r/TriangleMesh.hpp"
 
 #include "test_utils.hpp"
diff --git a/tests/libslic3r/test_instance_lock.cpp b/tests/libslic3r/test_instance_lock.cpp
index 207dd77173..5ee14c665f 100644
--- a/tests/libslic3r/test_instance_lock.cpp
+++ b/tests/libslic3r/test_instance_lock.cpp
@@ -1,3 +1,4 @@
+#include <boost/filesystem/operations.hpp>
 #include <catch2/catch_all.hpp>
 
 #include <atomic>
@@ -6,6 +7,7 @@
 
 #include <boost/filesystem.hpp>
 
+#include <catch2/catch_test_macros.hpp>
 #include "libslic3r/InstanceLock.hpp"
 #include "test_utils.hpp"
 
diff --git a/tests/libslic3r/test_lay_on_face.cpp b/tests/libslic3r/test_lay_on_face.cpp
index 60226a9aab..76a197efe7 100644
--- a/tests/libslic3r/test_lay_on_face.cpp
+++ b/tests/libslic3r/test_lay_on_face.cpp
@@ -1,5 +1,15 @@
 #include <catch2/catch_all.hpp>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/TriangleMesh.hpp"
+#include <utility>
+#include <vector>
+#include "libslic3r/libslic3r.h"
+#include <cstddef>
 
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include "libslic3r/LayOnFace.hpp"
 #include "libslic3r/Model.hpp"
 
diff --git a/tests/libslic3r/test_locales_utils.cpp b/tests/libslic3r/test_locales_utils.cpp
index 6f1528649d..2bb134af6b 100644
--- a/tests/libslic3r/test_locales_utils.cpp
+++ b/tests/libslic3r/test_locales_utils.cpp
@@ -1,7 +1,9 @@
 #include <catch2/catch_all.hpp>
 
 #include <clocale>
+#include <locale.h>
 
+#include <catch2/catch_test_macros.hpp>
 #include "libslic3r/LocalesUtils.hpp"
 
 using namespace Slic3r;
diff --git a/tests/libslic3r/test_marchingsquares.cpp b/tests/libslic3r/test_marchingsquares.cpp
index 9a11f49faa..e9d0f8ebc2 100644
--- a/tests/libslic3r/test_marchingsquares.cpp
+++ b/tests/libslic3r/test_marchingsquares.cpp
@@ -2,6 +2,28 @@
 #define NOMINMAX
 #endif
 
+#include "libslic3r/Point.hpp"
+#include <cstddef>
+#include "libslic3r/libslic3r.h"
+#include <utility>
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/Polygon.hpp"
+#include <algorithm>
+#include <iterator>
+#include "libslic3r/SLA/RasterBase.hpp"
+#include <agg/agg_gamma_functions.h>
+#include <vector>
+#include <cmath>
+#include <string>
+#include "libslic3r/ExPolygon.hpp"
+#include <catch2/catch_message.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include "libslic3r/TriangleMesh.hpp"
+#include <cstdlib>
+#include <catch2/benchmark/catch_benchmark.hpp>
+
 #include <catch2/catch_all.hpp>
 #include "test_utils.hpp"
 
diff --git a/tests/libslic3r/test_meshboolean.cpp b/tests/libslic3r/test_meshboolean.cpp
index b7208349cc..4c0faa1bb0 100644
--- a/tests/libslic3r/test_meshboolean.cpp
+++ b/tests/libslic3r/test_meshboolean.cpp
@@ -1,4 +1,6 @@
 #include <catch2/catch_all.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_approx.hpp>
 #include "test_utils.hpp"
 
 #include <libslic3r/TriangleMesh.hpp>
diff --git a/tests/libslic3r/test_minimum_spanning_tree.cpp b/tests/libslic3r/test_minimum_spanning_tree.cpp
index 5f9998171c..b6685b0d1e 100644
--- a/tests/libslic3r/test_minimum_spanning_tree.cpp
+++ b/tests/libslic3r/test_minimum_spanning_tree.cpp
@@ -1,7 +1,11 @@
 #include <catch2/catch_all.hpp>
 
 #include <algorithm>
+#include <vector>
+#include <cstddef>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_message.hpp>
 #include "libslic3r/MinimumSpanningTree.hpp"
 #include "libslic3r/Point.hpp"
 
diff --git a/tests/libslic3r/test_miniz_extension.cpp b/tests/libslic3r/test_miniz_extension.cpp
index ff3274a886..3a10a8eb8e 100644
--- a/tests/libslic3r/test_miniz_extension.cpp
+++ b/tests/libslic3r/test_miniz_extension.cpp
@@ -1,5 +1,12 @@
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/directory.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/file_status.hpp>
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
+#include <catch2/catch_message.hpp>
 #include "libslic3r/miniz_extension.hpp"
 
 #include "test_utils.hpp"
@@ -7,8 +14,11 @@
 #include <boost/filesystem.hpp>
 
 #include <algorithm>
+#include <cstddef>
 #include <fstream>
+#include <ios>
 #include <iterator>
+#include <miniz.h>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/tests/libslic3r/test_model.cpp b/tests/libslic3r/test_model.cpp
index 3a580e3be2..24d690ac9e 100644
--- a/tests/libslic3r/test_model.cpp
+++ b/tests/libslic3r/test_model.cpp
@@ -1,5 +1,10 @@
 #include <catch2/catch_all.hpp>
+#include "libslic3r/TriangleMesh.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/Point.hpp"
 
+#include <catch2/catch_test_macros.hpp>
 #include "libslic3r/Model.hpp"
 
 using namespace Slic3r;
diff --git a/tests/libslic3r/test_multimaterial_segmentation.cpp b/tests/libslic3r/test_multimaterial_segmentation.cpp
index 271b9d5660..065a143ce1 100644
--- a/tests/libslic3r/test_multimaterial_segmentation.cpp
+++ b/tests/libslic3r/test_multimaterial_segmentation.cpp
@@ -3,6 +3,12 @@
 // MultiMaterialSegmentation.hpp declares boost::polygon traits for ColoredLine, so its
 // geometry/boost dependencies must be included first.
 #include <boost/polygon/polygon.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <string>
+#include <vector>
+#include <catch2/generators/catch_generators.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
 #include "libslic3r/Line.hpp"
 #include "libslic3r/Flow.hpp"
 #include "libslic3r/MultiMaterialSegmentation.hpp"
diff --git a/tests/libslic3r/test_mutable_polygon.cpp b/tests/libslic3r/test_mutable_polygon.cpp
index 906dffe50a..a233454427 100644
--- a/tests/libslic3r/test_mutable_polygon.cpp
+++ b/tests/libslic3r/test_mutable_polygon.cpp
@@ -1,5 +1,9 @@
 #include <catch2/catch_all.hpp>
+#include <cstddef>
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Polygon.hpp"
 
+#include <catch2/catch_test_macros.hpp>
 #include "libslic3r/Point.hpp"
 #include "libslic3r/MutablePolygon.hpp"
 
diff --git a/tests/libslic3r/test_mutable_priority_queue.cpp b/tests/libslic3r/test_mutable_priority_queue.cpp
index db7124df78..67191793da 100644
--- a/tests/libslic3r/test_mutable_priority_queue.cpp
+++ b/tests/libslic3r/test_mutable_priority_queue.cpp
@@ -1,8 +1,15 @@
+#include <algorithm>
 #include <catch2/catch_all.hpp>
 
 #include <queue>
+#include <cstddef>
+#include <iterator>
+#include <functional>
+#include <cstdlib>
 #include <random>
+#include <vector>
 
+#include <catch2/catch_test_macros.hpp>
 #include "libslic3r/MutablePriorityQueue.hpp"
 
 // based on https://raw.githubusercontent.com/rollbear/prio_queue/master/self_test.cpp
diff --git a/tests/libslic3r/test_nozzle_volume_type.cpp b/tests/libslic3r/test_nozzle_volume_type.cpp
index 99ad375f93..289133bb03 100644
--- a/tests/libslic3r/test_nozzle_volume_type.cpp
+++ b/tests/libslic3r/test_nozzle_volume_type.cpp
@@ -1,5 +1,9 @@
 #include <catch2/catch_all.hpp>
+#include <set>
+#include "libslic3r/Config.hpp"
+#include <vector>
 
+#include <catch2/catch_test_macros.hpp>
 #include "libslic3r/PrintConfig.hpp"
 
 using namespace Slic3r;
diff --git a/tests/libslic3r/test_obj.cpp b/tests/libslic3r/test_obj.cpp
index 2cbf57ff04..abab016b2a 100644
--- a/tests/libslic3r/test_obj.cpp
+++ b/tests/libslic3r/test_obj.cpp
@@ -1,9 +1,16 @@
+#include <array>
 #include <catch2/catch_all.hpp>
 
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include "libslic3r/TriangleMesh.hpp"
 #include "libslic3r/Format/OBJ.hpp"
 
 #include <boost/nowide/fstream.hpp>
+#include <string>
+#include "libslic3r/Point.hpp"
+#include <cstddef>
 
 #include "test_utils.hpp"
 
diff --git a/tests/libslic3r/test_optimizers.cpp b/tests/libslic3r/test_optimizers.cpp
index 8783ac1428..232481f23c 100644
--- a/tests/libslic3r/test_optimizers.cpp
+++ b/tests/libslic3r/test_optimizers.cpp
@@ -1,9 +1,13 @@
 #include <catch2/catch_all.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include "test_utils.hpp"
 
+#include <cstdlib>
 #include <libslic3r/Optimize/BruteforceOptimizer.hpp>
 
 #include <libslic3r/Optimize/NLoptOptimizer.hpp>
+#include "libslic3r/Optimize/Optimizer.hpp"
+#include "libslic3r/libslic3r.h"
 
 void check_opt_result(double score, double ref, double abs_err, double rel_err)
 {
diff --git a/tests/libslic3r/test_ordering_strategies.cpp b/tests/libslic3r/test_ordering_strategies.cpp
index ddbca07ae6..f6e0cd94f2 100644
--- a/tests/libslic3r/test_ordering_strategies.cpp
+++ b/tests/libslic3r/test_ordering_strategies.cpp
@@ -1,4 +1,12 @@
+#include <catch2/catch_test_macros.hpp>
 #include <catch2/catch_all.hpp>
+#include <vector>
+#include <cstddef>
+#include <math.h>
+#include "libslic3r/libslic3r.h"
+#include <cmath>
+#include <cstdint>
+#include <limits>
 
 #define SLIC3R_TEST_HARNESS
 
diff --git a/tests/libslic3r/test_parallel_resolve.cpp b/tests/libslic3r/test_parallel_resolve.cpp
index 76811f1475..4e7e52dca2 100644
--- a/tests/libslic3r/test_parallel_resolve.cpp
+++ b/tests/libslic3r/test_parallel_resolve.cpp
@@ -1,5 +1,6 @@
 #include <catch2/catch_all.hpp>
 
+#include <cstddef>
 #include <numeric>
 #include <stdexcept>
 #include <thread>
@@ -9,6 +10,7 @@
 #include <tbb/parallel_for.h>
 #include <tbb/task_group.h>
 
+#include <catch2/catch_test_macros.hpp>
 #include "libslic3r/ParallelResolve.hpp"
 
 using namespace Slic3r;
diff --git a/tests/libslic3r/test_placeholder_parser.cpp b/tests/libslic3r/test_placeholder_parser.cpp
index 4a95156c34..0a490a6bdd 100644
--- a/tests/libslic3r/test_placeholder_parser.cpp
+++ b/tests/libslic3r/test_placeholder_parser.cpp
@@ -1,5 +1,12 @@
 #include <catch2/catch_all.hpp>
+#include <string>
+#include <memory>
+#include "libslic3r/Config.hpp"
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_approx.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_string.hpp>
 #include "libslic3r/PlaceholderParser.hpp"
 #include "libslic3r/PrintConfig.hpp"
 
diff --git a/tests/libslic3r/test_polygon.cpp b/tests/libslic3r/test_polygon.cpp
index feae4ff50c..08fd21d3c0 100644
--- a/tests/libslic3r/test_polygon.cpp
+++ b/tests/libslic3r/test_polygon.cpp
@@ -1,5 +1,9 @@
+#include <algorithm>
 #include <catch2/catch_all.hpp>
+#include <cstddef>
+#include "libslic3r/libslic3r.h"
 
+#include <catch2/catch_test_macros.hpp>
 #include "libslic3r/Point.hpp"
 #include "libslic3r/Polygon.hpp"
 
diff --git a/tests/libslic3r/test_precise_seam_3mf.cpp b/tests/libslic3r/test_precise_seam_3mf.cpp
index 6449236744..cda140ebce 100644
--- a/tests/libslic3r/test_precise_seam_3mf.cpp
+++ b/tests/libslic3r/test_precise_seam_3mf.cpp
@@ -1,5 +1,10 @@
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <catch2/generators/catch_generators.hpp>
+#include <catch2/catch_message.hpp>
 #include "test_utils.hpp"
 #include "libslic3r/Model.hpp"
 #include "libslic3r/PrintConfig.hpp"
@@ -12,7 +17,13 @@
 
 #include <algorithm>
 #include <array>
+#include "libslic3r/Config.hpp"
+#include "libslic3r/TriangleMesh.hpp"
+#include <cstddef>
+#include "libslic3r/Geometry.hpp"
+#include <miniz.h>
 #include <string>
+#include <utility>
 #include <vector>
 
 using namespace Slic3r;
diff --git a/tests/libslic3r/test_preset_bundle_loading.cpp b/tests/libslic3r/test_preset_bundle_loading.cpp
index 4741e28f6b..c8cc1784de 100644
--- a/tests/libslic3r/test_preset_bundle_loading.cpp
+++ b/tests/libslic3r/test_preset_bundle_loading.cpp
@@ -1,9 +1,19 @@
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/directory.hpp>
+#include <boost/filesystem/file_status.hpp>
 #include <catch2/catch_all.hpp>
 
 #include <algorithm>
 #include <boost/filesystem.hpp>
+#include <cstddef>
 #include <fstream>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <catch2/catch_message.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include "libslic3r/PresetBundle.hpp"
 #include "libslic3r/ParallelResolve.hpp"
 #include "libslic3r/AppConfig.hpp"
@@ -17,6 +27,19 @@
 #include <algorithm>
 #include <iostream>
 #include <initializer_list>
+#include <vector>
+#include <string>
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Preset.hpp"
+#include <utility>
+#include "libslic3r/Config.hpp"
+#include <map>
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/PublishSettings.hpp"
+#include <set>
+#include "libslic3r/TriangleSelector.hpp"
+#include <iterator>
+#include <miniz.h>
 
 #ifndef _WIN32
 #include <unistd.h> // geteuid
diff --git a/tests/libslic3r/test_preset_diff.cpp b/tests/libslic3r/test_preset_diff.cpp
index 22255c049e..036e2aa922 100644
--- a/tests/libslic3r/test_preset_diff.cpp
+++ b/tests/libslic3r/test_preset_diff.cpp
@@ -1,9 +1,15 @@
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include "libslic3r/Preset.hpp"
 #include "libslic3r/PrintConfig.hpp"
 
 #include <algorithm>
+#include "libslic3r/Config.hpp"
+#include <vector>
+#include <cstddef>
+#include <string>
 
 using namespace Slic3r;
 
diff --git a/tests/libslic3r/test_preset_options.cpp b/tests/libslic3r/test_preset_options.cpp
index 1763f5fbc7..cf878ca9f8 100644
--- a/tests/libslic3r/test_preset_options.cpp
+++ b/tests/libslic3r/test_preset_options.cpp
@@ -16,10 +16,14 @@
 
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_message.hpp>
 #include "libslic3r/Preset.hpp"
 #include "libslic3r/PrintConfig.hpp"
 
+#include "libslic3r/Config.hpp"
 #include <set>
+#include <string>
 
 using namespace Slic3r;
 
diff --git a/tests/libslic3r/test_preset_setting_id.cpp b/tests/libslic3r/test_preset_setting_id.cpp
index 5c06335381..0b5736ad26 100644
--- a/tests/libslic3r/test_preset_setting_id.cpp
+++ b/tests/libslic3r/test_preset_setting_id.cpp
@@ -1,5 +1,8 @@
 #include <catch2/catch_all.hpp>
+#include <string>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_message.hpp>
 #include "libslic3r/Preset.hpp"
 
 using namespace Slic3r;
diff --git a/tests/libslic3r/test_sketchconstraints.cpp b/tests/libslic3r/test_sketchconstraints.cpp
index d0c5844b40..2142398e68 100644
--- a/tests/libslic3r/test_sketchconstraints.cpp
+++ b/tests/libslic3r/test_sketchconstraints.cpp
@@ -1,4 +1,11 @@
 #include <catch2/catch_all.hpp>   // mainline OrcaSlicer ships Catch2 v3 (v2 was catch2/catch.hpp)
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <cstdlib>
+#include <math.h>
+#include <utility>
+#include <vector>
 #include "libslic3r/CAD/SketchConstraints.hpp"
 #include "libslic3r/CAD/SketchEngine.hpp"
 
diff --git a/tests/libslic3r/test_sketchedit.cpp b/tests/libslic3r/test_sketchedit.cpp
index 634e743b99..b289b71e69 100644
--- a/tests/libslic3r/test_sketchedit.cpp
+++ b/tests/libslic3r/test_sketchedit.cpp
@@ -1,9 +1,16 @@
+#include <TopAbs_ShapeEnum.hxx>
+#include <TopoDS_Wire.hxx>
 #include <catch2/catch_all.hpp>   // mainline OrcaSlicer ships Catch2 v3 (v2 was catch2/catch.hpp)
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
 #include "libslic3r/CAD/SketchEngine.hpp"
 #include <cmath>
 #include <algorithm>
 #include <TopExp_Explorer.hxx>
 #include <TopAbs.hxx>
+#include <math.h>
+#include <vector>
 
 using namespace Slic3r;
 
diff --git a/tests/libslic3r/test_sketchimport.cpp b/tests/libslic3r/test_sketchimport.cpp
index 3e3f7c906e..3e6636fd7d 100644
--- a/tests/libslic3r/test_sketchimport.cpp
+++ b/tests/libslic3r/test_sketchimport.cpp
@@ -1,10 +1,16 @@
+#include <algorithm>
 #include <catch2/catch_all.hpp>   // mainline OrcaSlicer ships Catch2 v3 (v2 was catch2/catch.hpp)
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
 #include "libslic3r/CAD/SketchImport.hpp"
 #include "libslic3r/Utils.hpp"   // resources_dir
 #include "test_utils.hpp"        // ScopedTemporaryFile
 
+#include <cstdlib>
 #include <fstream>
+#include "libslic3r/Point.hpp"
 #include <string>
 
 using namespace Slic3r;
diff --git a/tests/libslic3r/test_sketchinference.cpp b/tests/libslic3r/test_sketchinference.cpp
index cbdd90628b..6ff9768b8f 100644
--- a/tests/libslic3r/test_sketchinference.cpp
+++ b/tests/libslic3r/test_sketchinference.cpp
@@ -1,4 +1,9 @@
+#include <catch2/catch_approx.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <catch2/catch_all.hpp>   // mainline OrcaSlicer ships Catch2 v3 (v2 was catch2/catch.hpp)
+#include "libslic3r/CAD/SketchEngine.hpp"
+#include "libslic3r/Point.hpp"
+#include <vector>
 using Catch::Approx;   // v3 scopes Approx into the Catch namespace; v2 had it at global scope
 
 #include "libslic3r/CAD/SketchInference.hpp"
diff --git a/tests/libslic3r/test_sketchprofile.cpp b/tests/libslic3r/test_sketchprofile.cpp
index 7f455eb936..6c33599847 100644
--- a/tests/libslic3r/test_sketchprofile.cpp
+++ b/tests/libslic3r/test_sketchprofile.cpp
@@ -9,11 +9,19 @@
 // So these cases assert the loop, not the coordinates. That is the invariant every sketch
 // operation has to preserve and the only one that predicts whether the GUI can build a solid
 // out of the result.
+#include <TopoDS_Face.hxx>
 #include <catch2/catch_all.hpp>   // mainline OrcaSlicer ships Catch2 v3 (v2 was catch2/catch.hpp)
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
 #include "libslic3r/CAD/SketchEngine.hpp"
 #include <BRepGProp.hxx>
 #include <GProp_GProps.hxx>
 #include <cmath>
+#include "libslic3r/Point.hpp"
+#include <vector>
+#include <math.h>
+#include <cstddef>
 
 using namespace Slic3r;
 using Catch::Matchers::WithinAbs;
diff --git a/tests/libslic3r/test_slvs_constraints.cpp b/tests/libslic3r/test_slvs_constraints.cpp
index 6dfac07348..4f5c27ba7d 100644
--- a/tests/libslic3r/test_slvs_constraints.cpp
+++ b/tests/libslic3r/test_slvs_constraints.cpp
@@ -1,4 +1,9 @@
+#include <catch2/catch_approx.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <catch2/catch_all.hpp>   // mainline OrcaSlicer ships Catch2 v3 (v2 was catch2/catch.hpp)
+#include "libslic3r/Point.hpp"
+#include <vector>
+#include <cstddef>
 using Catch::Approx;   // v3 scopes Approx into the Catch namespace; v2 had it at global scope
 
 #include "libslic3r/CAD/SketchSolver.hpp"
diff --git a/tests/libslic3r/test_step.cpp b/tests/libslic3r/test_step.cpp
index a2aa7218f1..3635c977dd 100644
--- a/tests/libslic3r/test_step.cpp
+++ b/tests/libslic3r/test_step.cpp
@@ -1,7 +1,11 @@
 #include <catch2/catch_all.hpp>
 
 #include <boost/nowide/fstream.hpp>
+#include <string>
+#include <ios>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include "libslic3r/Model.hpp"
 #include "libslic3r/Format/STEP.hpp"
 #include "test_utils.hpp"
diff --git a/tests/libslic3r/test_stl.cpp b/tests/libslic3r/test_stl.cpp
index a8addeca16..0223392c3f 100644
--- a/tests/libslic3r/test_stl.cpp
+++ b/tests/libslic3r/test_stl.cpp
@@ -1,5 +1,8 @@
 #include <catch2/catch_all.hpp>
+#include <string>
+#include "libslic3r/Point.hpp"
 
+#include <catch2/catch_test_macros.hpp>
 #include "libslic3r/Model.hpp"
 #include "libslic3r/Format/STL.hpp"
 
diff --git a/tests/libslic3r/test_texture_displacement.cpp b/tests/libslic3r/test_texture_displacement.cpp
index 04713d3fd9..1d9a89481b 100644
--- a/tests/libslic3r/test_texture_displacement.cpp
+++ b/tests/libslic3r/test_texture_displacement.cpp
@@ -1,6 +1,29 @@
 #ifndef NOMINMAX
 #define NOMINMAX
 #endif
+
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <memory>
+#include <vector>
+#include <cstdint>
+#include <cstddef>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <ios>
+#include <iterator>
+#include <utility>
+#include "libslic3r/Point.hpp"
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/generators/catch_generators.hpp>
+#include <map>
+#include <math.h>
+#include "libslic3r/TextureBake/TextureBakeDisplace.hpp"
+#include "libslic3r/TextureBake/TextureBakeIndex.hpp"
+#include <tuple>
+#include <Eigen/Geometry>
+#include "libslic3r/libslic3r.h"
+#include <catch2/catch_message.hpp>
 #include <catch2/catch_all.hpp>
 
 #include <algorithm>
diff --git a/tests/libslic3r/test_timeutils.cpp b/tests/libslic3r/test_timeutils.cpp
index 221dd07d81..213b5e6788 100644
--- a/tests/libslic3r/test_timeutils.cpp
+++ b/tests/libslic3r/test_timeutils.cpp
@@ -1,10 +1,13 @@
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_test_macros.hpp>
 #include "libslic3r/Time.hpp"
 
+#include <ctime>
 #include <sstream>
 #include <iomanip>
 #include <locale>
+#include <string>
 
 using namespace Slic3r;
 
diff --git a/tests/libslic3r/test_toolordering_nozzle_group.cpp b/tests/libslic3r/test_toolordering_nozzle_group.cpp
index 837b66287a..7c41b2315e 100644
--- a/tests/libslic3r/test_toolordering_nozzle_group.cpp
+++ b/tests/libslic3r/test_toolordering_nozzle_group.cpp
@@ -1,5 +1,9 @@
+#include <boost/filesystem/operations.hpp>
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
 #include "libslic3r/FilamentGroupUtils.hpp"
 #include "libslic3r/MultiNozzleUtils.hpp"
 #include "libslic3r/PrintConfig.hpp"
@@ -11,7 +15,11 @@
 #include "test_utils.hpp"
 
 #include <algorithm>
+#include "libslic3r/Config.hpp"
+#include "libslic3r/GCode/ToolOrderUtils.hpp"
+#include "libslic3r/PrintBase.hpp"
 #include <map>
+#include <memory>
 #include <set>
 #include <unordered_map>
 #include <vector>
diff --git a/tests/libslic3r/test_triangle_selector.cpp b/tests/libslic3r/test_triangle_selector.cpp
index c207ee66ad..9886308bdd 100644
--- a/tests/libslic3r/test_triangle_selector.cpp
+++ b/tests/libslic3r/test_triangle_selector.cpp
@@ -1,9 +1,16 @@
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_message.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include "libslic3r/TriangleSelector.hpp"
 #include "libslic3r/TriangleMesh.hpp"
 
 #include <algorithm>
+#include "libslic3r/libslic3r.h"
+#include <vector>
+#include <cstddef>
+#include <string>
 
 using namespace Slic3r;
 
diff --git a/tests/libslic3r/test_utils.cpp b/tests/libslic3r/test_utils.cpp
index ad5110aa5e..35094f056a 100644
--- a/tests/libslic3r/test_utils.cpp
+++ b/tests/libslic3r/test_utils.cpp
@@ -1,5 +1,14 @@
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/directory.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/file_status.hpp>
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_string.hpp>
+#include <catch2/generators/catch_generators.hpp>
+#include <catch2/catch_message.hpp>
 #include "libslic3r/Utils.hpp"
 
 #include "test_utils.hpp"
@@ -8,10 +17,14 @@
 
 #include <algorithm>
 #include <cctype>
+#include <cstddef>
 #include <fstream>
+#include <ios>
+#include <iterator>
 #include <string>
 #include <thread>
 #include <system_error>
+#include <utility>
 
 #ifndef _WIN32
 #include <unistd.h>     // getuid
diff --git a/tests/libslic3r/test_vendor_cache.cpp b/tests/libslic3r/test_vendor_cache.cpp
index be8b97943c..b78ce77e1f 100644
--- a/tests/libslic3r/test_vendor_cache.cpp
+++ b/tests/libslic3r/test_vendor_cache.cpp
@@ -1,3 +1,5 @@
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <catch2/catch_all.hpp>
 
 #include <boost/filesystem.hpp>
@@ -5,19 +7,32 @@
 #include <cereal/archives/binary.hpp>
 #include <algorithm>
 #include <atomic>
+#include <cstdint>
 #include <cstring>
 #include <fstream>
 #include <functional>
+#include <ios>
+#include <iterator>
+#include "libslic3r/Semver.hpp"
+#include "libslic3r/Config.hpp"
 #include <memory>
 #include <numeric>
 #include <random>
 #include <set>
 #include <sstream>
 
+#include <string>
+#include <stdexcept>
 #include <tbb/blocked_range.h>
 #include <tbb/parallel_for.h>
 #include <tbb/task_group.h>
+#include <vector>
+#include <utility>
 
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/catch_message.hpp>
 #include "libslic3r/PresetBundle.hpp"
 #include "libslic3r/PresetCacheFormat.hpp"
 #include "libslic3r/Preset.hpp"
diff --git a/tests/libslic3r/test_voronoi.cpp b/tests/libslic3r/test_voronoi.cpp
index b86f448c02..b512fe38fe 100644
--- a/tests/libslic3r/test_voronoi.cpp
+++ b/tests/libslic3r/test_voronoi.cpp
@@ -1,6 +1,14 @@
+#include <algorithm>
 #include <catch2/catch_all.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include "test_utils.hpp"
 
+#include "libslic3r/Geometry/Voronoi.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Line.hpp"
+#include <cmath>
+#include <cstddef>
+#include "libslic3r/BoundingBox.hpp"
 #include <libslic3r/Polygon.hpp>
 #include <libslic3r/Polyline.hpp>
 #include <libslic3r/EdgeGrid.hpp>
@@ -9,8 +17,11 @@
 #include <libslic3r/Geometry/VoronoiOffset.hpp>
 #include <libslic3r/Geometry/VoronoiVisualUtils.hpp>
 
+#include "libslic3r/libslic3r.h"
+#include <math.h>
 #include <numeric>
 #include <random>
+#include <vector>
 
 // #define VORONOI_DEBUG_OUT
 
diff --git a/tests/libslic3r/test_wipe_path.cpp b/tests/libslic3r/test_wipe_path.cpp
index b637ad2b87..731a8626d4 100644
--- a/tests/libslic3r/test_wipe_path.cpp
+++ b/tests/libslic3r/test_wipe_path.cpp
@@ -1,5 +1,10 @@
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_message.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include "libslic3r/GCode/WipePathHelpers.hpp"
 #include "libslic3r/AABBTreeLines.hpp"
 #include "libslic3r/Polyline.hpp"
@@ -9,7 +14,12 @@
 
 #include <algorithm>
 #include <cmath>
+#include "libslic3r/ExtrusionEntity.hpp"
+#include <cstddef>
 #include <limits>
+#include <vector>
+#include <utility>
+#include <optional>
 
 using namespace Slic3r;
 using Slic3r::AABBTreeLines::LinesDistancer;
diff --git a/tests/libslic3r/test_wipe_tower.cpp b/tests/libslic3r/test_wipe_tower.cpp
index 6f6daa74b8..9c64ae1b53 100644
--- a/tests/libslic3r/test_wipe_tower.cpp
+++ b/tests/libslic3r/test_wipe_tower.cpp
@@ -1,7 +1,17 @@
 #include <catch2/catch_all.hpp>
 
 #include <cmath>
+#include <vector>
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Point.hpp"
+#include <math.h>
+#include <utility>
+#include "libslic3r/libslic3r.h"
+#include <cstddef>
 
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/GCode/WipeTower.hpp"
diff --git a/tests/libslic3r/test_wipe_tower_estimate.cpp b/tests/libslic3r/test_wipe_tower_estimate.cpp
index 22b9b2d6c5..6f0b268801 100644
--- a/tests/libslic3r/test_wipe_tower_estimate.cpp
+++ b/tests/libslic3r/test_wipe_tower_estimate.cpp
@@ -1,5 +1,10 @@
+#include <algorithm>
 #include <catch2/catch_all.hpp>
 
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/GCode/WipeTower.hpp"
@@ -8,8 +13,14 @@
 #include "libslic3r/PrintConfig.hpp"
 
 #include <cmath>
+#include "libslic3r/Config.hpp"
+#include <cstddef>
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
 #include <numeric>
 #include <string>
+#include <vector>
 
 using namespace Slic3r;
 using Catch::Matchers::WithinAbs;
diff --git a/tests/sla_print/sla_print_tests.cpp b/tests/sla_print/sla_print_tests.cpp
index 308925a163..e095c0543a 100644
--- a/tests/sla_print/sla_print_tests.cpp
+++ b/tests/sla_print/sla_print_tests.cpp
@@ -1,14 +1,34 @@
+#include "libslic3r/TriangleMesh.hpp"
+#include "libslic3r/SLA/IndexedMesh.hpp"
+#include "libslic3r/SLA/SupportTree.hpp"
+#include "libslic3r/SLA/SupportPointGenerator.hpp"
+#include "libslic3r/MTUtils.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/SLA/SupportPoint.hpp"
+#include "libslic3r/Point.hpp"
+#include <cstddef>
+#include "libslic3r/SLA/Pad.hpp"
+#include "libslic3r/SLA/RasterBase.hpp"
+#include "libslic3r/SLA/AGGRaster.hpp"
+#include <cstdlib>
+#include "libslic3r/SLA/SupportTreeBuilder.hpp"
+#include "libslic3r/Execution/Execution.hpp"
+#include "libslic3r/Execution/ExecutionTBB.hpp"
 #include <unordered_set>
 #include <unordered_map>
 #include <random>
 #include <numeric>
 #include <cstdint>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_approx.hpp>
 #include "sla_test_utils.hpp"
+#include "test_utils.hpp"
 
 #include <libslic3r/TriangleMeshSlicer.hpp>
 #include <libslic3r/SLA/SupportTreeMesher.hpp>
 #include <libslic3r/SLA/Concurrency.hpp>
+#include <vector>
 
 namespace {
 
diff --git a/tests/sla_print/sla_raycast_tests.cpp b/tests/sla_print/sla_raycast_tests.cpp
index 8a520a241f..e050e35845 100644
--- a/tests/sla_print/sla_raycast_tests.cpp
+++ b/tests/sla_print/sla_raycast_tests.cpp
@@ -1,8 +1,15 @@
+#include <array>
 #include <catch2/catch_all.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_approx.hpp>
 #include "test_utils.hpp"
 
+#include "libslic3r/Point.hpp"
+#include <cstdlib>
+#include <cmath>
 #include <libslic3r/SLA/IndexedMesh.hpp>
 #include <libslic3r/SLA/Hollowing.hpp>
+#include <utility>
 
 #include "sla_test_utils.hpp"
 
diff --git a/tests/sla_print/sla_supptgen_tests.cpp b/tests/sla_print/sla_supptgen_tests.cpp
index 32f049d78e..091bfa2d66 100644
--- a/tests/sla_print/sla_supptgen_tests.cpp
+++ b/tests/sla_print/sla_supptgen_tests.cpp
@@ -1,8 +1,21 @@
+#include <algorithm>
 #include <catch2/catch_all.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include "test_utils.hpp"
 
+#include <cstddef>
+#include <iterator>
 #include <libslic3r/ExPolygon.hpp>
 #include <libslic3r/BoundingBox.hpp>
+#include "libslic3r/TriangleMesh.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/SLA/SupportPoint.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/SLA/SpatIndex.hpp"
+#include <limits>
+#include "libslic3r/SLA/SupportPointGenerator.hpp"
+#include "libslic3r/Line.hpp"
+#include "libslic3r/SLA/Hollowing.hpp"
 
 #include "sla_test_utils.hpp"
 
diff --git a/tests/sla_print/sla_test_utils.cpp b/tests/sla_print/sla_test_utils.cpp
index 8951bb3853..2a769692c8 100644
--- a/tests/sla_print/sla_test_utils.cpp
+++ b/tests/sla_print/sla_test_utils.cpp
@@ -1,8 +1,39 @@
 #include "sla_test_utils.hpp"
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/interfaces/catch_interfaces_capture.hpp>
+#include <catch2/catch_approx.hpp>
 #include "libslic3r/TriangleMeshSlicer.hpp"
 #include "libslic3r/SLA/AGGRaster.hpp"
+#include "test_utils.hpp"
 
+#include <cstddef>
+#include <cstdlib>
+#include <algorithm>
+#include <cmath>
 #include <iomanip>
+#include <string>
+#include "libslic3r/SLA/SupportTree.hpp"
+#include "libslic3r/SLA/Hollowing.hpp"
+#include <vector>
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/ClipperUtils.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
+#include <sstream>
+#include "libslic3r/SVG.hpp"
+#include "libslic3r/TriangleMesh.hpp"
+#include "libslic3r/MTUtils.hpp"
+#include "libslic3r/SLA/IndexedMesh.hpp"
+#include "libslic3r/SLA/SupportPointGenerator.hpp"
+#include "libslic3r/SLA/SupportPoint.hpp"
+#include "libslic3r/SLA/SupportTreeBuildsteps.hpp"
+#include <utility>
+#include "libslic3r/SLA/SupportTreeBuilder.hpp"
+#include "libslic3r/SLA/Pad.hpp"
+#include "libslic3r/SLA/ConcaveHull.hpp"
+#include "libslic3r/SLA/RasterBase.hpp"
+#include "libslic3r/BoundingBox.hpp"
 
 void test_support_model_collision(const std::string          &obj_filename,
                                   const sla::SupportTreeConfig   &input_supportcfg,
diff --git a/tests/sla_print/sla_test_utils.hpp b/tests/sla_print/sla_test_utils.hpp
index 1d27030c9d..03d4bfd3c9 100644
--- a/tests/sla_print/sla_test_utils.hpp
+++ b/tests/sla_print/sla_test_utils.hpp
@@ -2,11 +2,26 @@
 #define SLA_TEST_UTILS_HPP
 
 #include <catch2/catch_all.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include "test_utils.hpp"
 
 // Debug
+#include <cstddef>
+#include <climits>
+#include <cmath>
+#include <cstdint>
 #include <fstream>
+#include <string>
+#include "libslic3r/SLA/SupportTree.hpp"
+#include "libslic3r/SLA/Hollowing.hpp"
+#include <unordered_map>
+#include <random>
+#include <type_traits>
+#include "libslic3r/SLA/RasterBase.hpp"
+#include "libslic3r/SLA/SupportPoint.hpp"
 #include <unordered_set>
+#include <vector>
+#include <utility>
 
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Format/OBJ.hpp"
diff --git a/tests/slic3rutils/plugin_test_utils.hpp b/tests/slic3rutils/plugin_test_utils.hpp
index cbdcf1ff95..133a5aac9e 100644
--- a/tests/slic3rutils/plugin_test_utils.hpp
+++ b/tests/slic3rutils/plugin_test_utils.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <boost/filesystem/path.hpp>
 #include <libslic3r/Utils.hpp>
 
 #include <boost/filesystem.hpp>
diff --git a/tests/slic3rutils/python_test_support.hpp b/tests/slic3rutils/python_test_support.hpp
index 29747a88c4..e9b0aaac8d 100644
--- a/tests/slic3rutils/python_test_support.hpp
+++ b/tests/slic3rutils/python_test_support.hpp
@@ -4,7 +4,9 @@
 // interpreter (test_plugin_host_api.cpp, test_slicing_pipeline_bindings.cpp, ...).
 #include <boost/dll/runtime_symbol_info.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <memory.h>
+#include <memory>
 #include <stdexcept>
 #include <string>
 #include <pybind11/embed.h>
diff --git a/tests/slic3rutils/slic3rutils_tests_main.cpp b/tests/slic3rutils/slic3rutils_tests_main.cpp
index 176e34a5df..f8d2b4fac5 100644
--- a/tests/slic3rutils/slic3rutils_tests_main.cpp
+++ b/tests/slic3rutils/slic3rutils_tests_main.cpp
@@ -1,5 +1,6 @@
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_test_macros.hpp>
 #include "slic3r/Utils/Http.hpp"
 
 TEST_CASE("Check SSL certificates paths", "[Http][NotWorking]") {
diff --git a/tests/slic3rutils/test_action_source.cpp b/tests/slic3rutils/test_action_source.cpp
index 8dc4404419..315721ca9b 100644
--- a/tests/slic3rutils/test_action_source.cpp
+++ b/tests/slic3rutils/test_action_source.cpp
@@ -1,11 +1,15 @@
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <catch2/catch_test_macros.hpp>
 
+#include <catch2/catch_message.hpp>
 #include "slic3r/GUI/ActionRegistry.hpp"
 #include "slic3r/GUI/NativeCommands.hpp"
 #include "slic3r/GUI/SettingsIndex.hpp"
 
 #include <boost/filesystem.hpp>
 
+#include "libslic3r/Config.hpp"
 #include <memory>
 #include <set>
 #include <string>
diff --git a/tests/slic3rutils/test_bambu_filament_ids.cpp b/tests/slic3rutils/test_bambu_filament_ids.cpp
index 5f6215d7ca..7d9e0df1f1 100644
--- a/tests/slic3rutils/test_bambu_filament_ids.cpp
+++ b/tests/slic3rutils/test_bambu_filament_ids.cpp
@@ -2,7 +2,9 @@
 #include <boost/filesystem.hpp>
 #include <boost/nowide/fstream.hpp>
 #include <nlohmann/json.hpp>
+#include <string>
 
+#include <catch2/catch_test_macros.hpp>
 #include "libslic3r/Utils.hpp"
 #include "slic3r/Utils/BBLPrinterAgent.hpp"
 #include "slic3r/Utils/OrcaPrinterAgent.hpp"
diff --git a/tests/slic3rutils/test_creality_cfs_match.cpp b/tests/slic3rutils/test_creality_cfs_match.cpp
index 06606684b7..6b8faf4b79 100644
--- a/tests/slic3rutils/test_creality_cfs_match.cpp
+++ b/tests/slic3rutils/test_creality_cfs_match.cpp
@@ -1,4 +1,6 @@
+#include <algorithm>
 #include <catch2/catch_test_macros.hpp>
+#include <vector>
 
 #include "libslic3r/Preset.hpp"
 #include "libslic3r/PresetBundle.hpp"
diff --git a/tests/slic3rutils/test_dev_mapping.cpp b/tests/slic3rutils/test_dev_mapping.cpp
index 658117d2e4..4e32bcc20d 100644
--- a/tests/slic3rutils/test_dev_mapping.cpp
+++ b/tests/slic3rutils/test_dev_mapping.cpp
@@ -13,6 +13,12 @@
     #include <Windows.h>
 #endif
 
+#include <catch2/catch_test_macros.hpp>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include "libslic3r/ProjectTask.hpp"
+#include <vector>
+#include <catch2/catch_message.hpp>
+
 #include <catch2/catch_all.hpp>
 
 #include <wx/timer.h>
diff --git a/tests/slic3rutils/test_device_manager_integration.cpp b/tests/slic3rutils/test_device_manager_integration.cpp
index 2b042d4f8e..7e58dc7696 100644
--- a/tests/slic3rutils/test_device_manager_integration.cpp
+++ b/tests/slic3rutils/test_device_manager_integration.cpp
@@ -1,8 +1,11 @@
+#include <catch2/catch_test_macros.hpp>
 #include <catch2/catch_all.hpp>
 
 #include <slic3r/GUI/DeviceCore/DevManager.h>
 #include <slic3r/GUI/DeviceManager.hpp>
 #include <libslic3r/AppConfig.hpp>
+#include "slic3r/Utils/IPrinterAgent.hpp"
+#include "slic3r/Utils/CloudProvider.hpp"
 #include <slic3r/Utils/NetworkAgent.hpp>
 #include <slic3r/Utils/OrcaCloudServiceAgent.hpp>
 #include <slic3r/Utils/OrcaPrinterAgent.hpp>
diff --git a/tests/slic3rutils/test_device_progress.cpp b/tests/slic3rutils/test_device_progress.cpp
index 96dead46f0..3d42b012a2 100644
--- a/tests/slic3rutils/test_device_progress.cpp
+++ b/tests/slic3rutils/test_device_progress.cpp
@@ -12,6 +12,9 @@
     #include <Windows.h>
 #endif
 
+#include <catch2/catch_test_macros.hpp>
+#include "libslic3r/ProjectTask.hpp"
+
 #include <catch2/catch_all.hpp>
 
 #include <stdexcept>
diff --git a/tests/slic3rutils/test_filament_bitmap_utils.cpp b/tests/slic3rutils/test_filament_bitmap_utils.cpp
index 997a119521..df5bba0567 100644
--- a/tests/slic3rutils/test_filament_bitmap_utils.cpp
+++ b/tests/slic3rutils/test_filament_bitmap_utils.cpp
@@ -11,6 +11,12 @@
     #include <Windows.h>
 #endif
 
+#include <string>
+#include "libslic3r/Config.hpp"
+#include <vector>
+#include <catch2/catch_test_macros.hpp>
+#include <cstddef>
+
 #include <catch2/catch_all.hpp>
 
 #include <cmath>
diff --git a/tests/slic3rutils/test_file_url.cpp b/tests/slic3rutils/test_file_url.cpp
index 484067b57e..f22b21612a 100644
--- a/tests/slic3rutils/test_file_url.cpp
+++ b/tests/slic3rutils/test_file_url.cpp
@@ -1,10 +1,13 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/generators/catch_generators.hpp>
 
+#include <catch2/catch_message.hpp>
 #include "slic3r/GUI/GUI.hpp"
 
 #include <boost/filesystem/path.hpp>
 
+#include <string>
+#include <wx/string.h>
 #include <wx/uri.h>
 
 using namespace Slic3r::GUI;
diff --git a/tests/slic3rutils/test_lazy.cpp b/tests/slic3rutils/test_lazy.cpp
index c04a27e9d1..156c478791 100644
--- a/tests/slic3rutils/test_lazy.cpp
+++ b/tests/slic3rutils/test_lazy.cpp
@@ -2,9 +2,12 @@
 
 #include <functional>
 #include <memory>
+#include "slic3r/GUI/StagedBuild.hpp"
 #include <stdexcept>
+#include <utility>
 #include <vector>
 
+#include <catch2/catch_test_macros.hpp>
 #include "slic3r/GUI/Lazy.hpp"
 
 using Slic3r::GUI::Lazy;
diff --git a/tests/slic3rutils/test_network_versions.cpp b/tests/slic3rutils/test_network_versions.cpp
index 349082a965..bfddcb5423 100644
--- a/tests/slic3rutils/test_network_versions.cpp
+++ b/tests/slic3rutils/test_network_versions.cpp
@@ -1,8 +1,13 @@
+#include <boost/filesystem/operations.hpp>
 #include <catch2/catch_all.hpp>
 
 #include <boost/filesystem.hpp>
 #include <boost/nowide/fstream.hpp>
+#include <vector>
+#include "libslic3r/AppConfig.hpp"
+#include <cstddef>
 
+#include <catch2/catch_test_macros.hpp>
 #include "libslic3r/Utils.hpp"
 #include "slic3r/Utils/bambu_networking.hpp"
 
diff --git a/tests/slic3rutils/test_orca_cloud_agent.cpp b/tests/slic3rutils/test_orca_cloud_agent.cpp
index 5f325751cb..8657310f27 100644
--- a/tests/slic3rutils/test_orca_cloud_agent.cpp
+++ b/tests/slic3rutils/test_orca_cloud_agent.cpp
@@ -1,3 +1,5 @@
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <catch2/catch_all.hpp>
 
 #include <boost/filesystem.hpp>
@@ -6,6 +8,7 @@
 #include <memory>
 #include <string>
 
+#include <catch2/catch_test_macros.hpp>
 #include "slic3r/Utils/OrcaCloudServiceAgent.hpp"
 #include "test_utils.hpp"
 
diff --git a/tests/slic3rutils/test_plugin_audit.cpp b/tests/slic3rutils/test_plugin_audit.cpp
index 71ce692671..ca8c46fabd 100644
--- a/tests/slic3rutils/test_plugin_audit.cpp
+++ b/tests/slic3rutils/test_plugin_audit.cpp
@@ -1,3 +1,5 @@
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <catch2/catch_all.hpp>
 
 #include <libslic3r/Utils.hpp>
@@ -5,6 +7,8 @@
 #include <slic3r/plugin/PluginAuditManager.hpp>
 #include <slic3r/Utils/OrcaCloudServiceAgent.hpp> // secret_constants::USER_SECRET_FILENAME
 
+#include <catch2/catch_test_macros.hpp>
+#include "libslic3r_version.h"
 #include "plugin_test_utils.hpp"
 
 #include <boost/filesystem.hpp>
diff --git a/tests/slic3rutils/test_plugin_capabilities_in_use.cpp b/tests/slic3rutils/test_plugin_capabilities_in_use.cpp
index 16ba6e91ac..e33c9980dd 100644
--- a/tests/slic3rutils/test_plugin_capabilities_in_use.cpp
+++ b/tests/slic3rutils/test_plugin_capabilities_in_use.cpp
@@ -1,5 +1,7 @@
+#include <catch2/catch_test_macros.hpp>
 #include <catch2/catch_all.hpp>
 
+#include "libslic3r/Config.hpp"
 #include <libslic3r/Preset.hpp>
 #include <libslic3r/PrintConfig.hpp>
 #include <slic3r/plugin/PluginResolver.hpp>
diff --git a/tests/slic3rutils/test_plugin_capability_config.cpp b/tests/slic3rutils/test_plugin_capability_config.cpp
index 39ecd1002d..34c380bba9 100644
--- a/tests/slic3rutils/test_plugin_capability_config.cpp
+++ b/tests/slic3rutils/test_plugin_capability_config.cpp
@@ -1,5 +1,6 @@
 #include <catch2/catch_all.hpp>
 
+#include <exception>
 #include <libslic3r/Utils.hpp>
 #include <slic3r/plugin/PluginConfig.hpp>
 #include <slic3r/plugin/PluginManager.hpp>
@@ -7,7 +8,11 @@
 #include <slic3r/plugin/PythonPluginBridge.hpp>
 #include <slic3r/plugin/PythonPluginInterface.hpp>
 
+#include <catch2/catch_test_macros.hpp>
 #include "plugin_test_utils.hpp"
+#include <pybind11/pytypes.h>
+#include <pybind11/eval.h>
+#include <pybind11/gil.h>
 
 #include <nlohmann/json.hpp>
 #include <pybind11/embed.h>
diff --git a/tests/slic3rutils/test_plugin_cloud_metadata.cpp b/tests/slic3rutils/test_plugin_cloud_metadata.cpp
index 241ef3ed90..09ac877eca 100644
--- a/tests/slic3rutils/test_plugin_cloud_metadata.cpp
+++ b/tests/slic3rutils/test_plugin_cloud_metadata.cpp
@@ -1,5 +1,8 @@
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <catch2/catch_all.hpp>
 
+#include <ios>
 #include <libslic3r/Utils.hpp>
 #include <slic3r/plugin/PluginConfig.hpp>
 #include <slic3r/plugin/PluginDescriptor.hpp>
@@ -8,6 +11,8 @@
 #include <slic3r/plugin/PythonInterpreter.hpp>
 #include <slic3r/plugin/PythonPluginInterface.hpp>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_message.hpp>
 #include "plugin_test_utils.hpp"
 
 #include <boost/filesystem.hpp>
diff --git a/tests/slic3rutils/test_plugin_config.cpp b/tests/slic3rutils/test_plugin_config.cpp
index 99de5e53db..ac7bae36be 100644
--- a/tests/slic3rutils/test_plugin_config.cpp
+++ b/tests/slic3rutils/test_plugin_config.cpp
@@ -1,15 +1,20 @@
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <catch2/catch_all.hpp>
 
+#include <ios>
 #include <libslic3r/Utils.hpp>
 #include <slic3r/plugin/PluginConfig.hpp>
 #include <slic3r/plugin/PluginManager.hpp>
 
+#include <catch2/catch_test_macros.hpp>
 #include "plugin_test_utils.hpp"
 
 #include <boost/filesystem.hpp>
 #include <boost/nowide/fstream.hpp>
 #include <nlohmann/json.hpp>
 
+#include "slic3r/plugin/PythonPluginInterface.hpp"
 #include <string>
 
 using namespace Slic3r;
diff --git a/tests/slic3rutils/test_plugin_host_api.cpp b/tests/slic3rutils/test_plugin_host_api.cpp
index 0283bb5744..7919b273db 100644
--- a/tests/slic3rutils/test_plugin_host_api.cpp
+++ b/tests/slic3rutils/test_plugin_host_api.cpp
@@ -1,5 +1,6 @@
 #include <catch2/catch_all.hpp>
 
+#include <cstddef>
 #include <libslic3r/Model.hpp>
 #include <libslic3r/PresetBundle.hpp>
 #include <libslic3r/TriangleMesh.hpp>
@@ -8,7 +9,13 @@
 #include <slic3r/GUI/Widgets/WebHosting.hpp>
 #include <slic3r/plugin/PythonPluginBridge.hpp>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_message.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
 #include "plugin_test_utils.hpp"
+#include <pybind11/pytypes.h>
+#include <pybind11/cast.h>
 #include "python_test_support.hpp"
 
 #include <pybind11/embed.h>
@@ -16,6 +23,7 @@
 
 #include <string>
 
+#include <wx/string.h>
 #include <wx/uri.h>
 
 namespace py = pybind11;
diff --git a/tests/slic3rutils/test_plugin_install.cpp b/tests/slic3rutils/test_plugin_install.cpp
index ae16703fa6..539bd917e0 100644
--- a/tests/slic3rutils/test_plugin_install.cpp
+++ b/tests/slic3rutils/test_plugin_install.cpp
@@ -1,10 +1,16 @@
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <catch2/catch_all.hpp>
 
+#include <ios>
 #include <libslic3r/Utils.hpp>
 #include <slic3r/plugin/PluginLoader.hpp>
 #include <slic3r/plugin/PluginDescriptor.hpp>
 #include <slic3r/plugin/PluginFsUtils.hpp>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_string.hpp>
 #include "plugin_test_utils.hpp"
 
 #include <boost/filesystem.hpp>
diff --git a/tests/slic3rutils/test_plugin_lifecycle.cpp b/tests/slic3rutils/test_plugin_lifecycle.cpp
index d90a166835..0c0399e2d3 100644
--- a/tests/slic3rutils/test_plugin_lifecycle.cpp
+++ b/tests/slic3rutils/test_plugin_lifecycle.cpp
@@ -1,13 +1,19 @@
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <catch2/catch_all.hpp>
 
+#include <ios>
 #include <libslic3r/LifecycleEvents.hpp>
 #include <libslic3r/Utils.hpp>
+#include <memory>
 #include <slic3r/Utils/NetworkAgentFactory.hpp>
 #include <slic3r/plugin/PluginDescriptor.hpp>
 #include <slic3r/plugin/PluginManager.hpp>
 #include <slic3r/plugin/PluginFsUtils.hpp>
 #include <slic3r/plugin/PythonInterpreter.hpp>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_message.hpp>
 #include "plugin_test_utils.hpp"
 
 #include <boost/filesystem.hpp>
@@ -17,8 +23,10 @@
 #include <condition_variable>
 #include <fstream>
 #include <mutex>
+#include "slic3r/plugin/PythonPluginInterface.hpp"
 #include <string>
 #include <thread>
+#include <utility>
 #include <vector>
 
 using namespace Slic3r;
diff --git a/tests/slic3rutils/test_plugin_printer_agent.cpp b/tests/slic3rutils/test_plugin_printer_agent.cpp
index c1bba8a88e..50570f8712 100644
--- a/tests/slic3rutils/test_plugin_printer_agent.cpp
+++ b/tests/slic3rutils/test_plugin_printer_agent.cpp
@@ -1,5 +1,6 @@
 #include <catch2/catch_all.hpp>
 
+#include "slic3r/Utils/bambu_networking.hpp"
 #include <slic3r/plugin/PluginManager.hpp>
 #include <slic3r/plugin/PythonInterpreter.hpp>
 #include <slic3r/plugin/PythonPluginBridge.hpp>
@@ -12,7 +13,11 @@
 #include <memory>
 #include <string>
 
+#include <catch2/catch_test_macros.hpp>
 #include "plugin_test_utils.hpp"
+#include <pybind11/pytypes.h>
+#include <pybind11/eval.h>
+#include <pybind11/gil.h>
 
 namespace py = pybind11;
 using namespace Slic3r;
diff --git a/tests/slic3rutils/test_plugin_sort.cpp b/tests/slic3rutils/test_plugin_sort.cpp
index 58db799dd8..8af2ce3b5b 100644
--- a/tests/slic3rutils/test_plugin_sort.cpp
+++ b/tests/slic3rutils/test_plugin_sort.cpp
@@ -1,7 +1,10 @@
+#include <catch2/catch_test_macros.hpp>
 #include <catch2/catch_all.hpp>
 
 #include <slic3r/GUI/PluginSort.hpp>
 
+#include "slic3r/GUI/PluginSource.hpp"
+#include "slic3r/GUI/PluginStatus.hpp"
 #include <string>
 #include <vector>
 
diff --git a/tests/slic3rutils/test_plugin_status.cpp b/tests/slic3rutils/test_plugin_status.cpp
index c51c54c6c6..ab206c22ce 100644
--- a/tests/slic3rutils/test_plugin_status.cpp
+++ b/tests/slic3rutils/test_plugin_status.cpp
@@ -1,3 +1,4 @@
+#include <catch2/catch_test_macros.hpp>
 #include <catch2/catch_all.hpp>
 
 #include <slic3r/GUI/PluginStatus.hpp>
diff --git a/tests/slic3rutils/test_prebuild_queue.cpp b/tests/slic3rutils/test_prebuild_queue.cpp
index 8cc5444345..dc797ca60a 100644
--- a/tests/slic3rutils/test_prebuild_queue.cpp
+++ b/tests/slic3rutils/test_prebuild_queue.cpp
@@ -1,8 +1,10 @@
 #include <catch2/catch_all.hpp>
 
+#include "slic3r/GUI/Lazy.hpp"
 #include <string>
 #include <vector>
 
+#include <catch2/catch_test_macros.hpp>
 #include "slic3r/GUI/PrebuildQueue.hpp"
 
 using Slic3r::GUI::LazyBase;
diff --git a/tests/slic3rutils/test_precise_seam_plugin.cpp b/tests/slic3rutils/test_precise_seam_plugin.cpp
index 244a4c3405..0375b96b9e 100644
--- a/tests/slic3rutils/test_precise_seam_plugin.cpp
+++ b/tests/slic3rutils/test_precise_seam_plugin.cpp
@@ -1,7 +1,11 @@
 #include <catch2/catch_all.hpp>
 
+#include <catch2/catch_test_macros.hpp>
 #include "libslic3r/Model.hpp"
 #include "libslic3r/TriangleMesh.hpp"
+#include <pybind11/gil.h>
+#include <pybind11/pytypes.h>
+#include <pybind11/cast.h>
 #include "python_test_support.hpp"
 
 #include <pybind11/embed.h>
diff --git a/tests/slic3rutils/test_printer_agent.cpp b/tests/slic3rutils/test_printer_agent.cpp
index 1418001205..8113326cc2 100644
--- a/tests/slic3rutils/test_printer_agent.cpp
+++ b/tests/slic3rutils/test_printer_agent.cpp
@@ -1,8 +1,14 @@
 #include <catch2/catch_all.hpp>
 
+#include <memory>
+#include "slic3r/Utils/ICloudServiceAgent.hpp"
+#include "slic3r/Utils/IPrinterAgent.hpp"
 #include <slic3r/Utils/NetworkAgentFactory.hpp>
 #include <slic3r/plugin/PythonPluginBridge.hpp>
 
+#include <catch2/catch_test_macros.hpp>
+#include <pybind11/pytypes.h>
+#include <catch2/catch_message.hpp>
 #include "python_test_support.hpp"
 
 #include <pybind11/embed.h>
diff --git a/tests/slic3rutils/test_printhost.cpp b/tests/slic3rutils/test_printhost.cpp
index c4df56ebb6..c7ce9dccaa 100644
--- a/tests/slic3rutils/test_printhost.cpp
+++ b/tests/slic3rutils/test_printhost.cpp
@@ -3,10 +3,18 @@
 #include <memory>
 #include <stdexcept>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <nlohmann/json.hpp>
+#include <wx/string.h>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_message.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_string.hpp>
+#include <catch2/generators/catch_generators_range.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include "libslic3r/LifecycleEvents.hpp"
 #include "slic3r/Utils/PrintHost.hpp"
 #include "slic3r/Utils/Flashforge.hpp"
diff --git a/tests/slic3rutils/test_scene_raycaster.cpp b/tests/slic3rutils/test_scene_raycaster.cpp
index d51671e5c5..a1be46f216 100644
--- a/tests/slic3rutils/test_scene_raycaster.cpp
+++ b/tests/slic3rutils/test_scene_raycaster.cpp
@@ -11,6 +11,16 @@
     #include <CommCtrl.h>
 #endif
 
+#include <catch2/catch_test_macros.hpp>
+#include "slic3r/GUI/MeshUtils.hpp"
+#include "libslic3r/Point.hpp"
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <catch2/generators/catch_generators.hpp>
+#include "libslic3r/TriangleMesh.hpp"
+#include "libslic3r/Geometry.hpp"
+#include <catch2/generators/catch_generators_range.hpp>
+
 #include <catch2/catch_all.hpp>
 
 #include "slic3r/GUI/Camera.hpp"
diff --git a/tests/slic3rutils/test_shortcuts.cpp b/tests/slic3rutils/test_shortcuts.cpp
index 350e87f48a..ed7975b1e5 100644
--- a/tests/slic3rutils/test_shortcuts.cpp
+++ b/tests/slic3rutils/test_shortcuts.cpp
@@ -1,10 +1,16 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/generators/catch_generators.hpp>
 
+#include <catch2/catch_message.hpp>
 #include "libslic3r/AppConfig.hpp"
 #include "slic3r/GUI/KeyChord.hpp"
 #include "slic3r/GUI/Shortcuts.hpp"
 
+#include <wx/accel.h>
+#include <string>
+#include <vector>
+#include <cstddef>
+#include <optional>
 #include <wx/event.h>
 
 using namespace Slic3r;
diff --git a/tests/slic3rutils/test_slicing_pipeline_bindings.cpp b/tests/slic3rutils/test_slicing_pipeline_bindings.cpp
index 5e819c09e0..7552fe15af 100644
--- a/tests/slic3rutils/test_slicing_pipeline_bindings.cpp
+++ b/tests/slic3rutils/test_slicing_pipeline_bindings.cpp
@@ -1,4 +1,18 @@
 #include <catch2/catch_test_macros.hpp>
+#include <pybind11/gil.h>
+#include <pybind11/pybind11.h>
+#include <pybind11/pytypes.h>
+#include "libslic3r/libslic3r.h"
+#include <pybind11/cast.h>
+#include <pybind11/eval.h>
+#include <catch2/matchers/catch_matchers.hpp>
+#include "libslic3r/Config.hpp"
+#include "libslic3r/Print.hpp"
+#include <cstddef>
+#include "libslic3r/SurfaceCollection.hpp"
+#include "libslic3r/Polygon.hpp"
+#include <initializer_list>
+#include <utility>
 #include "slic3r/plugin/PythonPluginInterface.hpp"
 using namespace Slic3r;
 
diff --git a/tests/slic3rutils/test_slicing_pipeline_config.cpp b/tests/slic3rutils/test_slicing_pipeline_config.cpp
index 37984cff34..1e8e728f4d 100644
--- a/tests/slic3rutils/test_slicing_pipeline_config.cpp
+++ b/tests/slic3rutils/test_slicing_pipeline_config.cpp
@@ -1,13 +1,26 @@
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <catch2/catch_all.hpp>
 
+#include <ios>
+#include <chrono>
+#include "libslic3r/Print.hpp"
+#include "libslic3r/Model.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Config.hpp"
 #include <libslic3r/Utils.hpp>
 #include <slic3r/plugin/PluginConfig.hpp>
+#include "slic3r/plugin/PluginFsUtils.hpp"
 #include <slic3r/plugin/PluginManager.hpp>
 #include <slic3r/plugin/PythonInterpreter.hpp>
 #include <slic3r/plugin/PythonPluginInterface.hpp>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_message.hpp>
 #include "fff_print/test_helpers.hpp"
 #include "plugin_test_utils.hpp"
+#include <pybind11/pybind11.h>
+#include <pybind11/pytypes.h>
 
 #include <boost/filesystem.hpp>
 #include <nlohmann/json.hpp>
diff --git a/tests/slic3rutils/test_staged_build.cpp b/tests/slic3rutils/test_staged_build.cpp
index 3afcd9e5fc..df56d0c6e7 100644
--- a/tests/slic3rutils/test_staged_build.cpp
+++ b/tests/slic3rutils/test_staged_build.cpp
@@ -2,6 +2,7 @@
 
 #include <vector>
 
+#include <catch2/catch_test_macros.hpp>
 #include "slic3r/GUI/StagedBuild.hpp"
 
 using Slic3r::GUI::StagedBuild;
diff --git a/tests/slic3rutils/test_user_manager.cpp b/tests/slic3rutils/test_user_manager.cpp
index cfccebe1cc..3c60552f22 100644
--- a/tests/slic3rutils/test_user_manager.cpp
+++ b/tests/slic3rutils/test_user_manager.cpp
@@ -2,6 +2,8 @@
 
 #include <string>
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include "slic3r/GUI/UserManager.hpp"
 
 using namespace Slic3r;
diff --git a/tests/slic3rutils/test_web_media_controller.cpp b/tests/slic3rutils/test_web_media_controller.cpp
index cdf756ca3a..fdf271fe10 100644
--- a/tests/slic3rutils/test_web_media_controller.cpp
+++ b/tests/slic3rutils/test_web_media_controller.cpp
@@ -1,7 +1,15 @@
+#include <catch2/catch_test_macros.hpp>
 #include <catch2/catch_all.hpp>
 
 #include <slic3r/GUI/WebMediaController.hpp>
 
+#include <wx/colour.h>
+#include <wx/gdicmn.h>
+#include <wx/string.h>
+#include <wx/sharedptr.h>
+#include <wx/vector.h>
+#include "slic3r/Utils/IPrinterAgent.hpp"
+#include <wx/uri.h>
 #include <wx/webview.h>
 
 #include <string>
diff --git a/tests/test_utils.hpp b/tests/test_utils.hpp
index 0b04e6ad11..d0817ce128 100644
--- a/tests/test_utils.hpp
+++ b/tests/test_utils.hpp
@@ -1,6 +1,9 @@
 #ifndef SLIC3R_TEST_UTILS
 #define SLIC3R_TEST_UTILS
 
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
+#include "libslic3r/BoundingBox.hpp"
 #include <libslic3r/TriangleMesh.hpp>
 #include <libslic3r/Format/OBJ.hpp>
 #include <libslic3r/SVG.hpp>