diff --git a/apps/openmw/mwlua/animationbindings.cpp b/apps/openmw/mwlua/animationbindings.cpp
index 5c4ccf7212..fb3e64ba73 100644
--- a/apps/openmw/mwlua/animationbindings.cpp
+++ b/apps/openmw/mwlua/animationbindings.cpp
@@ -1,3 +1,5 @@
+#include "animationbindings.hpp"
+
 #include <components/esm3/loadmgef.hpp>
 #include <components/esm3/loadstat.hpp>
 #include <components/lua/asyncpackage.hpp>
@@ -18,9 +20,6 @@
 #include "luamanagerimp.hpp"
 #include "objectvariant.hpp"
 
-#include "animationbindings.hpp"
-#include <array>
-
 namespace MWLua
 {
     using BlendMask = MWRender::Animation::BlendMask;
diff --git a/apps/openmw/mwlua/animationbindings.hpp b/apps/openmw/mwlua/animationbindings.hpp
index d28dda9208..251de42ee8 100644
--- a/apps/openmw/mwlua/animationbindings.hpp
+++ b/apps/openmw/mwlua/animationbindings.hpp
@@ -5,6 +5,8 @@
 
 namespace MWLua
 {
+    struct Context;
+
     sol::table initAnimationPackage(const Context& context);
     sol::table initCoreVfxBindings(const Context& context);
 }
diff --git a/apps/openmw/mwlua/birthsignbindings.cpp b/apps/openmw/mwlua/birthsignbindings.cpp
index 6993ae0105..f65d50bc5a 100644
--- a/apps/openmw/mwlua/birthsignbindings.cpp
+++ b/apps/openmw/mwlua/birthsignbindings.cpp
@@ -1,15 +1,13 @@
+#include "birthsignbindings.hpp"
+
 #include <components/esm3/loadbsgn.hpp>
 #include <components/lua/luastate.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwworld/class.hpp"
-#include "../mwworld/esmstore.hpp"
 
-#include "birthsignbindings.hpp"
 #include "idcollectionbindings.hpp"
-#include "luamanagerimp.hpp"
 #include "types/types.hpp"
 
 namespace sol
diff --git a/apps/openmw/mwlua/camerabindings.cpp b/apps/openmw/mwlua/camerabindings.cpp
index e3470eb853..ed75b4b198 100644
--- a/apps/openmw/mwlua/camerabindings.cpp
+++ b/apps/openmw/mwlua/camerabindings.cpp
@@ -1,3 +1,4 @@
+#include "camerabindings.hpp"
 
 #include <components/lua/luastate.hpp>
 #include <components/lua/utilpackage.hpp>
diff --git a/apps/openmw/mwlua/classbindings.cpp b/apps/openmw/mwlua/classbindings.cpp
index c9d5a9fb7b..84864781d2 100644
--- a/apps/openmw/mwlua/classbindings.cpp
+++ b/apps/openmw/mwlua/classbindings.cpp
@@ -1,14 +1,9 @@
+#include "classbindings.hpp"
+
 #include <components/esm3/loadclas.hpp>
 #include <components/lua/luastate.hpp>
 
-#include "../mwbase/environment.hpp"
-#include "../mwworld/class.hpp"
-#include "../mwworld/esmstore.hpp"
-
-#include "classbindings.hpp"
 #include "idcollectionbindings.hpp"
-#include "luamanagerimp.hpp"
-#include "stats.hpp"
 #include "types/types.hpp"
 
 namespace sol
diff --git a/apps/openmw/mwlua/debugbindings.cpp b/apps/openmw/mwlua/debugbindings.cpp
index 0aa1f4ace5..97ca080e5c 100644
--- a/apps/openmw/mwlua/debugbindings.cpp
+++ b/apps/openmw/mwlua/debugbindings.cpp
@@ -1,4 +1,5 @@
 #include "debugbindings.hpp"
+
 #include "context.hpp"
 #include "luamanagerimp.hpp"
 
diff --git a/apps/openmw/mwlua/factionbindings.cpp b/apps/openmw/mwlua/factionbindings.cpp
index e4c65386bf..b606d1a6f9 100644
--- a/apps/openmw/mwlua/factionbindings.cpp
+++ b/apps/openmw/mwlua/factionbindings.cpp
@@ -3,14 +3,9 @@
 #include <components/esm3/loadfact.hpp>
 #include <components/lua/luastate.hpp>
 
-#include "../mwbase/environment.hpp"
-#include "../mwworld/class.hpp"
-#include "../mwworld/esmstore.hpp"
-
-#include "../mwmechanics/npcstats.hpp"
+#include "../mwworld/store.hpp"
 
 #include "idcollectionbindings.hpp"
-#include "luamanagerimp.hpp"
 
 namespace
 {
diff --git a/apps/openmw/mwlua/inputbindings.cpp b/apps/openmw/mwlua/inputbindings.cpp
index ae54061cb6..e9ed4fe485 100644
--- a/apps/openmw/mwlua/inputbindings.cpp
+++ b/apps/openmw/mwlua/inputbindings.cpp
@@ -11,6 +11,7 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/inputmanager.hpp"
 #include "../mwinput/actions.hpp"
+
 #include "luamanagerimp.hpp"
 
 namespace sol
diff --git a/apps/openmw/mwlua/itemdata.cpp b/apps/openmw/mwlua/itemdata.cpp
index d7ced755ea..3e2b755af8 100644
--- a/apps/openmw/mwlua/itemdata.cpp
+++ b/apps/openmw/mwlua/itemdata.cpp
@@ -1,13 +1,11 @@
 #include "itemdata.hpp"
 
 #include "context.hpp"
-
 #include "luamanagerimp.hpp"
+#include "objectvariant.hpp"
 
 #include "../mwworld/class.hpp"
 
-#include "objectvariant.hpp"
-
 namespace
 {
     using SelfObject = MWLua::SelfObject;
diff --git a/apps/openmw/mwlua/objectlists.cpp b/apps/openmw/mwlua/objectlists.cpp
index e7b3bb2e06..d0bda5a644 100644
--- a/apps/openmw/mwlua/objectlists.cpp
+++ b/apps/openmw/mwlua/objectlists.cpp
@@ -7,7 +7,6 @@
 #include <components/misc/resourcehelpers.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/windowmanager.hpp"
 
 #include "../mwclass/container.hpp"
 
diff --git a/apps/openmw/mwlua/racebindings.cpp b/apps/openmw/mwlua/racebindings.cpp
index e2e2ae2a8a..ea23e883e1 100644
--- a/apps/openmw/mwlua/racebindings.cpp
+++ b/apps/openmw/mwlua/racebindings.cpp
@@ -1,14 +1,13 @@
+#include "racebindings.hpp"
+
 #include <components/esm/attr.hpp>
 #include <components/esm3/loadrace.hpp>
 #include <components/lua/luastate.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 
 #include "idcollectionbindings.hpp"
-#include "luamanagerimp.hpp"
-#include "racebindings.hpp"
 #include "types/types.hpp"
 
 namespace
diff --git a/apps/openmw/mwlua/vfsbindings.cpp b/apps/openmw/mwlua/vfsbindings.cpp
index 34a84221f8..0e13c07ef9 100644
--- a/apps/openmw/mwlua/vfsbindings.cpp
+++ b/apps/openmw/mwlua/vfsbindings.cpp
@@ -1,6 +1,9 @@
 #include "vfsbindings.hpp"
 
+#include <sol/object.hpp>
+
 #include <components/files/istreamptr.hpp>
+#include <components/lua/luastate.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/settings/values.hpp>
 #include <components/vfs/manager.hpp>
@@ -10,7 +13,6 @@
 #include "../mwbase/environment.hpp"
 
 #include "context.hpp"
-#include "luamanagerimp.hpp"
 
 namespace MWLua
 {