[7403] much more unneeded includes removed

now i extended my script:
NAME="Chat"; ack -c $NAME | ack ":1$" | sed 's/:1//' | xargs /usr/bin/ack-grep -l "include \""$NAME".h\"" | xargs /bin/sed -i '/include "'$NAME'.h"/d'

Signed-off-by: VladimirMangos <vladimir@getmangos.com>

src/game/ArenaTeamHandler.cpp

@@ -25,7 +25,6 @@
 #include "ArenaTeam.h"
 #include "World.h"
 #include "SocialMgr.h"
-#include "Language.h"
 
 void WorldSession::HandleInspectArenaStatsOpcode(WorldPacket & recv_data)
 {

src/game/Bag.cpp

@@ -21,9 +21,7 @@
 #include "ObjectMgr.h"
 #include "Database/DatabaseEnv.h"
 #include "Log.h"
-#include "WorldPacket.h"
 #include "UpdateData.h"
-#include "WorldSession.h"
 
 Bag::Bag( ): Item()
 {

src/game/BattleGround.cpp

@@ -26,6 +26,7 @@
 #include "Chat.h"
 #include "SpellAuras.h"
 #include "ArenaTeam.h"
+#include "World.h"
 #include "Group.h"
 #include "ObjectMgr.h"
 #include "WorldPacket.h"
@@ -1639,4 +1640,4 @@ void BattleGround::SetBgRaid( uint32 TeamID, Group *bg_raid )
 WorldSafeLocsEntry const* BattleGround::GetClosestGraveYard( Player* player )
 {
     return objmgr.GetClosestGraveYard( player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetMapId(), player->GetTeam() );
-}
+}

src/game/BattleGroundAB.cpp

@@ -23,7 +23,6 @@
 #include "Creature.h"
 #include "Chat.h"
 #include "ObjectMgr.h"
-#include "MapManager.h"
 #include "Language.h"
 #include "Util.h"
 #include "WorldPacket.h"

src/game/BattleGroundAV.cpp

@@ -20,7 +20,6 @@
 #include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundAV.h"
-#include "MapManager.h"
 #include "Language.h"
 
 BattleGroundAV::BattleGroundAV()

src/game/BattleGroundBE.cpp

@@ -21,7 +21,6 @@
 #include "BattleGround.h"
 #include "BattleGroundBE.h"
 #include "ObjectMgr.h"
-#include "MapManager.h"
 #include "WorldPacket.h"
 #include "Language.h"
 

src/game/BattleGroundEY.cpp

@@ -23,7 +23,6 @@
 #include "Creature.h"
 #include "Chat.h"
 #include "ObjectMgr.h"
-#include "MapManager.h"
 #include "Language.h"
 #include "WorldPacket.h"
 #include "Util.h"

src/game/BattleGroundHandler.cpp

@@ -23,7 +23,6 @@
 #include "Player.h"
 #include "ObjectMgr.h"
 #include "WorldSession.h"
-#include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "Object.h"
 #include "Chat.h"

src/game/BattleGroundNA.cpp

@@ -21,7 +21,6 @@
 #include "BattleGround.h"
 #include "BattleGroundNA.h"
 #include "ObjectMgr.h"
-#include "MapManager.h"
 #include "WorldPacket.h"
 #include "Language.h"
 

src/game/BattleGroundRL.cpp

@@ -21,7 +21,6 @@
 #include "BattleGround.h"
 #include "BattleGroundRL.h"
 #include "ObjectMgr.h"
-#include "MapManager.h"
 #include "Language.h"
 #include "WorldPacket.h"
 

src/game/BattleGroundWS.cpp

@@ -23,7 +23,6 @@
 #include "Creature.h"
 #include "GameObject.h"
 #include "Chat.h"
-#include "MapManager.h"
 #include "ObjectMgr.h"
 #include "WorldPacket.h"
 #include "Language.h"

src/game/Channel.h

@@ -21,7 +21,6 @@
 
 #include "Common.h"
 #include "WorldPacket.h"
-#include "WorldSession.h"
 #include "Opcodes.h"
 #include "Player.h"
 

src/game/CharacterHandler.cpp

@@ -29,7 +29,6 @@
 #include "Guild.h"
 #include "UpdateMask.h"
 #include "Auth/md5.h"
-#include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "Group.h"
 #include "Database/DatabaseImpl.h"

src/game/Chat.cpp

@@ -28,7 +28,6 @@
 #include "Player.h"
 #include "UpdateMask.h"
 #include "Chat.h"
-#include "MapManager.h"
 #include "GridNotifiersImpl.h"
 #include "CellImpl.h"
 #include "AccountMgr.h"

src/game/ChatHandler.cpp

@@ -28,7 +28,6 @@
 #include "ChannelMgr.h"
 #include "Group.h"
 #include "Guild.h"
-#include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "ScriptCalls.h"
 #include "Player.h"

src/game/Corpse.cpp

@@ -20,12 +20,9 @@
 #include "Corpse.h"
 #include "Player.h"
 #include "UpdateMask.h"
-#include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "Database/DatabaseEnv.h"
 #include "Opcodes.h"
-#include "WorldSession.h"
-#include "WorldPacket.h"
 #include "GossipDef.h"
 #include "World.h"
 

src/game/Creature.cpp

@@ -19,7 +19,6 @@
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "WorldPacket.h"
-#include "WorldSession.h"
 #include "World.h"
 #include "ObjectMgr.h"
 #include "SpellMgr.h"
@@ -35,7 +34,6 @@
 #include "CreatureAI.h"
 #include "CreatureAISelector.h"
 #include "Formulas.h"
-#include "SpellAuras.h"
 #include "WaypointMovementGenerator.h"
 #include "InstanceData.h"
 #include "BattleGroundMgr.h"
@@ -2117,4 +2115,4 @@ void Creature::SetActiveObjectState( bool on )
 
     if(world)
         map->Add(this);
-}
+}

src/game/CreatureAIRegistry.cpp

@@ -25,7 +25,6 @@
 #include "RandomMovementGenerator.h"
 #include "CreatureAIImpl.h"
 #include "MovementGeneratorImpl.h"
-#include "MapManager.h"
 #include "CreatureAIRegistry.h"
 #include "WaypointMovementGenerator.h"
 

src/game/DuelHandler.cpp

@@ -22,7 +22,6 @@
 #include "Log.h"
 #include "Opcodes.h"
 #include "UpdateData.h"
-#include "MapManager.h"
 #include "Player.h"
 
 void WorldSession::HandleDuelAcceptedOpcode(WorldPacket& recvPacket)

src/game/DynamicObject.cpp

@@ -17,16 +17,11 @@
  */
 
 #include "Common.h"
-#include "GameObject.h"
 #include "UpdateMask.h"
 #include "Opcodes.h"
-#include "WorldPacket.h"
-#include "WorldSession.h"
 #include "World.h"
 #include "ObjectAccessor.h"
 #include "Database/DatabaseEnv.h"
-#include "SpellAuras.h"
-#include "MapManager.h"
 #include "GridNotifiers.h"
 #include "CellImpl.h"
 #include "GridNotifiersImpl.h"

src/game/FleeingMovementGenerator.h

@@ -22,7 +22,6 @@
 #include "MovementGenerator.h"
 #include "DestinationHolder.h"
 #include "Traveller.h"
-#include "MapManager.h"
 
 template<class T>
 class MANGOS_DLL_SPEC FleeingMovementGenerator

src/game/GameObject.cpp

@@ -26,10 +26,8 @@
 #include "UpdateMask.h"
 #include "Opcodes.h"
 #include "WorldPacket.h"
-#include "WorldSession.h"
 #include "World.h"
 #include "Database/DatabaseEnv.h"
-#include "MapManager.h"
 #include "LootMgr.h"
 #include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"

src/game/GridNotifiers.cpp

@@ -22,7 +22,6 @@
 #include "UpdateData.h"
 #include "Item.h"
 #include "Map.h"
-#include "MapManager.h"
 #include "Transports.h"
 #include "ObjectAccessor.h"
 

src/game/GridStates.cpp

@@ -18,7 +18,6 @@
 
 #include "GridStates.h"
 #include "GridNotifiers.h"
-#include "ObjectAccessor.h"
 #include "GameSystem/Grid.h"
 #include "Log.h"
 

src/game/GroupHandler.cpp

@@ -26,8 +26,6 @@
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "Group.h"
-#include "ObjectAccessor.h"
-#include "MapManager.h"
 #include "SocialMgr.h"
 #include "Util.h"
 

src/game/Guild.cpp

@@ -19,7 +19,6 @@
 #include "Database/DatabaseEnv.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "MapManager.h"
 #include "Player.h"
 #include "Opcodes.h"
 #include "ObjectMgr.h"

src/game/GuildHandler.cpp

@@ -24,7 +24,6 @@
 #include "Log.h"
 #include "Opcodes.h"
 #include "Guild.h"
-#include "MapManager.h"
 #include "GossipDef.h"
 #include "SocialMgr.h"
 

src/game/HomeMovementGenerator.cpp

@@ -20,8 +20,6 @@
 #include "Creature.h"
 #include "CreatureAI.h"
 #include "Traveller.h"
-#include "MapManager.h"
-#include "ObjectAccessor.h"
 #include "DestinationHolderImp.h"
 #include "ObjectMgr.h"
 #include "WorldPacket.h"

src/game/InstanceSaveMgr.cpp

@@ -21,7 +21,6 @@
 
 #include "Player.h"
 #include "GridNotifiers.h"
-#include "WorldSession.h"
 #include "Log.h"
 #include "GridStates.h"
 #include "CellImpl.h"
@@ -33,7 +32,6 @@
 #include "GridNotifiersImpl.h"
 #include "Config/ConfigEnv.h"
 #include "Transports.h"
-#include "ObjectAccessor.h"
 #include "ObjectMgr.h"
 #include "World.h"
 #include "Group.h"

src/game/Level0.cpp

@@ -18,13 +18,10 @@
 
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
-#include "WorldPacket.h"
-#include "WorldSession.h"
 #include "World.h"
 #include "Player.h"
 #include "Opcodes.h"
 #include "Chat.h"
-#include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "Language.h"
 #include "AccountMgr.h"

src/game/Level2.cpp

@@ -18,8 +18,6 @@
 
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
-#include "WorldPacket.h"
-#include "WorldSession.h"
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "Item.h"

src/game/Level3.cpp

@@ -33,7 +33,6 @@
 #include "Guild.h"
 #include "ObjectAccessor.h"
 #include "MapManager.h"
-#include "SpellAuras.h"
 #include "ScriptCalls.h"
 #include "Language.h"
 #include "GridNotifiersImpl.h"

src/game/Map.cpp

@@ -19,7 +19,6 @@
 #include "MapManager.h"
 #include "Player.h"
 #include "GridNotifiers.h"
-#include "WorldSession.h"
 #include "Log.h"
 #include "GridStates.h"
 #include "CellImpl.h"

src/game/MiscHandler.cpp

@@ -34,11 +34,9 @@
 #include "Chat.h"
 #include "ScriptCalls.h"
 #include <zlib/zlib.h>
-#include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "Object.h"
 #include "BattleGround.h"
-#include "SpellAuras.h"
 #include "Pet.h"
 #include "SocialMgr.h"
 

src/game/NPCHandler.cpp

@@ -27,12 +27,10 @@
 #include "SpellMgr.h"
 #include "Player.h"
 #include "GossipDef.h"
-#include "SpellAuras.h"
 #include "UpdateMask.h"
 #include "ScriptCalls.h"
 #include "ObjectAccessor.h"
 #include "Creature.h"
-#include "MapManager.h"
 #include "Pet.h"
 #include "BattleGroundMgr.h"
 #include "BattleGround.h"

src/game/Object.cpp

@@ -26,7 +26,6 @@
 #include "Creature.h"
 #include "Player.h"
 #include "ObjectMgr.h"
-#include "WorldSession.h"
 #include "UpdateData.h"
 #include "UpdateMask.h"
 #include "Util.h"

src/game/ObjectAccessor.cpp

@@ -23,7 +23,6 @@
 #include "Creature.h"
 #include "GameObject.h"
 #include "DynamicObject.h"
-#include "WorldSession.h"
 #include "WorldPacket.h"
 #include "Item.h"
 #include "Corpse.h"

src/game/ObjectGridLoader.cpp

@@ -19,7 +19,6 @@
 #include "ObjectGridLoader.h"
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
-#include "MapManager.h"
 #include "Creature.h"
 #include "GameObject.h"
 #include "DynamicObject.h"

src/game/ObjectMgr.cpp

@@ -28,7 +28,6 @@
 #include "SpellMgr.h"
 #include "UpdateMask.h"
 #include "World.h"
-#include "WorldSession.h"
 #include "Group.h"
 #include "Guild.h"
 #include "ArenaTeam.h"
@@ -43,7 +42,6 @@
 #include "SpellAuras.h"
 #include "Util.h"
 #include "WaypointManager.h"
-#include "BattleGround.h"
 
 INSTANTIATE_SINGLETON_1(ObjectMgr);
 

src/game/Pet.cpp

@@ -19,12 +19,10 @@
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "Log.h"
-#include "WorldSession.h"
 #include "WorldPacket.h"
 #include "ObjectMgr.h"
 #include "SpellMgr.h"
 #include "Pet.h"
-#include "MapManager.h"
 #include "Formulas.h"
 #include "SpellAuras.h"
 #include "CreatureAI.h"

src/game/PetHandler.cpp

@@ -25,11 +25,9 @@
 #include "Opcodes.h"
 #include "Spell.h"
 #include "ObjectAccessor.h"
-#include "MapManager.h"
 #include "CreatureAI.h"
 #include "Util.h"
 #include "Pet.h"
-#include "Language.h"
 
 void WorldSession::HandlePetAction( WorldPacket & recv_data )
 {

src/game/PetitionsHandler.cpp

@@ -26,7 +26,6 @@
 #include "Opcodes.h"
 #include "Guild.h"
 #include "ArenaTeam.h"
-#include "MapManager.h"
 #include "GossipDef.h"
 #include "SocialMgr.h"
 

src/game/Player.cpp

@@ -46,7 +46,6 @@
 #include "Group.h"
 #include "Guild.h"
 #include "Pet.h"
-#include "SpellAuras.h"
 #include "Util.h"
 #include "Transports.h"
 #include "Weather.h"

src/game/PointMovementGenerator.cpp

@@ -20,7 +20,6 @@
 #include "Errors.h"
 #include "Creature.h"
 #include "CreatureAI.h"
-#include "MapManager.h"
 #include "DestinationHolderImp.h"
 
 //----- Point Movement Generator

src/game/PoolHandler.cpp

@@ -19,7 +19,6 @@
 #include "PoolHandler.h"
 #include "ObjectMgr.h"
 #include "ProgressBar.h"
-#include "Language.h"
 #include "Log.h"
 #include "MapManager.h"
 #include "Policies/SingletonImp.h"

src/game/QueryHandler.cpp

@@ -29,7 +29,6 @@
 #include "Player.h"
 #include "UpdateMask.h"
 #include "NPCHandler.h"
-#include "ObjectAccessor.h"
 #include "Pet.h"
 #include "MapManager.h"
 

src/game/SkillDiscovery.cpp

@@ -20,7 +20,6 @@
 #include "Log.h"
 #include "ProgressBar.h"
 #include "Policies/SingletonImp.h"
-#include "ObjectAccessor.h"
 #include "World.h"
 #include "Util.h"
 #include "SkillDiscovery.h"

src/game/SkillHandler.cpp

@@ -25,7 +25,6 @@
 #include "WorldSession.h"
 #include "ObjectAccessor.h"
 #include "UpdateMask.h"
-#include "SpellAuras.h"
 
 void WorldSession::HandleLearnTalentOpcode( WorldPacket & recv_data )
 {

src/game/SocialMgr.cpp

@@ -21,7 +21,6 @@
 #include "Database/DatabaseEnv.h"
 #include "Opcodes.h"
 #include "WorldPacket.h"
-#include "WorldSession.h"
 #include "Player.h"
 #include "ObjectMgr.h"
 #include "World.h"

src/game/Spell.cpp

@@ -33,7 +33,6 @@
 #include "Unit.h"
 #include "Spell.h"
 #include "DynamicObject.h"
-#include "SpellAuras.h"
 #include "Group.h"
 #include "UpdateData.h"
 #include "MapManager.h"

src/game/SpellAuras.cpp

@@ -29,11 +29,9 @@
 #include "Player.h"
 #include "Unit.h"
 #include "Spell.h"
-#include "SpellAuras.h"
 #include "DynamicObject.h"
 #include "Group.h"
 #include "UpdateData.h"
-#include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "Policies/SingletonImp.h"
 #include "Totem.h"

src/game/SpellEffects.cpp

@@ -19,7 +19,6 @@
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "WorldPacket.h"
-#include "WorldSession.h"
 #include "Opcodes.h"
 #include "Log.h"
 #include "UpdateMask.h"

src/game/SpellHandler.cpp

@@ -25,9 +25,6 @@
 #include "Log.h"
 #include "Opcodes.h"
 #include "Spell.h"
-#include "SpellAuras.h"
-#include "BattleGround.h"
-#include "MapManager.h"
 #include "ScriptCalls.h"
 #include "Totem.h"
 

src/game/TargetedMovementGenerator.cpp

@@ -20,7 +20,6 @@
 #include "TargetedMovementGenerator.h"
 #include "Errors.h"
 #include "Creature.h"
-#include "MapManager.h"
 #include "DestinationHolderImp.h"
 #include "World.h"
 

src/game/TemporarySummon.cpp

@@ -17,8 +17,6 @@
  */
 
 #include "TemporarySummon.h"
-#include "WorldPacket.h"
-#include "MapManager.h"
 #include "Log.h"
 #include "ObjectAccessor.h"
 #include "CreatureAI.h"

src/game/ThreatManager.cpp

@@ -21,7 +21,6 @@
 #include "Creature.h"
 #include "CreatureAI.h"
 #include "Map.h"
-#include "MapManager.h"
 #include "Player.h"
 #include "ObjectAccessor.h"
 #include "UnitEvents.h"

src/game/Totem.cpp

@@ -18,7 +18,6 @@
 
 #include "Totem.h"
 #include "WorldPacket.h"
-#include "MapManager.h"
 #include "Log.h"
 #include "Group.h"
 #include "Player.h"

src/game/TotemAI.cpp

@@ -20,7 +20,6 @@
 #include "Totem.h"
 #include "Creature.h"
 #include "Database/DBCStores.h"
-#include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "SpellMgr.h"
 

src/game/Traveller.h

@@ -19,7 +19,6 @@
 #ifndef MANGOS_TRAVELLER_H
 #define MANGOS_TRAVELLER_H
 
-#include "MapManager.h"
 #include "Creature.h"
 #include "Player.h"
 #include <cassert>

src/game/Vehicle.cpp

@@ -18,13 +18,8 @@
 
 #include "Common.h"
 #include "Log.h"
-#include "WorldSession.h"
-#include "WorldPacket.h"
 #include "ObjectMgr.h"
-#include "SpellMgr.h"
 #include "Vehicle.h"
-#include "MapManager.h"
-#include "SpellAuras.h"
 #include "Unit.h"
 #include "Util.h"
 

src/game/Weather.cpp

@@ -22,7 +22,6 @@
 
 #include "Weather.h"
 #include "WorldPacket.h"
-#include "WorldSession.h"
 #include "Player.h"
 #include "World.h"
 #include "Log.h"

src/game/WorldSession.cpp

@@ -32,11 +32,8 @@
 #include "Group.h"
 #include "Guild.h"
 #include "World.h"
-#include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "BattleGroundMgr.h"
-#include "Language.h"                                       // for CMSG_CANCEL_MOUNT_AURA handler
-#include "Chat.h"
 #include "SocialMgr.h"
 
 /// WorldSession constructor

src/game/debugcmds.cpp

@@ -19,16 +19,13 @@
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "WorldPacket.h"
-#include "WorldSession.h"
 #include "Player.h"
 #include "Opcodes.h"
 #include "Chat.h"
 #include "Log.h"
 #include "Unit.h"
-#include "ObjectAccessor.h"
 #include "GossipDef.h"
 #include "Language.h"
-#include "MapManager.h"
 #include "BattleGroundMgr.h"
 #include <fstream>
 #include "ObjectMgr.h"

src/shared/revision_nr.h

@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "7402"
+ #define REVISION_NR "7403"
 #endif // __REVISION_NR_H__