diff --git a/src/world/pchWorld.hpp b/src/world/pchWorld.hpp
index 14da687b1..563c99932 100644
--- a/src/world/pchWorld.hpp
+++ b/src/world/pchWorld.hpp
@@ -33,20 +33,57 @@ This file is released under the MIT license. See README-MIT for more information
 #include <GameObjectModel.h>
 #include <Cryptography/LogonCommDefines.h>
 #include <WorldConf.h>
+#include <Chat/Channel.hpp>
+#include <Chat/ChannelDefines.hpp>
+#include <Chat/ChannelMgr.hpp>
+#include <Chat/ChatCommand.hpp>
 #include <Chat/ChatDefines.hpp>
 #include <Chat/CommandTableStorage.hpp>
 #include <Chat/ChatHandler.hpp>
+#include <Macros/AIInterfaceMacros.hpp>
+#include <Macros/CreatureMacros.hpp>
+#include <Macros/GuildMacros.hpp>
+#include <Macros/ItemMacros.hpp>
+#include <Macros/LFGMacros.hpp>
+#include <Macros/LootMacros.hpp>
+#include <Macros/MapsMacros.hpp>
+#include <Macros/PetMacros.hpp>
+#include <Macros/PlayerMacros.hpp>
 #include <Macros/ScriptMacros.hpp>
+#include <Macros/UnitMacros.hpp>
 #include <Management/Faction.h>
 #include <Management/ItemInterface.h>
+#include <Management/ObjectMgr.h>
 #include <Management/QuestLogEntry.hpp>
+#include <Map/Area/AreaManagementGlobals.hpp>
 #include <Map/Area/AreaStorage.hpp>
+#include <Map/Cells/CellHandler.hpp>
+#include <Map/Cells/CellHandlerDefines.hpp>
+#include <Map/Cells/TerrainMgr.hpp>
+#include <Map/Management/MapManagementGlobals.hpp>
 #include <Map/Management/MapMgr.hpp>
-#include <Movement/Spline/Spline.h>
-#include <Movement/Spline/SplineImpl.h>
+#include <Map/Management/MapMgrDefines.hpp>
+#include <Map/Maps/BaseMap.hpp>
+#include <Map/Maps/BattleGroundMap.hpp>
+#include <Map/Maps/InstanceDefines.hpp>
+#include <Map/Maps/InstanceMap.hpp>
+#include <Map/Maps/InstanceMgr.hpp>
+#include <Map/Maps/MapScriptInterface.h>
+#include <Map/Maps/WorldMap.hpp>
+#include <Movement/Spline/MovementPacketBuilder.h>
+#include <Movement/Spline/MovementTypedefs.h>
 #include <Movement/Spline/MoveSpline.h>
+#include <Movement/Spline/MoveSplineFlag.h>
 #include <Movement/Spline/MoveSplineInit.h>
+#include <Movement/Spline/MoveSplineInitArgs.h>
+#include <Movement/Spline/Spline.h>
+#include <Movement/Spline/SplineChain.h>
+#include <Movement/Spline/SplineImpl.h>
+#include <Movement/MovementDefines.h>
+#include <Movement/WaypointDefines.h>
 #include <Objects/GameObject.h>
+#include <Objects/GameObjectDefines.hpp>
+#include <Objects/GameObjectProperties.hpp>
 #include <Objects/Item.hpp>
 #include <Objects/ItemDefines.hpp>
 #include <Objects/MovementDefines.hpp>
@@ -60,23 +97,25 @@ This file is released under the MIT license. See README-MIT for more information
 #include <Objects/Units/UnitDefines.hpp>
 #include <Server/Definitions.h>
 #include <Server/EventableObject.h>
-#include <Server/LogonCommClient/LogonCommHandler.h>
-#include <Server/LogonCommClient/LogonCommClient.h>
 #include <Server/Opcodes.hpp>
-#include <Server/Packets/SmsgMessageChat.h>
-#include <Server/Script/ScriptMgr.h>
+#include <Server/Serverstate.h>
 #include <Server/WorldConfig.h>
 #include <Server/WorldSession.h>
 #include <Server/WorldSocket.h>
+#include <Server/LogonCommClient/LogonCommHandler.h>
+#include <Server/LogonCommClient/LogonCommClient.h>
+#include <Server/Packets/SmsgMessageChat.h>
+#include <Server/Script/ScriptMgr.h>
 #include <Spell/Definitions/SpellEffects.hpp>
 #include <Spell/Spell.h>
 #include <Spell/SpellAuras.h>
+#include <Spell/SpellCastTargets.hpp>
+#include <Spell/SpellDefines.hpp>
 #include <Spell/SpellInfo.hpp>
 #include <Spell/SpellMgr.hpp>
 #include <Spell/SpellProc.hpp>
 #include <Spell/SpellScript.hpp>
 #include <Spell/SpellTarget.h>
 #include <Storage/MySQLDataStore.hpp>
-#include <Objects/Units/Players/Player.hpp>
-#include <Objects/Units/Unit.hpp>
-#include <Management/ObjectMgr.h>
+#include <Storage/MySQLStructures.h>
+#include <Storage/WorldStrings.h>