fewer header includes

apps/openmw/mwclass/activator.cpp

@@ -7,6 +7,8 @@
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/esm3/loadsoun.hpp>
 #include <components/esm3/loadsndg.hpp>
+#include <components/esm3/loadacti.hpp>
+#include <components/esm3/loadcrea.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"

apps/openmw/mwclass/apparatus.cpp

@@ -3,7 +3,7 @@
 #include <MyGUI_TextIterator.h>
 
 #include <components/esm3/loadappa.hpp>
-
+#include <components/esm3/loadnpc.hpp>
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 

apps/openmw/mwclass/armor.cpp

@@ -6,6 +6,7 @@
 #include <components/esm3/loadskil.hpp>
 #include <components/esm3/loadgmst.hpp>
 #include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadnpc.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"

apps/openmw/mwclass/bodypart.cpp

@@ -1,5 +1,7 @@
 #include "bodypart.hpp"
 
+#include <components/esm3/loadbody.hpp>
+
 #include "../mwrender/renderinginterface.hpp"
 #include "../mwrender/objects.hpp"
 

apps/openmw/mwclass/clothing.cpp

@@ -4,6 +4,7 @@
 
 #include <components/esm3/loadclot.hpp>
 #include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadnpc.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"

apps/openmw/mwclass/ingredient.cpp

@@ -3,6 +3,7 @@
 #include <MyGUI_TextIterator.h>
 
 #include <components/esm3/loadingr.hpp>
+#include <components/esm3/loadnpc.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"

apps/openmw/mwclass/light.cpp

@@ -3,6 +3,7 @@
 #include <MyGUI_TextIterator.h>
 
 #include <components/esm3/loadligh.hpp>
+#include <components/esm3/loadnpc.hpp>
 #include <components/esm3/objectstate.hpp>
 #include <components/settings/settings.hpp>
 

apps/openmw/mwclass/lockpick.cpp

@@ -3,6 +3,7 @@
 #include <MyGUI_TextIterator.h>
 
 #include <components/esm3/loadlock.hpp>
+#include <components/esm3/loadnpc.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"

apps/openmw/mwclass/misc.cpp

@@ -3,6 +3,9 @@
 #include <MyGUI_TextIterator.h>
 
 #include <components/esm3/loadmisc.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadcrea.hpp>
+
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"

apps/openmw/mwclass/npc.cpp

@@ -17,6 +17,7 @@
 #include <components/esm3/loadclas.hpp>
 #include <components/esm3/loadnpc.hpp>
 #include <components/esm3/loadsoun.hpp>
+#include <components/esm3/loadbody.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"

apps/openmw/mwclass/potion.cpp

@@ -3,7 +3,7 @@
 #include <MyGUI_TextIterator.h>
 
 #include <components/esm3/loadalch.hpp>
-
+#include <components/esm3/loadnpc.hpp>
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"

apps/openmw/mwclass/probe.cpp

@@ -3,6 +3,7 @@
 #include <MyGUI_TextIterator.h>
 
 #include <components/esm3/loadprob.hpp>
+#include <components/esm3/loadnpc.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"

apps/openmw/mwclass/repair.cpp

@@ -3,6 +3,7 @@
 #include <MyGUI_TextIterator.h>
 
 #include <components/esm3/loadrepa.hpp>
+#include <components/esm3/loadnpc.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"

apps/openmw/mwclass/weapon.cpp

@@ -3,6 +3,7 @@
 #include <MyGUI_TextIterator.h>
 
 #include <components/esm3/loadweap.hpp>
+#include <components/esm3/loadnpc.hpp>
 #include <components/misc/constants.hpp>
 #include <components/settings/settings.hpp>
 

apps/openmw/mwdialogue/filter.cpp

@@ -3,6 +3,7 @@
 #include <components/compiler/locals.hpp>
 #include <components/esm3/loadmgef.hpp>
 #include <components/esm3/loadfact.hpp>
+#include <components/esm3/loadcrea.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"

apps/openmw/mwgui/travelwindow.cpp

@@ -6,6 +6,7 @@
 
 #include <components/settings/settings.hpp>
 #include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadcrea.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"

apps/openmw/mwlua/cellbindings.cpp

@@ -1,6 +1,6 @@
 #include "luabindings.hpp"
 
-#include <components/esm3/loadcell.hpp>
+#include <components/esm/records.hpp>
 
 #include "../mwworld/cellstore.hpp"
 

apps/openmw/mwmechanics/actors.cpp

@@ -14,6 +14,8 @@
 
 #include <components/esm3/loadmgef.hpp>
 #include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadstat.hpp>
 
 
 #include "../mwworld/esmstore.hpp"

apps/openmw/mwmechanics/obstacle.cpp

@@ -4,6 +4,8 @@
 
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/detournavigator/agentbounds.hpp>
+#include <components/esm3/loadbody.hpp>
+#include <components/esm3/loaddoor.hpp>
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"

apps/openmw/mwmechanics/spellcasting.cpp

@@ -6,6 +6,7 @@
 #include <components/misc/strings/format.hpp>
 #include <components/esm3/loadmgef.hpp>
 #include <components/esm3/loadench.hpp>
+#include <components/esm3/loadstat.hpp>
 
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/soundmanager.hpp"

apps/openmw/mwmechanics/spelleffects.cpp

@@ -7,6 +7,9 @@
 #include <components/settings/settings.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/esm3/loadench.hpp>
+#include <components/esm3/loadstat.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadbody.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"

apps/openmw/mwrender/actoranimation.cpp

@@ -7,6 +7,7 @@
 
 #include <components/esm3/loadligh.hpp>
 #include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadbody.hpp>
 
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>

apps/openmw/mwrender/animation.cpp

@@ -23,6 +23,9 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/esm3/loadmgef.hpp>
 #include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadnpc.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loadcrea.hpp>
 
 #include <components/sceneutil/keyframe.hpp>
 

apps/openmw/mwscript/miscextensions.cpp

@@ -22,6 +22,8 @@
 
 #include <components/esm3/loadmgef.hpp>
 #include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadlevlist.hpp>
+#include <components/esm3/loaddoor.hpp>
 
 #include <components/vfs/manager.hpp>
 

apps/openmw/mwworld/cellstore.cpp

@@ -18,7 +18,7 @@
 #include <components/esm3/creaturelevliststate.hpp>
 #include <components/esm3/doorstate.hpp>
 #include <components/esm3/readerscache.hpp>
-#include <components/esm3/loadench.hpp>
+#include <components/esm/records.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/luamanager.hpp"

apps/openmw/mwworld/cellstore.hpp

@@ -15,26 +15,6 @@
 #include "cellreflist.hpp"
 
 #include <components/misc/tuplemeta.hpp>
-#include <components/esm3/loadacti.hpp>
-#include <components/esm3/loadalch.hpp>
-#include <components/esm3/loadappa.hpp>
-#include <components/esm3/loadarmo.hpp>
-#include <components/esm3/loadbook.hpp>
-#include <components/esm3/loadclot.hpp>
-#include <components/esm3/loadcont.hpp>
-#include <components/esm3/loadcrea.hpp>
-#include <components/esm3/loaddoor.hpp>
-#include <components/esm3/loadingr.hpp>
-#include <components/esm3/loadlevlist.hpp>
-#include <components/esm3/loadligh.hpp>
-#include <components/esm3/loadlock.hpp>
-#include <components/esm3/loadprob.hpp>
-#include <components/esm3/loadrepa.hpp>
-#include <components/esm3/loadstat.hpp>
-#include <components/esm3/loadweap.hpp>
-#include <components/esm3/loadnpc.hpp>
-#include <components/esm3/loadmisc.hpp>
-#include <components/esm3/loadbody.hpp>
 #include <components/esm3/fogstate.hpp>
 
 #include "timestamp.hpp"

apps/openmw/mwworld/localscripts.cpp

@@ -2,6 +2,9 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/esm3/loadscpt.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadnpc.hpp>
 
 #include "esmstore.hpp"
 #include "cellstore.hpp"

apps/openmw/mwworld/scene.cpp

@@ -17,6 +17,7 @@
 #include <components/detournavigator/agentbounds.hpp>
 #include <components/misc/convert.hpp>
 #include <components/detournavigator/heightfieldshape.hpp>
+#include <components/esm/records.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"

apps/openmw/mwworld/worldimp.cpp

@@ -21,6 +21,8 @@
 #include <components/esm3/loadench.hpp>
 #include <components/esm3/loadmgef.hpp>
 #include <components/esm3/loadclas.hpp>
+#include <components/esm3/loadcrea.hpp>
+#include <components/esm3/loadstat.hpp>
 
 #include <components/misc/constants.hpp>
 #include <components/misc/mathutil.hpp>