diff --git a/src/libslic3r/GCode/SmallAreaInfillFlowCompensator.hpp b/src/libslic3r/GCode/SmallAreaInfillFlowCompensator.hpp
index 7864d21acf..aa12614851 100644
--- a/src/libslic3r/GCode/SmallAreaInfillFlowCompensator.hpp
+++ b/src/libslic3r/GCode/SmallAreaInfillFlowCompensator.hpp
@@ -4,6 +4,7 @@
 #include "../PrintConfig.hpp"
 #include <memory>
 #include <vector>
+#include <cstdint>
 
 class PchipInterpolatorHelper;
 namespace Slic3r { enum ExtrusionRole : uint8_t; }
diff --git a/src/libslic3r/MultiMaterialSegmentation.cpp b/src/libslic3r/MultiMaterialSegmentation.cpp
index 8707125d9b..b7dfd6a160 100644
--- a/src/libslic3r/MultiMaterialSegmentation.cpp
+++ b/src/libslic3r/MultiMaterialSegmentation.cpp
@@ -25,6 +25,7 @@
 #include <cmath>
 #include <cstddef>
 #include <list>
+#include <cstdint>
 #include <cassert>
 #include <algorithm>
 #include <cstdlib>
diff --git a/src/libslic3r/pchheader.hpp b/src/libslic3r/pchheader.hpp
index 39949b9e0d..401e9b1145 100644
--- a/src/libslic3r/pchheader.hpp
+++ b/src/libslic3r/pchheader.hpp
@@ -110,7 +110,19 @@
 #include <cereal/access.hpp>
 #include <cereal/types/base_class.hpp>
 
+#include "BoundingBox.hpp"
+#include "ClipperUtils.hpp"
+#include "Config.hpp"
+#include "enum_bitmask.hpp"
+#include "format.hpp"
+#include "I18N.hpp"
+#include "MultiPoint.hpp"
+#include "Point.hpp"
+#include "Polygon.hpp"
+#include "Polyline.hpp"
+#include "SVG.hpp"
 
+#include "libslic3r.h"
 #include "libslic3r_version.h"
 
 #include <Shiny/Shiny.h>
diff --git a/src/slic3r/GUI/2DBed.cpp b/src/slic3r/GUI/2DBed.cpp
index 27199edf5a..46335271f4 100644
--- a/src/slic3r/GUI/2DBed.cpp
+++ b/src/slic3r/GUI/2DBed.cpp
@@ -3,6 +3,7 @@
 
 #include "3DBed.hpp"
 #include "PartPlate.hpp"
+#include "I18N.hpp"
 
 #include <vector>
 #include "libslic3r/Polyline.hpp"
diff --git a/src/slic3r/GUI/BackgroundSlicingProcess.hpp b/src/slic3r/GUI/BackgroundSlicingProcess.hpp
index 2e98436522..cebeb52e0f 100644
--- a/src/slic3r/GUI/BackgroundSlicingProcess.hpp
+++ b/src/slic3r/GUI/BackgroundSlicingProcess.hpp
@@ -5,6 +5,7 @@
 #include <cassert>
 #include <cstddef>
 #include "libslic3r/Config.hpp"
+#include "libslic3r/Polygon.hpp"
 #include <memory>
 #include <functional>
 #include <string>
diff --git a/src/slic3r/GUI/DailyTips.cpp b/src/slic3r/GUI/DailyTips.cpp
index bb7a6f74e4..66f8f0dbb4 100644
--- a/src/slic3r/GUI/DailyTips.cpp
+++ b/src/slic3r/GUI/DailyTips.cpp
@@ -12,6 +12,7 @@
 #include <memory>
 #include "slic3r/GUI/HintNotification.hpp"
 #include "slic3r/GUI/GLCanvas3D.hpp"
+#include "slic3r/GUI/I18N.hpp"
 
 #ifndef IMGUI_DEFINE_MATH_OPERATORS
 #define IMGUI_DEFINE_MATH_OPERATORS
diff --git a/src/slic3r/GUI/GUI_Init.cpp b/src/slic3r/GUI/GUI_Init.cpp
index 3806c25799..6b8166d67e 100644
--- a/src/slic3r/GUI/GUI_Init.cpp
+++ b/src/slic3r/GUI/GUI_Init.cpp
@@ -6,6 +6,7 @@
 #include "slic3r/GUI/InstanceCheck.hpp"
 #include "slic3r/GUI/format.hpp"
 #include "slic3r/GUI/MainFrame.hpp"
+#include "slic3r/GUI/I18N.hpp"
 
 // To show a message box if GUI initialization ends up with an exception thrown.
 #include <vector>
diff --git a/src/slic3r/GUI/GUI_Preview.cpp b/src/slic3r/GUI/GUI_Preview.cpp
index 79c884cd6a..1968df996f 100644
--- a/src/slic3r/GUI/GUI_Preview.cpp
+++ b/src/slic3r/GUI/GUI_Preview.cpp
@@ -20,6 +20,7 @@
 #include "libslic3r/PrintConfig.hpp"
 #include "libslic3r/ExPolygon.hpp"
 #include <cmath>
+#include <cstdint>
 #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 1b9e0c5cd9..b8bf09bd65 100644
--- a/src/slic3r/GUI/GUI_Preview.hpp
+++ b/src/slic3r/GUI/GUI_Preview.hpp
@@ -158,7 +158,7 @@ public:
     //BBS: add m_loaded_print logic
     bool is_loaded() const { return (m_loaded_print != nullptr); }
     //BBS
-    void on_tick_changed(Type type);
+    void on_tick_changed(CustomGCode::Type type);
 
     void show_sliders(bool show = true);
     void show_moves_sliders(bool show = true);
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp b/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp
index decbd13add..d36efa7d58 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp
@@ -26,6 +26,7 @@
 #include "slic3r/GUI/Gizmos/GLGizmosManager.hpp"
 #include "slic3r/GUI/ImGuiWrapper.hpp"
 #include "slic3r/GUI/Selection.hpp"
+#include "slic3r/GUI/I18N.hpp"
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/KBShortcutsDialog.hpp b/src/slic3r/GUI/KBShortcutsDialog.hpp
index 4cf677d16b..1e7344a7d5 100644
--- a/src/slic3r/GUI/KBShortcutsDialog.hpp
+++ b/src/slic3r/GUI/KBShortcutsDialog.hpp
@@ -11,6 +11,7 @@
 #include <map>
 #include <variant>
 #include <vector>
+#include <cstdint>
 
 #include "GUI_Utils.hpp"
 #include <wx/simplebook.h>
diff --git a/src/slic3r/GUI/ParamsPanel.cpp b/src/slic3r/GUI/ParamsPanel.cpp
index c367e4cb94..5b25f292ee 100644
--- a/src/slic3r/GUI/ParamsPanel.cpp
+++ b/src/slic3r/GUI/ParamsPanel.cpp
@@ -16,6 +16,7 @@
 #include "Widgets/SwitchButton.hpp"
 #include "Widgets/Button.hpp"
 #include "GUI_Factories.hpp"
+#include "I18N.hpp"
 #include "libslic3r/Config.hpp"
 #include <string>
 #include <map>
diff --git a/src/slic3r/GUI/Project.cpp b/src/slic3r/GUI/Project.cpp
index 182500dc2f..2ce0da582c 100644
--- a/src/slic3r/GUI/Project.cpp
+++ b/src/slic3r/GUI/Project.cpp
@@ -16,6 +16,7 @@
 #include <string>
 #include "slic3r/GUI/GUI.hpp"
 #include "slic3r/GUI/Auxiliary.hpp"
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
 #include <cstddef>
 #include <memory>
 #include <map>
diff --git a/src/slic3r/GUI/WebGuideDialog.cpp b/src/slic3r/GUI/WebGuideDialog.cpp
index 5c79dc8115..8d5fe9bfc2 100644
--- a/src/slic3r/GUI/WebGuideDialog.cpp
+++ b/src/slic3r/GUI/WebGuideDialog.cpp
@@ -36,6 +36,7 @@
 #include "libslic3r/PresetBundle.hpp"
 #include "libslic3r/PresetCacheFormat.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
 #include "libslic3r_version.h"
 
 #include <string>
diff --git a/src/slic3r/GUI/WipeTowerDialog.cpp b/src/slic3r/GUI/WipeTowerDialog.cpp
index 2ce6867db5..8e2b0fcb9c 100644
--- a/src/slic3r/GUI/WipeTowerDialog.cpp
+++ b/src/slic3r/GUI/WipeTowerDialog.cpp
@@ -38,6 +38,7 @@
 #include "Widgets/Label.hpp"
 #include "MainFrame.hpp"
 #include "libslic3r/PresetBundle.hpp"
+#include "slic3r/GUI/Printer/PrinterFileSystem.h"
 #include "slic3r/GUI/Jobs/SendJob.hpp"
 #include "slic3r/Utils/json_diff.hpp"
 #include <boost/filesystem.hpp>
diff --git a/tests/fff_print/test_gcode_timing.cpp b/tests/fff_print/test_gcode_timing.cpp
index babceb9a9e..49c254e810 100644
--- a/tests/fff_print/test_gcode_timing.cpp
+++ b/tests/fff_print/test_gcode_timing.cpp
@@ -12,6 +12,7 @@
 
 #include <cmath>
 #include <cstddef>
+#include <cstdint>
 #include <fstream>
 #include <iomanip>
 #include <ios>