diff --git a/src/game/BattleGroundHandler.cpp b/src/game/BattleGroundHandler.cpp
index dd01b66f3..6e8fafd29 100644
--- a/src/game/BattleGroundHandler.cpp
+++ b/src/game/BattleGroundHandler.cpp
@@ -23,7 +23,6 @@
 #include "Player.h"
 #include "ObjectMgr.h"
 #include "WorldSession.h"
-#include "ObjectAccessor.h"
 #include "Object.h"
 #include "Chat.h"
 #include "BattleGroundMgr.h"
diff --git a/src/game/BattleGroundMgr.h b/src/game/BattleGroundMgr.h
index 45199d8b6..5fb3668c0 100644
--- a/src/game/BattleGroundMgr.h
+++ b/src/game/BattleGroundMgr.h
@@ -21,6 +21,7 @@
 
 #include "Common.h"
 #include "Policies/Singleton.h"
+#include "Utilities/EventProcessor.h"
 #include "BattleGround.h"
 
 typedef std::map<uint32, BattleGround*> BattleGroundSet;
diff --git a/src/game/ItemHandler.cpp b/src/game/ItemHandler.cpp
index c861fae4f..390382727 100644
--- a/src/game/ItemHandler.cpp
+++ b/src/game/ItemHandler.cpp
@@ -25,7 +25,6 @@
 #include "Player.h"
 #include "Item.h"
 #include "UpdateData.h"
-#include "ObjectAccessor.h"
 
 void WorldSession::HandleSplitItemOpcode( WorldPacket & recv_data )
 {
diff --git a/src/game/Level0.cpp b/src/game/Level0.cpp
index 937f1b9cc..8f5b4b5ad 100644
--- a/src/game/Level0.cpp
+++ b/src/game/Level0.cpp
@@ -22,7 +22,6 @@
 #include "Player.h"
 #include "Opcodes.h"
 #include "Chat.h"
-#include "ObjectAccessor.h"
 #include "Language.h"
 #include "AccountMgr.h"
 #include "SystemConfig.h"
diff --git a/src/game/SkillHandler.cpp b/src/game/SkillHandler.cpp
index 970406f79..9c97d9844 100644
--- a/src/game/SkillHandler.cpp
+++ b/src/game/SkillHandler.cpp
@@ -23,7 +23,6 @@
 #include "Player.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "ObjectAccessor.h"
 #include "UpdateMask.h"
 
 void WorldSession::HandleLearnTalentOpcode( WorldPacket & recv_data )
diff --git a/src/game/WorldSession.cpp b/src/game/WorldSession.cpp
index 44d55fbcd..2533ccfdf 100644
--- a/src/game/WorldSession.cpp
+++ b/src/game/WorldSession.cpp
@@ -32,7 +32,6 @@
 #include "Group.h"
 #include "Guild.h"
 #include "World.h"
-#include "ObjectAccessor.h"
 #include "BattleGroundMgr.h"
 #include "MapManager.h"
 #include "SocialMgr.h"
diff --git a/src/mangosd/WorldRunnable.cpp b/src/mangosd/WorldRunnable.cpp
index 1f783f4a2..b90cd4a72 100644
--- a/src/mangosd/WorldRunnable.cpp
+++ b/src/mangosd/WorldRunnable.cpp
@@ -25,7 +25,6 @@
 #include "World.h"
 #include "WorldRunnable.h"
 #include "Timer.h"
-#include "ObjectAccessor.h"
 #include "MapManager.h"
 #include "BattleGroundMgr.h"
 
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 38002310a..0b753564d 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "8576"
+ #define REVISION_NR "8577"
 #endif // __REVISION_NR_H__