diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 0ea8451774..2a66878a04 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -5,7 +5,8 @@
 #include <future>
 #include <system_error>
 
-#include <osgDB/WriteFile>
+#include <osgDB/ReaderWriter>
+#include <osgDB/Registry>
 #include <osgViewer/ViewerEventHandlers>
 
 #include <SDL.h>
@@ -28,7 +29,6 @@
 
 #include <components/compiler/extensions0.hpp>
 
-#include <components/stereo/multiview.hpp>
 #include <components/stereo/stereomanager.hpp>
 
 #include <components/sceneutil/glextensions.hpp>
diff --git a/apps/openmw/mwlua/animationbindings.cpp b/apps/openmw/mwlua/animationbindings.cpp
index 1af7acea36..5ecd3bd1fa 100644
--- a/apps/openmw/mwlua/animationbindings.cpp
+++ b/apps/openmw/mwlua/animationbindings.cpp
@@ -1,13 +1,7 @@
 #include "animationbindings.hpp"
 
-#include <components/esm3/loadmgef.hpp>
-#include <components/esm3/loadstat.hpp>
-#include <components/lua/asyncpackage.hpp>
 #include <components/lua/luastate.hpp>
-#include <components/lua/utilpackage.hpp>
 #include <components/misc/finitenumbers.hpp>
-#include <components/misc/resourcehelpers.hpp>
-#include <components/settings/values.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
@@ -15,11 +9,8 @@
 
 #include "../mwmechanics/character.hpp"
 
-#include "../mwworld/esmstore.hpp"
-
 #include "context.hpp"
 #include "luamanagerimp.hpp"
-#include "objectvariant.hpp"
 
 namespace MWLua
 {
diff --git a/apps/openmw/mwlua/birthsignbindings.cpp b/apps/openmw/mwlua/birthsignbindings.cpp
index 218d05b804..130144ab9b 100644
--- a/apps/openmw/mwlua/birthsignbindings.cpp
+++ b/apps/openmw/mwlua/birthsignbindings.cpp
@@ -8,7 +8,7 @@
 #include "../mwbase/environment.hpp"
 
 #include "idcollectionbindings.hpp"
-#include "types/types.hpp"
+#include "recordstore.hpp"
 
 namespace sol
 {
diff --git a/apps/openmw/mwlua/birthsignbindings.hpp b/apps/openmw/mwlua/birthsignbindings.hpp
index bf41707d47..e57d56c971 100644
--- a/apps/openmw/mwlua/birthsignbindings.hpp
+++ b/apps/openmw/mwlua/birthsignbindings.hpp
@@ -3,10 +3,10 @@
 
 #include <sol/forward.hpp>
 
-#include "context.hpp"
-
 namespace MWLua
 {
+    struct Context;
+
     sol::table initBirthSignRecordBindings(const Context& context);
 }
 
diff --git a/apps/openmw/mwlua/cellbindings.cpp b/apps/openmw/mwlua/cellbindings.cpp
index ec64a3cddd..4e4542d89f 100644
--- a/apps/openmw/mwlua/cellbindings.cpp
+++ b/apps/openmw/mwlua/cellbindings.cpp
@@ -1,7 +1,5 @@
 #include "cellbindings.hpp"
 
-#include <components/esm/esmbridge.hpp>
-
 #include <components/esm3/loadacti.hpp>
 #include <components/esm3/loadalch.hpp>
 #include <components/esm3/loadappa.hpp>
@@ -27,7 +25,6 @@
 #include <components/esm4/loadammo.hpp>
 #include <components/esm4/loadarmo.hpp>
 #include <components/esm4/loadbook.hpp>
-#include <components/esm4/loadcell.hpp>
 #include <components/esm4/loadclot.hpp>
 #include <components/esm4/loadcont.hpp>
 #include <components/esm4/loaddoor.hpp>
@@ -38,7 +35,6 @@
 #include <components/esm4/loadligh.hpp>
 #include <components/esm4/loadmisc.hpp>
 #include <components/esm4/loadmstt.hpp>
-#include <components/esm4/loadrefr.hpp>
 #include <components/esm4/loadscol.hpp>
 #include <components/esm4/loadstat.hpp>
 #include <components/esm4/loadtree.hpp>
diff --git a/apps/openmw/mwlua/cellbindings.hpp b/apps/openmw/mwlua/cellbindings.hpp
index 0d8e90e989..70255d8d7f 100644
--- a/apps/openmw/mwlua/cellbindings.hpp
+++ b/apps/openmw/mwlua/cellbindings.hpp
@@ -1,12 +1,12 @@
 #ifndef MWLUA_CELLBINDINGS_H
 #define MWLUA_CELLBINDINGS_H
 
-#include "context.hpp"
-
 namespace MWLua
 {
-    void initCellBindingsForLocalScripts(const Context&);
-    void initCellBindingsForGlobalScripts(const Context&);
+    struct Context;
+
+    void initCellBindingsForLocalScripts(const Context& context);
+    void initCellBindingsForGlobalScripts(const Context& context);
 }
 
 #endif // MWLUA_CELLBINDINGS_H
diff --git a/apps/openmw/mwlua/classbindings.cpp b/apps/openmw/mwlua/classbindings.cpp
index c94631fb3c..338698bfee 100644
--- a/apps/openmw/mwlua/classbindings.cpp
+++ b/apps/openmw/mwlua/classbindings.cpp
@@ -4,7 +4,7 @@
 #include <components/lua/luastate.hpp>
 
 #include "idcollectionbindings.hpp"
-#include "types/types.hpp"
+#include "recordstore.hpp"
 
 namespace sol
 {
diff --git a/apps/openmw/mwlua/classbindings.hpp b/apps/openmw/mwlua/classbindings.hpp
index 1acb0a9ad3..cc67f2df02 100644
--- a/apps/openmw/mwlua/classbindings.hpp
+++ b/apps/openmw/mwlua/classbindings.hpp
@@ -3,10 +3,10 @@
 
 #include <sol/forward.hpp>
 
-#include "context.hpp"
-
 namespace MWLua
 {
+    struct Context;
+
     sol::table initClassRecordBindings(const Context& context);
 }
 
diff --git a/apps/openmw/mwlua/corebindings.cpp b/apps/openmw/mwlua/corebindings.cpp
index bdf71710af..282a9f970b 100644
--- a/apps/openmw/mwlua/corebindings.cpp
+++ b/apps/openmw/mwlua/corebindings.cpp
@@ -4,7 +4,6 @@
 #include <stdexcept>
 
 #include <components/debug/debuglog.hpp>
-#include <components/esm3/loadfact.hpp>
 #include <components/lua/l10n.hpp>
 #include <components/lua/luastate.hpp>
 #include <components/lua/serialization.hpp>
@@ -20,6 +19,7 @@
 #include "../mwworld/datetimemanager.hpp"
 #include "../mwworld/esmstore.hpp"
 
+#include "context.hpp"
 #include "coremwscriptbindings.hpp"
 #include "dialoguebindings.hpp"
 #include "factionbindings.hpp"
diff --git a/apps/openmw/mwlua/corebindings.hpp b/apps/openmw/mwlua/corebindings.hpp
index ef385ca993..6d27dd0412 100644
--- a/apps/openmw/mwlua/corebindings.hpp
+++ b/apps/openmw/mwlua/corebindings.hpp
@@ -3,13 +3,13 @@
 
 #include <sol/forward.hpp>
 
-#include "context.hpp"
-
 namespace MWLua
 {
+    struct Context;
+
     void addCoreTimeBindings(sol::table& api, const Context& context);
 
-    sol::table initCorePackage(const Context&);
+    sol::table initCorePackage(const Context& context);
 }
 
 #endif // MWLUA_COREBINDINGS_H
diff --git a/apps/openmw/mwlua/debugbindings.hpp b/apps/openmw/mwlua/debugbindings.hpp
index c508b54496..d7902cb618 100644
--- a/apps/openmw/mwlua/debugbindings.hpp
+++ b/apps/openmw/mwlua/debugbindings.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_MWLUA_DEBUGBINDINGS_H
 #define OPENMW_MWLUA_DEBUGBINDINGS_H
 
-#include <sol/sol.hpp>
+#include <sol/forward.hpp>
 
 namespace MWLua
 {
diff --git a/apps/openmw/mwlua/factionbindings.hpp b/apps/openmw/mwlua/factionbindings.hpp
index 0dc06ceaf2..280c7d4791 100644
--- a/apps/openmw/mwlua/factionbindings.hpp
+++ b/apps/openmw/mwlua/factionbindings.hpp
@@ -3,10 +3,10 @@
 
 #include <sol/forward.hpp>
 
-#include "context.hpp"
-
 namespace MWLua
 {
+    struct Context;
+
     sol::table initCoreFactionBindings(const Context& context);
 }
 
diff --git a/apps/openmw/mwlua/inputbindings.cpp b/apps/openmw/mwlua/inputbindings.cpp
index c3b47c5061..9a781106a6 100644
--- a/apps/openmw/mwlua/inputbindings.cpp
+++ b/apps/openmw/mwlua/inputbindings.cpp
@@ -13,6 +13,7 @@
 #include "../mwbase/windowmanager.hpp"
 #include "../mwinput/actions.hpp"
 
+#include "context.hpp"
 #include "luamanagerimp.hpp"
 
 namespace sol
diff --git a/apps/openmw/mwlua/inputbindings.hpp b/apps/openmw/mwlua/inputbindings.hpp
index 195f69f5f9..e9a19ed34d 100644
--- a/apps/openmw/mwlua/inputbindings.hpp
+++ b/apps/openmw/mwlua/inputbindings.hpp
@@ -3,11 +3,11 @@
 
 #include <sol/forward.hpp>
 
-#include "context.hpp"
-
 namespace MWLua
 {
-    sol::table initInputPackage(const Context&);
+    struct Context;
+
+    sol::table initInputPackage(const Context& context);
 }
 
 #endif // MWLUA_INPUTBINDINGS_H
diff --git a/apps/openmw/mwlua/landbindings.cpp b/apps/openmw/mwlua/landbindings.cpp
index 3f85e2b066..2b053802db 100644
--- a/apps/openmw/mwlua/landbindings.cpp
+++ b/apps/openmw/mwlua/landbindings.cpp
@@ -1,14 +1,24 @@
 #include "landbindings.hpp"
 
+#include <span>
+#include <string>
+
+#include <sol/object.hpp>
+#include <sol/table.hpp>
+#include <sol/variadic_results.hpp>
+
 #include <components/esm/refid.hpp>
 #include <components/esm/util.hpp>
 #include <components/esmterrain/storage.hpp>
+#include <components/lua/luastate.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/worldmodel.hpp"
+
+#include "context.hpp"
 #include "object.hpp"
 
 namespace
diff --git a/apps/openmw/mwlua/landbindings.hpp b/apps/openmw/mwlua/landbindings.hpp
index 8cdf30046b..f38d260759 100644
--- a/apps/openmw/mwlua/landbindings.hpp
+++ b/apps/openmw/mwlua/landbindings.hpp
@@ -1,10 +1,12 @@
 #ifndef MWLUA_LANDBINDINGS_H
 #define MWLUA_LANDBINDINGS_H
 
-#include "context.hpp"
+#include <sol/forward.hpp>
 
 namespace MWLua
 {
+    struct Context;
+
     sol::table initCoreLandBindings(const Context& context);
 }
 
diff --git a/apps/openmw/mwlua/localscripts.cpp b/apps/openmw/mwlua/localscripts.cpp
index ad2913dd49..99c994304b 100644
--- a/apps/openmw/mwlua/localscripts.cpp
+++ b/apps/openmw/mwlua/localscripts.cpp
@@ -1,9 +1,5 @@
 #include "localscripts.hpp"
 
-#include <components/esm3/loadcell.hpp>
-#include <components/esm3/loadweap.hpp>
-#include <components/misc/strings/lower.hpp>
-
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwmechanics/aicombat.hpp"
diff --git a/apps/openmw/mwlua/localscripts.hpp b/apps/openmw/mwlua/localscripts.hpp
index bc34576509..c51d2d8c19 100644
--- a/apps/openmw/mwlua/localscripts.hpp
+++ b/apps/openmw/mwlua/localscripts.hpp
@@ -1,9 +1,7 @@
 #ifndef MWLUA_LOCALSCRIPTS_H
 #define MWLUA_LOCALSCRIPTS_H
 
-#include <memory>
-#include <set>
-#include <string>
+#include <string_view>
 #include <utility>
 
 #include <components/lua/luastate.hpp>
diff --git a/apps/openmw/mwlua/luabindings.hpp b/apps/openmw/mwlua/luabindings.hpp
index 749987e5b2..e7b73dbca1 100644
--- a/apps/openmw/mwlua/luabindings.hpp
+++ b/apps/openmw/mwlua/luabindings.hpp
@@ -1,29 +1,30 @@
 #ifndef MWLUA_LUABINDINGS_H
 #define MWLUA_LUABINDINGS_H
 
-#include <map>
 #include <sol/forward.hpp>
-#include <string>
 
-#include "context.hpp"
+#include <map>
+#include <string>
 
 namespace MWLua
 {
+    struct Context;
+
     // Initialize Lua packages that are available for all scripts.
-    std::map<std::string, sol::object> initCommonPackages(const Context&);
+    std::map<std::string, sol::object> initCommonPackages(const Context& context);
 
     // Initialize Lua packages that are available for global scripts (additionally to common packages).
-    std::map<std::string, sol::object> initGlobalPackages(const Context&);
+    std::map<std::string, sol::object> initGlobalPackages(const Context& context);
 
     // Initialize Lua packages that are available for local scripts (additionally to common packages).
-    std::map<std::string, sol::object> initLocalPackages(const Context&);
+    std::map<std::string, sol::object> initLocalPackages(const Context& context);
 
     // Initialize Lua packages that are available only for local scripts on the player (additionally to common and local
     // packages).
-    std::map<std::string, sol::object> initPlayerPackages(const Context&);
+    std::map<std::string, sol::object> initPlayerPackages(const Context& context);
 
     // Initialize Lua packages that are available only for menu scripts (additionally to common packages).
-    std::map<std::string, sol::object> initMenuPackages(const Context&);
+    std::map<std::string, sol::object> initMenuPackages(const Context& context);
 }
 
 #endif // MWLUA_LUABINDINGS_H
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 850dd87eed..66ecfb1c55 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -5,6 +5,10 @@
 #include <MyGUI_InputManager.h>
 #include <osg/Stats>
 
+#include <sol/object.hpp>
+#include <sol/table.hpp>
+#include <sol/types.hpp>
+
 #include <components/debug/debuglog.hpp>
 
 #include <components/esm/luascripts.hpp>
@@ -15,7 +19,6 @@
 
 #include <components/l10n/manager.hpp>
 
-#include <components/lua_ui/content.hpp>
 #include <components/lua_ui/registerscriptsettings.hpp>
 #include <components/lua_ui/util.hpp>
 
diff --git a/apps/openmw/mwlua/luamanagerimp.hpp b/apps/openmw/mwlua/luamanagerimp.hpp
index bd4ab0d30e..42b18d236f 100644
--- a/apps/openmw/mwlua/luamanagerimp.hpp
+++ b/apps/openmw/mwlua/luamanagerimp.hpp
@@ -3,9 +3,10 @@
 
 #include <filesystem>
 #include <map>
-#include <osg/Stats>
 #include <set>
 
+#include <osg/Stats>
+
 #include <components/lua/inputactions.hpp>
 #include <components/lua/luastate.hpp>
 #include <components/lua/scripttracker.hpp>
diff --git a/apps/openmw/mwlua/magicbindings.hpp b/apps/openmw/mwlua/magicbindings.hpp
index 047bd2e3d9..d9c5182d76 100644
--- a/apps/openmw/mwlua/magicbindings.hpp
+++ b/apps/openmw/mwlua/magicbindings.hpp
@@ -3,10 +3,10 @@
 
 #include <sol/forward.hpp>
 
-#include "context.hpp"
-
 namespace MWLua
 {
+    struct Context;
+
     sol::table initCoreMagicBindings(const Context& context);
     void addActorMagicBindings(sol::table& actor, const Context& context);
 }
diff --git a/apps/openmw/mwlua/markupbindings.hpp b/apps/openmw/mwlua/markupbindings.hpp
index 9105ab5edf..ec4b6dbbb2 100644
--- a/apps/openmw/mwlua/markupbindings.hpp
+++ b/apps/openmw/mwlua/markupbindings.hpp
@@ -3,11 +3,11 @@
 
 #include <sol/forward.hpp>
 
-#include "context.hpp"
-
 namespace MWLua
 {
-    sol::table initMarkupPackage(const Context&);
+    struct Context;
+
+    sol::table initMarkupPackage(const Context& context);
 }
 
 #endif // MWLUA_MARKUPBINDINGS_H
diff --git a/apps/openmw/mwlua/menuscripts.cpp b/apps/openmw/mwlua/menuscripts.cpp
index 32520c0822..a7ff80e63e 100644
--- a/apps/openmw/mwlua/menuscripts.cpp
+++ b/apps/openmw/mwlua/menuscripts.cpp
@@ -7,6 +7,8 @@
 #include "../mwbase/statemanager.hpp"
 #include "../mwstate/character.hpp"
 
+#include "context.hpp"
+
 namespace MWLua
 {
     static const MWState::Character* findCharacter(std::string_view characterDir)
diff --git a/apps/openmw/mwlua/menuscripts.hpp b/apps/openmw/mwlua/menuscripts.hpp
index 8721224413..11c6cc1912 100644
--- a/apps/openmw/mwlua/menuscripts.hpp
+++ b/apps/openmw/mwlua/menuscripts.hpp
@@ -9,11 +9,11 @@
 
 #include "../mwbase/luamanager.hpp"
 
-#include "context.hpp"
 #include "inputprocessor.hpp"
 
 namespace MWLua
 {
+    struct Context;
 
     sol::table initMenuPackage(const Context& context);
 
diff --git a/apps/openmw/mwlua/mwscriptbindings.cpp b/apps/openmw/mwlua/mwscriptbindings.cpp
index 90d24b39fe..179b35aa5c 100644
--- a/apps/openmw/mwlua/mwscriptbindings.cpp
+++ b/apps/openmw/mwlua/mwscriptbindings.cpp
@@ -12,6 +12,7 @@
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/worldimp.hpp"
 
+#include "context.hpp"
 #include "object.hpp"
 
 #include <stdexcept>
diff --git a/apps/openmw/mwlua/mwscriptbindings.hpp b/apps/openmw/mwlua/mwscriptbindings.hpp
index 9598f051ae..c0c88ec28c 100644
--- a/apps/openmw/mwlua/mwscriptbindings.hpp
+++ b/apps/openmw/mwlua/mwscriptbindings.hpp
@@ -3,13 +3,11 @@
 
 #include <sol/forward.hpp>
 
-#include "context.hpp"
-
 namespace MWLua
 {
+    struct Context;
 
-    sol::table initMWScriptBindings(const Context&);
-
+    sol::table initMWScriptBindings(const Context& context);
 }
 
 #endif // MWLUA_MWSCRIPTBINDINGS_H
diff --git a/apps/openmw/mwlua/nearbybindings.cpp b/apps/openmw/mwlua/nearbybindings.cpp
index 6c244a0fd4..b31a934a54 100644
--- a/apps/openmw/mwlua/nearbybindings.cpp
+++ b/apps/openmw/mwlua/nearbybindings.cpp
@@ -13,9 +13,12 @@
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/scene.hpp"
 
+#include "context.hpp"
 #include "luamanagerimp.hpp"
 #include "objectlists.hpp"
 
+#include <vector>
+
 namespace
 {
     template <class T = MWWorld::Ptr>
diff --git a/apps/openmw/mwlua/nearbybindings.hpp b/apps/openmw/mwlua/nearbybindings.hpp
index ee0022898e..2d8140195e 100644
--- a/apps/openmw/mwlua/nearbybindings.hpp
+++ b/apps/openmw/mwlua/nearbybindings.hpp
@@ -3,11 +3,11 @@
 
 #include <sol/forward.hpp>
 
-#include "context.hpp"
-
 namespace MWLua
 {
-    sol::table initNearbyPackage(const Context&);
+    struct Context;
+
+    sol::table initNearbyPackage(const Context& context);
 }
 
 #endif // MWLUA_NEARBYBINDINGS_H
diff --git a/apps/openmw/mwlua/object.hpp b/apps/openmw/mwlua/object.hpp
index d032515314..4a50dee8b6 100644
--- a/apps/openmw/mwlua/object.hpp
+++ b/apps/openmw/mwlua/object.hpp
@@ -1,9 +1,7 @@
 #ifndef MWLUA_OBJECT_H
 #define MWLUA_OBJECT_H
 
-#include <map>
 #include <stdexcept>
-#include <typeindex>
 
 #include <sol/sol.hpp>
 
diff --git a/apps/openmw/mwlua/objectbindings.hpp b/apps/openmw/mwlua/objectbindings.hpp
index 5f69c54da3..3861211357 100644
--- a/apps/openmw/mwlua/objectbindings.hpp
+++ b/apps/openmw/mwlua/objectbindings.hpp
@@ -1,12 +1,12 @@
 #ifndef MWLUA_OBJECTBINDINGS_H
 #define MWLUA_OBJECTBINDINGS_H
 
-#include "context.hpp"
-
 namespace MWLua
 {
-    void initObjectBindingsForLocalScripts(const Context&);
-    void initObjectBindingsForGlobalScripts(const Context&);
+    struct Context;
+
+    void initObjectBindingsForLocalScripts(const Context& context);
+    void initObjectBindingsForGlobalScripts(const Context& context);
 }
 
 #endif // MWLUA_OBJECTBINDINGS_H
diff --git a/apps/openmw/mwlua/objectlists.cpp b/apps/openmw/mwlua/objectlists.cpp
index d0bda5a644..b0169dd651 100644
--- a/apps/openmw/mwlua/objectlists.cpp
+++ b/apps/openmw/mwlua/objectlists.cpp
@@ -1,9 +1,5 @@
 #include "objectlists.hpp"
 
-#include <components/esm3/esmreader.hpp>
-#include <components/esm3/esmwriter.hpp>
-#include <components/esm3/loadcell.hpp>
-
 #include <components/misc/resourcehelpers.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwlua/postprocessingbindings.cpp b/apps/openmw/mwlua/postprocessingbindings.cpp
index f12bda8650..6d0c33848a 100644
--- a/apps/openmw/mwlua/postprocessingbindings.cpp
+++ b/apps/openmw/mwlua/postprocessingbindings.cpp
@@ -8,6 +8,7 @@
 #include "../mwbase/world.hpp"
 #include "../mwrender/postprocessor.hpp"
 
+#include "context.hpp"
 #include "luamanagerimp.hpp"
 
 namespace
diff --git a/apps/openmw/mwlua/postprocessingbindings.hpp b/apps/openmw/mwlua/postprocessingbindings.hpp
index 50cd84fa24..55b46d2524 100644
--- a/apps/openmw/mwlua/postprocessingbindings.hpp
+++ b/apps/openmw/mwlua/postprocessingbindings.hpp
@@ -3,11 +3,11 @@
 
 #include <sol/forward.hpp>
 
-#include "context.hpp"
-
 namespace MWLua
 {
-    sol::table initPostprocessingPackage(const Context&);
+    struct Context;
+
+    sol::table initPostprocessingPackage(const Context& context);
 }
 
 #endif // MWLUA_POSTPROCESSINGBINDINGS_H
diff --git a/apps/openmw/mwlua/racebindings.cpp b/apps/openmw/mwlua/racebindings.cpp
index b5c4d6093f..590d16b4c9 100644
--- a/apps/openmw/mwlua/racebindings.cpp
+++ b/apps/openmw/mwlua/racebindings.cpp
@@ -8,7 +8,7 @@
 #include "../mwworld/esmstore.hpp"
 
 #include "idcollectionbindings.hpp"
-#include "types/types.hpp"
+#include "recordstore.hpp"
 
 namespace
 {
diff --git a/apps/openmw/mwlua/racebindings.hpp b/apps/openmw/mwlua/racebindings.hpp
index 43ba9237c5..405a158899 100644
--- a/apps/openmw/mwlua/racebindings.hpp
+++ b/apps/openmw/mwlua/racebindings.hpp
@@ -3,10 +3,10 @@
 
 #include <sol/forward.hpp>
 
-#include "context.hpp"
-
 namespace MWLua
 {
+    struct Context;
+
     sol::table initRaceRecordBindings(const Context& context);
 }
 
diff --git a/apps/openmw/mwlua/recordstore.hpp b/apps/openmw/mwlua/recordstore.hpp
index aed84a1271..f2fb4ed453 100644
--- a/apps/openmw/mwlua/recordstore.hpp
+++ b/apps/openmw/mwlua/recordstore.hpp
@@ -1,10 +1,16 @@
 #ifndef MWLUA_RECORDSTORE_H
 #define MWLUA_RECORDSTORE_H
 
-#include <sol/sol.hpp>
+#include <type_traits>
+
+#include <sol/forward.hpp>
+#include <sol/overload.hpp>
+#include <sol/state_view.hpp>
+#include <sol/table.hpp>
+#include <sol/types.hpp>
+#include <sol/unsafe_function.hpp>
+#include <sol/usertype.hpp>
 
-#include <components/esm/defs.hpp>
-#include <components/lua/luastate.hpp>
 #include <components/lua/util.hpp>
 
 #include "apps/openmw/mwbase/environment.hpp"
diff --git a/apps/openmw/mwlua/soundbindings.hpp b/apps/openmw/mwlua/soundbindings.hpp
index 333ed898c4..d7af17cb69 100644
--- a/apps/openmw/mwlua/soundbindings.hpp
+++ b/apps/openmw/mwlua/soundbindings.hpp
@@ -3,11 +3,11 @@
 
 #include <sol/forward.hpp>
 
-#include "context.hpp"
-
 namespace MWLua
 {
-    sol::table initCoreSoundBindings(const Context&);
+    struct Context;
+
+    sol::table initCoreSoundBindings(const Context& context);
 
     sol::table initAmbientPackage(const Context& context);
 }
diff --git a/apps/openmw/mwlua/stats.cpp b/apps/openmw/mwlua/stats.cpp
index 637ae0b002..8b103d5943 100644
--- a/apps/openmw/mwlua/stats.cpp
+++ b/apps/openmw/mwlua/stats.cpp
@@ -1,9 +1,11 @@
 #include "stats.hpp"
 
 #include <algorithm>
-#include <memory>
 #include <optional>
+#include <string>
 #include <string_view>
+#include <type_traits>
+#include <utility>
 #include <variant>
 
 #include <components/esm3/loadclas.hpp>
diff --git a/apps/openmw/mwlua/uibindings.hpp b/apps/openmw/mwlua/uibindings.hpp
index 930ba7f3d8..32fb54e590 100644
--- a/apps/openmw/mwlua/uibindings.hpp
+++ b/apps/openmw/mwlua/uibindings.hpp
@@ -3,11 +3,11 @@
 
 #include <sol/forward.hpp>
 
-#include "context.hpp"
-
 namespace MWLua
 {
-    sol::table initUserInterfacePackage(const Context&);
+    struct Context;
+
+    sol::table initUserInterfacePackage(const Context& context);
 }
 
 #endif // MWLUA_UIBINDINGS_H
diff --git a/apps/openmw/mwlua/userdataserializer.hpp b/apps/openmw/mwlua/userdataserializer.hpp
index f52bb22723..35e4c4729b 100644
--- a/apps/openmw/mwlua/userdataserializer.hpp
+++ b/apps/openmw/mwlua/userdataserializer.hpp
@@ -1,7 +1,8 @@
 #ifndef MWLUA_USERDATASERIALIZER_H
 #define MWLUA_USERDATASERIALIZER_H
 
-#include "object.hpp"
+#include <map>
+#include <memory>
 
 namespace LuaUtil
 {
diff --git a/apps/openmw/mwlua/vfsbindings.hpp b/apps/openmw/mwlua/vfsbindings.hpp
index b251db6fd4..ab3ad3662c 100644
--- a/apps/openmw/mwlua/vfsbindings.hpp
+++ b/apps/openmw/mwlua/vfsbindings.hpp
@@ -3,11 +3,11 @@
 
 #include <sol/forward.hpp>
 
-#include "context.hpp"
-
 namespace MWLua
 {
-    sol::table initVFSPackage(const Context&);
+    struct Context;
+
+    sol::table initVFSPackage(const Context& context);
 }
 
 #endif // MWLUA_VFSBINDINGS_H
diff --git a/apps/openmw/mwlua/worldbindings.cpp b/apps/openmw/mwlua/worldbindings.cpp
index c02bad3bd3..d98c769e65 100644
--- a/apps/openmw/mwlua/worldbindings.cpp
+++ b/apps/openmw/mwlua/worldbindings.cpp
@@ -7,7 +7,6 @@
 #include <components/esm3/loadclot.hpp>
 #include <components/esm3/loadligh.hpp>
 #include <components/esm3/loadmisc.hpp>
-#include <components/esm3/loadskil.hpp>
 #include <components/esm3/loadweap.hpp>
 #include <components/lua/luastate.hpp>
 #include <components/misc/finitenumbers.hpp>
@@ -27,6 +26,7 @@
 #include "luamanagerimp.hpp"
 
 #include "animationbindings.hpp"
+#include "context.hpp"
 #include "corebindings.hpp"
 #include "mwscriptbindings.hpp"
 
diff --git a/apps/openmw/mwlua/worldbindings.hpp b/apps/openmw/mwlua/worldbindings.hpp
index 4bd2318b68..368344429b 100644
--- a/apps/openmw/mwlua/worldbindings.hpp
+++ b/apps/openmw/mwlua/worldbindings.hpp
@@ -3,11 +3,11 @@
 
 #include <sol/forward.hpp>
 
-#include "context.hpp"
-
 namespace MWLua
 {
-    sol::table initWorldPackage(const Context&);
+    struct Context;
+
+    sol::table initWorldPackage(const Context& context);
 }
 
 #endif // MWLUA_WORLDBINDINGS_H
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 8a3325ea71..6b7fe32d40 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -407,6 +407,7 @@ add_component_dir(detournavigator
     areatype
     asyncnavmeshupdater
     bounds
+    cellgridbounds
     changetype
     collisionshapetype
     commulativeaabb
diff --git a/components/detournavigator/dbrefgeometryobject.hpp b/components/detournavigator/dbrefgeometryobject.hpp
index dbbafe7e18..71e035d9e6 100644
--- a/components/detournavigator/dbrefgeometryobject.hpp
+++ b/components/detournavigator/dbrefgeometryobject.hpp
@@ -8,7 +8,6 @@
 
 #include <algorithm>
 #include <cstdint>
-#include <optional>
 #include <tuple>
 #include <type_traits>
 #include <variant>
diff --git a/components/detournavigator/generatenavmeshtile.cpp b/components/detournavigator/generatenavmeshtile.cpp
index 118114181e..115ca75d40 100644
--- a/components/detournavigator/generatenavmeshtile.cpp
+++ b/components/detournavigator/generatenavmeshtile.cpp
@@ -10,10 +10,8 @@
 
 #include <osg/io_utils>
 
-#include <functional>
 #include <memory>
 #include <optional>
-#include <stdexcept>
 #include <vector>
 
 namespace DetourNavigator
@@ -79,7 +77,7 @@ namespace DetourNavigator
                 return;
             }
 
-            const auto data
+            const std::unique_ptr<PreparedNavMeshData> data
                 = prepareNavMeshTileData(*recastMesh, mWorldspace, mTilePosition, mAgentBounds, mSettings.mRecast);
 
             if (data == nullptr)
diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index fe63d27a1e..06bb693aad 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -3,8 +3,6 @@
 #include "exceptions.hpp"
 #include "flags.hpp"
 #include "navmeshdata.hpp"
-#include "navmeshdb.hpp"
-#include "navmeshtilescache.hpp"
 #include "offmeshconnection.hpp"
 #include "preparednavmeshdata.hpp"
 #include "recastcontext.hpp"
@@ -22,8 +20,6 @@
 
 #include <algorithm>
 #include <array>
-#include <iomanip>
-#include <limits>
 
 namespace DetourNavigator
 {
diff --git a/components/detournavigator/navmeshtileview.cpp b/components/detournavigator/navmeshtileview.cpp
index d22efcbfff..e77962bb3c 100644
--- a/components/detournavigator/navmeshtileview.cpp
+++ b/components/detournavigator/navmeshtileview.cpp
@@ -4,7 +4,6 @@
 #include <DetourCommon.h>
 #include <DetourNavMesh.h>
 
-#include <algorithm>
 #include <cassert>
 #include <stdexcept>
 #include <tuple>
diff --git a/components/detournavigator/offmeshconnection.hpp b/components/detournavigator/offmeshconnection.hpp
index fb8b166498..01bae02732 100644
--- a/components/detournavigator/offmeshconnection.hpp
+++ b/components/detournavigator/offmeshconnection.hpp
@@ -6,7 +6,6 @@
 #include <osg/Vec3f>
 
 #include <tuple>
-#include <vector>
 
 namespace DetourNavigator
 {
diff --git a/components/detournavigator/preparednavmeshdata.cpp b/components/detournavigator/preparednavmeshdata.cpp
index a737ae19a5..32e559b8d0 100644
--- a/components/detournavigator/preparednavmeshdata.cpp
+++ b/components/detournavigator/preparednavmeshdata.cpp
@@ -4,8 +4,6 @@
 
 #include <Recast.h>
 
-#include <cstring>
-
 namespace
 {
     void initPolyMeshDetail(rcPolyMeshDetail& value) noexcept
diff --git a/components/detournavigator/raycast.hpp b/components/detournavigator/raycast.hpp
index 855c5562fc..374b09320c 100644
--- a/components/detournavigator/raycast.hpp
+++ b/components/detournavigator/raycast.hpp
@@ -3,9 +3,10 @@
 
 #include "flags.hpp"
 
-#include <optional>
 #include <osg/Vec3f>
 
+#include <optional>
+
 class dtNavMeshQuery;
 
 namespace DetourNavigator
diff --git a/components/detournavigator/recastmesh.hpp b/components/detournavigator/recastmesh.hpp
index 6d06db0799..1a67bb5495 100644
--- a/components/detournavigator/recastmesh.hpp
+++ b/components/detournavigator/recastmesh.hpp
@@ -11,9 +11,7 @@
 #include <osg/Vec3f>
 
 #include <cstdint>
-#include <memory>
 #include <numeric>
-#include <string>
 #include <tuple>
 #include <vector>
 
diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp
index 49fdd996a7..bef98b73f0 100644
--- a/components/files/configurationmanager.cpp
+++ b/components/files/configurationmanager.cpp
@@ -1,6 +1,7 @@
 #include "configurationmanager.hpp"
 
 #include <fstream>
+#include <map>
 
 #include <components/debug/debuglog.hpp>
 #include <components/fallback/validate.hpp>
diff --git a/components/files/configurationmanager.hpp b/components/files/configurationmanager.hpp
index 184c6ebb82..da4397146b 100644
--- a/components/files/configurationmanager.hpp
+++ b/components/files/configurationmanager.hpp
@@ -1,7 +1,6 @@
 #ifndef COMPONENTS_FILES_CONFIGURATIONMANAGER_HPP
 #define COMPONENTS_FILES_CONFIGURATIONMANAGER_HPP
 
-#include <map>
 #include <optional>
 #include <stack>
 #include <string_view>
diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
index 9fa01385d5..d456795781 100644
--- a/components/sceneutil/mwshadowtechnique.cpp
+++ b/components/sceneutil/mwshadowtechnique.cpp
@@ -27,7 +27,6 @@
 #include <osg/ClipControl>
 
 #include <sstream>
-#include <deque>
 #include <vector>
 
 #include "glextensions.hpp"