diff --git a/apps/openmw/mwgui/alchemywindow.hpp b/apps/openmw/mwgui/alchemywindow.hpp
index 33bd1f9743..afc00e2bfb 100644
--- a/apps/openmw/mwgui/alchemywindow.hpp
+++ b/apps/openmw/mwgui/alchemywindow.hpp
@@ -12,10 +12,7 @@
 
 #include "windowbase.hpp"
 
-namespace MWMechanics
-{
-    class Alchemy;
-}
+#include "../mwmechanics/alchemy.hpp"
 
 namespace MWGui
 {
diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index 080a9f6fd0..78735540e0 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -32,31 +32,15 @@
 
 namespace MWGui
 {
-
-    class ResponseCallback : public MWBase::DialogueManager::ResponseCallback
+    void ResponseCallback::addResponse(const std::string& title, const std::string& text)
     {
-    public:
-        ResponseCallback(DialogueWindow* win, bool needMargin=true)
-            : mWindow(win)
-            , mNeedMargin(needMargin)
-        {
+        mWindow->addResponse(title, text, mNeedMargin);
+    }
 
-        }
-
-        void addResponse(const std::string& title, const std::string& text) override
-        {
-            mWindow->addResponse(title, text, mNeedMargin);
-        }
-
-        void updateTopics()
-        {
-            mWindow->updateTopics();
-        }
-
-    private:
-        DialogueWindow* mWindow;
-        bool mNeedMargin;
-    };
+    void ResponseCallback::updateTopics() const
+    {
+        mWindow->updateTopics();
+    }
 
     PersuasionDialog::PersuasionDialog(std::unique_ptr<ResponseCallback> callback)
         : WindowModal("openmw_persuasion_dialog.layout")
diff --git a/apps/openmw/mwgui/dialogue.hpp b/apps/openmw/mwgui/dialogue.hpp
index 7965a7cb24..27547ca046 100644
--- a/apps/openmw/mwgui/dialogue.hpp
+++ b/apps/openmw/mwgui/dialogue.hpp
@@ -8,6 +8,7 @@
 
 #include "bookpage.hpp"
 
+#include "../mwbase/dialoguemanager.hpp"
 #include "../mwdialogue/keywordsearch.hpp"
 
 #include <MyGUI_Delegate.h>
@@ -20,7 +21,21 @@ namespace Gui
 
 namespace MWGui
 {
-    class ResponseCallback;
+    class DialogueWindow;
+
+    class ResponseCallback : public MWBase::DialogueManager::ResponseCallback
+    {
+        DialogueWindow* mWindow;
+        bool mNeedMargin;
+        
+    public:
+        ResponseCallback(DialogueWindow* win, bool needMargin = true) : mWindow(win), mNeedMargin(needMargin)
+        {}
+
+        void addResponse(const std::string& title, const std::string& text) override;
+
+        void updateTopics() const;
+    };
 
     class PersuasionDialog : public WindowModal
     {
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 1812bbfc63..51867fc322 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -13,7 +13,6 @@
 #include <MyGUI_LanguageManager.h>
 #include <MyGUI_PointerManager.h>
 #include <MyGUI_InputManager.h>
-#include <MyGUI_Gui.h>
 #include <MyGUI_ClipboardManager.h>
 
 // For BT_NO_PROFILE
@@ -24,9 +23,6 @@
 
 #include <components/debug/debuglog.hpp>
 
-#include <components/sdlutil/sdlcursormanager.hpp>
-#include <components/sdlutil/sdlvideowrapper.hpp>
-
 #include <components/esm3/esmreader.hpp>
 #include <components/esm3/esmwriter.hpp>
 
@@ -71,17 +67,13 @@
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/actorutil.hpp"
 
-#include "../mwrender/localmap.hpp"
 #include "../mwrender/postprocessor.hpp"
 
 #include "console.hpp"
 #include "journalwindow.hpp"
 #include "journalviewmodel.hpp"
-#include "charactercreation.hpp"
 #include "dialogue.hpp"
 #include "statswindow.hpp"
-#include "messagebox.hpp"
-#include "tooltips.hpp"
 #include "scrollwindow.hpp"
 #include "bookwindow.hpp"
 #include "hud.hpp"
@@ -105,7 +97,6 @@
 #include "cursor.hpp"
 #include "merchantrepair.hpp"
 #include "repair.hpp"
-#include "soulgemdialog.hpp"
 #include "companionwindow.hpp"
 #include "inventorywindow.hpp"
 #include "bookpage.hpp"
@@ -117,7 +108,6 @@
 #include "debugwindow.hpp"
 #include "postprocessorhud.hpp"
 #include "spellview.hpp"
-#include "draganddrop.hpp"
 #include "container.hpp"
 #include "controllers.hpp"
 #include "jailscreen.hpp"