diff --git a/.clang-tidy b/.clang-tidy
new file mode 100644
index 0000000000..a670e9e1b1
--- /dev/null
+++ b/.clang-tidy
@@ -0,0 +1,47 @@
+# clang-tidy configuration. Only missing includes are reported for now: a file
+# should include the header for every symbol it uses, not rely on the
+# precompiled header or another header's includes. Run with --fix to add them.
+Checks: '-*,misc-include-cleaner'
+CheckOptions:
+  # Missing includes only. Builds without the precompiled header break on these.
+  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
+  # admesh's stl.h, which the include path also exposes without its directory.
+  # 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,
+  # and an include added at the top of the file would break the other platforms'
+  # builds. A symbol these provide is not reported missing.
+  # Write every / as [/\\] so the patterns also match Windows paths.
+  # No comments inside the block below, because a # there silently becomes part of a pattern.
+  misc-include-cleaner.IgnoreHeaders: >-
+    wx[/\\](gtk|gtk1|msw|osx|unix|x11|motif|univ|qt|dfb|generic|private)[/\\].*;
+    .*[/\\]detail[/\\].*;
+    .*[/\\]impl[/\\].*;
+    .*_fwd\.hpp;
+    python3\.[0-9]+[/\\].*;
+    bits[/\\].*;
+    imconfig\.h;
+    expat_external\.h;
+    admesh[/\\]stl\.h;
+    boost[/\\]thread[/\\](pthread|win32)[/\\].*;
+    boost[/\\]regex[/\\]v[0-9]+[/\\].*;
+    curl[/\\](easy|multi|system|urlapi|header|options|websockets|mprintf)\.h;
+    oneapi[/\\]tbb[/\\].*;
+    opencv2[/\\]core[/\\]hal[/\\].*;
+    openssl[/\\]ossl_typ\.h;
+    libav[a-z]+[/\\].*;
+    libsw[a-z]+[/\\].*;
+    glib-2\.0[/\\].*;
+    gtk-3\.0[/\\].*;
+    dbus-1\.0[/\\].*;
+    sys[/\\].*;
+    unistd\.h;
+    strings\.h;
+    fcntl\.h;
+    termios\.h;
+    [/\\](um|shared)[/\\].*;
+    sal\.h
diff --git a/src/slic3r/GUI/2DBed.cpp b/src/slic3r/GUI/2DBed.cpp
index 9aadd26951..3257d05adc 100644
--- a/src/slic3r/GUI/2DBed.cpp
+++ b/src/slic3r/GUI/2DBed.cpp
@@ -4,7 +4,25 @@
 #include "3DBed.hpp"
 #include "PartPlate.hpp"
 
+#include <vector>
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
+#include <wx/colour.h>
+#include <wx/brush.h>
+#include <algorithm>
+#include "libslic3r/Color.hpp"
+#include <string>
+#include <cstddef>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
 #include <wx/dcbuffer.h>
+#include <wx/panel.h>
+#include <wx/wx.h>
+#include <wx/gdicmn.h>
+#include <wx/peninfobase.h>
+#include <wx/font.h>
 
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/Geometry.hpp"
diff --git a/src/slic3r/GUI/2DBed.hpp b/src/slic3r/GUI/2DBed.hpp
index 9cd7b5ec8e..d0ee8689ba 100644
--- a/src/slic3r/GUI/2DBed.hpp
+++ b/src/slic3r/GUI/2DBed.hpp
@@ -1,6 +1,10 @@
 #ifndef slic3r_2DBed_hpp_
 #define slic3r_2DBed_hpp_
 
+#include <wx/panel.h>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Line.hpp"
+#include <vector>
 #include <wx/wx.h>
 #include "libslic3r/Config.hpp"
 #include "libslic3r/ExPolygon.hpp"
diff --git a/src/slic3r/GUI/3DBed.cpp b/src/slic3r/GUI/3DBed.cpp
index 3d7db8eb32..6d14a4d77c 100644
--- a/src/slic3r/GUI/3DBed.cpp
+++ b/src/slic3r/GUI/3DBed.cpp
@@ -15,11 +15,27 @@
 #include "Plater.hpp"
 #include "Camera.hpp"
 
+#include <boost/version.hpp>
+#include <cstddef>
+#include <array>
 #include <glad/gl.h>
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/log/trivial.hpp>
+#include "slic3r/GUI/GLModel.hpp"
+#include <vector>
+#include "libslic3r/Point.hpp"
+#include <utility>
+#include "libslic3r/Color.hpp"
+#include "slic3r/GUI/ImGuiWrapper.hpp"
+#include "slic3r/GUI/GLShader.hpp"
+#include "slic3r/GUI/3DScene.hpp"
+#include "libslic3r/Geometry.hpp"
+#include <math.h>
+#include <tuple>
+#include "libslic3r/Preset.hpp"
+#include "libslic3r/Config.hpp"
 
 #if BOOST_VERSION >= 107800
 #include <boost/timer/timer.hpp>
diff --git a/src/slic3r/GUI/3DBed.hpp b/src/slic3r/GUI/3DBed.hpp
index e6335fba3a..66e4bc7d0a 100644
--- a/src/slic3r/GUI/3DBed.hpp
+++ b/src/slic3r/GUI/3DBed.hpp
@@ -8,8 +8,13 @@
 #include "libslic3r/BuildVolume.hpp"
 #include "libslic3r/ExPolygon.hpp"
 
+#include "libslic3r/Color.hpp"
+#include "libslic3r/Point.hpp"
+#include <string>
+#include "libslic3r/BoundingBox.hpp"
 #include <tuple>
 #include <array>
+#include <vector>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/3DScene.cpp b/src/slic3r/GUI/3DScene.cpp
index d72407a77e..0ba85775bd 100644
--- a/src/slic3r/GUI/3DScene.cpp
+++ b/src/slic3r/GUI/3DScene.cpp
@@ -1,3 +1,7 @@
+#include <array>
+#include <algorithm>
+#include <functional>
+#include <cmath>
 #include <glad/gl.h>
 
 #include "3DScene.hpp"
@@ -25,6 +29,30 @@
 #include "libslic3r/Tesselate.hpp"
 #include "libslic3r/PrintConfig.hpp"
 
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/TriangleMeshSlicer.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Point.hpp"
+#include "slic3r/GUI/ImGuiWrapper.hpp"
+#include "libslic3r/Model.hpp"
+#include "libslic3r/Technologies.hpp"
+#include <optional>
+#include "slic3r/GUI/OpenGLManager.hpp"
+#include "libslic3r/Config.hpp"
+#include <memory>
+#include "slic3r/GUI/MeshUtils.hpp"
+#include "libslic3r/TriangleMesh.hpp"
+#include <math.h>
+#include "libslic3r/ObjectID.hpp"
+#include "libslic3r/libslic3r.h"
+#include <map>
+#include <set>
+#include <iterator>
+#include "libslic3r/Color.hpp"
+#include "slic3r/GUI/GUI_ObjectList.hpp"
+#include "libslic3r/Line.hpp"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/Exception.hpp"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -36,6 +64,9 @@
 #include <boost/algorithm/string/predicate.hpp>
 
 #include <Eigen/Dense>
+#include <vector>
+#include <utility>
+#include <string>
 
 #ifdef HAS_GLSAFE
 void glAssertRecentCallImpl(const char* file_name, unsigned int line, const char* function_name)
diff --git a/src/slic3r/GUI/3DScene.hpp b/src/slic3r/GUI/3DScene.hpp
index b70cb4f565..663979690f 100644
--- a/src/slic3r/GUI/3DScene.hpp
+++ b/src/slic3r/GUI/3DScene.hpp
@@ -16,8 +16,17 @@
 #include "GLShader.hpp"
 #include "MeshUtils.hpp"
 
+#include <array>
+#include <cstddef>
+#include <cmath>
 #include <functional>
+#include <map>
+#include "libslic3r/BoundingBox.hpp"
+#include <memory>
 #include <optional>
+#include <vector>
+#include <string>
+#include <utility>
 
 #ifndef NDEBUG
 #define HAS_GLSAFE
diff --git a/src/slic3r/GUI/AMSDryControl.cpp b/src/slic3r/GUI/AMSDryControl.cpp
index 17d7d62ad8..a45a5fb4fd 100644
--- a/src/slic3r/GUI/AMSDryControl.cpp
+++ b/src/slic3r/GUI/AMSDryControl.cpp
@@ -19,7 +19,38 @@
 #include "libslic3r/PresetBundle.hpp"
 #include "libslic3r/Preset.hpp"
 
+#include <algorithm>
 #include <boost/log/trivial.hpp>
+#include <string>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <wx/string.h>
+#include <wx/event.h>
+#include <wx/panel.h>
+#include <wx/colour.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/gdicmn.h>
+#include "libslic3r/Exception.hpp"
+#include <wx/dcclient.h>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/toplevel.h>
+#include <wx/scrolwin.h>
+#include "slic3r/GUI/Widgets/AMSItem.hpp"
+#include <wx/chartype.h>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <utility>
+#include <chrono>
+#include <optional>
+#include <wx/timer.h>
+#include "libslic3r/Utils.hpp"
+#include <unordered_set>
+#include <vector>
+#include <set>
+#include <sstream>
+#include <ios>
+#include <iomanip>
+#include "slic3r/GUI/DeviceCore/DevConfigUtil.h"
+#include <limits>
+#include <memory>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/AMSDryControl.hpp b/src/slic3r/GUI/AMSDryControl.hpp
index 6c5df86849..36f41fc026 100644
--- a/src/slic3r/GUI/AMSDryControl.hpp
+++ b/src/slic3r/GUI/AMSDryControl.hpp
@@ -9,7 +9,25 @@
 #include "slic3r/GUI/I18N.hpp" // Orca: explicit _L() catalog include
 
 #include <chrono>
+#include <memory>
+#include "libslic3r/PresetBundle.hpp"
+#include <map>
 #include <optional>
+#include <wx/panel.h>
+#include <wx/string.h>
+#include <string>
+#include <wx/event.h>
+#include <vector>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/gdicmn.h>
+#include <wx/simplebook.h>
+#include "slic3r/GUI/Widgets/ComboBox.hpp"
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <wx/timer.h>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <unordered_map>
+#include <wx/colour.h>
+#include <wx/scrolwin.h>
 
 
 //Previous defintions
diff --git a/src/slic3r/GUI/AMSMaterialsSetting.cpp b/src/slic3r/GUI/AMSMaterialsSetting.cpp
index edd1827f16..08e7d7a056 100644
--- a/src/slic3r/GUI/AMSMaterialsSetting.cpp
+++ b/src/slic3r/GUI/AMSMaterialsSetting.cpp
@@ -8,8 +8,48 @@
 #include "I18N.hpp"
 #include <algorithm>
 #include <boost/log/trivial.hpp>
+#include <string>
+#include <sstream>
+#include <ios>
+#include <iomanip>
+#include <wx/checklst.h>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <utility>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "slic3r/GUI/Widgets/HyperLink.hpp"
+#include <cstdlib>
+#include <cstdio>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include "libslic3r/calib.hpp"
+#include "libslic3r/Config.hpp"
+#include <vector>
+#include <unordered_map>
+#include <wx/arrstr.h>
+#include <set>
+#include "slic3r/GUI/DeviceCore/DevConfigUtil.h"
+#include <cstddef>
+#include <climits>
+#include "libslic3r/PrintConfig.hpp"
+#include <cmath>
+#include "slic3r/GUI/Widgets/PopupWindow.hpp"
+#include "slic3r/GUI/Widgets/StaticBox.hpp"
 #include <wx/colordlg.h>
+#include <wx/dcclient.h>
+#include <wx/dc.h>
+#include <wx/colour.h>
+#include <wx/colourdata.h>
 #include <wx/dcgraph.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/toplevel.h>
+#include <wx/panel.h>
+#include <wx/textctrl.h>
+#include <wx/string.h>
+#include <wx/valtext.h>
+#include <wx/sizer.h>
+#include <wx/peninfobase.h>
 #include "CalibUtils.hpp"
 #include "../Utils/ColorSpaceConvert.hpp"
 #include "EncodedFilament.hpp"
diff --git a/src/slic3r/GUI/AMSMaterialsSetting.hpp b/src/slic3r/GUI/AMSMaterialsSetting.hpp
index 4cfdde791d..79880a6ec5 100644
--- a/src/slic3r/GUI/AMSMaterialsSetting.hpp
+++ b/src/slic3r/GUI/AMSMaterialsSetting.hpp
@@ -16,6 +16,21 @@
 #include "Widgets/TextInput.hpp"
 #include "Widgets/HyperLink.hpp"
 #include "slic3r/Utils/CalibUtils.hpp"
+#include <wx/colour.h>
+#include <vector>
+#include <wx/checklst.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <wx/dc.h>
+#include "slic3r/GUI/Widgets/PopupWindow.hpp"
+#include "slic3r/GUI/Widgets/StaticBox.hpp"
+#include <wx/sizer.h>
+#include <wx/string.h>
+#include <string>
+#include "libslic3r/calib.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/panel.h>
+#include <map>
 
 #define AMS_MATERIALS_SETTING_DEF_COLOUR wxColour(255, 255, 255)
 #define AMS_MATERIALS_SETTING_GREY900 wxColour(38, 46, 48)
diff --git a/src/slic3r/GUI/AMSSetting.cpp b/src/slic3r/GUI/AMSSetting.cpp
index 9ba9031f19..d967fa37ab 100644
--- a/src/slic3r/GUI/AMSSetting.cpp
+++ b/src/slic3r/GUI/AMSSetting.cpp
@@ -2,6 +2,7 @@
 #include "GUI_App.hpp"
 #include "I18N.hpp"
 
+#include "libslic3r_version.h"
 #include "slic3r/GUI/DeviceCore/DevExtruderSystem.h"
 #include "slic3r/GUI/DeviceCore/DevFilaSystem.h"
 #include "slic3r/GUI/DeviceCore/DevManager.h"
@@ -11,6 +12,18 @@
 #include "slic3r/GUI/Widgets/AnimaController.hpp"
 #include "slic3r/GUI/Widgets/Label.hpp"
 #include "slic3r/GUI/Widgets/ComboBox.hpp"
+#include <wx/checklst.h>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/string.h>
+#include <wx/panel.h>
+#include "slic3r/GUI/Widgets/CheckBox.hpp"
+#include <wx/tglbtn.h>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "slic3r/GUI/DeviceCore/DevFilaAmsSetting.h"
+#include "slic3r/GUI/DeviceCore/DevConfigUtil.h"
+#include <wx/event.h>
+#include <vector>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/AMSSetting.hpp b/src/slic3r/GUI/AMSSetting.hpp
index e157c947ae..24467f8d13 100644
--- a/src/slic3r/GUI/AMSSetting.hpp
+++ b/src/slic3r/GUI/AMSSetting.hpp
@@ -12,6 +12,15 @@
 #include "Widgets/CheckBox.hpp"
 
 #include "slic3r/GUI/DeviceCore/DevFilaAmsSetting.h"
+#include <wx/checklst.h>
+#include <wx/gdicmn.h>
+#include <wx/dialog.h>
+#include <string>
+#include <wx/event.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <memory>
+#include <unordered_map>
 
 #define AMS_SETTING_DEF_COLOUR wxColour(255, 255, 255)
 #define AMS_SETTING_GREY800 wxColour(50, 58, 61)
diff --git a/src/slic3r/GUI/AVVideoDecoder.cpp b/src/slic3r/GUI/AVVideoDecoder.cpp
index 76965fedef..c89676d0a6 100644
--- a/src/slic3r/GUI/AVVideoDecoder.cpp
+++ b/src/slic3r/GUI/AVVideoDecoder.cpp
@@ -1,6 +1,14 @@
 #include "AVVideoDecoder.hpp"
 
+#include <algorithm>
 #include <assert.h>
+#include "slic3r/GUI/Printer/BambuTunnel.h"
+#include <cstdio>
+#include <cstring>
+#include <cstddef>
+#include <wx/image.h>
+#include <wx/gdicmn.h>
+#include <cstdint>
 
 extern "C"
 {
diff --git a/src/slic3r/GUI/AVVideoDecoder.hpp b/src/slic3r/GUI/AVVideoDecoder.hpp
index d3d16a11c1..2e3a7ab616 100644
--- a/src/slic3r/GUI/AVVideoDecoder.hpp
+++ b/src/slic3r/GUI/AVVideoDecoder.hpp
@@ -2,6 +2,7 @@
 #define AVVIDEODECODER_HPP
 
 #include "Printer/BambuTunnel.h"
+#include <cstdint>
 
 extern "C" {
     #include <libavcodec/avcodec.h>
diff --git a/src/slic3r/GUI/AboutDialog.cpp b/src/slic3r/GUI/AboutDialog.cpp
index 9e1cefbc84..d8fe67f97d 100644
--- a/src/slic3r/GUI/AboutDialog.cpp
+++ b/src/slic3r/GUI/AboutDialog.cpp
@@ -9,8 +9,26 @@
 #include "MainFrame.hpp"
 #include "format.hpp"
 #include "Widgets/Button.hpp"
+#include "libslic3r_version.h"
 
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "libslic3r/libslic3r.h"
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <vector>
 #include <wx/clipbrd.h>
+#include <wx/panel.h>
+#include <wx/wx.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <wx/dcclient.h>
+#include <wx/dialog.h>
+#include <wx/toplevel.h>
+#include <wx/sizer.h>
+#include <wx/html/htmlwin.h>
+#include <wx/string.h>
+#include <wx/colour.h>
+#include <wx/dataobj.h>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/AboutDialog.hpp b/src/slic3r/GUI/AboutDialog.hpp
index e96c74ba08..61ccb4bc72 100644
--- a/src/slic3r/GUI/AboutDialog.hpp
+++ b/src/slic3r/GUI/AboutDialog.hpp
@@ -1,6 +1,11 @@
 #ifndef slic3r_GUI_AboutDialog_hpp_
 #define slic3r_GUI_AboutDialog_hpp_
 
+#include <wx/panel.h>
+#include <wx/event.h>
+#include <string>
+#include <vector>
+#include <wx/string.h>
 #include <wx/wx.h>
 #include <wx/intl.h>
 #include <wx/html/htmlwin.h>
diff --git a/src/slic3r/GUI/ActionRegistry.cpp b/src/slic3r/GUI/ActionRegistry.cpp
index 6dd9b0b542..9d70bdb934 100644
--- a/src/slic3r/GUI/ActionRegistry.cpp
+++ b/src/slic3r/GUI/ActionRegistry.cpp
@@ -12,10 +12,19 @@
 #include "Tab.hpp"
 #include "slic3r/plugin/PluginManager.hpp"
 
+#include <cassert>
+#include <boost/filesystem/operations.hpp>
 #include <libslic3r/AppConfig.hpp>
 #include <libslic3r/Config.hpp>
+#include "slic3r/plugin/PluginDescriptor.hpp"
+#include <memory>
+#include "libslic3r/Preset.hpp"
+#include "slic3r/GUI/PartPlate.hpp"
 #include <slic3r/plugin/PythonPluginInterface.hpp>
 
+#include <vector>
+#include <utility>
+#include <wx/app.h>
 #include <wx/thread.h>
 
 #include <boost/filesystem.hpp>
diff --git a/src/slic3r/GUI/AmsMappingPopup.cpp b/src/slic3r/GUI/AmsMappingPopup.cpp
index 32a580845d..b1d5f7948e 100644
--- a/src/slic3r/GUI/AmsMappingPopup.cpp
+++ b/src/slic3r/GUI/AmsMappingPopup.cpp
@@ -11,6 +11,36 @@
 #include "MainFrame.hpp"
 #include "format.hpp"
 #include "Widgets/ProgressDialog.hpp"
+#include <wx/event.h>
+#include <wx/colour.h>
+#include <string>
+#include <wx/panel.h>
+#include <wx/gdicmn.h>
+#include <vector>
+#include <boost/log/trivial.hpp>
+#include <wx/dcclient.h>
+#include <cstddef>
+#include <wx/arrstr.h>
+#include "slic3r/GUI/DeviceManager.hpp"
+#include <math.h>
+#include <cmath>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/peninfobase.h>
+#include <wx/string.h>
+#include "slic3r/GUI/Widgets/PopupWindow.hpp"
+#include <wx/popupwin.h>
+#include <wx/anybutton.h>
+#include <wx/sizer.h>
+#include <map>
+#include "slic3r/GUI/DeviceCore/DevUtil.h"
+#include <cstdlib>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "slic3r/GUI/Widgets/SwitchButton.hpp"
+#include <utility>
+#include "slic3r/GUI/Widgets/AMSItem.hpp"
+#include <unordered_map>
 #include <wx/tooltip.h>
 #include "Widgets/RoundedRectangle.hpp"
 #include "Widgets/StaticBox.hpp"
@@ -23,6 +53,9 @@
 #include <miniz.h>
 #include <algorithm>
 #include <optional>
+#include <wx/wx.h>
+#include <wx/toplevel.h>
+#include <wx/wrapsizer.h>
 #include "Plater.hpp"
 #include "BitmapCache.hpp"
 #include "BindDialog.hpp"
diff --git a/src/slic3r/GUI/AmsMappingPopup.hpp b/src/slic3r/GUI/AmsMappingPopup.hpp
index 21a3e38080..f86b2a4497 100644
--- a/src/slic3r/GUI/AmsMappingPopup.hpp
+++ b/src/slic3r/GUI/AmsMappingPopup.hpp
@@ -1,6 +1,16 @@
 #ifndef slic3r_GUI_AmsMappingPopup_hpp_
 #define slic3r_GUI_AmsMappingPopup_hpp_
 
+#include <string>
+#include <vector>
+#include <wx/event.h>
+#include <wx/dc.h>
+#include <optional>
+#include "libslic3r/ProjectTask.hpp"
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <map>
+#include <functional>
+#include <memory>
 #include <wx/wx.h>
 #include <wx/intl.h>
 #include <wx/collpane.h>
diff --git a/src/slic3r/GUI/AmsMappingPopupUpdate.cpp b/src/slic3r/GUI/AmsMappingPopupUpdate.cpp
index 3e2853ad1a..4aed4e6545 100644
--- a/src/slic3r/GUI/AmsMappingPopupUpdate.cpp
+++ b/src/slic3r/GUI/AmsMappingPopupUpdate.cpp
@@ -21,6 +21,17 @@
 #include "Widgets/RoundedRectangle.hpp"
 #include "Widgets/StaticBox.hpp"
 
+#include <list>
+#include <vector>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <boost/log/trivial.hpp>
+#include <cstddef>
+#include <string>
+#include <cstdlib>
+#include <exception>
+#include <map>
+#include "libslic3r/Config.hpp"
+#include <wx/event.h>
 #include <wx/progdlg.h>
 #include <wx/clipbrd.h>
 #include <wx/dcgraph.h>
@@ -28,6 +39,7 @@
 #include <miniz.h>
 #include <algorithm>
 #include <optional>
+#include <wx/wx.h>
 #include "Plater.hpp"
 #include "BitmapCache.hpp"
 
diff --git a/src/slic3r/GUI/AmsWidgets.cpp b/src/slic3r/GUI/AmsWidgets.cpp
index 86014d31e9..effbbaabc7 100644
--- a/src/slic3r/GUI/AmsWidgets.cpp
+++ b/src/slic3r/GUI/AmsWidgets.cpp
@@ -1,7 +1,10 @@
 #include "AmsWidgets.hpp"
+#include <map>
+#include <string>
 #include <wx/button.h>
 #include <wx/sizer.h>
 #include <wx/dataview.h>
+#include <wx/variant.h>
 
 #include "GUI_App.hpp"
 #include "GUI_ObjectList.hpp"
diff --git a/src/slic3r/GUI/AmsWidgets.hpp b/src/slic3r/GUI/AmsWidgets.hpp
index 4f5bc592d2..24f3f781b2 100644
--- a/src/slic3r/GUI/AmsWidgets.hpp
+++ b/src/slic3r/GUI/AmsWidgets.hpp
@@ -2,6 +2,7 @@
 #define slic3r_AmsWidgets_hpp_
 
 
+#include <wx/arrstr.h>
 #include <wx/notebook.h>
 #include <wx/scrolwin.h>
 #include <wx/sizer.h>
@@ -10,6 +11,7 @@
 #include <wx/treectrl.h>
 #include <wx/imaglist.h>
 #include <wx/artprov.h>
+#include <wx/variant.h>
 #include <wx/xrc/xmlres.h>
 #include <wx/string.h>
 #include <wx/stattext.h>
diff --git a/src/slic3r/GUI/AuiPaneLayout.cpp b/src/slic3r/GUI/AuiPaneLayout.cpp
index dc93352971..8bd8cd3f5f 100644
--- a/src/slic3r/GUI/AuiPaneLayout.cpp
+++ b/src/slic3r/GUI/AuiPaneLayout.cpp
@@ -1,4 +1,6 @@
 #include "AuiPaneLayout.hpp"
+#include <string>
+#include <cstddef>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/Auxiliary.cpp b/src/slic3r/GUI/Auxiliary.cpp
index 67998b59d9..956417016c 100644
--- a/src/slic3r/GUI/Auxiliary.cpp
+++ b/src/slic3r/GUI/Auxiliary.cpp
@@ -4,17 +4,53 @@
 #include "libslic3r/Model.hpp"
 #include "libslic3r/Format/bbs_3mf.hpp"
 
+#include <vector>
+#include <string>
+#include <memory>
+#include <boost/filesystem/path.hpp>
+#include "slic3r/GUI/Project.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include "slic3r/GUI/Field.hpp"
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include "libslic3r/Preset.hpp"
+#include <cstddef>
+#include <cstring>
+#include "slic3r/GUI/GUI.hpp"
+#include <boost/filesystem/operations.hpp>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <utility>
+#include "slic3r/GUI/Widgets/AMSItem.hpp"
+#include <iterator>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <wx/anybutton.h>
+#include "slic3r/GUI/Tabbook.hpp"
+#include <ctime>
+#include <map>
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
+#include "slic3r/GUI/Widgets/ComboBox.hpp"
 #include <wx/app.h>
+#include <wx/bookctrl.h>
 #include <wx/button.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include <wx/image.h>
+#include <wx/dcclient.h>
+#include <wx/notebook.h>
+#include <wx/chartype.h>
 #include <wx/scrolwin.h>
 #include <wx/sizer.h>
 
 #include <wx/bmpcbox.h>
 #include <wx/bmpbuttn.h>
+#include <wx/string.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
 #include <wx/treectrl.h>
 #include <wx/imaglist.h>
 #include <wx/settings.h>
 #include <wx/filedlg.h>
+#include <wx/wrapsizer.h>
 #include <wx/wupdlock.h>
 #include <wx/dataview.h>
 #include <wx/tokenzr.h>
diff --git a/src/slic3r/GUI/Auxiliary.hpp b/src/slic3r/GUI/Auxiliary.hpp
index 76e6adf97b..442d4d0718 100644
--- a/src/slic3r/GUI/Auxiliary.hpp
+++ b/src/slic3r/GUI/Auxiliary.hpp
@@ -2,6 +2,16 @@
 #define slic3r_Auxiliary_hpp_
 
 #include "Tabbook.hpp"
+#include <array>
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include <boost/filesystem/path.hpp>
+#include <wx/bookctrl.h>
+#include <wx/event.h>
+#include <wx/dynarray.h>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "slic3r/GUI/Widgets/ComboBox.hpp"
+#include <string>
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
 #include <wx/notebook.h>
 #include <wx/scrolwin.h>
 #include <wx/sizer.h>
@@ -10,6 +20,7 @@
 #include <wx/treectrl.h>
 #include <wx/imaglist.h>
 #include <wx/artprov.h>
+#include <wx/wrapsizer.h>
 #include <wx/xrc/xmlres.h>
 #include <wx/string.h>
 #include <wx/stattext.h>
diff --git a/src/slic3r/GUI/AuxiliaryDataViewModel.cpp b/src/slic3r/GUI/AuxiliaryDataViewModel.cpp
index a4268c7044..832fab7d6f 100644
--- a/src/slic3r/GUI/AuxiliaryDataViewModel.cpp
+++ b/src/slic3r/GUI/AuxiliaryDataViewModel.cpp
@@ -4,9 +4,22 @@
 #include "libslic3r/Format/bbs_3mf.hpp"
 
 
+#include <array>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/directory.hpp>
 #include <boost/log/trivial.hpp>
 
+#include <wx/filefn.h>
+#include <wx/dataview.h>
+#include <map>
+#include <wx/debug.h>
+#include <cstddef>
+#include <wx/arrstr.h>
 #include <wx/log.h>
+#include <wx/string.h>
+#include <wx/variant.h>
+#include <wx/types.h>
 
 const static std::array<wxString, 4> s_default_folders = {
     _L("Model Pictures"),
diff --git a/src/slic3r/GUI/AuxiliaryDataViewModel.hpp b/src/slic3r/GUI/AuxiliaryDataViewModel.hpp
index 76c046c5e0..3b7764f16d 100644
--- a/src/slic3r/GUI/AuxiliaryDataViewModel.hpp
+++ b/src/slic3r/GUI/AuxiliaryDataViewModel.hpp
@@ -9,6 +9,12 @@
 #include "I18N.hpp"
 
 #include <boost/filesystem.hpp>
+#include <wx/dynarray.h>
+#include <boost/filesystem/path.hpp>
+#include <cstddef>
+#include <wx/string.h>
+#include <wx/arrstr.h>
+#include <wx/variant.h>
 
 class AuxiliaryModelNode;
 WX_DEFINE_ARRAY_PTR(AuxiliaryModelNode*, AuxiliaryModelNodePtrArray);
diff --git a/src/slic3r/GUI/AuxiliaryDialog.cpp b/src/slic3r/GUI/AuxiliaryDialog.cpp
index 0fce2cc833..64c333146f 100644
--- a/src/slic3r/GUI/AuxiliaryDialog.cpp
+++ b/src/slic3r/GUI/AuxiliaryDialog.cpp
@@ -5,6 +5,11 @@
 #include "libslic3r/Utils.hpp"
 
 #include <boost/property_tree/ptree.hpp>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/wx.h>
+#include <wx/gdicmn.h>
+#include <wx/dialog.h>
+#include <wx/toplevel.h>
 
 namespace pt = boost::property_tree;
 typedef pt::ptree JSON;
diff --git a/src/slic3r/GUI/BBLStatusBar.cpp b/src/slic3r/GUI/BBLStatusBar.cpp
index 175e553dc1..37e1bcf9d3 100644
--- a/src/slic3r/GUI/BBLStatusBar.cpp
+++ b/src/slic3r/GUI/BBLStatusBar.cpp
@@ -1,5 +1,11 @@
 #include "BBLStatusBar.hpp"
 
+#include <wx/panel.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+#include <string>
 #include <wx/timer.h>
 #include <wx/gauge.h>
 #include <wx/button.h>
diff --git a/src/slic3r/GUI/BBLStatusBarBind.cpp b/src/slic3r/GUI/BBLStatusBarBind.cpp
index 73151266b2..c2da7f59ea 100644
--- a/src/slic3r/GUI/BBLStatusBarBind.cpp
+++ b/src/slic3r/GUI/BBLStatusBarBind.cpp
@@ -1,5 +1,10 @@
 #include "BBLStatusBarBind.hpp"
 
+#include <wx/panel.h>
+#include <wx/event.h>
+#include <wx/sizer.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <string>
 #include <wx/timer.h>
 #include <wx/gauge.h>
 #include <wx/button.h>
diff --git a/src/slic3r/GUI/BBLStatusBarBind.hpp b/src/slic3r/GUI/BBLStatusBarBind.hpp
index ce7a394576..f46dec4bcc 100644
--- a/src/slic3r/GUI/BBLStatusBarBind.hpp
+++ b/src/slic3r/GUI/BBLStatusBarBind.hpp
@@ -2,6 +2,7 @@
 #define BBLStatusBarBind_HPP
 
 #include <wx/panel.h>
+#include <wx/sizer.h>
 #include <wx/stattext.h>
 #include <wx/simplebook.h>
 
diff --git a/src/slic3r/GUI/BBLStatusBarPrint.cpp b/src/slic3r/GUI/BBLStatusBarPrint.cpp
index 1eaf82bb45..88d33dcbdc 100644
--- a/src/slic3r/GUI/BBLStatusBarPrint.cpp
+++ b/src/slic3r/GUI/BBLStatusBarPrint.cpp
@@ -1,5 +1,15 @@
 #include "BBLStatusBarPrint.hpp"
 
+#include <wx/event.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/string.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <utility>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <cstddef>
 #include <wx/timer.h>
 #include <wx/gauge.h>
 #include <wx/button.h>
diff --git a/src/slic3r/GUI/BBLStatusBarPrint.hpp b/src/slic3r/GUI/BBLStatusBarPrint.hpp
index 757dcf95bf..0622516791 100644
--- a/src/slic3r/GUI/BBLStatusBarPrint.hpp
+++ b/src/slic3r/GUI/BBLStatusBarPrint.hpp
@@ -1,7 +1,9 @@
 #ifndef BBLStatusBarPrint_HPP
 #define BBLStatusBarPrint_HPP
 
+#include <wx/event.h>
 #include <wx/panel.h>
+#include <wx/sizer.h>
 #include <wx/stattext.h>
 
 #include <memory>
diff --git a/src/slic3r/GUI/BBLStatusBarSend.cpp b/src/slic3r/GUI/BBLStatusBarSend.cpp
index d6d38fd019..4ada6ac95a 100644
--- a/src/slic3r/GUI/BBLStatusBarSend.cpp
+++ b/src/slic3r/GUI/BBLStatusBarSend.cpp
@@ -1,5 +1,13 @@
 #include "BBLStatusBarSend.hpp"
 
+#include <wx/event.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/string.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <cstddef>
 #include <wx/timer.h>
 #include <wx/gauge.h>
 #include <wx/button.h>
diff --git a/src/slic3r/GUI/BBLStatusBarSend.hpp b/src/slic3r/GUI/BBLStatusBarSend.hpp
index 2dd7851b1a..abe4bece3b 100644
--- a/src/slic3r/GUI/BBLStatusBarSend.hpp
+++ b/src/slic3r/GUI/BBLStatusBarSend.hpp
@@ -1,7 +1,9 @@
 #ifndef BBLSTATUSBARSEND_HPP
 #define BBLSTATUSBARSEND_HPP
 
+#include <wx/event.h>
 #include <wx/panel.h>
+#include <wx/sizer.h>
 #include <wx/stattext.h>
 
 #include <memory>
diff --git a/src/slic3r/GUI/BBLTopbar.cpp b/src/slic3r/GUI/BBLTopbar.cpp
index eb6f4bcb00..eeb8df79fa 100644
--- a/src/slic3r/GUI/BBLTopbar.cpp
+++ b/src/slic3r/GUI/BBLTopbar.cpp
@@ -2,7 +2,19 @@
 #include "wx/artprov.h"
 #include "wx/aui/framemanager.h"
 #include "wx/display.h"
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <wx/dcbuffer.h>
+#include <wx/dc.h>
+#include <wx/aui/auibar.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/settings.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <wx/image.h>
+#include <wx/string.h>
+#include <cstddef>
 #include <wx/utils.h>
+#include <wx/window.h>
 #include "I18N.hpp"
 #include "GUI_App.hpp"
 #include "GUI.hpp"
diff --git a/src/slic3r/GUI/BBLTopbar.hpp b/src/slic3r/GUI/BBLTopbar.hpp
index 2745490d00..db34d8dc80 100644
--- a/src/slic3r/GUI/BBLTopbar.hpp
+++ b/src/slic3r/GUI/BBLTopbar.hpp
@@ -7,6 +7,9 @@
 #include "DeviceManager.hpp"
 
 #include <wx/control.h>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
 
 using namespace Slic3r::GUI;
 
diff --git a/src/slic3r/GUI/BackgroundSlicingProcess.cpp b/src/slic3r/GUI/BackgroundSlicingProcess.cpp
index f795b41999..423f8b68b2 100644
--- a/src/slic3r/GUI/BackgroundSlicingProcess.cpp
+++ b/src/slic3r/GUI/BackgroundSlicingProcess.cpp
@@ -4,8 +4,26 @@
 #include "MainFrame.hpp"
 #include "format.hpp"
 
+#include <cstddef>
+#include <exception>
+#include "libslic3r/Config.hpp"
+#include <cstdint>
+#include <functional>
 #include <libslic3r/Exception.hpp>
+#include <utility>
+#include <string>
+#include <vector>
+#include <new>
+#include "libslic3r/GCode/ThumbnailData.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Zipper.hpp"
+#include <mutex>
+#include "libslic3r/PrintBase.hpp"
+#include <ostream>
+#include <memory>
+#include "libslic3r/Polygon.hpp"
 #include <wx/app.h>
+#include <wx/event.h>
 #include <wx/panel.h>
 #include <wx/stdpaths.h>
 
@@ -36,6 +54,7 @@
 #include "I18N.hpp"
 // #include "RemovableDriveManager.hpp"
 
+#include "libslic3r_version.h"
 #include "slic3r/GUI/Plater.hpp"
 
 namespace Slic3r {
diff --git a/src/slic3r/GUI/BackgroundSlicingProcess.hpp b/src/slic3r/GUI/BackgroundSlicingProcess.hpp
index 07d6b42df6..b1020cf4c9 100644
--- a/src/slic3r/GUI/BackgroundSlicingProcess.hpp
+++ b/src/slic3r/GUI/BackgroundSlicingProcess.hpp
@@ -1,12 +1,21 @@
 #ifndef slic3r_GUI_BackgroundSlicingProcess_hpp_
 #define slic3r_GUI_BackgroundSlicingProcess_hpp_
 
+#include <exception>
+#include <cassert>
+#include <cstddef>
+#include "libslic3r/Config.hpp"
+#include "libslic3r/Polygon.hpp"
+#include <memory>
+#include <functional>
 #include <string>
 #include <condition_variable>
 #include <mutex>
 
 #include <boost/thread.hpp>
 
+#include <utility>
+#include <vector>
 #include <wx/event.h>
 
 #include "libslic3r/PrintBase.hpp"
diff --git a/src/slic3r/GUI/BaseTransparentDPIFrame.cpp b/src/slic3r/GUI/BaseTransparentDPIFrame.cpp
index 918116d89b..81e0fb7baf 100644
--- a/src/slic3r/GUI/BaseTransparentDPIFrame.cpp
+++ b/src/slic3r/GUI/BaseTransparentDPIFrame.cpp
@@ -1,7 +1,14 @@
 #include "BaseTransparentDPIFrame.hpp"
 
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/Event.hpp"
 #include <thread>
+#include <wx/dcclient.h>
 #include <wx/event.h>
+#include <wx/gdicmn.h>
 #include <wx/sizer.h>
 #include <wx/slider.h>
 #include <wx/dcmemory.h>
@@ -14,6 +21,9 @@
 #include "Widgets/TextInput.hpp"
 #include "Notebook.hpp"
 #include <chrono>
+#include <wx/string.h>
+#include <wx/toplevel.h>
+#include <wx/timer.h>
 #include "Widgets/Button.hpp"
 #include "Widgets/CheckBox.hpp"
 #include "CapsuleButton.hpp"
diff --git a/src/slic3r/GUI/BaseTransparentDPIFrame.hpp b/src/slic3r/GUI/BaseTransparentDPIFrame.hpp
index 7dc83b4d46..e63e23c079 100644
--- a/src/slic3r/GUI/BaseTransparentDPIFrame.hpp
+++ b/src/slic3r/GUI/BaseTransparentDPIFrame.hpp
@@ -2,9 +2,13 @@
 #define _BaseTransparentDPIFrame_H_
 
 #include <future>
+#include "slic3r/GUI/Event.hpp"
 #include <thread>
 #include "GUI_App.hpp"
 #include "GUI_Utils.hpp"
+#include <wx/gdicmn.h>
+#include <wx/string.h>
+#include <wx/sizer.h>
 #include <wx/timer.h>
 
 class Button;
diff --git a/src/slic3r/GUI/BedShapeDialog.cpp b/src/slic3r/GUI/BedShapeDialog.cpp
index 6066fd5633..d8438e178a 100644
--- a/src/slic3r/GUI/BedShapeDialog.cpp
+++ b/src/slic3r/GUI/BedShapeDialog.cpp
@@ -2,6 +2,30 @@
 #include "GUI_App.hpp"
 #include "OptionsGroup.hpp"
 
+#include "libslic3r/Point.hpp"
+#include <string>
+#include <cassert>
+#include "libslic3r/Config.hpp"
+#include <utility>
+#include <wx/string.h>
+#include "libslic3r/BuildVolume.hpp"
+#include "slic3r/GUI/Field.hpp"
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <wx/panel.h>
+#include <wx/bookctrl.h>
+#include "slic3r/GUI/2DBed.hpp"
+#include <memory>
+#include <boost/filesystem/operations.hpp>
+#include <boost/any.hpp>
+#include <exception>
+#include "libslic3r/libslic3r.h"
+#include <vector>
+#include <cmath>
+#include <wx/filedlg.h>
+#include "slic3r/GUI/GUI.hpp"
+#include <wx/busycursor.h>
 #include <wx/wx.h>
 #include <wx/numformatter.h>
 #include <wx/sizer.h>
diff --git a/src/slic3r/GUI/BedShapeDialog.hpp b/src/slic3r/GUI/BedShapeDialog.hpp
index 9b5cb1f2ae..78211d103b 100644
--- a/src/slic3r/GUI/BedShapeDialog.hpp
+++ b/src/slic3r/GUI/BedShapeDialog.hpp
@@ -11,8 +11,17 @@
 
 #include "Widgets/ComboBox.hpp"
 
+#include <memory>
+#include "libslic3r/Point.hpp"
+#include <string>
+#include <vector>
+#include "libslic3r/Config.hpp"
 #include <wx/dialog.h>
+#include <wx/panel.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
 #include <wx/simplebook.h> // ORCA
+#include <wx/string.h>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/BindDialog.cpp b/src/slic3r/GUI/BindDialog.cpp
index 883765751b..c16bcf016d 100644
--- a/src/slic3r/GUI/BindDialog.cpp
+++ b/src/slic3r/GUI/BindDialog.cpp
@@ -1,10 +1,44 @@
 #include "BindDialog.hpp"
 #include "GUI_App.hpp"
 
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/intl.h>
+#include <wx/gdicmn.h>
+#include <wx/toplevel.h>
+#include <wx/panel.h>
+#include <wx/simplebook.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/Widgets/HyperLink.hpp"
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include <wx/string.h>
+#include <wx/textctrl.h>
+#include <wx/event.h>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <cstddef>
+#include <wx/utils.h>
+#include "slic3r/GUI/MsgDialog.hpp"
+#include "slic3r/GUI/Widgets/StaticBox.hpp"
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <wx/wrapsizer.h>
+#include "slic3r/GUI/Widgets/CheckBox.hpp"
+#include "slic3r/GUI/ReleaseNote.hpp"
+#include <wx/tglbtn.h>
+#include <memory>
+#include "slic3r/GUI/BBLStatusBarBind.hpp"
+#include "slic3r/GUI/Jobs/BindJob.hpp"
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include "slic3r/GUI/Jobs/Worker.hpp"
+#include <utility>
+#include "slic3r/GUI/GUI.hpp"
+#include <wx/image.h>
+#include <wx/stattext.h>
 #include <wx/wx.h>
 #include <wx/mstream.h>
 #include <wx/sizer.h>
 #include <wx/statbox.h>
+#include "bambu_networking.hpp"
+#include "Http.hpp"
 #include "wx/evtloop.h"
 #include <wx/tokenzr.h>
 #include <wx/richmsgdlg.h>
diff --git a/src/slic3r/GUI/BindDialog.hpp b/src/slic3r/GUI/BindDialog.hpp
index 8d21c1be5e..25df5c75ff 100644
--- a/src/slic3r/GUI/BindDialog.hpp
+++ b/src/slic3r/GUI/BindDialog.hpp
@@ -3,9 +3,16 @@
 
 #include "I18N.hpp"
 
+#include <cstddef>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <memory>
+#include <wx/event.h>
+#include "slic3r/GUI/Widgets/StaticBox.hpp"
 #include <wx/font.h>
 #include <wx/colour.h>
+#include <wx/panel.h>
 #include <wx/settings.h>
+#include <wx/simplebook.h>
 #include <wx/string.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
diff --git a/src/slic3r/GUI/BitmapCache.cpp b/src/slic3r/GUI/BitmapCache.cpp
index 6885c19297..4a52c3efab 100644
--- a/src/slic3r/GUI/BitmapCache.cpp
+++ b/src/slic3r/GUI/BitmapCache.cpp
@@ -5,8 +5,24 @@
 #include "GUI.hpp"
 #include "GUI_Utils.hpp"
 
+#include <algorithm>
+#include <boost/algorithm/string/replace.hpp>
 #include <boost/nowide/cstdio.hpp>
 #include <boost/filesystem.hpp>
+#include <utility>
+#include <string>
+#include <wx/image.h>
+#include <cstddef>
+#include <wx/dcmemory.h>
+#include <wx/gdicmn.h>
+#include <map>
+#include <cstdio>
+#include <cstdlib>
+#include "libslic3r/LocalesUtils.hpp"
+#include <cstring>
+#include <vector>
+#include <cstdint>
+#include <imgui.h>
 
 #ifdef __WXGTK2__
     // Broken alpha workaround
diff --git a/src/slic3r/GUI/BitmapCache.hpp b/src/slic3r/GUI/BitmapCache.hpp
index e2ebe75314..2f5efb061e 100644
--- a/src/slic3r/GUI/BitmapCache.hpp
+++ b/src/slic3r/GUI/BitmapCache.hpp
@@ -1,9 +1,12 @@
 #ifndef SLIC3R_GUI_BITMAP_CACHE_HPP
 #define SLIC3R_GUI_BITMAP_CACHE_HPP
 
+#include <cstddef>
 #include <map>
+#include <string>
 #include <vector>
 
+#include <wx/colour.h>
 #include <wx/wxprec.h>
 #ifndef WX_PRECOMP
     #include <wx/wx.h>
diff --git a/src/slic3r/GUI/BitmapComboBox.cpp b/src/slic3r/GUI/BitmapComboBox.cpp
index c7911f4864..217b885b91 100644
--- a/src/slic3r/GUI/BitmapComboBox.cpp
+++ b/src/slic3r/GUI/BitmapComboBox.cpp
@@ -5,6 +5,8 @@
 #include <string>
 #include <boost/algorithm/string.hpp>
 
+#include <wx/bmpcbox.h>
+#include <wx/gdicmn.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
 #include <wx/textctrl.h>
diff --git a/src/slic3r/GUI/BitmapComboBox.hpp b/src/slic3r/GUI/BitmapComboBox.hpp
index 14e7e74c93..8b3d1f0f1d 100644
--- a/src/slic3r/GUI/BitmapComboBox.hpp
+++ b/src/slic3r/GUI/BitmapComboBox.hpp
@@ -1,8 +1,10 @@
 #ifndef slic3r_BitmapComboBox_hpp_
 #define slic3r_BitmapComboBox_hpp_
 
+#include <cstddef>
 #include <wx/bmpcbox.h>
 #include <wx/gdicmn.h>
+#include <wx/string.h>
 
 #include "GUI_Utils.hpp"
 
diff --git a/src/slic3r/GUI/BonjourDialog.cpp b/src/slic3r/GUI/BonjourDialog.cpp
index 8b3217e193..566441c64f 100644
--- a/src/slic3r/GUI/BonjourDialog.cpp
+++ b/src/slic3r/GUI/BonjourDialog.cpp
@@ -2,15 +2,27 @@
 
 #include "BonjourDialog.hpp"
 
+#include "libslic3r/Config.hpp"
+#include <memory>
+#include <boost/asio/ip/address.hpp>
+#include <cstddef>
 #include <set>
 #include <mutex>
 
 #include <boost/nowide/convert.hpp>
 
+#include <wx/event.h>
+#include <utility>
+#include <wx/gdicmn.h>
+#include <wx/dialog.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <wx/listbase.h>
+#include <vector>
 #include <wx/sizer.h>
 #include <wx/listctrl.h>
 #include <wx/stattext.h>
 #include <wx/timer.h>
+#include <wx/toplevel.h>
 #include <wx/wupdlock.h>
 
 #include "slic3r/GUI/GUI.hpp"
diff --git a/src/slic3r/GUI/BonjourDialog.hpp b/src/slic3r/GUI/BonjourDialog.hpp
index 8bfc076c44..2af82f8410 100644
--- a/src/slic3r/GUI/BonjourDialog.hpp
+++ b/src/slic3r/GUI/BonjourDialog.hpp
@@ -2,11 +2,14 @@
 #define slic3r_BonjourDialog_hpp_
 
 #include <cstddef>
+#include "libslic3r/Config.hpp"
 #include <memory>
 
 #include <boost/asio/ip/address.hpp>
 
+#include <vector>
 #include <wx/dialog.h>
+#include <wx/event.h>
 #include <wx/string.h>
 
 #include "libslic3r/PrintConfig.hpp"
diff --git a/src/slic3r/GUI/CAD/DesignCanvas.cpp b/src/slic3r/GUI/CAD/DesignCanvas.cpp
index 8db2afbbc2..517fbcee63 100644
--- a/src/slic3r/GUI/CAD/DesignCanvas.cpp
+++ b/src/slic3r/GUI/CAD/DesignCanvas.cpp
@@ -15,14 +15,32 @@
 #include "libslic3r/Config.hpp"
 #include <boost/algorithm/string/predicate.hpp>
 #include <algorithm>
+#include <cstdio>
 #include <cstdlib>
 
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include "libslic3r/CAD/SketchEngine.hpp"
+#include <vector>
+#include <memory>
+#include <string>
+#include <functional>
+#include "libslic3r/Color.hpp"
+#include "slic3r/GUI/CAD/DesignSketchTool.hpp"
+#include "libslic3r/Point.hpp"
+#include <utility>
+#include "libslic3r/CAD/CadDocument.hpp"
+#include "libslic3r/BoundingBox.hpp"
 #include <wx/glcanvas.h>
+#include <wx/panel.h>
 #include <wx/stopwatch.h>   // wxGetLocalTimeMillis: the right-click vs right-hold budget
 #include <wx/sizer.h>
 #include <wx/frame.h>
 #include <wx/stattext.h>
+#include <wx/string.h>
+#include <wx/time.h>
 #include <wx/toplevel.h>
+#include <wx/window.h>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/CAD/DesignCanvas.hpp b/src/slic3r/GUI/CAD/DesignCanvas.hpp
index fab2e556e3..3f87eb434b 100644
--- a/src/slic3r/GUI/CAD/DesignCanvas.hpp
+++ b/src/slic3r/GUI/CAD/DesignCanvas.hpp
@@ -1,12 +1,20 @@
 #ifndef slic3r_DesignCanvas_hpp_
 #define slic3r_DesignCanvas_hpp_
 
+#include <vector>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/CAD/CadDocument.hpp"
+#include "libslic3r/Color.hpp"
+#include <utility>
+#include <wx/colour.h>
+#include <wx/event.h>
 #include <wx/panel.h>
 #include <wx/popupwin.h>
 
 #include <functional>
 #include <memory>
 #include <string>
+#include <wx/string.h>
 
 #include "slic3r/GUI/3DBed.hpp"
 #include "slic3r/GUI/Camera.hpp"
diff --git a/src/slic3r/GUI/CAD/DesignPanel.cpp b/src/slic3r/GUI/CAD/DesignPanel.cpp
index 5f64025f2b..59e3aaac8e 100644
--- a/src/slic3r/GUI/CAD/DesignPanel.cpp
+++ b/src/slic3r/GUI/CAD/DesignPanel.cpp
@@ -1,4 +1,5 @@
 #include "slic3r/GUI/CAD/DesignPanel.hpp"
+#include "libslic3r_version.h"
 #include "slic3r/GUI/CAD/DesignCanvas.hpp"
 #include "slic3r/GUI/CAD/DesignSketchTool.hpp"
 #include "slic3r/GUI/CAD/DesignOffer.hpp"                // generated offer table — see scripts/CAD/tool_atlas.json
@@ -7,6 +8,11 @@
 #include "libslic3r/Format/OBJ.hpp"
 #include "libslic3r/Format/bbs_3mf.hpp"   // put_other_changes: mark the project dirty outside the undo stack
 
+#include <TopoDS_Face.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS_Shape.hxx>
+#include <Eigen/Geometry>
+#include <TopAbs_Orientation.hxx>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/log/trivial.hpp>          // the offer/atlas join check reports on the log
@@ -14,15 +20,45 @@
 
 #include <cassert>
 #include <cstdarg>                        // offer_trace: diagnostic row dump for the offer ladder
+#include <cstddef>
+#include <cstdint>
+#include <cstdio>
+#include "libslic3r/CAD/SketchEngine.hpp"
+#include "libslic3r/CAD/CadDocument.hpp"
+#include "libslic3r/Point.hpp"
+#include <cstdlib>
+#include <exception>
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/Color.hpp"
+#include "libslic3r/CAD/SketchSolver.hpp"
 #include <map>
+#include <math.h>
 #include <set>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/chartype.h>
+#include <vector>
+#include <wx/scrolwin.h>
+#include <wx/anybutton.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <utility>
+#include <wx/listbase.h>
+#include <wx/busycursor.h>
+#include <wx/colourdata.h>
+#include "slic3r/GUI/CAD/DesignInteraction.hpp"
 #include <wx/sizer.h>
 #include <wx/button.h>
+#include <wx/spinbutt.h>
 #include <wx/stattext.h>
 #include <wx/checkbox.h>
 #include <wx/checklst.h>
 #include <wx/spinctrl.h>
 #include <wx/listctrl.h>
+#include <wx/string.h>
+#include <wx/treebase.h>
+#include <wx/tglbtn.h>
+#include <wx/textctrl.h>
+#include <wx/translation.h>
 #include <wx/treectrl.h>
 #include <wx/imaglist.h>
 #include <wx/statline.h>
@@ -35,6 +71,7 @@
 #include <wx/colordlg.h>
 #include <wx/menu.h>
 #include <wx/progdlg.h>
+#include <wx/unichar.h>
 #include <wx/utils.h>    // wxWindowDisabler, wxMilliSleep
 #include <wx/msgdlg.h>   // wxMessageBox
 
@@ -45,6 +82,7 @@
 #include <algorithm>
 #include <thread>
 #include <atomic>
+#include <wx/window.h>
 
 #include "slic3r/GUI/wxExtensions.hpp"   // ScalableButton, create_scaled_bitmap
 #include "slic3r/GUI/Widgets/Label.hpp"             // HarmonyOS Sans fonts (Head_*/Body_*) shared with the rest of Orca
diff --git a/src/slic3r/GUI/CAD/DesignPanel.hpp b/src/slic3r/GUI/CAD/DesignPanel.hpp
index 16f0a2722c..5197ea4bbf 100644
--- a/src/slic3r/GUI/CAD/DesignPanel.hpp
+++ b/src/slic3r/GUI/CAD/DesignPanel.hpp
@@ -1,8 +1,17 @@
 #ifndef slic3r_DesignPanel_hpp_
 #define slic3r_DesignPanel_hpp_
 
+#include <string>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/CAD/SketchEngine.hpp"
+#include "libslic3r/TriangleMesh.hpp"
+#include <wx/accel.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/colour.h>
 #include <wx/panel.h>
 #include <wx/scrolwin.h>
+#include <wx/string.h>
 #include <wx/treebase.h>   // wxTreeItemId
 
 #include <vector>
diff --git a/src/slic3r/GUI/CAD/DesignSketchTool.cpp b/src/slic3r/GUI/CAD/DesignSketchTool.cpp
index c195d6a877..d4883b4ba6 100644
--- a/src/slic3r/GUI/CAD/DesignSketchTool.cpp
+++ b/src/slic3r/GUI/CAD/DesignSketchTool.cpp
@@ -5,6 +5,11 @@
 #include "slic3r/GUI/CAD/SketchInlineEditor.hpp"
 #include "slic3r/GUI/Plater.hpp"
 
+#include <Eigen/Core>
+#include <TopoDS_Shape.hxx>
+#include <TopoDS_Face.hxx>
+#include <TopoDS_Edge.hxx>
+#include <Eigen/Geometry>
 #include <imgui/imgui.h>
 #include <imgui/imgui_internal.h>
 #include "libslic3r/BuildVolume.hpp"
@@ -15,6 +20,19 @@
 #include "libslic3r/TriangleMesh.hpp"
 
 #include <GL/glew.h>
+#include "libslic3r/CAD/SketchEngine.hpp"
+#include "libslic3r/Point.hpp"
+#include <vector>
+#include <math.h>
+#include "libslic3r/CAD/SketchSolver.hpp"
+#include "libslic3r/Line.hpp"
+#include <string>
+#include "libslic3r/CAD/SketchInference.hpp"
+#include <utility>
+#include "libslic3r/CAD/CadDocument.hpp"
+#include "slic3r/GUI/GLModel.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include <initializer_list>
 #include <wx/gdicmn.h>
 #include <algorithm>
 #include <climits>
diff --git a/src/slic3r/GUI/CAD/DesignSketchTool.hpp b/src/slic3r/GUI/CAD/DesignSketchTool.hpp
index c88b149c59..a68cfc2b88 100644
--- a/src/slic3r/GUI/CAD/DesignSketchTool.hpp
+++ b/src/slic3r/GUI/CAD/DesignSketchTool.hpp
@@ -8,7 +8,10 @@
 #include "libslic3r/CAD/SketchSolver.hpp"
 #include "slic3r/GUI/GLModel.hpp"
 #include "slic3r/GUI/GLSelectionRectangle.hpp"   // left-drag rubber band over the committed bodies
+#include <Eigen/Core>
 #include <functional>
+#include "libslic3r/Color.hpp"
+#include <math.h>
 #include <vector>
 #include <string>
 #include <utility>
diff --git a/src/slic3r/GUI/CAD/McpControl.cpp b/src/slic3r/GUI/CAD/McpControl.cpp
index 0ad05667c3..5ae67edbb2 100644
--- a/src/slic3r/GUI/CAD/McpControl.cpp
+++ b/src/slic3r/GUI/CAD/McpControl.cpp
@@ -1,4 +1,11 @@
 #include "slic3r/GUI/CAD/McpControl.hpp"
+#include "libslic3r/Point.hpp"
+#include <stdexcept>
+#include <math.h>
+#include <TopAbs_ShapeEnum.hxx>
+#include <Standard_TypeDef.hxx>
+#include <exception>
+#include <cstdint>
 
 #ifndef _WIN32  // POSIX Unix-domain-socket transport only (slice 1)
 
diff --git a/src/slic3r/GUI/CAD/SketchInlineEditor.cpp b/src/slic3r/GUI/CAD/SketchInlineEditor.cpp
index 8dfb939576..effb949f66 100644
--- a/src/slic3r/GUI/CAD/SketchInlineEditor.cpp
+++ b/src/slic3r/GUI/CAD/SketchInlineEditor.cpp
@@ -5,6 +5,7 @@
 #include "slic3r/GUI/I18N.hpp"
 #include "libslic3r/Color.hpp"
 
+#include <functional>
 #include <imgui/imgui.h>
 #include <imgui/imgui_internal.h>   // BringWindowToDisplayFront / GetCurrentWindow
 
@@ -12,6 +13,8 @@
 #include <cstdlib>
 #include <cstring>
 #include <string>
+#include <wx/gdicmn.h>
+#include <utility>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/CaliHistoryDialog.cpp b/src/slic3r/GUI/CaliHistoryDialog.cpp
index 9b85e80c10..1c2c0b9217 100644
--- a/src/slic3r/GUI/CaliHistoryDialog.cpp
+++ b/src/slic3r/GUI/CaliHistoryDialog.cpp
@@ -8,7 +8,38 @@
 #include "MsgDialog.hpp"
 #include "slic3r/Utils/CalibUtils.hpp"
 #include "Widgets/DialogButtons.hpp"
+#include "libslic3r/Config.hpp"
+#include <boost/log/trivial.hpp>
+#include <string>
+#include <vector>
+#include "libslic3r/calib.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/event.h>
+#include <wx/dialog.h>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "slic3r/GUI/Widgets/SwitchButton.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <array>
+#include <cstdlib>
+#include <cassert>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include <algorithm>
+#include <wx/arrstr.h>
+#include <set>
+#include <sstream>
+#include <ios>
+#include <iomanip>
+#include <cstddef>
+#include <cstdint>
 #include <wx/gbsizer.h>
+#include <wx/gdicmn.h>
+#include <wx/tglbtn.h>
+#include <wx/panel.h>
+#include <wx/timer.h>
+#include <wx/sizer.h>
+#include <wx/string.h>
 
 #include "Plater.hpp"
 #include "DeviceCore/DevExtruderSystem.h"
diff --git a/src/slic3r/GUI/CaliHistoryDialog.hpp b/src/slic3r/GUI/CaliHistoryDialog.hpp
index d5159b634c..c57c5abcf4 100644
--- a/src/slic3r/GUI/CaliHistoryDialog.hpp
+++ b/src/slic3r/GUI/CaliHistoryDialog.hpp
@@ -6,6 +6,16 @@
 #include "Widgets/ComboBox.hpp"
 #include "Widgets/SwitchButton.hpp"
 #include "DeviceManager.hpp"
+#include <vector>
+#include "libslic3r/calib.hpp"
+#include <wx/event.h>
+#include <wx/timer.h>
+#include <wx/panel.h>
+#include "slic3r/GUI/DeviceErrorDialog.hpp"
+#include <string>
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include <wx/arrstr.h>
+#include <map>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/Calibration.cpp b/src/slic3r/GUI/Calibration.cpp
index f3351fdb6b..7c25d4adaa 100644
--- a/src/slic3r/GUI/Calibration.cpp
+++ b/src/slic3r/GUI/Calibration.cpp
@@ -12,6 +12,23 @@
 #include "Widgets/StaticBox.hpp"
 
 #include "DeviceCore/DevConfig.h"
+#include <wx/colour.h>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/wx.h>
+#include <wx/gdicmn.h>
+#include <wx/toplevel.h>
+#include <wx/panel.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/Widgets/AMSItem.hpp"
+#include "slic3r/GUI/Widgets/StaticLine.hpp"
+#include "slic3r/GUI/Widgets/StepCtrl.hpp"
+#include <utility>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <wx/event.h>
+#include <wx/string.h>
+#include <wx/stattext.h>
+#include "slic3r/GUI/DeviceManager.hpp"
+#include <boost/log/trivial.hpp>
 
 static wxColour FG_COLOR = wxColour(0x32, 0x3A, 0x3D);
 static wxColour BG_COLOR = wxColour(0xF8, 0xF8, 0xF8);
diff --git a/src/slic3r/GUI/Calibration.hpp b/src/slic3r/GUI/Calibration.hpp
index 35e006c446..c5318f818b 100644
--- a/src/slic3r/GUI/Calibration.hpp
+++ b/src/slic3r/GUI/Calibration.hpp
@@ -1,6 +1,10 @@
 #ifndef slic3r_GUI_Calibration_hpp_
 #define slic3r_GUI_Calibration_hpp_
 
+#include <map>
+#include <string>
+#include <vector>
+#include <wx/event.h>
 #include <wx/wx.h>
 #include <wx/intl.h>
 #include <wx/collpane.h>
diff --git a/src/slic3r/GUI/CalibrationPanel.cpp b/src/slic3r/GUI/CalibrationPanel.cpp
index 14e1d5dea2..bd09d5fcf7 100644
--- a/src/slic3r/GUI/CalibrationPanel.cpp
+++ b/src/slic3r/GUI/CalibrationPanel.cpp
@@ -1,4 +1,33 @@
+#include "libslic3r/calib.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/dcclient.h>
+#include <wx/dc.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/Widgets/PopupWindow.hpp"
+#include <boost/log/trivial.hpp>
+#include "libslic3r/Thread.hpp"
+#include <memory>
+#include <vector>
+#include <utility>
+#include <algorithm>
+#include "slic3r/GUI/Widgets/SideTools.hpp"
+#include <cstddef>
+#include "slic3r/GUI/Tabbook.hpp"
+#include <wx/colour.h>
+#include "slic3r/GUI/CalibrationWizard.hpp"
+#include "slic3r/GUI/CalibrationWizardPage.hpp"
+#include "slic3r/GUI/CalibrationWizardPresetPage.hpp"
+#include "slic3r/GUI/CalibrationWizardSavePage.hpp"
 #include <wx/dcgraph.h>
+#include <wx/event.h>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include <wx/popupwin.h>
+#include <wx/sizer.h>
+#include <wx/scrolwin.h>
+#include <wx/timer.h>
+#include <wx/notebook.h>
 #include "GUI.hpp"
 #include "GUI_App.hpp"
 #include "MainFrame.hpp"
diff --git a/src/slic3r/GUI/CalibrationPanel.hpp b/src/slic3r/GUI/CalibrationPanel.hpp
index 960c5eed37..f427b37871 100644
--- a/src/slic3r/GUI/CalibrationPanel.hpp
+++ b/src/slic3r/GUI/CalibrationPanel.hpp
@@ -4,7 +4,8 @@
 #include "CalibrationWizard.hpp"
 #include "Tabbook.hpp"
 #include "Lazy.hpp"
-//#include "Widgets/SideTools.hpp"
+#include "SelectMachinePop.hpp"
+#include "Widgets/SideTools.hpp"
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/CalibrationWizard.cpp b/src/slic3r/GUI/CalibrationWizard.cpp
index 4d6e694380..c1aa26aa98 100644
--- a/src/slic3r/GUI/CalibrationWizard.cpp
+++ b/src/slic3r/GUI/CalibrationWizard.cpp
@@ -1,4 +1,5 @@
 #include "CalibrationWizard.hpp"
+#include "CalibUtils.hpp"
 #include "I18N.hpp"
 #include "GUI_App.hpp"
 #include "slic3r/Utils/NetworkAgent.hpp"
@@ -7,6 +8,34 @@
 #include "../../libslic3r/calib.hpp"
 #include "Tabbook.hpp"
 #include "CaliHistoryDialog.hpp"
+#include <wx/event.h>
+#include <wx/string.h>
+#include <map>
+#include "libslic3r/Preset.hpp"
+#include <utility>
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/libslic3r.h"
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include <wx/colour.h>
+#include <wx/scrolwin.h>
+#include <functional>
+#include <boost/log/trivial.hpp>
+#include <string>
+#include "libslic3r/Config.hpp"
+#include "slic3r/GUI/CalibrationWizardPresetPage.hpp"
+#include <vector>
+#include "slic3r/GUI/ReleaseNote.hpp"
+#include <cassert>
+#include "slic3r/GUI/CalibrationWizardStartPage.hpp"
+#include "slic3r/GUI/CalibrationWizardCaliPage.hpp"
+#include "slic3r/GUI/CalibrationWizardSavePage.hpp"
+#include "slic3r/GUI/DeviceCore/DevCalib.h"
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <wx/arrstr.h>
+#include <algorithm>
+#include "slic3r/GUI/GUI.hpp"
+#include "libslic3r/ParameterUtils.hpp"
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/CalibrationWizard.hpp b/src/slic3r/GUI/CalibrationWizard.hpp
index 89c515eb80..86f876be55 100644
--- a/src/slic3r/GUI/CalibrationWizard.hpp
+++ b/src/slic3r/GUI/CalibrationWizard.hpp
@@ -10,6 +10,20 @@
 #include "CalibrationWizardCaliPage.hpp"
 #include "CalibrationWizardSavePage.hpp"
 #include "StagedBuild.hpp"
+#include <wx/panel.h>
+#include "libslic3r/calib.hpp"
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <string>
+#include <map>
+#include "libslic3r/Config.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include <functional>
+#include <wx/scrolwin.h>
+#include <wx/sizer.h>
+#include <vector>
+#include "slic3r/GUI/ReleaseNote.hpp"
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/CalibrationWizardCaliPage.cpp b/src/slic3r/GUI/CalibrationWizardCaliPage.cpp
index 2dc766dca3..babc7e959f 100644
--- a/src/slic3r/GUI/CalibrationWizardCaliPage.cpp
+++ b/src/slic3r/GUI/CalibrationWizardCaliPage.cpp
@@ -1,9 +1,27 @@
 #include "CalibrationWizardCaliPage.hpp"
+#include "CalibUtils.hpp"
 #include "MainFrame.hpp"
 #include "I18N.hpp"
 #include "Widgets/Label.hpp"
 
 #include "DeviceCore/DevManager.h"
+#include <wx/string.h>
+#include "libslic3r/calib.hpp"
+#include "slic3r/GUI/CalibrationWizardPage.hpp"
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/sizer.h>
+#include <cstddef>
+#include <wx/arrstr.h>
+#include "slic3r/GUI/StatusPanel.hpp"
+#include "slic3r/GUI/GUI_App.hpp"
+#include "slic3r/GUI/ReleaseNote.hpp"
+#include <boost/log/trivial.hpp>
+#include <cassert>
+#include <string>
+#include "slic3r/GUI/GUI.hpp"
+#include "libslic3r/Utils.hpp"
+#include <wx/panel.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/CalibrationWizardCaliPage.hpp b/src/slic3r/GUI/CalibrationWizardCaliPage.hpp
index b3ff01c2dc..b87ac0e5fd 100644
--- a/src/slic3r/GUI/CalibrationWizardCaliPage.hpp
+++ b/src/slic3r/GUI/CalibrationWizardCaliPage.hpp
@@ -3,6 +3,12 @@
 
 #include "CalibrationWizardPage.hpp"
 #include "StatusPanel.hpp"
+#include "libslic3r/calib.hpp"
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/DeviceManager.hpp"
+#include <wx/sizer.h>
+#include "slic3r/GUI/ReleaseNote.hpp"
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/CalibrationWizardPage.cpp b/src/slic3r/GUI/CalibrationWizardPage.cpp
index ff02feab68..0c4abb8070 100644
--- a/src/slic3r/GUI/CalibrationWizardPage.cpp
+++ b/src/slic3r/GUI/CalibrationWizardPage.cpp
@@ -1,9 +1,35 @@
 #include "CalibrationWizardPage.hpp"
+#include "CalibUtils.hpp"
 #include "I18N.hpp"
 #include "Widgets/Label.hpp"
 #include "MsgDialog.hpp"
 
 #include "DeviceCore/DevFilaSystem.h"
+#include <wx/event.h>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <wx/string.h>
+#include "libslic3r/calib.hpp"
+#include <string>
+#include "slic3r/GUI/GUI_App.hpp"
+#include <boost/algorithm/string/predicate.hpp>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <utility>
+#include <wx/colour.h>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include "slic3r/GUI/PresetComboBoxes.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <wx/anybutton.h>
+#include "slic3r/GUI/Widgets/HyperLink.hpp"
+#include <wx/utils.h>
+#include <wx/arrstr.h>
+#include "slic3r/GUI/Widgets/PopupWindow.hpp"
+#include <wx/dcclient.h>
+#include "slic3r/GUI/BBLStatusBarSend.hpp"
+#include <memory>
+#include <wx/scrolwin.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/CalibrationWizardPage.hpp b/src/slic3r/GUI/CalibrationWizardPage.hpp
index 524b1a6029..8624d7c9f7 100644
--- a/src/slic3r/GUI/CalibrationWizardPage.hpp
+++ b/src/slic3r/GUI/CalibrationWizardPage.hpp
@@ -13,6 +13,20 @@
 
 #include "slic3r/Utils/CalibUtils.hpp"
 #include "../../libslic3r/calib.hpp"
+#include "slic3r/GUI/DeviceManager.hpp"
+#include <wx/panel.h>
+#include <wx/gdicmn.h>
+#include "libslic3r/PrintConfig.hpp"
+#include <string>
+#include "slic3r/GUI/Widgets/CheckBox.hpp"
+#include <vector>
+#include <wx/arrstr.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/Widgets/PopupWindow.hpp"
+#include <wx/string.h>
+#include <memory>
+#include "slic3r/GUI/BBLStatusBarSend.hpp"
+#include <wx/scrolwin.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp
index 01c9843305..e49ebfb787 100644
--- a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp
+++ b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp
@@ -1,5 +1,43 @@
+#include "libslic3r/calib.hpp"
+#include <functional>
+#include <cstddef>
+#include <boost/log/trivial.hpp>
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/CommonDefs.hpp"
+#include <cstdint>
+#include "libslic3r/Config.hpp"
+#include "libslic3r/Preset.hpp"
+#include <algorithm>
+#include <map>
+#include <cassert>
+#include "libslic3r/PresetBundle.hpp"
+#include <cstdlib>
 #include <regex>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include <wx/string.h>
+#include <wx/valtext.h>
+#include <wx/textctrl.h>
+#include <wx/arrstr.h>
+#include "slic3r/GUI/Widgets/ComboBox.hpp"
+#include <string>
+#include <wx/sizer.h>
+#include "slic3r/GUI/CalibrationWizardPage.hpp"
+#include "slic3r/GUI/Widgets/AMSItem.hpp"
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <utility>
+#include <wx/anybutton.h>
+#include "slic3r/GUI/Widgets/CheckBox.hpp"
+#include <wx/tglbtn.h>
+#include <vector>
+#include "slic3r/GUI/BBLStatusBarSend.hpp"
+#include "slic3r/GUI/GUI_App.hpp"
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <wx/chartype.h>
 #include "CalibrationWizardPresetPage.hpp"
+#include "CalibUtils.hpp"
 #include "GUI.hpp"
 #include "slic3r/Utils/NetworkAgent.hpp"
 #include "I18N.hpp"
diff --git a/src/slic3r/GUI/CalibrationWizardPresetPage.hpp b/src/slic3r/GUI/CalibrationWizardPresetPage.hpp
index 4d1adb1004..1ad2a2e1e1 100644
--- a/src/slic3r/GUI/CalibrationWizardPresetPage.hpp
+++ b/src/slic3r/GUI/CalibrationWizardPresetPage.hpp
@@ -2,6 +2,30 @@
 #define slic3r_GUI_CalibrationWizardPresetPage_hpp_
 
 #include "CalibrationWizardPage.hpp"
+#include <wx/panel.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include "libslic3r/calib.hpp"
+#include <wx/sizer.h>
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include <wx/string.h>
+#include <wx/arrstr.h>
+#include <functional>
+#include "slic3r/GUI/Widgets/ComboBox.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <vector>
+#include <string>
+#include "slic3r/GUI/DeviceManager.hpp"
+#include <map>
+#include "libslic3r/Preset.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include <memory>
+#include "slic3r/GUI/Jobs/ProgressIndicator.hpp"
+#include "slic3r/GUI/Widgets/AMSItem.hpp"
+#include <cstddef>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <unordered_map>
+#include "slic3r/GUI/wxExtensions.hpp"
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/CalibrationWizardSavePage.cpp b/src/slic3r/GUI/CalibrationWizardSavePage.cpp
index fdff760078..d39b39206c 100644
--- a/src/slic3r/GUI/CalibrationWizardSavePage.cpp
+++ b/src/slic3r/GUI/CalibrationWizardSavePage.cpp
@@ -1,4 +1,5 @@
 #include "CalibrationWizardSavePage.hpp"
+#include "CalibUtils.hpp"
 #include "GUI.hpp"
 #include "I18N.hpp"
 #include "Widgets/Label.hpp"
@@ -6,6 +7,34 @@
 #include "DeviceCore/DevConfigUtil.h"
 #include "DeviceCore/DevNozzleSystem.h"
 #include "DeviceCore/DevNozzleRack.h"
+#include <wx/string.h>
+#include "libslic3r/calib.hpp"
+#include "libslic3r/PresetBundle.hpp"
+#include "slic3r/GUI/GUI_App.hpp"
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/CalibrationWizardPage.hpp"
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include "slic3r/GUI/Widgets/ComboBox.hpp"
+#include <wx/panel.h>
+#include <vector>
+#include <utility>
+#include <unordered_set>
+#include <string>
+#include <algorithm>
+#include <wx/valtext.h>
+#include <wx/arrstr.h>
+#include <map>
+#include <wx/sizer.h>
+#include "libslic3r/PrintConfig.hpp"
+#include <wx/anybutton.h>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <boost/log/trivial.hpp>
+#include "slic3r/GUI/DeviceCore/DevCalib.h"
+#include <cassert>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include "slic3r/GUI/Widgets/CheckBox.hpp"
+#include <wx/tglbtn.h>
 
 
 namespace Slic3r { namespace GUI {
diff --git a/src/slic3r/GUI/CalibrationWizardSavePage.hpp b/src/slic3r/GUI/CalibrationWizardSavePage.hpp
index eb15720e96..d29620ba4c 100644
--- a/src/slic3r/GUI/CalibrationWizardSavePage.hpp
+++ b/src/slic3r/GUI/CalibrationWizardSavePage.hpp
@@ -3,6 +3,24 @@
 
 #include "CalibrationWizardPage.hpp"
 #include "Widgets/TextInput.hpp"
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/sizer.h>
+#include <wx/panel.h>
+#include <wx/string.h>
+#include "slic3r/GUI/Widgets/ComboBox.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <string>
+#include "slic3r/GUI/DeviceManager.hpp"
+#include <vector>
+#include <utility>
+#include "libslic3r/calib.hpp"
+#include "slic3r/GUI/DeviceCore/DevCalib.h"
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <map>
+#include <memory>
+#include "slic3r/GUI/Jobs/ProgressIndicator.hpp"
+#include "slic3r/GUI/Widgets/CheckBox.hpp"
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/CalibrationWizardStartPage.cpp b/src/slic3r/GUI/CalibrationWizardStartPage.cpp
index 3ed24d184e..6fcfbb0aef 100644
--- a/src/slic3r/GUI/CalibrationWizardStartPage.cpp
+++ b/src/slic3r/GUI/CalibrationWizardStartPage.cpp
@@ -1,6 +1,17 @@
 #include "CalibrationWizardStartPage.hpp"
 #include "I18N.hpp"
 #include "Widgets/Label.hpp"
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/CalibrationWizardPage.hpp"
+#include <wx/sizer.h>
+#include <wx/string.h>
+#include <string>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "libslic3r/calib.hpp"
+#include "slic3r/GUI/GUI_App.hpp"
+#include "slic3r/GUI/DeviceManager.hpp"
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/CalibrationWizardStartPage.hpp b/src/slic3r/GUI/CalibrationWizardStartPage.hpp
index 026ce187ac..d8b928fd16 100644
--- a/src/slic3r/GUI/CalibrationWizardStartPage.hpp
+++ b/src/slic3r/GUI/CalibrationWizardStartPage.hpp
@@ -2,6 +2,14 @@
 #define slic3r_GUI_CalibrationWizardStartPage_hpp_
 
 #include "CalibrationWizardPage.hpp"
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include "libslic3r/calib.hpp"
+#include <wx/sizer.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <wx/string.h>
+#include <string>
+#include "slic3r/GUI/DeviceManager.hpp"
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/Camera.cpp b/src/slic3r/GUI/Camera.cpp
index 19e37feaaf..ff97505483 100644
--- a/src/slic3r/GUI/Camera.cpp
+++ b/src/slic3r/GUI/Camera.cpp
@@ -3,6 +3,21 @@
 
 #include "Camera.hpp"
 #include "GUI_App.hpp"
+#include "libslic3r/Technologies.hpp"
+#include <string>
+#include "libslic3r/Point.hpp"
+#include <algorithm>
+#include "libslic3r/Geometry.hpp"
+#include <cmath>
+#include "libslic3r/BoundingBox.hpp"
+#include <cassert>
+#include "slic3r/GUI/3DScene.hpp"
+#include <cstdlib>
+#include <utility>
+#include <vector>
+#include <cfloat>
+#include "libslic3r/TriangleMesh.hpp"
+#include <math.h>
 #if ENABLE_CAMERA_STATISTICS
 #include "Mouse3DController.hpp"
 #include "Plater.hpp"
diff --git a/src/slic3r/GUI/Camera.hpp b/src/slic3r/GUI/Camera.hpp
index 7835b84b58..5e8d6781e5 100644
--- a/src/slic3r/GUI/Camera.hpp
+++ b/src/slic3r/GUI/Camera.hpp
@@ -3,7 +3,16 @@
 
 #include "libslic3r/BoundingBox.hpp"
 #include "3DScene.hpp"
+#include <Eigen/Geometry>
+#include <algorithm>
 #include <array>
+#include "libslic3r/Point.hpp"
+#include <utility>
+#include <string>
+#include <cassert>
+#include "libslic3r/Technologies.hpp"
+#include <cstdlib>
+#include "libslic3r/libslic3r.h"
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/CameraPopup.cpp b/src/slic3r/GUI/CameraPopup.cpp
index 099edd7de0..299aaa85fc 100644
--- a/src/slic3r/GUI/CameraPopup.cpp
+++ b/src/slic3r/GUI/CameraPopup.cpp
@@ -4,9 +4,28 @@
 #include "Widgets/Label.hpp"
 #include "libslic3r/Utils.hpp"
 #include "BitmapCache.hpp"
+#include <wx/object.h>
+#include "slic3r/GUI/Widgets/PopupWindow.hpp"
+#include <wx/event.h>
+#include <wx/colour.h>
+#include <wx/popupwin.h>
+#include "slic3r/GUI/Widgets/SwitchButton.hpp"
+#include <wx/panel.h>
+#include <wx/gdicmn.h>
+#include <cstddef>
+#include "slic3r/GUI/Widgets/RadioBox.hpp"
+#include <string>
+#include <vector>
+#include <algorithm>
+#include <wx/dcclient.h>
+#include <wx/dc.h>
 #include <wx/progdlg.h>
 #include <wx/clipbrd.h>
 #include <wx/dcgraph.h>
+#include <wx/string.h>
+#include <wx/scrolwin.h>
+#include <wx/sizer.h>
+#include <wx/timer.h>
 #include <wx/utils.h>
 #include "GUI_App.hpp"
 #include <slic3r/GUI/StatusPanel.hpp>
diff --git a/src/slic3r/GUI/CameraPopup.hpp b/src/slic3r/GUI/CameraPopup.hpp
index c9b1540d3b..06580f6653 100644
--- a/src/slic3r/GUI/CameraPopup.hpp
+++ b/src/slic3r/GUI/CameraPopup.hpp
@@ -4,9 +4,18 @@
 #include "slic3r/GUI/MonitorBasePanel.h"
 #include "DeviceManager.hpp"
 #include "GUI.hpp"
+#include <wx/event.h>
+#include <cstddef>
+#include <string>
+#include <vector>
+#include "slic3r/GUI/DeviceErrorDialog.hpp"
+#include "slic3r/GUI/wxExtensions.hpp"
 #include <wx/panel.h>
 #include <wx/bitmap.h>
 #include <wx/image.h>
+#include <wx/string.h>
+#include <wx/scrolwin.h>
+#include <wx/rtti.h>
 #include <wx/timer.h>
 #include <wx/sizer.h>
 #include <wx/gbsizer.h>
diff --git a/src/slic3r/GUI/CameraUtils.cpp b/src/slic3r/GUI/CameraUtils.cpp
index a14e99c9c5..ace1225394 100644
--- a/src/slic3r/GUI/CameraUtils.cpp
+++ b/src/slic3r/GUI/CameraUtils.cpp
@@ -1,6 +1,16 @@
 #include "CameraUtils.hpp"
+#include <Eigen/Core>
+#include <cstddef>
+#include <cassert>
+#include <cmath>
 #include <igl/project.h> // projecting points
 #include <igl/unproject.h>
+#include "libslic3r/Point.hpp"
+#include "slic3r/GUI/Camera.hpp"
+#include <vector>
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/TriangleMesh.hpp"
+#include <limits>
 
 #include "slic3r/GUI/3DScene.hpp" // GLVolume
 #include "libslic3r/Geometry/ConvexHull.hpp"
diff --git a/src/slic3r/GUI/CameraUtils.hpp b/src/slic3r/GUI/CameraUtils.hpp
index 6e953bf6ee..2961629d0c 100644
--- a/src/slic3r/GUI/CameraUtils.hpp
+++ b/src/slic3r/GUI/CameraUtils.hpp
@@ -3,6 +3,8 @@
 
 #include "Camera.hpp"
 #include "libslic3r/Point.hpp"
+#include <vector>
+#include "libslic3r/Polygon.hpp"
 namespace Slic3r {
 class GLVolume;
 }
diff --git a/src/slic3r/GUI/CapsuleButton.cpp b/src/slic3r/GUI/CapsuleButton.cpp
index 8d71f9911e..062dcd9c88 100644
--- a/src/slic3r/GUI/CapsuleButton.cpp
+++ b/src/slic3r/GUI/CapsuleButton.cpp
@@ -1,7 +1,15 @@
 #include "GUI_App.hpp"
 #include "CapsuleButton.hpp"
 #include "Widgets/StateColor.hpp"
+#include <wx/colour.h>
+#include "slic3r/GUI/wxExtensions.hpp"
 #include <wx/dcbuffer.h>
+#include <wx/string.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <wx/window.h>
 #include "wx/graphics.h"
 #include "Widgets/Label.hpp"
 
diff --git a/src/slic3r/GUI/CapsuleButton.hpp b/src/slic3r/GUI/CapsuleButton.hpp
index 7ec13f3e20..ac23f174e8 100644
--- a/src/slic3r/GUI/CapsuleButton.hpp
+++ b/src/slic3r/GUI/CapsuleButton.hpp
@@ -3,6 +3,10 @@
 
 #include "wxExtensions.hpp"
 #include "Widgets/Label.hpp"
+#include <wx/panel.h>
+#include <wx/checklst.h>
+#include <wx/string.h>
+#include <wx/event.h>
 
 namespace Slic3r { namespace GUI {
 class CapsuleButton : public wxPanel
diff --git a/src/slic3r/GUI/CloneDialog.cpp b/src/slic3r/GUI/CloneDialog.cpp
index 9024f0cb61..1c52b8cdb4 100644
--- a/src/slic3r/GUI/CloneDialog.cpp
+++ b/src/slic3r/GUI/CloneDialog.cpp
@@ -2,6 +2,24 @@
 
 #include "GUI_App.hpp"
 #include "MainFrame.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/event.h>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <wx/gdicmn.h>
+#include <wx/toplevel.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <wx/sizer.h>
+#include "slic3r/GUI/Widgets/SpinInput.hpp"
+#include <wx/string.h>
+#include "slic3r/GUI/Widgets/CheckBox.hpp"
+#include "slic3r/GUI/Widgets/ProgressBar.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/colour.h>
+#include "slic3r/GUI/Widgets/DialogButtons.hpp"
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "slic3r/GUI/Selection.hpp"
+#include <wx/utils.h>
+#include "slic3r/GUI/Jobs/Job.hpp"
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/CloneDialog.hpp b/src/slic3r/GUI/CloneDialog.hpp
index b15e0b9757..7d83b93d62 100644
--- a/src/slic3r/GUI/CloneDialog.hpp
+++ b/src/slic3r/GUI/CloneDialog.hpp
@@ -10,6 +10,7 @@
 #include "Widgets/DialogButtons.hpp"
 #include "Widgets/CheckBox.hpp"
 #include "Widgets/ProgressBar.hpp"
+#include "libslic3r/AppConfig.hpp"
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/ColorDecomposeDialog.cpp b/src/slic3r/GUI/ColorDecomposeDialog.cpp
index 2176de110e..4a038affaa 100644
--- a/src/slic3r/GUI/ColorDecomposeDialog.cpp
+++ b/src/slic3r/GUI/ColorDecomposeDialog.cpp
@@ -2,12 +2,26 @@
 
 #include <algorithm>
 #include <cmath>
+#include <cstddef>
 #include <functional>
 #include <memory>
 #include <set>
+#include <wx/colour.h>
+#include <string>
+#include <wx/panel.h>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <vector>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <utility>
+#include <wx/event.h>
+#include <wx/peninfobase.h>
 #include <wx/sizer.h>
 #include <wx/dcclient.h>
 #include <wx/dcbuffer.h>
+#include <wx/toplevel.h>
+#include <wx/string.h>
+#include <wx/tglbtn.h>
 #include "wx/graphics.h"
 
 #include "I18N.hpp"
diff --git a/src/slic3r/GUI/ColorDecomposeDialog.hpp b/src/slic3r/GUI/ColorDecomposeDialog.hpp
index 419dfe8cea..6e5a602e2c 100644
--- a/src/slic3r/GUI/ColorDecomposeDialog.hpp
+++ b/src/slic3r/GUI/ColorDecomposeDialog.hpp
@@ -2,14 +2,17 @@
 #define slic3r_ColorDecomposeDialog_hpp_
 
 #include <array>
+#include <cstddef>
 #include <functional>
 #include <string>
 #include <vector>
 #include <utility>
 #include <wx/colour.h>
 #include <wx/panel.h>
+#include <wx/sizer.h>
 #include <wx/statbmp.h>
 #include <wx/stattext.h>
+#include <wx/string.h>
 
 #include "GUI_Utils.hpp"
 #include "libslic3r/ColorDecomposeRecipe.hpp"
diff --git a/src/slic3r/GUI/ColorDecomposeSupport.cpp b/src/slic3r/GUI/ColorDecomposeSupport.cpp
index cfd0d02532..35ba3ffeb8 100644
--- a/src/slic3r/GUI/ColorDecomposeSupport.cpp
+++ b/src/slic3r/GUI/ColorDecomposeSupport.cpp
@@ -10,9 +10,17 @@
 
 #include "nlohmann/json.hpp"
 
+#include <cstddef>
 #include <fstream>
 #include <algorithm>
 #include <cctype>
+#include <string>
+#include "slic3r/GUI/ColorDecomposeDialog.hpp"
+#include <wx/string.h>
+#include <vector>
+#include "libslic3r/Config.hpp"
+#include <wx/colour.h>
+#include <utility>
 
 using json = nlohmann::json;
 
diff --git a/src/slic3r/GUI/ColorDecomposeSupport.hpp b/src/slic3r/GUI/ColorDecomposeSupport.hpp
index a982c51303..cc736fb3e2 100644
--- a/src/slic3r/GUI/ColorDecomposeSupport.hpp
+++ b/src/slic3r/GUI/ColorDecomposeSupport.hpp
@@ -1,6 +1,7 @@
 #ifndef slic3r_GUI_ColorDecomposeSupport_hpp_
 #define slic3r_GUI_ColorDecomposeSupport_hpp_
 
+#include <cstddef>
 #include <string>
 #include <vector>
 #include <wx/string.h>
diff --git a/src/slic3r/GUI/ConfigManipulation.cpp b/src/slic3r/GUI/ConfigManipulation.cpp
index 7b2bfe0352..91c5f211e1 100644
--- a/src/slic3r/GUI/ConfigManipulation.cpp
+++ b/src/slic3r/GUI/ConfigManipulation.cpp
@@ -14,7 +14,15 @@
 #include "Plater.hpp"
 
 #include <algorithm>
+#include "slic3r/GUI/GUI.hpp"
+#include "libslic3r/libslic3r.h"
+#include "slic3r/GUI/Field.hpp"
+#include <cstdlib>
+#include <set>
+#include <map>
 #include <sstream>
+#include <string>
+#include <vector>
 #include <wx/msgdlg.h>
 
 namespace Slic3r {
diff --git a/src/slic3r/GUI/ConfigManipulation.hpp b/src/slic3r/GUI/ConfigManipulation.hpp
index 0ebf7d963a..8e189a541c 100644
--- a/src/slic3r/GUI/ConfigManipulation.hpp
+++ b/src/slic3r/GUI/ConfigManipulation.hpp
@@ -10,6 +10,13 @@
 
 #include "libslic3r/PrintConfig.hpp"
 #include "Field.hpp"
+#include <functional>
+#include <string>
+#include <wx/string.h>
+#include <boost/any.hpp>
+#include "libslic3r/Config.hpp"
+#include <vector>
+#include <map>
 
 namespace Slic3r {
 
diff --git a/src/slic3r/GUI/ConfigValueFormatter.cpp b/src/slic3r/GUI/ConfigValueFormatter.cpp
index 17cf902217..2ae515b0e2 100644
--- a/src/slic3r/GUI/ConfigValueFormatter.cpp
+++ b/src/slic3r/GUI/ConfigValueFormatter.cpp
@@ -1,12 +1,15 @@
 #include "ConfigValueFormatter.hpp"
 
 #include <algorithm>
+#include <boost/algorithm/string/erase.hpp>
 #include <cstdlib>
+#include "libslic3r/Point.hpp"
 #include <string>
 #include <vector>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/format.hpp>
+#include <wx/string.h>
 
 #include "libslic3r/Config.hpp"
 #include "libslic3r/PrintConfig.hpp"
diff --git a/src/slic3r/GUI/ConfigWizard.cpp b/src/slic3r/GUI/ConfigWizard.cpp
index 7aaa0e7865..945e88cc45 100644
--- a/src/slic3r/GUI/ConfigWizard.cpp
+++ b/src/slic3r/GUI/ConfigWizard.cpp
@@ -1,9 +1,30 @@
 // FIXME: extract absolute units -> em
 
 #include "ConfigWizard_private.hpp"
+#include "libslic3r_version.h"
 
 #include <algorithm>
+#include <memory>
+#include <cstddef>
+#include <cassert>
+#include <exception>
+#include "libslic3r/Exception.hpp"
+#include "libslic3r/Preset.hpp"
+#include <functional>
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/LocalesUtils.hpp"
+#include <cstdio>
+#include <cstdlib>
+#include <boost/filesystem/directory.hpp>
+#include <map>
+#include <iterator>
 #include <numeric>
+#include <string>
+#include <set>
+#include "slic3r/GUI/Widgets/StaticLine.hpp"
+#include "slic3r/GUI/BedShapeDialog.hpp"
+#include "slic3r/GUI/wxExtensions.hpp"
 #include <utility>
 #include <unordered_map>
 #include <stdexcept>
@@ -12,8 +33,19 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/nowide/convert.hpp>
 
+#include <wx/event.h>
+#include <wx/panel.h>
+#include <vector>
+#include <wx/gdicmn.h>
+#include <wx/html/htmlwin.h>
+#include <wx/arrstr.h>
+#include <wx/busycursor.h>
+#include <wx/dialog.h>
+#include <wx/scrolwin.h>
 #include <wx/settings.h>
+#include <wx/sizer.h>
 #include <wx/stattext.h>
+#include <wx/string.h>
 #include <wx/textctrl.h>
 #include <wx/dcclient.h>
 #include <wx/statbmp.h>
@@ -24,6 +56,7 @@
 #include <wx/listbook.h>
 #include <wx/display.h>
 #include <wx/filefn.h>
+#include <wx/types.h>
 #include <wx/wupdlock.h>
 #include <wx/debug.h>
 
diff --git a/src/slic3r/GUI/ConfigWizard.hpp b/src/slic3r/GUI/ConfigWizard.hpp
index f929a3aaa2..72f710b42b 100644
--- a/src/slic3r/GUI/ConfigWizard.hpp
+++ b/src/slic3r/GUI/ConfigWizard.hpp
@@ -4,6 +4,7 @@
 #include <memory>
 
 #include <wx/dialog.h>
+#include <wx/string.h>
 
 #include "GUI_Utils.hpp"
 
diff --git a/src/slic3r/GUI/ConfigWizard_private.hpp b/src/slic3r/GUI/ConfigWizard_private.hpp
index 7b9674b216..c1371f5316 100644
--- a/src/slic3r/GUI/ConfigWizard_private.hpp
+++ b/src/slic3r/GUI/ConfigWizard_private.hpp
@@ -3,6 +3,14 @@
 
 #include "ConfigWizard.hpp"
 
+#include <memory>
+#include "libslic3r/Preset.hpp"
+#include <string>
+#include <utility>
+#include <cstddef>
+#include <algorithm>
+#include "libslic3r/Config.hpp"
+#include <map>
 #include <vector>
 #include <set>
 #include <unordered_map>
@@ -10,11 +18,15 @@
 #include <boost/filesystem.hpp>
 #include <boost/log/trivial.hpp>
 
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/scrolwin.h>
 #include <wx/sizer.h>
 #include <wx/panel.h>
 #include <wx/button.h>
 #include <wx/choice.h>
 #include <wx/spinctrl.h>
+#include <wx/string.h>
 #include <wx/textctrl.h>
 #include <wx/listbox.h>
 #include <wx/checklst.h>
diff --git a/src/slic3r/GUI/ConnectPrinter.cpp b/src/slic3r/GUI/ConnectPrinter.cpp
index 8e3d58b413..5d7bf67e03 100644
--- a/src/slic3r/GUI/ConnectPrinter.cpp
+++ b/src/slic3r/GUI/ConnectPrinter.cpp
@@ -1,7 +1,18 @@
 #include "ConnectPrinter.hpp"
 #include "GUI_App.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "slic3r/GUI/GUI.hpp"
+#include "slic3r/GUI/DeviceCore/DevConfigUtil.h"
 #include <slic3r/GUI/I18N.hpp>
+#include "slic3r/GUI/Widgets/Button.hpp"
 #include <slic3r/GUI/Widgets/Label.hpp>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/sizer.h>
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include <wx/event.h>
+#include <string>
+#include "slic3r/GUI/wxExtensions.hpp"
 #include "libslic3r/AppConfig.hpp"
 
 #include "DeviceCore/DevManager.h"
diff --git a/src/slic3r/GUI/ConnectPrinter.hpp b/src/slic3r/GUI/ConnectPrinter.hpp
index 95175a1ab0..5ce512512b 100644
--- a/src/slic3r/GUI/ConnectPrinter.hpp
+++ b/src/slic3r/GUI/ConnectPrinter.hpp
@@ -4,6 +4,8 @@
 #include "GUI.hpp"
 #include "GUI_Utils.hpp"
 #include <wx/artprov.h>
+#include <wx/toplevel.h>
+#include <wx/event.h>
 #include <wx/xrc/xmlres.h>
 #include <wx/string.h>
 #include <wx/stattext.h>
diff --git a/src/slic3r/GUI/CrealityDiscoveryDialog.cpp b/src/slic3r/GUI/CrealityDiscoveryDialog.cpp
index 4f0c59038d..ec32292631 100644
--- a/src/slic3r/GUI/CrealityDiscoveryDialog.cpp
+++ b/src/slic3r/GUI/CrealityDiscoveryDialog.cpp
@@ -4,10 +4,19 @@
 #include "I18N.hpp"
 #include "Widgets/DialogButtons.hpp"
 
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/dialog.h>
+#include <wx/listbase.h>
+#include <vector>
+#include <wx/busycursor.h>
+#include <utility>
+#include <cstddef>
 #include <wx/sizer.h>
 #include <wx/button.h>
 #include <wx/listctrl.h>
 #include <wx/stattext.h>
+#include <wx/toplevel.h>
 #include <wx/utils.h>
 
 #include <boost/log/trivial.hpp>
diff --git a/src/slic3r/GUI/CreatePresetsDialog.cpp b/src/slic3r/GUI/CreatePresetsDialog.cpp
index 16b9a5765d..24591ae0f8 100644
--- a/src/slic3r/GUI/CreatePresetsDialog.cpp
+++ b/src/slic3r/GUI/CreatePresetsDialog.cpp
@@ -1,15 +1,69 @@
 #include "CreatePresetsDialog.hpp"
+#include <algorithm>
+#include <any>
+#include <boost/algorithm/string/trim.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <boost/log/trivial.hpp>
+#include <string>
+#include <cctype>
+#include "libslic3r/LocalesUtils.hpp"
+#include <cstddef>
+#include "libslic3r/Preset.hpp"
+#include <deque>
+#include <exception>
+#include <chrono>
+#include <ctime>
+#include <sstream>
+#include <iomanip>
+#include "libslic3r/Config.hpp"
+#include <utility>
+#include "slic3r/GUI/Widgets/CheckBox.hpp"
+#include "slic3r/GUI/GUI.hpp"
+#include <memory>
+#include "slic3r/GUI/Widgets/ComboBox.hpp"
+#include "slic3r/GUI/Widgets/RadioBox.hpp"
+#include <cstdio>
+#include <map>
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
+#include <cstdlib>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include "slic3r/GUI/Widgets/DialogButtons.hpp"
+#include "libslic3r/libslic3r.h"
+#include <cassert>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "libslic3r/Utils.hpp"
+#include <cmath>
+#include "libslic3r/Point.hpp"
+#include <miniz.h>
+#include "slic3r/GUI/ParamsDialog.hpp"
 #include <vector>
 #include <set>
 #include <unordered_map>
 #include <unordered_set>
 #include <openssl/md5.h>
 #include <openssl/evp.h>
+#include <wx/anybutton.h>
+#include <wx/colour.h>
 #include <wx/dcgraph.h>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <wx/panel.h>
+#include <wx/scrolwin.h>
+#include <wx/sizer.h>
+#include <wx/tglbtn.h>
+#include <wx/filedlg.h>
+#include <wx/dirdlg.h>
 #include <wx/tooltip.h>
+#include <wx/treebase.h>
+#include <wx/toplevel.h>
 #include <wx/utils.h>
 #include <boost/nowide/cstdio.hpp>
+#include <wx/valtext.h>
 #include "libslic3r/PresetBundle.hpp"
 #include "I18N.hpp"
 #include "GUI_App.hpp"
diff --git a/src/slic3r/GUI/CreatePresetsDialog.hpp b/src/slic3r/GUI/CreatePresetsDialog.hpp
index 07811aa144..39714af1fe 100644
--- a/src/slic3r/GUI/CreatePresetsDialog.hpp
+++ b/src/slic3r/GUI/CreatePresetsDialog.hpp
@@ -13,6 +13,19 @@
 #include "Widgets/DialogButtons.hpp"
 #include "miniz.h"
 #include "ParamsDialog.hpp"
+#include <wx/sizer.h>
+#include <wx/arrstr.h>
+#include <wx/string.h>
+#include <vector>
+#include <utility>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <set>
+#include <wx/panel.h>
+#include <wx/scrolwin.h>
+#include <wx/event.h>
+#include <memory>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/DailyTips.cpp b/src/slic3r/GUI/DailyTips.cpp
index 894c0316bb..8563766f81 100644
--- a/src/slic3r/GUI/DailyTips.cpp
+++ b/src/slic3r/GUI/DailyTips.cpp
@@ -1,5 +1,18 @@
 #include "DailyTips.hpp"
 #include "slic3r/GUI/Widgets/Label.hpp"
+#include <string>
+#include <functional>
+#include <imgui.h>
+#include "slic3r/GUI/GLTexture.hpp"
+#include "libslic3r/Utils.hpp"
+#include "slic3r/GUI/GUI_App.hpp"
+#include "slic3r/GUI/ImGuiWrapper.hpp"
+#include <cstdint>
+#include <cstddef>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <memory>
+#include "slic3r/GUI/HintNotification.hpp"
+#include "slic3r/GUI/GLCanvas3D.hpp"
 
 #ifndef IMGUI_DEFINE_MATH_OPERATORS
 #define IMGUI_DEFINE_MATH_OPERATORS
diff --git a/src/slic3r/GUI/DailyTips.hpp b/src/slic3r/GUI/DailyTips.hpp
index 537fed4952..96179ba791 100644
--- a/src/slic3r/GUI/DailyTips.hpp
+++ b/src/slic3r/GUI/DailyTips.hpp
@@ -4,6 +4,8 @@
 #include "HintNotification.hpp"
 
 //#include <wx/time.h>
+#include <imgui.h>
+#include <cstddef>
 #include <string>
 #include <vector>
 #include <memory>
diff --git a/src/slic3r/GUI/DesktopIntegrationDialog.cpp b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
index cbe9088f2e..aa5097a60e 100644
--- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp
+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
@@ -1,3 +1,21 @@
+#include <string>
+#include <vector>
+#include <cstddef>
+#include <wx/string.h>
+#include <wx/utils.h>
+#include <boost/nowide/convert.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <fstream>
+#include <cstdlib>
+#include <exception>
+#include "libslic3r_version.h"
+#include <cstdio>
+#include <cassert>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/dialog.h>
+#include <wx/toplevel.h>
+#include <wx/sizer.h>
 #ifdef __linux__
 #include "DesktopIntegrationDialog.hpp"
 #include "GUI_App.hpp"
diff --git a/src/slic3r/GUI/DesktopIntegrationDialog.hpp b/src/slic3r/GUI/DesktopIntegrationDialog.hpp
index c89315794a..e97c82f2ea 100644
--- a/src/slic3r/GUI/DesktopIntegrationDialog.hpp
+++ b/src/slic3r/GUI/DesktopIntegrationDialog.hpp
@@ -1,3 +1,4 @@
+#include <string>
 #ifdef __linux__
 #ifndef slic3r_DesktopIntegrationDialog_hpp_
 #define slic3r_DesktopIntegrationDialog_hpp_
diff --git a/src/slic3r/GUI/DeviceCore/DevAxis.cpp b/src/slic3r/GUI/DeviceCore/DevAxis.cpp
index 201e3afb00..1274054507 100644
--- a/src/slic3r/GUI/DeviceCore/DevAxis.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevAxis.cpp
@@ -1,7 +1,9 @@
 #include "DevAxis.h"
 #include "DevUtil.h"
 
+#include "json_diff.hpp"
 #include "slic3r/GUI/DeviceManager.hpp"
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
 
 namespace Slic3r
 {
diff --git a/src/slic3r/GUI/DeviceCore/DevAxis.h b/src/slic3r/GUI/DeviceCore/DevAxis.h
index a109ff8267..d543132e49 100644
--- a/src/slic3r/GUI/DeviceCore/DevAxis.h
+++ b/src/slic3r/GUI/DeviceCore/DevAxis.h
@@ -1,5 +1,7 @@
 #pragma once
+#include <memory>
 #include <nlohmann/json.hpp>
+#include <string>
 #include "slic3r/Utils/json_diff.hpp"
 
 namespace Slic3r {
diff --git a/src/slic3r/GUI/DeviceCore/DevAxisCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevAxisCtrl.cpp
index 6a975b3eb5..d1e210f940 100644
--- a/src/slic3r/GUI/DeviceCore/DevAxisCtrl.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevAxisCtrl.cpp
@@ -1,7 +1,11 @@
 #include "DevAxis.h"
 
+#include "json_diff.hpp"
 #include "slic3r/GUI/DeviceManager.hpp"
 #include "slic3r/Utils/NetworkAgent.hpp"
+#include <string>
+#include <cstdlib>
+#include <cstdio>
 
 namespace Slic3r
 {
diff --git a/src/slic3r/GUI/DeviceCore/DevBed.cpp b/src/slic3r/GUI/DeviceCore/DevBed.cpp
index 09fd553159..134de17e30 100644
--- a/src/slic3r/GUI/DeviceCore/DevBed.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevBed.cpp
@@ -1,4 +1,5 @@
 #include "DevBed.h"
+#include "json_diff.hpp"
 #include "slic3r/GUI/DeviceManager.hpp"
 
 namespace Slic3r {
diff --git a/src/slic3r/GUI/DeviceCore/DevCalib.cpp b/src/slic3r/GUI/DeviceCore/DevCalib.cpp
index 6385fa77c6..74d73abbc0 100644
--- a/src/slic3r/GUI/DeviceCore/DevCalib.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevCalib.cpp
@@ -1,4 +1,6 @@
+#include <algorithm>
 #include <boost/log/trivial.hpp>
+#include "json_diff.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/I18N.hpp"
 #include "slic3r/GUI/DeviceManager.hpp"
@@ -6,7 +8,13 @@
 #include "slic3r/GUI/UserNotification.hpp"
 #include "libslic3r/PrintConfig.hpp"
 
+#include <string>
+#include <cassert>
+#include "libslic3r/calib.hpp"
+#include <chrono>
+#include <vector>
 #include <wx/dir.h>
+#include <wx/string.h>
 #include "fast_float/fast_float.h"
 
 #include "DevCalib.h"
diff --git a/src/slic3r/GUI/DeviceCore/DevCalib.h b/src/slic3r/GUI/DeviceCore/DevCalib.h
index d5894c1c9d..54f5f4b053 100644
--- a/src/slic3r/GUI/DeviceCore/DevCalib.h
+++ b/src/slic3r/GUI/DeviceCore/DevCalib.h
@@ -1,5 +1,7 @@
 #pragma once
 #include <nlohmann/json.hpp>
+#include <optional>
+#include <vector>
 #include "slic3r/Utils/json_diff.hpp"
 
 
diff --git a/src/slic3r/GUI/DeviceCore/DevChamber.cpp b/src/slic3r/GUI/DeviceCore/DevChamber.cpp
index a0edef51c5..8cd47481f2 100644
--- a/src/slic3r/GUI/DeviceCore/DevChamber.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevChamber.cpp
@@ -3,6 +3,7 @@
 #include "DevConfig.h"
 #include "DevUtil.h"
 
+#include "json_diff.hpp"
 #include "slic3r/GUI/DeviceManager.hpp"
 
 namespace Slic3r {
diff --git a/src/slic3r/GUI/DeviceCore/DevChamber.h b/src/slic3r/GUI/DeviceCore/DevChamber.h
index 29acacff9c..6fcafabcf2 100644
--- a/src/slic3r/GUI/DeviceCore/DevChamber.h
+++ b/src/slic3r/GUI/DeviceCore/DevChamber.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <memory>
 #include <nlohmann/json.hpp>
 #include "slic3r/Utils/json_diff.hpp"
 
diff --git a/src/slic3r/GUI/DeviceCore/DevChamberCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevChamberCtrl.cpp
index 651806fd5f..01201998ce 100644
--- a/src/slic3r/GUI/DeviceCore/DevChamberCtrl.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevChamberCtrl.cpp
@@ -1,5 +1,7 @@
 #include "DevChamber.h"
+#include "json_diff.hpp"
 #include "slic3r/GUI/DeviceManager.hpp"
+#include <string>
 
 namespace Slic3r {
 
diff --git a/src/slic3r/GUI/DeviceCore/DevConfig.cpp b/src/slic3r/GUI/DeviceCore/DevConfig.cpp
index 9833731040..cce5257527 100644
--- a/src/slic3r/GUI/DeviceCore/DevConfig.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevConfig.cpp
@@ -2,6 +2,7 @@
 
 #include "DevConfig.h"
 #include "DevUtil.h"
+#include "json_diff.hpp"
 
 using namespace nlohmann;
 
diff --git a/src/slic3r/GUI/DeviceCore/DevConfigUtil.cpp b/src/slic3r/GUI/DeviceCore/DevConfigUtil.cpp
index 159fca6285..e6679f4463 100644
--- a/src/slic3r/GUI/DeviceCore/DevConfigUtil.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevConfigUtil.cpp
@@ -1,9 +1,23 @@
 #include "DevConfigUtil.h"
 
+#include "json_diff.hpp"
 #include "slic3r/GUI/DeviceManager.hpp"
 
+#include <string>
+#include <algorithm>
+#include <map>
+#include <vector>
+#include <boost/nowide/fstream.hpp>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <cstddef>
+#include <boost/log/trivial.hpp>
+#include <boost/filesystem/directory.hpp>
+#include <utility>
+#include <exception>
+#include <cctype>
 #include <wx/dir.h>
 #include <boost/filesystem/operations.hpp>
+#include <wx/string.h>
 #include "../I18N.hpp"
 
 using namespace nlohmann;
diff --git a/src/slic3r/GUI/DeviceCore/DevConfigUtil.h b/src/slic3r/GUI/DeviceCore/DevConfigUtil.h
index e42f2806d1..7eb0dff56b 100644
--- a/src/slic3r/GUI/DeviceCore/DevConfigUtil.h
+++ b/src/slic3r/GUI/DeviceCore/DevConfigUtil.h
@@ -8,8 +8,10 @@
 
 #pragma once
 
+#include <cassert>
 #include <string>
 #include <map>
+#include <unordered_map>
 #include <vector>
 #include <algorithm>
 #include <cctype>
diff --git a/src/slic3r/GUI/DeviceCore/DevCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevCtrl.cpp
index d1bcbfd864..e9301ad9a8 100644
--- a/src/slic3r/GUI/DeviceCore/DevCtrl.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevCtrl.cpp
@@ -1,8 +1,11 @@
+#include <ctime>
 #include <nlohmann/json.hpp>
+#include <string>
 #include "DevCtrl.h"
 
 // TODO: remove this include
 #include "DevUtil.h"
+#include "json_diff.hpp"
 #include "slic3r/GUI/DeviceManager.hpp"
 
 using namespace nlohmann;
diff --git a/src/slic3r/GUI/DeviceCore/DevCtrl.h b/src/slic3r/GUI/DeviceCore/DevCtrl.h
index 5cd564f27f..8dde98ec35 100644
--- a/src/slic3r/GUI/DeviceCore/DevCtrl.h
+++ b/src/slic3r/GUI/DeviceCore/DevCtrl.h
@@ -2,6 +2,8 @@
 #include "libslic3r/CommonDefs.hpp"
 
 #include "slic3r/Utils/json_diff.hpp"
+#include <string>
+#include <ctime>
 #include <wx/string.h>
 
 namespace Slic3r
diff --git a/src/slic3r/GUI/DeviceCore/DevDefs.h b/src/slic3r/GUI/DeviceCore/DevDefs.h
index bde6a86622..6332d6b109 100644
--- a/src/slic3r/GUI/DeviceCore/DevDefs.h
+++ b/src/slic3r/GUI/DeviceCore/DevDefs.h
@@ -9,8 +9,12 @@
 */
 
 #pragma once
+#include <functional>
+#include <cstddef>
 #include <string>
 #include <nlohmann/json.hpp>
+#include <utility>
+#include <unordered_map>
 
 // Reserved for future usage
 #define DEV_RESERVED_FOR_FUTURE(...) /* stripped */
diff --git a/src/slic3r/GUI/DeviceCore/DevExtensionTool.cpp b/src/slic3r/GUI/DeviceCore/DevExtensionTool.cpp
index 5426a9bba3..1947cf1d87 100644
--- a/src/slic3r/GUI/DeviceCore/DevExtensionTool.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevExtensionTool.cpp
@@ -1,6 +1,8 @@
 #include "DevExtensionTool.h"
 #include "DevUtil.h"
 
+#include <memory>
+#include <map>
 #include <nlohmann/json.hpp>
 
 using namespace nlohmann;
diff --git a/src/slic3r/GUI/DeviceCore/DevExtensionTool.h b/src/slic3r/GUI/DeviceCore/DevExtensionTool.h
index c3b9c5b0b7..8ce33b6e43 100644
--- a/src/slic3r/GUI/DeviceCore/DevExtensionTool.h
+++ b/src/slic3r/GUI/DeviceCore/DevExtensionTool.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <memory>
 #include <optional>
 #include "libslic3r/CommonDefs.hpp"
 
diff --git a/src/slic3r/GUI/DeviceCore/DevExtruderSystem.cpp b/src/slic3r/GUI/DeviceCore/DevExtruderSystem.cpp
index d4e1397c70..20975a7ca3 100644
--- a/src/slic3r/GUI/DeviceCore/DevExtruderSystem.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevExtruderSystem.cpp
@@ -1,9 +1,21 @@
+#include "libslic3r/CommonDefs.hpp"
+#include <cassert>
+#include <boost/log/trivial.hpp>
+#include <map>
+#include <cstdlib>
 #include <nlohmann/json.hpp>
+#include <wx/string.h>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <unordered_map>
+#include <optional>
+#include <string>
+#include <vector>
 #include "DevExtruderSystem.h"
 #include "DevNozzleSystem.h"
 #include "DevFilaSystem.h" // complete type for GetFilaSystem()->GetTrayIndexMap() in GetBackupAmsSlotInGroup
 
 // TODO: remove this include
+#include "json_diff.hpp"
 #include "slic3r/GUI/DeviceManager.hpp"
 #include "slic3r/GUI/I18N.hpp"
 
diff --git a/src/slic3r/GUI/DeviceCore/DevExtruderSystem.h b/src/slic3r/GUI/DeviceCore/DevExtruderSystem.h
index 5770770175..4d9f7c9abf 100644
--- a/src/slic3r/GUI/DeviceCore/DevExtruderSystem.h
+++ b/src/slic3r/GUI/DeviceCore/DevExtruderSystem.h
@@ -1,9 +1,12 @@
 #pragma once
+#include <cassert>
 #include <optional>
+#include <string>
 #include <unordered_map>
 #include "libslic3r/CommonDefs.hpp"
 
 #include "slic3r/Utils/json_diff.hpp"
+#include <vector>
 #include <wx/string.h>
 
 #include "DevDefs.h"
diff --git a/src/slic3r/GUI/DeviceCore/DevFan.cpp b/src/slic3r/GUI/DeviceCore/DevFan.cpp
index 3b5cb40702..30edbcdf35 100644
--- a/src/slic3r/GUI/DeviceCore/DevFan.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevFan.cpp
@@ -1,6 +1,12 @@
+#include <boost/log/trivial.hpp>
+#include <cstdint>
+#include <cmath>
 #include <nlohmann/json.hpp>
 #include "DevFan.h"
+#include <string>
+#include <vector>
 #include <wx/app.h>
+#include "json_diff.hpp"
 #include "slic3r/GUI/DeviceManager.hpp"
 #include "slic3r/GUI/GUI.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
diff --git a/src/slic3r/GUI/DeviceCore/DevFan.h b/src/slic3r/GUI/DeviceCore/DevFan.h
index ca029e0005..393c8a477c 100644
--- a/src/slic3r/GUI/DeviceCore/DevFan.h
+++ b/src/slic3r/GUI/DeviceCore/DevFan.h
@@ -1,8 +1,12 @@
 #pragma once
+#include <functional>
+#include <cstdint>
 #include <nlohmann/json.hpp>
 #include "slic3r/Utils/json_diff.hpp"
 
 #include <map>
+#include <vector>
+#include <string>
 
 namespace Slic3r {
 
diff --git a/src/slic3r/GUI/DeviceCore/DevFilaAmsSetting.h b/src/slic3r/GUI/DeviceCore/DevFilaAmsSetting.h
index ca59b9fd3e..f8d194c999 100644
--- a/src/slic3r/GUI/DeviceCore/DevFilaAmsSetting.h
+++ b/src/slic3r/GUI/DeviceCore/DevFilaAmsSetting.h
@@ -1,5 +1,7 @@
 #pragma once
+#include <memory>
 #include <optional>
+#include <string>
 #include <unordered_map> // Orca: for m_firmwares / GetSuppotedFirmwares() — the unordered_map AMSSetting.cpp mirrors and iterates
 #include <nlohmann/json.hpp>
 #include "DevCtrl.h"
diff --git a/src/slic3r/GUI/DeviceCore/DevFilaAmsSettingCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevFilaAmsSettingCtrl.cpp
index 59f31db936..d9342a4c21 100644
--- a/src/slic3r/GUI/DeviceCore/DevFilaAmsSettingCtrl.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevFilaAmsSettingCtrl.cpp
@@ -1,7 +1,9 @@
 #include "DevFilaAmsSetting.h"
 #include "DevFilaSystem.h"
 
+#include "json_diff.hpp"
 #include "slic3r/GUI/DeviceManager.hpp"
+#include <string>
 
 namespace Slic3r {
     int DevAmsSystemFirmwareSwitch::CrtlSwitchFirmware(int firmware_idx)
diff --git a/src/slic3r/GUI/DeviceCore/DevFilaBlackList.cpp b/src/slic3r/GUI/DeviceCore/DevFilaBlackList.cpp
index 7ae990730a..c499b89622 100644
--- a/src/slic3r/GUI/DeviceCore/DevFilaBlackList.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevFilaBlackList.cpp
@@ -1,9 +1,20 @@
+#include <boost/nowide/fstream.hpp>
+#include <boost/log/trivial.hpp>
+#include <cctype>
+#include "libslic3r/Preset.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/PrintConfig.hpp"
 #include <nlohmann/json.hpp>
 
 #include <algorithm>
+#include <optional>
 #include <set>
+#include <string>
+#include <vector>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
 
 #include "DevFilaBlackList.h"
+#include "json_diff.hpp"
 #include "slic3r/Utils/NetworkAgent.hpp"
 #include "slic3r/GUI/DeviceManager.hpp"
 #include "DevFilaSystem.h"
diff --git a/src/slic3r/GUI/DeviceCore/DevFilaBlackList.h b/src/slic3r/GUI/DeviceCore/DevFilaBlackList.h
index 80340d6efd..1f727396a8 100644
--- a/src/slic3r/GUI/DeviceCore/DevFilaBlackList.h
+++ b/src/slic3r/GUI/DeviceCore/DevFilaBlackList.h
@@ -1,6 +1,9 @@
 #pragma once
 
+#include <map>
 #include <optional>
+#include <string>
+#include <vector>
 #include <wx/string.h>
 #include "slic3r/Utils/json_diff.hpp"
 
diff --git a/src/slic3r/GUI/DeviceCore/DevFilaSwitch.cpp b/src/slic3r/GUI/DeviceCore/DevFilaSwitch.cpp
index 11034ccfcd..cf872b7139 100644
--- a/src/slic3r/GUI/DeviceCore/DevFilaSwitch.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevFilaSwitch.cpp
@@ -4,6 +4,11 @@
 #include "DevUtil.h"
 
 #include "slic3r/GUI/DeviceManager.hpp"
+#include <boost/log/trivial.hpp>
+#include <optional>
+#include <string>
+#include <vector>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
 
 namespace Slic3r {
 
diff --git a/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp b/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp
index 2cce41db9d..bef0391109 100644
--- a/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp
@@ -1,5 +1,24 @@
+#include <array>
+#include <cstddef>
+#include <cassert>
+#include <exception>
+#include <boost/log/trivial.hpp>
+#include <map>
+#include <ctime>
+#include <cstdlib>
+#include <chrono>
 #include <nlohmann/json.hpp>
+#include <wx/colour.h>
+#include <string>
+#include <wx/string.h>
+#include <optional>
+#include <unordered_map>
+#include <vector>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <set>
+#include <utility>
 #include "DevFilaSystem.h"
+#include "json_diff.hpp"
 #include "slic3r/Utils/NetworkAgent.hpp"
 #include "DevNozzleSystem.h" // DevNozzle / DevNozzleSystem for GetNozzleFlowStringByAmsId
 
diff --git a/src/slic3r/GUI/DeviceCore/DevFilaSystem.h b/src/slic3r/GUI/DeviceCore/DevFilaSystem.h
index 51fb744f72..32edc06a32 100644
--- a/src/slic3r/GUI/DeviceCore/DevFilaSystem.h
+++ b/src/slic3r/GUI/DeviceCore/DevFilaSystem.h
@@ -9,6 +9,7 @@
 
 #include <map>
 #include <set>
+#include <string>
 #include <vector>
 #include <optional>
 #include <memory>
diff --git a/src/slic3r/GUI/DeviceCore/DevFilaSystemCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevFilaSystemCtrl.cpp
index 9a8a3a68d2..e2972a3254 100644
--- a/src/slic3r/GUI/DeviceCore/DevFilaSystemCtrl.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevFilaSystemCtrl.cpp
@@ -1,6 +1,8 @@
 #include <nlohmann/json.hpp>
+#include <string>
 #include "DevFilaSystem.h"
 
+#include "json_diff.hpp"
 #include "slic3r/GUI/DeviceManager.hpp"// TODO: remove this include
 #include "DevUtil.h"
 
diff --git a/src/slic3r/GUI/DeviceCore/DevFirmware.h b/src/slic3r/GUI/DeviceCore/DevFirmware.h
index 5b0ea986a2..1b251144e5 100644
--- a/src/slic3r/GUI/DeviceCore/DevFirmware.h
+++ b/src/slic3r/GUI/DeviceCore/DevFirmware.h
@@ -3,6 +3,7 @@
 #include "slic3r/Utils/json_diff.hpp"
 
 #include <nlohmann/json.hpp>
+#include <string>
 #include <wx/string.h>
 #include "slic3r/Utils/json_diff.hpp"
 
diff --git a/src/slic3r/GUI/DeviceCore/DevHMS.cpp b/src/slic3r/GUI/DeviceCore/DevHMS.cpp
index f6ba592c6d..456e806170 100644
--- a/src/slic3r/GUI/DeviceCore/DevHMS.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevHMS.cpp
@@ -1,5 +1,10 @@
 //#include "D:/dev/bamboo_slicer/build_release/src/slic3r/CMakeFiles/libslic3r_gui.dir/Release/cmake_pch.hxx"
 #include "DevHMS.h"
+#include <string>
+#include <cstdio>
+#include "json_diff.hpp"
+#include <exception>
+#include <cassert>
 
 namespace Slic3r
 {
diff --git a/src/slic3r/GUI/DeviceCore/DevHMS.h b/src/slic3r/GUI/DeviceCore/DevHMS.h
index f72d899187..6be4545e89 100644
--- a/src/slic3r/GUI/DeviceCore/DevHMS.h
+++ b/src/slic3r/GUI/DeviceCore/DevHMS.h
@@ -2,6 +2,8 @@
 #include "libslic3r/CommonDefs.hpp"
 
 #include "slic3r/Utils/json_diff.hpp"
+#include <vector>
+#include <string>
 #include <wx/string.h>
 #include <map>
 
diff --git a/src/slic3r/GUI/DeviceCore/DevLamp.cpp b/src/slic3r/GUI/DeviceCore/DevLamp.cpp
index 19fd83e421..9b425fda21 100644
--- a/src/slic3r/GUI/DeviceCore/DevLamp.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevLamp.cpp
@@ -1,4 +1,5 @@
 #include "DevLamp.h"
+#include <string>
 
 static Slic3r::DevLamp::LIGHT_EFFECT _light_effect_parse(std::string effect_str)
 {
diff --git a/src/slic3r/GUI/DeviceCore/DevLampCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevLampCtrl.cpp
index b35adc5cb3..5190632b5b 100644
--- a/src/slic3r/GUI/DeviceCore/DevLampCtrl.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevLampCtrl.cpp
@@ -1,7 +1,9 @@
 #include <nlohmann/json.hpp>
+#include <string>
 #include "DevLamp.h"
 
 // TODO: remove this include
+#include "json_diff.hpp"
 #include "slic3r/GUI/DeviceManager.hpp"
 
 using namespace nlohmann;
diff --git a/src/slic3r/GUI/DeviceCore/DevManager.cpp b/src/slic3r/GUI/DeviceCore/DevManager.cpp
index 5a0e4d768f..0fd5ed2cc0 100644
--- a/src/slic3r/GUI/DeviceCore/DevManager.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevManager.cpp
@@ -1,13 +1,29 @@
 #include "DevManager.h"
+#include "libslic3r/Utils.hpp"
+#include <boost/log/trivial.hpp>
+#include <mutex>
+#include <chrono>
+#include "libslic3r/LifecycleEvents.hpp"
+#include <map>
+#include <cstdint>
+#include <algorithm>
 #include <nlohmann/json.hpp>
 
 #include <exception>
 
 #include <libslic3r/AppConfig.hpp>
+#include <string>
+#include "slic3r/GUI/DeviceCore/DevConfigUtil.h"
+#include <utility>
+#include <vector>
+#include <set>
+#include <wx/object.h>
+#include <wx/timer.h>
 #include "CloudProvider.hpp"
 #include "DevUtil.h"
 
 // TODO: remove this include
+#include "json_diff.hpp"
 #include "slic3r/GUI/DeviceManager.hpp"
 #include "slic3r/GUI/I18N.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
diff --git a/src/slic3r/GUI/DeviceCore/DevManager.h b/src/slic3r/GUI/DeviceCore/DevManager.h
index 1ba4631881..5ab3eed01b 100644
--- a/src/slic3r/GUI/DeviceCore/DevManager.h
+++ b/src/slic3r/GUI/DeviceCore/DevManager.h
@@ -1,8 +1,12 @@
 #pragma once
+#include <map>
 #include <mutex>
 #include "libslic3r/CommonDefs.hpp"
 
 #include "slic3r/Utils/json_diff.hpp"
+#include <string>
+#include <vector>
+#include <wx/object.h>
 #include <wx/string.h>
 #include <wx/timer.h>
 
diff --git a/src/slic3r/GUI/DeviceCore/DevMapping.cpp b/src/slic3r/GUI/DeviceCore/DevMapping.cpp
index 0040bb05f2..c98fc4bbfb 100644
--- a/src/slic3r/GUI/DeviceCore/DevMapping.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevMapping.cpp
@@ -1,6 +1,18 @@
+#include "libslic3r/ProjectTask.hpp"
+#include <cstdlib>
+#include <cassert>
+#include <cstdio>
+#include <boost/log/trivial.hpp>
 #include <limits>
 
+#include <map>
 #include <nlohmann/json.hpp>
+#include <vector>
+#include <string>
+#include <utility>
+#include <wx/colour.h>
+#include <set>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
 #include "DevMapping.h"
 #include "DevFilaSystem.h"
 #include "DevUtil.h"
diff --git a/src/slic3r/GUI/DeviceCore/DevMapping.h b/src/slic3r/GUI/DeviceCore/DevMapping.h
index e3169a03eb..52094f92b9 100644
--- a/src/slic3r/GUI/DeviceCore/DevMapping.h
+++ b/src/slic3r/GUI/DeviceCore/DevMapping.h
@@ -3,6 +3,7 @@
 #include "libslic3r/ProjectTask.hpp"
 
 #include "slic3r/Utils/json_diff.hpp"
+#include <vector>
 #include <wx/string.h>
 
 namespace Slic3r
diff --git a/src/slic3r/GUI/DeviceCore/DevMappingNozzle.cpp b/src/slic3r/GUI/DeviceCore/DevMappingNozzle.cpp
index 76bfa8364c..125e0acc68 100644
--- a/src/slic3r/GUI/DeviceCore/DevMappingNozzle.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevMappingNozzle.cpp
@@ -7,6 +7,7 @@
 #include "DevUtil.h"
 #include "DevUtilBackend.h"
 
+#include "json_diff.hpp"
 #include "libslic3r/MultiNozzleUtils.hpp"
 #include "libslic3r/Print.hpp"
 
@@ -16,8 +17,18 @@
 
 #include "slic3r/GUI/GUI_App.hpp"
 
+#include <algorithm>
 #include <boost/lexical_cast.hpp>
+#include <boost/log/trivial.hpp>
+#include "libslic3r/GCode/GCodeProcessor.hpp"
+#include <cassert>
+#include <exception>
+#include "libslic3r/PrintConfig.hpp"
 #include <nlohmann/json.hpp>
+#include <vector>
+#include <string>
+#include <unordered_set>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
 using namespace nlohmann;
 
 namespace Slic3r {
diff --git a/src/slic3r/GUI/DeviceCore/DevMappingNozzle.h b/src/slic3r/GUI/DeviceCore/DevMappingNozzle.h
index 7b0f9d0e25..b00e308789 100644
--- a/src/slic3r/GUI/DeviceCore/DevMappingNozzle.h
+++ b/src/slic3r/GUI/DeviceCore/DevMappingNozzle.h
@@ -8,6 +8,7 @@
 #include <unordered_map>
 #include <nlohmann/json.hpp>
 
+#include <vector>
 #include <wx/string.h>
 
 namespace Slic3r
diff --git a/src/slic3r/GUI/DeviceCore/DevNozzleRack.cpp b/src/slic3r/GUI/DeviceCore/DevNozzleRack.cpp
index de372f1ea9..df82de7855 100644
--- a/src/slic3r/GUI/DeviceCore/DevNozzleRack.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevNozzleRack.cpp
@@ -2,6 +2,10 @@
 #include "DevUtil.h"
 
 #include "slic3r/GUI/DeviceManager.hpp"
+#include <wx/event.h>
+#include "slic3r/GUI/DeviceCore/DevNozzleSystem.h"
+#include "slic3r/GUI/DeviceCore/DevFirmware.h"
+#include <boost/log/trivial.hpp>
 
 wxDEFINE_EVENT(DEV_RACK_EVENT_READING_FINISHED, wxCommandEvent);
 namespace Slic3r
diff --git a/src/slic3r/GUI/DeviceCore/DevNozzleRack.h b/src/slic3r/GUI/DeviceCore/DevNozzleRack.h
index 34b201c072..28c7990b78 100644
--- a/src/slic3r/GUI/DeviceCore/DevNozzleRack.h
+++ b/src/slic3r/GUI/DeviceCore/DevNozzleRack.h
@@ -9,6 +9,7 @@
 #include <map>
 
 // wx
+#include <string>
 #include <wx/string.h>
 #include <wx/event.h>
 
diff --git a/src/slic3r/GUI/DeviceCore/DevNozzleRackCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevNozzleRackCtrl.cpp
index cb0272dfe8..a2c56ce804 100644
--- a/src/slic3r/GUI/DeviceCore/DevNozzleRackCtrl.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevNozzleRackCtrl.cpp
@@ -2,10 +2,14 @@
 #include "DevUtil.h"
 #include "DevExtruderSystem.h"
 
+#include "json_diff.hpp"
 #include "slic3r/GUI/DeviceManager.hpp"
 #include "slic3r/GUI/MsgDialog.hpp"
 #include "slic3r/GUI/I18N.hpp"
 
+#include <string>
+#include <wx/string.h>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
 #include <wx/thread.h>
 
 
diff --git a/src/slic3r/GUI/DeviceCore/DevNozzleSystem.cpp b/src/slic3r/GUI/DeviceCore/DevNozzleSystem.cpp
index 9f1b5311c2..70eec0f795 100644
--- a/src/slic3r/GUI/DeviceCore/DevNozzleSystem.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevNozzleSystem.cpp
@@ -4,11 +4,29 @@
 #include "DevNozzleSystem.h"
 #include "DevUtil.h"
 
+#include "json_diff.hpp"
 #include "slic3r/GUI/DeviceManager.hpp"
 #include "slic3r/GUI/I18N.hpp"
 
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Utils.hpp"
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include "libslic3r/PrintConfig.hpp"
+#include <boost/log/trivial.hpp>
+#include <wx/string.h>
+#include <string>
+#include "libslic3r/CommonDefs.hpp"
+#include "slic3r/GUI/DeviceCore/DevFirmware.h"
+#include <cassert>
+#include <memory>
+#include <map>
+#include <vector>
+#include "libslic3r/MultiNozzleUtils.hpp"
+#include <utility>
+#include <exception>
+#include <unordered_map>
+#include <optional>
+#include <cmath>
 
 namespace Slic3r
 {
diff --git a/src/slic3r/GUI/DeviceCore/DevNozzleSystem.h b/src/slic3r/GUI/DeviceCore/DevNozzleSystem.h
index 168cb94116..f4fc97938b 100644
--- a/src/slic3r/GUI/DeviceCore/DevNozzleSystem.h
+++ b/src/slic3r/GUI/DeviceCore/DevNozzleSystem.h
@@ -6,6 +6,10 @@
 #include "libslic3r/MultiNozzleUtils.hpp"
 #include "slic3r/Utils/json_diff.hpp"
 
+#include "libslic3r/PrintConfig.hpp"
+#include <string>
+#include <vector>
+#include <optional>
 #include <wx/string.h>
 #include <map>
 #include <memory>
diff --git a/src/slic3r/GUI/DeviceCore/DevPrintOptions.cpp b/src/slic3r/GUI/DeviceCore/DevPrintOptions.cpp
index 1ba22b1091..082997e177 100644
--- a/src/slic3r/GUI/DeviceCore/DevPrintOptions.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevPrintOptions.cpp
@@ -1,8 +1,14 @@
 #include "DevPrintOptions.h"
 #include "DevUtil.h"
 
+#include <boost/log/trivial.hpp>
 #include <cassert>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <string>
+#include <ctime>
+#include <exception>
 
+#include "json_diff.hpp"
 #include "slic3r/GUI/DeviceManager.hpp"
 
 namespace Slic3r
diff --git a/src/slic3r/GUI/DeviceCore/DevPrintOptions.h b/src/slic3r/GUI/DeviceCore/DevPrintOptions.h
index 302d8270a2..587d5eef38 100644
--- a/src/slic3r/GUI/DeviceCore/DevPrintOptions.h
+++ b/src/slic3r/GUI/DeviceCore/DevPrintOptions.h
@@ -1,7 +1,9 @@
 #pragma once
+#include <ctime>
 #include <map>
 #include <nlohmann/json.hpp>
 #include "slic3r/Utils/json_diff.hpp"
+#include <string>
 #include <wx/string.h>
 
 #include "DevDefs.h"
diff --git a/src/slic3r/GUI/DeviceCore/DevStatus.cpp b/src/slic3r/GUI/DeviceCore/DevStatus.cpp
index e37a0f9abc..cbf350339a 100644
--- a/src/slic3r/GUI/DeviceCore/DevStatus.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevStatus.cpp
@@ -1,6 +1,7 @@
 #include "DevStatus.h"
 #include "slic3r/GUI/DeviceManager.hpp"
 #include <boost/log/trivial.hpp>
+#include <exception>
 
 namespace Slic3r {
 
diff --git a/src/slic3r/GUI/DeviceCore/DevStorage.cpp b/src/slic3r/GUI/DeviceCore/DevStorage.cpp
index 0c60b096bd..c70a717336 100644
--- a/src/slic3r/GUI/DeviceCore/DevStorage.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevStorage.cpp
@@ -1,5 +1,7 @@
 #include "DevStorage.h"
+#include "json_diff.hpp"
 #include "slic3r/GUI/DeviceManager.hpp"
+#include <string>
 
 
 namespace Slic3r {
diff --git a/src/slic3r/GUI/DeviceCore/DevStorage.h b/src/slic3r/GUI/DeviceCore/DevStorage.h
index 8ac53b7fea..58f556499b 100644
--- a/src/slic3r/GUI/DeviceCore/DevStorage.h
+++ b/src/slic3r/GUI/DeviceCore/DevStorage.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <nlohmann/json.hpp>
+#include <string>
 #include "slic3r/Utils/json_diff.hpp"
 
 namespace Slic3r {
diff --git a/src/slic3r/GUI/DeviceCore/DevUpgrade.cpp b/src/slic3r/GUI/DeviceCore/DevUpgrade.cpp
index fc9ba0061d..c35ec8bfce 100644
--- a/src/slic3r/GUI/DeviceCore/DevUpgrade.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevUpgrade.cpp
@@ -1,10 +1,17 @@
 #include "DevUpgrade.h"
 #include "DevUtil.h"
 
+#include "json_diff.hpp"
 #include "slic3r/GUI/DeviceManager.hpp"
 
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/I18N.hpp"
+#include <string>
+#include <exception>
+#include <boost/log/trivial.hpp>
+#include "slic3r/GUI/DeviceCore/DevFirmware.h"
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <wx/string.h>
 
 namespace Slic3r {
 
diff --git a/src/slic3r/GUI/DeviceCore/DevUpgrade.h b/src/slic3r/GUI/DeviceCore/DevUpgrade.h
index a9d9b7c957..1593f54260 100644
--- a/src/slic3r/GUI/DeviceCore/DevUpgrade.h
+++ b/src/slic3r/GUI/DeviceCore/DevUpgrade.h
@@ -1,5 +1,9 @@
 #pragma once
+#include <memory>
+#include <map>
 #include <nlohmann/json.hpp>
+#include <string>
+#include <wx/string.h>
 #include "slic3r/Utils/json_diff.hpp"
 
 #include "DevDefs.h"
diff --git a/src/slic3r/GUI/DeviceCore/DevUpgradeCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevUpgradeCtrl.cpp
index 7fa2d2b5cf..6c46a0ef32 100644
--- a/src/slic3r/GUI/DeviceCore/DevUpgradeCtrl.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevUpgradeCtrl.cpp
@@ -1,7 +1,10 @@
 #include "DevUpgrade.h"
 #include "DevUtil.h"
 
+#include "json_diff.hpp"
 #include "slic3r/GUI/DeviceManager.hpp"
+#include <string>
+#include "slic3r/GUI/DeviceCore/DevFirmware.h"
 
 namespace Slic3r {
 
diff --git a/src/slic3r/GUI/DeviceCore/DevUtil.cpp b/src/slic3r/GUI/DeviceCore/DevUtil.cpp
index 19296d5773..b2ea072fc8 100644
--- a/src/slic3r/GUI/DeviceCore/DevUtil.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevUtil.cpp
@@ -1,5 +1,15 @@
 #include "DevUtil.h"
 #include "fast_float/fast_float.h"
+#include <string>
+#include <exception>
+#include <boost/log/trivial.hpp>
+#include <cstdint>
+#include <algorithm>
+#include <cctype>
+#include <cstddef>
+#include <limits>
+#include <stdexcept>
+#include <sstream>
 
 namespace Slic3r
 {
diff --git a/src/slic3r/GUI/DeviceCore/DevUtil.h b/src/slic3r/GUI/DeviceCore/DevUtil.h
index 6644b8b5b9..848b53957a 100644
--- a/src/slic3r/GUI/DeviceCore/DevUtil.h
+++ b/src/slic3r/GUI/DeviceCore/DevUtil.h
@@ -7,6 +7,9 @@
  */
 
 #pragma once
+#include <cstdint>
+#include <cassert>
+#include <ctime>
 #include <string>
 #include <sstream>
 #include <stdexcept>
diff --git a/src/slic3r/GUI/DeviceCore/DevUtilBackend.cpp b/src/slic3r/GUI/DeviceCore/DevUtilBackend.cpp
index 5d051dc876..8c423977a3 100644
--- a/src/slic3r/GUI/DeviceCore/DevUtilBackend.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevUtilBackend.cpp
@@ -7,6 +7,19 @@
 #include "slic3r/GUI/GUI_App.hpp"
 
 #include <boost/lexical_cast.hpp>
+#include "libslic3r/MultiNozzleUtils.hpp"
+#include "slic3r/GUI/DeviceCore/DevNozzleSystem.h"
+#include <memory>
+#include <unordered_map>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <vector>
+#include <exception>
+#include <cassert>
+#include <boost/log/trivial.hpp>
+#include <optional>
+#include "slic3r/GUI/DeviceCore/DevFilaSystem.h"
+#include "libslic3r/Preset.hpp"
+#include "libslic3r/Config.hpp"
 #include <wx/string.h>
 
 namespace Slic3r
diff --git a/src/slic3r/GUI/DeviceCore/DevUtilBackend.h b/src/slic3r/GUI/DeviceCore/DevUtilBackend.h
index ffcfc5fa2e..44540ae62c 100644
--- a/src/slic3r/GUI/DeviceCore/DevUtilBackend.h
+++ b/src/slic3r/GUI/DeviceCore/DevUtilBackend.h
@@ -12,6 +12,9 @@
 #include "DevFilaSystem.h"
 
 #include "libslic3r/MultiNozzleUtils.hpp"
+#include <memory>
+#include <optional>
+#include <string>
 #include <unordered_map>
 
  // Forward declarations
diff --git a/src/slic3r/GUI/DeviceErrorDialog.cpp b/src/slic3r/GUI/DeviceErrorDialog.cpp
index 4e81135a75..de578f78ed 100644
--- a/src/slic3r/GUI/DeviceErrorDialog.cpp
+++ b/src/slic3r/GUI/DeviceErrorDialog.cpp
@@ -7,8 +7,28 @@
 #include "ReleaseNote.hpp"
 #include "wxExtensions.hpp"
 
+#include <unordered_set>
+#include <string>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "libslic3r/Utils.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <wx/event.h>
+#include <boost/log/trivial.hpp>
+#include <wx/image.h>
+#include <utility>
+#include <vector>
+#include "slic3r/GUI/Monitor.hpp"
 #include <wx/mstream.h>
 #include <wx/dcmemory.h>
+#include <wx/statbmp.h>
+#include <wx/string.h>
+#include <wx/panel.h>
+#include <wx/scrolwin.h>
+#include <wx/sizer.h>
+#include <wx/webrequest.h>
+#include <wx/timer.h>
+#include <wx/toplevel.h>
 
 namespace Slic3r {
 namespace GUI
diff --git a/src/slic3r/GUI/DeviceErrorDialog.hpp b/src/slic3r/GUI/DeviceErrorDialog.hpp
index 1363f494a6..fd195242e7 100644
--- a/src/slic3r/GUI/DeviceErrorDialog.hpp
+++ b/src/slic3r/GUI/DeviceErrorDialog.hpp
@@ -1,10 +1,18 @@
 #pragma once
 
+#include <string>
+#include <map>
 #include <unordered_set>
 #include <atomic>
 #include <memory>
+#include <wx/gdicmn.h>
+#include <vector>
+#include <wx/sizer.h>
+#include <wx/dialog.h>
 #include <wx/statbmp.h>
+#include <wx/string.h>
 #include <wx/timer.h>
+#include <wx/toplevel.h>
 #include <wx/webrequest.h>
 
 #include "GUI_Utils.hpp"
diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp
index 29fd113d1f..9d60a0bf9a 100644
--- a/src/slic3r/GUI/DeviceManager.cpp
+++ b/src/slic3r/GUI/DeviceManager.cpp
@@ -1,3 +1,5 @@
+#include "PrinterNetworkTypes.hpp"
+#include "json_diff.hpp"
 #include "libslic3r/libslic3r.h"
 #include "DeviceManager.hpp"
 #include "HMS.hpp"
@@ -16,6 +18,46 @@
 #include "Plater.hpp"
 #include "GUI_App.hpp"
 #include "ReleaseNote.hpp"
+#include <string>
+#include <boost/log/trivial.hpp>
+#include <cstdlib>
+#include <cstddef>
+#include "libslic3r/PrintConfig.hpp"
+#include <cassert>
+#include "slic3r/GUI/DeviceCore/DevConfigUtil.h"
+#include "libslic3r/Utils.hpp"
+#include <boost/filesystem/operations.hpp>
+#include <chrono>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <memory>
+#include "slic3r/GUI/DeviceCore/DevCalib.h"
+#include <boost/algorithm/string/predicate.hpp>
+#include <cstdint>
+#include <map>
+#include "libslic3r/calib.hpp"
+#include <ctime>
+#include "slic3r/GUI/DeviceCore/DevFilaAmsSetting.h"
+#include <cstdio>
+#include "slic3r/GUI/DeviceCore/DevFirmware.h"
+#include <optional>
+#include <exception>
+#include "libslic3r/LocalesUtils.hpp"
+#include "libslic3r/LifecycleEvents.hpp"
+#include <system_error>
+#include "libslic3r/ProjectTask.hpp"
+#include <cstring>
+#include <boost/chrono/duration.hpp>
+#include <iterator>
+#include "slic3r/GUI/UserNotification.hpp"
+#include <cctype>
+#include <algorithm>
+#include <limits>
+#include <stdexcept>
+#include "libslic3r/Config.hpp"
+#include <set>
+#include <sstream>
+#include <ios>
+#include <iomanip>
 #include <thread>
 #include <mutex>
 #include <charconv>
@@ -25,7 +67,15 @@
 #include <boost/uuid/uuid.hpp>
 #include <boost/uuid/uuid_generators.hpp>
 #include <boost/uuid/uuid_io.hpp>
+#include <unordered_set>
+#include <utility>
+#include <vector>
+#include <wx/colour.h>
+#include <tuple>
 #include <wx/dir.h>
+#include <wx/string.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
 #include "fast_float/fast_float.h"
 
 #include "DeviceCore/DevFilaSystem.h"
diff --git a/src/slic3r/GUI/DeviceManager.hpp b/src/slic3r/GUI/DeviceManager.hpp
index 94f867b93d..c4a63cb588 100644
--- a/src/slic3r/GUI/DeviceManager.hpp
+++ b/src/slic3r/GUI/DeviceManager.hpp
@@ -1,9 +1,15 @@
 #ifndef slic3r_DeviceManager_hpp_
 #define slic3r_DeviceManager_hpp_
 
+#include <cstdint>
+#include <ctime>
+#include <functional>
 #include <map>
 #include <mutex>
 #include <atomic>
+#include <tuple>
+#include <set>
+#include <utility>
 #include <vector>
 #include <string>
 #include <memory>
@@ -27,6 +33,7 @@
 #include "DeviceErrorDialog.hpp"
 
 #include <wx/object.h>
+#include <wx/string.h>
 #include <wx/timer.h>
 #include <wx/colour.h>
 
diff --git a/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.cpp b/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.cpp
index 8505a559d6..f02007593a 100644
--- a/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.cpp
+++ b/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.cpp
@@ -13,8 +13,34 @@
 #include "slic3r/GUI/Widgets/StateColor.hpp"
 
 
+#include <wx/checklst.h>
+#include <wx/colour.h>
+#include <wx/dcclient.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <vector>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <algorithm>
+#include <cstdlib>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <map>
+#include "libslic3r/ProjectTask.hpp"
+#include "slic3r/GUI/DeviceCore/DevFilaSwitch.h"
+#include <cstddef>
+#include "slic3r/GUI/Widgets/AMSItem.hpp"
+#include <tuple>
+#include <utility>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
 #include <wx/dcgraph.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/font.h>
 #include <wx/grid.h>
+#include <wx/string.h>
+#include <wx/panel.h>
+#include <wx/peninfobase.h>
+#include <wx/types.h>
+#include <wx/sizer.h>
+#include <wx/toplevel.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.hpp b/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.hpp
index 265666bb12..34cd85e692 100644
--- a/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.hpp
+++ b/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.hpp
@@ -14,7 +14,19 @@
 #include "slic3r/GUI/DeviceCore/DevFilaSwitch.h"
 #include <algorithm>
 
+#include <map>
+#include "libslic3r/ProjectTask.hpp"
+#include <string>
 #include <tuple>
+#include <wx/panel.h>
+#include <wx/checklst.h>
+#include <wx/gdicmn.h>
+#include <wx/colour.h>
+#include <wx/string.h>
+#include <wx/event.h>
+#include <wx/sizer.h>
+#include <vector>
+#include <wx/dcclient.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp b/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp
index e33987af33..5014743f2d 100644
--- a/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp
+++ b/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp
@@ -14,8 +14,14 @@
 #include "slic3r/GUI/Widgets/StateColor.hpp"
 
 
+#include <wx/checklst.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <string>
+#include <cmath>
 #include <wx/dcgraph.h>
+#include <wx/gdicmn.h>
 #include <wx/grid.h>
+#include <wx/sizer.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.h b/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.h
index 867e6ac118..1ef6543018 100644
--- a/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.h
+++ b/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.h
@@ -11,6 +11,8 @@
 #include "slic3r/GUI/Widgets/PopupWindow.hpp"
 
 #include "slic3r/GUI/wxExtensions.hpp"
+#include <string>
+#include <wx/sizer.h>
 
 //Previous defintions
 class wxGrid;
diff --git a/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.cpp b/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.cpp
index 59fc8809ce..1e582acce9 100644
--- a/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.cpp
+++ b/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.cpp
@@ -12,6 +12,12 @@
 #include "slic3r/GUI/wxExtensions.hpp"
 #include "slic3r/GUI/Widgets/Label.hpp" // Orca: explicit Label include
 
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include "slic3r/GUI/DeviceCore/DevFirmware.h"
+#include <wx/font.h>
+#include <wx/sizer.h>
 #include <wx/stattext.h>
 
 #define MODEL_STR   L("Model:")
diff --git a/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.h b/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.h
index 342067e374..054164f313 100644
--- a/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.h
+++ b/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.h
@@ -6,7 +6,11 @@
 **********************************************************/
 
 #pragma once
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/DeviceCore/DevFirmware.h"
 #include <wx/panel.h>
+#include <wx/string.h>
 #include "slic3r/GUI/wxExtensions.hpp"
 #include "slic3r/GUI/DeviceManager.hpp"
 
diff --git a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.cpp b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.cpp
index 00d4c3e809..213a313d12 100644
--- a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.cpp
+++ b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.cpp
@@ -22,7 +22,27 @@
 #include "slic3r/GUI/Widgets/Button.hpp"
 #include "slic3r/GUI/Widgets/Label.hpp"
 
+#include <string>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <memory>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include "slic3r/GUI/Widgets/StaticBox.hpp"
+#include "slic3r/GUI/Widgets/AnimaController.hpp"
+#include <unordered_map>
+#include <cassert>
+#include "slic3r/GUI/Monitor.hpp"
 #include <unordered_set>
+#include <wx/colour.h>
+#include <vector>
+#include <wx/event.h>
+#include <wx/image.h>
+#include <utility>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/simplebook.h>
+#include <wx/anybutton.h>
 
 #define WX_DIP_SIZE_18 wxSize(FromDIP(18), FromDIP(18))
 #define WX_DIP_SIZE_46 wxSize(FromDIP(46), FromDIP(46))
diff --git a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.cpp b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.cpp
index eae377c147..6a27c16bb7 100644
--- a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.cpp
+++ b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.cpp
@@ -18,6 +18,25 @@
 
 #include "slic3r/GUI/Widgets/Button.hpp"
 #include "slic3r/GUI/Widgets/Label.hpp"
+#include <wx/colour.h>
+#include <wx/event.h>
+#include <memory>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/toplevel.h>
+#include <wx/panel.h>
+#include "slic3r/GUI/Widgets/StaticBox.hpp"
+#include <string>
+#include <vector>
+#include "slic3r/GUI/Widgets/AnimaController.hpp"
+#include "slic3r/GUI/Monitor.hpp"
+#include <wx/frame.h>
+#include <wx/window.h>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include "libslic3r/CommonDefs.hpp"
+#include "libslic3r/Preset.hpp"
+#include "slic3r/GUI/DeviceCore/DevFirmware.h"
 
 #define WX_DIP_SIZE(x, y) wxSize(FromDIP(x), FromDIP(y))
 
diff --git a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.h b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.h
index 06b950cd7e..f7210394a4 100644
--- a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.h
+++ b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.h
@@ -12,8 +12,14 @@
 #include "slic3r/GUI/Widgets/StaticBox.hpp"
 #include "slic3r/GUI/Widgets/AnimaController.hpp"
 
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <unordered_map>
+#include <wx/colour.h>
+#include <vector>
 #include <wx/panel.h>
 #include <memory>
+#include <wx/string.h>
 
 // Previous definitions
 class Button;
diff --git a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.cpp b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.cpp
index f351e7af2b..d7877656f7 100644
--- a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.cpp
+++ b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.cpp
@@ -12,6 +12,16 @@
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/DeviceTab/wgtMsgBox.h"
 #include "slic3r/GUI/Widgets/Label.hpp" // Orca: explicit Label include
+#include <wx/colour.h>
+#include <vector>
+#include <wx/event.h>
+#include <wx/panel.h>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/sizer.h>
+#include <memory>
+#include <optional>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
 
 static wxColour s_gray_clr("#B0B0B0");
 static wxColour s_hgreen_clr("#009688"); // Orca: accent green
diff --git a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.h b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.h
index 729d24a03d..532b44b29d 100644
--- a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.h
+++ b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.h
@@ -9,6 +9,11 @@
 
 #include "slic3r/GUI/DeviceCore/DevNozzleSystem.h"
 
+#include <wx/event.h>
+#include <vector>
+#include <optional>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <unordered_map>
 #include <wx/panel.h>
 
 #include <memory>
diff --git a/src/slic3r/GUI/DeviceTab/wgtMsgBox.cpp b/src/slic3r/GUI/DeviceTab/wgtMsgBox.cpp
index 22ee189777..504602bd79 100644
--- a/src/slic3r/GUI/DeviceTab/wgtMsgBox.cpp
+++ b/src/slic3r/GUI/DeviceTab/wgtMsgBox.cpp
@@ -4,7 +4,11 @@
 #include "slic3r/GUI/Widgets/Label.hpp"
 #include "slic3r/GUI/wxExtensions.hpp"
 
+#include "slic3r/GUI/Widgets/StaticBox.hpp"
+#include <wx/gdicmn.h>
+#include <wx/event.h>
 #include <wx/sizer.h>
+#include <wx/wx.h>
 
 namespace Slic3r::GUI
 {
diff --git a/src/slic3r/GUI/DeviceTab/wgtMsgBox.h b/src/slic3r/GUI/DeviceTab/wgtMsgBox.h
index 9f05abef96..c19956c711 100644
--- a/src/slic3r/GUI/DeviceTab/wgtMsgBox.h
+++ b/src/slic3r/GUI/DeviceTab/wgtMsgBox.h
@@ -1,6 +1,7 @@
 #ifndef WGTMSGBOX_H
 #define WGTMSGBOX_H
 
+#include <wx/event.h>
 #include <wx/wx.h>
 #include <wx/panel.h>
 #include <wx/stattext.h>
diff --git a/src/slic3r/GUI/DeviceTab/wgtMsgPanel.cpp b/src/slic3r/GUI/DeviceTab/wgtMsgPanel.cpp
index 16ae8812be..747fc96a02 100644
--- a/src/slic3r/GUI/DeviceTab/wgtMsgPanel.cpp
+++ b/src/slic3r/GUI/DeviceTab/wgtMsgPanel.cpp
@@ -6,7 +6,14 @@
 #include "slic3r/GUI/Widgets/StateColor.hpp"
 #include "slic3r/GUI/wxExtensions.hpp"
 
+#include <wx/colour.h>
+#include <wx/panel.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/hyperlink.h>
 #include <wx/sizer.h>
+#include <wx/string.h>
+#include <wx/utils.h>
 
 namespace Slic3r::GUI
 {
diff --git a/src/slic3r/GUI/DeviceTab/wgtMsgPanel.h b/src/slic3r/GUI/DeviceTab/wgtMsgPanel.h
index 1f983ce2e4..f710bd51fa 100644
--- a/src/slic3r/GUI/DeviceTab/wgtMsgPanel.h
+++ b/src/slic3r/GUI/DeviceTab/wgtMsgPanel.h
@@ -1,10 +1,12 @@
 #pragma once
 
+#include <wx/colour.h>
 #include <wx/panel.h>
 #include <wx/hyperlink.h>
 #include <wx/sizer.h>
 
 #include <string>
+#include <wx/string.h>
 
 class Label;
 
diff --git a/src/slic3r/GUI/DockPanel.cpp b/src/slic3r/GUI/DockPanel.cpp
index 0a5d25c4e7..ca5e064b7a 100644
--- a/src/slic3r/GUI/DockPanel.cpp
+++ b/src/slic3r/GUI/DockPanel.cpp
@@ -4,10 +4,13 @@
 #include "Plater.hpp"
 #include "Widgets/WebHosting.hpp"
 
+#include <string>
+#include "slic3r/GUI/WebPanel.hpp"
 #include <wx/weakref.h>
 
 #include <algorithm>
 #include <utility>
+#include <wx/webview.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/DockPanel.hpp b/src/slic3r/GUI/DockPanel.hpp
index a9a0a0d6b3..0eb1129787 100644
--- a/src/slic3r/GUI/DockPanel.hpp
+++ b/src/slic3r/GUI/DockPanel.hpp
@@ -3,6 +3,7 @@
 #include "WebPanel.hpp"
 
 #include <functional>
+#include <optional>
 #include <string>
 
 namespace Slic3r { namespace GUI {
diff --git a/src/slic3r/GUI/DownloadProgressDialog.cpp b/src/slic3r/GUI/DownloadProgressDialog.cpp
index 1c5ff4c3d7..cc04efdda5 100644
--- a/src/slic3r/GUI/DownloadProgressDialog.cpp
+++ b/src/slic3r/GUI/DownloadProgressDialog.cpp
@@ -1,6 +1,17 @@
 #include "DownloadProgressDialog.hpp"
 
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/chartype.h>
+#include <wx/panel.h>
+#include <memory>
+#include "slic3r/GUI/BBLStatusBarSend.hpp"
+#include "slic3r/GUI/Jobs/UpgradeNetworkJob.hpp"
+#include "slic3r/GUI/Jobs/Worker.hpp"
+#include <utility>
 #include <wx/settings.h>
+#include <wx/simplebook.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
 #include <wx/button.h>
@@ -11,6 +22,8 @@
 #include <wx/html/htmlwin.h>
 
 #include <boost/algorithm/string/replace.hpp>
+#include <wx/string.h>
+#include <wx/toplevel.h>
 
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Utils.hpp"
diff --git a/src/slic3r/GUI/DownloadProgressDialog.hpp b/src/slic3r/GUI/DownloadProgressDialog.hpp
index fa23be5245..659fa20d6d 100644
--- a/src/slic3r/GUI/DownloadProgressDialog.hpp
+++ b/src/slic3r/GUI/DownloadProgressDialog.hpp
@@ -1,14 +1,17 @@
 #ifndef slic3r_DownloadProgressDialog_hpp_
 #define slic3r_DownloadProgressDialog_hpp_
 
+#include <memory>
 #include <string>
 #include <unordered_map>
 
 #include "GUI_Utils.hpp"
 #include <wx/dialog.h>
+#include <wx/event.h>
 #include <wx/font.h>
 #include <wx/bitmap.h>
 #include <wx/msgdlg.h>
+#include <wx/panel.h>
 #include <wx/richmsgdlg.h>
 #include <wx/textctrl.h>
 #include <wx/statline.h>
diff --git a/src/slic3r/GUI/Downloader.cpp b/src/slic3r/GUI/Downloader.cpp
index 0d37a0eca6..e94b9f2b7d 100644
--- a/src/slic3r/GUI/Downloader.cpp
+++ b/src/slic3r/GUI/Downloader.cpp
@@ -5,8 +5,22 @@
 #include "MainFrame.hpp"
 
 #include <boost/algorithm/string.hpp>
+#include <boost/filesystem/path.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/regex.hpp>
+#include <string>
+#include <wx/utils.h>
+#include <utility>
+#include <cstddef>
+#include <wx/event.h>
+#include <cassert>
+#include <memory>
+#include "slic3r/GUI/DownloaderFileGet.hpp"
+#include "libslic3r/Utils.hpp"
+#include <functional>
+#include "slic3r/GUI/GUI.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <wx/arrstr.h>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/Downloader.hpp b/src/slic3r/GUI/Downloader.hpp
index 84a9a95697..308c9b2198 100644
--- a/src/slic3r/GUI/Downloader.hpp
+++ b/src/slic3r/GUI/Downloader.hpp
@@ -3,6 +3,11 @@
 
 #include "DownloaderFileGet.hpp"
 #include <boost/filesystem/path.hpp>
+#include <string>
+#include <wx/event.h>
+#include <memory>
+#include <vector>
+#include <cstddef>
 #include <wx/wx.h>
 
 namespace Slic3r {
diff --git a/src/slic3r/GUI/DownloaderFileGet.cpp b/src/slic3r/GUI/DownloaderFileGet.cpp
index 4a7269affa..a35df951ff 100644
--- a/src/slic3r/GUI/DownloaderFileGet.cpp
+++ b/src/slic3r/GUI/DownloaderFileGet.cpp
@@ -1,5 +1,16 @@
 #include "DownloaderFileGet.hpp"
 
+#include <cstddef>
+#include <string>
+#include <boost/algorithm/string/predicate.hpp>
+#include <atomic>
+#include <regex>
+#include <cassert>
+#include <boost/filesystem/exception.hpp>
+#include <cstdio>
+#include <boost/filesystem/operations.hpp>
+#include <exception>
+#include <stdexcept>
 #include <thread>
 #include <curl/curl.h>
 #include <boost/nowide/fstream.hpp>
@@ -8,6 +19,8 @@
 #include <boost/log/trivial.hpp>
 #include <boost/algorithm/string.hpp>
 #include <iostream>
+#include <wx/event.h>
+#include <utility>
 
 #include "format.hpp"
 #include "GUI.hpp"
diff --git a/src/slic3r/GUI/DownloaderFileGet.hpp b/src/slic3r/GUI/DownloaderFileGet.hpp
index 022d4c0c10..483ae8b1a5 100644
--- a/src/slic3r/GUI/DownloaderFileGet.hpp
+++ b/src/slic3r/GUI/DownloaderFileGet.hpp
@@ -3,6 +3,7 @@
 
 #include "../Utils/Http.hpp"
 
+#include <boost/filesystem/path.hpp>
 #include <memory>
 #include <string>
 #include <wx/event.h>
diff --git a/src/slic3r/GUI/DragCanvas.cpp b/src/slic3r/GUI/DragCanvas.cpp
index 66a9acecbc..353ab9416e 100644
--- a/src/slic3r/GUI/DragCanvas.cpp
+++ b/src/slic3r/GUI/DragCanvas.cpp
@@ -2,6 +2,16 @@
 #include "wxExtensions.hpp"
 #include "GUI_App.hpp"
 #include "Widgets/StateColor.hpp"
+#include <wx/colour.h>
+#include <vector>
+#include <string>
+#include <wx/panel.h>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <algorithm>
+#include <wx/dcclient.h>
+#include <wx/dragimag.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/DragCanvas.hpp b/src/slic3r/GUI/DragCanvas.hpp
index f39e836673..d61fa26eeb 100644
--- a/src/slic3r/GUI/DragCanvas.hpp
+++ b/src/slic3r/GUI/DragCanvas.hpp
@@ -4,6 +4,12 @@
 #include "wx/bitmap.h"
 #include "wx/dragimag.h"
 #include "wx/panel.h"
+#include <wx/object.h>
+#include <wx/gdicmn.h>
+#include <vector>
+#include <string>
+#include <wx/event.h>
+#include <wx/colour.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/DragDropPanel.cpp b/src/slic3r/GUI/DragDropPanel.cpp
index 41c31d927b..f462e7a2ed 100644
--- a/src/slic3r/GUI/DragDropPanel.cpp
+++ b/src/slic3r/GUI/DragDropPanel.cpp
@@ -3,7 +3,29 @@
 #include "I18N.hpp"
 #include "Widgets/Label.hpp"
 #include "Widgets/StateColor.hpp"
+#include <ios>
+#include <cstring>
+#include <cstddef>
+#include "slic3r/GUI/BitmapCache.hpp"
+#include <algorithm>
+#include "libslic3r/Config.hpp"
+#include "libslic3r/PrintConfig.hpp"
 #include <slic3r/GUI/wxExtensions.hpp>
+#include <wx/event.h>
+#include <string>
+#include <stdexcept>
+#include <sstream>
+#include <wx/dataobj.h>
+#include <wx/colour.h>
+#include <wx/panel.h>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/dcclient.h>
+#include <wx/chartype.h>
+#include <wx/dnd.h>
+#include <wx/types.h>
+#include <wx/sizer.h>
+#include <vector>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/DragDropPanel.hpp b/src/slic3r/GUI/DragDropPanel.hpp
index 4f2a4bced0..bfad906924 100644
--- a/src/slic3r/GUI/DragDropPanel.hpp
+++ b/src/slic3r/GUI/DragDropPanel.hpp
@@ -5,9 +5,14 @@
 #include "GUI_Utils.hpp"
 #include "Widgets/Label.hpp"
 
+#include <wx/event.h>
+#include <string>
+#include <wx/panel.h>
+#include <wx/colour.h>
 #include <wx/simplebook.h>
 #include <wx/dialog.h>
 #include <wx/sizer.h>
+#include <wx/string.h>
 #include <wx/timer.h>
 #include <vector>
 
diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp
index 3dff82d610..c9646295c0 100644
--- a/src/slic3r/GUI/EditGCodeDialog.cpp
+++ b/src/slic3r/GUI/EditGCodeDialog.cpp
@@ -1,12 +1,34 @@
 #include "EditGCodeDialog.hpp"
 
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include <set>
+#include <initializer_list>
+#include <map>
+#include "libslic3r/libslic3r.h"
+#include <utility>
+#include <memory>
+#include <algorithm>
+#include <cassert>
 #include <vector>
 #include <string>
 
+#include <wx/gdicmn.h>
+#include <wx/dialog.h>
+#include <wx/event.h>
+#include <wx/dataview.h>
+#include <wx/log.h>
+#include <wx/chartype.h>
+#include <wx/dvrenderers.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
+#include <wx/string.h>
 #include <wx/textctrl.h>
 #include <wx/button.h>
+#include <wx/toplevel.h>
+#include <wx/variant.h>
 #include <wx/wupdlock.h>
 
 #include "GUI.hpp"
diff --git a/src/slic3r/GUI/EditGCodeDialog.hpp b/src/slic3r/GUI/EditGCodeDialog.hpp
index e6907acbf1..573d0fab8e 100644
--- a/src/slic3r/GUI/EditGCodeDialog.hpp
+++ b/src/slic3r/GUI/EditGCodeDialog.hpp
@@ -1,8 +1,13 @@
 #ifndef slic3r_EditGCodeDialog_hpp_
 #define slic3r_EditGCodeDialog_hpp_
 
+#include <string>
+#include <unordered_map>
+#include <memory>
+#include <utility>
 #include <vector>
 
+#include <wx/dataview.h>
 #include <wx/gdicmn.h>
 #include <slic3r/GUI/Widgets/Button.hpp>
 
@@ -11,6 +16,7 @@
 #include "libslic3r/Preset.hpp"
 #include "libslic3r/PrintConfig.hpp"
 #include <wx/srchctrl.h>
+#include <wx/variant.h>
 
 class wxListBox;
 class wxTextCtrl;
diff --git a/src/slic3r/GUI/EncodedFilament.cpp b/src/slic3r/GUI/EncodedFilament.cpp
index 0cab200386..737c66ff33 100644
--- a/src/slic3r/GUI/EncodedFilament.cpp
+++ b/src/slic3r/GUI/EncodedFilament.cpp
@@ -1,5 +1,14 @@
 #include "EncodedFilament.hpp"
+#include "libslic3r/Utils.hpp"
+#include <fstream>
+#include <boost/log/trivial.hpp>
+#include <cassert>
 #include <nlohmann/json.hpp>
+#include <wx/string.h>
+#include <wx/colour.h>
+#include <unordered_map>
+#include <vector>
+#include <utility>
 
 #include "GUI_App.hpp"
 
diff --git a/src/slic3r/GUI/EncodedFilament.hpp b/src/slic3r/GUI/EncodedFilament.hpp
index 9150998b65..8e3542b1e4 100644
--- a/src/slic3r/GUI/EncodedFilament.hpp
+++ b/src/slic3r/GUI/EncodedFilament.hpp
@@ -1,6 +1,9 @@
 #ifndef slic3r_ENCODED_FILAMENT_hpp_
 #define slic3r_ENCODED_FILAMENT_hpp_
 
+#include <algorithm>
+#include <cstddef>
+#include <string>
 #include <vector>
 #include <map>
 #include <math.h>
diff --git a/src/slic3r/GUI/Event.hpp b/src/slic3r/GUI/Event.hpp
index 9fbf2d8fcc..d693b93f67 100644
--- a/src/slic3r/GUI/Event.hpp
+++ b/src/slic3r/GUI/Event.hpp
@@ -2,8 +2,10 @@
 #define slic3r_Events_hpp_
 
 #include <array>
+#include <cstddef>
 #include <wx/debug.h>
 #include <wx/event.h>
+#include <wx/object.h>
 
 
 namespace Slic3r {
diff --git a/src/slic3r/GUI/ExportPresetBundleDialog.cpp b/src/slic3r/GUI/ExportPresetBundleDialog.cpp
index 9d2f26bf6a..f4e27c4367 100644
--- a/src/slic3r/GUI/ExportPresetBundleDialog.cpp
+++ b/src/slic3r/GUI/ExportPresetBundleDialog.cpp
@@ -4,10 +4,30 @@
 #include "ConfigWizard.hpp"
 #include "I18N.hpp"
 #include "GUI_App.hpp"
+#include <cstddef>
+#include <chrono>
+#include <ctime>
+#include <iomanip>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/log/trivial.hpp>
+#include <deque>
 #include <libslic3r/Config.hpp>
+#include "slic3r/GUI/Widgets/WebViewHostDialog.hpp"
+#include <utility>
+#include <string>
+#include "libslic3r/Preset.hpp"
+#include <sstream>
+#include "libslic3r/Utils.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/PrintConfig.hpp"
+#include <vector>
+#include "slic3r/GUI/GUI.hpp"
 #include <wx/app.h>
 #include <wx/event.h>
+#include <wx/filedlg.h>
 #include <wx/filename.h>
+#include <wx/gdicmn.h>
 #include <wx/scrolwin.h>
 #include <wx/sizer.h>
 #include <libslic3r/PresetBundle.hpp>
diff --git a/src/slic3r/GUI/ExportPresetBundleDialog.hpp b/src/slic3r/GUI/ExportPresetBundleDialog.hpp
index 9340759c06..2038cd7677 100644
--- a/src/slic3r/GUI/ExportPresetBundleDialog.hpp
+++ b/src/slic3r/GUI/ExportPresetBundleDialog.hpp
@@ -6,12 +6,20 @@
 #include "Widgets/WebViewHostDialog.hpp"
 
 #include "libslic3r/AppConfig.hpp"
+#include "libslic3r/Preset.hpp"
 #include <slic3r/GUI/GUI.hpp>
+#include <wx/chartype.h>
+#include <unordered_map>
+#include <string>
+#include <vector>
+#include <utility>
 #include <wx/dataview.h>
 #include <wx/event.h>
+#include <wx/gdicmn.h>
 #include <wx/language.h>
 #include <wx/string.h>
 #include <wx/fswatcher.h>
+#include <wx/toplevel.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/ExtraRenderers.cpp b/src/slic3r/GUI/ExtraRenderers.cpp
index 3abfdb82ff..56311406cc 100644
--- a/src/slic3r/GUI/ExtraRenderers.cpp
+++ b/src/slic3r/GUI/ExtraRenderers.cpp
@@ -6,7 +6,20 @@
 #include "Plater.hpp"
 #include "Widgets/ComboBox.hpp"
 
+#include "libslic3r/Technologies.hpp"
+#include <wx/dataview.h>
+#include "slic3r/GUI/ObjectDataViewModel.hpp"
+#include <vector>
+#include <cstddef>
+#include <cstdlib>
 #include <wx/dc.h>
+#include <wx/setup.h>
+#include <wx/rtti.h>
+#include <wx/object.h>
+#include <wx/variant.h>
+#include <wx/gdicmn.h>
+#include <wx/string.h>
+#include <wx/event.h>
 #ifdef wxHAS_GENERIC_DATAVIEWCTRL
 #include "wx/generic/private/markuptext.h"
 #include "wx/generic/private/rowheightcache.h"
diff --git a/src/slic3r/GUI/ExtraRenderers.hpp b/src/slic3r/GUI/ExtraRenderers.hpp
index 59a1f040ee..4defa2e389 100644
--- a/src/slic3r/GUI/ExtraRenderers.hpp
+++ b/src/slic3r/GUI/ExtraRenderers.hpp
@@ -3,7 +3,16 @@
 
 #include <functional>
 
+#include <wx/chartype.h>
+#include <wx/bitmap.h>
 #include <wx/dataview.h>
+#include <wx/setup.h>
+#include <wx/object.h>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/rtti.h>
+#include <wx/dvrenderers.h>
+#include <wx/variant.h>
 
 #if wxUSE_MARKUP
     #define SUPPORTS_MARKUP
diff --git a/src/slic3r/GUI/ExtrusionCalibration.cpp b/src/slic3r/GUI/ExtrusionCalibration.cpp
index 1f07823d61..e15470e462 100644
--- a/src/slic3r/GUI/ExtrusionCalibration.cpp
+++ b/src/slic3r/GUI/ExtrusionCalibration.cpp
@@ -6,7 +6,30 @@
 #include <algorithm>
 #include "I18N.hpp"
 #include <boost/log/trivial.hpp>
+#include <wx/checklst.h>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/Widgets/ComboBox.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <cstddef>
+#include <wx/dcclient.h>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <wx/arrstr.h>
+#include <vector>
+#include <cstdlib>
 #include <wx/dcgraph.h>
+#include <wx/gdicmn.h>
+#include <wx/toplevel.h>
+#include <wx/panel.h>
+#include <wx/string.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+#include <wx/event.h>
+#include <wx/textctrl.h>
 #include "CalibUtils.hpp"
 
 namespace Slic3r { namespace GUI {
diff --git a/src/slic3r/GUI/ExtrusionCalibration.hpp b/src/slic3r/GUI/ExtrusionCalibration.hpp
index c7b6c28c8d..cbee1b56b1 100644
--- a/src/slic3r/GUI/ExtrusionCalibration.hpp
+++ b/src/slic3r/GUI/ExtrusionCalibration.hpp
@@ -16,6 +16,13 @@
 #include "ParamsDialog.hpp"
 #include "GUI_App.hpp"
 #include "wx/hyperlink.h"
+#include <wx/checklst.h>
+#include <wx/string.h>
+#include <string>
+#include <vector>
+#include <wx/event.h>
+#include "libslic3r/PrintConfig.hpp"
+#include <wx/panel.h>
 
 #define EXTRUSION_CALIBRATION_DEF_COLOUR    wxColour(255, 255, 255)
 #define EXTRUSION_CALIBRATION_GREY900       wxColour(38, 46, 48)
diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp
index 74ef3f87c8..8ca4722e3d 100644
--- a/src/slic3r/GUI/Field.cpp
+++ b/src/slic3r/GUI/Field.cpp
@@ -11,16 +11,60 @@
 #include "libslic3r/PrintConfig.hpp"
 
 #include <algorithm>
+#include <boost/algorithm/string/erase.hpp>
+#include <cfloat>
+#include <boost/any.hpp>
+#include <climits>
+#include <boost/filesystem/operations.hpp>
 #include <cmath>
+#include "libslic3r/LocalesUtils.hpp"
+#include <cstddef>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Config.hpp"
+#include <cstdlib>
+#include "libslic3r/Preset.hpp"
+#include <limits>
+#include "libslic3r/enum_bitmask.hpp"
+#include <deque>
+#include "libslic3r/libslic3r.h"
+#include <map>
+#include "libslic3r/Utils.hpp"
+#include <functional>
+#include <cstring>
+#include "libslic3r/Color.hpp"
 #include <regex>
+#include <string>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include "slic3r/GUI/Widgets/DropDown.hpp"
 #include <utility>
 #include <cstdint>
+#include <vector>
+#include <wx/event.h>
+#include <wx/chartype.h>
+#include <wx/gdicmn.h>
+#include <wx/arrstr.h>
+#include <wx/anybutton.h>
+#include <wx/colour.h>
+#include <wx/clrpicker.h>
+#include <wx/image.h>
+#include <wx/dcmemory.h>
+#include <wx/dc.h>
+#include <wx/dcgraph.h>
+#include <wx/font.h>
 #include <wx/numformatter.h>
+#include <wx/settings.h>
+#include <wx/string.h>
+#include <wx/textctrl.h>
+#include <wx/tglbtn.h>
+#include <wx/spinctrl.h>
+#include <wx/panel.h>
+#include <wx/stattext.h>
 #include <wx/tooltip.h>
 #include <wx/notebook.h>
 #include <wx/listbook.h>
 #include <wx/tokenzr.h>
 #include <boost/algorithm/string/predicate.hpp>
+#include <wx/types.h>
 #include "OG_CustomCtrl.hpp"
 #include "MsgDialog.hpp"
 #include "BitmapComboBox.hpp"
diff --git a/src/slic3r/GUI/Field.hpp b/src/slic3r/GUI/Field.hpp
index 3f55bf5c5a..da078d37a4 100644
--- a/src/slic3r/GUI/Field.hpp
+++ b/src/slic3r/GUI/Field.hpp
@@ -1,6 +1,16 @@
 #ifndef SLIC3R_GUI_FIELD_HPP
 #define SLIC3R_GUI_FIELD_HPP
 
+#include <string>
+#include <wx/string.h>
+#include "libslic3r/Point.hpp"
+#include <vector>
+#include <wx/colour.h>
+#include <wx/sizer.h>
+#include <wx/event.h>
+#include <climits>
+#include <wx/arrstr.h>
+#include <cstddef>
 #include <wx/wxprec.h>
 #ifndef WX_PRECOMP
     #include <wx/wx.h>
diff --git a/src/slic3r/GUI/FilamentBitmapUtils.cpp b/src/slic3r/GUI/FilamentBitmapUtils.cpp
index 3af3d1ad01..c3381bd3a7 100644
--- a/src/slic3r/GUI/FilamentBitmapUtils.cpp
+++ b/src/slic3r/GUI/FilamentBitmapUtils.cpp
@@ -1,7 +1,20 @@
+#include <wx/colour.h>
+#include <vector>
+#include <cstddef>
+#include "libslic3r/Config.hpp"
+#include "libslic3r/LocalesUtils.hpp"
+#include <cstdio>
+#include <wx/chartype.h>
+#include <array>
 #include <wx/dcmemory.h>
 #include <wx/dcgraph.h>
+#include <wx/gdicmn.h>
+#include <wx/geometry.h>
+#include <wx/font.h>
 #include <wx/graphics.h>
+#include <wx/peninfobase.h>
 #include <wx/settings.h>
+#include <wx/string.h>
 #include <wx/window.h>
 #include <algorithm>
 #include <cmath>
diff --git a/src/slic3r/GUI/FilamentBitmapUtils.hpp b/src/slic3r/GUI/FilamentBitmapUtils.hpp
index 687d34a825..b95a61a1b6 100644
--- a/src/slic3r/GUI/FilamentBitmapUtils.hpp
+++ b/src/slic3r/GUI/FilamentBitmapUtils.hpp
@@ -1,6 +1,7 @@
 #ifndef slic3r_GUI_FilamentBitmapUtils_hpp_
 #define slic3r_GUI_FilamentBitmapUtils_hpp_
 
+#include <cstddef>
 #include <wx/bitmap.h>
 #include <wx/colour.h>
 #include <wx/dc.h>
diff --git a/src/slic3r/GUI/FilamentGroupPopup.cpp b/src/slic3r/GUI/FilamentGroupPopup.cpp
index e5e49928dc..d8442071b4 100644
--- a/src/slic3r/GUI/FilamentGroupPopup.cpp
+++ b/src/slic3r/GUI/FilamentGroupPopup.cpp
@@ -5,6 +5,29 @@
 #include "I18N.hpp"
 #include "PartPlate.hpp"
 #include "Widgets/HyperLink.hpp"
+#include <wx/colour.h>
+#include "libslic3r/Config.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include <map>
+#include <string>
+#include <boost/log/trivial.hpp>
+#include <vector>
+#include <wx/utils.h>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "slic3r/GUI/Widgets/PopupWindow.hpp"
+#include <wx/string.h>
+#include <wx/popupwin.h>
+#include <cstddef>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <wx/event.h>
+#include <wx/timer.h>
+#include <wx/window.h>
+#include <wx/sizer.h>
+#include "slic3r/GUI/Widgets/StaticBox.hpp"
+#include <utility>
+#include "slic3r/GUI/Widgets/SwitchButton.hpp"
+#include <wx/tglbtn.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/FilamentGroupPopup.hpp b/src/slic3r/GUI/FilamentGroupPopup.hpp
index 6d0bd43da7..09b6b8d344 100644
--- a/src/slic3r/GUI/FilamentGroupPopup.hpp
+++ b/src/slic3r/GUI/FilamentGroupPopup.hpp
@@ -1,8 +1,10 @@
 #ifndef FILAMENT_GROUP_HOVER_HPP
 #define FILAMENT_GROUP_HOVER_HPP
 
+#include <vector>
 #include <wx/bitmap.h>
 #include <wx/bmpbuttn.h>
+#include <wx/event.h>
 #include <wx/sizer.h>
 #include <wx/timer.h>
 #include "libslic3r/PrintConfig.hpp"
diff --git a/src/slic3r/GUI/FilamentMapDialog.cpp b/src/slic3r/GUI/FilamentMapDialog.cpp
index 7bb6f51421..e23d0c5d0f 100644
--- a/src/slic3r/GUI/FilamentMapDialog.cpp
+++ b/src/slic3r/GUI/FilamentMapDialog.cpp
@@ -7,6 +7,19 @@
 #include "GUI_App.hpp"
 #include "CapsuleButton.hpp"
 #include "MsgDialog.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Config.hpp"
+#include <vector>
+#include <wx/panel.h>
+#include <wx/string.h>
+#include <wx/colour.h>
+#include "slic3r/GUI/Widgets/CheckBox.hpp"
+#include <wx/tglbtn.h>
+#include <wx/event.h>
+#include <numeric>
+#include <wx/gdicmn.h>
+#include <wx/dialog.h>
+#include "slic3r/GUI/FilamentMapPanel.hpp"
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/FilamentMapDialog.hpp b/src/slic3r/GUI/FilamentMapDialog.hpp
index fd1b056347..df588bd4ca 100644
--- a/src/slic3r/GUI/FilamentMapDialog.hpp
+++ b/src/slic3r/GUI/FilamentMapDialog.hpp
@@ -2,7 +2,11 @@
 #define slic3r_FilamentMapDialog_hpp_
 
 #include "FilamentMapPanel.hpp"
+#include <string>
+#include "libslic3r/PrintConfig.hpp"
 #include <vector>
+#include <wx/string.h>
+#include <wx/event.h>
 #include "CapsuleButton.hpp"
 #include "Widgets/CheckBox.hpp"
 
diff --git a/src/slic3r/GUI/FilamentMapPanel.cpp b/src/slic3r/GUI/FilamentMapPanel.cpp
index bd7d42333b..599a41dff8 100644
--- a/src/slic3r/GUI/FilamentMapPanel.cpp
+++ b/src/slic3r/GUI/FilamentMapPanel.cpp
@@ -4,8 +4,27 @@
 #include "Plater.hpp"
 #include "Widgets/MultiNozzleSync.hpp" // manuallySetNozzleCount producer for extruder_nozzle_stats
 #include <algorithm>
+#include <wx/colour.h>
+#include "libslic3r/Config.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include <vector>
+#include <cstddef>
+#include <string>
+#include <wx/chartype.h>
+#include "slic3r/GUI/DragDropPanel.hpp"
+#include <cassert>
+#include <wx/anybutton.h>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
 #include <wx/dcbuffer.h>
+#include <wx/event.h>
+#include <wx/timer.h>
+#include <wx/object.h>
+#include <wx/string.h>
+#include <wx/sizer.h>
+#include <wx/gdicmn.h>
 #include <wx/utils.h>
+#include <wx/window.h>
 #include "wx/graphics.h"
 
 namespace Slic3r { namespace GUI {
diff --git a/src/slic3r/GUI/FilamentMapPanel.hpp b/src/slic3r/GUI/FilamentMapPanel.hpp
index ce7c8010a3..c165c76be6 100644
--- a/src/slic3r/GUI/FilamentMapPanel.hpp
+++ b/src/slic3r/GUI/FilamentMapPanel.hpp
@@ -6,6 +6,13 @@
 #include "DragDropPanel.hpp"
 #include "wxExtensions.hpp"
 #include "Widgets/Label.hpp"
+#include <wx/event.h>
+#include <wx/panel.h>
+#include <vector>
+#include <string>
+#include <wx/timer.h>
+#include <wx/string.h>
+#include "libslic3r/PrintConfig.hpp"
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/FilamentPickerDialog.cpp b/src/slic3r/GUI/FilamentPickerDialog.cpp
index 5b5af59501..8821a43c52 100644
--- a/src/slic3r/GUI/FilamentPickerDialog.cpp
+++ b/src/slic3r/GUI/FilamentPickerDialog.cpp
@@ -9,6 +9,28 @@
 #include "Widgets/StateColor.hpp"
 #include "Widgets/DialogButtons.hpp"
 #include "wxExtensions.hpp"
+#include <wx/colour.h>
+#include <wx/gdicmn.h>
+#include <wx/string.h>
+#include <wx/timer.h>
+#include <string>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/frame.h>
+#include <wx/nonownedwnd.h>
+#include <wx/scrolwin.h>
+#include <wx/event.h>
+#include <wx/dcmemory.h>
+#include <boost/log/trivial.hpp>
+#include <vector>
+#include "slic3r/GUI/FilamentBitmapUtils.hpp"
+#include <wx/font.h>
+#include <wx/panel.h>
+#include <wx/anybutton.h>
+#include <wx/settings.h>
+#include <wx/colourdata.h>
+#include <wx/utils.h>
+#include <wx/dcclient.h>
+#include <wx/window.h>
 #include <wx/wx.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
diff --git a/src/slic3r/GUI/FilamentPickerDialog.hpp b/src/slic3r/GUI/FilamentPickerDialog.hpp
index 2a1412c947..06b73bab56 100644
--- a/src/slic3r/GUI/FilamentPickerDialog.hpp
+++ b/src/slic3r/GUI/FilamentPickerDialog.hpp
@@ -7,7 +7,11 @@
 #include "FilamentBitmapUtils.hpp"
 #include "Widgets/Button.hpp"
 #include "EncodedFilament.hpp"
+#include <wx/colourdata.h>
 #include <wx/dialog.h>
+#include <wx/string.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
 #include <wx/wx.h>
 #include <wx/scrolwin.h>
 #include <wx/bitmap.h>
diff --git a/src/slic3r/GUI/FileArchiveDialog.cpp b/src/slic3r/GUI/FileArchiveDialog.cpp
index 982187211c..42fdc9a700 100644
--- a/src/slic3r/GUI/FileArchiveDialog.cpp
+++ b/src/slic3r/GUI/FileArchiveDialog.cpp
@@ -6,9 +6,31 @@
 #include "MainFrame.hpp"
 #include "ExtraRenderers.hpp"
 #include "format.hpp"
+#include <memory>
+#include <cassert>
+#include <miniz.h>
+#include <cstddef>
+#include <functional>
+#include "libslic3r/miniz_extension.hpp"
+#include <boost/algorithm/string/predicate.hpp>
+#include <algorithm>
 #include <regex>
 #include <boost/log/trivial.hpp>
 #include <boost/nowide/convert.hpp>
+#include <wx/string.h>
+#include <wx/dataview.h>
+#include <wx/variant.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <vector>
+#include <utility>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/dialog.h>
+#include <wx/toplevel.h>
+#include <wx/settings.h>
+#include <wx/sizer.h>
+#include <wx/dvrenderers.h>
+#include "slic3r/GUI/Widgets/Button.hpp"
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/FileArchiveDialog.hpp b/src/slic3r/GUI/FileArchiveDialog.hpp
index decb960589..0afac1fd33 100644
--- a/src/slic3r/GUI/FileArchiveDialog.hpp
+++ b/src/slic3r/GUI/FileArchiveDialog.hpp
@@ -5,6 +5,16 @@
 #include "libslic3r/miniz_extension.hpp"
 
 #include <boost/filesystem/path.hpp>
+#include <wx/string.h>
+#include <vector>
+#include <memory>
+#include <cstddef>
+#include <wx/variant.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <miniz.h>
+#include <utility>
+#include <wx/sizer.h>
 #include <wx/wx.h>
 #include <wx/dataview.h>
 #include <slic3r/GUI/Widgets/Button.hpp>
diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp
index cb3fc8d292..04c930dcfe 100644
--- a/src/slic3r/GUI/GCodeViewer.cpp
+++ b/src/slic3r/GUI/GCodeViewer.cpp
@@ -28,6 +28,52 @@
 #include "libslic3r/Layer.hpp"
 #include "Widgets/ProgressDialog.hpp"
 #include "MsgDialog.hpp"
+#include <string>
+#include "libvgcode/include/Types.hpp"
+#include <vector>
+#include <utility>
+#include <cstdio>
+#include "libslic3r/Technologies.hpp"
+#include <imgui.h>
+#include "slic3r/GUI/ImGuiWrapper.hpp"
+#include "slic3r/GUI/GLModel.hpp"
+#include "slic3r/GUI/GLShader.hpp"
+#include "libslic3r/Point.hpp"
+#include <math.h>
+#include "libvgcode/include/Viewer.hpp"
+#include "libvgcode/include/PathVertex.hpp"
+#include <cstddef>
+#include <cstring>
+#include "slic3r/GUI/LibVGCode/LibVGCodeWrapper.hpp"
+#include <cassert>
+#include <cstdint>
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/constants.hpp>
+#include "slic3r/GUI/IMSlider.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/Preset.hpp"
+#include <exception>
+#include <iterator>
+#include "libslic3r/GCode/GCodeProcessor.hpp"
+#include "libvgcode/include/GCodeInputData.hpp"
+#include "libvgcode/include/ColorRange.hpp"
+#include <optional>
+#include "libslic3r_version.h"
+#include <wx/busycursor.h>
+#include "libslic3r/Slicing.hpp"
+#include "slic3r/GUI/3DScene.hpp"
+#include "libslic3r/Color.hpp"
+#include <map>
+#include "libslic3r/PrintBase.hpp"
+#include <wx/event.h>
+#include <wx/string.h>
+#include <wx/slider.h>
+#include "libslic3r/PrintConfig.hpp"
+#include "slic3r/GUI/Event.hpp"
+#include <string_view>
+#include <functional>
+#include "libslic3r/CustomGCode.hpp"
+#include "libslic3r/ExtrusionEntity.hpp"
 
 #define IMGUI_DEFINE_MATH_OPERATORS
 
diff --git a/src/slic3r/GUI/GCodeViewer.hpp b/src/slic3r/GUI/GCodeViewer.hpp
index f4ebe2e81d..5154726aba 100644
--- a/src/slic3r/GUI/GCodeViewer.hpp
+++ b/src/slic3r/GUI/GCodeViewer.hpp
@@ -8,17 +8,30 @@
 #include "GLModel.hpp"
 #include "I18N.hpp"
 
+#include <algorithm>
 #include <boost/iostreams/device/mapped_file.hpp>
 
 #include "LibVGCode/LibVGCodeWrapper.hpp"
 // needed for tech VGCODE_ENABLE_COG_AND_TOOL_MARKERS
+#include "libslic3r/Technologies.hpp"
+#include "libslic3r/Color.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include <cstddef>
+#include "libslic3r/Config.hpp"
+#include "libvgcode/include/GCodeInputData.hpp"
+#include <iterator>
+#include "libvgcode/include/PathVertex.hpp"
 #include <libvgcode/include/Types.hpp>
 
 #include <array>
 #include <cstdint>
 #include <float.h>
 #include <set>
+#include <string>
 #include <unordered_set>
+#include <utility>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index 01ff6de714..ea116587ac 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -1,4 +1,68 @@
 #include "libslic3r/libslic3r.h"
+#include "libslic3r/Point.hpp"
+#include <string>
+#include <sstream>
+#include <iomanip>
+#include <imgui.h>
+#include <wx/event.h>
+#include "slic3r/GUI/Event.hpp"
+#include <vector>
+#include <utility>
+#include "libslic3r/Slicing.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmosManager.hpp"
+#include <cstddef>
+#include <array>
+#include <cassert>
+#include <climits>
+#include "libslic3r/BoundingBox.hpp"
+#include <chrono>
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/LocalesUtils.hpp"
+#include "libslic3r/Config.hpp"
+#include <wx/timer.h>
+#include "slic3r/GUI/IMSlider.hpp"
+#include "libslic3r/Preset.hpp"
+#include "libslic3r/Model.hpp"
+#include <memory>
+#include "slic3r/GUI/SceneRaycaster.hpp"
+#include "slic3r/GUI/Camera.hpp"
+#include "slic3r/GUI/GCodeViewer.hpp"
+#include <optional>
+#include <map>
+#include "slic3r/GUI/GUI_Geometry.hpp"
+#include "libslic3r/PrintBase.hpp"
+#include <tuple>
+#include "libslic3r/SLA/SupportPoint.hpp"
+#include "slic3r/GUI/MeshUtils.hpp"
+#include "libslic3r/GCode/WipeTowerEstimate.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <wx/window.h>
+#include "slic3r/GUI/GLTexture.hpp"
+#include <ratio>
+#include <wx/string.h>
+#include "slic3r/GUI/GLToolbar.hpp"
+#include <math.h>
+#include <Eigen/Core>
+#include <iterator>
+#include <wx/app.h>
+#include <cstdlib>
+#include <wx/setup.h>
+#include "libslic3r/Line.hpp"
+#include "libslic3r/Format/bbs_3mf.hpp"
+#include "libslic3r/LifecycleEvents.hpp"
+#include "slic3r/GUI/GUI_ObjectLayers.hpp"
+#include "libslic3r/GCode/WipeTower.hpp"
+#include "libslic3r/Geometry.hpp"
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/Jobs/Job.hpp"
+#include <cstring>
+#include "libslic3r/Color.hpp"
+#include <boost/container_hash/hash.hpp>
+#include <cstdint>
+#include <functional>
+#include <wx/colour.h>
+#include <string_view>
+#include "slic3r/GUI/Selection.hpp"
 #include "GLCanvas3D.hpp"
 #ifdef SLIC3R_CAD
 #include "slic3r/GUI/CAD/DesignSketchTool.hpp"   // Design tab: interactive 2D sketch tool
diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp
index 36a6c7b944..f861e15ca1 100644
--- a/src/slic3r/GUI/GLCanvas3D.hpp
+++ b/src/slic3r/GUI/GLCanvas3D.hpp
@@ -1,6 +1,24 @@
 #ifndef slic3r_GLCanvas3D_hpp_
 #define slic3r_GLCanvas3D_hpp_
 
+#include "libslic3r/Point.hpp"
+#include "slic3r/GUI/3DScene.hpp"
+#include <cstdlib>
+#include <map>
+#include <cmath>
+#include "libslic3r/Geometry.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include <array>
+#include "libslic3r/Config.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Technologies.hpp"
+#include "libslic3r/Model.hpp"
+#include "libvgcode/include/Types.hpp"
+#include "libvgcode/include/PathVertex.hpp"
+#include "libslic3r/Color.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Line.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
 #include <stddef.h>
 #include <memory>
 #include <chrono>
@@ -25,6 +43,14 @@
 
 #include <float.h>
 
+#include <wx/setup.h>
+#include <wx/event.h>
+#include <utility>
+#include <vector>
+#include <string>
+#include <wx/string.h>
+#include <wx/colour.h>
+#include <wx/time.h>
 #include <wx/timer.h>
 
 class wxSizeEvent;
diff --git a/src/slic3r/GUI/GLModel.cpp b/src/slic3r/GUI/GLModel.cpp
index 92296030e1..52526e0e10 100644
--- a/src/slic3r/GUI/GLModel.cpp
+++ b/src/slic3r/GUI/GLModel.cpp
@@ -11,8 +11,29 @@
 #include "libslic3r/BuildVolume.hpp"
 #include "libslic3r/Geometry/ConvexHull.hpp"
 
+#include <Eigen/Core>
+#include <algorithm>
+#include <Eigen/Geometry>
 #include <boost/filesystem/operations.hpp>
 #include <boost/algorithm/string/predicate.hpp>
+#include <vector>
+#include "libslic3r/Point.hpp"
+#include <cstddef>
+#include <cassert>
+#include <cfloat>
+#include <utility>
+#include "libslic3r/AppConfig.hpp"
+#include <cstdint>
+#include <string>
+#include <exception>
+#include "slic3r/GUI/OpenGLManager.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include <limits>
+#include "libslic3r/Geometry/Circle.hpp"
+#include <cmath>
+#include <math.h>
+#include <cstdlib>
+#include "libslic3r/Geometry.hpp"
 
 #if defined(L)
 #undef L
diff --git a/src/slic3r/GUI/GLModel.hpp b/src/slic3r/GUI/GLModel.hpp
index d007b31371..343d64df83 100644
--- a/src/slic3r/GUI/GLModel.hpp
+++ b/src/slic3r/GUI/GLModel.hpp
@@ -4,6 +4,8 @@
 #include "libslic3r/Point.hpp"
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/Color.hpp"
+#include <cstddef>
+#include <utility>
 #include <vector>
 #include <string>
 
diff --git a/src/slic3r/GUI/GLSelectionRectangle.cpp b/src/slic3r/GUI/GLSelectionRectangle.cpp
index 966749ac85..0f7ac82862 100644
--- a/src/slic3r/GUI/GLSelectionRectangle.cpp
+++ b/src/slic3r/GUI/GLSelectionRectangle.cpp
@@ -5,9 +5,17 @@
 #include "GLCanvas3D.hpp"
 #include "GUI_App.hpp"
 #include "Plater.hpp"
+#include <array>
 #include <igl/project.h>
 
 #include <glad/gl.h>
+#include "libslic3r/Point.hpp"
+#include <vector>
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/libslic3r.h"
+#include "slic3r/GUI/OpenGLManager.hpp"
+#include <utility>
+#include "libslic3r/Color.hpp"
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/GLSelectionRectangle.hpp b/src/slic3r/GUI/GLSelectionRectangle.hpp
index f588b4fddd..5578f70e59 100644
--- a/src/slic3r/GUI/GLSelectionRectangle.hpp
+++ b/src/slic3r/GUI/GLSelectionRectangle.hpp
@@ -3,6 +3,9 @@
 
 #include "libslic3r/Point.hpp"
 #include "GLModel.hpp"
+#include <vector>
+#include <cstdlib>
+#include <algorithm>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/GLShader.cpp b/src/slic3r/GUI/GLShader.cpp
index 96a8c7c095..7d091e74f3 100644
--- a/src/slic3r/GUI/GLShader.cpp
+++ b/src/slic3r/GUI/GLShader.cpp
@@ -6,11 +6,21 @@
 #include "libslic3r/format.hpp"
 #include "libslic3r/Color.hpp"
 
+#include <array>
+#include <algorithm>
 #include <boost/nowide/fstream.hpp>
+#include <cstring>
+#include <cstddef>
 #include <glad/gl.h>
 #include <cassert>
 
 #include <boost/log/trivial.hpp>
+#include <string>
+#include <initializer_list>
+#include <string_view>
+#include <utility>
+#include <vector>
+#include "libslic3r/Point.hpp"
 
 namespace Slic3r {
 
diff --git a/src/slic3r/GUI/GLShader.hpp b/src/slic3r/GUI/GLShader.hpp
index 935daaaeaa..52bec0389f 100644
--- a/src/slic3r/GUI/GLShader.hpp
+++ b/src/slic3r/GUI/GLShader.hpp
@@ -2,8 +2,12 @@
 #define slic3r_GLShader_hpp_
 
 #include <array>
+#include <cstddef>
+#include <initializer_list>
 #include <string>
 #include <string_view>
+#include <vector>
+#include <utility>
 
 #include "libslic3r/Point.hpp"
 
diff --git a/src/slic3r/GUI/GLShadersManager.cpp b/src/slic3r/GUI/GLShadersManager.cpp
index be0c57c658..003f994a21 100644
--- a/src/slic3r/GUI/GLShadersManager.cpp
+++ b/src/slic3r/GUI/GLShadersManager.cpp
@@ -6,7 +6,13 @@
 
 #include <cassert>
 #include <algorithm>
+#include <string>
+#include <initializer_list>
+#include <memory>
+#include "slic3r/GUI/OpenGLManager.hpp"
+#include "libslic3r/Technologies.hpp"
 #include <string_view>
+#include <utility>
 using namespace std::literals;
 
 #include <glad/gl.h>
diff --git a/src/slic3r/GUI/GLShadersManager.hpp b/src/slic3r/GUI/GLShadersManager.hpp
index b2bbc140bd..bcf10aea5e 100644
--- a/src/slic3r/GUI/GLShadersManager.hpp
+++ b/src/slic3r/GUI/GLShadersManager.hpp
@@ -3,6 +3,7 @@
 
 #include "GLShader.hpp"
 
+#include <utility>
 #include <vector>
 #include <string>
 #include <memory>
diff --git a/src/slic3r/GUI/GLTexture.cpp b/src/slic3r/GUI/GLTexture.cpp
index 1e8f253ea9..4cdb17dd28 100644
--- a/src/slic3r/GUI/GLTexture.cpp
+++ b/src/slic3r/GUI/GLTexture.cpp
@@ -12,8 +12,22 @@
 #include "GUI.hpp"
 #include "GLModel.hpp"
 
+#include <cassert>
+#include <atomic>
+#include <boost/filesystem/operations.hpp>
+#include <cstddef>
+#include <cstring>
+#include <cstdint>
+#include <array>
 #include <glad/gl.h>
 
+#include <utility>
+#include <wx/app.h>
+#include <string>
+#include <wx/colour.h>
+#include <wx/gdicmn.h>
+#include <wx/dcclient.h>
+#include "libslic3r/Point.hpp"
 #include <wx/image.h>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string/predicate.hpp>
@@ -21,6 +35,9 @@
 #include <vector>
 #include <algorithm>
 #include <thread>
+#include <wx/string.h>
+#include <wx/types.h>
+#include <wx/intl.h>
 #include "FileHelp.hpp"
 #define STB_DXT_IMPLEMENTATION
 #include "stb_dxt/stb_dxt.h"
diff --git a/src/slic3r/GUI/GLTexture.hpp b/src/slic3r/GUI/GLTexture.hpp
index cf6f0f1d71..9ec20dcde6 100644
--- a/src/slic3r/GUI/GLTexture.hpp
+++ b/src/slic3r/GUI/GLTexture.hpp
@@ -3,12 +3,14 @@
 
 #include <atomic>
 #include <string>
+#include <utility>
 #include <vector>
 #include <array>
 #include <thread>
 
 #include <wx/colour.h>
 #include <wx/font.h>
+#include <wx/gdicmn.h>
 
 class wxImage;
 
diff --git a/src/slic3r/GUI/GLToolbar.cpp b/src/slic3r/GUI/GLToolbar.cpp
index e36385c946..91afb33370 100644
--- a/src/slic3r/GUI/GLToolbar.cpp
+++ b/src/slic3r/GUI/GLToolbar.cpp
@@ -8,8 +8,15 @@
 #include "slic3r/GUI/Camera.hpp"
 #include "slic3r/GUI/Plater.hpp"
 
+#include <boost/container_hash/hash.hpp>
 #include <boost/functional/hash.hpp>
 
+#include "slic3r/GUI/Event.hpp"
+#include "libslic3r/Utils.hpp"
+#include <cassert>
+#include <cstddef>
+#include <vector>
+#include <utility>
 #include <wx/event.h>
 #include <wx/bitmap.h>
 #include <wx/dcmemory.h>
diff --git a/src/slic3r/GUI/GLToolbar.hpp b/src/slic3r/GUI/GLToolbar.hpp
index 638ac937d4..192af7e50d 100644
--- a/src/slic3r/GUI/GLToolbar.hpp
+++ b/src/slic3r/GUI/GLToolbar.hpp
@@ -1,9 +1,11 @@
 #ifndef slic3r_GLToolbar_hpp_
 #define slic3r_GLToolbar_hpp_
 
+#include <cstddef>
 #include <functional>
 #include <string>
 #include <vector>
+#include <wx/event.h>
 
 #include "GLTexture.hpp"
 #include "Event.hpp"
diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp
index d7bd96f178..ac66e1b988 100644
--- a/src/slic3r/GUI/GUI.cpp
+++ b/src/slic3r/GUI/GUI.cpp
@@ -5,6 +5,26 @@
 #include "I18N.hpp"
 
 #include "libslic3r/LocalesUtils.hpp"
+#include "libslic3r/Config.hpp"
+#include <memory>
+#include <vector>
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/classification.hpp>
+#include "libslic3r/Point.hpp"
+#include <exception>
+#include <wx/log.h>
+#include <cassert>
+#include "libslic3r/libslic3r.h"
+#include <algorithm>
+#include "libslic3r/Preset.hpp"
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <wx/event.h>
+#include <boost/algorithm/string/constants.hpp>
+#include <cstddef>
+#include <wx/utils.h>
+#include <utility>
+#include <boost/filesystem/operations.hpp>
+#include <wx/string.h>
 #ifdef __APPLE__
 #include "slic3r/Utils/MacDarkMode.hpp"
 #endif
diff --git a/src/slic3r/GUI/GUI.hpp b/src/slic3r/GUI/GUI.hpp
index a5bbb35f6f..afaae47f40 100644
--- a/src/slic3r/GUI/GUI.hpp
+++ b/src/slic3r/GUI/GUI.hpp
@@ -1,6 +1,7 @@
 #ifndef slic3r_GUI_hpp_
 #define slic3r_GUI_hpp_
 
+#include <string>
 namespace boost { class any; }
 namespace boost::filesystem { class path; }
 
diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index 6c824c1392..7eaa0aad85 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -1,4 +1,7 @@
+#include "CloudProvider.hpp"
 #include "ExportPresetBundleDialog.hpp"
+#include "ICloudServiceAgent.hpp"
+#include "IPrinterAgent.hpp"
 #include "OrcaCloudServiceAgent.hpp"
 #include "libslic3r/Technologies.hpp"
 #include "libslic3r/Platform.hpp"
@@ -21,12 +24,96 @@
 #include "libslic3r_version.h"
 #include "BuildCommit.hpp"
 #include "Downloader.hpp"
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/replace.hpp>
+#include <boost/algorithm/string/case_conv.hpp>
+#include <boost/assert/source_location.hpp>
+#include <boost/algorithm/string/trim.hpp>
+#include <atomic>
+#include <boost/asio/ip/basic_endpoint.hpp>
 #include <boost/chrono/duration.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/directory.hpp>
+#include <boost/format/exceptions.hpp>
+#include <boost/filesystem/file_status.hpp>
+#include <boost/filesystem/fstream.hpp>
+#include <boost/filesystem/exception.hpp>
 #include <boost/locale/encoding_utf.hpp>
 #include <boost/log/detail/native_typeof.hpp>
+#include <iomanip>
+#include <iostream>
+#include <cassert>
+#include <filesystem>
+#include <ctime>
+#include "libslic3r/AppConfig.hpp"
+#include <ios>
+#include <chrono>
+#include <functional>
+#include <boost/optional/optional.hpp>
+#include <fstream>
+#include <boost/none.hpp>
+#include <cstring>
+#include <cmath>
+#include <climits>
+#include <cctype>
+#include <cstdio>
 #include <libslic3r/Config.hpp>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <ostream>
+#include <new>
+#include "libslic3r/Exception.hpp"
+#include "slic3r/GUI/MsgDialog.hpp"
+#include <memory>
+#include "slic3r/GUI/Jobs/UpgradeNetworkJob.hpp"
+#include "slic3r/GUI/Jobs/SendJob.hpp"
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
+#include <miniz.h>
+#include "slic3r/GUI/Monitor.hpp"
+#include "slic3r/GUI/OpenGLManager.hpp"
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <optional>
+#include "slic3r/GUI/UserNotification.hpp"
+#include <map>
+#include "libslic3r/Preset.hpp"
+#include <set>
+#include "libslic3r/libslic3r.h"
+#include "slic3r/GUI/PrinterWebView.hpp"
+#include "libslic3r/PrintConfig.hpp"
 #include <slic3r/plugin/PythonPluginInterface.hpp>
+#include <string>
+#include <vector>
+#include <sstream>
+#include <wx/dcclient.h>
+#include <wx/chartype.h>
+#include <utility>
+#include <wx/app.h>
+#include <wx/busycursor.h>
+#include <wx/debug.h>
+#include <wx/anybutton.h>
+#include <wx/clntdata.h>
+#include <unordered_set>
+#include <stdio.h>
+#include <wx/arrstr.h>
 #include <wx/event.h>
+#include <wx/strconv.h>
+#include <wx/gdicmn.h>
+#include <wx/string.h>
+#include <wx/frame.h>
+#include <wx/filename.h>
+#include <wx/translation.h>
+#include <wx/msgdlg.h>
+#include <wx/setup.h>
+#include <wx/timer.h>
+#include <wx/snglinst.h>
+#include <wx/image.h>
+#include <wx/settings.h>
+#include <wx/font.h>
+#include <wx/platinfo.h>
+#include <wx/language.h>
+#include <wx/localedefs.h>
+#include <wx/eventfilter.h>
+#include <wx/toplevel.h>
 
 // Localization headers: include libslic3r version first so everything in this file
 // uses the slic3r/GUI version (the macros will take precedence over the functions).
diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp
index da37c79242..91efa51377 100644
--- a/src/slic3r/GUI/GUI_App.hpp
+++ b/src/slic3r/GUI/GUI_App.hpp
@@ -1,9 +1,22 @@
 #ifndef slic3r_GUI_App_hpp_
 #define slic3r_GUI_App_hpp_
 
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/classification.hpp>
+#include <atomic>
+#include <boost/optional/optional.hpp>
 #include <chrono>
+#include <cstdint>
+#include <cstddef>
 #include <functional>
+#include <map>
+#include "libslic3r/Config.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Technologies.hpp"
+#include "libslic3r/Semver.hpp"
 #include <memory>
+#include <set>
+#include "slic3r/GUI/GLShader.hpp"
 #include <string>
 #include "ActionRegistry.hpp"
 #include "ImGuiWrapper.hpp"
@@ -11,15 +24,23 @@
 #include "OpenGLManager.hpp"
 #include "libslic3r/Preset.hpp"
 #include "libslic3r/PresetBundle.hpp"
+#include "libslic3r_version.h"
 #include "slic3r/GUI/UserNotification.hpp"
 #include "slic3r/Utils/CloudProvider.hpp"
 #include "slic3r/GUI/Jobs/UpgradeNetworkJob.hpp"
 #include "slic3r/GUI/HttpServer.hpp"
 #include "../Utils/PrintHost.hpp"
 
+#include <vector>
+#include <utility>
 #include <wx/app.h>
 #include <wx/colour.h>
+#include <wx/event.h>
 #include <wx/font.h>
+#include <wx/strconv.h>
+#include <wx/setup.h>
+#include <wx/intl.h>
+#include <wx/gdicmn.h>
 #include <wx/string.h>
 #include <wx/snglinst.h>
 #include <wx/msgdlg.h>
diff --git a/src/slic3r/GUI/GUI_AuxiliaryList.cpp b/src/slic3r/GUI/GUI_AuxiliaryList.cpp
index be9f99a76a..bfc3ecf044 100644
--- a/src/slic3r/GUI/GUI_AuxiliaryList.cpp
+++ b/src/slic3r/GUI/GUI_AuxiliaryList.cpp
@@ -1,9 +1,24 @@
+#include "slic3r/GUI/AuxiliaryDataViewModel.hpp"
+#include <string>
+#include "libslic3r/Utils.hpp"
+#include <wx/arrstr.h>
 #include <wx/button.h>
 #include "GUI_AuxiliaryList.hpp"
 #include "I18N.hpp"
 #include "wxExtensions.hpp"
 
 #include <boost/filesystem.hpp>
+#include <wx/gdicmn.h>
+#include <wx/dvrenderers.h>
+#include <wx/dataview.h>
+#include <wx/sizer.h>
+#include <wx/panel.h>
+#include <wx/event.h>
+#include <wx/utils.h>
+#include <wx/string.h>
+#include <wx/filedlg.h>
+#include <wx/dataobj.h>
+#include <wx/dnd.h>
 
 #include "GUI_App.hpp"
 #include "Plater.hpp"
diff --git a/src/slic3r/GUI/GUI_Factories.cpp b/src/slic3r/GUI/GUI_Factories.cpp
index 8bc899bb3d..7913a33e7c 100644
--- a/src/slic3r/GUI/GUI_Factories.cpp
+++ b/src/slic3r/GUI/GUI_Factories.cpp
@@ -20,7 +20,32 @@
 #include "Gizmos/GLGizmoEmboss.hpp"
 #include "Gizmos/GLGizmoSVG.hpp"
 
+#include <algorithm>
+#include <array>
 #include <boost/algorithm/string.hpp>
+#include <string>
+#include <map>
+#include <vector>
+#include "libslic3r/PrintConfig.hpp"
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <utility>
+#include <wx/dataview.h>
+#include <wx/string.h>
+#include <wx/event.h>
+#include <cstddef>
+#include <boost/filesystem/path.hpp>
+#include "libslic3r/Utils.hpp"
+#include "libslic3r/Format/bbs_3mf.hpp"
+#include "slic3r/GUI/Jobs/Job.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmosManager.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "slic3r/GUI/GUI.hpp"
+#include "slic3r/GUI/Event.hpp"
+#include <cassert>
+#include "libslic3r/Point.hpp"
+#include <cstdlib>
+#include <boost/log/trivial.hpp>
 #include "slic3r/GUI/Tab.hpp"
 #include "ParamsPanel.hpp"
 #include "MsgDialog.hpp"
diff --git a/src/slic3r/GUI/GUI_Factories.hpp b/src/slic3r/GUI/GUI_Factories.hpp
index ad694f15de..4202cce5bc 100644
--- a/src/slic3r/GUI/GUI_Factories.hpp
+++ b/src/slic3r/GUI/GUI_Factories.hpp
@@ -2,6 +2,7 @@
 #define slic3r_GUI_Factories_hpp_
 
 #include <map>
+#include <string>
 #include <vector>
 #include <array>
 #include <cstddef>
diff --git a/src/slic3r/GUI/GUI_Init.cpp b/src/slic3r/GUI/GUI_Init.cpp
index 93fbd5204c..0eb2110b19 100644
--- a/src/slic3r/GUI/GUI_Init.cpp
+++ b/src/slic3r/GUI/GUI_Init.cpp
@@ -11,10 +11,19 @@
 #include "slic3r/GUI/Plater.hpp"
 
 // To show a message box if GUI initialization ends up with an exception thrown.
+#include <vector>
+#include <utility>
+#include <wx/init.h>
+#include "libslic3r/Exception.hpp"
+#include <boost/log/trivial.hpp>
+#include <ostream>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <exception>
 #include <wx/msgdlg.h>
 
 #include <boost/nowide/iostream.hpp>
 #include <boost/nowide/convert.hpp>
+#include <wx/string.h>
 
 #if __APPLE__
     #include <signal.h>
diff --git a/src/slic3r/GUI/GUI_Init.hpp b/src/slic3r/GUI/GUI_Init.hpp
index 0d987fa014..44d8964977 100644
--- a/src/slic3r/GUI/GUI_Init.hpp
+++ b/src/slic3r/GUI/GUI_Init.hpp
@@ -3,6 +3,9 @@
 
 #include <libslic3r/Preset.hpp>
 #include <libslic3r/PrintConfig.hpp>
+#include <vector>
+#include <utility>
+#include <string>
 
 namespace Slic3r {
 
diff --git a/src/slic3r/GUI/GUI_ObjectLayers.cpp b/src/slic3r/GUI/GUI_ObjectLayers.cpp
index 93bdeec9ee..1bf8d9106f 100644
--- a/src/slic3r/GUI/GUI_ObjectLayers.cpp
+++ b/src/slic3r/GUI/GUI_ObjectLayers.cpp
@@ -14,6 +14,23 @@
 
 #include "I18N.hpp"
 
+#include "slic3r/GUI/GUI_ObjectSettings.hpp"
+#include <wx/sizer.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/stattext.h>
+#include "slic3r/GUI/Field.hpp"
+#include <cmath>
+#include "libslic3r/libslic3r.h"
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "slic3r/GUI/ObjectDataViewModel.hpp"
+#include <cstddef>
+#include <functional>
+#include <wx/types.h>
+#include <wx/textctrl.h>
+#include <wx/utils.h>
+#include "libslic3r/LocalesUtils.hpp"
+#include "slic3r/GUI/GUI.hpp"
 #include <wx/wupdlock.h>
 
 namespace Slic3r
diff --git a/src/slic3r/GUI/GUI_ObjectLayers.hpp b/src/slic3r/GUI/GUI_ObjectLayers.hpp
index ab547d80dc..d161ef1e2b 100644
--- a/src/slic3r/GUI/GUI_ObjectLayers.hpp
+++ b/src/slic3r/GUI/GUI_ObjectLayers.hpp
@@ -3,6 +3,11 @@
 
 #include "GUI_ObjectSettings.hpp"
 #include "wxExtensions.hpp"
+#include <utility>
+#include <wx/string.h>
+#include <functional>
+#include <wx/sizer.h>
+#include <wx/event.h>
 
 #ifdef __WXOSX__
 #include "libslic3r/PrintConfig.hpp"
diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp
index 99c023e4a1..e2226b3d3e 100644
--- a/src/slic3r/GUI/GUI_ObjectList.cpp
+++ b/src/slic3r/GUI/GUI_ObjectList.cpp
@@ -28,16 +28,67 @@
 #include "StepMeshDialog.hpp"
 
 
+#include "slic3r/GUI/Event.hpp"
+#include "libslic3r/Config.hpp"
+#include <string>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/ObjectDataViewModel.hpp"
+#include <cstddef>
+#include "slic3r/GUI/ExtraRenderers.hpp"
+#include <cassert>
+#include <algorithm>
+#include "libslic3r/TriangleMesh.hpp"
+#include "slic3r/GUI/GUI.hpp"
+#include <memory>
+#include <iterator>
+#include "slic3r/GUI/GLToolbar.hpp"
+#include <optional>
+#include <cstdlib>
+#include <utility>
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/Geometry.hpp"
+#include "libslic3r/Point.hpp"
+#include <boost/algorithm/string/predicate.hpp>
+#include "libslic3r/LocalesUtils.hpp"
+#include "libslic3r/Format/STEP.hpp"
+#include <exception>
+#include "slic3r/GUI/ParamsPanel.hpp"
+#include "slic3r/GUI/GUI_ObjectLayers.hpp"
+#include <map>
+#include <set>
+#include "libslic3r/BrimEarsPoint.hpp"
+#include "libslic3r/ObjectID.hpp"
+#include "slic3r/GUI/GUI_ObjectSettings.hpp"
+#include <cmath>
+#include "slic3r/GUI/GUI_Utils.hpp"
 #include <vector>
 #include <unordered_map>
 #include <functional>
 #include <boost/algorithm/string.hpp>
 #include <boost/log/trivial.hpp>
+#include <wx/dc.h>
+#include <wx/gdicmn.h>
+#include <wx/colour.h>
+#include <wx/dataview.h>
+#include <wx/event.h>
+#include <wx/dvrenderers.h>
+#include <wx/chartype.h>
+#include <wx/dataobj.h>
+#include <wx/dnd.h>
+#include <wx/busycursor.h>
+#include <wx/msgdlg.h>
+#include <wx/accel.h>
+#include <wx/app.h>
 #include <wx/progdlg.h>
 #include <wx/listbook.h>
 #include <wx/numformatter.h>
+#include <wx/string.h>
+#include <wx/setup.h>
+#include <wx/settings.h>
 #include <wx/utils.h>
 #include <wx/headerctrl.h>
+#include <wx/window.h>
 
 #include "slic3r/Utils/FixModelByCgal.hpp"
 #include "libslic3r/Format/bbs_3mf.hpp"
diff --git a/src/slic3r/GUI/GUI_ObjectList.hpp b/src/slic3r/GUI/GUI_ObjectList.hpp
index 2700dbc5d8..4aff69534e 100644
--- a/src/slic3r/GUI/GUI_ObjectList.hpp
+++ b/src/slic3r/GUI/GUI_ObjectList.hpp
@@ -1,13 +1,23 @@
 #ifndef slic3r_GUI_ObjectList_hpp_
 #define slic3r_GUI_ObjectList_hpp_
 
+#include <cstdint>
+#include <cstddef>
+#include <functional>
 #include <map>
+#include <string>
+#include <utility>
 #include <vector>
 #include <set>
 
+#include <wx/arrstr.h>
 #include <wx/bitmap.h>
 #include <wx/dataview.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
 #include <wx/menu.h>
+#include <wx/string.h>
+#include <wx/window.h>
 
 #include "Event.hpp"
 #include "wxExtensions.hpp"
diff --git a/src/slic3r/GUI/GUI_ObjectSettings.cpp b/src/slic3r/GUI/GUI_ObjectSettings.cpp
index 25e6204a40..efe7f71899 100644
--- a/src/slic3r/GUI/GUI_ObjectSettings.cpp
+++ b/src/slic3r/GUI/GUI_ObjectSettings.cpp
@@ -16,6 +16,15 @@
 #include "I18N.hpp"
 #include "ConfigManipulation.hpp"
 
+#include <memory>
+#include <cstddef>
+#include <wx/dataview.h>
+#include <map>
+#include "slic3r/GUI/ObjectDataViewModel.hpp"
+#include <cassert>
+#include "slic3r/GUI/GUI_ObjectLayers.hpp"
+#include "libslic3r/Config.hpp"
+#include <string>
 #include <wx/wupdlock.h>
 
 namespace Slic3r
diff --git a/src/slic3r/GUI/GUI_ObjectSettings.hpp b/src/slic3r/GUI/GUI_ObjectSettings.hpp
index 21146425cc..485f014684 100644
--- a/src/slic3r/GUI/GUI_ObjectSettings.hpp
+++ b/src/slic3r/GUI/GUI_ObjectSettings.hpp
@@ -2,8 +2,10 @@
 #define slic3r_GUI_ObjectSettings_hpp_
 
 #include <memory>
+#include <string>
 #include <vector>
 #include <wx/panel.h>
+#include <wx/sizer.h>
 #include "wxExtensions.hpp"
 
 #define NEW_OBJECT_SETTING 1
diff --git a/src/slic3r/GUI/GUI_ObjectTable.cpp b/src/slic3r/GUI/GUI_ObjectTable.cpp
index a7c761a06f..822b42c696 100644
--- a/src/slic3r/GUI/GUI_ObjectTable.cpp
+++ b/src/slic3r/GUI/GUI_ObjectTable.cpp
@@ -17,6 +17,39 @@
 #include "BitmapCache.hpp"
 #include "GUI_ObjectTable.hpp"
 #include "GUI_ObjectList.hpp"
+#include <wx/gdicmn.h>
+#include <wx/dc.h>
+#include <boost/log/trivial.hpp>
+#include "libslic3r/Config.hpp"
+#include <ostream>
+#include <wx/arrstr.h>
+#include <vector>
+#include <cstddef>
+#include <wx/event.h>
+#include <wx/string.h>
+#include "slic3r/GUI/Widgets/ComboBox.hpp"
+#include "libslic3r/Model.hpp"
+#include <wx/debug.h>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <wx/dataobj.h>
+#include <wx/chartype.h>
+#include <wx/log.h>
+#include <wx/dynarray.h>
+#include "libslic3r/PrintConfig.hpp"
+#include <wx/wxcrt.h>
+#include <string>
+#include "slic3r/GUI/PartPlate.hpp"
+#include <cstdlib>
+#include <list>
+#include <algorithm>
+#include <wx/object.h>
+#include <wx/panel.h>
+#include <wx/valnum.h>
+#include "libslic3r/Color.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/toplevel.h>
+#include <wx/textctrl.h>
 
 //use wxGridWindow to compute position
 //#include "wx/generic/private/grid.h"
diff --git a/src/slic3r/GUI/GUI_ObjectTable.hpp b/src/slic3r/GUI/GUI_ObjectTable.hpp
index 0fbd432e02..724f7d9885 100644
--- a/src/slic3r/GUI/GUI_ObjectTable.hpp
+++ b/src/slic3r/GUI/GUI_ObjectTable.hpp
@@ -1,6 +1,20 @@
 #ifndef slic3r_GUI_ObjectTable_hpp_
 #define slic3r_GUI_ObjectTable_hpp_
 
+#include <wx/event.h>
+#include <cstddef>
+#include <vector>
+#include <wx/arrstr.h>
+#include "libslic3r/Config.hpp"
+#include <wx/dynarray.h>
+#include <wx/dataobj.h>
+#include <string>
+#include <functional>
+#include <list>
+#include <wx/panel.h>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <wx/rtti.h>
+#include "slic3r/GUI/GUI_Utils.hpp"
 #include <wx/wx.h>
 #include <wx/intl.h>
 #include <wx/generic/gridsel.h>
diff --git a/src/slic3r/GUI/GUI_ObjectTableSettings.cpp b/src/slic3r/GUI/GUI_ObjectTableSettings.cpp
index 4cd272840f..fbca655a24 100644
--- a/src/slic3r/GUI/GUI_ObjectTableSettings.cpp
+++ b/src/slic3r/GUI/GUI_ObjectTableSettings.cpp
@@ -15,6 +15,19 @@
 #include "I18N.hpp"
 #include "ConfigManipulation.hpp"
 
+#include <wx/event.h>
+#include <memory>
+#include <cstddef>
+#include <wx/string.h>
+#include "libslic3r/Config.hpp"
+#include <map>
+#include <vector>
+#include <boost/log/trivial.hpp>
+#include <ostream>
+#include "slic3r/GUI/Field.hpp"
+#include "slic3r/GUI/GUI.hpp"
+#include <boost/any.hpp>
+#include <wx/sizer.h>
 #include <wx/wupdlock.h>
 
 namespace Slic3r
diff --git a/src/slic3r/GUI/GUI_Preview.cpp b/src/slic3r/GUI/GUI_Preview.cpp
index 2c44202876..7ea2bba557 100644
--- a/src/slic3r/GUI/GUI_Preview.cpp
+++ b/src/slic3r/GUI/GUI_Preview.cpp
@@ -5,6 +5,23 @@
 #include "GUI_Preview.hpp"
 #include "GUI_App.hpp"
 #include "GUI.hpp"
+#include <wx/slider.h>
+#include <wx/gdicmn.h>
+#include <string>
+#include <vector>
+#include "libslic3r/GCode/GCodeProcessor.hpp"
+#include <functional>
+#include "libslic3r/Config.hpp"
+#include <boost/log/trivial.hpp>
+#include "libslic3r/CustomGCode.hpp"
+#include <wx/event.h>
+#include <algorithm>
+#include <cstdlib>
+#include <cassert>
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include <cmath>
+#include "libvgcode/include/Types.hpp"
 #if ENABLE_OPENGL_AUTO_AA_SAMPLES
 #include "GUI_Init.hpp"
 #endif // ENABLE_OPENGL_AUTO_AA_SAMPLES
diff --git a/src/slic3r/GUI/GUI_Preview.hpp b/src/slic3r/GUI/GUI_Preview.hpp
index fdfe364fb8..3080b7a89a 100644
--- a/src/slic3r/GUI/GUI_Preview.hpp
+++ b/src/slic3r/GUI/GUI_Preview.hpp
@@ -1,6 +1,10 @@
 #ifndef slic3r_GUI_Preview_hpp_
 #define slic3r_GUI_Preview_hpp_
 
+#include <vector>
+#include "libslic3r/libslic3r.h"
+#include <functional>
+#include <wx/event.h>
 #include <wx/panel.h>
 
 #include "libslic3r/Point.hpp"
@@ -12,6 +16,7 @@
 #include <string>
 #include "libslic3r/GCode/GCodeProcessor.hpp"
 #include <slic3r/GUI/GCodeViewer.hpp>
+#include <wx/window.h>
 
 class wxGLCanvas;
 class wxBoxSizer;
diff --git a/src/slic3r/GUI/GUI_Utils.cpp b/src/slic3r/GUI/GUI_Utils.cpp
index 5c55e341c9..f8ec0d3c90 100644
--- a/src/slic3r/GUI/GUI_Utils.cpp
+++ b/src/slic3r/GUI/GUI_Utils.cpp
@@ -4,8 +4,29 @@
 #include "I18N.hpp"
 
 #include <algorithm>
+#include <boost/algorithm/string/predicate.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/format.hpp>
+#include "libslic3r/Utils.hpp"
+#include <string>
+#include <functional>
+#include <wx/event.h>
+#include <wx/settings.h>
+#include <wx/panel.h>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <boost/optional/optional.hpp>
+#include <vector>
+#include <boost/none.hpp>
+#include <cstddef>
+#include <boost/lexical_cast/bad_lexical_cast.hpp>
+#include <ostream>
+#include <chrono>
+#include <cstdio>
+#include <wx/image.h>
+#include <cstring>
+#include <deque>
+#include <fstream>
 
 #ifdef _WIN32
     #include <Windows.h>
diff --git a/src/slic3r/GUI/GUI_Utils.hpp b/src/slic3r/GUI/GUI_Utils.hpp
index dae0305f1d..f77e6b6bc0 100644
--- a/src/slic3r/GUI/GUI_Utils.hpp
+++ b/src/slic3r/GUI/GUI_Utils.hpp
@@ -1,6 +1,10 @@
 #ifndef slic3r_GUI_Utils_hpp_
 #define slic3r_GUI_Utils_hpp_
 
+#include <deque>
+#include <cstddef>
+#include <cmath>
+#include <boost/optional/optional.hpp>
 #include <memory>
 #include <string>
 #include <ostream>
@@ -9,11 +13,14 @@
 #include <boost/optional.hpp>
 #include <boost/log/trivial.hpp>
 
+#include <type_traits>
+#include <utility>
 #include <wx/frame.h>
 #include <wx/dialog.h>
 #include <wx/event.h>
 #include <wx/filedlg.h>
 #include <wx/gdicmn.h>
+#include <wx/image.h>
 #include <wx/panel.h>
 #include <wx/dcclient.h>
 #include <wx/debug.h>
@@ -23,6 +30,9 @@
 #include <wx/inspector/inspector.h>
 
 #include <chrono>
+#include <wx/version.h>
+#include <wx/toplevel.h>
+#include <wx/string.h>
 #include "Event.hpp"
 #include "libslic3r/Utils.hpp"
 #include "libslic3r/Color.hpp"
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp b/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp
index 9560078cb2..ae45707682 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp
@@ -10,14 +10,23 @@
 #include "libslic3r/PresetBundle.hpp"
 #include "libslic3r/MeasureUtils.hpp"
 
+#include <cstdlib>
+#include <imgui.h>
+#include <algorithm>
 #include <imgui/imgui_internal.h>
 
+#include "libslic3r/Measure.hpp"
 #include <numeric>
 
 #include <glad/gl.h>
 
+#include <string>
+#include "slic3r/GUI/Gizmos/GLGizmoMeasure.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <optional>
 #include <tbb/parallel_for.h>
 #include <future>
+#include <vector>
 #include <wx/clipbrd.h>
 
 namespace Slic3r {
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoAssembly.hpp b/src/slic3r/GUI/Gizmos/GLGizmoAssembly.hpp
index 4804af9c4a..f35ad90aa2 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoAssembly.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoAssembly.hpp
@@ -2,6 +2,8 @@
 #define slic3r_GLGizmoAssembly_hpp_
 
 #include "GLGizmoMeasure.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <string>
 
 namespace Slic3r {
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
index 6ff2c8213d..90b175ddfd 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
@@ -1,7 +1,29 @@
 #include "GLGizmoBase.hpp"
 #include "slic3r/GUI/GLCanvas3D.hpp"
 
+#include <array>
+#include <algorithm>
+#include <cstddef>
+#include <cassert>
+#include <cstdlib>
 #include <glad/gl.h>
+#include "libslic3r/Color.hpp"
+#include "slic3r/GUI/MeshUtils.hpp"
+#include "libslic3r/TriangleMesh.hpp"
+#include "libslic3r/Point.hpp"
+#include <memory>
+#include <utility>
+#include "slic3r/GUI/SceneRaycaster.hpp"
+#include "slic3r/GUI/GLShader.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Geometry.hpp"
+#include <string>
+#include <vector>
+#include <imgui.h>
+#include "slic3r/GUI/OpenGLManager.hpp"
+#include "slic3r/GUI/3DScene.hpp"
+#include "slic3r/GUI/Event.hpp"
+#include "libslic3r/Utils.hpp"
 
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/Shortcuts.hpp"
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
index 47e8f832a6..c19b5e4c05 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
@@ -10,9 +10,16 @@
 #include "slic3r/GUI/SceneRaycaster.hpp"
 #include "slic3r/GUI/3DScene.hpp"
 
+#include <array>
+#include <cassert>
 #include <cereal/archives/binary.hpp>
+#include <cstdint>
+#include <memory>
+#include <cstddef>
 #include <optional>
 
+#include <string>
+#include <vector>
 #include <wx/event.h>
 
 #define ENABLE_FIXED_GRABBER 1
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp b/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp
index 750e5fe6cb..7f52b2cc0c 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp
@@ -1,5 +1,40 @@
 #include "GLGizmoBrimEars.hpp"
+#include <cstddef>
+#include <Eigen/Geometry>
+#include <algorithm>
+#include <cereal/archives/binary.hpp>
+#include <cmath>
+#include <cstdint>
 #include <glad/gl.h>
+#include "libslic3r/Color.hpp"
+#include "slic3r/GUI/Selection.hpp"
+#include "slic3r/GUI/3DScene.hpp"
+#include "libslic3r/CutUtils.hpp"
+#include <string>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "slic3r/GUI/GLModel.hpp"
+#include <memory>
+#include "slic3r/GUI/MeshUtils.hpp"
+#include "libslic3r/TriangleMesh.hpp"
+#include <utility>
+#include "slic3r/GUI/Event.hpp"
+#include "libslic3r/Utils.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/BrimEarsPoint.hpp"
+#include "libslic3r/Geometry.hpp"
+#include <limits>
+#include <vector>
+#include <imgui.h>
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "slic3r/GUI/GUI_ObjectLayers.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/MultiPoint.hpp"
+#include "libslic3r/TriangleMeshSlicer.hpp"
+#include "libslic3r/Model.hpp"
+#include "slic3r/GUI/SceneRaycaster.hpp"
+#include <map>
 #include "slic3r/GUI/GLCanvas3D.hpp"
 #include "slic3r/GUI/GUI.hpp"
 #include "slic3r/GUI/Camera.hpp"
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.hpp b/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.hpp
index 075fb37b21..35177bfac6 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.hpp
@@ -6,6 +6,22 @@
 #include "slic3r/GUI/I18N.hpp"
 #include "libslic3r/BrimEarsPoint.hpp"
 #include "libslic3r/ObjectID.hpp"
+#include "slic3r/GUI/SceneRaycaster.hpp"
+#include "libslic3r/Point.hpp"
+#include <utility>
+#include <string>
+#include <wx/event.h>
+#include <vector>
+#include <map>
+#include "slic3r/GUI/3DScene.hpp"
+#include <memory>
+#include <optional>
+#include "slic3r/GUI/MeshUtils.hpp"
+#include <wx/string.h>
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/Polygon.hpp"
+#include <cereal/archives/binary.hpp>
+#include "libslic3r/Geometry.hpp"
 
 
 namespace Slic3r {
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
index 2100b1fca7..ebd0821ded 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
@@ -1,9 +1,54 @@
 #include "GLGizmoCut.hpp"
 #include "slic3r/GUI/GLCanvas3D.hpp"
 
+#include <cmath>
+#include <cstddef>
+#include <Standard_Real.hxx>
+#include <cereal/archives/binary.hpp>
+#include <cassert>
+#include <cstdlib>
+#include <functional>
+#include <Eigen/Geometry>
+#include <boost/log/trivial.hpp>
 #include <glad/gl.h>
 
 #include <algorithm>
+#include "libslic3r/Color.hpp"
+#include "libslic3r/libslic3r.h"
+#include <string>
+#include "slic3r/GUI/GLModel.hpp"
+#include "libslic3r/Point.hpp"
+#include <utility>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "libslic3r/Model.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/Geometry.hpp"
+#include <wx/intl.h>
+#include <imgui.h>
+#include <vector>
+#include "slic3r/GUI/GUI.hpp"
+#include "slic3r/GUI/SceneRaycaster.hpp"
+#include <memory>
+#include "slic3r/GUI/3DScene.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/Line.hpp"
+#include <wx/utils.h>
+#include "libslic3r/TriangleMesh.hpp"
+#include "slic3r/GUI/MeshUtils.hpp"
+#include "libslic3r/CutUtils.hpp"
+#include "libslic3r/AABBMesh.hpp"
+#include <wx/busycursor.h>
+#include <sstream>
+#include <ios>
+#include <iomanip>
+#include "libslic3r/ObjectID.hpp"
+#include <wx/debug.h>
+#include "libslic3r/Utils.hpp"
+#include "libslic3r/enum_bitmask.hpp"
+#include "slic3r/GUI/Widgets/ProgressDialog.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/progdlg.h>
+#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp"
 
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/Shortcuts.hpp"
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp
index 109e0fe5bc..d2c872d9f3 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp
@@ -9,6 +9,19 @@
 #include "libslic3r/Model.hpp"
 #include "libslic3r/CutUtils.hpp"
 #include "imgui/imgui.h"
+#include "libslic3r/Point.hpp"
+#include "slic3r/GUI/MeshUtils.hpp"
+#include <map>
+#include <vector>
+#include <memory>
+#include "slic3r/GUI/SceneRaycaster.hpp"
+#include <cstddef>
+#include <utility>
+#include <wx/string.h>
+#include <string>
+#include <wx/event.h>
+#include <functional>
+#include "libslic3r/Color.hpp"
 
 namespace Slic3r {
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
index da26353eb6..5bf94c7d77 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
@@ -1,4 +1,5 @@
 #include "GLGizmoEmboss.hpp"
+#include "EmbossStyleManager.hpp"
 #include "slic3r/GUI/GLCanvas3D.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/Shortcuts.hpp"
@@ -29,6 +30,51 @@
 #include "libslic3r/BuildVolume.hpp"
 
 #include "imgui/imgui_stdlib.h" // using std::string for inputs
+#include <string>
+#include "libslic3r/Point.hpp"
+#include <memory>
+#include "slic3r/GUI/TextLines.hpp"
+#include <atomic>
+#include <imgui.h>
+#include "libslic3r/Emboss.hpp"
+#include "libslic3r/TextConfiguration.hpp"
+#include "libslic3r/EmbossShape.hpp"
+#include "slic3r/GUI/IconManager.hpp"
+#include <cstddef>
+#include <vector>
+#include <wx/fontenc.h>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <utility>
+#include <cassert>
+#include <optional>
+#include "libslic3r/libslic3r.h"
+#include "slic3r/GUI/SurfaceDrag.hpp"
+#include <Eigen/Geometry>
+#include "slic3r/GUI/Selection.hpp"
+#include "slic3r/GUI/3DScene.hpp"
+#include "libslic3r/Color.hpp"
+#include <algorithm>
+#include <wx/gdicmn.h>
+#include "libslic3r/Utils.hpp"
+#include <wx/settings.h>
+#include <cmath>
+#include <string_view>
+#include "libslic3r/Config.hpp"
+#include <wx/dataview.h>
+#include <limits>
+#include <wx/intl.h>
+#include <math.h>
+#include <boost/container_hash/hash.hpp>
+#include <cstdint>
+#include <boost/nowide/convert.hpp>
+#include "libslic3r/Polygon.hpp"
+#include <sstream>
+#include <boost/filesystem/path.hpp>
+#include <ios>
+#include <exception>
+#include <boost/filesystem/operations.hpp>
+#include "slic3r/GUI/Jobs/Worker.hpp"
+#include <cfloat>
 #ifndef IMGUI_DEFINE_MATH_OPERATORS
 #define IMGUI_DEFINE_MATH_OPERATORS
 #endif
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp
index 4ad41483ac..0823e613a3 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp
@@ -10,6 +10,8 @@
 #include "slic3r/Utils/RaycastManager.hpp"
 #include "slic3r/Utils/EmbossStyleManager.hpp"
 
+#include <cstddef>
+#include "libslic3r/ObjectID.hpp"
 #include <optional>
 #include <memory>
 #include <atomic>
@@ -20,6 +22,11 @@
 
 #include <imgui/imgui.h>
 #include <glad/gl.h>
+#include <string>
+#include <wx/event.h>
+#include <wx/string.h>
+#include <vector>
+#include <utility>
 
 class wxFont;
 namespace Slic3r{
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
index 06d69c3e82..6a6288a71c 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
@@ -17,9 +17,34 @@
 #include "slic3r/Utils/UndoRedo.hpp"
 #include "GLGizmoUtils.hpp"
 
+#include <boost/chrono/duration.hpp>
+#include <cstddef>
+#include <algorithm>
+#include <array>
+#include <cmath>
 #include <glad/gl.h>
 
 #include <boost/log/trivial.hpp>
+#include <string>
+#include "slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp"
+#include <utility>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "libslic3r/Format/bbs_3mf.hpp"
+#include <imgui.h>
+#include <vector>
+#include "libslic3r/PrintConfig.hpp"
+#include <math.h>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/TriangleMesh.hpp"
+#include "libslic3r/TriangleSelector.hpp"
+#include "slic3r/GUI/Event.hpp"
+#include <wx/busycursor.h>
+#include <memory>
+#include <mutex>
+#include "slic3r/GUI/GLModel.hpp"
+#include "libslic3r/ExtrusionEntity.hpp"
+#include "slic3r/GUI/3DScene.hpp"
+#include <wx/event.h>
 
 namespace Slic3r::GUI {
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.hpp b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.hpp
index d282a06b65..9c5b18e927 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.hpp
@@ -9,6 +9,14 @@
 #include "slic3r/GUI/I18N.hpp"
 
 #include <boost/thread.hpp>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <string>
+#include <wx/string.h>
+#include <cstddef>
+#include <vector>
+#include <mutex>
+#include <map>
+#include <utility>
 
 namespace Slic3r::GUI {
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp
index 54dbd96ba7..5d9c4b15b7 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp
@@ -8,9 +8,25 @@
 #include "libslic3r/LayOnFace.hpp"
 #include "libslic3r/Model.hpp"
 
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Geometry.hpp"
+#include <cassert>
+#include <algorithm>
+#include <cstddef>
+#include "libslic3r/TriangleMesh.hpp"
+#include <memory>
 #include <numeric>
 
 #include <glad/gl.h>
+#include <string>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "slic3r/GUI/Selection.hpp"
+#include "slic3r/GUI/GLShader.hpp"
+#include "slic3r/GUI/3DScene.hpp"
+#include "slic3r/GUI/SceneRaycaster.hpp"
+#include <vector>
+#include <utility>
+#include "slic3r/GUI/MeshUtils.hpp"
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFlatten.hpp b/src/slic3r/GUI/Gizmos/GLGizmoFlatten.hpp
index 74e2062de4..4f5a29e458 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoFlatten.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoFlatten.hpp
@@ -4,6 +4,12 @@
 #include "GLGizmoBase.hpp"
 #include "slic3r/GUI/GLModel.hpp"
 #include "slic3r/GUI/MeshUtils.hpp"
+#include <vector>
+#include "libslic3r/Point.hpp"
+#include <memory>
+#include "slic3r/GUI/SceneRaycaster.hpp"
+#include <string>
+#include <wx/event.h>
 
 namespace Slic3r {
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp
index 8938e8a264..7f36e85e80 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp
@@ -14,8 +14,24 @@
 #include "slic3r/Utils/UndoRedo.hpp"
 #include "GLGizmoUtils.hpp"
 
+#include <array>
+#include <cassert>
 #include <glad/gl.h>
 #include <algorithm>
+#include <string>
+#include <utility>
+#include "slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp"
+#include <vector>
+#include "slic3r/GUI/Gizmos/GLGizmosManager.hpp"
+#include <imgui.h>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Config.hpp"
+#include "slic3r/GUI/Event.hpp"
+#include <wx/busycursor.h>
+#include "libslic3r/Color.hpp"
+#include "slic3r/GUI/3DScene.hpp"
+#include <memory>
 
 namespace Slic3r::GUI {
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.hpp b/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.hpp
index ed6a38e068..88f07d3092 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.hpp
@@ -4,6 +4,13 @@
 #include "GLGizmoPainterBase.hpp"
 
 #include "slic3r/GUI/I18N.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <string>
+#include <wx/string.h>
+#include "libslic3r/TriangleSelector.hpp"
+#include <map>
+#include <vector>
+#include <utility>
 
 namespace Slic3r::GUI {
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp
index 8ec564e5b4..087e6e7af1 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp
@@ -11,15 +11,52 @@
 #include "libslic3r/PresetBundle.hpp"
 #include "libslic3r/MeasureUtils.hpp"
 
+#include <cstdio>
+#include <cassert>
+#include <array>
+#include <cstdlib>
+#include <cstddef>
+#include <functional>
+#include <cfloat>
+#include <Eigen/Geometry>
+#include <cmath>
+#include <imgui.h>
+#include <algorithm>
 #include <imgui/imgui_internal.h>
 
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Measure.hpp"
+#include <memory>
+#include "libslic3r/TriangleMesh.hpp"
+#include <map>
+#include "libslic3r/Model.hpp"
+#include <limits>
+#include "libslic3r/Geometry.hpp"
+#include <math.h>
+#include "libslic3r/Color.hpp"
+#include "libslic3r/libslic3r.h"
 #include <numeric>
 
 #include <glad/gl.h>
 
+#include <string>
+#include <optional>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "slic3r/GUI/GLModel.hpp"
+#include "slic3r/GUI/MeshUtils.hpp"
+#include "slic3r/GUI/3DScene.hpp"
+#include "slic3r/GUI/GLShader.hpp"
+#include "slic3r/GUI/OpenGLManager.hpp"
+#include "slic3r/GUI/GUI_Geometry.hpp"
 #include <tbb/parallel_for.h>
 
+#include <utility>
+#include <wx/busycursor.h>
+#include <vector>
 #include <wx/clipbrd.h>
+#include <wx/utils.h>
+#include <wx/dataobj.h>
+#include <wx/strconv.h>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.hpp b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.hpp
index 40cb3bab1f..1d76810050 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.hpp
@@ -8,6 +8,19 @@
 #include "slic3r/GUI/I18N.hpp"
 #include "libslic3r/Measure.hpp"
 #include "libslic3r/Model.hpp"
+#include "libslic3r/Color.hpp"
+#include <string>
+#include <array>
+#include "libslic3r/Point.hpp"
+#include "slic3r/GUI/SceneRaycaster.hpp"
+#include <optional>
+#include <map>
+#include "slic3r/GUI/3DScene.hpp"
+#include <memory>
+#include <vector>
+#include <wx/event.h>
+#include <utility>
+#include <wx/string.h>
 
 namespace Slic3r {
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp
index b91f0a9468..f8ffe44b85 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp
@@ -8,6 +8,25 @@
 #include "slic3r/GUI/Plater.hpp"
 #include "slic3r/GUI/Camera.hpp"
 #include "slic3r/GUI/NotificationManager.hpp"
+#include <string>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp"
+#include "libslic3r/Point.hpp"
+#include <vector>
+#include "slic3r/GUI/GUI_App.hpp"
+#include <cstddef>
+#include <limits>
+#include "libslic3r/BoundingBox.hpp"
+#include "slic3r/GUI/3DScene.hpp"
+#include "libslic3r/Color.hpp"
+#include <optional>
+#include "libslic3r/TriangleSelector.hpp"
+#include <algorithm>
+#include <imgui.h>
+#include <cereal/archives/binary.hpp>
+#include <utility>
+#include "slic3r/GUI/ObjectDataViewModel.hpp"
+#include <wx/dataview.h>
 #ifndef IMGUI_DEFINE_MATH_OPERATORS
 #define IMGUI_DEFINE_MATH_OPERATORS
 #endif
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.hpp b/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.hpp
index 3ba613295d..458728cd05 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.hpp
@@ -4,6 +4,12 @@
 #include "GLGizmoBase.hpp"
 #include "GLGizmosCommon.hpp"
 #include "libslic3r/Model.hpp"
+#include "libslic3r/Point.hpp"
+#include <optional>
+#include <string>
+#include <wx/event.h>
+#include "libslic3r/TriangleMesh.hpp"
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
index 2e741fa5e5..2a19cf3ee7 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
@@ -17,7 +17,28 @@
 #include "GLGizmoUtils.hpp"
 
 
+#include <cstddef>
+#include <cassert>
+#include <algorithm>
+#include <array>
 #include <glad/gl.h>
+#include <string>
+#include "libslic3r/Config.hpp"
+#include <vector>
+#include <utility>
+#include "slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp"
+#include "slic3r/GUI/3DScene.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "libslic3r/Color.hpp"
+#include <imgui.h>
+#include <wx/colour.h>
+#include "libslic3r/TriangleSelector.hpp"
+#include "slic3r/GUI/Event.hpp"
+#include <memory>
+#include <wx/busycursor.h>
+#include "libslic3r/Format/bbs_3mf.hpp"
+#include "slic3r/GUI/OpenGLManager.hpp"
+#include "slic3r/GUI/GLShader.hpp"
 
 namespace Slic3r::GUI {
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp
index b2b04acdbe..165fc40fd9 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp
@@ -3,6 +3,18 @@
 
 #include "GLGizmoPainterBase.hpp"
 #include "slic3r/GUI/I18N.hpp"
+#include <cstddef>
+#include <cassert>
+#include <vector>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <string>
+#include "libslic3r/TriangleSelector.hpp"
+#include "libslic3r/Color.hpp"
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <set>
+#include <map>
+#include <utility>
 
 namespace Slic3r::GUI {
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
index 4bee1a6cfc..bed2c42267 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
@@ -7,8 +7,24 @@
 #include "libslic3r/AppConfig.hpp"
 
 
+#include <cassert>
+#include <array>
+#include <cmath>
 #include <glad/gl.h>
 
+#include <string>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "slic3r/GUI/Selection.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/libslic3r.h"
+#include "slic3r/GUI/GUI_Geometry.hpp"
+#include "slic3r/GUI/3DScene.hpp"
+#include "slic3r/GUI/OpenGLManager.hpp"
+#include <utility>
+#include "slic3r/GUI/GLShader.hpp"
+#include "libslic3r/Geometry.hpp"
+#include <wx/intl.h>
+#include "libslic3r/Model.hpp"
 #include <wx/utils.h>
 
 namespace Slic3r {
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMove.hpp b/src/slic3r/GUI/Gizmos/GLGizmoMove.hpp
index fecc8abf1c..8296ba7c5e 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoMove.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoMove.hpp
@@ -4,6 +4,11 @@
 #include "GLGizmoBase.hpp"
 //BBS: add size adjust related
 #include "GizmoObjectManipulation.hpp"
+#include "libslic3r/Point.hpp"
+#include "slic3r/GUI/GLModel.hpp"
+#include <array>
+#include <string>
+#include <wx/event.h>
 
 
 namespace Slic3r {
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp
index d90579e589..c9847afcde 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp
@@ -2,6 +2,14 @@
 #include "slic3r/GUI/GLCanvas3D.hpp"
 #include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp"
 
+#include <cfloat>
+#include <cstddef>
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <cassert>
+#include <algorithm>
+#include <boost/log/trivial.hpp>
 #include <glad/gl.h>
 
 #include "slic3r/GUI/GUI_App.hpp"
@@ -13,8 +21,27 @@
 #include "libslic3r/PresetBundle.hpp"
 #include "libslic3r/TriangleMesh.hpp"
 
+#include "libslic3r/Utils.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Geometry.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/TriangleMeshSlicer.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/TriangleSelector.hpp"
+#include <limits>
+#include "libslic3r/Config.hpp"
 #include <memory>
 #include <optional>
+#include "slic3r/GUI/GLModel.hpp"
+#include <string>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "slic3r/GUI/3DScene.hpp"
+#include <vector>
+#include <utility>
+#include "slic3r/GUI/ImGuiWrapper.hpp"
+#include <queue>
 
 namespace Slic3r::GUI {
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp
index 19856603fa..a98f303fe1 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp
@@ -9,10 +9,20 @@
 #include "libslic3r/TriangleSelector.hpp"
 #include "libslic3r/Model.hpp"
 
+#include <array>
+#include <cassert>
 #include <cereal/types/vector.hpp>
+#include <cstddef>
 #include <glad/gl.h>
 
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Color.hpp"
 #include <memory>
+#include <vector>
+#include <set>
+#include <string>
+#include <wx/event.h>
+#include <wx/string.h>
 
 
 namespace Slic3r::GUI {
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoPrimitive.cpp b/src/slic3r/GUI/Gizmos/GLGizmoPrimitive.cpp
index 4e1a197a39..e03b561c38 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoPrimitive.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoPrimitive.cpp
@@ -6,6 +6,16 @@
 #include "slic3r/GUI/GUI_ObjectList.hpp"
 #include "slic3r/GUI/NotificationManager.hpp"
 #include "libslic3r/Model.hpp"
+#include <string>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp"
+#include "libslic3r/CAD/GeometryEngine.hpp"
+#include <TopoDS_Solid.hxx>
+#include <TopoDS_Shape.hxx>
+#include "slic3r/GUI/GUI_App.hpp"
+#include <utility>
+#include <algorithm>
+#include <imgui.h>
 
 #ifndef IMGUI_DEFINE_MATH_OPERATORS
 #define IMGUI_DEFINE_MATH_OPERATORS
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoPrimitive.hpp b/src/slic3r/GUI/Gizmos/GLGizmoPrimitive.hpp
index f78289a58d..8ac7754007 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoPrimitive.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoPrimitive.hpp
@@ -4,6 +4,10 @@
 #include "GLGizmoBase.hpp"
 #include "GLGizmosCommon.hpp"
 #include "libslic3r/CAD/GeometryEngine.hpp"
+#include <string>
+#include <wx/event.h>
+#include <cereal/archives/binary.hpp>
+#include "libslic3r/TriangleMesh.hpp"
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
index 835b97f072..8d1b3e50df 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
@@ -10,7 +10,28 @@
 
 #include "libslic3r/PresetBundle.hpp"
 
+#include <cstdlib>
+#include <cmath>
+#include <algorithm>
+#include <array>
+#include <cassert>
+#include <cstddef>
 #include <glad/gl.h>
+#include "libslic3r/libslic3r.h"
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "libslic3r/Geometry.hpp"
+#include "libslic3r/Point.hpp"
+#include "slic3r/GUI/OpenGLManager.hpp"
+#include "slic3r/GUI/GLShader.hpp"
+#include "slic3r/GUI/GUI_Geometry.hpp"
+#include <utility>
+#include <string>
+#include "libslic3r/Line.hpp"
+#include "slic3r/GUI/3DScene.hpp"
+#include <math.h>
+#include <imgui.h>
+#include "slic3r/GUI/Jobs/Worker.hpp"
+#include <memory>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp b/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
index 8cbacde3c6..44222479bd 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
@@ -4,6 +4,14 @@
 #include "GLGizmoBase.hpp"
 //BBS: add size adjust related
 #include "GizmoObjectManipulation.hpp"
+#include "libslic3r/Point.hpp"
+#include "slic3r/GUI/GLModel.hpp"
+#include "libslic3r/Color.hpp"
+#include <string>
+#include <wx/event.h>
+#include <array>
+#include "libslic3r/libslic3r.h"
+#include "slic3r/GUI/3DScene.hpp"
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp
index 94373391fa..8660e3c508 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp
@@ -23,6 +23,44 @@
 #include "libslic3r/ClipperUtils.hpp" // union_ex
 
 #include "imgui/imgui_stdlib.h" // using std::string for inputs
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <string>
+#include <wx/string.h>
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/EmbossShape.hpp"
+#include <string_view>
+#include <memory>
+#include <atomic>
+#include "slic3r/GUI/IconManager.hpp"
+#include <utility>
+#include "slic3r/GUI/SurfaceDrag.hpp"
+#include <optional>
+#include <cassert>
+#include "libslic3r/Color.hpp"
+#include "slic3r/GUI/3DScene.hpp"
+#include <imgui.h>
+#include <vector>
+#include "libslic3r/Utils.hpp"
+#include <algorithm>
+#include "libslic3r/Line.hpp"
+#include <functional>
+#include <cmath>
+#include <cstdlib>
+#include "libslic3r/ExPolygon.hpp"
+#include <cstddef>
+#include "slic3r/GUI/Selection.hpp"
+#include <cstdint>
+#include <boost/filesystem/operations.hpp>
+#include "slic3r/GUI/GUI.hpp"
+#include <wx/filedlg.h>
+#include <wx/intl.h>
+#include <iomanip>
+#include <ios>
+#include <math.h>
+#include "libslic3r/Config.hpp"
+#include <wx/dataview.h>
+#include <wx/arrstr.h>
+#include <boost/algorithm/string/predicate.hpp>
 #ifndef IMGUI_DEFINE_MATH_OPERATORS
 #define IMGUI_DEFINE_MATH_OPERATORS
 #endif
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSVG.hpp b/src/slic3r/GUI/Gizmos/GLGizmoSVG.hpp
index 4a0bf84934..2d59135769 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSVG.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSVG.hpp
@@ -10,6 +10,8 @@
 #include "slic3r/Utils/RaycastManager.hpp"
 #include "slic3r/GUI/IconManager.hpp"
 
+#include "libslic3r/EmbossShape.hpp"
+#include "libslic3r/ObjectID.hpp"
 #include <optional>
 #include <memory>
 #include <atomic>
@@ -20,6 +22,10 @@
 
 #include <imgui/imgui.h>
 #include <glad/gl.h>
+#include <string_view>
+#include <string>
+#include <wx/event.h>
+#include <vector>
 
 namespace Slic3r{
 class ModelVolume;
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp b/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
index c30acba386..a223749b6c 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
@@ -4,8 +4,26 @@
 #include "slic3r/GUI/Shortcuts.hpp"
 #include "slic3r/GUI/Plater.hpp"
 
+#include <cstddef>
+#include <array>
+#include <cstdlib>
+#include <cmath>
 #include <glad/gl.h>
 
+#include "libslic3r/Point.hpp"
+#include <string>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "slic3r/GUI/Selection.hpp"
+#include "slic3r/GUI/GUI_Geometry.hpp"
+#include "libslic3r/libslic3r.h"
+#include <vector>
+#include <wx/intl.h>
+#include "libslic3r/Model.hpp"
+#include "slic3r/GUI/3DScene.hpp"
+#include "slic3r/GUI/OpenGLManager.hpp"
+#include "slic3r/GUI/GLShader.hpp"
+#include <utility>
+#include "libslic3r/Geometry.hpp"
 #include <wx/utils.h>
 
 namespace Slic3r {
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoScale.hpp b/src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
index 3bfb63ff7a..d830b9f36a 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
@@ -6,6 +6,15 @@
 #include "GizmoObjectManipulation.hpp"
 
 #include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Geometry.hpp"
+#include "slic3r/GUI/GLModel.hpp"
+#include <utility>
+#include <array>
+#include <string>
+#include <wx/event.h>
+#include "libslic3r/Color.hpp"
+#include "libslic3r/libslic3r.h"
 
 
 namespace Slic3r {
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp
index f36a47c8ec..3ae5604226 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp
@@ -13,7 +13,21 @@
 #include "slic3r/Utils/UndoRedo.hpp"
 #include "GLGizmoUtils.hpp"
 
+#include <algorithm>
+#include <array>
 #include <glad/gl.h>
+#include <string>
+#include "slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmosManager.hpp"
+#include <imgui.h>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "libslic3r/Format/bbs_3mf.hpp"
+#include "slic3r/GUI/Event.hpp"
+#include <wx/busycursor.h>
+#include <vector>
+#include "libslic3r/Color.hpp"
+#include "slic3r/GUI/3DScene.hpp"
+#include <memory>
 
 
 namespace Slic3r::GUI {
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSeam.hpp b/src/slic3r/GUI/Gizmos/GLGizmoSeam.hpp
index f1c48a12d6..ac4382c5ca 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSeam.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSeam.hpp
@@ -2,6 +2,12 @@
 #define slic3r_GLGizmoSeam_hpp_
 
 #include "GLGizmoPainterBase.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <string>
+#include <wx/string.h>
+#include <map>
+#include <vector>
+#include <utility>
 
 namespace Slic3r::GUI {
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
index 6a08d5eff4..59af0eab06 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
@@ -11,9 +11,32 @@
 #include "libslic3r/Model.hpp"
 #include "libslic3r/QuadricEdgeCollapse.hpp"
 
+#include <functional>
+#include <cstddef>
+#include <cstdint>
+#include <algorithm>
+#include <cassert>
+#include <cmath>
 #include <glad/gl.h>
 
+#include "slic3r/GUI/Gizmos/GLGizmosManager.hpp"
+#include "slic3r/GUI/Selection.hpp"
+#include "slic3r/GUI/3DScene.hpp"
+#include <string>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <iterator>
+#include <mutex>
+#include <imgui.h>
+#include <memory>
+#include <limits>
+#include <optional>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Color.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp"
 #include <thread>
+#include <vector>
+#include <wx/event.h>
+#include <utility>
 
 namespace Slic3r::GUI {
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp
index b4be94d2c9..fa43291705 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp
@@ -6,8 +6,19 @@
 #include "GLGizmoBase.hpp"
 #include "slic3r/GUI/3DScene.hpp"
 #include "admesh/stl.h" // indexed_triangle_set
+#include <cstddef>
+#include <cstdint>
+#include <limits>
+#include <memory>
+#include <chrono>
+#include <exception>
 #include <mutex>
+#include <string>
+#include "slic3r/GUI/GLModel.hpp"
+#include <ratio>
+#include <optional>
 #include <thread>
+#include <vector>
 
 namespace Slic3r {
 class ModelVolume;
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSketch.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSketch.cpp
index 195ceba713..60e8e383c6 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSketch.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSketch.cpp
@@ -9,6 +9,24 @@
 #include <BRepBuilderAPI_MakeFace.hxx>
 #include <BRepPrimAPI_MakeRevol.hxx>
 #include <BRepAlgoAPI_Fuse.hxx>
+#include <string>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp"
+#include "libslic3r/CAD/SketchEngine.hpp"
+#include "libslic3r/Point.hpp"
+#include <cmath>
+#include <math.h>
+#include <imgui.h>
+#include <cstddef>
+#include <vector>
+#include <stdexcept>
+#include <gp_Pnt.hxx>
+#include <gp_Dir.hxx>
+#include "libslic3r/CAD/GeometryEngine.hpp"
+#include <algorithm>
+#include "slic3r/GUI/GUI_App.hpp"
+#include <utility>
+#include <exception>
 
 #ifndef IMGUI_DEFINE_MATH_OPERATORS
 #define IMGUI_DEFINE_MATH_OPERATORS
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSketch.hpp b/src/slic3r/GUI/Gizmos/GLGizmoSketch.hpp
index 5a4b59edfd..9e878db152 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSketch.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSketch.hpp
@@ -4,7 +4,13 @@
 #include "GLGizmoBase.hpp"
 #include "GLGizmosCommon.hpp"
 #include "libslic3r/CAD/SketchEngine.hpp"
+#include <cereal/archives/binary.hpp>
+#include <TopoDS_Shape.hxx>
 #include <imgui/imgui.h>
+#include <string>
+#include <wx/event.h>
+#include <vector>
+#include "libslic3r/Point.hpp"
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.cpp b/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.cpp
index 5c322a1f81..4aed58d884 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.cpp
@@ -1,8 +1,11 @@
 #include "GLGizmoTextureDisplacement.hpp"
 
+#include <Eigen/Core>
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <boost/log/trivial.hpp>
 
+#include "ColorSpaceConvert.hpp"
 #include "libslic3r/AABBTreeIndirect.hpp"
 #include "libslic3r/Color.hpp"
 #include "libslic3r/PresetBundle.hpp"
@@ -34,7 +37,32 @@
 #include "slic3r/Utils/UndoRedo.hpp"
 #include "GLGizmoUtils.hpp"
 
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <chrono>
+#include <cstdio>
 #include <glad/gl.h>
+#include <imgui.h>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/TriangleSelector.hpp"
+#include <memory>
+#include "slic3r/GUI/GLTexture.hpp"
+#include "libslic3r/TextureDisplacement.hpp"
+#include <string>
+#include "slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp"
+#include "slic3r/GUI/3DScene.hpp"
+#include "slic3r/GUI/GLShader.hpp"
+#include <math.h>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "slic3r/GUI/Jobs/Worker.hpp"
+#include "libslic3r/Geometry.hpp"
+#include "slic3r/GUI/Event.hpp"
+#include "slic3r/GUI/IconManager.hpp"
+#include <optional>
+#include "libslic3r/Config.hpp"
+#include "libslic3r/TextureBake/TextureBakeDebug.hpp"
+#include <ratio>
 #include <tbb/parallel_for.h>
 #include <algorithm>
 #include <array>
@@ -42,6 +70,12 @@
 #include <limits>
 #include <queue>
 #include <set>
+#include <vector>
+#include <utility>
+#include <wx/gdicmn.h>
+#include <wx/busycursor.h>
+#include <wx/string.h>
+#include <wx/filedlg.h>
 
 namespace Slic3r::GUI {
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.hpp b/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.hpp
index 705408b153..6685f8d713 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.hpp
@@ -10,11 +10,23 @@
 #include "slic3r/GUI/IconManager.hpp"
 #include "slic3r/GUI/TextureLibrary.hpp"
 
+#include <Eigen/Core>
 #include <array>
 #include <atomic>
+#include "libslic3r/Color.hpp"
+#include <cstddef>
+#include "libslic3r/TriangleSelector.hpp"
+#include <cstdint>
+#include "libslic3r/Point.hpp"
+#include <imgui.h>
 #include <map>
 #include <memory>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
 #include <string>
+#include <vector>
+#include <utility>
+#include <wx/event.h>
+#include <wx/string.h>
 
 namespace Slic3r::GUI {
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoUtils.cpp b/src/slic3r/GUI/Gizmos/GLGizmoUtils.cpp
index 75dca0855d..d5aab16808 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoUtils.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoUtils.cpp
@@ -3,6 +3,12 @@
 #include "GLGizmosManager.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/GLCanvas3D.hpp"
+#include <vector>
+#include <utility>
+#include <imgui.h>
+#include <algorithm>
+#include <string_view>
+#include <cstddef>
 #include <wx/app.h>
 #include <boost/algorithm/string.hpp>
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoUtils.hpp b/src/slic3r/GUI/Gizmos/GLGizmoUtils.hpp
index 1eed68b2cd..f6feee3df1 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoUtils.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoUtils.hpp
@@ -2,6 +2,7 @@
 #define GL_GIZMO_UTIL_HPP
 
 #include <map>
+#include <utility>
 #include <vector>
 #include <string>
 #include <wx/string.h>
diff --git a/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp b/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp
index 5243c8294f..18308b81b2 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp
@@ -1,5 +1,6 @@
 #include "GLGizmosCommon.hpp"
 
+#include <algorithm>
 #include <cassert>
 
 #include "slic3r/GUI/GLCanvas3D.hpp"
@@ -10,7 +11,18 @@
 
 #include "libslic3r/PresetBundle.hpp"
 
+#include <cstddef>
 #include <glad/gl.h>
+#include "slic3r/GUI/Selection.hpp"
+#include <limits>
+#include "libslic3r/Model.hpp"
+#include <vector>
+#include "slic3r/GUI/MeshUtils.hpp"
+#include "libslic3r/Geometry.hpp"
+#include "slic3r/GUI/3DScene.hpp"
+#include <wx/busycursor.h>
+#include <memory>
+#include <utility>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/Gizmos/GLGizmosCommon.hpp b/src/slic3r/GUI/Gizmos/GLGizmosCommon.hpp
index 2ab910785b..d2eeda4f64 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmosCommon.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmosCommon.hpp
@@ -1,8 +1,15 @@
 #ifndef slic3r_GUI_GLGizmosCommon_hpp_
 #define slic3r_GUI_GLGizmosCommon_hpp_
 
+#include "libslic3r/TriangleMesh.hpp"
+#include <cassert>
+#include <cstddef>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Geometry.hpp"
 #include <memory>
 #include <map>
+#include <vector>
+#include <utility>
 
 #include "slic3r/GUI/3DScene.hpp"
 #include "slic3r/GUI/MeshUtils.hpp"
diff --git a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
index 40c272fcb7..f9d88b67b8 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
@@ -29,6 +29,27 @@
 #include "slic3r/GUI/Gizmos/GLGizmoSVG.hpp"
 #include "slic3r/GUI/Gizmos/GLGizmoMeshBoolean.hpp"
 #include "slic3r/GUI/Gizmos/GLGizmoAssembly.hpp"
+#include <wx/timer.h>
+#include <vector>
+#include <cstddef>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Utils.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmoMeasure.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp"
+#include <utility>
+#include <map>
+#include <imgui.h>
+#include "slic3r/GUI/ImGuiWrapper.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <algorithm>
+#include <memory>
+#include "slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp"
+#include <cassert>
+#include <boost/container_hash/hash.hpp>
+#include <wx/colour.h>
+#include <wx/event.h>
+#include <optional>
+#include "libslic3r/AppConfig.hpp"
 #ifdef SLIC3R_CAD
 #include "slic3r/GUI/Gizmos/GLGizmoPrimitive.hpp"
 #include "slic3r/GUI/Gizmos/GLGizmoSketch.hpp"
diff --git a/src/slic3r/GUI/Gizmos/GLGizmosManager.hpp b/src/slic3r/GUI/Gizmos/GLGizmosManager.hpp
index 2903b38777..63207f741b 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmosManager.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.hpp
@@ -10,6 +10,16 @@
 
 #include "libslic3r/ObjectID.hpp"
 
+#include <cstdlib>
+#include "libslic3r/libslic3r.h"
+#include <vector>
+#include <memory>
+#include <utility>
+#include <cstddef>
+#include "libslic3r/Point.hpp"
+#include <string>
+#include <wx/event.h>
+#include <cereal/specialize.hpp>
 #include <wx/timer.h>
 #include <map>
 
diff --git a/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp b/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp
index 5d70fde833..3d9d18883d 100644
--- a/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp
+++ b/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp
@@ -1,4 +1,10 @@
 #include "slic3r/GUI/ImGuiWrapper.hpp"
+#include <algorithm>
+#include <cstddef>
+#include <cstdlib>
+#include <cmath>
+#include <cfloat>
+#include <imgui.h>
 #include <imgui/imgui_internal.h>
 
 #include "GizmoObjectManipulation.hpp"
@@ -18,6 +24,17 @@
 #include "GLGizmoUtils.hpp"
 
 #include <boost/algorithm/string.hpp>
+#include "libslic3r/Point.hpp"
+#include <limits>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "slic3r/GUI/GUI.hpp"
+#include <math.h>
+#include "slic3r/GUI/ObjectDataViewModel.hpp"
+#include "libslic3r/libslic3r.h"
+#include "slic3r/GUI/GUI_Geometry.hpp"
+#include <vector>
+#include <string_view>
+#include "libslic3r/Color.hpp"
 
 #define MAX_NUM 9999.99
 #define MAX_SIZE std::string_view{"9999.99"}
diff --git a/src/slic3r/GUI/GradientCurveEditor.cpp b/src/slic3r/GUI/GradientCurveEditor.cpp
index 6d38ef81a5..b18bfe0480 100644
--- a/src/slic3r/GUI/GradientCurveEditor.cpp
+++ b/src/slic3r/GUI/GradientCurveEditor.cpp
@@ -7,11 +7,20 @@
 
 #include <algorithm>
 #include <cmath>
+#include "libslic3r/FilamentMixer.hpp"
+#include <cstddef>
 #include <limits>
 
+#include <wx/colour.h>
+#include <vector>
+#include <utility>
 #include <wx/dcbuffer.h>
 #include <wx/dcclient.h>
 #include <wx/dcgraph.h>
+#include <wx/event.h>
+#include <wx/panel.h>
+#include <wx/gdicmn.h>
+#include <wx/geometry.h>
 #include <wx/settings.h>
 
 namespace Slic3r {
diff --git a/src/slic3r/GUI/GuiColor.cpp b/src/slic3r/GUI/GuiColor.cpp
index b5225d41d3..d1055ce19d 100644
--- a/src/slic3r/GUI/GuiColor.cpp
+++ b/src/slic3r/GUI/GuiColor.cpp
@@ -1,4 +1,8 @@
 #include "GuiColor.hpp"
+#include <wx/colour.h>
+#include "libslic3r/Color.hpp"
+#include <algorithm>
+#include "ColorSpaceConvert.hpp"
 
 namespace Slic3r { namespace GUI {
 wxColour convert_to_wxColour(const RGBA &color)
diff --git a/src/slic3r/GUI/HMS.cpp b/src/slic3r/GUI/HMS.cpp
index f00e661df2..5a37823092 100644
--- a/src/slic3r/GUI/HMS.cpp
+++ b/src/slic3r/GUI/HMS.cpp
@@ -5,9 +5,25 @@
 #include "DeviceManager.hpp"
 #include "DeviceCore/DevManager.h"
 #include "DeviceCore/DevUtil.h"
+#include "Http.hpp"
+#include "json_diff.hpp"
 #include "libslic3r/AppConfig.hpp"
 
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/directory.hpp>
+#include <boost/algorithm/string/case_conv.hpp>
 #include <boost/log/trivial.hpp>
+#include <unordered_set>
+#include <string>
+#include "libslic3r/Utils.hpp"
+#include <fstream>
+#include <ostream>
+#include <wx/string.h>
+#include <vector>
+#include <cstdio>
+#include <wx/image.h>
+#include <mutex>
+#include <ctime>
 
 static const char* HMS_PATH = "hms";
 static const char* HMS_LOCAL_IMG_PATH = "hms/local_image";
diff --git a/src/slic3r/GUI/HMS.hpp b/src/slic3r/GUI/HMS.hpp
index c494539b36..fdbf6f5fc4 100644
--- a/src/slic3r/GUI/HMS.hpp
+++ b/src/slic3r/GUI/HMS.hpp
@@ -15,6 +15,8 @@
 #include <string>
 #include <unordered_map>
 #include <vector>
+#include <wx/string.h>
+#include <wx/image.h>
 
 namespace Slic3r {
 
diff --git a/src/slic3r/GUI/HMSPanel.cpp b/src/slic3r/GUI/HMSPanel.cpp
index 1268cb8f7b..c767c8613c 100644
--- a/src/slic3r/GUI/HMSPanel.cpp
+++ b/src/slic3r/GUI/HMSPanel.cpp
@@ -1,8 +1,20 @@
 #include "HMS.hpp"
 #include "HMSPanel.hpp"
+#include "slic3r/GUI/DeviceCore/DevHMS.h"
+#include <boost/log/trivial.hpp>
 #include <slic3r/GUI/Widgets/SideTools.hpp>
 #include <slic3r/GUI/Widgets/Label.hpp>
 #include <slic3r/GUI/I18N.hpp>
+#include <wx/event.h>
+#include <string>
+#include <wx/panel.h>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+#include <wx/utils.h>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <wx/scrolwin.h>
 #include "GUI.hpp"
 #include "GUI_App.hpp"
 #include "MainFrame.hpp"
diff --git a/src/slic3r/GUI/HMSPanel.hpp b/src/slic3r/GUI/HMSPanel.hpp
index 25ac56de96..c87ffccec7 100644
--- a/src/slic3r/GUI/HMSPanel.hpp
+++ b/src/slic3r/GUI/HMSPanel.hpp
@@ -1,7 +1,13 @@
 #ifndef slic3r_HMSPanel_hpp_
 #define slic3r_HMSPanel_hpp_
 
+#include <string>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <map>
 #include <wx/panel.h>
+#include <wx/scrolwin.h>
+#include <wx/sizer.h>
 #include <wx/textctrl.h>
 #include <slic3r/GUI/Widgets/Button.hpp>
 #include <slic3r/GUI/DeviceManager.hpp>
diff --git a/src/slic3r/GUI/HintNotification.cpp b/src/slic3r/GUI/HintNotification.cpp
index de5f12e07e..2267918b5a 100644
--- a/src/slic3r/GUI/HintNotification.cpp
+++ b/src/slic3r/GUI/HintNotification.cpp
@@ -15,6 +15,22 @@
 #include "libslic3r/Config.hpp"
 #include "libslic3r/PrintConfig.hpp"
 
+#include <cstdint>
+#include "libslic3r/Exception.hpp"
+#include <cereal/cereal.hpp>
+#include <imgui.h>
+#include <boost/filesystem/path.hpp>
+#include <ios>
+#include <exception>
+#include <boost/filesystem/operations.hpp>
+#include <algorithm>
+#include <cstddef>
+#include <cstdlib>
+#include <ctime>
+#include <boost/algorithm/string/predicate.hpp>
+#include <functional>
+#include <boost/nowide/convert.hpp>
+#include <cassert>
 #include <map>
 
 #include <boost/algorithm/string/replace.hpp>
@@ -26,6 +42,12 @@
 #include <cereal/archives/binary.hpp>
 #include <cereal/types/string.hpp>
 #include <cereal/types/vector.hpp>
+#include <vector>
+#include <string>
+#include "slic3r/GUI/GUI_App.hpp"
+#include <utility>
+#include "slic3r/GUI/NotificationManager.hpp"
+#include "slic3r/GUI/GUI.hpp"
 
 #define HINTS_CEREAL_VERSION 1
 // structure for writing used hints into binary file with version
diff --git a/src/slic3r/GUI/HintNotification.hpp b/src/slic3r/GUI/HintNotification.hpp
index 89a2871c5a..cb05697869 100644
--- a/src/slic3r/GUI/HintNotification.hpp
+++ b/src/slic3r/GUI/HintNotification.hpp
@@ -2,6 +2,12 @@
 #define slic3r_GUI_HintNotification_hpp_
 
 #include "NotificationManager.hpp"
+#include <string>
+#include <cstddef>
+#include <functional>
+#include <boost/filesystem/path.hpp>
+#include <vector>
+#include <wx/event.h>
 
 namespace Slic3r {namespace GUI {
 
diff --git a/src/slic3r/GUI/HttpServer.cpp b/src/slic3r/GUI/HttpServer.cpp
index ef26f20173..789d833006 100644
--- a/src/slic3r/GUI/HttpServer.cpp
+++ b/src/slic3r/GUI/HttpServer.cpp
@@ -1,11 +1,30 @@
 #include "HttpServer.hpp"
+#include <boost/asio/socket_base.hpp>
+#include <boost/beast/core/error.hpp>
+#include <boost/asio/error.hpp>
+#include <boost/asio/buffer.hpp>
+#include <boost/asio/ip/tcp.hpp>
+#include <boost/asio/ip/basic_endpoint.hpp>
+#include <boost/asio/post.hpp>
+#include <boost/algorithm/string/predicate.hpp>
 #include <boost/log/trivial.hpp>
+#include "CloudProvider.hpp"
 #include "GUI_App.hpp"
 #include "slic3r/Utils/Http.hpp"
 #include "slic3r/Utils/NetworkAgent.hpp"
 #include "slic3r/Utils/BBLNetworkPlugin.hpp"
 #include "libslic3r/Thread.hpp"
+#include <cstddef>
+#include <istream>
+#include <memory>
+#include <iostream>
+#include <functional>
 #include <nlohmann/json.hpp>
+#include <string>
+#include <vector>
+#include <sstream>
+#include <ostream>
+#include <utility>
 
 using json = nlohmann::json;
 
diff --git a/src/slic3r/GUI/HttpServer.hpp b/src/slic3r/GUI/HttpServer.hpp
index 4c0b929663..d609821bc6 100644
--- a/src/slic3r/GUI/HttpServer.hpp
+++ b/src/slic3r/GUI/HttpServer.hpp
@@ -1,8 +1,15 @@
 #ifndef slic3r_Http_App_hpp_
 #define slic3r_Http_App_hpp_
 
+#include <boost/asio/ip/basic_endpoint.hpp>
+#include <functional>
+#include <boost/asio/io_service.hpp>
+#include <boost/asio/ip/tcp.hpp>
+#include <boost/asio/streambuf.hpp>
 #include <iostream>
+#include <map>
 #include <mutex>
+#include <sstream>
 #include <stack>
 
 #include <boost/beast/core.hpp>
diff --git a/src/slic3r/GUI/I18N.cpp b/src/slic3r/GUI/I18N.cpp
index 530a321431..f1f9764839 100644
--- a/src/slic3r/GUI/I18N.cpp
+++ b/src/slic3r/GUI/I18N.cpp
@@ -1,4 +1,8 @@
 #include "I18N.hpp"
+#include <wx/string.h>
+#include <string>
+#include <wx/translation.h>
+#include <wx/strconv.h>
 
 namespace Slic3r { namespace GUI { 
 
diff --git a/src/slic3r/GUI/I18N.hpp b/src/slic3r/GUI/I18N.hpp
index 2c338a1fd9..f2ca833423 100644
--- a/src/slic3r/GUI/I18N.hpp
+++ b/src/slic3r/GUI/I18N.hpp
@@ -1,3 +1,7 @@
+#include <wx/string.h>
+#include <wx/translation.h>
+#include <wx/strconv.h>
+#include <string>
 #ifndef _
 #define _(s)    	Slic3r::GUI::I18N::translate((s))
 #define _L(s)    	Slic3r::GUI::I18N::translate((s))
diff --git a/src/slic3r/GUI/IMSlider.cpp b/src/slic3r/GUI/IMSlider.cpp
index fa777b6a37..239882457f 100644
--- a/src/slic3r/GUI/IMSlider.cpp
+++ b/src/slic3r/GUI/IMSlider.cpp
@@ -4,6 +4,34 @@
 #include "GUI.hpp"
 #include "NotificationManager.hpp"
 #include "Widgets/StateColor.hpp"
+#include "libslic3r/libslic3r.h"
+#include <imgui.h>
+#include <cmath>
+#include <cstddef>
+#include <functional>
+#include "libslic3r/ExPolygon.hpp"
+#include <string>
+#include "libslic3r/CustomGCode.hpp"
+#include <cstdio>
+#include "slic3r/GUI/ImGuiWrapper.hpp"
+#include "libslic3r/Utils.hpp"
+#include <algorithm>
+#include <vector>
+#include "slic3r/GUI/TickCode.hpp"
+#include <boost/log/trivial.hpp>
+#include <wx/colour.h>
+#include "libslic3r/Color.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <set>
+#include <wx/string.h>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <cstring>
+#include <cctype>
+#include <cstdlib>
+#include <wx/event.h>
+#include <wx/utils.h>
+#include <wx/slider.h>
+#include <array>
 #ifndef IMGUI_DEFINE_MATH_OPERATORS
 #define IMGUI_DEFINE_MATH_OPERATORS
 #endif
diff --git a/src/slic3r/GUI/IMSlider.hpp b/src/slic3r/GUI/IMSlider.hpp
index d28a65c1ff..41e3d6747f 100644
--- a/src/slic3r/GUI/IMSlider.hpp
+++ b/src/slic3r/GUI/IMSlider.hpp
@@ -2,7 +2,14 @@
 #define slic3r_GUI_IMSlider_hpp_
 
 #include "TickCode.hpp"
+#include <cstddef>
+#include <functional>
+#include <array>
 #include <imgui/imgui.h>
+#include <vector>
+#include "libslic3r/CustomGCode.hpp"
+#include <string>
+#include <wx/event.h>
 #include <wx/slider.h>
 
 #include <set>
diff --git a/src/slic3r/GUI/IMToolbar.cpp b/src/slic3r/GUI/IMToolbar.cpp
index 2a569c960b..1629644df9 100644
--- a/src/slic3r/GUI/IMToolbar.cpp
+++ b/src/slic3r/GUI/IMToolbar.cpp
@@ -1,9 +1,12 @@
 #include "IMToolbar.hpp"
 
 #include "3DScene.hpp"
+#include <cstdint>
 #include <glad/gl.h>
 #include <imgui/imgui_internal.h>
 #include <imgui/imgui.h>
+#include <string>
+#include "libslic3r/Utils.hpp"
 
 #include "nanosvg/nanosvg.h"
 #include "nanosvg/nanosvgrast.h"
diff --git a/src/slic3r/GUI/IMediaController.hpp b/src/slic3r/GUI/IMediaController.hpp
index 3b4cbf7d24..72798ff983 100644
--- a/src/slic3r/GUI/IMediaController.hpp
+++ b/src/slic3r/GUI/IMediaController.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <wx/gdicmn.h>
 #include <wx/mediactrl.h>
 #include <wx/uri.h>
 
diff --git a/src/slic3r/GUI/IconManager.cpp b/src/slic3r/GUI/IconManager.cpp
index abe76f052f..ebdf9b93a4 100644
--- a/src/slic3r/GUI/IconManager.cpp
+++ b/src/slic3r/GUI/IconManager.cpp
@@ -1,5 +1,15 @@
 #include "IconManager.hpp"
+#include <cassert>
+#include <algorithm>
+#include <boost/filesystem/operations.hpp>
+#include <boost/algorithm/string/predicate.hpp>
 #include <cmath>
+#include <cstdio>
+#include <cstddef>
+#include <memory>
+#include <cstring>
+#include <imgui.h>
+#include <cstdint>
 #include <numeric>
 #include <boost/log/trivial.hpp>
 #include <boost/filesystem.hpp>
@@ -10,6 +20,9 @@
 
 #include "3DScene.hpp" // glsafe
 #include <glad/gl.h>
+#include <vector>
+#include <utility>
+#include <string>
 
 #define STB_RECT_PACK_IMPLEMENTATION
 #include "imgui/imstb_rectpack.h" // distribute rectangles
diff --git a/src/slic3r/GUI/IconManager.hpp b/src/slic3r/GUI/IconManager.hpp
index 24ec3f7a91..b5d86fbd6e 100644
--- a/src/slic3r/GUI/IconManager.hpp
+++ b/src/slic3r/GUI/IconManager.hpp
@@ -1,6 +1,7 @@
 #ifndef slic3r_IconManager_hpp_
 #define slic3r_IconManager_hpp_
 
+#include <string>
 #include <vector>
 #include <memory>
 #include "imgui/imgui.h" // ImVec2
diff --git a/src/slic3r/GUI/IdleScheduler.cpp b/src/slic3r/GUI/IdleScheduler.cpp
index 18498fce0d..bfece0e3fe 100644
--- a/src/slic3r/GUI/IdleScheduler.cpp
+++ b/src/slic3r/GUI/IdleScheduler.cpp
@@ -3,7 +3,11 @@
 #include <chrono>
 
 #include <boost/log/trivial.hpp>
+#include <functional>
+#include <utility>
+#include <string>
 #include <wx/evtloop.h>
+#include <wx/timer.h>
 
 #include "libslic3r/Utils.hpp"
 
diff --git a/src/slic3r/GUI/IdleScheduler.hpp b/src/slic3r/GUI/IdleScheduler.hpp
index 7c31e9414c..a210971e74 100644
--- a/src/slic3r/GUI/IdleScheduler.hpp
+++ b/src/slic3r/GUI/IdleScheduler.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <functional>
+#include "slic3r/GUI/Lazy.hpp"
 #include <string>
 
 #include <wx/event.h>
diff --git a/src/slic3r/GUI/ImGuiWrapper.cpp b/src/slic3r/GUI/ImGuiWrapper.cpp
index fe5ddc9fa0..64bb5e11ca 100644
--- a/src/slic3r/GUI/ImGuiWrapper.cpp
+++ b/src/slic3r/GUI/ImGuiWrapper.cpp
@@ -1,6 +1,28 @@
 #include "ImGuiWrapper.hpp"
 
+#include <algorithm>
+#include <cstdint>
+#include <array>
+#include <cassert>
 #include <cstdio>
+#include "libslic3r/Technologies.hpp"
+#include <map>
+#include <string>
+#include <imgui.h>
+#include "libslic3r/GCode/ThumbnailData.hpp"
+#include <cstdlib>
+#include <utility>
+#include <string_view>
+#include <cstring>
+#include "libslic3r/Point.hpp"
+#include <functional>
+#include <optional>
+#include <limits>
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "libslic3r/Exception.hpp"
+#include <tuple>
 #include <vector>
 #include <cmath>
 #include <stdexcept>
@@ -8,6 +30,9 @@
 #include <boost/format.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/filesystem.hpp>
+#include <wx/colour.h>
+#include <wx/utils.h>
+#include <wx/dataobj.h>
 #if ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/nowide/convert.hpp>
diff --git a/src/slic3r/GUI/ImGuiWrapper.hpp b/src/slic3r/GUI/ImGuiWrapper.hpp
index ad83d50d2d..1a6f5e1bb9 100644
--- a/src/slic3r/GUI/ImGuiWrapper.hpp
+++ b/src/slic3r/GUI/ImGuiWrapper.hpp
@@ -1,8 +1,12 @@
 #ifndef slic3r_ImGuiWrapper_hpp_
 #define slic3r_ImGuiWrapper_hpp_
 
+#include "libslic3r/Technologies.hpp"
+#include <optional>
 #include <string>
 #include <map>
+#include <string_view>
+#include <tuple>
 #include <vector>
 #include <cstdlib>
 
diff --git a/src/slic3r/GUI/ImageDPIFrame.cpp b/src/slic3r/GUI/ImageDPIFrame.cpp
index 8dad9c44da..655fa87633 100644
--- a/src/slic3r/GUI/ImageDPIFrame.cpp
+++ b/src/slic3r/GUI/ImageDPIFrame.cpp
@@ -1,6 +1,11 @@
 #include "ImageDPIFrame.hpp"
 
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/dcclient.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
 #include <wx/event.h>
+#include <wx/gdicmn.h>
 #include <wx/sizer.h>
 #include <wx/slider.h>
 #include <wx/dcmemory.h>
@@ -10,6 +15,11 @@
 #include "I18N.hpp"
 #include "MainFrame.hpp"
 #include <chrono>
+#include <wx/string.h>
+#include <wx/toplevel.h>
+#include <wx/stattext.h>
+#include <wx/timer.h>
+#include <wx/window.h>
 #include "wxExtensions.hpp"
 
 using namespace Slic3r;
diff --git a/src/slic3r/GUI/ImageDPIFrame.hpp b/src/slic3r/GUI/ImageDPIFrame.hpp
index c22d296492..494f158b9a 100644
--- a/src/slic3r/GUI/ImageDPIFrame.hpp
+++ b/src/slic3r/GUI/ImageDPIFrame.hpp
@@ -3,7 +3,9 @@
 
 #include "GUI_App.hpp"
 #include "GUI_Utils.hpp"
+#include <wx/sizer.h>
 #include <wx/stattext.h>
+#include <wx/string.h>
 #include <wx/timer.h>
 
 class wxStaticBitmap;
diff --git a/src/slic3r/GUI/ImageGrid.cpp b/src/slic3r/GUI/ImageGrid.cpp
index f6bf25d77c..280b95055d 100644
--- a/src/slic3r/GUI/ImageGrid.cpp
+++ b/src/slic3r/GUI/ImageGrid.cpp
@@ -6,9 +6,27 @@
 #include "GUI_App.hpp"
 #include "GUI.hpp"
 
+#include <utility>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <wx/colour.h>
+#include <cstddef>
+#include <wx/dcclient.h>
+#include <cstring>
+#include <wx/dc.h>
+#include <cmath>
+#include <wx/chartype.h>
+#include <algorithm>
+#include <ctime>
+#include <wx/arrstr.h>
 #include <wx/dcgraph.h>
 
 #include <boost/log/trivial.hpp>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/timer.h>
+#include <wx/string.h>
+#include <wx/image.h>
+#include <wx/dcmemory.h>
 
 wxDEFINE_EVENT(EVT_ITEM_ACTION, wxCommandEvent);
 
diff --git a/src/slic3r/GUI/ImageGrid.h b/src/slic3r/GUI/ImageGrid.h
index 4bc17e4b6d..b2025c91ed 100644
--- a/src/slic3r/GUI/ImageGrid.h
+++ b/src/slic3r/GUI/ImageGrid.h
@@ -8,6 +8,14 @@
 #ifndef ImageGrid_h
 #define ImageGrid_h
 
+#include <wx/event.h>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <wx/string.h>
+#include <string>
+#include <cstddef>
+#include <utility>
+#include <wx/gdicmn.h>
+#include <wx/colour.h>
 #include <wx/window.h>
 #include <wx/timer.h>
 #include <wx/arrstr.h>
diff --git a/src/slic3r/GUI/InstanceCheck.cpp b/src/slic3r/GUI/InstanceCheck.cpp
index 28c5176cb1..8205b5edc3 100644
--- a/src/slic3r/GUI/InstanceCheck.cpp
+++ b/src/slic3r/GUI/InstanceCheck.cpp
@@ -1,7 +1,23 @@
 #include "GUI_App.hpp"
 #include "InstanceCheck.hpp"
 #include "Plater.hpp"
+#include <boost/bind/bind.hpp>
 #include <boost/regex.hpp>
+#include <string>
+#include <vector>
+#include <cstdio>
+#include <stdio.h>
+#include <wx/string.h>
+#include <cstddef>
+#include <cstdlib>
+#include <functional>
+#include <exception>
+#include <wx/event.h>
+#include <cassert>
+#include <mutex>
+#include <utility>
+#include <cstring>
+#include <chrono>
 
 #ifdef _WIN32
   #include "MainFrame.hpp"
diff --git a/src/slic3r/GUI/InstanceCheck.hpp b/src/slic3r/GUI/InstanceCheck.hpp
index 9bfb3e2500..47b26cd868 100644
--- a/src/slic3r/GUI/InstanceCheck.hpp
+++ b/src/slic3r/GUI/InstanceCheck.hpp
@@ -2,6 +2,10 @@
 #define slic3r_InstanceCheck_hpp_
 
 #include "Event.hpp"
+#include <vector>
+#include <boost/filesystem/path.hpp>
+#include <cassert>
+#include <wx/event.h>
 
 #if _WIN32
 #include <windows.h>
diff --git a/src/slic3r/GUI/Jobs/ArrangeJob.cpp b/src/slic3r/GUI/Jobs/ArrangeJob.cpp
index 438bda2cc2..c89c574e55 100644
--- a/src/slic3r/GUI/Jobs/ArrangeJob.cpp
+++ b/src/slic3r/GUI/Jobs/ArrangeJob.cpp
@@ -16,6 +16,27 @@
 #include "slic3r/plugin/PluginManager.hpp"
 
 #include "libnest2d/common.hpp"
+#include "libslic3r/Arrange.hpp"
+#include <utility>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Polygon.hpp"
+#include <boost/log/trivial.hpp>
+#include <cstddef>
+#include <vector>
+#include "slic3r/GUI/Selection.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <set>
+#include <algorithm>
+#include "libslic3r/PrintConfig.hpp"
+#include <map>
+#include <cassert>
+#include "slic3r/GUI/Jobs/Job.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/libslic3r.h"
+#include <numeric>
+#include <exception>
+#include "libslic3r/LifecycleEvents.hpp"
+#include <optional>
 
 #define SAVE_ARRANGE_POLY 0
 
diff --git a/src/slic3r/GUI/Jobs/ArrangeJob.hpp b/src/slic3r/GUI/Jobs/ArrangeJob.hpp
index 0c9f03de01..c161a55f2d 100644
--- a/src/slic3r/GUI/Jobs/ArrangeJob.hpp
+++ b/src/slic3r/GUI/Jobs/ArrangeJob.hpp
@@ -2,7 +2,11 @@
 #define ARRANGEJOB_HPP
 
 
+#include <map>
+#include "libslic3r/Polygon.hpp"
+#include <exception>
 #include <optional>
+#include <vector>
 
 #include "Job.hpp"
 #include "libslic3r/Arrange.hpp"
diff --git a/src/slic3r/GUI/Jobs/BindJob.cpp b/src/slic3r/GUI/Jobs/BindJob.cpp
index 76af712f63..502511ca7e 100644
--- a/src/slic3r/GUI/Jobs/BindJob.cpp
+++ b/src/slic3r/GUI/Jobs/BindJob.cpp
@@ -1,5 +1,6 @@
 #include "BindJob.hpp"
 
+#include "bambu_networking.hpp"
 #include "slic3r/GUI/Plater.hpp"
 #include "slic3r/GUI/GUI.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
@@ -9,6 +10,13 @@
 #include "slic3r/Utils/NetworkAgent.hpp"
 
 #include "slic3r/GUI/DeviceCore/DevManager.h"
+#include <wx/event.h>
+#include <string>
+#include <functional>
+#include <wx/datetime.h>
+#include "libslic3r/Utils.hpp"
+#include <boost/log/trivial.hpp>
+#include <exception>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/Jobs/BindJob.hpp b/src/slic3r/GUI/Jobs/BindJob.hpp
index 1e8aa91d6f..7670b58611 100644
--- a/src/slic3r/GUI/Jobs/BindJob.hpp
+++ b/src/slic3r/GUI/Jobs/BindJob.hpp
@@ -3,6 +3,10 @@
 
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/operations.hpp>
+#include <functional>
+#include <string>
+#include <exception>
+#include <wx/event.h>
 #include "Job.hpp"
 
 namespace fs = boost::filesystem;
diff --git a/src/slic3r/GUI/Jobs/BoostThreadWorker.cpp b/src/slic3r/GUI/Jobs/BoostThreadWorker.cpp
index 1c44a71eb7..9f1f52c763 100644
--- a/src/slic3r/GUI/Jobs/BoostThreadWorker.cpp
+++ b/src/slic3r/GUI/Jobs/BoostThreadWorker.cpp
@@ -1,4 +1,14 @@
+#include <boost/variant/get.hpp>
+#include <boost/log/trivial.hpp>
+#include <boost/chrono/duration.hpp>
 #include <exception>
+#include "slic3r/GUI/Jobs/ThreadSafeQueue.hpp"
+#include <utility>
+#include <future>
+#include <functional>
+#include <memory>
+#include "libslic3r/Thread.hpp"
+#include "slic3r/GUI/Jobs/Job.hpp"
 
 #include "BoostThreadWorker.hpp"
 
diff --git a/src/slic3r/GUI/Jobs/BoostThreadWorker.hpp b/src/slic3r/GUI/Jobs/BoostThreadWorker.hpp
index 3887be79c1..dc95047e41 100644
--- a/src/slic3r/GUI/Jobs/BoostThreadWorker.hpp
+++ b/src/slic3r/GUI/Jobs/BoostThreadWorker.hpp
@@ -1,12 +1,22 @@
 #ifndef BOOSTTHREADWORKER_HPP
 #define BOOSTTHREADWORKER_HPP
 
+#include <atomic>
 #include <boost/variant.hpp>
 
 #include "Worker.hpp"
 
+#include <exception>
+#include <functional>
+#include <future>
+#include <boost/variant/variant.hpp>
 #include <libslic3r/Thread.hpp>
 #include <boost/log/trivial.hpp>
+#include "slic3r/GUI/Jobs/Job.hpp"
+#include <memory>
+#include <string>
+#include <utility>
+#include "slic3r/GUI/Jobs/ProgressIndicator.hpp"
 
 #include "ThreadSafeQueue.hpp"
 #include "slic3r/GUI/GUI.hpp"
diff --git a/src/slic3r/GUI/Jobs/BusyCursorJob.hpp b/src/slic3r/GUI/Jobs/BusyCursorJob.hpp
index 8504d1eb93..12b9b15bcf 100644
--- a/src/slic3r/GUI/Jobs/BusyCursorJob.hpp
+++ b/src/slic3r/GUI/Jobs/BusyCursorJob.hpp
@@ -3,6 +3,8 @@
 
 #include "Job.hpp"
 
+#include <wx/busycursor.h>
+#include <exception>
 #include <wx/utils.h>
 #include <boost/log/trivial.hpp>
 
diff --git a/src/slic3r/GUI/Jobs/CreateFontNameImageJob.cpp b/src/slic3r/GUI/Jobs/CreateFontNameImageJob.cpp
index c452018a7f..6159182c2b 100644
--- a/src/slic3r/GUI/Jobs/CreateFontNameImageJob.cpp
+++ b/src/slic3r/GUI/Jobs/CreateFontNameImageJob.cpp
@@ -15,6 +15,20 @@
 #include "wx/fontenum.h"
 
 #include <boost/log/trivial.hpp>
+#include <string>
+#include <utility>
+#include <cassert>
+#include <memory>
+#include <cstddef>
+#include <functional>
+#include "libslic3r/TextConfiguration.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include <cmath>
+#include <vector>
+#include "libslic3r/SLA/RasterBase.hpp"
+#include "libslic3r/libslic3r.h"
+#include <exception>
 
 using namespace Slic3r;
 using namespace Slic3r::GUI;
diff --git a/src/slic3r/GUI/Jobs/CreateFontNameImageJob.hpp b/src/slic3r/GUI/Jobs/CreateFontNameImageJob.hpp
index e103e11682..572ac21d4e 100644
--- a/src/slic3r/GUI/Jobs/CreateFontNameImageJob.hpp
+++ b/src/slic3r/GUI/Jobs/CreateFontNameImageJob.hpp
@@ -1,6 +1,10 @@
 #ifndef slic3r_CreateFontNameImageJob_hpp_
 #define slic3r_CreateFontNameImageJob_hpp_
 
+#include <cstddef>
+#include <memory>
+#include <atomic>
+#include <exception>
 #include <vector>
 #include <string>
 #include <glad/gl.h>
diff --git a/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.cpp b/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.cpp
index 31bd6728b1..ac9b11b81e 100644
--- a/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.cpp
+++ b/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.cpp
@@ -1,6 +1,7 @@
 #include "CreateFontStyleImagesJob.hpp"
 
 // rasterization of ExPoly
+#include "EmbossStyleManager.hpp"
 #include "libslic3r/SLA/AGGRaster.hpp"
 #include "slic3r/GUI/3DScene.hpp" // ::glsafe
 
@@ -8,6 +9,19 @@
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/Plater.hpp"
 #include "slic3r/GUI/GLCanvas3D.hpp"
+#include <utility>
+#include <cassert>
+#include <vector>
+#include "libslic3r/ExPolygon.hpp"
+#include <cstddef>
+#include "libslic3r/Emboss.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include <cmath>
+#include "libslic3r/SLA/RasterBase.hpp"
+#include "libslic3r/libslic3r.h"
+#include <memory>
+#include <exception>
+#include <cstdint>
 
 using namespace Slic3r;
 using namespace Slic3r::Emboss;
diff --git a/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.hpp b/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.hpp
index b8c2757a62..f2f37c0418 100644
--- a/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.hpp
+++ b/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.hpp
@@ -1,6 +1,7 @@
 #ifndef slic3r_CreateFontStyleImagesJob_hpp_
 #define slic3r_CreateFontStyleImagesJob_hpp_
 
+#include <exception>
 #include <vector>
 #include <string>
 #include <libslic3r/Emboss.hpp>
diff --git a/src/slic3r/GUI/Jobs/EmbossJob.cpp b/src/slic3r/GUI/Jobs/EmbossJob.cpp
index 58cdbd95f4..e92ab2b1ed 100644
--- a/src/slic3r/GUI/Jobs/EmbossJob.cpp
+++ b/src/slic3r/GUI/Jobs/EmbossJob.cpp
@@ -1,6 +1,32 @@
 #include "EmbossJob.hpp"
 
+#include <optional>
+#include "libslic3r/Point.hpp"
+#include "slic3r/GUI/Jobs/Job.hpp"
+#include <exception>
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/Emboss.hpp"
+#include <cstddef>
+#include <cassert>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/Geometry.hpp"
+#include <memory>
+#include "slic3r/GUI/SurfaceDrag.hpp"
+#include <Eigen/Geometry>
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/EmbossShape.hpp"
+#include <cmath>
+#include <math.h>
+#include "libslic3r/TriangleMesh.hpp"
+#include "libslic3r/Utils.hpp"
+#include <functional>
+#include <limits>
+#include <algorithm>
+#include <cstdint>
 #include <stdexcept>
+#include <string>
 #include <type_traits>
 #include <boost/log/trivial.hpp>
 
@@ -9,6 +35,9 @@
 #include <libslic3r/CutSurface.hpp> // use surface cuts
 #include <libslic3r/BuildVolume.hpp> // create object
 #include <libslic3r/SLA/ReprojectPointsOnMesh.hpp>
+#include <vector>
+#include <utility>
+#include <wx/dataview.h>
 
 #include "libslic3r/libslic3r.h"
 #include "slic3r/GUI/Plater.hpp"
diff --git a/src/slic3r/GUI/Jobs/EmbossJob.hpp b/src/slic3r/GUI/Jobs/EmbossJob.hpp
index a9160619ca..9bf2fb0fc1 100644
--- a/src/slic3r/GUI/Jobs/EmbossJob.hpp
+++ b/src/slic3r/GUI/Jobs/EmbossJob.hpp
@@ -2,10 +2,15 @@
 #define slic3r_EmbossJob_hpp_
 
 #include <atomic>
+#include <exception>
 #include <memory>
+#include <optional>
+#include "slic3r/GUI/3DScene.hpp"
 #include <string>
 #include <libslic3r/Emboss.hpp>
 #include <libslic3r/EmbossShape.hpp> // ExPolygonsWithIds
+#include <utility>
+#include <vector>
 #include "libslic3r/Point.hpp" // Transform3d
 #include "libslic3r/ObjectID.hpp"
 
diff --git a/src/slic3r/GUI/Jobs/FillBedJob.cpp b/src/slic3r/GUI/Jobs/FillBedJob.cpp
index 961b8af566..f01dc846ca 100644
--- a/src/slic3r/GUI/Jobs/FillBedJob.cpp
+++ b/src/slic3r/GUI/Jobs/FillBedJob.cpp
@@ -9,7 +9,25 @@
 #include "slic3r/plugin/PluginManager.hpp"
 #include "libnest2d/common.hpp"
 
+#include <algorithm>
+#include <boost/log/trivial.hpp>
+#include "libslic3r/BoundingBox.hpp"
+#include <cstddef>
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Arrange.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include <exception>
+#include "libslic3r/LifecycleEvents.hpp"
 #include <numeric>
+#include "slic3r/GUI/Jobs/ArrangeJob.hpp"
+#include "slic3r/GUI/GUI_App.hpp"
+#include <utility>
+#include <string>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <vector>
+#include "slic3r/GUI/Jobs/Job.hpp"
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/Jobs/FillBedJob.hpp b/src/slic3r/GUI/Jobs/FillBedJob.hpp
index 28950aeac8..6a2300dc60 100644
--- a/src/slic3r/GUI/Jobs/FillBedJob.hpp
+++ b/src/slic3r/GUI/Jobs/FillBedJob.hpp
@@ -2,6 +2,10 @@
 #define FILLBEDJOB_HPP
 
 #include "ArrangeJob.hpp"
+#include "slic3r/GUI/Jobs/Job.hpp"
+#include "libslic3r/Arrange.hpp"
+#include "libslic3r/Point.hpp"
+#include <exception>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/Jobs/Job.hpp b/src/slic3r/GUI/Jobs/Job.hpp
index 4058acf03f..80254c43c3 100644
--- a/src/slic3r/GUI/Jobs/Job.hpp
+++ b/src/slic3r/GUI/Jobs/Job.hpp
@@ -3,8 +3,10 @@
 
 #include <atomic>
 #include <exception>
+#include <functional>
 #include <future>
 
+#include <string>
 #include <wx/window.h>
 
 #include "libslic3r/libslic3r.h"
diff --git a/src/slic3r/GUI/Jobs/NotificationProgressIndicator.cpp b/src/slic3r/GUI/Jobs/NotificationProgressIndicator.cpp
index bbe5898736..91d1c007c3 100644
--- a/src/slic3r/GUI/Jobs/NotificationProgressIndicator.cpp
+++ b/src/slic3r/GUI/Jobs/NotificationProgressIndicator.cpp
@@ -1,5 +1,7 @@
 #include "NotificationProgressIndicator.hpp"
 #include "slic3r/GUI/NotificationManager.hpp"
+#include <wx/string.h>
+#include <utility>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/Jobs/NotificationProgressIndicator.hpp b/src/slic3r/GUI/Jobs/NotificationProgressIndicator.hpp
index cc09876e31..89eff74ea2 100644
--- a/src/slic3r/GUI/Jobs/NotificationProgressIndicator.hpp
+++ b/src/slic3r/GUI/Jobs/NotificationProgressIndicator.hpp
@@ -2,6 +2,7 @@
 #define NOTIFICATIONPROGRESSINDICATOR_HPP
 
 #include "ProgressIndicator.hpp"
+#include <wx/string.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/Jobs/OAuthJob.cpp b/src/slic3r/GUI/Jobs/OAuthJob.cpp
index 8a8d02ac90..e24146f3d0 100644
--- a/src/slic3r/GUI/Jobs/OAuthJob.cpp
+++ b/src/slic3r/GUI/Jobs/OAuthJob.cpp
@@ -5,7 +5,15 @@
 #include "slic3r/GUI/I18N.hpp"
 #include "nlohmann/json.hpp"
 #include <boost/algorithm/string.hpp>
+#include <string>
+#include <boost/log/trivial.hpp>
+#include <memory>
+#include <boost/algorithm/string/predicate.hpp>
+#include "slic3r/GUI/HttpServer.hpp"
+#include <chrono>
+#include <exception>
 #include <thread>
+#include <wx/event.h>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/Jobs/OAuthJob.hpp b/src/slic3r/GUI/Jobs/OAuthJob.hpp
index 7b58c53b2e..0377cada59 100644
--- a/src/slic3r/GUI/Jobs/OAuthJob.hpp
+++ b/src/slic3r/GUI/Jobs/OAuthJob.hpp
@@ -3,9 +3,14 @@
 
 #include "Job.hpp"
 #include "slic3r/GUI/HttpServer.hpp"
+#include <boost/asio/ip/basic_endpoint.hpp>
 #include <boost/nowide/fstream.hpp>
 #include <boost/nowide/cstdio.hpp>
 #include <boost/log/trivial.hpp>
+#include <string>
+#include <memory>
+#include <exception>
+#include <wx/event.h>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/Jobs/OrientJob.cpp b/src/slic3r/GUI/Jobs/OrientJob.cpp
index ed9117e8bf..e9f5048c43 100644
--- a/src/slic3r/GUI/Jobs/OrientJob.cpp
+++ b/src/slic3r/GUI/Jobs/OrientJob.cpp
@@ -7,6 +7,24 @@
 #include "slic3r/GUI/NotificationManager.hpp"
 #include "slic3r/plugin/PluginManager.hpp"
 #include "libslic3r/PresetBundle.hpp"
+#include <cstddef>
+#include <vector>
+#include <utility>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "slic3r/GUI/PartPlate.hpp"
+#include <cassert>
+#include <boost/log/trivial.hpp>
+#include "slic3r/GUI/Jobs/Job.hpp"
+#include "libslic3r/Orient.hpp"
+#include <chrono>
+#include <string>
+#include <sstream>
+#include <ios>
+#include <iomanip>
+#include <exception>
+#include "libslic3r/LifecycleEvents.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Config.hpp"
 
 
 namespace Slic3r { namespace GUI {
diff --git a/src/slic3r/GUI/Jobs/OrientJob.hpp b/src/slic3r/GUI/Jobs/OrientJob.hpp
index 968be209ed..bf4eddc6e2 100644
--- a/src/slic3r/GUI/Jobs/OrientJob.hpp
+++ b/src/slic3r/GUI/Jobs/OrientJob.hpp
@@ -3,6 +3,9 @@
 
 #include "Job.hpp"
 #include "libslic3r/Orient.hpp"
+#include <vector>
+#include <exception>
+#include "libslic3r/Model.hpp"
 
 namespace Slic3r {
 
diff --git a/src/slic3r/GUI/Jobs/PrintJob.cpp b/src/slic3r/GUI/Jobs/PrintJob.cpp
index 2dea8801b5..265014c7e4 100644
--- a/src/slic3r/GUI/Jobs/PrintJob.cpp
+++ b/src/slic3r/GUI/Jobs/PrintJob.cpp
@@ -16,6 +16,25 @@
 #include "slic3r/Utils/FileTransferUtils.hpp"
 #include "slic3r/Utils/BBLNetworkPlugin.hpp"
 #include "NetworkAgent.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <string>
+#include "libslic3r/Utils.hpp"
+#include <boost/log/trivial.hpp>
+#include <functional>
+#include <cstddef>
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
+#include <wx/string.h>
+#include "slic3r/GUI/PartPlate.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include <memory>
+#include <exception>
+#include "libslic3r/Format/bbs_3mf.hpp"
+#include <algorithm>
+#include <regex>
+#include <tuple>
+#include <boost/chrono/duration.hpp>
+#include "slic3r/GUI/DeviceCore/DevStorage.h"
+#include <wx/event.h>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/Jobs/PrintJob.hpp b/src/slic3r/GUI/Jobs/PrintJob.hpp
index 4be68031d9..4207824471 100644
--- a/src/slic3r/GUI/Jobs/PrintJob.hpp
+++ b/src/slic3r/GUI/Jobs/PrintJob.hpp
@@ -3,6 +3,11 @@
 
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/operations.hpp>
+#include <functional>
+#include <string>
+#include <wx/string.h>
+#include <exception>
+#include <cstddef>
 #include "libslic3r/PrintConfig.hpp"
 #include "Job.hpp"
 #include "slic3r/GUI/DeviceCore/DevStorage.h" 
diff --git a/src/slic3r/GUI/Jobs/RotoptimizeJob.cpp b/src/slic3r/GUI/Jobs/RotoptimizeJob.cpp
index 7f8219008f..72dc7419f3 100644
--- a/src/slic3r/GUI/Jobs/RotoptimizeJob.cpp
+++ b/src/slic3r/GUI/Jobs/RotoptimizeJob.cpp
@@ -11,6 +11,12 @@
 
 #include "slic3r/GUI/GUI_App.hpp"
 #include "libslic3r/AppConfig.hpp"
+#include <string>
+#include <algorithm>
+#include <cstddef>
+#include <tuple>
+#include <exception>
+#include "libslic3r/libslic3r.h"
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/Jobs/RotoptimizeJob.hpp b/src/slic3r/GUI/Jobs/RotoptimizeJob.hpp
index 5e462c6cc1..1c27df3e54 100644
--- a/src/slic3r/GUI/Jobs/RotoptimizeJob.hpp
+++ b/src/slic3r/GUI/Jobs/RotoptimizeJob.hpp
@@ -6,6 +6,14 @@
 #include "libslic3r/SLA/Rotfinder.hpp"
 #include "libslic3r/PrintConfig.hpp"
 #include "slic3r/GUI/I18N.hpp"
+#include <functional>
+#include "libslic3r/Point.hpp"
+#include <string>
+#include <cstddef>
+#include <optional>
+#include <vector>
+#include <exception>
+#include <iterator>
 
 namespace Slic3r {
 
diff --git a/src/slic3r/GUI/Jobs/SLAImportJob.cpp b/src/slic3r/GUI/Jobs/SLAImportJob.cpp
index ef1d957441..d592bcbe21 100644
--- a/src/slic3r/GUI/Jobs/SLAImportJob.cpp
+++ b/src/slic3r/GUI/Jobs/SLAImportJob.cpp
@@ -10,6 +10,15 @@
 #include "libslic3r/Model.hpp"
 #include "libslic3r/PresetBundle.hpp"
 
+#include "libslic3r/Point.hpp"
+#include <string>
+#include "libslic3r/Config.hpp"
+#include <memory>
+#include "slic3r/GUI/GUI_App.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <exception>
+#include "libslic3r/PrintConfig.hpp"
+#include <utility>
 #include <wx/filename.h>
 
 namespace Slic3r { namespace GUI {
diff --git a/src/slic3r/GUI/Jobs/SLAImportJob.hpp b/src/slic3r/GUI/Jobs/SLAImportJob.hpp
index 4ea25bc752..c8f053260d 100644
--- a/src/slic3r/GUI/Jobs/SLAImportJob.hpp
+++ b/src/slic3r/GUI/Jobs/SLAImportJob.hpp
@@ -3,6 +3,9 @@
 
 #include "Job.hpp"
 #include "libslic3r/Point.hpp"
+#include <string>
+#include <memory>
+#include <exception>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/Jobs/SendJob.cpp b/src/slic3r/GUI/Jobs/SendJob.cpp
index a06144878c..9a155e6a85 100644
--- a/src/slic3r/GUI/Jobs/SendJob.cpp
+++ b/src/slic3r/GUI/Jobs/SendJob.cpp
@@ -1,4 +1,6 @@
 #include "SendJob.hpp"
+#include "json_diff.hpp"
+#include "bambu_networking.hpp"
 #include "libslic3r/LifecycleEvents.hpp"
 #include "slic3r/GUI/I18N.hpp"
 #include "slic3r/Utils/NetworkAgent.hpp"
@@ -9,6 +11,15 @@
 #include "slic3r/GUI/GUI.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/format.hpp"
+#include <string>
+#include "libslic3r/Utils.hpp"
+#include <boost/log/trivial.hpp>
+#include <cstdio>
+#include "slic3r/GUI/PartPlate.hpp"
+#include "slic3r/GUI/DeviceCore/DevStorage.h"
+#include <wx/event.h>
+#include <functional>
+#include <exception>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/Jobs/SendJob.hpp b/src/slic3r/GUI/Jobs/SendJob.hpp
index 86d180ac8c..c77efe69bb 100644
--- a/src/slic3r/GUI/Jobs/SendJob.hpp
+++ b/src/slic3r/GUI/Jobs/SendJob.hpp
@@ -3,6 +3,10 @@
 
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/operations.hpp>
+#include <functional>
+#include <string>
+#include <wx/string.h>
+#include <exception>
 #include "slic3r/GUI/DeviceCore/DevStorage.h" 
 #include "Job.hpp"
 #include "PrintJob.hpp"
diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.cpp b/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.cpp
index 25a6eeb301..03b4b14fc1 100644
--- a/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.cpp
+++ b/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.cpp
@@ -1,6 +1,14 @@
 #include "TextureDisplacementBakeJob.hpp"
 
 #include <algorithm>
+#include <functional>
+#include <utility>
+#include <string>
+#include "libslic3r/TextureDisplacement.hpp"
+#include <exception>
+#include <cstddef>
+#include "slic3r/GUI/Jobs/Worker.hpp"
+#include <memory>
 
 #include "libslic3r/Model.hpp"
 #include "libslic3r/format.hpp"
diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.hpp b/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.hpp
index 187df3d0e7..43358e40e3 100644
--- a/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.hpp
+++ b/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.hpp
@@ -1,7 +1,10 @@
 #ifndef slic3r_TextureDisplacementBakeJob_hpp_
 #define slic3r_TextureDisplacementBakeJob_hpp_
 
+#include <exception>
+#include <cstdint>
 #include <functional>
+#include "libslic3r/Point.hpp"
 #include <vector>
 
 #include "libslic3r/Color.hpp"
diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.cpp b/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.cpp
index 97958ead9d..10709a8346 100644
--- a/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.cpp
+++ b/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.cpp
@@ -6,6 +6,16 @@
 #include "slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.hpp"
 #include "slic3r/GUI/I18N.hpp"
 #include "slic3r/GUI/Plater.hpp"
+#include <functional>
+#include <vector>
+#include "libslic3r/TextureBake/TextureBakeDebug.hpp"
+#include <utility>
+#include <string>
+#include "libslic3r/TextureDisplacement.hpp"
+#include <exception>
+#include <cstddef>
+#include "slic3r/GUI/Jobs/Worker.hpp"
+#include <memory>
 
 namespace Slic3r::GUI {
 
diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.hpp b/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.hpp
index 0e7ca5c8a2..91e0621985 100644
--- a/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.hpp
+++ b/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.hpp
@@ -1,7 +1,10 @@
 #ifndef slic3r_TextureDisplacementDebugJob_hpp_
 #define slic3r_TextureDisplacementDebugJob_hpp_
 
+#include <cstddef>
+#include <exception>
 #include <functional>
+#include "libslic3r/Point.hpp"
 #include <vector>
 
 #include "libslic3r/ObjectID.hpp"
diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.cpp b/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.cpp
index 4494594c7d..24dcc2baa6 100644
--- a/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.cpp
+++ b/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.cpp
@@ -1,7 +1,16 @@
 #include "TextureDisplacementPrepareJob.hpp"
 
 #include <algorithm>
+#include <functional>
+#include <exception>
+#include "libslic3r/TextureDisplacement.hpp"
+#include <cstddef>
+#include <memory>
 #include <optional>
+#include <utility>
+#include <string>
+#include "slic3r/GUI/GLCanvas3D.hpp"
+#include "slic3r/GUI/Jobs/Worker.hpp"
 
 #include "libslic3r/Model.hpp"
 #include "libslic3r/TriangleSelector.hpp"
diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.hpp b/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.hpp
index efe6a8ce75..c1d51a0c6b 100644
--- a/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.hpp
+++ b/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.hpp
@@ -1,6 +1,7 @@
 #ifndef slic3r_TextureDisplacementPrepareJob_hpp_
 #define slic3r_TextureDisplacementPrepareJob_hpp_
 
+#include <exception>
 #include <functional>
 #include <string>
 #include <vector>
diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.cpp b/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.cpp
index 1845314f0d..e8c7dfca01 100644
--- a/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.cpp
+++ b/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.cpp
@@ -2,6 +2,13 @@
 
 #include "slic3r/GUI/I18N.hpp"
 #include "slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.hpp"
+#include <cstdint>
+#include <memory>
+#include <atomic>
+#include <functional>
+#include <utility>
+#include "libslic3r/TextureDisplacement.hpp"
+#include <exception>
 
 namespace Slic3r::GUI {
 
diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.hpp b/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.hpp
index 312cf6593e..5aa5d82d16 100644
--- a/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.hpp
+++ b/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.hpp
@@ -3,7 +3,9 @@
 
 #include <atomic>
 #include <cstdint>
+#include <exception>
 #include <functional>
+#include "libslic3r/Point.hpp"
 #include <memory>
 #include <vector>
 
diff --git a/src/slic3r/GUI/Jobs/ThreadSafeQueue.hpp b/src/slic3r/GUI/Jobs/ThreadSafeQueue.hpp
index 3ee1672bde..074bf1de5c 100644
--- a/src/slic3r/GUI/Jobs/ThreadSafeQueue.hpp
+++ b/src/slic3r/GUI/Jobs/ThreadSafeQueue.hpp
@@ -1,6 +1,9 @@
 #ifndef THREADSAFEQUEUE_HPP
 #define THREADSAFEQUEUE_HPP
 
+#include <deque>
+#include <chrono>
+#include <cstddef>
 #include <type_traits>
 #include <queue>
 #include <mutex>
diff --git a/src/slic3r/GUI/Jobs/UpgradeNetworkJob.cpp b/src/slic3r/GUI/Jobs/UpgradeNetworkJob.cpp
index 7090f0e2e0..d5cb7f4aae 100644
--- a/src/slic3r/GUI/Jobs/UpgradeNetworkJob.cpp
+++ b/src/slic3r/GUI/Jobs/UpgradeNetworkJob.cpp
@@ -4,6 +4,12 @@
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/I18N.hpp"
 #include "slic3r/Utils/Http.hpp"
+#include <wx/event.h>
+#include <functional>
+#include <boost/log/trivial.hpp>
+#include <boost/filesystem/operations.hpp>
+#include "libslic3r/Utils.hpp"
+#include <exception>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/Jobs/UpgradeNetworkJob.hpp b/src/slic3r/GUI/Jobs/UpgradeNetworkJob.hpp
index 3e634e0337..5b6288ff6a 100644
--- a/src/slic3r/GUI/Jobs/UpgradeNetworkJob.hpp
+++ b/src/slic3r/GUI/Jobs/UpgradeNetworkJob.hpp
@@ -3,8 +3,11 @@
 
 #include <boost/filesystem.hpp>
 #include <boost/log/trivial.hpp>
+#include <exception>
 #include <functional>
 #include "Job.hpp"
+#include <string>
+#include <wx/event.h>
 #include <wx/window.h>
 
 namespace fs = boost::filesystem;
diff --git a/src/slic3r/GUI/Jobs/Worker.hpp b/src/slic3r/GUI/Jobs/Worker.hpp
index 3a29d49e8a..428829716e 100644
--- a/src/slic3r/GUI/Jobs/Worker.hpp
+++ b/src/slic3r/GUI/Jobs/Worker.hpp
@@ -1,7 +1,10 @@
 #ifndef PRUSALSICER_WORKER_HPP
 #define PRUSALSICER_WORKER_HPP
 
+#include <exception>
 #include <memory>
+#include <type_traits>
+#include <utility>
 
 #include "Job.hpp"
 
diff --git a/src/slic3r/GUI/KBShortcutsDialog.cpp b/src/slic3r/GUI/KBShortcutsDialog.cpp
index 63580387a7..f7c0f23ae8 100644
--- a/src/slic3r/GUI/KBShortcutsDialog.cpp
+++ b/src/slic3r/GUI/KBShortcutsDialog.cpp
@@ -4,6 +4,20 @@
 #include "libslic3r/Utils.hpp"
 #include "GUI.hpp"
 #include "Notebook.hpp"
+#include <vector>
+#include "slic3r/GUI/Shortcuts.hpp"
+#include <wx/colour.h>
+#include <string>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/gdicmn.h>
+#include <wx/dialog.h>
+#include <wx/event.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <utility>
+#include <cstddef>
+#include <wx/panel.h>
+#include <variant>
+#include <optional>
 #include <wx/scrolwin.h>
 #include <wx/display.h>
 #include <algorithm>
@@ -20,6 +34,9 @@
 #include "Widgets/StaticLine.hpp"
 #include "Widgets/TabCtrl.hpp"
 #include <wx/notebook.h>
+#include <wx/wx.h>
+#include <wx/treebase.h>
+#include <wx/simplebook.h>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/KBShortcutsDialog.hpp b/src/slic3r/GUI/KBShortcutsDialog.hpp
index 3091726147..4be3967eb1 100644
--- a/src/slic3r/GUI/KBShortcutsDialog.hpp
+++ b/src/slic3r/GUI/KBShortcutsDialog.hpp
@@ -1,6 +1,12 @@
 #ifndef slic3r_GUI_KBShortcutsDialog_hpp_
 #define slic3r_GUI_KBShortcutsDialog_hpp_
 
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include "slic3r/GUI/KeyChord.hpp"
+#include <wx/event.h>
+#include <wx/colour.h>
 #include <wx/wx.h>
 #include <map>
 #include <variant>
diff --git a/src/slic3r/GUI/KeyChord.cpp b/src/slic3r/GUI/KeyChord.cpp
index f6aeacd3ce..768e503486 100644
--- a/src/slic3r/GUI/KeyChord.cpp
+++ b/src/slic3r/GUI/KeyChord.cpp
@@ -3,6 +3,11 @@
 #include "GUI.hpp"
 #include "I18N.hpp"
 
+#include <wx/accel.h>
+#include <string>
+#include <cstddef>
+#include <optional>
+#include <vector>
 #include <wx/event.h>
 
 #include <algorithm>
diff --git a/src/slic3r/GUI/KeyChord.hpp b/src/slic3r/GUI/KeyChord.hpp
index c2cfb88883..36d1ca8d16 100644
--- a/src/slic3r/GUI/KeyChord.hpp
+++ b/src/slic3r/GUI/KeyChord.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstddef>
 #include <wx/accel.h>
 #include <wx/defs.h>
 
diff --git a/src/slic3r/GUI/Lazy.cpp b/src/slic3r/GUI/Lazy.cpp
index 2a1a74510a..27e0844568 100644
--- a/src/slic3r/GUI/Lazy.cpp
+++ b/src/slic3r/GUI/Lazy.cpp
@@ -1,6 +1,9 @@
 #include "Lazy.hpp"
 
 #include <boost/log/trivial.hpp>
+#include <chrono>
+#include <memory>
+#include <string>
 #include <wx/app.h>
 #include <wx/utils.h>
 
diff --git a/src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.cpp b/src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.cpp
index 8a3c497eae..7c9d6e651d 100644
--- a/src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.cpp
+++ b/src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.cpp
@@ -2,12 +2,18 @@
 ///|/
 ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
 ///|/
+#include <Eigen/Geometry>
 #include <algorithm>
 #include <cmath>
+#include <cstdint>
 #include <cstring>
 #include <iterator>
 #include <cassert>
 #include <cinttypes>
+#include "libslic3r/Point.hpp"
+#include <string>
+#include "libslic3r/GCode/GCodeProcessor.hpp"
+#include <vector>
 
 #include "libslic3r/libslic3r.h"
 #include "LibVGCodeWrapper.hpp"
diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp
index 08da15d3e3..f8f1fcc199 100644
--- a/src/slic3r/GUI/MainFrame.cpp
+++ b/src/slic3r/GUI/MainFrame.cpp
@@ -1,6 +1,54 @@
 #include "MainFrame.hpp"
 
+#include <wx/event.h>
+#include "slic3r/GUI/Event.hpp"
+#include <wx/gdicmn.h>
+#include <wx/dcclient.h>
+#include "libslic3r/Utils.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/filehistory.h>
+#include "slic3r/GUI/BBLTopbar.hpp"
+#include "libslic3r/Format/bbs_3mf.hpp"
+#include <boost/lexical_cast.hpp>
+#include <optional>
+#include "slic3r/GUI/GLToolbar.hpp"
+#include "libslic3r/Preset.hpp"
+#include <functional>
+#include <wx/busycursor.h>
+#include <cstddef>
+#include "slic3r/GUI/Project.hpp"
+#include <wx/bookctrl.h>
+#include "slic3r/GUI/LazyPage.hpp"
+#include "slic3r/GUI/Monitor.hpp"
+#include "slic3r/GUI/PrinterWebView.hpp"
+#include "slic3r/GUI/MultiMachinePage.hpp"
+#include "slic3r/GUI/CalibrationPanel.hpp"
+#include "slic3r/GUI/ReleaseNote.hpp"
+#include "slic3r/GUI/GUI.hpp"
+#include <vector>
+#include "libslic3r/PublishSettings.hpp"
+#include "libslic3r/Config.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/colour.h>
+#include "slic3r/GUI/FilamentGroupPopup.hpp"
+#include "slic3r/GUI/Widgets/SideMenuPopup.hpp"
+#include <utility>
+#include "libslic3r/libslic3r.h"
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
+#include <algorithm>
+#include <wx/dirdlg.h>
+#include <exception>
+#include <wx/filedlg.h>
+#include "slic3r/GUI/Lazy.hpp"
+#include <wx/filefn.h>
+#include <string>
+#include <sstream>
+#include <wx/base64.h>
+#include <ctime>
+#include <boost/filesystem/operations.hpp>
+#include "slic3r/GUI/calib_dlg.hpp"
 #include <wx/panel.h>
+#include <wx/settings.h>
 #include <wx/textentry.h>
 #include <wx/notebook.h>
 #include <wx/listbook.h>
@@ -13,11 +61,13 @@
 //#include <wx/glcanvas.h>
 #include <wx/filename.h>
 #include <wx/debug.h>
+#include <wx/toplevel.h>
 #include <wx/utils.h>
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/property_tree/ptree.hpp>
+#include <wx/webview.h>
 
 #include "libslic3r/Print.hpp"
 #include "libslic3r/Polygon.hpp"
@@ -30,6 +80,7 @@
 #include "3DScene.hpp"
 #include "ParamsDialog.hpp"
 #include "PrintHostDialogs.hpp"
+#include "libslic3r_version.h"
 #include "wxExtensions.hpp"
 #include "GUI_ObjectList.hpp"
 #include "Mouse3DController.hpp"
diff --git a/src/slic3r/GUI/MainFrame.hpp b/src/slic3r/GUI/MainFrame.hpp
index 0033f41a18..8c4fc58d03 100644
--- a/src/slic3r/GUI/MainFrame.hpp
+++ b/src/slic3r/GUI/MainFrame.hpp
@@ -3,10 +3,21 @@
 
 #include "libslic3r/PrintConfig.hpp"
 
+#include <cstdint>
+#include "libslic3r/Config.hpp"
+#include "slic3r/GUI/Lazy.hpp"
+#include <wx/event.h>
+#include <functional>
+#include <cstddef>
+#include <deque>
 #include <wx/frame.h>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
 #include <wx/settings.h>
+#include <wx/sizer.h>
 #include <wx/string.h>
 #include <wx/filehistory.h>
+#include <wx/timer.h>
 #ifdef __APPLE__
 #include <wx/taskbar.h>
 #endif // __APPLE__
diff --git a/src/slic3r/GUI/MarkdownTip.cpp b/src/slic3r/GUI/MarkdownTip.cpp
index a22f4da87f..70422a4232 100644
--- a/src/slic3r/GUI/MarkdownTip.cpp
+++ b/src/slic3r/GUI/MarkdownTip.cpp
@@ -7,7 +7,21 @@
 #include "libslic3r/Utils.hpp"
 #include "I18N.hpp"
 
+#include <string>
+#include <sstream>
+#include <ios>
+#include <cctype>
+#include <iomanip>
+#include <boost/filesystem/operations.hpp>
+#include <boost/log/trivial.hpp>
+#include <cstddef>
 #include <wx/display.h>
+#include <wx/popupwin.h>
+#include <wx/sizer.h>
+#include <wx/timer.h>
+#include <wx/file.h>
+#include <wx/webview.h>
+#include <wx/window.h>
 
 namespace fs = boost::filesystem;
 
diff --git a/src/slic3r/GUI/MarkdownTip.hpp b/src/slic3r/GUI/MarkdownTip.hpp
index 0b28ea091f..adbb26721d 100644
--- a/src/slic3r/GUI/MarkdownTip.hpp
+++ b/src/slic3r/GUI/MarkdownTip.hpp
@@ -1,6 +1,8 @@
 #ifndef slic3r_MarkdownTip_hpp_
 #define slic3r_MarkdownTip_hpp_
 
+#include <string>
+#include <wx/gdicmn.h>
 #include <wx/popupwin.h>
 #include <wx/timer.h>
 #include <wx/webview.h>
diff --git a/src/slic3r/GUI/MediaFilePanel.cpp b/src/slic3r/GUI/MediaFilePanel.cpp
index e9e1f56b03..23aff37f77 100644
--- a/src/slic3r/GUI/MediaFilePanel.cpp
+++ b/src/slic3r/GUI/MediaFilePanel.cpp
@@ -4,6 +4,7 @@
 #include "GUI_App.hpp"
 #include "GUI.hpp"
 #include "DeviceManager.hpp"
+#include "libslic3r_version.h"
 #include "slic3r/Utils/NetworkAgent.hpp"
 #include "Plater.hpp"
 #include "Widgets/Button.hpp"
@@ -12,8 +13,30 @@
 #include "Printer/PrinterFileSystem.h"
 #include "MsgDialog.hpp"
 #include "Widgets/ProgressDialog.hpp"
+#include <cstddef>
+#include <algorithm>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/weak_ptr.hpp>
+#include <boost/log/trivial.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/lexical_cast.hpp>
+#include <functional>
 #include <libslic3r/Model.hpp>
 #include <libslic3r/Format/bbs_3mf.hpp>
+#include <wx/panel.h>
+#include <wx/event.h>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <wx/gdicmn.h>
+#include <utility>
+#include <wx/colour.h>
+#include <vector>
+#include <wx/progdlg.h>
+#include "libslic3r/Semver.hpp"
+#include <sstream>
+#include "slic3r/GUI/Event.hpp"
+#include <wx/string.h>
+#include <wx/utils.h>
+#include "slic3r/GUI/GUI_Utils.hpp"
 #include "DeviceCore/DevStorage.h"
 
 #ifdef __WXMSW__
diff --git a/src/slic3r/GUI/MediaFilePanel.h b/src/slic3r/GUI/MediaFilePanel.h
index 36696d2225..cdf6bf7df1 100644
--- a/src/slic3r/GUI/MediaFilePanel.h
+++ b/src/slic3r/GUI/MediaFilePanel.h
@@ -8,12 +8,17 @@
 #ifndef MediaFilePanel_h
 #define MediaFilePanel_h
 
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <cstddef>
 #include <set>
 
 #include "GUI_Utils.hpp"
 #include "wxExtensions.hpp"
 
+#include <wx/event.h>
+#include <string>
 #include <wx/frame.h>
+#include <wx/panel.h>
 
 class Button;
 class SwitchButton;
diff --git a/src/slic3r/GUI/MediaPlayCtrl.cpp b/src/slic3r/GUI/MediaPlayCtrl.cpp
index c854683368..d7a80a7823 100644
--- a/src/slic3r/GUI/MediaPlayCtrl.cpp
+++ b/src/slic3r/GUI/MediaPlayCtrl.cpp
@@ -1,4 +1,5 @@
 #include "MediaPlayCtrl.h"
+#include "PrinterNetworkTypes.hpp"
 #include "WebMediaController.hpp"
 #include "IPrinterAgent.hpp"
 #include "Widgets/Button.hpp"
@@ -8,6 +9,7 @@
 #include "GUI.hpp"
 #include "DeviceManager.hpp"
 #include "DeviceCore/DevConfigUtil.h"
+#include "libslic3r_version.h"
 #include "slic3r/Utils/NetworkAgent.hpp"
 #include "slic3r/Utils/NetworkAgentFactory.hpp"
 #include "libslic3r/Thread.hpp"
@@ -20,13 +22,46 @@
 
 #include <algorithm>
 
+#include <boost/chrono/duration.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/filesystem/file_status.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/nowide/cstdio.hpp>
 #include <boost/nowide/fstream.hpp>
 #include <boost/nowide/utf8_codecvt.hpp>
+#include <map>
+#include "libslic3r/Utils.hpp"
+#include <cstring>
+#include <boost/thread/lock_types.hpp>
+#include <memory>
+#include <cstddef>
+#include <cstdlib>
+#include <cstdio>
+#include <boost/process/pipe.hpp>
+#include <boost/process/start_dir.hpp>
+#include <boost/process/io.hpp>
+#include <boost/process/handles.hpp>
+#include <exception>
 #include <slic3r/GUI/DeviceManager.hpp>
+#include <string>
+#include "slic3r/GUI/wxMediaCtrl3.h"
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <wx/colour.h>
+#include <wx/dataobj.h>
+#include <wx/image.h>
+#include <wx/datetime.h>
+#include <vector>
+#include <utility>
+#include "slic3r/GUI/Jobs/UpgradeNetworkJob.hpp"
 #include <wx/mediactrl.h>
+#include <wx/panel.h>
+#include <wx/utils.h>
+#include <wx/uri.h>
 #undef pid_t
 #include <boost/process.hpp>
 #ifdef __WIN32__
diff --git a/src/slic3r/GUI/MediaPlayCtrl.h b/src/slic3r/GUI/MediaPlayCtrl.h
index 1d426fc685..8a8a15d474 100644
--- a/src/slic3r/GUI/MediaPlayCtrl.h
+++ b/src/slic3r/GUI/MediaPlayCtrl.h
@@ -13,6 +13,14 @@
 #include "WebRtcMediaController.hpp"
 #include "slic3r/Utils/IPrinterAgent.hpp"
 
+#include <wx/gdicmn.h>
+#include <wx/mediactrl.h>
+#include <wx/event.h>
+#include <string>
+#include <memory>
+#include <cstdint>
+#include <vector>
+#include <wx/datetime.h>
 #include <wx/panel.h>
 
 #include <boost/thread.hpp>
@@ -20,6 +28,7 @@
 
 #include <deque>
 #include <set>
+#include <wx/string.h>
 
 class Button;
 class Label;
diff --git a/src/slic3r/GUI/MeshUtils.cpp b/src/slic3r/GUI/MeshUtils.cpp
index 173c5d2f13..db7f9aa5f2 100644
--- a/src/slic3r/GUI/MeshUtils.cpp
+++ b/src/slic3r/GUI/MeshUtils.cpp
@@ -14,11 +14,31 @@
 #include "slic3r/GUI/CameraUtils.hpp"
 
 
+#include <cstddef>
+#include <algorithm>
+#include <cassert>
+#include <Eigen/Geometry>
+#include <Eigen/Core>
+#include <cstdlib>
+#include <cmath>
 #include <glad/gl.h>
 
 #include <igl/unproject.h>
 
 #include <cstdint>
+#include "libslic3r/AnyPtr.hpp"
+#include <utility>
+#include "libslic3r/Geometry.hpp"
+#include "libslic3r/Color.hpp"
+#include <vector>
+#include "slic3r/GUI/GLShader.hpp"
+#include "libslic3r/Point.hpp"
+#include <optional>
+#include <math.h>
+#include <limits>
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/AABBMesh.hpp"
 
 
 namespace Slic3r {
diff --git a/src/slic3r/GUI/MeshUtils.hpp b/src/slic3r/GUI/MeshUtils.hpp
index 679c0e2a97..4eed2c422a 100644
--- a/src/slic3r/GUI/MeshUtils.hpp
+++ b/src/slic3r/GUI/MeshUtils.hpp
@@ -11,9 +11,20 @@
 
 #include "slic3r/GUI/GLModel.hpp"
 
+#include <array>
+#include <cassert>
 #include <cfloat>
+#include "libslic3r/AnyPtr.hpp"
+#include "libslic3r/libslic3r.h"
+#include <iterator>
+#include "libslic3r/Color.hpp"
+#include <cstddef>
+#include "libslic3r/CSGMesh/CSGMesh.hpp"
+#include "libslic3r/ExPolygon.hpp"
 #include <optional>
 #include <memory>
+#include <vector>
+#include <utility>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/MixedFilamentDialog.cpp b/src/slic3r/GUI/MixedFilamentDialog.cpp
index 246c6548c6..314570f126 100644
--- a/src/slic3r/GUI/MixedFilamentDialog.cpp
+++ b/src/slic3r/GUI/MixedFilamentDialog.cpp
@@ -2,16 +2,36 @@
 
 #include <algorithm>
 #include <cmath>
+#include <cstddef>
+#include <cstring>
 #include <functional>
 #include <map>
 #include <set>
+#include <wx/colour.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <vector>
+#include <string>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/dc.h>
+#include <wx/dcmemory.h>
+#include <utility>
+#include <wx/chartype.h>
+#include <tuple>
+#include <wx/arrstr.h>
 #include <wx/image.h>
+#include <wx/panel.h>
 #include <wx/sizer.h>
 #include <wx/dcclient.h>
 #include <wx/dcbuffer.h>
 #include <wx/dcgraph.h>
 #include <wx/scrolwin.h>
+#include <wx/string.h>
 #include <wx/textctrl.h>
+#include <wx/toplevel.h>
+#include <wx/window.h>
+#include <wx/tglbtn.h>
 #include <wx/wrapsizer.h>
 #include <wx/tokenzr.h>
 
diff --git a/src/slic3r/GUI/MixedFilamentDialog.hpp b/src/slic3r/GUI/MixedFilamentDialog.hpp
index 381896494e..2e94b0c6e7 100644
--- a/src/slic3r/GUI/MixedFilamentDialog.hpp
+++ b/src/slic3r/GUI/MixedFilamentDialog.hpp
@@ -2,11 +2,17 @@
 #define slic3r_MixedFilamentDialog_hpp_
 
 #include <array>
+#include <cstddef>
 #include <string>
 #include <utility>
 #include <vector>
 #include <wx/bitmap.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <wx/colour.h>
 #include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/string.h>
 #include <wx/tglbtn.h>
 #include <wx/stattext.h>
 
diff --git a/src/slic3r/GUI/ModelMall.cpp b/src/slic3r/GUI/ModelMall.cpp
index 3de5da4613..bae46f2dcd 100644
--- a/src/slic3r/GUI/ModelMall.cpp
+++ b/src/slic3r/GUI/ModelMall.cpp
@@ -1,6 +1,20 @@
 #include "ModelMall.hpp"
 #include "GUI_App.hpp"
 
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/intl.h>
+#include <wx/gdicmn.h>
+#include <wx/toplevel.h>
+#include <wx/dialog.h>
+#include <wx/panel.h>
+#include <wx/string.h>
+#include <wx/anybutton.h>
+#include <wx/event.h>
+#include "slic3r/GUI/Widgets/WebView.hpp"
+#include <wx/log.h>
+#include <wx/webview.h>
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
+#include <exception>
 #include <wx/wx.h>
 #include <wx/sizer.h>
 #include <wx/statbox.h>
diff --git a/src/slic3r/GUI/ModelMall.hpp b/src/slic3r/GUI/ModelMall.hpp
index 06b6ebbfe3..7c7c2280b4 100644
--- a/src/slic3r/GUI/ModelMall.hpp
+++ b/src/slic3r/GUI/ModelMall.hpp
@@ -3,9 +3,14 @@
 
 #include "I18N.hpp"
 
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/event.h>
 #include <wx/font.h>
 #include <wx/colour.h>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
 #include <wx/settings.h>
+#include <wx/setup.h>
 #include <wx/string.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
@@ -15,6 +20,7 @@
 #include <wx/image.h>
 #include <wx/icon.h>
 #include <wx/dialog.h>
+#include <wx/webview.h>
 
 #if wxUSE_WEBVIEW_IE
 #include "wx/msw/webview_ie.h"
diff --git a/src/slic3r/GUI/Monitor.cpp b/src/slic3r/GUI/Monitor.cpp
index 91bbbf8930..b05ededd62 100644
--- a/src/slic3r/GUI/Monitor.cpp
+++ b/src/slic3r/GUI/Monitor.cpp
@@ -5,13 +5,32 @@
 #include "slic3r/Utils/bambu_networking.hpp"
 #include "slic3r/Utils/NetworkAgent.hpp"
 
+#include "slic3r/GUI/Monitor.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <utility>
+#include "slic3r/GUI/Field.hpp"
+#include <cstddef>
+#include "slic3r/GUI/SelectMachinePop.hpp"
+#include "slic3r/GUI/HMSPanel.hpp"
+#include "slic3r/GUI/Tabbook.hpp"
+#include "slic3r/GUI/StatusPanel.hpp"
+#include "slic3r/GUI/UpgradePanel.hpp"
+#include "slic3r/GUI/Widgets/SideTools.hpp"
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
 #include <wx/app.h>
+#include <wx/bookctrl.h>
 #include <wx/button.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include <wx/notebook.h>
 #include <wx/scrolwin.h>
 #include <wx/sizer.h>
 
 #include <wx/bmpcbox.h>
 #include <wx/bmpbuttn.h>
+#include <wx/string.h>
+#include <wx/timer.h>
 #include <wx/treectrl.h>
 #include <wx/imaglist.h>
 #include <wx/settings.h>
diff --git a/src/slic3r/GUI/Monitor.hpp b/src/slic3r/GUI/Monitor.hpp
index 94474f73b0..ce7fcf0570 100644
--- a/src/slic3r/GUI/Monitor.hpp
+++ b/src/slic3r/GUI/Monitor.hpp
@@ -2,11 +2,17 @@
 #define slic3r_Monitor_hpp_
 
 #include "Tabbook.hpp"
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <wx/event.h>
+#include <wx/bookctrl.h>
+#include "slic3r/GUI/StagedBuild.hpp"
+#include <string>
 #include <wx/notebook.h>
 #include <wx/scrolwin.h>
 #include <wx/sizer.h>
 #include <wx/bmpcbox.h>
 #include <wx/bmpbuttn.h>
+#include <wx/timer.h>
 #include <wx/treectrl.h>
 #include <wx/imaglist.h>
 #include <wx/artprov.h>
diff --git a/src/slic3r/GUI/MonitorBasePanel.cpp b/src/slic3r/GUI/MonitorBasePanel.cpp
index a63a86f997..21a49a4c65 100644
--- a/src/slic3r/GUI/MonitorBasePanel.cpp
+++ b/src/slic3r/GUI/MonitorBasePanel.cpp
@@ -8,6 +8,17 @@
 #include "MonitorBasePanel.h"
 #include "Printer/PrinterFileSystem.h"
 #include "Widgets/Label.hpp"
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/splitter.h>
+#include <wx/event.h>
+#include <cstddef>
+#include <wx/chartype.h>
+#include <wx/stattext.h>
+#include <wx/font.h>
+#include "slic3r/GUI/Widgets/StaticLine.hpp"
 
 ///////////////////////////////////////////////////////////////////////////
 using namespace Slic3r::GUI;
diff --git a/src/slic3r/GUI/MonitorBasePanel.h b/src/slic3r/GUI/MonitorBasePanel.h
index 42424a7187..fbfeec60c6 100644
--- a/src/slic3r/GUI/MonitorBasePanel.h
+++ b/src/slic3r/GUI/MonitorBasePanel.h
@@ -7,7 +7,9 @@
 
 #pragma once
 
+#include <cstddef>
 #include <wx/artprov.h>
+#include <wx/event.h>
 #include <wx/xrc/xmlres.h>
 #include <wx/panel.h>
 #include <wx/gdicmn.h>
diff --git a/src/slic3r/GUI/MonitorPage.cpp b/src/slic3r/GUI/MonitorPage.cpp
index 74fee260d1..54a9289b5b 100644
--- a/src/slic3r/GUI/MonitorPage.cpp
+++ b/src/slic3r/GUI/MonitorPage.cpp
@@ -1,4 +1,8 @@
 #include "MonitorPage.hpp"
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/MonitorPage.hpp b/src/slic3r/GUI/MonitorPage.hpp
index 3efaccda31..9e6e86e82d 100644
--- a/src/slic3r/GUI/MonitorPage.hpp
+++ b/src/slic3r/GUI/MonitorPage.hpp
@@ -1,6 +1,8 @@
 #ifndef slic3r_MonitorPage_hpp_
 #define slic3r_MonitorPage_hpp_
 
+#include <wx/event.h>
+#include <wx/gdicmn.h>
 #include <wx/panel.h>
 #include <wx/sizer.h>
 
diff --git a/src/slic3r/GUI/Mouse3DController.cpp b/src/slic3r/GUI/Mouse3DController.cpp
index 0317342412..161bfa7730 100644
--- a/src/slic3r/GUI/Mouse3DController.cpp
+++ b/src/slic3r/GUI/Mouse3DController.cpp
@@ -9,6 +9,23 @@
 #include "Plater.hpp"
 #include "NotificationManager.hpp"
 
+#include <vector>
+#include "libslic3r/Point.hpp"
+#include <cstddef>
+#include <mutex>
+#include <deque>
+#include <utility>
+#include <cassert>
+#include <string>
+#include <algorithm>
+#include <imgui.h>
+#include <chrono>
+#include <hidapi.h>
+#include <map>
+#include <boost/algorithm/string/trim.hpp>
+#include <ios>
+#include <wx/app.h>
+#include <cstdlib>
 #include <wx/glcanvas.h>
 
 #include <boost/nowide/convert.hpp>
diff --git a/src/slic3r/GUI/Mouse3DController.hpp b/src/slic3r/GUI/Mouse3DController.hpp
index 9fb9cf68c8..ac6a2b9b9f 100644
--- a/src/slic3r/GUI/Mouse3DController.hpp
+++ b/src/slic3r/GUI/Mouse3DController.hpp
@@ -2,6 +2,12 @@
 #define slic3r_Mouse3DController_hpp_
 
 // Enabled debug output to console and extended imgui dialog
+#include <cstddef>
+#include <limits>
+#include <deque>
+#include <map>
+#include <string>
+#include <array>
 #define ENABLE_3DCONNEXION_DEVICES_DEBUG_OUTPUT 0
 
 #include "libslic3r/Point.hpp"
diff --git a/src/slic3r/GUI/MsgDialog.cpp b/src/slic3r/GUI/MsgDialog.cpp
index 8c981a970f..cc5d97b358 100644
--- a/src/slic3r/GUI/MsgDialog.cpp
+++ b/src/slic3r/GUI/MsgDialog.cpp
@@ -1,5 +1,28 @@
 #include "MsgDialog.hpp"
 
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/dialog.h>
+#include <wx/font.h>
+#include "slic3r/GUI/Widgets/CheckBox.hpp"
+#include "slic3r/GUI/ReleaseNote.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <string>
+#include <vector>
+#include <utility>
+#include <cstddef>
+#include <wx/chartype.h>
+#include <wx/html/htmltag.h>
+#include <wx/dcclient.h>
+#include <functional>
+#include <cmath>
+#include <cassert>
+#include <wx/panel.h>
+#include "libslic3r/Semver.hpp"
+#include "slic3r/GUI/Widgets/HyperLink.hpp"
+#include <boost/log/trivial.hpp>
 #include <wx/settings.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
@@ -16,6 +39,10 @@
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/classification.hpp>
+#include <wx/string.h>
+#include <wx/tglbtn.h>
+#include <wx/toplevel.h>
+#include <wx/utils.h>
 
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Utils.hpp"
@@ -23,6 +50,7 @@
 #include "GUI.hpp"
 #include "I18N.hpp"
 //#include "ConfigWizard.hpp"
+#include "libslic3r_version.h"
 #include "wxExtensions.hpp"
 #include "Widgets/Label.hpp"
 #include "slic3r/GUI/MainFrame.hpp"
diff --git a/src/slic3r/GUI/MsgDialog.hpp b/src/slic3r/GUI/MsgDialog.hpp
index ed8079d88c..21ad283d0a 100644
--- a/src/slic3r/GUI/MsgDialog.hpp
+++ b/src/slic3r/GUI/MsgDialog.hpp
@@ -1,16 +1,25 @@
 #ifndef slic3r_MsgDialog_hpp_
 #define slic3r_MsgDialog_hpp_
 
+#include <cstddef>
+#include <functional>
+#include "slic3r/GUI/Widgets/Label.hpp"
 #include <string>
 #include <unordered_map>
 #include "GUI_Utils.hpp"
+#include <vector>
 #include <wx/dialog.h>
+#include <wx/event.h>
 #include <wx/font.h>
 #include <wx/bitmap.h>
+#include <wx/hashmap.h>
+#include <wx/gdicmn.h>
 #include <wx/msgdlg.h>
 #include <wx/richmsgdlg.h>
+#include <wx/string.h>
 #include <wx/textctrl.h>
 #include <wx/statline.h>
+#include <wx/translation.h>
 #include "Widgets/Button.hpp"
 #include "Widgets/CheckBox.hpp"
 #include "Widgets/TextInput.hpp"
diff --git a/src/slic3r/GUI/MultiChoiceDialog.cpp b/src/slic3r/GUI/MultiChoiceDialog.cpp
index 6bd5412737..e106d7869f 100644
--- a/src/slic3r/GUI/MultiChoiceDialog.cpp
+++ b/src/slic3r/GUI/MultiChoiceDialog.cpp
@@ -2,6 +2,18 @@
 
 #include "GUI_App.hpp"
 #include "MainFrame.hpp"
+#include <wx/string.h>
+#include <wx/arrstr.h>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/checklst.h>
+#include <wx/gdicmn.h>
+#include <wx/toplevel.h>
+#include <wx/sizer.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/Widgets/CheckList.hpp"
+#include "slic3r/GUI/Widgets/DialogButtons.hpp"
+#include <wx/event.h>
+#include <wx/dynarray.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/MultiChoiceDialog.hpp b/src/slic3r/GUI/MultiChoiceDialog.hpp
index f636bebd3b..a069c5e0df 100644
--- a/src/slic3r/GUI/MultiChoiceDialog.hpp
+++ b/src/slic3r/GUI/MultiChoiceDialog.hpp
@@ -4,6 +4,11 @@
 #include "Widgets/CheckList.hpp"
 #include "Widgets/DialogButtons.hpp"
 
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/string.h>
+#include <wx/arrstr.h>
+#include <wx/dynarray.h>
+#include <wx/gdicmn.h>
 #include <wx/wx.h>
 #include <vector>
 #include <map>
diff --git a/src/slic3r/GUI/MultiMachine.cpp b/src/slic3r/GUI/MultiMachine.cpp
index df6ccc1298..bbae95b37b 100644
--- a/src/slic3r/GUI/MultiMachine.cpp
+++ b/src/slic3r/GUI/MultiMachine.cpp
@@ -3,6 +3,10 @@
 
 #include "GUI_App.hpp"
 #include "MainFrame.hpp"
+#include <wx/event.h>
+#include <wx/string.h>
+#include <vector>
+#include <utility>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/MultiMachine.hpp b/src/slic3r/GUI/MultiMachine.hpp
index b38918225c..40ad2a0e61 100644
--- a/src/slic3r/GUI/MultiMachine.hpp
+++ b/src/slic3r/GUI/MultiMachine.hpp
@@ -3,7 +3,13 @@
 
 #include "GUI_Utils.hpp"
 #include "DeviceManager.hpp"
+#include <cstdint>
 #include <functional>
+#include <string>
+#include <wx/event.h>
+#include <wx/string.h>
+#include <vector>
+#include <unordered_map>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/MultiMachineManagerPage.cpp b/src/slic3r/GUI/MultiMachineManagerPage.cpp
index f68188a9f1..35a1b99b6a 100644
--- a/src/slic3r/GUI/MultiMachineManagerPage.cpp
+++ b/src/slic3r/GUI/MultiMachineManagerPage.cpp
@@ -3,6 +3,34 @@
 #include "MainFrame.hpp"
 
 #include "DeviceCore/DevManager.h"
+#include "slic3r/GUI/MultiMachine.hpp"
+#include <wx/event.h>
+#include "slic3r/GUI/Monitor.hpp"
+#include <wx/gdicmn.h>
+#include <wx/dcclient.h>
+#include <wx/dc.h>
+#include <wx/string.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/GUI.hpp"
+#include <string>
+#include "libslic3r/Utils.hpp"
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <utility>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "slic3r/GUI/MultiMachinePage.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/scrolwin.h>
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include <wx/valtext.h>
+#include <wx/textctrl.h>
+#include <wx/timer.h>
+#include <map>
+#include <algorithm>
+#include <cmath>
+#include <vector>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/MultiMachineManagerPage.hpp b/src/slic3r/GUI/MultiMachineManagerPage.hpp
index 9b5655a9ee..b0850219c9 100644
--- a/src/slic3r/GUI/MultiMachineManagerPage.hpp
+++ b/src/slic3r/GUI/MultiMachineManagerPage.hpp
@@ -6,6 +6,15 @@
 #include "wxExtensions.hpp"
 #include "Widgets/Button.hpp"
 #include "Widgets/TextInput.hpp"
+#include "slic3r/GUI/DeviceManager.hpp"
+#include <wx/event.h>
+#include <wx/dc.h>
+#include <wx/string.h>
+#include <wx/panel.h>
+#include <vector>
+#include <wx/timer.h>
+#include <wx/sizer.h>
+#include <wx/scrolwin.h>
 
 namespace Slic3r { 
 namespace GUI {
diff --git a/src/slic3r/GUI/MultiMachinePage.cpp b/src/slic3r/GUI/MultiMachinePage.cpp
index 2b6fe75f34..3238a7a723 100644
--- a/src/slic3r/GUI/MultiMachinePage.cpp
+++ b/src/slic3r/GUI/MultiMachinePage.cpp
@@ -3,6 +3,29 @@
 #include "MainFrame.hpp"
 
 #include "DeviceCore/DevManager.h"
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/timer.h>
+#include <wx/event.h>
+#include <wx/notebook.h>
+#include <wx/colour.h>
+#include <wx/bookctrl.h>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "slic3r/GUI/MultiMachine.hpp"
+#include <wx/dc.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/dcclient.h>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/toplevel.h>
+#include "slic3r/GUI/GUI.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <wx/scrolwin.h>
+#include <vector>
+#include "slic3r/GUI/MsgDialog.hpp"
+#include <string>
+#include <algorithm>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/MultiMachinePage.hpp b/src/slic3r/GUI/MultiMachinePage.hpp
index 14d531e8ab..ec23bd7d58 100644
--- a/src/slic3r/GUI/MultiMachinePage.hpp
+++ b/src/slic3r/GUI/MultiMachinePage.hpp
@@ -10,6 +10,19 @@
 #include "Lazy.hpp"
 
 #include "wx/button.h"
+#include <wx/panel.h>
+#include <wx/timer.h>
+#include <wx/sizer.h>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/MultiMachine.hpp"
+#include <wx/dc.h>
+#include <wx/event.h>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <wx/scrolwin.h>
+#include <map>
+#include <string>
 
 namespace Slic3r { 
 namespace GUI {
diff --git a/src/slic3r/GUI/MultiSendMachineModel.cpp b/src/slic3r/GUI/MultiSendMachineModel.cpp
index f7861516e4..c74de6aa50 100644
--- a/src/slic3r/GUI/MultiSendMachineModel.cpp
+++ b/src/slic3r/GUI/MultiSendMachineModel.cpp
@@ -1,6 +1,9 @@
 #include "MultiSendMachineModel.hpp"
 
 #include "GUI.hpp"
+#include <wx/dataview.h>
+#include "slic3r/GUI/DeviceManager.hpp"
+#include <wx/string.h>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/MultiTaskManagerPage.cpp b/src/slic3r/GUI/MultiTaskManagerPage.cpp
index d063b34743..df639bb029 100644
--- a/src/slic3r/GUI/MultiTaskManagerPage.cpp
+++ b/src/slic3r/GUI/MultiTaskManagerPage.cpp
@@ -4,8 +4,44 @@
 #include "GUI_App.hpp"
 #include "MainFrame.hpp"
 #include "Widgets/RadioBox.hpp"
+#include "slic3r/GUI/MultiMachine.hpp"
+#include <wx/event.h>
+#include <utility>
+#include <wx/colour.h>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <boost/log/trivial.hpp>
+#include <wx/gdicmn.h>
+#include <wx/dcclient.h>
+#include <wx/dc.h>
+#include "slic3r/GUI/MultiMachineManagerPage.hpp"
+#include <boost/algorithm/string/predicate.hpp>
+#include "libslic3r/Utils.hpp"
+#include "slic3r/GUI/Widgets/CheckBox.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <vector>
+#include <map>
+#include "slic3r/GUI/MultiMachinePage.hpp"
+#include <string>
+#include "slic3r/GUI/TaskManager.hpp"
+#include <algorithm>
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include <ctime>
+#include <sstream>
+#include <iomanip>
+#include <chrono>
+#include <wx/datetime.h>
+#include <cmath>
 #include <wx/listimpl.cpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
+#include <wx/sizer.h>
+#include <wx/string.h>
+#include <wx/panel.h>
+#include <wx/tglbtn.h>
+#include <wx/scrolwin.h>
+#include <wx/valtext.h>
+#include <wx/textctrl.h>
+#include <wx/timer.h>
 
 #include "DeviceCore/DevManager.h"
 
diff --git a/src/slic3r/GUI/MultiTaskManagerPage.hpp b/src/slic3r/GUI/MultiTaskManagerPage.hpp
index f1b35ca2aa..f03da412d1 100644
--- a/src/slic3r/GUI/MultiTaskManagerPage.hpp
+++ b/src/slic3r/GUI/MultiTaskManagerPage.hpp
@@ -13,6 +13,16 @@
 #include "Widgets/ScrolledWindow.hpp"
 #include "Widgets/PopupWindow.hpp"
 #include "Widgets/TextInput.hpp"
+#include <wx/event.h>
+#include <wx/dc.h>
+#include <wx/string.h>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <string>
+#include <wx/panel.h>
+#include <map>
+#include <wx/sizer.h>
+#include <wx/scrolwin.h>
+#include <wx/timer.h>
 
 namespace Slic3r { 
 namespace GUI {
diff --git a/src/slic3r/GUI/NativeCommands.cpp b/src/slic3r/GUI/NativeCommands.cpp
index 1297cd4a24..1725c94fcc 100644
--- a/src/slic3r/GUI/NativeCommands.cpp
+++ b/src/slic3r/GUI/NativeCommands.cpp
@@ -19,6 +19,9 @@
 #include "PlateSettingsDialog.hpp"
 #include "DeviceCore/DevManager.h"
 
+#include "libslic3r/Config.hpp"
+#include <functional>
+#include <initializer_list>
 #include <libslic3r/Model.hpp>
 #include <libslic3r/Utils.hpp>
 
@@ -26,11 +29,15 @@
 #include <cmath>
 #include <cstdlib>
 #include <exception>
+#include "libslic3r/libslic3r.h"
 #include <memory>
+#include "slic3r/GUI/ActionRegistry.hpp"
 #include <string>
 #include <tuple>
 #include <utility>
 
+#include <vector>
+#include <wx/string.h>
 #include <wx/utils.h>
 
 namespace Slic3r { namespace GUI {
diff --git a/src/slic3r/GUI/NetworkPluginDialog.cpp b/src/slic3r/GUI/NetworkPluginDialog.cpp
index 42e1fc5fc5..be5a0f1f53 100644
--- a/src/slic3r/GUI/NetworkPluginDialog.cpp
+++ b/src/slic3r/GUI/NetworkPluginDialog.cpp
@@ -9,9 +9,20 @@
 #include "wxExtensions.hpp"
 #include "slic3r/Utils/bambu_networking.hpp"
 
+#include <string>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/dialog.h>
+#include <wx/panel.h>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "slic3r/GUI/Widgets/CheckBox.hpp"
+#include "slic3r/GUI/Widgets/ComboBox.hpp"
 #include <wx/sizer.h>
 #include <wx/stattext.h>
 #include <wx/collpane.h>
+#include <wx/string.h>
+#include <wx/tglbtn.h>
 
 #define BORDER_W     FromDIP(20)
 #define TEXT_WRAP    FromDIP(400)
diff --git a/src/slic3r/GUI/NetworkPluginDialog.hpp b/src/slic3r/GUI/NetworkPluginDialog.hpp
index 6c7585411a..202ec9fb8c 100644
--- a/src/slic3r/GUI/NetworkPluginDialog.hpp
+++ b/src/slic3r/GUI/NetworkPluginDialog.hpp
@@ -6,7 +6,11 @@
 #include "Widgets/ComboBox.hpp"
 #include "Widgets/Button.hpp"
 #include "slic3r/Utils/bambu_networking.hpp"
+#include <string>
+#include <vector>
 #include <wx/collpane.h>
+#include <wx/string.h>
+#include <wx/event.h>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/NetworkTestDialog.cpp b/src/slic3r/GUI/NetworkTestDialog.cpp
index 53876d9f97..c1ce56b863 100644
--- a/src/slic3r/GUI/NetworkTestDialog.cpp
+++ b/src/slic3r/GUI/NetworkTestDialog.cpp
@@ -5,10 +5,26 @@
 #include "GUI.hpp"
 #include "GUI_App.hpp"
 #include "I18N.hpp"
+#include "libslic3r_version.h"
 #include "slic3r/Utils/Http.hpp"
 #include "libslic3r/AppConfig.hpp"
 #include <boost/asio/ip/address.hpp>
 #include <boost/log/trivial.hpp>
+#include <wx/event.h>
+#include <wx/string.h>
+#include <wx/wx.h>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/dialog.h>
+#include <wx/toplevel.h>
+#include <wx/sizer.h>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <ctime>
+#include <sstream>
+#include <iomanip>
+#include <exception>
+#include <wx/utils.h>
+#include <string>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/NetworkTestDialog.hpp b/src/slic3r/GUI/NetworkTestDialog.hpp
index 7a0622bcd4..cb1afe8377 100644
--- a/src/slic3r/GUI/NetworkTestDialog.hpp
+++ b/src/slic3r/GUI/NetworkTestDialog.hpp
@@ -1,6 +1,7 @@
 #ifndef slic3r_GUI_NetworkTestDialog_hpp_
 #define slic3r_GUI_NetworkTestDialog_hpp_
 
+#include <wx/event.h>
 #include <wx/wx.h>
 #include <boost/thread.hpp>
 
diff --git a/src/slic3r/GUI/Notebook.cpp b/src/slic3r/GUI/Notebook.cpp
index 7b69effacc..54c188fa38 100644
--- a/src/slic3r/GUI/Notebook.cpp
+++ b/src/slic3r/GUI/Notebook.cpp
@@ -9,9 +9,19 @@
 //BBS set font size
 #include "Widgets/Label.hpp"
 
+#include <wx/bookctrl.h>
+#include <cmath>
+#include <cstddef>
+#include <utility>
+#include <string>
+#include <algorithm>
 #include <wx/button.h>
+#include <wx/colour.h>
 #include <wx/dcclient.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
 #include <wx/sizer.h>
+#include <wx/window.h>
 
 wxDEFINE_EVENT(wxCUSTOMEVT_NOTEBOOK_SEL_CHANGED, wxCommandEvent);
 
diff --git a/src/slic3r/GUI/Notebook.hpp b/src/slic3r/GUI/Notebook.hpp
index cc6ad91f21..1153161856 100644
--- a/src/slic3r/GUI/Notebook.hpp
+++ b/src/slic3r/GUI/Notebook.hpp
@@ -3,12 +3,21 @@
 
 //#ifdef _WIN32
 
+#include <cstddef>
 #include <initializer_list>
 #include <string>
 #include <vector>
 #include <wx/bookctrl.h>
 #include <wx/bitmap.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/debug.h>
+#include <wx/chartype.h>
+#include <wx/object.h>
 #include <wx/sizer.h>
+#include <wx/string.h>
+#include <wx/withimages.h>
+#include <wx/window.h>
 
 class ScalableButton;
 class Button;
diff --git a/src/slic3r/GUI/NotificationManager.cpp b/src/slic3r/GUI/NotificationManager.cpp
index e6172135a6..cc391df8b5 100644
--- a/src/slic3r/GUI/NotificationManager.cpp
+++ b/src/slic3r/GUI/NotificationManager.cpp
@@ -14,14 +14,41 @@
 #include "libslic3r/PrintBase.hpp"
 #include "format.hpp"
 
+#include <algorithm>
 #include <boost/algorithm/string.hpp>
+#include <boost/bind/placeholders.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/bind/bind.hpp>
 #include <boost/nowide/convert.hpp>
 
+#include <imgui.h>
+#include <cstddef>
+#include <cassert>
+#include <functional>
+#include <cwctype>
+#include <cstdint>
+#include <iomanip>
 #include <iostream>
 
+#include <string>
+#include <utility>
+#include "libslic3r/Preset.hpp"
+#include <wx/event.h>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "slic3r/GUI/GLCanvas3D.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <limits>
+#include <sstream>
+#include <vector>
+#include "slic3r/GUI/Downloader.hpp"
+#include <memory>
+#include <iterator>
+#include "libslic3r/Model.hpp"
+#include <wx/dataview.h>
+#include "slic3r/GUI/Plater.hpp"
 #include <wx/glcanvas.h>
+#include <wx/utils.h>
+#include <wx/time.h>
 
 #include "GUI_App.hpp"
 #include "FilamentMapDialog.hpp"
diff --git a/src/slic3r/GUI/NotificationManager.hpp b/src/slic3r/GUI/NotificationManager.hpp
index cb65524dac..2613d3da9a 100644
--- a/src/slic3r/GUI/NotificationManager.hpp
+++ b/src/slic3r/GUI/NotificationManager.hpp
@@ -9,9 +9,16 @@
 #include "Jobs/ProgressIndicator.hpp"
 #include "Downloader.hpp"
 
+#include <cstdint>
+#include <cstddef>
+#include <imgui.h>
 #include <libslic3r/ObjectID.hpp>
+#include "libslic3r/PrintBase.hpp"
 #include <libslic3r/Technologies.hpp>
 
+#include <wx/event.h>
+#include <limits>
+#include <memory>
 #include <wx/time.h>
 
 #include <string>
@@ -22,6 +29,7 @@
 #include <unordered_set>
 
 #include <libslic3r/Preset.hpp>
+#include <wx/utils.h>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/OAuthDialog.cpp b/src/slic3r/GUI/OAuthDialog.cpp
index 40b5216832..66dd3c8970 100644
--- a/src/slic3r/GUI/OAuthDialog.cpp
+++ b/src/slic3r/GUI/OAuthDialog.cpp
@@ -5,6 +5,16 @@
 #include "Jobs/PlaterWorker.hpp"
 #include "wxExtensions.hpp"
 #include "Widgets/DialogButtons.hpp"
+#include "slic3r/GUI/Jobs/OAuthJob.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/dialog.h>
+#include <memory>
+#include <wx/sizer.h>
+#include "slic3r/GUI/Jobs/Worker.hpp"
+#include <utility>
+#include <wx/utils.h>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/OAuthDialog.hpp b/src/slic3r/GUI/OAuthDialog.hpp
index 3301cd9997..199d8f1c9c 100644
--- a/src/slic3r/GUI/OAuthDialog.hpp
+++ b/src/slic3r/GUI/OAuthDialog.hpp
@@ -4,6 +4,8 @@
 #include "GUI_Utils.hpp"
 #include "Jobs/OAuthJob.hpp"
 #include "Jobs/Worker.hpp"
+#include <memory>
+#include <wx/event.h>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/OG_CustomCtrl.cpp b/src/slic3r/GUI/OG_CustomCtrl.cpp
index 4fce046162..890e85fa9f 100644
--- a/src/slic3r/GUI/OG_CustomCtrl.cpp
+++ b/src/slic3r/GUI/OG_CustomCtrl.cpp
@@ -6,12 +6,32 @@
 #include "MsgDialog.hpp"
 #include "libslic3r/AppConfig.hpp"
 
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include <wx/stattext.h>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <cmath>
+#include <wx/event.h>
+#include <vector>
+#include <wx/types.h>
+#include <cassert>
+#include "slic3r/GUI/Field.hpp"
+#include <wx/dcclient.h>
+#include <wx/dc.h>
+#include <wx/colour.h>
+#include <cstddef>
+#include <wx/settings.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include "slic3r/GUI/GUI.hpp"
+#include "libslic3r/Config.hpp"
+#include <algorithm>
 #include <wx/utils.h>
 #include <boost/algorithm/string/split.hpp>
 #include "libslic3r/Utils.hpp"
 #include "I18N.hpp"
 #include "format.hpp"
 #include <slic3r/GUI/Widgets/Label.hpp>
+#include <wx/validate.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/OG_CustomCtrl.hpp b/src/slic3r/GUI/OG_CustomCtrl.hpp
index a9c5326618..c0ea80c172 100644
--- a/src/slic3r/GUI/OG_CustomCtrl.hpp
+++ b/src/slic3r/GUI/OG_CustomCtrl.hpp
@@ -1,11 +1,23 @@
 #ifndef slic3r_OG_CustomCtrl_hpp_
 #define slic3r_OG_CustomCtrl_hpp_
 
+#include <wx/panel.h>
+#include <wx/gdicmn.h>
+#include <wx/dc.h>
+#include <wx/colour.h>
+#include <cstddef>
+#include <vector>
+#include <wx/event.h>
+#include "slic3r/GUI/Field.hpp"
+#include <wx/sizer.h>
 #include <wx/stattext.h>
 #include <wx/settings.h>
 
 #include <map>
 #include <functional>
+#include <wx/types.h>
+#include <wx/string.h>
+#include <wx/validate.h>
 
 #include "libslic3r/Config.hpp"
 #include "libslic3r/PrintConfig.hpp"
diff --git a/src/slic3r/GUI/ObjColorDialog.cpp b/src/slic3r/GUI/ObjColorDialog.cpp
index 4388449bb5..e43b78762a 100644
--- a/src/slic3r/GUI/ObjColorDialog.cpp
+++ b/src/slic3r/GUI/ObjColorDialog.cpp
@@ -1,4 +1,19 @@
 #include <algorithm>
+#include "libslic3r/TriangleSelector.hpp"
+#include "slic3r/GUI/Widgets/HyperLink.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "libslic3r/Format/OBJ.hpp"
+#include <cstddef>
+#include "libslic3r/Color.hpp"
+#include "slic3r/GUI/GuiColor.hpp"
+#include "slic3r/GUI/Widgets/SpinInput.hpp"
+#include "slic3r/GUI/Plater.hpp"
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <cmath>
+#include <cstdlib>
+#include <boost/log/trivial.hpp>
+#include "slic3r/GUI/PartPlate.hpp"
+#include "slic3r/GUI/Camera.hpp"
 #include <sstream>
 //#include "libslic3r/FlushVolCalc.hpp"
 #include "ObjColorDialog.hpp"
@@ -13,7 +28,22 @@
 #include "BitmapComboBox.hpp"
 #include "Widgets/ComboBox.hpp"
 #include "Widgets/DialogButtons.hpp"
+#include <wx/colour.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <vector>
+#include <string>
+#include <wx/dialog.h>
+#include <wx/panel.h>
+#include <wx/busycursor.h>
+#include <wx/arrstr.h>
+#include <wx/image.h>
+#include <wx/anybutton.h>
+#include <wx/scrolwin.h>
 #include <wx/sizer.h>
+#include <wx/string.h>
+#include <wx/textctrl.h>
+#include <wx/spinctrl.h>
 
 #include "libslic3r/ObjColorUtils.hpp"
 #include "libslic3r/Model.hpp"
diff --git a/src/slic3r/GUI/ObjColorDialog.hpp b/src/slic3r/GUI/ObjColorDialog.hpp
index 34f9eb5de5..ffe27f8b58 100644
--- a/src/slic3r/GUI/ObjColorDialog.hpp
+++ b/src/slic3r/GUI/ObjColorDialog.hpp
@@ -5,6 +5,15 @@
 #include "Camera.hpp"
 #include "GuiColor.hpp"
 #include "libslic3r/Format/OBJ.hpp"
+#include <wx/panel.h>
+#include <vector>
+#include <string>
+#include <functional>
+#include <wx/colour.h>
+#include <wx/scrolwin.h>
+#include "libslic3r/Color.hpp"
+#include "libslic3r/Point.hpp"
+#include <unordered_map>
 #include <wx/sizer.h>
 #include <wx/spinctrl.h>
 #include <wx/stattext.h>
diff --git a/src/slic3r/GUI/ObjectDataViewModel.cpp b/src/slic3r/GUI/ObjectDataViewModel.cpp
index a20dc50877..eea00e57e6 100644
--- a/src/slic3r/GUI/ObjectDataViewModel.cpp
+++ b/src/slic3r/GUI/ObjectDataViewModel.cpp
@@ -10,8 +10,28 @@
 
 #include "libslic3r/Model.hpp"
 
+#include <string>
+#include <map>
+#include <cassert>
+#include <vector>
+#include "slic3r/GUI/ExtraRenderers.hpp"
+#include <cstdio>
+#include <cstddef>
+#include <cstdlib>
+#include <algorithm>
+#include "slic3r/GUI/GUI_ObjectSettings.hpp"
+#include <tuple>
 #include <wx/bmpcbox.h>
+#include <wx/chartype.h>
+#include <wx/dataview.h>
 #include <wx/dc.h>
+#include <wx/event.h>
+#include <wx/string.h>
+#include <wx/variant.h>
+#include <wx/gdicmn.h>
+#include <wx/strconv.h>
+#include <wx/debug.h>
+#include <wx/dynarray.h>
 
 
 namespace Slic3r {
diff --git a/src/slic3r/GUI/ObjectDataViewModel.hpp b/src/slic3r/GUI/ObjectDataViewModel.hpp
index 137863a36c..25cea565a6 100644
--- a/src/slic3r/GUI/ObjectDataViewModel.hpp
+++ b/src/slic3r/GUI/ObjectDataViewModel.hpp
@@ -2,9 +2,18 @@
 #define slic3r_GUI_ObjectDataViewModel_hpp_
 
 #include <boost/log/trivial.hpp>
+#include <utility>
+#include <cstddef>
+#include <string>
+#include <cassert>
+#include <tuple>
 #include <wx/dataview.h>
 #include <vector>
 #include <map>
+#include <wx/dynarray.h>
+#include <wx/string.h>
+#include <wx/variant.h>
+#include <wx/event.h>
 
 #include "ExtraRenderers.hpp"
 
diff --git a/src/slic3r/GUI/OpenGLManager.cpp b/src/slic3r/GUI/OpenGLManager.cpp
index 0fc8ce9c6e..0224de1b8a 100644
--- a/src/slic3r/GUI/OpenGLManager.cpp
+++ b/src/slic3r/GUI/OpenGLManager.cpp
@@ -8,14 +8,28 @@
 #include "libslic3r/AppConfig.hpp"
 #include "libslic3r/Platform.hpp"
 
+#include <boost/algorithm/string/predicate.hpp>
+#include <algorithm>
+#include <boost/algorithm/string/constants.hpp>
+#include <cstdlib>
 #include <glad/gl.h>
 
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/log/trivial.hpp>
 
+#include <string>
+#include <ostream>
+#include "libslic3r/Utils.hpp"
+#include <vector>
+#include <sstream>
+#include <utility>
+#include <wx/gdicmn.h>
 #include <wx/glcanvas.h>
+#include <wx/log.h>
 #include <wx/msgdlg.h>
+#include <wx/string.h>
+#include <wx/version.h>
 
 #include "GUI_Init.hpp"
 
diff --git a/src/slic3r/GUI/OpenGLManager.hpp b/src/slic3r/GUI/OpenGLManager.hpp
index b9ba064a59..ebd44170cb 100644
--- a/src/slic3r/GUI/OpenGLManager.hpp
+++ b/src/slic3r/GUI/OpenGLManager.hpp
@@ -2,6 +2,9 @@
 #define slic3r_OpenGLManager_hpp_
 
 #include "GLShadersManager.hpp"
+#include <string>
+#include <utility>
+#include "slic3r/GUI/GLShader.hpp"
 
 class wxWindow;
 class wxGLCanvas;
diff --git a/src/slic3r/GUI/OptionsGroup.cpp b/src/slic3r/GUI/OptionsGroup.cpp
index 84e6fc43c3..711a95e209 100644
--- a/src/slic3r/GUI/OptionsGroup.cpp
+++ b/src/slic3r/GUI/OptionsGroup.cpp
@@ -11,11 +11,25 @@
 #include "Widgets/StaticLine.hpp"
 #include "Widgets/LabeledStaticBox.hpp"
 
+#include <boost/any.hpp>
 #include <boost/log/trivial.hpp>
+#include <functional>
+#include <cstddef>
+#include <iostream>
 #include <libslic3r/Config.hpp>
+#include "slic3r/GUI/Field.hpp"
+#include "libslic3r/Preset.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/plugin/PluginDescriptor.hpp"
+#include "slic3r/GUI/GUI.hpp"
+#include "libslic3r/PrintConfig.hpp"
 #include <slic3r/plugin/PythonPluginInterface.hpp>
+#include <string>
 #include <utility>
+#include <vector>
 #include <wx/bookctrl.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
 #include <wx/numformatter.h>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/classification.hpp>
@@ -26,6 +40,9 @@
 #include "I18N.hpp"
 #include <algorithm>
 #include <locale>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+#include <wx/utils.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/OptionsGroup.hpp b/src/slic3r/GUI/OptionsGroup.hpp
index 8dde661bdd..63ebee7176 100644
--- a/src/slic3r/GUI/OptionsGroup.hpp
+++ b/src/slic3r/GUI/OptionsGroup.hpp
@@ -1,11 +1,20 @@
 #ifndef slic3r_OptionsGroup_hpp_
 #define slic3r_OptionsGroup_hpp_
 
+#include <exception>
+#include <wx/sizer.h>
+#include <memory>
+#include <string>
+#include <cstddef>
+#include <vector>
+#include <utility>
+#include <boost/any.hpp>
 #include <wx/stattext.h>
 #include <wx/settings.h>
 
 #include <map>
 #include <functional>
+#include <wx/string.h>
 
 #include "libslic3r/Config.hpp"
 #include "libslic3r/PrintConfig.hpp"
diff --git a/src/slic3r/GUI/ParamsDialog.cpp b/src/slic3r/GUI/ParamsDialog.cpp
index 740df52049..87888848a6 100644
--- a/src/slic3r/GUI/ParamsDialog.cpp
+++ b/src/slic3r/GUI/ParamsDialog.cpp
@@ -6,6 +6,16 @@
 #include "Tab.hpp"
 
 #include "libslic3r/Utils.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/wx.h>
+#include <wx/gdicmn.h>
+#include <wx/toplevel.h>
+#include <wx/bookctrl.h>
+#include <wx/sizer.h>
+#include <cstddef>
+#include <wx/event.h>
+#include <wx/utils.h>
+#include "slic3r/GUI/Event.hpp"
 
 namespace pt = boost::property_tree;
 typedef pt::ptree JSON;
diff --git a/src/slic3r/GUI/ParamsDialog.hpp b/src/slic3r/GUI/ParamsDialog.hpp
index 1c8a25a26a..9ad34e165e 100644
--- a/src/slic3r/GUI/ParamsDialog.hpp
+++ b/src/slic3r/GUI/ParamsDialog.hpp
@@ -1,6 +1,11 @@
 #ifndef slic3r_GUI_ParamsDialog_hpp_
 #define slic3r_GUI_ParamsDialog_hpp_
 
+#include <wx/event.h>
+#include "slic3r/GUI/Event.hpp"
+#include <wx/object.h>
+#include <string>
+#include <wx/utils.h>
 #include <wx/wx.h>
 #include <wx/intl.h>
 #include <wx/collpane.h>
diff --git a/src/slic3r/GUI/ParamsPanel.cpp b/src/slic3r/GUI/ParamsPanel.cpp
index 9e16fcf8df..674bbcd54f 100644
--- a/src/slic3r/GUI/ParamsPanel.cpp
+++ b/src/slic3r/GUI/ParamsPanel.cpp
@@ -17,6 +17,27 @@
 #include "Widgets/SwitchButton.hpp"
 #include "Widgets/Button.hpp"
 #include "GUI_Factories.hpp"
+#include "libslic3r/Config.hpp"
+#include <string>
+#include <map>
+#include <wx/string.h>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/gdicmn.h>
+#include <wx/toplevel.h>
+#include <wx/sizer.h>
+#include <wx/panel.h>
+#include "slic3r/GUI/Field.hpp"
+#include "slic3r/GUI/Widgets/CheckBox.hpp"
+#include <wx/tglbtn.h>
+#include <wx/event.h>
+#include <utility>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <wx/anybutton.h>
+#include <wx/timer.h>
+#include <cstddef>
+#include <boost/log/trivial.hpp>
+#include <wx/wupdlock.h>
+#include <vector>
 
 
 namespace Slic3r {
diff --git a/src/slic3r/GUI/ParamsPanel.hpp b/src/slic3r/GUI/ParamsPanel.hpp
index f4e151456d..8ae3c34fa3 100644
--- a/src/slic3r/GUI/ParamsPanel.hpp
+++ b/src/slic3r/GUI/ParamsPanel.hpp
@@ -3,11 +3,14 @@
 
 
 #include <map>
+#include <string>
+#include <utility>
 #include <vector>
 #include <memory>
 
 
 #include <wx/artprov.h>
+#include <wx/event.h>
 #include <wx/xrc/xmlres.h>
 #include <wx/string.h>
 #include <wx/stattext.h>
diff --git a/src/slic3r/GUI/PartPlate.cpp b/src/slic3r/GUI/PartPlate.cpp
index 8e2d6ba37b..41233ebc3b 100644
--- a/src/slic3r/GUI/PartPlate.cpp
+++ b/src/slic3r/GUI/PartPlate.cpp
@@ -1,7 +1,56 @@
+#include <boost/optional/optional.hpp>
+#include <array>
+#include <cassert>
+#include <cmath>
+#include <boost/algorithm/string/erase.hpp>
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/classification.hpp>
 #include <cstddef>
 #include <algorithm>
+#include "libslic3r/Color.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Line.hpp"
+#include "libslic3r/Polyline.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include <iterator>
+#include "libslic3r/BuildVolume.hpp"
+#include "libslic3r/GCode/WipeTower.hpp"
+#include "libslic3r/CustomGCode.hpp"
+#include "libslic3r/GCode/GCodeProcessor.hpp"
+#include <ios>
+#include <iomanip>
+#include "libslic3r/Arrange.hpp"
+#include "libslic3r/PrintBase.hpp"
+#include "libslic3r/Model.hpp"
+#include "libslic3r/format.hpp"
+#include <cstring>
+#include <exception>
+#include "libslic3r/ParameterUtils.hpp"
+#include <imgui.h>
+#include "libslic3r/Format/bbs_3mf.hpp"
+#include "libslic3r/Print.hpp"
+#include "libslic3r/LocalesUtils.hpp"
+#include <cstdlib>
 #include <limits>
+#include <memory>
+#include <map>
+#include <mutex>
 #include <numeric>
+#include "slic3r/GUI/ImGuiWrapper.hpp"
+#include <utility>
+#include "slic3r/GUI/MeshUtils.hpp"
+#include "slic3r/GUI/GLTexture.hpp"
+#include "slic3r/GUI/GLShader.hpp"
+#include "slic3r/GUI/OpenGLManager.hpp"
+#include "slic3r/GUI/SceneRaycaster.hpp"
+#include <set>
+#include <unordered_map>
+#include <unordered_set>
+#include "slic3r/GUI/3DScene.hpp"
+#include "slic3r/GUI/Plater.hpp"
+#include "slic3r/GUI/GUI_ObjectLayers.hpp"
 #include <vector>
 #include <string>
 #include <sstream>
@@ -48,7 +97,15 @@
 #include "slic3r/GUI/GUI.hpp"
 #include "slic3r/Utils/FileHelp.hpp"
 #include <imgui/imgui_internal.h>
+#include <wx/colour.h>
 #include <wx/dcgraph.h>
+#include <wx/string.h>
+#include <wx/types.h>
+#include <wx/dcmemory.h>
+#include <wx/intl.h>
+#include <wx/event.h>
+#include <wx/image.h>
+#include <wx/gdicmn.h>
 using boost::optional;
 namespace fs = boost::filesystem;
 
diff --git a/src/slic3r/GUI/PartPlate.hpp b/src/slic3r/GUI/PartPlate.hpp
index 52a277d0e3..fc1aeb7bd7 100644
--- a/src/slic3r/GUI/PartPlate.hpp
+++ b/src/slic3r/GUI/PartPlate.hpp
@@ -1,11 +1,27 @@
 #ifndef __part_plate_hpp_
 #define __part_plate_hpp_
 
+#include <cmath>
+#include "libslic3r/Config.hpp"
+#include <utility>
+#include "libslic3r/Point.hpp"
+#include <string>
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/Geometry.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/Color.hpp"
+#include "libslic3r/GCode/ThumbnailData.hpp"
+#include "libslic3r/PrintBase.hpp"
+#include <map>
+#include <cstddef>
+#include <cereal/access.hpp>
+#include <cereal/specialize.hpp>
 #include <vector>
 #include <set>
 #include <array>
 #include <thread>
 #include <mutex>
+#include <wx/types.h>
 
 #include "libslic3r/ObjectID.hpp"
 #include "libslic3r/GCode/GCodeProcessor.hpp"
diff --git a/src/slic3r/GUI/PartSkipDialog.cpp b/src/slic3r/GUI/PartSkipDialog.cpp
index 860779ead4..7d7b4a0635 100644
--- a/src/slic3r/GUI/PartSkipDialog.cpp
+++ b/src/slic3r/GUI/PartSkipDialog.cpp
@@ -1,11 +1,42 @@
 #include "GUI_Utils.hpp"
 #include "GUI_App.hpp"
+#include "libslic3r_version.h"
 #include "slic3r/Utils/NetworkAgent.hpp"
+#include <vector>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <utility>
+#include <wx/colour.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <ctime>
+#include <sstream>
+#include <iomanip>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "slic3r/GUI/Widgets/AnimaController.hpp"
+#include <cstddef>
+#include <boost/filesystem/path.hpp>
+#include "libslic3r/Utils.hpp"
+#include <filesystem>
+#include <boost/filesystem/operations.hpp>
+#include <wx/msgdlg.h>
+#include <boost/log/trivial.hpp>
+#include <string>
+#include <boost/smart_ptr/make_shared_object.hpp>
+#include <boost/smart_ptr/weak_ptr.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+#include "slic3r/GUI/PartSkipCommon.hpp"
+#include <iterator>
 #include <wx/panel.h>
 #include <wx/bitmap.h>
 #include <wx/image.h>
+#include <wx/simplebook.h>
+#include <wx/scrolwin.h>
 #include <wx/sizer.h>
 #include <wx/gbsizer.h>
+#include <wx/toplevel.h>
+#include <wx/string.h>
+#include <wx/tglbtn.h>
 #include <wx/webrequest.h>
 #include <wx/control.h>
 #include <wx/dcclient.h>
diff --git a/src/slic3r/GUI/PartSkipDialog.hpp b/src/slic3r/GUI/PartSkipDialog.hpp
index 37697ced31..f1aef1f022 100644
--- a/src/slic3r/GUI/PartSkipDialog.hpp
+++ b/src/slic3r/GUI/PartSkipDialog.hpp
@@ -1,6 +1,15 @@
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <map>
+#include <cstdint>
+#include <string>
+#include <vector>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <wx/event.h>
+#include <boost/smart_ptr/weak_ptr.hpp>
 #include <wx/panel.h>
 #include <wx/bitmap.h>
 #include <wx/image.h>
+#include <wx/scrolwin.h>
 #include <wx/sizer.h>
 #include <wx/gbsizer.h>
 #include <wx/webrequest.h>
diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
index 1facddbff1..ffbf98ede2 100644
--- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp
+++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
@@ -2,12 +2,36 @@
 #include "PresetComboBoxes.hpp"
 #include "PrinterCloudAuthDialog.hpp"
 
+#include <boost/algorithm/string/trim.hpp>
+#include <boost/any.hpp>
+#include <cassert>
+#include <algorithm>
 #include <cstddef>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "libslic3r/Preset.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/Widgets/RoundedRectangle.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include "libslic3r/Config.hpp"
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <memory>
+#include "slic3r/GUI/OptionsGroup.hpp"
+#include "slic3r/GUI/Field.hpp"
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include <cstring>
+#include "libslic3r/Exception.hpp"
 #include <vector>
 #include <string>
 #include <boost/algorithm/string.hpp>
 #include <boost/regex.hpp>
 
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/dialog.h>
+#include <wx/colour.h>
+#include <wx/busycursor.h>
+#include <wx/filedlg.h>
 #include <wx/sizer.h>
 #include <wx/tooltip.h>
 #include <wx/stattext.h>
@@ -15,6 +39,7 @@
 #include <wx/button.h>
 #include <wx/choicdlg.h>
 #include <wx/statbox.h>
+#include <wx/toplevel.h>
 #include <wx/wupdlock.h>
 
 #include "libslic3r/libslic3r.h"
@@ -28,6 +53,7 @@
 #include "MainFrame.hpp"
 #include "format.hpp"
 #include "Tab.hpp"
+#include "libslic3r_version.h"
 #include "wxExtensions.hpp"
 #include "PrintHostDialogs.hpp"
 #include "../Utils/ASCIIFolding.hpp"
diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.hpp b/src/slic3r/GUI/PhysicalPrinterDialog.hpp
index 276e62416e..fe43bb7d91 100644
--- a/src/slic3r/GUI/PhysicalPrinterDialog.hpp
+++ b/src/slic3r/GUI/PhysicalPrinterDialog.hpp
@@ -1,8 +1,11 @@
 #ifndef slic3r_PhysicalPrinterDialog_hpp_
 #define slic3r_PhysicalPrinterDialog_hpp_
 
+#include "libslic3r/PrintConfig.hpp"
+#include <string>
 #include <vector>
 
+#include <wx/event.h>
 #include <wx/gdicmn.h>
 
 #include "libslic3r/Preset.hpp"
diff --git a/src/slic3r/GUI/PlateSettingsDialog.cpp b/src/slic3r/GUI/PlateSettingsDialog.cpp
index 07c955ef01..b640b2cb84 100644
--- a/src/slic3r/GUI/PlateSettingsDialog.cpp
+++ b/src/slic3r/GUI/PlateSettingsDialog.cpp
@@ -1,6 +1,32 @@
 #include "PlateSettingsDialog.hpp"
 #include "MsgDialog.hpp"
 #include "Widgets/DialogButtons.hpp"
+#include <climits>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/Widgets/ComboBox.hpp"
+#include <wx/colour.h>
+#include <wx/string.h>
+#include <wx/valtext.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <algorithm>
+#include <cstdlib>
+#include <wx/textctrl.h>
+#include <string>
+#include <wx/panel.h>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <vector>
+#include "slic3r/GUI/GUI_App.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/sizer.h>
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/FilamentMixer.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include "libslic3r/ParameterUtils.hpp"
+#include <cstddef>
 
 namespace Slic3r { namespace GUI {
 static constexpr int MIN_LAYER_VALUE = 2;
diff --git a/src/slic3r/GUI/PlateSettingsDialog.hpp b/src/slic3r/GUI/PlateSettingsDialog.hpp
index b94739348f..1f05b58aeb 100644
--- a/src/slic3r/GUI/PlateSettingsDialog.hpp
+++ b/src/slic3r/GUI/PlateSettingsDialog.hpp
@@ -8,6 +8,19 @@
 #include "Widgets/ComboBox.hpp"
 #include "DragCanvas.hpp"
 #include "libslic3r/ParameterUtils.hpp"
+#include <wx/event.h>
+#include <vector>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <wx/sizer.h>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/string.h>
+#include <wx/toplevel.h>
+#include "libslic3r/PrintConfig.hpp"
+#include <utility>
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include <wx/colour.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index 2622fdbc28..142e4e2482 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -1,16 +1,96 @@
 #include "Plater.hpp"
 #include "../Utils/NetworkAgent.hpp"
+#include "IPrinterAgent.hpp"
+#include "CalibUtils.hpp"
+#include "Flashforge.hpp"
 #include "libslic3r/Config.hpp"
 #include "libslic3r_version.h"
 
+#include <boost/optional/optional.hpp>
+#include <cmath>
+#include <boost/algorithm/string/join.hpp>
+#include <cassert>
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+#include <climits>
+#include <array>
+#include <boost/filesystem/fstream.hpp>
+#include <clocale>
 #include <cstddef>
 #include <algorithm>
+#include <ios>
+#include <iomanip>
+#include <cstring>
+#include <map>
+#include <exception>
+#include <functional>
+#include <memory>
+#include <initializer_list>
+#include <cstdint>
+#include <cstdlib>
+#include "libslic3r/CommonDefs.hpp"
+#include "libslic3r/TriangleSelector.hpp"
+#include <cstdio>
+#include "libslic3r/LocalesUtils.hpp"
+#include "libslic3r/FlushVolCalc.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/GCode/GCodeProcessor.hpp"
+#include "libslic3r/Technologies.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/PrintBase.hpp"
+#include "libslic3r/Preset.hpp"
+#include <fstream>
+#include "libslic3r/calib.hpp"
+#include <iterator>
+#include "libslic3r/Format/OBJ.hpp"
+#include "libslic3r/Geometry.hpp"
+#include "libslic3r/Arrange.hpp"
+#include "libslic3r/MultiNozzleUtils.hpp"
+#include "libslic3r/Color.hpp"
+#include <miniz.h>
+#include "libslic3r/Exception.hpp"
+#include "libslic3r/AppConfig.hpp"
+#include "libslic3r/CSGMesh/CSGMesh.hpp"
+#include "libslic3r/format.hpp"
+#include "libslic3r/MeshBoolean.hpp"
 #include <numeric>
 #include <limits>
 #include <optional>
+#include "slic3r/GUI/Event.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include "slic3r/GUI/Widgets/AMSItem.hpp"
+#include "slic3r/GUI/Search.hpp"
+#include "slic3r/GUI/ObjectDataViewModel.hpp"
+#include "slic3r/GUI/Field.hpp"
+#include "slic3r/GUI/Widgets/PopupWindow.hpp"
+#include <set>
+#include "slic3r/GUI/Widgets/StaticLine.hpp"
+#include "slic3r/GUI/GUI_ObjectSettings.hpp"
+#include "slic3r/GUI/ColorDecomposeDialog.hpp"
+#include "slic3r/GUI/SettingsIndex.hpp"
+#include "slic3r/GUI/Jobs/Job.hpp"
+#include "slic3r/GUI/ParamsPanel.hpp"
+#include "slic3r/GUI/SceneRaycaster.hpp"
+#include "slic3r/GUI/PrinterWebView.hpp"
+#include "slic3r/GUI/ReleaseNote.hpp"
+#include "slic3r/GUI/Jobs/Worker.hpp"
+#include "slic3r/GUI/UnsavedChangesDialog.hpp"
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
+#include "slic3r/GUI/GUI_Geometry.hpp"
+#include "slic3r/GUI/Widgets/DialogButtons.hpp"
+#include "slic3r/GUI/PrintOptionsDialog.hpp"
+#include "slic3r/GUI/CalibrationPanel.hpp"
+#include "slic3r/GUI/CalibrationWizard.hpp"
+#include "slic3r/GUI/Monitor.hpp"
 #include <slic3r/plugin/PluginDescriptor.hpp>
 #include <slic3r/plugin/PluginManager.hpp>
 #include <slic3r/plugin/PluginResolver.hpp>
+#include <utility>
+#include <sstream>
+#include <unordered_map>
+#include <unordered_set>
 #include <vector>
 #include <string>
 #include <regex>
@@ -27,8 +107,25 @@
 #include <boost/uuid/uuid_generators.hpp>
 #include <boost/uuid/uuid_io.hpp>
 
+#include <wx/colour.h>
+#include <wx/aui/framemanager.h>
+#include <wx/gdicmn.h>
+#include <wx/anybutton.h>
+#include <wx/dcclient.h>
+#include <wx/dcbuffer.h>
+#include <wx/chartype.h>
+#include <wx/busycursor.h>
+#include <wx/app.h>
+#include <wx/aui/floatpane.h>
+#include <wx/bookctrl.h>
+#include <wx/dataview.h>
+#include <wx/dirdlg.h>
 #include <wx/msgdlg.h>
+#include <wx/settings.h>
+#include <wx/scrolwin.h>
+#include <wx/notebook.h>
 #include <wx/sizer.h>
+#include <wx/spinctrl.h>
 #include <wx/stattext.h>
 #include <wx/button.h>
 #include <wx/bmpcbox.h>
@@ -38,7 +135,12 @@
 #include <wx/filedlg.h>
 #include <wx/dnd.h>
 #include <wx/progdlg.h>
+#include <wx/strconv.h>
 #include <wx/string.h>
+#include <wx/types.h>
+#include <wx/utils.h>
+#include <wx/toplevel.h>
+#include <wx/tglbtn.h>
 #include <wx/wupdlock.h>
 #include <wx/numdlg.h>
 #include <wx/debug.h>
diff --git a/src/slic3r/GUI/Plater.hpp b/src/slic3r/GUI/Plater.hpp
index ebff1ff90d..a887805f8a 100644
--- a/src/slic3r/GUI/Plater.hpp
+++ b/src/slic3r/GUI/Plater.hpp
@@ -1,14 +1,38 @@
 #ifndef slic3r_Plater_hpp_
 #define slic3r_Plater_hpp_
 
+#include "libslic3r/Config.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include <cstddef>
+#include <map>
+#include "libslic3r/Technologies.hpp"
+#include "libslic3r/Color.hpp"
+#include "libslic3r/Format/bbs_3mf.hpp"
+#include <functional>
+#include <array>
+#include "libslic3r/Point.hpp"
+#include "libslic3r/PublishSettings.hpp"
+#include "libslic3r/TriangleMesh.hpp"
+#include "libslic3r/libslic3r.h"
+#include <atomic>
 #include <memory>
+#include "slic3r/GUI/Event.hpp"
+#include <string>
+#include "slic3r/GUI/ObjectDataViewModel.hpp"
+#include "slic3r/GUI/SettingsIndex.hpp"
+#include "slic3r/GUI/Widgets/TextInput.hpp"
 #include <vector>
 #include <boost/filesystem/path.hpp>
 
+#include <wx/arrstr.h>
 #include <wx/colour.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
 #include <wx/panel.h>
 // BBS
 #include <wx/notebook.h>
+#include <wx/sizer.h>
+#include <wx/string.h>
 
 #include "Selection.hpp"
 
diff --git a/src/slic3r/GUI/PluginPickerDialog.cpp b/src/slic3r/GUI/PluginPickerDialog.cpp
index 5109b3b483..1746f18605 100644
--- a/src/slic3r/GUI/PluginPickerDialog.cpp
+++ b/src/slic3r/GUI/PluginPickerDialog.cpp
@@ -1,9 +1,20 @@
 #include "PluginPickerDialog.hpp"
 
+#include <vector>
+#include "slic3r/plugin/PluginDescriptor.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <utility>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <wx/arrstr.h>
+#include "slic3r/GUI/Widgets/ComboBox.hpp"
+#include <cstddef>
 #include <wx/button.h>
 #include <wx/choice.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
+#include <wx/string.h>
 #include <wx/valgen.h>
 
 #include "GUI.hpp"
diff --git a/src/slic3r/GUI/PluginPickerDialog.hpp b/src/slic3r/GUI/PluginPickerDialog.hpp
index 6ae4163c5f..010372cdf9 100644
--- a/src/slic3r/GUI/PluginPickerDialog.hpp
+++ b/src/slic3r/GUI/PluginPickerDialog.hpp
@@ -1,6 +1,8 @@
 #ifndef SLIC3R_GUI_PLUGINPICKERDIALOG_HPP
 #define SLIC3R_GUI_PLUGINPICKERDIALOG_HPP
 
+#include <wx/string.h>
+#include "slic3r/plugin/PluginDescriptor.hpp"
 #include <wx/wxprec.h>
 #ifndef WX_PRECOMP
 #    include <wx/wx.h>
diff --git a/src/slic3r/GUI/PluginProgressDialog.cpp b/src/slic3r/GUI/PluginProgressDialog.cpp
index 778cbcde57..aa37655b73 100644
--- a/src/slic3r/GUI/PluginProgressDialog.cpp
+++ b/src/slic3r/GUI/PluginProgressDialog.cpp
@@ -1,6 +1,10 @@
 #include "PluginProgressDialog.hpp"
 
+#include "slic3r/GUI/Widgets/ProgressDialog.hpp"
+#include <memory>
 #include <utility>
+#include <wx/string.h>
+#include <wx/timer.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/PluginSort.hpp b/src/slic3r/GUI/PluginSort.hpp
index d0a45cbd05..9321206988 100644
--- a/src/slic3r/GUI/PluginSort.hpp
+++ b/src/slic3r/GUI/PluginSort.hpp
@@ -7,6 +7,7 @@
 
 #include <algorithm>
 #include <cctype>
+#include <cstddef>
 #include <string>
 #include <string_view>
 #include <vector>
diff --git a/src/slic3r/GUI/PluginsConfigDialog.cpp b/src/slic3r/GUI/PluginsConfigDialog.cpp
index 9a79588af1..18fb823f38 100644
--- a/src/slic3r/GUI/PluginsConfigDialog.cpp
+++ b/src/slic3r/GUI/PluginsConfigDialog.cpp
@@ -5,14 +5,23 @@
 #include "I18N.hpp"
 #include "format.hpp"
 
+#include <atomic>
+#include <exception>
 #include <libslic3r/Preset.hpp>
 #include <libslic3r/PresetBundle.hpp>
+#include "slic3r/GUI/Widgets/WebViewHostDialog.hpp"
 #include <slic3r/plugin/PluginConfig.hpp>
 #include <slic3r/plugin/PluginManager.hpp>
 #include <slic3r/plugin/PluginResolver.hpp>
 #include <slic3r/plugin/PythonInterpreter.hpp>
 
 #include <boost/log/trivial.hpp>
+#include <wx/string.h>
+#include <string>
+#include <wx/event.h>
+#include "slic3r/plugin/PythonPluginInterface.hpp"
+#include <wx/msgdlg.h>
+#include <wx/busycursor.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/PluginsConfigDialog.hpp b/src/slic3r/GUI/PluginsConfigDialog.hpp
index 616fde17ca..5ff832d348 100644
--- a/src/slic3r/GUI/PluginsConfigDialog.hpp
+++ b/src/slic3r/GUI/PluginsConfigDialog.hpp
@@ -6,7 +6,9 @@
 
 #include <atomic>
 #include <memory>
+#include "slic3r/plugin/PythonPluginInterface.hpp"
 #include <string>
+#include <wx/string.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/PluginsDialog.cpp b/src/slic3r/GUI/PluginsDialog.cpp
index 6ac04a50da..b9b7b031a4 100644
--- a/src/slic3r/GUI/PluginsDialog.cpp
+++ b/src/slic3r/GUI/PluginsDialog.cpp
@@ -9,10 +9,19 @@
 #include "slic3r/plugin/PluginFsUtils.hpp"
 #include "slic3r/plugin/PluginManager.hpp"
 
+#include <cctype>
+#include <exception>
+#include <atomic>
+#include <boost/filesystem/operations.hpp>
+#include <chrono>
 #include <libslic3r/Utils.hpp>
 
 #include <slic3r/GUI/NotificationManager.hpp>
 #include <slic3r/GUI/Plater.hpp>
+#include "slic3r/GUI/PluginSource.hpp"
+#include "slic3r/GUI/PluginStatus.hpp"
+#include "slic3r/GUI/Widgets/WebViewHostDialog.hpp"
+#include "slic3r/GUI/PluginSort.hpp"
 #include <slic3r/GUI/format.hpp>
 
 #include <slic3r/plugin/PluginDescriptor.hpp>
@@ -25,13 +34,18 @@
 #include <memory>
 #include <mutex>
 #include <stdexcept>
+#include <string>
+#include <utility>
 #include <vector>
 
+#include <wx/busycursor.h>
 #include <wx/dialog.h>
 #include <wx/event.h>
 #include <wx/filedlg.h>
+#include <wx/gdicmn.h>
 #include <wx/msgdlg.h>
 #include <wx/progdlg.h>
+#include <wx/string.h>
 #include <wx/timer.h>
 #include <wx/utils.h>
 
diff --git a/src/slic3r/GUI/PluginsDialog.hpp b/src/slic3r/GUI/PluginsDialog.hpp
index c85e57040c..272acf8a9e 100644
--- a/src/slic3r/GUI/PluginsDialog.hpp
+++ b/src/slic3r/GUI/PluginsDialog.hpp
@@ -9,6 +9,7 @@
 #include "slic3r/plugin/PluginDescriptor.hpp"
 
 #include <atomic>
+#include <boost/filesystem/path.hpp>
 #include <boost/log/trivial.hpp>
 #include <exception>
 #include <functional>
@@ -19,13 +20,17 @@
 #include <thread>
 #include <type_traits>
 #include <utility>
+#include <wx/event.h>
+#include <wx/chartype.h>
 #include <wx/evtloop.h>
 #include <wx/app.h>
+#include <wx/gdicmn.h>
 #include <wx/progdlg.h>
 #include <wx/string.h>
 #include <wx/timer.h>
 
 #include <boost/filesystem.hpp>
+#include <wx/toplevel.h>
 
 class wxTimer;
 
diff --git a/src/slic3r/GUI/PostProcessor.cpp b/src/slic3r/GUI/PostProcessor.cpp
index cd8592c813..99639e3a8d 100644
--- a/src/slic3r/GUI/PostProcessor.cpp
+++ b/src/slic3r/GUI/PostProcessor.cpp
@@ -13,6 +13,11 @@
 #include "slic3r/plugin/PythonInterpreter.hpp"
 
 #include <boost/algorithm/string.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/trim.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/format.hpp>
 #include <boost/filesystem.hpp>
@@ -22,9 +27,21 @@
 
 // BBS
 #include <algorithm>
+#include <boost/process/pipe.hpp>
+#include <boost/process/io.hpp>
+#include <cstring>
+#include <cstdio>
+#include <exception>
 #include <iostream>
 #include <fstream>
+#include "libslic3r/PrintConfig.hpp"
+#include <memory>
+#include "libslic3r/Print.hpp"
+#include "libslic3r/Exception.hpp"
 #include <slic3r/plugin/PythonPluginInterface.hpp>
+#include <string>
+#include <vector>
+#include <utility>
 
 #ifdef WIN32
 
diff --git a/src/slic3r/GUI/PrePrintChecker.cpp b/src/slic3r/GUI/PrePrintChecker.cpp
index 7d0ae63cf1..c15cfb9cbf 100644
--- a/src/slic3r/GUI/PrePrintChecker.cpp
+++ b/src/slic3r/GUI/PrePrintChecker.cpp
@@ -1,7 +1,20 @@
 #include "PrePrintChecker.hpp"
 #include "GUI_Utils.hpp"
 #include "I18N.hpp"
+#include <algorithm>
+#include <functional>
 #include <set>
+#include <string>
+#include <wx/string.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/wx.h>
+#include <wx/colour.h>
+#include <vector>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/utils.h>
 
 
 namespace Slic3r { namespace GUI {
diff --git a/src/slic3r/GUI/PrePrintChecker.hpp b/src/slic3r/GUI/PrePrintChecker.hpp
index 5dea00a88f..2ec99e3ed5 100644
--- a/src/slic3r/GUI/PrePrintChecker.hpp
+++ b/src/slic3r/GUI/PrePrintChecker.hpp
@@ -2,6 +2,11 @@
 #define slic3r_GUI_PRE_PRINT_CHECK_hpp_
 
 #include <functional>
+#include <wx/string.h>
+#include <vector>
+#include <string>
+#include <wx/panel.h>
+#include <wx/sizer.h>
 #include <wx/wx.h>
 #include "Widgets/Label.hpp"
 namespace Slic3r { namespace GUI {
diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp
index d9aedec79b..61ce51112e 100644
--- a/src/slic3r/GUI/Preferences.cpp
+++ b/src/slic3r/GUI/Preferences.cpp
@@ -1,4 +1,5 @@
 #include "Preferences.hpp"
+#include "CloudProvider.hpp"
 #include "OptionsGroup.hpp"
 #include "GUI_App.hpp"
 #include "MainFrame.hpp"
@@ -10,11 +11,59 @@
 #include "libslic3r/AppConfig.hpp"
 #include "libslic3r/Format/DRC.hpp"
 #include "libslic3r/CAD/SketchEngine.hpp"
+#include <wx/gdicmn.h>
+#include <wx/arrstr.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <wx/event.h>
+#include <wx/dcclient.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <cmath>
+#include <tuple>
+#include <string>
+#include <vector>
+#include <functional>
+#include <cstdlib>
+#include <cassert>
+#include <algorithm>
+#include <wx/intl.h>
+#include <cstddef>
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Utils.hpp"
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include <utility>
+#include "slic3r/GUI/Widgets/SpinInput.hpp"
+#include "slic3r/GUI/Widgets/CheckBox.hpp"
+#include "libslic3r/Format/bbs_3mf.hpp"
+#include <boost/lexical_cast.hpp>
+#include "slic3r/GUI/Event.hpp"
+#include <boost/log/trivial.hpp>
+#include "libslic3r/Preset.hpp"
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <wx/chartype.h>
+#include <wx/dirdlg.h>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "slic3r/GUI/GUI.hpp"
+#include "slic3r/GUI/Widgets/TabCtrl.hpp"
+#include "slic3r/GUI/Field.hpp"
+#include <map>
+#include "slic3r/GUI/ReleaseNote.hpp"
 #include <wx/language.h>
 #include "OG_CustomCtrl.hpp"
+#include "libslic3r_version.h"
 #include "wx/graphics.h"
 #include <wx/listimpl.cpp>
 #include <wx/display.h>
+#include <wx/string.h>
+#include <wx/panel.h>
+#include <wx/utils.h>
+#include <wx/valtext.h>
+#include <wx/textctrl.h>
+#include <wx/spinctrl.h>
+#include <wx/tglbtn.h>
+#include <wx/stattext.h>
+#include <wx/treebase.h>
+#include <wx/types.h>
+#include <wx/timer.h>
 #include "NetworkTestDialog.hpp"
 #include "Widgets/StaticLine.hpp"
 #include "Widgets/RadioGroup.hpp"
diff --git a/src/slic3r/GUI/Preferences.hpp b/src/slic3r/GUI/Preferences.hpp
index e3b6ffdc7d..195a0b45bd 100644
--- a/src/slic3r/GUI/Preferences.hpp
+++ b/src/slic3r/GUI/Preferences.hpp
@@ -4,12 +4,19 @@
 #include "GUI.hpp"
 #include "GUI_Utils.hpp"
 
+#include <wx/chartype.h>
+#include <functional>
+#include <tuple>
 #include <wx/dialog.h>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/sizer.h>
 #include <wx/timer.h>
 #include <string>
 #include <vector>
 #include <list>
 #include <map>
+#include <wx/toplevel.h>
 #include "Widgets/ComboBox.hpp"
 #include "Widgets/CheckBox.hpp"
 #include "Widgets/TextInput.hpp"
diff --git a/src/slic3r/GUI/PresetBundleDialog.cpp b/src/slic3r/GUI/PresetBundleDialog.cpp
index 8fb4a14ce8..9c11fc67aa 100644
--- a/src/slic3r/GUI/PresetBundleDialog.cpp
+++ b/src/slic3r/GUI/PresetBundleDialog.cpp
@@ -2,11 +2,27 @@
 #include "ExportPresetBundleDialog.hpp"
 #include "I18N.hpp"
 #include "GUI_App.hpp"
+#include <atomic>
+#include <boost/chrono/duration.hpp>
+#include <boost/log/trivial.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <libslic3r/Config.hpp>
+#include "libslic3r/Semver.hpp"
+#include "libslic3r/Preset.hpp"
 #include <libslic3r/Thread.hpp>
+#include "slic3r/GUI/Widgets/WebViewHostDialog.hpp"
+#include <memory>
+#include <string>
+#include <vector>
+#include <utility>
+#include "slic3r/GUI/GUI.hpp"
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
 #include <wx/app.h>
 #include <wx/event.h>
 #include <wx/filename.h>
+#include <wx/gdicmn.h>
+#include <wx/fswatcher.h>
+#include <wx/msgdlg.h>
 #include <wx/scrolwin.h>
 #include <wx/sizer.h>
 #include <libslic3r/PresetBundle.hpp>
diff --git a/src/slic3r/GUI/PresetBundleDialog.hpp b/src/slic3r/GUI/PresetBundleDialog.hpp
index c7e7b1bb0e..5e0b4b9b14 100644
--- a/src/slic3r/GUI/PresetBundleDialog.hpp
+++ b/src/slic3r/GUI/PresetBundleDialog.hpp
@@ -5,17 +5,21 @@
 #include "GUI_Utils.hpp"
 #include "Widgets/WebViewHostDialog.hpp"
 #include "libslic3r/AppConfig.hpp"
+#include <atomic>
 #include <boost/thread/detail/thread.hpp>
 #include <libslic3r/PresetBundle.hpp>
 #include <memory>
 #include <slic3r/GUI/GUI.hpp>
 #include <string>
 #include <unordered_map>
+#include <wx/chartype.h>
 #include <wx/dataview.h>
 #include <wx/event.h>
+#include <wx/gdicmn.h>
 #include <wx/language.h>
 #include <wx/string.h>
 #include <wx/fswatcher.h>
+#include <wx/toplevel.h>
 namespace Slic3r { namespace GUI {
 
 #define DESIGN_GRAY900_COLOR wxColour("#363636") // Label color
diff --git a/src/slic3r/GUI/PresetComboBoxes.cpp b/src/slic3r/GUI/PresetComboBoxes.cpp
index c5ffb533e2..28dfbed4a8 100644
--- a/src/slic3r/GUI/PresetComboBoxes.cpp
+++ b/src/slic3r/GUI/PresetComboBoxes.cpp
@@ -1,6 +1,26 @@
 #include "PresetComboBoxes.hpp"
 
+#include <climits>
+#include <boost/log/trivial.hpp>
+#include <cassert>
+#include <boost/algorithm/string/replace.hpp>
+#include <cmath>
+#include <boost/algorithm/string/predicate.hpp>
+#include <cctype>
 #include <cstddef>
+#include "libslic3r/Preset.hpp"
+#include "libslic3r/Config.hpp"
+#include <map>
+#include <iterator>
+#include <deque>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "slic3r/GUI/Widgets/DropDown.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "slic3r/GUI/EncodedFilament.hpp"
+#include <unordered_set>
+#include "libslic3r/Utils.hpp"
+#include "slic3r/GUI/CalibrationWizardPage.hpp"
 #include <vector>
 #include <string>
 #include <set>
@@ -8,8 +28,16 @@
 #include <algorithm>
 #include <boost/algorithm/string.hpp>
 
+#include <wx/gdicmn.h>
+#include <wx/colour.h>
+#include <wx/event.h>
+#include <wx/image.h>
+#include <wx/anybutton.h>
+#include <wx/app.h>
+#include <wx/colourdata.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
+#include <wx/string.h>
 #include <wx/textctrl.h>
 #include <wx/button.h>
 #include <wx/statbox.h>
diff --git a/src/slic3r/GUI/PresetComboBoxes.hpp b/src/slic3r/GUI/PresetComboBoxes.hpp
index b63f51dd70..e7de321fc6 100644
--- a/src/slic3r/GUI/PresetComboBoxes.hpp
+++ b/src/slic3r/GUI/PresetComboBoxes.hpp
@@ -2,7 +2,17 @@
 #define slic3r_PresetComboBoxes_hpp_
 
 //#include <wx/bmpcbox.h>
+#include <cstddef>
+#include "libslic3r/Config.hpp"
+#include <functional>
+#include <string>
+#include <wx/colour.h>
+#include <vector>
+#include "libslic3r/PrintConfig.hpp"
+#include <map>
+#include <utility>
 #include <wx/colourdata.h>
+#include <wx/event.h>
 #include <wx/gdicmn.h>
 #include <wx/clrpicker.h>
 
diff --git a/src/slic3r/GUI/PresetHints.cpp b/src/slic3r/GUI/PresetHints.cpp
index 202253604d..4f33ee8353 100644
--- a/src/slic3r/GUI/PresetHints.cpp
+++ b/src/slic3r/GUI/PresetHints.cpp
@@ -6,6 +6,10 @@
 
 #include "PresetHints.hpp"
 
+#include <string>
+#include "libslic3r/Preset.hpp"
+#include "libslic3r/Config.hpp"
+#include "libslic3r/PresetBundle.hpp"
 #include <wx/intl.h> 
 
 #include "GUI.hpp"
diff --git a/src/slic3r/GUI/PresetHints.hpp b/src/slic3r/GUI/PresetHints.hpp
index 4a71f6ff1a..d7a30890e5 100644
--- a/src/slic3r/GUI/PresetHints.hpp
+++ b/src/slic3r/GUI/PresetHints.hpp
@@ -1,6 +1,7 @@
 #ifndef slic3r_PresetHints_hpp_
 #define slic3r_PresetHints_hpp_
 
+#include "libslic3r/Preset.hpp"
 #include <string>
 
 #include "libslic3r/PresetBundle.hpp"
diff --git a/src/slic3r/GUI/PrintHostDialogs.cpp b/src/slic3r/GUI/PrintHostDialogs.cpp
index 2b4d212d0f..df14efa976 100644
--- a/src/slic3r/GUI/PrintHostDialogs.cpp
+++ b/src/slic3r/GUI/PrintHostDialogs.cpp
@@ -1,20 +1,57 @@
 #include "PrintHostDialogs.hpp"
 
 #include <algorithm>
+#include <boost/algorithm/string/trim.hpp>
+#include <boost/algorithm/string/case_conv.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <cctype>
+#include <functional>
+#include <cstddef>
+#include <cstdlib>
 #include <iomanip>
+#include "libslic3r/ProjectTask.hpp"
+#include <ios>
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Config.hpp"
 #include <limits>
 
+#include <wx/colour.h>
+#include <wx/event.h>
+#include <wx/dcclient.h>
+#include <memory>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <vector>
+#include <utility>
+#include <wx/arrstr.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <map>
+#include <string>
+#include <wx/busycursor.h>
+#include <wx/dialog.h>
+#include <wx/dvrenderers.h>
+#include <sstream>
+#include "slic3r/GUI/Widgets/RadioBox.hpp"
 #include <wx/frame.h>
+#include <wx/panel.h>
+#include <wx/gdicmn.h>
 #include <wx/progdlg.h>
+#include <wx/settings.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
+#include <wx/string.h>
 #include <wx/textctrl.h>
 #include <wx/checkbox.h>
 #include <wx/button.h>
 #include <wx/dataview.h>
 #include <wx/dcbuffer.h>
 #include <wx/graphics.h>
+#include <wx/toplevel.h>
+#include <wx/tglbtn.h>
+#include <wx/vector.h>
+#include <wx/variant.h>
+#include <wx/types.h>
 #include <wx/wrapsizer.h>
 #include <wx/wupdlock.h>
 #include <wx/debug.h>
@@ -26,17 +63,20 @@
 #include <boost/algorithm/string.hpp>
 #include <nlohmann/json.hpp>
 
+#include "Flashforge.hpp"
 #include "GUI.hpp"
 #include "GUI_App.hpp"
 #include "MsgDialog.hpp"
 #include "I18N.hpp"
 #include "MainFrame.hpp"
+#include "PrintHost.hpp"
 #include "libslic3r/AppConfig.hpp"
 #include "NotificationManager.hpp"
 #include "ExtraRenderers.hpp"
 #include "format.hpp"
 #include "../Utils/CrealityPrint.hpp"
 #include "BitmapComboBox.hpp"
+#include "libslic3r_version.h"
 #include "wxExtensions.hpp"
 
 #include <nlohmann/json.hpp>
diff --git a/src/slic3r/GUI/PrintHostDialogs.hpp b/src/slic3r/GUI/PrintHostDialogs.hpp
index 6f55c0d953..c348cb0b76 100644
--- a/src/slic3r/GUI/PrintHostDialogs.hpp
+++ b/src/slic3r/GUI/PrintHostDialogs.hpp
@@ -1,10 +1,14 @@
 #ifndef slic3r_PrintHostSendDialog_hpp_
 #define slic3r_PrintHostSendDialog_hpp_
 
+#include <map>
+#include <cstddef>
 #include <string>
+#include <utility>
 #include <vector>
 #include <boost/filesystem/path.hpp>
 
+#include <wx/colour.h>
 #include <wx/string.h>
 #include <wx/event.h>
 #include <wx/dialog.h>
diff --git a/src/slic3r/GUI/PrintOptionsDialog.cpp b/src/slic3r/GUI/PrintOptionsDialog.cpp
index f03bcb1d29..e43e47c9aa 100644
--- a/src/slic3r/GUI/PrintOptionsDialog.cpp
+++ b/src/slic3r/GUI/PrintOptionsDialog.cpp
@@ -1,5 +1,31 @@
 #include "PrintOptionsDialog.hpp"
+#include <boost/log/trivial.hpp>
+#include <cstddef>
+#include <ctime>
+#include <cassert>
 #include <initializer_list>
+#include <wx/colour.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <utility>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/wx.h>
+#include <wx/gdicmn.h>
+#include <wx/toplevel.h>
+#include <wx/scrolwin.h>
+#include <wx/types.h>
+#include <wx/tglbtn.h>
+#include <wx/event.h>
+#include <string>
+#include <wx/string.h>
+#include "slic3r/GUI/DeviceCore/DevConfigUtil.h"
+#include "slic3r/GUI/DeviceManager.hpp"
+#include <wx/sizer.h>
+#include "slic3r/GUI/Widgets/HyperLink.hpp"
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "libslic3r/CommonDefs.hpp"
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <wx/utils.h>
+#include <wx/msgdlg.h>
 #include "I18N.hpp"
 #include "GUI_App.hpp"
 #include "libslic3r/Utils.hpp"
diff --git a/src/slic3r/GUI/PrintOptionsDialog.hpp b/src/slic3r/GUI/PrintOptionsDialog.hpp
index 48f9f25b48..803f35c7ff 100644
--- a/src/slic3r/GUI/PrintOptionsDialog.hpp
+++ b/src/slic3r/GUI/PrintOptionsDialog.hpp
@@ -1,6 +1,12 @@
 #ifndef slic3r_GUI_PrintOptionsDialog_hpp_
 #define slic3r_GUI_PrintOptionsDialog_hpp_
 
+#include <wx/panel.h>
+#include <wx/event.h>
+#include "libslic3r/CommonDefs.hpp"
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <vector>
+#include <string>
 #include <wx/wx.h>
 #include <wx/font.h>
 #include <wx/colour.h>
diff --git a/src/slic3r/GUI/Printer/PrinterFileSystem.cpp b/src/slic3r/GUI/Printer/PrinterFileSystem.cpp
index 9aa35e2cff..89e57806b8 100644
--- a/src/slic3r/GUI/Printer/PrinterFileSystem.cpp
+++ b/src/slic3r/GUI/Printer/PrinterFileSystem.cpp
@@ -7,17 +7,52 @@
 #include "../../Utils/NetworkAgent.hpp"
 #include "../BitmapCache.hpp"
 
+#include <algorithm>
 #include <boost/algorithm/hex.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/date_time/posix_time/posix_time_duration.hpp>
+#include <boost/date_time/posix_time/posix_time_types.hpp>
+#include <boost/date_time/posix_time/posix_time_config.hpp>
 #include <boost/endian/conversion.hpp>
+#include <boost/filesystem/fstream.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <boost/log/trivial.hpp>
+#include <boost/thread/lock_types.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/weak_ptr.hpp>
 #include <boost/uuid/detail/md5.hpp>
 #include <boost/regex.hpp>
 
+#include <string>
+#include <cerrno>
+#include <system_error>
+#include <wx/event.h>
+#include <map>
+#include "slic3r/GUI/Printer/BambuTunnel.h"
+#include <vector>
+#include <cassert>
+#include <utility>
+#include <ctime>
+#include <openssl/md5.h>
+#include <memory>
+#include <wx/log.h>
+#include <ios>
+#include <iterator>
+#include <filesystem>
+#include <functional>
+#include <wx/datetime.h>
+#include <sstream>
+#include <istream>
+#include "libslic3r/Semver.hpp"
+#include <cmath>
+#include <cstdio>
+#include <cctype>
 #include <wx/mstream.h>
 
 #include "nlohmann/json.hpp"
 
 #include <cstring>
+#include <wx/thread.h>
 
 #ifndef NDEBUG
 //#define PRINTER_FILE_SYSTEM_TEST
diff --git a/src/slic3r/GUI/Printer/PrinterFileSystem.h b/src/slic3r/GUI/Printer/PrinterFileSystem.h
index 03a630e72f..2748e0ae0c 100644
--- a/src/slic3r/GUI/Printer/PrinterFileSystem.h
+++ b/src/slic3r/GUI/Printer/PrinterFileSystem.h
@@ -1,6 +1,17 @@
 #ifndef slic3r_GUI_PrinterFileSystem_h_
 #define slic3r_GUI_PrinterFileSystem_h_
 
+#include <boost/smart_ptr/enable_shared_from_this.hpp>
+#include <string>
+#include <cstddef>
+#include <wx/types.h>
+#include <ctime>
+#include <memory>
+#include <map>
+#include <vector>
+#include <istream>
+#include <utility>
+#include <boost/thread/lock_types.hpp>
 #define BAMBU_DYNAMIC
 #include "BambuTunnel.h"
 
diff --git a/src/slic3r/GUI/PrinterCloudAuthDialog.cpp b/src/slic3r/GUI/PrinterCloudAuthDialog.cpp
index e44a712acc..3b1b15ea6b 100644
--- a/src/slic3r/GUI/PrinterCloudAuthDialog.cpp
+++ b/src/slic3r/GUI/PrinterCloudAuthDialog.cpp
@@ -1,8 +1,20 @@
 #include "PrinterCloudAuthDialog.hpp"
+#include "slic3r/GUI/GUI_App.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <boost/log/trivial.hpp>
+#include <wx/log.h>
+#include <wx/gdicmn.h>
+#include <wx/settings.h>
+#include <cstddef>
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
+#include "slic3r/GUI/GUI.hpp"
+#include <exception>
+#include <wx/msgdlg.h>
 #include <wx/sizer.h>
 #include <wx/toolbar.h>
 #include <wx/textdlg.h>
 
+#include <wx/webview.h>
 #include <wx/wx.h>
 #include <wx/fileconf.h>
 #include <wx/file.h>
@@ -13,6 +25,7 @@
 
 #include <nlohmann/json.hpp>
 #include "MainFrame.hpp"
+#include "PrintHost.hpp"
 #include <boost/dll.hpp>
 
 #include <sstream>
diff --git a/src/slic3r/GUI/PrinterCloudAuthDialog.hpp b/src/slic3r/GUI/PrinterCloudAuthDialog.hpp
index 6ee3779156..5095c76875 100644
--- a/src/slic3r/GUI/PrinterCloudAuthDialog.hpp
+++ b/src/slic3r/GUI/PrinterCloudAuthDialog.hpp
@@ -1,6 +1,8 @@
 #ifndef slic3r_GUI_PrinterCloudAuthDialog_hpp_
 #define slic3r_GUI_PrinterCloudAuthDialog_hpp_
 
+#include <wx/setup.h>
+#include <string>
 #include <wx/wx.h>
 #include <wx/font.h>
 #include <wx/colour.h>
diff --git a/src/slic3r/GUI/PrinterWebView.cpp b/src/slic3r/GUI/PrinterWebView.cpp
index 791bec42b9..4ea2ba0a72 100644
--- a/src/slic3r/GUI/PrinterWebView.cpp
+++ b/src/slic3r/GUI/PrinterWebView.cpp
@@ -9,11 +9,19 @@
 #include "libslic3r_version.h"
 
 #include <boost/filesystem/path.hpp>
+#include <wx/panel.h>
+#include <wx/gdicmn.h>
+#include <memory>
+#include <wx/log.h>
+#include "libslic3r/Utils.hpp"
+#include <wx/event.h>
+#include <boost/log/trivial.hpp>
 #include <wx/sizer.h>
 #include <wx/string.h>
 #include <wx/toolbar.h>
 
 #include <slic3r/GUI/Widgets/WebView.hpp>
+#include <wx/utils.h>
 #include <wx/webview.h>
 
 #ifdef __linux__
diff --git a/src/slic3r/GUI/PrinterWebView.hpp b/src/slic3r/GUI/PrinterWebView.hpp
index 1ab1e17932..9bd8ff51a8 100644
--- a/src/slic3r/GUI/PrinterWebView.hpp
+++ b/src/slic3r/GUI/PrinterWebView.hpp
@@ -6,6 +6,8 @@
 #include "wx/cmdline.h"
 #include "wx/notifmsg.h"
 #include "wx/settings.h"
+#include <wx/setup.h>
+#include <wx/event.h>
 #include <wx/webview.h>
 #include <wx/string.h>
 
diff --git a/src/slic3r/GUI/PrinterWebViewHandler.cpp b/src/slic3r/GUI/PrinterWebViewHandler.cpp
index 165d7c16dd..56cf2c3101 100644
--- a/src/slic3r/GUI/PrinterWebViewHandler.cpp
+++ b/src/slic3r/GUI/PrinterWebViewHandler.cpp
@@ -1,5 +1,6 @@
 #include "PrinterWebViewHandler.hpp"
 
+#include "Http.hpp"
 #include "I18N.hpp"
 #include "PrinterWebView.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
@@ -7,12 +8,20 @@
 #include "slic3r/Utils/PrintHost.hpp"
 #include "libslic3r/Preset.hpp"
 
+#include <memory>
+#include <cstdint>
+#include "libslic3r/Config.hpp"
+#include "libslic3r/PrintConfig.hpp"
 #include <nlohmann/json.hpp>
 #include <atomic>
 #include <boost/filesystem/path.hpp>
+#include <string>
 #include <thread>
+#include <utility>
 #include <wx/filedlg.h>
 #include <wx/string.h>
+#include <wx/webview.h>
+#include <wx/utils.h>
 
 using json = nlohmann::json;
 
diff --git a/src/slic3r/GUI/PrivacyUpdateDialog.cpp b/src/slic3r/GUI/PrivacyUpdateDialog.cpp
index c396e85bfe..4e2d4053a8 100644
--- a/src/slic3r/GUI/PrivacyUpdateDialog.cpp
+++ b/src/slic3r/GUI/PrivacyUpdateDialog.cpp
@@ -2,8 +2,25 @@
 #include "GUI_App.hpp"
 #include "GUI.hpp"
 #include "BitmapCache.hpp"
+#include <string>
+#include <sstream>
+#include <ios>
+#include <cctype>
+#include <iomanip>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "libslic3r/Utils.hpp"
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "slic3r/GUI/Widgets/WebView.hpp"
 #include <wx/dcgraph.h>
 #include <slic3r/GUI/I18N.hpp>
+#include <wx/event.h>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/sizer.h>
+#include <wx/panel.h>
+#include <wx/log.h>
+#include <wx/webview.h>
+#include <wx/utils.h>
 
 
 namespace Slic3r { namespace GUI {
diff --git a/src/slic3r/GUI/PrivacyUpdateDialog.hpp b/src/slic3r/GUI/PrivacyUpdateDialog.hpp
index 6ae32b8397..b1779b36d4 100644
--- a/src/slic3r/GUI/PrivacyUpdateDialog.hpp
+++ b/src/slic3r/GUI/PrivacyUpdateDialog.hpp
@@ -5,6 +5,11 @@
 #include "Widgets/Button.hpp"
 #include "Widgets/Label.hpp"
 #include "Widgets/WebView.hpp"
+#include <wx/event.h>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <string>
+#include <wx/sizer.h>
 #include <wx/webview.h>
 #include <wx/progdlg.h>
 #include <wx/simplebook.h>
diff --git a/src/slic3r/GUI/ProcessRunner.cpp b/src/slic3r/GUI/ProcessRunner.cpp
index 77b296fc25..3be56c032f 100644
--- a/src/slic3r/GUI/ProcessRunner.cpp
+++ b/src/slic3r/GUI/ProcessRunner.cpp
@@ -1,7 +1,20 @@
 #include "ProcessRunner.hpp"
 
+#include <boost/process/cmd.hpp>
+#include <boost/process/args.hpp>
 #include <boost/process/env.hpp>
 #include <boost/process.hpp>
+#include <wx/event.h>
+#include <wx/timer.h>
+#include <string>
+#include <utility>
+#include <mutex>
+#include <vector>
+#include <system_error>
+#include <memory>
+#include <boost/process/pipe.hpp>
+#include <boost/process/io.hpp>
+#include <exception>
 #ifdef _WIN32
 #include <boost/process/windows.hpp>
 #endif
diff --git a/src/slic3r/GUI/ProcessRunner.hpp b/src/slic3r/GUI/ProcessRunner.hpp
index e07ec1af95..95910d4505 100644
--- a/src/slic3r/GUI/ProcessRunner.hpp
+++ b/src/slic3r/GUI/ProcessRunner.hpp
@@ -1,6 +1,7 @@
 #ifndef slic3r_GUI_ProcessRunner_hpp_
 #define slic3r_GUI_ProcessRunner_hpp_
 
+#include <boost/process/pipe.hpp>
 #include <wx/event.h>
 #include <wx/timer.h>
 
diff --git a/src/slic3r/GUI/ProgressStatusBar.cpp b/src/slic3r/GUI/ProgressStatusBar.cpp
index 18485659c5..f10a603674 100644
--- a/src/slic3r/GUI/ProgressStatusBar.cpp
+++ b/src/slic3r/GUI/ProgressStatusBar.cpp
@@ -1,5 +1,9 @@
 #include "ProgressStatusBar.hpp"
 
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <string>
 #include <wx/timer.h>
 #include <wx/gauge.h>
 #include <wx/button.h>
diff --git a/src/slic3r/GUI/Project.cpp b/src/slic3r/GUI/Project.cpp
index 127400c8b1..47945e1179 100644
--- a/src/slic3r/GUI/Project.cpp
+++ b/src/slic3r/GUI/Project.cpp
@@ -4,19 +4,47 @@
 #include "libslic3r/Model.hpp"
 #include "libslic3r/Format/bbs_3mf.hpp"
 
+#include <boost/filesystem/path.hpp>
+#include <atomic>
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/filesystem/directory.hpp>
+#include <array>
+#include <boost/filesystem/operations.hpp>
+#include <boost/algorithm/string/case_conv.hpp>
 #include <boost/log/trivial.hpp>
 
+#include <vector>
+#include <string>
+#include "slic3r/GUI/GUI.hpp"
+#include "slic3r/GUI/Auxiliary.hpp"
+#include <cstddef>
+#include <memory>
+#include <map>
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
+#include <exception>
+#include <cmath>
+#include <fstream>
+#include <ios>
+#include <sstream>
 #include <wx/app.h>
+#include <wx/base64.h>
 #include <wx/button.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include <wx/filefn.h>
 #include <wx/scrolwin.h>
 #include <wx/sizer.h>
 
 #include <wx/bmpcbox.h>
 #include <wx/bmpbuttn.h>
+#include <wx/string.h>
 #include <wx/treectrl.h>
 #include <wx/imaglist.h>
 #include <wx/settings.h>
 #include <wx/filedlg.h>
+#include <wx/webview.h>
+#include <wx/utils.h>
 #include <wx/wupdlock.h>
 #include <wx/dataview.h>
 #include <wx/tokenzr.h>
diff --git a/src/slic3r/GUI/Project.hpp b/src/slic3r/GUI/Project.hpp
index a22bc44430..c7a85bce74 100644
--- a/src/slic3r/GUI/Project.hpp
+++ b/src/slic3r/GUI/Project.hpp
@@ -7,6 +7,14 @@
 #include "wx/notifmsg.h"
 #include "wx/settings.h"
 #include "wx/webview.h"
+#include <wx/setup.h>
+#include <string>
+#include "slic3r/GUI/StagedBuild.hpp"
+#include <wx/string.h>
+#include <wx/bookctrl.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
 
 #if wxUSE_WEBVIEW_EDGE
 #include "wx/msw/webview_edge.h"
diff --git a/src/slic3r/GUI/ProjectDirtyStateManager.cpp b/src/slic3r/GUI/ProjectDirtyStateManager.cpp
index 53eb3cd353..784d6f9b03 100644
--- a/src/slic3r/GUI/ProjectDirtyStateManager.cpp
+++ b/src/slic3r/GUI/ProjectDirtyStateManager.cpp
@@ -12,6 +12,10 @@
 
 #include <algorithm>
 #include <assert.h>
+#include "libslic3r/Preset.hpp"
+#include "libslic3r/Config.hpp"
+#include <boost/log/trivial.hpp>
+#include "libslic3r/Technologies.hpp"
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/ProjectDirtyStateManager.hpp b/src/slic3r/GUI/ProjectDirtyStateManager.hpp
index fd121d1d85..efe58440bb 100644
--- a/src/slic3r/GUI/ProjectDirtyStateManager.hpp
+++ b/src/slic3r/GUI/ProjectDirtyStateManager.hpp
@@ -2,6 +2,11 @@
 #define slic3r_ProjectDirtyStateManager_hpp_
 
 #include "libslic3r/Preset.hpp"
+#include "libslic3r/Technologies.hpp"
+#include <array>
+#include <string>
+#include "libslic3r/PrintConfig.hpp"
+#include <vector>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/PublishDialog.cpp b/src/slic3r/GUI/PublishDialog.cpp
index e14c4484cd..f9c0beadb9 100644
--- a/src/slic3r/GUI/PublishDialog.cpp
+++ b/src/slic3r/GUI/PublishDialog.cpp
@@ -1,6 +1,21 @@
 #include "PublishDialog.hpp"
 #include "GUI_App.hpp"
 
+#include <wx/colour.h>
+#include <wx/string.h>
+#include "slic3r/GUI/Widgets/AMSItem.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/intl.h>
+#include <wx/gdicmn.h>
+#include <wx/toplevel.h>
+#include <wx/panel.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/Widgets/ProgressBar.hpp"
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <utility>
+#include <wx/event.h>
+#include "slic3r/GUI/Plater.hpp"
 #include <wx/wx.h> 
 #include <wx/sizer.h>
 #include <wx/statbox.h>
diff --git a/src/slic3r/GUI/PublishDialog.hpp b/src/slic3r/GUI/PublishDialog.hpp
index 2b59f8e4f0..3accc34784 100644
--- a/src/slic3r/GUI/PublishDialog.hpp
+++ b/src/slic3r/GUI/PublishDialog.hpp
@@ -4,8 +4,12 @@
 
 #include "I18N.hpp"
 
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/event.h>
 #include <wx/font.h>
 #include <wx/colour.h>
+#include <wx/panel.h>
+#include <wx/gdicmn.h>
 #include <wx/settings.h>
 #include <wx/string.h>
 #include <wx/sizer.h>
diff --git a/src/slic3r/GUI/PublishSettingsDialog.cpp b/src/slic3r/GUI/PublishSettingsDialog.cpp
index d231857f2c..8d192cfcf0 100644
--- a/src/slic3r/GUI/PublishSettingsDialog.cpp
+++ b/src/slic3r/GUI/PublishSettingsDialog.cpp
@@ -22,7 +22,27 @@
 #include "libslic3r/Model.hpp"
 
 #include <boost/algorithm/string/trim.hpp>
+#include <wx/colour.h>
+#include <string>
+#include "libslic3r/Config.hpp"
+#include "slic3r/GUI/GUI.hpp"
+#include <vector>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "libslic3r/CustomGCode.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "slic3r/GUI/Widgets/TabCtrl.hpp"
 #include <wx/display.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/tglbtn.h>
+#include <wx/treebase.h>
+#include <wx/sizer.h>
+#include <wx/string.h>
+#include <wx/toplevel.h>
+#include <wx/panel.h>
+#include <wx/textctrl.h>
+#include <wx/stattext.h>
+#include <wx/geometry.h>
 #include <wx/utils.h>
 #include <wx/dcbuffer.h>
 #include <wx/dcmemory.h>
diff --git a/src/slic3r/GUI/PublishSettingsDialog.hpp b/src/slic3r/GUI/PublishSettingsDialog.hpp
index c38d865413..3b7b8a4e5c 100644
--- a/src/slic3r/GUI/PublishSettingsDialog.hpp
+++ b/src/slic3r/GUI/PublishSettingsDialog.hpp
@@ -6,6 +6,12 @@
 
 #include "libslic3r/PublishSettings.hpp"
 
+#include <cstddef>
+#include <wx/string.h>
+#include <wx/sizer.h>
+#include <wx/panel.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
 #include <wx/wx.h>
 #include <wx/colour.h>
 #include <wx/scrolwin.h>
diff --git a/src/slic3r/GUI/PurgeModeDialog.cpp b/src/slic3r/GUI/PurgeModeDialog.cpp
index b3191a04e5..8bd06d6c65 100644
--- a/src/slic3r/GUI/PurgeModeDialog.cpp
+++ b/src/slic3r/GUI/PurgeModeDialog.cpp
@@ -1,10 +1,22 @@
 #include "PurgeModeDialog.hpp"
 
+#include <wx/colour.h>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/dialog.h>
+#include <string>
+#include <wx/panel.h>
+#include "libslic3r/Config.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
 #include <wx/sizer.h>
 #include <wx/stattext.h>
 #include <wx/statbmp.h>
 #include <wx/dcbuffer.h>
 #include <wx/graphics.h>
+#include <wx/window.h>
 
 #include "I18N.hpp"
 #include "GUI_App.hpp"
diff --git a/src/slic3r/GUI/PurgeModeDialog.hpp b/src/slic3r/GUI/PurgeModeDialog.hpp
index e5880e6ab1..ee802a62f5 100644
--- a/src/slic3r/GUI/PurgeModeDialog.hpp
+++ b/src/slic3r/GUI/PurgeModeDialog.hpp
@@ -1,7 +1,10 @@
 #pragma once
 
+#include <string>
 #include <wx/dialog.h>
+#include <wx/event.h>
 #include <wx/panel.h>
+#include <wx/string.h>
 
 #include "GUI_Utils.hpp"
 #include "libslic3r/PrintConfig.hpp"
diff --git a/src/slic3r/GUI/RammingChart.cpp b/src/slic3r/GUI/RammingChart.cpp
index 29116b12cb..6348135d9a 100644
--- a/src/slic3r/GUI/RammingChart.cpp
+++ b/src/slic3r/GUI/RammingChart.cpp
@@ -1,7 +1,15 @@
 // Orca: This file is ported from latest PrusaSlicer
 
 #include <algorithm>
+#include <wx/colour.h>
+#include <wx/chartype.h>
+#include <vector>
+#include <cmath>
+#include <utility>
 #include <wx/dcbuffer.h>
+#include <wx/event.h>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
 
 #include "RammingChart.hpp"
 #include "GUI.hpp"
diff --git a/src/slic3r/GUI/RammingChart.hpp b/src/slic3r/GUI/RammingChart.hpp
index 1517299aed..dbae6341bb 100644
--- a/src/slic3r/GUI/RammingChart.hpp
+++ b/src/slic3r/GUI/RammingChart.hpp
@@ -3,7 +3,10 @@
 #ifndef RAMMING_CHART_H_
 #define RAMMING_CHART_H_
 
+#include <utility>
 #include <vector>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
 #include <wx/wxprec.h>
 #ifndef WX_PRECOMP
     #include <wx/wx.h>
diff --git a/src/slic3r/GUI/RecenterDialog.cpp b/src/slic3r/GUI/RecenterDialog.cpp
index 11f185bf89..34b10ddb23 100644
--- a/src/slic3r/GUI/RecenterDialog.cpp
+++ b/src/slic3r/GUI/RecenterDialog.cpp
@@ -1,10 +1,20 @@
 #include "RecenterDialog.hpp"
 #include "GUI_App.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
 #include <slic3r/GUI/I18N.hpp>
+#include <wx/colour.h>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <wx/dcclient.h>
+#include <wx/dc.h>
 #include <wx/dcgraph.h>
 #include <wx/dcmemory.h>
 #include <slic3r/GUI/Widgets/Label.hpp>
 #include <slic3r/GUI/Widgets/DialogButtons.hpp>
+#include <wx/event.h>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/sizer.h>
+#include <wx/panel.h>
 
 #define BORDER FromDIP(25)
 #define DRAW_PANEL_SIZE wxSize(FromDIP(475), FromDIP(100))
diff --git a/src/slic3r/GUI/RecenterDialog.hpp b/src/slic3r/GUI/RecenterDialog.hpp
index cd7511d3f5..3954d87094 100644
--- a/src/slic3r/GUI/RecenterDialog.hpp
+++ b/src/slic3r/GUI/RecenterDialog.hpp
@@ -2,9 +2,15 @@
 #define slic3r_GUI_RecenterDialog_hpp_
 
 #include "GUI_Utils.hpp"
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <wx/event.h>
+#include <wx/dc.h>
+#include <wx/gdicmn.h>
 #include <wx/statbmp.h>
 #include "Widgets/Button.hpp"
 #include <wx/stattext.h>
+#include <wx/string.h>
+#include <wx/toplevel.h>
 
 namespace Slic3r { namespace GUI {
 class RecenterDialog : public DPIDialog
diff --git a/src/slic3r/GUI/ReleaseNote.cpp b/src/slic3r/GUI/ReleaseNote.cpp
index 7853149ccf..a65e39787c 100644
--- a/src/slic3r/GUI/ReleaseNote.cpp
+++ b/src/slic3r/GUI/ReleaseNote.cpp
@@ -1,6 +1,7 @@
 #include "ReleaseNote.hpp"
 #include "I18N.hpp"
 
+#include "bambu_networking.hpp"
 #include "libslic3r/Utils.hpp"
 #include "libslic3r/Thread.hpp"
 #include "GUI.hpp"
@@ -16,6 +17,35 @@
 #include "Jobs/BoostThreadWorker.hpp"
 #include "Jobs/PlaterWorker.hpp"
 
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <boost/nowide/fstream.hpp>
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
+#include <exception>
+#include <boost/log/trivial.hpp>
+#include "slic3r/GUI/Widgets/HyperLink.hpp"
+#include "slic3r/GUI/Widgets/CheckBox.hpp"
+#include <sstream>
+#include <ios>
+#include <iomanip>
+#include <vector>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <md4c/src/md4c.h>
+#include <wx/image.h>
+#include <wx/datetime.h>
+#include <utility>
+#include "slic3r/GUI/Widgets/AMSItem.hpp"
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include "slic3r/GUI/DeviceCore/DevConfigUtil.h"
+#include <memory>
+#include "slic3r/GUI/BBLStatusBarSend.hpp"
+#include <boost/bind/bind.hpp>
+#include "slic3r/GUI/Jobs/SendJob.hpp"
+#include "slic3r/GUI/Jobs/Worker.hpp"
 #include <wx/regex.h>
 #include <wx/progdlg.h>
 #include <wx/clipbrd.h>
@@ -24,6 +54,14 @@
 #include <miniz.h>
 #include <algorithm>
 #include <cctype>
+#include <wx/toplevel.h>
+#include <wx/string.h>
+#include <wx/simplebook.h>
+#include <wx/webview.h>
+#include <wx/utils.h>
+#include <wx/tglbtn.h>
+#include <wx/webrequest.h>
+#include <wx/timer.h>
 #include "Plater.hpp"
 #include "BitmapCache.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
diff --git a/src/slic3r/GUI/ReleaseNote.hpp b/src/slic3r/GUI/ReleaseNote.hpp
index 5d950005df..1234d59c60 100644
--- a/src/slic3r/GUI/ReleaseNote.hpp
+++ b/src/slic3r/GUI/ReleaseNote.hpp
@@ -1,6 +1,18 @@
 #ifndef slic3r_GUI_ReleaseNote_hpp_
 #define slic3r_GUI_ReleaseNote_hpp_
 
+#include "slic3r/GUI/Plater.hpp"
+#include <string>
+#include <vector>
+#include <wx/simplebook.h>
+#include <wx/toplevel.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/webrequest.h>
+#include <map>
+#include <memory>
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include <wx/timer.h>
+#include "slic3r/GUI/BBLStatusBarSend.hpp"
 #include <wx/wx.h>
 #include <wx/intl.h>
 #include <wx/collpane.h>
diff --git a/src/slic3r/GUI/RemovableDriveManager.cpp b/src/slic3r/GUI/RemovableDriveManager.cpp
index 83ec4695c7..8cbe89813a 100644
--- a/src/slic3r/GUI/RemovableDriveManager.cpp
+++ b/src/slic3r/GUI/RemovableDriveManager.cpp
@@ -1,9 +1,25 @@
 #include "RemovableDriveManager.hpp"
 #include "libslic3r/Platform.hpp"
+#include <boost/filesystem/operations.hpp>
+#include <cstddef>
+#include <boost/process/pipe.hpp>
+#include <boost/process/search_path.hpp>
+#include <boost/process/io.hpp>
+#include <cassert>
+#include <algorithm>
+#include <boost/bind/bind.hpp>
+#include <chrono>
 #include <libslic3r/libslic3r.h>
 
 #include <boost/nowide/convert.hpp>
 #include <boost/log/trivial.hpp>
+#include <string>
+#include <vector>
+#include <wx/utils.h>
+#include <mutex>
+#include <system_error>
+#include <wx/event.h>
+#include <utility>
 
 #if _WIN32
 #include <windows.h>
diff --git a/src/slic3r/GUI/RemovableDriveManager.hpp b/src/slic3r/GUI/RemovableDriveManager.hpp
index ea8b4e83a7..72e15b5807 100644
--- a/src/slic3r/GUI/RemovableDriveManager.hpp
+++ b/src/slic3r/GUI/RemovableDriveManager.hpp
@@ -1,12 +1,14 @@
 #ifndef slic3r_GUI_RemovableDriveManager_hpp_
 #define slic3r_GUI_RemovableDriveManager_hpp_
 
+#include <utility>
 #include <vector>
 #include <string>
 
 #include <boost/thread.hpp>
 #include <mutex>
 #include <condition_variable>
+#include <wx/event.h>
 
 // Custom wxWidget events
 #include "Event.hpp"
diff --git a/src/slic3r/GUI/SafetyOptionsDialog.cpp b/src/slic3r/GUI/SafetyOptionsDialog.cpp
index c633d2778e..716b6ac5c4 100644
--- a/src/slic3r/GUI/SafetyOptionsDialog.cpp
+++ b/src/slic3r/GUI/SafetyOptionsDialog.cpp
@@ -9,6 +9,20 @@
 #include "DeviceCore/DevExtruderSystem.h"
 #include "DeviceCore/DevNozzleSystem.h"
 #include "DeviceCore/DevPrintOptions.h"
+#include <wx/colour.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <utility>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/wx.h>
+#include <wx/gdicmn.h>
+#include <wx/toplevel.h>
+#include <string>
+#include <wx/scrolwin.h>
+#include <wx/types.h>
+#include <wx/tglbtn.h>
+#include <wx/event.h>
+#include <boost/log/trivial.hpp>
+#include <wx/timer.h>
 
 static const wxColour STATIC_BOX_LINE_COL = wxColour(238, 238, 238);
 static const wxColour STATIC_TEXT_CAPTION_COL = wxColour(100, 100, 100);
diff --git a/src/slic3r/GUI/SafetyOptionsDialog.hpp b/src/slic3r/GUI/SafetyOptionsDialog.hpp
index a39ddb77ab..316501b42b 100644
--- a/src/slic3r/GUI/SafetyOptionsDialog.hpp
+++ b/src/slic3r/GUI/SafetyOptionsDialog.hpp
@@ -1,6 +1,8 @@
 #ifndef slic3r_GUI_SafetyOptionsDialog_hpp_
 #define slic3r_GUI_SafetyOptionsDialog_hpp_
 
+#include <wx/panel.h>
+#include <wx/timer.h>
 #include <wx/wx.h>
 #include <wx/font.h>
 #include <wx/colour.h>
diff --git a/src/slic3r/GUI/SavePresetDialog.cpp b/src/slic3r/GUI/SavePresetDialog.cpp
index 04f98f06f9..7aff669668 100644
--- a/src/slic3r/GUI/SavePresetDialog.cpp
+++ b/src/slic3r/GUI/SavePresetDialog.cpp
@@ -1,13 +1,35 @@
 #include "SavePresetDialog.hpp"
 
+#include <cassert>
+#include <boost/algorithm/string/predicate.hpp>
 #include <cstddef>
+#include "libslic3r/Preset.hpp"
+#include "slic3r/GUI/Field.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <utility>
+#include "slic3r/GUI/Widgets/RadioGroup.hpp"
+#include "libslic3r/Config.hpp"
+#include "slic3r/GUI/Widgets/CheckBox.hpp"
+#include <cstring>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "slic3r/GUI/OptionsGroup.hpp"
 #include <vector>
 #include <string>
 #include <boost/algorithm/string.hpp>
 #include <boost/log/trivial.hpp>
 
+#include <wx/checklst.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <wx/colour.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
+#include <wx/string.h>
+#include <wx/tglbtn.h>
+#include <wx/toplevel.h>
 #include <wx/wupdlock.h>
 
 #include "libslic3r/PresetBundle.hpp"
diff --git a/src/slic3r/GUI/SavePresetDialog.hpp b/src/slic3r/GUI/SavePresetDialog.hpp
index 05aa1b2d39..10cf25883b 100644
--- a/src/slic3r/GUI/SavePresetDialog.hpp
+++ b/src/slic3r/GUI/SavePresetDialog.hpp
@@ -11,6 +11,11 @@
 #include "Widgets/RoundedRectangle.hpp"
 #include "Widgets/Label.hpp"
 #include "Widgets/TextInput.hpp"
+#include <string>
+#include <wx/sizer.h>
+#include <wx/checklst.h>
+#include <vector>
+#include <wx/event.h>
 
 class wxString;
 class wxStaticText;
diff --git a/src/slic3r/GUI/SceneCache.cpp b/src/slic3r/GUI/SceneCache.cpp
index a72e32695f..5cca509a5e 100644
--- a/src/slic3r/GUI/SceneCache.cpp
+++ b/src/slic3r/GUI/SceneCache.cpp
@@ -8,6 +8,8 @@
 #include "GUI_App.hpp"
 
 #include <glad/gl.h>
+#include <utility>
+#include "libslic3r/Point.hpp"
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/SceneRaycaster.cpp b/src/slic3r/GUI/SceneRaycaster.cpp
index 408e910ff8..d5abeb4c0f 100644
--- a/src/slic3r/GUI/SceneRaycaster.cpp
+++ b/src/slic3r/GUI/SceneRaycaster.cpp
@@ -5,6 +5,15 @@
 #include "GUI_App.hpp"
 #include "Selection.hpp"
 #include "Plater.hpp"
+#include "slic3r/GUI/PartPlate.hpp"
+#include "libslic3r/Technologies.hpp"
+#include <memory>
+#include "slic3r/GUI/MeshUtils.hpp"
+#include "libslic3r/Point.hpp"
+#include <cassert>
+#include <vector>
+#include <optional>
+#include <limits>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/SceneRaycaster.hpp b/src/slic3r/GUI/SceneRaycaster.hpp
index 9aa527abee..f6dc5c6261 100644
--- a/src/slic3r/GUI/SceneRaycaster.hpp
+++ b/src/slic3r/GUI/SceneRaycaster.hpp
@@ -3,6 +3,9 @@
 
 #include "MeshUtils.hpp"
 #include "GLModel.hpp"
+#include "libslic3r/Point.hpp"
+#include <memory>
+#include "libslic3r/Technologies.hpp"
 #include <vector>
 #include <string>
 #include <optional>
diff --git a/src/slic3r/GUI/Search.cpp b/src/slic3r/GUI/Search.cpp
index 427271ad2f..dcf0573321 100644
--- a/src/slic3r/GUI/Search.cpp
+++ b/src/slic3r/GUI/Search.cpp
@@ -1,11 +1,41 @@
 #include "Search.hpp"
 
+#include <boost/optional/optional.hpp>
+#include "slic3r/GUI/GUI.hpp"
+#include "libslic3r/Preset.hpp"
+#include "libslic3r/Config.hpp"
+#include <cstdint>
+#include "slic3r/GUI/SettingsIndex.hpp"
+#include <boost/algorithm/string/trim.hpp>
+#include <limits>
+#include <utility>
+#include <boost/algorithm/string/replace.hpp>
+#include <cassert>
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <map>
+#include "slic3r/GUI/Widgets/PopupWindow.hpp"
+#include "slic3r/GUI/Widgets/ScrolledWindow.hpp"
+#include <tuple>
+#include "slic3r/GUI/ObjectDataViewModel.hpp"
 #include <vector>
 #include <cstddef>
 #include <string>
 #include <boost/algorithm/string.hpp>
 #include <boost/optional.hpp>
 #include <boost/nowide/convert.hpp>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/colour.h>
+#include <wx/dc.h>
+#include <wx/dcclient.h>
+#include <wx/popupwin.h>
+#include <wx/sizer.h>
+#include <wx/panel.h>
+#include <wx/string.h>
+#include <wx/window.h>
+#include <wx/variant.h>
+#include <wx/debug.h>
 
 #include "wx/dataview.h"
 #include "wx/numformatter.h"
diff --git a/src/slic3r/GUI/Search.hpp b/src/slic3r/GUI/Search.hpp
index 92ccd4d28c..84a1a748dd 100644
--- a/src/slic3r/GUI/Search.hpp
+++ b/src/slic3r/GUI/Search.hpp
@@ -1,11 +1,22 @@
 #ifndef slic3r_SearchComboBox_hpp_
 #define slic3r_SearchComboBox_hpp_
 
+#include <string>
+#include <cstddef>
+#include "libslic3r/Config.hpp"
+#include <algorithm>
+#include "slic3r/GUI/ObjectDataViewModel.hpp"
+#include <utility>
 #include <vector>
 #include <map>
 
 #include <boost/nowide/convert.hpp>
 
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/dc.h>
+#include <wx/colour.h>
+#include <wx/dataview.h>
 #include <wx/panel.h>
 #include <wx/sizer.h>
 #include <wx/listctrl.h>
@@ -15,6 +26,8 @@
 #include <wx/checkbox.h>
 #include <wx/dialog.h>
 #include <wx/srchctrl.h>
+#include <wx/string.h>
+#include <wx/variant.h>
 
 #include "wxExtensions.hpp"
 #include "GUI_Utils.hpp"
diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp
index db4eb723bc..6855a42d77 100644
--- a/src/slic3r/GUI/SelectMachine.cpp
+++ b/src/slic3r/GUI/SelectMachine.cpp
@@ -38,6 +38,66 @@
 #include "BackgroundSlicingProcess.hpp"   // complete type for background_process().get_current_gcode_result()
 #include "DeviceCore/DevStorage.h"
 
+#include <wx/event.h>
+#include <string>
+#include "libslic3r/PrintConfig.hpp"
+#include <cassert>
+#include <vector>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/AmsMappingPopup.hpp"
+#include "libslic3r/ProjectTask.hpp"
+#include <wx/panel.h>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include "slic3r/GUI/PrePrintChecker.hpp"
+#include "slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.hpp"
+#include <wx/anybutton.h>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <memory>
+#include "slic3r/GUI/BBLStatusBarPrint.hpp"
+#include "slic3r/GUI/Widgets/HyperLink.hpp"
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <wx/busycursor.h>
+#include <boost/log/trivial.hpp>
+#include <cstdio>
+#include <cstddef>
+#include "libslic3r/Config.hpp"
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
+#include <exception>
+#include <cstdlib>
+#include <map>
+#include <ctime>
+#include <set>
+#include "slic3r/GUI/DeviceManager.hpp"
+#include <optional>
+#include <cmath>
+#include "libslic3r/GCode/GCodeProcessor.hpp"
+#include <wx/chartype.h>
+#include <unordered_set>
+#include "libslic3r/CommonDefs.hpp"
+#include "slic3r/GUI/ReleaseNote.hpp"
+#include <boost/algorithm/string/case_conv.hpp>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/dcclient.h>
+#include "libslic3r/Print.hpp"
+#include <wx/dialog.h>
+#include <utility>
+#include "slic3r/GUI/Monitor.hpp"
+#include <ostream>
+#include "slic3r/GUI/Jobs/PrintJob.hpp"
+#include "slic3r/GUI/MsgDialog.hpp"
+#include "slic3r/GUI/Jobs/Worker.hpp"
+#include <wx/arrstr.h>
+#include "slic3r/GUI/Auxiliary.hpp"
+#include <cstring>
+#include "libslic3r/PrintBase.hpp"
+#include "slic3r/GUI/PartPlate.hpp"
+#include "slic3r/GUI/3DScene.hpp"
+#include <wx/image.h>
+#include <wx/dcmemory.h>
+#include <wx/dc.h>
+#include "slic3r/GUI/Widgets/DropDown.hpp"
 #include <wx/progdlg.h>
 #include <wx/clipbrd.h>
 #include <wx/dcgraph.h>
@@ -45,6 +105,17 @@
 #include <miniz.h>
 #include <algorithm>
 #include <unordered_map>
+#include <wx/wx.h>
+#include <wx/toplevel.h>
+#include <wx/simplebook.h>
+#include <wx/string.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+#include <wx/sizer.h>
+#include <wx/timer.h>
+#include <wx/tglbtn.h>
+#include <wx/wxcrt.h>
+#include <wx/utils.h>
 #include "Plater.hpp"
 #include "Notebook.hpp"
 #include "BitmapCache.hpp"
diff --git a/src/slic3r/GUI/SelectMachine.hpp b/src/slic3r/GUI/SelectMachine.hpp
index 6a3acce54c..a0515dd20c 100644
--- a/src/slic3r/GUI/SelectMachine.hpp
+++ b/src/slic3r/GUI/SelectMachine.hpp
@@ -1,6 +1,24 @@
 #ifndef slic3r_GUI_SelectMachine_hpp_
 #define slic3r_GUI_SelectMachine_hpp_
 
+#include <string>
+#include "libslic3r/PrintConfig.hpp"
+#include <vector>
+#include "libslic3r/ProjectTask.hpp"
+#include <map>
+#include <wx/image.h>
+#include <wx/event.h>
+#include <wx/dc.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <list>
+#include <memory>
+#include "libslic3r/Format/bbs_3mf.hpp"
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include "slic3r/GUI/Jobs/PrintJob.hpp"
+#include "libslic3r/GCode/ThumbnailData.hpp"
+#include "slic3r/GUI/Widgets/StaticBox.hpp"
+#include "libslic3r/CommonDefs.hpp"
 #include <wx/wx.h>
 #include <wx/intl.h>
 #include <wx/collpane.h>
diff --git a/src/slic3r/GUI/SelectMachinePop.cpp b/src/slic3r/GUI/SelectMachinePop.cpp
index 0046fd5f7f..6dc39bb1a0 100644
--- a/src/slic3r/GUI/SelectMachinePop.cpp
+++ b/src/slic3r/GUI/SelectMachinePop.cpp
@@ -17,12 +17,40 @@
 #include "ConnectPrinter.hpp"
 
 
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/dcclient.h>
+#include <wx/dc.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/Widgets/PopupWindow.hpp"
+#include <wx/popupwin.h>
+#include <boost/log/trivial.hpp>
+#include <memory>
+#include "slic3r/GUI/Widgets/HyperLink.hpp"
+#include <wx/chartype.h>
+#include <vector>
+#include <utility>
+#include "slic3r/GUI/MsgDialog.hpp"
+#include "slic3r/GUI/ReleaseNote.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include "slic3r/GUI/Auxiliary.hpp"
+#include "libslic3r/Preset.hpp"
+#include <cstddef>
+#include <cstring>
 #include <wx/progdlg.h>
 #include <wx/clipbrd.h>
 #include <wx/dcgraph.h>
 #include <wx/mstream.h>
 #include <miniz.h>
 #include <algorithm>
+#include <wx/wx.h>
+#include <wx/timer.h>
+#include <wx/utils.h>
+#include <wx/toplevel.h>
+#include <wx/string.h>
 #include "Plater.hpp"
 #include "Notebook.hpp"
 #include "BitmapCache.hpp"
diff --git a/src/slic3r/GUI/SelectMachinePop.hpp b/src/slic3r/GUI/SelectMachinePop.hpp
index e34a23708c..37dcd98ac4 100644
--- a/src/slic3r/GUI/SelectMachinePop.hpp
+++ b/src/slic3r/GUI/SelectMachinePop.hpp
@@ -1,6 +1,15 @@
 #ifndef slic3r_GUI_SelectMachinePop_hpp_
 #define slic3r_GUI_SelectMachinePop_hpp_
 
+#include <wx/event.h>
+#include <wx/dc.h>
+#include <cstddef>
+#include "slic3r/GUI/Widgets/HyperLink.hpp"
+#include <vector>
+#include <memory>
+#include <string>
+#include <map>
+#include "slic3r/GUI/Widgets/TextInput.hpp"
 #include <wx/wx.h>
 #include <wx/intl.h>
 #include <wx/collpane.h>
diff --git a/src/slic3r/GUI/Selection.cpp b/src/slic3r/GUI/Selection.cpp
index 81dd074096..b704ac1fcb 100644
--- a/src/slic3r/GUI/Selection.cpp
+++ b/src/slic3r/GUI/Selection.cpp
@@ -14,6 +14,32 @@
 #include "libslic3r/LocalesUtils.hpp"
 #include "libslic3r/Model.hpp"
 #include "libslic3r/PresetBundle.hpp"
+#include "libslic3r/Technologies.hpp"
+#include "libslic3r/Color.hpp"
+#include "libslic3r/Point.hpp"
+#include "libslic3r/Geometry.hpp"
+#include "slic3r/GUI/GLModel.hpp"
+#include <string>
+#include <vector>
+#include <cstdlib>
+#include "slic3r/GUI/Event.hpp"
+#include <set>
+#include <utility>
+#include <cstddef>
+#include <algorithm>
+#include <cassert>
+#include <optional>
+#include "slic3r/GUI/GUI_Geometry.hpp"
+#include <cfloat>
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/GCode/WipeTower.hpp"
+#include "libslic3r/Geometry/Circle.hpp"
+#include "slic3r/GUI/ObjectDataViewModel.hpp"
+#include <map>
+#include "slic3r/GUI/OpenGLManager.hpp"
+#include <array>
+#include "libslic3r/Config.hpp"
 #if ENABLE_ENHANCED_PRINT_VOLUME_FIT
 #include "libslic3r/BuildVolume.hpp"
 #endif // ENABLE_ENHANCED_PRINT_VOLUME_FIT
diff --git a/src/slic3r/GUI/Selection.hpp b/src/slic3r/GUI/Selection.hpp
index 3fae13ec3a..35ba184d08 100644
--- a/src/slic3r/GUI/Selection.hpp
+++ b/src/slic3r/GUI/Selection.hpp
@@ -5,8 +5,20 @@
 #include "GUI_Geometry.hpp"
 #include "GLModel.hpp"
 
+#include "libslic3r/Technologies.hpp"
+#include "libslic3r/Point.hpp"
+#include <map>
+#include <memory>
+#include "libslic3r/BoundingBox.hpp"
+#include <array>
+#include <cstddef>
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Color.hpp"
 #include <set>
 #include <optional>
+#include <vector>
+#include <utility>
+#include <string>
 
 namespace Slic3r {
 
diff --git a/src/slic3r/GUI/SendMultiMachinePage.cpp b/src/slic3r/GUI/SendMultiMachinePage.cpp
index 04becefeac..87b68d1ddd 100644
--- a/src/slic3r/GUI/SendMultiMachinePage.cpp
+++ b/src/slic3r/GUI/SendMultiMachinePage.cpp
@@ -6,7 +6,58 @@
 #include "slic3r/Utils/bambu_networking.hpp"
 #include "MainFrame.hpp"
 #include "Widgets/RadioBox.hpp"
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/MultiMachine.hpp"
+#include <wx/dc.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/dcclient.h>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "slic3r/GUI/GUI.hpp"
+#include "slic3r/GUI/AmsMappingPopup.hpp"
+#include "slic3r/GUI/MultiTaskManagerPage.hpp"
+#include <map>
+#include <string>
+#include <vector>
+#include <algorithm>
+#include "slic3r/GUI/Jobs/PrintJob.hpp"
+#include "libslic3r/Utils.hpp"
+#include <boost/log/trivial.hpp>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include "slic3r/GUI/PartPlate.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
+#include "slic3r/GUI/MsgDialog.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include <utility>
+#include "slic3r/GUI/SelectMachine.hpp"
+#include <wx/arrstr.h>
+#include <wx/chartype.h>
+#include <wx/layout.h>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "slic3r/GUI/MultiMachinePage.hpp"
+#include "libslic3r/Config.hpp"
+#include "slic3r/GUI/BitmapCache.hpp"
+#include "libslic3r/GCode/ThumbnailData.hpp"
+#include <wx/image.h>
+#include <cstdio>
+#include "slic3r/GUI/Auxiliary.hpp"
+#include <cstddef>
+#include <cstring>
 #include <wx/listimpl.cpp>
+#include <wx/scrolwin.h>
+#include <wx/string.h>
+#include <wx/toplevel.h>
+#include <wx/sizer.h>
+#include <wx/panel.h>
+#include <wx/timer.h>
+#include <wx/tglbtn.h>
+#include <wx/valtext.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+#include <wx/wxcrt.h>
+#include <wx/simplebook.h>
 
 #include "DeviceCore/DevManager.h"
 #include "DeviceCore/DevStorage.h"
diff --git a/src/slic3r/GUI/SendMultiMachinePage.hpp b/src/slic3r/GUI/SendMultiMachinePage.hpp
index eadd78eb0a..7f066b9309 100644
--- a/src/slic3r/GUI/SendMultiMachinePage.hpp
+++ b/src/slic3r/GUI/SendMultiMachinePage.hpp
@@ -13,6 +13,23 @@
 #include "Widgets/TextInput.hpp"
 #include "AmsMappingPopup.hpp"
 #include "SelectMachine.hpp"
+#include <wx/string.h>
+#include <wx/list.h>
+#include <wx/dc.h>
+#include <wx/event.h>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <map>
+#include <string>
+#include <wx/timer.h>
+#include <wx/scrolwin.h>
+#include <wx/sizer.h>
+#include "libslic3r/AppConfig.hpp"
+#include <wx/panel.h>
+#include <vector>
+#include "libslic3r/ProjectTask.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/simplebook.h>
+#include "libslic3r/GCode/ThumbnailData.hpp"
 
 namespace Slic3r {
 
diff --git a/src/slic3r/GUI/SendSystemInfoDialog.cpp b/src/slic3r/GUI/SendSystemInfoDialog.cpp
index ed22a26753..3c16ddde93 100644
--- a/src/slic3r/GUI/SendSystemInfoDialog.cpp
+++ b/src/slic3r/GUI/SendSystemInfoDialog.cpp
@@ -1,4 +1,37 @@
 #include "SendSystemInfoDialog.hpp"
+#include <string>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/toplevel.h>
+#include <wx/textctrl.h>
+#include "libslic3r_version.h"
+#include <map>
+#include <cstddef>
+#include <cstdio>
+#include <stdio.h>
+#include <algorithm>
+#include <vector>
+#include <cstdint>
+#include <cstring>
+#include <iterator>
+#include <wx/language.h>
+#include <wx/intl.h>
+#include <wx/version.h>
+#include <cmath>
+#include <system_error>
+#include <utility>
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/constants.hpp>
+#include <functional>
+#include <boost/algorithm/string/trim.hpp>
+#include <sstream>
+#include <wx/dialog.h>
+#include "libslic3r/libslic3r.h"
+#include <cassert>
+#include <wx/colour.h>
+#include <wx/html/htmlwin.h>
+#include <wx/event.h>
+#include "slic3r/GUI/wxExtensions.hpp"
 
 #if __APPLE__
 #import <IOKit/IOKitLib.h>
diff --git a/src/slic3r/GUI/SendToPrinter.cpp b/src/slic3r/GUI/SendToPrinter.cpp
index d582cfdef7..7a44305e4e 100644
--- a/src/slic3r/GUI/SendToPrinter.cpp
+++ b/src/slic3r/GUI/SendToPrinter.cpp
@@ -16,16 +16,65 @@
 #include "Jobs/BoostThreadWorker.hpp"
 #include "Jobs/PlaterWorker.hpp"
 
+#include <wx/event.h>
+#include <map>
+#include <string>
+#include "slic3r/GUI/Auxiliary.hpp"
+#include "libslic3r/Preset.hpp"
+#include <cstddef>
+#include <cstring>
+#include "slic3r/GUI/MsgDialog.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/SelectMachine.hpp"
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/Widgets/ComboBox.hpp"
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <vector>
+#include "slic3r/GUI/Widgets/AnimaController.hpp"
+#include <memory>
+#include "slic3r/GUI/BBLStatusBarSend.hpp"
+#include "slic3r/GUI/Widgets/HyperLink.hpp"
+#include <wx/chartype.h>
+#include <wx/busycursor.h>
+#include <boost/log/trivial.hpp>
+#include <cassert>
+#include <ostream>
+#include "slic3r/GUI/PrePrintChecker.hpp"
+#include "slic3r/GUI/Jobs/PrintJob.hpp"
+#include "slic3r/GUI/Jobs/SendJob.hpp"
+#include "slic3r/GUI/Jobs/Worker.hpp"
+#include <utility>
+#include <wx/datetime.h>
+#include <wx/arrstr.h>
+#include "slic3r/GUI/PartPlate.hpp"
+#include "libslic3r/GCode/ThumbnailData.hpp"
+#include <wx/image.h>
+#include <cstdio>
+#include <exception>
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/lexical_cast.hpp>
+#include <cmath>
 #include <wx/progdlg.h>
 #include <wx/clipbrd.h>
 #include <wx/dcgraph.h>
 #include <miniz.h>
 #include <algorithm>
+#include <wx/string.h>
+#include <wx/wx.h>
+#include <wx/toplevel.h>
+#include <wx/scrolwin.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+#include <wx/types.h>
+#include <wx/timer.h>
 #include "BitmapCache.hpp"
 
 #include "DeviceCore/DevManager.h"
 #include "DeviceCore/DevConfigUtil.h"
 #include "DeviceCore/DevStorage.h"
+#include "libslic3r_version.h"
 #include "slic3r/Utils/FileTransferUtils.hpp"
 
 
diff --git a/src/slic3r/GUI/SendToPrinter.hpp b/src/slic3r/GUI/SendToPrinter.hpp
index ddfb017552..fad825713b 100644
--- a/src/slic3r/GUI/SendToPrinter.hpp
+++ b/src/slic3r/GUI/SendToPrinter.hpp
@@ -1,6 +1,19 @@
 #ifndef slic3r_GUI_SendToSDcard_hpp_
 #define slic3r_GUI_SendToSDcard_hpp_
 
+#include <string>
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include "slic3r/GUI/Widgets/HyperLink.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include "slic3r/GUI/PrePrintChecker.hpp"
+#include <vector>
+#include <map>
+#include <memory>
+#include "slic3r/GUI/Jobs/Worker.hpp"
+#include <wx/datetime.h>
+#include <wx/event.h>
+#include "slic3r/GUI/GUI_App.hpp"
+#include <cstddef>
 #include <wx/wx.h>
 #include <wx/intl.h>
 #include <wx/collpane.h>
diff --git a/src/slic3r/GUI/SettingsIndex.cpp b/src/slic3r/GUI/SettingsIndex.cpp
index fed344ff71..7300924076 100644
--- a/src/slic3r/GUI/SettingsIndex.cpp
+++ b/src/slic3r/GUI/SettingsIndex.cpp
@@ -3,10 +3,13 @@
 #include <algorithm>
 #include <cstddef>
 #include <cstdlib>
+#include "libslic3r/Preset.hpp"
+#include "libslic3r/Config.hpp"
 #include <string>
 #include <vector>
 
 #include <boost/nowide/convert.hpp>
+#include <wx/string.h>
 
 #include "GUI.hpp"
 #include "I18N.hpp"
diff --git a/src/slic3r/GUI/SettingsIndex.hpp b/src/slic3r/GUI/SettingsIndex.hpp
index a31d2109e0..0815dfec81 100644
--- a/src/slic3r/GUI/SettingsIndex.hpp
+++ b/src/slic3r/GUI/SettingsIndex.hpp
@@ -3,6 +3,7 @@
 
 #include <algorithm>
 #include <cstddef>
+#include "libslic3r/PrintConfig.hpp"
 #include <map>
 #include <string>
 #include <vector>
diff --git a/src/slic3r/GUI/Shortcuts.cpp b/src/slic3r/GUI/Shortcuts.cpp
index be713b7cf8..8773c6f364 100644
--- a/src/slic3r/GUI/Shortcuts.cpp
+++ b/src/slic3r/GUI/Shortcuts.cpp
@@ -4,8 +4,16 @@
 #include "libslic3r/AppConfig.hpp"
 
 #include <algorithm>
+#include <cstdint>
+#include <array>
+#include <cstddef>
 #include <map>
+#include "slic3r/GUI/KeyChord.hpp"
+#include <optional>
+#include <string>
 #include <utility>
+#include <wx/accel.h>
+#include <vector>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/Shortcuts.hpp b/src/slic3r/GUI/Shortcuts.hpp
index 71fe299a98..0e61554e2f 100644
--- a/src/slic3r/GUI/Shortcuts.hpp
+++ b/src/slic3r/GUI/Shortcuts.hpp
@@ -3,6 +3,7 @@
 #include "KeyChord.hpp"
 
 #include <array>
+#include <cstddef>
 #include <cstdint>
 #include <optional>
 #include <string>
diff --git a/src/slic3r/GUI/SingleChoiceDialog.cpp b/src/slic3r/GUI/SingleChoiceDialog.cpp
index ec8010234b..e6c54cf531 100644
--- a/src/slic3r/GUI/SingleChoiceDialog.cpp
+++ b/src/slic3r/GUI/SingleChoiceDialog.cpp
@@ -4,6 +4,15 @@
 #include "MainFrame.hpp"
 
 #include "Widgets/DialogButtons.hpp"
+#include <wx/string.h>
+#include <wx/arrstr.h>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/toplevel.h>
+#include <wx/sizer.h>
+#include "slic3r/GUI/Widgets/ComboBox.hpp"
+#include <cstddef>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/SingleChoiceDialog.hpp b/src/slic3r/GUI/SingleChoiceDialog.hpp
index ac43ef0808..d77d5d6296 100644
--- a/src/slic3r/GUI/SingleChoiceDialog.hpp
+++ b/src/slic3r/GUI/SingleChoiceDialog.hpp
@@ -4,6 +4,8 @@
 #include "GUI_Utils.hpp"
 #include "Widgets/Button.hpp"
 #include "Widgets/ComboBox.hpp"
+#include <wx/string.h>
+#include <wx/arrstr.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/SkipPartCanvas.cpp b/src/slic3r/GUI/SkipPartCanvas.cpp
index 7b7db213b1..af714b125d 100644
--- a/src/slic3r/GUI/SkipPartCanvas.cpp
+++ b/src/slic3r/GUI/SkipPartCanvas.cpp
@@ -1,6 +1,20 @@
+#include <cstdint>
+#include <functional>
+#include <algorithm>
+#include <cstdlib>
+#include <cstddef>
+#include <cmath>
+#include <boost/thread/lock_types.hpp>
+#include <exception>
+#include <cstring>
 #include <glad/gl.h>
 #include "SkipPartCanvas.hpp"
 
+#include <opencv2/core/mat.hpp>
+#include <opencv2/core/types.hpp>
+#include <opencv2/core/matx.hpp>
+#include <opencv2/imgcodecs.hpp>
+#include <math.h>
 #include <opencv2/opencv.hpp>
 #include <opencv2/core.hpp>
 #include <opencv2/imgproc.hpp>
@@ -12,6 +26,14 @@
 #include <libslic3r/Color.hpp>
 #include <filesystem>
 #include <map>
+#include <wx/event.h>
+#include <wx/glcanvas.h>
+#include <string>
+#include <vector>
+#include "slic3r/GUI/PartSkipCommon.hpp"
+#include <sstream>
+#include <wx/gdicmn.h>
+#include <wx/dcclient.h>
 
 wxDEFINE_EVENT(EVT_ZOOM_PERCENT, wxCommandEvent);
 wxDEFINE_EVENT(EVT_CANVAS_PART, wxCommandEvent);
diff --git a/src/slic3r/GUI/SkipPartCanvas.hpp b/src/slic3r/GUI/SkipPartCanvas.hpp
index d70ad3718f..c87c391a6e 100644
--- a/src/slic3r/GUI/SkipPartCanvas.hpp
+++ b/src/slic3r/GUI/SkipPartCanvas.hpp
@@ -1,5 +1,13 @@
 #ifndef SKIPPARTCANVAS_H
 #define SKIPPARTCANVAS_H
+#include <wx/event.h>
+#include <array>
+#include <string>
+#include <cstdint>
+#include <wx/gdicmn.h>
+#include <opencv2/core/mat.hpp>
+#include <unordered_map>
+#include <opencv2/core/types.hpp>
 #include <wx/wx.h>
 #include <wx/glcanvas.h>
 #include <opencv2/opencv.hpp>
diff --git a/src/slic3r/GUI/SliceInfoPanel.cpp b/src/slic3r/GUI/SliceInfoPanel.cpp
index a7e436c0ff..ed8ad89147 100644
--- a/src/slic3r/GUI/SliceInfoPanel.cpp
+++ b/src/slic3r/GUI/SliceInfoPanel.cpp
@@ -1,6 +1,27 @@
 #include "SliceInfoPanel.hpp"
 
+#include <array>
 #include <boost/log/trivial.hpp>
+#include <wx/object.h>
+#include "slic3r/GUI/Widgets/PopupWindow.hpp"
+#include <wx/colour.h>
+#include <string>
+#include <cstddef>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "libslic3r/ProjectTask.hpp"
+#include <wx/string.h>
+#include <wx/popupwin.h>
+#include <wx/scrolwin.h>
+#include <wx/event.h>
+#include <wx/sizer.h>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <wx/gdicmn.h>
+#include <wx/stattext.h>
+#include "slic3r/GUI/Widgets/StaticLine.hpp"
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <wx/panel.h>
+#include <wx/anybutton.h>
+#include <wx/webrequest.h>
 #include "I18N.hpp"
 #include "Widgets/Label.hpp"
 #include "libslic3r/Utils.hpp"
diff --git a/src/slic3r/GUI/SliceInfoPanel.hpp b/src/slic3r/GUI/SliceInfoPanel.hpp
index 09708d68e4..94a6a4149f 100644
--- a/src/slic3r/GUI/SliceInfoPanel.hpp
+++ b/src/slic3r/GUI/SliceInfoPanel.hpp
@@ -5,9 +5,18 @@
 #include "libslic3r/ProjectTask.hpp"
 #include "DeviceManager.hpp"
 #include "GUI.hpp"
+#include <wx/gdicmn.h>
+#include <cstddef>
+#include <wx/event.h>
+#include <memory>
+#include "slic3r/GUI/wxExtensions.hpp"
 #include <wx/panel.h>
 #include <wx/bitmap.h>
 #include <wx/image.h>
+#include <wx/scrolwin.h>
+#include <wx/rtti.h>
+#include <wx/sizer.h>
+#include <wx/string.h>
 #include <wx/webrequest.h>
 #include "Widgets/PopupWindow.hpp"
 
diff --git a/src/slic3r/GUI/SlicingProgressNotification.cpp b/src/slic3r/GUI/SlicingProgressNotification.cpp
index 539da41024..161e9d0e61 100644
--- a/src/slic3r/GUI/SlicingProgressNotification.cpp
+++ b/src/slic3r/GUI/SlicingProgressNotification.cpp
@@ -1,4 +1,17 @@
 #include "SlicingProgressNotification.hpp"
+#include <imgui.h>
+#include "slic3r/GUI/NotificationManager.hpp"
+#include <algorithm>
+#include <cstddef>
+#include "slic3r/GUI/GLCanvas3D.hpp"
+#include <string>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <cstdint>
+#include "slic3r/GUI/ImGuiWrapper.hpp"
+#include "slic3r/GUI/GUI_App.hpp"
+#include <sstream>
+#include <ios>
+#include <iomanip>
 
 #ifndef IMGUI_DEFINE_MATH_OPERATORS
 #define IMGUI_DEFINE_MATH_OPERATORS
diff --git a/src/slic3r/GUI/SlicingProgressNotification.hpp b/src/slic3r/GUI/SlicingProgressNotification.hpp
index 6a7ede1e2e..2564b770ec 100644
--- a/src/slic3r/GUI/SlicingProgressNotification.hpp
+++ b/src/slic3r/GUI/SlicingProgressNotification.hpp
@@ -3,6 +3,11 @@
 
 #include "DailyTips.hpp"
 #include "NotificationManager.hpp"
+#include <wx/event.h>
+#include <functional>
+#include <string>
+#include <cstdint>
+#include <imgui.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/SpeedDialDialog.cpp b/src/slic3r/GUI/SpeedDialDialog.cpp
index 1d81021a60..45161f472a 100644
--- a/src/slic3r/GUI/SpeedDialDialog.cpp
+++ b/src/slic3r/GUI/SpeedDialDialog.cpp
@@ -13,12 +13,25 @@
 
 #include <algorithm>
 
+#include "libslic3r/Config.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <string>
+#include <wx/chartype.h>
+#include <atomic>
+#include <vector>
+#include <utility>
 #include <wx/dcmemory.h>
 #include <wx/display.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/frame.h>
+#include <wx/nonownedwnd.h>
 #include <wx/region.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
+#include <wx/string.h>
 #include <wx/utils.h>
+#include <wx/webview.h>
 
 #ifdef __linux__
 #include <gtk/gtk.h>
diff --git a/src/slic3r/GUI/SpeedDialDialog.hpp b/src/slic3r/GUI/SpeedDialDialog.hpp
index d3b75f2256..f0bc5f3f00 100644
--- a/src/slic3r/GUI/SpeedDialDialog.hpp
+++ b/src/slic3r/GUI/SpeedDialDialog.hpp
@@ -8,6 +8,7 @@
 #include <string>
 
 #include <wx/bitmap.h>
+#include <wx/gdicmn.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/StagedBuild.hpp b/src/slic3r/GUI/StagedBuild.hpp
index 8f4c0454c3..74f07306d8 100644
--- a/src/slic3r/GUI/StagedBuild.hpp
+++ b/src/slic3r/GUI/StagedBuild.hpp
@@ -1,7 +1,9 @@
 #pragma once
 
 #include <algorithm>
+#include <cstddef>
 #include <functional>
+#include <utility>
 #include <vector>
 
 namespace Slic3r { namespace GUI {
diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp
index e4a9d906c0..a1f2b72c1a 100644
--- a/src/slic3r/GUI/StatusPanel.cpp
+++ b/src/slic3r/GUI/StatusPanel.cpp
@@ -1,5 +1,6 @@
 #include "StatusPanel.hpp"
 #include "I18N.hpp"
+#include "IPrinterAgent.hpp"
 #include "Widgets/Label.hpp"
 #include "Widgets/Button.hpp"
 #include "Widgets/StepCtrl.hpp"
@@ -11,16 +12,90 @@
 #include "MainFrame.hpp"
 
 #include "MsgDialog.hpp"
+#include "bambu_networking.hpp"
 #include "slic3r/Utils/Http.hpp"
 #include "libslic3r/Thread.hpp"
 #include "DeviceErrorDialog.hpp"
 
 #include "RecenterDialog.hpp"
 #include "CalibUtils.hpp"
+#include <boost/algorithm/string/replace.hpp>
+#include <cstddef>
+#include <ctime>
+#include "slic3r/GUI/DeviceManager.hpp"
+#include "slic3r/GUI/DeviceCore/DevExtruderSystem.h"
+#include "slic3r/GUI/Widgets/ProgressBar.hpp"
+#include "libslic3r/calib.hpp"
+#include <boost/log/trivial.hpp>
+#include "libslic3r/Utils.hpp"
+#include "slic3r/GUI/CameraPopup.hpp"
+#include <memory>
+#include "slic3r/GUI/WebMediaController.hpp"
+#include "slic3r/GUI/MediaPlayCtrl.h"
+#include "slic3r/GUI/Widgets/ImageSwitchButton.hpp"
+#include "slic3r/GUI/Widgets/AxisCtrlButton.hpp"
+#include "slic3r/GUI/Widgets/AMSControl.hpp"
+#include "slic3r/GUI/Widgets/FilamentLoad.hpp"
+#include "slic3r/GUI/DeviceCore/DevConfigUtil.h"
+#include "slic3r/GUI/Widgets/AMSItem.hpp"
+#include "slic3r/GUI/Widgets/FanControl.hpp"
+#include "slic3r/GUI/ReleaseNote.hpp"
+#include <cstdio>
+#include "slic3r/GUI/CalibrationWizardPage.hpp"
+#include "slic3r/GUI/SelectMachine.hpp"
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <cstdlib>
+#include "libslic3r/ProjectTask.hpp"
+#include "slic3r/GUI/GUI.hpp"
+#include <map>
+#include "slic3r/GUI/Event.hpp"
+#include <optional>
+#include "slic3r/GUI/AmsMappingPopup.hpp"
+#include <boost/date_time/posix_time/posix_time_types.hpp>
+#include <boost/date_time/posix_time/posix_time_duration.hpp>
+#include "slic3r/GUI/Widgets/PopupWindow.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <set>
+#include "libslic3r/libslic3r.h"
 #include <slic3r/GUI/Widgets/ProgressDialog.hpp>
+#include <wx/colour.h>
+#include <string>
+#include <wx/dcclient.h>
+#include <wx/dc.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/chartype.h>
+#include <utility>
+#include <wx/anybutton.h>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "slic3r/GUI/Widgets/SwitchButton.hpp"
+#include "slic3r/GUI/wxMediaCtrl3.h"
+#include "slic3r/GUI/Widgets/StaticBox.hpp"
+#include "slic3r/GUI/Widgets/TempInput.hpp"
+#include "slic3r/GUI/Widgets/StaticLine.hpp"
+#include <vector>
+#include <unordered_set>
+#include <wx/arrstr.h>
+#include <unordered_map>
 #include <wx/display.h>
+#include <wx/image.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <wx/font.h>
+#include <wx/filedlg.h>
 #include <wx/mstream.h>
+#include <wx/panel.h>
+#include <wx/scrolwin.h>
+#include <wx/sizer.h>
+#include <wx/simplebook.h>
 #include <wx/sstream.h>
+#include <wx/utils.h>
+#include <wx/string.h>
+#include <wx/stattext.h>
+#include <wx/window.h>
+#include <wx/webview.h>
+#include <wx/webrequest.h>
+#include <wx/tglbtn.h>
+#include <wx/toplevel.h>
 #include <wx/zstream.h>
 #include <chrono>
 
diff --git a/src/slic3r/GUI/StatusPanel.hpp b/src/slic3r/GUI/StatusPanel.hpp
index 0666703475..9f7547ecf1 100644
--- a/src/slic3r/GUI/StatusPanel.hpp
+++ b/src/slic3r/GUI/StatusPanel.hpp
@@ -8,13 +8,38 @@
 #include "CameraPopup.hpp"
 #include "GUI.hpp"
 #include "ThermalPreconditioningDialog.hpp"
+#include <string>
+#include <vector>
+#include <set>
+#include <utility>
+#include <functional>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <wx/event.h>
+#include <wx/colour.h>
+#include <wx/gdicmn.h>
+#include <ctime>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <unordered_map>
+#include <unordered_set>
+#include "slic3r/GUI/wxMediaCtrl3.h"
+#include "slic3r/GUI/Widgets/StaticBox.hpp"
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
+#include <boost/date_time/posix_time/ptime.hpp>
+#include <map>
+#include "libslic3r/calib.hpp"
+#include "slic3r/GUI/Event.hpp"
+#include <optional>
 #include <wx/panel.h>
 #include <wx/bitmap.h>
 #include <wx/image.h>
+#include <wx/scrolwin.h>
+#include <wx/simplebook.h>
 #include <wx/sizer.h>
 #include <wx/gbsizer.h>
+#include <wx/string.h>
 #include <wx/webrequest.h>
 #include <memory>
+#include <wx/webview.h>
 #include "MediaPlayCtrl.h"
 #include "WebMediaController.hpp"
 #include "AMSSetting.hpp"
diff --git a/src/slic3r/GUI/StepMeshDialog.cpp b/src/slic3r/GUI/StepMeshDialog.cpp
index c6131b7bfa..6316d10292 100644
--- a/src/slic3r/GUI/StepMeshDialog.cpp
+++ b/src/slic3r/GUI/StepMeshDialog.cpp
@@ -1,7 +1,18 @@
 #include "StepMeshDialog.hpp"
 
+#include "libslic3r/Format/STEP.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/Widgets/HyperLink.hpp"
+#include "slic3r/GUI/MsgDialog.hpp"
+#include "libslic3r/LocalesUtils.hpp"
+#include "libslic3r/Thread.hpp"
 #include <thread>
+#include <wx/dialog.h>
+#include <wx/colour.h>
 #include <wx/event.h>
+#include <wx/gdicmn.h>
 #include <wx/sizer.h>
 #include <wx/slider.h>
 #include <wx/dcmemory.h>
@@ -13,6 +24,9 @@
 #include "Widgets/DialogButtons.hpp"
 #include "Widgets/RoundedRectangle.hpp"
 #include <chrono>
+#include <wx/string.h>
+#include <wx/textctrl.h>
+#include <wx/valtext.h>
 
 using namespace Slic3r;
 using namespace Slic3r::GUI;
diff --git a/src/slic3r/GUI/StepMeshDialog.hpp b/src/slic3r/GUI/StepMeshDialog.hpp
index af7f150157..34673d1561 100644
--- a/src/slic3r/GUI/StepMeshDialog.hpp
+++ b/src/slic3r/GUI/StepMeshDialog.hpp
@@ -2,6 +2,7 @@
 #define _STEP_MESH_DIALOG_H_
 
 #include <thread>
+#include <wx/event.h>
 #include "GUI_App.hpp"
 #include "GUI_Utils.hpp"
 #include "libslic3r/Format/STEP.hpp"
diff --git a/src/slic3r/GUI/SurfaceDrag.cpp b/src/slic3r/GUI/SurfaceDrag.cpp
index 025b1d71c6..81b03c4836 100644
--- a/src/slic3r/GUI/SurfaceDrag.cpp
+++ b/src/slic3r/GUI/SurfaceDrag.cpp
@@ -1,7 +1,21 @@
 #include "SurfaceDrag.hpp"
 
+#include <cmath>
+#include <cassert>
+#include "libslic3r/BoundingBox.hpp"
+#include <algorithm>
+#include <functional>
+#include "libslic3r/Geometry.hpp"
+#include <cstddef>
+#include <Eigen/Geometry>
+#include <Eigen/Core>
 #include <libslic3r/Model.hpp> // ModelVolume
 #include <libslic3r/Emboss.hpp>
+#include "libslic3r/Point.hpp"
+#include <optional>
+#include "libslic3r/libslic3r.h"
+#include "slic3r/GUI/Selection.hpp"
+#include "slic3r/GUI/3DScene.hpp"
 
 #include "slic3r/Utils/RaycastManager.hpp"
 
diff --git a/src/slic3r/GUI/SurfaceDrag.hpp b/src/slic3r/GUI/SurfaceDrag.hpp
index f6bd731ae9..9de39a403e 100644
--- a/src/slic3r/GUI/SurfaceDrag.hpp
+++ b/src/slic3r/GUI/SurfaceDrag.hpp
@@ -1,6 +1,7 @@
 #ifndef slic3r_SurfaceDrag_hpp_
 #define slic3r_SurfaceDrag_hpp_
 
+#include "libslic3r/Model.hpp"
 #include <optional>
 #include "libslic3r/Point.hpp" // Vec2d, Transform3d
 #include "slic3r/Utils/RaycastManager.hpp"
diff --git a/src/slic3r/GUI/SyncAmsInfoDialog.cpp b/src/slic3r/GUI/SyncAmsInfoDialog.cpp
index b481a1b71b..f4c46c4a5c 100644
--- a/src/slic3r/GUI/SyncAmsInfoDialog.cpp
+++ b/src/slic3r/GUI/SyncAmsInfoDialog.cpp
@@ -1,7 +1,48 @@
 #include "SyncAmsInfoDialog.hpp"
 
+#include <boost/log/trivial.hpp>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "libslic3r/GCode/ThumbnailData.hpp"
+#include <cstddef>
+#include "libslic3r/Config.hpp"
+#include "libslic3r/Preset.hpp"
+#include <algorithm>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "slic3r/GUI/AmsMappingPopup.hpp"
+#include "slic3r/GUI/SelectMachine.hpp"
+#include "libslic3r/ProjectTask.hpp"
+#include "slic3r/GUI/GUI.hpp"
+#include "libslic3r/Utils.hpp"
+#include <string>
+#include "slic3r/GUI/BBLStatusBarPrint.hpp"
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
+#include <cassert>
+#include "libslic3r/PrintConfig.hpp"
+#include <cstdlib>
+#include "slic3r/GUI/DeviceCore/DevExtruderSystem.h"
+#include <map>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include "libslic3r/GCode/GCodeProcessor.hpp"
+#include "libslic3r/CommonDefs.hpp"
+#include "slic3r/GUI/ReleaseNote.hpp"
+#include "libslic3r/Thread.hpp"
+#include <memory>
+#include <boost/filesystem/path.hpp>
+#include <numeric>
+#include "slic3r/GUI/BitmapCache.hpp"
+#include "libslic3r/Color.hpp"
+#include "slic3r/GUI/3DScene.hpp"
+#include "slic3r/GUI/BaseTransparentDPIFrame.hpp"
 #include <thread>
+#include <vector>
+#include <wx/anybutton.h>
+#include <wx/animate.h>
+#include <wx/busycursor.h>
+#include <wx/chartype.h>
+#include <wx/arrstr.h>
 #include <wx/event.h>
+#include <wx/image.h>
+#include <wx/gdicmn.h>
 #include <wx/sizer.h>
 #include <wx/slider.h>
 #include <wx/dcmemory.h>
@@ -16,6 +57,11 @@
 #include "Jobs/BoostThreadWorker.hpp"
 #include "Jobs/PlaterWorker.hpp"
 #include <chrono>
+#include <wx/string.h>
+#include <wx/toplevel.h>
+#include <wx/tglbtn.h>
+#include <wx/timer.h>
+#include <wx/wxcrt.h>
 #include "Widgets/Label.hpp"
 #include "Widgets/Button.hpp"
 #include "Widgets/CheckBox.hpp"
diff --git a/src/slic3r/GUI/SyncAmsInfoDialog.hpp b/src/slic3r/GUI/SyncAmsInfoDialog.hpp
index 6f86af6032..96afb7d714 100644
--- a/src/slic3r/GUI/SyncAmsInfoDialog.hpp
+++ b/src/slic3r/GUI/SyncAmsInfoDialog.hpp
@@ -2,11 +2,37 @@
 #define _SyncAmsInfo_DIALOG_H_
 
 #include <future>
+#include <string>
+#include "slic3r/GUI/PrePrintChecker.hpp"
+#include <memory>
+#include <map>
+#include "libslic3r/ProjectTask.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Format/bbs_3mf.hpp"
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include "slic3r/GUI/AmsMappingPopup.hpp"
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "libslic3r/GCode/ThumbnailData.hpp"
+#include "slic3r/GUI/Widgets/StaticBox.hpp"
+#include "slic3r/GUI/Widgets/ComboBox.hpp"
+#include "libslic3r/CommonDefs.hpp"
+#include "libslic3r/PresetBundle.hpp"
 #include <thread>
 #include "GUI_App.hpp"
 #include "GUI_Utils.hpp"
 
+#include <vector>
 #include <wx/animate.h>
+#include <wx/string.h>
+#include <wx/colour.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/scrolwin.h>
+#include <wx/timer.h>
+#include <wx/arrstr.h>
+#include <wx/simplebook.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
 #include "SelectMachine.hpp"
 #include "DeviceManager.hpp"
 #include "BaseTransparentDPIFrame.hpp"
diff --git a/src/slic3r/GUI/SysInfoDialog.hpp b/src/slic3r/GUI/SysInfoDialog.hpp
index 070db61b2d..25a59f0fa7 100644
--- a/src/slic3r/GUI/SysInfoDialog.hpp
+++ b/src/slic3r/GUI/SysInfoDialog.hpp
@@ -1,6 +1,7 @@
 #ifndef slic3r_GUI_SysInfoDialog_hpp_
 #define slic3r_GUI_SysInfoDialog_hpp_
 
+#include <wx/event.h>
 #include <wx/wx.h>
 #include <wx/html/htmlwin.h>
 
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index b7f3e614b5..c60566d5c7 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -13,13 +13,60 @@
 #include "Search.hpp"
 #include "OG_CustomCtrl.hpp"
 
+#include "libslic3r/Config.hpp"
+#include <boost/any.hpp>
+#include <vector>
+#include <string>
+#include <utility>
+#include <cassert>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include <memory>
+#include "slic3r/GUI/Field.hpp"
+#include <map>
+#include <set>
+#include <initializer_list>
+#include "slic3r/GUI/GUI.hpp"
+#include "libslic3r/Preset.hpp"
+#include <boost/log/trivial.hpp>
+#include <wx/anybutton.h>
+#include <cstdint>
+#include <iterator>
+#include <functional>
+#include "libslic3r/ParameterUtils.hpp"
+#include <climits>
+#include "slic3r/GUI/ObjectDataViewModel.hpp"
+#include <cstring>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <boost/algorithm/string/erase.hpp>
+#include <cmath>
+#include "libslic3r/enum_bitmask.hpp"
+#include "slic3r/GUI/DeviceCore/DevConfigUtil.h"
+#include <deque>
+#include <exception>
+#include "libslic3r/LifecycleEvents.hpp"
+#include "libslic3r/Point.hpp"
+#include "slic3r/GUI/SettingsIndex.hpp"
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
 #include <wx/app.h>
+#include <wx/bookctrl.h>
+#include <wx/arrstr.h>
 #include <wx/button.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include <wx/colour.h>
+#include <wx/dataview.h>
+#include <wx/dynarray.h>
 #include <wx/scrolwin.h>
 #include <wx/sizer.h>
 
 #include <wx/bmpcbox.h>
 #include <wx/bmpbuttn.h>
+#include <wx/timer.h>
+#include <wx/string.h>
+#include <wx/treebase.h>
+#include <wx/tglbtn.h>
 #include <wx/treectrl.h>
 #include <wx/imaglist.h>
 #include <wx/settings.h>
diff --git a/src/slic3r/GUI/Tab.hpp b/src/slic3r/GUI/Tab.hpp
index 98428b148e..0ace0d7b9f 100644
--- a/src/slic3r/GUI/Tab.hpp
+++ b/src/slic3r/GUI/Tab.hpp
@@ -15,6 +15,16 @@
 //	   Slic3r::GUI::Tab::Preset;
 //	       - Single preset item: name, file is default or external.
 
+#include "libslic3r/PrintConfig.hpp"
+#include <cstddef>
+#include "libslic3r/Config.hpp"
+#include <functional>
+#include "slic3r/GUI/Field.hpp"
+#include <boost/any.hpp>
+#include <string>
+#include <wx/event.h>
+#include <utility>
+#include <wx/anybutton.h>
 #include <wx/panel.h>
 #include <wx/notebook.h>
 #include <wx/listbook.h>
@@ -22,6 +32,7 @@
 #include <wx/sizer.h>
 #include <wx/bmpcbox.h>
 #include <wx/bmpbuttn.h>
+#include <wx/string.h>
 #include <wx/treectrl.h>
 #include <wx/imaglist.h>
 
diff --git a/src/slic3r/GUI/TabButton.cpp b/src/slic3r/GUI/TabButton.cpp
index 79b9f32d13..3469c9c980 100644
--- a/src/slic3r/GUI/TabButton.cpp
+++ b/src/slic3r/GUI/TabButton.cpp
@@ -1,8 +1,18 @@
 #include "TabButton.hpp"
 #include "Widgets/Label.hpp"
 
+#include "slic3r/GUI/Widgets/StaticBox.hpp"
+#include <wx/colour.h>
+#include <utility>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <wx/checklst.h>
+#include "slic3r/GUI/Widgets/StateHandler.hpp"
+#include <wx/dc.h>
 #include <wx/dcclient.h>
 #include <wx/dcgraph.h>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
 
 BEGIN_EVENT_TABLE(TabButton, StaticBox)
 
diff --git a/src/slic3r/GUI/TabButton.hpp b/src/slic3r/GUI/TabButton.hpp
index 05ce1c6bd3..e637ea836b 100644
--- a/src/slic3r/GUI/TabButton.hpp
+++ b/src/slic3r/GUI/TabButton.hpp
@@ -3,6 +3,11 @@
 
 #include "wxExtensions.hpp"
 #include "Widgets/StaticBox.hpp"
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/string.h>
+#include <wx/event.h>
+#include <wx/dc.h>
 
 class TabButton : public StaticBox
 {
diff --git a/src/slic3r/GUI/Tabbook.cpp b/src/slic3r/GUI/Tabbook.cpp
index 40ced79d13..bfc5cf00f6 100644
--- a/src/slic3r/GUI/Tabbook.cpp
+++ b/src/slic3r/GUI/Tabbook.cpp
@@ -9,8 +9,17 @@
 //BBS set font size
 #include "Widgets/Label.hpp"
 
+#include <wx/bookctrl.h>
+#include <cmath>
+#include <cstddef>
+#include <algorithm>
 #include <wx/button.h>
+#include <wx/event.h>
+#include <wx/colour.h>
+#include <wx/gdicmn.h>
+#include <wx/dcclient.h>
 #include <wx/sizer.h>
+#include <wx/string.h>
 
 wxDEFINE_EVENT(wxCUSTOMEVT_TABBOOK_SEL_CHANGED, wxCommandEvent);
 
diff --git a/src/slic3r/GUI/Tabbook.hpp b/src/slic3r/GUI/Tabbook.hpp
index b1301a5c23..fd18ff0589 100644
--- a/src/slic3r/GUI/Tabbook.hpp
+++ b/src/slic3r/GUI/Tabbook.hpp
@@ -3,8 +3,19 @@
 
 //#ifdef _WIN32
 
+#include <cstddef>
+#include <string>
+#include <vector>
 #include <wx/bookctrl.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/debug.h>
+#include <wx/chartype.h>
+#include <wx/object.h>
 #include <wx/sizer.h>
+#include <wx/string.h>
+#include <wx/window.h>
+#include <wx/withimages.h>
 #include "wxExtensions.hpp"
 
 
diff --git a/src/slic3r/GUI/TaskManager.cpp b/src/slic3r/GUI/TaskManager.cpp
index 64f3e5d6a5..bbb49b4c76 100644
--- a/src/slic3r/GUI/TaskManager.cpp
+++ b/src/slic3r/GUI/TaskManager.cpp
@@ -1,12 +1,25 @@
 #include "TaskManager.hpp"
 
+#include "bambu_networking.hpp"
 #include "libslic3r/Thread.hpp"
 #include "libslic3r/LifecycleEvents.hpp"
 #include "nlohmann/json.hpp"
 #include "MainFrame.hpp"
 #include "GUI_App.hpp"
 
+#include <cassert>
+#include <boost/log/trivial.hpp>
+#include <chrono>
+#include <boost/chrono/duration.hpp>
+#include <algorithm>
+#include <cstdint>
 #include <exception>
+#include <wx/event.h>
+#include <string>
+#include <vector>
+#include <map>
+#include <utility>
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
 
 using namespace nlohmann;
 
diff --git a/src/slic3r/GUI/TaskManager.hpp b/src/slic3r/GUI/TaskManager.hpp
index 5c42d352d6..0f9686294d 100644
--- a/src/slic3r/GUI/TaskManager.hpp
+++ b/src/slic3r/GUI/TaskManager.hpp
@@ -2,10 +2,21 @@
 #define slic3r_TaskManager_hpp_
 
 #include "DeviceManager.hpp"
+#include "bambu_networking.hpp"
 #include "slic3r/Utils/NetworkAgent.hpp"
 
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/log/trivial.hpp>
+#include <string>
+#include <functional>
+#include <chrono>
+#include <ctime>
+#include <sstream>
+#include <iomanip>
+#include <vector>
+#include <map>
+#include <mutex>
+#include <wx/event.h>
 
 
 namespace Slic3r { 
diff --git a/src/slic3r/GUI/TerminalDialog.cpp b/src/slic3r/GUI/TerminalDialog.cpp
index 71f4bff28c..ce4435aa07 100644
--- a/src/slic3r/GUI/TerminalDialog.cpp
+++ b/src/slic3r/GUI/TerminalDialog.cpp
@@ -4,9 +4,18 @@
 
 #include "slic3r/plugin/PythonInterpreter.hpp"
 
+#include <string>
+#include <cstddef>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/Widgets/WebViewHostDialog.hpp"
+#include <memory>
+#include <vector>
+#include <utility>
 #include <wx/sizer.h>
 
 #include <cctype>
+#include <wx/string.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/TerminalDialog.hpp b/src/slic3r/GUI/TerminalDialog.hpp
index 7d44d167c7..6abd268c36 100644
--- a/src/slic3r/GUI/TerminalDialog.hpp
+++ b/src/slic3r/GUI/TerminalDialog.hpp
@@ -6,6 +6,11 @@
 #include <memory>
 #include <string>
 #include <vector>
+#include <wx/event.h>
+#include <wx/string.h>
+#include <wx/chartype.h>
+#include <wx/gdicmn.h>
+#include <wx/toplevel.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/TextLines.cpp b/src/slic3r/GUI/TextLines.cpp
index 63f247dfc7..1efd36a0ed 100644
--- a/src/slic3r/GUI/TextLines.cpp
+++ b/src/slic3r/GUI/TextLines.cpp
@@ -1,7 +1,25 @@
 #include "TextLines.hpp"
 
+#include <cstddef>
+#include <cassert>
+#include <cmath>
+#include <cstdint>
+#include <Eigen/Geometry>
 #include <glad/gl.h>
+#include <vector>
+#include "libslic3r/Point.hpp"
+#include <math.h>
+#include <utility>
+#include "libslic3r/TriangleMesh.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Line.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/AABBTreeIndirect.hpp"
+#include "libslic3r/Polygon.hpp"
+#include "libslic3r/Color.hpp"
+#include "libslic3r/TextConfiguration.hpp"
 
+#include "EmbossStyleManager.hpp"
 #include "libslic3r/Model.hpp"
 
 #include "libslic3r/Emboss.hpp"
diff --git a/src/slic3r/GUI/TextLines.hpp b/src/slic3r/GUI/TextLines.hpp
index f6e297cc22..4664de98c6 100644
--- a/src/slic3r/GUI/TextLines.hpp
+++ b/src/slic3r/GUI/TextLines.hpp
@@ -1,6 +1,7 @@
 #ifndef slic3r_TextLines_hpp_
 #define slic3r_TextLines_hpp_
 
+#include "libslic3r/TextConfiguration.hpp"
 #include <vector>
 #include <libslic3r/Polygon.hpp>
 #include <libslic3r/Point.hpp>
diff --git a/src/slic3r/GUI/TextureImportDialog.cpp b/src/slic3r/GUI/TextureImportDialog.cpp
index 7296a1ebeb..9ce10595ba 100644
--- a/src/slic3r/GUI/TextureImportDialog.cpp
+++ b/src/slic3r/GUI/TextureImportDialog.cpp
@@ -1,3 +1,6 @@
+#include <array>
+#include <cstdlib>
+#include <functional>
 #include <glad/gl.h>
 #include "OpenGLManager.hpp"
 
@@ -13,16 +16,46 @@
 #include "libslic3r/MeshBoolean.hpp"
 #include "libslic3r/TriangleSelector.hpp"
 
+#include <utility>
+#include <string>
+#include "libslic3r/Config.hpp"
+#include "slic3r/GUI/Widgets/PopupWindow.hpp"
+#include <vector>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <math.h>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "libslic3r/TexturePainting.hpp"
+#include "slic3r/GUI/Widgets/SpinInput.hpp"
+#include "libslic3r/TriangleMesh.hpp"
+#include <memory>
+#include <mutex>
 #include <wx/button.h>
 #include <wx/colour.h>
 #include <wx/colordlg.h>
+#include <wx/dc.h>
+#include <wx/colourdata.h>
 #include <wx/dcclient.h>
 #include <wx/dcbuffer.h>
+#include <wx/dialog.h>
 #include <wx/display.h>
+#include <wx/event.h>
 #include <wx/evtloop.h>
+#include <wx/settings.h>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include <wx/popupwin.h>
+#include <wx/glcanvas.h>
+#include <wx/image.h>
+#include <wx/sizer.h>
+#include <wx/object.h>
+#include <wx/spinctrl.h>
+#include <wx/progdlg.h>
+#include <wx/peninfobase.h>
 #include <wx/statline.h>
 #include <wx/scrolwin.h>
 #include <wx/msgdlg.h>
+#include <wx/string.h>
+#include <wx/toplevel.h>
 #include <wx/utils.h>
 #include <wx/valtext.h>
 
@@ -36,6 +69,7 @@
 #include <sstream>
 
 #include <boost/log/trivial.hpp>
+#include <wx/window.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/TextureImportDialog.hpp b/src/slic3r/GUI/TextureImportDialog.hpp
index 960bac6145..b1a2449fca 100644
--- a/src/slic3r/GUI/TextureImportDialog.hpp
+++ b/src/slic3r/GUI/TextureImportDialog.hpp
@@ -4,11 +4,14 @@
 #include "Widgets/ProgressDialog.hpp"
 #include "libslic3r/TexturePainting.hpp"
 
+#include <cstddef>
+#include <wx/gdicmn.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
 #include "Widgets/PopupWindow.hpp"
 #include <wx/panel.h>
 #include <wx/scrolwin.h>
+#include <wx/string.h>
 #include <wx/textctrl.h>
 #include "Widgets/SpinInput.hpp"
 #include <wx/checkbox.h>
diff --git a/src/slic3r/GUI/TextureLibrary.cpp b/src/slic3r/GUI/TextureLibrary.cpp
index 7cbd50a240..e3f73258df 100644
--- a/src/slic3r/GUI/TextureLibrary.cpp
+++ b/src/slic3r/GUI/TextureLibrary.cpp
@@ -1,8 +1,17 @@
 #include "TextureLibrary.hpp"
 
 #include <algorithm>
+#include <boost/filesystem/operations.hpp>
+#include <cstddef>
+#include <boost/filesystem/directory.hpp>
+#include <cstdint>
 #include <fstream>
+#include <ios>
+#include <iterator>
 #include <limits>
+#include <string>
+#include <optional>
+#include <memory>
 #include <unordered_map>
 
 #include <boost/algorithm/string/case_conv.hpp>
@@ -11,6 +20,9 @@
 #include <boost/nowide/fstream.hpp>
 #include <boost/system/error_code.hpp>
 
+#include <vector>
+#include <wx/gdicmn.h>
+#include <utility>
 #include <wx/image.h>
 #include <wx/mstream.h>
 
diff --git a/src/slic3r/GUI/TextureProjectorFrame.cpp b/src/slic3r/GUI/TextureProjectorFrame.cpp
index cfa29967ad..9469e0f397 100644
--- a/src/slic3r/GUI/TextureProjectorFrame.cpp
+++ b/src/slic3r/GUI/TextureProjectorFrame.cpp
@@ -2,8 +2,16 @@
 
 #include <algorithm>
 
+#include <vector>
+#include <cstddef>
 #include <wx/dcclient.h>
+#include <wx/gdicmn.h>
+#include <wx/frame.h>
+#include <wx/event.h>
 #include <wx/image.h>
+#include <wx/string.h>
+#include <wx/toplevel.h>
+#include <wx/types.h>
 
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/I18N.hpp"
diff --git a/src/slic3r/GUI/TextureProjectorFrame.hpp b/src/slic3r/GUI/TextureProjectorFrame.hpp
index 784062680d..6c2048465b 100644
--- a/src/slic3r/GUI/TextureProjectorFrame.hpp
+++ b/src/slic3r/GUI/TextureProjectorFrame.hpp
@@ -21,7 +21,9 @@
 #include <vector>
 
 #include <wx/bitmap.h>
+#include <wx/event.h>
 #include <wx/frame.h>
+#include <wx/gdicmn.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/ThermalPreconditioningDialog.cpp b/src/slic3r/GUI/ThermalPreconditioningDialog.cpp
index bd04335a22..03a0c5f45f 100644
--- a/src/slic3r/GUI/ThermalPreconditioningDialog.cpp
+++ b/src/slic3r/GUI/ThermalPreconditioningDialog.cpp
@@ -5,6 +5,17 @@
 #include "wxExtensions.hpp"
 #include "DeviceManager.hpp"
 #include "DeviceCore/DevManager.h"
+#include <wx/wx.h>
+#include <string>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/dialog.h>
+#include <wx/toplevel.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/timer.h>
+#include <wx/sizer.h>
+#include <wx/font.h>
+#include <wx/event.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/ThermalPreconditioningDialog.hpp b/src/slic3r/GUI/ThermalPreconditioningDialog.hpp
index 57cda90b18..a7538a7e9a 100644
--- a/src/slic3r/GUI/ThermalPreconditioningDialog.hpp
+++ b/src/slic3r/GUI/ThermalPreconditioningDialog.hpp
@@ -1,5 +1,9 @@
 #pragma once
 
+#include <string>
+#include <wx/string.h>
+#include <wx/event.h>
+#include <wx/timer.h>
 #include <wx/wx.h>
 #include <wx/dialog.h>
 #include <wx/stattext.h>
diff --git a/src/slic3r/GUI/TickCode.cpp b/src/slic3r/GUI/TickCode.cpp
index 267752c544..92997095b6 100644
--- a/src/slic3r/GUI/TickCode.cpp
+++ b/src/slic3r/GUI/TickCode.cpp
@@ -1,4 +1,9 @@
 #include "TickCode.hpp"
+#include <string>
+#include "libslic3r/CustomGCode.hpp"
+#include "libslic3r/Color.hpp"
+#include <algorithm>
+#include <set>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/TickCode.hpp b/src/slic3r/GUI/TickCode.hpp
index 14785dee55..50025d4172 100644
--- a/src/slic3r/GUI/TickCode.hpp
+++ b/src/slic3r/GUI/TickCode.hpp
@@ -4,6 +4,8 @@
 #include "libslic3r/CustomGCode.hpp"
 #include "libslic3r/Color.hpp"
 #include <set>
+#include <string>
+#include <vector>
 
 namespace Slic3r {
 using namespace CustomGCode;
diff --git a/src/slic3r/GUI/TroubleshootDialog.cpp b/src/slic3r/GUI/TroubleshootDialog.cpp
index 7cbb00b5d8..8cb87f10c3 100644
--- a/src/slic3r/GUI/TroubleshootDialog.cpp
+++ b/src/slic3r/GUI/TroubleshootDialog.cpp
@@ -6,10 +6,54 @@
 #include "GUI_App.hpp"
 #include "MainFrame.hpp"
 
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/colour.h>
+#include "slic3r/GUI/Widgets/ComboBox.hpp"
+#include <vector>
+#include <wx/event.h>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/dialog.h>
+#include <wx/dataobj.h>
+#include <wx/buffer.h>
+#include <cctype>
+#include <wx/chartype.h>
+#include <wx/datetime.h>
+#include "libslic3r/Config.hpp"
+#include <wx/arrstr.h>
+#include <wx/filefn.h>
+#include <map>
+#include <cstdio>
+#include <stdio.h>
+#include <algorithm>
+#include <boost/algorithm/string/trim_all.hpp>
+#include <cmath>
+#include <string>
+#include "slic3r/GUI/OpenGLManager.hpp"
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/directory.hpp>
+#include <fstream>
+#include <ios>
+#include <boost/log/trivial.hpp>
+#include <exception>
+#include <utility>
+#include <ctime>
+#include <boost/filesystem/file_status.hpp>
+#include <cstdint>
+#include <wx/filedlg.h>
+#include <wx/dirdlg.h>
+#include <wx/dir.h>
 #include <wx/filename.h>
+#include <wx/sizer.h>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
 #include <wx/stdpaths.h>
 #include <wx/display.h>
+#include <wx/string.h>
+#include <wx/utils.h>
+#include <wx/strconv.h>
 #include <wx/wfstream.h>
+#include "libslic3r_version.h"
 #include "wx/clipbrd.h"
 
 #include "libslic3r/libslic3r.h"
@@ -19,6 +63,9 @@
 #include "libslic3r/Preset.hpp"
 
 #include <nlohmann/json.hpp>
+#include <wx/wx.h>
+#include <wx/zipstrm.h>
+#include <wx/window.h>
 
 #ifdef __WINDOWS__
 #include <windows.h>
diff --git a/src/slic3r/GUI/TroubleshootDialog.hpp b/src/slic3r/GUI/TroubleshootDialog.hpp
index ab0fcfbadd..f8b1e5fbaa 100644
--- a/src/slic3r/GUI/TroubleshootDialog.hpp
+++ b/src/slic3r/GUI/TroubleshootDialog.hpp
@@ -1,6 +1,17 @@
 #ifndef slic3r_GUI_TroublesootDialog_hpp_
 #define slic3r_GUI_TroublesootDialog_hpp_
 
+#include <wx/sizer.h>
+#include <wx/string.h>
+#include <string>
+#include <wx/panel.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <wx/dc.h>
+#include <wx/arrstr.h>
+#include <wx/types.h>
+#include <cstddef>
+#include <wx/dcclient.h>
 #include <wx/wx.h>
 #include <wx/zipstrm.h>
 #include <wx/dir.h>
diff --git a/src/slic3r/GUI/UVEditorCanvas.cpp b/src/slic3r/GUI/UVEditorCanvas.cpp
index dd0432bc95..3a2b28a689 100644
--- a/src/slic3r/GUI/UVEditorCanvas.cpp
+++ b/src/slic3r/GUI/UVEditorCanvas.cpp
@@ -1,14 +1,38 @@
 #include "UVEditorCanvas.hpp"
 
+#include <Eigen/Core>
 #include <algorithm>
 #include <cmath>
+#include <cstdlib>
+#include <cstdint>
+#include "libslic3r/Point.hpp"
+#include <cstddef>
 #include <limits>
+#include <string>
+#include <math.h>
+#include "slic3r/GUI/GLModel.hpp"
 #include <unordered_map>
 
 #include <glad/gl.h>
 
+#include <vector>
+#include <utility>
+#include <wx/colour.h>
 #include <wx/dcbuffer.h>
+#include <wx/gdicmn.h>
+#include <wx/glcanvas.h>
+#include <wx/event.h>
+#include <wx/dcclient.h>
+#include <wx/image.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/spinctrl.h>
 #include <wx/statbmp.h>
+#include <wx/window.h>
+#include <wx/utils.h>
+#include <wx/string.h>
+#include <wx/stattext.h>
+#include <wx/tglbtn.h>
 
 #include "3DScene.hpp"
 #include "BitmapCache.hpp"
diff --git a/src/slic3r/GUI/UVEditorCanvas.hpp b/src/slic3r/GUI/UVEditorCanvas.hpp
index 0dd088c4e8..2b3ee0781d 100644
--- a/src/slic3r/GUI/UVEditorCanvas.hpp
+++ b/src/slic3r/GUI/UVEditorCanvas.hpp
@@ -1,8 +1,11 @@
 #ifndef slic3r_UVEditorCanvas_hpp_
 #define slic3r_UVEditorCanvas_hpp_
 
+#include <Eigen/Core>
 #include <algorithm>
+#include <cstddef>
 #include <functional>
+#include "libslic3r/Color.hpp"
 #include <utility>
 #include <vector>
 
@@ -10,9 +13,12 @@
 // pulls in the platform's real GL/gl.h, and glad/gl.h errors out if that happens first (it wants
 // to be the one to define the standard include guards GL/gl.h itself defines).
 #include <glad/gl.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
 #include <wx/glcanvas.h>
 #include <wx/panel.h>
 #include <wx/button.h>
+#include <wx/string.h>
 #include <wx/tglbtn.h>
 #include <wx/stattext.h>
 #include <wx/statbmp.h>
diff --git a/src/slic3r/GUI/UnsavedChangesDialog.cpp b/src/slic3r/GUI/UnsavedChangesDialog.cpp
index df809396f5..9619debd59 100644
--- a/src/slic3r/GUI/UnsavedChangesDialog.cpp
+++ b/src/slic3r/GUI/UnsavedChangesDialog.cpp
@@ -1,13 +1,52 @@
 #include "UnsavedChangesDialog.hpp"
 
+#include <boost/optional/optional.hpp>
+#include <cmath>
+#include <boost/algorithm/string/replace.hpp>
+#include <cassert>
+#include <algorithm>
+#include <array>
 #include <cstddef>
+#include "slic3r/GUI/Event.hpp"
+#include <map>
+#include "libslic3r/Preset.hpp"
+#include "libslic3r/Config.hpp"
+#include "slic3r/GUI/GUI.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include <memory>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/DeviceCore/DevConfigUtil.h"
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "slic3r/GUI/SettingsIndex.hpp"
+#include <set>
+#include <iterator>
 #include <string>
 #include <vector>
 #include <boost/algorithm/string.hpp>
 #include <boost/optional.hpp>
 
+#include <wx/colour.h>
+#include <wx/dataview.h>
+#include <wx/log.h>
+#include <wx/gdicmn.h>
+#include <wx/dvrenderers.h>
+#include <wx/panel.h>
+#include <wx/string.h>
+#include <wx/event.h>
+#include <wx/stattext.h>
+#include <wx/dialog.h>
+#include <wx/sizer.h>
+#include <wx/textctrl.h>
+#include <wx/settings.h>
 #include <wx/tokenzr.h>
+#include <wx/variant.h>
+#include <wx/window.h>
+#include <wx/toplevel.h>
 
+#include "CalibUtils.hpp"
 #include "libslic3r/PrintConfig.hpp"
 #include "libslic3r/PresetBundle.hpp"
 #include "libslic3r/Color.hpp"
diff --git a/src/slic3r/GUI/UnsavedChangesDialog.hpp b/src/slic3r/GUI/UnsavedChangesDialog.hpp
index 3145434e8c..0cbb927ebc 100644
--- a/src/slic3r/GUI/UnsavedChangesDialog.hpp
+++ b/src/slic3r/GUI/UnsavedChangesDialog.hpp
@@ -1,9 +1,24 @@
 #ifndef slic3r_UnsavedChangesDialog_hpp_
 #define slic3r_UnsavedChangesDialog_hpp_
 
+#include "slic3r/GUI/Event.hpp"
+#include <memory>
+#include "libslic3r/Preset.hpp"
+#include <string>
+#include <utility>
+#include "libslic3r/Config.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include <array>
 #include <wx/dataview.h>
 #include <map>
 #include <vector>
+#include <wx/event.h>
+#include <wx/string.h>
+#include <wx/variant.h>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/scrolwin.h>
 
 #include "GUI_Utils.hpp"
 #include "wxExtensions.hpp"
diff --git a/src/slic3r/GUI/UpdateDialogs.cpp b/src/slic3r/GUI/UpdateDialogs.cpp
index 42383cd177..83a8738aa3 100644
--- a/src/slic3r/GUI/UpdateDialogs.cpp
+++ b/src/slic3r/GUI/UpdateDialogs.cpp
@@ -4,6 +4,18 @@
 #include <boost/format.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 
+#include <string>
+#include "libslic3r/Semver.hpp"
+#include "slic3r/GUI/MsgDialog.hpp"
+#include <wx/hyperlink.h>
+#include <vector>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <wx/scrolwin.h>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <unordered_map>
 #include <wx/settings.h>
 #include <wx/sizer.h>
 #include <wx/event.h>
@@ -11,6 +23,7 @@
 #include <wx/button.h>
 #include <wx/statbmp.h>
 #include <wx/checkbox.h>
+#include <wx/string.h>
 
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Utils.hpp"
diff --git a/src/slic3r/GUI/UpdateDialogs.hpp b/src/slic3r/GUI/UpdateDialogs.hpp
index 784c10f09a..a18b34c293 100644
--- a/src/slic3r/GUI/UpdateDialogs.hpp
+++ b/src/slic3r/GUI/UpdateDialogs.hpp
@@ -1,10 +1,14 @@
 #ifndef slic3r_UpdateDialogs_hpp_
 #define slic3r_UpdateDialogs_hpp_
 
+#include "slic3r/GUI/GUI_Utils.hpp"
 #include <string>
 #include <unordered_map>
+#include <utility>
 #include <vector>
+#include <wx/gdicmn.h>
 #include <wx/hyperlink.h>
+#include <wx/string.h>
 
 #include "libslic3r/Semver.hpp"
 #include "MsgDialog.hpp"
diff --git a/src/slic3r/GUI/UpgradePanel.cpp b/src/slic3r/GUI/UpgradePanel.cpp
index 5f168025ed..485ac48b99 100644
--- a/src/slic3r/GUI/UpgradePanel.cpp
+++ b/src/slic3r/GUI/UpgradePanel.cpp
@@ -1,7 +1,27 @@
 #include "UpgradePanel.hpp"
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "slic3r/GUI/Widgets/ProgressBar.hpp"
+#include <exception>
+#include <boost/log/trivial.hpp>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <map>
+#include <cstdlib>
+#include <cstddef>
+#include "slic3r/GUI/ReleaseNote.hpp"
 #include <slic3r/GUI/Widgets/SideTools.hpp>
 #include <slic3r/GUI/Widgets/Label.hpp>
 #include <slic3r/GUI/I18N.hpp>
+#include <wx/colour.h>
+#include <unordered_map>
+#include <wx/string.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <string>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <utility>
+#include <wx/scrolwin.h>
 #include "slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.h"
 #include "slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.h"
 
diff --git a/src/slic3r/GUI/UpgradePanel.hpp b/src/slic3r/GUI/UpgradePanel.hpp
index ba7e86e807..2e0245e40e 100644
--- a/src/slic3r/GUI/UpgradePanel.hpp
+++ b/src/slic3r/GUI/UpgradePanel.hpp
@@ -1,12 +1,23 @@
 #ifndef slic3r_UpgradePanel_hpp_
 #define slic3r_UpgradePanel_hpp_
 
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/dynarray.h>
+#include <vector>
+#include <string>
+#include "slic3r/GUI/DeviceCore/DevFirmware.h"
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
 #include <wx/panel.h>
 #include <slic3r/GUI/Widgets/Button.hpp>
 #include "Widgets/ProgressBar.hpp"
 #include <slic3r/GUI/DeviceManager.hpp>
 #include <slic3r/GUI/Widgets/ScrolledWindow.hpp>
 #include <slic3r/GUI/StatusPanel.hpp>
+#include <wx/string.h>
+#include <wx/sizer.h>
+#include <wx/scrolwin.h>
 #include "ReleaseNote.hpp"
 
 namespace Slic3r {
diff --git a/src/slic3r/GUI/UserManager.cpp b/src/slic3r/GUI/UserManager.cpp
index f181f3e568..3cbf30cfd9 100644
--- a/src/slic3r/GUI/UserManager.cpp
+++ b/src/slic3r/GUI/UserManager.cpp
@@ -1,3 +1,4 @@
+#include "json_diff.hpp"
 #include "libslic3r/libslic3r.h"
 #include "UserManager.hpp"
 #include "DeviceManager.hpp"
@@ -9,6 +10,8 @@
 #include "MsgDialog.hpp"
 
 #include "DeviceCore/DevManager.h"
+#include <string>
+#include <wx/string.h>
 
 
 namespace Slic3r {
diff --git a/src/slic3r/GUI/WebDialog.cpp b/src/slic3r/GUI/WebDialog.cpp
index 8bcb517d87..509ccefdee 100644
--- a/src/slic3r/GUI/WebDialog.cpp
+++ b/src/slic3r/GUI/WebDialog.cpp
@@ -3,9 +3,15 @@
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/Widgets/WebHosting.hpp"
 
+#include <string>
+#include "slic3r/GUI/Widgets/WebViewHostDialog.hpp"
+#include <wx/chartype.h>
 #include <wx/event.h>
 
 #include <utility>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/webview.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/WebDialog.hpp b/src/slic3r/GUI/WebDialog.hpp
index aec5de18ef..2fb017d68c 100644
--- a/src/slic3r/GUI/WebDialog.hpp
+++ b/src/slic3r/GUI/WebDialog.hpp
@@ -8,6 +8,10 @@
 #include <string>
 
 #include <nlohmann/json.hpp>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/toplevel.h>
+#include <wx/event.h>
 #include <wx/webview.h>
 
 namespace Slic3r { namespace GUI {
diff --git a/src/slic3r/GUI/WebDownPluginDlg.cpp b/src/slic3r/GUI/WebDownPluginDlg.cpp
index 6358582831..93c8c77d46 100644
--- a/src/slic3r/GUI/WebDownPluginDlg.cpp
+++ b/src/slic3r/GUI/WebDownPluginDlg.cpp
@@ -1,6 +1,11 @@
 #include "WebDownPluginDlg.hpp"
 #include "ConfigWizard.hpp"
 
+#include "slic3r/GUI/GUI.hpp"
+#include <boost/filesystem/path.hpp>
+#include <boost/log/trivial.hpp>
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
+#include <exception>
 #include <string.h>
 #include "I18N.hpp"
 #include "libslic3r/AppConfig.hpp"
@@ -8,10 +13,17 @@
 #include "slic3r/GUI/GUI_App.hpp"
 #include "libslic3r_version.h"
 
+#include <wx/log.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <wx/setup.h>
 #include <wx/sizer.h>
+#include <wx/string.h>
 #include <wx/toolbar.h>
 #include <wx/textdlg.h>
 
+#include <wx/webview.h>
+#include <wx/utils.h>
 #include <wx/wx.h>
 #include <wx/fileconf.h>
 #include <wx/file.h>
diff --git a/src/slic3r/GUI/WebDownPluginDlg.hpp b/src/slic3r/GUI/WebDownPluginDlg.hpp
index c05de098e5..71b2876a5b 100644
--- a/src/slic3r/GUI/WebDownPluginDlg.hpp
+++ b/src/slic3r/GUI/WebDownPluginDlg.hpp
@@ -6,6 +6,9 @@
 #include "wx/notifmsg.h"
 #include "wx/settings.h"
 #include "wx/webview.h"
+#include <wx/setup.h>
+#include <wx/string.h>
+#include <wx/event.h>
 
 #if wxUSE_WEBVIEW_IE
 #include "wx/msw/webview_ie.h"
diff --git a/src/slic3r/GUI/WebGuideDialog.cpp b/src/slic3r/GUI/WebGuideDialog.cpp
index c77c8a5698..4f1998ae94 100644
--- a/src/slic3r/GUI/WebGuideDialog.cpp
+++ b/src/slic3r/GUI/WebGuideDialog.cpp
@@ -1,12 +1,34 @@
 #include "WebGuideDialog.hpp"
 #include "ConfigWizard.hpp"
 
+#include <algorithm>
 #include <boost/algorithm/string/join.hpp>
+#include <boost/filesystem/directory.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/bind/bind.hpp>
+#include <boost/algorithm/string/trim.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/nowide/fstream.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/iostreams/detail/select.hpp>
 #include <boost/log/trivial.hpp>
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
+#include <map>
+#include "slic3r/GUI/GUI.hpp"
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <memory>
+#include <exception>
+#include "slic3r/GUI/Event.hpp"
+#include "slic3r/GUI/Plater.hpp"
+#include <set>
+#include <ostream>
+#include <iterator>
+#include "slic3r/GUI/UnsavedChangesDialog.hpp"
+#include "slic3r/GUI/ParamsDialog.hpp"
+#include "libslic3r/Semver.hpp"
+#include <ios>
+#include <stdexcept>
+#include <sstream>
 #include <string.h>
 #include "I18N.hpp"
 #include "libslic3r/AppConfig.hpp"
@@ -18,10 +40,24 @@
 #include "slic3r/GUI/GUI_App.hpp"
 #include "libslic3r_version.h"
 
+#include <string>
+#include <vector>
+#include <utility>
+#include <wx/gdicmn.h>
+#include <wx/log.h>
+#include <wx/settings.h>
+#include <wx/event.h>
+#include <wx/setup.h>
+#include <unordered_set>
+#include <system_error>
 #include <wx/sizer.h>
+#include <wx/string.h>
+#include <wx/strconv.h>
 #include <wx/toolbar.h>
 #include <wx/textdlg.h>
 
+#include <wx/webview.h>
+#include <wx/utils.h>
 #include <wx/wx.h>
 #include <wx/weakref.h>
 #include <wx/display.h>
diff --git a/src/slic3r/GUI/WebGuideDialog.hpp b/src/slic3r/GUI/WebGuideDialog.hpp
index 9cd95d2515..73aa765c89 100644
--- a/src/slic3r/GUI/WebGuideDialog.hpp
+++ b/src/slic3r/GUI/WebGuideDialog.hpp
@@ -6,6 +6,14 @@
 #include "wx/notifmsg.h"
 #include "wx/settings.h"
 #include "wx/webview.h"
+#include <wx/setup.h>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/toplevel.h>
+#include <wx/string.h>
+#include <wx/event.h>
+#include <string>
+#include <wx/gdicmn.h>
+#include <boost/filesystem/path.hpp>
 
 #if wxUSE_WEBVIEW_IE
 #include "wx/msw/webview_ie.h"
diff --git a/src/slic3r/GUI/WebMediaController.cpp b/src/slic3r/GUI/WebMediaController.cpp
index fe4b94d3ac..f9c2e17fe8 100644
--- a/src/slic3r/GUI/WebMediaController.cpp
+++ b/src/slic3r/GUI/WebMediaController.cpp
@@ -1,5 +1,8 @@
 #include "WebMediaController.hpp"
+#include "IPrinterAgent.hpp"
 
+#include <wx/gdicmn.h>
+#include <wx/uri.h>
 #include <wx/webview.h>
 
 namespace Slic3r { namespace GUI {
diff --git a/src/slic3r/GUI/WebMediaController.hpp b/src/slic3r/GUI/WebMediaController.hpp
index e7756d8977..2d3e4e7cbf 100644
--- a/src/slic3r/GUI/WebMediaController.hpp
+++ b/src/slic3r/GUI/WebMediaController.hpp
@@ -4,6 +4,7 @@
 #include <slic3r/Utils/IPrinterAgent.hpp>
 
 #include <string>
+#include <wx/uri.h>
 
 class wxWebView;
 
diff --git a/src/slic3r/GUI/WebPanel.cpp b/src/slic3r/GUI/WebPanel.cpp
index a8cef9d941..5222636471 100644
--- a/src/slic3r/GUI/WebPanel.cpp
+++ b/src/slic3r/GUI/WebPanel.cpp
@@ -7,7 +7,13 @@
 
 #include <boost/log/trivial.hpp>
 
+#include <wx/panel.h>
+#include <wx/event.h>
+#include <optional>
+#include <string>
 #include <wx/sizer.h>
+#include <wx/string.h>
+#include <wx/webview.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/WebPanel.hpp b/src/slic3r/GUI/WebPanel.hpp
index d4c493dbc1..4ef5fec34c 100644
--- a/src/slic3r/GUI/WebPanel.hpp
+++ b/src/slic3r/GUI/WebPanel.hpp
@@ -2,6 +2,7 @@
 
 #include <nlohmann/json.hpp>
 
+#include <wx/event.h>
 #include <wx/panel.h>
 #include <wx/webview.h>
 
diff --git a/src/slic3r/GUI/WebRtcMediaController.cpp b/src/slic3r/GUI/WebRtcMediaController.cpp
index 9c03c7c8b1..9028bf384c 100644
--- a/src/slic3r/GUI/WebRtcMediaController.cpp
+++ b/src/slic3r/GUI/WebRtcMediaController.cpp
@@ -1,9 +1,26 @@
 #include "WebRtcMediaController.hpp"
+#include "ICameraSignalingChannel.hpp"
 
+#include <functional>
+#include <memory>
+#include <cstddef>
+#include <exception>
+#include <rtc/candidate.hpp>
+#include <chrono>
 #include <rtc/common.hpp>
+#include <rtc/global.hpp>
+#include <rtc/configuration.hpp>
+#include <rtc/description.hpp>
+#include <rtc/peerconnection.hpp>
 #include <rtc/rtc.hpp>
 
 #include <mutex>
+#include <string>
+#include <wx/image.h>
+#include <wx/gdicmn.h>
+#include <utility>
+#include <wx/mediactrl.h>
+#include <vector>
 #include <wx/mstream.h>
 
 #include <boost/log/trivial.hpp>
diff --git a/src/slic3r/GUI/WebRtcMediaController.hpp b/src/slic3r/GUI/WebRtcMediaController.hpp
index 7a2ab02abb..0c291ef0e2 100644
--- a/src/slic3r/GUI/WebRtcMediaController.hpp
+++ b/src/slic3r/GUI/WebRtcMediaController.hpp
@@ -3,6 +3,9 @@
 #include "IMediaController.hpp"
 #include <slic3r/Utils/ICameraSignalingChannel.hpp>
 
+#include <wx/gdicmn.h>
+#include <string>
+#include <utility>
 #include <wx/image.h>
 
 #include <atomic>
@@ -16,6 +19,8 @@
 #include <mutex>
 #include <thread>
 #include <vector>
+#include <wx/uri.h>
+#include <wx/mediactrl.h>
 
 namespace rtc {
 class DataChannel;
diff --git a/src/slic3r/GUI/WebUserLoginDialog.cpp b/src/slic3r/GUI/WebUserLoginDialog.cpp
index 72860e3bdc..bf7c7d9365 100644
--- a/src/slic3r/GUI/WebUserLoginDialog.cpp
+++ b/src/slic3r/GUI/WebUserLoginDialog.cpp
@@ -1,17 +1,41 @@
 #include "WebUserLoginDialog.hpp"
 
+#include <boost/asio/io_service.hpp>
+#include <boost/asio/ip/tcp.hpp>
+#include "slic3r/GUI/HttpServer.hpp"
+#include <memory>
+#include <boost/log/trivial.hpp>
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
+#include "slic3r/GUI/GUI.hpp"
+#include <exception>
+#include <boost/filesystem/path.hpp>
+#include "libslic3r/Utils.hpp"
 #include <string.h>
+#include "CloudProvider.hpp"
 #include "I18N.hpp"
+#include "ICloudServiceAgent.hpp"
 #include "libslic3r/AppConfig.hpp"
 #include "slic3r/GUI/wxExtensions.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/Utils/NetworkAgent.hpp"
 #include "libslic3r_version.h"
 
+#include <string>
+#include <wx/panel.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <wx/log.h>
+#include <wx/msgdlg.h>
+#include <wx/app.h>
+#include <wx/setup.h>
 #include <wx/sizer.h>
+#include <wx/string.h>
+#include <wx/timer.h>
 #include <wx/toolbar.h>
 #include <wx/textdlg.h>
 
+#include <wx/webview.h>
+#include <wx/utils.h>
 #include <wx/wx.h>
 #include <wx/fileconf.h>
 #include <wx/file.h>
diff --git a/src/slic3r/GUI/WebUserLoginDialog.hpp b/src/slic3r/GUI/WebUserLoginDialog.hpp
index ce16a79718..f462052239 100644
--- a/src/slic3r/GUI/WebUserLoginDialog.hpp
+++ b/src/slic3r/GUI/WebUserLoginDialog.hpp
@@ -1,4 +1,9 @@
 #pragma once
+#include <wx/setup.h>
+#include <memory>
+#include <wx/string.h>
+#include <string>
+#include <wx/event.h>
 #ifndef slic3r_ZWebUserLogin_HEAD_
 #define slic3r_ZWebUserLogin_HEAD_
 
diff --git a/src/slic3r/GUI/WebViewDialog.cpp b/src/slic3r/GUI/WebViewDialog.cpp
index a98b196eb1..02fc7b0877 100644
--- a/src/slic3r/GUI/WebViewDialog.cpp
+++ b/src/slic3r/GUI/WebViewDialog.cpp
@@ -1,5 +1,6 @@
 #include "WebViewDialog.hpp"
 
+#include "CloudProvider.hpp"
 #include "I18N.hpp"
 #include "slic3r/GUI/wxExtensions.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
@@ -7,15 +8,40 @@
 #include "libslic3r_version.h"
 #include "../Utils/Http.hpp"
 
+#include <boost/filesystem/path.hpp>
+#include <boost/log/trivial.hpp>
+#include <algorithm>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/json_parser.hpp>
 
+#include <wx/event.h>
+#include <wx/panel.h>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/GUI.hpp"
+#include "libslic3r/Utils.hpp"
+#include <wx/log.h>
+#include "libslic3r/Config.hpp"
+#include <wx/filefn.h>
+#include <wx/filename.h>
+#include <sstream>
+#include <string>
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
+#include <functional>
+#include <cstddef>
+#include <wx/dialog.h>
 #include <wx/sizer.h>
+#include <wx/string.h>
+#include <wx/timer.h>
+#include <wx/textctrl.h>
 #include <wx/toolbar.h>
 #include <wx/textdlg.h>
+#include <wx/toplevel.h>
 #include <wx/url.h>
 
 #include <slic3r/GUI/Widgets/WebView.hpp>
+#include <wx/webview.h>
+#include <wx/utils.h>
+#include <wx/window.h>
 
 namespace pt = boost::property_tree;
 
diff --git a/src/slic3r/GUI/WebViewDialog.hpp b/src/slic3r/GUI/WebViewDialog.hpp
index 73ad061bb0..96d18f23c0 100644
--- a/src/slic3r/GUI/WebViewDialog.hpp
+++ b/src/slic3r/GUI/WebViewDialog.hpp
@@ -6,6 +6,13 @@
 #include "wx/cmdline.h"
 #include "wx/notifmsg.h"
 #include "wx/settings.h"
+#include <wx/setup.h>
+#include <wx/string.h>
+#include <wx/event.h>
+#include <string>
+#include <functional>
+#include <wx/dialog.h>
+#include <wx/accel.h>
 #include <wx/webview.h>
 
 #if wxUSE_WEBVIEW_EDGE
diff --git a/src/slic3r/GUI/Widgets/AMSControl.cpp b/src/slic3r/GUI/Widgets/AMSControl.cpp
index 7ba24fd991..8a5f03b7ad 100644
--- a/src/slic3r/GUI/Widgets/AMSControl.cpp
+++ b/src/slic3r/GUI/Widgets/AMSControl.cpp
@@ -11,11 +11,36 @@
 #include "slic3r/GUI/DeviceCore/DevFilaSystem.h"
 #include "slic3r/GUI/DeviceCore/DevFilaSwitch.h"
 
+#include <wx/checklst.h>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/AmsMappingPopup.hpp"
+#include "slic3r/GUI/AMSDryControl.hpp"
+#include <wx/scrolwin.h>
+#include <wx/panel.h>
+#include "slic3r/GUI/Widgets/AMSItem.hpp"
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <cstddef>
+#include <wx/event.h>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <string>
+#include <wx/colour.h>
+#include <vector>
+#include <utility>
+#include <cassert>
+#include <memory>
+#include "slic3r/GUI/DeviceCore/DevExtruderSystem.h"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include "slic3r/GUI/Event.hpp"
+#include <cstdlib>
+#include <algorithm>
+#include <tuple>
+#include <wx/font.h>
 #include <wx/simplebook.h>
 #include <wx/dcgraph.h>
 #include <wx/artprov.h>
 
 #include <boost/log/trivial.hpp>
+#include <wx/string.h>
 
 #include "CalibUtils.hpp"
 
diff --git a/src/slic3r/GUI/Widgets/AMSControl.hpp b/src/slic3r/GUI/Widgets/AMSControl.hpp
index 39421f1275..4f44d7a1e7 100644
--- a/src/slic3r/GUI/Widgets/AMSControl.hpp
+++ b/src/slic3r/GUI/Widgets/AMSControl.hpp
@@ -9,11 +9,24 @@
 #include "../DeviceManager.hpp"
 #include "slic3r/GUI/Event.hpp"
 #include "slic3r/GUI/AmsMappingPopup.hpp"
+#include <wx/checklst.h>
+#include <wx/gdicmn.h>
+#include <string>
+#include <map>
+#include <vector>
+#include <utility>
+#include <wx/panel.h>
+#include <wx/scrolwin.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <wx/colour.h>
+#include <wx/event.h>
 #include <wx/simplebook.h>
 #include <wx/hyperlink.h>
 #include <wx/animate.h>
 #include <wx/dynarray.h>
 #include <tuple>
+#include <wx/sizer.h>
+#include <wx/string.h>
 
 #include "slic3r/GUI/DeviceCore/DevExtruderSystem.h"
 #include "slic3r/GUI/AMSDryControl.hpp"
diff --git a/src/slic3r/GUI/Widgets/AMSItem.cpp b/src/slic3r/GUI/Widgets/AMSItem.cpp
index 9d5ec9c1c1..96ca92494d 100644
--- a/src/slic3r/GUI/Widgets/AMSItem.cpp
+++ b/src/slic3r/GUI/Widgets/AMSItem.cpp
@@ -12,10 +12,36 @@
 #include "slic3r/GUI/DeviceCore/DevConfig.h"
 #include "slic3r/GUI/DeviceCore/DevManager.h"
 
+#include <wx/colour.h>
+#include <wx/event.h>
+#include "slic3r/GUI/Event.hpp"
+#include <string>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include "slic3r/GUI/DeviceCore/DevFilaSwitch.h"
+#include <wx/checklst.h>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/dcclient.h>
+#include <wx/dc.h>
+#include <wx/peninfobase.h>
+#include <cstdlib>
+#include "slic3r/GUI/DeviceCore/DevConfigUtil.h"
+#include "slic3r/GUI/DeviceManager.hpp"
+#include <vector>
+#include "libslic3r/libslic3r.h"
+#include <cmath>
+#include <algorithm>
+#include <wx/chartype.h>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <optional>
+#include <utility>
+#include <cstddef>
 #include <wx/simplebook.h>
 #include <wx/dcgraph.h>
 
 #include <boost/log/trivial.hpp>
+#include <wx/timer.h>
+#include <wx/sizer.h>
 
 #include "CalibUtils.hpp"
 
diff --git a/src/slic3r/GUI/Widgets/AMSItem.hpp b/src/slic3r/GUI/Widgets/AMSItem.hpp
index ac4283b7e8..e84ba64d98 100644
--- a/src/slic3r/GUI/Widgets/AMSItem.hpp
+++ b/src/slic3r/GUI/Widgets/AMSItem.hpp
@@ -8,11 +8,27 @@
 #include "../DeviceManager.hpp"
 #include "slic3r/GUI/Event.hpp"
 #include "slic3r/GUI/AmsMappingPopup.hpp"
+#include <string>
+#include <wx/colour.h>
+#include <vector>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <wx/event.h>
+#include <wx/dc.h>
+#include <wx/checklst.h>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include <map>
+#include <cstddef>
+#include <wx/dcclient.h>
+#include <utility>
 #include <wx/simplebook.h>
 #include <wx/hyperlink.h>
 #include <wx/animate.h>
 #include <wx/dynarray.h>
 #include <optional>
+#include <wx/string.h>
+#include <wx/timer.h>
+#include <wx/sizer.h>
 
 #include "slic3r/GUI/DeviceCore/DevFilaSwitch.h" // Orca: DevFilaSwitch::SwitchPos for inlet-aware AMS placement
 
diff --git a/src/slic3r/GUI/Widgets/AnimaController.cpp b/src/slic3r/GUI/Widgets/AnimaController.cpp
index d5f665cde1..a73c6d8e50 100644
--- a/src/slic3r/GUI/Widgets/AnimaController.cpp
+++ b/src/slic3r/GUI/Widgets/AnimaController.cpp
@@ -1,7 +1,16 @@
 #include "AnimaController.hpp"
 
+#include <wx/checklst.h>
+#include <vector>
+#include <string>
+#include "slic3r/GUI/wxExtensions.hpp"
 #include <wx/dcclient.h>
 #include <wx/dcgraph.h>
+#include <wx/panel.h>
+#include <wx/gdicmn.h>
+#include <wx/sizer.h>
+#include <wx/timer.h>
+#include <wx/event.h>
 #ifdef __APPLE__
 #include "libslic3r/MacUtils.hpp"
 #endif
diff --git a/src/slic3r/GUI/Widgets/AnimaController.hpp b/src/slic3r/GUI/Widgets/AnimaController.hpp
index daf8f95314..e32eae6fb7 100644
--- a/src/slic3r/GUI/Widgets/AnimaController.hpp
+++ b/src/slic3r/GUI/Widgets/AnimaController.hpp
@@ -3,6 +3,11 @@
 
 #include "../wxExtensions.hpp"
 #include "Label.hpp"
+#include <wx/panel.h>
+#include <wx/checklst.h>
+#include <vector>
+#include <string>
+#include <wx/timer.h>
 
 
 class AnimaIcon : public wxPanel
diff --git a/src/slic3r/GUI/Widgets/AxisCtrlButton.cpp b/src/slic3r/GUI/Widgets/AxisCtrlButton.cpp
index 535abfcaf2..a771e28be2 100644
--- a/src/slic3r/GUI/Widgets/AxisCtrlButton.cpp
+++ b/src/slic3r/GUI/Widgets/AxisCtrlButton.cpp
@@ -2,8 +2,20 @@
 #include "Label.hpp"
 #include "libslic3r/libslic3r.h"
 
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <utility>
+#include <wx/colour.h>
+#include <cmath>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <algorithm>
+#include <wx/dc.h>
+#include <wx/chartype.h>
 #include <wx/dcclient.h>
 #include <wx/dcgraph.h>
+#include <wx/stattext.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <wx/graphics.h>
 
 StateColor blank_bg(StateColor(std::make_pair(wxColour("#FFFFFF"), (int)StateColor::Normal)));
 static const wxColour BUTTON_BG_COL = wxColour("#EEEEEE");
diff --git a/src/slic3r/GUI/Widgets/AxisCtrlButton.hpp b/src/slic3r/GUI/Widgets/AxisCtrlButton.hpp
index 739861bf0d..3a9b714c5c 100644
--- a/src/slic3r/GUI/Widgets/AxisCtrlButton.hpp
+++ b/src/slic3r/GUI/Widgets/AxisCtrlButton.hpp
@@ -1,6 +1,10 @@
 #ifndef slic3r_GUI_AxisCtrlButton_hpp_
 #define slic3r_GUI_AxisCtrlButton_hpp_
 
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/event.h>
+#include <wx/dc.h>
 #include <wx/stattext.h>
 #include <wx/vlbox.h>
 #include <wx/combo.h>
diff --git a/src/slic3r/GUI/Widgets/Button.cpp b/src/slic3r/GUI/Widgets/Button.cpp
index d29daef1de..7010dbd91c 100644
--- a/src/slic3r/GUI/Widgets/Button.cpp
+++ b/src/slic3r/GUI/Widgets/Button.cpp
@@ -1,7 +1,19 @@
 #include "Button.hpp"
 #include "Label.hpp"
 
+#include "slic3r/GUI/Widgets/StaticBox.hpp"
+#include <utility>
+#include <wx/checklst.h>
+#include <vector>
+#include <wx/colour.h>
+#include "slic3r/GUI/Widgets/StateHandler.hpp"
+#include <wx/dcclient.h>
+#include <wx/dc.h>
+#include <algorithm>
 #include <wx/dcgraph.h>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
 #include <wx/tipwin.h>
 #ifdef __APPLE__
 #include "libslic3r/MacUtils.hpp"
diff --git a/src/slic3r/GUI/Widgets/Button.hpp b/src/slic3r/GUI/Widgets/Button.hpp
index 4077bd5cac..cee2eb15b6 100644
--- a/src/slic3r/GUI/Widgets/Button.hpp
+++ b/src/slic3r/GUI/Widgets/Button.hpp
@@ -3,6 +3,12 @@
 
 #include "../wxExtensions.hpp"
 #include "StaticBox.hpp"
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/string.h>
+#include <wx/checklst.h>
+#include <wx/event.h>
+#include <wx/dc.h>
 #include <wx/tipwin.h>
 #include <wx/colour.h>
 
diff --git a/src/slic3r/GUI/Widgets/CheckBox.cpp b/src/slic3r/GUI/Widgets/CheckBox.cpp
index 91cbb8c4e1..f019f18784 100644
--- a/src/slic3r/GUI/Widgets/CheckBox.cpp
+++ b/src/slic3r/GUI/Widgets/CheckBox.cpp
@@ -1,6 +1,9 @@
 #include "CheckBox.hpp"
 
 #include "../wxExtensions.hpp"
+#include <wx/gdicmn.h>
+#include <wx/checklst.h>
+#include <wx/tglbtn.h>
 
 #ifdef __WXGTK__
 #include "../GUI_Utils.hpp"
diff --git a/src/slic3r/GUI/Widgets/CheckBox.hpp b/src/slic3r/GUI/Widgets/CheckBox.hpp
index abff45ecf1..3ad3dac2c4 100644
--- a/src/slic3r/GUI/Widgets/CheckBox.hpp
+++ b/src/slic3r/GUI/Widgets/CheckBox.hpp
@@ -3,6 +3,7 @@
 
 #include "../wxExtensions.hpp"
 
+#include <wx/checklst.h>
 #include <wx/tglbtn.h>
 
 class CheckBox : public wxBitmapToggleButton
diff --git a/src/slic3r/GUI/Widgets/CheckList.cpp b/src/slic3r/GUI/Widgets/CheckList.cpp
index ed404c62fe..2b8dcac75e 100644
--- a/src/slic3r/GUI/Widgets/CheckList.cpp
+++ b/src/slic3r/GUI/Widgets/CheckList.cpp
@@ -2,6 +2,19 @@
 
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/I18N.hpp"
+#include <wx/arrstr.h>
+#include <wx/checklst.h>
+#include <wx/sizer.h>
+#include <wx/panel.h>
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <wx/event.h>
+#include <wx/textctrl.h>
+#include <wx/scrolwin.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <cstddef>
+#include <wx/dynarray.h>
 
 CheckList::CheckList(
     wxWindow* parent,
diff --git a/src/slic3r/GUI/Widgets/CheckList.hpp b/src/slic3r/GUI/Widgets/CheckList.hpp
index bd40e1ad84..9e5ae4c9e1 100644
--- a/src/slic3r/GUI/Widgets/CheckList.hpp
+++ b/src/slic3r/GUI/Widgets/CheckList.hpp
@@ -6,6 +6,13 @@
 #include "Label.hpp"
 #include "TextInput.hpp"
 
+#include <wx/arrstr.h>
+#include <wx/checklst.h>
+#include <wx/dynarray.h>
+#include <wx/string.h>
+#include <wx/event.h>
+#include <wx/sizer.h>
+#include <wx/panel.h>
 #include <wx/wx.h>
 #include <vector>
 #include <wx/scrolwin.h>
diff --git a/src/slic3r/GUI/Widgets/ComboBox.cpp b/src/slic3r/GUI/Widgets/ComboBox.cpp
index 08687f3cf6..7d507789f5 100644
--- a/src/slic3r/GUI/Widgets/ComboBox.cpp
+++ b/src/slic3r/GUI/Widgets/ComboBox.cpp
@@ -1,7 +1,18 @@
 #include "ComboBox.hpp"
 #include "Label.hpp"
 
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include <utility>
+#include "slic3r/GUI/Widgets/DropDown.hpp"
+#include <wx/clntdata.h>
+#include <vector>
+#include <wx/arrstr.h>
+#include <cstddef>
 #include <wx/dcgraph.h>
+#include <wx/textctrl.h>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
 
 BEGIN_EVENT_TABLE(ComboBox, TextInput)
 
diff --git a/src/slic3r/GUI/Widgets/ComboBox.hpp b/src/slic3r/GUI/Widgets/ComboBox.hpp
index 91c34d53aa..f13bc876c4 100644
--- a/src/slic3r/GUI/Widgets/ComboBox.hpp
+++ b/src/slic3r/GUI/Widgets/ComboBox.hpp
@@ -3,6 +3,15 @@
 
 #include "TextInput.hpp"
 #include "DropDown.hpp"
+#include <wx/ctrlsub.h>
+#include <vector>
+#include <wx/string.h>
+#include <wx/textctrl.h>
+#include <wx/gdicmn.h>
+#include <cstddef>
+#include <wx/arrstr.h>
+#include <wx/clntdata.h>
+#include <wx/event.h>
 
 #define CB_NO_DROP_ICON DD_NO_CHECK_ICON
 #define CB_NO_TEXT DD_NO_TEXT
diff --git a/src/slic3r/GUI/Widgets/DialogButtons.cpp b/src/slic3r/GUI/Widgets/DialogButtons.cpp
index 05e3bcbbc1..f43f1953cf 100644
--- a/src/slic3r/GUI/Widgets/DialogButtons.cpp
+++ b/src/slic3r/GUI/Widgets/DialogButtons.cpp
@@ -1,6 +1,17 @@
 #include "DialogButtons.hpp"
 
 #include "slic3r/GUI/I18N.hpp"
+#include <vector>
+#include <wx/string.h>
+#include <wx/panel.h>
+#include <wx/wx.h>
+#include <wx/sizer.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/colour.h>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <wx/event.h>
+#include <set>
+#include <wx/object.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/Widgets/DialogButtons.hpp b/src/slic3r/GUI/Widgets/DialogButtons.hpp
index d03a1dfd47..3186e7f09c 100644
--- a/src/slic3r/GUI/Widgets/DialogButtons.hpp
+++ b/src/slic3r/GUI/Widgets/DialogButtons.hpp
@@ -10,6 +10,10 @@
 #include "Label.hpp"
 
 #include "slic3r/GUI/GUI_App.hpp"
+#include <wx/panel.h>
+#include <vector>
+#include <wx/string.h>
+#include <wx/event.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/Widgets/DropDown.cpp b/src/slic3r/GUI/Widgets/DropDown.cpp
index cd4d5edff8..c17e5d6e04 100644
--- a/src/slic3r/GUI/Widgets/DropDown.cpp
+++ b/src/slic3r/GUI/Widgets/DropDown.cpp
@@ -1,10 +1,24 @@
 #include "DropDown.hpp"
 #include "Label.hpp"
 
+#include <cassert>
+#include <algorithm>
+#include <boost/date_time/posix_time/posix_time_types.hpp>
 #include <cstdio>
+#include "slic3r/GUI/Widgets/PopupWindow.hpp"
+#include <vector>
+#include <utility>
+#include <iterator>
+#include <wx/dc.h>
+#include <wx/dcclient.h>
 #include <wx/display.h>
 #include <wx/dcbuffer.h>
 #include <wx/dcgraph.h>
+#include <wx/event.h>
+#include <wx/popupwin.h>
+#include <wx/stattext.h>
+#include <wx/gdicmn.h>
+#include <wx/window.h>
 
 #ifdef __WXGTK__
 #include <gtk/gtk.h>
diff --git a/src/slic3r/GUI/Widgets/DropDown.hpp b/src/slic3r/GUI/Widgets/DropDown.hpp
index bcd0a58c41..f9e759202a 100644
--- a/src/slic3r/GUI/Widgets/DropDown.hpp
+++ b/src/slic3r/GUI/Widgets/DropDown.hpp
@@ -2,7 +2,15 @@
 #define slic3r_GUI_DropDown_hpp_
 
 #include <boost/date_time/posix_time/posix_time.hpp>
+#include <wx/event.h>
+#include <vector>
+#include <cstddef>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <boost/date_time/posix_time/ptime.hpp>
+#include <wx/dc.h>
 #include <wx/stattext.h>
+#include <wx/string.h>
 #include "../wxExtensions.hpp"
 #include "StateHandler.hpp"
 #include "PopupWindow.hpp"
diff --git a/src/slic3r/GUI/Widgets/ErrorMsgStaticText.cpp b/src/slic3r/GUI/Widgets/ErrorMsgStaticText.cpp
index dc6c2fc9ed..bb024073e0 100644
--- a/src/slic3r/GUI/Widgets/ErrorMsgStaticText.cpp
+++ b/src/slic3r/GUI/Widgets/ErrorMsgStaticText.cpp
@@ -1,5 +1,8 @@
 #include "ErrorMsgStaticText.hpp"
 #include <wx/dcclient.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/string.h>
 
 ErrorMsgStaticText::ErrorMsgStaticText() {}
 
diff --git a/src/slic3r/GUI/Widgets/ErrorMsgStaticText.hpp b/src/slic3r/GUI/Widgets/ErrorMsgStaticText.hpp
index 63968a57c5..71adbcd7cf 100644
--- a/src/slic3r/GUI/Widgets/ErrorMsgStaticText.hpp
+++ b/src/slic3r/GUI/Widgets/ErrorMsgStaticText.hpp
@@ -2,7 +2,11 @@
 #ifndef _WX_ERRORMSGSTATTEXT_H_
 #define _WX_ERRORMSGSTATTEXT_H_
 
+#include <wx/dlimpexp.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
 #include <wx/panel.h>
+#include <wx/string.h>
 #include "wx/stattext.h"
 
 class WXDLLIMPEXP_CORE ErrorMsgStaticText : public wxPanel
diff --git a/src/slic3r/GUI/Widgets/FanControl.cpp b/src/slic3r/GUI/Widgets/FanControl.cpp
index 7efdfabf07..3ffaf59141 100644
--- a/src/slic3r/GUI/Widgets/FanControl.cpp
+++ b/src/slic3r/GUI/Widgets/FanControl.cpp
@@ -4,9 +4,29 @@
 #include "../I18N.hpp"
 #include "../GUI_App.hpp"
 #include "../MsgDialog.hpp"
+#include "json_diff.hpp"
 
+#include <wx/event.h>
+#include <wx/checklst.h>
+#include <wx/gdicmn.h>
+#include <wx/dcclient.h>
+#include <wx/dc.h>
+#include <wx/chartype.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/colour.h>
+#include "slic3r/GUI/DeviceCore/DevFan.h"
+#include <boost/log/trivial.hpp>
+#include <cmath>
+#include <algorithm>
+#include <wx/panel.h>
+#include "slic3r/GUI/SelectMachine.hpp"
+#include "slic3r/GUI/DeviceCore/DevConfigUtil.h"
+#include <map>
 #include <wx/simplebook.h>
 #include <wx/dcgraph.h>
+#include <wx/string.h>
+#include <wx/stattext.h>
+#include <wx/sizer.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/Widgets/FanControl.hpp b/src/slic3r/GUI/Widgets/FanControl.hpp
index 2badbf8594..b97c9a4d27 100644
--- a/src/slic3r/GUI/Widgets/FanControl.hpp
+++ b/src/slic3r/GUI/Widgets/FanControl.hpp
@@ -9,10 +9,23 @@
 #include "../SelectMachine.hpp"
 #include "../DeviceManager.hpp"
 #include "slic3r/GUI/Event.hpp"
+#include <wx/gdicmn.h>
+#include <wx/checklst.h>
+#include <wx/event.h>
+#include <wx/dc.h>
+#include <vector>
+#include <wx/image.h>
+#include <memory>
+#include <unordered_map>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include <wx/panel.h>
+#include <map>
 #include <wx/simplebook.h>
 #include <wx/hyperlink.h>
 #include <wx/animate.h>
 #include <wx/dynarray.h>
+#include <wx/sizer.h>
+#include <wx/string.h>
 #include "../DeviceCore/DevFan.h"
 
 namespace Slic3r {
diff --git a/src/slic3r/GUI/Widgets/FilamentLoad.cpp b/src/slic3r/GUI/Widgets/FilamentLoad.cpp
index 2f2ef4dd92..712c103826 100644
--- a/src/slic3r/GUI/Widgets/FilamentLoad.cpp
+++ b/src/slic3r/GUI/Widgets/FilamentLoad.cpp
@@ -5,10 +5,18 @@
 #include "../GUI_App.hpp"
 #include "../DeviceCore/DevFilaSystem.h"
 
+#include <wx/checklst.h>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/Widgets/StepCtrl.hpp"
+#include "slic3r/GUI/Widgets/AMSItem.hpp"
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <string>
+#include <wx/colour.h>
 #include <wx/simplebook.h>
 #include <wx/dcgraph.h>
 
 #include <boost/log/trivial.hpp>
+#include <wx/string.h>
 
 #include "CalibUtils.hpp"
 
diff --git a/src/slic3r/GUI/Widgets/FilamentLoad.hpp b/src/slic3r/GUI/Widgets/FilamentLoad.hpp
index e3cc6daf67..257e92d21c 100644
--- a/src/slic3r/GUI/Widgets/FilamentLoad.hpp
+++ b/src/slic3r/GUI/Widgets/FilamentLoad.hpp
@@ -8,10 +8,17 @@
 #include "../DeviceManager.hpp"
 #include "slic3r/GUI/Event.hpp"
 #include "slic3r/GUI/AmsMappingPopup.hpp"
+#include <wx/checklst.h>
+#include <wx/gdicmn.h>
+#include <map>
+#include "slic3r/GUI/Widgets/AMSItem.hpp"
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <wx/colour.h>
 #include <wx/simplebook.h>
 #include <wx/hyperlink.h>
 #include <wx/animate.h>
 #include <wx/dynarray.h>
+#include <wx/string.h>
 
 
 namespace Slic3r {  namespace GUI {
diff --git a/src/slic3r/GUI/Widgets/HyperLink.cpp b/src/slic3r/GUI/Widgets/HyperLink.cpp
index 7fdb236199..cc065e1c9b 100644
--- a/src/slic3r/GUI/Widgets/HyperLink.cpp
+++ b/src/slic3r/GUI/Widgets/HyperLink.cpp
@@ -1,5 +1,11 @@
 #include "HyperLink.hpp"
 #include "Label.hpp"
+#include <wx/string.h>
+#include <wx/wx.h>
+#include <wx/colour.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <wx/utils.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/Widgets/HyperLink.hpp b/src/slic3r/GUI/Widgets/HyperLink.hpp
index 48e2245e3b..09b033802e 100644
--- a/src/slic3r/GUI/Widgets/HyperLink.hpp
+++ b/src/slic3r/GUI/Widgets/HyperLink.hpp
@@ -1,6 +1,8 @@
 #ifndef slic3r_GUI_HyperLink_hpp_
 #define slic3r_GUI_HyperLink_hpp_
 
+#include <wx/string.h>
+#include <wx/colour.h>
 #include <wx/wx.h>
 #include <wx/window.h>
 
diff --git a/src/slic3r/GUI/Widgets/ImageSwitchButton.cpp b/src/slic3r/GUI/Widgets/ImageSwitchButton.cpp
index adaadcb8f5..9915795af5 100644
--- a/src/slic3r/GUI/Widgets/ImageSwitchButton.cpp
+++ b/src/slic3r/GUI/Widgets/ImageSwitchButton.cpp
@@ -4,8 +4,15 @@
 #include "../wxExtensions.hpp"
 
 #include "slic3r/GUI/I18N.hpp"
+#include <wx/colour.h>
+#include <utility>
+#include <wx/checklst.h>
+#include <wx/dc.h>
 #include <wx/dcclient.h>
 #include <wx/dcgraph.h>
+#include <wx/gdicmn.h>
+#include <wx/string.h>
+#include <wx/event.h>
 
 BEGIN_EVENT_TABLE(ImageSwitchButton, StaticBox)
 
diff --git a/src/slic3r/GUI/Widgets/ImageSwitchButton.hpp b/src/slic3r/GUI/Widgets/ImageSwitchButton.hpp
index d49bc6642c..69d643a3df 100644
--- a/src/slic3r/GUI/Widgets/ImageSwitchButton.hpp
+++ b/src/slic3r/GUI/Widgets/ImageSwitchButton.hpp
@@ -7,6 +7,11 @@
 #include "Button.hpp"
 
 
+#include "slic3r/GUI/Widgets/StaticBox.hpp"
+#include <wx/string.h>
+#include <wx/event.h>
+#include <wx/dc.h>
+#include <wx/gdicmn.h>
 #include <wx/tglbtn.h>
 
 class ImageSwitchButton : public StaticBox
diff --git a/src/slic3r/GUI/Widgets/Label.cpp b/src/slic3r/GUI/Widgets/Label.cpp
index 60a2a90a9e..da5e9b72af 100644
--- a/src/slic3r/GUI/Widgets/Label.cpp
+++ b/src/slic3r/GUI/Widgets/Label.cpp
@@ -1,10 +1,25 @@
 #include "libslic3r/Utils.hpp"
 #include "Label.hpp"
 #include "StaticBox.hpp"
+#include <wx/font.h>
+#include <string>
+#include <wx/dlimpexp.h>
+#include <wx/dc.h>
+#include <wx/arrstr.h>
+#include <wx/dynarray.h>
+#include <cstddef>
+#include <algorithm>
+#include <wx/chartype.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <wx/colour.h>
 #include <wx/intl.h> // For wxLocale
 #include <wx/dcclient.h>
+#include <wx/language.h>
 #include <wx/settings.h>
 #include <boost/log/trivial.hpp>
+#include <wx/string.h>
+#include <wx/stattext.h>
 #ifdef __linux__
 #include <fontconfig/fontconfig.h>
 #endif
diff --git a/src/slic3r/GUI/Widgets/Label.hpp b/src/slic3r/GUI/Widgets/Label.hpp
index 1415db6ad7..29df6a8272 100644
--- a/src/slic3r/GUI/Widgets/Label.hpp
+++ b/src/slic3r/GUI/Widgets/Label.hpp
@@ -1,7 +1,11 @@
 #ifndef slic3r_GUI_Label_hpp_
 #define slic3r_GUI_Label_hpp_
 
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <wx/colour.h>
 #include <wx/stattext.h>
+#include <wx/string.h>
 
 #define LB_HYPERLINK 0x0020
 #define LB_PROPAGATE_MOUSE_EVENT 0x0040
diff --git a/src/slic3r/GUI/Widgets/LabeledStaticBox.cpp b/src/slic3r/GUI/Widgets/LabeledStaticBox.cpp
index a11839a8b8..734373ca7b 100644
--- a/src/slic3r/GUI/Widgets/LabeledStaticBox.cpp
+++ b/src/slic3r/GUI/Widgets/LabeledStaticBox.cpp
@@ -3,6 +3,15 @@
 #include "../GUI.hpp"
 #include "../GUI_Utils.hpp"
 #include "Label.hpp"
+#include <utility>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <wx/dcclient.h>
+#include "slic3r/GUI/Widgets/StateHandler.hpp"
+#include <wx/dc.h>
+#include <wx/peninfobase.h>
+#include <algorithm>
 
 LabeledStaticBox::LabeledStaticBox()
     : state_handler(this)
diff --git a/src/slic3r/GUI/Widgets/LabeledStaticBox.hpp b/src/slic3r/GUI/Widgets/LabeledStaticBox.hpp
index d3e7f2efce..d47699aa73 100644
--- a/src/slic3r/GUI/Widgets/LabeledStaticBox.hpp
+++ b/src/slic3r/GUI/Widgets/LabeledStaticBox.hpp
@@ -1,6 +1,9 @@
 #ifndef slic3r_GUI_LabeledStaticBox_hpp_
 #define slic3r_GUI_LabeledStaticBox_hpp_
 
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
 #include <wx/window.h>
 #include <wx/dc.h>
 #include <wx/dcgraph.h>
diff --git a/src/slic3r/GUI/Widgets/MultiNozzleSync.cpp b/src/slic3r/GUI/Widgets/MultiNozzleSync.cpp
index 616b8b8779..bbaf2cb3b3 100644
--- a/src/slic3r/GUI/Widgets/MultiNozzleSync.cpp
+++ b/src/slic3r/GUI/Widgets/MultiNozzleSync.cpp
@@ -12,18 +12,46 @@
 #include "Label.hpp"
 #include "ComboBox.hpp"
 #include "StaticBox.hpp"
+#include "json_diff.hpp"
 #include "libslic3r/PresetBundle.hpp"
 #include "libslic3r/Utils.hpp"
 
 #include <algorithm>
+#include <boost/log/trivial.hpp>
 #include <cmath>
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/Config.hpp"
+#include <cstdlib>
+#include <cstddef>
+#include "libslic3r/MultiNozzleUtils.hpp"
 #include <map>
+#include <memory>
 #include <numeric>
+#include <optional>
 #include <set>
 
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/arrstr.h>
+#include <vector>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include <utility>
+#include <unordered_map>
+#include <string>
+#include "slic3r/GUI/DeviceCore/DevNozzleRack.h"
 #include <wx/choice.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include <wx/colour.h>
+#include <wx/dcclient.h>
+#include <wx/dialog.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
+#include <wx/toplevel.h>
+#include <wx/webview.h>
+#include <wx/string.h>
+#include <wx/timer.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/Widgets/MultiNozzleSync.hpp b/src/slic3r/GUI/Widgets/MultiNozzleSync.hpp
index 50bd534c72..85dd5f1977 100644
--- a/src/slic3r/GUI/Widgets/MultiNozzleSync.hpp
+++ b/src/slic3r/GUI/Widgets/MultiNozzleSync.hpp
@@ -23,7 +23,11 @@
 #include "slic3r/GUI/DeviceCore/DevNozzleRack.h"
 #include "slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.h"
 
+#include <string>
+#include <wx/event.h>
 #include <wx/panel.h>
+#include <wx/string.h>
+#include <wx/timer.h>
 #include <wx/webview.h>
 
 #include <memory>
diff --git a/src/slic3r/GUI/Widgets/PopupWindow.cpp b/src/slic3r/GUI/Widgets/PopupWindow.cpp
index 8fb1cda774..371ece392b 100644
--- a/src/slic3r/GUI/Widgets/PopupWindow.cpp
+++ b/src/slic3r/GUI/Widgets/PopupWindow.cpp
@@ -1,4 +1,6 @@
 #include "PopupWindow.hpp"
+#include <wx/popupwin.h>
+#include <wx/event.h>
 
 static wxWindow *GetTopParent(wxWindow *pWindow)
 {
diff --git a/src/slic3r/GUI/Widgets/ProgressBar.cpp b/src/slic3r/GUI/Widgets/ProgressBar.cpp
index 1bd9882cd3..86963fa638 100644
--- a/src/slic3r/GUI/Widgets/ProgressBar.cpp
+++ b/src/slic3r/GUI/Widgets/ProgressBar.cpp
@@ -1,7 +1,11 @@
 #include "ProgressBar.hpp"
 #include "../I18N.hpp"
+#include <wx/dc.h>
 #include <wx/dcclient.h>
 #include <wx/dcgraph.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/string.h>
 #include "Label.hpp"
 
 
diff --git a/src/slic3r/GUI/Widgets/ProgressBar.hpp b/src/slic3r/GUI/Widgets/ProgressBar.hpp
index 40ddb8e4be..728f47d65a 100644
--- a/src/slic3r/GUI/Widgets/ProgressBar.hpp
+++ b/src/slic3r/GUI/Widgets/ProgressBar.hpp
@@ -1,6 +1,10 @@
 #ifndef slic3r_GUI_ProgressBar_hpp_
 #define slic3r_GUI_ProgressBar_hpp_
 
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/colour.h>
+#include <wx/string.h>
 #include <wx/window.h>
 #include "../wxExtensions.hpp"
 
diff --git a/src/slic3r/GUI/Widgets/ProgressDialog.cpp b/src/slic3r/GUI/Widgets/ProgressDialog.cpp
index 6d42df1007..82d2efa0eb 100644
--- a/src/slic3r/GUI/Widgets/ProgressDialog.cpp
+++ b/src/slic3r/GUI/Widgets/ProgressDialog.cpp
@@ -1,4 +1,14 @@
 #include "wx/wxprec.h"
+#include <cstddef>
+#include <wx/time.h>
+#include <wx/dialog.h>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/progdlg.h>
+#include <wx/panel.h>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include <wx/translation.h>
+#include <wx/debug.h>
 
 #ifndef WX_PRECOMP
 #include "wx/utils.h"
diff --git a/src/slic3r/GUI/Widgets/ProgressDialog.hpp b/src/slic3r/GUI/Widgets/ProgressDialog.hpp
index 9ebf31b194..a8b2dee827 100644
--- a/src/slic3r/GUI/Widgets/ProgressDialog.hpp
+++ b/src/slic3r/GUI/Widgets/ProgressDialog.hpp
@@ -7,6 +7,12 @@
 #include "wx/simplebook.h"
 #include "Button.hpp"
 #include "../wxExtensions.hpp"
+#include <wx/dlimpexp.h>
+#include <wx/string.h>
+#include <cstddef>
+#include <wx/event.h>
+#include <wx/panel.h>
+#include <wx/translation.h>
 
 class WXDLLIMPEXP_FWD_CORE wxButton;
 class WXDLLIMPEXP_FWD_CORE wxEventLoop;
diff --git a/src/slic3r/GUI/Widgets/RadioBox.cpp b/src/slic3r/GUI/Widgets/RadioBox.cpp
index f00447e0ec..93e8f63b91 100644
--- a/src/slic3r/GUI/Widgets/RadioBox.cpp
+++ b/src/slic3r/GUI/Widgets/RadioBox.cpp
@@ -1,6 +1,8 @@
 #include "RadioBox.hpp"
 
 #include "../wxExtensions.hpp"
+#include <wx/checklst.h>
+#include <wx/gdicmn.h>
 
 #ifdef __WXGTK__
 #include "../GUI_Utils.hpp"
diff --git a/src/slic3r/GUI/Widgets/RadioGroup.cpp b/src/slic3r/GUI/Widgets/RadioGroup.cpp
index a5f63a9ac0..5b4499a1b4 100644
--- a/src/slic3r/GUI/Widgets/RadioGroup.cpp
+++ b/src/slic3r/GUI/Widgets/RadioGroup.cpp
@@ -1,6 +1,20 @@
 #include "RadioGroup.hpp"
 #include "Label.hpp"
 #include "StateColor.hpp"
+#include <vector>
+#include <wx/string.h>
+#include <wx/panel.h>
+#include <wx/checklst.h>
+#include <wx/gdicmn.h>
+#include <utility>
+#include <wx/colour.h>
+#include <wx/sizer.h>
+#include <wx/anybutton.h>
+#include <wx/event.h>
+#include <wx/utils.h>
+#include <wx/window.h>
+#include <cstddef>
+#include "slic3r/GUI/Widgets/StateHandler.hpp"
 
 RadioGroup::RadioGroup(
     wxWindow* parent,
diff --git a/src/slic3r/GUI/Widgets/RadioGroup.hpp b/src/slic3r/GUI/Widgets/RadioGroup.hpp
index 93dc1df73f..6f25190431 100644
--- a/src/slic3r/GUI/Widgets/RadioGroup.hpp
+++ b/src/slic3r/GUI/Widgets/RadioGroup.hpp
@@ -3,6 +3,10 @@
 
 #include "../wxExtensions.hpp"
 
+#include <wx/panel.h>
+#include <wx/string.h>
+#include <wx/checklst.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
 #include <wx/wx.h>
 #include <wx/dcclient.h>
 #include <wx/dcgraph.h>
diff --git a/src/slic3r/GUI/Widgets/RoundedRectangle.cpp b/src/slic3r/GUI/Widgets/RoundedRectangle.cpp
index 681251a764..5b5cd98076 100644
--- a/src/slic3r/GUI/Widgets/RoundedRectangle.cpp
+++ b/src/slic3r/GUI/Widgets/RoundedRectangle.cpp
@@ -1,7 +1,11 @@
 #include "RoundedRectangle.hpp"
 #include "../wxExtensions.hpp"
+#include <wx/colour.h>
+#include <wx/checklst.h>
 #include <wx/dcgraph.h>
 #include <wx/dcclient.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
 
 BEGIN_EVENT_TABLE(RoundedRectangle, wxWindow)
 EVT_PAINT(RoundedRectangle::OnPaint)
diff --git a/src/slic3r/GUI/Widgets/RoundedRectangle.hpp b/src/slic3r/GUI/Widgets/RoundedRectangle.hpp
index 970901031f..e28611ef55 100644
--- a/src/slic3r/GUI/Widgets/RoundedRectangle.hpp
+++ b/src/slic3r/GUI/Widgets/RoundedRectangle.hpp
@@ -2,6 +2,9 @@
 #define slic3r_GUI_ROUNDEDRECTANGLE_hpp_
 
 #include "../wxExtensions.hpp"
+#include <wx/colour.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
 
 class RoundedRectangle : public wxWindow
 {
diff --git a/src/slic3r/GUI/Widgets/Scrollbar.cpp b/src/slic3r/GUI/Widgets/Scrollbar.cpp
index 5b2140c658..0c076e939a 100644
--- a/src/slic3r/GUI/Widgets/Scrollbar.cpp
+++ b/src/slic3r/GUI/Widgets/Scrollbar.cpp
@@ -1,3 +1,8 @@
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include <wx/event.h>
+#include <wx/dcclient.h>
+#include <wx/colour.h>
 #include <wx/wxprec.h>
 #ifndef WX_PRECOMP
 #include <wx/wx.h>
diff --git a/src/slic3r/GUI/Widgets/Scrollbar.hpp b/src/slic3r/GUI/Widgets/Scrollbar.hpp
index 9b00eaedca..0a69601291 100644
--- a/src/slic3r/GUI/Widgets/Scrollbar.hpp
+++ b/src/slic3r/GUI/Widgets/Scrollbar.hpp
@@ -1,4 +1,8 @@
 #pragma once
+#include <wx/panel.h>
+#include <wx/gdicmn.h>
+#include <wx/colour.h>
+#include <wx/event.h>
 #include <wx/wxprec.h>
 #ifndef WX_PRECOMP
 #include <wx/wx.h>
diff --git a/src/slic3r/GUI/Widgets/ScrolledWindow.cpp b/src/slic3r/GUI/Widgets/ScrolledWindow.cpp
index 90922f93f1..025ade8eda 100644
--- a/src/slic3r/GUI/Widgets/ScrolledWindow.cpp
+++ b/src/slic3r/GUI/Widgets/ScrolledWindow.cpp
@@ -1,4 +1,10 @@
 // for scroll
+#include <wx/gdicmn.h>
+#include <wx/scrolwin.h>
+#include <cstddef>
+#include <wx/panel.h>
+#include <wx/event.h>
+#include <wx/colour.h>
 #include <wx/wxprec.h>
 #ifndef WX_PRECOMP
 #include <wx/wx.h>
diff --git a/src/slic3r/GUI/Widgets/ScrolledWindow.hpp b/src/slic3r/GUI/Widgets/ScrolledWindow.hpp
index 5c2bc2f9e5..a430dec423 100644
--- a/src/slic3r/GUI/Widgets/ScrolledWindow.hpp
+++ b/src/slic3r/GUI/Widgets/ScrolledWindow.hpp
@@ -1,4 +1,9 @@
 #pragma once
+#include <wx/scrolwin.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <wx/colour.h>
+#include <wx/panel.h>
 #include <wx/wxprec.h>
 #ifndef WX_PRECOMP
 #include <wx/wx.h>
diff --git a/src/slic3r/GUI/Widgets/SideButton.cpp b/src/slic3r/GUI/Widgets/SideButton.cpp
index 08c58309e5..e9fe493621 100644
--- a/src/slic3r/GUI/Widgets/SideButton.cpp
+++ b/src/slic3r/GUI/Widgets/SideButton.cpp
@@ -1,8 +1,15 @@
 #include "SideButton.hpp"
 #include "Label.hpp"
 
+#include <vector>
+#include "slic3r/GUI/Widgets/StateHandler.hpp"
+#include <wx/dc.h>
 #include <wx/dcclient.h>
 #include <wx/dcgraph.h>
+#include <wx/string.h>
+#include <wx/stattext.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
 
 BEGIN_EVENT_TABLE(SideButton, wxWindow)
 EVT_LEFT_DOWN(SideButton::mouseDown)
diff --git a/src/slic3r/GUI/Widgets/SideButton.hpp b/src/slic3r/GUI/Widgets/SideButton.hpp
index 894a7d8727..84a210c3e3 100644
--- a/src/slic3r/GUI/Widgets/SideButton.hpp
+++ b/src/slic3r/GUI/Widgets/SideButton.hpp
@@ -1,7 +1,14 @@
 #ifndef slic3r_GUI_SideButton_hpp_
 #define slic3r_GUI_SideButton_hpp_
 
+#include <vector>
+#include <wx/colour.h>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/event.h>
+#include <wx/dc.h>
 #include <wx/stattext.h>
+#include <wx/string.h>
 #include <wx/vlbox.h>
 #include <wx/combo.h>
 #include "../wxExtensions.hpp"
diff --git a/src/slic3r/GUI/Widgets/SideMenuPopup.cpp b/src/slic3r/GUI/Widgets/SideMenuPopup.cpp
index caa6c8f802..3a55475e60 100644
--- a/src/slic3r/GUI/Widgets/SideMenuPopup.cpp
+++ b/src/slic3r/GUI/Widgets/SideMenuPopup.cpp
@@ -1,8 +1,16 @@
 #include "SideMenuPopup.hpp"
 #include "Label.hpp"
 
+#include "slic3r/GUI/Widgets/PopupWindow.hpp"
+#include <algorithm>
+#include <wx/dcclient.h>
+#include <wx/colour.h>
 #include <wx/display.h>
 #include <wx/dcgraph.h>
+#include <wx/stattext.h>
+#include <wx/popupwin.h>
+#include <wx/event.h>
+#include <wx/sizer.h>
 #include "../GUI_App.hpp"
 
 
diff --git a/src/slic3r/GUI/Widgets/SideMenuPopup.hpp b/src/slic3r/GUI/Widgets/SideMenuPopup.hpp
index 09f756a5eb..dc665e3557 100644
--- a/src/slic3r/GUI/Widgets/SideMenuPopup.hpp
+++ b/src/slic3r/GUI/Widgets/SideMenuPopup.hpp
@@ -1,6 +1,9 @@
 #ifndef slic3r_GUI_SideMenuPopup_hpp_
 #define slic3r_GUI_SideMenuPopup_hpp_
 
+#include <vector>
+#include <cstddef>
+#include <wx/event.h>
 #include <wx/stattext.h>
 #include <wx/vlbox.h>
 #include <wx/combo.h>
diff --git a/src/slic3r/GUI/Widgets/SideTools.cpp b/src/slic3r/GUI/Widgets/SideTools.cpp
index d66c46c42b..79be4c3b87 100644
--- a/src/slic3r/GUI/Widgets/SideTools.cpp
+++ b/src/slic3r/GUI/Widgets/SideTools.cpp
@@ -1,7 +1,22 @@
 #include "SideTools.hpp"
 #include "bambu_networking.hpp"
+#include <wx/colour.h>
+#include <wx/dcclient.h>
+#include <wx/dc.h>
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "slic3r/GUI/Widgets/HyperLink.hpp"
+#include <wx/chartype.h>
+#include <boost/algorithm/string/predicate.hpp>
+#include <string>
 #include <wx/dcmemory.h>
 #include <wx/dcgraph.h>
+#include <wx/gdicmn.h>
+#include <wx/panel.h>
+#include <wx/event.h>
+#include <wx/timer.h>
+#include <wx/string.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
 #include "Label.hpp"
 #include "StateColor.hpp"
 #include "../GUI_App.hpp"
diff --git a/src/slic3r/GUI/Widgets/SideTools.hpp b/src/slic3r/GUI/Widgets/SideTools.hpp
index 24cbae4fd2..81c42ecef0 100644
--- a/src/slic3r/GUI/Widgets/SideTools.hpp
+++ b/src/slic3r/GUI/Widgets/SideTools.hpp
@@ -1,9 +1,14 @@
 #ifndef slic3r_GUI_SIDETOOLS_hpp_
 #define slic3r_GUI_SIDETOOLS_hpp_
 
+#include <string>
+#include <wx/dc.h>
 #include <wx/dcgraph.h>
+#include <wx/event.h>
 #include <wx/gdicmn.h>
 #include <wx/dcclient.h>
+#include <wx/panel.h>
+#include <wx/timer.h>
 #include "Button.hpp"
 #include "Label.hpp"
 #include "HyperLink.hpp" // ORCA
diff --git a/src/slic3r/GUI/Widgets/SpinInput.cpp b/src/slic3r/GUI/Widgets/SpinInput.cpp
index c91fd41543..3077304947 100644
--- a/src/slic3r/GUI/Widgets/SpinInput.cpp
+++ b/src/slic3r/GUI/Widgets/SpinInput.cpp
@@ -3,7 +3,19 @@
 #include "Button.hpp"
 #include "TextCtrl.h"
 
+#include "slic3r/GUI/Widgets/StaticBox.hpp"
+#include <utility>
+#include "slic3r/GUI/Widgets/StateHandler.hpp"
+#include <wx/dcclient.h>
+#include <wx/dc.h>
 #include <wx/dcgraph.h>
+#include <wx/event.h>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/valtext.h>
+#include <wx/textctrl.h>
+#include <wx/timer.h>
+#include <wx/spinctrl.h>
 
 #ifdef __WXGTK__
 #include "../GUI_Utils.hpp"
diff --git a/src/slic3r/GUI/Widgets/SpinInput.hpp b/src/slic3r/GUI/Widgets/SpinInput.hpp
index caf2bf3843..27bf6fcddf 100644
--- a/src/slic3r/GUI/Widgets/SpinInput.hpp
+++ b/src/slic3r/GUI/Widgets/SpinInput.hpp
@@ -1,7 +1,13 @@
 #ifndef slic3r_GUI_SpinInput_hpp_
 #define slic3r_GUI_SpinInput_hpp_
 
+#include <wx/containr.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/dc.h>
 #include <wx/dcclient.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/string.h>
 #include <wx/timer.h>
 #include <wx/textctrl.h>
 #include <wx/valtext.h>
diff --git a/src/slic3r/GUI/Widgets/StateColor.cpp b/src/slic3r/GUI/Widgets/StateColor.cpp
index 2a9d91f59a..8d9cded8a6 100644
--- a/src/slic3r/GUI/Widgets/StateColor.cpp
+++ b/src/slic3r/GUI/Widgets/StateColor.cpp
@@ -1,5 +1,10 @@
 #include "StateColor.hpp"
+#include <algorithm>
 #include <cmath>
+#include <wx/colour.h>
+#include <map>
+#include <tuple>
+#include <wx/string.h>
 
 static bool gDarkMode = false;
 
diff --git a/src/slic3r/GUI/Widgets/StateColor.hpp b/src/slic3r/GUI/Widgets/StateColor.hpp
index 8aa8cb4dfe..669108adf3 100644
--- a/src/slic3r/GUI/Widgets/StateColor.hpp
+++ b/src/slic3r/GUI/Widgets/StateColor.hpp
@@ -1,9 +1,13 @@
 #ifndef slic3r_GUI_StateColor_hpp_
 #define slic3r_GUI_StateColor_hpp_
 
+#include <tuple>
+#include <utility>
+#include <vector>
 #include <wx/colour.h>
 
 #include <map>
+#include <wx/string.h>
 
 class StateColor
 {
diff --git a/src/slic3r/GUI/Widgets/StateHandler.cpp b/src/slic3r/GUI/Widgets/StateHandler.cpp
index f71f649144..7329965572 100644
--- a/src/slic3r/GUI/Widgets/StateHandler.cpp
+++ b/src/slic3r/GUI/Widgets/StateHandler.cpp
@@ -1,4 +1,8 @@
 #include "StateHandler.hpp"
+#include <wx/event.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <vector>
+#include <algorithm>
 #include <wx/window.h>
 
 wxDEFINE_EVENT(EVT_ENABLE_CHANGED, wxCommandEvent);
diff --git a/src/slic3r/GUI/Widgets/StateHandler.hpp b/src/slic3r/GUI/Widgets/StateHandler.hpp
index a0af2cc285..c0bba3a36a 100644
--- a/src/slic3r/GUI/Widgets/StateHandler.hpp
+++ b/src/slic3r/GUI/Widgets/StateHandler.hpp
@@ -2,6 +2,7 @@
 #define slic3r_GUI_StateHandler_hpp_
 
 #include <memory>
+#include <vector>
 #include <wx/event.h>
 
 #include "StateColor.hpp"
diff --git a/src/slic3r/GUI/Widgets/StaticBox.cpp b/src/slic3r/GUI/Widgets/StaticBox.cpp
index 75953ceb3f..87a1d26827 100644
--- a/src/slic3r/GUI/Widgets/StaticBox.cpp
+++ b/src/slic3r/GUI/Widgets/StaticBox.cpp
@@ -1,7 +1,15 @@
 #include "StaticBox.hpp"
 #include "../GUI.hpp"
+#include <utility>
+#include <wx/checklst.h>
+#include <wx/colour.h>
+#include <wx/dc.h>
+#include <cmath>
 #include <wx/dcclient.h>
 #include <wx/dcgraph.h>
+#include <wx/gdicmn.h>
+#include <wx/peninfobase.h>
+#include <wx/event.h>
 
 BEGIN_EVENT_TABLE(StaticBox, wxWindow)
 
diff --git a/src/slic3r/GUI/Widgets/StaticBox.hpp b/src/slic3r/GUI/Widgets/StaticBox.hpp
index b1aee505ce..b7662ff670 100644
--- a/src/slic3r/GUI/Widgets/StaticBox.hpp
+++ b/src/slic3r/GUI/Widgets/StaticBox.hpp
@@ -4,6 +4,12 @@
 #include "../wxExtensions.hpp"
 #include "StateHandler.hpp"
 
+#include <wx/checklst.h>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/colour.h>
+#include <wx/peninfobase.h>
+#include <wx/event.h>
 #include <wx/window.h>
 
 class StaticBox : public wxWindow
diff --git a/src/slic3r/GUI/Widgets/StaticLine.cpp b/src/slic3r/GUI/Widgets/StaticLine.cpp
index 3dd564c02b..f574a5b739 100644
--- a/src/slic3r/GUI/Widgets/StaticLine.cpp
+++ b/src/slic3r/GUI/Widgets/StaticLine.cpp
@@ -2,8 +2,14 @@
 #include "Label.hpp"
 #include "StateColor.hpp"
 
+#include <wx/checklst.h>
+#include <wx/dc.h>
 #include <wx/dcclient.h>
 #include <wx/dcgraph.h>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <wx/utils.h>
 
 BEGIN_EVENT_TABLE(StaticLine, wxWindow)
 
diff --git a/src/slic3r/GUI/Widgets/StaticLine.hpp b/src/slic3r/GUI/Widgets/StaticLine.hpp
index 46944b9d26..2241dfbd21 100644
--- a/src/slic3r/GUI/Widgets/StaticLine.hpp
+++ b/src/slic3r/GUI/Widgets/StaticLine.hpp
@@ -3,6 +3,9 @@
 
 #include "../wxExtensions.hpp"
 #include "wx/window.h"
+#include <wx/string.h>
+#include <wx/colour.h>
+#include <wx/event.h>
 
 class StaticLine : public wxWindow
 {
diff --git a/src/slic3r/GUI/Widgets/StepCtrl.cpp b/src/slic3r/GUI/Widgets/StepCtrl.cpp
index c780351755..34ce8506de 100644
--- a/src/slic3r/GUI/Widgets/StepCtrl.cpp
+++ b/src/slic3r/GUI/Widgets/StepCtrl.cpp
@@ -1,8 +1,16 @@
 #include "StepCtrl.hpp"
 #include "Label.hpp"
 
+#include <wx/checklst.h>
+#include "slic3r/GUI/Widgets/StaticBox.hpp"
+#include <utility>
+#include <algorithm>
+#include "slic3r/GUI/BitmapCache.hpp"
 #include <wx/dc.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
 #include <wx/pen.h>
+#include <wx/string.h>
 
 wxDEFINE_EVENT( EVT_STEP_CHANGING, wxCommandEvent );
 wxDEFINE_EVENT( EVT_STEP_CHANGED, wxCommandEvent );
diff --git a/src/slic3r/GUI/Widgets/StepCtrl.hpp b/src/slic3r/GUI/Widgets/StepCtrl.hpp
index f59f9aac85..d568443eaa 100644
--- a/src/slic3r/GUI/Widgets/StepCtrl.hpp
+++ b/src/slic3r/GUI/Widgets/StepCtrl.hpp
@@ -2,6 +2,14 @@
 #define slic3r_GUI_StepCtrlBase_hpp_
 
 #include "StaticBox.hpp"
+#include <wx/event.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <vector>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/checklst.h>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include <wx/dc.h>
 
 wxDECLARE_EVENT( EVT_STEP_CHANGING, wxCommandEvent );
 wxDECLARE_EVENT( EVT_STEP_CHANGED, wxCommandEvent );
diff --git a/src/slic3r/GUI/Widgets/SwitchButton.cpp b/src/slic3r/GUI/Widgets/SwitchButton.cpp
index f9fa3405d3..6ac9d2210f 100644
--- a/src/slic3r/GUI/Widgets/SwitchButton.cpp
+++ b/src/slic3r/GUI/Widgets/SwitchButton.cpp
@@ -5,7 +5,23 @@
 
 #include "../wxExtensions.hpp"
 
+#include <wx/event.h>
+#include <wx/checklst.h>
+#include <wx/gdicmn.h>
+#include <wx/anybutton.h>
+#include <utility>
+#include <wx/colour.h>
+#include <wx/image.h>
+#include <cstring>
+#include <wx/dc.h>
+#include <vector>
+#include "slic3r/GUI/Widgets/StateHandler.hpp"
+#include <wx/scrolwin.h>
 #include <wx/settings.h>
+#include <wx/tglbtn.h>
+#include <wx/string.h>
+#include <wx/types.h>
+#include <wx/sizer.h>
 #include "../GUI_App.hpp"
 #include "slic3r/GUI/I18N.hpp"
 #include "../Utils/MacDarkMode.hpp"
diff --git a/src/slic3r/GUI/Widgets/SwitchButton.hpp b/src/slic3r/GUI/Widgets/SwitchButton.hpp
index decff25919..e4ef0005ad 100644
--- a/src/slic3r/GUI/Widgets/SwitchButton.hpp
+++ b/src/slic3r/GUI/Widgets/SwitchButton.hpp
@@ -5,9 +5,16 @@
 #include "StateColor.hpp"
 #include "StaticBox.hpp"
 
+#include <cstddef>
 #include <vector>
+#include <wx/event.h>
+#include <wx/checklst.h>
+#include <wx/colour.h>
+#include <wx/dc.h>
+#include <wx/gdicmn.h>
 #include <wx/sizer.h>
 #include <wx/scrolwin.h>
+#include <wx/string.h>
 #include <wx/tglbtn.h>
 #include "Button.hpp"
 
diff --git a/src/slic3r/GUI/Widgets/TabCtrl.cpp b/src/slic3r/GUI/Widgets/TabCtrl.cpp
index ef23e2c5e4..66ff926d25 100644
--- a/src/slic3r/GUI/Widgets/TabCtrl.cpp
+++ b/src/slic3r/GUI/Widgets/TabCtrl.cpp
@@ -1,6 +1,16 @@
 #include "TabCtrl.hpp"
 
+#include "slic3r/GUI/Widgets/StaticBox.hpp"
+#include <wx/checklst.h>
+#include <cstddef>
+#include <utility>
+#include <wx/colour.h>
+#include <algorithm>
 #include <wx/dc.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/sizer.h>
+#include <wx/string.h>
 
 wxDEFINE_EVENT(wxEVT_TAB_SEL_CHANGING, wxCommandEvent);
 wxDEFINE_EVENT(wxEVT_TAB_SEL_CHANGED, wxCommandEvent);
diff --git a/src/slic3r/GUI/Widgets/TabCtrl.hpp b/src/slic3r/GUI/Widgets/TabCtrl.hpp
index d89da145af..80ac49da0a 100644
--- a/src/slic3r/GUI/Widgets/TabCtrl.hpp
+++ b/src/slic3r/GUI/Widgets/TabCtrl.hpp
@@ -2,6 +2,15 @@
 #define slic3r_GUI_TabCtrl_hpp_
 
 #include "Button.hpp"
+#include <wx/event.h>
+#include "slic3r/GUI/Widgets/StaticBox.hpp"
+#include <vector>
+#include <wx/sizer.h>
+#include <wx/checklst.h>
+#include <wx/gdicmn.h>
+#include <wx/string.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/dc.h>
 
 wxDECLARE_EVENT(wxEVT_TAB_SEL_CHANGING, wxCommandEvent);
 wxDECLARE_EVENT(wxEVT_TAB_SEL_CHANGED, wxCommandEvent);
diff --git a/src/slic3r/GUI/Widgets/TempInput.cpp b/src/slic3r/GUI/Widgets/TempInput.cpp
index 79899940d1..99f50269ed 100644
--- a/src/slic3r/GUI/Widgets/TempInput.cpp
+++ b/src/slic3r/GUI/Widgets/TempInput.cpp
@@ -2,7 +2,21 @@
 #include "Label.hpp"
 #include "PopupWindow.hpp"
 #include "../I18N.hpp"
+#include "slic3r/GUI/Widgets/StaticBox.hpp"
+#include <utility>
+#include <string>
+#include <wx/checklst.h>
+#include "slic3r/GUI/Widgets/StateHandler.hpp"
+#include <wx/dcclient.h>
+#include <wx/dc.h>
 #include <wx/dcgraph.h>
+#include <wx/event.h>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/valtext.h>
+#include <wx/textctrl.h>
+#include <wx/sizer.h>
+#include <wx/panel.h>
 #include "../GUI.hpp"
 #include "../GUI_App.hpp"
 
diff --git a/src/slic3r/GUI/Widgets/TempInput.hpp b/src/slic3r/GUI/Widgets/TempInput.hpp
index f281a1ea6e..8560576b96 100644
--- a/src/slic3r/GUI/Widgets/TempInput.hpp
+++ b/src/slic3r/GUI/Widgets/TempInput.hpp
@@ -2,6 +2,15 @@
 #define slic3r_GUI_TempInput_hpp_
 
 #include "../wxExtensions.hpp"
+#include <wx/event.h>
+#include <wx/containr.h>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/string.h>
+#include <wx/popupwin.h>
+#include <string>
+#include <wx/checklst.h>
+#include <wx/dc.h>
 #include <wx/textctrl.h>
 #include <wx/stattext.h>
 #include "StaticBox.hpp"
diff --git a/src/slic3r/GUI/Widgets/TextInput.cpp b/src/slic3r/GUI/Widgets/TextInput.cpp
index 23f55d155c..0ed38ff8de 100644
--- a/src/slic3r/GUI/Widgets/TextInput.cpp
+++ b/src/slic3r/GUI/Widgets/TextInput.cpp
@@ -3,8 +3,18 @@
 #include "TextCtrl.h"
 #include "slic3r/GUI/Widgets/Label.hpp"
 
+#include "slic3r/GUI/Widgets/StaticBox.hpp"
+#include <utility>
+#include <cassert>
+#include "slic3r/GUI/Widgets/StateHandler.hpp"
+#include <wx/dc.h>
+#include <algorithm>
 #include <wx/dcclient.h>
 #include <wx/dcgraph.h>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/textctrl.h>
+#include <wx/event.h>
 
 #ifdef __WXGTK__
 #include "../GUI_Utils.hpp"
diff --git a/src/slic3r/GUI/Widgets/TextInput.hpp b/src/slic3r/GUI/Widgets/TextInput.hpp
index bbd38b0c00..0e7d722961 100644
--- a/src/slic3r/GUI/Widgets/TextInput.hpp
+++ b/src/slic3r/GUI/Widgets/TextInput.hpp
@@ -1,6 +1,13 @@
 #ifndef slic3r_GUI_TextInput_hpp_
 #define slic3r_GUI_TextInput_hpp_
 
+#include <wx/containr.h>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/string.h>
+#include <wx/event.h>
+#include <wx/dc.h>
 #include <wx/textctrl.h>
 #include "StaticBox.hpp"
 
diff --git a/src/slic3r/GUI/Widgets/WebHosting.cpp b/src/slic3r/GUI/Widgets/WebHosting.cpp
index b6af6d3a39..e3fa9423aa 100644
--- a/src/slic3r/GUI/Widgets/WebHosting.cpp
+++ b/src/slic3r/GUI/Widgets/WebHosting.cpp
@@ -6,6 +6,7 @@
 
 #include <boost/filesystem.hpp>
 
+#include <wx/string.h>
 #include <wx/uri.h>
 
 namespace Slic3r { namespace GUI { namespace web_hosting {
diff --git a/src/slic3r/GUI/Widgets/WebView.cpp b/src/slic3r/GUI/Widgets/WebView.cpp
index a313e80d66..9a4d5f90b0 100644
--- a/src/slic3r/GUI/Widgets/WebView.cpp
+++ b/src/slic3r/GUI/Widgets/WebView.cpp
@@ -3,11 +3,26 @@
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/Utils/MacDarkMode.hpp"
 
+#include <algorithm>
 #include <boost/log/trivial.hpp>
 
+#include <cassert>
 #include <chrono>
+#include <cstddef>
+#include <exception>
 #include <thread>
 
+#include <wx/setup.h>
+#include <wx/webview.h>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/sharedptr.h>
+#include <wx/vector.h>
+#include <wx/event.h>
+#include <vector>
+#include <wx/object.h>
+#include <wx/log.h>
+#include <utility>
 #include <wx/webviewarchivehandler.h>
 #include <wx/webviewfshandler.h>
 #include <wx/weakref.h>
diff --git a/src/slic3r/GUI/Widgets/WebView.hpp b/src/slic3r/GUI/Widgets/WebView.hpp
index 69aa88ca4d..2dc126643d 100644
--- a/src/slic3r/GUI/Widgets/WebView.hpp
+++ b/src/slic3r/GUI/Widgets/WebView.hpp
@@ -1,6 +1,8 @@
 #ifndef slic3r_GUI_WebView_hpp_
 #define slic3r_GUI_WebView_hpp_
 
+#include <wx/string.h>
+#include <wx/setup.h>
 #include <wx/webview.h>
 #include <wx/event.h>
 
diff --git a/src/slic3r/GUI/Widgets/WebViewHostDialog.cpp b/src/slic3r/GUI/Widgets/WebViewHostDialog.cpp
index 3c14ab37e1..d16d7022d4 100644
--- a/src/slic3r/GUI/Widgets/WebViewHostDialog.cpp
+++ b/src/slic3r/GUI/Widgets/WebViewHostDialog.cpp
@@ -4,15 +4,24 @@
 #include "slic3r/GUI/GUI.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/Widgets/StateColor.hpp"
+#include "libslic3r/Utils.hpp"
+#include <exception>
 #include <nlohmann/json.hpp>
 
 #include <boost/filesystem.hpp>
 #include <boost/log/trivial.hpp>
 
+#include <string>
+#include <wx/colour.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/chartype.h>
 #include <wx/log.h>
 #include <wx/sizer.h>
 
 #include <algorithm>
+#include <wx/webview.h>
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/Widgets/WebViewHostDialog.hpp b/src/slic3r/GUI/Widgets/WebViewHostDialog.hpp
index 57ee21d119..1f617f6757 100644
--- a/src/slic3r/GUI/Widgets/WebViewHostDialog.hpp
+++ b/src/slic3r/GUI/Widgets/WebViewHostDialog.hpp
@@ -7,7 +7,11 @@
 #include <exception>
 #include <string>
 
+#include <wx/event.h>
+#include <wx/chartype.h>
+#include <wx/gdicmn.h>
 #include <wx/string.h>
+#include <wx/toplevel.h>
 #include <wx/webview.h>
 
 namespace Slic3r { namespace GUI {
diff --git a/src/slic3r/GUI/WipeTowerDialog.cpp b/src/slic3r/GUI/WipeTowerDialog.cpp
index 126f090a0b..51fcb8f613 100644
--- a/src/slic3r/GUI/WipeTowerDialog.cpp
+++ b/src/slic3r/GUI/WipeTowerDialog.cpp
@@ -1,6 +1,31 @@
 #include <algorithm>
+#include <string>
+#include <wx/dialog.h>
+#include <sstream>
+#include <vector>
+#include <utility>
+#include "slic3r/GUI/RammingChart.hpp"
+#include <wx/dcclient.h>
+#include "slic3r/GUI/Widgets/StateColor.hpp"
+#include <wx/colour.h>
+#include "slic3r/GUI/Widgets/SpinInput.hpp"
+#include <cstddef>
+#include "libslic3r/PrintConfig.hpp"
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
+#include "slic3r/GUI/Plater.hpp"
+#include "libslic3r/FlushVolPredictor.hpp"
+#include "libslic3r/Utils.hpp"
+#include <boost/log/trivial.hpp>
 #include <wx/display.h>
+#include <wx/gdicmn.h>
+#include <wx/event.h>
+#include <wx/panel.h>
+#include <wx/filename.h>
 #include <wx/sizer.h>
+#include <wx/string.h>
+#include <wx/spinctrl.h>
+#include <wx/toplevel.h>
+#include <wx/webview.h>
 #include "libslic3r/FlushVolCalc.hpp"
 #include "WipeTowerDialog.hpp"
 #include "GUI.hpp"
diff --git a/src/slic3r/GUI/calib_dlg.cpp b/src/slic3r/GUI/calib_dlg.cpp
index 4d8a835f73..48ea425cf0 100644
--- a/src/slic3r/GUI/calib_dlg.cpp
+++ b/src/slic3r/GUI/calib_dlg.cpp
@@ -2,6 +2,25 @@
 #include "GUI_App.hpp"
 #include "MsgDialog.hpp"
 #include "I18N.hpp"
+#include <algorithm>
+#include <sstream>
+#include <iterator>
+#include "slic3r/GUI/Widgets/CheckBox.hpp"
+#include <wx/checklst.h>
+#include "libslic3r/Config.hpp"
+#include <cstddef>
+#include "slic3r/GUI/GUI_Utils.hpp"
+#include <wx/colour.h>
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/Widgets/LabeledStaticBox.hpp"
+#include "slic3r/GUI/Widgets/RadioGroup.hpp"
+#include "slic3r/GUI/Widgets/TextInput.hpp"
+#include "libslic3r/calib.hpp"
+#include "libslic3r/libslic3r.h"
+#include "slic3r/GUI/Widgets/ComboBox.hpp"
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
+#include "slic3r/GUI/wxExtensions.hpp"
 #include <wx/dcgraph.h>
 #include "MainFrame.hpp"
 #include "Widgets/DialogButtons.hpp"
@@ -9,6 +28,13 @@
 #include <string>
 #include <vector>
 #include <cmath>
+#include <wx/string.h>
+#include <wx/gdicmn.h>
+#include <wx/sizer.h>
+#include <wx/dialog.h>
+#include <wx/valtext.h>
+#include <wx/tglbtn.h>
+#include <wx/event.h>
 #include "libslic3r/PrintConfig.hpp"
 #include "libslic3r/Flow.hpp"
 #include "libslic3r/Utils.hpp"
diff --git a/src/slic3r/GUI/calib_dlg.hpp b/src/slic3r/GUI/calib_dlg.hpp
index 3927c5e1fd..da6e9ee7c5 100644
--- a/src/slic3r/GUI/calib_dlg.hpp
+++ b/src/slic3r/GUI/calib_dlg.hpp
@@ -13,6 +13,8 @@
 #include "Widgets/RadioGroup.hpp"
 #include "GUI_App.hpp"
 #include "wx/hyperlink.h"
+#include <wx/checklst.h>
+#include <wx/event.h>
 #include <wx/radiobox.h>
 #include "libslic3r/calib.hpp"
 
diff --git a/src/slic3r/GUI/format.hpp b/src/slic3r/GUI/format.hpp
index 51beafff13..e4bbd4d98d 100644
--- a/src/slic3r/GUI/format.hpp
+++ b/src/slic3r/GUI/format.hpp
@@ -9,6 +9,8 @@
 
 #include <libslic3r/format.hpp>
 
+#include <string>
+#include <ostream>
 #include <wx/string.h>
 
 namespace Slic3r { 
diff --git a/src/slic3r/GUI/wxExtensions.cpp b/src/slic3r/GUI/wxExtensions.cpp
index 0857612ac3..26b03a028b 100644
--- a/src/slic3r/GUI/wxExtensions.cpp
+++ b/src/slic3r/GUI/wxExtensions.cpp
@@ -1,11 +1,34 @@
 #include "wxExtensions.hpp"
 
+#include <functional>
+#include <algorithm>
+#include "slic3r/GUI/BitmapCache.hpp"
+#include "libslic3r/Exception.hpp"
+#include <cstddef>
+#include "libslic3r/Utils.hpp"
+#include "slic3r/GUI/Widgets/PopupWindow.hpp"
 #include <stdexcept>
 #include <cmath>
 
+#include <wx/event.h>
+#include <wx/checklst.h>
+#include <string>
+#include <wx/gdicmn.h>
+#include <wx/dataview.h>
+#include <vector>
+#include <wx/dcclient.h>
+#include <wx/dcmemory.h>
+#include <wx/colour.h>
+#include <wx/colourdata.h>
+#include <wx/anybutton.h>
+#include <wx/object.h>
+#include <wx/popupwin.h>
+#include <wx/panel.h>
 #include <wx/sizer.h>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/log/trivial.hpp>
+#include <wx/utils.h>
+#include <wx/string.h>
 
 #include "GUI.hpp"
 #include "GUI_App.hpp"
@@ -20,6 +43,7 @@
 #include "../Utils/WxFontUtils.hpp"
 #include "FilamentBitmapUtils.hpp"
 #include "../Utils/ColorSpaceConvert.hpp"
+#include "libslic3r_version.h"
 #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/wxExtensions.hpp b/src/slic3r/GUI/wxExtensions.hpp
index 2754b3e5ba..d2d621328d 100644
--- a/src/slic3r/GUI/wxExtensions.hpp
+++ b/src/slic3r/GUI/wxExtensions.hpp
@@ -1,10 +1,18 @@
 #ifndef slic3r_GUI_wxExtensions_hpp_
 #define slic3r_GUI_wxExtensions_hpp_
 
+#include <string>
+#include <wx/anybutton.h>
+#include <cstddef>
 #include <wx/checklst.h>
+#include <wx/colour.h>
+#include <wx/colourdata.h>
 #include <wx/combo.h>
 #include <wx/dataview.h>
 #include <wx/button.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/rtti.h>
 #include <wx/sizer.h>
 #include <wx/menu.h>
 #include <wx/bmpcbox.h>
@@ -17,6 +25,7 @@
 
 #include <vector>
 #include <functional>
+#include <wx/string.h>
 #include "BitmapCache.hpp"
 #include "Widgets/PopupWindow.hpp"
 
diff --git a/src/slic3r/GUI/wxMediaCtrl3.cpp b/src/slic3r/GUI/wxMediaCtrl3.cpp
index 58e258d7f3..67bf5cf9a3 100644
--- a/src/slic3r/GUI/wxMediaCtrl3.cpp
+++ b/src/slic3r/GUI/wxMediaCtrl3.cpp
@@ -2,12 +2,24 @@
 #include "AVVideoDecoder.hpp"
 #include "I18N.hpp"
 #include "libslic3r/Utils.hpp"
+#include <algorithm>
 #include <boost/log/trivial.hpp>
+#include "slic3r/GUI/Printer/BambuTunnel.h"
+#include <cassert>
+#include <memory>
+#include <string>
+#include <chrono>
+#include <thread>
 #include <wx/dcclient.h>
 #include <cstdarg>
 #include <cstdlib>
 #include <cstring>
 #include <mutex>
+#include <wx/event.h>
+#include <wx/uri.h>
+#include <wx/gdicmn.h>
+#include <wx/mediactrl.h>
+#include <wx/string.h>
 extern "C" {
 #include <libavformat/avformat.h>
 #include <libavutil/log.h>
diff --git a/src/slic3r/GUI/wxMediaCtrl3.h b/src/slic3r/GUI/wxMediaCtrl3.h
index 936d5e5ddf..681256a04a 100644
--- a/src/slic3r/GUI/wxMediaCtrl3.h
+++ b/src/slic3r/GUI/wxMediaCtrl3.h
@@ -9,6 +9,12 @@
 #define wxMediaCtrl3_h
 
 #include <chrono>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
+#include <wx/string.h>
+#include <memory>
+#include <mutex>
+#include <cstdint>
 #include "wx/window.h"
 #include "wx/bitmap.h"
 #include "wx/uri.h"