Core: Header cleanup in game/*/*.cpp

src/server/game/AI/CoreAI/GuardAI.cpp

@@ -19,9 +19,6 @@
 #include "GuardAI.h"
 #include "Errors.h"
 #include "Player.h"
-#include "ObjectAccessor.h"
-#include "World.h"
-#include "CreatureAIImpl.h"
 
 int GuardAI::Permissible(Creature const* creature)
 {

src/server/game/AI/CoreAI/PassiveAI.cpp

@@ -18,7 +18,6 @@
 
 #include "PassiveAI.h"
 #include "Creature.h"
-#include "TemporarySummon.h"
 
 PassiveAI::PassiveAI(Creature* c) : CreatureAI(c) { me->SetReactState(REACT_PASSIVE); }
 PossessedAI::PossessedAI(Creature* c) : CreatureAI(c) { me->SetReactState(REACT_PASSIVE); }

src/server/game/AI/CoreAI/PetAI.cpp

@@ -20,12 +20,10 @@
 #include "Errors.h"
 #include "Pet.h"
 #include "Player.h"
-#include "DBCStores.h"
 #include "Spell.h"
 #include "ObjectAccessor.h"
 #include "SpellMgr.h"
 #include "Creature.h"
-#include "World.h"
 #include "Util.h"
 #include "Group.h"
 #include "SpellInfo.h"

src/server/game/AI/CoreAI/ReactorAI.cpp

@@ -18,10 +18,6 @@
 
 #include "ByteBuffer.h"
 #include "ReactorAI.h"
-#include "Errors.h"
-#include "Log.h"
-#include "ObjectAccessor.h"
-#include "CreatureAIImpl.h"
 
 int ReactorAI::Permissible(const Creature* creature)
 {

src/server/game/AI/CoreAI/TotemAI.cpp

@@ -19,10 +19,8 @@
 #include "TotemAI.h"
 #include "Totem.h"
 #include "Creature.h"
-#include "DBCStores.h"
 #include "ObjectAccessor.h"
 #include "SpellMgr.h"
-
 #include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
 #include "CellImpl.h"

src/server/game/AI/CreatureAISelector.cpp

@@ -21,7 +21,6 @@
 #include "PassiveAI.h"
 
 #include "MovementGenerator.h"
-#include "Pet.h"
 #include "TemporarySummon.h"
 #include "CreatureAIFactory.h"
 #include "ScriptMgr.h"

src/server/game/AI/ScriptedAI/ScriptedCreature.cpp

@@ -17,14 +17,12 @@
  */
 
 #include "ScriptedCreature.h"
-#include "Item.h"
 #include "Spell.h"
 #include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
 #include "Cell.h"
 #include "CellImpl.h"
 #include "ObjectMgr.h"
-#include "TemporarySummon.h"
 
 // Spell summary for ScriptedAI::SelectSpell
 struct TSpellSummary

src/server/game/AI/SmartScripts/SmartAI.cpp

@@ -21,11 +21,7 @@
 #include "GridDefines.h"
 #include "GridNotifiers.h"
 #include "SpellMgr.h"
-#include "GridNotifiersImpl.h"
 #include "Cell.h"
-#include "CellImpl.h"
-#include "InstanceScript.h"
-#include "ScriptedCreature.h"
 #include "Group.h"
 #include "SmartAI.h"
 #include "ScriptMgr.h"

src/server/game/AI/SmartScripts/SmartScript.cpp

@@ -35,7 +35,6 @@
 #include "SmartScript.h"
 #include "SpellMgr.h"
 #include "Vehicle.h"
-#include "MoveSplineInit.h"
 #include "GameEventMgr.h"
 
 SmartScript::SmartScript()

src/server/game/AI/SmartScripts/SmartScriptMgr.cpp

@@ -21,14 +21,9 @@
 #include "GridDefines.h"
 #include "GridNotifiers.h"
 #include "SpellMgr.h"
-#include "GridNotifiersImpl.h"
 #include "Cell.h"
-#include "CellImpl.h"
-#include "InstanceScript.h"
-#include "ScriptedCreature.h"
 #include "GameEventMgr.h"
 #include "CreatureTextMgr.h"
-#include "SpellMgr.h"
 #include "SpellInfo.h"
 
 #include "SmartScriptMgr.h"

src/server/game/Battlefield/BattlefieldMgr.cpp

@@ -17,7 +17,6 @@
 
 #include "BattlefieldMgr.h"
 #include "BattlefieldWG.h"
-#include "ObjectMgr.h"
 #include "Player.h"
 
 BattlefieldMgr::BattlefieldMgr()

src/server/game/Battlegrounds/ArenaTeamMgr.cpp

@@ -20,8 +20,6 @@
 #include "World.h"
 #include "Log.h"
 #include "DatabaseEnv.h"
-#include "Language.h"
-#include "ObjectAccessor.h"
 #include "Player.h"
 
 ArenaTeamMgr::ArenaTeamMgr()

src/server/game/Battlegrounds/Battleground.cpp

@@ -22,18 +22,15 @@
 #include "BattlegroundScore.h"
 #include "Creature.h"
 #include "CreatureTextMgr.h"
-#include "Chat.h"
 #include "Formulas.h"
 #include "GridNotifiersImpl.h"
 #include "Group.h"
 #include "GuildMgr.h"
 #include "Guild.h"
-#include "MapManager.h"
 #include "Object.h"
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "ReputationMgr.h"
-#include "SpellAuraEffects.h"
 #include "SpellAuras.h"
 #include "Util.h"
 #include "WorldPacket.h"

src/server/game/Battlegrounds/BattlegroundMgr.cpp

@@ -18,11 +18,9 @@
 
 #include "Common.h"
 #include "ObjectMgr.h"
-#include "ArenaTeamMgr.h"
 #include "World.h"
 #include "WorldPacket.h"
 
-#include "ArenaTeam.h"
 #include "BattlegroundMgr.h"
 #include "BattlegroundAV.h"
 #include "BattlegroundAB.h"
@@ -37,17 +35,14 @@
 #include "BattlegroundIC.h"
 #include "BattlegroundTP.h"
 #include "BattlegroundBFG.h"
-#include "Chat.h"
 #include "Map.h"
 #include "MapInstanced.h"
 #include "MapManager.h"
 #include "Player.h"
 #include "GameEventMgr.h"
 #include "SharedDefines.h"
-#include "Formulas.h"
 #include "DisableMgr.h"
 #include "Opcodes.h"
-#include "MiscPackets.h"
 
 /*********************************************************/
 /***            BATTLEGROUND MANAGER                   ***/

src/server/game/Battlegrounds/BattlegroundQueue.cpp

@@ -24,7 +24,6 @@
 #include "Group.h"
 #include "Log.h"
 #include "Language.h"
-#include "ObjectMgr.h"
 #include "Player.h"
 
 /*********************************************************/

src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp

@@ -17,9 +17,7 @@
  */
 
 #include "BattlegroundAB.h"
-#include "World.h"
 #include "WorldPacket.h"
-#include "ObjectMgr.h"
 #include "BattlegroundMgr.h"
 #include "Creature.h"
 #include "Language.h"

src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp

@@ -21,12 +21,10 @@
 #include "ObjectMgr.h"
 #include "WorldPacket.h"
 
-#include "Formulas.h"
 #include "GameObject.h"
 #include "Language.h"
 #include "Player.h"
 #include "ScriptedCreature.h"
-#include "SpellAuras.h"
 #include "WorldSession.h"
 
 BattlegroundAV::BattlegroundAV()

src/server/game/Battlegrounds/Zones/BattlegroundBFG.cpp

@@ -15,17 +15,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Battleground.h"
 #include "BattlegroundBFG.h"
-#include "Creature.h"
-#include "GameObject.h"
-#include "Language.h"
-#include "Object.h"
-#include "ObjectMgr.h"
-#include "BattlegroundMgr.h"
-#include "Player.h"
-#include "World.h"
-#include "WorldPacket.h"
 
 BattlegroundBFG::BattlegroundBFG()
 {

src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp

@@ -18,7 +18,6 @@
 
 #include "BattlegroundDS.h"
 #include "Creature.h"
-#include "GameObject.h"
 #include "Player.h"
 #include "WorldPacket.h"
 

src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp

@@ -17,8 +17,6 @@
  */
 
 #include "BattlegroundEY.h"
-#include "ObjectMgr.h"
-#include "World.h"
 #include "WorldPacket.h"
 #include "BattlegroundMgr.h"
 #include "Creature.h"

src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp

@@ -25,7 +25,6 @@
 #include "ObjectMgr.h"
 #include "Vehicle.h"
 #include "Transport.h"
-#include "WorldSession.h"
 #include "ScriptedCreature.h"
 
 BattlegroundIC::BattlegroundIC()

src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp

@@ -23,7 +23,6 @@
 #include "Player.h"
 #include "ScriptedCreature.h"
 #include "WorldPacket.h"
-#include "WorldSession.h"
 
 BattlegroundSA::BattlegroundSA()
 {

src/server/game/Battlegrounds/Zones/BattlegroundTP.cpp

@@ -15,17 +15,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Battleground.h"
 #include "BattlegroundTP.h"
-#include "Creature.h"
-#include "GameObject.h"
-#include "Language.h"
-#include "Object.h"
-#include "ObjectMgr.h"
-#include "BattlegroundMgr.h"
-#include "Player.h"
-#include "World.h"
-#include "WorldPacket.h"
 
 BattlegroundTP::BattlegroundTP()
 {

src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp

@@ -17,14 +17,11 @@
  */
 
 #include "BattlegroundWS.h"
-#include "Creature.h"
 #include "GameObject.h"
 #include "Language.h"
 #include "Object.h"
-#include "ObjectMgr.h"
 #include "BattlegroundMgr.h"
 #include "Player.h"
-#include "World.h"
 #include "WorldPacket.h"
 
 // these variables aren't used outside of this file, so declare them only here

src/server/game/Chat/Channels/ChannelMgr.cpp

@@ -20,7 +20,6 @@
 #include "ChannelPackets.h"
 #include "Player.h"
 #include "World.h"
-#include "WorldSession.h"
 
 ChannelMgr::~ChannelMgr()
 {

src/server/game/Chat/Chat.cpp

@@ -19,7 +19,6 @@
 #include "Common.h"
 #include "ObjectMgr.h"
 #include "World.h"
-#include "WorldPacket.h"
 #include "WorldSession.h"
 #include "DatabaseEnv.h"
 
@@ -29,13 +28,9 @@
 #include "GridNotifiersImpl.h"
 #include "Language.h"
 #include "Log.h"
-#include "Opcodes.h"
 #include "Player.h"
-#include "UpdateMask.h"
-#include "SpellMgr.h"
 #include "ScriptMgr.h"
 #include "ChatLink.h"
-#include "Guild.h"
 #include "Group.h"
 
 bool ChatHandler::load_command_table = true;

src/server/game/Combat/HostileRefManager.cpp

@@ -20,7 +20,6 @@
 #include "ThreatManager.h"
 #include "Unit.h"
 #include "DBCStructure.h"
-#include "SpellMgr.h"
 #include "SpellInfo.h"
 
 HostileRefManager::~HostileRefManager()

src/server/game/Combat/ThreatManager.cpp

@@ -19,7 +19,6 @@
 #include "ThreatManager.h"
 #include "Unit.h"
 #include "Creature.h"
-#include "CreatureAI.h"
 #include "Map.h"
 #include "Player.h"
 #include "ObjectAccessor.h"

src/server/game/Conditions/ConditionMgr.cpp

@@ -27,7 +27,6 @@
 #include "ScriptMgr.h"
 #include "SpellAuras.h"
 #include "SpellMgr.h"
-#include "Spell.h"
 
 char const* ConditionMgr::StaticSourceTypeData[CONDITION_SOURCE_TYPE_MAX] =
 {

src/server/game/DataStores/DB2Stores.cpp

@@ -23,7 +23,6 @@
 #include "Log.h"
 #include "TransportMgr.h"
 #include "World.h"
-#include <functional>
 
 DB2Storage<AreaGroupEntry>                      sAreaGroupStore("AreaGroup.db2", AreaGroupFormat, HOTFIX_SEL_AREA_GROUP);
 DB2Storage<AreaGroupMemberEntry>                sAreaGroupMemberStore("AreaGroupMember.db2", AreaGroupMemberFormat, HOTFIX_SEL_AREA_GROUP_MEMBER);

src/server/game/DataStores/DBCStores.cpp

@@ -17,15 +17,11 @@
  */
 
 #include "DBCStores.h"
-#include "Containers.h"
 #include "Log.h"
 #include "SharedDefines.h"
 #include "SpellInfo.h"
-#include "SpellMgr.h"
 #include "DBCfmt.h"
-#include "ItemTemplate.h"
 #include "Timer.h"
-#include "ObjectDefines.h"
 #include "DB2Stores.h"
 
 #include <map>

src/server/game/DungeonFinding/LFGMgr.cpp

@@ -21,7 +21,6 @@
 #include "DisableMgr.h"
 #include "ObjectMgr.h"
 #include "SocialMgr.h"
-#include "Language.h"
 #include "LFGMgr.h"
 #include "LFGScripts.h"
 #include "LFGGroupData.h"

src/server/game/DungeonFinding/LFGQueue.cpp

@@ -23,9 +23,6 @@
 #include "LFGQueue.h"
 #include "LFGMgr.h"
 #include "Log.h"
-#include "ObjectMgr.h"
-#include "World.h"
-#include "GroupMgr.h"
 
 namespace lfg
 {

src/server/game/Entities/Corpse/Corpse.cpp

@@ -22,9 +22,6 @@
 #include "UpdateMask.h"
 #include "ObjectAccessor.h"
 #include "DatabaseEnv.h"
-#include "Opcodes.h"
-#include "GossipDef.h"
-#include "World.h"
 
 Corpse::Corpse(CorpseType type) : WorldObject(type != CORPSE_BONES), m_type(type)
 {

src/server/game/Entities/Creature/Creature.cpp

@@ -34,12 +34,7 @@
 #include "InstanceScript.h"
 #include "Log.h"
 #include "LootMgr.h"
-#include "MapManager.h"
-#include "MoveSpline.h"
-#include "MoveSplineInit.h"
 #include "ObjectMgr.h"
-#include "Opcodes.h"
-#include "OutdoorPvPMgr.h"
 #include "Player.h"
 #include "PoolMgr.h"
 #include "QuestDef.h"
@@ -48,7 +43,6 @@
 #include "TemporarySummon.h"
 #include "Util.h"
 #include "Vehicle.h"
-#include "WaypointMovementGenerator.h"
 #include "World.h"
 #include "WorldPacket.h"
 #include "CombatPackets.h"

src/server/game/Entities/Creature/GossipDef.cpp

@@ -19,13 +19,10 @@
 #include "QuestDef.h"
 #include "GossipDef.h"
 #include "ObjectMgr.h"
-#include "Opcodes.h"
-#include "WorldPacket.h"
 #include "WorldSession.h"
 #include "Formulas.h"
 #include "QuestPackets.h"
 #include "NPCPackets.h"
-#include "WorldPacket.h"
 
 GossipMenu::GossipMenu()
 {

src/server/game/Entities/DynamicObject/DynamicObject.cpp

@@ -23,7 +23,6 @@
 #include "ObjectAccessor.h"
 #include "DatabaseEnv.h"
 #include "GridNotifiers.h"
-#include "CellImpl.h"
 #include "GridNotifiersImpl.h"
 #include "ScriptMgr.h"
 #include "Transport.h"

src/server/game/Entities/GameObject/GameObject.cpp

@@ -20,7 +20,6 @@
 #include "Battleground.h"
 #include "CellImpl.h"
 #include "CreatureAISelector.h"
-#include "DynamicTree.h"
 #include "GameObjectModel.h"
 #include "GameObjectPackets.h"
 #include "GridNotifiersImpl.h"
@@ -35,7 +34,6 @@
 #include "UpdateFieldFlags.h"
 #include "World.h"
 #include "Transport.h"
-#include <G3D/Quat.h>
 
 GameObject::GameObject() : WorldObject(false), MapObject(),
     m_model(NULL), m_goValue(), m_AI(NULL)

src/server/game/Entities/Item/ItemEnchantmentMgr.cpp

@@ -16,17 +16,17 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdlib.h>
-#include <functional>
 #include "ItemEnchantmentMgr.h"
 #include "DatabaseEnv.h"
 #include "Log.h"
 #include "ObjectMgr.h"
-#include <list>
-#include <vector>
 #include "Util.h"
 #include "DBCStores.h"
 
+#include <list>
+#include <vector>
+#include <stdlib.h>
+
 struct EnchStoreItem
 {
     uint32  ench;

src/server/game/Entities/Object/Object.cpp

@@ -30,12 +30,8 @@
 #include "UpdateData.h"
 #include "UpdateMask.h"
 #include "Util.h"
-#include "MapManager.h"
 #include "ObjectAccessor.h"
-#include "Log.h"
 #include "Transport.h"
-#include "TargetedMovementGenerator.h"
-#include "WaypointMovementGenerator.h"
 #include "VMapFactory.h"
 #include "CellImpl.h"
 #include "GridNotifiers.h"
@@ -46,12 +42,8 @@
 #include "Totem.h"
 #include "MovementPackets.h"
 #include "OutdoorPvPMgr.h"
-#include "DynamicTree.h"
 #include "Unit.h"
-#include "Group.h"
 #include "BattlefieldMgr.h"
-#include "Battleground.h"
-#include "Chat.h"
 #include "GameObjectPackets.h"
 #include "MiscPackets.h"
 

src/server/game/Entities/Object/ObjectGuid.cpp

@@ -18,7 +18,7 @@
 
 #include "ObjectGuid.h"
 #include "World.h"
-#include "ObjectMgr.h"
+
 #include <sstream>
 #include <iomanip>
 

src/server/game/Entities/Object/Position.cpp

@@ -17,9 +17,10 @@
 
 #include "Position.h"
 #include "ByteBuffer.h"
-#include "G3D/g3dmath.h"
 #include "GridDefines.h"
 
+#include <G3D/g3dmath.h>
+
 bool Position::operator==(Position const &a)
 {
     return (G3D::fuzzyEq(a.m_positionX, m_positionX) &&

src/server/game/Entities/Object/Updates/UpdateData.cpp

@@ -20,9 +20,7 @@
 #include "ByteBuffer.h"
 #include "WorldPacket.h"
 #include "UpdateData.h"
-#include "Log.h"
 #include "Opcodes.h"
-#include "World.h"
 
 UpdateData::UpdateData(uint32 map) : m_map(map), m_blockCount(0) { }
 

src/server/game/Entities/Pet/Pet.cpp

@@ -24,11 +24,9 @@
 #include "ObjectMgr.h"
 #include "SpellMgr.h"
 #include "Pet.h"
-#include "Formulas.h"
 #include "SpellAuras.h"
 #include "SpellAuraEffects.h"
 #include "SpellHistory.h"
-#include "CreatureAI.h"
 #include "Unit.h"
 #include "Util.h"
 #include "Group.h"

src/server/game/Entities/Player/Player.cpp

@@ -92,7 +92,6 @@
 #include "UpdateFieldFlags.h"
 #include "UpdateMask.h"
 #include "Util.h"
-#include "Vehicle.h"
 #include "VehiclePackets.h"
 #include "Weather.h"
 #include "WeatherMgr.h"
@@ -100,7 +99,6 @@
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "WorldStatePackets.h"
-#include "InstancePackets.h"
 
 #define ZONE_UPDATE_INTERVAL (1*IN_MILLISECONDS)
 
@@ -890,6 +888,9 @@ Player::Player(WorldSession* session): Unit(true)
 
     m_achievementMgr = new AchievementMgr<Player>(this);
     m_reputationMgr = new ReputationMgr(this);
+
+    for (uint8 i = 0; i < MAX_CUF_PROFILES; ++i)
+        _CUFProfiles[i] = nullptr;
 }
 
 Player::~Player()

src/server/game/Entities/Player/Player.h

@@ -2912,7 +2912,7 @@ class Player : public Unit, public GridObject<Player>
 
         uint8 m_grantableLevels;
 
-        std::array<std::unique_ptr<CUFProfile>, MAX_CUF_PROFILES> _CUFProfiles = {};
+        std::array<std::unique_ptr<CUFProfile>, MAX_CUF_PROFILES> _CUFProfiles;
 
     private:
         // internal common parts for CanStore/StoreItem functions

src/server/game/Entities/Totem/Totem.cpp

@@ -17,7 +17,6 @@
  */
 
 #include "Totem.h"
-#include "Log.h"
 #include "Group.h"
 #include "ObjectMgr.h"
 #include "Opcodes.h"

src/server/game/Entities/Transport/Transport.cpp

@@ -22,12 +22,9 @@
 #include "ObjectMgr.h"
 #include "Path.h"
 #include "ScriptMgr.h"
-#include "WorldPacket.h"
 #include "DBCStores.h"
-#include "World.h"
 #include "GameObjectAI.h"
 #include "Vehicle.h"
-#include "MapReference.h"
 #include "Player.h"
 #include "Cell.h"
 #include "CellImpl.h"

src/server/game/Entities/Unit/StatSystem.cpp

@@ -23,7 +23,6 @@
 #include "SharedDefines.h"
 #include "SpellAuras.h"
 #include "SpellAuraEffects.h"
-#include "SpellMgr.h"
 #include "World.h"
 
 inline bool _ModifyUInt32(bool apply, uint32& baseValue, int32& amount)

src/server/game/Entities/Unit/Unit.cpp

@@ -35,7 +35,6 @@
 #include "InstanceSaveMgr.h"
 #include "InstanceScript.h"
 #include "Log.h"
-#include "MapManager.h"
 #include "MoveSpline.h"
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
@@ -54,8 +53,8 @@
 #include "SpellHistory.h"
 #include "SpellMgr.h"
 #include "TemporarySummon.h"
-#include "Totem.h"
 #include "Transport.h"
+#include "Totem.h"
 #include "UpdateFieldFlags.h"
 #include "Util.h"
 #include "Vehicle.h"

src/server/game/Entities/Vehicle/Vehicle.cpp

@@ -22,12 +22,8 @@
 #include "Vehicle.h"
 #include "Unit.h"
 #include "Util.h"
-#include "WorldPacket.h"
 #include "ScriptMgr.h"
 #include "CreatureAI.h"
-#include "ZoneScript.h"
-#include "SpellMgr.h"
-#include "SpellInfo.h"
 #include "MoveSplineInit.h"
 #include "TemporarySummon.h"
 #include "EventProcessor.h"

src/server/game/Events/GameEventMgr.cpp

@@ -23,7 +23,6 @@
 #include "Language.h"
 #include "Log.h"
 #include "MapManager.h"
-#include "GossipDef.h"
 #include "Player.h"
 #include "BattlegroundMgr.h"
 #include "UnitAI.h"

src/server/game/Globals/ObjectAccessor.cpp

@@ -16,32 +16,23 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <boost/thread/shared_mutex.hpp>
-#include <boost/thread/locks.hpp>
-
 #include "ObjectAccessor.h"
-#include "CellImpl.h"
 #include "Corpse.h"
 #include "Creature.h"
 #include "DynamicObject.h"
 #include "GameObject.h"
 #include "GridNotifiers.h"
-#include "GridNotifiersImpl.h"
 #include "Item.h"
 #include "Map.h"
-#include "MapInstanced.h"
-#include "MapManager.h"
 #include "ObjectDefines.h"
 #include "ObjectMgr.h"
-#include "Opcodes.h"
 #include "Pet.h"
 #include "Player.h"
 #include "Transport.h"
-#include "Vehicle.h"
 #include "World.h"
-#include "WorldPacket.h"
 
-#include <cmath>
+#include <boost/thread/shared_mutex.hpp>
+#include <boost/thread/locks.hpp>
 
 ObjectAccessor::ObjectAccessor() { }
 

src/server/game/Globals/ObjectMgr.cpp

@@ -27,7 +27,6 @@
 #include "DB2Structure.h"
 #include "DB2Stores.h"
 #include "DisableMgr.h"
-#include "GameEventMgr.h"
 #include "GossipDef.h"
 #include "GroupMgr.h"
 #include "GuildMgr.h"
@@ -38,19 +37,15 @@
 #include "MapManager.h"
 #include "Object.h"
 #include "ObjectMgr.h"
-#include "Pet.h"
 #include "PoolMgr.h"
 #include "ReputationMgr.h"
 #include "ScriptMgr.h"
 #include "SpellAuras.h"
-#include "Spell.h"
 #include "SpellMgr.h"
 #include "SpellScript.h"
-#include "Transport.h"
 #include "UpdateMask.h"
 #include "Util.h"
 #include "Vehicle.h"
-#include "WaypointManager.h"
 #include "World.h"
 
 ScriptMapMap sSpellScripts;

src/server/game/Grids/Notifiers/GridNotifiers.cpp

@@ -21,12 +21,9 @@
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "UpdateData.h"
-#include "Item.h"
-#include "Map.h"
 #include "Transport.h"
 #include "ObjectAccessor.h"
 #include "CellImpl.h"
-#include "SpellInfo.h"
 
 using namespace Trinity;
 

src/server/game/Grids/ObjectGridLoader.cpp

@@ -20,7 +20,6 @@
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
 #include "Creature.h"
-#include "Vehicle.h"
 #include "GameObject.h"
 #include "DynamicObject.h"
 #include "Corpse.h"

src/server/game/Groups/Group.cpp

@@ -32,7 +32,6 @@
 #include "BattlegroundMgr.h"
 #include "MapManager.h"
 #include "InstanceSaveMgr.h"
-#include "MapInstanced.h"
 #include "Util.h"
 #include "LFGMgr.h"
 #include "UpdateFieldFlags.h"

src/server/game/Handlers/ArenaTeamHandler.cpp

@@ -17,16 +17,8 @@
  */
 
 #include "Player.h"
-#include "World.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "DatabaseEnv.h"
-
-#include "ArenaTeam.h"
-#include "Log.h"
-#include "ObjectMgr.h"
-#include "SocialMgr.h"
-#include "ArenaTeamMgr.h"
 #include "Opcodes.h"
 
 void WorldSession::SendNotInArenaTeamPacket(uint8 type)

src/server/game/Handlers/AuctionHouseHandler.cpp

@@ -24,7 +24,6 @@
 #include "AuctionHouseMgr.h"
 #include "Log.h"
 #include "Language.h"
-#include "Opcodes.h"
 #include "UpdateMask.h"
 #include "Util.h"
 #include "AccountMgr.h"

src/server/game/Handlers/BankHandler.cpp

@@ -17,7 +17,6 @@
 
 #include "BankPackets.h"
 #include "NPCPackets.h"
-#include "ObjectMgr.h"
 #include "Opcodes.h"
 #include "Player.h"
 #include "WorldPacket.h"

src/server/game/Handlers/CalendarHandler.cpp

@@ -45,7 +45,6 @@ Copied events should probably have a new owner
 #include "ObjectAccessor.h"
 #include "DatabaseEnv.h"
 #include "GuildMgr.h"
-#include "ArenaTeamMgr.h"
 #include "WorldSession.h"
 
 void WorldSession::HandleCalendarGetCalendar(WorldPacket& /*recvData*/)

src/server/game/Handlers/CharacterHandler.cpp

@@ -34,7 +34,6 @@
 #include "GuildFinderMgr.h"
 #include "GuildMgr.h"
 #include "Language.h"
-#include "LFGMgr.h"
 #include "Log.h"
 #include "MiscPackets.h"
 #include "ObjectAccessor.h"

src/server/game/Handlers/ChatHandler.cpp

@@ -24,7 +24,6 @@
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "DatabaseEnv.h"
-#include "CellImpl.h"
 #include "Chat.h"
 #include "ChannelMgr.h"
 #include "GridNotifiersImpl.h"
@@ -34,7 +33,6 @@
 #include "Log.h"
 #include "Opcodes.h"
 #include "Player.h"
-#include "SpellAuras.h"
 #include "SpellAuraEffects.h"
 #include "Util.h"
 #include "ScriptMgr.h"

src/server/game/Handlers/CombatHandler.cpp

@@ -22,11 +22,8 @@
 #include "WorldSession.h"
 #include "ObjectAccessor.h"
 #include "CreatureAI.h"
-#include "ObjectDefines.h"
 #include "Vehicle.h"
-#include "VehicleDefines.h"
 #include "Player.h"
-#include "Opcodes.h"
 #include "CombatPackets.h"
 
 void WorldSession::HandleAttackSwingOpcode(WorldPackets::Combat::AttackSwing& packet)

src/server/game/Handlers/DuelHandler.cpp

@@ -20,8 +20,6 @@
 #include "DuelPackets.h"
 #include "WorldSession.h"
 #include "Log.h"
-#include "Opcodes.h"
-#include "UpdateData.h"
 #include "Player.h"
 #include "ObjectAccessor.h"
 

src/server/game/Handlers/GroupHandler.cpp

@@ -22,17 +22,12 @@
 #include "GroupMgr.h"
 #include "Log.h"
 #include "ObjectMgr.h"
-#include "Opcodes.h"
-#include "Pet.h"
 #include "Player.h"
 #include "SocialMgr.h"
-#include "SpellAuras.h"
 #include "Util.h"
-#include "Vehicle.h"
 #include "World.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "SpellAuraEffects.h"
 #include "MiscPackets.h"
 #include "LootPackets.h"
 #include "PartyPackets.h"

src/server/game/Handlers/GuildHandler.cpp

@@ -25,8 +25,6 @@
 #include "Log.h"
 #include "Opcodes.h"
 #include "Guild.h"
-#include "GossipDef.h"
-#include "SocialMgr.h"
 #include "GuildPackets.h"
 
 void WorldSession::HandleGuildQueryOpcode(WorldPackets::Guild::QueryGuildInfo& query)

src/server/game/Handlers/ItemHandler.cpp

@@ -24,9 +24,6 @@
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "Item.h"
-#include "UpdateData.h"
-#include "ObjectAccessor.h"
-#include "SpellInfo.h"
 #include "DB2Stores.h"
 #include "NPCPackets.h"
 #include "ItemPackets.h"

src/server/game/Handlers/LootHandler.cpp

@@ -26,9 +26,7 @@
 #include "LootMgr.h"
 #include "ObjectAccessor.h"
 #include "Object.h"
-#include "Opcodes.h"
 #include "Player.h"
-#include "World.h"
 #include "WorldPacket.h"
 #include "LootPackets.h"
 #include "WorldSession.h"

src/server/game/Handlers/MiscHandler.cpp

@@ -28,31 +28,19 @@
 #include "ObjectMgr.h"
 #include "GuildMgr.h"
 #include "WorldSession.h"
-#include "BigNumber.h"
-#include "SHA1.h"
-#include "UpdateData.h"
-#include "LootMgr.h"
 #include "Chat.h"
 #include "zlib.h"
 #include "ObjectAccessor.h"
 #include "Object.h"
 #include "Battleground.h"
 #include "OutdoorPvP.h"
-#include "Pet.h"
-#include "CellImpl.h"
 #include "AccountMgr.h"
-#include "Vehicle.h"
-#include "CreatureAI.h"
 #include "DBCEnums.h"
 #include "ScriptMgr.h"
 #include "MapManager.h"
-#include "InstanceScript.h"
 #include "Group.h"
-#include "AccountMgr.h"
 #include "Spell.h"
 #include "SpellPackets.h"
-#include "BattlegroundMgr.h"
-#include "DB2Stores.h"
 #include "CharacterPackets.h"
 #include "ClientConfigPackets.h"
 #include "MiscPackets.h"

src/server/game/Handlers/MovementHandler.cpp

@@ -24,7 +24,6 @@
 #include "Corpse.h"
 #include "Player.h"
 #include "Garrison.h"
-#include "SpellAuras.h"
 #include "MapManager.h"
 #include "Transport.h"
 #include "Battleground.h"

src/server/game/Handlers/PetitionsHandler.cpp

@@ -17,7 +17,6 @@
  */
 
 #include "Common.h"
-#include "Language.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "World.h"
@@ -26,8 +25,6 @@
 #include "Log.h"
 #include "Opcodes.h"
 #include "Guild.h"
-#include "GossipDef.h"
-#include "SocialMgr.h"
 #include "PetitionPackets.h"
 
 #define CHARTER_DISPLAY_ID 16161

src/server/game/Handlers/QueryHandler.cpp

@@ -17,20 +17,16 @@
  */
 
 #include "Common.h"
-#include "Language.h"
 #include "DatabaseEnv.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "Opcodes.h"
 #include "Log.h"
 #include "World.h"
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "UpdateMask.h"
 #include "NPCHandler.h"
-#include "Pet.h"
 #include "MapManager.h"
-#include "CharacterPackets.h"
 #include "QueryPackets.h"
 
 void WorldSession::SendNameQueryOpcode(ObjectGuid guid)

src/server/game/Handlers/QuestHandler.cpp

@@ -20,7 +20,6 @@
 #include "Log.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "Opcodes.h"
 #include "World.h"
 #include "ObjectMgr.h"
 #include "Player.h"

src/server/game/Handlers/ReferAFriendHandler.cpp

@@ -18,7 +18,6 @@
 #include "WorldSession.h"
 #include "Player.h"
 #include "ObjectMgr.h"
-#include "Opcodes.h"
 #include "Log.h"
 #include "ReferAFriendPackets.h"
 

src/server/game/Handlers/SkillHandler.cpp

@@ -17,13 +17,10 @@
  */
 
 #include "Common.h"
-#include "DatabaseEnv.h"
 #include "Log.h"
 #include "ObjectAccessor.h"
-#include "Opcodes.h"
 #include "Player.h"
 #include "Pet.h"
-#include "UpdateMask.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "TalentPackets.h"

src/server/game/Handlers/SpellHandler.cpp

@@ -27,9 +27,7 @@
 #include "Opcodes.h"
 #include "Spell.h"
 #include "Totem.h"
-#include "TemporarySummon.h"
 #include "SpellAuras.h"
-#include "CreatureAI.h"
 #include "ScriptMgr.h"
 #include "GameObjectAI.h"
 #include "SpellAuraEffects.h"

src/server/game/Handlers/TaxiHandler.cpp

@@ -24,7 +24,6 @@
 #include "Log.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "UpdateMask.h"
 #include "Path.h"
 #include "WaypointMovementGenerator.h"
 

src/server/game/Handlers/TicketHandler.cpp

@@ -16,16 +16,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "zlib.h"
 #include "Common.h"
-#include "Language.h"
 #include "ObjectMgr.h"
 #include "Opcodes.h"
 #include "Player.h"
 #include "SupportMgr.h"
 #include "TicketPackets.h"
 #include "Util.h"
-#include "World.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
 

src/server/game/Handlers/TokenHandler.cpp

@@ -15,7 +15,6 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Common.h"
 #include "TokenPackets.h"
 #include "WorldSession.h"
 

src/server/game/Handlers/TradeHandler.cpp

@@ -22,7 +22,6 @@
 #include "World.h"
 #include "ObjectAccessor.h"
 #include "Log.h"
-#include "Opcodes.h"
 #include "Player.h"
 #include "Item.h"
 #include "Spell.h"

src/server/game/Handlers/VehicleHandler.cpp

@@ -17,7 +17,6 @@
 
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "Opcodes.h"
 #include "Vehicle.h"
 #include "Player.h"
 #include "Log.h"

src/server/game/Handlers/VoiceChatHandler.cpp

@@ -19,8 +19,6 @@
 #include "Common.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "Opcodes.h"
-#include "Log.h"
 
 void WorldSession::HandleVoiceSessionEnableOpcode(WorldPacket& recvData)
 {

src/server/game/Instances/InstanceSaveMgr.cpp

@@ -21,15 +21,12 @@
 #include "GridNotifiers.h"
 #include "Log.h"
 #include "GridStates.h"
-#include "CellImpl.h"
 #include "Map.h"
 #include "MapManager.h"
 #include "MapInstanced.h"
 #include "InstanceSaveMgr.h"
 #include "Timer.h"
-#include "GridNotifiersImpl.h"
 #include "Config.h"
-#include "Transport.h"
 #include "ObjectMgr.h"
 #include "World.h"
 #include "Group.h"

src/server/game/Mails/Mail.cpp

@@ -22,8 +22,6 @@
 #include "World.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "Unit.h"
-#include "BattlegroundMgr.h"
 #include "Item.h"
 #include "AuctionHouseMgr.h"
 #include "CalendarMgr.h"

src/server/game/Maps/Map.cpp

@@ -28,7 +28,6 @@
 #include "Group.h"
 #include "InstanceScript.h"
 #include "MapInstanced.h"
-#include "MapManager.h"
 #include "MiscPackets.h"
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"

src/server/game/Maps/MapManager.cpp

@@ -27,10 +27,8 @@
 #include "InstanceScript.h"
 #include "Config.h"
 #include "World.h"
-#include "CellImpl.h"
 #include "Corpse.h"
 #include "ObjectMgr.h"
-#include "Language.h"
 #include "WorldPacket.h"
 #include "Group.h"
 #include "Player.h"

src/server/game/Maps/MapUpdater.cpp

@@ -16,12 +16,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <mutex>
-#include <condition_variable>
-
 #include "MapUpdater.h"
 #include "Map.h"
 
+#include <mutex>
+
 
 class MapUpdateRequest
 {

src/server/game/Maps/TransportMgr.cpp

@@ -18,7 +18,6 @@
 #include "TransportMgr.h"
 #include "Transport.h"
 #include "InstanceScript.h"
-#include "MoveSpline.h"
 #include "MapManager.h"
 
 TransportTemplate::~TransportTemplate()

src/server/game/Movement/MotionMaster.cpp

@@ -30,7 +30,6 @@
 #include "RandomMovementGenerator.h"
 #include "MoveSpline.h"
 #include "MoveSplineInit.h"
-#include <cassert>
 
 inline bool isStatic(MovementGenerator *mv)
 {

src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp

@@ -17,10 +17,8 @@
  */
 
 #include "Creature.h"
-#include "MapManager.h"
 #include "ConfusedMovementGenerator.h"
 #include "PathGenerator.h"
-#include "VMapFactory.h"
 #include "MoveSplineInit.h"
 #include "MoveSpline.h"
 #include "Player.h"

src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp

@@ -18,7 +18,6 @@
 
 #include "Creature.h"
 #include "CreatureAI.h"
-#include "MapManager.h"
 #include "FleeingMovementGenerator.h"
 #include "PathGenerator.h"
 #include "ObjectAccessor.h"

src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp

@@ -19,7 +19,6 @@
 #include "HomeMovementGenerator.h"
 #include "Creature.h"
 #include "CreatureAI.h"
-#include "WorldPacket.h"
 #include "MoveSplineInit.h"
 #include "MoveSpline.h"
 

src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp

@@ -17,9 +17,7 @@
  */
 
 #include "Creature.h"
-#include "MapManager.h"
 #include "RandomMovementGenerator.h"
-#include "ObjectAccessor.h"
 #include "Map.h"
 #include "Util.h"
 #include "CreatureGroups.h"

src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp

@@ -19,7 +19,6 @@
 #include "WaypointMovementGenerator.h"
 //Extended headers
 #include "ObjectMgr.h"
-#include "World.h"
 #include "Transport.h"
 //Flightmaster grid preloading
 #include "MapManager.h"

src/server/game/Movement/Spline/MoveSpline.cpp

@@ -17,10 +17,11 @@
  */
 
 #include "MoveSpline.h"
-#include <sstream>
 #include "Log.h"
 #include "Creature.h"
 
+#include <sstream>
+
 namespace Movement{
 
 Location MoveSpline::ComputePosition() const

src/server/game/Movement/Spline/MoveSplineInit.cpp

@@ -20,9 +20,6 @@
 #include "MoveSpline.h"
 #include "Unit.h"
 #include "Transport.h"
-#include "Vehicle.h"
-#include "WorldPacket.h"
-#include "Opcodes.h"
 #include "MovementPackets.h"
 
 namespace Movement

src/server/game/Quests/QuestDef.cpp

@@ -19,7 +19,6 @@
 #include "QuestDef.h"
 #include "Player.h"
 #include "World.h"
-#include "ObjectMgr.h"
 #include "QuestPackets.h"
 
 Quest::Quest(Field* questRecord)

src/server/game/Scripting/MapScripts.cpp

@@ -18,13 +18,11 @@
 
 #include "CellImpl.h"
 #include "GridNotifiers.h"
-#include "GridNotifiersImpl.h"
 #include "GossipDef.h"
 #include "Map.h"
-#include "MapManager.h"
-#include "MapRefManager.h"
 #include "ObjectMgr.h"
 #include "Pet.h"
+#include "Item.h"
 #include "ScriptedCreature.h"
 #include "ScriptMgr.h"
 #include "Transport.h"

src/server/game/Server/Packet.cpp

@@ -15,4 +15,4 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Packet.h"
+//#include "Packet.h"