diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index cabb1113b..4e58e8a4c 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -6,22 +6,24 @@
 #include <iostream>
 #include <utility>
 
-#include <OgreVector3.h>
-#include <Ogre.h>
+#include <OgreRoot.h>
 
-#include "components/esm/records.hpp"
+#include <MyGUI_WidgetManager.h>
+
+#include <openengine/ogre/renderer.hpp>
+#include <openengine/gui/manager.hpp>
+
+#include <components/esm/records.hpp>
 #include <components/esm_store/cell_store.hpp>
-#include <components/files/fileops.hpp>
 #include <components/bsa/bsa_archive.hpp>
-#include <components/esm/loadregn.hpp>
 #include <components/esm/esm_reader.hpp>
 #include <components/files/path.hpp>
-
-#include <openengine/gui/manager.hpp>
-#include "mwgui/window_manager.hpp"
+#include <components/nifbullet/bullet_nif_loader.hpp>
 
 #include "mwinput/inputmanager.hpp"
 
+#include "mwgui/window_manager.hpp"
+
 #include "mwscript/scriptmanager.hpp"
 #include "mwscript/compilercontext.hpp"
 #include "mwscript/interpretercontext.hpp"
@@ -43,15 +45,6 @@
 
 #include "mwmechanics/mechanicsmanager.hpp"
 
-#include <OgreRoot.h>
-
-#include <MyGUI_WidgetManager.h>
-#include "mwgui/class.hpp"
-
-#include "components/nifbullet/bullet_nif_loader.hpp"
-
-//using namespace ESM;
-
 void OMW::Engine::executeLocalScripts()
 {
     MWWorld::LocalScripts& localScripts = mEnvironment.mWorld->getLocalScripts();
diff --git a/apps/openmw/engine.hpp b/apps/openmw/engine.hpp
index b162e25e9..443f790a4 100644
--- a/apps/openmw/engine.hpp
+++ b/apps/openmw/engine.hpp
@@ -7,14 +7,14 @@
 
 #include <OgreFrameListener.h>
 
-#include <openengine/ogre/renderer.hpp>
 #include <openengine/bullet/physic.hpp>
+
 #include <components/compiler/extensions.hpp>
 #include <components/files/collections.hpp>
+#include <components/cfg/configurationmanager.hpp>
 
 #include "mwworld/environment.hpp"
 #include "mwworld/ptr.hpp"
-#include <components/cfg/configurationmanager.hpp>
 
 namespace Compiler
 {
@@ -47,6 +47,11 @@ namespace OEngine
   {
     class MyGUIManager;
   }
+
+  namespace Render
+  {
+    class OgreRenderer;
+  }
 }
 
 namespace OMW