diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index ec864d983..774562c7c 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -7,6 +7,7 @@
 
 #include "ptr.hpp"
 #include "nullaction.hpp"
+#include "containerstore.hpp"
 
 namespace MWWorld
 {
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index c5e271e7a..68fa7f1f5 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -7,11 +7,11 @@
 #include <boost/shared_ptr.hpp>
 
 #include "action.hpp"
-#include "containerstore.hpp"
 #include "refdata.hpp"
-#include "../mwrender/renderinginterface.hpp"
 #include "physicssystem.hpp"
 
+#include "../mwrender/renderinginterface.hpp"
+
 namespace Ogre
 {
     class Vector3;
@@ -33,6 +33,7 @@ namespace MWWorld
 {
     class Ptr;
     class Environment;
+    class ContainerStore;
 
     /// \brief Base class for referenceable esm records
     class Class