diff --git a/world/CMakeLists.txt b/world/CMakeLists.txt
index 1e44afc59..80be6aeb8 100644
--- a/world/CMakeLists.txt
+++ b/world/CMakeLists.txt
@@ -96,6 +96,7 @@ add_executable(world ${world_sources} ${world_headers})
 target_compile_definitions(world PRIVATE WORLD)
 
 target_link_libraries(world common)
+target_include_directories(world PRIVATE ..)
 
 if(WIN32 AND EQEMU_BUILD_PCH)
     target_precompile_headers(world PRIVATE ../common/pch/std-pch.h)
diff --git a/world/adventure.cpp b/world/adventure.cpp
index 5249f1c47..fbf6f9904 100644
--- a/world/adventure.cpp
+++ b/world/adventure.cpp
@@ -1,19 +1,20 @@
-#include <glm/vec4.hpp>
-#include "../common/global_define.h"
-#include "../common/servertalk.h"
-#include "../common/extprofile.h"
-#include "../common/rulesys.h"
-#include "../common/misc_functions.h"
-#include "../common/strings.h"
-#include "../common/random.h"
 #include "adventure.h"
-#include "adventure_manager.h"
-#include "worlddb.h"
-#include "zonelist.h"
-#include "clientlist.h"
-#include "cliententry.h"
-#include "../common/zone_store.h"
-#include "../common/repositories/character_corpses_repository.h"
+
+#include "common/extprofile.h"
+#include "common/misc_functions.h"
+#include "common/random.h"
+#include "common/repositories/character_corpses_repository.h"
+#include "common/rulesys.h"
+#include "common/servertalk.h"
+#include "common/strings.h"
+#include "common/zone_store.h"
+#include "world/adventure_manager.h"
+#include "world/cliententry.h"
+#include "world/clientlist.h"
+#include "world/worlddb.h"
+#include "world/zonelist.h"
+
+#include "glm/vec4.hpp"
 
 extern EQ::Random emu_random;
 
diff --git a/world/adventure.h b/world/adventure.h
index 8f7e4c418..6fd966737 100644
--- a/world/adventure.h
+++ b/world/adventure.h
@@ -1,13 +1,12 @@
-#ifndef ADVENTURE_H
-#define ADVENTURE_H
+#pragma once
 
-#include "../common/global_define.h"
-#include "../common/types.h"
-#include "../common/timer.h"
-#include "adventure_template.h"
+#include "common/timer.h"
+#include "common/types.h"
+#include "world/adventure_template.h"
+
+#include <cstdlib>
 #include <list>
 #include <string>
-#include <stdlib.h>
 
 enum AdventureStatus
 {
@@ -97,5 +96,3 @@ protected:
 	Timer *current_timer;
 	int instance_id;
 };
-
-#endif
diff --git a/world/adventure_manager.cpp b/world/adventure_manager.cpp
index 3ba718b53..edc12c19a 100644
--- a/world/adventure_manager.cpp
+++ b/world/adventure_manager.cpp
@@ -1,18 +1,19 @@
-#include "../common/global_define.h"
-#include "../common/misc_functions.h"
-#include "../common/strings.h"
-#include "../common/servertalk.h"
-#include "../common/rulesys.h"
-#include "../common/random.h"
-#include "adventure.h"
 #include "adventure_manager.h"
-#include "worlddb.h"
-#include "zonelist.h"
-#include "clientlist.h"
-#include "cliententry.h"
-#include "../common/zone_store.h"
+
+#include "common/misc_functions.h"
+#include "common/random.h"
+#include "common/rulesys.h"
+#include "common/servertalk.h"
+#include "common/strings.h"
+#include "common/zone_store.h"
+#include "world/adventure.h"
+#include "world/cliententry.h"
+#include "world/clientlist.h"
+#include "world/worlddb.h"
+#include "world/zonelist.h"
+
+#include <cstdio>
 #include <sstream>
-#include <stdio.h>
 
 AdventureManager::AdventureManager()
 {
diff --git a/world/adventure_manager.h b/world/adventure_manager.h
index 9f84ce838..d9934f849 100644
--- a/world/adventure_manager.h
+++ b/world/adventure_manager.h
@@ -1,11 +1,10 @@
-#ifndef ADVENTURE_MANAGER_H
-#define ADVENTURE_MANAGER_H
+#pragma once
+
+#include "common/timer.h"
+#include "common/types.h"
+#include "world/adventure_template.h"
+#include "world/adventure.h"
 
-#include "../common/global_define.h"
-#include "../common/types.h"
-#include "../common/timer.h"
-#include "adventure.h"
-#include "adventure_template.h"
 #include <map>
 #include <list>
 
@@ -94,5 +93,3 @@ protected:
 	Timer *save_timer;
 	Timer *leaderboard_info_timer;
 };
-
-#endif
diff --git a/world/adventure_template.h b/world/adventure_template.h
index 89f8b9915..b35da738f 100644
--- a/world/adventure_template.h
+++ b/world/adventure_template.h
@@ -1,9 +1,8 @@
-#ifndef ADVENTURE_TEMPLATE_H
-#define ADVENTURE_TEMPLATE_H
+#pragma once
 
-#include "../common/global_define.h"
-#include "../common/types.h"
+#include "common/types.h"
 
+#pragma pack(push)
 #pragma pack(1)
 
 struct AdventureTemplate
@@ -42,6 +41,4 @@ struct AdventureTemplate
 	float graveyard_radius;
 };
 
-#pragma pack()
-
-#endif
+#pragma pack(pop)
diff --git a/world/cli/cli_bots_disable.cpp b/world/cli/cli_bots_disable.cpp
index 0df7b9873..4cbe5ed7e 100644
--- a/world/cli/cli_bots_disable.cpp
+++ b/world/cli/cli_bots_disable.cpp
@@ -1,6 +1,7 @@
-#include "../world_server_cli.h"
-#include "../worlddb.h"
-#include "../../common/database_schema.h"
+#include "world/world_server_cli.h"
+
+#include "common/database_schema.h"
+#include "world/worlddb.h"
 
 void WorldserverCLI::BotsDisable(int argc, char **argv, argh::parser &cmd, std::string &description)
 {
diff --git a/world/cli/cli_bots_enable.cpp b/world/cli/cli_bots_enable.cpp
index e503f93c9..766443113 100644
--- a/world/cli/cli_bots_enable.cpp
+++ b/world/cli/cli_bots_enable.cpp
@@ -1,6 +1,7 @@
-#include "../world_server_cli.h"
-#include "../worlddb.h"
-#include "../../common/rulesys.h"
+#include "world/world_server_cli.h"
+
+#include "common/rulesys.h"
+#include "world/worlddb.h"
 
 void WorldserverCLI::BotsEnable(int argc, char **argv, argh::parser &cmd, std::string &description)
 {
diff --git a/world/cli/cli_copy_character.cpp b/world/cli/cli_copy_character.cpp
index 047b81944..41e3bb349 100644
--- a/world/cli/cli_copy_character.cpp
+++ b/world/cli/cli_copy_character.cpp
@@ -1,7 +1,8 @@
-#include "../world_server_cli.h"
-#include "../../common/eqemu_logsys.h"
-#include "../../common/eqemu_logsys_log_aliases.h"
-#include "../worlddb.h"
+#include "world/world_server_cli.h"
+
+#include "common/eqemu_logsys_log_aliases.h"
+#include "common/eqemu_logsys.h"
+#include "world/worlddb.h"
 
 void WorldserverCLI::CopyCharacter(int argc, char **argv, argh::parser &cmd, std::string &description)
 {
diff --git a/world/cli/cli_database_concurrency.cpp b/world/cli/cli_database_concurrency.cpp
index 0479a90a1..81b6619b1 100644
--- a/world/cli/cli_database_concurrency.cpp
+++ b/world/cli/cli_database_concurrency.cpp
@@ -1,8 +1,10 @@
+#include "world/world_server_cli.h"
+
+#include "common/eqemu_config.h"
+#include "common/repositories/zone_repository.h"
+
+#include <csignal>
 #include <thread>
-#include "../world_server_cli.h"
-#include "../../common/repositories/zone_repository.h"
-#include "../../common/eqemu_config.h"
-#include <signal.h>
 
 Database db;
 Database db2;
diff --git a/world/cli/cli_database_dump.cpp b/world/cli/cli_database_dump.cpp
index 2cedd6392..00618606c 100644
--- a/world/cli/cli_database_dump.cpp
+++ b/world/cli/cli_database_dump.cpp
@@ -1,5 +1,6 @@
-#include "../world_server_cli.h"
-#include "../../common/database/database_dump_service.h"
+#include "world/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/cli_database_get_schema.cpp b/world/cli/cli_database_get_schema.cpp
index d4b71c1c4..37af40567 100644
--- a/world/cli/cli_database_get_schema.cpp
+++ b/world/cli/cli_database_get_schema.cpp
@@ -1,6 +1,9 @@
-#include "../world_server_cli.h"
-#include "../../common/database_schema.h"
-#include "../../common/json/json.h"
+#include "world/world_server_cli.h"
+
+#include "common/database_schema.h"
+#include "common/json/json.h"
+
+#include <iostream>
 
 void WorldserverCLI::DatabaseGetSchema(int argc, char **argv, argh::parser &cmd, std::string &description)
 {
@@ -62,8 +65,5 @@ void WorldserverCLI::DatabaseGetSchema(int argc, char **argv, argh::parser &cmd,
 	schema["version_tables"] = version_tables_json;
 	schema["bot_tables"]     = bot_tables_json;
 
-	std::stringstream payload;
-	payload << schema;
-
-	std::cout << payload.str() << std::endl;
+	std::cout << schema << std::endl;
 }
diff --git a/world/cli/cli_database_set_account_status.cpp b/world/cli/cli_database_set_account_status.cpp
index d0e94b23c..49e76307c 100644
--- a/world/cli/cli_database_set_account_status.cpp
+++ b/world/cli/cli_database_set_account_status.cpp
@@ -1,5 +1,5 @@
-#include "../world_server_cli.h"
-#include "../worlddb.h"
+#include "world/world_server_cli.h"
+#include "world/worlddb.h"
 
 void WorldserverCLI::DatabaseSetAccountStatus(int argc, char **argv, argh::parser &cmd, std::string &description)
 {
diff --git a/world/cli/cli_database_updates.cpp b/world/cli/cli_database_updates.cpp
index 763a1f3c3..f2f773849 100644
--- a/world/cli/cli_database_updates.cpp
+++ b/world/cli/cli_database_updates.cpp
@@ -1,6 +1,7 @@
-#include "../world_server_cli.h"
-#include "../worlddb.h"
-#include "../../common/database/database_update.h"
+#include "world/world_server_cli.h"
+
+#include "common/database/database_update.h"
+#include "world/worlddb.h"
 
 void WorldserverCLI::DatabaseUpdates(int argc, char **argv, argh::parser &cmd, std::string &description)
 {
diff --git a/world/cli/cli_database_version.cpp b/world/cli/cli_database_version.cpp
index ee11bb7b1..424bc4ee6 100644
--- a/world/cli/cli_database_version.cpp
+++ b/world/cli/cli_database_version.cpp
@@ -1,7 +1,10 @@
-#include "../world_server_cli.h"
-#include "../../common/version.h"
-#include "../../common/json/json.h"
-#include "../../common/rulesys.h"
+#include "world/world_server_cli.h"
+
+#include "common/json/json.h"
+#include "common/rulesys.h"
+#include "common/version.h"
+
+#include <iostream>
 
 void WorldserverCLI::DatabaseVersion(int argc, char **argv, argh::parser &cmd, std::string &description)
 {
diff --git a/world/cli/cli_etl_get_settings.cpp b/world/cli/cli_etl_get_settings.cpp
index c17d0b8e8..a96c8477f 100644
--- a/world/cli/cli_etl_get_settings.cpp
+++ b/world/cli/cli_etl_get_settings.cpp
@@ -1,7 +1,8 @@
-#include "../world_server_cli.h"
-#include "../worlddb.h"
-#include "../../common/events/player_event_logs.h"
-#include "../../common/json/json.h"
+#include "world/world_server_cli.h"
+
+#include "common/events/player_event_logs.h"
+#include "common/json/json.h"
+#include "world/worlddb.h"
 
 void WorldserverCLI::EtlGetSettings(int argc, char **argv, argh::parser &cmd, std::string &description)
 {
diff --git a/world/cli/cli_mercs_disable.cpp b/world/cli/cli_mercs_disable.cpp
index 9018d271b..737608ccf 100644
--- a/world/cli/cli_mercs_disable.cpp
+++ b/world/cli/cli_mercs_disable.cpp
@@ -1,6 +1,7 @@
-#include "../world_server_cli.h"
-#include "../worlddb.h"
-#include "../../common/database_schema.h"
+#include "world/world_server_cli.h"
+
+#include "common/database_schema.h"
+#include "world/worlddb.h"
 
 void WorldserverCLI::MercsDisable(int argc, char **argv, argh::parser &cmd, std::string &description)
 {
diff --git a/world/cli/cli_mercs_enable.cpp b/world/cli/cli_mercs_enable.cpp
index 2e69472d5..a4f6c2972 100644
--- a/world/cli/cli_mercs_enable.cpp
+++ b/world/cli/cli_mercs_enable.cpp
@@ -1,6 +1,7 @@
-#include "../world_server_cli.h"
-#include "../worlddb.h"
-#include "../../common/database_schema.h"
+#include "world/world_server_cli.h"
+
+#include "common/database_schema.h"
+#include "world/worlddb.h"
 
 void WorldserverCLI::MercsEnable(int argc, char **argv, argh::parser &cmd, std::string &description)
 {
diff --git a/world/cli/cli_test.cpp b/world/cli/cli_test.cpp
index 305f22d2f..ecbb1e5fa 100644
--- a/world/cli/cli_test.cpp
+++ b/world/cli/cli_test.cpp
@@ -1,9 +1,11 @@
-#include "../world_server_cli.h"
-#include <cereal/archives/json.hpp>
-#include <cereal/types/vector.hpp>
+#include "world/world_server_cli.h"
+
+#include "common/events/player_events.h"
+#include "common/memory/ksm.hpp"
+
+#include "cereal/archives/json.hpp"
+#include "cereal/types/vector.hpp"
 #include <iomanip>
-#include "../../common/events/player_events.h"
-#include "../../common/memory/ksm.hpp"
 
 void WorldserverCLI::TestCommand(int argc, char **argv, argh::parser &cmd, std::string &description)
 {
diff --git a/world/cli/cli_test_colors.cpp b/world/cli/cli_test_colors.cpp
index 477c13333..ae6e4cbd4 100644
--- a/world/cli/cli_test_colors.cpp
+++ b/world/cli/cli_test_colors.cpp
@@ -1,6 +1,7 @@
-#include "../world_server_cli.h"
-#include "../../common/zone_store.h"
-#include "../../common/termcolor/rang.hpp"
+#include "world/world_server_cli.h"
+
+#include "common/termcolor/rang.hpp"
+#include "common/zone_store.h"
 
 void WorldserverCLI::TestColors(int argc, char **argv, argh::parser &cmd, std::string &description)
 {
diff --git a/world/cli/cli_test_expansion.cpp b/world/cli/cli_test_expansion.cpp
index 24e227472..93dc94f29 100644
--- a/world/cli/cli_test_expansion.cpp
+++ b/world/cli/cli_test_expansion.cpp
@@ -1,9 +1,10 @@
-#include "../world_server_cli.h"
-#include "../../common/rulesys.h"
-#include "../../common/repositories/content_flags_repository.h"
-#include "../../common/content/world_content_service.h"
-#include "../../common/repositories/criteria/content_filter_criteria.h"
-#include "../worlddb.h"
+#include "world/world_server_cli.h"
+
+#include "common/content/world_content_service.h"
+#include "common/repositories/content_flags_repository.h"
+#include "common/repositories/criteria/content_filter_criteria.h"
+#include "common/rulesys.h"
+#include "world/worlddb.h"
 
 void WorldserverCLI::ExpansionTestCommand(int argc, char **argv, argh::parser &cmd, std::string &description)
 {
diff --git a/world/cli/cli_test_repository.cpp b/world/cli/cli_test_repository.cpp
index bd2ee5449..038ce5871 100644
--- a/world/cli/cli_test_repository.cpp
+++ b/world/cli/cli_test_repository.cpp
@@ -1,6 +1,7 @@
-#include "../world_server_cli.h"
-#include "../../common/repositories/instance_list_repository.h"
-#include "../worlddb.h"
+#include "world/world_server_cli.h"
+
+#include "common/repositories/instance_list_repository.h"
+#include "world/worlddb.h"
 
 void WorldserverCLI::TestRepository(int argc, char **argv, argh::parser &cmd, std::string &description)
 {
diff --git a/world/cli/cli_test_repository_2.cpp b/world/cli/cli_test_repository_2.cpp
index 6091b0220..4c914090f 100644
--- a/world/cli/cli_test_repository_2.cpp
+++ b/world/cli/cli_test_repository_2.cpp
@@ -1,6 +1,7 @@
-#include "../world_server_cli.h"
-#include "../worlddb.h"
-#include "../../common/repositories/zone_repository.h"
+#include "world/world_server_cli.h"
+
+#include "common/repositories/zone_repository.h"
+#include "world/worlddb.h"
 
 void WorldserverCLI::TestRepository2(int argc, char **argv, argh::parser &cmd, std::string &description)
 {
diff --git a/world/cli/cli_test_string_benchmark.cpp b/world/cli/cli_test_string_benchmark.cpp
index e064a266a..dd3edbb8f 100644
--- a/world/cli/cli_test_string_benchmark.cpp
+++ b/world/cli/cli_test_string_benchmark.cpp
@@ -1,8 +1,10 @@
-#include "../world_server_cli.h"
-#include <cereal/archives/json.hpp>
-#include <cereal/types/vector.hpp>
-#include "../../common/events/player_events.h"
-#include "../../common/timer.h"
+#include "world/world_server_cli.h"
+
+#include "common/events/player_events.h"
+#include "common/timer.h"
+
+#include "cereal/archives/json.hpp"
+#include "cereal/types/vector.hpp"
 
 void WorldserverCLI::TestStringBenchmarkCommand(int argc, char **argv, argh::parser &cmd, std::string &description)
 {
diff --git a/world/cli/cli_version.cpp b/world/cli/cli_version.cpp
index c82ea9967..1f1502bb5 100644
--- a/world/cli/cli_version.cpp
+++ b/world/cli/cli_version.cpp
@@ -1,6 +1,9 @@
-#include "../world_server_cli.h"
-#include "../../common/json/json.h"
-#include "../../common/version.h"
+#include "world/world_server_cli.h"
+
+#include "common/json/json.h"
+#include "common/version.h"
+
+#include <iostream>
 
 void WorldserverCLI::Version(int argc, char **argv, argh::parser &cmd, std::string &description)
 {
diff --git a/world/client.cpp b/world/client.cpp
index 91aaf3e9f..555a0055a 100644
--- a/world/client.cpp
+++ b/world/client.cpp
@@ -16,59 +16,54 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "../common/global_define.h"
-#include "../common/eq_packet.h"
-#include "../common/eq_stream_intf.h"
-#include "../common/misc.h"
-#include "../common/rulesys.h"
-#include "../common/emu_opcodes.h"
-#include "../common/eq_packet_structs.h"
-#include "../common/packet_dump.h"
-#include "../common/eq_stream_intf.h"
-#include "../common/inventory_profile.h"
-#include "../common/races.h"
-#include "../common/classes.h"
-#include "../common/skills.h"
-#include "../common/extprofile.h"
-#include "../common/strings.h"
-#include "../common/emu_versions.h"
-#include "../common/random.h"
-#include "../common/shareddb.h"
-#include "../common/opcodemgr.h"
-#include "../common/data_verification.h"
-#include "../common/data_bucket.h"
-
 #include "client.h"
-#include "worlddb.h"
-#include "world_config.h"
-#include "login_server.h"
-#include "login_server_list.h"
-#include "zoneserver.h"
-#include "zonelist.h"
-#include "clientlist.h"
-#include "wguild_mgr.h"
-#include "sof_char_create_data.h"
-#include "../common/zone_store.h"
-#include "../common/repositories/account_repository.h"
-#include "../common/repositories/player_event_logs_repository.h"
-#include "../common/repositories/inventory_repository.h"
-#include "../common/events/player_event_logs.h"
-#include "../common/content/world_content_service.h"
-#include "../common/repositories/group_id_repository.h"
-#include "../common/repositories/character_data_repository.h"
-#include "../common/skill_caps.h"
 
-#include <iostream>
+#include "common/classes.h"
+#include "common/content/world_content_service.h"
+#include "common/data_bucket.h"
+#include "common/data_verification.h"
+#include "common/emu_opcodes.h"
+#include "common/emu_versions.h"
+#include "common/eq_packet_structs.h"
+#include "common/eq_packet.h"
+#include "common/eq_stream_intf.h"
+#include "common/eq_stream_intf.h"
+#include "common/events/player_event_logs.h"
+#include "common/extprofile.h"
+#include "common/inventory_profile.h"
+#include "common/misc.h"
+#include "common/opcodemgr.h"
+#include "common/packet_dump.h"
+#include "common/races.h"
+#include "common/random.h"
+#include "common/repositories/account_repository.h"
+#include "common/repositories/character_data_repository.h"
+#include "common/repositories/group_id_repository.h"
+#include "common/repositories/inventory_repository.h"
+#include "common/repositories/player_event_logs_repository.h"
+#include "common/rulesys.h"
+#include "common/shareddb.h"
+#include "common/skill_caps.h"
+#include "common/skills.h"
+#include "common/strings.h"
+#include "common/zone_store.h"
+#include "world/clientlist.h"
+#include "world/login_server_list.h"
+#include "world/login_server.h"
+#include "world/sof_char_create_data.h"
+#include "world/wguild_mgr.h"
+#include "world/world_config.h"
+#include "world/worlddb.h"
+#include "world/zonelist.h"
+#include "world/zoneserver.h"
+
+#include "zlib.h"
+#include <climits>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <iomanip>
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <zlib.h>
-#include <limits.h>
-
-//FatherNitwit: uncomment to enable my IP based authentication hack
-//#define IPBASED_AUTH_HACK
+#include <iostream>
 
 // Disgrace: for windows compile
 #ifdef _WINDOWS
diff --git a/world/client.h b/world/client.h
index 5890cfcf0..f26dcaaac 100644
--- a/world/client.h
+++ b/world/client.h
@@ -15,19 +15,17 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#ifndef CLIENT_H
-#define CLIENT_H
+
+#pragma once
+
+#include "common/eq_packet_structs.h"
+#include "common/inventory_profile.h"
+#include "common/linked_list.h"
+#include "common/timer.h"
+#include "world/cliententry.h"
 
 #include <string>
 
-#include "../common/linked_list.h"
-#include "../common/timer.h"
-#include "../common/inventory_profile.h"
-//#include "zoneserver.h"
-
-#include "../common/eq_packet_structs.h"
-#include "cliententry.h"
-
 class EQApplicationPacket;
 class EQStreamInterface;
 
@@ -128,5 +126,3 @@ private:
 
 bool CheckCharCreateInfoSoF(CharCreate_Struct *cc);
 bool CheckCharCreateInfoTitanium(CharCreate_Struct *cc);
-
-#endif
diff --git a/world/cliententry.cpp b/world/cliententry.cpp
index d6feb68dd..6b37f7b64 100644
--- a/world/cliententry.cpp
+++ b/world/cliententry.cpp
@@ -1,12 +1,12 @@
-#include "../common/global_define.h"
 #include "cliententry.h"
-#include "clientlist.h"
-#include "login_server.h"
-#include "login_server_list.h"
-#include "shared_task_manager.h"
-#include "worlddb.h"
-#include "zoneserver.h"
-#include "world_config.h"
+
+#include "world/clientlist.h"
+#include "world/login_server_list.h"
+#include "world/login_server.h"
+#include "world/shared_task_manager.h"
+#include "world/world_config.h"
+#include "world/worlddb.h"
+#include "world/zoneserver.h"
 
 extern uint32            numplayers;
 extern volatile bool     RunLoops;
diff --git a/world/cliententry.h b/world/cliententry.h
index bf9a2662c..97c5e4002 100644
--- a/world/cliententry.h
+++ b/world/cliententry.h
@@ -1,11 +1,10 @@
-#ifndef CLIENTENTRY_H_
-#define CLIENTENTRY_H_
+#pragma once
+
+#include "common/md5.h"
+#include "common/rulesys.h"
+#include "common/servertalk.h"
+#include "common/types.h"
 
-#include "../common/types.h"
-#include "../common/md5.h"
-//#include "../common/eq_packet_structs.h"
-#include "../common/servertalk.h"
-#include "../common/rulesys.h"
 #include <vector>
 
 typedef enum {
@@ -160,6 +159,3 @@ private:
 
 	std::unique_ptr<ServerPacket> m_dz_invite;
 };
-
-#endif /*CLIENTENTRY_H_*/
-
diff --git a/world/clientlist.cpp b/world/clientlist.cpp
index d8f1d9fbc..1aa59930e 100644
--- a/world/clientlist.cpp
+++ b/world/clientlist.cpp
@@ -16,24 +16,24 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "../common/global_define.h"
-#include "clientlist.h"
-#include "zoneserver.h"
-#include "zonelist.h"
-#include "client.h"
-#include "worlddb.h"
-#include "../common/strings.h"
-#include "../common/guilds.h"
-#include "../common/races.h"
-#include "../common/classes.h"
-#include "../common/packet_dump.h"
-#include "../common/misc.h"
-#include "../common/misc_functions.h"
-#include "../common/json/json.h"
-#include "../common/event_sub.h"
-#include "web_interface.h"
-#include "wguild_mgr.h"
-#include "../common/zone_store.h"
+#include "common/classes.h"
+#include "common/event_sub.h"
+#include "common/guilds.h"
+#include "common/json/json.h"
+#include "common/misc_functions.h"
+#include "common/misc.h"
+#include "common/packet_dump.h"
+#include "common/races.h"
+#include "common/strings.h"
+#include "common/zone_store.h"
+#include "world/client.h"
+#include "world/clientlist.h"
+#include "world/web_interface.h"
+#include "world/wguild_mgr.h"
+#include "world/worlddb.h"
+#include "world/zonelist.h"
+#include "world/zoneserver.h"
+
 #include <set>
 
 uint32 numplayers = 0;	//this really wants to be a member variable of ClientList...
diff --git a/world/clientlist.h b/world/clientlist.h
index b158ad28d..34970a7e6 100644
--- a/world/clientlist.h
+++ b/world/clientlist.h
@@ -1,16 +1,16 @@
-#ifndef CLIENTLIST_H_
-#define CLIENTLIST_H_
+#pragma once
+
+#include "common/eq_packet_structs.h"
+#include "common/event/timer.h"
+#include "common/json/json.h"
+#include "common/linked_list.h"
+#include "common/net/console_server_connection.h"
+#include "common/rulesys.h"
+#include "common/servertalk.h"
+#include "common/timer.h"
 
-#include "../common/eq_packet_structs.h"
-#include "../common/linked_list.h"
-#include "../common/json/json.h"
-#include "../common/timer.h"
-#include "../common/rulesys.h"
-#include "../common/servertalk.h"
-#include "../common/event/timer.h"
-#include "../common/net/console_server_connection.h"
-#include <vector>
 #include <string>
+#include <vector>
 
 class Client;
 class ZoneServer;
@@ -111,6 +111,3 @@ private:
 	std::unordered_set<uint32_t>                               m_gm_zone_server_ids;
 	std::unordered_map<uint32_t, std::unordered_set<uint32_t>> m_guild_zone_server_ids;
 };
-
-#endif /*CLIENTLIST_H_*/
-
diff --git a/world/console.cpp b/world/console.cpp
index 41906239b..cbf998c3c 100644
--- a/world/console.cpp
+++ b/world/console.cpp
@@ -19,19 +19,21 @@
  */
 
 #include "console.h"
-#include "clientlist.h"
-#include "login_server.h"
-#include "login_server_list.h"
-#include "world_config.h"
-#include "world_console_connection.h"
-#include "worlddb.h"
-#include "zonelist.h"
-#include "zoneserver.h"
-#include "../common/strings.h"
-#include "../common/md5.h"
-#include "eqemu_api_world_data_service.h"
-#include "../common/zone_store.h"
-#include <fmt/format.h>
+
+#include "common/md5.h"
+#include "common/strings.h"
+#include "common/zone_store.h"
+#include "world/clientlist.h"
+#include "world/eqemu_api_world_data_service.h"
+#include "world/login_server_list.h"
+#include "world/login_server.h"
+#include "world/world_config.h"
+#include "world/world_console_connection.h"
+#include "world/worlddb.h"
+#include "world/zonelist.h"
+#include "world/zoneserver.h"
+
+#include "fmt/format.h"
 
 /**
  * @param username
diff --git a/world/console.h b/world/console.h
index 174349595..b8d4d3d86 100644
--- a/world/console.h
+++ b/world/console.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#include "../common/net/console_server.h"
+#include "common/net/console_server.h"
 
 void RegisterConsoleFunctions(std::unique_ptr<EQ::Net::ConsoleServer> &console);
diff --git a/world/dynamic_zone.cpp b/world/dynamic_zone.cpp
index fd9406f5c..832e2f6ca 100644
--- a/world/dynamic_zone.cpp
+++ b/world/dynamic_zone.cpp
@@ -1,12 +1,13 @@
 #include "dynamic_zone.h"
-#include "cliententry.h"
-#include "clientlist.h"
-#include "dynamic_zone_manager.h"
-#include "worlddb.h"
-#include "zonelist.h"
-#include "zoneserver.h"
-#include "../common/eqemu_logsys.h"
-#include "../common/repositories/instance_list_repository.h"
+
+#include "common/eqemu_logsys.h"
+#include "common/repositories/instance_list_repository.h"
+#include "world/cliententry.h"
+#include "world/clientlist.h"
+#include "world/dynamic_zone_manager.h"
+#include "world/worlddb.h"
+#include "world/zonelist.h"
+#include "world/zoneserver.h"
 
 Database& DynamicZone::GetDatabase()
 {
diff --git a/world/dynamic_zone.h b/world/dynamic_zone.h
index 48c702789..770f06ab9 100644
--- a/world/dynamic_zone.h
+++ b/world/dynamic_zone.h
@@ -1,9 +1,8 @@
-#ifndef WORLD_DYNAMIC_ZONE_H
-#define WORLD_DYNAMIC_ZONE_H
+#pragma once
 
-#include "../common/dynamic_zone_base.h"
-#include "../common/rulesys.h"
-#include "../common/timer.h"
+#include "common/dynamic_zone_base.h"
+#include "common/rulesys.h"
+#include "common/timer.h"
 
 class Database;
 class ServerPacket;
@@ -52,5 +51,3 @@ private:
 	Timer m_choose_leader_cooldown_timer{ static_cast<uint32_t>(RuleI(Expedition, ChooseLeaderCooldownTime)) };
 	Timer m_warning_cooldown_timer{ 1 }; // non-zero so it's enabled initially
 };
-
-#endif
diff --git a/world/dynamic_zone_manager.cpp b/world/dynamic_zone_manager.cpp
index 8cf87affe..66cd5e734 100644
--- a/world/dynamic_zone_manager.cpp
+++ b/world/dynamic_zone_manager.cpp
@@ -1,13 +1,15 @@
 #include "dynamic_zone_manager.h"
-#include "dynamic_zone.h"
-#include "cliententry.h"
-#include "clientlist.h"
-#include "worlddb.h"
-#include "zonelist.h"
-#include "zoneserver.h"
-#include "../common/rulesys.h"
-#include "../common/repositories/dynamic_zone_lockouts_repository.h"
-#include <cereal/types/utility.hpp>
+
+#include "common/repositories/dynamic_zone_lockouts_repository.h"
+#include "common/rulesys.h"
+#include "world/cliententry.h"
+#include "world/clientlist.h"
+#include "world/dynamic_zone.h"
+#include "world/worlddb.h"
+#include "world/zonelist.h"
+#include "world/zoneserver.h"
+
+#include "cereal/types/utility.hpp"
 
 DynamicZoneManager dynamic_zone_manager;
 
diff --git a/world/dynamic_zone_manager.h b/world/dynamic_zone_manager.h
index 0e7077639..42faa42a6 100644
--- a/world/dynamic_zone_manager.h
+++ b/world/dynamic_zone_manager.h
@@ -1,8 +1,8 @@
-#ifndef WORLD_DYNAMIC_ZONE_MANAGER_H
-#define WORLD_DYNAMIC_ZONE_MANAGER_H
+#pragma once
+
+#include "common/repositories/dynamic_zone_templates_repository.h"
+#include "common/timer.h"
 
-#include "../common/timer.h"
-#include "../common/repositories/dynamic_zone_templates_repository.h"
 #include <memory>
 #include <unordered_map>
 #include <vector>
@@ -35,5 +35,3 @@ private:
 	Timer m_process_throttle_timer{};
 	std::unordered_map<uint32_t, DynamicZoneTemplatesRepository::DynamicZoneTemplates> m_dz_templates;
 };
-
-#endif
diff --git a/world/eqemu_api_world_data_service.cpp b/world/eqemu_api_world_data_service.cpp
index eff7b7d94..8a4132e3e 100644
--- a/world/eqemu_api_world_data_service.cpp
+++ b/world/eqemu_api_world_data_service.cpp
@@ -1,17 +1,19 @@
-#include <fmt/format.h>
-#include "clientlist.h"
-#include "cliententry.h"
 #include "eqemu_api_world_data_service.h"
-#include "zoneserver.h"
-#include "zonelist.h"
-#include "../common/database_schema.h"
-#include "../common/server_reload_types.h"
-#include "../common/zone_store.h"
-#include "worlddb.h"
-#include "wguild_mgr.h"
-#include "world_config.h"
-#include "ucs.h"
-#include "queryserv.h"
+
+#include "common/database_schema.h"
+#include "common/server_reload_types.h"
+#include "common/zone_store.h"
+#include "world/cliententry.h"
+#include "world/clientlist.h"
+#include "world/queryserv.h"
+#include "world/ucs.h"
+#include "world/wguild_mgr.h"
+#include "world/world_config.h"
+#include "world/worlddb.h"
+#include "world/zonelist.h"
+#include "world/zoneserver.h"
+
+#include "fmt/format.h"
 
 extern WorldGuildManager guild_mgr;
 
diff --git a/world/eqemu_api_world_data_service.h b/world/eqemu_api_world_data_service.h
index f0952969e..806558287 100644
--- a/world/eqemu_api_world_data_service.h
+++ b/world/eqemu_api_world_data_service.h
@@ -18,10 +18,9 @@
  *
  */
 
-#ifndef EQEMU_API_WORLD_DATA_SERVICE_H
-#define EQEMU_API_WORLD_DATA_SERVICE_H
+#pragma once
 
-#include "../common/json/json.h"
+#include "common/json/json.h"
 
 class EQEmuApiWorldDataService {
 public:
@@ -30,6 +29,3 @@ public:
 	static void message(Json::Value &r, const std::string &message);
 	static void callGetGuildDetails(Json::Value &response, const std::vector<std::string> &args);
 };
-
-
-#endif //EQEMU_API_WORLD_DATA_SERVICE_H
diff --git a/world/eql_config.cpp b/world/eql_config.cpp
index 037372a94..74e4de689 100644
--- a/world/eql_config.cpp
+++ b/world/eql_config.cpp
@@ -15,13 +15,15 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#include "../common/global_define.h"
+
 #include "eql_config.h"
-#include "worlddb.h"
-#include "launcher_link.h"
-#include "launcher_list.h"
-#include "../common/strings.h"
-#include "../common/zone_store.h"
+
+#include "common/strings.h"
+#include "common/zone_store.h"
+#include "world/launcher_link.h"
+#include "world/launcher_list.h"
+#include "world/worlddb.h"
+
 #include <cstdlib>
 #include <cstring>
 
diff --git a/world/eql_config.h b/world/eql_config.h
index 998816165..1380e0bf9 100644
--- a/world/eql_config.h
+++ b/world/eql_config.h
@@ -15,11 +15,12 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#ifndef EQLCONFIG_H_
-#define EQLCONFIG_H_
 
-#include "../common/types.h"
-#include "worlddb.h"
+#pragma once
+
+#include "common/types.h"
+#include "world/worlddb.h"
+
 #include <map>
 #include <string>
 
@@ -53,6 +54,3 @@ protected:
 
 	std::map<std::string, LauncherZone> m_zones;	//static zones.
 };
-
-#endif /*EQLCONFIG_H_*/
-
diff --git a/world/launcher_link.cpp b/world/launcher_link.cpp
index 3b1a3fc05..92c7c030b 100644
--- a/world/launcher_link.cpp
+++ b/world/launcher_link.cpp
@@ -16,21 +16,20 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "../common/global_define.h"
 #include "launcher_link.h"
-#include "launcher_list.h"
-#include "world_config.h"
 
-#include "../common/md5.h"
-#include "../common/packet_dump.h"
-#include "../common/servertalk.h"
-#include "../common/strings.h"
-#include "../common/misc_functions.h"
-#include "worlddb.h"
-#include "eql_config.h"
+#include "common/md5.h"
+#include "common/misc_functions.h"
+#include "common/packet_dump.h"
+#include "common/servertalk.h"
+#include "common/strings.h"
+#include "world/eql_config.h"
+#include "world/launcher_list.h"
+#include "world/world_config.h"
+#include "world/worlddb.h"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 extern LauncherList launcher_list;
 
diff --git a/world/launcher_link.h b/world/launcher_link.h
index 60d8540e9..c22311d9a 100644
--- a/world/launcher_link.h
+++ b/world/launcher_link.h
@@ -15,16 +15,17 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#ifndef LAUNCHERLINK_H_
-#define LAUNCHERLINK_H_
 
-#include "../common/timer.h"
-#include "../common/net/servertalk_server_connection.h"
-#include "../common/event/timer.h"
+#pragma once
+
+#include "common/event/timer.h"
+#include "common/net/servertalk_server_connection.h"
+#include "common/timer.h"
+
+#include <map>
 #include <memory>
 #include <string>
 #include <vector>
-#include <map>
 
 class ServerPacket;
 
@@ -76,6 +77,3 @@ protected:
 	} ZoneState;
 	std::map<std::string, ZoneState> m_states;
 };
-
-#endif /*LAUNCHERLINK_H_*/
-
diff --git a/world/launcher_list.cpp b/world/launcher_list.cpp
index f9923f345..e5c3555d9 100644
--- a/world/launcher_list.cpp
+++ b/world/launcher_list.cpp
@@ -16,12 +16,10 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-
-#include "../common/global_define.h"
 #include "launcher_list.h"
-#include "launcher_link.h"
 
-#include "eql_config.h"
+#include "world/eql_config.h"
+#include "world/launcher_link.h"
 
 LauncherList::LauncherList()
 	: nextID(1)
diff --git a/world/launcher_list.h b/world/launcher_list.h
index f20dba0f4..15e655e8c 100644
--- a/world/launcher_list.h
+++ b/world/launcher_list.h
@@ -15,15 +15,16 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#ifndef LAUNCHERLIST_H_
-#define LAUNCHERLIST_H_
 
-#include "../common/types.h"
-#include "../common/net/servertalk_server_connection.h"
+#pragma once
+
+#include "common/types.h"
+#include "common/net/servertalk_server_connection.h"
+
 #include <map>
-#include <vector>
-#include <string>
 #include <memory>
+#include <string>
+#include <vector>
 
 class LauncherLink;
 class EQLConfig;
@@ -50,6 +51,3 @@ protected:
 	std::vector<LauncherLink *> m_pendingLaunchers;	//we own these objects, have not yet identified themself
 	int nextID;
 };
-
-#endif /*LAUNCHERLIST_H_*/
-
diff --git a/world/lfplist.cpp b/world/lfplist.cpp
index fcdc9daf3..283ffe8a6 100644
--- a/world/lfplist.cpp
+++ b/world/lfplist.cpp
@@ -17,13 +17,13 @@
 */
 
 #include "lfplist.h"
-#include "cliententry.h"
-#include "clientlist.h"
-#include "zoneserver.h"
-#include "zonelist.h"
 
-#include "../common/misc_functions.h"
-#include "../common/classes.h"
+#include "common/classes.h"
+#include "common/misc_functions.h"
+#include "world/cliententry.h"
+#include "world/clientlist.h"
+#include "world/zonelist.h"
+#include "world/zoneserver.h"
 
 GroupLFP::GroupLFP(uint32 inLeaderID) {
 
diff --git a/world/lfplist.h b/world/lfplist.h
index dbb4f8962..7524b3ca7 100644
--- a/world/lfplist.h
+++ b/world/lfplist.h
@@ -16,13 +16,12 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#ifndef LFPENTRY_H
-#define LFPENTRY_H
+#pragma once
 
-#include "../common/eq_packet_structs.h"
-#include "../common/servertalk.h"
-#include "../common/linked_list.h"
-#include "../common/timer.h"
+#include "common/eq_packet_structs.h"
+#include "common/linked_list.h"
+#include "common/servertalk.h"
+#include "common/timer.h"
 
 class GroupLFP {
 
@@ -59,9 +58,4 @@ public:
 private:
 	LinkedList<GroupLFP*> LFPGroupList;
 	Timer LFPStaleTimer;
-
-
 };
-
-#endif
-
diff --git a/world/login_server.cpp b/world/login_server.cpp
index 9bdc0c470..f911004f8 100644
--- a/world/login_server.cpp
+++ b/world/login_server.cpp
@@ -1,24 +1,23 @@
-#include "../common/global_define.h"
-#include <iostream>
-#include <string.h>
-#include <stdio.h>
-#include <iomanip>
-#include <stdlib.h>
-#include "../common/version.h"
-#include "../common/servertalk.h"
-#include "../common/misc_functions.h"
-#include "../common/eq_packet_structs.h"
-#include "../common/packet_dump.h"
-#include "../common/strings.h"
-#include "../common/eqemu_logsys.h"
 #include "login_server.h"
-#include "login_server_list.h"
-#include "zoneserver.h"
-#include "worlddb.h"
-#include "zonelist.h"
-#include "clientlist.h"
-#include "cliententry.h"
-#include "world_config.h"
+
+#include "common/eq_packet_structs.h"
+#include "common/eqemu_logsys.h"
+#include "common/misc_functions.h"
+#include "common/packet_dump.h"
+#include "common/servertalk.h"
+#include "common/strings.h"
+#include "common/version.h"
+#include "world/cliententry.h"
+#include "world/clientlist.h"
+#include "world/login_server_list.h"
+#include "world/world_config.h"
+#include "world/worlddb.h"
+#include "world/zonelist.h"
+#include "world/zoneserver.h"
+
+#include <cstring>
+#include <cstdio>
+#include <cstdlib>
 
 extern uint32        numzones;
 extern uint32        numplayers;
diff --git a/world/login_server.h b/world/login_server.h
index 0a5e6a107..e77366411 100644
--- a/world/login_server.h
+++ b/world/login_server.h
@@ -1,15 +1,15 @@
-#ifndef LOGINSERVER_H
-#define LOGINSERVER_H
+#pragma once
+
+#include "common/eq_packet_structs.h"
+#include "common/event/timer.h"
+#include "common/linked_list.h"
+#include "common/mutex.h"
+#include "common/net/servertalk_client_connection.h"
+#include "common/net/servertalk_legacy_client_connection.h"
+#include "common/queue.h"
+#include "common/servertalk.h"
+#include "common/timer.h"
 
-#include "../common/servertalk.h"
-#include "../common/linked_list.h"
-#include "../common/timer.h"
-#include "../common/queue.h"
-#include "../common/eq_packet_structs.h"
-#include "../common/mutex.h"
-#include "../common/net/servertalk_client_connection.h"
-#include "../common/net/servertalk_legacy_client_connection.h"
-#include "../common/event/timer.h"
 #include <memory>
 
 class LoginServer{
@@ -63,4 +63,3 @@ private:
 	bool                                             m_can_account_update;
 	bool                                             m_is_legacy;
 };
-#endif
diff --git a/world/login_server_list.cpp b/world/login_server_list.cpp
index 5a2c8f375..06f01e25f 100644
--- a/world/login_server_list.cpp
+++ b/world/login_server_list.cpp
@@ -15,27 +15,26 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#include "../common/global_define.h"
-#include <iostream>
-#include <string.h>
-#include <stdio.h>
-#include <iomanip>
-#include <stdlib.h>
-#include "../common/version.h"
+
+#include "login_server_list.h"
+
+#include "common/eq_packet_structs.h"
+#include "common/packet_dump.h"
+#include "common/servertalk.h"
+#include "common/version.h"
+#include "world/clientlist.h"
+#include "world/login_server.h"
+#include "world/world_config.h"
+#include "world/worlddb.h"
+#include "world/zonelist.h"
+#include "world/zoneserver.h"
+
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #define IGNORE_LS_FATAL_ERROR
 
-#include "../common/servertalk.h"
-#include "login_server.h"
-#include "login_server_list.h"
-#include "../common/eq_packet_structs.h"
-#include "../common/packet_dump.h"
-#include "zoneserver.h"
-#include "worlddb.h"
-#include "zonelist.h"
-#include "clientlist.h"
-#include "world_config.h"
-
 extern uint32 numzones;
 extern uint32 numplayers;
 extern volatile bool	RunLoops;
diff --git a/world/login_server_list.h b/world/login_server_list.h
index 54de20bef..fe37f5274 100644
--- a/world/login_server_list.h
+++ b/world/login_server_list.h
@@ -1,11 +1,11 @@
-#ifndef LOGINSERVERLIST_H_
-#define LOGINSERVERLIST_H_
+#pragma once
+
+#include "common/eq_packet_structs.h"
+#include "common/mutex.h"
+#include "common/queue.h"
+#include "common/servertalk.h"
+#include "common/timer.h"
 
-#include "../common/servertalk.h"
-#include "../common/timer.h"
-#include "../common/queue.h"
-#include "../common/eq_packet_structs.h"
-#include "../common/mutex.h"
 #include <list>
 
 class LoginServer;
@@ -31,8 +31,3 @@ public:
 protected:
 	std::list<std::unique_ptr<LoginServer>> m_list;
 };
-
-
-
-
-#endif /*LOGINSERVERLIST_H_*/
diff --git a/world/main.cpp b/world/main.cpp
index c9386128e..9aa7f50fe 100644
--- a/world/main.cpp
+++ b/world/main.cpp
@@ -18,79 +18,55 @@
  *
  */
 
-#include "../common/global_define.h"
-
-#include <iostream>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <signal.h>
-
-#include "../common/strings.h"
-#include "../common/eqemu_logsys.h"
-#include "../common/queue.h"
-#include "../common/timer.h"
-#include "../common/eq_packet.h"
-#include "../common/seperator.h"
-#include "../common/version.h"
-#include "../common/eqtime.h"
-#include "../common/event/event_loop.h"
-#include "../common/net/eqstream.h"
-#include "../common/opcodemgr.h"
-#include "../common/guilds.h"
-#include "../common/eq_stream_ident.h"
-#include "../common/rulesys.h"
-#include "../common/platform.h"
-#include "../common/crash.h"
-#include "../common/misc.h"
-#include "client.h"
-#include "worlddb.h"
-#include "wguild_mgr.h"
-#include "../common/evolving_items.h"
+#include "common/content/world_content_service.h"
+#include "common/crash.h"
+#include "common/eq_packet.h"
+#include "common/eq_stream_ident.h"
+#include "common/eqemu_logsys.h"
+#include "common/eqtime.h"
+#include "common/event/event_loop.h"
+#include "common/events/player_event_logs.h"
+#include "common/guilds.h"
+#include "common/ip_util.h"
+#include "common/misc.h"
+#include "common/net/eqstream.h"
+#include "common/patches/patches.h"
+#include "common/path_manager.h"
+#include "common/platform.h"
+#include "common/repositories/character_expedition_lockouts_repository.h"
+#include "common/repositories/character_task_timers_repository.h"
+#include "common/rulesys.h"
+#include "common/skill_caps.h"
+#include "common/timer.h"
+#include "common/version.h"
+#include "world/adventure_manager.h"
+#include "world/client.h"
+#include "world/clientlist.h"
+#include "world/console.h"
+#include "world/dynamic_zone_manager.h"
+#include "world/launcher_list.h"
+#include "world/lfplist.h"
+#include "world/login_server.h"
+#include "world/queryserv.h"
+#include "world/shared_task_manager.h"
+#include "world/ucs.h"
+#include "world/web_interface.h"
+#include "world/wguild_mgr.h"
+#include "world/world_boot.h"
+#include "world/world_config.h"
+#include "world/world_event_scheduler.h"
+#include "world/world_server_cli.h"
+#include "world/worlddb.h"
+#include "world/zonelist.h"
+#include "world/zoneserver.h"
 
+#include "fmt/format.h"
+#include <csignal>
+#include <cstdlib>
 #ifdef _WINDOWS
-#include <process.h>
-#define snprintf	_snprintf
-#define strncasecmp	_strnicmp
-#define strcasecmp	_stricmp
 #include <conio.h>
-#else
-
-#include <sys/sem.h>
-#include <thread>
-
 #endif
 
-#include "../common/patches/patches.h"
-#include "zoneserver.h"
-#include "login_server.h"
-#include "login_server_list.h"
-#include "world_config.h"
-#include "zonelist.h"
-#include "clientlist.h"
-#include "launcher_list.h"
-#include "lfplist.h"
-#include "adventure_manager.h"
-#include "ucs.h"
-#include "queryserv.h"
-#include "web_interface.h"
-#include "console.h"
-#include "dynamic_zone_manager.h"
-
-#include "world_server_cli.h"
-#include "../common/content/world_content_service.h"
-#include "../common/repositories/character_expedition_lockouts_repository.h"
-#include "../common/repositories/character_task_timers_repository.h"
-#include "../common/zone_store.h"
-#include "world_event_scheduler.h"
-#include "shared_task_manager.h"
-#include "world_boot.h"
-#include "../common/path_manager.h"
-#include "../common/events/player_event_logs.h"
-#include "../common/skill_caps.h"
-#include "../common/repositories/character_parcels_repository.h"
-#include "../common/ip_util.h"
-
 GroupLFPList        LFPGroupList;
 LauncherList        launcher_list;
 volatile bool       RunLoops   = true;
diff --git a/world/queryserv.cpp b/world/queryserv.cpp
index 69185607c..19bce076c 100644
--- a/world/queryserv.cpp
+++ b/world/queryserv.cpp
@@ -1,13 +1,11 @@
-#include "../common/global_define.h"
-#include "../common/eqemu_logsys.h"
 #include "queryserv.h"
-#include "world_config.h"
-#include "clientlist.h"
-#include "zonelist.h"
 
-
-#include "../common/md5.h"
-#include "../common/packet_dump.h"
+#include "common/eqemu_logsys.h"
+#include "common/md5.h"
+#include "common/packet_dump.h"
+#include "world/clientlist.h"
+#include "world/world_config.h"
+#include "world/zonelist.h"
 
 QueryServConnection::QueryServConnection()
 {
diff --git a/world/queryserv.h b/world/queryserv.h
index 5366fbeb5..177da7b75 100644
--- a/world/queryserv.h
+++ b/world/queryserv.h
@@ -1,10 +1,9 @@
-#ifndef QueryServ_H
-#define QueryServ_H
+#pragma once
 
-#include "../common/types.h"
-#include "../common/net/servertalk_server.h"
-#include "../common/servertalk.h"
-#include "../common/event/timer.h"
+#include "common/types.h"
+#include "common/net/servertalk_server.h"
+#include "common/servertalk.h"
+#include "common/event/timer.h"
 
 class QueryServConnection
 {
@@ -26,5 +25,3 @@ private:
 	std::map<std::string, std::shared_ptr<EQ::Net::ServertalkServerConnection>> m_streams;
 	std::unique_ptr<EQ::Timer> m_keepalive;
 };
-
-#endif /*QueryServ_H_*/
diff --git a/world/shared_task_manager.cpp b/world/shared_task_manager.cpp
index 914f40958..6eae5ef40 100644
--- a/world/shared_task_manager.cpp
+++ b/world/shared_task_manager.cpp
@@ -1,21 +1,21 @@
 #include "shared_task_manager.h"
-#include "cliententry.h"
-#include "clientlist.h"
-#include "dynamic_zone.h"
-#include "dynamic_zone_manager.h"
-#include "zonelist.h"
-#include "zoneserver.h"
-#include "shared_task_world_messaging.h"
-#include "../common/rulesys.h"
-#include "../common/repositories/character_data_repository.h"
-#include "../common/repositories/character_task_timers_repository.h"
-#include "../common/repositories/shared_task_members_repository.h"
-#include "../common/repositories/shared_task_activity_state_repository.h"
-#include "../common/repositories/completed_shared_tasks_repository.h"
-#include "../common/repositories/completed_shared_task_members_repository.h"
-#include "../common/repositories/completed_shared_task_activity_state_repository.h"
-#include "../common/repositories/shared_task_dynamic_zones_repository.h"
-#include <ctime>
+
+#include "common/repositories/character_data_repository.h"
+#include "common/repositories/character_task_timers_repository.h"
+#include "common/repositories/completed_shared_task_activity_state_repository.h"
+#include "common/repositories/completed_shared_task_members_repository.h"
+#include "common/repositories/completed_shared_tasks_repository.h"
+#include "common/repositories/shared_task_activity_state_repository.h"
+#include "common/repositories/shared_task_dynamic_zones_repository.h"
+#include "common/repositories/shared_task_members_repository.h"
+#include "common/rulesys.h"
+#include "world/cliententry.h"
+#include "world/clientlist.h"
+#include "world/dynamic_zone_manager.h"
+#include "world/dynamic_zone.h"
+#include "world/shared_task_world_messaging.h"
+#include "world/zonelist.h"
+#include "world/zoneserver.h"
 
 SharedTaskManager::SharedTaskManager()
 	: m_process_timer{ static_cast<uint32_t>(RuleI(TaskSystem, SharedTasksWorldProcessRate)) }
diff --git a/world/shared_task_manager.h b/world/shared_task_manager.h
index 197a8bce2..bb8afe50c 100644
--- a/world/shared_task_manager.h
+++ b/world/shared_task_manager.h
@@ -1,10 +1,9 @@
-#ifndef EQEMU_SHARED_TASK_MANAGER_H
-#define EQEMU_SHARED_TASK_MANAGER_H
+#pragma once
 
-#include "../common/database.h"
-#include "../common/shared_tasks.h"
-#include "../common/timer.h"
-#include "../common/repositories/character_task_timers_repository.h"
+#include "common/database.h"
+#include "common/repositories/character_task_timers_repository.h"
+#include "common/shared_tasks.h"
+#include "common/timer.h"
 
 class DynamicZone;
 
@@ -147,5 +146,3 @@ protected:
 	// memory search
 	std::vector<SharedTaskMember> FindCharactersInSharedTasks(const std::vector<uint32_t> &find_characters);
 };
-
-#endif //EQEMU_SHARED_TASK_MANAGER_H
diff --git a/world/shared_task_world_messaging.cpp b/world/shared_task_world_messaging.cpp
index 39f4af804..526b144bc 100644
--- a/world/shared_task_world_messaging.cpp
+++ b/world/shared_task_world_messaging.cpp
@@ -1,18 +1,19 @@
 #include "shared_task_world_messaging.h"
-#include "cliententry.h"
-#include "worlddb.h"
-#include "../common/shared_tasks.h"
-#include "../common/eqemu_logsys.h"
-#include "../common/repositories/tasks_repository.h"
-#include "../common/tasks.h"
-#include "cliententry.h"
-#include "clientlist.h"
-#include "zonelist.h"
-#include "zoneserver.h"
-#include "shared_task_manager.h"
-#include "../common/repositories/shared_task_members_repository.h"
-#include "../common/repositories/task_activities_repository.h"
-#include "dynamic_zone.h"
+
+#include "common/eqemu_logsys.h"
+#include "common/repositories/shared_task_members_repository.h"
+#include "common/repositories/task_activities_repository.h"
+#include "common/repositories/tasks_repository.h"
+#include "common/shared_tasks.h"
+#include "common/tasks.h"
+#include "world/cliententry.h"
+#include "world/cliententry.h"
+#include "world/clientlist.h"
+#include "world/dynamic_zone.h"
+#include "world/shared_task_manager.h"
+#include "world/worlddb.h"
+#include "world/zonelist.h"
+#include "world/zoneserver.h"
 
 void SharedTaskWorldMessaging::HandleZoneMessage(ServerPacket *pack)
 {
diff --git a/world/shared_task_world_messaging.h b/world/shared_task_world_messaging.h
index e8062e2ec..c841baf80 100644
--- a/world/shared_task_world_messaging.h
+++ b/world/shared_task_world_messaging.h
@@ -1,18 +1,14 @@
-#ifndef EQEMU_SHARED_TASK_WORLD_MESSAGING_H
-#define EQEMU_SHARED_TASK_WORLD_MESSAGING_H
+#pragma once
 
-#include "../common/types.h"
-#include "../common/servertalk.h"
-#include "../common/shared_tasks.h"
-#include "../common/eqemu_logsys.h"
-#include "../common/repositories/tasks_repository.h"
-#include "../common/tasks.h"
+#include "common/eqemu_logsys.h"
+#include "common/repositories/tasks_repository.h"
+#include "common/servertalk.h"
+#include "common/shared_tasks.h"
+#include "common/tasks.h"
+#include "common/types.h"
 
-class SharedTaskWorldMessaging {
+class SharedTaskWorldMessaging
+{
 public:
 	static void HandleZoneMessage(ServerPacket *pack);
 };
-
-
-#endif //EQEMU_SHARED_TASK_WORLD_MESSAGING_H
-
diff --git a/world/sof_char_create_data.h b/world/sof_char_create_data.h
index 97d9e8014..c522507d6 100644
--- a/world/sof_char_create_data.h
+++ b/world/sof_char_create_data.h
@@ -1,6 +1,6 @@
-#ifndef SOFCHARCREATEDATA_H
-#define SOFCHARCREATEDATA_H
+#pragma once
 
+#pragma pack(push)
 #pragma pack(1)
 
 struct RaceClassAllocation {
@@ -26,6 +26,5 @@ struct RaceClassCombos {
 	SoFCCStartZoneData StartZoneData[641];
 };
 */
-#pragma pack()
 
-#endif
+#pragma pack(pop)
diff --git a/world/ucs.cpp b/world/ucs.cpp
index 0cc70a0ea..298c359fc 100644
--- a/world/ucs.cpp
+++ b/world/ucs.cpp
@@ -1,12 +1,11 @@
-#include "../common/global_define.h"
-#include "../common/eqemu_logsys.h"
 #include "ucs.h"
-#include "world_config.h"
 
-#include "../common/misc_functions.h"
-#include "../common/md5.h"
-#include "../common/packet_dump.h"
-#include "../common/event/timer.h"
+#include "common/eqemu_logsys.h"
+#include "common/event/timer.h"
+#include "common/md5.h"
+#include "common/misc_functions.h"
+#include "common/packet_dump.h"
+#include "world/world_config.h"
 
 UCSConnection::UCSConnection()
 {
diff --git a/world/ucs.h b/world/ucs.h
index a324d91fc..520dff929 100644
--- a/world/ucs.h
+++ b/world/ucs.h
@@ -1,10 +1,10 @@
-#ifndef UCS_H
-#define UCS_H
+#pragma once
+
+#include "common/event/timer.h"
+#include "common/net/servertalk_server_connection.h"
+#include "common/servertalk.h"
+#include "common/types.h"
 
-#include "../common/types.h"
-#include "../common/net/servertalk_server_connection.h"
-#include "../common/servertalk.h"
-#include "../common/event/timer.h"
 #include <memory>
 
 class UCSConnection
@@ -30,5 +30,3 @@ private:
 	std::shared_ptr<EQ::Net::ServertalkServerConnection> connection;
 
 };
-
-#endif /*UCS_H_*/
diff --git a/world/web_interface.cpp b/world/web_interface.cpp
index 1de21b4e4..e794b7074 100644
--- a/world/web_interface.cpp
+++ b/world/web_interface.cpp
@@ -1,7 +1,7 @@
 #include "web_interface.h"
-#include "../common/json/json.h"
 
-#include "web_interface_eqw.h"
+#include "common/json/json.h"
+#include "world/web_interface_eqw.h"
 
 #include <sstream>
 
diff --git a/world/web_interface.h b/world/web_interface.h
index 0725c190a..4933d7905 100644
--- a/world/web_interface.h
+++ b/world/web_interface.h
@@ -1,12 +1,11 @@
 #pragma once
 
-#include "../common/net/servertalk_server_connection.h"
-#include "../common/json/json.h"
+#include "common/json/json.h"
+#include "common/net/servertalk_server_connection.h"
+
+#include <functional>
 #include <map>
 #include <string>
-#include <functional>
-
-
 
 class WebInterface
 {
diff --git a/world/web_interface_eqw.cpp b/world/web_interface_eqw.cpp
index 2601eccc8..554b495f3 100644
--- a/world/web_interface_eqw.cpp
+++ b/world/web_interface_eqw.cpp
@@ -1,10 +1,11 @@
 #include "web_interface_eqw.h"
-#include "web_interface.h"
-#include "world_config.h"
-#include "login_server_list.h"
-#include "clientlist.h"
-#include "zonelist.h"
-#include "launcher_list.h"
+
+#include "world/clientlist.h"
+#include "world/launcher_list.h"
+#include "world/login_server_list.h"
+#include "world/web_interface.h"
+#include "world/world_config.h"
+#include "world/zonelist.h"
 
 extern LauncherList launcher_list;
 
diff --git a/world/web_interface_eqw.h b/world/web_interface_eqw.h
index 6ebceae15..d7a3f54f5 100644
--- a/world/web_interface_eqw.h
+++ b/world/web_interface_eqw.h
@@ -2,4 +2,4 @@
 
 class WebInterface;
 
-void RegisterEQW(WebInterface *i);
\ No newline at end of file
+void RegisterEQW(WebInterface *i);
diff --git a/world/wguild_mgr.cpp b/world/wguild_mgr.cpp
index ace4d9e0f..fbbbbcd78 100644
--- a/world/wguild_mgr.cpp
+++ b/world/wguild_mgr.cpp
@@ -16,23 +16,23 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "../common/eqemu_logsys.h"
-#include "../common/global_define.h"
 #include "wguild_mgr.h"
-#include "../common/servertalk.h"
-#include "clientlist.h"
-#include "zonelist.h"
-#include "zoneserver.h"
-#include "cliententry.h"
-#include "client.h"
-#include "../common/repositories/guilds_repository.h"
-#include "../common/repositories/guild_ranks_repository.h"
-#include "../common/repositories/guild_permissions_repository.h"
-#include "../common/repositories/guild_members_repository.h"
-#include "../common/repositories/guild_bank_repository.h"
-#include "../common/repositories/guild_tributes_repository.h"
-#include "../common/repositories/tributes_repository.h"
-#include "../common/repositories/tribute_levels_repository.h"
+
+#include "common/eqemu_logsys.h"
+#include "common/repositories/guild_bank_repository.h"
+#include "common/repositories/guild_members_repository.h"
+#include "common/repositories/guild_permissions_repository.h"
+#include "common/repositories/guild_ranks_repository.h"
+#include "common/repositories/guild_tributes_repository.h"
+#include "common/repositories/guilds_repository.h"
+#include "common/repositories/tribute_levels_repository.h"
+#include "common/repositories/tributes_repository.h"
+#include "common/servertalk.h"
+#include "world/client.h"
+#include "world/cliententry.h"
+#include "world/clientlist.h"
+#include "world/zonelist.h"
+#include "world/zoneserver.h"
 
 std::map<uint32, TributeData> tribute_list;
 
diff --git a/world/wguild_mgr.h b/world/wguild_mgr.h
index 9a0204760..f107086d9 100644
--- a/world/wguild_mgr.h
+++ b/world/wguild_mgr.h
@@ -1,8 +1,7 @@
-#ifndef WGUILD_MGR_H_
-#define WGUILD_MGR_H_
+#pragma once
 
-#include "../common/types.h"
-#include "../common/guild_base.h"
+#include "common/types.h"
+#include "common/guild_base.h"
 
 class Client;
 class ServerPacket;
@@ -30,7 +29,3 @@ protected:
 };
 
 extern WorldGuildManager guild_mgr;
-
-
-#endif /*WGUILD_MGR_H_*/
-
diff --git a/world/world_boot.cpp b/world/world_boot.cpp
index 19667927c..337e5d133 100644
--- a/world/world_boot.cpp
+++ b/world/world_boot.cpp
@@ -1,33 +1,34 @@
-#include "../common/content/world_content_service.h"
-#include "../common/emu_constants.h"
-#include "../common/eqemu_logsys.h"
-#include "../common/http/httplib.h"
-#include "../common/http/uri.h"
-#include "../common/net/console_server.h"
-#include "../common/net/servertalk_server.h"
-#include "../common/repositories/character_expedition_lockouts_repository.h"
-#include "../common/repositories/character_task_timers_repository.h"
-#include "../common/rulesys.h"
-#include "../common/strings.h"
-#include "adventure_manager.h"
-#include "dynamic_zone_manager.h"
-#include "login_server_list.h"
-#include "shared_task_manager.h"
-#include "ucs.h"
-#include "wguild_mgr.h"
 #include "world_boot.h"
-#include "world_config.h"
-#include "world_event_scheduler.h"
-#include "world_server_cli.h"
-#include "../common/zone_store.h"
-#include "worlddb.h"
-#include "zonelist.h"
-#include "zoneserver.h"
-#include "../common/ip_util.h"
-#include "../common/zone_store.h"
-#include "../common/path_manager.h"
-#include "../common/database/database_update.h"
-#include "../common/repositories/zone_state_spawns_repository.h"
+
+#include "common/content/world_content_service.h"
+#include "common/database/database_update.h"
+#include "common/emu_constants.h"
+#include "common/eqemu_logsys.h"
+#include "common/http/httplib.h"
+#include "common/http/uri.h"
+#include "common/ip_util.h"
+#include "common/net/console_server.h"
+#include "common/net/servertalk_server.h"
+#include "common/path_manager.h"
+#include "common/repositories/character_expedition_lockouts_repository.h"
+#include "common/repositories/character_task_timers_repository.h"
+#include "common/repositories/zone_state_spawns_repository.h"
+#include "common/rulesys.h"
+#include "common/strings.h"
+#include "common/zone_store.h"
+#include "common/zone_store.h"
+#include "world/adventure_manager.h"
+#include "world/dynamic_zone_manager.h"
+#include "world/login_server_list.h"
+#include "world/shared_task_manager.h"
+#include "world/ucs.h"
+#include "world/wguild_mgr.h"
+#include "world/world_config.h"
+#include "world/world_event_scheduler.h"
+#include "world/world_server_cli.h"
+#include "world/worlddb.h"
+#include "world/zonelist.h"
+#include "world/zoneserver.h"
 
 extern WorldConfig Config;
 
diff --git a/world/world_boot.h b/world/world_boot.h
index e58b900c5..d8254d586 100644
--- a/world/world_boot.h
+++ b/world/world_boot.h
@@ -1,10 +1,10 @@
-#ifndef EQEMU_WORLD_BOOT_H
-#define EQEMU_WORLD_BOOT_H
+#pragma once
+
+#include "common/discord/discord.h"
+#include "common/types.h"
+#include "world/ucs.h"
 
 #include <string>
-#include "../common/types.h"
-#include "../common/discord/discord.h"
-#include "ucs.h"
 
 class WorldBoot {
 public:
@@ -27,6 +27,3 @@ public:
 		SendDiscordMessage(webhook_id, message_prefix + Discord::FormatDiscordMessage(log_category, message));
 	};
 };
-
-
-#endif //EQEMU_WORLD_BOOT_H
diff --git a/world/world_config.cpp b/world/world_config.cpp
index d49884740..53055b254 100644
--- a/world/world_config.cpp
+++ b/world/world_config.cpp
@@ -15,10 +15,11 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#include "../common/global_define.h"
-#include "../common/eqemu_logsys.h"
+
 #include "world_config.h"
 
+#include "common/eqemu_logsys.h"
+
 WorldConfig *WorldConfig::_world_config = nullptr;
 
 std::string WorldConfig::GetByName(const std::string &var_name) const
@@ -31,4 +32,3 @@ std::string WorldConfig::GetByName(const std::string &var_name) const
 	}
 	return (EQEmuConfig::GetByName(var_name));
 }
-
diff --git a/world/world_config.h b/world/world_config.h
index bcea602d3..ffe0114e1 100644
--- a/world/world_config.h
+++ b/world/world_config.h
@@ -15,10 +15,10 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#ifndef __WorldConfig_H
-#define __WorldConfig_H
 
-#include "../common/eqemu_config.h"
+#pragma once
+
+#include "common/eqemu_config.h"
 
 class WorldConfig : public EQEmuConfig {
 public:
@@ -64,5 +64,3 @@ public:
 
 	void Dump() const;
 };
-
-#endif
diff --git a/world/world_console_connection.cpp b/world/world_console_connection.cpp
index 930f6da95..196826954 100644
--- a/world/world_console_connection.cpp
+++ b/world/world_console_connection.cpp
@@ -1,6 +1,7 @@
 #include "world_console_connection.h"
-#include <string.h>
-#include <stdarg.h>
+
+#include <cstring>
+#include <cstdarg>
 
 void WorldConsoleTCPConnection::SendEmoteMessage(const char *to, uint32 to_guilddbid, int16 to_minstatus, uint32 type, const char *message, ...)
 {
diff --git a/world/world_console_connection.h b/world/world_console_connection.h
index 5629f1def..616fdbd12 100644
--- a/world/world_console_connection.h
+++ b/world/world_console_connection.h
@@ -15,10 +15,11 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
+
 #pragma once
 
-#include "world_tcp_connection.h"
-#include "../common/net/console_server_connection.h"
+#include "common/net/console_server_connection.h"
+#include "world/world_tcp_connection.h"
 
 class WorldConsoleTCPConnection : public WorldTCPConnection
 {
@@ -33,4 +34,3 @@ public:
 private:
 	EQ::Net::ConsoleServerConnection *m_connection;
 };
-
diff --git a/world/world_event_scheduler.cpp b/world/world_event_scheduler.cpp
index c1ab226ab..c9ceafc52 100644
--- a/world/world_event_scheduler.cpp
+++ b/world/world_event_scheduler.cpp
@@ -1,8 +1,10 @@
 #include "world_event_scheduler.h"
-#include "../common/servertalk.h"
+
+#include "common/rulesys.h"
+#include "common/server_reload_types.h"
+#include "common/servertalk.h"
+
 #include <ctime>
-#include "../common/rulesys.h"
-#include "../common/server_reload_types.h"
 
 void WorldEventScheduler::Process(ZSList *zs_list)
 {
diff --git a/world/world_event_scheduler.h b/world/world_event_scheduler.h
index 4819b1400..d5e333f64 100644
--- a/world/world_event_scheduler.h
+++ b/world/world_event_scheduler.h
@@ -1,8 +1,7 @@
-#ifndef EQEMU_EVENT_SCHEDULER_H
-#define EQEMU_EVENT_SCHEDULER_H
+#pragma once
 
-#include "../common/server_event_scheduler.h"
-#include "zonelist.h"
+#include "common/server_event_scheduler.h"
+#include "world/zonelist.h"
 
 class WorldEventScheduler : public ServerEventScheduler {
 public:
@@ -14,5 +13,3 @@ public:
 		return &instance;
 	}
 };
-
-#endif //EQEMU_EVENT_SCHEDULER_H
diff --git a/world/world_server_cli.cpp b/world/world_server_cli.cpp
index 111929a0c..50b16f4e4 100644
--- a/world/world_server_cli.cpp
+++ b/world/world_server_cli.cpp
@@ -1,9 +1,5 @@
 #include "world_server_cli.h"
 
-/**
- * @param argc
- * @param argv
- */
 void WorldserverCLI::CommandHandler(int argc, char **argv)
 {
 	if (argc == 1) { return; }
@@ -38,4 +34,3 @@ void WorldserverCLI::CommandHandler(int argc, char **argv)
 
 	EQEmuCommand::HandleMenu(function_map, cmd, argc, argv);
 }
-
diff --git a/world/world_server_cli.h b/world/world_server_cli.h
index 1066158b9..4fa4b434e 100644
--- a/world/world_server_cli.h
+++ b/world/world_server_cli.h
@@ -1,8 +1,7 @@
-#include "iostream"
-#include "../common/cli/eqemu_command_handler.h"
 
-#ifndef EQEMU_WORLD_SERVER_COMMAND_HANDLER_H
-#define EQEMU_WORLD_SERVER_COMMAND_HANDLER_H
+#pragma once
+
+#include "common/cli/eqemu_command_handler.h"
 
 class WorldserverCLI {
 public:
@@ -27,6 +26,3 @@ public:
 	static void TestStringBenchmarkCommand(int argc, char **argv, argh::parser &cmd, std::string &description);
 	static void EtlGetSettings(int argc, char **argv, argh::parser &cmd, std::string &description);
 };
-
-
-#endif //EQEMU_WORLD_SERVER_COMMAND_HANDLER_H
diff --git a/world/world_tcp_connection.h b/world/world_tcp_connection.h
index dd9ff7a5b..960e07204 100644
--- a/world/world_tcp_connection.h
+++ b/world/world_tcp_connection.h
@@ -15,10 +15,10 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#ifndef WorldTCPCONNECTION_H
-#define WorldTCPCONNECTION_H
 
-#include "../common/types.h"
+#pragma once
+
+#include "common/types.h"
 
 class WorldTCPConnection
 {
@@ -31,5 +31,3 @@ public:
 	virtual inline bool IsConsole() { return false; }
 	virtual inline bool IsZoneServer() { return false; }
 };
-
-#endif
diff --git a/world/worlddb.cpp b/world/worlddb.cpp
index f47cdb608..b03478e8b 100644
--- a/world/worlddb.cpp
+++ b/world/worlddb.cpp
@@ -17,22 +17,23 @@
 */
 
 #include "worlddb.h"
-#include "../common/strings.h"
-#include "../common/eq_packet_structs.h"
-#include "../common/inventory_profile.h"
-#include "../common/rulesys.h"
-#include <iostream>
+
+#include "common/eq_packet_structs.h"
+#include "common/inventory_profile.h"
+#include "common/repositories/character_bind_repository.h"
+#include "common/repositories/character_data_repository.h"
+#include "common/repositories/character_instance_safereturns_repository.h"
+#include "common/repositories/character_material_repository.h"
+#include "common/repositories/criteria/content_filter_criteria.h"
+#include "common/repositories/inventory_repository.h"
+#include "common/repositories/start_zones_repository.h"
+#include "common/rulesys.h"
+#include "common/strings.h"
+#include "common/zone_store.h"
+#include "world/sof_char_create_data.h"
+
 #include <cstdlib>
 #include <vector>
-#include "sof_char_create_data.h"
-#include "../common/repositories/character_instance_safereturns_repository.h"
-#include "../common/repositories/inventory_repository.h"
-#include "../common/repositories/criteria/content_filter_criteria.h"
-#include "../common/zone_store.h"
-#include "../common/repositories/character_data_repository.h"
-#include "../common/repositories/character_bind_repository.h"
-#include "../common/repositories/character_material_repository.h"
-#include "../common/repositories/start_zones_repository.h"
 
 WorldDatabase database;
 WorldDatabase content_db;
diff --git a/world/worlddb.h b/world/worlddb.h
index 5d9dab2e8..b6025b3d3 100644
--- a/world/worlddb.h
+++ b/world/worlddb.h
@@ -15,13 +15,13 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#ifndef WORLDDB_H_
-#define WORLDDB_H_
 
-#include "../common/shareddb.h"
-#include "../common/eq_packet.h"
-#include "../common/repositories/inventory_repository.h"
-#include "../common/repositories/character_data_repository.h"
+#pragma once
+
+#include "common/eq_packet.h"
+#include "common/repositories/character_data_repository.h"
+#include "common/repositories/inventory_repository.h"
+#include "common/shareddb.h"
 
 struct PlayerProfile_Struct;
 struct CharCreate_Struct;
@@ -54,5 +54,3 @@ private:
 
 extern WorldDatabase database;
 extern WorldDatabase content_db;
-
-#endif /*WORLDDB_H_*/
diff --git a/world/zonelist.cpp b/world/zonelist.cpp
index f108031dc..1f4ae80fc 100644
--- a/world/zonelist.cpp
+++ b/world/zonelist.cpp
@@ -15,31 +15,32 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#include "../common/global_define.h"
+
 #include "zonelist.h"
-#include "zoneserver.h"
-#include "worlddb.h"
-#include "world_config.h"
-#include "../common/misc_functions.h"
-#include "../common/servertalk.h"
-#include "../common/strings.h"
-#include "../common/random.h"
-#include "../common/json/json.h"
-#include "../common/event_sub.h"
-#include "web_interface.h"
-#include "../common/zone_store.h"
-#include "../common/events/player_event_logs.h"
-#include "../common/patches/patches.h"
-#include "../common/skill_caps.h"
-#include "../common/content/world_content_service.h"
-#include "world_boot.h"
-#include "shared_task_manager.h"
-#include "dynamic_zone_manager.h"
-#include "ucs.h"
-#include "clientlist.h"
-#include "queryserv.h"
-#include "../common/repositories/trader_repository.h"
-#include "../common/repositories/buyer_repository.h"
+
+#include "common/content/world_content_service.h"
+#include "common/event_sub.h"
+#include "common/events/player_event_logs.h"
+#include "common/json/json.h"
+#include "common/misc_functions.h"
+#include "common/patches/patches.h"
+#include "common/random.h"
+#include "common/repositories/buyer_repository.h"
+#include "common/repositories/trader_repository.h"
+#include "common/servertalk.h"
+#include "common/skill_caps.h"
+#include "common/strings.h"
+#include "common/zone_store.h"
+#include "world/clientlist.h"
+#include "world/dynamic_zone_manager.h"
+#include "world/queryserv.h"
+#include "world/shared_task_manager.h"
+#include "world/ucs.h"
+#include "world/web_interface.h"
+#include "world/world_boot.h"
+#include "world/world_config.h"
+#include "world/worlddb.h"
+#include "world/zoneserver.h"
 
 extern uint32 numzones;
 volatile bool UCSServerAvailable_ = false;
diff --git a/world/zonelist.h b/world/zonelist.h
index 43dd52b44..9263a1e90 100644
--- a/world/zonelist.h
+++ b/world/zonelist.h
@@ -1,15 +1,15 @@
-#ifndef ZONELIST_H_
-#define ZONELIST_H_
+#pragma once
+
+#include "common/eqtime.h"
+#include "common/event/timer.h"
+#include "common/server_reload_types.h"
+#include "common/timer.h"
+#include "common/types.h"
 
-#include "../common/types.h"
-#include "../common/eqtime.h"
-#include "../common/timer.h"
-#include "../common/event/timer.h"
-#include "../common/server_reload_types.h"
-#include <vector>
-#include <memory>
 #include <deque>
+#include <memory>
 #include <mutex>
+#include <vector>
 
 class WorldTCPConnection;
 class ServerPacket;
@@ -97,6 +97,3 @@ private:
 
 	std::list<std::unique_ptr<ZoneServer>> zone_server_list;
 };
-
-#endif /*ZONELIST_H_*/
-
diff --git a/world/zoneserver.cpp b/world/zoneserver.cpp
index 30e90cb09..8e6c7e72e 100644
--- a/world/zoneserver.cpp
+++ b/world/zoneserver.cpp
@@ -16,41 +16,42 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#include "../common/global_define.h"
+
 #include "zoneserver.h"
-#include "clientlist.h"
-#include "login_server.h"
-#include "login_server_list.h"
-#include "zonelist.h"
-#include "worlddb.h"
-#include "client.h"
-#include "../common/md5.h"
-#include "world_config.h"
-#include "../common/guilds.h"
-#include "../common/packet_dump.h"
-#include "../common/misc.h"
-#include "../common/strings.h"
-#include "cliententry.h"
-#include "wguild_mgr.h"
-#include "lfplist.h"
-#include "adventure_manager.h"
-#include "ucs.h"
-#include "queryserv.h"
-#include "../common/zone_store.h"
-#include "dynamic_zone.h"
-#include "dynamic_zone_manager.h"
-#include "shared_task_world_messaging.h"
-#include "../common/shared_tasks.h"
-#include "shared_task_manager.h"
-#include "../common/content/world_content_service.h"
-#include "../common/repositories/player_event_logs_repository.h"
-#include "../common/events/player_event_logs.h"
-#include "../common/patches/patches.h"
-#include "../common/repositories/guild_tributes_repository.h"
-#include "../common/skill_caps.h"
-#include "../common/server_reload_types.h"
-#include "../common/repositories/trader_repository.h"
-#include "../common/repositories/buyer_repository.h"
+
+#include "common/content/world_content_service.h"
+#include "common/events/player_event_logs.h"
+#include "common/guilds.h"
+#include "common/md5.h"
+#include "common/misc.h"
+#include "common/packet_dump.h"
+#include "common/patches/patches.h"
+#include "common/repositories/buyer_repository.h"
+#include "common/repositories/guild_tributes_repository.h"
+#include "common/repositories/player_event_logs_repository.h"
+#include "common/repositories/trader_repository.h"
+#include "common/server_reload_types.h"
+#include "common/shared_tasks.h"
+#include "common/skill_caps.h"
+#include "common/strings.h"
+#include "common/zone_store.h"
+#include "world/adventure_manager.h"
+#include "world/client.h"
+#include "world/cliententry.h"
+#include "world/clientlist.h"
+#include "world/dynamic_zone_manager.h"
+#include "world/dynamic_zone.h"
+#include "world/lfplist.h"
+#include "world/login_server_list.h"
+#include "world/login_server.h"
+#include "world/queryserv.h"
+#include "world/shared_task_manager.h"
+#include "world/shared_task_world_messaging.h"
+#include "world/ucs.h"
+#include "world/wguild_mgr.h"
+#include "world/world_config.h"
+#include "world/worlddb.h"
+#include "world/zonelist.h"
 
 extern GroupLFPList LFPGroupList;
 extern volatile bool RunLoops;
diff --git a/world/zoneserver.h b/world/zoneserver.h
index 4e93c9b7e..30d06a18d 100644
--- a/world/zoneserver.h
+++ b/world/zoneserver.h
@@ -15,16 +15,18 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#ifndef ZONESERVER_H
-#define ZONESERVER_H
+
+#pragma once
 
 #include "world_tcp_connection.h"
-#include "../common/net/servertalk_server.h"
-#include "../common/event/timer.h"
-#include "../common/timer.h"
-#include "../common/emu_constants.h"
-#include "console.h"
-#include <string.h>
+
+#include "common/net/servertalk_server.h"
+#include "common/event/timer.h"
+#include "common/timer.h"
+#include "common/emu_constants.h"
+#include "world/console.h"
+
+#include <cstring>
 #include <string>
 
 class Client;
@@ -102,6 +104,3 @@ private:
 	std::string launched_name;	//the name of the zone we launched.
 	EQ::Net::ConsoleServer *console;
 };
-
-#endif
-