Cleanup includes

apps/openmw/mwclass/misc.cpp

@@ -10,7 +10,6 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/world.hpp"
 
 #include "../mwworld/actionsoulgem.hpp"
 #include "../mwworld/cellstore.hpp"

apps/openmw/mwclass/weapon.cpp

@@ -10,7 +10,6 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/world.hpp"
 
 #include "../mwworld/actionequip.hpp"
 #include "../mwworld/cellstore.hpp"

apps/openmw/mwgui/enchantingdialog.cpp

@@ -15,7 +15,6 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/world.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"

apps/openmw/mwgui/spellicons.cpp

@@ -12,7 +12,6 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/world.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"

apps/openmw/mwgui/tooltips.cpp

@@ -17,7 +17,6 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/world.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/spellutil.hpp"

apps/openmw/mwmechanics/actors.cpp

@@ -17,7 +17,7 @@
 #include <components/esm3/loadmgef.hpp>
 #include <components/esm3/loadstat.hpp>
 
-#include "../mwworld/actionequip.hpp"
+#include "../mwworld/cellstore.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
@@ -39,7 +39,6 @@
 
 #include "actor.hpp"
 #include "actorutil.hpp"
-#include "aicombat.hpp"
 #include "aicombataction.hpp"
 #include "aifollow.hpp"
 #include "aipursue.hpp"
@@ -48,7 +47,6 @@
 #include "creaturestats.hpp"
 #include "movement.hpp"
 #include "npcstats.hpp"
-#include "spellcasting.hpp"
 #include "steering.hpp"
 #include "summoning.hpp"
 

apps/openmw/mwmechanics/aipackage.cpp

@@ -10,11 +10,10 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
-#include "../mwworld/action.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/class.hpp"
+#include "../mwworld/containerstore.hpp"
 #include "../mwworld/esmstore.hpp"
-#include "../mwworld/inventorystore.hpp"
 
 #include "../mwphysics/raycasting.hpp"
 

apps/openmw/mwmechanics/difficultyscaling.cpp

@@ -3,8 +3,8 @@
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/ptr.hpp"
 
 #include "actorutil.hpp"
 

apps/openmw/mwrender/actoranimation.cpp

@@ -25,7 +25,6 @@
 #include <components/vfs/manager.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/drawstate.hpp"