diff --git a/world/CMakeLists.txt b/world/CMakeLists.txt
index d980a458f..5a490f3b9 100644
--- a/world/CMakeLists.txt
+++ b/world/CMakeLists.txt
@@ -6,6 +6,25 @@ set(world_sources
     client.cpp
     cliententry.cpp
     clientlist.cpp
+    cli/cli_database_concurrency.cpp
+    cli/cli_bots_enable.cpp
+    cli/cli_bots_disable.cpp
+    cli/cli_mercs_enable.cpp
+    cli/cli_mercs_disable.cpp
+    cli/cli_copy_character.cpp
+    cli/cli_database_updates.cpp
+    cli/cli_database_dump.cpp
+    cli/cli_database_get_schema.cpp
+    cli/cli_database_set_account_status.cpp
+    cli/cli_database_version.cpp
+    cli/cli_test.cpp
+    cli/cli_test_colors.cpp
+    cli/cli_test_expansion.cpp
+    cli/cli_test_repository.cpp
+    cli/cli_test_repository_2.cpp
+    cli/cli_test_string_benchmark.cpp
+    cli/cli_version.cpp
+    cli/cli_etl_get_settings.cpp
     console.cpp
     dynamic_zone.cpp
     dynamic_zone_manager.cpp
@@ -68,7 +87,29 @@ set(world_headers
     world_event_scheduler.h
     zonelist.h
     zoneserver.h
-    )
+)
+
+source_group(cli FILES
+    cli/cli_database_concurrency.cpp
+    cli/cli_bots_enable.cpp
+    cli/cli_bots_disable.cpp
+    cli/cli_mercs_enable.cpp
+    cli/cli_mercs_disable.cpp
+    cli/cli_copy_character.cpp
+    cli/cli_database_updates.cpp
+    cli/cli_database_dump.cpp
+    cli/cli_database_get_schema.cpp
+    cli/cli_database_set_account_status.cpp
+    cli/cli_database_version.cpp
+    cli/cli_test.cpp
+    cli/cli_test_colors.cpp
+    cli/cli_test_expansion.cpp
+    cli/cli_test_repository.cpp
+    cli/cli_test_repository_2.cpp
+    cli/cli_test_string_benchmark.cpp
+    cli/cli_version.cpp
+    cli/cli_etl_get_settings.cpp
+)
 
 add_executable(world ${world_sources} ${world_headers})
 
diff --git a/world/cli/bots_disable.cpp b/world/cli/cli_bots_disable.cpp
similarity index 96%
rename from world/cli/bots_disable.cpp
rename to world/cli/cli_bots_disable.cpp
index b8b36dcc7..0df7b9873 100644
--- a/world/cli/bots_disable.cpp
+++ b/world/cli/cli_bots_disable.cpp
@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../worlddb.h"
 #include "../../common/database_schema.h"
 
diff --git a/world/cli/bots_enable.cpp b/world/cli/cli_bots_enable.cpp
similarity index 95%
rename from world/cli/bots_enable.cpp
rename to world/cli/cli_bots_enable.cpp
index f02950742..e503f93c9 100644
--- a/world/cli/bots_enable.cpp
+++ b/world/cli/cli_bots_enable.cpp
@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../worlddb.h"
 #include "../../common/rulesys.h"
 
diff --git a/world/cli/copy_character.cpp b/world/cli/cli_copy_character.cpp
similarity index 93%
rename from world/cli/copy_character.cpp
rename to world/cli/cli_copy_character.cpp
index ebe8e1831..047b81944 100644
--- a/world/cli/copy_character.cpp
+++ b/world/cli/cli_copy_character.cpp
@@ -1,3 +1,5 @@
+#include "../world_server_cli.h"
+#include "../../common/eqemu_logsys.h"
 #include "../../common/eqemu_logsys_log_aliases.h"
 #include "../worlddb.h"
 
diff --git a/world/cli/database_concurrency.cpp b/world/cli/cli_database_concurrency.cpp
similarity index 97%
rename from world/cli/database_concurrency.cpp
rename to world/cli/cli_database_concurrency.cpp
index bb20f4eba..0479a90a1 100644
--- a/world/cli/database_concurrency.cpp
+++ b/world/cli/cli_database_concurrency.cpp
@@ -1,4 +1,5 @@
 #include <thread>
+#include "../world_server_cli.h"
 #include "../../common/repositories/zone_repository.h"
 #include "../../common/eqemu_config.h"
 #include <signal.h>
diff --git a/world/cli/database_dump.cpp b/world/cli/cli_database_dump.cpp
similarity index 98%
rename from world/cli/database_dump.cpp
rename to world/cli/cli_database_dump.cpp
index 67a591fb0..2cedd6392 100644
--- a/world/cli/database_dump.cpp
+++ b/world/cli/cli_database_dump.cpp
@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../../common/database/database_dump_service.h"
 
 void WorldserverCLI::DatabaseDump(int argc, char **argv, argh::parser &cmd, std::string &description)
diff --git a/world/cli/database_get_schema.cpp b/world/cli/cli_database_get_schema.cpp
similarity index 98%
rename from world/cli/database_get_schema.cpp
rename to world/cli/cli_database_get_schema.cpp
index b71139358..d4b71c1c4 100644
--- a/world/cli/database_get_schema.cpp
+++ b/world/cli/cli_database_get_schema.cpp
@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../../common/database_schema.h"
 #include "../../common/json/json.h"
 
diff --git a/world/cli/database_set_account_status.cpp b/world/cli/cli_database_set_account_status.cpp
similarity index 93%
rename from world/cli/database_set_account_status.cpp
rename to world/cli/cli_database_set_account_status.cpp
index 39dbeeb28..d0e94b23c 100644
--- a/world/cli/database_set_account_status.cpp
+++ b/world/cli/cli_database_set_account_status.cpp
@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../worlddb.h"
 
 void WorldserverCLI::DatabaseSetAccountStatus(int argc, char **argv, argh::parser &cmd, std::string &description)
diff --git a/world/cli/database_updates.cpp b/world/cli/cli_database_updates.cpp
similarity index 89%
rename from world/cli/database_updates.cpp
rename to world/cli/cli_database_updates.cpp
index f967349fa..763a1f3c3 100644
--- a/world/cli/database_updates.cpp
+++ b/world/cli/cli_database_updates.cpp
@@ -1,3 +1,5 @@
+#include "../world_server_cli.h"
+#include "../worlddb.h"
 #include "../../common/database/database_update.h"
 
 void WorldserverCLI::DatabaseUpdates(int argc, char **argv, argh::parser &cmd, std::string &description)
diff --git a/world/cli/database_version.cpp b/world/cli/cli_database_version.cpp
similarity index 95%
rename from world/cli/database_version.cpp
rename to world/cli/cli_database_version.cpp
index 2426d9d72..ee11bb7b1 100644
--- a/world/cli/database_version.cpp
+++ b/world/cli/cli_database_version.cpp
@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../../common/version.h"
 #include "../../common/json/json.h"
 #include "../../common/rulesys.h"
diff --git a/world/cli/etl_get_settings.cpp b/world/cli/cli_etl_get_settings.cpp
similarity index 96%
rename from world/cli/etl_get_settings.cpp
rename to world/cli/cli_etl_get_settings.cpp
index eb1d873ac..c17d0b8e8 100644
--- a/world/cli/etl_get_settings.cpp
+++ b/world/cli/cli_etl_get_settings.cpp
@@ -1,3 +1,5 @@
+#include "../world_server_cli.h"
+#include "../worlddb.h"
 #include "../../common/events/player_event_logs.h"
 #include "../../common/json/json.h"
 
diff --git a/world/cli/mercs_disable.cpp b/world/cli/cli_mercs_disable.cpp
similarity index 96%
rename from world/cli/mercs_disable.cpp
rename to world/cli/cli_mercs_disable.cpp
index 0af5d4b0e..9018d271b 100644
--- a/world/cli/mercs_disable.cpp
+++ b/world/cli/cli_mercs_disable.cpp
@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../worlddb.h"
 #include "../../common/database_schema.h"
 
diff --git a/world/cli/mercs_enable.cpp b/world/cli/cli_mercs_enable.cpp
similarity index 97%
rename from world/cli/mercs_enable.cpp
rename to world/cli/cli_mercs_enable.cpp
index efb005421..2e69472d5 100644
--- a/world/cli/mercs_enable.cpp
+++ b/world/cli/cli_mercs_enable.cpp
@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../worlddb.h"
 #include "../../common/database_schema.h"
 
diff --git a/world/cli/test.cpp b/world/cli/cli_test.cpp
similarity index 96%
rename from world/cli/test.cpp
rename to world/cli/cli_test.cpp
index 172d46d21..305f22d2f 100644
--- a/world/cli/test.cpp
+++ b/world/cli/cli_test.cpp
@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include <cereal/archives/json.hpp>
 #include <cereal/types/vector.hpp>
 #include <iomanip>
diff --git a/world/cli/test_colors.cpp b/world/cli/cli_test_colors.cpp
similarity index 99%
rename from world/cli/test_colors.cpp
rename to world/cli/cli_test_colors.cpp
index aeff8d61b..477c13333 100644
--- a/world/cli/test_colors.cpp
+++ b/world/cli/cli_test_colors.cpp
@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../../common/zone_store.h"
 #include "../../common/termcolor/rang.hpp"
 
diff --git a/world/cli/test_expansion.cpp b/world/cli/cli_test_expansion.cpp
similarity index 97%
rename from world/cli/test_expansion.cpp
rename to world/cli/cli_test_expansion.cpp
index 856e053d8..24e227472 100644
--- a/world/cli/test_expansion.cpp
+++ b/world/cli/cli_test_expansion.cpp
@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../../common/rulesys.h"
 #include "../../common/repositories/content_flags_repository.h"
 #include "../../common/content/world_content_service.h"
diff --git a/world/cli/test_repository.cpp b/world/cli/cli_test_repository.cpp
similarity index 98%
rename from world/cli/test_repository.cpp
rename to world/cli/cli_test_repository.cpp
index a4c8f59b1..bd2ee5449 100644
--- a/world/cli/test_repository.cpp
+++ b/world/cli/cli_test_repository.cpp
@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../../common/repositories/instance_list_repository.h"
 #include "../worlddb.h"
 
diff --git a/world/cli/test_repository_2.cpp b/world/cli/cli_test_repository_2.cpp
similarity index 88%
rename from world/cli/test_repository_2.cpp
rename to world/cli/cli_test_repository_2.cpp
index 06a2a624b..6091b0220 100644
--- a/world/cli/test_repository_2.cpp
+++ b/world/cli/cli_test_repository_2.cpp
@@ -1,3 +1,5 @@
+#include "../world_server_cli.h"
+#include "../worlddb.h"
 #include "../../common/repositories/zone_repository.h"
 
 void WorldserverCLI::TestRepository2(int argc, char **argv, argh::parser &cmd, std::string &description)
diff --git a/world/cli/test_string_benchmark.cpp b/world/cli/cli_test_string_benchmark.cpp
similarity index 98%
rename from world/cli/test_string_benchmark.cpp
rename to world/cli/cli_test_string_benchmark.cpp
index 32d5e9020..e064a266a 100644
--- a/world/cli/test_string_benchmark.cpp
+++ b/world/cli/cli_test_string_benchmark.cpp
@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include <cereal/archives/json.hpp>
 #include <cereal/types/vector.hpp>
 #include "../../common/events/player_events.h"
diff --git a/world/cli/version.cpp b/world/cli/cli_version.cpp
similarity index 95%
rename from world/cli/version.cpp
rename to world/cli/cli_version.cpp
index 383b69ac7..c82ea9967 100644
--- a/world/cli/version.cpp
+++ b/world/cli/cli_version.cpp
@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../../common/json/json.h"
 #include "../../common/version.h"
 
diff --git a/world/world_server_cli.cpp b/world/world_server_cli.cpp
index 3af88f953..111929a0c 100644
--- a/world/world_server_cli.cpp
+++ b/world/world_server_cli.cpp
@@ -39,22 +39,3 @@ void WorldserverCLI::CommandHandler(int argc, char **argv)
 	EQEmuCommand::HandleMenu(function_map, cmd, argc, argv);
 }
 
-#include "cli/database_concurrency.cpp"
-#include "cli/bots_enable.cpp"
-#include "cli/bots_disable.cpp"
-#include "cli/mercs_enable.cpp"
-#include "cli/mercs_disable.cpp"
-#include "cli/copy_character.cpp"
-#include "cli/database_updates.cpp"
-#include "cli/database_dump.cpp"
-#include "cli/database_get_schema.cpp"
-#include "cli/database_set_account_status.cpp"
-#include "cli/database_version.cpp"
-#include "cli/test.cpp"
-#include "cli/test_colors.cpp"
-#include "cli/test_expansion.cpp"
-#include "cli/test_repository.cpp"
-#include "cli/test_repository_2.cpp"
-#include "cli/test_string_benchmark.cpp"
-#include "cli/version.cpp"
-#include "cli/etl_get_settings.cpp"