diff --git a/src/libslic3r/GCode/ExtrusionOrder.hpp b/src/libslic3r/GCode/ExtrusionOrder.hpp
index 93c4f50519..c9409f07ae 100644
--- a/src/libslic3r/GCode/ExtrusionOrder.hpp
+++ b/src/libslic3r/GCode/ExtrusionOrder.hpp
@@ -25,6 +25,7 @@ class ExtrusionEntityReference;
 class Print;
 class PrintObject;
 class PrintRegion;
+
 namespace GCode {
 class WipeTowerIntegration;
 }  // namespace GCode
diff --git a/src/libslic3r/GCode/PressureEqualizer.cpp b/src/libslic3r/GCode/PressureEqualizer.cpp
index acd8019b94..ed131f7162 100644
--- a/src/libslic3r/GCode/PressureEqualizer.cpp
+++ b/src/libslic3r/GCode/PressureEqualizer.cpp
@@ -8,7 +8,6 @@
 #include <cstring>
 #include <algorithm>
 #include <array>
-#include <iosfwd>
 #include <iterator>
 #include <limits>
 #include <cctype>
diff --git a/src/libslic3r/GCode/SeamPerimeters.cpp b/src/libslic3r/GCode/SeamPerimeters.cpp
index 78d7c246c9..d8879f93b7 100644
--- a/src/libslic3r/GCode/SeamPerimeters.cpp
+++ b/src/libslic3r/GCode/SeamPerimeters.cpp
@@ -3,6 +3,7 @@
 #include <cstdint>
 #include <iterator>
 #include <tuple>
+#include <limits>
 
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/Layer.hpp"
diff --git a/src/libslic3r/LayerRegion.cpp b/src/libslic3r/LayerRegion.cpp
index 0ce03b2595..89e27cd8bc 100644
--- a/src/libslic3r/LayerRegion.cpp
+++ b/src/libslic3r/LayerRegion.cpp
@@ -28,7 +28,6 @@
 #include "SVG.hpp"
 #include "Algorithm/RegionExpansion.hpp"
 #include "libslic3r/ExtrusionEntity.hpp"
-#include "libslic3r/LayerRegion.hpp"
 #include "libslic3r/Line.hpp"
 #include "libslic3r/MultiMaterialSegmentation.hpp"
 #include "libslic3r/Point.hpp"
diff --git a/src/libslic3r/MultiMaterialSegmentation.cpp b/src/libslic3r/MultiMaterialSegmentation.cpp
index a846de55c5..9625cb1dca 100644
--- a/src/libslic3r/MultiMaterialSegmentation.cpp
+++ b/src/libslic3r/MultiMaterialSegmentation.cpp
@@ -34,7 +34,6 @@
 #include "libslic3r/LayerRegion.hpp"
 #include "libslic3r/Line.hpp"
 #include "libslic3r/Model.hpp"
-#include "libslic3r/MultiMaterialSegmentation.hpp"
 #include "libslic3r/Point.hpp"
 #include "libslic3r/Polygon.hpp"
 #include "libslic3r/PrintConfig.hpp"
diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp
index 3ba266ed9f..ab288b4237 100644
--- a/src/libslic3r/PrintObject.cpp
+++ b/src/libslic3r/PrintObject.cpp
@@ -34,7 +34,6 @@
 #include "Flow.hpp"
 #include "libslic3r/GCode/ExtrusionProcessor.hpp"
 #include "Line.hpp"
-#include "Point.hpp"
 #include "Polygon.hpp"
 #include "Polyline.hpp"
 #include "Print.hpp"
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp
index 54e601e850..dbacc213e3 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp
@@ -27,12 +27,12 @@
 
 #include <wx/display.h> // detection of change DPI
 #include <boost/log/trivial.hpp>
+#include <boost/nowide/fstream.hpp>
 
 #include <GL/glew.h>
 #include <chrono> // measure enumeration of fonts
 #include <sstream> // save for svg
 #include <array>
-#include <fstream> // IWYU pragma: keep
 
 using namespace Slic3r;
 using namespace Slic3r::Emboss;
diff --git a/src/slic3r/GUI/PresetArchiveDatabase.cpp b/src/slic3r/GUI/PresetArchiveDatabase.cpp
index ac94a7f6b8..d4b671d317 100644
--- a/src/slic3r/GUI/PresetArchiveDatabase.cpp
+++ b/src/slic3r/GUI/PresetArchiveDatabase.cpp
@@ -12,6 +12,7 @@
 
 #include <boost/log/trivial.hpp>
 #include <boost/filesystem/fstream.hpp>
+#include <boost/nowide/fstream.hpp> // IWYU pragma: keep
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/uuid/uuid.hpp>
@@ -916,4 +917,4 @@ void PresetArchiveDatabase::sync_blocking()
 	read_server_manifest(std::move(manifest));
 }
 
-}} // Slic3r::GUI
\ No newline at end of file
+}} // Slic3r::GUI
diff --git a/src/slic3r/GUI/UserAccountUtils.cpp b/src/slic3r/GUI/UserAccountUtils.cpp
index 7527feaeca..81c8dfb9b6 100644
--- a/src/slic3r/GUI/UserAccountUtils.cpp
+++ b/src/slic3r/GUI/UserAccountUtils.cpp
@@ -1,11 +1,13 @@
 #include "UserAccountUtils.hpp"
 
-#include "format.hpp"
-
-#include <boost/regex.hpp>
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/lexical_cast.hpp>
+#include <boost/lexical_cast/bad_lexical_cast.hpp>
+#include <cassert>
+#include <cstddef>
+#include <exception>
+#include <utility>
 
 namespace pt = boost::property_tree;
 
diff --git a/src/slic3r/GUI/WebViewPlatformUtilsLinux.cpp b/src/slic3r/GUI/WebViewPlatformUtilsLinux.cpp
index b14a561ddf..35161a1c45 100644
--- a/src/slic3r/GUI/WebViewPlatformUtilsLinux.cpp
+++ b/src/slic3r/GUI/WebViewPlatformUtilsLinux.cpp
@@ -1,5 +1,4 @@
 #include <webkit2/webkit2.h>
-#include <wx/defs.h>
 #include <wx/webview.h>
 #include <unordered_map>
 #include <string>
diff --git a/src/slic3r/Utils/Http.cpp b/src/slic3r/Utils/Http.cpp
index a1c4f57c69..6895b6678b 100644
--- a/src/slic3r/Utils/Http.cpp
+++ b/src/slic3r/Utils/Http.cpp
@@ -18,6 +18,7 @@
 #include <boost/filesystem.hpp>
 #include <boost/format.hpp>
 #include <boost/log/trivial.hpp>
+#include <boost/nowide/fstream.hpp>
 
 #include <curl/curl.h>
 
diff --git a/src/slic3r/Utils/Jwt.cpp b/src/slic3r/Utils/Jwt.cpp
index 4584471e04..448a062656 100644
--- a/src/slic3r/Utils/Jwt.cpp
+++ b/src/slic3r/Utils/Jwt.cpp
@@ -1,12 +1,13 @@
 #include "Jwt.hpp"
 
+#include <boost/property_tree/ptree.hpp>
+#include <boost/property_tree/json_parser.hpp>
+#include <boost/beast/core/detail/base64.hpp> // IWYU pragma: keep
+#include <boost/optional/optional.hpp>
 #include <ctime>
 #include <sstream>
 #include <tuple>
-
-#include <boost/beast/core/detail/base64.hpp>
-#include <boost/property_tree/ptree.hpp>
-#include <boost/property_tree/json_parser.hpp>
+#include <algorithm>
 
 namespace Slic3r::Utils {