diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp
index f19e013c4..7dd0dcc67 100644
--- a/src/game/BattleGround.cpp
+++ b/src/game/BattleGround.cpp
@@ -26,7 +26,6 @@
 #include "Chat.h"
 #include "SpellAuras.h"
 #include "ArenaTeam.h"
-#include "World.h"
 #include "Group.h"
 #include "ObjectMgr.h"
 #include "WorldPacket.h"
diff --git a/src/game/CombatHandler.cpp b/src/game/CombatHandler.cpp
index 86605c397..12fedd89a 100644
--- a/src/game/CombatHandler.cpp
+++ b/src/game/CombatHandler.cpp
@@ -20,7 +20,6 @@
 #include "Log.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "World.h"
 #include "ObjectAccessor.h"
 #include "CreatureAI.h"
 #include "ObjectDefines.h"
diff --git a/src/game/DuelHandler.cpp b/src/game/DuelHandler.cpp
index a355931e5..d98b444cc 100644
--- a/src/game/DuelHandler.cpp
+++ b/src/game/DuelHandler.cpp
@@ -19,7 +19,6 @@
 #include "Common.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "World.h"
 #include "Log.h"
 #include "Opcodes.h"
 #include "UpdateData.h"
diff --git a/src/game/ItemHandler.cpp b/src/game/ItemHandler.cpp
index dc92c6539..82ce5c546 100644
--- a/src/game/ItemHandler.cpp
+++ b/src/game/ItemHandler.cpp
@@ -19,7 +19,6 @@
 #include "Common.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "World.h"
 #include "Opcodes.h"
 #include "Log.h"
 #include "ObjectMgr.h"
diff --git a/src/game/MovementHandler.cpp b/src/game/MovementHandler.cpp
index ef7fee4df..d6e974a49 100644
--- a/src/game/MovementHandler.cpp
+++ b/src/game/MovementHandler.cpp
@@ -21,7 +21,6 @@
 #include "WorldSession.h"
 #include "Opcodes.h"
 #include "Log.h"
-#include "World.h"
 #include "Corpse.h"
 #include "Player.h"
 #include "MapManager.h"
diff --git a/src/game/NPCHandler.cpp b/src/game/NPCHandler.cpp
index d762b9a77..12f7bfb93 100644
--- a/src/game/NPCHandler.cpp
+++ b/src/game/NPCHandler.cpp
@@ -23,7 +23,6 @@
 #include "WorldSession.h"
 #include "Opcodes.h"
 #include "Log.h"
-#include "World.h"
 #include "ObjectMgr.h"
 #include "SpellMgr.h"
 #include "Player.h"
diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp
index 72921513a..37697ec7c 100644
--- a/src/game/PetHandler.cpp
+++ b/src/game/PetHandler.cpp
@@ -19,7 +19,6 @@
 #include "Common.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "World.h"
 #include "ObjectMgr.h"
 #include "SpellMgr.h"
 #include "Log.h"
diff --git a/src/game/PoolHandler.cpp b/src/game/PoolHandler.cpp
index 0f18aee05..4d040146f 100644
--- a/src/game/PoolHandler.cpp
+++ b/src/game/PoolHandler.cpp
@@ -17,7 +17,6 @@
  */
 
 #include "PoolHandler.h"
-#include "World.h"
 #include "ObjectMgr.h"
 #include "ProgressBar.h"
 #include "Language.h"
diff --git a/src/game/SkillHandler.cpp b/src/game/SkillHandler.cpp
index 8f854dd52..8e20d50df 100644
--- a/src/game/SkillHandler.cpp
+++ b/src/game/SkillHandler.cpp
@@ -21,7 +21,6 @@
 #include "Opcodes.h"
 #include "Log.h"
 #include "Player.h"
-#include "World.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "ObjectAccessor.h"
diff --git a/src/game/SpellHandler.cpp b/src/game/SpellHandler.cpp
index 986c39908..26d328e82 100644
--- a/src/game/SpellHandler.cpp
+++ b/src/game/SpellHandler.cpp
@@ -20,7 +20,6 @@
 #include "Database/DBCStores.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "World.h"
 #include "ObjectMgr.h"
 #include "SpellMgr.h"
 #include "Log.h"
diff --git a/src/game/TaxiHandler.cpp b/src/game/TaxiHandler.cpp
index b8aa614db..166d833d0 100644
--- a/src/game/TaxiHandler.cpp
+++ b/src/game/TaxiHandler.cpp
@@ -22,7 +22,6 @@
 #include "WorldSession.h"
 #include "Opcodes.h"
 #include "Log.h"
-#include "World.h"
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "UpdateMask.h"
diff --git a/src/game/VoiceChatHandler.cpp b/src/game/VoiceChatHandler.cpp
index 741957610..d3b614c52 100644
--- a/src/game/VoiceChatHandler.cpp
+++ b/src/game/VoiceChatHandler.cpp
@@ -19,7 +19,6 @@
 #include "Common.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "World.h"
 #include "Opcodes.h"
 #include "Log.h"
 
diff --git a/src/game/debugcmds.cpp b/src/game/debugcmds.cpp
index d04cce6a2..a2271783d 100644
--- a/src/game/debugcmds.cpp
+++ b/src/game/debugcmds.cpp
@@ -20,7 +20,6 @@
 #include "Database/DatabaseEnv.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "World.h"
 #include "Player.h"
 #include "Opcodes.h"
 #include "Chat.h"