Cleanup openmw lua includes

apps/openmw/mwlua/asyncbindings.cpp

@@ -1,6 +1,6 @@
 #include "luabindings.hpp"
 
-#include "luamanagerimp.hpp"
+#include "worldview.hpp"
 
 namespace sol
 {

apps/openmw/mwlua/camerabindings.cpp

@@ -5,6 +5,8 @@
 
 #include "../mwrender/camera.hpp"
 #include "../mwrender/renderingmanager.hpp"
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
 
 namespace MWLua
 {

apps/openmw/mwlua/cellbindings.cpp

@@ -3,7 +3,9 @@
 #include <components/esm3/loadcell.hpp>
 
 #include "../mwworld/cellstore.hpp"
+
 #include "types/types.hpp"
+#include "worldview.hpp"
 
 namespace sol
 {

apps/openmw/mwlua/inputbindings.cpp

@@ -6,6 +6,7 @@
 
 #include <components/sdlutil/events.hpp>
 
+#include "../mwbase/environment.hpp"
 #include "../mwbase/inputmanager.hpp"
 #include "../mwinput/actions.hpp"
 

apps/openmw/mwlua/localscripts.cpp

@@ -14,7 +14,8 @@
 #include "../mwmechanics/aipackage.hpp"
 #include "../mwmechanics/creaturestats.hpp"
 
-#include "luamanagerimp.hpp"
+#include "context.hpp"
+#include "worldview.hpp"
 
 namespace sol
 {

apps/openmw/mwlua/localscripts.hpp

@@ -11,10 +11,10 @@
 #include "../mwbase/luamanager.hpp"
 
 #include "object.hpp"
-#include "luabindings.hpp"
 
 namespace MWLua
 {
+    struct Context;
 
     class LocalScripts : public LuaUtil::ScriptsContainer
     {

apps/openmw/mwlua/luabindings.cpp

@@ -8,13 +8,11 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/statemanager.hpp"
 #include "../mwworld/esmstore.hpp"
-#include "../mwworld/inventorystore.hpp"
 #include "../mwworld/store.hpp"
 
 #include "eventqueue.hpp"
 #include "worldview.hpp"
 #include "luamanagerimp.hpp"
-#include "types/types.hpp"
 
 namespace MWLua
 {

apps/openmw/mwlua/luabindings.hpp

@@ -7,9 +7,6 @@
 #include <components/lua/storage.hpp>
 
 #include "context.hpp"
-#include "eventqueue.hpp"
-#include "object.hpp"
-#include "worldview.hpp"
 
 namespace MWWorld
 {

apps/openmw/mwlua/luamanagerimp.cpp

@@ -26,6 +26,7 @@
 #include "userdataserializer.hpp"
 #include "types/types.hpp"
 #include "debugbindings.hpp"
+#include "playerscripts.hpp"
 
 namespace MWLua
 {

apps/openmw/mwlua/luamanagerimp.hpp

@@ -17,9 +17,8 @@
 #include "object.hpp"
 #include "eventqueue.hpp"
 #include "globalscripts.hpp"
-#include "localscripts.hpp"
-#include "playerscripts.hpp"
 #include "worldview.hpp"
+#include "localscripts.hpp"
 
 namespace MWLua
 {

apps/openmw/mwlua/objectbindings.cpp

@@ -6,7 +6,6 @@
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
-#include "../mwworld/inventorystore.hpp"
 #include "../mwworld/player.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"

apps/openmw/mwlua/stats.cpp

@@ -10,6 +10,7 @@
 
 #include "localscripts.hpp"
 #include "luamanagerimp.hpp"
+#include "context.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/npcstats.hpp"

apps/openmw/mwlua/stats.hpp

@@ -1,10 +1,12 @@
 #ifndef MWLUA_STATS_H
 #define MWLUA_STATS_H
 
-#include "context.hpp"
+#include <sol/forward.hpp>
 
 namespace MWLua
 {
+    struct Context;
+
     void addActorStatsBindings(sol::table& actor, const Context& context);
     void addNpcStatsBindings(sol::table& npc, const Context& context);
 }

apps/openmw/mwlua/types/activator.cpp

@@ -3,10 +3,11 @@
 #include <components/esm3/loadacti.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
+#include <components/lua/luastate.hpp>
 
 #include <apps/openmw/mwworld/esmstore.hpp>
-
-#include "../luabindings.hpp"
+#include <apps/openmw/mwbase/environment.hpp>
+#include <apps/openmw/mwbase/world.hpp>
 
 namespace sol
 {

apps/openmw/mwlua/types/actor.cpp

@@ -8,7 +8,6 @@
 #include <apps/openmw/mwworld/inventorystore.hpp>
 #include <apps/openmw/mwworld/class.hpp>
 
-#include "../luabindings.hpp"
 #include "../localscripts.hpp"
 #include "../luamanagerimp.hpp"
 #include "../stats.hpp"

apps/openmw/mwlua/types/apparatus.cpp

@@ -3,10 +3,11 @@
 #include <components/esm3/loadappa.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
+#include <components/lua/luastate.hpp>
 
 #include <apps/openmw/mwworld/esmstore.hpp>
-
-#include "../luabindings.hpp"
+#include <apps/openmw/mwbase/environment.hpp>
+#include <apps/openmw/mwbase/world.hpp>
 
 namespace sol
 {

apps/openmw/mwlua/types/book.cpp

@@ -3,10 +3,11 @@
 #include <components/esm3/loadbook.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
+#include <components/lua/luastate.hpp>
 
 #include <apps/openmw/mwworld/esmstore.hpp>
-
-#include "../luabindings.hpp"
+#include <apps/openmw/mwbase/environment.hpp>
+#include <apps/openmw/mwbase/world.hpp>
 
 namespace sol
 {

apps/openmw/mwlua/types/container.cpp

@@ -3,11 +3,12 @@
 #include <components/esm3/loadcont.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
+#include <components/lua/luastate.hpp>
 
 #include <apps/openmw/mwworld/esmstore.hpp>
 #include <apps/openmw/mwworld/class.hpp>
-
-#include "../luabindings.hpp"
+#include <apps/openmw/mwbase/environment.hpp>
+#include <apps/openmw/mwbase/world.hpp>
 
 namespace sol
 {

apps/openmw/mwlua/types/creature.cpp

@@ -1,13 +1,13 @@
 #include "types.hpp"
 
 #include <components/esm3/loadcrea.hpp>
-
-#include <apps/openmw/mwworld/esmstore.hpp>
+#include <components/lua/luastate.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
 
-#include "../stats.hpp"
-#include "../luabindings.hpp"
+#include <apps/openmw/mwworld/esmstore.hpp>
+#include <apps/openmw/mwbase/environment.hpp>
+#include <apps/openmw/mwbase/world.hpp>
 
 namespace sol
 {

apps/openmw/mwlua/types/door.cpp

@@ -7,6 +7,7 @@
 #include <apps/openmw/mwworld/esmstore.hpp>
 
 #include "../luabindings.hpp"
+#include "../worldview.hpp"
 
 namespace sol
 {

apps/openmw/mwlua/types/ingredient.cpp

@@ -2,9 +2,12 @@
 
 #include <components/esm3/loadingr.hpp>
 
+#include <components/lua/luastate.hpp>
+
 #include <apps/openmw/mwworld/esmstore.hpp>
 
-#include "../luabindings.hpp"
+#include <apps/openmw/mwbase/environment.hpp>
+#include <apps/openmw/mwbase/world.hpp>
 
 namespace sol
 {

apps/openmw/mwlua/types/lockpick.cpp

@@ -3,10 +3,11 @@
 #include <components/esm3/loadlock.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
+#include <components/lua/luastate.hpp>
 
 #include <apps/openmw/mwworld/esmstore.hpp>
-
-#include "../luabindings.hpp"
+#include <apps/openmw/mwbase/environment.hpp>
+#include <apps/openmw/mwbase/world.hpp>
 
 namespace sol
 {

apps/openmw/mwlua/types/misc.cpp

@@ -3,10 +3,11 @@
 #include <components/esm3/loadmisc.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
+#include <components/lua/luastate.hpp>
 
 #include <apps/openmw/mwworld/esmstore.hpp>
-
-#include "../luabindings.hpp"
+#include <apps/openmw/mwbase/environment.hpp>
+#include <apps/openmw/mwbase/world.hpp>
 
 namespace sol
 {

apps/openmw/mwlua/types/npc.cpp

@@ -1,11 +1,13 @@
 #include "types.hpp"
 
 #include <components/esm3/loadnpc.hpp>
+#include <components/lua/luastate.hpp>
 
 #include <apps/openmw/mwworld/esmstore.hpp>
+#include <apps/openmw/mwbase/environment.hpp>
+#include <apps/openmw/mwbase/world.hpp>
 
 #include "../stats.hpp"
-#include "../luabindings.hpp"
 
 namespace sol
 {

apps/openmw/mwlua/types/potion.cpp

@@ -3,10 +3,11 @@
 #include <components/esm3/loadalch.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
+#include <components/lua/luastate.hpp>
 
 #include <apps/openmw/mwworld/esmstore.hpp>
-
-#include "../luabindings.hpp"
+#include <apps/openmw/mwbase/environment.hpp>
+#include <apps/openmw/mwbase/world.hpp>
 
 namespace sol
 {

apps/openmw/mwlua/types/probe.cpp

@@ -3,10 +3,11 @@
 #include <components/esm3/loadprob.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
+#include <components/lua/luastate.hpp>
 
 #include <apps/openmw/mwworld/esmstore.hpp>
-
-#include "../luabindings.hpp"
+#include <apps/openmw/mwbase/environment.hpp>
+#include <apps/openmw/mwbase/world.hpp>
 
 namespace sol
 {

apps/openmw/mwlua/types/repair.cpp

@@ -3,10 +3,11 @@
 #include <components/esm3/loadrepa.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
+#include <components/lua/luastate.hpp>
 
 #include <apps/openmw/mwworld/esmstore.hpp>
-
-#include "../luabindings.hpp"
+#include <apps/openmw/mwbase/environment.hpp>
+#include <apps/openmw/mwbase/world.hpp>
 
 namespace sol
 {

apps/openmw/mwlua/types/weapon.cpp

@@ -3,10 +3,11 @@
 #include <components/esm3/loadweap.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
+#include <components/lua/luastate.hpp>
 
 #include <apps/openmw/mwworld/esmstore.hpp>
-
-#include "../luabindings.hpp"
+#include <apps/openmw/mwbase/environment.hpp>
+#include <apps/openmw/mwbase/world.hpp>
 
 namespace sol
 {