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.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.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 653eef2a42..282a9f970b 100644
--- a/apps/openmw/mwlua/corebindings.cpp
+++ b/apps/openmw/mwlua/corebindings.cpp
@@ -19,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/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/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 230fab45db..b31a934a54 100644
--- a/apps/openmw/mwlua/nearbybindings.cpp
+++ b/apps/openmw/mwlua/nearbybindings.cpp
@@ -13,6 +13,7 @@
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/scene.hpp"
 
+#include "context.hpp"
 #include "luamanagerimp.hpp"
 #include "objectlists.hpp"
 
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/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/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.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/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/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/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 66c17699f2..d98c769e65 100644
--- a/apps/openmw/mwlua/worldbindings.cpp
+++ b/apps/openmw/mwlua/worldbindings.cpp
@@ -26,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