From 6128b9276f35d75c6fccb5a05e458fc8537ac5bc Mon Sep 17 00:00:00 2001
From: Britt Mathis <britt.mathis@gmail.com>
Date: Thu, 11 Apr 2013 00:21:56 -0400
Subject: [PATCH] Removed non-essential includes from all MWGui header files.

---
 apps/openmw/mwgui/alchemywindow.hpp     | 2 +-
 apps/openmw/mwgui/charactercreation.hpp | 4 ----
 apps/openmw/mwgui/container.hpp         | 3 ---
 apps/openmw/mwgui/cursor.hpp            | 1 -
 apps/openmw/mwgui/dialogue.hpp          | 3 ---
 apps/openmw/mwgui/dialoguehistory.hpp   | 1 +
 apps/openmw/mwgui/enchantingdialog.hpp  | 2 --
 apps/openmw/mwgui/hud.hpp               | 2 --
 apps/openmw/mwgui/itemselection.hpp     | 2 --
 apps/openmw/mwgui/journalwindow.hpp     | 3 ---
 apps/openmw/mwgui/list.hpp              | 1 -
 apps/openmw/mwgui/loadingscreen.hpp     | 1 -
 apps/openmw/mwgui/messagebox.hpp        | 2 --
 apps/openmw/mwgui/quickkeysmenu.hpp     | 1 -
 apps/openmw/mwgui/race.hpp              | 5 -----
 apps/openmw/mwgui/repair.hpp            | 1 -
 apps/openmw/mwgui/review.hpp            | 1 -
 apps/openmw/mwgui/statswindow.hpp       | 5 -----
 apps/openmw/mwgui/tradewindow.hpp       | 3 ---
 apps/openmw/mwgui/travelwindow.hpp      | 3 ---
 apps/openmw/mwgui/widgets.hpp           | 2 --
 apps/openmw/mwgui/windowmanagerimp.hpp  | 5 -----
 22 files changed, 2 insertions(+), 51 deletions(-)

diff --git a/apps/openmw/mwgui/alchemywindow.hpp b/apps/openmw/mwgui/alchemywindow.hpp
index c61d2f92b3..655a832c17 100644
--- a/apps/openmw/mwgui/alchemywindow.hpp
+++ b/apps/openmw/mwgui/alchemywindow.hpp
@@ -5,12 +5,12 @@
 
 #include "../mwmechanics/alchemy.hpp"
 
-#include "windowbase.hpp"
 #include "container.hpp"
 #include "widgets.hpp"
 
 namespace MWGui
 {
+
     class AlchemyWindow : public WindowBase, public ContainerBase
     {
     public:
diff --git a/apps/openmw/mwgui/charactercreation.hpp b/apps/openmw/mwgui/charactercreation.hpp
index fed77e889f..586faf966e 100644
--- a/apps/openmw/mwgui/charactercreation.hpp
+++ b/apps/openmw/mwgui/charactercreation.hpp
@@ -1,13 +1,9 @@
 #ifndef CHARACTER_CREATION_HPP
 #define CHARACTER_CREATION_HPP
 
-#include "../mwworld/esmstore.hpp"
-
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 
-#include "../mwmechanics/stat.hpp"
-
 namespace MWGui
 {
     class WindowBase;
diff --git a/apps/openmw/mwgui/container.hpp b/apps/openmw/mwgui/container.hpp
index 521ac8cc35..8440c6444e 100644
--- a/apps/openmw/mwgui/container.hpp
+++ b/apps/openmw/mwgui/container.hpp
@@ -1,13 +1,10 @@
 #ifndef MGUI_CONTAINER_H
 #define MGUI_CONTAINER_H
 
-#include "../mwworld/esmstore.hpp"
-
 #include "windowbase.hpp"
 #include "referenceinterface.hpp"
 
 #include "../mwclass/container.hpp"
-#include "../mwworld/ptr.hpp"
 #include "../mwworld/containerstore.hpp"
 
 
diff --git a/apps/openmw/mwgui/cursor.hpp b/apps/openmw/mwgui/cursor.hpp
index 3a4a05f4ca..badf82262b 100644
--- a/apps/openmw/mwgui/cursor.hpp
+++ b/apps/openmw/mwgui/cursor.hpp
@@ -3,7 +3,6 @@
 
 #include <MyGUI_IPointer.h>
 #include <MyGUI_ResourceImageSet.h>
-#include <MyGUI_RTTI.h>
 
 namespace MWGui
 {
diff --git a/apps/openmw/mwgui/dialogue.hpp b/apps/openmw/mwgui/dialogue.hpp
index a1bbee02c7..74fa8051c5 100644
--- a/apps/openmw/mwgui/dialogue.hpp
+++ b/apps/openmw/mwgui/dialogue.hpp
@@ -3,9 +3,6 @@
 
 #include "windowbase.hpp"
 #include "referenceinterface.hpp"
-#include <boost/array.hpp>
-
-#include "../mwworld/ptr.hpp"
 
 namespace MWGui
 {
diff --git a/apps/openmw/mwgui/dialoguehistory.hpp b/apps/openmw/mwgui/dialoguehistory.hpp
index c37504af77..4cf6de621d 100644
--- a/apps/openmw/mwgui/dialoguehistory.hpp
+++ b/apps/openmw/mwgui/dialoguehistory.hpp
@@ -1,5 +1,6 @@
 #ifndef MWGUI_DIALOGE_HISTORY_H
 #define MWGUI_DIALOGE_HISTORY_H
+
 #include <openengine/gui/layout.hpp>
 
 namespace MWGui
diff --git a/apps/openmw/mwgui/enchantingdialog.hpp b/apps/openmw/mwgui/enchantingdialog.hpp
index c727a09749..8bad60c8e6 100644
--- a/apps/openmw/mwgui/enchantingdialog.hpp
+++ b/apps/openmw/mwgui/enchantingdialog.hpp
@@ -1,8 +1,6 @@
 #ifndef MWGUI_ENCHANTINGDIALOG_H
 #define MWGUI_ENCHANTINGDIALOG_H
 
-#include "windowbase.hpp"
-#include "referenceinterface.hpp"
 #include "spellcreationdialog.hpp"
 
 #include "../mwbase/windowmanager.hpp"
diff --git a/apps/openmw/mwgui/hud.hpp b/apps/openmw/mwgui/hud.hpp
index c65566ce3e..1dd53683b8 100644
--- a/apps/openmw/mwgui/hud.hpp
+++ b/apps/openmw/mwgui/hud.hpp
@@ -1,7 +1,5 @@
 #include "mapwindow.hpp"
 
-#include <openengine/gui/layout.hpp>
-
 #include "../mwmechanics/stat.hpp"
 #include "../mwworld/ptr.hpp"
 
diff --git a/apps/openmw/mwgui/itemselection.hpp b/apps/openmw/mwgui/itemselection.hpp
index 3e812d26c5..19007de6b0 100644
--- a/apps/openmw/mwgui/itemselection.hpp
+++ b/apps/openmw/mwgui/itemselection.hpp
@@ -1,7 +1,5 @@
 #include "container.hpp"
 
-#include "../mwworld/ptr.hpp"
-
 namespace MWGui
 {
 
diff --git a/apps/openmw/mwgui/journalwindow.hpp b/apps/openmw/mwgui/journalwindow.hpp
index 7670b65f55..da05a6f0ec 100644
--- a/apps/openmw/mwgui/journalwindow.hpp
+++ b/apps/openmw/mwgui/journalwindow.hpp
@@ -1,10 +1,7 @@
 #ifndef MWGUI_JOURNAL_H
 #define MWGUI_JOURNAL_H
 
-#include <sstream>
-#include <set>
 #include <string>
-#include <utility>
 
 #include "windowbase.hpp"
 #include "imagebutton.hpp"
diff --git a/apps/openmw/mwgui/list.hpp b/apps/openmw/mwgui/list.hpp
index 09e42e865e..956523c0dc 100644
--- a/apps/openmw/mwgui/list.hpp
+++ b/apps/openmw/mwgui/list.hpp
@@ -1,7 +1,6 @@
 #ifndef MWGUI_LIST_HPP
 #define MWGUI_LIST_HPP
 
-#include <MyGUI_Widget.h>
 #include <MyGUI_ScrollView.h>
 
 namespace MWGui
diff --git a/apps/openmw/mwgui/loadingscreen.hpp b/apps/openmw/mwgui/loadingscreen.hpp
index 12e6504bca..87cedaa98c 100644
--- a/apps/openmw/mwgui/loadingscreen.hpp
+++ b/apps/openmw/mwgui/loadingscreen.hpp
@@ -2,7 +2,6 @@
 #define MWGUI_LOADINGSCREEN_H
 
 #include <OgreSceneManager.h>
-#include <OgreResourceGroupManager.h>
 
 #include "windowbase.hpp"
 
diff --git a/apps/openmw/mwgui/messagebox.hpp b/apps/openmw/mwgui/messagebox.hpp
index cb40739023..0df6f3544b 100644
--- a/apps/openmw/mwgui/messagebox.hpp
+++ b/apps/openmw/mwgui/messagebox.hpp
@@ -1,8 +1,6 @@
 #ifndef MWGUI_MESSAGE_BOX_H
 #define MWGUI_MESSAGE_BOX_H
 
-#include <openengine/gui/layout.hpp>
-
 #include "windowbase.hpp"
 
 #include "../mwbase/windowmanager.hpp"
diff --git a/apps/openmw/mwgui/quickkeysmenu.hpp b/apps/openmw/mwgui/quickkeysmenu.hpp
index 646ec2aa45..058519ece4 100644
--- a/apps/openmw/mwgui/quickkeysmenu.hpp
+++ b/apps/openmw/mwgui/quickkeysmenu.hpp
@@ -1,7 +1,6 @@
 #ifndef MWGUI_QUICKKEYS_H
 #define MWGUI_QUICKKEYS_H
 
-
 #include "../mwworld/ptr.hpp"
 
 #include "windowbase.hpp"
diff --git a/apps/openmw/mwgui/race.hpp b/apps/openmw/mwgui/race.hpp
index f3adce4447..893c4c90b6 100644
--- a/apps/openmw/mwgui/race.hpp
+++ b/apps/openmw/mwgui/race.hpp
@@ -1,11 +1,6 @@
 #ifndef MWGUI_RACE_H
 #define MWGUI_RACE_H
 
-
-#include <boost/array.hpp>
-
-#include "../mwworld/esmstore.hpp"
-
 #include "../mwrender/characterpreview.hpp"
 
 #include "windowbase.hpp"
diff --git a/apps/openmw/mwgui/repair.hpp b/apps/openmw/mwgui/repair.hpp
index 5d9a487199..d0f5c54c4b 100644
--- a/apps/openmw/mwgui/repair.hpp
+++ b/apps/openmw/mwgui/repair.hpp
@@ -3,7 +3,6 @@
 
 #include "windowbase.hpp"
 
-#include "../mwworld/ptr.hpp"
 #include "../mwmechanics/repair.hpp"
 
 namespace MWGui
diff --git a/apps/openmw/mwgui/review.hpp b/apps/openmw/mwgui/review.hpp
index d5df94e285..87d6fedfa7 100644
--- a/apps/openmw/mwgui/review.hpp
+++ b/apps/openmw/mwgui/review.hpp
@@ -2,7 +2,6 @@
 #define MWGUI_REVIEW_H
 
 #include "windowbase.hpp"
-#include "../mwmechanics/stat.hpp"
 #include "widgets.hpp"
 
 namespace MWGui
diff --git a/apps/openmw/mwgui/statswindow.hpp b/apps/openmw/mwgui/statswindow.hpp
index 4b723048cc..bec42d029b 100644
--- a/apps/openmw/mwgui/statswindow.hpp
+++ b/apps/openmw/mwgui/statswindow.hpp
@@ -3,11 +3,6 @@
 
 #include "../mwworld/esmstore.hpp"
 
-#include <sstream>
-#include <set>
-#include <string>
-#include <utility>
-
 #include "../mwmechanics/stat.hpp"
 #include "windowpinnablebase.hpp"
 
diff --git a/apps/openmw/mwgui/tradewindow.hpp b/apps/openmw/mwgui/tradewindow.hpp
index e526a42ca5..892ce0297c 100644
--- a/apps/openmw/mwgui/tradewindow.hpp
+++ b/apps/openmw/mwgui/tradewindow.hpp
@@ -2,9 +2,6 @@
 #define MWGUI_TRADEWINDOW_H
 
 #include "container.hpp"
-#include "windowbase.hpp"
-
-#include "../mwworld/ptr.hpp"
 
 namespace MyGUI
 {
diff --git a/apps/openmw/mwgui/travelwindow.hpp b/apps/openmw/mwgui/travelwindow.hpp
index a814d04785..f2a23b0486 100644
--- a/apps/openmw/mwgui/travelwindow.hpp
+++ b/apps/openmw/mwgui/travelwindow.hpp
@@ -2,9 +2,6 @@
 #define MWGUI_TravelWINDOW_H
 
 #include "container.hpp"
-#include "windowbase.hpp"
-
-#include "../mwworld/ptr.hpp"
 
 namespace MyGUI
 {
diff --git a/apps/openmw/mwgui/widgets.hpp b/apps/openmw/mwgui/widgets.hpp
index 038ce3f86f..1567946913 100644
--- a/apps/openmw/mwgui/widgets.hpp
+++ b/apps/openmw/mwgui/widgets.hpp
@@ -4,8 +4,6 @@
 #include "../mwworld/esmstore.hpp"
 #include "../mwmechanics/stat.hpp"
 
-#include <MyGUI_Widget.h>
-#include <MyGUI_TextBox.h>
 #include <MyGUI_Button.h>
 #include <MyGUI_EditBox.h>
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 3c9fc586a3..652ad870f3 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -10,11 +10,6 @@
    this class.
 **/
 
-#include <vector>
-#include <string>
-
-#include <components/esm/loadclas.hpp>
-
 #include "../mwbase/windowmanager.hpp"
 
 namespace MyGUI