diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index 9b81494956..381f46c3c4 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -14,7 +14,6 @@
 
 #include <components/esm3/esmreader.hpp>
 #include <components/esm3/esmwriter.hpp>
-#include <components/esm/records.hpp>
 #include <components/esm/format.hpp>
 #include <components/files/openfile.hpp>
 #include <components/misc/strings/algorithm.hpp>
diff --git a/apps/openmw/mwgui/alchemywindow.cpp b/apps/openmw/mwgui/alchemywindow.cpp
index 5c4ea49c70..c0174f3f73 100644
--- a/apps/openmw/mwgui/alchemywindow.cpp
+++ b/apps/openmw/mwgui/alchemywindow.cpp
@@ -19,7 +19,6 @@
 #include "../mwworld/esmstore.hpp"
 
 #include <MyGUI_Macros.h>
-#include <components/esm/records.hpp>
 
 #include "inventoryitemmodel.hpp"
 #include "sortfilteritemmodel.hpp"
diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp
index 6a8beb63fd..7c56342ade 100644
--- a/apps/openmw/mwgui/spellcreationdialog.cpp
+++ b/apps/openmw/mwgui/spellcreationdialog.cpp
@@ -5,7 +5,6 @@
 #include <MyGUI_Gui.h>
 #include <MyGUI_ScrollBar.h>
 
-#include <components/esm/records.hpp>
 #include <components/widgets/list.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
diff --git a/apps/openmw/mwworld/groundcoverstore.cpp b/apps/openmw/mwworld/groundcoverstore.cpp
index d6df136516..251e05225a 100644
--- a/apps/openmw/mwworld/groundcoverstore.cpp
+++ b/apps/openmw/mwworld/groundcoverstore.cpp
@@ -6,6 +6,8 @@
 #include <components/esm3/readerscache.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
+#include <components/esm3/loadstat.hpp>
+#include <components/esm3/loadcell.hpp>
 
 #include <apps/openmw/mwbase/environment.hpp>
 
diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index de9db1bf67..2b98eb2921 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -4,6 +4,7 @@
 
 #include <components/esm3/esmreader.hpp>
 #include <components/esm3/esmwriter.hpp>
+#include <components/esm/records.hpp>
 
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/misc/rng.hpp>
@@ -330,6 +331,9 @@ namespace MWWorld
         }
         return ptr;
     }
+
+    void Store<ESM::LandTexture>::resize(std::size_t num) { mStatic.resize(num); }
+
     size_t Store<ESM::LandTexture>::getSize() const
     {
         return mStatic.size();
diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index 65821a6227..214d3b3a96 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -8,7 +8,10 @@
 #include <unordered_map>
 #include <set>
 
-#include <components/esm/records.hpp>
+#include <components/esm3/loadland.hpp>
+#include <components/esm3/loaddial.hpp>
+#include <components/esm3/loadpgrd.hpp>
+#include <components/esm3/loadcell.hpp>
 #include <components/misc/strings/algorithm.hpp>
 #include <components/misc/rng.hpp>
 
@@ -16,7 +19,13 @@
 
 namespace ESM
 {
-    struct Land;
+    struct Attribute;
+    struct LandTexture;
+    struct MagicEffect;
+    struct Skill;
+    struct WeaponType;
+    class ESMReader;
+    class ESMWriter;
 }
 
 namespace Loading
@@ -227,7 +236,7 @@ namespace MWWorld
         const ESM::LandTexture *search(size_t index, size_t plugin) const;
         const ESM::LandTexture *find(size_t index, size_t plugin) const;
 
-        void resize(size_t num) { mStatic.resize(num); }
+        void resize(std::size_t num);
 
         size_t getSize() const override;
         size_t getSize(size_t plugin) const;