diff --git a/src/common/Collision/Maps/TileAssembler.cpp b/src/common/Collision/Maps/TileAssembler.cpp
index 8fd9fb63d..e11f53911 100644
--- a/src/common/Collision/Maps/TileAssembler.cpp
+++ b/src/common/Collision/Maps/TileAssembler.cpp
@@ -9,9 +9,7 @@
 #include "BoundingIntervalHierarchy.h"
 #include "VMapDefinitions.h"
 #include "SharedDefines.h"
-
 #include <set>
-#include <iomanip>
 #include <sstream>
 #include <iomanip>
 
diff --git a/src/common/Threading/Threading.h b/src/common/Threading/Threading.h
index 9671dee0e..a38d645ec 100644
--- a/src/common/Threading/Threading.h
+++ b/src/common/Threading/Threading.h
@@ -10,9 +10,6 @@
 #include <thread>
 #include <atomic>
 
-#include <thread>
-#include <atomic>
-
 namespace acore
 {
     class Runnable
diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp
index 7708ffc28..8f299babb 100644
--- a/src/server/game/Battlefield/Battlefield.cpp
+++ b/src/server/game/Battlefield/Battlefield.cpp
@@ -10,8 +10,6 @@
 #include "CreatureTextMgr.h"
 #include "GameGraveyard.h"
 #include "GridNotifiers.h"
-#include "GridNotifiers.h"
-#include "GridNotifiersImpl.h"
 #include "GridNotifiersImpl.h"
 #include "Group.h"
 #include "GroupMgr.h"
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index 1cbb8122f..bb9a2c7c3 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -16,7 +16,6 @@
 #include "GridNotifiersImpl.h"
 #include "Group.h"
 #include "Log.h"
-#include "Log.h"
 #include "MapManager.h"
 #include "MovementPacketBuilder.h"
 #include "Object.h"
diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp
index 04a7048de..e8d310401 100644
--- a/src/server/game/Handlers/MiscHandler.cpp
+++ b/src/server/game/Handlers/MiscHandler.cpp
@@ -4,7 +4,6 @@
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  */
 
-#include "AccountMgr.h"
 #include "AccountMgr.h"
 #include "BattlefieldMgr.h"
 #include "Battleground.h"
diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.cpp b/src/server/game/OutdoorPvP/OutdoorPvP.cpp
index 65c5df21c..80b057642 100644
--- a/src/server/game/OutdoorPvP/OutdoorPvP.cpp
+++ b/src/server/game/OutdoorPvP/OutdoorPvP.cpp
@@ -6,8 +6,6 @@
 
 #include "CellImpl.h"
 #include "GridNotifiers.h"
-#include "GridNotifiers.h"
-#include "GridNotifiersImpl.h"
 #include "GridNotifiersImpl.h"
 #include "Group.h"
 #include "Map.h"
diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp
index 334f34e0d..61f54ac0c 100644
--- a/src/server/game/Server/WorldSocket.cpp
+++ b/src/server/game/Server/WorldSocket.cpp
@@ -28,7 +28,6 @@
 #include <ace/os_include/sys/os_socket.h>
 #include <ace/os_include/sys/os_types.h>
 #include <ace/OS_NS_string.h>
-#include <ace/OS_NS_string.h>
 #include <ace/OS_NS_unistd.h>
 #include <ace/Reactor.h>
 #include <thread>
diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp
index 0198c8d47..ba4a575ed 100644
--- a/src/server/game/Server/WorldSocketMgr.cpp
+++ b/src/server/game/Server/WorldSocketMgr.cpp
@@ -28,7 +28,6 @@
 #include <ace/Reactor.h>
 #include <ace/TP_Reactor.h>
 #include <atomic>
-#include <atomic>
 #include <set>
 
 /**
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index aace850eb..42705b5ba 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -56,7 +56,6 @@
 #include "PoolMgr.h"
 #include "SavingSystem.h"
 #include "ScriptMgr.h"
-#include "ScriptMgr.h"
 #include "ServerMotd.h"
 #include "SkillDiscovery.h"
 #include "SkillExtraItems.h"
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index 2020587f8..f94bc50db 100644
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -38,13 +38,11 @@ EndContentData */
 #include "Group.h"
 #include "ObjectMgr.h"
 #include "PassiveAI.h"
-#include "PassiveAI.h"
 #include "Pet.h"
 #include "ScriptedCreature.h"
 #include "ScriptedEscortAI.h"
 #include "ScriptedGossip.h"
 #include "ScriptMgr.h"
-#include "ScriptMgr.h"
 #include "SmartAI.h"
 #include "SpellAuras.h"
 #include "WaypointManager.h"
diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp
index 309257937..679f0b624 100644
--- a/src/tools/vmap4_extractor/vmapexport.cpp
+++ b/src/tools/vmap4_extractor/vmapexport.cpp
@@ -10,14 +10,13 @@
 #include <iostream>
 #include <list>
 #include <vector>
+#include <sys/stat.h>
 
 #ifdef WIN32
 #include <Windows.h>
 #include <sys/stat.h>
 #include <direct.h>
 #define mkdir _mkdir
-#else
-#include <sys/stat.h>
 #endif
 
 #undef min