diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp
index a7be872a2e..da7d4cf170 100644
--- a/src/server/game/AI/CreatureAI.cpp
+++ b/src/server/game/AI/CreatureAI.cpp
@@ -32,7 +32,6 @@
 #include "SpellHistory.h"
 #include "TemporarySummon.h"
 #include "Vehicle.h"
-#include "World.h"
 
 //Disable CreatureAI when charmed
 void CreatureAI::OnCharmed(bool isNew)
diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h
index 4c8b1c72d5..5eedd31397 100644
--- a/src/server/game/AI/CreatureAI.h
+++ b/src/server/game/AI/CreatureAI.h
@@ -19,7 +19,6 @@
 #define TRINITY_CREATUREAI_H
 
 #include "UnitAI.h"
-#include "Common.h"
 #include "ObjectDefines.h"
 #include "Optional.h"
 #include "QuestDef.h"
diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
index df85e6be9e..7511521aa1 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
@@ -26,7 +26,6 @@
 #include "Log.h"
 #include "MotionMaster.h"
 #include "ObjectAccessor.h"
-#include "Spell.h"
 #include "SpellMgr.h"
 #include "TemporarySummon.h"
 
diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp
index 242ef8eb04..b9983755f7 100644
--- a/src/server/game/Entities/Creature/CreatureGroups.cpp
+++ b/src/server/game/Entities/Creature/CreatureGroups.cpp
@@ -25,8 +25,6 @@
 #include "MovementGenerator.h"
 #include "ObjectMgr.h"
 
-#include <cmath>
-
 #define MAX_DESYNC 5.0f
 
 FormationMgr* FormationMgr::instance()
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index 17c1d66a23..2c9300c65d 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -41,7 +41,6 @@
 #include "PhasingHandler.h"
 #include "PoolMgr.h"
 #include "QueryPackets.h"
-#include "ScriptMgr.h"
 #include "SpellMgr.h"
 #include "Transport.h"
 #include "UpdateFieldFlags.h"
diff --git a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
index e88ade3946..e73d6ba622 100644
--- a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
+++ b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
@@ -20,14 +20,12 @@
 #include "DatabaseEnv.h"
 #include "Log.h"
 #include "ObjectMgr.h"
-#include "Util.h"
 #include "DBCStores.h"
 #include "Random.h"
 #include "Timer.h"
 
 #include <list>
 #include <vector>
-#include <stdlib.h>
 
 struct EnchStoreItem
 {
diff --git a/src/server/game/Entities/Item/ItemTemplate.h b/src/server/game/Entities/Item/ItemTemplate.h
index 8115d29e3d..8a1efcde77 100644
--- a/src/server/game/Entities/Item/ItemTemplate.h
+++ b/src/server/game/Entities/Item/ItemTemplate.h
@@ -21,7 +21,6 @@
 #include "DB2Structure.h"
 #include "Errors.h"
 #include "SharedDefines.h"
-#include "WorldPacket.h"
 #include <vector>
 
 enum ItemModType
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index eba7be6f62..8de5ab7dfc 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -25,7 +25,6 @@
 #include "Common.h"
 #include "Creature.h"
 #include "DBCStores.h"
-#include "DynamicTree.h"
 #include "G3DPosition.hpp"
 #include "GameTime.h"
 #include "GridNotifiers.h"
@@ -38,7 +37,6 @@
 #include "MovementPacketBuilder.h"
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
-#include "Opcodes.h"
 #include "OutdoorPvPMgr.h"
 #include "PhasingHandler.h"
 #include "PathGenerator.h"
diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h
index a86b4eaac8..bbca273239 100644
--- a/src/server/game/Entities/Object/Object.h
+++ b/src/server/game/Entities/Object/Object.h
@@ -35,7 +35,6 @@
 #include "UpdateFields.h"
 #include "UpdateMask.h"
 #include <list>
-#include <set>
 #include <unordered_map>
 
 class AreaTrigger;
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index 18ac79b60b..1f117b54ec 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -30,7 +30,6 @@
 #include "PetDefines.h"
 #include "PlayerTaxi.h"
 #include "QuestDef.h"
-#include <queue>
 
 struct AccessRequirement;
 struct AchievementEntry;
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h
index 9aa241d2ab..40886c0943 100644
--- a/src/server/game/Entities/Unit/Unit.h
+++ b/src/server/game/Entities/Unit/Unit.h
@@ -24,14 +24,12 @@
 #include "SpellDefines.h"
 #include "ThreatManager.h"
 #include "Timer.h"
-#include "SpellPacketsCommon.h"
 #include "UnitDefines.h"
 #include "Util.h"
 #include <array>
 #include <map>
 #include <memory>
 #include <stack>
-#include <queue>
 
 #define WORLD_TRIGGER   12999
 
diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp
index 0bb2e2d8fd..32c052bc21 100644
--- a/src/server/game/Entities/Vehicle/Vehicle.cpp
+++ b/src/server/game/Entities/Vehicle/Vehicle.cpp
@@ -664,6 +664,35 @@ void Vehicle::InitMovementInfoForBase()
         _me->AddExtraUnitMovementFlag(MOVEMENTFLAG2_FULL_SPEED_PITCHING);
 }
 
+ObjectGuid Vehicle::GetTransportGUID() const
+{
+    return GetBase()->GetGUID();
+}
+
+float Vehicle::GetTransportOrientation() const
+{
+    return GetBase()->GetOrientation();
+}
+
+void Vehicle::CalculatePassengerPosition(float& x, float& y, float& z, float* o /*= nullptr*/) const
+{
+    TransportBase::CalculatePassengerPosition(x, y, z, o,
+        GetBase()->GetPositionX(), GetBase()->GetPositionY(),
+        GetBase()->GetPositionZ(), GetBase()->GetOrientation());
+}
+
+void Vehicle::CalculatePassengerOffset(float& x, float& y, float& z, float* o /*= nullptr*/) const
+{
+    TransportBase::CalculatePassengerOffset(x, y, z, o,
+        GetBase()->GetPositionX(), GetBase()->GetPositionY(),
+        GetBase()->GetPositionZ(), GetBase()->GetOrientation());
+}
+
+int32 Vehicle::GetMapIdForSpawning() const
+{
+    return GetBase()->GetMapId();
+}
+
 /**
  * @fn VehicleSeatEntry const* Vehicle::GetSeatForPassenger(Unit* passenger)
  *
diff --git a/src/server/game/Entities/Vehicle/Vehicle.h b/src/server/game/Entities/Vehicle/Vehicle.h
index 7149516eae..591976b387 100644
--- a/src/server/game/Entities/Vehicle/Vehicle.h
+++ b/src/server/game/Entities/Vehicle/Vehicle.h
@@ -18,10 +18,8 @@
 #ifndef __TRINITY_VEHICLE_H
 #define __TRINITY_VEHICLE_H
 
-#include "ObjectDefines.h"
 #include "Object.h"
 #include "VehicleDefines.h"
-#include "Unit.h"
 #include <list>
 
 struct VehicleEntry;
@@ -82,29 +80,18 @@ class TC_GAME_API Vehicle : public TransportBase
         SeatMap::iterator GetSeatIteratorForPassenger(Unit* passenger);
         void InitMovementInfoForBase();
 
-        ObjectGuid GetTransportGUID() const override { return GetBase()->GetGUID(); }
+        ObjectGuid GetTransportGUID() const override;
 
-        float GetTransportOrientation() const override { return GetBase()->GetOrientation(); }
+        float GetTransportOrientation() const override;
 
         void AddPassenger(WorldObject* /*passenger*/) override { ASSERT("Vehicle cannot directly gain passengers without auras"); }
 
         /// This method transforms supplied transport offsets into global coordinates
-        void CalculatePassengerPosition(float& x, float& y, float& z, float* o /*= nullptr*/) const override
-        {
-            TransportBase::CalculatePassengerPosition(x, y, z, o,
-                GetBase()->GetPositionX(), GetBase()->GetPositionY(),
-                GetBase()->GetPositionZ(), GetBase()->GetOrientation());
-        }
-
+        void CalculatePassengerPosition(float& x, float& y, float& z, float* o /*= nullptr*/) const override;
         /// This method transforms supplied global coordinates into local offsets
-        void CalculatePassengerOffset(float& x, float& y, float& z, float* o /*= nullptr*/) const override
-        {
-            TransportBase::CalculatePassengerOffset(x, y, z, o,
-                GetBase()->GetPositionX(), GetBase()->GetPositionY(),
-                GetBase()->GetPositionZ(), GetBase()->GetOrientation());
-        }
+        void CalculatePassengerOffset(float& x, float& y, float& z, float* o /*= nullptr*/) const override;
 
-        int32 GetMapIdForSpawning() const override { return GetBase()->GetMapId(); }
+        int32 GetMapIdForSpawning() const override;
 
 
         void RemovePendingEvent(VehicleJoinEvent* e);
@@ -112,7 +99,6 @@ class TC_GAME_API Vehicle : public TransportBase
 
         bool HasPendingEventForSeat(int8 seatId) const;
 
-    private:
         Unit* _me;                                          ///< The underlying unit with the vehicle kit. Can be player or creature.
         VehicleEntry const* _vehicleInfo;                   ///< DBC data for vehicle
         GuidSet vehiclePlayers;
diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h
index b0d935f5b3..7b695c557c 100644
--- a/src/server/game/Grids/Notifiers/GridNotifiers.h
+++ b/src/server/game/Grids/Notifiers/GridNotifiers.h
@@ -21,13 +21,11 @@
 #include "AreaTrigger.h"
 #include "Corpse.h"
 #include "Creature.h"
-#include "CreatureAI.h"
 #include "DynamicObject.h"
 #include "GameObject.h"
 #include "Player.h"
 #include "Spell.h"
 #include "SpellInfo.h"
-#include "TemporarySummon.h"
 #include "UnitAI.h"
 #include "UpdateData.h"
 
diff --git a/src/server/game/Loot/LootMgr.h b/src/server/game/Loot/LootMgr.h
index c06f771b87..927f6465a1 100644
--- a/src/server/game/Loot/LootMgr.h
+++ b/src/server/game/Loot/LootMgr.h
@@ -21,7 +21,6 @@
 #include "Define.h"
 #include "ConditionMgr.h"
 #include "ObjectGuid.h"
-#include "SharedDefines.h"
 #include <list>
 #include <vector>
 
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h
index b134b538e9..e37194266c 100644
--- a/src/server/game/Maps/Map.h
+++ b/src/server/game/Maps/Map.h
@@ -38,7 +38,6 @@
 #include <bitset>
 #include <list>
 #include <memory>
-#include <mutex>
 
 class Battleground;
 class BattlegroundMap;
diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp
index b0a899dea8..a06574b3dc 100644
--- a/src/server/game/Maps/MapManager.cpp
+++ b/src/server/game/Maps/MapManager.cpp
@@ -22,17 +22,13 @@
 #include "DBCStores.h"
 #include "Group.h"
 #include "InstanceSaveMgr.h"
-#include "Language.h"
 #include "Log.h"
 #include "Map.h"
 #include "ObjectMgr.h"
-#include "Opcodes.h"
 #include "Player.h"
 #include "ScriptMgr.h"
 #include "World.h"
 #include "WorldStateMgr.h"
-#include "WorldPacket.h"
-#include "WorldSession.h"
 #include <boost/dynamic_bitset.hpp>
 #include <numeric>
 
diff --git a/src/server/game/Maps/MapScripts.cpp b/src/server/game/Maps/MapScripts.cpp
index c41340ae1d..7d31d49bec 100644
--- a/src/server/game/Maps/MapScripts.cpp
+++ b/src/server/game/Maps/MapScripts.cpp
@@ -16,7 +16,6 @@
  */
 
 #include "Map.h"
-#include "CellImpl.h"
 #include "GameTime.h"
 #include "GossipDef.h"
 #include "GridNotifiers.h"
@@ -26,7 +25,6 @@
 #include "MotionMaster.h"
 #include "ObjectMgr.h"
 #include "Pet.h"
-#include "ScriptMgr.h"
 #include "Transport.h"
 #include "WaypointManager.h"
 #include "World.h"
diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h
index e42b68f4ec..505ce78e2d 100644
--- a/src/server/game/Movement/MotionMaster.h
+++ b/src/server/game/Movement/MotionMaster.h
@@ -20,7 +20,6 @@
 
 #include "Common.h"
 #include "Errors.h"
-#include "ObjectDefines.h"
 #include "ObjectGuid.h"
 #include "Optional.h"
 #include "Position.h"
diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp
index 334f0c28f9..65cd610339 100644
--- a/src/server/game/Quests/QuestDef.cpp
+++ b/src/server/game/Quests/QuestDef.cpp
@@ -20,7 +20,6 @@
 #include "Field.h"
 #include "Log.h"
 #include "ObjectMgr.h"
-#include "Opcodes.h"
 #include "Player.h"
 #include "QuestPackets.h"
 #include "QuestPools.h"
diff --git a/src/server/game/Server/Packets/SpellPacketsCommon.h b/src/server/game/Server/Packets/SpellPacketsCommon.h
index 928fc437cd..15c8afdbcf 100644
--- a/src/server/game/Server/Packets/SpellPacketsCommon.h
+++ b/src/server/game/Server/Packets/SpellPacketsCommon.h
@@ -22,8 +22,6 @@
 #include "Optional.h"
 #include "MovementInfo.h"
 #include "Position.h"
-#include "SharedDefines.h"
-#include <array>
 
 namespace WorldPackets
 {
diff --git a/src/server/game/Skills/Archaeology/Archaeology.h b/src/server/game/Skills/Archaeology/Archaeology.h
index fc68da7cae..e0f393dd0f 100644
--- a/src/server/game/Skills/Archaeology/Archaeology.h
+++ b/src/server/game/Skills/Archaeology/Archaeology.h
@@ -19,8 +19,8 @@
 #define _ARCHAEOLOGY_H
 
 #include "ArchaeologyMgr.h"
-#include "Common.h"
 #include "WorldSession.h"
+#include <array>
 
 #define DIGS_PER_SITE 3
 class Player;
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index a39127147a..a131a1a124 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -22,7 +22,6 @@
 #include "CellImpl.h"
 #include "Common.h"
 #include "DBCStores.h"
-#include "EventProcessor.h"
 #include "GridNotifiersImpl.h"
 #include "Item.h"
 #include "Log.h"
@@ -31,7 +30,6 @@
 #include "MotionMaster.h"
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
-#include "Opcodes.h"
 #include "OutdoorPvPMgr.h"
 #include "Pet.h"
 #include "PhasingHandler.h"
@@ -46,7 +44,6 @@
 #include "Util.h"
 #include "Vehicle.h"
 #include "Weather.h"
-#include "WeatherMgr.h"
 #include "WorldPacket.h"
 #include <G3D/g3dmath.h>
 #include <numeric>
diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp
index 82b35911ba..a3d6056e89 100644
--- a/src/server/game/Spells/Auras/SpellAuras.cpp
+++ b/src/server/game/Spells/Auras/SpellAuras.cpp
@@ -25,7 +25,6 @@
 #include "Log.h"
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
-#include "Opcodes.h"
 #include "Player.h"
 #include "ScriptMgr.h"
 #include "Spell.h"
diff --git a/src/server/game/Spells/Auras/SpellAuras.h b/src/server/game/Spells/Auras/SpellAuras.h
index c0a5bb12cc..d000c5ae99 100644
--- a/src/server/game/Spells/Auras/SpellAuras.h
+++ b/src/server/game/Spells/Auras/SpellAuras.h
@@ -22,7 +22,6 @@
 #include "EventProcessor.h"
 #include "SpellAuraDefines.h"
 #include "SpellInfo.h"
-#include <typeinfo>
 
 class SpellInfo;
 struct SpellModifier;
diff --git a/src/server/game/Spells/SpellCastRequest.h b/src/server/game/Spells/SpellCastRequest.h
index 621e251a1a..a96a633df2 100644
--- a/src/server/game/Spells/SpellCastRequest.h
+++ b/src/server/game/Spells/SpellCastRequest.h
@@ -15,6 +15,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef SpellCastRequest_h__
+#define SpellCastRequest_h__
+
 #include "SpellPacketsCommon.h"
 
 struct SpellCastRequestItemData
@@ -35,3 +38,5 @@ struct PendingSpellCastRequest
     WorldPackets::Spells::SpellCastRequest CastRequest;
     Optional<SpellCastRequestItemData> CastItemData;
 };
+
+#endif // SpellCastRequest_h__
diff --git a/src/server/game/Spells/SpellHistory.h b/src/server/game/Spells/SpellHistory.h
index c9a4974394..142245cc16 100644
--- a/src/server/game/Spells/SpellHistory.h
+++ b/src/server/game/Spells/SpellHistory.h
@@ -21,7 +21,6 @@
 #include "SharedDefines.h"
 #include "DatabaseEnvFwd.h"
 #include "GameTime.h"
-#include <deque>
 #include <vector>
 #include <unordered_map>
 
diff --git a/src/server/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp
index 6668d9f30b..d5c0e43e02 100644
--- a/src/server/game/Spells/SpellScript.cpp
+++ b/src/server/game/Spells/SpellScript.cpp
@@ -23,7 +23,6 @@
 #include "SpellAuras.h"
 #include "SpellMgr.h"
 #include "Unit.h"
-#include <sstream>
 #include <string>
 
 bool _SpellScript::_Validate(SpellInfo const* entry)
diff --git a/src/server/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h
index 37875118d6..250a2a1362 100644
--- a/src/server/game/Spells/SpellScript.h
+++ b/src/server/game/Spells/SpellScript.h
@@ -19,16 +19,12 @@
 #define __SPELL_SCRIPT_H
 
 #include "ObjectGuid.h"
-#include "Optional.h"
 #include "SharedDefines.h"
 #include "SpellAuraDefines.h"
 #include "SpellInfo.h"
 #include "Utilities/StringFormat.h"
 #include "Util.h"
-#include "Unit.h"
-#include "advstd.h"
 
-#include <memory>
 #include <functional>
 #include <stack>
 
diff --git a/src/server/game/Tools/PlayerDump.cpp b/src/server/game/Tools/PlayerDump.cpp
index 7f5a18c51a..28b65c2a66 100644
--- a/src/server/game/Tools/PlayerDump.cpp
+++ b/src/server/game/Tools/PlayerDump.cpp
@@ -23,7 +23,6 @@
 #include "Log.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "UpdateFields.h"
 #include "World.h"
 
 // static data
diff --git a/src/server/game/Warden/WardenCheckMgr.cpp b/src/server/game/Warden/WardenCheckMgr.cpp
index 1ac5ad0ee1..0d90f11400 100644
--- a/src/server/game/Warden/WardenCheckMgr.cpp
+++ b/src/server/game/Warden/WardenCheckMgr.cpp
@@ -16,7 +16,6 @@
  */
 
 #include "Common.h"
-#include "WorldPacket.h"
 #include "WorldSession.h"
 #include "Log.h"
 #include "DatabaseEnv.h"
diff --git a/src/server/game/Warden/WardenMac.h b/src/server/game/Warden/WardenMac.h
index 81ab864cf0..24e9201177 100644
--- a/src/server/game/Warden/WardenMac.h
+++ b/src/server/game/Warden/WardenMac.h
@@ -19,8 +19,6 @@
 #define _WARDEN_MAC_H
 
 #include "Cryptography/ARC4.h"
-#include <map>
-#include "Cryptography/BigNumber.h"
 #include "ByteBuffer.h"
 #include "Warden.h"
 
diff --git a/src/server/game/Warden/WardenWin.cpp b/src/server/game/Warden/WardenWin.cpp
index 952c44e73e..5ea93d5a78 100644
--- a/src/server/game/Warden/WardenWin.cpp
+++ b/src/server/game/Warden/WardenWin.cpp
@@ -26,13 +26,11 @@
 #include "Database/DatabaseEnv.h"
 #include "GameTime.h"
 #include "World.h"
-#include "Player.h"
 #include "Util.h"
 #include "WardenWin.h"
 #include "WardenModuleWin.h"
 #include "WardenCheckMgr.h"
 #include "Random.h"
-#include <openssl/md5.h>
 
 WardenWin::WardenWin() : Warden(), _serverTicks(0) {}
 
diff --git a/src/server/game/Warden/WardenWin.h b/src/server/game/Warden/WardenWin.h
index c45d73572b..051892c7ca 100644
--- a/src/server/game/Warden/WardenWin.h
+++ b/src/server/game/Warden/WardenWin.h
@@ -18,9 +18,7 @@
 #ifndef _WARDEN_WIN_H
 #define _WARDEN_WIN_H
 
-#include <map>
 #include "Cryptography/ARC4.h"
-#include "Cryptography/BigNumber.h"
 #include "ByteBuffer.h"
 #include "Warden.h"
 
diff --git a/src/server/game/Weather/Weather.cpp b/src/server/game/Weather/Weather.cpp
index bfb353d7d2..9e37ac2ace 100644
--- a/src/server/game/Weather/Weather.cpp
+++ b/src/server/game/Weather/Weather.cpp
@@ -22,14 +22,12 @@
 #include "Weather.h"
 #include "GameTime.h"
 #include "Log.h"
-#include "Opcodes.h"
 #include "MiscPackets.h"
 #include "Player.h"
 #include "Random.h"
 #include "ScriptMgr.h"
 #include "Util.h"
 #include "World.h"
-#include "WorldPacket.h"
 
 /// Create the Weather object
 Weather::Weather(uint32 zone, WeatherData const* weatherChances)
diff --git a/src/server/game/Weather/Weather.h b/src/server/game/Weather/Weather.h
index abb529fdbe..86070fa82c 100644
--- a/src/server/game/Weather/Weather.h
+++ b/src/server/game/Weather/Weather.h
@@ -22,7 +22,6 @@
 #ifndef __WEATHER_H
 #define __WEATHER_H
 
-#include "Common.h"
 #include "SharedDefines.h"
 #include "Timer.h"
 
diff --git a/src/server/game/Weather/WeatherMgr.cpp b/src/server/game/Weather/WeatherMgr.cpp
index 0854b0279b..68ed8cab26 100644
--- a/src/server/game/Weather/WeatherMgr.cpp
+++ b/src/server/game/Weather/WeatherMgr.cpp
@@ -25,7 +25,6 @@
 #include "Log.h"
 #include "ObjectMgr.h"
 #include "Timer.h"
-#include "Opcodes.h"
 #include "DatabaseEnv.h"
 
 namespace WeatherMgr
diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp
index d923da13d5..56b604784b 100644
--- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp
+++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp
@@ -20,7 +20,6 @@
 #include "InstanceScript.h"
 #include "MotionMaster.h"
 #include "MoveSpline.h"
-#include "ObjectAccessor.h"
 #include "Player.h"
 #include "ScriptedCreature.h"
 #include "SpellInfo.h"
diff --git a/src/server/scripts/EasternKingdoms/BastionOfTwilight/bastion_of_twilight.cpp b/src/server/scripts/EasternKingdoms/BastionOfTwilight/bastion_of_twilight.cpp
index 2b2862fd14..5e54848751 100644
--- a/src/server/scripts/EasternKingdoms/BastionOfTwilight/bastion_of_twilight.cpp
+++ b/src/server/scripts/EasternKingdoms/BastionOfTwilight/bastion_of_twilight.cpp
@@ -21,7 +21,6 @@
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
 #include "SpellAuraEffects.h"
-#include "GameObject.h"
 #include "GameObjectAI.h"
 #include "Object.h"
 #include "Map.h"
diff --git a/src/server/scripts/EasternKingdoms/BastionOfTwilight/instance_bastion_of_twilight.cpp b/src/server/scripts/EasternKingdoms/BastionOfTwilight/instance_bastion_of_twilight.cpp
index 5928860758..9103c77422 100644
--- a/src/server/scripts/EasternKingdoms/BastionOfTwilight/instance_bastion_of_twilight.cpp
+++ b/src/server/scripts/EasternKingdoms/BastionOfTwilight/instance_bastion_of_twilight.cpp
@@ -23,8 +23,6 @@
 #include "Map.h"
 #include "MotionMaster.h"
 #include "TemporarySummon.h"
-#include "VehicleDefines.h"
-#include "WorldPacket.h"
 
 ObjectData const creatureData[] =
 {
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp
index 4f78ca2e10..8ad2e85a19 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp
@@ -24,7 +24,6 @@
 #include "Player.h"
 #include "ScriptedCreature.h"
 #include "ScriptedEscortAI.h"
-#include "Spell.h"
 #include "SpellAuras.h"
 #include "SpellScript.h"
 #include "TemporarySummon.h"
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp
index b5d6e5dc9a..69373fbf37 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp
@@ -19,7 +19,6 @@
 #include "blackrock_caverns.h"
 #include "InstanceScript.h"
 #include "Creature.h"
-#include "InstanceScript.h"
 #include "CreatureAI.h"
 #include "Map.h"
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp
index 7710e6956c..9da17f32d1 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp
@@ -19,9 +19,7 @@
 #include "ScriptMgr.h"
 #include "CommonPredicates.h"
 #include "GridNotifiers.h"
-#include "PassiveAI.h"
 #include "ScriptedCreature.h"
-#include "ScriptedGossip.h"
 #include "SpellScript.h"
 #include "SpellAuraEffects.h"
 #include "SpellMgr.h"
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/instance_blackwing_descent.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/instance_blackwing_descent.cpp
index ebccb137ce..45d86b2d36 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/instance_blackwing_descent.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/instance_blackwing_descent.cpp
@@ -21,7 +21,6 @@
 #include "InstanceScript.h"
 #include "Map.h"
 #include "MapManager.h"
-#include "Transport.h"
 #include "EventMap.h"
 #include "CreatureAI.h"
 #include "TemporarySummon.h"
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_helix_gearbreaker.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_helix_gearbreaker.cpp
index ece84817e4..05feeeeafd 100644
--- a/src/server/scripts/EasternKingdoms/Deadmines/boss_helix_gearbreaker.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_helix_gearbreaker.cpp
@@ -19,7 +19,6 @@
 #include "deadmines.h"
 #include "InstanceScript.h"
 #include "MotionMaster.h"
-#include "MovementTypedefs.h"
 #include "PassiveAI.h"
 #include "PhasingHandler.h"
 #include "Player.h"
@@ -27,7 +26,6 @@
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"
 #include "SpellMgr.h"
-#include "VehicleDefines.h"
 #include "GridNotifiers.h"
 #include "Map.h"
 
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_vanessa_van_cleef.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_vanessa_van_cleef.cpp
index 1552a4ad9a..44a92cd44c 100644
--- a/src/server/scripts/EasternKingdoms/Deadmines/boss_vanessa_van_cleef.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_vanessa_van_cleef.cpp
@@ -20,15 +20,11 @@
 #include "InstanceScript.h"
 #include "GridNotifiers.h"
 #include "MotionMaster.h"
-#include "MovementTypedefs.h"
 #include "MoveSplineInit.h"
-#include "PassiveAI.h"
 #include "PhasingHandler.h"
 #include "Player.h"
 #include "ScriptedCreature.h"
-#include "SpellAuraEffects.h"
 #include "ObjectAccessor.h"
-#include "MotionMaster.h"
 #include "SpellScript.h"
 
 enum Texts
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
index 62c0dc17bb..014b7f2a7a 100644
--- a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
@@ -24,7 +24,6 @@
 #include "MotionMaster.h"
 #include "TemporarySummon.h"
 #include "VehicleDefines.h"
-#include "WorldPacket.h"
 #include "Player.h"
 #include "CreatureAIImpl.h"
 
diff --git a/src/server/scripts/EasternKingdoms/GrimBatol/boss_drahga_shadowburner.cpp b/src/server/scripts/EasternKingdoms/GrimBatol/boss_drahga_shadowburner.cpp
index 014f07ba4b..80d0b54a9c 100644
--- a/src/server/scripts/EasternKingdoms/GrimBatol/boss_drahga_shadowburner.cpp
+++ b/src/server/scripts/EasternKingdoms/GrimBatol/boss_drahga_shadowburner.cpp
@@ -21,7 +21,6 @@
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
 #include "SpellAuraEffects.h"
-#include "MoveSplineInit.h"
 #include "Player.h"
 #include "MotionMaster.h"
 #include "InstanceScript.h"
diff --git a/src/server/scripts/EasternKingdoms/GrimBatol/instance_grim_batol.cpp b/src/server/scripts/EasternKingdoms/GrimBatol/instance_grim_batol.cpp
index 90f83f000f..19de26c6f3 100644
--- a/src/server/scripts/EasternKingdoms/GrimBatol/instance_grim_batol.cpp
+++ b/src/server/scripts/EasternKingdoms/GrimBatol/instance_grim_batol.cpp
@@ -21,8 +21,6 @@
 #include "Creature.h"
 #include "EventMap.h"
 #include "Map.h"
-#include "ScriptMgr.h"
-#include "MotionMaster.h"
 #include "CreatureAI.h"
 
 ObjectData const creatureData[] =
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
index fefba01adf..ea50964b88 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
@@ -20,7 +20,6 @@
 #include "InstanceScript.h"
 #include "Map.h"
 #include "MotionMaster.h"
-#include "ObjectAccessor.h"
 #include "scarlet_monastery.h"
 #include "ScriptedCreature.h"
 #include "Spell.h"
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp
index 9d3688bbbb..e04d3cda9b 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp
@@ -20,6 +20,7 @@
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "Spell.h"
+#include "SpellScript.h"
 #include "SpellAuras.h"
 #include "SpellAuraEffects.h"
 #include "Player.h"
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_silverlaine.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_silverlaine.cpp
index f43a6d9091..b084f1b27d 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_silverlaine.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_silverlaine.cpp
@@ -20,11 +20,10 @@
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "Spell.h"
+#include "SpellScript.h"
 #include "SpellAuras.h"
-#include "SpellAuraEffects.h"
 #include "Player.h"
 #include "InstanceScript.h"
-#include "CreatureAIImpl.h"
 #include "ObjectAccessor.h"
 
 enum Texts
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_commander_springvale.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_commander_springvale.cpp
index 2e8a8ae57c..f12b1e89e1 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_commander_springvale.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_commander_springvale.cpp
@@ -19,9 +19,8 @@
 #include "ObjectMgr.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
-#include "Spell.h"
 #include "SpellAuras.h"
-#include "SpellAuraEffects.h"
+#include "SpellScript.h"
 #include "Player.h"
 #include "InstanceScript.h"
 #include "MotionMaster.h"
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp
index 4aba6eecf1..3456e37ff3 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp
@@ -20,7 +20,7 @@
 #include "ObjectMgr.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
-#include "Spell.h"
+#include "SpellScript.h"
 #include "SpellAuras.h"
 #include "SpellAuraEffects.h"
 #include "Player.h"
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_walden.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_walden.cpp
index cdfd95d130..5f10503ec4 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_walden.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_walden.cpp
@@ -16,6 +16,7 @@
 */
 
 #include "shadowfang_keep.h"
+#include "SpellScript.h"
 #include "ObjectMgr.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
index 5db5ba18ee..fc74b0ec41 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
@@ -21,7 +21,6 @@
 #include "GameObject.h"
 #include "Player.h"
 #include "InstanceScript.h"
-#include "shadowfang_keep.h"
 #include "Map.h"
 #include "Creature.h"
 #include "EventMap.h"
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
index e9a301bc51..75482787ce 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
@@ -20,7 +20,6 @@
 #include "MotionMaster.h"
 #include "GridNotifiersImpl.h"
 #include "ScriptedCreature.h"
-#include "ScriptedGossip.h"
 #include "SpellScript.h"
 #include "SpellAuraEffects.h"
 #include "ScriptedEscortAI.h"
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
index 073782a228..7b8be7d9bc 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
@@ -19,7 +19,7 @@
 #define DEF_SHADOWFANG_H
 
 #include "CreatureAIImpl.h"
-#include "SpellScript.h"
+#include "Creature.h"
 
 #define DataHeader "SK"
 #define SKScriptName "instance_shadowfang_keep"
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
index 1949e0270d..c6870eae8f 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
@@ -15,7 +15,6 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ObjectMgr.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "zulgurub.h"
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
index 5396ea8f04..24db7f1f97 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
@@ -15,7 +15,6 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ObjectMgr.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "zulgurub.h"
diff --git a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp
index b011fc641c..81c288796c 100644
--- a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp
@@ -22,7 +22,6 @@ Quest support: 3628.
 
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
-#include "ScriptedGossip.h"
 #include "SpellScript.h"
 #include "Player.h"
 #include "Group.h"
diff --git a/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp b/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp
index 202d79f9ba..d1b27df752 100644
--- a/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp
@@ -19,7 +19,6 @@
 #include "CreatureAIImpl.h"
 #include "CreatureGroups.h"
 #include "GameEventMgr.h"
-#include "GameTime.h"
 #include "GridNotifiersImpl.h"
 #include "MotionMaster.h"
 #include "ObjectAccessor.h"
diff --git a/src/server/scripts/EasternKingdoms/zone_hillsbrad_foothills.cpp b/src/server/scripts/EasternKingdoms/zone_hillsbrad_foothills.cpp
index 8b36dcbf4a..3e72a7e3b1 100644
--- a/src/server/scripts/EasternKingdoms/zone_hillsbrad_foothills.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_hillsbrad_foothills.cpp
@@ -23,7 +23,6 @@
 #include "MotionMaster.h"
 #include "ObjectAccessor.h"
 #include "Player.h"
-#include "PassiveAI.h"
 #include "PhasingHandler.h"
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_ammunae.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_ammunae.cpp
index f3727f07a9..b3aea9a58d 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_ammunae.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_ammunae.cpp
@@ -16,7 +16,6 @@
  */
 
 #include "halls_of_origination.h"
-#include "CreatureAIImpl.h"
 #include "PassiveAI.h"
 #include "Player.h"
 #include "ScriptMgr.h"
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp
index d44e1360bc..e00f8b0996 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp
@@ -23,7 +23,6 @@
 #include "MotionMaster.h"
 #include "Player.h"
 #include "ScriptedCreature.h"
-#include "ScriptedGossip.h"
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"
 
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
index af11edde9e..2140568298 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
@@ -24,10 +24,8 @@
 #include "ScriptedCreature.h"
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"
-#include "TemporarySummon.h"
 #include "PassiveAI.h"
 #include "GridNotifiers.h"
-#include "MoveSplineInit.h"
 #include "MoveSpline.h"
 #include "Weather.h"
 #include "ObjectAccessor.h"
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_isiset.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_isiset.cpp
index 81612a7ca9..2c65a12b3e 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_isiset.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_isiset.cpp
@@ -22,7 +22,6 @@
 #include "SpellAuraEffects.h"
 #include "halls_of_origination.h"
 #include "InstanceScript.h"
-#include "TemporarySummon.h"
 
 enum Spells
 {
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp
index 469d2259b0..6b38a748d4 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp
@@ -29,7 +29,6 @@
 #include "ScriptedCreature.h"
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"
-#include "World.h"
 
 enum Texts
 {
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h b/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h
index 90618fadbf..e4a807a911 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h
@@ -20,7 +20,6 @@
 
 #include "CreatureAIImpl.h"
 #include "Position.h"
-#include "Creature.h"
 
 #define DataHeader "HOO"
 #define HoOScriptName "instance_halls_of_origination"
diff --git a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp
index c92f0d30b7..ace57169b7 100644
--- a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp
+++ b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp
@@ -19,12 +19,10 @@
 #include "throne_of_the_four_winds.h"
 #include "GameObject.h"
 #include "ObjectMgr.h"
-#include "MoveSplineInit.h"
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
 #include "SpellAuraEffects.h"
 #include "SpellMgr.h"
-#include "Spell.h"
 #include "Vehicle.h"
 #include "InstanceScript.h"
 #include "MotionMaster.h"
diff --git a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/instance_throne_of_the_four_winds.cpp b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/instance_throne_of_the_four_winds.cpp
index f5b7e21724..5aecac2e5f 100644
--- a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/instance_throne_of_the_four_winds.cpp
+++ b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/instance_throne_of_the_four_winds.cpp
@@ -29,7 +29,6 @@
 #include "Weather.h"
 #include "Player.h"
 #include "Creature.h"
-#include "Map.h"
 
 ObjectData const creatureData[] =
 {
diff --git a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/throne_of_the_four_winds.cpp b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/throne_of_the_four_winds.cpp
index a2ccdbdb7f..ff06fe2780 100644
--- a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/throne_of_the_four_winds.cpp
+++ b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/throne_of_the_four_winds.cpp
@@ -22,7 +22,6 @@
 #include "SpellAuraEffects.h"
 #include "GameObject.h"
 #include "GameObjectAI.h"
-#include "MoveSplineInit.h"
 #include "Player.h"
 #include "Vehicle.h"
 #include "InstanceScript.h"
diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp
index 65844dc120..d5439560a1 100644
--- a/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp
+++ b/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp
@@ -24,7 +24,6 @@
 #include "PassiveAI.h"
 #include "Player.h"
 #include "ScriptedCreature.h"
-#include "Spell.h"
 #include "SpellInfo.h"
 #include "SpellScript.h"
 #include "TemporarySummon.h"
diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp
index 9bf332bc8a..55b45f91ae 100644
--- a/src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp
+++ b/src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp
@@ -22,7 +22,6 @@
 #include "SpellScript.h"
 #include "TemporarySummon.h"
 #include "InstanceScript.h"
-#include "SpellScript.h"
 #include "Unit.h"
 #include "SpellInfo.h"
 #include "vortex_pinnacle.h"
diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp
index 5df8fe2ccc..fa0c97f2b2 100644
--- a/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp
+++ b/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp
@@ -19,7 +19,6 @@
 #include "AreaBoundary.h"
 #include "InstanceScript.h"
 #include "MotionMaster.h"
-#include "MoveSplineInit.h"
 #include "PassiveAI.h"
 #include "Player.h"
 #include "ScriptedCreature.h"
diff --git a/src/server/scripts/Kalimdor/zone_felwood.cpp b/src/server/scripts/Kalimdor/zone_felwood.cpp
index 3ed2e0c15e..ce5cadd9a5 100644
--- a/src/server/scripts/Kalimdor/zone_felwood.cpp
+++ b/src/server/scripts/Kalimdor/zone_felwood.cpp
@@ -19,7 +19,6 @@
 #include "MotionMaster.h"
 #include "Player.h"
 #include "ScriptedCreature.h"
-#include "ScriptedGossip.h"
 #include "SpellScript.h"
 
 /*######
diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp
index 0705b8eafc..d579e60afa 100644
--- a/src/server/scripts/Kalimdor/zone_moonglade.cpp
+++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp
@@ -20,7 +20,6 @@
 #include "MotionMaster.h"
 #include "Player.h"
 #include "ScriptedCreature.h"
-#include "ScriptedGossip.h"
 #include "SpellInfo.h"
 
 
diff --git a/src/server/scripts/Kalimdor/zone_mount_hyjal.cpp b/src/server/scripts/Kalimdor/zone_mount_hyjal.cpp
index 5199d0fb2b..f431b5c60b 100644
--- a/src/server/scripts/Kalimdor/zone_mount_hyjal.cpp
+++ b/src/server/scripts/Kalimdor/zone_mount_hyjal.cpp
@@ -24,7 +24,6 @@
 #include "MoveSplineInit.h"
 #include "PassiveAI.h"
 #include "Spell.h"
-#include "Vehicle.h"
 #include "Map.h"
 #include "MotionMaster.h"
 #include "ObjectAccessor.h"
diff --git a/src/server/scripts/Kalimdor/zone_winterspring.cpp b/src/server/scripts/Kalimdor/zone_winterspring.cpp
index d80a40ee5c..bf5e0626fc 100644
--- a/src/server/scripts/Kalimdor/zone_winterspring.cpp
+++ b/src/server/scripts/Kalimdor/zone_winterspring.cpp
@@ -35,7 +35,6 @@ EndContentData */
 #include "Player.h"
 #include "ScriptedEscortAI.h"
 #include "TemporarySummon.h"
-#include "WorldSession.h"
 
 enum Says
 {
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
index f231859029..4cadbc64eb 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
@@ -28,7 +28,6 @@ EndScriptData */
 #include "Player.h"
 #include "ScriptedCreature.h"
 #include "shattered_halls.h"
-#include "SpellAuraEffects.h"
 #include "SpellAuras.h"
 #include "SpellScript.h"
 #include "TemporarySummon.h"
diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp
index 9b162419c4..12d5b8ef19 100644
--- a/src/server/scripts/Outland/zone_nagrand.cpp
+++ b/src/server/scripts/Outland/zone_nagrand.cpp
@@ -33,7 +33,6 @@ EndContentData */
 #include "MotionMaster.h"
 #include "Player.h"
 #include "ScriptedEscortAI.h"
-#include "ScriptedGossip.h"
 #include "SpellInfo.h"
 #include "TemporarySummon.h"
 
diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp
index b5823283cb..b538bb6f51 100644
--- a/src/server/scripts/Outland/zone_netherstorm.cpp
+++ b/src/server/scripts/Outland/zone_netherstorm.cpp
@@ -36,7 +36,6 @@ EndContentData */
 #include "ObjectAccessor.h"
 #include "Player.h"
 #include "ScriptedEscortAI.h"
-#include "ScriptedGossip.h"
 
 /*######
 ## npc_commander_dawnforge
diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
index 778783ca66..303db07917 100644
--- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
@@ -44,7 +44,6 @@ EndContentData */
 #include "ObjectAccessor.h"
 #include "Player.h"
 #include "ScriptedEscortAI.h"
-#include "ScriptedGossip.h"
 #include "SpellInfo.h"
 #include "SpellScript.h"
 #include "TemporarySummon.h"
diff --git a/src/server/scripts/Pet/pet_mage.cpp b/src/server/scripts/Pet/pet_mage.cpp
index a8ae9491f2..c9022836dc 100644
--- a/src/server/scripts/Pet/pet_mage.cpp
+++ b/src/server/scripts/Pet/pet_mage.cpp
@@ -22,10 +22,8 @@
 
 #include "ScriptMgr.h"
 #include "CellImpl.h"
-#include "CombatAI.h"
 #include "GridNotifiersImpl.h"
 #include "MotionMaster.h"
-#include "PetAI.h"
 #include "ScriptedCreature.h"
 #include "TemporarySummon.h"
 
diff --git a/src/server/scripts/Pet/pet_paladin.cpp b/src/server/scripts/Pet/pet_paladin.cpp
index 18a7572467..0faef3b0bc 100644
--- a/src/server/scripts/Pet/pet_paladin.cpp
+++ b/src/server/scripts/Pet/pet_paladin.cpp
@@ -22,7 +22,6 @@
 
 #include "ScriptMgr.h"
 #include "CellImpl.h"
-#include "CombatAI.h"
 #include "GridNotifiersImpl.h"
 #include "MotionMaster.h"
 #include "PetAI.h"
diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index 508a22b346..e916425448 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -31,7 +31,6 @@
 #include "Group.h"
 #include "InstanceScript.h"
 #include "Item.h"
-#include "LFGMgr.h"
 #include "Log.h"
 #include "ObjectAccessor.h"
 #include "Pet.h"
diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp
index d93024b8a5..43eeed5f73 100644
--- a/src/server/scripts/Spells/spell_rogue.cpp
+++ b/src/server/scripts/Spells/spell_rogue.cpp
@@ -25,7 +25,6 @@
 #include "Containers.h"
 #include "DBCStores.h"
 #include "Item.h"
-#include "Log.h"
 #include "ObjectAccessor.h"
 #include "Player.h"
 #include "SpellAuraEffects.h"
diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp
index 097fe03e85..f430f78b09 100644
--- a/src/server/scripts/Spells/spell_shaman.cpp
+++ b/src/server/scripts/Spells/spell_shaman.cpp
@@ -29,6 +29,7 @@
 #include "SpellHistory.h"
 #include "SpellMgr.h"
 #include "SpellScript.h"
+#include "TemporarySummon.h"
 #include "Unit.h"
 
 enum ShamanSpells
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index b2dd7ab4bb..96bbd979c9 100644
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -31,7 +31,6 @@
 #include "PetAI.h"
 #include "ScriptedEscortAI.h"
 #include "ScriptedGossip.h"
-#include "ScriptMgr.h"
 #include "SmartAI.h"
 #include "SpellAuras.h"
 #include "SpellHistory.h"
diff --git a/src/server/scripts/World/world_map_scripts.cpp b/src/server/scripts/World/world_map_scripts.cpp
index ce339d84ce..a3ab78ba18 100644
--- a/src/server/scripts/World/world_map_scripts.cpp
+++ b/src/server/scripts/World/world_map_scripts.cpp
@@ -20,7 +20,6 @@
 #include "Map.h"
 #include "Player.h"
 #include "SpellMgr.h"
-#include "Transport.h"
 #include "Unit.h"
 #include "Weather.h"
 #include "ObjectMgr.h"
diff --git a/src/server/shared/DataStores/DB2Store.h b/src/server/shared/DataStores/DB2Store.h
index 49ee6a2a2d..462138891f 100644
--- a/src/server/shared/DataStores/DB2Store.h
+++ b/src/server/shared/DataStores/DB2Store.h
@@ -23,7 +23,6 @@
 #include "Common.h"
 #include "Errors.h"
 #include "ByteBuffer.h"
-#include <vector>
 
 /// Interface class for common access
 class DB2StorageBase
diff --git a/src/server/shared/DataStores/DBCDatabaseLoader.h b/src/server/shared/DataStores/DBCDatabaseLoader.h
index 5b3e714a41..4a858aa4e0 100644
--- a/src/server/shared/DataStores/DBCDatabaseLoader.h
+++ b/src/server/shared/DataStores/DBCDatabaseLoader.h
@@ -20,7 +20,6 @@
 
 #include "DBCFileLoader.h"
 #include <string>
-#include <vector>
 
 struct TC_SHARED_API DBCDatabaseLoader
 {
diff --git a/src/server/worldserver/RemoteAccess/RASession.h b/src/server/worldserver/RemoteAccess/RASession.h
index 9912719309..004d8fc5a8 100644
--- a/src/server/worldserver/RemoteAccess/RASession.h
+++ b/src/server/worldserver/RemoteAccess/RASession.h
@@ -21,7 +21,6 @@
 #include <memory>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/streambuf.hpp>
-#include "Common.h"
 
 #include <future>
 
diff --git a/src/server/worldserver/TCSoap/TCSoap.h b/src/server/worldserver/TCSoap/TCSoap.h
index e45d044983..4b8fef3a72 100644
--- a/src/server/worldserver/TCSoap/TCSoap.h
+++ b/src/server/worldserver/TCSoap/TCSoap.h
@@ -19,7 +19,6 @@
 #define _TCSOAP_H
 
 #include "Define.h"
-#include <mutex>
 #include <future>
 #include <string>
 
diff --git a/src/tools/vmap4_extractor/gameobject_extract.cpp b/src/tools/vmap4_extractor/gameobject_extract.cpp
index b4c15817b8..60a0c5b098 100644
--- a/src/tools/vmap4_extractor/gameobject_extract.cpp
+++ b/src/tools/vmap4_extractor/gameobject_extract.cpp
@@ -20,7 +20,6 @@
 #include "adtfile.h"
 #include "vmapexport.h"
 #include "VMapDefinitions.h"
-#include <algorithm>
 #include <stdio.h>
 
 bool ExtractSingleModel(std::string& fname)
diff --git a/src/tools/vmap4_extractor/model.cpp b/src/tools/vmap4_extractor/model.cpp
index 9e91d33c5b..21ec58ab58 100644
--- a/src/tools/vmap4_extractor/model.cpp
+++ b/src/tools/vmap4_extractor/model.cpp
@@ -20,10 +20,8 @@
 #include "model.h"
 #include "wmo.h"
 #include "adtfile.h"
-#include "mpqfile.h"
 #include "VMapDefinitions.h"
 #include <G3D/Quat.h>
-#include <algorithm>
 #include <cstdio>
 #include <limits>
 
diff --git a/src/tools/vmap4_extractor/mpqfile.cpp b/src/tools/vmap4_extractor/mpqfile.cpp
index 8a7af1bbca..73c4d191f0 100644
--- a/src/tools/vmap4_extractor/mpqfile.cpp
+++ b/src/tools/vmap4_extractor/mpqfile.cpp
@@ -1,5 +1,4 @@
 #include "mpqfile.h"
-#include <deque>
 #include <cstdio>
 #include "StormLib.h"
 
diff --git a/src/tools/vmap4_extractor/mpqfile.h b/src/tools/vmap4_extractor/mpqfile.h
index 71f0d3843c..17f3e4d7be 100644
--- a/src/tools/vmap4_extractor/mpqfile.h
+++ b/src/tools/vmap4_extractor/mpqfile.h
@@ -6,12 +6,6 @@
 #ifndef MPQ_H
 #define MPQ_H
 
-#include <string.h>
-#include <ctype.h>
-#include <vector>
-#include <iostream>
-#include <deque>
-#include "StormLib.h"
 #include "Define.h"
 
 #ifdef _WIN32
diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp
index 82829ea7d7..fdf8309820 100644
--- a/src/tools/vmap4_extractor/vmapexport.cpp
+++ b/src/tools/vmap4_extractor/vmapexport.cpp
@@ -19,7 +19,6 @@
 #include "wdtfile.h"
 #include "dbcfile.h"
 #include "wmo.h"
-#include "mpqfile.h"
 #include "StringFormat.h"
 #include "vmapexport.h"
 #include "VMapDefinitions.h"
@@ -41,7 +40,6 @@
 #undef max
 
 #include <cstdio>
-#include <iostream>
 #include <map>
 #include <unordered_map>
 #include <unordered_set>
diff --git a/src/tools/vmap4_extractor/wmo.cpp b/src/tools/vmap4_extractor/wmo.cpp
index 75c59d8a08..083c948041 100644
--- a/src/tools/vmap4_extractor/wmo.cpp
+++ b/src/tools/vmap4_extractor/wmo.cpp
@@ -17,7 +17,6 @@
 
 #include "vmapexport.h"
 #include "adtfile.h"
-#include "mpqfile.h"
 #include "Errors.h"
 #include "vec3d.h"
 #include "VMapDefinitions.h"
diff --git a/src/tools/vmap4_extractor/wmo.h b/src/tools/vmap4_extractor/wmo.h
index 1280aec80d..2f78ec94ab 100644
--- a/src/tools/vmap4_extractor/wmo.h
+++ b/src/tools/vmap4_extractor/wmo.h
@@ -23,7 +23,6 @@
 #include <memory>
 #include <vector>
 #include "vec3d.h"
-#include "mpqfile.h"
 
 // MOPY flags
 enum MopyFlags