Includes cleanup:

GUI_App.hpp      (should not include) MainFrame.hpp
MainFrame.hpp    Plater.hpp
ModelArrange.hpp Model.hpp
Slicing.hpp      PrintConfig.hpp
FillBase.hpp     PrintConfig.hpp
GUI_App.hpp      PrintConfig.hpp
OptionsGroup.hpp GUI_App.hpp

src/PrusaSlicer.cpp

@@ -53,6 +53,8 @@
     #include "slic3r/GUI/3DScene.hpp"
     #include "slic3r/GUI/InstanceCheck.hpp" 
     #include "slic3r/GUI/AppConfig.hpp" 
+    #include "slic3r/GUI/MainFrame.hpp"
+    #include "slic3r/GUI/Plater.hpp"
 #endif /* SLIC3R_GUI */
 
 using namespace Slic3r;

src/libslic3r/Fill/FillBase.hpp

@@ -11,13 +11,13 @@
 
 #include "../libslic3r.h"
 #include "../BoundingBox.hpp"
-#include "../PrintConfig.hpp"
 #include "../Utils.hpp"
 
 namespace Slic3r {
 
 class ExPolygon;
 class Surface;
+enum InfillPattern : int;
 
 class InfillFailedException : public std::runtime_error {
 public:

src/libslic3r/ModelArrange.cpp

@@ -1,4 +1,6 @@
 #include "ModelArrange.hpp"
+
+#include <libslic3r/Model.hpp>
 #include "MTUtils.hpp"
 
 namespace Slic3r {

src/libslic3r/ModelArrange.hpp

@@ -1,11 +1,14 @@
 #ifndef MODELARRANGE_HPP
 #define MODELARRANGE_HPP
 
-#include <libslic3r/Model.hpp>
 #include <libslic3r/Arrange.hpp>
 
 namespace Slic3r {
 
+class Model;
+class ModelInstance;
+using ModelInstancePtrs = std::vector<ModelInstance*>;
+
 using arrangement::ArrangePolygon;
 using arrangement::ArrangePolygons;
 using arrangement::ArrangeParams;

src/libslic3r/PrintConfig.hpp

@@ -33,7 +33,7 @@ enum PrintHostType {
     htOctoPrint, htDuet, htFlashAir, htAstroBox
 };
 
-enum InfillPattern {
+enum InfillPattern : int {
     ipRectilinear, ipMonotonous, ipGrid, ipTriangles, ipStars, ipCubic, ipLine, ipConcentric, ipHoneycomb, ip3DHoneycomb,
     ipGyroid, ipHilbertCurve, ipArchimedeanChords, ipOctagramSpiral, ipCount,
 };

src/libslic3r/Slicing.hpp

@@ -11,7 +11,6 @@
 
 #include "libslic3r.h"
 #include "Utils.hpp"
-#include "PrintConfig.hpp"
 
 namespace Slic3r
 {
@@ -19,6 +18,7 @@ namespace Slic3r
 class PrintConfig;
 class PrintObjectConfig;
 class ModelObject;
+class DynamicPrintConfig;
 
 // Parameters to guide object slicing and support generation.
 // The slicing parameters account for a raft and whether the 1st object layer is printed with a normal or a bridging flow

src/slic3r/GUI/BackgroundSlicingProcess.cpp

@@ -1,6 +1,7 @@
 #include "BackgroundSlicingProcess.hpp"
 #include "GUI_App.hpp"
 #include "GUI.hpp"
+#include "MainFrame.hpp"
 
 #include <wx/app.h>
 #include <wx/panel.h>
@@ -34,6 +35,7 @@
 #include "RemovableDriveManager.hpp"
 
 #include "slic3r/Utils/Thread.hpp"
+#include "slic3r/GUI/Plater.hpp"
 
 namespace Slic3r {
 

src/slic3r/GUI/BedShapeDialog.cpp

@@ -1,4 +1,5 @@
 #include "BedShapeDialog.hpp"
+#include "GUI_App.hpp"
 
 #include <wx/wx.h> 
 #include <wx/numformatter.h>

src/slic3r/GUI/BedShapeDialog.hpp

@@ -4,6 +4,7 @@
 // The dialog opens from Print Settins tab->Bed Shape : Set...
 
 #include "OptionsGroup.hpp"
+#include "GUI_Utils.hpp"
 #include "2DBed.hpp"
 #include "I18N.hpp"
 

src/slic3r/GUI/ConfigWizard.cpp

@@ -27,6 +27,7 @@
 
 #include "libslic3r/Utils.hpp"
 #include "GUI.hpp"
+#include "GUI_App.hpp"
 #include "GUI_Utils.hpp"
 #include "slic3r/Config/Snapshot.hpp"
 #include "slic3r/Utils/PresetUpdater.hpp"

src/slic3r/GUI/DoubleSlider.cpp

@@ -2,6 +2,7 @@
 #include "libslic3r/GCode/PreviewData.hpp"
 #include "GUI.hpp"
 #include "GUI_App.hpp"
+#include "Plater.hpp"
 #include "I18N.hpp"
 #include "ExtruderSequenceDialog.hpp"
 #include "libslic3r/Print.hpp"

src/slic3r/GUI/Field.cpp

@@ -3,6 +3,8 @@
 #include "I18N.hpp"
 #include "Field.hpp"
 #include "wxExtensions.hpp"
+#include "Plater.hpp"
+#include "MainFrame.hpp"
 
 #include "libslic3r/PrintConfig.hpp"
 

src/slic3r/GUI/GLCanvas3D.cpp

@@ -23,6 +23,8 @@
 #include "slic3r/GUI/OpenGLManager.hpp"
 #include "slic3r/GUI/3DBed.hpp"
 #include "slic3r/GUI/Camera.hpp"
+#include "slic3r/GUI/Plater.hpp"
+#include "slic3r/GUI/MainFrame.hpp"
 
 #include "GUI_App.hpp"
 #include "GUI_ObjectList.hpp"

src/slic3r/GUI/GLCanvas3D.hpp

@@ -5,7 +5,6 @@
 #include <memory>
 #include <chrono>
 
-#include "3DScene.hpp"
 #include "GLToolbar.hpp"
 #include "GLShader.hpp"
 #include "Event.hpp"

src/slic3r/GUI/GLSelectionRectangle.cpp

@@ -3,6 +3,7 @@
 #include "3DScene.hpp"
 #include "GLCanvas3D.hpp"
 #include "GUI_App.hpp"
+#include "Plater.hpp"
 
 #include <GL/glew.h>
 

src/slic3r/GUI/GLToolbar.cpp

@@ -6,6 +6,7 @@
 #include "slic3r/GUI/GLCanvas3D.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/Camera.hpp"
+#include "slic3r/GUI/Plater.hpp"
 
 #include <wx/event.h>
 #include <wx/bitmap.h>

src/slic3r/GUI/GUI_App.cpp

@@ -37,6 +37,8 @@
 #include "AppConfig.hpp"
 #include "PresetBundle.hpp"
 #include "3DScene.hpp"
+#include "MainFrame.hpp"
+#include "Plater.hpp"
 
 #include "../Utils/PresetUpdater.hpp"
 #include "../Utils/PrintHost.hpp"

src/slic3r/GUI/GUI_App.hpp

@@ -3,8 +3,7 @@
 
 #include <memory>
 #include <string>
-#include "libslic3r/PrintConfig.hpp"
-#include "MainFrame.hpp"
+#include "Preset.hpp"
 #include "ImGuiWrapper.hpp"
 #include "ConfigWizard.hpp"
 #include "OpenGLManager.hpp"
@@ -30,11 +29,21 @@ class PresetBundle;
 class PresetUpdater;
 class ModelObject;
 class PrintHostJobQueue;
-
+class Model;
 
 namespace GUI{
 class RemovableDriveManager;
 class OtherInstanceMessageHandler;
+class MainFrame;
+class Sidebar;
+class ObjectManipulation;
+class ObjectSettings;
+class ObjectList;
+class ObjectLayers;
+class Plater;
+
+
+
 enum FileType
 {
     FT_STL,

src/slic3r/GUI/GUI_ObjectLayers.cpp

@@ -2,9 +2,11 @@
 #include "GUI_ObjectList.hpp"
 
 #include "OptionsGroup.hpp"
+#include "GUI_App.hpp"
 #include "PresetBundle.hpp"
 #include "libslic3r/Model.hpp"
 #include "GLCanvas3D.hpp"
+#include "Plater.hpp"
 
 #include <boost/algorithm/string.hpp>
 

src/slic3r/GUI/GUI_ObjectList.cpp

@@ -4,6 +4,7 @@
 #include "GUI_ObjectLayers.hpp"
 #include "GUI_App.hpp"
 #include "I18N.hpp"
+#include "Plater.hpp"
 
 #include "OptionsGroup.hpp"
 #include "PresetBundle.hpp"

src/slic3r/GUI/GUI_ObjectManipulation.cpp

@@ -4,11 +4,14 @@
 
 #include "GLCanvas3D.hpp"
 #include "OptionsGroup.hpp"
+#include "GUI_App.hpp"
 #include "wxExtensions.hpp"
 #include "PresetBundle.hpp"
 #include "libslic3r/Model.hpp"
 #include "libslic3r/Geometry.hpp"
 #include "Selection.hpp"
+#include "Plater.hpp"
+#include "MainFrame.hpp"
 
 #include <boost/algorithm/string.hpp>
 #include "slic3r/Utils/FixModelByWin10.hpp"

src/slic3r/GUI/GUI_ObjectSettings.cpp

@@ -2,8 +2,10 @@
 #include "GUI_ObjectList.hpp"
 
 #include "OptionsGroup.hpp"
+#include "GUI_App.hpp"
 #include "wxExtensions.hpp"
 #include "PresetBundle.hpp"
+#include "Plater.hpp"
 #include "libslic3r/Model.hpp"
 
 #include <boost/algorithm/string.hpp>

src/slic3r/GUI/GUI_Preview.cpp

@@ -10,6 +10,7 @@
 #include "GLCanvas3D.hpp"
 #include "PresetBundle.hpp"
 #include "DoubleSlider.hpp"
+#include "Plater.hpp"
 
 #include <wx/notebook.h>
 #include <wx/glcanvas.h>

src/slic3r/GUI/Gizmos/GLGizmoCut.cpp

@@ -12,6 +12,7 @@
 #include <algorithm>
 
 #include "slic3r/GUI/GUI_App.hpp"
+#include "slic3r/GUI/Plater.hpp"
 
 
 namespace Slic3r {

src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp

@@ -8,6 +8,7 @@
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/PresetBundle.hpp"
 #include "slic3r/GUI/Camera.hpp"
+#include "slic3r/GUI/Plater.hpp"
 #include "libslic3r/Model.hpp"
 
 

src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp

@@ -3,6 +3,7 @@
 #include "slic3r/GUI/GLCanvas3D.hpp"
 #include "slic3r/GUI/Camera.hpp"
 #include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp"
+#include "slic3r/GUI/MainFrame.hpp"
 
 #include <GL/glew.h>
 

src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp

@@ -6,6 +6,7 @@
 #include "libslic3r/SLAPrint.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/Camera.hpp"
+#include "slic3r/GUI/Plater.hpp"
 
 #include <GL/glew.h>
 

src/slic3r/GUI/Gizmos/GLGizmosManager.cpp

@@ -6,6 +6,7 @@
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/GUI_ObjectManipulation.hpp"
 #include "slic3r/GUI/PresetBundle.hpp"
+#include "slic3r/GUI/Plater.hpp"
 #include "slic3r/Utils/UndoRedo.hpp"
 
 #include "slic3r/GUI/Gizmos/GLGizmoMove.hpp"

src/slic3r/GUI/InstanceCheck.cpp

@@ -1,5 +1,10 @@
 #include "GUI_App.hpp"
 #include "InstanceCheck.hpp"
+#include "Plater.hpp"
+
+#ifdef _WIN32
+  #include "MainFrame.hpp"
+#endif
 
 #include "libslic3r/Utils.hpp"
 #include "libslic3r/Config.hpp"

src/slic3r/GUI/LambdaObjectDialog.cpp

@@ -3,6 +3,7 @@
 #include <wx/window.h>
 #include <wx/button.h>
 #include "OptionsGroup.hpp"
+#include "GUI_App.hpp"
 #include "I18N.hpp"
 
 namespace Slic3r

src/slic3r/GUI/MainFrame.cpp

@@ -29,6 +29,7 @@
 #include "InstanceCheck.hpp"
 #include "I18N.hpp"
 #include "GLCanvas3D.hpp"
+#include "Plater.hpp"
 
 #include <fstream>
 #include "GUI_App.hpp"

src/slic3r/GUI/MainFrame.hpp

@@ -12,7 +12,6 @@
 #include <map>
 
 #include "GUI_Utils.hpp"
-#include "Plater.hpp"
 #include "Event.hpp"
 
 class wxNotebook;
@@ -27,6 +26,8 @@ namespace GUI
 
 class Tab;
 class PrintHostQueueDialog;
+class Plater;
+class MainFrame;
 
 enum QuickSlice
 {

src/slic3r/GUI/Mouse3DController.cpp

@@ -6,6 +6,7 @@
 #include "PresetBundle.hpp"
 #include "AppConfig.hpp"
 #include "GLCanvas3D.hpp"
+#include "Plater.hpp"
 
 #include <wx/glcanvas.h>
 

src/slic3r/GUI/OptionsGroup.cpp

@@ -1,5 +1,7 @@
 #include "OptionsGroup.hpp"
 #include "ConfigExceptions.hpp"
+#include "Plater.hpp"
+#include "GUI_App.hpp"
 
 #include <utility>
 #include <wx/numformatter.h>
@@ -100,6 +102,36 @@ const t_field& OptionsGroup::build_field(const t_config_option_key& id, const Co
     return field;
 }
 
+OptionsGroup::OptionsGroup(	wxWindow* _parent, const wxString& title,
+                            bool is_tab_opt /* = false */,
+                            column_t extra_clmn /* = nullptr */) :
+                m_parent(_parent), title(title),
+                m_show_modified_btns(is_tab_opt),
+                staticbox(title!=""), extra_column(extra_clmn)
+{
+    if (staticbox) {
+        stb = new wxStaticBox(_parent, wxID_ANY, _(title));
+        if (!wxOSX) stb->SetBackgroundStyle(wxBG_STYLE_PAINT);
+        stb->SetFont(wxOSX ? wxGetApp().normal_font() : wxGetApp().bold_font());
+    } else
+        stb = nullptr;
+    sizer = (staticbox ? new wxStaticBoxSizer(stb, wxVERTICAL) : new wxBoxSizer(wxVERTICAL));
+    auto num_columns = 1U;
+    if (label_width != 0) num_columns++;
+    if (extra_column != nullptr) num_columns++;
+    m_grid_sizer = new wxFlexGridSizer(0, num_columns, 1,0);
+    static_cast<wxFlexGridSizer*>(m_grid_sizer)->SetFlexibleDirection(wxBOTH/*wxHORIZONTAL*/);
+    static_cast<wxFlexGridSizer*>(m_grid_sizer)->AddGrowableCol(label_width == 0 ? 0 : !extra_column ? 1 : 2 );
+#if 0//#ifdef __WXGTK__
+    m_panel = new wxPanel( _parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    sizer->Fit(m_panel);
+    sizer->Add(m_panel, 0, wxEXPAND | wxALL, wxOSX||!staticbox ? 0: 5);
+#else
+    sizer->Add(m_grid_sizer, 0, wxEXPAND | wxALL, wxOSX||!staticbox ? 0: 5);
+#endif /* __WXGTK__ */
+
+}
+
 void OptionsGroup::add_undo_buttuns_to_sizer(wxSizer* sizer, const t_field& field)
 {
 	if (!m_show_modified_btns) {

src/slic3r/GUI/OptionsGroup.hpp

@@ -11,7 +11,6 @@
 #include "libslic3r/PrintConfig.hpp"
 
 #include "Field.hpp"
-#include "GUI_App.hpp"
 #include "I18N.hpp"
 
 // Translate the ifdef 
@@ -171,32 +170,7 @@ public:
     }
 
 	OptionsGroup(	wxWindow* _parent, const wxString& title, bool is_tab_opt = false, 
-					column_t extra_clmn = nullptr) :
-					m_parent(_parent), title(title), 
-                    m_show_modified_btns(is_tab_opt),
-					staticbox(title!=""), extra_column(extra_clmn) {
-        if (staticbox) {
-            stb = new wxStaticBox(_parent, wxID_ANY, _(title));
-            if (!wxOSX) stb->SetBackgroundStyle(wxBG_STYLE_PAINT);
-            stb->SetFont(wxOSX ? wxGetApp().normal_font() : wxGetApp().bold_font());
-        } else
-        	stb = nullptr;
-        sizer = (staticbox ? new wxStaticBoxSizer(stb, wxVERTICAL) : new wxBoxSizer(wxVERTICAL));
-        auto num_columns = 1U;
-        if (label_width != 0) num_columns++;
-        if (extra_column != nullptr) num_columns++;
-        m_grid_sizer = new wxFlexGridSizer(0, num_columns, 1,0);
-        static_cast<wxFlexGridSizer*>(m_grid_sizer)->SetFlexibleDirection(wxBOTH/*wxHORIZONTAL*/);
-        static_cast<wxFlexGridSizer*>(m_grid_sizer)->AddGrowableCol(label_width == 0 ? 0 : !extra_column ? 1 : 2 );
-#if 0//#ifdef __WXGTK__
-        m_panel = new wxPanel( _parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-        sizer->Fit(m_panel);
-        sizer->Add(m_panel, 0, wxEXPAND | wxALL, wxOSX||!staticbox ? 0: 5);
-#else
-        sizer->Add(m_grid_sizer, 0, wxEXPAND | wxALL, wxOSX||!staticbox ? 0: 5);
-#endif /* __WXGTK__ */
-
-    }
+                    column_t extra_clmn = nullptr);
 
     wxGridSizer*        get_grid_sizer() { return m_grid_sizer; }
 

src/slic3r/GUI/Preferences.cpp

@@ -1,6 +1,7 @@
 #include "Preferences.hpp"
 #include "AppConfig.hpp"
 #include "OptionsGroup.hpp"
+#include "GUI_App.hpp"
 #include "I18N.hpp"
 
 namespace Slic3r {
@@ -364,4 +365,4 @@ void PreferencesDialog::create_settings_mode_widget()
 
 
 } // GUI
-} // Slic3r
+} // Slic3r

src/slic3r/GUI/Search.cpp

@@ -10,6 +10,7 @@
 
 #include "libslic3r/PrintConfig.hpp"
 #include "GUI_App.hpp"
+#include "Plater.hpp"
 #include "Tab.hpp"
 #include "PresetBundle.hpp"
 

src/slic3r/GUI/Selection.cpp

@@ -9,6 +9,7 @@
 #include "GUI_ObjectList.hpp"
 #include "Gizmos/GLGizmoBase.hpp"
 #include "Camera.hpp"
+#include "Plater.hpp"
 
 #include "libslic3r/Model.hpp"
 

src/slic3r/GUI/SysInfoDialog.cpp

@@ -3,6 +3,7 @@
 #include "3DScene.hpp"
 #include "GUI.hpp"
 #include "../Utils/UndoRedo.hpp"
+#include "Plater.hpp"
 
 #include <string>
 

src/slic3r/GUI/Tab.cpp

@@ -32,6 +32,8 @@
 #include "GUI_App.hpp"
 #include "GUI_ObjectList.hpp"
 #include "ConfigWizard.hpp"
+#include "Plater.hpp"
+#include "MainFrame.hpp"
 #include "format.hpp"
 
 namespace Slic3r {

src/slic3r/GUI/Tab.hpp

@@ -33,6 +33,8 @@
 #include "Event.hpp"
 #include "wxExtensions.hpp"
 #include "ConfigManipulation.hpp"
+#include "Preset.hpp"
+#include "GUI_App.hpp"
 
 namespace Slic3r {
 namespace GUI {

src/slic3r/GUI/wxExtensions.cpp

@@ -13,6 +13,7 @@
 #include "GUI_ObjectList.hpp"
 #include "I18N.hpp"
 #include "GUI_Utils.hpp"
+#include "Plater.hpp"
 #include "../Utils/MacDarkMode.hpp"
 
 #ifndef __WXGTK__// msw_menuitem_bitmaps is used for MSW and OSX

src/slic3r/Utils/PresetUpdater.cpp

@@ -25,6 +25,7 @@
 #include "slic3r/GUI/UpdateDialogs.hpp"
 #include "slic3r/GUI/ConfigWizard.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
+#include "slic3r/GUI/Plater.hpp"
 #include "slic3r/GUI/format.hpp"
 #include "slic3r/Utils/Http.hpp"
 #include "slic3r/Config/Version.hpp"