diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index cc625b306..0c9110ed4 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -6,6 +6,7 @@
 #include <components/settings/settings.hpp>
 
 #include "../mwworld/globals.hpp"
+#include "../mwworld/ptr.hpp"
 
 namespace Ogre
 {
@@ -42,7 +43,6 @@ namespace MWWorld
     class CellStore;
     class Player;
     class LocalScripts;
-    class Ptr;
     class TimeStamp;
     class ESMStore;
 }
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index edf5dd25d..7b0f9f728 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -18,6 +18,7 @@
 #include "../mwworld/physicssystem.hpp"
 
 #include "../mwrender/renderinginterface.hpp"
+#include "../mwrender/actors.hpp"
 
 #include "../mwgui/tooltips.hpp"
 
diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp
index a158fa743..a96c18a8c 100644
--- a/apps/openmw/mwclass/creature.hpp
+++ b/apps/openmw/mwclass/creature.hpp
@@ -1,9 +1,7 @@
 #ifndef GAME_MWCLASS_CREATURE_H
 #define GAME_MWCLASS_CREATURE_H
 
-#include "../mwrender/renderinginterface.hpp"
-#include "../mwrender/actors.hpp"
-
+#include "../mwworld/class.hpp"
 
 namespace MWClass
 {
diff --git a/apps/openmw/mwrender/actors.cpp b/apps/openmw/mwrender/actors.cpp
index 05bb030d7..fc5a46d12 100644
--- a/apps/openmw/mwrender/actors.cpp
+++ b/apps/openmw/mwrender/actors.cpp
@@ -3,15 +3,20 @@
 #include <OgreSceneNode.h>
 #include <OgreSceneManager.h>
 
+#include "../mwworld/ptr.hpp"
+
+#include "animation.hpp"
+#include "creatureanimation.hpp"
+#include "npcanimation.hpp"
+
 #include "renderconst.hpp"
 
 
+namespace MWRender
+{
 using namespace Ogre;
-using namespace MWRender;
-using namespace NifOgre;
 
 Actors::~Actors(){
-
     std::map<MWWorld::Ptr, Animation*>::iterator it = mAllActors.begin();
     for (; it != mAllActors.end(); ++it) {
         delete it->second;
@@ -156,3 +161,5 @@ Actors::updateObjectCell(const MWWorld::Ptr &ptr)
         mAllActors[ptr] = anim;
     }
 }
+
+}
diff --git a/apps/openmw/mwrender/actors.hpp b/apps/openmw/mwrender/actors.hpp
index 073c5d51f..71be0bd7b 100644
--- a/apps/openmw/mwrender/actors.hpp
+++ b/apps/openmw/mwrender/actors.hpp
@@ -1,25 +1,27 @@
 #ifndef _GAME_RENDER_ACTORS_H
 #define _GAME_RENDER_ACTORS_H
 
-#include "npcanimation.hpp"
-#include "creatureanimation.hpp"
+#include <openengine/ogre/renderer.hpp>
 
 namespace MWWorld
 {
     class Ptr;
     class CellStore;
+    class InventoryStore;
 }
 
-namespace MWRender{
-    class Actors{
+namespace MWRender
+{
+    class Animation;
+
+    class Actors
+    {
         OEngine::Render::OgreRenderer &mRend;
         std::map<MWWorld::CellStore *, Ogre::SceneNode *> mCellSceneNodes;
         Ogre::SceneNode* mMwRoot;
         std::map<MWWorld::Ptr, Animation*> mAllActors;
 
-
-
-        public:
+    public:
         Actors(OEngine::Render::OgreRenderer& _rend): mRend(_rend) {}
         ~Actors();
         void setMwRoot(Ogre::SceneNode* root);
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index de4778d87..633a3f9e7 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -1,20 +1,13 @@
 #ifndef _GAME_RENDER_ANIMATION_H
 #define _GAME_RENDER_ANIMATION_H
 
-#include <vector>
-
 #include <components/nifogre/ogre_nif_loader.hpp>
-#include <openengine/ogre/renderer.hpp>
-#include "../mwworld/actiontalk.hpp"
-#include <components/nif/node.hpp>
-#include <openengine/bullet/physic.hpp>
 
+namespace MWRender
+{
 
-
-
-namespace MWRender {
-
-class Animation {
+class Animation
+{
     struct GroupTimes {
         float mStart;
         float mStop;
diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 0a11dc281..b144466c9 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -10,6 +10,7 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwworld/player.hpp"
+#include "../mwworld/class.hpp"
 
 #include "renderconst.hpp"
 #include "npcanimation.hpp"
diff --git a/apps/openmw/mwrender/creatureanimation.hpp b/apps/openmw/mwrender/creatureanimation.hpp
index e1a7bbb8f..5456f857f 100644
--- a/apps/openmw/mwrender/creatureanimation.hpp
+++ b/apps/openmw/mwrender/creatureanimation.hpp
@@ -3,18 +3,21 @@
 
 #include "animation.hpp"
 
-#include "components/nifogre/ogre_nif_loader.hpp"
+namespace MWWorld
+{
+    class Ptr;
+}
 
-
-namespace MWRender{
-
-    class CreatureAnimation: public Animation
+namespace MWRender
+{
+    class CreatureAnimation : public Animation
     {
     public:
-        virtual ~CreatureAnimation();
         CreatureAnimation(const MWWorld::Ptr& ptr);
-        virtual void runAnimation(float timepassed);
+        virtual ~CreatureAnimation();
 
+        virtual void runAnimation(float timepassed);
     };
 }
+
 #endif
diff --git a/apps/openmw/mwrender/npcanimation.hpp b/apps/openmw/mwrender/npcanimation.hpp
index ca76dcc22..ff853de71 100644
--- a/apps/openmw/mwrender/npcanimation.hpp
+++ b/apps/openmw/mwrender/npcanimation.hpp
@@ -3,9 +3,7 @@
 
 #include "animation.hpp"
 
-#include "components/nifogre/ogre_nif_loader.hpp"
 #include "../mwworld/inventorystore.hpp"
-#include "../mwclass/npc.hpp"
 #include "../mwworld/containerstore.hpp"
 
 namespace ESM
@@ -13,9 +11,11 @@ namespace ESM
     struct NPC;
 }
 
-namespace MWRender{
+namespace MWRender
+{
 
-class NpcAnimation: public Animation{
+class NpcAnimation : public Animation
+{
 private:
     MWWorld::InventoryStore& mInv;
     int mStateID;
@@ -91,4 +91,5 @@ public:
 };
 
 }
+
 #endif
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 8cb8e9fa8..71424aaed 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -19,8 +19,9 @@
 #include <extern/shiny/Platforms/Ogre/OgrePlatform.hpp>
 
 #include <components/esm/loadstat.hpp>
-#include "../mwworld/esmstore.hpp"
 #include <components/settings/settings.hpp>
+#include "../mwworld/esmstore.hpp"
+#include "../mwworld/class.hpp"
 
 #include "../mwbase/world.hpp" // these includes can be removed once the static-hack is gone
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 6b9abf508..6a6ad92d7 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -10,6 +10,7 @@
 #include "player.hpp"
 #include "localscripts.hpp"
 #include "esmstore.hpp"
+#include "class.hpp"
 
 #include "cellfunctors.hpp"