diff --git a/apps/openmw/mwlua/object.cpp b/apps/openmw/mwlua/object.cpp
index e81a6fbcc6..9b51729b10 100644
--- a/apps/openmw/mwlua/object.cpp
+++ b/apps/openmw/mwlua/object.cpp
@@ -1,7 +1,5 @@
 #include "object.hpp"
 
-#include <unordered_map>
-
 #include "types/types.hpp"
 
 namespace MWLua
diff --git a/apps/openmw/mwlua/object.hpp b/apps/openmw/mwlua/object.hpp
index 499c21c7e7..4c4fbd7908 100644
--- a/apps/openmw/mwlua/object.hpp
+++ b/apps/openmw/mwlua/object.hpp
@@ -2,15 +2,11 @@
 #define MWLUA_OBJECT_H
 
 #include <typeindex>
+#include <map>
 
 #include <sol/sol.hpp>
 
 #include <components/esm3/cellref.hpp>
-#include <components/esm/defs.hpp>
-#include <components/esm/luascripts.hpp>
-
-#include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 
 #include "../mwworld/ptr.hpp"
 
diff --git a/apps/openmw/mwlua/worldview.hpp b/apps/openmw/mwlua/worldview.hpp
index e5b5fe4f67..004fcfc0c3 100644
--- a/apps/openmw/mwlua/worldview.hpp
+++ b/apps/openmw/mwlua/worldview.hpp
@@ -3,6 +3,11 @@
 
 #include "object.hpp"
 
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+
+#include <set>
+
 namespace ESM
 {
     class ESMWriter;