diff --git a/src/slic3r/GUI/AMSMaterialsSetting.cpp b/src/slic3r/GUI/AMSMaterialsSetting.cpp
index 1af3ecb1f3..26c41c24cb 100644
--- a/src/slic3r/GUI/AMSMaterialsSetting.cpp
+++ b/src/slic3r/GUI/AMSMaterialsSetting.cpp
@@ -9,6 +9,7 @@
 #include "I18N.hpp"
 #include <algorithm>
 #include <boost/log/trivial.hpp>
+#include <slic3r/GUI/DeviceManager.hpp>
 #include <string>
 #include <sstream>
 #include <ios>
diff --git a/src/slic3r/GUI/CaliHistoryDialog.cpp b/src/slic3r/GUI/CaliHistoryDialog.cpp
index 60866a3595..0384201b6c 100644
--- a/src/slic3r/GUI/CaliHistoryDialog.cpp
+++ b/src/slic3r/GUI/CaliHistoryDialog.cpp
@@ -10,6 +10,7 @@
 #include "Widgets/DialogButtons.hpp"
 #include "libslic3r/Config.hpp"
 #include <boost/log/trivial.hpp>
+#include <slic3r/GUI/DeviceManager.hpp>
 #include <string>
 #include <vector>
 #include "libslic3r/calib.hpp"
diff --git a/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp b/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp
index bb6fed2cfa..2e3108811c 100644
--- a/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp
@@ -1,3 +1,4 @@
+#include <algorithm>
 #include <array>
 #include <cstddef>
 #include <cassert>
@@ -8,6 +9,7 @@
 #include <cstdlib>
 #include <chrono>
 #include <nlohmann/json.hpp>
+#include <wx/app.h>
 #include <wx/colour.h>
 #include <string>
 #include <wx/string.h>
diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp
index 1fbd66865d..2c8f50c8c5 100644
--- a/src/slic3r/GUI/DeviceManager.cpp
+++ b/src/slic3r/GUI/DeviceManager.cpp
@@ -65,6 +65,7 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
+#include <wx/app.h>
 #include <wx/colour.h>
 #include <tuple>
 #include <wx/dir.h>
diff --git a/src/slic3r/GUI/ImageGrid.cpp b/src/slic3r/GUI/ImageGrid.cpp
index 5ef8524ef1..e5d6001b24 100644
--- a/src/slic3r/GUI/ImageGrid.cpp
+++ b/src/slic3r/GUI/ImageGrid.cpp
@@ -7,6 +7,7 @@
 #include "GUI_App.hpp"
 #include "GUI.hpp"
 
+#include <slic3r/GUI/Printer/IFileGridModel.h>
 #include <utility>
 #include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/smart_ptr/make_shared_object.hpp>
diff --git a/src/slic3r/GUI/OrcaFilesPanel.cpp b/src/slic3r/GUI/OrcaFilesPanel.cpp
index 6a5cda0016..12d9fad9e7 100644
--- a/src/slic3r/GUI/OrcaFilesPanel.cpp
+++ b/src/slic3r/GUI/OrcaFilesPanel.cpp
@@ -14,7 +14,14 @@
 #include "slic3r/Utils/bambu_networking.hpp"
 
 #include <boost/make_shared.hpp>
+#include <slic3r/GUI/wxExtensions.hpp>
+#include <slic3r/GUI/Printer/IFileGridModel.h>
+#include <cstddef>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <wx/colour.h>
+#include <wx/panel.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
 #include <wx/sizer.h>
 #include <utility>
 
diff --git a/src/slic3r/GUI/OrcaFilesPanel.h b/src/slic3r/GUI/OrcaFilesPanel.h
index 0257afc49f..3f6ac92350 100644
--- a/src/slic3r/GUI/OrcaFilesPanel.h
+++ b/src/slic3r/GUI/OrcaFilesPanel.h
@@ -5,6 +5,8 @@
 #include "Printer/RemoteFileGridModel.h"
 
 #include <boost/smart_ptr/shared_ptr.hpp>
+#include <slic3r/GUI/Printer/IFileGridModel.h>
+#include <string>
 #include <wx/panel.h>
 
 class Button;
diff --git a/src/slic3r/GUI/Printer/BambuFileGridModel.cpp b/src/slic3r/GUI/Printer/BambuFileGridModel.cpp
index eaa1aa47ca..230baebe07 100644
--- a/src/slic3r/GUI/Printer/BambuFileGridModel.cpp
+++ b/src/slic3r/GUI/Printer/BambuFileGridModel.cpp
@@ -2,7 +2,14 @@
 
 #include "slic3r/GUI/GUI_App.hpp"
 
+#include <slic3r/GUI/Printer/IFileGridModel.h>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <slic3r/GUI/Printer/PrinterFileSystem.h>
+#include <cstddef>
+#include <ctime>
+#include <functional>
 #include <utility>
+#include <wx/event.h>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/Printer/RemoteFileGridModel.cpp b/src/slic3r/GUI/Printer/RemoteFileGridModel.cpp
index 851c288aea..77550620ea 100644
--- a/src/slic3r/GUI/Printer/RemoteFileGridModel.cpp
+++ b/src/slic3r/GUI/Printer/RemoteFileGridModel.cpp
@@ -1,9 +1,19 @@
 #include "RemoteFileGridModel.h"
 
+#include "IPrinterAgent.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/Utils/NetworkAgent.hpp"
 
+#include <slic3r/GUI/Printer/IFileGridModel.h>
+#include <string>
+#include <cstdint>
+#include <memory>
+#include <vector>
+#include <ctime>
+#include <functional>
+#include <cstddef>
 #include <wx/datetime.h>
+#include <wx/gdicmn.h>
 #include <wx/image.h>
 #include <wx/mstream.h>
 
diff --git a/src/slic3r/GUI/Printer/RemoteFileGridModel.h b/src/slic3r/GUI/Printer/RemoteFileGridModel.h
index 82cccb7412..e791105652 100644
--- a/src/slic3r/GUI/Printer/RemoteFileGridModel.h
+++ b/src/slic3r/GUI/Printer/RemoteFileGridModel.h
@@ -4,7 +4,9 @@
 
 #include "slic3r/Utils/IPrinterAgent.hpp"
 
+#include <cstddef>
 #include <cstdint>
+#include <ctime>
 #include <deque>
 #include <functional>
 #include <memory>
diff --git a/src/slic3r/GUI/StoragePanel.cpp b/src/slic3r/GUI/StoragePanel.cpp
index 6771c13b49..07c91e31fe 100644
--- a/src/slic3r/GUI/StoragePanel.cpp
+++ b/src/slic3r/GUI/StoragePanel.cpp
@@ -7,6 +7,8 @@
 #include "Widgets/StateColor.hpp"
 
 #include <wx/colour.h>
+#include <wx/panel.h>
+#include <wx/event.h>
 #include <wx/sizer.h>
 
 namespace Slic3r {
diff --git a/src/slic3r/Utils/OrcaCloudServiceAgent.cpp b/src/slic3r/Utils/OrcaCloudServiceAgent.cpp
index 30e169b527..a28a9e892d 100644
--- a/src/slic3r/Utils/OrcaCloudServiceAgent.cpp
+++ b/src/slic3r/Utils/OrcaCloudServiceAgent.cpp
@@ -3,6 +3,7 @@
 #include "Http.hpp"
 #include "ICameraSignalingChannel.hpp"
 #include "OrcaCloudSignalingChannel.hpp"
+#include "OrcaMqttConnection.hpp"
 #include "bambu_networking.hpp"
 #include "ICloudServiceAgent.hpp"
 #include "libslic3r/Utils.hpp"
@@ -18,6 +19,7 @@
 #include <boost/beast/websocket.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/path.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/uuid/name_generator_sha1.hpp>
 #include <boost/uuid/uuid.hpp>
diff --git a/src/slic3r/Utils/OrcaCloudSignalingChannel.cpp b/src/slic3r/Utils/OrcaCloudSignalingChannel.cpp
index 3e7b0bfa82..1530fff32e 100644
--- a/src/slic3r/Utils/OrcaCloudSignalingChannel.cpp
+++ b/src/slic3r/Utils/OrcaCloudSignalingChannel.cpp
@@ -1,20 +1,38 @@
 #include "OrcaCloudSignalingChannel.hpp"
 
 #include "Http.hpp"
+#include "OrcaCloudServiceAgent.hpp"
+#include "ICameraSignalingChannel.hpp"
 
+#include <boost/asio/buffer.hpp>
 #include <boost/asio/connect.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/post.hpp>
+#include <boost/asio/ssl/verify_mode.hpp>
+#include <boost/asio/ssl/host_name_verification.hpp>
+#include <boost/asio/ssl/stream_base.hpp>
 #include <boost/beast/core.hpp>
+#include <boost/beast/core/stream_traits.hpp>
+#include <boost/beast/core/flat_buffer.hpp>
+#include <boost/beast/core/buffers_to_string.hpp>
 #include <boost/log/trivial.hpp>
+#include <memory>
+#include <mutex>
+#include <ios>
+#include <exception>
+#include <cstddef>
 #include <nlohmann/json.hpp>
 
 #include <openssl/ssl.h>
 
 #include <cctype>
 #include <iomanip>
+#include <openssl/tls1.h>
 #include <sstream>
 #include <stdexcept>
+#include <string>
+#include <utility>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/slic3r/Utils/OrcaCloudSignalingChannel.hpp b/src/slic3r/Utils/OrcaCloudSignalingChannel.hpp
index ff84190853..bbb13eb132 100644
--- a/src/slic3r/Utils/OrcaCloudSignalingChannel.hpp
+++ b/src/slic3r/Utils/OrcaCloudSignalingChannel.hpp
@@ -7,9 +7,12 @@
 #include <boost/asio/io_context.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl.hpp>
+#include <boost/asio/ssl/context.hpp>
 #include <boost/beast/ssl.hpp>
+#include <boost/beast/ssl/ssl_stream.hpp>
 #include <boost/beast/websocket.hpp>
 
+#include <boost/beast/websocket/stream.hpp>
 #include <nlohmann/json_fwd.hpp>
 
 #include <atomic>
diff --git a/src/slic3r/Utils/OrcaMqttConnection.cpp b/src/slic3r/Utils/OrcaMqttConnection.cpp
index e4dd1b3cfc..8bd3603b93 100644
--- a/src/slic3r/Utils/OrcaMqttConnection.cpp
+++ b/src/slic3r/Utils/OrcaMqttConnection.cpp
@@ -1,21 +1,49 @@
 #include "OrcaMqttConnection.hpp"
 #include "Http.hpp"
 
+#include <atomic>
 #include <boost/asio.hpp>
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/ip/tcp.hpp>
+#include <boost/asio/post.hpp>
+#include <boost/asio/buffer.hpp>
+#include <boost/asio/error.hpp>
 #include <boost/asio/ssl.hpp>
+#include <boost/asio/ssl/context.hpp>
+#include <boost/asio/steady_timer.hpp>
+#include <boost/asio/ssl/verify_mode.hpp>
+#include <boost/asio/ssl/host_name_verification.hpp>
+#include <boost/asio/ssl/stream_base.hpp>
 #include <boost/beast/core.hpp>
+#include <boost/beast/core/flat_buffer.hpp>
+#include <boost/beast/core/stream_traits.hpp>
+#include <boost/beast/core/buffers_to_string.hpp>
+#include <boost/beast/http/field.hpp>
+#include <boost/beast/http/message.hpp>
+#include <boost/beast/http/string_body.hpp>
 #include <boost/beast/ssl.hpp>
 #include <boost/beast/websocket.hpp>
 
+#include <deque>
+#include <cstdint>
+#include <mutex>
+#include <cstddef>
+#include <boost/beast/websocket/rfc6455.hpp>
+#include <boost/beast/websocket/stream_base.hpp>
+#include <ios>
+#include <exception>
 #include <openssl/ssl.h>
 
 #include <algorithm>
 #include <chrono>
 #include <memory>
+#include <openssl/tls1.h>
 #include <optional>
 #include <sstream>
 #include <stdexcept>
+#include <string>
 #include <utility>
+#include <vector>
 
 namespace Slic3r {
 
diff --git a/src/slic3r/Utils/OrcaMqttConnection.hpp b/src/slic3r/Utils/OrcaMqttConnection.hpp
index 1565542f69..ef9593a533 100644
--- a/src/slic3r/Utils/OrcaMqttConnection.hpp
+++ b/src/slic3r/Utils/OrcaMqttConnection.hpp
@@ -2,10 +2,14 @@
 #define slic3r_OrcaMqttConnection_hpp_
 
 #include <boost/asio/ssl.hpp>
+#include <boost/asio/ssl/stream.hpp>
 #include <boost/beast/core.hpp>
+#include <boost/beast/core/tcp_stream.hpp>
+#include <boost/beast/core/flat_buffer.hpp>
 #include <boost/beast/ssl.hpp>
 #include <boost/beast/websocket.hpp>
 #include <atomic>
+#include <boost/beast/websocket/stream.hpp>
 #include <condition_variable>
 #include <deque>
 #include <functional>
diff --git a/src/slic3r/Utils/OrcaPrinterAgent.cpp b/src/slic3r/Utils/OrcaPrinterAgent.cpp
index df015d7068..4e2a82a6b4 100644
--- a/src/slic3r/Utils/OrcaPrinterAgent.cpp
+++ b/src/slic3r/Utils/OrcaPrinterAgent.cpp
@@ -4,15 +4,26 @@
 #include "Http.hpp"
 #include "NetworkAgentFactory.hpp"
 #include "OrcaCloudServiceAgent.hpp"
+#include "OrcaMqttConnection.hpp"
 #include "bambu_networking.hpp"
 
 #include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/algorithm/string/trim.hpp>
 #include <boost/asio.hpp>
+#include <boost/asio/ip/udp.hpp>
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/ip/address_v4.hpp>
+#include <boost/asio/buffer.hpp>
+#include <boost/asio/error.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/xml_parser.hpp>
 
+#include <exception>
+#include <functional>
 #include <nlohmann/json.hpp>
 #include <nlohmann/json_fwd.hpp>
 
@@ -35,6 +46,7 @@
 #include <unordered_map>
 #include <utility>
 #include <memory>
+#include <vector>
 
 namespace Slic3r { class ICloudServiceAgent; }
 
diff --git a/src/slic3r/Utils/OrcaPrinterAgent.hpp b/src/slic3r/Utils/OrcaPrinterAgent.hpp
index c4ed9af4a2..105dea1214 100644
--- a/src/slic3r/Utils/OrcaPrinterAgent.hpp
+++ b/src/slic3r/Utils/OrcaPrinterAgent.hpp
@@ -13,6 +13,7 @@
 #include <mutex>
 #include <memory>
 #include <thread>
+#include <vector>
 
 namespace Slic3r { class ICloudServiceAgent; }
 
diff --git a/tests/libslic3r/test_preset_bundle_ams_sync.cpp b/tests/libslic3r/test_preset_bundle_ams_sync.cpp
index e8784388fe..c87badf3ff 100644
--- a/tests/libslic3r/test_preset_bundle_ams_sync.cpp
+++ b/tests/libslic3r/test_preset_bundle_ams_sync.cpp
@@ -1,10 +1,12 @@
 #include <catch2/catch_all.hpp>
 
+#include <libslic3r/PrintConfig.hpp>
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
 
+#include "catch2/catch_test_macros.hpp"
 #include "libslic3r/Preset.hpp"
 #include "libslic3r/PresetBundle.hpp"
 
diff --git a/tests/slic3rutils/orca_mqtt_mock_broker.hpp b/tests/slic3rutils/orca_mqtt_mock_broker.hpp
index f4088000e1..29b90b9fac 100644
--- a/tests/slic3rutils/orca_mqtt_mock_broker.hpp
+++ b/tests/slic3rutils/orca_mqtt_mock_broker.hpp
@@ -9,6 +9,18 @@
 // OrcaMqttConnection::make_publish_packet() so the tests never depend on a
 // second, hand-rolled MQTT encoder.
 
+#include <boost/asio/ip/tcp.hpp>
+#include <boost/asio/ip/address.hpp>
+#include <boost/asio/socket_base.hpp>
+#include <boost/asio/buffer.hpp>
+#include <boost/asio/error.hpp>
+#include <boost/beast/websocket/stream.hpp>
+#include <boost/beast/core/tcp_stream.hpp>
+#include <boost/beast/core/stream_traits.hpp>
+#include <boost/beast/websocket/stream_base.hpp>
+#include <boost/beast/websocket/rfc6455.hpp>
+#include <boost/beast/core/flat_buffer.hpp>
+#include <boost/beast/core/buffers_to_string.hpp>
 #include <slic3r/Utils/OrcaMqttConnection.hpp>
 
 #include <boost/asio.hpp>
diff --git a/tests/slic3rutils/test_ams_item.cpp b/tests/slic3rutils/test_ams_item.cpp
index 8f86c13d22..ed5d3b50f7 100644
--- a/tests/slic3rutils/test_ams_item.cpp
+++ b/tests/slic3rutils/test_ams_item.cpp
@@ -1,5 +1,6 @@
 // why: match the GUI include order to avoid rpcndr.h byte/std::byte
 // ambiguity in the Windows COM headers.
+#include "catch2/catch_test_macros.hpp"
 #ifdef WIN32
     #ifndef WIN32_LEAN_AND_MEAN
         #define WIN32_LEAN_AND_MEAN
diff --git a/tests/slic3rutils/test_device_manager_integration.cpp b/tests/slic3rutils/test_device_manager_integration.cpp
index 022c3ad3a8..0bab6effc0 100644
--- a/tests/slic3rutils/test_device_manager_integration.cpp
+++ b/tests/slic3rutils/test_device_manager_integration.cpp
@@ -1,6 +1,9 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/catch_all.hpp>
 
+#include <libslic3r/ProjectTask.hpp>
+#include <libslic3r/Preset.hpp>
+#include <libslic3r/Config.hpp>
 #include <slic3r/GUI/DeviceCore/DevManager.h>
 #include <slic3r/GUI/DeviceManager.hpp>
 #include <slic3r/GUI/DeviceCore/DevFilaSystem.h>
diff --git a/tests/slic3rutils/test_orca_printer_agent.cpp b/tests/slic3rutils/test_orca_printer_agent.cpp
index 119de65284..4a9d18a58e 100644
--- a/tests/slic3rutils/test_orca_printer_agent.cpp
+++ b/tests/slic3rutils/test_orca_printer_agent.cpp
@@ -1,17 +1,21 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include <libslic3r/ProjectTask.hpp>
 #include <slic3r/GUI/FilamentMappingUtils.hpp>
 #include <slic3r/Utils/IPrinterAgent.hpp>
 #include <slic3r/Utils/OrcaCloudServiceAgent.hpp>
 #include <slic3r/Utils/OrcaPrinterAgent.hpp>
 
+#include "catch2/matchers/catch_matchers.hpp"
 #include "orca_mqtt_mock_broker.hpp"
 
 #include <chrono>
 #include <functional>
 #include <memory>
+#include <slic3r/Utils/bambu_networking.hpp>
 #include <string>
 #include <thread>
+#include <utility>
 #include <vector>
 
 using Slic3r::OrcaPrinterAgent;