From bc04d7ce25b400d22fa95e5505e08916a49fb79f Mon Sep 17 00:00:00 2001
From: Brian <runningnak3d@gmail.com>
Date: Tue, 8 Jun 2010 17:01:03 -0600
Subject: [PATCH] * Remove the last of the realative paths from #include
 statements

--HG--
branch : trunk
---
 src/server/game/Movement/DestinationHolder.h              | 2 +-
 src/server/game/Movement/FollowerRefManager.h             | 2 +-
 src/server/game/Movement/FollowerReference.h              | 2 +-
 src/server/game/Movement/MovementGenerator.h              | 6 +++---
 .../MovementGenerators/WaypointMovementGenerator.h        | 4 ++--
 src/server/game/Movement/Waypoints/WaypointManager.cpp    | 2 +-
 src/server/game/OutdoorPvP/OutdoorPvP.h                   | 2 +-
 src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp              | 2 +-
 src/server/game/OutdoorPvP/OutdoorPvPMgr.h                | 2 +-
 src/server/game/Pools/PoolHandler.cpp                     | 4 ++--
 src/server/game/Pools/PoolHandler.h                       | 2 +-
 src/server/game/PrecompiledHeaders/NixCorePCH.h           | 8 ++++----
 src/server/game/PrecompiledHeaders/WinCorePCH.cpp         | 2 +-
 src/server/game/PrecompiledHeaders/WinCorePCH.h           | 2 +-
 src/server/game/Quests/QuestDef.h                         | 2 +-
 src/server/game/Scripting/ScriptMgr.cpp                   | 6 +++---
 src/server/game/Scripting/ScriptMgr.h                     | 2 +-
 src/server/game/Scripting/ScriptSystem.cpp                | 2 +-
 src/server/game/Server/Protocol/Handlers/AddonHandler.cpp | 4 ++--
 src/server/game/Server/Protocol/Handlers/AddonHandler.h   | 4 ++--
 .../game/Server/Protocol/Handlers/ArenaTeamHandler.cpp    | 2 +-
 .../game/Server/Protocol/Handlers/ChannelHandler.cpp      | 2 +-
 .../game/Server/Protocol/Handlers/CharacterHandler.cpp    | 4 ++--
 src/server/game/Server/Protocol/Handlers/ChatHandler.cpp  | 2 +-
 src/server/game/Server/Protocol/Handlers/GroupHandler.cpp | 2 +-
 src/server/game/Server/Protocol/Handlers/MiscHandler.cpp  | 4 ++--
 src/server/game/Server/Protocol/Handlers/NPCHandler.cpp   | 2 +-
 src/server/game/Server/Protocol/Handlers/QueryHandler.cpp | 6 +++---
 src/server/game/Server/Protocol/Handlers/SkillHandler.cpp | 2 +-
 src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp  | 2 +-
 src/server/game/Server/Protocol/WorldLog.cpp              | 4 ++--
 src/server/game/Server/Protocol/WorldLog.h                | 2 +-
 src/server/game/Server/WorldSession.cpp                   | 2 +-
 src/server/game/Server/WorldSocket.cpp                    | 2 +-
 src/server/game/Server/WorldSocket.h                      | 2 +-
 src/server/game/Server/WorldSocketMgr.cpp                 | 4 ++--
 src/server/game/Skills/SkillDiscovery.cpp                 | 4 ++--
 src/server/game/Skills/SkillExtraItems.cpp                | 2 +-
 src/server/game/Spells/Auras/SpellEffects.cpp             | 2 +-
 src/server/game/Spells/Spell.cpp                          | 4 ++--
 src/server/game/Tools/PlayerDump.cpp                      | 4 ++--
 src/server/game/World/TimeMgr.cpp                         | 2 +-
 src/server/game/World/TimeMgr.h                           | 2 +-
 src/server/game/World/World.cpp                           | 8 ++++----
 44 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/src/server/game/Movement/DestinationHolder.h b/src/server/game/Movement/DestinationHolder.h
index 7adf6f4cb1..c0ee668eb9 100644
--- a/src/server/game/Movement/DestinationHolder.h
+++ b/src/server/game/Movement/DestinationHolder.h
@@ -22,7 +22,7 @@
 #define TRINITY_DESTINATION_HOLDER_H
 
 #include "Define.h"
-#include "Utilities/Timer.h"
+#include "Timer.h"
 
 class WorldObject;
 class Map;
diff --git a/src/server/game/Movement/FollowerRefManager.h b/src/server/game/Movement/FollowerRefManager.h
index a0364e03db..e451cd4747 100644
--- a/src/server/game/Movement/FollowerRefManager.h
+++ b/src/server/game/Movement/FollowerRefManager.h
@@ -21,7 +21,7 @@
 #ifndef _FOLLOWERREFMANAGER
 #define _FOLLOWERREFMANAGER
 
-#include "Dynamic/LinkedReference/RefManager.h"
+#include "RefManager.h"
 
 class Unit;
 class TargetedMovementGeneratorBase;
diff --git a/src/server/game/Movement/FollowerReference.h b/src/server/game/Movement/FollowerReference.h
index db66ec4d02..72a6d4f463 100644
--- a/src/server/game/Movement/FollowerReference.h
+++ b/src/server/game/Movement/FollowerReference.h
@@ -21,7 +21,7 @@
 #ifndef _FOLLOWERREFERENCE_H
 #define _FOLLOWERREFERENCE_H
 
-#include "Dynamic/LinkedReference/Reference.h"
+#include "Reference.h"
 
 class TargetedMovementGeneratorBase;
 class Unit;
diff --git a/src/server/game/Movement/MovementGenerator.h b/src/server/game/Movement/MovementGenerator.h
index fa7291b860..650b4fc319 100644
--- a/src/server/game/Movement/MovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerator.h
@@ -22,9 +22,9 @@
 #define TRINITY_MOVEMENTGENERATOR_H
 
 #include "Define.h"
-#include "Policies/Singleton.h"
-#include "Dynamic/ObjectRegistry.h"
-#include "Dynamic/FactoryHolder.h"
+#include "Singleton.h"
+#include "ObjectRegistry.h"
+#include "FactoryHolder.h"
 #include "Common.h"
 #include "MotionMaster.h"
 
diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
index 9216aac5d0..4b74e80e16 100644
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
@@ -29,8 +29,8 @@
 
 #include "MovementGenerator.h"
 #include "DestinationHolder.h"
-#include "Movement/Waypoints/WaypointManager.h"
-#include "Movement/Waypoints/Path.h"
+#include "WaypointManager.h"
+#include "Path.h"
 #include "Traveller.h"
 
 #include "Player.h"
diff --git a/src/server/game/Movement/Waypoints/WaypointManager.cpp b/src/server/game/Movement/Waypoints/WaypointManager.cpp
index 0cbdd0bf97..078d272f62 100644
--- a/src/server/game/Movement/Waypoints/WaypointManager.cpp
+++ b/src/server/game/Movement/Waypoints/WaypointManager.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "GridDefines.h"
 #include "WaypointManager.h"
 #include "ProgressBar.h"
diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.h b/src/server/game/OutdoorPvP/OutdoorPvP.h
index 4f8d32c938..8aa19ef94d 100644
--- a/src/server/game/OutdoorPvP/OutdoorPvP.h
+++ b/src/server/game/OutdoorPvP/OutdoorPvP.h
@@ -20,7 +20,7 @@
 #define OUTDOOR_PVP_H_
 
 #include "Utilities/Util.h"
-#include "Miscellaneous/SharedDefines.h"
+#include "SharedDefines.h"
 #include "ZoneScript.h"
 
 class GameObject;
diff --git a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
index 4a0baf49a0..f9dbedb30d 100644
--- a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
+++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
@@ -25,7 +25,7 @@
 #include "OutdoorPvPEP.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 
 INSTANTIATE_SINGLETON_1(OutdoorPvPMgr);
 
diff --git a/src/server/game/OutdoorPvP/OutdoorPvPMgr.h b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h
index 1e314bfd16..a78583100e 100644
--- a/src/server/game/OutdoorPvP/OutdoorPvPMgr.h
+++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h
@@ -22,7 +22,7 @@
 #define OUTDOORPVP_OBJECTIVE_UPDATE_INTERVAL 1000
 
 #include "OutdoorPvP.h"
-#include "Policies/Singleton.h"
+#include "Singleton.h"
 
 class Player;
 class GameObject;
diff --git a/src/server/game/Pools/PoolHandler.cpp b/src/server/game/Pools/PoolHandler.cpp
index 0b5a55623e..0105b5870e 100644
--- a/src/server/game/Pools/PoolHandler.cpp
+++ b/src/server/game/Pools/PoolHandler.cpp
@@ -21,7 +21,7 @@
 #include "ProgressBar.h"
 #include "Log.h"
 #include "MapManager.h"
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 
 INSTANTIATE_SINGLETON_1(PoolHandler);
 
@@ -750,4 +750,4 @@ void PoolHandler::UpdatePool(uint16 pool_id, uint32 db_guid_or_pool_id)
 
 template void PoolHandler::UpdatePool<Pool>(uint16 pool_id, uint32 db_guid_or_pool_id);
 template void PoolHandler::UpdatePool<GameObject>(uint16 pool_id, uint32 db_guid_or_pool_id);
-template void PoolHandler::UpdatePool<Creature>(uint16 pool_id, uint32 db_guid_or_pool_id);
\ No newline at end of file
+template void PoolHandler::UpdatePool<Creature>(uint16 pool_id, uint32 db_guid_or_pool_id);
diff --git a/src/server/game/Pools/PoolHandler.h b/src/server/game/Pools/PoolHandler.h
index 7263eb7a7f..df62badd9c 100644
--- a/src/server/game/Pools/PoolHandler.h
+++ b/src/server/game/Pools/PoolHandler.h
@@ -20,7 +20,7 @@
 #define TRINITY_POOLHANDLER_H
 
 #include "Define.h"
-#include "Policies/Singleton.h"
+#include "Singleton.h"
 #include "Creature.h"
 #include "GameObject.h"
 
diff --git a/src/server/game/PrecompiledHeaders/NixCorePCH.h b/src/server/game/PrecompiledHeaders/NixCorePCH.h
index 3587d27013..dd56e3fc16 100644
--- a/src/server/game/PrecompiledHeaders/NixCorePCH.h
+++ b/src/server/game/PrecompiledHeaders/NixCorePCH.h
@@ -1,12 +1,12 @@
 //add here most rarely modified headers to speed up debug build compilation
-#include "Server/WorldSocket.h"                                    // must be first to make ACE happy with ACE includes in it
+#include "WorldSocket.h"                                    // must be first to make ACE happy with ACE includes in it
 #include "Common.h"
 
 #include "MapManager.h"
 #include "Logging/Log.h"
 #include "ObjectAccessor.h"
 #include "ObjectDefines.h"
-#include "Database/SQLStorage.h"
-#include "Server/Protocol/Opcodes.h"
-#include "Miscellaneous/SharedDefines.h"
+#include "SQLStorage.h"
+#include "Opcodes.h"
+#include "SharedDefines.h"
 #include "ObjectMgr.h"
diff --git a/src/server/game/PrecompiledHeaders/WinCorePCH.cpp b/src/server/game/PrecompiledHeaders/WinCorePCH.cpp
index e588392689..240d73fa2c 100644
--- a/src/server/game/PrecompiledHeaders/WinCorePCH.cpp
+++ b/src/server/game/PrecompiledHeaders/WinCorePCH.cpp
@@ -1 +1 @@
-#include "pchdef.h"
\ No newline at end of file
+#include "WinCorePCH.h"
diff --git a/src/server/game/PrecompiledHeaders/WinCorePCH.h b/src/server/game/PrecompiledHeaders/WinCorePCH.h
index 0757b07438..09b5de6d67 100644
--- a/src/server/game/PrecompiledHeaders/WinCorePCH.h
+++ b/src/server/game/PrecompiledHeaders/WinCorePCH.h
@@ -6,7 +6,7 @@
 #include "Log.h"
 #include "ObjectAccessor.h"
 #include "ObjectDefines.h"
-#include "Database/SQLStorage.h"
+#include "SQLStorage.h"
 #include "Opcodes.h"
 #include "SharedDefines.h"
 #include "ObjectMgr.h"
diff --git a/src/server/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h
index 8da1f822b4..5318f685cf 100644
--- a/src/server/game/Quests/QuestDef.h
+++ b/src/server/game/Quests/QuestDef.h
@@ -22,7 +22,7 @@
 #define TRINITYCORE_QUEST_H
 
 #include "Define.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 
 #include <string>
 #include <vector>
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index 3c506f9a90..8e52e1ce43 100644
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -3,14 +3,14 @@
  * Please see the included DOCS/LICENSE.TXT for more information */
 
 #include "ScriptPCH.h"
-#include "Configuration/Config.h"
-#include "Database/DatabaseEnv.h"
+#include "Config.h"
+#include "DatabaseEnv.h"
 #include "DBCStores.h"
 #include "ObjectMgr.h"
 #include "ProgressBar.h"
 #include "ScriptLoader.h"
 #include "ScriptSystem.h"
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 
 INSTANTIATE_SINGLETON_1(ScriptMgr);
 
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index 1814148e5e..250bbf5526 100644
--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -11,7 +11,7 @@
 #include "Common.h"
 #include "CompilerDefs.h"
 #include "DBCStructure.h"
-#include "Configuration/ConfigEnv.h"
+#include "ConfigEnv.h"
 
 class Player;
 class Creature;
diff --git a/src/server/game/Scripting/ScriptSystem.cpp b/src/server/game/Scripting/ScriptSystem.cpp
index 9c25475aa4..fcd5c81add 100644
--- a/src/server/game/Scripting/ScriptSystem.cpp
+++ b/src/server/game/Scripting/ScriptSystem.cpp
@@ -22,7 +22,7 @@
 #include "ScriptSystem.h"
 #include "ProgressBar.h"
 #include "ObjectMgr.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 
 SystemMgr::SystemMgr()
 {
diff --git a/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp b/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp
index ee2efcaffb..b54c119270 100644
--- a/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp
@@ -21,8 +21,8 @@
 #include "zlib.h"
 
 #include "AddonHandler.h"
-#include "Database/DatabaseEnv.h"
-#include "Policies/SingletonImp.h"
+#include "DatabaseEnv.h"
+#include "SingletonImp.h"
 #include "Opcodes.h"
 
 #include "Log.h"
diff --git a/src/server/game/Server/Protocol/Handlers/AddonHandler.h b/src/server/game/Server/Protocol/Handlers/AddonHandler.h
index 956b603017..2c9394c947 100644
--- a/src/server/game/Server/Protocol/Handlers/AddonHandler.h
+++ b/src/server/game/Server/Protocol/Handlers/AddonHandler.h
@@ -22,8 +22,8 @@
 #define __ADDONHANDLER_H
 
 #include "Common.h"
-#include "Configuration/ConfigEnv.h"
-#include "Policies/Singleton.h"
+#include "ConfigEnv.h"
+#include "Singleton.h"
 
 #include "WorldPacket.h"
 
diff --git a/src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp b/src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp
index 3a9a14524f..1d93090d25 100644
--- a/src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp
@@ -22,7 +22,7 @@
 #include "World.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 
 #include "ArenaTeam.h"
 #include "Log.h"
diff --git a/src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp b/src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp
index 0f615579cb..73f01f46c4 100644
--- a/src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 
 #include "ObjectMgr.h"                                      // for normalizePlayerName
 #include "ChannelMgr.h"
diff --git a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
index e57a5295df..141f3605ee 100644
--- a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
@@ -26,8 +26,8 @@
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "MD5.h"
-#include "Database/DatabaseEnv.h"
-#include "Database/DatabaseImpl.h"
+#include "DatabaseEnv.h"
+#include "DatabaseImpl.h"
 
 #include "ArenaTeam.h"
 #include "Chat.h"
diff --git a/src/server/game/Server/Protocol/Handlers/ChatHandler.cpp b/src/server/game/Server/Protocol/Handlers/ChatHandler.cpp
index 88e2b5473a..85f37b5247 100644
--- a/src/server/game/Server/Protocol/Handlers/ChatHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/ChatHandler.cpp
@@ -24,7 +24,7 @@
 #include "World.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 
 #include "CellImpl.h"
 #include "Chat.h"
diff --git a/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp b/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp
index f973bc2472..29178465ec 100644
--- a/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "Opcodes.h"
 #include "Log.h"
 #include "WorldPacket.h"
diff --git a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
index f1ec828447..378a817137 100644
--- a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
@@ -20,8 +20,8 @@
 
 #include "Common.h"
 #include "Language.h"
-#include "Database/DatabaseEnv.h"
-#include "Database/DatabaseImpl.h"
+#include "DatabaseEnv.h"
+#include "DatabaseImpl.h"
 #include "WorldPacket.h"
 #include "Opcodes.h"
 #include "Log.h"
diff --git a/src/server/game/Server/Protocol/Handlers/NPCHandler.cpp b/src/server/game/Server/Protocol/Handlers/NPCHandler.cpp
index 4e73fb381a..00da860db8 100644
--- a/src/server/game/Server/Protocol/Handlers/NPCHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/NPCHandler.cpp
@@ -20,7 +20,7 @@
 
 #include "Common.h"
 #include "Language.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "Opcodes.h"
diff --git a/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp b/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp
index 1067ad49bc..05cbcf81f2 100644
--- a/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp
@@ -20,8 +20,8 @@
 
 #include "Common.h"
 #include "Language.h"
-#include "Database/DatabaseEnv.h"
-#include "Database/DatabaseImpl.h"
+#include "DatabaseEnv.h"
+#include "DatabaseImpl.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "Opcodes.h"
@@ -536,4 +536,4 @@ void WorldSession::HandleQuestPOIQuery(WorldPacket& recv_data)
     }
 
     SendPacket(&data);
-}
\ No newline at end of file
+}
diff --git a/src/server/game/Server/Protocol/Handlers/SkillHandler.cpp b/src/server/game/Server/Protocol/Handlers/SkillHandler.cpp
index 312065f9f1..e6ad7a4c9e 100644
--- a/src/server/game/Server/Protocol/Handlers/SkillHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/SkillHandler.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "Opcodes.h"
 #include "Log.h"
 #include "Player.h"
diff --git a/src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp b/src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp
index b0660527f7..d2a7976c7a 100644
--- a/src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "Opcodes.h"
diff --git a/src/server/game/Server/Protocol/WorldLog.cpp b/src/server/game/Server/Protocol/WorldLog.cpp
index 6cccb27ae8..a9000f8e65 100644
--- a/src/server/game/Server/Protocol/WorldLog.cpp
+++ b/src/server/game/Server/Protocol/WorldLog.cpp
@@ -23,8 +23,8 @@
 */
 
 #include "WorldLog.h"
-#include "Policies/SingletonImp.h"
-#include "Configuration/ConfigEnv.h"
+#include "SingletonImp.h"
+#include "ConfigEnv.h"
 #include "Log.h"
 
 #define CLASS_LOCK Trinity::ClassLevelLockable<WorldLog, ACE_Thread_Mutex>
diff --git a/src/server/game/Server/Protocol/WorldLog.h b/src/server/game/Server/Protocol/WorldLog.h
index 4ee9bb178e..8a3c96b3b1 100644
--- a/src/server/game/Server/Protocol/WorldLog.h
+++ b/src/server/game/Server/Protocol/WorldLog.h
@@ -26,7 +26,7 @@
 #define TRINITY_WORLDLOG_H
 
 #include "Common.h"
-#include "Policies/Singleton.h"
+#include "Singleton.h"
 #include "Errors.h"
 
 #include <stdarg.h>
diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp
index 97c54c1f37..a464e37ec6 100644
--- a/src/server/game/Server/WorldSession.cpp
+++ b/src/server/game/Server/WorldSession.cpp
@@ -24,7 +24,7 @@
 
 #include "WorldSocket.h"                                    // must be first to make ACE happy with ACE includes in it
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "Log.h"
 #include "Opcodes.h"
 #include "WorldPacket.h"
diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp
index b792ad2faf..0b76eb9b41 100644
--- a/src/server/game/Server/WorldSocket.cpp
+++ b/src/server/game/Server/WorldSocket.cpp
@@ -38,7 +38,7 @@
 #include "SharedDefines.h"
 #include "ByteBuffer.h"
 #include "Opcodes.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "BigNumber.h"
 #include "SHA1.h"
 #include "WorldSession.h"
diff --git a/src/server/game/Server/WorldSocket.h b/src/server/game/Server/WorldSocket.h
index 61158799be..d07e9a3f2e 100644
--- a/src/server/game/Server/WorldSocket.h
+++ b/src/server/game/Server/WorldSocket.h
@@ -43,7 +43,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "Common.h"
-#include "Cryptography/Authentication/AuthCrypt.h"
+#include "AuthCrypt.h"
 
 class ACE_Message_Block;
 class WorldPacket;
diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp
index f7bb3949ee..0996d873ff 100644
--- a/src/server/game/Server/WorldSocketMgr.cpp
+++ b/src/server/game/Server/WorldSocketMgr.cpp
@@ -42,8 +42,8 @@
 
 #include "Log.h"
 #include "Common.h"
-#include "Configuration/ConfigEnv.h"
-#include "Database/DatabaseEnv.h"
+#include "ConfigEnv.h"
+#include "DatabaseEnv.h"
 #include "WorldSocket.h"
 
 /**
diff --git a/src/server/game/Skills/SkillDiscovery.cpp b/src/server/game/Skills/SkillDiscovery.cpp
index 163f7a2bf7..f0bfb5bc0b 100644
--- a/src/server/game/Skills/SkillDiscovery.cpp
+++ b/src/server/game/Skills/SkillDiscovery.cpp
@@ -18,10 +18,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "Log.h"
 #include "ProgressBar.h"
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 #include "World.h"
 #include "Util.h"
 #include "SkillDiscovery.h"
diff --git a/src/server/game/Skills/SkillExtraItems.cpp b/src/server/game/Skills/SkillExtraItems.cpp
index cc50d3683f..982556c055 100644
--- a/src/server/game/Skills/SkillExtraItems.cpp
+++ b/src/server/game/Skills/SkillExtraItems.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "SkillExtraItems.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "Log.h"
 #include "ProgressBar.h"
 #include "Player.h"
diff --git a/src/server/game/Spells/Auras/SpellEffects.cpp b/src/server/game/Spells/Auras/SpellEffects.cpp
index 6d224af30e..ef046531f1 100644
--- a/src/server/game/Spells/Auras/SpellEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellEffects.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "WorldPacket.h"
 #include "Opcodes.h"
 #include "Log.h"
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 5016e5ebc2..f5c105fa9b 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "GridNotifiers.h"
@@ -41,7 +41,7 @@
 #include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "CellImpl.h"
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 #include "SharedDefines.h"
 #include "LootMgr.h"
 #include "VMapFactory.h"
diff --git a/src/server/game/Tools/PlayerDump.cpp b/src/server/game/Tools/PlayerDump.cpp
index 8ebcbce50c..964e7f9b3b 100644
--- a/src/server/game/Tools/PlayerDump.cpp
+++ b/src/server/game/Tools/PlayerDump.cpp
@@ -20,8 +20,8 @@
 
 #include "Common.h"
 #include "PlayerDump.h"
-#include "Database/DatabaseEnv.h"
-#include "Database/SQLStorage.h"
+#include "DatabaseEnv.h"
+#include "SQLStorage.h"
 #include "UpdateFields.h"
 #include "ObjectMgr.h"
 
diff --git a/src/server/game/World/TimeMgr.cpp b/src/server/game/World/TimeMgr.cpp
index 42ecc77bbf..00152280aa 100644
--- a/src/server/game/World/TimeMgr.cpp
+++ b/src/server/game/World/TimeMgr.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "TimeMgr.h"
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 
 INSTANTIATE_SINGLETON_1(GameTime);
 
diff --git a/src/server/game/World/TimeMgr.h b/src/server/game/World/TimeMgr.h
index 5776bb1151..4a8cac9035 100644
--- a/src/server/game/World/TimeMgr.h
+++ b/src/server/game/World/TimeMgr.h
@@ -20,7 +20,7 @@
 #define _TIMEMGR_H
 
 #include "Timer.h"
-#include "Policies/Singleton.h"
+#include "Singleton.h"
 
 struct IntervalTimer
 {
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 30cedf28b4..1a14f39500 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -23,8 +23,8 @@
 */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
-#include "Configuration/ConfigEnv.h"
+#include "DatabaseEnv.h"
+#include "ConfigEnv.h"
 #include "SystemConfig.h"
 #include "Log.h"
 #include "Opcodes.h"
@@ -48,7 +48,7 @@
 #include "ItemEnchantmentMgr.h"
 #include "MapManager.h"
 #include "CreatureAIRegistry.h"
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 #include "BattleGroundMgr.h"
 #include "OutdoorPvPMgr.h"
 #include "TemporarySummon.h"
@@ -58,7 +58,7 @@
 #include "GlobalEvents.h"
 #include "GameEventMgr.h"
 #include "PoolHandler.h"
-#include "Database/DatabaseImpl.h"
+#include "DatabaseImpl.h"
 #include "GridNotifiersImpl.h"
 #include "CellImpl.h"
 #include "InstanceSaveMgr.h"