From 0a5c863f272e91e6316875470adc64a9e862b0ae Mon Sep 17 00:00:00 2001
From: "florent.teppe" <florent.teppe@nadeo.com>
Date: Thu, 8 Sep 2022 21:08:59 +0200
Subject: [PATCH] fewer header includes

---
 apps/openmw/mwclass/activator.cpp        |  2 ++
 apps/openmw/mwclass/apparatus.cpp        |  2 +-
 apps/openmw/mwclass/armor.cpp            |  1 +
 apps/openmw/mwclass/bodypart.cpp         |  2 ++
 apps/openmw/mwclass/clothing.cpp         |  1 +
 apps/openmw/mwclass/ingredient.cpp       |  1 +
 apps/openmw/mwclass/light.cpp            |  1 +
 apps/openmw/mwclass/lockpick.cpp         |  1 +
 apps/openmw/mwclass/misc.cpp             |  3 +++
 apps/openmw/mwclass/npc.cpp              |  1 +
 apps/openmw/mwclass/potion.cpp           |  2 +-
 apps/openmw/mwclass/probe.cpp            |  1 +
 apps/openmw/mwclass/repair.cpp           |  1 +
 apps/openmw/mwclass/weapon.cpp           |  1 +
 apps/openmw/mwdialogue/filter.cpp        |  1 +
 apps/openmw/mwgui/travelwindow.cpp       |  1 +
 apps/openmw/mwlua/cellbindings.cpp       |  2 +-
 apps/openmw/mwmechanics/actors.cpp       |  2 ++
 apps/openmw/mwmechanics/obstacle.cpp     |  2 ++
 apps/openmw/mwmechanics/spellcasting.cpp |  1 +
 apps/openmw/mwmechanics/spelleffects.cpp |  3 +++
 apps/openmw/mwrender/actoranimation.cpp  |  1 +
 apps/openmw/mwrender/animation.cpp       |  3 +++
 apps/openmw/mwscript/miscextensions.cpp  |  2 ++
 apps/openmw/mwworld/cellstore.cpp        |  2 +-
 apps/openmw/mwworld/cellstore.hpp        | 20 --------------------
 apps/openmw/mwworld/localscripts.cpp     |  3 +++
 apps/openmw/mwworld/scene.cpp            |  1 +
 apps/openmw/mwworld/worldimp.cpp         |  2 ++
 29 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index 2c32fa33c8..a651a1f0b5 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/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"
diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp
index 88dae17a63..885fbb3bbc 100644
--- a/apps/openmw/mwclass/apparatus.cpp
+++ b/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"
 
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index 85d831a544..b4a9d73c5c 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/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"
diff --git a/apps/openmw/mwclass/bodypart.cpp b/apps/openmw/mwclass/bodypart.cpp
index c341799ab4..427203c383 100644
--- a/apps/openmw/mwclass/bodypart.cpp
+++ b/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"
 
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index fab3d35464..3413c271ff 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/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"
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index e3f5c26899..d7b313a4f9 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/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"
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index 3fd61ad995..49974f9461 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/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>
 
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index 8a9495d603..0c09027d25 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/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"
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index a55b2b1f09..0658212b84 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/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"
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 0958c4e23a..6a0637576f 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/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"
diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index 2b15379aa7..874d33c598 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/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"
diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp
index fd152c1906..94bb574b92 100644
--- a/apps/openmw/mwclass/probe.cpp
+++ b/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"
diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp
index ce6a2fee4b..85a014a1bf 100644
--- a/apps/openmw/mwclass/repair.cpp
+++ b/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"
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index 9dbdbfecb0..3e58f68e7e 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/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>
 
diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index 6e202a1c2f..54e853e12b 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/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"
diff --git a/apps/openmw/mwgui/travelwindow.cpp b/apps/openmw/mwgui/travelwindow.cpp
index 1104653c62..9533e00375 100644
--- a/apps/openmw/mwgui/travelwindow.cpp
+++ b/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"
diff --git a/apps/openmw/mwlua/cellbindings.cpp b/apps/openmw/mwlua/cellbindings.cpp
index 2a077b4270..63ea583a6c 100644
--- a/apps/openmw/mwlua/cellbindings.cpp
+++ b/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"
 
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 2c423cafd1..ee1d02aaaa 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/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"
diff --git a/apps/openmw/mwmechanics/obstacle.cpp b/apps/openmw/mwmechanics/obstacle.cpp
index 0f73890eb7..c7573c3158 100644
--- a/apps/openmw/mwmechanics/obstacle.cpp
+++ b/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"
diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index c845cfab04..63a9b0ba4c 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/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"
diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index af71ed416a..78ec41e2de 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/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"
diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp
index b73a9d8a76..a6caef852e 100644
--- a/apps/openmw/mwrender/actoranimation.cpp
+++ b/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>
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 28dea789e5..55f444b90d 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/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>
 
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index a005594490..632e00708c 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/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>
 
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 88679bf3f6..ef7192104b 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/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"
diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index 4076357ee5..8c0fca4bf0 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/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"
diff --git a/apps/openmw/mwworld/localscripts.cpp b/apps/openmw/mwworld/localscripts.cpp
index 2cc9261fae..ec8706320a 100644
--- a/apps/openmw/mwworld/localscripts.cpp
+++ b/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"
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 29c8b6f76b..3c85f52d1b 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/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"
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index fc90a14b25..401ba7e24c 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/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>