From d3128a12b6bdb6deb579b4098e0f7e066358daf3 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Mon, 9 Feb 2015 16:23:41 +0100
Subject: [PATCH] Remove a large include form mwbase/windowmanager.hpp

---
 apps/openmw/mwbase/windowmanager.hpp         | 12 ++++++++++--
 apps/openmw/mwgui/journalwindow.cpp          |  1 +
 apps/openmw/mwgui/settingswindow.cpp         |  1 +
 apps/openmw/mwgui/windowmanagerimp.cpp       |  1 +
 apps/openmw/mwgui/windowmanagerimp.hpp       |  1 +
 apps/openmw/mwmechanics/npcstats.hpp         |  2 --
 apps/openmw/mwscript/containerextensions.cpp |  2 ++
 7 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index c984b5e54..0d0731265 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -1,11 +1,11 @@
 #ifndef GAME_MWBASE_WINDOWMANAGER_H
 #define GAME_MWBASE_WINDOWMANAGER_H
 
+#include <cstdint>
 #include <string>
 #include <vector>
 #include <map>
-
-#include "../mwmechanics/stat.hpp"
+#include <set>
 
 #include "../mwgui/mode.hpp"
 
@@ -42,6 +42,14 @@ namespace ESM
     struct CellId;
 }
 
+namespace MWMechanics
+{
+    class AttributeValue;
+    template<typename T>
+    class DynamicStat;
+    class SkillValue;
+}
+
 namespace MWWorld
 {
     class CellStore;
diff --git a/apps/openmw/mwgui/journalwindow.cpp b/apps/openmw/mwgui/journalwindow.cpp
index afff5601a..d7e27a277 100644
--- a/apps/openmw/mwgui/journalwindow.cpp
+++ b/apps/openmw/mwgui/journalwindow.cpp
@@ -11,6 +11,7 @@
 #include <boost/bind.hpp>
 #include <boost/function.hpp>
 
+#include <components/misc/stringops.hpp>
 #include <components/widgets/imagebutton.hpp>
 #include <components/widgets/list.hpp>
 
diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 281093452..a4f87e598 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -14,6 +14,7 @@
 
 #include <SDL_video.h>
 
+#include <components/misc/stringops.hpp>
 #include <components/widgets/sharedstatebutton.hpp>
 #include <components/settings/settings.hpp>
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 715f47c46..7f32f2b27 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -42,6 +42,7 @@
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/esmstore.hpp"
 
+#include "../mwmechanics/stat.hpp"
 #include "../mwmechanics/npcstats.hpp"
 
 #include "../mwsound/soundmanagerimp.hpp"
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 9f01b136c..dfeef982b 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -12,6 +12,7 @@
 #include "../mwbase/windowmanager.hpp"
 
 #include <components/settings/settings.hpp>
+#include <components/to_utf8/to_utf8.hpp>
 
 #include "mapwindow.hpp"
 
diff --git a/apps/openmw/mwmechanics/npcstats.hpp b/apps/openmw/mwmechanics/npcstats.hpp
index 224366a3e..0b9090f28 100644
--- a/apps/openmw/mwmechanics/npcstats.hpp
+++ b/apps/openmw/mwmechanics/npcstats.hpp
@@ -6,8 +6,6 @@
 #include <string>
 #include <vector>
 
-#include "stat.hpp"
-
 #include "creaturestats.hpp"
 
 namespace ESM
diff --git a/apps/openmw/mwscript/containerextensions.cpp b/apps/openmw/mwscript/containerextensions.cpp
index 58b1b375b..69dfc9972 100644
--- a/apps/openmw/mwscript/containerextensions.cpp
+++ b/apps/openmw/mwscript/containerextensions.cpp
@@ -14,6 +14,8 @@
 #include <components/interpreter/runtime.hpp>
 #include <components/interpreter/opcodes.hpp>
 
+#include <components/misc/stringops.hpp>
+
 #include <components/esm/loadskil.hpp>
 
 #include "../mwbase/environment.hpp"