diff --git a/game/render/mwscene.cpp b/game/render/mwscene.cpp
index b916e940c5..c28dea25a5 100644
--- a/game/render/mwscene.cpp
+++ b/game/render/mwscene.cpp
@@ -2,6 +2,13 @@
 
 #include <assert.h>
 
+#include "OgreRoot.h"
+#include "OgreRenderWindow.h"
+#include "OgreSceneManager.h"
+#include "OgreViewport.h"
+#include "OgreCamera.h"
+#include "OgreTextureManager.h"
+
 using namespace Render;
 using namespace Ogre;
 
diff --git a/game/render/mwscene.hpp b/game/render/mwscene.hpp
index 9eaba76f79..3aff8c3682 100644
--- a/game/render/mwscene.hpp
+++ b/game/render/mwscene.hpp
@@ -3,6 +3,14 @@
 
 #include "ogre/renderer.hpp"
 
+namespace Ogre
+{
+    class Camera;
+    class Viewport;
+    class SceneManager;
+    class SceneNode;
+}
+
 namespace Render
 {
   /** Class responsible for Morrowind-specific interfaces to OGRE.
diff --git a/input/oismanager.cpp b/input/oismanager.cpp
index 37593c29de..924c94ea3e 100644
--- a/input/oismanager.cpp
+++ b/input/oismanager.cpp
@@ -2,12 +2,14 @@
 #include <assert.h>
 #include <string>
 #include <sstream>
+#include <iostream>
+
+#include "OgreRenderWindow.h"
 
 using namespace Input;
 using namespace Ogre;
 using namespace OIS;
 
-#include <iostream>
 using namespace std;
 
 void OISManager::setup(Render::OgreRenderer *rend)
diff --git a/ogre/renderer.cpp b/ogre/renderer.cpp
index d43109ff23..a7998596d0 100644
--- a/ogre/renderer.cpp
+++ b/ogre/renderer.cpp
@@ -1,5 +1,10 @@
 #include "renderer.hpp"
 
+#include "OgreRoot.h"
+#include "OgreRenderWindow.h"
+#include "OgreLogManager.h"
+#include "OgreLog.h"
+
 using namespace Ogre;
 using namespace Render;
 
diff --git a/ogre/renderer.hpp b/ogre/renderer.hpp
index 11eae25761..31937903fd 100644
--- a/ogre/renderer.hpp
+++ b/ogre/renderer.hpp
@@ -5,9 +5,14 @@
   Ogre renderer class
  */
 
-#include <Ogre.h>
 #include <string>
 
+namespace Ogre
+{
+    class Root;
+    class RenderWindow;
+}
+
 namespace Render
 {
   class OgreRenderer