diff --git a/src/common/Collision/DynamicTree.cpp b/src/common/Collision/DynamicTree.cpp
index 3fe1f33b8..e7020c627 100644
--- a/src/common/Collision/DynamicTree.cpp
+++ b/src/common/Collision/DynamicTree.cpp
@@ -18,7 +18,6 @@
 #include "DynamicTree.h"
 #include "BoundingIntervalHierarchyWrapper.h"
 #include "GameObjectModel.h"
-#include "Log.h"
 #include "MapTree.h"
 #include "ModelInstance.h"
 #include "RegularGrid.h"
diff --git a/src/common/Utilities/Util.cpp b/src/common/Utilities/Util.cpp
index 53af88440..dc8348452 100644
--- a/src/common/Utilities/Util.cpp
+++ b/src/common/Utilities/Util.cpp
@@ -20,7 +20,6 @@
 #include "Containers.h"
 #include "IpAddress.h"
 #include "StringConvert.h"
-#include "StringFormat.h"
 #include "Tokenize.h"
 #include <algorithm>
 #include <boost/core/demangle.hpp>
diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp
index 6a79401f7..c7ff02847 100644
--- a/src/server/authserver/Main.cpp
+++ b/src/server/authserver/Main.cpp
@@ -26,7 +26,6 @@
 #include "AppenderDB.h"
 #include "AuthSocketMgr.h"
 #include "Banner.h"
-#include "Common.h"
 #include "Config.h"
 #include "DatabaseEnv.h"
 #include "DatabaseLoader.h"
diff --git a/src/server/database/Database/DatabaseWorkerPool.cpp b/src/server/database/Database/DatabaseWorkerPool.cpp
index 9bd474578..c1c0361eb 100644
--- a/src/server/database/Database/DatabaseWorkerPool.cpp
+++ b/src/server/database/Database/DatabaseWorkerPool.cpp
@@ -17,7 +17,6 @@
 
 #include "DatabaseWorkerPool.h"
 #include "AdhocStatement.h"
-#include "Common.h"
 #include "Errors.h"
 #include "Implementation/CharacterDatabase.h"
 #include "Implementation/LoginDatabase.h"
@@ -175,7 +174,7 @@ bool DatabaseWorkerPool<T>::PrepareStatements()
                     uint32 const paramCount = stmt->GetParameterCount();
 
                     // TC only supports uint8 indices.
-                    ASSERT(paramCount < std::numeric_limits<uint8>::max());
+                    ASSERT(paramCount < (std::numeric_limits<uint8>::max)());
 
                     _preparedStatementSize[i] = static_cast<uint8>(paramCount);
                 }
diff --git a/src/server/database/Database/MySQLConnection.cpp b/src/server/database/Database/MySQLConnection.cpp
index e5ee70ac1..90d5ddaa2 100644
--- a/src/server/database/Database/MySQLConnection.cpp
+++ b/src/server/database/Database/MySQLConnection.cpp
@@ -16,7 +16,6 @@
  */
 
 #include "MySQLConnection.h"
-#include "Common.h"
 #include "DatabaseWorker.h"
 #include "Log.h"
 #include "MySQLHacks.h"
diff --git a/src/server/game/DungeonFinding/LFGPlayerData.cpp b/src/server/game/DungeonFinding/LFGPlayerData.cpp
index a063453ab..ddfeec2fc 100644
--- a/src/server/game/DungeonFinding/LFGPlayerData.cpp
+++ b/src/server/game/DungeonFinding/LFGPlayerData.cpp
@@ -16,7 +16,6 @@
  */
 
 #include "LFGPlayerData.h"
-#include "LFGMgr.h"
 
 namespace lfg
 {
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 7f07af7d3..dfb37b690 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -48,7 +48,6 @@
 #include "WaypointMovementGenerator.h"
 #include "World.h"
 #include "WorldPacket.h"
-#include "Pet.h"
 
 // TODO: this import is not necessary for compilation and marked as unused by the IDE
 //  however, for some reasons removing it would cause a damn linking issue
diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp
index 6b11b4566..053f8d077 100644
--- a/src/server/game/Entities/Pet/Pet.cpp
+++ b/src/server/game/Entities/Pet/Pet.cpp
@@ -17,7 +17,6 @@
 
 #include "Pet.h"
 #include "ArenaSpectator.h"
-#include "Battleground.h"
 #include "Common.h"
 #include "CreatureAI.h"
 #include "DatabaseEnv.h"
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index f90e5ccec..e73bd8bd5 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -80,7 +80,6 @@
 #include "Util.h"
 #include "Vehicle.h"
 #include "Weather.h"
-#include "WeatherMgr.h"
 #include "World.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
diff --git a/src/server/game/Handlers/AuctionHouseHandler.cpp b/src/server/game/Handlers/AuctionHouseHandler.cpp
index df3920f21..632144b8c 100644
--- a/src/server/game/Handlers/AuctionHouseHandler.cpp
+++ b/src/server/game/Handlers/AuctionHouseHandler.cpp
@@ -25,7 +25,6 @@
 #include "Player.h"
 #include "ScriptMgr.h"
 #include "UpdateMask.h"
-#include "Util.h"
 #include "World.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
diff --git a/src/server/game/Modules/ModuleMgr.cpp b/src/server/game/Modules/ModuleMgr.cpp
index e5d34efc6..ed9ce90ab 100644
--- a/src/server/game/Modules/ModuleMgr.cpp
+++ b/src/server/game/Modules/ModuleMgr.cpp
@@ -16,7 +16,6 @@
  */
 
 #include "ModuleMgr.h"
-#include "Log.h"
 #include "Tokenize.h"
 
 namespace
diff --git a/src/server/scripts/Commands/cs_bag.cpp b/src/server/scripts/Commands/cs_bag.cpp
index 20c0cb1a2..d190b790f 100644
--- a/src/server/scripts/Commands/cs_bag.cpp
+++ b/src/server/scripts/Commands/cs_bag.cpp
@@ -16,7 +16,6 @@
  */
 
 #include "Chat.h"
-#include "Language.h"
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "ScriptMgr.h"
diff --git a/src/server/scripts/Commands/cs_group.cpp b/src/server/scripts/Commands/cs_group.cpp
index 85d699b2b..d7c192be9 100644
--- a/src/server/scripts/Commands/cs_group.cpp
+++ b/src/server/scripts/Commands/cs_group.cpp
@@ -20,8 +20,6 @@
 #include "DatabaseEnv.h"
 #include "GroupMgr.h"
 #include "Language.h"
-#include "LFG.h"
-#include "ObjectAccessor.h"
 #include "Player.h"
 
 using namespace Acore::ChatCommands;
diff --git a/src/server/scripts/Commands/cs_pet.cpp b/src/server/scripts/Commands/cs_pet.cpp
index 533a3a89d..6dd3f2812 100644
--- a/src/server/scripts/Commands/cs_pet.cpp
+++ b/src/server/scripts/Commands/cs_pet.cpp
@@ -25,7 +25,6 @@
 #include "SpellMgr.h"
 #include "SpellInfo.h"
 #include "WorldSession.h"
-#include "ObjectMgr.h"
 
 using namespace Acore::ChatCommands;
 
diff --git a/src/server/scripts/Commands/cs_send.cpp b/src/server/scripts/Commands/cs_send.cpp
index 6e69304dc..bf15904bb 100644
--- a/src/server/scripts/Commands/cs_send.cpp
+++ b/src/server/scripts/Commands/cs_send.cpp
@@ -24,7 +24,6 @@
 #include "ObjectMgr.h"
 #include "Pet.h"
 #include "Player.h"
-#include "WorldSession.h"
 #include "Tokenize.h"
 
 using namespace Acore::ChatCommands;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
index 28b5fd823..bc8b29bed 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
@@ -21,7 +21,6 @@
 #include "MotionMaster.h"
 #include "Player.h"
 #include "ScriptMgr.h"
-#include "ScriptedCreature.h"
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"
 #include "TemporarySummon.h"
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
index 3a1d8ac69..665cd5258 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
@@ -16,7 +16,6 @@
  */
 
 #include "ObjectAccessor.h"
-#include "ObjectMgr.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "molten_core.h"
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
index 8860a6742..230b54e6e 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
@@ -18,7 +18,6 @@
 #include "InstanceScript.h"
 #include "ObjectMgr.h"
 #include "ScriptMgr.h"
-#include "ScriptedCreature.h"
 #include "TemporarySummon.h"
 #include "molten_core.h"
 
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
index 99c7d0625..c189559b4 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
@@ -18,7 +18,6 @@
 #include "Player.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
-#include "ScriptedEscortAI.h"
 #include "azjol_nerub.h"
 
 enum Spells
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp
index 78e7cc6eb..f701b22fa 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp
@@ -18,7 +18,6 @@
 #include "OutdoorPvPZM.h"
 #include "Creature.h"
 #include "GameGraveyard.h"
-#include "GossipDef.h"
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
 #include "OutdoorPvPMgr.h"
diff --git a/src/server/worldserver/ACSoap/ACSoap.cpp b/src/server/worldserver/ACSoap/ACSoap.cpp
index ff2ea70b0..3b2c2ef8c 100644
--- a/src/server/worldserver/ACSoap/ACSoap.cpp
+++ b/src/server/worldserver/ACSoap/ACSoap.cpp
@@ -19,7 +19,6 @@
 #include "AccountMgr.h"
 #include "Log.h"
 #include "World.h"
-#include "soapH.h"
 #include "soapStub.h"
 
 void ACSoapThread(const std::string& host, uint16 port)
diff --git a/src/server/worldserver/CommandLine/CliRunnable.cpp b/src/server/worldserver/CommandLine/CliRunnable.cpp
index 5a6b96651..1fbb0b06e 100644
--- a/src/server/worldserver/CommandLine/CliRunnable.cpp
+++ b/src/server/worldserver/CommandLine/CliRunnable.cpp
@@ -20,12 +20,9 @@
 /// \file
 
 #include "CliRunnable.h"
-#include "Common.h"
 #include "Config.h"
 #include "Errors.h"
-#include "Log.h"
 #include "ObjectMgr.h"
-#include "Util.h"
 #include "World.h"
 
 #if AC_PLATFORM != AC_PLATFORM_WINDOWS