diff --git a/apps/openmw/mwrender/groundcover.cpp b/apps/openmw/mwrender/groundcover.cpp
index 7271a06df9..194227f758 100644
--- a/apps/openmw/mwrender/groundcover.cpp
+++ b/apps/openmw/mwrender/groundcover.cpp
@@ -13,6 +13,7 @@
 #include <components/terrain/quadtreenode.hpp>
 #include <components/shader/shadermanager.hpp>
 #include <components/esm3/readerscache.hpp>
+#include <components/esm3/loadland.hpp>
 
 #include "../mwworld/groundcoverstore.hpp"
 
diff --git a/apps/openmw/mwworld/groundcoverstore.cpp b/apps/openmw/mwworld/groundcoverstore.cpp
index 980eb09e46..567735e02a 100644
--- a/apps/openmw/mwworld/groundcoverstore.cpp
+++ b/apps/openmw/mwworld/groundcoverstore.cpp
@@ -1,12 +1,15 @@
 #include "groundcoverstore.hpp"
 
 #include <components/esmloader/load.hpp>
+#include <components/esmloader/esmdata.hpp>
 #include <components/misc/stringops.hpp>
 #include <components/esm3/readerscache.hpp>
 
 #include <apps/openmw/mwbase/environment.hpp>
 #include <apps/openmw/mwbase/windowmanager.hpp>
 
+#include "store.hpp"
+
 namespace MWWorld
 {
     void GroundcoverStore::init(const Store<ESM::Static>& statics, const Files::Collections& fileCollections,
diff --git a/apps/openmw/mwworld/groundcoverstore.hpp b/apps/openmw/mwworld/groundcoverstore.hpp
index ffeb111134..d955f731fc 100644
--- a/apps/openmw/mwworld/groundcoverstore.hpp
+++ b/apps/openmw/mwworld/groundcoverstore.hpp
@@ -5,14 +5,33 @@
 #include <string>
 #include <map>
 
-#include <components/esm3/esmreader.hpp>
-#include <components/esmloader/esmdata.hpp>
-#include <components/files/collections.hpp>
+namespace ESM
+{
+    struct ESM_Context;
+    struct Static;
+    struct Cell;
+}
 
-#include "esmstore.hpp"
+namespace Loading
+{
+    class Listener;
+}
+
+namespace Files
+{
+    class Collections;
+}
+
+namespace ToUTF8
+{
+    class Utf8Encoder;
+}
 
 namespace MWWorld
 {
+    template <class T>
+    class Store;
+
     class GroundcoverStore
     {
         private: