diff --git a/apps/openmw/mwgui/widgets.cpp b/apps/openmw/mwgui/widgets.cpp
index d7bc2c96e..052407c58 100644
--- a/apps/openmw/mwgui/widgets.cpp
+++ b/apps/openmw/mwgui/widgets.cpp
@@ -1,4 +1,5 @@
 #include "widgets.hpp"
+#include "../mwworld/esmstore.hpp"
 
 #include <boost/lexical_cast.hpp>
 
diff --git a/apps/openmw/mwgui/widgets.hpp b/apps/openmw/mwgui/widgets.hpp
index aae28a686..6ce114131 100644
--- a/apps/openmw/mwgui/widgets.hpp
+++ b/apps/openmw/mwgui/widgets.hpp
@@ -1,10 +1,12 @@
 #ifndef MWGUI_WIDGETS_H
 #define MWGUI_WIDGETS_H
 
-#include "../mwworld/esmstore.hpp"
 #include "../mwmechanics/stat.hpp"
 #include "controllers.hpp"
 
+#include <components/esm/effectlist.hpp>
+#include <components/esm/loadskil.hpp>
+
 #include <MyGUI_Button.h>
 #include <MyGUI_EditBox.h>
 #include <MyGUI_ScrollBar.h>
diff --git a/apps/openmw/mwmechanics/aipackage.hpp b/apps/openmw/mwmechanics/aipackage.hpp
index f1c9ec7d2..ca08de072 100644
--- a/apps/openmw/mwmechanics/aipackage.hpp
+++ b/apps/openmw/mwmechanics/aipackage.hpp
@@ -3,7 +3,6 @@
 
 #include "pathfinding.hpp"
 #include <components/esm/defs.hpp>
-#include "../mwbase/world.hpp"
 
 #include "obstacle.hpp"
 #include "aistate.hpp"
diff --git a/apps/openmw/mwscript/interpretercontext.hpp b/apps/openmw/mwscript/interpretercontext.hpp
index 354df00bd..698df62c2 100644
--- a/apps/openmw/mwscript/interpretercontext.hpp
+++ b/apps/openmw/mwscript/interpretercontext.hpp
@@ -5,8 +5,6 @@
 
 #include <components/interpreter/context.hpp>
 
-#include "../mwbase/world.hpp"
-
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/action.hpp"
 
diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index eba627b3e..f6f2a3b48 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/apps/openmw/mwworld/cellstore.hpp
@@ -6,10 +6,10 @@
 #include <boost/shared_ptr.hpp>
 
 #include "livecellref.hpp"
-#include "esmstore.hpp"
 #include "cellreflist.hpp"
 
 #include <components/esm/fogstate.hpp>
+#include <components/esm/records.hpp>
 
 #include "../mwmechanics/pathgrid.hpp"  // TODO: maybe belongs in mwworld
 
@@ -24,7 +24,7 @@ namespace ESM
 namespace MWWorld
 {
     class Ptr;
-
+    class ESMStore;
 
 
     /// \brief Mutable state of a cell