From 0dd529ab1d4b8a7dfb5a1256aa041e8b4061bf4f Mon Sep 17 00:00:00 2001
From: "florent.teppe" <florent.teppe@nadeo.com>
Date: Mon, 5 Sep 2022 19:35:15 +0200
Subject: [PATCH] With the records include removed from store.hpp, need to
 include the relevant files accross the codebase.Lots of touched files, but
 very little done

---
 apps/openmw/mwclass/activator.cpp             |  2 +
 apps/openmw/mwclass/armor.cpp                 |  1 +
 apps/openmw/mwclass/book.cpp                  |  1 +
 apps/openmw/mwclass/clothing.cpp              |  1 +
 apps/openmw/mwclass/container.cpp             |  1 +
 apps/openmw/mwclass/creature.cpp              |  3 ++
 apps/openmw/mwclass/door.cpp                  |  1 +
 apps/openmw/mwclass/npc.cpp                   |  1 +
 apps/openmw/mwdialogue/dialoguemanagerimp.cpp |  1 +
 apps/openmw/mwdialogue/filter.cpp             |  2 +
 apps/openmw/mwdialogue/scripttest.cpp         |  2 +
 apps/openmw/mwgui/alchemywindow.cpp           |  3 ++
 apps/openmw/mwgui/birth.cpp                   |  2 +
 apps/openmw/mwgui/class.cpp                   |  1 +
 apps/openmw/mwgui/dialogue.cpp                |  2 +
 apps/openmw/mwgui/enchantingdialog.cpp        |  2 +
 apps/openmw/mwgui/hud.cpp                     |  2 +
 apps/openmw/mwgui/quickkeysmenu.cpp           |  1 +
 apps/openmw/mwgui/race.cpp                    |  3 ++
 apps/openmw/mwgui/recharge.cpp                |  2 +
 apps/openmw/mwgui/review.cpp                  |  4 ++
 apps/openmw/mwgui/savegamedialog.cpp          |  2 +
 apps/openmw/mwgui/sortfilteritemmodel.cpp     |  2 +-
 apps/openmw/mwgui/spellbuyingwindow.cpp       |  4 ++
 apps/openmw/mwgui/spellcreationdialog.cpp     |  2 +
 apps/openmw/mwgui/spellmodel.cpp              |  3 ++
 apps/openmw/mwgui/spellwindow.cpp             |  2 +
 apps/openmw/mwgui/statswatcher.cpp            |  3 ++
 apps/openmw/mwgui/statswindow.cpp             |  7 +++
 apps/openmw/mwgui/tooltips.cpp                |  1 +
 apps/openmw/mwgui/trainingwindow.cpp          |  1 +
 apps/openmw/mwgui/waitdialog.cpp              |  1 +
 apps/openmw/mwgui/widgets.cpp                 |  3 ++
 apps/openmw/mwlua/stats.cpp                   |  1 +
 apps/openmw/mwlua/types/book.cpp              |  1 +
 apps/openmw/mwlua/types/ingredient.cpp        |  1 +
 apps/openmw/mwmechanics/activespells.cpp      |  3 ++
 apps/openmw/mwmechanics/actors.cpp            |  4 ++
 apps/openmw/mwmechanics/autocalcspell.cpp     |  5 +++
 apps/openmw/mwmechanics/character.cpp         |  1 +
 apps/openmw/mwmechanics/combat.cpp            |  4 ++
 apps/openmw/mwmechanics/creaturestats.cpp     |  1 +
 apps/openmw/mwmechanics/disease.hpp           |  1 +
 apps/openmw/mwmechanics/enchanting.cpp        |  2 +
 apps/openmw/mwmechanics/levelledlist.hpp      |  1 +
 .../mwmechanics/mechanicsmanagerimp.cpp       |  3 ++
 apps/openmw/mwmechanics/recharge.cpp          |  2 +
 apps/openmw/mwmechanics/spellcasting.cpp      |  2 +
 apps/openmw/mwmechanics/spelleffects.cpp      |  1 +
 apps/openmw/mwmechanics/spelllist.cpp         |  2 +
 apps/openmw/mwmechanics/spellpriority.cpp     |  1 +
 apps/openmw/mwmechanics/spellresistance.cpp   |  2 +
 apps/openmw/mwmechanics/spells.cpp            |  2 +
 apps/openmw/mwmechanics/spellutil.cpp         |  2 +
 apps/openmw/mwmechanics/summoning.cpp         |  3 ++
 apps/openmw/mwmechanics/weaponpriority.cpp    |  2 +
 apps/openmw/mwphysics/physicssystem.cpp       |  1 +
 apps/openmw/mwrender/animation.cpp            |  2 +
 apps/openmw/mwrender/npcanimation.cpp         |  8 +++-
 apps/openmw/mwrender/objectpaging.cpp         |  5 +++
 apps/openmw/mwscript/compilercontext.cpp      |  3 +-
 apps/openmw/mwscript/containerextensions.cpp  |  2 +
 apps/openmw/mwscript/globalscripts.cpp        |  2 +
 apps/openmw/mwscript/interpretercontext.cpp   |  1 +
 apps/openmw/mwscript/skyextensions.cpp        |  1 +
 apps/openmw/mwscript/statsextensions.cpp      |  3 ++
 apps/openmw/mwsound/regionsoundselector.cpp   |  1 +
 apps/openmw/mwsound/sound_buffer.cpp          |  1 +
 apps/openmw/mwstate/statemanagerimp.cpp       |  1 +
 apps/openmw/mwworld/actionread.cpp            |  3 ++
 apps/openmw/mwworld/actionsoulgem.cpp         |  1 +
 apps/openmw/mwworld/cellstore.cpp             |  1 +
 apps/openmw/mwworld/class.cpp                 |  3 ++
 apps/openmw/mwworld/containerstore.cpp        |  1 +
 apps/openmw/mwworld/esmstore.cpp              |  2 +
 apps/openmw/mwworld/esmstore.hpp              | 44 ++++++++++++++++++-
 apps/openmw/mwworld/livecellref.cpp           |  3 ++
 apps/openmw/mwworld/localscripts.cpp          |  1 +
 apps/openmw/mwworld/magiceffects.cpp          |  7 +++
 apps/openmw/mwworld/manualref.cpp             |  1 +
 apps/openmw/mwworld/player.cpp                |  1 +
 apps/openmw/mwworld/projectilemanager.cpp     |  3 ++
 apps/openmw/mwworld/weather.cpp               |  1 +
 apps/openmw/mwworld/worldimp.cpp              |  4 ++
 apps/openmw_test_suite/mwworld/test_store.cpp |  1 +
 85 files changed, 220 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index 525097f815..2c32fa33c8 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -5,6 +5,8 @@
 #include <components/esm3/loadacti.hpp>
 #include <components/misc/rng.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
+#include <components/esm3/loadsoun.hpp>
+#include <components/esm3/loadsndg.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index 3abf2f6f57..85d831a544 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -5,6 +5,7 @@
 #include <components/esm3/loadarmo.hpp>
 #include <components/esm3/loadskil.hpp>
 #include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadrace.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index dd8cef1d8a..c1734be946 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -3,6 +3,7 @@
 #include <MyGUI_TextIterator.h>
 
 #include <components/esm3/loadbook.hpp>
+#include <components/esm3/loadsoun.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index 0ad6782011..fab3d35464 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -3,6 +3,7 @@
 #include <MyGUI_TextIterator.h>
 
 #include <components/esm3/loadclot.hpp>
+#include <components/esm3/loadrace.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index b8bff50c27..a95c90d1b1 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -5,6 +5,7 @@
 #include <components/esm3/loadcont.hpp>
 #include <components/esm3/containerstate.hpp>
 #include <components/settings/settings.hpp>
+#include <components/esm3/loadsoun.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 1be89c0c09..a3d6ce8212 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -5,6 +5,9 @@
 #include <components/esm3/loadcrea.hpp>
 #include <components/esm3/creaturestate.hpp>
 #include <components/settings/settings.hpp>
+#include <components/esm3/loadsoun.hpp>
+#include <components/esm3/loadsndg.hpp>
+#include <components/esm3/loadclas.hpp>
 
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/magiceffects.hpp"
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index a990c1439a..3faa42b288 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -4,6 +4,7 @@
 
 #include <components/esm3/loaddoor.hpp>
 #include <components/esm3/doorstate.hpp>
+#include <components/esm3/loadmgef.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 0169e63950..0958c4e23a 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -16,6 +16,7 @@
 #include <components/esm3/loadrace.hpp>
 #include <components/esm3/loadclas.hpp>
 #include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadsoun.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index e10273952a..1f076e6735 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -10,6 +10,7 @@
 #include <components/esm3/loadinfo.hpp>
 #include <components/esm3/dialoguestate.hpp>
 #include <components/esm3/esmwriter.hpp>
+#include <components/esm3/loadfact.hpp>
 
 #include <components/compiler/exception.hpp>
 #include <components/compiler/errorhandler.hpp>
diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index 20092f936c..6e202a1c2f 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -1,6 +1,8 @@
 #include "filter.hpp"
 
 #include <components/compiler/locals.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadfact.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwdialogue/scripttest.cpp b/apps/openmw/mwdialogue/scripttest.cpp
index 3692272484..3edcf077fc 100644
--- a/apps/openmw/mwdialogue/scripttest.cpp
+++ b/apps/openmw/mwdialogue/scripttest.cpp
@@ -16,6 +16,8 @@
 #include <components/compiler/scanner.hpp>
 #include <components/compiler/locals.hpp>
 #include <components/compiler/scriptparser.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadcrea.hpp>
 
 #include "filter.hpp"
 
diff --git a/apps/openmw/mwgui/alchemywindow.cpp b/apps/openmw/mwgui/alchemywindow.cpp
index b7fa3d71a9..67bee26710 100644
--- a/apps/openmw/mwgui/alchemywindow.cpp
+++ b/apps/openmw/mwgui/alchemywindow.cpp
@@ -7,6 +7,9 @@
 #include <MyGUI_ControllerManager.h>
 #include <MyGUI_ControllerRepeatClick.h>
 
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadingr.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
diff --git a/apps/openmw/mwgui/birth.cpp b/apps/openmw/mwgui/birth.cpp
index 6022a8bf89..6686678983 100644
--- a/apps/openmw/mwgui/birth.cpp
+++ b/apps/openmw/mwgui/birth.cpp
@@ -7,6 +7,8 @@
 
 #include <components/resource/resourcesystem.hpp>
 #include <components/misc/resourcehelpers.hpp>
+#include <components/esm3/loadbsgn.hpp>
+#include <components/esm3/loadspel.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwgui/class.cpp b/apps/openmw/mwgui/class.cpp
index 682ea31a0e..a54435d67f 100644
--- a/apps/openmw/mwgui/class.cpp
+++ b/apps/openmw/mwgui/class.cpp
@@ -16,6 +16,7 @@
 #include <components/resource/resourcesystem.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/vfs/manager.hpp>
+#include <components/esm3/loadnpc.hpp>
 
 #include "tooltips.hpp"
 #include "ustring.hpp"
diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index 78735540e0..03cd234fed 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -10,6 +10,8 @@
 #include <components/widgets/box.hpp>
 #include <components/widgets/list.hpp>
 #include <components/translation/translation.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadfact.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
diff --git a/apps/openmw/mwgui/enchantingdialog.cpp b/apps/openmw/mwgui/enchantingdialog.cpp
index 582aeded24..1e340b4a99 100644
--- a/apps/openmw/mwgui/enchantingdialog.cpp
+++ b/apps/openmw/mwgui/enchantingdialog.cpp
@@ -10,6 +10,8 @@
 #include <components/misc/strings/format.hpp>
 #include <components/settings/settings.hpp>
 
+#include <components/esm3/loadgmst.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index 028da083f5..d2a2b8f320 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -10,6 +10,8 @@
 #include <components/settings/settings.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadmgef.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp
index c661b59f17..c218d60726 100644
--- a/apps/openmw/mwgui/quickkeysmenu.cpp
+++ b/apps/openmw/mwgui/quickkeysmenu.cpp
@@ -10,6 +10,7 @@
 #include <components/esm3/quickkeys.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/misc/resourcehelpers.hpp>
+#include <components/esm3/loadmgef.hpp>
 
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/class.hpp"
diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp
index 0c59d1a938..f9d261a272 100644
--- a/apps/openmw/mwgui/race.cpp
+++ b/apps/openmw/mwgui/race.cpp
@@ -10,6 +10,9 @@
 #include <components/debug/debuglog.hpp>
 #include <components/myguiplatform/myguitexture.hpp>
 
+#include <components/esm3/loadbody.hpp>
+#include <components/esm3/loadrace.hpp>
+
 #include "../mwworld/esmstore.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwgui/recharge.cpp b/apps/openmw/mwgui/recharge.cpp
index cbebb0cc68..46fb64780e 100644
--- a/apps/openmw/mwgui/recharge.cpp
+++ b/apps/openmw/mwgui/recharge.cpp
@@ -6,6 +6,8 @@
 
 #include <components/misc/rng.hpp>
 
+#include <components/esm3/loadcrea.hpp>
+
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
diff --git a/apps/openmw/mwgui/review.cpp b/apps/openmw/mwgui/review.cpp
index b0f35640f1..737efba65c 100644
--- a/apps/openmw/mwgui/review.cpp
+++ b/apps/openmw/mwgui/review.cpp
@@ -7,6 +7,10 @@
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_Gui.h>
 
+#include <components/esm3/loadbsgn.hpp>
+#include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadspel.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
diff --git a/apps/openmw/mwgui/savegamedialog.cpp b/apps/openmw/mwgui/savegamedialog.cpp
index acc220c751..8ea39429f5 100644
--- a/apps/openmw/mwgui/savegamedialog.cpp
+++ b/apps/openmw/mwgui/savegamedialog.cpp
@@ -21,6 +21,8 @@
 
 #include <components/files/memorystream.hpp>
 
+#include <components/esm3/loadclas.hpp>
+
 #include "../mwbase/statemanager.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwgui/sortfilteritemmodel.cpp b/apps/openmw/mwgui/sortfilteritemmodel.cpp
index 09ecdb54e5..f3239f0186 100644
--- a/apps/openmw/mwgui/sortfilteritemmodel.cpp
+++ b/apps/openmw/mwgui/sortfilteritemmodel.cpp
@@ -15,7 +15,7 @@
 #include <components/esm3/loadrepa.hpp>
 #include <components/esm3/loadweap.hpp>
 #include <components/esm3/loadench.hpp>
-
+#include <components/esm3/loadcrea.hpp>
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
diff --git a/apps/openmw/mwgui/spellbuyingwindow.cpp b/apps/openmw/mwgui/spellbuyingwindow.cpp
index dae157f511..0894e9e1f2 100644
--- a/apps/openmw/mwgui/spellbuyingwindow.cpp
+++ b/apps/openmw/mwgui/spellbuyingwindow.cpp
@@ -6,6 +6,10 @@
 
 #include <components/misc/strings/lower.hpp>
 
+#include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadgmst.hpp>
+
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp
index a54c5c87f3..43024a3db3 100644
--- a/apps/openmw/mwgui/spellcreationdialog.cpp
+++ b/apps/openmw/mwgui/spellcreationdialog.cpp
@@ -9,6 +9,8 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
 
+#include <components/esm3/loadgmst.hpp>
+
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwgui/spellmodel.cpp b/apps/openmw/mwgui/spellmodel.cpp
index 859410392d..a6972b90e4 100644
--- a/apps/openmw/mwgui/spellmodel.cpp
+++ b/apps/openmw/mwgui/spellmodel.cpp
@@ -3,6 +3,9 @@
 #include <components/debug/debuglog.hpp>
 #include <components/misc/utf8stream.hpp>
 
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadench.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
diff --git a/apps/openmw/mwgui/spellwindow.cpp b/apps/openmw/mwgui/spellwindow.cpp
index f41990ac41..f35d435f0c 100644
--- a/apps/openmw/mwgui/spellwindow.cpp
+++ b/apps/openmw/mwgui/spellwindow.cpp
@@ -5,6 +5,8 @@
 
 #include <components/settings/settings.hpp>
 #include <components/misc/strings/format.hpp>
+#include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadbsgn.hpp>
 
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwgui/statswatcher.cpp b/apps/openmw/mwgui/statswatcher.cpp
index 883fd265cc..46be15542a 100644
--- a/apps/openmw/mwgui/statswatcher.cpp
+++ b/apps/openmw/mwgui/statswatcher.cpp
@@ -1,5 +1,8 @@
 #include "statswatcher.hpp"
 
+#include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadclas.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwgui/statswindow.cpp b/apps/openmw/mwgui/statswindow.cpp
index 1f7576d493..4856487686 100644
--- a/apps/openmw/mwgui/statswindow.cpp
+++ b/apps/openmw/mwgui/statswindow.cpp
@@ -9,6 +9,13 @@
 #include <MyGUI_TextIterator.h>
 #include <MyGUI_Gui.h>
 
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadfact.hpp>
+#include <components/esm3/loadspel.hpp>
+#include <components/esm3/loadbsgn.hpp>
+#include <components/esm3/loadclas.hpp>
+#include <components/esm3/loadrace.hpp>
+
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp
index 94c4288ddf..e0da731d5d 100644
--- a/apps/openmw/mwgui/tooltips.cpp
+++ b/apps/openmw/mwgui/tooltips.cpp
@@ -10,6 +10,7 @@
 #include <components/settings/settings.hpp>
 #include <components/widgets/box.hpp>
 #include <components/misc/resourcehelpers.hpp>
+#include <components/esm/records.hpp>
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwgui/trainingwindow.cpp b/apps/openmw/mwgui/trainingwindow.cpp
index 24a4eb3607..1955a79426 100644
--- a/apps/openmw/mwgui/trainingwindow.cpp
+++ b/apps/openmw/mwgui/trainingwindow.cpp
@@ -16,6 +16,7 @@
 #include "../mwmechanics/actorutil.hpp"
 
 #include <components/settings/settings.hpp>
+#include <components/esm3/loadclas.hpp>
 
 #include "tooltips.hpp"
 
diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp
index f6671915f3..c8abf87fcb 100644
--- a/apps/openmw/mwgui/waitdialog.cpp
+++ b/apps/openmw/mwgui/waitdialog.cpp
@@ -9,6 +9,7 @@
 #include <components/widgets/box.hpp>
 #include <components/settings/settings.hpp>
 #include <components/misc/strings/format.hpp>
+#include <components/esm3/loadregn.hpp>
 
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwgui/widgets.cpp b/apps/openmw/mwgui/widgets.cpp
index 2a27a976ee..aa88d58c4f 100644
--- a/apps/openmw/mwgui/widgets.cpp
+++ b/apps/openmw/mwgui/widgets.cpp
@@ -9,6 +9,9 @@
 
 #include <components/resource/resourcesystem.hpp>
 #include <components/misc/resourcehelpers.hpp>
+#include <components/esm3/loadspel.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm/attr.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwlua/stats.cpp b/apps/openmw/mwlua/stats.cpp
index 3e1746dce8..83bce35cca 100644
--- a/apps/openmw/mwlua/stats.cpp
+++ b/apps/openmw/mwlua/stats.cpp
@@ -7,6 +7,7 @@
 #include <variant>
 
 #include <components/lua/luastate.hpp>
+#include <components/esm3/loadclas.hpp>
 
 #include "localscripts.hpp"
 #include "luamanagerimp.hpp"
diff --git a/apps/openmw/mwlua/types/book.cpp b/apps/openmw/mwlua/types/book.cpp
index fd646048f8..c439965f30 100644
--- a/apps/openmw/mwlua/types/book.cpp
+++ b/apps/openmw/mwlua/types/book.cpp
@@ -8,6 +8,7 @@
 #include <apps/openmw/mwworld/esmstore.hpp>
 #include <apps/openmw/mwbase/environment.hpp>
 #include <apps/openmw/mwbase/world.hpp>
+#include <components/esm3/loadskil.hpp>
 
 namespace sol
 {
diff --git a/apps/openmw/mwlua/types/ingredient.cpp b/apps/openmw/mwlua/types/ingredient.cpp
index e75453d776..3505633036 100644
--- a/apps/openmw/mwlua/types/ingredient.cpp
+++ b/apps/openmw/mwlua/types/ingredient.cpp
@@ -8,6 +8,7 @@
 
 #include <apps/openmw/mwbase/environment.hpp>
 #include <apps/openmw/mwbase/world.hpp>
+#include <components/esm3/loadalch.hpp>
 
 namespace sol
 {
diff --git a/apps/openmw/mwmechanics/activespells.cpp b/apps/openmw/mwmechanics/activespells.cpp
index 040214848c..6d61b59553 100644
--- a/apps/openmw/mwmechanics/activespells.cpp
+++ b/apps/openmw/mwmechanics/activespells.cpp
@@ -10,6 +10,9 @@
 #include <components/misc/strings/algorithm.hpp>
 
 #include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadstat.hpp>
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/loadrace.hpp>
 
 #include <components/settings/settings.hpp>
 
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 2bc0a217c9..2c423cafd1 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -12,6 +12,10 @@
 #include <components/settings/settings.hpp>
 #include <components/misc/resourcehelpers.hpp>
 
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadgmst.hpp>
+
+
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/inventorystore.hpp"
diff --git a/apps/openmw/mwmechanics/autocalcspell.cpp b/apps/openmw/mwmechanics/autocalcspell.cpp
index d82b8505f1..fd7bcd7d5e 100644
--- a/apps/openmw/mwmechanics/autocalcspell.cpp
+++ b/apps/openmw/mwmechanics/autocalcspell.cpp
@@ -2,6 +2,11 @@
 
 #include <limits>
 
+#include <components/esm3/loadspel.hpp>
+#include <components/esm3/loadrace.hpp>
+#include <components/esm/attr.hpp>
+#include <components/esm3/loadmgef.hpp>
+
 #include "../mwworld/esmstore.hpp"
 
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 266ea5a9f5..7f14185ad2 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -25,6 +25,7 @@
 #include <components/misc/rng.hpp>
 #include <components/misc/strings/algorithm.hpp>
 #include <components/misc/resourcehelpers.hpp>
+#include <components/esm/records.hpp>
 
 #include <components/settings/settings.hpp>
 
diff --git a/apps/openmw/mwmechanics/combat.cpp b/apps/openmw/mwmechanics/combat.cpp
index 5ecbd78ad6..612f178d65 100644
--- a/apps/openmw/mwmechanics/combat.cpp
+++ b/apps/openmw/mwmechanics/combat.cpp
@@ -6,6 +6,10 @@
 
 #include <components/sceneutil/positionattitudetransform.hpp>
 
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadsoun.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index ae4ebbce49..97e30620da 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -6,6 +6,7 @@
 #include <components/esm3/creaturestats.hpp>
 #include <components/esm3/esmreader.hpp>
 #include <components/esm3/esmwriter.hpp>
+#include <components/esm3/loadmgef.hpp>
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
diff --git a/apps/openmw/mwmechanics/disease.hpp b/apps/openmw/mwmechanics/disease.hpp
index e182886059..fad9afd015 100644
--- a/apps/openmw/mwmechanics/disease.hpp
+++ b/apps/openmw/mwmechanics/disease.hpp
@@ -3,6 +3,7 @@
 
 #include <components/misc/rng.hpp>
 #include <components/misc/strings/format.hpp>
+#include <components/esm3/loadmgef.hpp>
 
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwmechanics/enchanting.cpp b/apps/openmw/mwmechanics/enchanting.cpp
index 256e1bd871..6540b405a0 100644
--- a/apps/openmw/mwmechanics/enchanting.cpp
+++ b/apps/openmw/mwmechanics/enchanting.cpp
@@ -2,6 +2,8 @@
 
 #include <components/misc/rng.hpp>
 #include <components/settings/settings.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadmgef.hpp>
 
 #include "../mwworld/manualref.hpp"
 #include "../mwworld/class.hpp"
diff --git a/apps/openmw/mwmechanics/levelledlist.hpp b/apps/openmw/mwmechanics/levelledlist.hpp
index 57dca34cf0..35ad048a27 100644
--- a/apps/openmw/mwmechanics/levelledlist.hpp
+++ b/apps/openmw/mwmechanics/levelledlist.hpp
@@ -3,6 +3,7 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/rng.hpp>
+#include <components/esm3/loadlevlist.hpp>
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/esmstore.hpp"
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index bde5ad0225..1d69faaa8e 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -6,6 +6,9 @@
 
 #include <components/esm3/esmwriter.hpp>
 #include <components/esm3/stolenitems.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm/records.hpp>
 
 #include <components/sceneutil/positionattitudetransform.hpp>
 
diff --git a/apps/openmw/mwmechanics/recharge.cpp b/apps/openmw/mwmechanics/recharge.cpp
index 315495ac67..d15b44d298 100644
--- a/apps/openmw/mwmechanics/recharge.cpp
+++ b/apps/openmw/mwmechanics/recharge.cpp
@@ -2,6 +2,8 @@
 
 #include <components/misc/rng.hpp>
 #include <components/misc/strings/format.hpp>
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/loadcrea.hpp>
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index 06d504ef6c..c845cfab04 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -4,6 +4,8 @@
 #include <components/misc/rng.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/misc/strings/format.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadench.hpp>
 
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index 4a9cf49263..0ad0d2f6eb 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -6,6 +6,7 @@
 #include <components/misc/rng.hpp>
 #include <components/settings/settings.hpp>
 #include <components/misc/resourcehelpers.hpp>
+#include <components/esm3/loadench.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
diff --git a/apps/openmw/mwmechanics/spelllist.cpp b/apps/openmw/mwmechanics/spelllist.cpp
index cbe95e7047..7c302f7861 100644
--- a/apps/openmw/mwmechanics/spelllist.cpp
+++ b/apps/openmw/mwmechanics/spelllist.cpp
@@ -3,6 +3,8 @@
 #include <algorithm>
 
 #include <components/esm3/loadspel.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadnpc.hpp>
 
 #include "spells.hpp"
 
diff --git a/apps/openmw/mwmechanics/spellpriority.cpp b/apps/openmw/mwmechanics/spellpriority.cpp
index e22a8c4f75..52ad95f710 100644
--- a/apps/openmw/mwmechanics/spellpriority.cpp
+++ b/apps/openmw/mwmechanics/spellpriority.cpp
@@ -4,6 +4,7 @@
 #include <components/esm3/loadench.hpp>
 #include <components/esm3/loadmgef.hpp>
 #include <components/esm3/loadspel.hpp>
+#include <components/esm3/loadrace.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwmechanics/spellresistance.cpp b/apps/openmw/mwmechanics/spellresistance.cpp
index bb39255b43..d865172875 100644
--- a/apps/openmw/mwmechanics/spellresistance.cpp
+++ b/apps/openmw/mwmechanics/spellresistance.cpp
@@ -2,6 +2,8 @@
 
 #include <components/misc/rng.hpp>
 
+#include <components/esm3/loadmgef.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
diff --git a/apps/openmw/mwmechanics/spells.cpp b/apps/openmw/mwmechanics/spells.cpp
index 2f81be6d36..481d555c01 100644
--- a/apps/openmw/mwmechanics/spells.cpp
+++ b/apps/openmw/mwmechanics/spells.cpp
@@ -5,6 +5,8 @@
 #include <components/esm3/spellstate.hpp>
 #include <components/misc/rng.hpp>
 
+#include <components/esm3/loadmgef.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
diff --git a/apps/openmw/mwmechanics/spellutil.cpp b/apps/openmw/mwmechanics/spellutil.cpp
index 7fa9687189..f8a9eb3b2e 100644
--- a/apps/openmw/mwmechanics/spellutil.cpp
+++ b/apps/openmw/mwmechanics/spellutil.cpp
@@ -2,6 +2,8 @@
 
 #include <limits>
 
+#include <components/esm3/loadmgef.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
diff --git a/apps/openmw/mwmechanics/summoning.cpp b/apps/openmw/mwmechanics/summoning.cpp
index f17b6773e8..20455e7350 100644
--- a/apps/openmw/mwmechanics/summoning.cpp
+++ b/apps/openmw/mwmechanics/summoning.cpp
@@ -2,6 +2,9 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/resourcehelpers.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadspel.hpp>
+#include <components/esm3/loadstat.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwmechanics/weaponpriority.cpp b/apps/openmw/mwmechanics/weaponpriority.cpp
index 024d837fe7..0beecae990 100644
--- a/apps/openmw/mwmechanics/weaponpriority.cpp
+++ b/apps/openmw/mwmechanics/weaponpriority.cpp
@@ -1,6 +1,8 @@
 #include "weaponpriority.hpp"
 
 #include <components/esm3/loadench.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadcrea.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index df94d5cc1f..76800ed498 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -28,6 +28,7 @@
 #include <components/misc/convert.hpp>
 #include <components/settings/settings.hpp>
 #include <components/nifosg/particle.hpp> // FindRecIndexVisitor
+#include <components/esm3/loadmgef.hpp>
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 9b9ad0f770..28dea789e5 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -21,6 +21,8 @@
 #include <components/misc/constants.hpp>
 #include <components/misc/pathhelpers.hpp>
 #include <components/misc/resourcehelpers.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadrace.hpp>
 
 #include <components/sceneutil/keyframe.hpp>
 
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 421a7e622f..940b343792 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -21,7 +21,13 @@
 #include <components/sceneutil/skeleton.hpp>
 #include <components/sceneutil/keyframe.hpp>
 #include <components/sceneutil/depth.hpp>
-
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadstat.hpp>
+#include <components/esm3/loadacti.hpp>
+#include <components/esm3/loaddoor.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loadbody.hpp>
+#include <components/esm3/loadrace.hpp>
 #include <components/settings/settings.hpp>
 
 #include <components/vfs/manager.hpp>
diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index adbf1a202b..1426a6d314 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -11,6 +11,11 @@
 #include <osgUtil/IncrementalCompileOperation>
 
 #include <components/esm3/esmreader.hpp>
+#include <components/esm3/loadstat.hpp>
+#include <components/esm3/loadacti.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loaddoor.hpp>
+
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/optimizer.hpp>
diff --git a/apps/openmw/mwscript/compilercontext.cpp b/apps/openmw/mwscript/compilercontext.cpp
index 53e93354fa..fcad0dd998 100644
--- a/apps/openmw/mwscript/compilercontext.cpp
+++ b/apps/openmw/mwscript/compilercontext.cpp
@@ -3,7 +3,8 @@
 #include "../mwworld/esmstore.hpp"
 
 #include <components/esm3/loaddial.hpp>
-
+#include <components/esm3/loadscpt.hpp>
+#include <components/esm/records.hpp>
 #include <components/compiler/locals.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwscript/containerextensions.cpp b/apps/openmw/mwscript/containerextensions.cpp
index f3c04a7341..9f93e5853b 100644
--- a/apps/openmw/mwscript/containerextensions.cpp
+++ b/apps/openmw/mwscript/containerextensions.cpp
@@ -16,6 +16,8 @@
 #include <components/esm3/loadskil.hpp>
 #include <components/esm3/loadlevlist.hpp>
 
+#include <components/esm3/loadcrea.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwscript/globalscripts.cpp b/apps/openmw/mwscript/globalscripts.cpp
index 35a666234b..17742a0f84 100644
--- a/apps/openmw/mwscript/globalscripts.cpp
+++ b/apps/openmw/mwscript/globalscripts.cpp
@@ -4,6 +4,8 @@
 #include <components/misc/strings/lower.hpp>
 #include <components/esm3/esmwriter.hpp>
 #include <components/esm3/globalscript.hpp>
+#include <components/esm3/loadsscr.hpp>
+#include <components/esm3/loadscpt.hpp>
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp
index 633bcf88a2..0ca1443656 100644
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@@ -4,6 +4,7 @@
 #include <sstream>
 
 #include <components/compiler/locals.hpp>
+#include <components/esm/records.hpp>
 
 #include "../mwworld/esmstore.hpp"
 
diff --git a/apps/openmw/mwscript/skyextensions.cpp b/apps/openmw/mwscript/skyextensions.cpp
index ed65885906..6ade880c7e 100644
--- a/apps/openmw/mwscript/skyextensions.cpp
+++ b/apps/openmw/mwscript/skyextensions.cpp
@@ -7,6 +7,7 @@
 #include <components/interpreter/interpreter.hpp>
 #include <components/interpreter/runtime.hpp>
 #include <components/interpreter/opcodes.hpp>
+#include <components/esm3/loadregn.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index fa48ae7e99..7ce266111f 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -12,6 +12,9 @@
 #include <components/interpreter/interpreter.hpp>
 #include <components/interpreter/runtime.hpp>
 #include <components/interpreter/opcodes.hpp>
+#include <components/esm3/loadfact.hpp>
+
+#include <components/esm3/loadmgef.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
diff --git a/apps/openmw/mwsound/regionsoundselector.cpp b/apps/openmw/mwsound/regionsoundselector.cpp
index 752c4a26b4..1553344913 100644
--- a/apps/openmw/mwsound/regionsoundselector.cpp
+++ b/apps/openmw/mwsound/regionsoundselector.cpp
@@ -2,6 +2,7 @@
 
 #include <components/fallback/fallback.hpp>
 #include <components/misc/rng.hpp>
+#include <components/esm3/loadregn.hpp>
 
 #include <algorithm>
 #include <numeric>
diff --git a/apps/openmw/mwsound/sound_buffer.cpp b/apps/openmw/mwsound/sound_buffer.cpp
index e64e89d775..814e400305 100644
--- a/apps/openmw/mwsound/sound_buffer.cpp
+++ b/apps/openmw/mwsound/sound_buffer.cpp
@@ -7,6 +7,7 @@
 #include <components/debug/debuglog.hpp>
 #include <components/settings/settings.hpp>
 #include <components/vfs/manager.hpp>
+#include <components/esm3/loadsoun.hpp>
 
 #include <algorithm>
 #include <cmath>
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index b6fb8c61e3..c21713ceca 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -8,6 +8,7 @@
 #include <components/esm3/esmreader.hpp>
 #include <components/esm3/cellid.hpp>
 #include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadclas.hpp>
 
 #include <components/loadinglistener/loadinglistener.hpp>
 
diff --git a/apps/openmw/mwworld/actionread.cpp b/apps/openmw/mwworld/actionread.cpp
index 58611f0af7..442078b18c 100644
--- a/apps/openmw/mwworld/actionread.cpp
+++ b/apps/openmw/mwworld/actionread.cpp
@@ -1,5 +1,8 @@
 #include "actionread.hpp"
 
+#include <components/esm3/loadbook.hpp>
+#include <components/esm3/loadclas.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwworld/actionsoulgem.cpp b/apps/openmw/mwworld/actionsoulgem.cpp
index dae0a4503f..161d923358 100644
--- a/apps/openmw/mwworld/actionsoulgem.cpp
+++ b/apps/openmw/mwworld/actionsoulgem.cpp
@@ -1,6 +1,7 @@
 #include "actionsoulgem.hpp"
 
 #include <components/debug/debuglog.hpp>
+#include <components/esm3/loadcrea.hpp>
 
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index fd4c6161e9..951b1ab6fe 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -18,6 +18,7 @@
 #include <components/esm3/creaturelevliststate.hpp>
 #include <components/esm3/doorstate.hpp>
 #include <components/esm3/readerscache.hpp>
+#include <components/esm3/loadench.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/luamanager.hpp"
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 93009c26cb..46c5bb81ab 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -3,6 +3,9 @@
 #include <stdexcept>
 
 #include <components/esm/defs.hpp>
+#include <components/esm3/loadsoun.hpp>
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/loadmgef.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index 5f6df78b50..91b0c9e9cb 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -8,6 +8,7 @@
 #include <components/misc/strings/algorithm.hpp>
 #include <components/misc/strings/lower.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
+#include <components/esm3/loadench.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index d4f1554564..688b9a6379 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -11,6 +11,8 @@
 #include <components/lua/configuration.hpp>
 #include <components/misc/algorithm.hpp>
 #include <components/esm3/readerscache.hpp>
+#include <components/esm/records.hpp>
+
 #include <components/esmloader/load.hpp>
 #include <components/esm4/common.hpp>
 
diff --git a/apps/openmw/mwworld/esmstore.hpp b/apps/openmw/mwworld/esmstore.hpp
index 3890dcaa51..068bb054ca 100644
--- a/apps/openmw/mwworld/esmstore.hpp
+++ b/apps/openmw/mwworld/esmstore.hpp
@@ -7,7 +7,7 @@
 #include <tuple>
 
 #include <components/esm/luascripts.hpp>
-#include <components/esm/records.hpp>
+#include <components/esm3/loadgmst.hpp>
 
 #include "store.hpp"
 
@@ -24,6 +24,48 @@ namespace MWMechanics
 namespace ESM
 {
     class ReadersCache;
+    struct Activator;
+    struct Potion;
+    struct Apparatus;
+    struct Armor;
+    struct BodyPart;
+    struct Book;
+    struct BirthSign;
+    struct Class;
+    struct Clothing;
+    struct Container;
+    struct Creature;
+    struct Dialogue;
+    struct Door;
+    struct Enchantment;
+    struct Faction;
+    struct Global;
+    struct Ingredient;
+    struct CreatureLevList;
+    struct ItemLevList;
+    struct Light;
+    struct Lockpick;
+    struct Miscellaneous;
+    struct NPC;
+    struct Probe;
+    struct Race;
+    struct Region;
+    struct Repair;
+    struct SoundGenerator;
+    struct Sound;
+    struct Spell;
+    struct StartScript;
+    struct Static;
+    struct Weapon;
+    struct GameSetting;
+    class Script;
+    struct Cell;
+    struct Land;
+    struct LandTexture;
+    struct Pathgrid;
+    struct MagicEffect;
+    struct Skill;
+    struct Attribute;
 }
 
 namespace MWWorld
diff --git a/apps/openmw/mwworld/livecellref.cpp b/apps/openmw/mwworld/livecellref.cpp
index 172ba9ca8d..d69f314ef3 100644
--- a/apps/openmw/mwworld/livecellref.cpp
+++ b/apps/openmw/mwworld/livecellref.cpp
@@ -4,6 +4,9 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/esm3/objectstate.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadclas.hpp>
+#include <components/esm3/loadscpt.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwworld/localscripts.cpp b/apps/openmw/mwworld/localscripts.cpp
index 9345a0cb9b..2cc9261fae 100644
--- a/apps/openmw/mwworld/localscripts.cpp
+++ b/apps/openmw/mwworld/localscripts.cpp
@@ -1,6 +1,7 @@
 #include "localscripts.hpp"
 
 #include <components/debug/debuglog.hpp>
+#include <components/esm3/loadscpt.hpp>
 
 #include "esmstore.hpp"
 #include "cellstore.hpp"
diff --git a/apps/openmw/mwworld/magiceffects.cpp b/apps/openmw/mwworld/magiceffects.cpp
index 5e8eb54138..e5e42b1a2d 100644
--- a/apps/openmw/mwworld/magiceffects.cpp
+++ b/apps/openmw/mwworld/magiceffects.cpp
@@ -2,6 +2,13 @@
 #include "esmstore.hpp"
 
 #include <components/esm3/npcstate.hpp>
+#include <components/esm3/loadspel.hpp>
+#include <components/esm3/loadskil.hpp>
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadarmo.hpp>
+#include <components/esm3/loadclot.hpp>
+#include <components/esm3/loadweap.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwworld/manualref.cpp b/apps/openmw/mwworld/manualref.cpp
index b809a81b3e..5c822483c5 100644
--- a/apps/openmw/mwworld/manualref.cpp
+++ b/apps/openmw/mwworld/manualref.cpp
@@ -1,4 +1,5 @@
 #include "manualref.hpp"
+#include <components/esm/records.hpp>
 
 #include "esmstore.hpp"
 
diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index 9c5f226bc6..3d0fa1afa2 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -10,6 +10,7 @@
 #include <components/esm/defs.hpp>
 #include <components/esm3/loadbsgn.hpp>
 #include <components/fallback/fallback.hpp>
+#include <components/esm3/loadmgef.hpp>
 
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index b25d867542..d11cf47ce0 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -11,6 +11,9 @@
 
 #include <components/esm3/esmwriter.hpp>
 #include <components/esm3/projectilestate.hpp>
+#include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadmgef.hpp>
+#include <components/esm3/loadench.hpp>
 
 #include <components/misc/constants.hpp>
 #include <components/misc/convert.hpp>
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index 38f1b340e8..4a3690daf7 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -5,6 +5,7 @@
 #include <components/esm3/esmreader.hpp>
 #include <components/esm3/esmwriter.hpp>
 #include <components/esm3/weatherstate.hpp>
+#include <components/esm3/loadregn.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/soundmanager.hpp"
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 163df76106..c7492eec1b 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -16,6 +16,10 @@
 #include <components/esm3/esmwriter.hpp>
 #include <components/esm3/cellid.hpp>
 #include <components/esm3/cellref.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadregn.hpp>
+#include <components/esm3/loadench.hpp>
+#include <components/esm3/loadmgef.hpp>
 
 #include <components/misc/constants.hpp>
 #include <components/misc/mathutil.hpp>
diff --git a/apps/openmw_test_suite/mwworld/test_store.cpp b/apps/openmw_test_suite/mwworld/test_store.cpp
index 3f77aec498..88ea74c804 100644
--- a/apps/openmw_test_suite/mwworld/test_store.cpp
+++ b/apps/openmw_test_suite/mwworld/test_store.cpp
@@ -8,6 +8,7 @@
 #include <components/files/configurationmanager.hpp>
 #include <components/esm3/esmreader.hpp>
 #include <components/esm3/esmwriter.hpp>
+#include <components/esm/records.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/misc/strings/algorithm.hpp>