From 1d577ea4e219d3fcd56ed52648c5d0b1cb8dce8e Mon Sep 17 00:00:00 2001
From: Kris Austin <kris.austin@gmail.com>
Date: Mon, 5 Oct 2026 19:49:32 -0500
Subject: [PATCH] build: add the missing includes only a Windows build reports
 (#16110)

---
 .clang-tidy                                       | 1 +
 src/OrcaSlicer.cpp                                | 2 ++
 src/OrcaSlicer_app_msvc.cpp                       | 1 +
 src/dev-utils/BaseException.cpp                   | 8 ++++++++
 src/dev-utils/BaseException.h                     | 2 ++
 src/dev-utils/StackWalker.cpp                     | 3 +++
 src/dev-utils/StackWalker.h                       | 1 +
 src/libslic3r/AppConfig.cpp                       | 3 +++
 src/libslic3r/BlacklistedLibraryCheck.cpp         | 3 +++
 src/libslic3r/Emboss.cpp                          | 1 +
 src/libslic3r/Feature/FuzzySkin/FuzzySkin.cpp     | 1 +
 src/libslic3r/GCode.cpp                           | 1 +
 src/libslic3r/InstanceLock.cpp                    | 1 +
 src/libslic3r/LocalesUtils.cpp                    | 1 +
 src/libslic3r/Thread.cpp                          | 1 +
 src/libslic3r/utils.cpp                           | 1 +
 src/slic3r/GUI/Auxiliary.cpp                      | 2 ++
 src/slic3r/GUI/BackgroundSlicingProcess.cpp       | 3 +++
 src/slic3r/GUI/ConfigWizard_private.hpp           | 1 +
 src/slic3r/GUI/Downloader.cpp                     | 1 +
 src/slic3r/GUI/ExtraRenderers.cpp                 | 1 +
 src/slic3r/GUI/Field.cpp                          | 1 +
 src/slic3r/GUI/FilamentPickerDialog.cpp           | 1 +
 src/slic3r/GUI/GUI_App.cpp                        | 6 ++++++
 src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp      | 1 +
 src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp        | 1 +
 src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp  | 1 +
 src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp             | 1 +
 src/slic3r/GUI/Gizmos/GLGizmoUtils.cpp            | 1 +
 src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp | 1 +
 src/slic3r/GUI/InstanceCheck.cpp                  | 2 ++
 src/slic3r/GUI/InstanceCheck.hpp                  | 1 +
 src/slic3r/GUI/MainFrame.cpp                      | 3 +++
 src/slic3r/GUI/MediaPlayCtrl.cpp                  | 1 +
 src/slic3r/GUI/Mouse3DController.cpp              | 2 ++
 src/slic3r/GUI/MultiMachineManagerPage.cpp        | 1 +
 src/slic3r/GUI/MultiMachinePage.cpp               | 1 +
 src/slic3r/GUI/MultiTaskManagerPage.cpp           | 1 +
 src/slic3r/GUI/PostProcessor.cpp                  | 4 ++++
 src/slic3r/GUI/PresetComboBoxes.cpp               | 1 +
 src/slic3r/GUI/PrinterWebViewHandler.cpp          | 1 +
 src/slic3r/GUI/RemovableDriveManager.cpp          | 1 +
 src/slic3r/GUI/RemovableDriveManager.hpp          | 1 +
 src/slic3r/GUI/SelectMachinePop.cpp               | 1 +
 src/slic3r/GUI/SendMultiMachinePage.cpp           | 1 +
 src/slic3r/GUI/SendSystemInfoDialog.cpp           | 3 +++
 src/slic3r/GUI/StatusPanel.cpp                    | 1 +
 src/slic3r/GUI/Tab.cpp                            | 1 +
 src/slic3r/GUI/TextureImportDialog.cpp            | 1 +
 src/slic3r/GUI/WebViewDialog.cpp                  | 1 +
 src/slic3r/GUI/Widgets/LabeledStaticBox.cpp       | 1 +
 src/slic3r/GUI/Widgets/ProgressDialog.cpp         | 3 +++
 src/slic3r/GUI/Widgets/TextCtrl.h                 | 1 +
 src/slic3r/GUI/Widgets/WebView.cpp                | 6 ++++++
 src/slic3r/GUI/dark_mode.cpp                      | 3 +++
 src/slic3r/GUI/dark_mode/IatHook.hpp              | 3 +++
 src/slic3r/GUI/dark_mode/dark_mode.hpp            | 1 +
 src/slic3r/GUI/format.hpp                         | 1 +
 src/slic3r/GUI/wxExtensions.cpp                   | 1 +
 src/slic3r/GUI/wxMediaCtrl3.cpp                   | 1 +
 src/slic3r/Utils/BBLNetworkPlugin.cpp             | 3 +++
 src/slic3r/Utils/ElegooLink.cpp                   | 1 +
 src/slic3r/Utils/OctoPrint.cpp                    | 2 ++
 tests/libslic3r/test_instance_lock.cpp            | 1 +
 64 files changed, 110 insertions(+)

diff --git a/.clang-tidy b/.clang-tidy
index 0acb13bb49..ed2378536e 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -61,6 +61,7 @@ CheckOptions:
     termios\.h;
     [/\\](um|shared)[/\\].*;
     sal\.h;
+    tchar\.h;
     clipper[/\\]clipper\.hpp;
     png(lib)?conf\.h;
     mcut[/\\]platform\.h;
diff --git a/src/OrcaSlicer.cpp b/src/OrcaSlicer.cpp
index 62ccfb7675..ed6b0c1714 100644
--- a/src/OrcaSlicer.cpp
+++ b/src/OrcaSlicer.cpp
@@ -153,6 +153,8 @@ using namespace nlohmann;
 #include "slic3r/GUI/GUI_ObjectList.hpp"
 #include "slic3r/GUI/I18N.hpp"
 #include "slic3r/GUI/Jobs/SendJob.hpp"
+#include <boost/nowide/convert.hpp>
+#include <stdio.h>
 
 namespace fs = boost::filesystem;
 
diff --git a/src/OrcaSlicer_app_msvc.cpp b/src/OrcaSlicer_app_msvc.cpp
index 265047fa34..14295b27c3 100644
--- a/src/OrcaSlicer_app_msvc.cpp
+++ b/src/OrcaSlicer_app_msvc.cpp
@@ -35,6 +35,7 @@ extern "C"
 #include <boost/algorithm/string/classification.hpp>
 
 #include <stdio.h>
+#include <boost/algorithm/string/constants.hpp>
 
 #ifdef SLIC3R_GUI
 class OpenGLVersionCheck
diff --git a/src/dev-utils/BaseException.cpp b/src/dev-utils/BaseException.cpp
index 048eadf151..ac2e37d1ff 100644
--- a/src/dev-utils/BaseException.cpp
+++ b/src/dev-utils/BaseException.cpp
@@ -11,6 +11,14 @@
 
 #include "git_commit_hash.h"
 #include "libslic3r_version.h"
+#include "StackWalker.h"
+#include <algorithm>
+#include <atomic>
+#include <boost/nowide/fstream.hpp>
+#include <cstdarg>
+#include <cstddef>
+#include <ctime>
+#include <excpt.h>
 
 static std::string g_log_folder;
 static std::atomic<int> g_crash_log_count = 0;
diff --git a/src/dev-utils/BaseException.h b/src/dev-utils/BaseException.h
index 20b6fb0c89..6e7a05eb1a 100644
--- a/src/dev-utils/BaseException.h
+++ b/src/dev-utils/BaseException.h
@@ -3,6 +3,8 @@
 #include <boost/nowide/fstream.hpp>
 #include "StackWalker.h"
 #include <eh.h>
+#include <cstddef>
+#include <string>
 
 class CBaseException : public CStackWalker
 {
diff --git a/src/dev-utils/StackWalker.cpp b/src/dev-utils/StackWalker.cpp
index 3ef983cd86..15c63c324d 100644
--- a/src/dev-utils/StackWalker.cpp
+++ b/src/dev-utils/StackWalker.cpp
@@ -2,6 +2,9 @@
 #include <strsafe.h>
 //#include <atlconv.h>
 #include <dbghelp.h>
+#include <cstdarg>
+#include <cstddef>
+#include <cstring>
 #pragma comment(lib, "version.lib")
 #pragma comment( lib, "dbghelp.lib" )
 
diff --git a/src/dev-utils/StackWalker.h b/src/dev-utils/StackWalker.h
index 7795bf7124..4113e391a0 100644
--- a/src/dev-utils/StackWalker.h
+++ b/src/dev-utils/StackWalker.h
@@ -2,6 +2,7 @@
 #include <Windows.h>
 #include <tchar.h>
 #include <vector>
+#include <cstddef>
 
 namespace textconv_helper
 {
diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp
index 663072d866..ebaa17a4b7 100644
--- a/src/libslic3r/AppConfig.cpp
+++ b/src/libslic3r/AppConfig.cpp
@@ -42,6 +42,9 @@
 #include <boost/uuid/uuid.hpp>
 #include <boost/uuid/uuid_generators.hpp>
 #include <boost/uuid/uuid_io.hpp>
+#include <cassert>
+#include <iterator>
+#include <string_view>
 
 #ifdef WIN32
 //FIXME replace the two following includes with <boost/md5.hpp> after it becomes mainstream.
diff --git a/src/libslic3r/BlacklistedLibraryCheck.cpp b/src/libslic3r/BlacklistedLibraryCheck.cpp
index cf7e6da2aa..19cee86dd0 100644
--- a/src/libslic3r/BlacklistedLibraryCheck.cpp
+++ b/src/libslic3r/BlacklistedLibraryCheck.cpp
@@ -3,6 +3,9 @@
 #include <cstdio>
 #include <boost/filesystem/path.hpp>
 #include <boost/nowide/convert.hpp>
+#include <algorithm>
+#include <string>
+#include <vector>
 
 #ifdef  WIN32
 #include <psapi.h>
diff --git a/src/libslic3r/Emboss.cpp b/src/libslic3r/Emboss.cpp
index ae13cbf54e..2506c26f61 100644
--- a/src/libslic3r/Emboss.cpp
+++ b/src/libslic3r/Emboss.cpp
@@ -43,6 +43,7 @@
 #include "libslic3r/AABBTreeLines.hpp" // search structure for found close points
 #include "libslic3r/Line.hpp"
 #include "libslic3r/BoundingBox.hpp"
+#include <sstream>
 
 // Experimentaly suggested ration of font ascent by multiple fonts
 // to get approx center of normal text line
diff --git a/src/libslic3r/Feature/FuzzySkin/FuzzySkin.cpp b/src/libslic3r/Feature/FuzzySkin/FuzzySkin.cpp
index c580cc3c0f..ae8d50edb7 100644
--- a/src/libslic3r/Feature/FuzzySkin/FuzzySkin.cpp
+++ b/src/libslic3r/Feature/FuzzySkin/FuzzySkin.cpp
@@ -28,6 +28,7 @@
 #include "FuzzySkin.hpp"
 
 #include "libnoise/noise.h"
+#include <functional>
 
 // #define DEBUG_FUZZY
 
diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
index 6ae5394ac2..7317676240 100644
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@@ -119,6 +119,7 @@
 #endif
 
 #include <Shiny/Shiny.h>
+#include <stdio.h>
 
 
 using namespace std::literals::string_view_literals;
diff --git a/src/libslic3r/InstanceLock.cpp b/src/libslic3r/InstanceLock.cpp
index 7cacdef0cb..9ab49b1f12 100644
--- a/src/libslic3r/InstanceLock.cpp
+++ b/src/libslic3r/InstanceLock.cpp
@@ -12,6 +12,7 @@
 #include <boost/filesystem.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/nowide/fstream.hpp>
+#include <ios>
 #ifdef _WIN32
 #include <boost/interprocess/sync/file_lock.hpp>
 #include <boost/nowide/convert.hpp>
diff --git a/src/libslic3r/LocalesUtils.cpp b/src/libslic3r/LocalesUtils.cpp
index d792692cd2..fd6afb0018 100644
--- a/src/libslic3r/LocalesUtils.cpp
+++ b/src/libslic3r/LocalesUtils.cpp
@@ -12,6 +12,7 @@
 #include <system_error>
 
 #include <fast_float/fast_float.h>
+#include <clocale>
 
 // Defined where the floating point std::to_chars can be called, which with Apple's libc++ runtime is from macOS 13.3.
 #if defined(_LIBCPP_VERSION)
diff --git a/src/libslic3r/Thread.cpp b/src/libslic3r/Thread.cpp
index ce3e5e8bdd..1297849945 100644
--- a/src/libslic3r/Thread.cpp
+++ b/src/libslic3r/Thread.cpp
@@ -22,6 +22,7 @@
 #include <tbb/task_arena.h>
 
 #include "Thread.hpp"
+#include <cstring>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/utils.cpp b/src/libslic3r/utils.cpp
index a8e47ddded..8d5ab732be 100644
--- a/src/libslic3r/utils.cpp
+++ b/src/libslic3r/utils.cpp
@@ -119,6 +119,7 @@
 // We are using quite an old TBB 2017 U7, which does not support global control API officially.
 // Before we update our build servers, let's use the old API, which is deprecated in up to date TBB.
 #include <tbb/tbb.h>
+#include <string.h>
 
 namespace boost::posix_time { class ptime; }
 #if ! defined(TBB_VERSION_MAJOR)
diff --git a/src/slic3r/GUI/Auxiliary.cpp b/src/slic3r/GUI/Auxiliary.cpp
index d523b7eae3..bb952e8ae0 100644
--- a/src/slic3r/GUI/Auxiliary.cpp
+++ b/src/slic3r/GUI/Auxiliary.cpp
@@ -65,6 +65,8 @@
 #include "Widgets/Label.hpp"
 #include "slic3r/GUI/I18N.hpp"
 #include "slic3r/GUI/Plater.hpp"
+#include <wx/dcgraph.h>
+#include <wx/dcmemory.h>
 
 namespace fs = boost::filesystem;
 
diff --git a/src/slic3r/GUI/BackgroundSlicingProcess.cpp b/src/slic3r/GUI/BackgroundSlicingProcess.cpp
index f2da864a4d..e9417782db 100644
--- a/src/slic3r/GUI/BackgroundSlicingProcess.cpp
+++ b/src/slic3r/GUI/BackgroundSlicingProcess.cpp
@@ -60,6 +60,9 @@
 #include "libslic3r/PresetBundle.hpp"
 #include "slic3r/GUI/PartPlate.hpp"
 #include "slic3r/Utils/PrintHost.hpp"
+#ifdef _WIN32
+#include <excpt.h>
+#endif
 
 namespace Slic3r {
 
diff --git a/src/slic3r/GUI/ConfigWizard_private.hpp b/src/slic3r/GUI/ConfigWizard_private.hpp
index c1371f5316..a1f9b61b00 100644
--- a/src/slic3r/GUI/ConfigWizard_private.hpp
+++ b/src/slic3r/GUI/ConfigWizard_private.hpp
@@ -40,6 +40,7 @@
 #include "GUI.hpp"
 #include "wxExtensions.hpp"
 #include "Widgets/Button.hpp"
+#include <wx/types.h>
 
 
 namespace fs = boost::filesystem;
diff --git a/src/slic3r/GUI/Downloader.cpp b/src/slic3r/GUI/Downloader.cpp
index 8f252e4604..9724f291fc 100644
--- a/src/slic3r/GUI/Downloader.cpp
+++ b/src/slic3r/GUI/Downloader.cpp
@@ -22,6 +22,7 @@
 #include "slic3r/GUI/I18N.hpp"
 #include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
 #include <wx/arrstr.h>
+#include <wx/string.h>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/ExtraRenderers.cpp b/src/slic3r/GUI/ExtraRenderers.cpp
index 7cd488e664..92f39145f0 100644
--- a/src/slic3r/GUI/ExtraRenderers.cpp
+++ b/src/slic3r/GUI/ExtraRenderers.cpp
@@ -22,6 +22,7 @@
 #include <wx/event.h>
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/Widgets/DropDown.hpp"
+#include <wx/dvrenderers.h>
 #ifdef wxHAS_GENERIC_DATAVIEWCTRL
 #include "wx/generic/private/markuptext.h"
 #include "wx/generic/private/rowheightcache.h"
diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp
index 1ea5309042..05ab99bae1 100644
--- a/src/slic3r/GUI/Field.cpp
+++ b/src/slic3r/GUI/Field.cpp
@@ -81,6 +81,7 @@
 
 #include "../Utils/ColorSpaceConvert.hpp"
 #include "../Utils/NetworkAgentFactory.hpp"
+#include <wx/sizer.h>
 #ifdef __WXOSX__
 #define wxOSX true
 #else
diff --git a/src/slic3r/GUI/FilamentPickerDialog.cpp b/src/slic3r/GUI/FilamentPickerDialog.cpp
index b5e85ab72b..61db61bac2 100644
--- a/src/slic3r/GUI/FilamentPickerDialog.cpp
+++ b/src/slic3r/GUI/FilamentPickerDialog.cpp
@@ -34,6 +34,7 @@
 #include <wx/sizer.h>
 #include <wx/stattext.h>
 #include <wx/button.h>
+#include <cstddef>
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index eb9237b864..62e780afef 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -255,6 +255,11 @@
 #include "slic3r/GUI/wxExtensions.hpp"
 #include "slic3r/plugin/host/PluginPages.hpp"
 #include <wx/defs.h>
+#include "slic3r/GUI/Widgets/WebView.hpp"
+#include <cwchar>
+#include <wx/dataview.h>
+#include <wx/itemattr.h>
+#include <wx/version.h>
 
 //#ifdef WIN32
 //#include "BaseException.h"
@@ -283,6 +288,7 @@ typedef BOOL (WINAPI *LPFN_ISWOW64PROCESS2)(
 #endif
 #ifdef _WIN32
 #include <boost/dll/runtime_symbol_info.hpp>
+#include <direct.h>
 #endif
 
 #ifdef WIN32
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
index 95faae41a9..fb2137982a 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
@@ -57,6 +57,7 @@
 #include "slic3r/GUI/Gizmos/GLGizmosManager.hpp"
 #include "slic3r/GUI/I18N.hpp"
 #include "slic3r/GUI/Selection.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
 
 namespace Slic3r::GUI {
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp
index 0ddf665c06..d38927dd47 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp
@@ -38,6 +38,7 @@
 #include "libslic3r/TriangleSelector.hpp"
 #include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp"
 #include "slic3r/GUI/I18N.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
 
 namespace Slic3r::GUI {
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
index f4f8dc0151..80a87b26c5 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
@@ -46,6 +46,7 @@
 #include "slic3r/GUI/I18N.hpp"
 #include "slic3r/GUI/PartPlate.hpp"
 #include "slic3r/GUI/Selection.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
 
 namespace Slic3r::GUI {
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp
index 1d6d31a047..0f71ee546a 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp
@@ -28,6 +28,7 @@
 #include "libslic3r/Color.hpp"
 #include "slic3r/GUI/3DScene.hpp"
 #include <memory>
+#include "slic3r/GUI/GUI_Utils.hpp"
 
 
 namespace Slic3r::GUI {
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoUtils.cpp b/src/slic3r/GUI/Gizmos/GLGizmoUtils.cpp
index d5aab16808..19bd47fb6c 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoUtils.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoUtils.cpp
@@ -11,6 +11,7 @@
 #include <cstddef>
 #include <wx/app.h>
 #include <boost/algorithm/string.hpp>
+#include "slic3r/GUI/GUI_Utils.hpp"
 
 #ifdef WIN32
 #include <wx/msw/winundef.h>
diff --git a/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp b/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp
index 9d655b8c6a..72f08318c6 100644
--- a/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp
+++ b/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp
@@ -39,6 +39,7 @@
 #include "libslic3r/TriangleMesh.hpp"
 #include "slic3r/GUI/3DScene.hpp"
 #include "slic3r/GUI/I18N.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
 
 #define MAX_NUM 9999.99
 #define MAX_SIZE std::string_view{"9999.99"}
diff --git a/src/slic3r/GUI/InstanceCheck.cpp b/src/slic3r/GUI/InstanceCheck.cpp
index 8205b5edc3..d8365be97e 100644
--- a/src/slic3r/GUI/InstanceCheck.cpp
+++ b/src/slic3r/GUI/InstanceCheck.cpp
@@ -35,6 +35,8 @@
 #include <errno.h>
 #include <optional>
 #include <cstdint>
+#include <cwchar>
+#include <memory>
 
 #ifdef _WIN32
 #include <strsafe.h>
diff --git a/src/slic3r/GUI/InstanceCheck.hpp b/src/slic3r/GUI/InstanceCheck.hpp
index 47b26cd868..635004e2eb 100644
--- a/src/slic3r/GUI/InstanceCheck.hpp
+++ b/src/slic3r/GUI/InstanceCheck.hpp
@@ -14,6 +14,7 @@
 #include <string>
 
 #include <boost/filesystem.hpp>
+#include <cstddef>
 
 #if __linux__
 #include <boost/thread.hpp>
diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp
index 1da22366aa..689f9eb87c 100644
--- a/src/slic3r/GUI/MainFrame.cpp
+++ b/src/slic3r/GUI/MainFrame.cpp
@@ -150,6 +150,9 @@
 #include "slic3r/plugin/host/PluginPages.hpp"
 #include "slic3r/Utils/NetworkAgent.hpp"
 #include <wx/defs.h>
+#include <cassert>
+#include <wx/display.h>
+#include <wx/window.h>
 
 
 namespace Slic3r {
diff --git a/src/slic3r/GUI/MediaPlayCtrl.cpp b/src/slic3r/GUI/MediaPlayCtrl.cpp
index 1ee7400882..c16731793b 100644
--- a/src/slic3r/GUI/MediaPlayCtrl.cpp
+++ b/src/slic3r/GUI/MediaPlayCtrl.cpp
@@ -73,6 +73,7 @@
 
 #include <wx/clipbrd.h>
 #include "wx/evtloop.h"
+#include <boost/nowide/convert.hpp>
 
 class wxImage;
 
diff --git a/src/slic3r/GUI/Mouse3DController.cpp b/src/slic3r/GUI/Mouse3DController.cpp
index 161bfa7730..b517e36841 100644
--- a/src/slic3r/GUI/Mouse3DController.cpp
+++ b/src/slic3r/GUI/Mouse3DController.cpp
@@ -33,6 +33,8 @@
 #include "I18N.hpp"
 
 #include <bitset>
+#include <cstdio>
+#include <cstring>
 
 //unofficial linux lib
 #ifdef HAVE_SPNAV
diff --git a/src/slic3r/GUI/MultiMachineManagerPage.cpp b/src/slic3r/GUI/MultiMachineManagerPage.cpp
index 8e9b8dadf4..9788b025a8 100644
--- a/src/slic3r/GUI/MultiMachineManagerPage.cpp
+++ b/src/slic3r/GUI/MultiMachineManagerPage.cpp
@@ -31,6 +31,7 @@
 #include <algorithm>
 #include <cmath>
 #include <vector>
+#include <wx/dcgraph.h>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/MultiMachinePage.cpp b/src/slic3r/GUI/MultiMachinePage.cpp
index 3238a7a723..0bcca06b18 100644
--- a/src/slic3r/GUI/MultiMachinePage.cpp
+++ b/src/slic3r/GUI/MultiMachinePage.cpp
@@ -26,6 +26,7 @@
 #include "slic3r/GUI/MsgDialog.hpp"
 #include <string>
 #include <algorithm>
+#include <wx/dcgraph.h>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/MultiTaskManagerPage.cpp b/src/slic3r/GUI/MultiTaskManagerPage.cpp
index 4fd6c341a3..d8fde019c3 100644
--- a/src/slic3r/GUI/MultiTaskManagerPage.cpp
+++ b/src/slic3r/GUI/MultiTaskManagerPage.cpp
@@ -44,6 +44,7 @@
 #include <wx/timer.h>
 
 #include "DeviceCore/DevManager.h"
+#include <wx/dcgraph.h>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/PostProcessor.cpp b/src/slic3r/GUI/PostProcessor.cpp
index 67449573f7..4aa498ad74 100644
--- a/src/slic3r/GUI/PostProcessor.cpp
+++ b/src/slic3r/GUI/PostProcessor.cpp
@@ -42,6 +42,10 @@
 #include <string>
 #include <vector>
 #include <utility>
+#include <boost/algorithm/string/predicate.hpp>
+#include <cassert>
+#include <cwchar>
+#include <stdlib.h>
 
 #ifdef WIN32
 
diff --git a/src/slic3r/GUI/PresetComboBoxes.cpp b/src/slic3r/GUI/PresetComboBoxes.cpp
index 3dfd5e3b0a..29e34d98a0 100644
--- a/src/slic3r/GUI/PresetComboBoxes.cpp
+++ b/src/slic3r/GUI/PresetComboBoxes.cpp
@@ -72,6 +72,7 @@
 #include "wxExtensions.hpp"
 
 #include "DeviceCore/DevManager.h"
+#include "slic3r/GUI/Widgets/Label.hpp"
 
 // A workaround for a set of issues related to text fitting into gtk widgets:
 #if defined(__WXGTK20__) || defined(__WXGTK3__)
diff --git a/src/slic3r/GUI/PrinterWebViewHandler.cpp b/src/slic3r/GUI/PrinterWebViewHandler.cpp
index d2ab640ef8..bf16070c6a 100644
--- a/src/slic3r/GUI/PrinterWebViewHandler.cpp
+++ b/src/slic3r/GUI/PrinterWebViewHandler.cpp
@@ -22,6 +22,7 @@
 #include <wx/string.h>
 #include <wx/webview.h>
 #include <wx/utils.h>
+#include <wx/buffer.h>
 
 using json = nlohmann::json;
 
diff --git a/src/slic3r/GUI/RemovableDriveManager.cpp b/src/slic3r/GUI/RemovableDriveManager.cpp
index 8cbe89813a..f628a9a312 100644
--- a/src/slic3r/GUI/RemovableDriveManager.cpp
+++ b/src/slic3r/GUI/RemovableDriveManager.cpp
@@ -20,6 +20,7 @@
 #include <system_error>
 #include <wx/event.h>
 #include <utility>
+#include <cwchar>
 
 #if _WIN32
 #include <windows.h>
diff --git a/src/slic3r/GUI/RemovableDriveManager.hpp b/src/slic3r/GUI/RemovableDriveManager.hpp
index 72e15b5807..94d33a8669 100644
--- a/src/slic3r/GUI/RemovableDriveManager.hpp
+++ b/src/slic3r/GUI/RemovableDriveManager.hpp
@@ -12,6 +12,7 @@
 
 // Custom wxWidget events
 #include "Event.hpp"
+#include <atomic>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/SelectMachinePop.cpp b/src/slic3r/GUI/SelectMachinePop.cpp
index 7a847ec9d0..47c05143d2 100644
--- a/src/slic3r/GUI/SelectMachinePop.cpp
+++ b/src/slic3r/GUI/SelectMachinePop.cpp
@@ -55,6 +55,7 @@
 #include "BindDialog.hpp"
 
 #include "DeviceCore/DevManager.h"
+#include <wx/textctrl.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/SendMultiMachinePage.cpp b/src/slic3r/GUI/SendMultiMachinePage.cpp
index 95baec3199..c66a0f6055 100644
--- a/src/slic3r/GUI/SendMultiMachinePage.cpp
+++ b/src/slic3r/GUI/SendMultiMachinePage.cpp
@@ -74,6 +74,7 @@
 #include "slic3r/GUI/Widgets/CheckBox.hpp"
 #include "slic3r/GUI/wxExtensions.hpp"
 #include <boost/filesystem.hpp>
+#include <wx/dcgraph.h>
 
 namespace fs = boost::filesystem;
 
diff --git a/src/slic3r/GUI/SendSystemInfoDialog.cpp b/src/slic3r/GUI/SendSystemInfoDialog.cpp
index 5d20e9e478..ec32273443 100644
--- a/src/slic3r/GUI/SendSystemInfoDialog.cpp
+++ b/src/slic3r/GUI/SendSystemInfoDialog.cpp
@@ -73,6 +73,9 @@
 
 #include <atomic>
 #include <thread>
+#include "slic3r/GUI/GUI.hpp"
+#include <cstdlib>
+#include <iomanip>
 
 class wxWindow;
 
diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp
index 510bdbb3e9..c720494dff 100644
--- a/src/slic3r/GUI/StatusPanel.cpp
+++ b/src/slic3r/GUI/StatusPanel.cpp
@@ -117,6 +117,7 @@
 #include "SafetyOptionsDialog.hpp"
 
 #include "ThermalPreconditioningDialog.hpp"
+#include <wx/dcgraph.h>
 
 
 namespace Slic3r { namespace GUI {
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index c1d2b2129b..ace8646927 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -116,6 +116,7 @@
 #include <algorithm>
 #include <cstdlib>
 #include <unordered_set>
+#include "slic3r/GUI/GUI_Utils.hpp"
 
 namespace Slic3r {
 
diff --git a/src/slic3r/GUI/TextureImportDialog.cpp b/src/slic3r/GUI/TextureImportDialog.cpp
index 4233a7aac7..bc50cabc8c 100644
--- a/src/slic3r/GUI/TextureImportDialog.cpp
+++ b/src/slic3r/GUI/TextureImportDialog.cpp
@@ -71,6 +71,7 @@
 
 #include <boost/log/trivial.hpp>
 #include <wx/window.h>
+#include <wx/busycursor.h>
 
 static constexpr const char* DEFAULT_VIRTUAL_FILAMENT_BASIC_TYPE = "PLA Basic";
 static constexpr const char* DEFAULT_VIRTUAL_FILAMENT_SHORT_TYPE = "PLA";
diff --git a/src/slic3r/GUI/WebViewDialog.cpp b/src/slic3r/GUI/WebViewDialog.cpp
index 656f250efb..d46615328b 100644
--- a/src/slic3r/GUI/WebViewDialog.cpp
+++ b/src/slic3r/GUI/WebViewDialog.cpp
@@ -41,6 +41,7 @@
 #include <wx/webview.h>
 #include <wx/utils.h>
 #include <wx/window.h>
+#include <wx/infobar.h>
 
 namespace pt = boost::property_tree;
 
diff --git a/src/slic3r/GUI/Widgets/LabeledStaticBox.cpp b/src/slic3r/GUI/Widgets/LabeledStaticBox.cpp
index 0bc7d198ed..c5076a6f2c 100644
--- a/src/slic3r/GUI/Widgets/LabeledStaticBox.cpp
+++ b/src/slic3r/GUI/Widgets/LabeledStaticBox.cpp
@@ -13,6 +13,7 @@
 #include <wx/peninfobase.h>
 #include <algorithm>
 #include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/dcgraph.h>
 
 LabeledStaticBox::LabeledStaticBox()
     : state_handler(this)
diff --git a/src/slic3r/GUI/Widgets/ProgressDialog.cpp b/src/slic3r/GUI/Widgets/ProgressDialog.cpp
index e7bef2e518..96288d3bc7 100644
--- a/src/slic3r/GUI/Widgets/ProgressDialog.cpp
+++ b/src/slic3r/GUI/Widgets/ProgressDialog.cpp
@@ -31,6 +31,9 @@
 #include "ProgressDialog.hpp"
 #include "wx/evtloop.h"
 #include "Label.hpp"
+#include <wx/event.h>
+#include <wx/gauge.h>
+#include <wx/sizer.h>
 
 #ifdef __WXGTK__
 #include "slic3r/GUI/Widgets/StateColor.hpp"
diff --git a/src/slic3r/GUI/Widgets/TextCtrl.h b/src/slic3r/GUI/Widgets/TextCtrl.h
index 2d57c38146..f616b177f0 100644
--- a/src/slic3r/GUI/Widgets/TextCtrl.h
+++ b/src/slic3r/GUI/Widgets/TextCtrl.h
@@ -1,4 +1,5 @@
 #include <wx/textctrl.h>
+#include <wx/colour.h>
 
 #ifdef __WXMSW__
 class TextCtrl : public wxTextCtrl
diff --git a/src/slic3r/GUI/Widgets/WebView.cpp b/src/slic3r/GUI/Widgets/WebView.cpp
index ec10dd03b3..498fa4ec43 100644
--- a/src/slic3r/GUI/Widgets/WebView.cpp
+++ b/src/slic3r/GUI/Widgets/WebView.cpp
@@ -35,6 +35,12 @@
 #include <wx/filename.h>
 #include <wx/stdpaths.h>
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/path.hpp>
+#include <ios>
+#include <string>
+#include <wx/versioninfo.h>
 
 namespace fs = boost::filesystem;
 #if defined(__WIN32__) || defined(__WXMAC__)
diff --git a/src/slic3r/GUI/dark_mode.cpp b/src/slic3r/GUI/dark_mode.cpp
index 01725aae1b..0fc8e31f66 100644
--- a/src/slic3r/GUI/dark_mode.cpp
+++ b/src/slic3r/GUI/dark_mode.cpp
@@ -12,6 +12,9 @@
 #include <Shlwapi.h>
 #include "windowsx.h"
 #include "stdlib.h"
+#include <algorithm>
+#include <cassert>
+#include <cwchar>
 
 #ifdef __GNUC__
 #include <cmath>
diff --git a/src/slic3r/GUI/dark_mode/IatHook.hpp b/src/slic3r/GUI/dark_mode/IatHook.hpp
index ba042d86bb..84364845b5 100644
--- a/src/slic3r/GUI/dark_mode/IatHook.hpp
+++ b/src/slic3r/GUI/dark_mode/IatHook.hpp
@@ -6,6 +6,9 @@
 #pragma once
 
 #include <stdint.h>
+#include <cstddef>
+#include <cstring>
+#include <string.h>
 
 template <typename T, typename T1, typename T2>
 constexpr T RVA2VA(T1 base, T2 rva)
diff --git a/src/slic3r/GUI/dark_mode/dark_mode.hpp b/src/slic3r/GUI/dark_mode/dark_mode.hpp
index 56aa154a5a..c8dd3c867a 100644
--- a/src/slic3r/GUI/dark_mode/dark_mode.hpp
+++ b/src/slic3r/GUI/dark_mode/dark_mode.hpp
@@ -8,6 +8,7 @@
 
 #include <unordered_set>
 #include <mutex>
+#include <cwchar>
 
 enum IMMERSIVE_HC_CACHE_MODE
 {
diff --git a/src/slic3r/GUI/format.hpp b/src/slic3r/GUI/format.hpp
index e4bbd4d98d..c76b935579 100644
--- a/src/slic3r/GUI/format.hpp
+++ b/src/slic3r/GUI/format.hpp
@@ -12,6 +12,7 @@
 #include <string>
 #include <ostream>
 #include <wx/string.h>
+#include <wx/buffer.h>
 
 namespace Slic3r { 
 namespace GUI { 
diff --git a/src/slic3r/GUI/wxExtensions.cpp b/src/slic3r/GUI/wxExtensions.cpp
index 29c540fcaf..5d38e87f4d 100644
--- a/src/slic3r/GUI/wxExtensions.cpp
+++ b/src/slic3r/GUI/wxExtensions.cpp
@@ -43,6 +43,7 @@
 #include "FilamentBitmapUtils.hpp"
 #include "../Utils/ColorSpaceConvert.hpp"
 #include "libslic3r_version.h"
+#include <map>
 #ifndef __linux__
 // msw_menuitem_bitmaps is used for MSW and OSX
 static std::map<int, std::string> msw_menuitem_bitmaps;
diff --git a/src/slic3r/GUI/wxMediaCtrl3.cpp b/src/slic3r/GUI/wxMediaCtrl3.cpp
index 31a8df55d7..db9b627fb3 100644
--- a/src/slic3r/GUI/wxMediaCtrl3.cpp
+++ b/src/slic3r/GUI/wxMediaCtrl3.cpp
@@ -18,6 +18,7 @@
 #include <wx/gdicmn.h>
 #include <wx/mediactrl.h>
 #include <wx/string.h>
+#include <wx/image.h>
 extern "C" {
 #include <libavformat/avformat.h>
 #include <libavutil/log.h>
diff --git a/src/slic3r/Utils/BBLNetworkPlugin.cpp b/src/slic3r/Utils/BBLNetworkPlugin.cpp
index 94ac57aaf0..5cffe6468d 100644
--- a/src/slic3r/Utils/BBLNetworkPlugin.cpp
+++ b/src/slic3r/Utils/BBLNetworkPlugin.cpp
@@ -19,6 +19,9 @@
 #include <utility>
 #include "libslic3r/Utils.hpp"
 #include "slic3r/Utils/FileTransferUtils.hpp"
+#include <cstddef>
+#include <cstring>
+#include <cwchar>
 
 #if !defined(_MSC_VER) && !defined(_WIN32)
 #include <dlfcn.h>
diff --git a/src/slic3r/Utils/ElegooLink.cpp b/src/slic3r/Utils/ElegooLink.cpp
index fb74a384d1..d6b40578aa 100644
--- a/src/slic3r/Utils/ElegooLink.cpp
+++ b/src/slic3r/Utils/ElegooLink.cpp
@@ -48,6 +48,7 @@
 #include "libslic3r/AppConfig.hpp"
 #include "Bonjour.hpp"
 #include "slic3r/GUI/BonjourDialog.hpp"
+#include <boost/asio/ip/address.hpp>
 
 namespace fs = boost::filesystem;
 namespace pt = boost::property_tree;
diff --git a/src/slic3r/Utils/OctoPrint.cpp b/src/slic3r/Utils/OctoPrint.cpp
index a39b300d79..63199c8781 100644
--- a/src/slic3r/Utils/OctoPrint.cpp
+++ b/src/slic3r/Utils/OctoPrint.cpp
@@ -34,6 +34,8 @@
 #include "libslic3r/AppConfig.hpp"
 #include "Bonjour.hpp"
 #include "slic3r/GUI/BonjourDialog.hpp"
+#include <boost/asio/ip/address.hpp>
+#include <cstddef>
 
 namespace fs = boost::filesystem;
 namespace pt = boost::property_tree;
diff --git a/tests/libslic3r/test_instance_lock.cpp b/tests/libslic3r/test_instance_lock.cpp
index 5ee14c665f..790657298a 100644
--- a/tests/libslic3r/test_instance_lock.cpp
+++ b/tests/libslic3r/test_instance_lock.cpp
@@ -10,6 +10,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include "libslic3r/InstanceLock.hpp"
 #include "test_utils.hpp"
+#include <ios>
 
 #ifdef _WIN32
 #include <boost/interprocess/sync/file_lock.hpp>