Remove forward declarations used by smart pointers

apps/openmw/mwgui/enchantingdialog.hpp

@@ -3,6 +3,7 @@
 
 #include <memory>
 
+#include "itemselection.hpp"
 #include "spellcreationdialog.hpp"
 
 #include "../mwmechanics/enchanting.hpp"
@@ -10,7 +11,6 @@
 namespace MWGui
 {
 
-    class ItemSelectionDialog;
     class ItemWidget;
 
     class EnchantingDialog : public WindowBase, public ReferenceInterface, public EffectEditorBase

apps/openmw/mwgui/hud.hpp

@@ -4,6 +4,7 @@
 #include <memory>
 
 #include "mapwindow.hpp"
+#include "spellicons.hpp"
 #include "statswatcher.hpp"
 
 namespace MWWorld
@@ -14,7 +15,6 @@ namespace MWWorld
 namespace MWGui
 {
     class DragAndDrop;
-    class SpellIcons;
     class ItemWidget;
     class SpellWidget;
 

apps/openmw/mwgui/itemselection.hpp

@@ -14,7 +14,6 @@ namespace MWGui
 {
     class ItemView;
     class SortFilterItemModel;
-    class InventoryItemModel;
 
     class ItemSelectionDialog : public WindowModal
     {

apps/openmw/mwgui/mainmenu.hpp

@@ -3,6 +3,7 @@
 
 #include <memory>
 
+#include "savegamedialog.hpp"
 #include "windowbase.hpp"
 
 namespace Gui
@@ -19,7 +20,6 @@ namespace MWGui
 {
 
     class BackgroundImage;
-    class SaveGameDialog;
     class VideoWidget;
 
     class MainMenu : public WindowBase

apps/openmw/mwgui/quickkeysmenu.hpp

@@ -3,15 +3,14 @@
 
 #include <memory>
 
-#include "windowbase.hpp"
-
+#include "itemselection.hpp"
 #include "spellmodel.hpp"
+#include "windowbase.hpp"
 
 namespace MWGui
 {
 
     class QuickKeysMenuAssign;
-    class ItemSelectionDialog;
     class MagicSelectionDialog;
     class ItemWidget;
     class SpellView;

apps/openmw/mwgui/spellwindow.hpp

@@ -3,13 +3,12 @@
 
 #include <memory>
 
-#include "windowpinnablebase.hpp"
-
+#include "spellicons.hpp"
 #include "spellmodel.hpp"
+#include "windowpinnablebase.hpp"
 
 namespace MWGui
 {
-    class SpellIcons;
     class SpellView;
 
     class SpellWindow : public WindowPinnableBase, public NoDrop

apps/openmw/mwgui/windowmanagerimp.hpp

@@ -14,22 +14,32 @@
 #include <osg/ref_ptr>
 
 #include "../mwbase/windowmanager.hpp"
+#include "../mwrender/localmap.hpp"
 
+#include <components/misc/guarded.hpp>
+#include <components/myguiplatform/myguiplatform.hpp>
 #include <components/sdlutil/events.hpp>
+#include <components/sdlutil/sdlcursormanager.hpp>
+#include <components/sdlutil/sdlvideowrapper.hpp>
 #include <components/settings/settings.hpp>
 #include <components/to_utf8/to_utf8.hpp>
-#include <components/misc/guarded.hpp>
 
+#include "charactercreation.hpp"
+#include "draganddrop.hpp"
 #include "mapwindow.hpp"
+#include "messagebox.hpp"
+#include "soulgemdialog.hpp"
 #include "statswatcher.hpp"
 #include "textcolours.hpp"
+#include "tooltips.hpp"
+#include "windowbase.hpp"
 
+#include <MyGUI_Gui.h>
 #include <MyGUI_KeyCode.h>
 #include <MyGUI_Types.h>
 
 namespace MyGUI
 {
-    class Gui;
     class Widget;
     class Window;
     class UString;
@@ -70,42 +80,21 @@ namespace SceneUtil
     class WorkQueue;
 }
 
-namespace SDLUtil
-{
-    class SDLCursorManager;
-    class VideoWrapper;
-}
-
-namespace osgMyGUI
-{
-    class Platform;
-}
-
 namespace Gui
 {
     class FontLoader;
 }
 
-namespace MWRender
-{
-    class LocalMap;
-}
-
 namespace MWGui
 {
-  class WindowBase;
   class HUD;
   class MapWindow;
   class MainMenu;
   class StatsWindow;
   class InventoryWindow;
   struct JournalWindow;
-  class CharacterCreation;
-  class DragAndDrop;
-  class ToolTips;
   class TextInputDialog;
   class InfoBoxDialog;
-  class MessageBoxManager;
   class SettingsWindow;
   class AlchemyWindow;
   class QuickKeysMenu;
@@ -117,7 +106,6 @@ namespace MWGui
   class TrainingWindow;
   class SpellIcons;
   class MerchantRepair;
-  class SoulgemDialog;
   class Recharge;
   class CompanionWindow;
   class VideoWidget;