Include cleanup

apps/openmw/mwgui/alchemywindow.cpp

@@ -1,6 +1,8 @@
 #include "alchemywindow.hpp"
 
 #include <MyGUI_Gui.h>
+#include <MyGUI_Button.h>
+#include <MyGUI_EditBox.h>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -19,6 +21,7 @@
 #include "sortfilteritemmodel.hpp"
 #include "itemview.hpp"
 #include "itemwidget.hpp"
+#include "widgets.hpp"
 
 namespace MWGui
 {

apps/openmw/mwgui/alchemywindow.hpp

@@ -5,7 +5,6 @@
 
 #include "../mwmechanics/alchemy.hpp"
 
-#include "widgets.hpp"
 #include "windowbase.hpp"
 
 namespace MWMechanics

apps/openmw/mwgui/companionwindow.cpp

@@ -13,6 +13,7 @@
 #include "companionitemmodel.hpp"
 #include "draganddrop.hpp"
 #include "countdialog.hpp"
+#include "widgets.hpp"
 
 namespace
 {

apps/openmw/mwgui/companionwindow.hpp

@@ -1,12 +1,16 @@
 #ifndef OPENMW_MWGUI_COMPANIONWINDOW_H
 #define OPENMW_MWGUI_COMPANIONWINDOW_H
 
-#include "widgets.hpp"
 #include "windowbase.hpp"
 #include "referenceinterface.hpp"
 
 namespace MWGui
 {
+    namespace Widgets
+    {
+        class MWDynamicStat;
+    }
+
     class MessageBoxManager;
     class ItemView;
     class DragAndDrop;

apps/openmw/mwgui/dialogue.cpp

@@ -3,6 +3,8 @@
 #include <MyGUI_LanguageManager.h>
 #include <MyGUI_Window.h>
 #include <MyGUI_ProgressBar.h>
+#include <MyGUI_ScrollBar.h>
+#include <MyGUI_Button.h>
 
 #include <components/widgets/list.hpp>
 #include <components/translation/translation.hpp>
@@ -20,7 +22,6 @@
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/actorutil.hpp"
 
-#include "widgets.hpp"
 #include "bookpage.hpp"
 #include "textcolours.hpp"
 

apps/openmw/mwgui/recharge.cpp

@@ -21,7 +21,6 @@
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/actorutil.hpp"
 
-#include "widgets.hpp"
 #include "itemwidget.hpp"
 #include "itemchargeview.hpp"
 #include "sortfilteritemmodel.hpp"

apps/openmw/mwgui/repair.cpp

@@ -17,8 +17,6 @@
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/class.hpp"
 
-#include "widgets.hpp"
-
 #include "itemwidget.hpp"
 #include "itemchargeview.hpp"
 #include "sortfilteritemmodel.hpp"

apps/openmw/mwgui/savegamedialog.cpp

@@ -29,7 +29,6 @@
 #include "../mwstate/character.hpp"
 
 #include "confirmationdialog.hpp"
-#include "widgets.hpp"
 
 namespace MWGui
 {

apps/openmw/mwgui/waitdialog.cpp

@@ -2,6 +2,7 @@
 
 #include <MyGUI_ProgressBar.h>
 #include <MyGUI_InputManager.h>
+#include <MyGUI_ScrollBar.h>
 
 #include <components/misc/rng.hpp>
 
@@ -24,8 +25,6 @@
 
 #include "../mwstate/charactermanager.hpp"
 
-#include "widgets.hpp"
-
 namespace MWGui
 {