diff --git a/src/common/Debugging/Errors.cpp b/src/common/Debugging/Errors.cpp
index 0c8fa924cbb..91e65a070a3 100644
--- a/src/common/Debugging/Errors.cpp
+++ b/src/common/Debugging/Errors.cpp
@@ -34,6 +34,7 @@
  */
 
 #if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS
+#include <Windows.h>
 #define Crash(message) \
     ULONG_PTR execeptionArgs[] = { reinterpret_cast<ULONG_PTR>(strdup(message)), reinterpret_cast<ULONG_PTR>(_ReturnAddress()) }; \
     RaiseException(EXCEPTION_ASSERTION_FAILURE, 0, 2, execeptionArgs);
diff --git a/src/server/database/Database/Implementation/HotfixDatabase.cpp b/src/server/database/Database/Implementation/HotfixDatabase.cpp
index f286063c886..457657da51a 100644
--- a/src/server/database/Database/Implementation/HotfixDatabase.cpp
+++ b/src/server/database/Database/Implementation/HotfixDatabase.cpp
@@ -19,6 +19,7 @@
 // Autogenerated from DB2Structure.h
 
 #include "HotfixDatabase.h"
+#include "PreparedStatement.h"
 
 // Force locale statments to appear exactly in locale declaration order, right after normal data fetch statement
 #define PREPARE_LOCALE_STMT(stmtBase, sql, con) \
diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp
index 842380173c5..33b02e010fc 100644
--- a/src/server/game/AI/CreatureAI.cpp
+++ b/src/server/game/AI/CreatureAI.cpp
@@ -20,6 +20,7 @@
 #include "Creature.h"
 #include "CreatureAIImpl.h"
 #include "CreatureTextMgr.h"
+#include "DBCStores.h"
 #include "Language.h"
 #include "Log.h"
 #include "Map.h"
diff --git a/src/server/game/Achievements/AchievementMgr.h b/src/server/game/Achievements/AchievementMgr.h
index 76b715519ed..53ef2a5bc99 100644
--- a/src/server/game/Achievements/AchievementMgr.h
+++ b/src/server/game/Achievements/AchievementMgr.h
@@ -28,6 +28,7 @@
 
 class Unit;
 class Player;
+class GameObject;
 class WorldPacket;
 
 typedef std::vector<AchievementCriteriaEntry const*> AchievementCriteriaEntryList;
diff --git a/src/server/game/DataStores/DB2Stores.cpp b/src/server/game/DataStores/DB2Stores.cpp
index 3c84af3028d..f85ab47cfa8 100644
--- a/src/server/game/DataStores/DB2Stores.cpp
+++ b/src/server/game/DataStores/DB2Stores.cpp
@@ -15,12 +15,15 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "DB2Stores.h"
 #include "Common.h"
+#include "DatabaseEnv.h"
+#include "DB2Stores.h"
 #include "DB2fmt.h"
 #include "Errors.h"
+#include "HotfixDatabase.h"
 #include "Log.h"
 #include "World.h"
+
 #include <sstream>
 
 DB2Storage<ItemEntry>               sItemStore("Item.db2", Itemfmt, HOTFIX_SEL_ITEM);
diff --git a/src/server/game/DataStores/DB2Stores.h b/src/server/game/DataStores/DB2Stores.h
index af5b14a4807..b676089fcba 100644
--- a/src/server/game/DataStores/DB2Stores.h
+++ b/src/server/game/DataStores/DB2Stores.h
@@ -20,6 +20,8 @@
 
 #include "DB2Store.h"
 #include "DB2Structure.h"
+
+#include <map>
 #include <string>
 
 TC_GAME_API extern DB2Storage<ItemEntry>                sItemStore;
diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp
index aaf9196d149..c4d1b675de0 100644
--- a/src/server/game/DataStores/DBCStores.cpp
+++ b/src/server/game/DataStores/DBCStores.cpp
@@ -23,6 +23,7 @@
 #include "ItemTemplate.h"
 #include "Log.h"
 #include "ObjectDefines.h"
+#include "Player.h"
 #include "Regex.h"
 #include "SharedDefines.h"
 #include "SpellMgr.h"
diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp
index 9424fdc992f..19bed3c73cc 100644
--- a/src/server/game/Entities/Creature/CreatureGroups.cpp
+++ b/src/server/game/Entities/Creature/CreatureGroups.cpp
@@ -24,6 +24,8 @@
 #include "MotionMaster.h"
 #include "ObjectMgr.h"
 
+#include <cmath>
+
 #define MAX_DESYNC 5.0f
 
 FormationMgr::~FormationMgr()
diff --git a/src/server/game/Entities/Creature/CreatureGroups.h b/src/server/game/Entities/Creature/CreatureGroups.h
index 8287e49158e..2c6e9865d67 100644
--- a/src/server/game/Entities/Creature/CreatureGroups.h
+++ b/src/server/game/Entities/Creature/CreatureGroups.h
@@ -63,6 +63,8 @@ class TC_GAME_API FormationMgr
         CreatureGroupInfoType CreatureGroupMap;
 };
 
+struct Position;
+
 class TC_GAME_API CreatureGroup
 {
     private:
diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h
index cb9c3e1ffbb..9ad6292c869 100644
--- a/src/server/game/Entities/GameObject/GameObject.h
+++ b/src/server/game/Entities/GameObject/GameObject.h
@@ -29,6 +29,7 @@ class GameObjectAI;
 class GameObjectModel;
 class Group;
 class OPvPCapturePoint;
+class SpellInfo;
 class Transport;
 class Unit;
 struct TransportAnimation;
diff --git a/src/server/game/Entities/Item/ItemTemplate.h b/src/server/game/Entities/Item/ItemTemplate.h
index 9cd0dd8af89..b86fcc6d962 100644
--- a/src/server/game/Entities/Item/ItemTemplate.h
+++ b/src/server/game/Entities/Item/ItemTemplate.h
@@ -19,6 +19,7 @@
 #define _ITEMPROTOTYPE_H
 
 #include "DB2Structure.h"
+#include "Errors.h"
 #include "SharedDefines.h"
 #include "WorldPacket.h"
 #include <vector>
@@ -624,7 +625,9 @@ struct ItemEffect
 #define MAX_ITEM_PROTO_SPELLS  5
 #define MAX_ITEM_PROTO_STATS  10
 
-struct ItemTemplate
+class Player;
+
+struct TC_GAME_API ItemTemplate
 {
     ItemEntry const* BasicData;
     ItemSparseEntry const* ExtendedData;
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp
index 80f39e46115..bb6d00c6c29 100644
--- a/src/server/game/Guilds/Guild.cpp
+++ b/src/server/game/Guilds/Guild.cpp
@@ -42,7 +42,6 @@
 #include "Group.h"
 #include "Battleground.h"
 #include "ReputationMgr.h"
-#include <unordered_map>
 
 #define MAX_GUILD_BANK_TAB_TEXT_LEN 500
 #define EMBLEM_PRICE 10 * GOLD
diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h
index 4d5188c8032..3e4e8b3767f 100644
--- a/src/server/game/Guilds/Guild.h
+++ b/src/server/game/Guilds/Guild.h
@@ -21,6 +21,8 @@
 #include "DatabaseEnvFwd.h"
 #include "ObjectGuid.h"
 #include "SharedDefines.h"
+
+#include <array>
 #include <unordered_map>
 
 template<class T>
@@ -29,6 +31,7 @@ class AchievementMgr;
 class Item;
 class Player;
 class Unit;
+class GameObject;
 class WorldPacket;
 class WorldSession;
 struct ItemPosCount;
diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp
index 6cdb80d2d43..48ef2249a24 100644
--- a/src/server/game/Handlers/ItemHandler.cpp
+++ b/src/server/game/Handlers/ItemHandler.cpp
@@ -28,6 +28,7 @@
 #include "Player.h"
 #include "SpellInfo.h"
 #include "WorldPacket.h"
+#include "World.h"
 
 void WorldSession::HandleSplitItemOpcode(WorldPacket& recvData)
 {
diff --git a/src/server/game/Handlers/LFGHandler.cpp b/src/server/game/Handlers/LFGHandler.cpp
index 0bb1729a992..0ef27178486 100644
--- a/src/server/game/Handlers/LFGHandler.cpp
+++ b/src/server/game/Handlers/LFGHandler.cpp
@@ -15,9 +15,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "LFGMgr.h"
+#include "DBCStores.h"
 #include "GameTime.h"
 #include "Group.h"
+#include "LFGMgr.h"
 #include "LFGPackets.h"
 #include "Log.h"
 #include "ObjectAccessor.h"
diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp
index 8c45c189424..ddaede5e4c6 100644
--- a/src/server/game/Instances/InstanceScript.cpp
+++ b/src/server/game/Instances/InstanceScript.cpp
@@ -21,7 +21,7 @@
 #include "CreatureAI.h"
 #include "CreatureAIImpl.h"
 #include "DatabaseEnv.h"
-#include "DBCStructure.h"
+#include "DBCStores.h"
 #include "GameObject.h"
 #include "Group.h"
 #include "Guild.h"
diff --git a/src/server/game/Loot/Loot.cpp b/src/server/game/Loot/Loot.cpp
index 11db358095c..5503a5dbe1d 100644
--- a/src/server/game/Loot/Loot.cpp
+++ b/src/server/game/Loot/Loot.cpp
@@ -16,6 +16,7 @@
  */
 
 #include "Loot.h"
+#include "DBCStores.h"
 #include "Group.h"
 #include "ItemEnchantmentMgr.h"
 #include "ItemTemplate.h"
diff --git a/src/server/game/Maps/TransportMgr.cpp b/src/server/game/Maps/TransportMgr.cpp
index b0338b2143c..0a8a0ff4040 100644
--- a/src/server/game/Maps/TransportMgr.cpp
+++ b/src/server/game/Maps/TransportMgr.cpp
@@ -17,6 +17,7 @@
 
 #include "TransportMgr.h"
 #include "DatabaseEnv.h"
+#include "GameObjectData.h"
 #include "InstanceScript.h"
 #include "Log.h"
 #include "MapManager.h"
diff --git a/src/server/game/Maps/TransportMgr.h b/src/server/game/Maps/TransportMgr.h
index 99b8f9b8f59..d53cfef7f74 100644
--- a/src/server/game/Maps/TransportMgr.h
+++ b/src/server/game/Maps/TransportMgr.h
@@ -25,6 +25,7 @@
 struct KeyFrame;
 struct GameObjectTemplate;
 struct TransportTemplate;
+class Transport;
 class MapTransport;
 class Map;
 
@@ -33,12 +34,12 @@ namespace Movement
     template <typename length_type> class Spline;
 }
 
-typedef Movement::Spline<double>                 TransportSpline;
-typedef std::vector<KeyFrame>                    KeyFrameVec;
-typedef std::unordered_map<uint32, TransportTemplate> TransportTemplates;
-typedef std::set<Transport*>                     TransportSet;
-typedef std::unordered_map<uint32, TransportSet>      TransportMap;
-typedef std::unordered_map<uint32, std::set<uint32> > TransportInstanceMap;
+typedef Movement::Spline<double>                        TransportSpline;
+typedef std::vector<KeyFrame>                           KeyFrameVec;
+typedef std::unordered_map<uint32, TransportTemplate>   TransportTemplates;
+typedef std::set<Transport*>                            TransportSet;
+typedef std::unordered_map<uint32, TransportSet>        TransportMap;
+typedef std::unordered_map<uint32, std::set<uint32>>    TransportInstanceMap;
 
 struct KeyFrame
 {
@@ -83,6 +84,8 @@ struct TransportTemplate
     uint32 entry;
 };
 
+struct QuaternionData;
+
 typedef std::map<uint32, TransportAnimationEntry const*> TransportPathContainer;
 typedef std::map<uint32, TransportRotationEntry const*> TransportPathRotationContainer;
 
diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h
index eb9907e6978..97213976000 100644
--- a/src/server/game/Movement/MotionMaster.h
+++ b/src/server/game/Movement/MotionMaster.h
@@ -22,6 +22,7 @@
 #include "Errors.h"
 #include "ObjectDefines.h"
 #include "ObjectGuid.h"
+#include "Optional.h"
 #include "Position.h"
 #include "SharedDefines.h"
 #include <vector>
diff --git a/src/server/game/Movement/PathGenerator.h b/src/server/game/Movement/PathGenerator.h
index d5d54b1d210..74600490625 100644
--- a/src/server/game/Movement/PathGenerator.h
+++ b/src/server/game/Movement/PathGenerator.h
@@ -25,6 +25,7 @@
 #include <G3D/Vector3.h>
 
 class Unit;
+class WorldObject;
 
 // 74*4.0f=296y  number_of_points*interval = max_path_len
 // this is way more than actual evade range
diff --git a/src/server/game/Movement/Waypoints/WaypointManager.h b/src/server/game/Movement/Waypoints/WaypointManager.h
index 0b35a89f9f4..19e5caae826 100644
--- a/src/server/game/Movement/Waypoints/WaypointManager.h
+++ b/src/server/game/Movement/Waypoints/WaypointManager.h
@@ -18,8 +18,10 @@
 #ifndef TRINITY_WAYPOINTMANAGER_H
 #define TRINITY_WAYPOINTMANAGER_H
 
+#include "Define.h"
 #include "WaypointDefines.h"
 #include <vector>
+#include <unordered_map>
 
 class TC_GAME_API WaypointMgr
 {
diff --git a/src/server/game/Server/Packets/LFGPackets.cpp b/src/server/game/Server/Packets/LFGPackets.cpp
index 038f7ca1457..ab67d2ff8d1 100644
--- a/src/server/game/Server/Packets/LFGPackets.cpp
+++ b/src/server/game/Server/Packets/LFGPackets.cpp
@@ -16,6 +16,8 @@
  */
 
 #include "LFGPackets.h"
+#include "ItemTemplate.h"
+#include "ObjectMgr.h"
 
 void WorldPackets::LFG::LFGJoin::Read()
 {
diff --git a/src/server/game/Server/Packets/QueryPackets.cpp b/src/server/game/Server/Packets/QueryPackets.cpp
index 33334ea9667..76d5be73edc 100644
--- a/src/server/game/Server/Packets/QueryPackets.cpp
+++ b/src/server/game/Server/Packets/QueryPackets.cpp
@@ -15,7 +15,6 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "QueryPackets.h"
 
 void WorldPackets::Query::DBQueryBulk::Read()
diff --git a/src/server/game/Server/Packets/QueryPackets.h b/src/server/game/Server/Packets/QueryPackets.h
index 413d406312d..ec29d9ecd5b 100644
--- a/src/server/game/Server/Packets/QueryPackets.h
+++ b/src/server/game/Server/Packets/QueryPackets.h
@@ -19,6 +19,8 @@
 #define QueryPackets_h__
 
 #include "Packet.h"
+#include "DB2Stores.h"
+#include "ObjectGuid.h"
 
 namespace WorldPackets
 {
diff --git a/src/server/game/Server/Packets/QuestPackets.h b/src/server/game/Server/Packets/QuestPackets.h
index b94ee04d11d..ccd5f23b904 100644
--- a/src/server/game/Server/Packets/QuestPackets.h
+++ b/src/server/game/Server/Packets/QuestPackets.h
@@ -19,6 +19,7 @@
 #define QuestPackets_h__
 
 #include "Packet.h"
+#include "QuestDef.h"
 #include "ObjectGuid.h"
 #include "Optional.h"
 
diff --git a/src/server/game/Server/Packets/SpellPackets.h b/src/server/game/Server/Packets/SpellPackets.h
index ab1e4d8deab..9a985167e37 100644
--- a/src/server/game/Server/Packets/SpellPackets.h
+++ b/src/server/game/Server/Packets/SpellPackets.h
@@ -24,6 +24,8 @@
 #include "Position.h"
 #include "SharedDefines.h"
 
+#include <array>
+
 namespace WorldPackets
 {
     namespace Spells
diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp
index aa0c106b213..0c2a029ea10 100644
--- a/src/server/game/Server/WorldSocketMgr.cpp
+++ b/src/server/game/Server/WorldSocketMgr.cpp
@@ -20,6 +20,7 @@
 #include "ScriptMgr.h"
 #include "WorldSocket.h"
 #include "WorldSocketMgr.h"
+#include "World.h"
 
 #include <boost/system/error_code.hpp>
 
diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h
index c92afe6784a..83b9266a2b9 100644
--- a/src/server/game/Spells/SpellMgr.h
+++ b/src/server/game/Spells/SpellMgr.h
@@ -20,6 +20,7 @@
 
 // For static or at-server-startup loaded spell data
 
+#include "ConditionMgr.h"
 #include "Define.h"
 #include "Duration.h"
 #include "IteratorPair.h"
diff --git a/src/server/game/Weather/WeatherMgr.cpp b/src/server/game/Weather/WeatherMgr.cpp
index 4885ce4cbdd..0854b0279b2 100644
--- a/src/server/game/Weather/WeatherMgr.cpp
+++ b/src/server/game/Weather/WeatherMgr.cpp
@@ -26,6 +26,7 @@
 #include "ObjectMgr.h"
 #include "Timer.h"
 #include "Opcodes.h"
+#include "DatabaseEnv.h"
 
 namespace WeatherMgr
 {
diff --git a/src/server/scripts/EasternKingdoms/Gilneas/gilneas.h b/src/server/scripts/EasternKingdoms/Gilneas/gilneas.h
index 14cc312c90f..ef204ca8f08 100644
--- a/src/server/scripts/EasternKingdoms/Gilneas/gilneas.h
+++ b/src/server/scripts/EasternKingdoms/Gilneas/gilneas.h
@@ -18,6 +18,8 @@
 #ifndef GILNEAS_M_
 #define GILNEAS_M_
 
+#include "Position.h"
+
 /*######
 ## Quest 14154 - By the Skin of his Teeth
 ######*/
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
index ef4dde7f1d3..ab0de4bdc1f 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
@@ -15,9 +15,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "scarlet_monastery.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
-#include "scarlet_monastery.h"
+#include "InstanceScript.h"
 
 enum Yells
 {
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
index a8ab1895de2..76b62a366b8 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
@@ -17,6 +17,8 @@
 
 #include "zulaman.h"
 #include "InstanceScript.h"
+#include "Map.h"
+#include "MotionMaster.h"
 #include "ObjectAccessor.h"
 #include "PassiveAI.h"
 #include "ScriptMgr.h"
@@ -25,6 +27,7 @@
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"
 #include "SpellMgr.h"
+#include "TemporarySummon.h"
 #include "Weather.h"
 
 enum Texts
diff --git a/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp b/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp
index c0cb8ead79a..75ce8776610 100644
--- a/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp
@@ -20,9 +20,11 @@
 #include "CreatureAIImpl.h"
 #include "GridNotifiersImpl.h"
 #include "MotionMaster.h"
+#include "ObjectAccessor.h"
 #include "Player.h"
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
+
 enum Northshire
 {
     NPC_STORWIND_INFANTRY                   = 49869,
diff --git a/src/server/scripts/EasternKingdoms/zone_westfall.cpp b/src/server/scripts/EasternKingdoms/zone_westfall.cpp
index 0ef4e5d2551..0bd475f2e3e 100644
--- a/src/server/scripts/EasternKingdoms/zone_westfall.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_westfall.cpp
@@ -15,10 +15,15 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "Player.h"
 #include "ScriptMgr.h"
 #include "SpellScript.h"
 #include "CombatAI.h"
+#include "CreatureAIImpl.h"
+#include "ObjectAccessor.h"
+#include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
+#include "SpellInfo.h"
 #include "SharedDefines.h"
 
 class spell_westfall_unbound_energy : public SpellScript
diff --git a/src/server/shared/DataStores/DB2StorageLoader.cpp b/src/server/shared/DataStores/DB2StorageLoader.cpp
index 7a266d29e4c..5521a542ba4 100644
--- a/src/server/shared/DataStores/DB2StorageLoader.cpp
+++ b/src/server/shared/DataStores/DB2StorageLoader.cpp
@@ -19,6 +19,7 @@
 #include "DB2StorageLoader.h"
 #include "Database/Implementation/HotfixDatabase.h"
 #include "Database/DatabaseEnv.h"
+#include "Errors.h"
 #include "Log.h"
 
 DB2FileLoader::DB2FileLoader()
diff --git a/src/server/shared/DataStores/DB2StorageLoader.h b/src/server/shared/DataStores/DB2StorageLoader.h
index 95346f04f4f..ff5617928cb 100644
--- a/src/server/shared/DataStores/DB2StorageLoader.h
+++ b/src/server/shared/DataStores/DB2StorageLoader.h
@@ -22,6 +22,7 @@
 #include "Utilities/ByteConverter.h"
 #include <cassert>
 #include <list>
+#include <string>
 
 class TC_SHARED_API DB2FileLoader
 {