diff --git a/apps/openmw/mwgui/charactercreation.cpp b/apps/openmw/mwgui/charactercreation.cpp
index 090025d2d7..bd7706c8b1 100644
--- a/apps/openmw/mwgui/charactercreation.cpp
+++ b/apps/openmw/mwgui/charactercreation.cpp
@@ -13,7 +13,7 @@
 #include "../mwbase/world.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
-#include "../mwmechanics/npcstats.hpp"
+#include "../mwmechanics/creaturestats.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
diff --git a/apps/openmw/mwgui/inventoryitemmodel.cpp b/apps/openmw/mwgui/inventoryitemmodel.cpp
index e87ae7b8e0..e20637d58c 100644
--- a/apps/openmw/mwgui/inventoryitemmodel.cpp
+++ b/apps/openmw/mwgui/inventoryitemmodel.cpp
@@ -3,12 +3,11 @@
 #include <sstream>
 
 #include "../mwmechanics/actorutil.hpp"
-#include "../mwmechanics/npcstats.hpp"
+#include "../mwmechanics/creaturestats.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/inventorystore.hpp"
-#include "../mwworld/manualref.hpp"
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index 2ef0406e3a..9ae9ecf2b0 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -23,7 +23,7 @@
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 
-#include "../mwworld/actionequip.hpp"
+#include "../mwworld/action.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/inventorystore.hpp"
 
diff --git a/apps/openmw/mwgui/itemmodel.cpp b/apps/openmw/mwgui/itemmodel.cpp
index fce3e68e78..4bdd2399fe 100644
--- a/apps/openmw/mwgui/itemmodel.cpp
+++ b/apps/openmw/mwgui/itemmodel.cpp
@@ -2,13 +2,10 @@
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
-#include "../mwworld/worldmodel.hpp"
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 
-#include <components/debug/debuglog.hpp>
-
 namespace MWGui
 {
 
diff --git a/apps/openmw/mwgui/repair.cpp b/apps/openmw/mwgui/repair.cpp
index dc559f03b0..12f04a15d8 100644
--- a/apps/openmw/mwgui/repair.cpp
+++ b/apps/openmw/mwgui/repair.cpp
@@ -4,16 +4,15 @@
 
 #include <MyGUI_ScrollView.h>
 
+#include <components/esm3/loadrepa.hpp>
 #include <components/widgets/box.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/world.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
 
 #include "../mwworld/class.hpp"
-#include "../mwworld/containerstore.hpp"
 
 #include "inventoryitemmodel.hpp"
 #include "itemchargeview.hpp"
diff --git a/apps/openmw/mwgui/sortfilteritemmodel.cpp b/apps/openmw/mwgui/sortfilteritemmodel.cpp
index 81074d7fcf..4a5e02a881 100644
--- a/apps/openmw/mwgui/sortfilteritemmodel.cpp
+++ b/apps/openmw/mwgui/sortfilteritemmodel.cpp
@@ -1,7 +1,5 @@
 #include "sortfilteritemmodel.hpp"
 
-#include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include <components/debug/debuglog.hpp>
 #include <components/esm3/loadalch.hpp>
 #include <components/esm3/loadappa.hpp>
@@ -19,9 +17,12 @@
 #include <components/esm3/loadweap.hpp>
 #include <components/misc/utf8stream.hpp>
 
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+
+#include "../mwworld/action.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
-#include "../mwworld/nullaction.hpp"
 
 #include "../mwmechanics/alchemy.hpp"
 #include "../mwmechanics/spellutil.hpp"
diff --git a/apps/openmw/mwinput/controllermanager.cpp b/apps/openmw/mwinput/controllermanager.cpp
index 0fc625ccc1..7054f72c8f 100644
--- a/apps/openmw/mwinput/controllermanager.cpp
+++ b/apps/openmw/mwinput/controllermanager.cpp
@@ -6,6 +6,7 @@
 #include <SDL.h>
 
 #include <components/debug/debuglog.hpp>
+#include <components/esm/refid.hpp>
 #include <components/files/conversion.hpp>
 #include <components/sdlutil/sdlmappings.hpp>
 #include <components/settings/values.hpp>
@@ -15,11 +16,7 @@
 #include "../mwbase/luamanager.hpp"
 #include "../mwbase/statemanager.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/world.hpp"
 
-#include "../mwworld/player.hpp"
-
-#include "actionmanager.hpp"
 #include "actions.hpp"
 #include "bindingsmanager.hpp"
 #include "mousemanager.hpp"
diff --git a/apps/openmw/mwinput/controllermanager.hpp b/apps/openmw/mwinput/controllermanager.hpp
index 63bfc07169..596a9ef465 100644
--- a/apps/openmw/mwinput/controllermanager.hpp
+++ b/apps/openmw/mwinput/controllermanager.hpp
@@ -1,11 +1,12 @@
 #ifndef MWINPUT_MWCONTROLLERMANAGER_H
 #define MWINPUT_MWCONTROLLERMANAGER_H
 
+#include <array>
+#include <filesystem>
 #include <string>
 
 #include <components/sdlutil/events.hpp>
 #include <components/settings/settings.hpp>
-#include <filesystem>
 
 namespace MWInput
 {
diff --git a/apps/openmw/mwlua/cellbindings.cpp b/apps/openmw/mwlua/cellbindings.cpp
index 914f3f5fcc..51f5bb25f5 100644
--- a/apps/openmw/mwlua/cellbindings.cpp
+++ b/apps/openmw/mwlua/cellbindings.cpp
@@ -4,6 +4,7 @@
 #include <components/esm/records.hpp>
 
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/worldmodel.hpp"
 
 #include "types/types.hpp"
 
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index f7386ca61d..326afbb4ad 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -26,6 +26,7 @@
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/scene.hpp"
+#include "../mwworld/worldmodel.hpp"
 
 #include "luabindings.hpp"
 #include "playerscripts.hpp"
diff --git a/apps/openmw/mwlua/mwscriptbindings.cpp b/apps/openmw/mwlua/mwscriptbindings.cpp
index 2b91d0d04f..dbe02a9fed 100644
--- a/apps/openmw/mwlua/mwscriptbindings.cpp
+++ b/apps/openmw/mwlua/mwscriptbindings.cpp
@@ -1,12 +1,17 @@
 #include "mwscriptbindings.hpp"
 
 #include <components/lua/luastate.hpp>
+#include <components/misc/strings/lower.hpp>
 
+#include "../mwbase/environment.hpp"
+#include "../mwbase/scriptmanager.hpp"
 #include "../mwbase/world.hpp"
-#include "../mwscript/scriptmanagerimp.hpp"
+#include "../mwscript/globalscripts.hpp"
 
 #include "object.hpp"
 
+#include <stdexcept>
+
 namespace MWLua
 {
     struct MWScriptRef
diff --git a/apps/openmw/mwlua/object.hpp b/apps/openmw/mwlua/object.hpp
index 89bf425295..fcf225de85 100644
--- a/apps/openmw/mwlua/object.hpp
+++ b/apps/openmw/mwlua/object.hpp
@@ -2,15 +2,14 @@
 #define MWLUA_OBJECT_H
 
 #include <map>
+#include <stdexcept>
 #include <typeindex>
 
 #include <sol/sol.hpp>
 
 #include <components/esm3/cellref.hpp>
 
-#include "../mwbase/environment.hpp"
 #include "../mwworld/ptr.hpp"
-#include "../mwworld/worldmodel.hpp"
 
 namespace MWLua
 {
diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
index 7c0606b1d1..cbd8347d0d 100644
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@@ -13,6 +13,7 @@
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/player.hpp"
 #include "../mwworld/scene.hpp"
+#include "../mwworld/worldmodel.hpp"
 
 #include "../mwrender/renderingmanager.hpp"
 
diff --git a/apps/openmw/mwlua/types/actor.cpp b/apps/openmw/mwlua/types/actor.cpp
index 641723afe9..199bc3bd08 100644
--- a/apps/openmw/mwlua/types/actor.cpp
+++ b/apps/openmw/mwlua/types/actor.cpp
@@ -3,12 +3,13 @@
 #include <components/detournavigator/agentbounds.hpp>
 #include <components/lua/luastate.hpp>
 
-#include <apps/openmw/mwbase/mechanicsmanager.hpp>
-#include <apps/openmw/mwbase/windowmanager.hpp>
-#include <apps/openmw/mwmechanics/creaturestats.hpp>
-#include <apps/openmw/mwmechanics/drawstate.hpp>
-#include <apps/openmw/mwworld/class.hpp>
-#include <apps/openmw/mwworld/inventorystore.hpp>
+#include "apps/openmw/mwbase/mechanicsmanager.hpp"
+#include "apps/openmw/mwbase/windowmanager.hpp"
+#include "apps/openmw/mwmechanics/creaturestats.hpp"
+#include "apps/openmw/mwmechanics/drawstate.hpp"
+#include "apps/openmw/mwworld/class.hpp"
+#include "apps/openmw/mwworld/inventorystore.hpp"
+#include "apps/openmw/mwworld/worldmodel.hpp"
 
 #include "../localscripts.hpp"
 #include "../luamanagerimp.hpp"
diff --git a/apps/openmw/mwlua/types/door.cpp b/apps/openmw/mwlua/types/door.cpp
index 4505f2db7e..3f1e77f629 100644
--- a/apps/openmw/mwlua/types/door.cpp
+++ b/apps/openmw/mwlua/types/door.cpp
@@ -7,7 +7,8 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
 
-#include <apps/openmw/mwworld/esmstore.hpp>
+#include "apps/openmw/mwworld/esmstore.hpp"
+#include "apps/openmw/mwworld/worldmodel.hpp"
 
 namespace sol
 {
diff --git a/apps/openmw/mwscript/cellextensions.cpp b/apps/openmw/mwscript/cellextensions.cpp
index 9ffc3f7bec..3a8318a7a3 100644
--- a/apps/openmw/mwscript/cellextensions.cpp
+++ b/apps/openmw/mwscript/cellextensions.cpp
@@ -2,14 +2,15 @@
 
 #include <limits>
 
-#include "../mwworld/esmstore.hpp"
-
 #include <components/compiler/opcodes.hpp>
 
+#include <components/interpreter/context.hpp>
 #include <components/interpreter/interpreter.hpp>
 #include <components/interpreter/opcodes.hpp>
 #include <components/interpreter/runtime.hpp>
 
+#include <components/misc/strings/algorithm.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/statemanager.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -20,8 +21,6 @@
 
 #include "../mwmechanics/actorutil.hpp"
 
-#include "interpretercontext.hpp"
-
 namespace MWScript
 {
     namespace Cell
diff --git a/apps/openmw/mwscript/dialogueextensions.cpp b/apps/openmw/mwscript/dialogueextensions.cpp
index 857f3c5edf..5a361e1bdc 100644
--- a/apps/openmw/mwscript/dialogueextensions.cpp
+++ b/apps/openmw/mwscript/dialogueextensions.cpp
@@ -3,6 +3,7 @@
 #include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
 #include <components/debug/debuglog.hpp>
+#include <components/interpreter/context.hpp>
 #include <components/interpreter/interpreter.hpp>
 #include <components/interpreter/opcodes.hpp>
 #include <components/interpreter/runtime.hpp>
@@ -16,7 +17,6 @@
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwworld/class.hpp"
 
-#include "interpretercontext.hpp"
 #include "ref.hpp"
 
 namespace MWScript
diff --git a/apps/openmw/mwscript/guiextensions.cpp b/apps/openmw/mwscript/guiextensions.cpp
index b2667e6320..c1590941e6 100644
--- a/apps/openmw/mwscript/guiextensions.cpp
+++ b/apps/openmw/mwscript/guiextensions.cpp
@@ -2,6 +2,7 @@
 
 #include <components/compiler/opcodes.hpp>
 
+#include <components/interpreter/context.hpp>
 #include <components/interpreter/interpreter.hpp>
 #include <components/interpreter/opcodes.hpp>
 #include <components/interpreter/runtime.hpp>
@@ -11,11 +12,9 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/world.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
 
-#include "interpretercontext.hpp"
 #include "ref.hpp"
 
 namespace MWScript
diff --git a/apps/openmw/mwscript/skyextensions.cpp b/apps/openmw/mwscript/skyextensions.cpp
index 2284e2a3ae..39944970bf 100644
--- a/apps/openmw/mwscript/skyextensions.cpp
+++ b/apps/openmw/mwscript/skyextensions.cpp
@@ -5,6 +5,7 @@
 #include <components/compiler/opcodes.hpp>
 
 #include <components/esm3/loadregn.hpp>
+#include <components/interpreter/context.hpp>
 #include <components/interpreter/interpreter.hpp>
 #include <components/interpreter/opcodes.hpp>
 #include <components/interpreter/runtime.hpp>
@@ -14,8 +15,6 @@
 
 #include "../mwworld/esmstore.hpp"
 
-#include "interpretercontext.hpp"
-
 namespace MWScript
 {
     namespace Sky
diff --git a/components/fx/widgets.hpp b/components/fx/widgets.hpp
index f02b88f802..baee2d6df4 100644
--- a/components/fx/widgets.hpp
+++ b/components/fx/widgets.hpp
@@ -10,8 +10,6 @@
 #include <MyGUI_Widget.h>
 
 #include <algorithm>
-#include <components/fx/widgets.hpp>
-#include <components/misc/strings/format.hpp>
 #include <memory>
 #include <string>
 #include <vector>
@@ -20,6 +18,8 @@
 #include <osg/Vec3f>
 #include <osg/Vec4f>
 
+#include <components/misc/strings/format.hpp>
+
 #include "types.hpp"
 
 namespace Gui