diff --git a/apps/openmw/mwdialogue/journalimp.cpp b/apps/openmw/mwdialogue/journalimp.cpp
index 1d458b2ebc..e442044a3e 100644
--- a/apps/openmw/mwdialogue/journalimp.cpp
+++ b/apps/openmw/mwdialogue/journalimp.cpp
@@ -16,8 +16,6 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 
-#include "../mwgui/messagebox.hpp"
-
 namespace MWDialogue
 {
     Quest& Journal::getQuest (const std::string& id)
diff --git a/apps/openmw/mwgui/bookpage.cpp b/apps/openmw/mwgui/bookpage.cpp
index 5d8fb898fc..7cc0f60b1d 100644
--- a/apps/openmw/mwgui/bookpage.cpp
+++ b/apps/openmw/mwgui/bookpage.cpp
@@ -6,6 +6,7 @@
 #include "MyGUI_RenderManager.h"
 #include "MyGUI_TextureUtility.h"
 #include "MyGUI_FactoryManager.h"
+#include "MyGUI_FontManager.h"
 
 #include <components/misc/utf8stream.hpp>
 #include <components/sceneutil/depth.hpp>
diff --git a/apps/openmw/mwgui/bookpage.hpp b/apps/openmw/mwgui/bookpage.hpp
index ab6ef555b0..05bbd3af82 100644
--- a/apps/openmw/mwgui/bookpage.hpp
+++ b/apps/openmw/mwgui/bookpage.hpp
@@ -3,7 +3,7 @@
 
 #include "MyGUI_Colour.h"
 #include "MyGUI_Widget.h"
-#include "MyGUI_FontManager.h"
+#include "MyGUI_IFont.h"
 
 #include <functional>
 #include <memory>
diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp
index 920612bc5b..60c96b4f90 100644
--- a/apps/openmw/mwgui/console.cpp
+++ b/apps/openmw/mwgui/console.cpp
@@ -15,6 +15,7 @@
 #include <components/interpreter/interpreter.hpp>
 
 #include "../mwscript/extensions.hpp"
+#include "../mwscript/interpretercontext.hpp"
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/scriptmanager.hpp"
diff --git a/apps/openmw/mwgui/console.hpp b/apps/openmw/mwgui/console.hpp
index 891c4e0ac7..d90308d4e7 100644
--- a/apps/openmw/mwgui/console.hpp
+++ b/apps/openmw/mwgui/console.hpp
@@ -12,7 +12,6 @@
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwscript/compilercontext.hpp"
-#include "../mwscript/interpretercontext.hpp"
 
 #include "referenceinterface.hpp"
 #include "windowbase.hpp"
diff --git a/apps/openmw/mwgui/enchantingdialog.cpp b/apps/openmw/mwgui/enchantingdialog.cpp
index 6c81036eba..3cbd16239f 100644
--- a/apps/openmw/mwgui/enchantingdialog.cpp
+++ b/apps/openmw/mwgui/enchantingdialog.cpp
@@ -13,6 +13,7 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/world.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
diff --git a/apps/openmw/mwgui/enchantingdialog.hpp b/apps/openmw/mwgui/enchantingdialog.hpp
index 3989ae076b..52f3aa34b8 100644
--- a/apps/openmw/mwgui/enchantingdialog.hpp
+++ b/apps/openmw/mwgui/enchantingdialog.hpp
@@ -3,8 +3,6 @@
 
 #include "spellcreationdialog.hpp"
 
-#include "../mwbase/windowmanager.hpp"
-
 #include "../mwmechanics/enchanting.hpp"
 
 namespace MWGui
diff --git a/apps/openmw/mwinput/actionmanager.cpp b/apps/openmw/mwinput/actionmanager.cpp
index 75b53d47be..30118555d3 100644
--- a/apps/openmw/mwinput/actionmanager.cpp
+++ b/apps/openmw/mwinput/actionmanager.cpp
@@ -17,7 +17,6 @@
 #include "../mwworld/player.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/inventorystore.hpp"
-#include "../mwworld/esmstore.hpp"
 
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/actorutil.hpp"
diff --git a/apps/openmw/mwinput/inputmanagerimp.hpp b/apps/openmw/mwinput/inputmanagerimp.hpp
index dbc980e446..738ff98bdf 100644
--- a/apps/openmw/mwinput/inputmanagerimp.hpp
+++ b/apps/openmw/mwinput/inputmanagerimp.hpp
@@ -11,8 +11,6 @@
 
 #include "../mwbase/inputmanager.hpp"
 
-#include "../mwgui/mode.hpp"
-
 #include "actions.hpp"
 
 namespace MWWorld
diff --git a/apps/openmw/mwphysics/hasspherecollisioncallback.hpp b/apps/openmw/mwphysics/hasspherecollisioncallback.hpp
index 09be0fd306..34666e534c 100644
--- a/apps/openmw/mwphysics/hasspherecollisioncallback.hpp
+++ b/apps/openmw/mwphysics/hasspherecollisioncallback.hpp
@@ -3,6 +3,7 @@
 
 #include <LinearMath/btVector3.h>
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
+#include <BulletCollision/BroadphaseCollision/btBroadphaseInterface.h>
 
 #include <algorithm>
 
diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp
index 0f49b7bf2d..d3b9defe3d 100644
--- a/apps/openmw/mwrender/actoranimation.cpp
+++ b/apps/openmw/mwrender/actoranimation.cpp
@@ -28,6 +28,7 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/inventorystore.hpp"
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/weapontype.hpp"
 #include "../mwmechanics/drawstate.hpp"
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 9d910c00f9..07562a7593 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -42,6 +42,7 @@
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/containerstore.hpp"
 
 #include "../mwmechanics/character.hpp" // FIXME: for MWMechanics::Priority
 
diff --git a/apps/openmw/mwrender/pingpongcanvas.hpp b/apps/openmw/mwrender/pingpongcanvas.hpp
index eaaa90b778..4286d10a90 100644
--- a/apps/openmw/mwrender/pingpongcanvas.hpp
+++ b/apps/openmw/mwrender/pingpongcanvas.hpp
@@ -10,7 +10,6 @@
 
 #include <components/fx/technique.hpp>
 
-#include "postprocessor.hpp"
 #include "luminancecalculator.hpp"
 
 namespace Shader
diff --git a/apps/openmw/mwrender/recastmesh.cpp b/apps/openmw/mwrender/recastmesh.cpp
index d0a086377d..06884f1332 100644
--- a/apps/openmw/mwrender/recastmesh.cpp
+++ b/apps/openmw/mwrender/recastmesh.cpp
@@ -12,7 +12,6 @@
 
 #include "vismask.hpp"
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 
 namespace MWRender
diff --git a/apps/openmw/mwrender/transparentpass.cpp b/apps/openmw/mwrender/transparentpass.cpp
index eee7d72ecd..237ebdf9da 100644
--- a/apps/openmw/mwrender/transparentpass.cpp
+++ b/apps/openmw/mwrender/transparentpass.cpp
@@ -11,6 +11,7 @@
 #include <components/shader/shadermanager.hpp>
 #include <components/stereo/multiview.hpp>
 #include <components/stereo/stereomanager.hpp>
+#include <components/sceneutil/depth.hpp>
 
 #include "vismask.hpp"
 
diff --git a/apps/openmw/mwrender/transparentpass.hpp b/apps/openmw/mwrender/transparentpass.hpp
index 652fe8b8b7..0522ee4687 100644
--- a/apps/openmw/mwrender/transparentpass.hpp
+++ b/apps/openmw/mwrender/transparentpass.hpp
@@ -2,14 +2,13 @@
 #define OPENMW_MWRENDER_TRANSPARENTPASS_H
 
 #include <array>
+#include <memory>
 
 #include <osg/FrameBufferObject>
 #include <osg/StateSet>
 
 #include <osgUtil/RenderBin>
 
-#include "postprocessor.hpp"
-
 namespace Shader
 {
     class ShaderManager;
diff --git a/apps/openmw/mwworld/action.cpp b/apps/openmw/mwworld/action.cpp
index 6a2cab1b87..16edea93d6 100644
--- a/apps/openmw/mwworld/action.cpp
+++ b/apps/openmw/mwworld/action.cpp
@@ -1,7 +1,6 @@
 #include "action.hpp"
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
diff --git a/apps/openmw/mwworld/inventorystore.hpp b/apps/openmw/mwworld/inventorystore.hpp
index 01c53d7028..51eea3129d 100644
--- a/apps/openmw/mwworld/inventorystore.hpp
+++ b/apps/openmw/mwworld/inventorystore.hpp
@@ -3,8 +3,6 @@
 
 #include "containerstore.hpp"
 
-#include "../mwmechanics/magiceffects.hpp"
-
 namespace ESM
 {
     struct MagicEffect;
diff --git a/apps/openmw/mwworld/player.hpp b/apps/openmw/mwworld/player.hpp
index 54d9c08da4..6efdc2e00b 100644
--- a/apps/openmw/mwworld/player.hpp
+++ b/apps/openmw/mwworld/player.hpp
@@ -3,11 +3,9 @@
 
 #include <map>
 
-#include "../mwworld/refdata.hpp"
 #include "../mwworld/livecellref.hpp"
 
 #include "../mwmechanics/drawstate.hpp"
-#include "../mwmechanics/stat.hpp"
 
 #include <components/esm3/loadskil.hpp>
 #include <components/esm/attr.hpp>
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index 38e39e9450..075213a66a 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -6,7 +6,6 @@
 #include <osg/ref_ptr>
 
 #include "ptr.hpp"
-#include "globals.hpp"
 
 #include <set>
 #include <memory>
diff --git a/apps/openmw/mwworld/weather.hpp b/apps/openmw/mwworld/weather.hpp
index 5bb287ccce..28723b828f 100644
--- a/apps/openmw/mwworld/weather.hpp
+++ b/apps/openmw/mwworld/weather.hpp
@@ -11,7 +11,7 @@
 
 #include "../mwbase/soundmanager.hpp"
 
-#include "../mwrender/sky.hpp"
+#include "../mwrender/skyutil.hpp"
 
 namespace ESM
 {