Remove Unused Project Includes and Forward-Declare Where a Type Is Only Referenced (#16099)

* Remove Unused Project Includes and Forward-Declare Where a Type Is Only Referenced

Generated with include-what-you-use and applied conservatively. Only OrcaSlicer's own headers, the ones under src/ and tests/, are removed or forward-declared; standard-library and third-party includes are left alone. An include is removed only when both the Release and the Debug configuration leave it unused, never from inside a conditional block, and never from a file with platform-specific blocks, which only gain includes. Files whose only use of a header sits behind a feature or debug macro (libvgcode's OpenGL ES and marker code, the ARACHNE/TESTS_EXPORT_SVGS debug output) keep their includes.

clonable_ptr.hpp gains #pragma once; it had no include guard and was only safe while Config.hpp was its sole includer.

* Remove Unused Project Includes From Files With Platform-Specific Code

A Linux include-what-you-use run cannot see the code inside _WIN32, __APPLE__ or __linux__ blocks, so its verdict is only taken where nothing the removed header declares, directly or through what it includes, is named inside those blocks. Removals also have to hold in both the Release and Debug configuration and never touch a line inside a conditional block.

* Restore the libslic3r Precompiled Header and Direct Includes Lost in the Platform Pass

The platform-file pass treated pchheader.hpp as an ordinary header and
emptied it, and left GUI_Preview.hpp and 14 other files relying on
headers they no longer reached directly.

* Restore MainFrame.hpp in ParamsDialog.cpp for the Windows-Only Reparent Call

* Include Headers That Files Reached Through Ones the Cleanup Removed

* Drop Includes Duplicated by the Cleanup or by Main's Own Additions

* Leave PreciseSeam.cpp as Main Has It After the Precise Seam Rework

src/slic3r/Config/Version.hpp

@@ -7,7 +7,6 @@
 
 #include <boost/filesystem/path.hpp>
 
-#include "libslic3r/FileParserError.hpp"
 #include "libslic3r/Semver.hpp"
 
 namespace Slic3r { 

src/slic3r/GUI/2DBed.cpp

@@ -3,6 +3,7 @@
 
 #include "3DBed.hpp"
 #include "PartPlate.hpp"
+#include "I18N.hpp"
 
 #include <vector>
 #include "libslic3r/Polyline.hpp"
@@ -15,7 +16,6 @@
 #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/event.h>
@@ -29,6 +29,8 @@
 #include "libslic3r/Geometry.hpp"
 #include "libslic3r/ClipperUtils.hpp"
 
+class wxWindow;
+
 namespace Slic3r {
 namespace GUI {
 

src/slic3r/GUI/AVVideoDecoder.hpp

@@ -13,6 +13,9 @@ extern "C" {
 #include <wx/gdicmn.h>
 #include <wx/image.h>
 
+class wxImage;
+struct SwsContext;
+
 class wxBitmap;
 
 class AVVideoDecoder

src/slic3r/GUI/AboutDialog.hpp

@@ -13,6 +13,12 @@
 #include "GUI_Utils.hpp"
 #include "wxExtensions.hpp"
 
+class wxEvent;
+class wxHtmlLinkEvent;
+class wxHtmlWindow;
+class wxStaticBitmap;
+class wxWindow;
+
 namespace Slic3r { 
 namespace GUI {
 

src/slic3r/GUI/AmsMappingPopup.cpp

@@ -2,14 +2,12 @@
 #include "I18N.hpp"
 
 #include "libslic3r/Utils.hpp"
-#include "libslic3r/Thread.hpp"
 #include "slic3r/Utils/WxFontUtils.hpp"
 #include "GUI.hpp"
 #include "GUI_App.hpp"
 #include "DeviceCore/DevConfigUtil.h"
 #include "GUI_Preview.hpp"
 #include "MainFrame.hpp"
-#include "format.hpp"
 #include "Widgets/ProgressDialog.hpp"
 #include <wx/event.h>
 #include <wx/colour.h>
@@ -57,7 +55,6 @@
 #include <wx/toplevel.h>
 #include <wx/wrapsizer.h>
 #include "Plater.hpp"
-#include "BitmapCache.hpp"
 #include "BindDialog.hpp"
 #include "FilamentBitmapUtils.hpp"
 
@@ -68,6 +65,11 @@
 
 #include "DeviceTab/wgtDeviceNozzleSelect.h"
 #include "DeviceTab/wgtMsgPanel.h"
+#include "slic3r/GUI/DeviceCore/DevExtruderSystem.h"
+#include "slic3r/GUI/DeviceCore/DevNozzleSystem.h"
+#include "libslic3r/Preset.hpp"
+#include "libslic3r/PresetBundle.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
 
 namespace Slic3r { namespace GUI {
 #define MATERIAL_ITEM_SIZE wxSize(FromDIP(65), FromDIP(50))

src/slic3r/GUI/AmsMappingPopupUpdate.cpp

@@ -16,10 +16,6 @@
 #include "GUI_App.hpp"
 #include "GUI_Preview.hpp"
 #include "MainFrame.hpp"
-#include "format.hpp"
-#include "Widgets/ProgressDialog.hpp"
-#include "Widgets/RoundedRectangle.hpp"
-#include "Widgets/StaticBox.hpp"
 
 #include <list>
 #include <vector>
@@ -41,7 +37,6 @@
 #include <optional>
 #include <wx/wx.h>
 #include "Plater.hpp"
-#include "BitmapCache.hpp"
 
 #include "DeviceCore/DevFilaSystem.h"
 #include "DeviceCore/DevFilaSwitch.h"
@@ -50,6 +45,15 @@
 
 #include "DeviceTab/wgtDeviceNozzleSelect.h"
 #include "DeviceTab/wgtMsgPanel.h"
+#include "slic3r/GUI/DeviceCore/DevExtruderSystem.h"
+#include "slic3r/GUI/DeviceCore/DevNozzleSystem.h"
+#include "slic3r/GUI/DeviceCore/DevUtil.h"
+#include "libslic3r/PresetBundle.hpp"
+#include "libslic3r/PrintConfig.hpp"
+#include "libslic3r/ProjectTask.hpp"
+#include "slic3r/GUI/DeviceManager.hpp"
+#include "slic3r/GUI/Widgets/Label.hpp"
+#include "slic3r/GUI/wxExtensions.hpp"
 
 namespace Slic3r::GUI {
 

src/slic3r/GUI/AmsWidgets.cpp

@@ -4,16 +4,13 @@
 #include <wx/button.h>
 #include <wx/sizer.h>
 #include <wx/dataview.h>
+#include <wx/string.h>
 #include <wx/variant.h>
 
-#include "GUI_App.hpp"
-#include "GUI_ObjectList.hpp"
-#include "Plater.hpp"
-#include "MainFrame.hpp"
-#include "Widgets/Label.hpp"
-#include "format.hpp"
 
 #include "DeviceCore/DevFilaSystem.h"
+#include "slic3r/GUI/DeviceCore/DevUtil.h"
+#include "slic3r/GUI/DeviceManager.hpp"
 
 
 namespace Slic3r {

src/slic3r/GUI/Auxiliary.cpp

@@ -26,7 +26,6 @@
 #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>
@@ -64,6 +63,8 @@
 #include "GUI_ObjectList.hpp"
 #include "MainFrame.hpp"
 #include "Widgets/Label.hpp"
+#include "slic3r/GUI/I18N.hpp"
+#include "slic3r/GUI/Plater.hpp"
 
 namespace fs = boost::filesystem;
 

src/slic3r/GUI/AuxiliaryDataViewModel.cpp

@@ -1,6 +1,4 @@
 #include "AuxiliaryDataViewModel.hpp"
-#include "libslic3r/libslic3r.h"
-#include "libslic3r/Model.hpp"
 #include "libslic3r/Format/bbs_3mf.hpp"
 
 
@@ -20,6 +18,9 @@
 #include <wx/string.h>
 #include <wx/variant.h>
 #include <wx/types.h>
+#include "libslic3r/Format/STEP.hpp"
+#include "slic3r/GUI/I18N.hpp"
+#include <wx/defs.h>
 
 namespace fs = boost::filesystem;
 

src/slic3r/GUI/AuxiliaryDataViewModel.hpp

@@ -6,7 +6,6 @@
 #include "wx/hashmap.h"
 #include "wx/vector.h"
 
-#include "I18N.hpp"
 
 #include <boost/filesystem.hpp>
 #include <wx/dynarray.h>

src/slic3r/GUI/AuxiliaryDialog.cpp

@@ -2,7 +2,6 @@
 #include "I18N.hpp"
 #include "GUI_AuxiliaryList.hpp"
 
-#include "libslic3r/Utils.hpp"
 
 #include <boost/property_tree/ptree.hpp>
 #include "slic3r/GUI/GUI_Utils.hpp"
@@ -11,6 +10,8 @@
 #include <wx/dialog.h>
 #include <wx/toplevel.h>
 
+class wxWindow;
+
 namespace pt = boost::property_tree;
 typedef pt::ptree JSON;
 

src/slic3r/GUI/AuxiliaryDialog.hpp

@@ -6,7 +6,8 @@
 #include <wx/collpane.h>
 
 #include "GUI_Utils.hpp"
-#include "wxExtensions.hpp"
+
+class wxWindow;
 
 class AuxiliaryList;
 

src/slic3r/GUI/BBLStatusBar.cpp

@@ -13,7 +13,6 @@
 #include <wx/frame.h>
 #include <wx/statline.h>
 
-#include "GUI_App.hpp"
 
 #include "I18N.hpp"
 

src/slic3r/GUI/BBLStatusBarBind.cpp

@@ -12,11 +12,10 @@
 #include <wx/frame.h>
 #include "wx/evtloop.h"
 #include <wx/gdicmn.h>
-#include "GUI_App.hpp"
 
-#include "I18N.hpp"
 
 #include <iostream>
+#include "slic3r/GUI/Widgets/Button.hpp"
 
 
 namespace Slic3r {

src/slic3r/GUI/BBLStatusBarBind.hpp

@@ -11,19 +11,16 @@
 #include <string>
 #include <functional>
 #include <string>
+#include <wx/string.h>
 #include "Jobs/ProgressIndicator.hpp"
-#include "Widgets/Label.hpp"
-#include "Widgets/Button.hpp"
 
-class wxTimer;
+class Button;
+class wxBoxSizer;
+class wxPanel;
+class wxStaticText;
+
 class wxGauge;
-class wxButton;
-class wxTimerEvent;
-class wxStatusBar;
 class wxWindow;
-class wxFrame;
-class wxString;
-class wxFont;
 
 
 namespace Slic3r {

src/slic3r/GUI/BBLStatusBarPrint.cpp

@@ -17,7 +17,6 @@
 #include <wx/frame.h>
 #include "wx/evtloop.h"
 #include <wx/gdicmn.h>
-#include "GUI_App.hpp"
 
 #include "I18N.hpp"
 

src/slic3r/GUI/BBLStatusBarSend.cpp

@@ -15,7 +15,6 @@
 #include <wx/frame.h>
 #include "wx/evtloop.h"
 #include <wx/gdicmn.h>
-#include "GUI_App.hpp"
 
 #include "I18N.hpp"
 

src/slic3r/GUI/BBLTopbar.cpp

@@ -28,6 +28,7 @@
 #include "PartPlate.hpp"
 
 #include <boost/log/trivial.hpp>
+#include "libslic3r/AppConfig.hpp"
 
 #ifdef __WXGTK__
 #include <gtk/gtk.h>

src/slic3r/GUI/BBLTopbar.hpp

@@ -4,12 +4,19 @@
 #include "wx/aui/auibar.h"
 
 #include "SelectMachine.hpp"
-#include "DeviceManager.hpp"
 
 #include <wx/control.h>
 #include <wx/string.h>
 #include <wx/gdicmn.h>
 #include <wx/event.h>
+#include "slic3r/GUI/DeviceCore/DevDefs.h"
+
+class wxFrame;
+class wxMenuEvent;
+class wxMenuItem;
+class wxMouseCaptureLostEvent;
+class wxMouseEvent;
+class wxWindow;
 
 using namespace Slic3r::GUI;
 

src/slic3r/GUI/BackgroundSlicingProcess.cpp

@@ -56,6 +56,10 @@
 
 #include "libslic3r_version.h"
 #include "slic3r/GUI/Plater.hpp"
+#include "libslic3r/GCode/GCodeProcessor.hpp"
+#include "libslic3r/PresetBundle.hpp"
+#include "slic3r/GUI/PartPlate.hpp"
+#include "slic3r/Utils/PrintHost.hpp"
 
 namespace Slic3r {
 

src/slic3r/GUI/BackgroundSlicingProcess.hpp

@@ -23,7 +23,11 @@
 #include "libslic3r/Format/SL1.hpp"
 #include "slic3r/Utils/PrintHost.hpp"
 #include "libslic3r/GCode/GCodeProcessor.hpp"
-#include "PartPlate.hpp"
+
+namespace Slic3r { class Polygon; }
+namespace Slic3r { class Print; }
+namespace Slic3r::GUI { class PartPlate; }
+namespace Slic3r::GUI { class Plater; }
 
 namespace boost { namespace filesystem { class path; } }
 

src/slic3r/GUI/BaseTransparentDPIFrame.cpp

@@ -4,7 +4,6 @@
 #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>
@@ -13,20 +12,16 @@
 #include <wx/slider.h>
 #include <wx/dcmemory.h>
 #include "GUI_App.hpp"
-#include "Tab.hpp"
-#include "PartPlate.hpp"
-#include "I18N.hpp"
 #include "MainFrame.hpp"
 #include "Widgets/Button.hpp"
-#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"
+
+namespace Slic3r::GUI { struct IntEvent; }
 using namespace Slic3r;
 using namespace Slic3r::GUI;
 

src/slic3r/GUI/BaseTransparentDPIFrame.hpp

@@ -2,18 +2,22 @@
 #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 wxBoxSizer;
+class wxSizer;
+class wxTimer;
+class wxTimerEvent;
+class wxWindow;
+namespace Slic3r::GUI { struct IntEvent; }
+
 class Button;
 class Label;
-class CheckBox;
 namespace Slic3r { namespace GUI {
 class CapsuleButton;
 

src/slic3r/GUI/BonjourDialog.hpp

@@ -2,7 +2,6 @@
 #define slic3r_BonjourDialog_hpp_
 
 #include <cstddef>
-#include "libslic3r/Config.hpp"
 #include <memory>
 
 #include <boost/asio/ip/address.hpp>
@@ -12,13 +11,15 @@
 #include <wx/event.h>
 #include <wx/string.h>
 
-#include "libslic3r/PrintConfig.hpp"
+class wxWindow;
+namespace Slic3r { enum PrinterTechnology : unsigned char; }
+namespace boost::asio::ip { class address; }
+
 
 class wxListView;
 class wxStaticText;
 class wxTimer;
 class wxTimerEvent;
-class address;
 
 namespace Slic3r {
 

src/slic3r/GUI/CAD/DesignCanvas.cpp

@@ -42,6 +42,7 @@
 #include <wx/time.h>
 #include <wx/toplevel.h>
 #include <wx/window.h>
+#include "libslic3r/PrintConfig.hpp"
 
 namespace Slic3r {
 namespace GUI {

src/slic3r/GUI/CAD/DesignCanvas.hpp

@@ -3,7 +3,6 @@
 
 #include <vector>
 #include "libslic3r/Point.hpp"
-#include "libslic3r/CAD/CadDocument.hpp"
 #include "libslic3r/Color.hpp"
 #include <utility>
 #include <wx/colour.h>
@@ -22,8 +21,14 @@
 #include "libslic3r/CAD/SketchEngine.hpp"
 #include "slic3r/GUI/CAD/DesignSketchTool.hpp"
 
+class wxActivateEvent;
+class wxEvent;
+class wxIconizeEvent;
+class wxPopupWindow;
+class wxWindow;
+namespace Slic3r { struct CadBody; }
+
 class wxGLCanvas;
-class wxFrame;
 class wxStaticText;
 
 namespace Slic3r {

src/slic3r/GUI/CAD/DesignPanel.cpp

@@ -87,7 +87,6 @@
 #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
 #include "slic3r/GUI/Widgets/DropDown.hpp"          // Orca-themed combo dropdown (white/teal selector) for the tool flyouts
-#include "slic3r/GUI/Widgets/Button.hpp"            // Orca-styled Button (ButtonStyle/ButtonType) — same look as Prepare
 #include "slic3r/GUI/Widgets/CheckBox.hpp"          // Orca teal check (label lives in the row's left column)
 #include "slic3r/GUI/Widgets/ComboBox.hpp"          // Orca dropdown — replaces wxChoice in every Design card
 #include "slic3r/GUI/Widgets/StaticBox.hpp"         // Prepare's rounded white card frame around each tool dialog
@@ -99,6 +98,7 @@
 #include "libslic3r/BuildVolume.hpp"
 #include "slic3r/GUI/MainFrame.hpp"
 #include "slic3r/GUI/GUI_ObjectList.hpp"
+#include "slic3r/GUI/I18N.hpp"
 
 // English-only pin for the Design tab (see design-ux-contract): one lever
 // de-translates this whole TU so our strings never half-translate against the host's

src/slic3r/GUI/CAD/DesignSketchTool.cpp

@@ -42,6 +42,11 @@
 #include <cstdio>
 #include <cstdarg>
 #include <cstdlib>
+#include "libslic3r/AppConfig.hpp"
+#include "libslic3r/Color.hpp"
+#include "slic3r/GUI/GLSelectionRectangle.hpp"
+
+class TopoDS_Shape;
 
 namespace Slic3r {
 namespace GUI {

src/slic3r/GUI/CAD/DesignSketchTool.hpp

@@ -5,7 +5,6 @@
 #include "libslic3r/CAD/SketchEngine.hpp"
 #include "libslic3r/CAD/CadDocument.hpp"   // CadBody for per-body solid picking
 #include "libslic3r/CAD/SketchInference.hpp"
-#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>

src/slic3r/GUI/CAD/SketchInlineEditor.cpp

@@ -1,7 +1,6 @@
 #include "slic3r/GUI/CAD/SketchInlineEditor.hpp"
 
 #include "slic3r/GUI/ImGuiWrapper.hpp"
-#include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/I18N.hpp"
 #include "libslic3r/Color.hpp"
 

src/slic3r/GUI/CalibrationWizardCaliPage.cpp

@@ -1,8 +1,6 @@
 #include "CalibrationWizardCaliPage.hpp"
 #include "CalibUtils.hpp"
-#include "MainFrame.hpp"
 #include "I18N.hpp"
-#include "Widgets/Label.hpp"
 
 #include "DeviceCore/DevManager.h"
 #include <wx/string.h>
@@ -22,6 +20,14 @@
 #include "slic3r/GUI/GUI.hpp"
 #include "libslic3r/Utils.hpp"
 #include <wx/panel.h>
+#include "slic3r/GUI/DeviceCore/DevExtruderSystem.h"
+#include "libslic3r/ProjectTask.hpp"
+#include "slic3r/GUI/DeviceManager.hpp"
+#include "slic3r/GUI/Monitor.hpp"
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "slic3r/GUI/wxExtensions.hpp"
+
+class wxWindow;
 
 namespace Slic3r { namespace GUI {
 

src/slic3r/GUI/CalibrationWizardPage.cpp

@@ -19,7 +19,6 @@
 #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"
@@ -31,6 +30,8 @@
 #include <memory>
 #include <wx/scrolwin.h>
 
+namespace Slic3r { class DynamicPrintConfig; }
+
 namespace Slic3r { namespace GUI {
 
 wxDEFINE_EVENT(EVT_CALI_ACTION, wxCommandEvent);

src/slic3r/GUI/CameraPopup.cpp

@@ -3,7 +3,6 @@
 #include "I18N.hpp"
 #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>

src/slic3r/GUI/CameraUtils.cpp

@@ -14,6 +14,8 @@
 
 #include "slic3r/GUI/3DScene.hpp" // GLVolume
 #include "libslic3r/Geometry/ConvexHull.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/Geometry.hpp"
 
 using namespace Slic3r;
 using namespace GUI;

src/slic3r/GUI/CloneDialog.cpp

@@ -4,7 +4,6 @@
 #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"
@@ -20,6 +19,12 @@
 #include "slic3r/GUI/Selection.hpp"
 #include <wx/utils.h>
 #include "slic3r/GUI/Jobs/Job.hpp"
+#include "libslic3r/AppConfig.hpp"
+#include "slic3r/GUI/GLCanvas3D.hpp"
+#include "slic3r/GUI/I18N.hpp"
+#include "slic3r/GUI/Plater.hpp"
+
+class wxWindow;
 
 namespace Slic3r { namespace GUI {
 

src/slic3r/GUI/ColorDecomposeSupport.cpp

@@ -21,6 +21,10 @@
 #include "libslic3r/Config.hpp"
 #include <wx/colour.h>
 #include <utility>
+#include "libslic3r/AppConfig.hpp"
+#include "libslic3r/ColorDecomposeRecipe.hpp"
+#include "libslic3r/FilamentMixer.hpp"
+#include "libslic3r/PrintConfig.hpp"
 
 using json = nlohmann::json;
 

src/slic3r/GUI/ConfigManipulation.hpp

@@ -8,8 +8,6 @@
  *	 and local config (overrides options on sidebar)
  * */
 
-#include "libslic3r/PrintConfig.hpp"
-#include "Field.hpp"
 #include <functional>
 #include <string>
 #include <wx/string.h>
@@ -18,6 +16,10 @@
 #include <vector>
 #include <map>
 
+class wxWindow;
+namespace Slic3r { class DynamicPrintConfig; }
+namespace boost { class any; }
+
 namespace Slic3r {
 
 class ModelConfig;

src/slic3r/GUI/ConfigWizard.cpp

@@ -64,7 +64,6 @@
 #include <wx/msw/dark_mode.h>
 #endif // _MSW_DARK_MODE
 
-#include "libslic3r/Platform.hpp"
 #include "libslic3r/Utils.hpp"
 #include "libslic3r/Config.hpp"
 #include "libslic3r/libslic3r.h"

src/slic3r/GUI/CrealityDiscoveryDialog.hpp

@@ -6,6 +6,8 @@
 #include <string>
 #include <vector>
 
+class wxWindow;
+
 class wxListView;
 class wxStaticText;
 

src/slic3r/GUI/DailyTips.cpp

@@ -9,10 +9,10 @@
 #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"
+#include "slic3r/GUI/I18N.hpp"
 
 #ifndef IMGUI_DEFINE_MATH_OPERATORS
 #define IMGUI_DEFINE_MATH_OPERATORS

src/slic3r/GUI/DesktopIntegrationDialog.cpp

@@ -16,6 +16,7 @@
 #include <wx/dialog.h>
 #include <wx/toplevel.h>
 #include <wx/sizer.h>
+#include "slic3r/GUI/Plater.hpp"
 #ifdef __linux__
 #include "DesktopIntegrationDialog.hpp"
 #include "GUI_App.hpp"

src/slic3r/GUI/DeviceCore/DevAxisCtrl.cpp

@@ -2,7 +2,6 @@
 
 #include "json_diff.hpp"
 #include "slic3r/GUI/DeviceManager.hpp"
-#include "slic3r/Utils/NetworkAgent.hpp"
 #include <string>
 #include <cstdlib>
 #include <cstdio>

src/slic3r/GUI/DeviceCore/DevCtrl.cpp

@@ -4,7 +4,6 @@
 #include "DevCtrl.h"
 
 // TODO: remove this include
-#include "DevUtil.h"
 #include "json_diff.hpp"
 #include "slic3r/GUI/DeviceManager.hpp"
 

src/slic3r/GUI/DeviceCore/DevCtrl.h

@@ -1,5 +1,4 @@
 #pragma once
-#include "libslic3r/CommonDefs.hpp"
 
 #include "slic3r/Utils/json_diff.hpp"
 #include <string>

src/slic3r/GUI/DeviceCore/DevFan.cpp

@@ -8,8 +8,6 @@
 #include <wx/app.h>
 #include "json_diff.hpp"
 #include "slic3r/GUI/DeviceManager.hpp"
-#include "slic3r/GUI/GUI.hpp"
-#include "slic3r/GUI/GUI_App.hpp"
 using namespace nlohmann;
 
 void Slic3r::DevFan::converse_to_duct(bool is_suppt_part_fun, bool is_suppt_aux_fun, bool is_suppt_cham_fun)

src/slic3r/GUI/DeviceCore/DevFilaAmsSetting.cpp

@@ -1,5 +1,6 @@
 #include "DevFilaAmsSetting.h"
 #include "DevUtil.h"
+#include "slic3r/GUI/DeviceCore/DevCtrl.h"
 
 namespace Slic3r {
 

src/slic3r/GUI/DeviceCore/DevFilaAmsSettingCtrl.cpp

@@ -4,6 +4,7 @@
 #include "json_diff.hpp"
 #include "slic3r/GUI/DeviceManager.hpp"
 #include <string>
+#include "slic3r/GUI/DeviceCore/DevCtrl.h"
 
 namespace Slic3r {
     int DevAmsSystemFirmwareSwitch::CrtlSwitchFirmware(int firmware_idx)

src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp

@@ -24,11 +24,12 @@
 
 // TODO: remove this include
 #include "slic3r/GUI/DeviceManager.hpp"
-#include "slic3r/GUI/I18N.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
 
 #include "DevUtil.h"
 #include "DevUtilBackend.h"
+#include "slic3r/GUI/DeviceCore/DevFilaAmsSetting.h"
+#include "slic3r/GUI/DeviceCore/DevFilaSwitch.h"
 
 using namespace nlohmann;
 

src/slic3r/GUI/DeviceCore/DevFilaSystemCtrl.cpp

@@ -4,7 +4,6 @@
 
 #include "json_diff.hpp"
 #include "slic3r/GUI/DeviceManager.hpp"// TODO: remove this include
-#include "DevUtil.h"
 
 using namespace nlohmann;
 namespace Slic3r

src/slic3r/GUI/DeviceCore/DevFirmware.cpp

@@ -1,2 +1 @@
 #include "DevFirmware.h"
-#include "slic3r/GUI/DeviceManager.hpp"

src/slic3r/GUI/DeviceCore/DevHMS.h

@@ -1,5 +1,4 @@
 #pragma once
-#include "libslic3r/CommonDefs.hpp"
 
 #include "slic3r/Utils/json_diff.hpp"
 #include <vector>

src/slic3r/GUI/DeviceCore/DevInfo.cpp

@@ -1,5 +1,4 @@
 #include "DevInfo.h"
-#include "slic3r/GUI/DeviceManager.hpp"
 
 namespace Slic3r
 {

src/slic3r/GUI/DeviceCore/DevInfo.h

@@ -1,6 +1,5 @@
 #pragma once
 #include <nlohmann/json.hpp>
-#include "slic3r/Utils/json_diff.hpp"
 #include <wx/string.h>
 
 namespace Slic3r {

src/slic3r/GUI/DeviceCore/DevMapping.cpp

@@ -19,7 +19,6 @@
 
 // TODO: remove this include
 #include "slic3r/GUI/DeviceManager.hpp"
-#include "slic3r/GUI/I18N.hpp"
 #include "slic3r/GUI/GuiColor.hpp"
 
 using namespace nlohmann;

src/slic3r/GUI/DeviceCore/DevMapping.h

@@ -1,11 +1,10 @@
 #pragma once
-#include "libslic3r/CommonDefs.hpp"
-#include "libslic3r/ProjectTask.hpp"
 
-#include "slic3r/Utils/json_diff.hpp"
 #include <vector>
 #include <wx/string.h>
 
+namespace Slic3r { struct FilamentInfo; }
+
 namespace Slic3r
 {
 //Previous definitions

src/slic3r/GUI/DeviceCore/DevMappingNozzle.cpp

@@ -1,4 +1,3 @@
-#include "DevMapping.h"
 #include "DevMappingNozzle.h"
 
 #include "DevNozzleRack.h"
@@ -9,7 +8,6 @@
 
 #include "json_diff.hpp"
 #include "libslic3r/MultiNozzleUtils.hpp"
-#include "libslic3r/Print.hpp"
 
 #include "slic3r/GUI/DeviceManager.hpp"
 #include "slic3r/GUI/Plater.hpp"
@@ -29,6 +27,8 @@
 #include <string>
 #include <unordered_set>
 #include "slic3r/GUI/DeviceCore/DevDefs.h"
+#include "libslic3r/PresetBundle.hpp"
+#include "libslic3r/ProjectTask.hpp"
 using namespace nlohmann;
 
 namespace Slic3r {

src/slic3r/GUI/DeviceCore/DevNozzleRack.cpp

@@ -1,7 +1,6 @@
 #include "DevNozzleRack.h"
 #include "DevUtil.h"
 
-#include "slic3r/GUI/DeviceManager.hpp"
 #include <wx/event.h>
 #include "slic3r/GUI/DeviceCore/DevNozzleSystem.h"
 #include "slic3r/GUI/DeviceCore/DevFirmware.h"

src/slic3r/GUI/DeviceCore/DevNozzleRackCtrl.cpp

@@ -1,5 +1,4 @@
 #include "DevNozzleRack.h"
-#include "DevUtil.h"
 #include "DevExtruderSystem.h"
 
 #include "json_diff.hpp"
@@ -11,6 +10,8 @@
 #include <wx/string.h>
 #include "slic3r/GUI/DeviceCore/DevDefs.h"
 #include <wx/thread.h>
+#include "slic3r/GUI/DeviceCore/DevFirmware.h"
+#include "slic3r/GUI/DeviceCore/DevNozzleSystem.h"
 
 
 namespace Slic3r

src/slic3r/GUI/DeviceCore/DevPrintOptions.h

@@ -2,7 +2,6 @@
 #include <ctime>
 #include <map>
 #include <nlohmann/json.hpp>
-#include "slic3r/Utils/json_diff.hpp"
 #include <string>
 #include <wx/string.h>
 

src/slic3r/GUI/DeviceCore/DevStatus.cpp

@@ -1,5 +1,4 @@
 #include "DevStatus.h"
-#include "slic3r/GUI/DeviceManager.hpp"
 #include <boost/log/trivial.hpp>
 #include <exception>
 

src/slic3r/GUI/DeviceCore/DevStatus.h

@@ -1,9 +1,7 @@
 #pragma once
 #include <optional>
 #include <nlohmann/json.hpp>
-#include "slic3r/Utils/json_diff.hpp"
 
-#include "DevDefs.h"
 
 namespace Slic3r {
 

src/slic3r/GUI/DeviceCore/DevStorage.cpp

@@ -1,6 +1,5 @@
 #include "DevStorage.h"
 #include "json_diff.hpp"
-#include "slic3r/GUI/DeviceManager.hpp"
 #include <string>
 
 

src/slic3r/GUI/DeviceCore/DevUpgradeCtrl.cpp

@@ -1,5 +1,4 @@
 #include "DevUpgrade.h"
-#include "DevUtil.h"
 
 #include "json_diff.hpp"
 #include "slic3r/GUI/DeviceManager.hpp"

src/slic3r/GUI/DeviceCore/DevUtilBackend.cpp

@@ -2,7 +2,6 @@
 
 #include "slic3r/GUI/BackgroundSlicingProcess.hpp"
 
-#include "slic3r/GUI/PartPlate.hpp"
 #include "slic3r/GUI/Plater.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
 
@@ -21,6 +20,9 @@
 #include "libslic3r/Preset.hpp"
 #include "libslic3r/Config.hpp"
 #include <wx/string.h>
+#include "libslic3r/GCode/GCodeProcessor.hpp"
+#include "libslic3r/PresetBundle.hpp"
+#include "libslic3r/PrintConfig.hpp"
 
 namespace Slic3r
 {

src/slic3r/GUI/DeviceCore/DevUtilBackend.h

@@ -8,7 +8,6 @@
 
 #pragma once
 #include "DevDefs.h"
-#include "DevNozzleSystem.h"
 #include "DevFilaSystem.h"
 
 #include "libslic3r/MultiNozzleUtils.hpp"
@@ -17,6 +16,8 @@
 #include <string>
 #include <unordered_map>
 
+namespace Slic3r { struct DevNozzle; }
+
  // Forward declarations
 namespace Slic3r
 {

src/slic3r/GUI/DeviceErrorDialog.hpp

@@ -19,6 +19,13 @@
 #include "Widgets/StateColor.hpp"
 #include <nlohmann/json.hpp>
 
+class wxBoxSizer;
+class wxScrolledWindow;
+class wxStaticBitmap;
+class wxTimer;
+class wxTimerEvent;
+class wxWindow;
+
 class Label;
 class Button;
 

src/slic3r/GUI/DeviceManager.cpp

@@ -1,19 +1,14 @@
 #include "PrinterNetworkTypes.hpp"
 #include "json_diff.hpp"
-#include "libslic3r/libslic3r.h"
 #include "DeviceManager.hpp"
 #include "HMS.hpp"
 #include "I18N.hpp"
-#include "libslic3r/Time.hpp"
 #include "libslic3r/Thread.hpp"
 #include "slic3r/Utils/Http.hpp"
 #include "slic3r/Utils/NetworkAgent.hpp"
-#include "slic3r/plugin/PluginManager.hpp"
 #include "slic3r/Utils/NetworkAgentFactory.hpp"
-#include "GuiColor.hpp"
 
 #include "GUI_App.hpp"
-#include "MsgDialog.hpp"
 #include "DeviceErrorDialog.hpp"
 #include "Plater.hpp"
 #include "GUI_App.hpp"
@@ -90,12 +85,10 @@
 
 #include "DeviceCore/DevConfig.h"
 #include "DeviceCore/DevCtrl.h"
-#include "DeviceCore/DevInfo.h"
 #include "DeviceCore/DevPrintOptions.h"
 #include "DeviceCore/DevPrintTaskInfo.h"
 #include "DeviceCore/DevHMS.h"
 
-#include "DeviceCore/DevMapping.h"
 #include "DeviceCore/DevMappingNozzle.h"
 #include "DeviceCore/DevManager.h"
 #include "DeviceCore/DevUtil.h"
@@ -107,6 +100,12 @@
 #include "DeviceCore/DevUpgrade.h"
 
 #include "IPrinterAgent.hpp"
+#include "libslic3r/AppConfig.hpp"
+#include "libslic3r/Preset.hpp"
+#include "libslic3r/PresetBundle.hpp"
+#include "slic3r/GUI/Jobs/SendJob.hpp"
+
+class wxWindow;
 
 namespace fs = boost::filesystem;
 

src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp

@@ -7,11 +7,9 @@
 
 #include "uiAmsHumidityPopup.h"
 
-#include "slic3r/Utils/WxFontUtils.hpp"
 
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/I18N.hpp"
-#include "slic3r/GUI/Widgets/StateColor.hpp"
 
 
 #include <wx/anybutton.h>
@@ -23,6 +21,9 @@
 #include <wx/gdicmn.h>
 #include <wx/grid.h>
 #include <wx/sizer.h>
+#include "slic3r/GUI/wxExtensions.hpp"
+
+class wxWindow;
 
 namespace Slic3r { namespace GUI {
 

src/slic3r/GUI/DeviceTab/wgtMsgBox.cpp

@@ -1,8 +1,6 @@
 #include "wgtMsgBox.h"
 
-#include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/Widgets/Label.hpp"
-#include "slic3r/GUI/wxExtensions.hpp"
 
 #include "slic3r/GUI/Widgets/StaticBox.hpp"
 #include <wx/gdicmn.h>
@@ -10,6 +8,9 @@
 #include <wx/sizer.h>
 #include <wx/wx.h>
 
+class wxCommandEvent;
+class wxWindow;
+
 namespace Slic3r::GUI
 {
 

src/slic3r/GUI/DeviceTab/wgtMsgPanel.cpp

@@ -1,10 +1,8 @@
 #include "wgtMsgPanel.h"
 
-#include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/I18N.hpp"
 #include "slic3r/GUI/Widgets/Label.hpp"
 #include "slic3r/GUI/Widgets/StateColor.hpp"
-#include "slic3r/GUI/wxExtensions.hpp"
 
 #include <wx/colour.h>
 #include <wx/panel.h>

src/slic3r/GUI/DeviceTab/wgtMsgPanel.h

@@ -8,6 +8,10 @@
 #include <string>
 #include <wx/string.h>
 
+class wxHyperlinkCtrl;
+class wxHyperlinkEvent;
+class wxWindow;
+
 class Label;
 
 namespace Slic3r

src/slic3r/GUI/DockPanel.hpp

@@ -6,6 +6,8 @@
 #include <optional>
 #include <string>
 
+class wxWindow;
+
 namespace Slic3r { namespace GUI {
 
 // Stable across sessions so the saved layout finds the pane; free of wxAuiManager layout delimiters.

src/slic3r/GUI/DownloadProgressDialog.cpp

@@ -25,12 +25,8 @@
 #include <wx/string.h>
 #include <wx/toplevel.h>
 
-#include "libslic3r/libslic3r.h"
-#include "libslic3r/Utils.hpp"
-#include "GUI.hpp"
 #include "I18N.hpp"
 //#include "ConfigWizard.hpp"
-#include "wxExtensions.hpp"
 #include "slic3r/GUI/MainFrame.hpp"
 #include "slic3r/GUI/MsgDialog.hpp"
 #include "GUI_App.hpp"
@@ -38,6 +34,9 @@
 #include "Jobs/PlaterWorker.hpp"
 
 #include "Widgets/HyperLink.hpp" // ORCA
+#include "libslic3r/AppConfig.hpp"
+
+class wxWindow;
 
 namespace Slic3r {
 namespace GUI {

src/slic3r/GUI/Downloader.hpp

@@ -1,7 +1,6 @@
 #ifndef slic3r_Downloader_hpp_
 #define slic3r_Downloader_hpp_
 
-#include "DownloaderFileGet.hpp"
 #include <boost/filesystem/path.hpp>
 #include <string>
 #include <wx/event.h>
@@ -10,6 +9,8 @@
 #include <cstddef>
 #include <wx/wx.h>
 
+namespace Slic3r::GUI { class FileGet; }
+
 namespace Slic3r {
 namespace GUI {
 

src/slic3r/GUI/DownloaderFileGet.cpp

@@ -26,6 +26,7 @@
 #include "GUI.hpp"
 #include "I18N.hpp"
 #include "libslic3r/Utils.hpp"
+#include "slic3r/Utils/Http.hpp"
 
 namespace Slic3r {
 namespace GUI {

src/slic3r/GUI/DownloaderFileGet.hpp

@@ -1,7 +1,6 @@
 #ifndef slic3r_DownloaderFileGet_hpp_
 #define slic3r_DownloaderFileGet_hpp_
 
-#include "../Utils/Http.hpp"
 
 #include <boost/filesystem/path.hpp>
 #include <memory>

src/slic3r/GUI/DragCanvas.cpp

@@ -1,6 +1,5 @@
 #include "DragCanvas.hpp"
 #include "wxExtensions.hpp"
-#include "GUI_App.hpp"
 #include "Widgets/StateColor.hpp"
 #include <wx/colour.h>
 #include <vector>
@@ -13,6 +12,8 @@
 #include <wx/dcclient.h>
 #include <wx/dragimag.h>
 
+class wxWindow;
+
 namespace Slic3r { namespace GUI {
 
 #define CANVAS_WIDTH FromDIP(240)

src/slic3r/GUI/DragCanvas.hpp

@@ -11,6 +11,12 @@
 #include <wx/event.h>
 #include <wx/colour.h>
 
+class wxDC;
+class wxEraseEvent;
+class wxMouseEvent;
+class wxPaintEvent;
+class wxWindow;
+
 namespace Slic3r { namespace GUI {
 
 class DragShape : public wxObject

src/slic3r/GUI/ExportPresetBundleDialog.cpp

@@ -1,9 +1,7 @@
 #include "ExportPresetBundleDialog.hpp"
 #include "slic3r/Utils/NetworkAgent.hpp"
 #include "GUI_App.hpp"
-#include "ConfigWizard.hpp"
 #include "I18N.hpp"
-#include "GUI_App.hpp"
 #include <cstddef>
 #include <chrono>
 #include <ctime>
@@ -12,7 +10,6 @@
 #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>
@@ -36,6 +33,8 @@
 #include <nlohmann/json.hpp>
 #include <slic3r/GUI/MsgDialog.hpp>
 
+class wxWindow;
+
 using json = nlohmann::json;
 
 namespace Slic3r { namespace GUI {

src/slic3r/GUI/ExtraRenderers.cpp

@@ -20,6 +20,8 @@
 #include <wx/gdicmn.h>
 #include <wx/string.h>
 #include <wx/event.h>
+#include "slic3r/GUI/GUI_App.hpp"
+#include "slic3r/GUI/Widgets/DropDown.hpp"
 #ifdef wxHAS_GENERIC_DATAVIEWCTRL
 #include "wx/generic/private/markuptext.h"
 #include "wx/generic/private/rowheightcache.h"

src/slic3r/GUI/ExtrusionCalibration.cpp

@@ -1,6 +1,5 @@
 #include "ExtrusionCalibration.hpp"
 #include "GUI_App.hpp"
-#include "GUI.hpp"
 #include "MsgDialog.hpp"
 #include "libslic3r/Preset.hpp"
 #include <algorithm>

src/slic3r/GUI/Field.hpp

@@ -29,13 +29,17 @@
 
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Config.hpp"
-#include "libslic3r/Utils.hpp"
 
-#include "GUI.hpp"
 #include "wxExtensions.hpp"
 #include "Widgets/SpinInput.hpp"
-#include "Widgets/TextInput.hpp"
-#include "Widgets/ComboBox.hpp"
+
+class ComboBox;
+class TextInput;
+class wxBitmap;
+class wxBoxSizer;
+class wxCommandEvent;
+class wxEvent;
+class wxSizer;
 
 #ifdef __WXMSW__
 #define wxMSW true

src/slic3r/GUI/FilamentPickerDialog.cpp

@@ -4,7 +4,6 @@
 #include "GUI_App.hpp"
 #include "MainFrame.hpp"
 #include "EncodedFilament.hpp"
-#include "Widgets/Label.hpp"
 #include "Widgets/Button.hpp"
 #include "Widgets/StateColor.hpp"
 #include "Widgets/DialogButtons.hpp"

src/slic3r/GUI/FileArchiveDialog.cpp

@@ -2,10 +2,8 @@
 
 #include "I18N.hpp"
 #include "GUI_App.hpp"
-#include "GUI.hpp"
 #include "MainFrame.hpp"
-#include "ExtraRenderers.hpp"
-#include "format.hpp"
+#include <boost/filesystem/path.hpp>
 #include <memory>
 #include <cassert>
 #include <miniz.h>

src/slic3r/GUI/FrameProfiler.cpp

@@ -1,4 +1,3 @@
-#include "libslic3r/libslic3r.h"
 #include "FrameProfiler.hpp"
 
 #include "3DScene.hpp"

src/slic3r/GUI/GCodeViewer.cpp

@@ -2,7 +2,6 @@
 #include "GCodeViewer.hpp"
 
 #include "libslic3r/BuildVolume.hpp"
-#include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/Print.hpp"
 #include "libslic3r/Geometry.hpp"
 #include "libslic3r/Model.hpp"
@@ -10,23 +9,16 @@
 #include "libslic3r/LocalesUtils.hpp"
 #include "libslic3r/PresetBundle.hpp"
 //BBS: add convex hull logic for toolpath check
-#include "libslic3r/Geometry/ConvexHull.hpp"
 
 #include "GUI_App.hpp"
-#include "MainFrame.hpp"
 #include "Plater.hpp"
 #include "Camera.hpp"
 #include "I18N.hpp"
 #include "format.hpp"
-#include "GUI_Utils.hpp"
 #include "GUI.hpp"
 #include "GLCanvas3D.hpp"
 #include "FilamentGroupPopup.hpp"
 #include "GLToolbar.hpp"
-#include "GUI_Preview.hpp"
-#include "libslic3r/Print.hpp"
-#include "libslic3r/Layer.hpp"
-#include "Widgets/ProgressDialog.hpp"
 #include "MsgDialog.hpp"
 #include <boost/container_hash/hash.hpp>
 #include "slic3r/GUI/MeshUtils.hpp"
@@ -66,7 +58,6 @@
 #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>
@@ -95,6 +86,15 @@
 #include <algorithm>
 #include <cmath>
 #include <chrono>
+#include "libslic3r/AppConfig.hpp"
+#include "libslic3r/BoundingBox.hpp"
+#include "libslic3r/CutUtils.hpp"
+#include "libslic3r/GCode/ToolOrdering.hpp"
+#include "libslic3r/ObjectID.hpp"
+#include "slic3r/GUI/Gizmos/GizmoObjectManipulation.hpp"
+#include "slic3r/GUI/PartPlate.hpp"
+
+namespace Slic3r { class PrintBase; }
 
 
 namespace Slic3r {

src/slic3r/GUI/GLCanvas3D.cpp

@@ -100,7 +100,6 @@
 #include "Mouse3DController.hpp"
 #include "I18N.hpp"
 #include "NotificationManager.hpp"
-#include "format.hpp"
 #include "DailyTips.hpp"
 #include "FilamentMapDialog.hpp"
 #include "Gizmos/GLGizmoUtils.hpp"
@@ -152,6 +151,24 @@
 #include <imgui/imgui_internal.h>
 
 #include <imguizmo/ImGuizmo.h>
+#include "libslic3r/CutUtils.hpp"
+#include "libslic3r/EmbossShape.hpp"
+#include "libslic3r/ExPolygon.hpp"
+#include "libslic3r/GCode/GCodeProcessor.hpp"
+#include "libslic3r/MultiMaterialSegmentation.hpp"
+#include "libslic3r/SLA/Pad.hpp"
+#include "libslic3r/TextConfiguration.hpp"
+#include "libslic3r/TriangleMesh.hpp"
+#include "slic3r/GUI/3DBed.hpp"
+#include "slic3r/GUI/FrameProfiler.hpp"
+#include "slic3r/GUI/GLSelectionRectangle.hpp"
+#include "slic3r/GUI/IMToolbar.hpp"
+#include "slic3r/GUI/ImGuiWrapper.hpp"
+#include "slic3r/GUI/KeyChord.hpp"
+#include "slic3r/GUI/ObjectDataViewModel.hpp"
+#include "slic3r/GUI/PartPlate.hpp"
+#include "slic3r/GUI/SceneCache.hpp"
+#include "slic3r/Utils/NetworkAgent.hpp"
 
 #ifdef __WXMSW__
 #if wxUSE_POPUPWIN

src/slic3r/GUI/GLCanvas3D.hpp

@@ -15,11 +15,8 @@
 #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>
@@ -33,7 +30,6 @@
 #include "GUI_ObjectLayers.hpp"
 #include "GLSelectionRectangle.hpp"
 #include "MeshUtils.hpp"
-#include "libslic3r/GCode/GCodeProcessor.hpp"
 #include "GCodeViewer.hpp"
 #include "Camera.hpp"
 #include "SceneRaycaster.hpp"
@@ -55,6 +51,14 @@
 #include <wx/time.h>
 #include <wx/timer.h>
 
+namespace Slic3r { class ColorRGBA; }
+namespace Slic3r { class DynamicPrintConfig; }
+namespace Slic3r { class GLShaderProgram; }
+namespace Slic3r { struct GCodeProcessorResult; }
+namespace Slic3r::GUI { class ImGuiWrapper; }
+namespace libvgcode { struct PathVertex; }
+struct ImVec2;
+
 class wxSizeEvent;
 class wxIdleEvent;
 class wxKeyEvent;

src/slic3r/GUI/GLSelectionRectangle.cpp

@@ -16,6 +16,8 @@
 #include "slic3r/GUI/OpenGLManager.hpp"
 #include <utility>
 #include "libslic3r/Color.hpp"
+#include "slic3r/GUI/GLModel.hpp"
+#include "slic3r/GUI/GLShader.hpp"
 
 namespace Slic3r {
 namespace GUI {

src/slic3r/GUI/GLShader.cpp

@@ -1,4 +1,3 @@
-#include "libslic3r/libslic3r.h"
 #include "GLShader.hpp"
 
 #include "3DScene.hpp"

src/slic3r/GUI/GLTexture.hpp

@@ -12,7 +12,8 @@
 #include <wx/font.h>
 #include <wx/gdicmn.h>
 
-class wxImage;
+class wxFont;
+
 
 namespace Slic3r {
 namespace GUI {

src/slic3r/GUI/GLToolbar.cpp

@@ -1,5 +1,4 @@
 #include "libslic3r/Point.hpp"
-#include "libslic3r/libslic3r.h"
 
 #include "GLToolbar.hpp"
 
@@ -11,7 +10,6 @@
 #include <boost/container_hash/hash.hpp>
 #include <boost/functional/hash.hpp>
 
-#include "slic3r/GUI/Event.hpp"
 #include "libslic3r/Utils.hpp"
 #include <cassert>
 #include <cstddef>
@@ -22,6 +20,11 @@
 #include <wx/dcmemory.h>
 #include <wx/settings.h>
 #include <wx/glcanvas.h>
+#include "slic3r/GUI/GLTexture.hpp"
+
+class wxFont;
+namespace Slic3r::GUI { struct IntEvent; }
+namespace Slic3r::GUI { struct SimpleEvent; }
 
 namespace Slic3r {
 namespace GUI {

src/slic3r/GUI/GUI.cpp

@@ -4,7 +4,6 @@
 #include "format.hpp"
 #include "I18N.hpp"
 
-#include "libslic3r/LocalesUtils.hpp"
 #include "libslic3r/Config.hpp"
 #include <memory>
 #include <vector>

src/slic3r/GUI/GUI_App.cpp

@@ -240,6 +240,21 @@
 #include "PluginsDialog.hpp"
 #include "SpeedDialDialog.hpp"
 #include "TerminalDialog.hpp"
+#include "libslic3r/Format/STEP.hpp"
+#include "libslic3r/Semver.hpp"
+#include "slic3r/GUI/ActionRegistry.hpp"
+#include "slic3r/GUI/Camera.hpp"
+#include "slic3r/GUI/ConfigWizard.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmosManager.hpp"
+#include "slic3r/GUI/HttpServer.hpp"
+#include "slic3r/GUI/ImGuiWrapper.hpp"
+#include "slic3r/GUI/ParamsDialog.hpp"
+#include "slic3r/GUI/ParamsPanel.hpp"
+#include "slic3r/GUI/PartPlate.hpp"
+#include "slic3r/GUI/Widgets/Button.hpp"
+#include "slic3r/GUI/wxExtensions.hpp"
+#include "slic3r/plugin/host/PluginPages.hpp"
+#include <wx/defs.h>
 
 //#ifdef WIN32
 //#include "BaseException.h"

src/slic3r/GUI/GUI_AuxiliaryList.hpp

@@ -15,7 +15,15 @@
 #include <wx/window.h>
 #include <wx/string.h>
 
-#include "AuxiliaryDataViewModel.hpp"
+class AuxiliaryModel;
+class AuxiliaryModelNode;
+class wxButton;
+class wxCommandEvent;
+class wxKeyEvent;
+class wxMouseEvent;
+class wxSizer;
+class wxWindow;
+
 
 class AuxiliaryList : public wxDataViewCtrl
 {

src/slic3r/GUI/GUI_Factories.cpp

@@ -14,7 +14,6 @@
 #include "OptionsGroup.hpp"
 #include "GLCanvas3D.hpp"
 #include "Selection.hpp"
-#include "format.hpp"
 //BBS: add partplate related logic
 #include "PartPlate.hpp"
 #include "Gizmos/GLGizmoEmboss.hpp"

src/slic3r/GUI/GUI_Geometry.cpp

@@ -1,4 +1,3 @@
-#include "libslic3r/libslic3r.h"
 #include "GUI_Geometry.hpp"
 
 namespace Slic3r {

src/slic3r/GUI/GUI_Init.cpp

@@ -2,13 +2,11 @@
 
 #include "libslic3r/AppConfig.hpp"
 
-#include "slic3r/GUI/GUI.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
-#include "slic3r/GUI/3DScene.hpp"
 #include "slic3r/GUI/InstanceCheck.hpp"
 #include "slic3r/GUI/format.hpp"
 #include "slic3r/GUI/MainFrame.hpp"
-#include "slic3r/GUI/Plater.hpp"
+#include "slic3r/GUI/I18N.hpp"
 
 // To show a message box if GUI initialization ends up with an exception thrown.
 #include <vector>
@@ -17,7 +15,6 @@
 #include "libslic3r/Exception.hpp"
 #include <boost/log/trivial.hpp>
 #include <ostream>
-#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
 #include <exception>
 #include <wx/msgdlg.h>
 

src/slic3r/GUI/GUI_ObjectList.cpp

@@ -51,7 +51,6 @@
 #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"
@@ -103,6 +102,9 @@
 #include "Gizmos/GLGizmoScale.hpp"
 
 #include "libslic3r/TriangleMeshDeal.hpp"
+
+class wxMenu;
+namespace Slic3r { class Step; }
 namespace Slic3r
 {
 namespace GUI

src/slic3r/GUI/GUI_ObjectList.hpp

@@ -20,11 +20,12 @@
 #include <wx/window.h>
 
 #include "Event.hpp"
-#include "wxExtensions.hpp"
 #include "ObjectDataViewModel.hpp"
 
 #include "libslic3r/PrintConfig.hpp"
 
+class wxBitmap;
+
 class wxBoxSizer;
 class wxBitmapComboBox;
 class wxMenuItem;