Include some more required Ogre headers explicitely.

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"
 

apps/openmw/engine.cpp

@@ -1,6 +1,7 @@
 #include "engine.hpp"
 
 #include <stdexcept>
+#include <iomanip>
 
 #include <OgreRoot.h>
 #include <OgreRenderWindow.h>

apps/openmw/mwgui/enchantingdialog.cpp

@@ -1,5 +1,7 @@
 #include "enchantingdialog.hpp"
 
+#include <iomanip>
+
 #include <boost/lexical_cast.hpp>
 
 #include "../mwbase/environment.hpp"

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>
 

apps/openmw/mwgui/loadingscreen.hpp

@@ -2,6 +2,7 @@
 #define MWGUI_LOADINGSCREEN_H
 
 #include <OgreSceneManager.h>
+#include <OgreTimer.h>
 
 #include "windowbase.hpp"
 

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"

apps/openmw/mwgui/repair.cpp

@@ -1,5 +1,7 @@
 #include "repair.hpp"
 
+#include <iomanip>
+
 #include <boost/lexical_cast.hpp>
 
 #include "../mwbase/world.hpp"

apps/openmw/mwgui/tooltips.cpp

@@ -1,5 +1,7 @@
 #include "tooltips.hpp"
 
+#include <iomanip>
+
 #include <boost/lexical_cast.hpp>
 
 #include "../mwbase/world.hpp"

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"

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;
-}
+}

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>

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>
 

apps/openmw/mwrender/characterpreview.hpp

@@ -3,6 +3,7 @@
 
 #include <OgreRenderTarget.h>
 #include <OgreMaterialManager.h>
+#include <OgreVector3.h>
 
 #include <components/esm/loadnpc.hpp>
 

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>
 

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"

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"

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>
 

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"
 

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>
 

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>
 

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>
 

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>
 

apps/openmw/mwrender/sky.cpp

@@ -11,6 +11,7 @@
 #include <OgreBillboardSet.h>
 #include <OgreEntity.h>
 #include <OgreSubEntity.h>
+#include <OgreTechnique.h>
 
 #include <OgreMeshManager.h>
 

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>
 

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"

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>

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"

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>

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>
 

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>

components/terrain/chunk.cpp

@@ -2,6 +2,7 @@
 
 #include <OgreSceneNode.h>
 #include <OgreHardwareBufferManager.h>
+#include <OgreRenderQueue.h>
 
 #include "quadtreenode.hpp"
 #include "world.hpp"

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"

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"

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>

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>

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>
 

libs/openengine/ogre/fader.cpp

@@ -6,6 +6,7 @@
 #include <OgreResourceGroupManager.h>
 #include <OgreRectangle2D.h>
 #include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
 
 
 using namespace Ogre;

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;

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>
 

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>

libs/openengine/ogre/selectionbuffer.hpp

@@ -5,6 +5,7 @@
 #include <OgreTexture.h>
 #include <OgreRenderTarget.h>
 #include <OgreMaterialManager.h>
+#include <OgreColourValue.h>
 
 namespace OEngine
 {