diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index 6f07c1b0d..3c389bec2 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -8,6 +8,8 @@
 #include <OgreRenderWindow.h>
 #include <OgreEntity.h>
 #include <OgreCamera.h>
+#include <OgreSceneNode.h>
+#include <OgreViewport.h>
 
 #include "navigation.hpp"
 
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index af8d49426..4c3cadb3b 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -1,6 +1,7 @@
 #include "engine.hpp"
 
 #include <stdexcept>
+#include <iomanip>
 
 #include <OgreRoot.h>
 #include <OgreRenderWindow.h>
diff --git a/apps/openmw/mwgui/enchantingdialog.cpp b/apps/openmw/mwgui/enchantingdialog.cpp
index 92205c3e9..ada004612 100644
--- a/apps/openmw/mwgui/enchantingdialog.cpp
+++ b/apps/openmw/mwgui/enchantingdialog.cpp
@@ -1,5 +1,7 @@
 #include "enchantingdialog.hpp"
 
+#include <iomanip>
+
 #include <boost/lexical_cast.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwgui/loadingscreen.cpp b/apps/openmw/mwgui/loadingscreen.cpp
index 868b58209..53a45db09 100644
--- a/apps/openmw/mwgui/loadingscreen.cpp
+++ b/apps/openmw/mwgui/loadingscreen.cpp
@@ -1,6 +1,12 @@
 #include "loadingscreen.hpp"
 
 #include <OgreRenderWindow.h>
+#include <OgreMaterialManager.h>
+#include <OgreTechnique.h>
+#include <OgreRectangle2D.h>
+#include <OgreSceneNode.h>
+#include <OgreTextureManager.h>
+#include <OgreViewport.h>
 
 #include <openengine/ogre/fader.hpp>
 
diff --git a/apps/openmw/mwgui/loadingscreen.hpp b/apps/openmw/mwgui/loadingscreen.hpp
index 2d1d7431f..e91e5951d 100644
--- a/apps/openmw/mwgui/loadingscreen.hpp
+++ b/apps/openmw/mwgui/loadingscreen.hpp
@@ -2,6 +2,7 @@
 #define MWGUI_LOADINGSCREEN_H
 
 #include <OgreSceneManager.h>
+#include <OgreTimer.h>
 
 #include "windowbase.hpp"
 
diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index 51e160d26..1cc9610df 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -3,6 +3,7 @@
 #include <boost/lexical_cast.hpp>
 
 #include <OgreSceneNode.h>
+#include <OgreVector2.h>
 
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwgui/repair.cpp b/apps/openmw/mwgui/repair.cpp
index d729ee7fa..de96bcacd 100644
--- a/apps/openmw/mwgui/repair.cpp
+++ b/apps/openmw/mwgui/repair.cpp
@@ -1,5 +1,7 @@
 #include "repair.hpp"
 
+#include <iomanip>
+
 #include <boost/lexical_cast.hpp>
 
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp
index 8716c4dea..f941c699b 100644
--- a/apps/openmw/mwgui/tooltips.cpp
+++ b/apps/openmw/mwgui/tooltips.cpp
@@ -1,5 +1,7 @@
 #include "tooltips.hpp"
 
+#include <iomanip>
+
 #include <boost/lexical_cast.hpp>
 
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index f44078256..1b71157a7 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -3,6 +3,8 @@
 #include <cassert>
 #include <iterator>
 
+#include <OgreTextureManager.h>
+
 #include "MyGUI_UString.h"
 #include "MyGUI_IPointer.h"
 #include "MyGUI_ResourceImageSetPointer.h"
diff --git a/apps/openmw/mwmechanics/npcstats.cpp b/apps/openmw/mwmechanics/npcstats.cpp
index 8918bfbe7..74587a626 100644
--- a/apps/openmw/mwmechanics/npcstats.cpp
+++ b/apps/openmw/mwmechanics/npcstats.cpp
@@ -6,6 +6,8 @@
 #include <vector>
 #include <algorithm>
 
+#include <iomanip>
+
 #include <boost/format.hpp>
 
 #include <components/esm/loadskil.hpp>
@@ -509,4 +511,4 @@ void MWMechanics::NpcStats::readState (const ESM::NpcStats& state)
     mTimeToStartDrowning = state.mTimeToStartDrowning;
     mLastDrowningHit = state.mLastDrowningHit;
     mLevelHealthBonus = state.mLevelHealthBonus;
-}
\ No newline at end of file
+}
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 6ba3b1fcd..e62fee6e2 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -10,6 +10,8 @@
 #include <OgreSceneManager.h>
 #include <OgreControllerManager.h>
 #include <OgreStaticGeometry.h>
+#include <OgreSceneNode.h>
+#include <OgreTechnique.h>
 
 #include <components/esm/loadligh.hpp>
 #include <components/esm/loadweap.hpp>
diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 280828652..013e3daf4 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -1,10 +1,13 @@
 #include "characterpreview.hpp"
 
-
 #include <OgreSceneManager.h>
 #include <OgreRoot.h>
 #include <OgreHardwarePixelBuffer.h>
 #include <OgreCamera.h>
+#include <OgreSceneNode.h>
+#include <OgreTextureManager.h>
+#include <OgreViewport.h>
+#include <OgreRenderTexture.h>
 
 #include <libs/openengine/ogre/selectionbuffer.hpp>
 
diff --git a/apps/openmw/mwrender/characterpreview.hpp b/apps/openmw/mwrender/characterpreview.hpp
index cd30cdf46..16e6ab017 100644
--- a/apps/openmw/mwrender/characterpreview.hpp
+++ b/apps/openmw/mwrender/characterpreview.hpp
@@ -3,6 +3,7 @@
 
 #include <OgreRenderTarget.h>
 #include <OgreMaterialManager.h>
+#include <OgreVector3.h>
 
 #include <components/esm/loadnpc.hpp>
 
diff --git a/apps/openmw/mwrender/debugging.cpp b/apps/openmw/mwrender/debugging.cpp
index 241f7e470..ba39d10d5 100644
--- a/apps/openmw/mwrender/debugging.cpp
+++ b/apps/openmw/mwrender/debugging.cpp
@@ -7,6 +7,8 @@
 #include <OgreMaterial.h>
 #include <OgreMaterialManager.h>
 #include <OgreManualObject.h>
+#include <OgreTechnique.h>
+#include <OgreSceneNode.h>
 
 #include <openengine/bullet/physic.hpp>
 
diff --git a/apps/openmw/mwrender/effectmanager.cpp b/apps/openmw/mwrender/effectmanager.cpp
index 7d41525b7..1e6119daa 100644
--- a/apps/openmw/mwrender/effectmanager.cpp
+++ b/apps/openmw/mwrender/effectmanager.cpp
@@ -2,6 +2,8 @@
 
 #include <OgreSceneManager.h>
 #include <OgreParticleSystem.h>
+#include <OgreSceneNode.h>
+#include <OgreTechnique.h>
 
 #include "animation.hpp"
 #include "renderconst.hpp"
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 772813c73..003f08300 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -6,6 +6,8 @@
 #include <OgreSceneNode.h>
 #include <OgreCamera.h>
 #include <OgreTextureManager.h>
+#include <OgreRenderTexture.h>
+#include <OgreViewport.h>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index d07aad31d..60760b7fb 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -4,6 +4,11 @@
 #include <OgreEntity.h>
 #include <OgreParticleSystem.h>
 #include <OgreSubEntity.h>
+#include <OgreSkeleton.h>
+#include <OgreSkeletonInstance.h>
+#include <OgreSceneNode.h>
+#include <OgreBone.h>
+#include <OgreTechnique.h>
 
 #include <extern/shiny/Main/Factory.hpp>
 
diff --git a/apps/openmw/mwrender/occlusionquery.cpp b/apps/openmw/mwrender/occlusionquery.cpp
index 246103471..67bc75e02 100644
--- a/apps/openmw/mwrender/occlusionquery.cpp
+++ b/apps/openmw/mwrender/occlusionquery.cpp
@@ -9,6 +9,8 @@
 #include <OgreMeshManager.h>
 #include <OgreMaterialManager.h>
 #include <OgreCamera.h>
+#include <OgreSceneNode.h>
+#include <OgreMesh.h>
 
 #include "renderconst.hpp"
 
diff --git a/apps/openmw/mwrender/refraction.cpp b/apps/openmw/mwrender/refraction.cpp
index d590dbf4c..f22968e9d 100644
--- a/apps/openmw/mwrender/refraction.cpp
+++ b/apps/openmw/mwrender/refraction.cpp
@@ -7,6 +7,8 @@
 #include <OgreRenderTarget.h>
 #include <OgreViewport.h>
 #include <OgreRoot.h>
+#include <OgreRenderTexture.h>
+#include <OgreSceneNode.h>
 
 #include <extern/shiny/Main/Factory.hpp>
 
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 68bf957c8..b67875405 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -5,12 +5,14 @@
 #include <OgreRoot.h>
 #include <OgreRenderWindow.h>
 #include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
 #include <OgreViewport.h>
 #include <OgreCamera.h>
 #include <OgreTextureManager.h>
 #include <OgreHardwarePixelBuffer.h>
 #include <OgreControllerManager.h>
 #include <OgreMeshManager.h>
+#include <OgreRenderTexture.h>
 
 #include <SDL_video.h>
 
diff --git a/apps/openmw/mwrender/ripplesimulation.cpp b/apps/openmw/mwrender/ripplesimulation.cpp
index e5db8346f..f52deedcc 100644
--- a/apps/openmw/mwrender/ripplesimulation.cpp
+++ b/apps/openmw/mwrender/ripplesimulation.cpp
@@ -4,6 +4,10 @@
 #include <OgreStringConverter.h>
 #include <OgreHardwarePixelBuffer.h>
 #include <OgreRoot.h>
+#include <OgreRectangle2D.h>
+#include <OgreSceneNode.h>
+#include <OgreRenderTexture.h>
+#include <OgreViewport.h>
 
 #include <extern/shiny/Main/Factory.hpp>
 
diff --git a/apps/openmw/mwrender/shadows.cpp b/apps/openmw/mwrender/shadows.cpp
index 9ebb0ab08..33e337649 100644
--- a/apps/openmw/mwrender/shadows.cpp
+++ b/apps/openmw/mwrender/shadows.cpp
@@ -9,6 +9,8 @@
 #include <OgreShadowCameraSetupPSSM.h>
 #include <OgreHardwarePixelBuffer.h>
 #include <OgreCamera.h>
+#include <OgreRenderTexture.h>
+#include <OgreViewport.h>
 
 #include <extern/shiny/Main/Factory.hpp>
 
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 39f7ccc85..90c08c299 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -11,6 +11,7 @@
 #include <OgreBillboardSet.h>
 #include <OgreEntity.h>
 #include <OgreSubEntity.h>
+#include <OgreTechnique.h>
 
 #include <OgreMeshManager.h>
 
diff --git a/apps/openmw/mwrender/videoplayer.cpp b/apps/openmw/mwrender/videoplayer.cpp
index adf20dc63..f3c0971e7 100644
--- a/apps/openmw/mwrender/videoplayer.cpp
+++ b/apps/openmw/mwrender/videoplayer.cpp
@@ -9,6 +9,11 @@
 #include <OgreRoot.h>
 #include <OgreHardwarePixelBuffer.h>
 #include <OgreRenderWindow.h>
+#include <OgreTextureManager.h>
+#include <OgreTechnique.h>
+#include <OgreRectangle2D.h>
+#include <OgreMaterialManager.h>
+#include <OgreSceneNode.h>
 
 #include <boost/thread.hpp>
 
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 9e3105168..1fa5d8834 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -1,11 +1,16 @@
 #include "water.hpp"
 
-#include <OgreRenderTarget.h>
+#include <OgreRenderTexture.h>
 #include <OgreEntity.h>
 #include <OgreMeshManager.h>
+#include <OgreMaterialManager.h>
 #include <OgreHardwarePixelBuffer.h>
 #include <OgreRoot.h>
 #include <OgreCamera.h>
+#include <OgreTextureManager.h>
+#include <OgreViewport.h>
+#include <OgreSceneNode.h>
+#include <OgreTechnique.h>
 
 #include "sky.hpp"
 #include "renderingmanager.hpp"
diff --git a/apps/openmw/mwworld/physicssystem.cpp b/apps/openmw/mwworld/physicssystem.cpp
index 1a16870da..8ef5797ca 100644
--- a/apps/openmw/mwworld/physicssystem.cpp
+++ b/apps/openmw/mwworld/physicssystem.cpp
@@ -8,6 +8,7 @@
 #include <OgreViewport.h>
 #include <OgreCamera.h>
 #include <OgreTextureManager.h>
+#include <OgreSceneNode.h>
 
 #include <openengine/bullet/trace.h>
 #include <openengine/bullet/physic.hpp>
diff --git a/components/bsa/bsa_archive.cpp b/components/bsa/bsa_archive.cpp
index eb741fb10..6574f096b 100644
--- a/components/bsa/bsa_archive.cpp
+++ b/components/bsa/bsa_archive.cpp
@@ -29,6 +29,7 @@
 #include <OgreArchive.h>
 #include <OgreArchiveFactory.h>
 #include <OgreArchiveManager.h>
+#include <OgreResourceGroupManager.h>
 #include "bsa_file.hpp"
 
 #include "../files/constrainedfiledatastream.hpp"
diff --git a/components/nifogre/mesh.cpp b/components/nifogre/mesh.cpp
index 43622cb9a..8bebe0589 100644
--- a/components/nifogre/mesh.cpp
+++ b/components/nifogre/mesh.cpp
@@ -11,6 +11,8 @@
 #include <OgreSkeletonManager.h>
 #include <OgreRenderSystem.h>
 #include <OgreRoot.h>
+#include <OgreSkeleton.h>
+#include <OgreKeyFrame.h>
 
 #include <components/nif/node.hpp>
 #include <components/misc/stringops.hpp>
diff --git a/components/nifogre/ogrenifloader.cpp b/components/nifogre/ogrenifloader.cpp
index 43e8934c8..acab419b0 100644
--- a/components/nifogre/ogrenifloader.cpp
+++ b/components/nifogre/ogrenifloader.cpp
@@ -38,6 +38,9 @@
 #include <OgreMaterialManager.h>
 #include <OgreCamera.h>
 #include <OgreSceneManager.h>
+#include <OgreSkeletonInstance.h>
+#include <OgreSceneNode.h>
+#include <OgreMesh.h>
 
 #include <extern/shiny/Main/Factory.hpp>
 
diff --git a/components/ogreinit/ogreinit.cpp b/components/ogreinit/ogreinit.cpp
index 840cf4bb0..1b9a899a0 100644
--- a/components/ogreinit/ogreinit.cpp
+++ b/components/ogreinit/ogreinit.cpp
@@ -5,6 +5,7 @@
 #include <OgreRoot.h>
 #include <OgreParticleEmitterFactory.h>
 #include <OgreParticleSystemManager.h>
+#include <OgreLogManager.h>
 
 #if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
 #include <OSX/macUtils.h>
diff --git a/components/terrain/chunk.cpp b/components/terrain/chunk.cpp
index 139694ee5..6f2b9ff73 100644
--- a/components/terrain/chunk.cpp
+++ b/components/terrain/chunk.cpp
@@ -2,6 +2,7 @@
 
 #include <OgreSceneNode.h>
 #include <OgreHardwareBufferManager.h>
+#include <OgreRenderQueue.h>
 
 #include "quadtreenode.hpp"
 #include "world.hpp"
diff --git a/components/terrain/quadtreenode.cpp b/components/terrain/quadtreenode.cpp
index 721771ff3..1c8553967 100644
--- a/components/terrain/quadtreenode.cpp
+++ b/components/terrain/quadtreenode.cpp
@@ -2,6 +2,9 @@
 
 #include <OgreSceneManager.h>
 #include <OgreManualObject.h>
+#include <OgreSceneNode.h>
+#include <OgreMaterialManager.h>
+#include <OgreTextureManager.h>
 
 #include "world.hpp"
 #include "chunk.hpp"
diff --git a/components/terrain/world.cpp b/components/terrain/world.cpp
index 87baeff84..4d4616511 100644
--- a/components/terrain/world.cpp
+++ b/components/terrain/world.cpp
@@ -4,7 +4,11 @@
 #include <OgreCamera.h>
 #include <OgreHardwareBufferManager.h>
 #include <OgreHardwarePixelBuffer.h>
+#include <OgreTextureManager.h>
+#include <OgreRenderTexture.h>
+#include <OgreSceneNode.h>
 #include <OgreRoot.h>
+#include <OgreTimer.h> // TEMP
 
 #include "storage.hpp"
 #include "quadtreenode.hpp"
diff --git a/extern/sdl4ogre/sdlcursormanager.cpp b/extern/sdl4ogre/sdlcursormanager.cpp
index 65fb7f98b..5ef274b7e 100644
--- a/extern/sdl4ogre/sdlcursormanager.cpp
+++ b/extern/sdl4ogre/sdlcursormanager.cpp
@@ -1,6 +1,7 @@
 #include "sdlcursormanager.hpp"
 
 #include <OgreHardwarePixelBuffer.h>
+#include <OgreTextureManager.h>
 #include <OgreRoot.h>
 
 #include <openengine/ogre/imagerotate.hpp>
diff --git a/extern/sdl4ogre/sdlwindowhelper.cpp b/extern/sdl4ogre/sdlwindowhelper.cpp
index f819043cf..2a14cc6b4 100644
--- a/extern/sdl4ogre/sdlwindowhelper.cpp
+++ b/extern/sdl4ogre/sdlwindowhelper.cpp
@@ -2,6 +2,7 @@
 
 #include <OgreStringConverter.h>
 #include <OgreRoot.h>
+#include <OgreTextureManager.h>
 
 #include <SDL_syswm.h>
 #include <SDL_endian.h>
diff --git a/extern/shiny/Platforms/Ogre/OgreTextureUnitState.cpp b/extern/shiny/Platforms/Ogre/OgreTextureUnitState.cpp
index f215f4ab7..ad8e6d2b0 100644
--- a/extern/shiny/Platforms/Ogre/OgreTextureUnitState.cpp
+++ b/extern/shiny/Platforms/Ogre/OgreTextureUnitState.cpp
@@ -1,5 +1,7 @@
 #include "OgreTextureUnitState.hpp"
 
+#include <iomanip>
+
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
 
diff --git a/libs/openengine/ogre/fader.cpp b/libs/openengine/ogre/fader.cpp
index 923b0b7e3..20b9296da 100644
--- a/libs/openengine/ogre/fader.cpp
+++ b/libs/openengine/ogre/fader.cpp
@@ -6,6 +6,7 @@
 #include <OgreResourceGroupManager.h>
 #include <OgreRectangle2D.h>
 #include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
 
 
 using namespace Ogre;
diff --git a/libs/openengine/ogre/imagerotate.cpp b/libs/openengine/ogre/imagerotate.cpp
index 9c32924f1..cc5f572cf 100644
--- a/libs/openengine/ogre/imagerotate.cpp
+++ b/libs/openengine/ogre/imagerotate.cpp
@@ -8,6 +8,13 @@
 #include <OgreCamera.h>
 #include <OgreTextureUnitState.h>
 #include <OgreHardwarePixelBuffer.h>
+#include <OgreTechnique.h>
+#include <OgreMaterialManager.h>
+#include <OgreRectangle2D.h>
+#include <OgreSceneNode.h>
+#include <OgreTextureManager.h>
+#include <OgreRenderTexture.h>
+#include <OgreViewport.h>
 
 using namespace Ogre;
 using namespace OEngine::Render;
diff --git a/libs/openengine/ogre/renderer.cpp b/libs/openengine/ogre/renderer.cpp
index c86697497..c816f2060 100644
--- a/libs/openengine/ogre/renderer.cpp
+++ b/libs/openengine/ogre/renderer.cpp
@@ -9,6 +9,7 @@
 #include <OgreTexture.h>
 #include <OgreHardwarePixelBuffer.h>
 #include <OgreCamera.h>
+#include <OgreViewport.h>
 
 #include <extern/sdl4ogre/sdlwindowhelper.hpp>
 
diff --git a/libs/openengine/ogre/selectionbuffer.cpp b/libs/openengine/ogre/selectionbuffer.cpp
index 69375b74d..5aeb35c28 100644
--- a/libs/openengine/ogre/selectionbuffer.cpp
+++ b/libs/openengine/ogre/selectionbuffer.cpp
@@ -5,6 +5,9 @@
 #include <OgreSubEntity.h>
 #include <OgreEntity.h>
 #include <OgreTechnique.h>
+#include <OgreTextureManager.h>
+#include <OgreViewport.h>
+
 #include <stdexcept>
 
 #include <extern/shiny/Main/Factory.hpp>
diff --git a/libs/openengine/ogre/selectionbuffer.hpp b/libs/openengine/ogre/selectionbuffer.hpp
index c487b24b0..b9b4cd9d9 100644
--- a/libs/openengine/ogre/selectionbuffer.hpp
+++ b/libs/openengine/ogre/selectionbuffer.hpp
@@ -5,6 +5,7 @@
 #include <OgreTexture.h>
 #include <OgreRenderTarget.h>
 #include <OgreMaterialManager.h>
+#include <OgreColourValue.h>
 
 namespace OEngine
 {