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

@@ -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"

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"

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"

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"

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"

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"

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"

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"

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>

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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"
 

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"

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"

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"

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
 {

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
 {

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>
 

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"

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"

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>
 

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"

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"

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"

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"

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"

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>
 

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"

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"

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"

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"
 

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"

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"
 

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"
 

apps/openmw/mwmechanics/spellutil.cpp

@@ -2,6 +2,8 @@
 
 #include <limits>
 
+#include <components/esm3/loadmgef.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 

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"

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"

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"

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>
 

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>

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>

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"

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"

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"

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"
 

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"

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"

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>

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>

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>
 

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"

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"

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"

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"

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"

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>
 

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

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"

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"

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"

apps/openmw/mwworld/manualref.cpp

@@ -1,4 +1,5 @@
 #include "manualref.hpp"
+#include <components/esm/records.hpp>
 
 #include "esmstore.hpp"
 

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"

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>

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"

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>

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>