diff --git a/apps/openmw/mwgui/window_manager.cpp b/apps/openmw/mwgui/window_manager.cpp
index 94cad2818..369eae089 100644
--- a/apps/openmw/mwgui/window_manager.cpp
+++ b/apps/openmw/mwgui/window_manager.cpp
@@ -1,4 +1,25 @@
 #include "window_manager.hpp"
+
+#include <cassert>
+#include <iterator>
+
+#include "MyGUI_UString.h"
+
+#include <openengine/ogre/renderer.hpp>
+#include <openengine/gui/manager.hpp>
+
+#include <components/settings/settings.hpp>
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/inputmanager.hpp"
+
+#include "../mwworld/ptr.hpp"
+#include "../mwworld/cellstore.hpp"
+
+#include "console.hpp"
+#include "journalwindow.hpp"
+#include "charactercreation.hpp"
 #include "text_input.hpp"
 #include "review.hpp"
 #include "dialogue.hpp"
@@ -21,22 +42,6 @@
 #include "alchemywindow.hpp"
 #include "spellwindow.hpp"
 
-#include "../mwbase/environment.hpp"
-#include "../mwbase/mechanicsmanager.hpp"
-#include "../mwbase/inputmanager.hpp"
-
-#include "../mwworld/ptr.hpp"
-#include "../mwworld/cellstore.hpp"
-
-#include "console.hpp"
-#include "journalwindow.hpp"
-#include "charactercreation.hpp"
-
-#include <components/settings/settings.hpp>
-
-#include <cassert>
-#include <iterator>
-
 using namespace MWGui;
 
 WindowManager::WindowManager(
diff --git a/apps/openmw/mwgui/window_manager.hpp b/apps/openmw/mwgui/window_manager.hpp
index de90037b9..59a6ab395 100644
--- a/apps/openmw/mwgui/window_manager.hpp
+++ b/apps/openmw/mwgui/window_manager.hpp
@@ -10,12 +10,11 @@
    this class.
 **/
 
-#include "MyGUI_UString.h"
+#include <vector>
+#include <string>
 
 #include <components/esm_store/store.hpp>
 #include <components/settings/settings.hpp>
-#include <openengine/ogre/renderer.hpp>
-#include <openengine/gui/manager.hpp>
 
 #include "../mwmechanics/stat.hpp"
 
@@ -23,8 +22,9 @@
 
 namespace MyGUI
 {
-  class Gui;
-  class Widget;
+    class Gui;
+    class Widget;
+    class UString;
 }
 
 namespace Compiler
@@ -38,16 +38,17 @@ namespace MWWorld
     class CellStore;
 }
 
-namespace MWMechanics
-{
-    class MechanicsManager;
-}
-
 namespace OEngine
 {
     namespace GUI
     {
         class Layout;
+        class MyGUIManager;
+    }
+
+    namespace Render
+    {
+        class OgreRenderer;
     }
 }