Replace many includes with forward declarations

apps/openmw/mwbase/inputmanager.hpp

@@ -5,7 +5,6 @@
 #include <string>
 #include <vector>
 
-#include <MyGUI_Widget.h>
 #include <SDL_gamecontroller.h>
 #include <cstdint>
 
@@ -20,6 +19,11 @@ namespace ESM
     class ESMWriter;
 }
 
+namespace MyGUI
+{
+    class Widget;
+}
+
 namespace MWBase
 {
     /// \brief Interface for input manager (implemented in MWInput)

apps/openmw/mwbase/windowmanager.hpp

@@ -11,10 +11,9 @@
 
 #include <MyGUI_KeyCode.h>
 
-#include "../mwgui/hud.hpp"
 #include "../mwgui/mode.hpp"
-#include "../mwgui/windowbase.hpp"
 
+#include <components/esm/refid.hpp>
 #include <components/sdlutil/events.hpp>
 
 namespace ESM
@@ -80,6 +79,8 @@ namespace MWGui
     class MessageBox;
     class PostProcessorHud;
     class SettingsWindow;
+    class HUD;
+    class WindowBase;
 
     enum ShowInDialogueMode
     {

apps/openmw/mwgui/companionwindow.hpp

@@ -1,8 +1,6 @@
 #ifndef OPENMW_MWGUI_COMPANIONWINDOW_H
 #define OPENMW_MWGUI_COMPANIONWINDOW_H
 
-#include "companionitemmodel.hpp"
-#include "itemmodel.hpp"
 #include "referenceinterface.hpp"
 #include "windowbase.hpp"
 
@@ -46,7 +44,7 @@ namespace MWGui
         void setActiveControllerWindow(bool active) override;
 
         MWGui::ItemView* getItemView() { return mItemView; }
-        ItemModel* getModel() { return mModel; }
+        CompanionItemModel* getModel() { return mModel; }
 
     private:
         ItemView* mItemView;

apps/openmw/mwgui/countdialog.cpp

@@ -5,6 +5,7 @@
 #include <MyGUI_ScrollBar.h>
 
 #include <components/widgets/numericeditbox.hpp>
+#include <components/widgets/scrollbar.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"

apps/openmw/mwgui/countdialog.hpp

@@ -3,11 +3,10 @@
 
 #include "windowbase.hpp"
 
-#include <components/widgets/scrollbar.hpp>
-
 namespace Gui
 {
     class NumericEditBox;
+    class ScrollBar;
 }
 
 namespace MWGui

apps/openmw/mwgui/inventorytabsoverlay.cpp

@@ -1,5 +1,6 @@
 #include "inventorytabsoverlay.hpp"
 
+#include <MyGUI_Button.h>
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_Window.h>
 

apps/openmw/mwgui/inventorytabsoverlay.hpp

@@ -1,10 +1,13 @@
 #ifndef MWGUI_INVENTORYTABSSOVERLAY_H
 #define MWGUI_INVENTORYTABSSOVERLAY_H
 
-#include <MyGUI_Button.h>
-
 #include "windowbase.hpp"
 
+namespace MyGUI
+{
+    class Button;
+}
+
 namespace MWGui
 {
     class InventoryTabsOverlay : public WindowBase

apps/openmw/mwgui/itemchargeview.cpp

@@ -24,6 +24,7 @@
 #include "itemmodel.hpp"
 #include "itemwidget.hpp"
 #include "textcolours.hpp"
+#include "windowbase.hpp"
 
 namespace MWGui
 {

apps/openmw/mwgui/itemview.hpp

@@ -2,7 +2,6 @@
 #define MWGUI_ITEMVIEW_H
 
 #include <MyGUI_Widget.h>
-#include <SDL.h>
 
 #include "itemmodel.hpp"
 

apps/openmw/mwgui/quickkeysmenu.cpp

@@ -11,6 +11,7 @@
 #include <components/esm3/quickkeys.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
+#include <components/settings/values.hpp>
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"

apps/openmw/mwgui/race.cpp

@@ -13,6 +13,7 @@
 #include <components/esm3/loadrace.hpp>
 #include <components/myguiplatform/myguitexture.hpp>
 #include <components/settings/values.hpp>
+#include <components/widgets/scrollbar.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"

apps/openmw/mwgui/race.hpp

@@ -3,7 +3,6 @@
 
 #include "windowbase.hpp"
 #include <components/esm/refid.hpp>
-#include <components/widgets/scrollbar.hpp>
 #include <memory>
 
 namespace MWRender
@@ -26,6 +25,11 @@ namespace Resource
     class ResourceSystem;
 }
 
+namespace Gui
+{
+    class ScrollBar;
+}
+
 namespace MWGui
 {
     class RaceDialog : public WindowModal

apps/openmw/mwgui/spellcreationdialog.cpp

@@ -9,6 +9,7 @@
 #include <components/resource/resourcesystem.hpp>
 #include <components/settings/values.hpp>
 #include <components/widgets/list.hpp>
+#include <components/widgets/scrollbar.hpp>
 
 #include <components/esm3/loadgmst.hpp>
 

apps/openmw/mwgui/spellcreationdialog.hpp

@@ -1,12 +1,10 @@
 #ifndef MWGUI_SPELLCREATION_H
 #define MWGUI_SPELLCREATION_H
 
-#include <SDL.h>
 #include <memory>
 
 #include <components/esm3/loadmgef.hpp>
 #include <components/esm3/loadspel.hpp>
-#include <components/widgets/scrollbar.hpp>
 
 #include "referenceinterface.hpp"
 #include "widgets.hpp"
@@ -15,6 +13,7 @@
 namespace Gui
 {
     class MWList;
+    class ScrollBar;
 }
 
 namespace MWGui

apps/openmw/mwgui/spellview.cpp

@@ -14,6 +14,7 @@
 #include "../mwbase/windowmanager.hpp"
 
 #include "tooltips.hpp"
+#include "windowbase.hpp"
 
 namespace MWGui
 {

apps/openmw/mwgui/spellview.hpp

@@ -5,9 +5,6 @@
 #include <tuple>
 
 #include <MyGUI_Widget.h>
-#include <SDL.h>
-
-#include <components/widgets/sharedstatebutton.hpp>
 
 #include "spellmodel.hpp"
 
@@ -16,6 +13,11 @@ namespace MyGUI
     class ScrollView;
 }
 
+namespace Gui
+{
+    class SharedStateButton;
+}
+
 namespace MWGui
 {
 

apps/openmw/mwgui/waitdialog.cpp

@@ -10,6 +10,7 @@
 #include <components/misc/strings/format.hpp>
 #include <components/settings/values.hpp>
 #include <components/widgets/box.hpp>
+#include <components/widgets/scrollbar.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"

apps/openmw/mwgui/waitdialog.hpp

@@ -4,7 +4,11 @@
 #include "timeadvancer.hpp"
 #include "windowbase.hpp"
 #include <components/esm/refid.hpp>
-#include <components/widgets/scrollbar.hpp>
+
+namespace Gui
+{
+    class ScrollBar;
+}
 
 namespace MWGui
 {

apps/openmw/mwgui/windowbase.hpp

@@ -1,7 +1,7 @@
 #ifndef MWGUI_WINDOW_BASE_H
 #define MWGUI_WINDOW_BASE_H
 
-#include <SDL.h>
+#include <SDL_events.h>
 
 #include "layout.hpp"
 

apps/openmw/mwgui/windowmanagerimp.cpp

@@ -83,6 +83,7 @@
 #include "confirmationdialog.hpp"
 #include "console.hpp"
 #include "container.hpp"
+#include "controllerbuttonsoverlay.hpp"
 #include "controllers.hpp"
 #include "countdialog.hpp"
 #include "cursor.hpp"
@@ -91,6 +92,7 @@
 #include "enchantingdialog.hpp"
 #include "exposedwindow.hpp"
 #include "hud.hpp"
+#include "inventorytabsoverlay.hpp"
 #include "inventorywindow.hpp"
 #include "itemchargeview.hpp"
 #include "itemtransfer.hpp"

apps/openmw/mwgui/windowmanagerimp.hpp

@@ -24,9 +24,7 @@
 #include <components/toutf8/toutf8.hpp>
 
 #include "charactercreation.hpp"
-#include "controllerbuttonsoverlay.hpp"
 #include "draganddrop.hpp"
-#include "inventorytabsoverlay.hpp"
 #include "mapwindow.hpp"
 #include "messagebox.hpp"
 #include "settings.hpp"
@@ -47,6 +45,8 @@ namespace MyGUI
     class Window;
     class UString;
     class ImageBox;
+    class ControllerButtonsOverlay;
+    class InventoryTabsOverlay;
 }
 
 namespace MWWorld