diff --git a/src/server/scripts/Commands/PlayerCommand.h b/src/server/scripts/Commands/PlayerCommand.h
index 08603edb8..10410e9ac 100644
--- a/src/server/scripts/Commands/PlayerCommand.h
+++ b/src/server/scripts/Commands/PlayerCommand.h
@@ -19,7 +19,6 @@
 #define _PLAYER_COMMAND_H
 
 #include "Chat.h"
-#include "Common.h"
 
 class Player;
 class SpellInfo;
diff --git a/src/server/scripts/Commands/cs_achievement.cpp b/src/server/scripts/Commands/cs_achievement.cpp
index d730c0a34..ca742f767 100644
--- a/src/server/scripts/Commands/cs_achievement.cpp
+++ b/src/server/scripts/Commands/cs_achievement.cpp
@@ -22,7 +22,6 @@ Comment: All achievement related commands
 Category: commandscripts
 EndScriptData */
 
-#include "AchievementMgr.h"
 #include "Chat.h"
 #include "CommandScript.h"
 #include "Player.h"
diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp
index 9b03cc878..612537c8f 100644
--- a/src/server/scripts/Commands/cs_debug.cpp
+++ b/src/server/scripts/Commands/cs_debug.cpp
@@ -38,10 +38,8 @@
 #include "ObjectMgr.h"
 #include "PoolMgr.h"
 #include "ScriptMgr.h"
-#include "SpellMgr.h"
 #include "Transport.h"
 #include "Warden.h"
-#include "World.h"
 #include <fstream>
 #include <set>
 
diff --git a/src/server/scripts/Commands/cs_disable.cpp b/src/server/scripts/Commands/cs_disable.cpp
index f717469e6..b48ae4fbc 100644
--- a/src/server/scripts/Commands/cs_disable.cpp
+++ b/src/server/scripts/Commands/cs_disable.cpp
@@ -22,7 +22,6 @@ Comment: All disable related commands
 Category: commandscripts
 EndScriptData */
 
-#include "AchievementMgr.h"
 #include "Chat.h"
 #include "CommandScript.h"
 #include "DisableMgr.h"
diff --git a/src/server/scripts/Commands/cs_event.cpp b/src/server/scripts/Commands/cs_event.cpp
index 80d036d2c..bda903f7d 100644
--- a/src/server/scripts/Commands/cs_event.cpp
+++ b/src/server/scripts/Commands/cs_event.cpp
@@ -27,7 +27,6 @@
 #include "GameEventMgr.h"
 #include "GameTime.h"
 #include "Language.h"
-#include "Player.h"
 #include "Timer.h"
 
 using namespace Acore::ChatCommands;
diff --git a/src/server/scripts/Commands/cs_gear.cpp b/src/server/scripts/Commands/cs_gear.cpp
index 3f0e3aedc..9753997fe 100644
--- a/src/server/scripts/Commands/cs_gear.cpp
+++ b/src/server/scripts/Commands/cs_gear.cpp
@@ -18,7 +18,6 @@
 #include "Chat.h"
 #include "CommandScript.h"
 #include "Language.h"
-#include "Log.h"
 #include "Player.h"
 #include "WorldSession.h"
 
diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp
index 499d5f72f..3eab21a35 100644
--- a/src/server/scripts/Commands/cs_gobject.cpp
+++ b/src/server/scripts/Commands/cs_gobject.cpp
@@ -23,7 +23,6 @@
 #include "Language.h"
 #include "MapMgr.h"
 #include "ObjectMgr.h"
-#include "Opcodes.h"
 #include "Player.h"
 #include "PoolMgr.h"
 #include "Transport.h"
diff --git a/src/server/scripts/Commands/cs_group.cpp b/src/server/scripts/Commands/cs_group.cpp
index 441bde078..62abe21ae 100644
--- a/src/server/scripts/Commands/cs_group.cpp
+++ b/src/server/scripts/Commands/cs_group.cpp
@@ -17,7 +17,6 @@
 
 #include "Chat.h"
 #include "CommandScript.h"
-#include "DatabaseEnv.h"
 #include "GroupMgr.h"
 #include "Language.h"
 #include "Player.h"
diff --git a/src/server/scripts/Commands/cs_instance.cpp b/src/server/scripts/Commands/cs_instance.cpp
index 732f0982b..37d1d66e7 100644
--- a/src/server/scripts/Commands/cs_instance.cpp
+++ b/src/server/scripts/Commands/cs_instance.cpp
@@ -25,12 +25,10 @@
 #include "Chat.h"
 #include "CommandScript.h"
 #include "GameTime.h"
-#include "Group.h"
 #include "InstanceSaveMgr.h"
 #include "InstanceScript.h"
 #include "Language.h"
 #include "MapMgr.h"
-#include "ObjectAccessor.h"
 #include "Player.h"
 
 using namespace Acore::ChatCommands;
diff --git a/src/server/scripts/Commands/cs_lfg.cpp b/src/server/scripts/Commands/cs_lfg.cpp
index 1cf649976..5e809cafa 100644
--- a/src/server/scripts/Commands/cs_lfg.cpp
+++ b/src/server/scripts/Commands/cs_lfg.cpp
@@ -17,7 +17,6 @@
 
 #include "Chat.h"
 #include "CommandScript.h"
-#include "DatabaseEnv.h"
 #include "Group.h"
 #include "LFGMgr.h"
 #include "Language.h"
diff --git a/src/server/scripts/Commands/cs_list.cpp b/src/server/scripts/Commands/cs_list.cpp
index af687c177..caeb7c2e1 100644
--- a/src/server/scripts/Commands/cs_list.cpp
+++ b/src/server/scripts/Commands/cs_list.cpp
@@ -30,7 +30,6 @@ EndScriptData */
 #include "GameObject.h"
 #include "Language.h"
 #include "MapMgr.h"
-#include "ObjectAccessor.h"
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "Random.h"
diff --git a/src/server/scripts/Commands/cs_lookup.cpp b/src/server/scripts/Commands/cs_lookup.cpp
index 0ad9752bb..20cf780e7 100644
--- a/src/server/scripts/Commands/cs_lookup.cpp
+++ b/src/server/scripts/Commands/cs_lookup.cpp
@@ -22,7 +22,6 @@ Comment: All lookup related commands
 Category: commandscripts
 EndScriptData */
 
-#include "AccountMgr.h"
 #include "CharacterCache.h"
 #include "Chat.h"
 #include "CommandScript.h"
diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index 127706523..17820f31b 100644
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -36,7 +36,6 @@
 #include "MiscPackets.h"
 #include "MovementGenerator.h"
 #include "ObjectAccessor.h"
-#include "Opcodes.h"
 #include "Pet.h"
 #include "Player.h"
 #include "Realm.h"
diff --git a/src/server/scripts/Commands/cs_mmaps.cpp b/src/server/scripts/Commands/cs_mmaps.cpp
index 9c1130071..9e72cfc70 100644
--- a/src/server/scripts/Commands/cs_mmaps.cpp
+++ b/src/server/scripts/Commands/cs_mmaps.cpp
@@ -30,10 +30,8 @@
 #include "GridNotifiersImpl.h"
 #include "MMapFactory.h"
 #include "Map.h"
-#include "ObjectMgr.h"
 #include "PathGenerator.h"
 #include "Player.h"
-#include "PointMovementGenerator.h"
 #include "TargetedMovementGenerator.h"
 
 using namespace Acore::ChatCommands;
diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp
index aaadedb7b..302c09a96 100644
--- a/src/server/scripts/Commands/cs_modify.cpp
+++ b/src/server/scripts/Commands/cs_modify.cpp
@@ -22,7 +22,6 @@ Comment: All modify related commands
 Category: commandscripts
 EndScriptData */
 
-#include "AccountMgr.h"
 #include "Chat.h"
 #include "CommandScript.h"
 #include "ObjectMgr.h"
diff --git a/src/server/scripts/Commands/cs_reset.cpp b/src/server/scripts/Commands/cs_reset.cpp
index 5ea17dca8..cdd32ada0 100644
--- a/src/server/scripts/Commands/cs_reset.cpp
+++ b/src/server/scripts/Commands/cs_reset.cpp
@@ -26,7 +26,6 @@ EndScriptData */
 #include "Chat.h"
 #include "CommandScript.h"
 #include "Language.h"
-#include "ObjectAccessor.h"
 #include "Pet.h"
 #include "Player.h"
 #include "ScriptMgr.h"
diff --git a/src/server/scripts/Commands/cs_server.cpp b/src/server/scripts/Commands/cs_server.cpp
index d004420b4..34a74babe 100644
--- a/src/server/scripts/Commands/cs_server.cpp
+++ b/src/server/scripts/Commands/cs_server.cpp
@@ -26,10 +26,10 @@
 #include "CommandScript.h"
 #include "GameTime.h"
 #include "GitRevision.h"
+#include "Log.h"
 #include "ModuleMgr.h"
 #include "MotdMgr.h"
 #include "MySQLThreading.h"
-#include "Player.h"
 #include "Realm.h"
 #include "StringConvert.h"
 #include "UpdateTime.h"
diff --git a/src/server/scripts/Commands/cs_spectator.cpp b/src/server/scripts/Commands/cs_spectator.cpp
index 540cedc49..4819e0b01 100644
--- a/src/server/scripts/Commands/cs_spectator.cpp
+++ b/src/server/scripts/Commands/cs_spectator.cpp
@@ -15,7 +15,6 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "AccountMgr.h"
 #include "ArenaSpectator.h"
 #include "BattlegroundMgr.h"
 #include "Chat.h"
diff --git a/src/server/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp
index b968b72b7..fa77beb3a 100644
--- a/src/server/scripts/Commands/cs_wp.cpp
+++ b/src/server/scripts/Commands/cs_wp.cpp
@@ -24,7 +24,6 @@ EndScriptData */
 
 #include "Chat.h"
 #include "CommandScript.h"
-#include "ObjectMgr.h"
 #include "Player.h"
 #include "WaypointMgr.h"