diff --git a/src/game/AuctionHouseBot/AuctionHouseBot.cpp b/src/game/AuctionHouseBot/AuctionHouseBot.cpp
index 603d37151..47f7d9028 100644
--- a/src/game/AuctionHouseBot/AuctionHouseBot.cpp
+++ b/src/game/AuctionHouseBot/AuctionHouseBot.cpp
@@ -1,10 +1,10 @@
 #include "AuctionHouseBot.h"
 #include "ProgressBar.h"
 #include "Log.h"
-#include "../ObjectMgr.h"
-#include "../AuctionHouseMgr.h"
+#include "ObjectMgr.h"
+#include "AuctionHouseMgr.h"
 #include "SystemConfig.h"
-#include "../SQLStorages.h"
+#include "SQLStorages.h"
 
 // Format is YYYYMMDDRR where RR is the change in the conf file
 // for that day.
diff --git a/src/game/AuctionHouseBot/AuctionHouseBot.h b/src/game/AuctionHouseBot/AuctionHouseBot.h
index 933950f68..f967b021f 100644
--- a/src/game/AuctionHouseBot/AuctionHouseBot.h
+++ b/src/game/AuctionHouseBot/AuctionHouseBot.h
@@ -1,11 +1,11 @@
 #ifndef AUCTION_HOUSE_BOT_H
 #define AUCTION_HOUSE_BOT_H
 
-#include "../World.h"
+#include "World.h"
 #include "Config/Config.h"
-#include "../AuctionHouseMgr.h"
-#include "../SharedDefines.h"
-#include "../Item.h"
+#include "AuctionHouseMgr.h"
+#include "SharedDefines.h"
+#include "Item.h"
 
 // shadow of ItemQualities with skipped ITEM_QUALITY_HEIRLOOM, anything after ITEM_QUALITY_ARTIFACT(6) in fact
 enum AuctionQuality
diff --git a/src/game/BattleGround/BattleGround.cpp b/src/game/BattleGround/BattleGround.cpp
index b8cc8d28b..b7c4192cc 100644
--- a/src/game/BattleGround/BattleGround.cpp
+++ b/src/game/BattleGround/BattleGround.cpp
@@ -16,24 +16,24 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "../Object.h"
-#include "../Player.h"
+#include "Object.h"
+#include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundMgr.h"
-#include "../Creature.h"
-#include "../MapManager.h"
-#include "../Language.h"
-#include "../SpellAuras.h"
-#include "../ArenaTeam.h"
-#include "../World.h"
-#include "../Group.h"
-#include "../ObjectGuid.h"
-#include "../ObjectMgr.h"
-#include "../Mail.h"
+#include "Creature.h"
+#include "MapManager.h"
+#include "Language.h"
+#include "SpellAuras.h"
+#include "ArenaTeam.h"
+#include "World.h"
+#include "Group.h"
+#include "ObjectGuid.h"
+#include "ObjectMgr.h"
+#include "Mail.h"
 #include "WorldPacket.h"
 #include "Util.h"
-#include "../Formulas.h"
-#include "../GridNotifiersImpl.h"
+#include "Formulas.h"
+#include "GridNotifiersImpl.h"
 
 namespace MaNGOS
 {
diff --git a/src/game/BattleGround/BattleGroundAA.cpp b/src/game/BattleGround/BattleGroundAA.cpp
index 30796ca23..a00039fa7 100644
--- a/src/game/BattleGround/BattleGroundAA.cpp
+++ b/src/game/BattleGround/BattleGroundAA.cpp
@@ -16,10 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "../Player.h"
+#include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundAA.h"
-#include "../Language.h"
+#include "Language.h"
 
 BattleGroundAA::BattleGroundAA()
 {
diff --git a/src/game/BattleGround/BattleGroundAB.cpp b/src/game/BattleGround/BattleGroundAB.cpp
index 68f261361..9f5b8bb74 100644
--- a/src/game/BattleGround/BattleGroundAB.cpp
+++ b/src/game/BattleGround/BattleGroundAB.cpp
@@ -16,18 +16,18 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "../Object.h"
-#include "../Player.h"
+#include "Object.h"
+#include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundAB.h"
-#include "../Creature.h"
-#include "../GameObject.h"
+#include "Creature.h"
+#include "GameObject.h"
 #include "BattleGroundMgr.h"
-#include "../Language.h"
+#include "Language.h"
 #include "Util.h"
 #include "WorldPacket.h"
-#include "../MapManager.h"
-#include "../DBCStores.h"                                   // TODO REMOVE this when graveyard handling for pvp is updated
+#include "MapManager.h"
+#include "DBCStores.h"                                   // TODO REMOVE this when graveyard handling for pvp is updated
 
 BattleGroundAB::BattleGroundAB()
 {
diff --git a/src/game/BattleGround/BattleGroundAV.cpp b/src/game/BattleGround/BattleGroundAV.cpp
index 2db990915..1632eadd0 100644
--- a/src/game/BattleGround/BattleGroundAV.cpp
+++ b/src/game/BattleGround/BattleGroundAV.cpp
@@ -16,15 +16,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "../Player.h"
+#include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundAV.h"
 #include "BattleGroundMgr.h"
-#include "../Creature.h"
-#include "../GameObject.h"
-#include "../Language.h"
+#include "Creature.h"
+#include "GameObject.h"
+#include "Language.h"
 #include "WorldPacket.h"
-#include "../DBCStores.h"                                   // TODO REMOVE this when graveyard handling for pvp is updated
+#include "DBCStores.h"                                   // TODO REMOVE this when graveyard handling for pvp is updated
 
 BattleGroundAV::BattleGroundAV()
 {
diff --git a/src/game/BattleGround/BattleGroundBE.cpp b/src/game/BattleGround/BattleGroundBE.cpp
index 40ec1ab74..d8c6e1f19 100644
--- a/src/game/BattleGround/BattleGroundBE.cpp
+++ b/src/game/BattleGround/BattleGroundBE.cpp
@@ -16,13 +16,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "../Object.h"
-#include "../Player.h"
+#include "Object.h"
+#include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundBE.h"
-#include "../ObjectMgr.h"
+#include "ObjectMgr.h"
 #include "WorldPacket.h"
-#include "../Language.h"
+#include "Language.h"
 
 BattleGroundBE::BattleGroundBE()
 {
diff --git a/src/game/BattleGround/BattleGroundDS.cpp b/src/game/BattleGround/BattleGroundDS.cpp
index e2ee29283..a6c496c0a 100644
--- a/src/game/BattleGround/BattleGroundDS.cpp
+++ b/src/game/BattleGround/BattleGroundDS.cpp
@@ -16,10 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "../Player.h"
+#include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundDS.h"
-#include "../Language.h"
+#include "Language.h"
 
 BattleGroundDS::BattleGroundDS()
 {
diff --git a/src/game/BattleGround/BattleGroundEY.cpp b/src/game/BattleGround/BattleGroundEY.cpp
index ed1f3c084..9dd6ddf63 100644
--- a/src/game/BattleGround/BattleGroundEY.cpp
+++ b/src/game/BattleGround/BattleGroundEY.cpp
@@ -16,17 +16,17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "../Object.h"
-#include "../Player.h"
+#include "Object.h"
+#include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundEY.h"
-#include "../Creature.h"
-#include "../ObjectMgr.h"
+#include "Creature.h"
+#include "ObjectMgr.h"
 #include "BattleGroundMgr.h"
-#include "../Language.h"
+#include "Language.h"
 #include "WorldPacket.h"
 #include "Util.h"
-#include "../MapManager.h"
+#include "MapManager.h"
 
 BattleGroundEY::BattleGroundEY()
 {
diff --git a/src/game/BattleGround/BattleGroundEY.h b/src/game/BattleGround/BattleGroundEY.h
index 9e2348fc7..910be0632 100644
--- a/src/game/BattleGround/BattleGroundEY.h
+++ b/src/game/BattleGround/BattleGroundEY.h
@@ -19,7 +19,7 @@
 #ifndef __BATTLEGROUNDEY_H
 #define __BATTLEGROUNDEY_H
 
-#include "../Language.h"
+#include "Language.h"
 
 class BattleGround;
 
diff --git a/src/game/BattleGround/BattleGroundHandler.cpp b/src/game/BattleGround/BattleGroundHandler.cpp
index fe8ed2669..fbf612aef 100644
--- a/src/game/BattleGround/BattleGroundHandler.cpp
+++ b/src/game/BattleGround/BattleGroundHandler.cpp
@@ -17,22 +17,22 @@
  */
 
 #include "Common.h"
-#include "../SharedDefines.h"
+#include "SharedDefines.h"
 #include "WorldPacket.h"
-#include "../Opcodes.h"
+#include "Opcodes.h"
 #include "Log.h"
-#include "../Player.h"
-#include "../ObjectMgr.h"
-#include "../WorldSession.h"
-#include "../Object.h"
-#include "../Chat.h"
+#include "Player.h"
+#include "ObjectMgr.h"
+#include "WorldSession.h"
+#include "Object.h"
+#include "Chat.h"
 #include "BattleGroundMgr.h"
 #include "BattleGroundWS.h"
 #include "BattleGround.h"
-#include "../ArenaTeam.h"
-#include "../Language.h"
-#include "../ScriptMgr.h"
-#include "../World.h"
+#include "ArenaTeam.h"
+#include "Language.h"
+#include "ScriptMgr.h"
+#include "World.h"
 
 void WorldSession::HandleBattlemasterHelloOpcode(WorldPacket& recv_data)
 {
diff --git a/src/game/BattleGround/BattleGroundIC.cpp b/src/game/BattleGround/BattleGroundIC.cpp
index 182218f7e..b95b2e50a 100644
--- a/src/game/BattleGround/BattleGroundIC.cpp
+++ b/src/game/BattleGround/BattleGroundIC.cpp
@@ -16,10 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "../Player.h"
+#include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundIC.h"
-#include "../Language.h"
+#include "Language.h"
 
 BattleGroundIC::BattleGroundIC()
 {
diff --git a/src/game/BattleGround/BattleGroundMgr.cpp b/src/game/BattleGround/BattleGroundMgr.cpp
index e22013824..83a403743 100644
--- a/src/game/BattleGround/BattleGroundMgr.cpp
+++ b/src/game/BattleGround/BattleGroundMgr.cpp
@@ -17,8 +17,8 @@
  */
 
 #include "Common.h"
-#include "../SharedDefines.h"
-#include "../Player.h"
+#include "SharedDefines.h"
+#include "Player.h"
 #include "BattleGroundMgr.h"
 #include "BattleGroundAV.h"
 #include "BattleGroundAB.h"
@@ -33,15 +33,15 @@
 #include "BattleGroundRV.h"
 #include "BattleGroundIC.h"
 #include "BattleGroundRB.h"
-#include "../MapManager.h"
-#include "../Map.h"
-#include "../ObjectMgr.h"
+#include "MapManager.h"
+#include "Map.h"
+#include "ObjectMgr.h"
 #include "ProgressBar.h"
-#include "../Chat.h"
-#include "../ArenaTeam.h"
-#include "../World.h"
+#include "Chat.h"
+#include "ArenaTeam.h"
+#include "World.h"
 #include "WorldPacket.h"
-#include "../GameEventMgr.h"
+#include "GameEventMgr.h"
 
 #include "Policies/SingletonImp.h"
 
diff --git a/src/game/BattleGround/BattleGroundMgr.h b/src/game/BattleGround/BattleGroundMgr.h
index 83b27bf29..1d13bccdd 100644
--- a/src/game/BattleGround/BattleGroundMgr.h
+++ b/src/game/BattleGround/BattleGroundMgr.h
@@ -22,8 +22,8 @@
 #include "Common.h"
 #include "Policies/Singleton.h"
 #include "Utilities/EventProcessor.h"
-#include "../SharedDefines.h"
-#include "../DBCEnums.h"
+#include "SharedDefines.h"
+#include "DBCEnums.h"
 #include "BattleGround.h"
 #include "ace/Recursive_Thread_Mutex.h"
 
diff --git a/src/game/BattleGround/BattleGroundNA.cpp b/src/game/BattleGround/BattleGroundNA.cpp
index 132a8eb46..447fe9909 100644
--- a/src/game/BattleGround/BattleGroundNA.cpp
+++ b/src/game/BattleGround/BattleGroundNA.cpp
@@ -16,13 +16,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "../Object.h"
-#include "../Player.h"
+#include "Object.h"
+#include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundNA.h"
-#include "../ObjectMgr.h"
+#include "ObjectMgr.h"
 #include "WorldPacket.h"
-#include "../Language.h"
+#include "Language.h"
 
 BattleGroundNA::BattleGroundNA()
 {
diff --git a/src/game/BattleGround/BattleGroundRB.cpp b/src/game/BattleGround/BattleGroundRB.cpp
index d59c73e74..734d1eee8 100644
--- a/src/game/BattleGround/BattleGroundRB.cpp
+++ b/src/game/BattleGround/BattleGroundRB.cpp
@@ -16,10 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "../Player.h"
+#include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundRB.h"
-#include "../Language.h"
+#include "Language.h"
 
 BattleGroundRB::BattleGroundRB()
 {
diff --git a/src/game/BattleGround/BattleGroundRL.cpp b/src/game/BattleGround/BattleGroundRL.cpp
index c7487392c..f481b5870 100644
--- a/src/game/BattleGround/BattleGroundRL.cpp
+++ b/src/game/BattleGround/BattleGroundRL.cpp
@@ -16,12 +16,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "../Object.h"
-#include "../Player.h"
+#include "Object.h"
+#include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundRL.h"
-#include "../ObjectMgr.h"
-#include "../Language.h"
+#include "ObjectMgr.h"
+#include "Language.h"
 #include "WorldPacket.h"
 
 BattleGroundRL::BattleGroundRL()
diff --git a/src/game/BattleGround/BattleGroundRV.cpp b/src/game/BattleGround/BattleGroundRV.cpp
index 0302fdcc7..39e1d28fc 100644
--- a/src/game/BattleGround/BattleGroundRV.cpp
+++ b/src/game/BattleGround/BattleGroundRV.cpp
@@ -16,10 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "../Player.h"
+#include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundRV.h"
-#include "../Language.h"
+#include "Language.h"
 
 BattleGroundRV::BattleGroundRV()
 {
diff --git a/src/game/BattleGround/BattleGroundSA.cpp b/src/game/BattleGround/BattleGroundSA.cpp
index 2e7fd6b66..5321ecf01 100644
--- a/src/game/BattleGround/BattleGroundSA.cpp
+++ b/src/game/BattleGround/BattleGroundSA.cpp
@@ -16,10 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "../Player.h"
+#include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundSA.h"
-#include "../Language.h"
+#include "Language.h"
 
 BattleGroundSA::BattleGroundSA()
 {
diff --git a/src/game/BattleGround/BattleGroundWS.cpp b/src/game/BattleGround/BattleGroundWS.cpp
index 0698c1194..061a5486b 100644
--- a/src/game/BattleGround/BattleGroundWS.cpp
+++ b/src/game/BattleGround/BattleGroundWS.cpp
@@ -16,17 +16,17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "../Object.h"
-#include "../Player.h"
+#include "Object.h"
+#include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundWS.h"
-#include "../Creature.h"
-#include "../GameObject.h"
-#include "../ObjectMgr.h"
+#include "Creature.h"
+#include "GameObject.h"
+#include "ObjectMgr.h"
 #include "BattleGroundMgr.h"
 #include "WorldPacket.h"
-#include "../Language.h"
-#include "../MapManager.h"
+#include "Language.h"
+#include "MapManager.h"
 
 BattleGroundWS::BattleGroundWS()
 {
diff --git a/src/game/OutdoorPvP/OutdoorPvP.cpp b/src/game/OutdoorPvP/OutdoorPvP.cpp
index e33dbb1a7..908a14174 100644
--- a/src/game/OutdoorPvP/OutdoorPvP.cpp
+++ b/src/game/OutdoorPvP/OutdoorPvP.cpp
@@ -17,12 +17,12 @@
  */
 
 #include "OutdoorPvP.h"
-#include "../Language.h"
-#include "../World.h"
-#include "../ObjectMgr.h"
-#include "../Object.h"
-#include "../GameObject.h"
-#include "../Player.h"
+#include "Language.h"
+#include "World.h"
+#include "ObjectMgr.h"
+#include "Object.h"
+#include "GameObject.h"
+#include "Player.h"
 
 /**
    Function that adds a player to the players of the affected outdoor pvp zones
diff --git a/src/game/OutdoorPvP/OutdoorPvP.h b/src/game/OutdoorPvP/OutdoorPvP.h
index 61c031142..20b71fc26 100644
--- a/src/game/OutdoorPvP/OutdoorPvP.h
+++ b/src/game/OutdoorPvP/OutdoorPvP.h
@@ -20,8 +20,8 @@
 #define OUTDOOR_PVP_H
 
 #include "Common.h"
-#include "../ObjectGuid.h"
-#include "../SharedDefines.h"
+#include "ObjectGuid.h"
+#include "SharedDefines.h"
 #include "OutdoorPvPMgr.h"
 
 class WorldPacket;
diff --git a/src/game/OutdoorPvP/OutdoorPvPEP.cpp b/src/game/OutdoorPvP/OutdoorPvPEP.cpp
index 096bac329..b292ac941 100644
--- a/src/game/OutdoorPvP/OutdoorPvPEP.cpp
+++ b/src/game/OutdoorPvP/OutdoorPvPEP.cpp
@@ -18,12 +18,12 @@
 
 #include "OutdoorPvPEP.h"
 #include "WorldPacket.h"
-#include "../World.h"
-#include "../ObjectMgr.h"
-#include "../Object.h"
-#include "../Creature.h"
-#include "../GameObject.h"
-#include "../Player.h"
+#include "World.h"
+#include "ObjectMgr.h"
+#include "Object.h"
+#include "Creature.h"
+#include "GameObject.h"
+#include "Player.h"
 
 OutdoorPvPEP::OutdoorPvPEP() : OutdoorPvP(),
     m_towersAlliance(0),
diff --git a/src/game/OutdoorPvP/OutdoorPvPEP.h b/src/game/OutdoorPvP/OutdoorPvPEP.h
index e4c79e34b..8e39338fa 100644
--- a/src/game/OutdoorPvP/OutdoorPvPEP.h
+++ b/src/game/OutdoorPvP/OutdoorPvPEP.h
@@ -21,7 +21,7 @@
 
 #include "Common.h"
 #include "OutdoorPvP.h"
-#include "../Language.h"
+#include "Language.h"
 
 enum
 {
diff --git a/src/game/OutdoorPvP/OutdoorPvPGH.cpp b/src/game/OutdoorPvP/OutdoorPvPGH.cpp
index 0c49594d2..f7a696c11 100644
--- a/src/game/OutdoorPvP/OutdoorPvPGH.cpp
+++ b/src/game/OutdoorPvP/OutdoorPvPGH.cpp
@@ -17,10 +17,10 @@
  */
 
 #include "OutdoorPvPGH.h"
-#include "../Map.h"
-#include "../Object.h"
-#include "../Creature.h"
-#include "../GameObject.h"
+#include "Map.h"
+#include "Object.h"
+#include "Creature.h"
+#include "GameObject.h"
 
 OutdoorPvPGH::OutdoorPvPGH() : OutdoorPvP(),
     m_zoneOwner(TEAM_NONE)
diff --git a/src/game/OutdoorPvP/OutdoorPvPHP.cpp b/src/game/OutdoorPvP/OutdoorPvPHP.cpp
index 63f9d5cec..df4accea6 100644
--- a/src/game/OutdoorPvP/OutdoorPvPHP.cpp
+++ b/src/game/OutdoorPvP/OutdoorPvPHP.cpp
@@ -18,11 +18,11 @@
 
 #include "OutdoorPvPHP.h"
 #include "WorldPacket.h"
-#include "../World.h"
-#include "../Object.h"
-#include "../Creature.h"
-#include "../GameObject.h"
-#include "../Player.h"
+#include "World.h"
+#include "Object.h"
+#include "Creature.h"
+#include "GameObject.h"
+#include "Player.h"
 
 OutdoorPvPHP::OutdoorPvPHP() : OutdoorPvP(),
     m_towersAlliance(0),
diff --git a/src/game/OutdoorPvP/OutdoorPvPHP.h b/src/game/OutdoorPvP/OutdoorPvPHP.h
index 2a8cd481e..beafb01a4 100644
--- a/src/game/OutdoorPvP/OutdoorPvPHP.h
+++ b/src/game/OutdoorPvP/OutdoorPvPHP.h
@@ -21,7 +21,7 @@
 
 #include "Common.h"
 #include "OutdoorPvP.h"
-#include "../Language.h"
+#include "Language.h"
 
 enum
 {
diff --git a/src/game/OutdoorPvP/OutdoorPvPMgr.cpp b/src/game/OutdoorPvP/OutdoorPvPMgr.cpp
index 472e9155c..beaa48933 100644
--- a/src/game/OutdoorPvP/OutdoorPvPMgr.cpp
+++ b/src/game/OutdoorPvP/OutdoorPvPMgr.cpp
@@ -19,8 +19,8 @@
 #include "OutdoorPvPMgr.h"
 #include "Policies/SingletonImp.h"
 #include "OutdoorPvP.h"
-#include "../GameObject.h"
-#include "../World.h"
+#include "GameObject.h"
+#include "World.h"
 #include "Log.h"
 #include "OutdoorPvPEP.h"
 #include "OutdoorPvPGH.h"
diff --git a/src/game/OutdoorPvP/OutdoorPvPNA.cpp b/src/game/OutdoorPvP/OutdoorPvPNA.cpp
index 7b743d2f6..37bd32c7d 100644
--- a/src/game/OutdoorPvP/OutdoorPvPNA.cpp
+++ b/src/game/OutdoorPvP/OutdoorPvPNA.cpp
@@ -18,12 +18,12 @@
 
 #include "OutdoorPvPNA.h"
 #include "WorldPacket.h"
-#include "../World.h"
-#include "../ObjectMgr.h"
-#include "../Object.h"
-#include "../Creature.h"
-#include "../GameObject.h"
-#include "../Player.h"
+#include "World.h"
+#include "ObjectMgr.h"
+#include "Object.h"
+#include "Creature.h"
+#include "GameObject.h"
+#include "Player.h"
 
 OutdoorPvPNA::OutdoorPvPNA() : OutdoorPvP(),
     m_zoneOwner(TEAM_NONE),
diff --git a/src/game/OutdoorPvP/OutdoorPvPNA.h b/src/game/OutdoorPvP/OutdoorPvPNA.h
index c67dc74a8..2c7d734bf 100644
--- a/src/game/OutdoorPvP/OutdoorPvPNA.h
+++ b/src/game/OutdoorPvP/OutdoorPvPNA.h
@@ -21,7 +21,7 @@
 
 #include "Common.h"
 #include "OutdoorPvP.h"
-#include "../Language.h"
+#include "Language.h"
 
 enum
 {
diff --git a/src/game/OutdoorPvP/OutdoorPvPSI.cpp b/src/game/OutdoorPvP/OutdoorPvPSI.cpp
index 2f4e10801..f02e025db 100644
--- a/src/game/OutdoorPvP/OutdoorPvPSI.cpp
+++ b/src/game/OutdoorPvP/OutdoorPvPSI.cpp
@@ -18,12 +18,12 @@
 
 #include "OutdoorPvPSI.h"
 #include "WorldPacket.h"
-#include "../World.h"
-#include "../ObjectMgr.h"
-#include "../Object.h"
-#include "../Creature.h"
-#include "../GameObject.h"
-#include "../Player.h"
+#include "World.h"
+#include "ObjectMgr.h"
+#include "Object.h"
+#include "Creature.h"
+#include "GameObject.h"
+#include "Player.h"
 
 OutdoorPvPSI::OutdoorPvPSI() : OutdoorPvP(),
     m_resourcesAlliance(0),
diff --git a/src/game/OutdoorPvP/OutdoorPvPSI.h b/src/game/OutdoorPvP/OutdoorPvPSI.h
index 3ffbb7734..f1939720e 100644
--- a/src/game/OutdoorPvP/OutdoorPvPSI.h
+++ b/src/game/OutdoorPvP/OutdoorPvPSI.h
@@ -21,7 +21,7 @@
 
 #include "Common.h"
 #include "OutdoorPvP.h"
-#include "../Language.h"
+#include "Language.h"
 
 enum
 {
diff --git a/src/game/OutdoorPvP/OutdoorPvPTF.cpp b/src/game/OutdoorPvP/OutdoorPvPTF.cpp
index d28e490cf..2fef35538 100644
--- a/src/game/OutdoorPvP/OutdoorPvPTF.cpp
+++ b/src/game/OutdoorPvP/OutdoorPvPTF.cpp
@@ -18,12 +18,12 @@
 
 #include "OutdoorPvPTF.h"
 #include "WorldPacket.h"
-#include "../World.h"
-#include "../ObjectMgr.h"
-#include "../Object.h"
-#include "../Creature.h"
-#include "../GameObject.h"
-#include "../Player.h"
+#include "World.h"
+#include "ObjectMgr.h"
+#include "Object.h"
+#include "Creature.h"
+#include "GameObject.h"
+#include "Player.h"
 
 OutdoorPvPTF::OutdoorPvPTF() : OutdoorPvP(),
     m_zoneWorldState(WORLD_STATE_TF_TOWERS_CONTROLLED),
diff --git a/src/game/OutdoorPvP/OutdoorPvPTF.h b/src/game/OutdoorPvP/OutdoorPvPTF.h
index 164b36e23..451d9650a 100644
--- a/src/game/OutdoorPvP/OutdoorPvPTF.h
+++ b/src/game/OutdoorPvP/OutdoorPvPTF.h
@@ -21,7 +21,7 @@
 
 #include "Common.h"
 #include "OutdoorPvP.h"
-#include "../Language.h"
+#include "Language.h"
 
 enum
 {
diff --git a/src/game/OutdoorPvP/OutdoorPvPZM.cpp b/src/game/OutdoorPvP/OutdoorPvPZM.cpp
index 354676de4..5df47833b 100644
--- a/src/game/OutdoorPvP/OutdoorPvPZM.cpp
+++ b/src/game/OutdoorPvP/OutdoorPvPZM.cpp
@@ -18,12 +18,12 @@
 
 #include "OutdoorPvPZM.h"
 #include "WorldPacket.h"
-#include "../World.h"
-#include "../ObjectMgr.h"
-#include "../Object.h"
-#include "../Creature.h"
-#include "../GameObject.h"
-#include "../Player.h"
+#include "World.h"
+#include "ObjectMgr.h"
+#include "Object.h"
+#include "Creature.h"
+#include "GameObject.h"
+#include "Player.h"
 
 OutdoorPvPZM::OutdoorPvPZM() : OutdoorPvP(),
     m_graveyardOwner(TEAM_NONE),
diff --git a/src/game/OutdoorPvP/OutdoorPvPZM.h b/src/game/OutdoorPvP/OutdoorPvPZM.h
index d0e970ade..a9e74e140 100644
--- a/src/game/OutdoorPvP/OutdoorPvPZM.h
+++ b/src/game/OutdoorPvP/OutdoorPvPZM.h
@@ -21,7 +21,7 @@
 
 #include "Common.h"
 #include "OutdoorPvP.h"
-#include "../Language.h"
+#include "Language.h"
 
 enum
 {
diff --git a/src/game/movement/MoveSplineInit.cpp b/src/game/movement/MoveSplineInit.cpp
index d84ca4648..27c39a984 100644
--- a/src/game/movement/MoveSplineInit.cpp
+++ b/src/game/movement/MoveSplineInit.cpp
@@ -19,8 +19,8 @@
 #include "MoveSplineInit.h"
 #include "MoveSpline.h"
 #include "packet_builder.h"
-#include "../Unit.h"
-#include "../TransportSystem.h"
+#include "Unit.h"
+#include "TransportSystem.h"
 
 namespace Movement
 {
diff --git a/src/game/movement/MoveSplineInit.h b/src/game/movement/MoveSplineInit.h
index 3338960b8..664c50be7 100644
--- a/src/game/movement/MoveSplineInit.h
+++ b/src/game/movement/MoveSplineInit.h
@@ -20,7 +20,7 @@
 #define MANGOSSERVER_MOVESPLINEINIT_H
 
 #include "MoveSplineInitArgs.h"
-#include "../PathFinder.h"
+#include "PathFinder.h"
 
 class Unit;
 
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 1b0b0a87a..ef537aa87 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 "12130"
+ #define REVISION_NR "12131"
 #endif // __REVISION_NR_H__
diff --git a/win/VC100/game.vcxproj b/win/VC100/game.vcxproj
index a4c50eb1b..2a42e08ad 100644
--- a/win/VC100/game.vcxproj
+++ b/win/VC100/game.vcxproj
@@ -136,7 +136,7 @@
     <ClCompile>
       <AdditionalOptions>/Zm300 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -173,7 +173,7 @@
     <ClCompile>
       <AdditionalOptions>/bigobj /Zm300 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -207,7 +207,7 @@
     <ClCompile>
       <AdditionalOptions>/Zm300 %(AdditionalOptions)</AdditionalOptions>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -244,7 +244,7 @@
     <ClCompile>
       <AdditionalOptions>/bigobj /Zm300 %(AdditionalOptions)</AdditionalOptions>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -277,7 +277,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -313,7 +313,7 @@
     <ClCompile>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj
index fa115d952..2c05cb6bc 100644
--- a/win/VC90/game.vcproj
+++ b/win/VC90/game.vcproj
@@ -47,7 +47,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP /Zm200"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite"
+				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game"
 				PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;"
 				StringPooling="false"
 				MinimalRebuild="false"
@@ -130,7 +130,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP /bigobj /Zm200"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite"
+				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game"
 				PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;"
 				StringPooling="false"
 				MinimalRebuild="false"
@@ -213,7 +213,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP /Zm200"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite"
+				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -295,7 +295,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP /bigobj /Zm200"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite"
+				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -377,7 +377,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite"
+				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game"
 				PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;"
 				StringPooling="false"
 				MinimalRebuild="false"
@@ -458,7 +458,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP /bigobj"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite"
+				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game"
 				PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;"
 				StringPooling="false"
 				MinimalRebuild="false"