diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 7c1882292..9db8b1ac5 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -39,7 +39,7 @@ jobs:
       - name: Configure
         run: |
           cmake -S . -B build -G Ninja \
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+            -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_C_COMPILER_LAUNCHER=ccache \
             -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
             -DEQEMU_BUILD_TESTS=ON \
@@ -69,7 +69,7 @@ jobs:
 
       - name: Enable long paths
         run: git config --global core.longpaths true
-        
+
       - name: Setup MSVC environment
         uses: TheMrMilchmann/setup-msvc-dev@v4
         with:
@@ -89,7 +89,7 @@ jobs:
         shell: pwsh
         run: |
           cmake -S . -B build -G "Visual Studio 17 2022" -A x64 `
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo `
+            -DCMAKE_BUILD_TYPE=Release `
             -DEQEMU_BUILD_TESTS=ON `
             -DEQEMU_BUILD_LOGIN=ON `
             -DEQEMU_BUILD_LUA=ON `
@@ -98,8 +98,8 @@ jobs:
 
       - name: Build
         shell: pwsh
-        run: cmake --build build --config RelWithDebInfo --target ALL_BUILD -- /m
+        run: cmake --build build --config Release --target ALL_BUILD -- /m
 
       - name: Test
         working-directory: build
-        run: ./bin/RelWithDebInfo/tests.exe
+        run: ./bin/Release/tests.exe
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f42bad57..738b1c004 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,6 +18,17 @@ if(NOT CMAKE_TOOLCHAIN_FILE)
 	endif()
 endif()
 
+# Uncomment to generate just the standard Debug and Release configurations
+#set(CMAKE_BUILD_TYPE "Debug")
+#set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "" FORCE)
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(dummy "${CMAKE_C_COMPILER}")
+
 project(EQEmu
 	VERSION 24.10.3
 	LANGUAGES CXX
@@ -27,34 +38,28 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 #explicitly set CMP0167 for Find Boost
 if(POLICY CMP0167)
-  cmake_policy(SET CMP0167 NEW)
+	cmake_policy(SET CMP0167 NEW)
 endif()
 
-if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
-	set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Build type")
-endif()
+option(EQEMU_BUILD_PCH "Build with precompiled headers" ON)
 
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
-option(EQEMU_BUILD_PCH "Build with precompiled headers (Windows)" ON)
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
 
 if(MSVC)
-	add_compile_options(/bigobj)
-	add_compile_definitions(_CRT_SECURE_NO_WARNINGS NOMINMAX WIN32_LEAN_AND_MEAN CRASH_LOGGING)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+	# Always build with debug symbols
+	add_compile_options("$<$<CONFIG:RELEASE>:/Zi>")
+	add_link_options("$<$<CONFIG:RELEASE>:/DEBUG /OPT:REF /OPT:ICF>")
 
-	option(EQEMU_DISABLE_MSVC_WARNINGS "Disable MSVC compile warnings." OFF)
-	if(EQEMU_DISABLE_MSVC_WARNINGS)
-		add_compile_options(/W0 /wd4005 /wd4996 /nologo /Os)
-	endif()
+	add_compile_options(/bigobj /MP)
+	add_compile_definitions(_CRT_SECURE_NO_WARNINGS NOMINMAX WIN32_LEAN_AND_MEAN CRASH_LOGGING)
 
 	option(EQEMU_MSVC_DEBUG_CRT "Use the debug CRT on MSVC debug builds" OFF)
 	if(EQEMU_MSVC_DEBUG_CRT)
 		add_compile_definitions(_CRT_DBG_MAP_ALLOC)
 	endif()
 else()
+	add_compile_options("$<$<CONFIG:RELEASE>:-g>")
+
 	add_compile_definitions(HAS_UNION_SEMUN)
 endif()
 
diff --git a/CMakePresets.json b/CMakePresets.json
index ca50a3625..4459bd8c5 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -1,49 +1,74 @@
 {
-  "version": 3,
-  "cmakeMinimumRequired": {
-    "major": 3,
-    "minor": 19,
-    "patch": 0
-  },
-  "configurePresets": [
-    {
-      "name": "linux-debug",
-      "displayName": "Linux Debug",
-      "generator": "Ninja",
-      "binaryDir": "${sourceDir}/build",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug",
-        "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
-        "CMAKE_C_COMPILER_LAUNCHER": "ccache",
-        "CMAKE_CXX_COMPILER_LAUNCHER": "ccache",
-        "EQEMU_BUILD_LOGIN": "ON",
-        "EQEMU_BUILD_TESTS": "ON",
-        "EQEMU_ADD_PROFILER": "ON"
-      }
-    },
-    {
-      "name": "linux-release",
-      "displayName": "Linux Release",
-      "generator": "Ninja",
-      "binaryDir": "${sourceDir}/build/release",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release",
-        "CMAKE_C_COMPILER_LAUNCHER": "ccache",
-        "CMAKE_CXX_COMPILER_LAUNCHER": "ccache",
-        "EQEMU_BUILD_LOGIN": "ON"
-      }
-    },
-  {
-      "name": "win-msvc",
-      "displayName": "Windows MSVC (VS 2022)",
-      "generator": "Visual Studio 17 2022",
-      "binaryDir": "${sourceDir}/build/${presetName}",
-      "architecture": { "value": "x64" },
-      "cacheVariables": {
-        "CMAKE_CONFIGURATION_TYPES": "Debug;Release",
-        "EQEMU_BUILD_LOGIN": "ON",
-        "EQEMU_BUILD_TESTS": "ON"
-      }
-    }
-  ]
-}
\ No newline at end of file
+	"version": 3,
+	"cmakeMinimumRequired": {
+		"major": 3,
+		"minor": 20,
+		"patch": 0
+	},
+	"configurePresets": [
+		{
+			"name": "linux",
+			"displayName": "Linux-Ninja",
+			"generator": "Ninja",
+			"binaryDir": "${sourceDir}/build",
+			"cacheVariables": {
+				"EQEMU_BUILD_TESTS": "ON"
+			}
+		},
+		{
+			"name": "linux-clang",
+			"displayName": "Linux-Ninja (Clang)",
+			"generator": "Ninja",
+			"binaryDir": "${sourceDir}/build",
+			"cacheVariables": {
+				"EQEMU_BUILD_TESTS": "ON",
+				"CMAKE_C_COMPILER": "clang",
+				"CMAKE_CXX_COMPILER": "clang++"
+			}
+		},
+		{
+			"name": "linux-ccache",
+			"displayName": "Linux-Ninja (Ccache)",
+			"generator": "Ninja",
+			"binaryDir": "${sourceDir}/build",
+			"cacheVariables": {
+				"CMAKE_C_COMPILER_LAUNCHER": "ccache",
+				"CMAKE_CXX_COMPILER_LAUNCHER": "ccache",
+				"EQEMU_BUILD_TESTS": "ON"
+			}
+		},
+		{
+			"name": "linux-clang-ccache",
+			"displayName": "Linux-Ninja (Clang, Ccache)",
+			"generator": "Ninja",
+			"binaryDir": "${sourceDir}/build",
+			"cacheVariables": {
+				"CMAKE_C_COMPILER_LAUNCHER": "ccache",
+				"CMAKE_CXX_COMPILER_LAUNCHER": "ccache",
+				"EQEMU_BUILD_TESTS": "ON",
+				"CMAKE_C_COMPILER": "clang",
+				"CMAKE_CXX_COMPILER": "clang++"
+			}
+		},
+		{
+			"name": "win-msvc-2022",
+			"displayName": "Windows MSVC (VS 2022)",
+			"generator": "Visual Studio 17 2022",
+			"binaryDir": "${sourceDir}/build",
+			"architecture": { "value": "x64" },
+			"cacheVariables": {
+				"EQEMU_BUILD_TESTS": "ON"
+			}
+		},
+		{
+			"name": "win-msvc-2026",
+			"displayName": "Windows MSVC (VS 2026)",
+			"generator": "Visual Studio 18 2026",
+			"binaryDir": "${sourceDir}/build",
+			"architecture": { "value": "x64" },
+			"cacheVariables": {
+				"EQEMU_BUILD_TESTS": "ON"
+			}
+		}
+	]
+}
diff --git a/client_files/CMakeLists.txt b/client_files/CMakeLists.txt
index 2fec654cf..9c1a7f76b 100644
--- a/client_files/CMakeLists.txt
+++ b/client_files/CMakeLists.txt
@@ -1,4 +1,2 @@
-cmake_minimum_required(VERSION 3.20)
-
 add_subdirectory(import)
 add_subdirectory(export)
diff --git a/client_files/export/CMakeLists.txt b/client_files/export/CMakeLists.txt
index c81977fb0..20e341ed1 100644
--- a/client_files/export/CMakeLists.txt
+++ b/client_files/export/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.20.0)
-
 set(export_sources
 	main.cpp
 )
@@ -12,7 +10,6 @@ add_executable(export_client_files ${export_sources} ${export_headers})
 install(TARGETS export_client_files RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
 target_link_libraries(export_client_files common)
-target_include_directories(export_client_files PRIVATE ../..)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 set_property(TARGET export_client_files PROPERTY FOLDER executables/tools)
diff --git a/client_files/import/CMakeLists.txt b/client_files/import/CMakeLists.txt
index 7966eb3b3..f7bfef3e9 100644
--- a/client_files/import/CMakeLists.txt
+++ b/client_files/import/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.20.0)
-
 set(import_sources
 	main.cpp
 )
@@ -12,7 +10,6 @@ add_executable(import_client_files ${import_sources} ${import_headers})
 install(TARGETS import_client_files RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
 target_link_libraries(import_client_files common)
-target_include_directories(import_client_files PRIVATE ../..)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 set_property(TARGET import_client_files PROPERTY FOLDER executables/tools)
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 1fa0d0af8..301d2c166 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -1,744 +1,742 @@
-cmake_minimum_required(VERSION 3.20.0)
-
 set(common_sources
-    base_packet.cpp
-    bazaar.cpp
-    bodytypes.cpp
-    classes.cpp
-    cli/eqemu_command_handler.cpp
-    compiler_macros.h
-    compression.cpp
-    content/world_content_service.cpp
-    crash.cpp
-    crc16.cpp
-    crc32.cpp
-    data_bucket.cpp
-    data_bucket.cpp
-    database_instances.cpp
-    database.cpp
-    database/database_dump_service.cpp
-    database/database_update.cpp
-    dbcore.cpp
-    deity.cpp
-    discord/discord_manager.cpp
-    discord/discord.cpp
-    dynamic_zone_base.cpp
-    dynamic_zone_lockout.cpp
-    emu_constants.cpp
-    emu_limits.cpp
-    emu_opcodes.cpp
-    emu_versions.cpp
-    eq_limits.cpp
-    eq_packet.cpp
-    eq_stream_ident.cpp
-    eq_stream_proxy.cpp
-    eqdb_res.cpp
-    eqdb.cpp
-    eqemu_config.cpp
-    eqemu_exception.cpp
-    eqemu_logsys.cpp
-    eqtime.cpp
-    event_sub.cpp
-    event/event_loop.cpp
-    event/task_scheduler.cpp
-    event/timer.cpp
-    events/player_event_discord_formatter.cpp
-    events/player_event_logs.cpp
-    evolving_items.cpp
-    extprofile.cpp
-    faction.cpp
-    file.cpp
-    guild_base.cpp
-    inventory_profile.cpp
-    inventory_slot.cpp
-    ip_util.cpp
-    ipc_mutex.cpp
-    item_data.cpp
-    item_instance.cpp
-    json_config.cpp
-    json/jsoncpp.cpp
-    light_source.cpp
-    md5.cpp
-    memory_buffer.cpp
-    memory_mapped_file.cpp
-    memory/ksm.cpp
-    misc_functions.cpp
-    misc.cpp
-    mysql_request_result.cpp
-    mysql_request_row.cpp
-    mysql_stmt.cpp
-    net/console_server_connection.cpp
-    net/console_server.cpp
-    net/crc32.cpp
-    net/dns.cpp
-    net/eqstream.cpp
-    net/packet.cpp
-    net/reliable_stream_connection.cpp
-    net/servertalk_client_connection.cpp
-    net/servertalk_legacy_client_connection.cpp
-    net/servertalk_server_connection.cpp
-    net/servertalk_server.cpp
-    net/tcp_connection.cpp
-    net/tcp_server.cpp
-    net/websocket_server_connection.cpp
-    net/websocket_server.cpp
-    opcode_map.cpp
-    opcodemgr.cpp
-    packet_dump_file.cpp
-    packet_dump.cpp
-    packet_functions.cpp
+	base_packet.cpp
+	bazaar.cpp
+	bodytypes.cpp
+	classes.cpp
+	cli/eqemu_command_handler.cpp
+	compiler_macros.h
+	compression.cpp
+	content/world_content_service.cpp
+	crash.cpp
+	crc16.cpp
+	crc32.cpp
+	data_bucket.cpp
+	data_bucket.cpp
+	database_instances.cpp
+	database.cpp
+	database/database_dump_service.cpp
+	database/database_update.cpp
+	dbcore.cpp
+	deity.cpp
+	discord/discord_manager.cpp
+	discord/discord.cpp
+	dynamic_zone_base.cpp
+	dynamic_zone_lockout.cpp
+	emu_constants.cpp
+	emu_limits.cpp
+	emu_opcodes.cpp
+	emu_versions.cpp
+	eq_limits.cpp
+	eq_packet.cpp
+	eq_stream_ident.cpp
+	eq_stream_proxy.cpp
+	eqdb_res.cpp
+	eqdb.cpp
+	eqemu_config.cpp
+	eqemu_exception.cpp
+	eqemu_logsys.cpp
+	eqtime.cpp
+	event_sub.cpp
+	event/event_loop.cpp
+	event/task_scheduler.cpp
+	event/timer.cpp
+	events/player_event_discord_formatter.cpp
+	events/player_event_logs.cpp
+	evolving_items.cpp
+	extprofile.cpp
+	faction.cpp
+	file.cpp
+	guild_base.cpp
+	inventory_profile.cpp
+	inventory_slot.cpp
+	ip_util.cpp
+	ipc_mutex.cpp
+	item_data.cpp
+	item_instance.cpp
+	json_config.cpp
+	json/jsoncpp.cpp
+	light_source.cpp
+	md5.cpp
+	memory_buffer.cpp
+	memory_mapped_file.cpp
+	memory/ksm.cpp
+	misc_functions.cpp
+	misc.cpp
+	mysql_request_result.cpp
+	mysql_request_row.cpp
+	mysql_stmt.cpp
+	net/console_server_connection.cpp
+	net/console_server.cpp
+	net/crc32.cpp
+	net/dns.cpp
+	net/eqstream.cpp
+	net/packet.cpp
+	net/reliable_stream_connection.cpp
+	net/servertalk_client_connection.cpp
+	net/servertalk_legacy_client_connection.cpp
+	net/servertalk_server_connection.cpp
+	net/servertalk_server.cpp
+	net/tcp_connection.cpp
+	net/tcp_server.cpp
+	net/websocket_server_connection.cpp
+	net/websocket_server.cpp
+	opcode_map.cpp
+	opcodemgr.cpp
+	packet_dump_file.cpp
+	packet_dump.cpp
+	packet_functions.cpp
 	patches/client_version.cpp
-    patches/patches.cpp
-    patches/rof_limits.cpp
-    patches/rof.cpp
-    patches/rof2_limits.cpp
-    patches/rof2.cpp
-    patches/sod_limits.cpp
-    patches/sod.cpp
-    patches/sof_limits.cpp
-    patches/sof.cpp
-    patches/titanium_limits.cpp
-    patches/titanium.cpp
+	patches/patches.cpp
+	patches/rof_limits.cpp
+	patches/rof.cpp
+	patches/rof2_limits.cpp
+	patches/rof2.cpp
+	patches/sod_limits.cpp
+	patches/sod.cpp
+	patches/sof_limits.cpp
+	patches/sof.cpp
+	patches/titanium_limits.cpp
+	patches/titanium.cpp
 	patches/tob.cpp
-    patches/tob_limits.cpp
-    patches/uf_limits.cpp
-    patches/uf.cpp
-    path_manager.cpp
-    path_manager.cpp
-    perl_eqdb_res.cpp
-    perl_eqdb.cpp
-    platform.cpp
-    proc_launcher.cpp
-    process.cpp
-    process/process.cpp
-    profanity_manager.cpp
-    ptimer.cpp
-    races.cpp
-    rdtsc.cpp
-    rulesys.cpp
-    say_link.cpp
-    serialize_buffer.cpp
-    server_event_scheduler.cpp
-    serverinfo.cpp
-    shared_tasks.cpp
-    shareddb.cpp
-    skill_caps.cpp
-    skills.cpp
-    spdat_bot.cpp
-    spdat.cpp
-    StackWalker/StackWalker.cpp
-    strings_legacy.cpp
-    strings_misc.cpp
-    strings.cpp
-    struct_strategy.cpp
-    textures.cpp
-    timer.cpp
-    unix.cpp
-    util/directory.cpp
-    util/uuid.cpp
-    zone_store.cpp
+	patches/tob_limits.cpp
+	patches/uf_limits.cpp
+	patches/uf.cpp
+	path_manager.cpp
+	path_manager.cpp
+	perl_eqdb_res.cpp
+	perl_eqdb.cpp
+	platform.cpp
+	proc_launcher.cpp
+	process.cpp
+	process/process.cpp
+	profanity_manager.cpp
+	ptimer.cpp
+	races.cpp
+	rdtsc.cpp
+	rulesys.cpp
+	say_link.cpp
+	serialize_buffer.cpp
+	server_event_scheduler.cpp
+	serverinfo.cpp
+	shared_tasks.cpp
+	shareddb.cpp
+	skill_caps.cpp
+	skills.cpp
+	spdat_bot.cpp
+	spdat.cpp
+	StackWalker/StackWalker.cpp
+	strings_legacy.cpp
+	strings_misc.cpp
+	strings.cpp
+	struct_strategy.cpp
+	textures.cpp
+	timer.cpp
+	unix.cpp
+	util/directory.cpp
+	util/uuid.cpp
+	zone_store.cpp
 	links.cpp
 )
 
 set(repositories
-    # Criteria
-    repositories/criteria/content_filter_criteria.h
+	# Criteria
+	repositories/criteria/content_filter_criteria.h
 
-    # Base Repositories
-    repositories/base/base_aa_ability_repository.h
-    repositories/base/base_aa_rank_effects_repository.h
-    repositories/base/base_aa_rank_prereqs_repository.h
-    repositories/base/base_aa_ranks_repository.h
-    repositories/base/base_account_flags_repository.h
-    repositories/base/base_account_ip_repository.h
-    repositories/base/base_account_repository.h
-    repositories/base/base_account_rewards_repository.h
-    repositories/base/base_adventure_details_repository.h
-    repositories/base/base_adventure_members_repository.h
-    repositories/base/base_adventure_stats_repository.h
-    repositories/base/base_adventure_template_entry_flavor_repository.h
-    repositories/base/base_adventure_template_entry_repository.h
-    repositories/base/base_adventure_template_repository.h
-    repositories/base/base_alternate_currency_repository.h
-    repositories/base/base_auras_repository.h
-    repositories/base/base_base_data_repository.h
-    repositories/base/base_blocked_spells_repository.h
-    repositories/base/base_books_repository.h
-    repositories/base/base_bug_reports_repository.h
-    repositories/base/base_bugs_repository.h
-    repositories/base/base_buyer_repository.h
-    repositories/base/base_buyer_trade_items_repository.h
-    repositories/base/base_char_create_combinations_repository.h
-    repositories/base/base_char_create_point_allocations_repository.h
-    repositories/base/base_char_recipe_list_repository.h
-    repositories/base/base_character_activities_repository.h
-    repositories/base/base_character_alt_currency_repository.h
-    repositories/base/base_character_alternate_abilities_repository.h
-    repositories/base/base_character_auras_repository.h
-    repositories/base/base_character_bandolier_repository.h
-    repositories/base/base_character_bind_repository.h
-    repositories/base/base_character_buffs_repository.h
-    repositories/base/base_character_corpse_items_repository.h
-    repositories/base/base_character_corpses_repository.h
-    repositories/base/base_character_currency_repository.h
-    repositories/base/base_character_data_repository.h
-    repositories/base/base_character_disciplines_repository.h
-    repositories/base/base_character_evolving_items_repository.h
-    repositories/base/base_character_exp_modifiers_repository.h
-    repositories/base/base_character_expedition_lockouts_repository.h
-    repositories/base/base_character_inspect_messages_repository.h
-    repositories/base/base_character_instance_safereturns_repository.h
-    repositories/base/base_character_item_recast_repository.h
-    repositories/base/base_character_languages_repository.h
-    repositories/base/base_character_leadership_abilities_repository.h
-    repositories/base/base_character_material_repository.h
-    repositories/base/base_character_memmed_spells_repository.h
-    repositories/base/base_character_parcels_containers_repository.h
-    repositories/base/base_character_parcels_repository.h
-    repositories/base/base_character_peqzone_flags_repository.h
-    repositories/base/base_character_pet_buffs_repository.h
-    repositories/base/base_character_pet_info_repository.h
-    repositories/base/base_character_pet_inventory_repository.h
-    repositories/base/base_character_potionbelt_repository.h
-    repositories/base/base_character_skills_repository.h
-    repositories/base/base_character_spells_repository.h
-    repositories/base/base_character_task_timers_repository.h
-    repositories/base/base_character_tasks_repository.h
-    repositories/base/base_chatchannel_reserved_names_repository.h
-    repositories/base/base_chatchannels_repository.h
-    repositories/base/base_completed_shared_task_activity_state_repository.h
-    repositories/base/base_completed_shared_task_members_repository.h
-    repositories/base/base_completed_shared_tasks_repository.h
-    repositories/base/base_completed_tasks_repository.h
-    repositories/base/base_content_flags_repository.h
-    repositories/base/base_damageshieldtypes_repository.h
-    repositories/base/base_data_buckets_repository.h
-    repositories/base/base_db_str_repository.h
-    repositories/base/base_discord_webhooks_repository.h
-    repositories/base/base_discovered_items_repository.h
-    repositories/base/base_doors_repository.h
-    repositories/base/base_dynamic_zone_lockouts_repository.h
-    repositories/base/base_dynamic_zone_members_repository.h
-    repositories/base/base_dynamic_zone_templates_repository.h
-    repositories/base/base_dynamic_zones_repository.h
-    repositories/base/base_faction_association_repository.h
-    repositories/base/base_faction_base_data_repository.h
-    repositories/base/base_faction_list_mod_repository.h
-    repositories/base/base_faction_list_repository.h
-    repositories/base/base_faction_values_repository.h
-    repositories/base/base_fishing_repository.h
-    repositories/base/base_forage_repository.h
-    repositories/base/base_friends_repository.h
-    repositories/base/base_global_loot_repository.h
-    repositories/base/base_gm_ips_repository.h
-    repositories/base/base_graveyard_repository.h
-    repositories/base/base_grid_entries_repository.h
-    repositories/base/base_grid_repository.h
-    repositories/base/base_ground_spawns_repository.h
-    repositories/base/base_group_id_repository.h
-    repositories/base/base_group_leaders_repository.h
-    repositories/base/base_guild_bank_repository.h
-    repositories/base/base_guild_members_repository.h
-    repositories/base/base_guild_permissions_repository.h
-    repositories/base/base_guild_ranks_repository.h
-    repositories/base/base_guild_relations_repository.h
-    repositories/base/base_guilds_repository.h
-    repositories/base/base_horses_repository.h
-    repositories/base/base_instance_list_player_repository.h
-    repositories/base/base_instance_list_repository.h
-    repositories/base/base_inventory_repository.h
-    repositories/base/base_inventory_snapshots_repository.h
-    repositories/base/base_ip_exemptions_repository.h
-    repositories/base/base_items_evolving_details_repository.h
-    repositories/base/base_items_repository.h
-    repositories/base/base_ldon_trap_entries_repository.h
-    repositories/base/base_ldon_trap_templates_repository.h
-    repositories/base/base_level_exp_mods_repository.h
-    repositories/base/base_lfguild_repository.h
-    repositories/base/base_login_accounts_repository.h
-    repositories/base/base_login_api_tokens_repository.h
-    repositories/base/base_login_server_admins_repository.h
-    repositories/base/base_login_server_list_types_repository.h
-    repositories/base/base_login_world_servers_repository.h
-    repositories/base/base_logsys_categories_repository.h
-    repositories/base/base_lootdrop_entries_repository.h
-    repositories/base/base_lootdrop_repository.h
-    repositories/base/base_loottable_entries_repository.h
-    repositories/base/base_loottable_repository.h
-    repositories/base/base_mail_repository.h
-    repositories/base/base_merchantlist_repository.h
-    repositories/base/base_merchantlist_temp_repository.h
-    repositories/base/base_name_filter_repository.h
-    repositories/base/base_npc_emotes_repository.h
-    repositories/base/base_npc_faction_entries_repository.h
-    repositories/base/base_npc_faction_repository.h
-    repositories/base/base_npc_scale_global_base_repository.h
-    repositories/base/base_npc_spells_effects_entries_repository.h
-    repositories/base/base_npc_spells_effects_repository.h
-    repositories/base/base_npc_spells_entries_repository.h
-    repositories/base/base_npc_spells_repository.h
-    repositories/base/base_npc_types_repository.h
-    repositories/base/base_npc_types_tint_repository.h
-    repositories/base/base_object_contents_repository.h
-    repositories/base/base_object_repository.h
-    repositories/base/base_perl_event_export_settings_repository.h
-    repositories/base/base_petitions_repository.h
-    repositories/base/base_pets_beastlord_data_repository.h
-    repositories/base/base_pets_equipmentset_entries_repository.h
-    repositories/base/base_pets_equipmentset_repository.h
-    repositories/base/base_pets_repository.h
-    repositories/base/base_player_event_aa_purchase_repository.h
-    repositories/base/base_player_event_killed_named_npc_repository.h
-    repositories/base/base_player_event_killed_npc_repository.h
-    repositories/base/base_player_event_killed_raid_npc_repository.h
-    repositories/base/base_player_event_log_settings_repository.h
-    repositories/base/base_player_event_logs_repository.h
-    repositories/base/base_player_event_loot_items_repository.h
-    repositories/base/base_player_event_merchant_purchase_repository.h
-    repositories/base/base_player_event_merchant_sell_repository.h
-    repositories/base/base_player_event_npc_handin_entries_repository.h
-    repositories/base/base_player_event_npc_handin_repository.h
-    repositories/base/base_player_event_speech_repository.h
-    repositories/base/base_player_event_trade_entries_repository.h
-    repositories/base/base_player_event_trade_repository.h
-    repositories/base/base_player_titlesets_repository.h
-    repositories/base/base_quest_globals_repository.h
-    repositories/base/base_raid_details_repository.h
-    repositories/base/base_raid_members_repository.h
-    repositories/base/base_reports_repository.h
-    repositories/base/base_respawn_times_repository.h
-    repositories/base/base_rule_sets_repository.h
-    repositories/base/base_rule_values_repository.h
-    repositories/base/base_saylink_repository.h
-    repositories/base/base_server_scheduled_events_repository.h
-    repositories/base/base_shared_task_activity_state_repository.h
-    repositories/base/base_shared_task_dynamic_zones_repository.h
-    repositories/base/base_shared_task_members_repository.h
-    repositories/base/base_shared_tasks_repository.h
-    repositories/base/base_skill_caps_repository.h
-    repositories/base/base_spawn2_repository.h
-    repositories/base/base_spawn_condition_values_repository.h
-    repositories/base/base_spawn_conditions_repository.h
-    repositories/base/base_spawn_events_repository.h
-    repositories/base/base_spawnentry_repository.h
-    repositories/base/base_spawngroup_repository.h
-    repositories/base/base_spell_buckets_repository.h
-    repositories/base/base_spell_globals_repository.h
-    repositories/base/base_spells_new_repository.h
-    repositories/base/base_start_zones_repository.h
-    repositories/base/base_starting_items_repository.h
-    repositories/base/base_task_activities_repository.h
-    repositories/base/base_tasks_repository.h
-    repositories/base/base_tasksets_repository.h
-    repositories/base/base_timers_repository.h
-    repositories/base/base_titles_repository.h
-    repositories/base/base_trader_repository.h
-    repositories/base/base_tradeskill_recipe_entries_repository.h
-    repositories/base/base_tradeskill_recipe_repository.h
-    repositories/base/base_traps_repository.h
-    repositories/base/base_tribute_levels_repository.h
-    repositories/base/base_tributes_repository.h
-    repositories/base/base_veteran_reward_templates_repository.h
-    repositories/base/base_zone_points_repository.h
-    repositories/base/base_zone_repository.h
+	# Base Repositories
+	repositories/base/base_aa_ability_repository.h
+	repositories/base/base_aa_rank_effects_repository.h
+	repositories/base/base_aa_rank_prereqs_repository.h
+	repositories/base/base_aa_ranks_repository.h
+	repositories/base/base_account_flags_repository.h
+	repositories/base/base_account_ip_repository.h
+	repositories/base/base_account_repository.h
+	repositories/base/base_account_rewards_repository.h
+	repositories/base/base_adventure_details_repository.h
+	repositories/base/base_adventure_members_repository.h
+	repositories/base/base_adventure_stats_repository.h
+	repositories/base/base_adventure_template_entry_flavor_repository.h
+	repositories/base/base_adventure_template_entry_repository.h
+	repositories/base/base_adventure_template_repository.h
+	repositories/base/base_alternate_currency_repository.h
+	repositories/base/base_auras_repository.h
+	repositories/base/base_base_data_repository.h
+	repositories/base/base_blocked_spells_repository.h
+	repositories/base/base_books_repository.h
+	repositories/base/base_bug_reports_repository.h
+	repositories/base/base_bugs_repository.h
+	repositories/base/base_buyer_repository.h
+	repositories/base/base_buyer_trade_items_repository.h
+	repositories/base/base_char_create_combinations_repository.h
+	repositories/base/base_char_create_point_allocations_repository.h
+	repositories/base/base_char_recipe_list_repository.h
+	repositories/base/base_character_activities_repository.h
+	repositories/base/base_character_alt_currency_repository.h
+	repositories/base/base_character_alternate_abilities_repository.h
+	repositories/base/base_character_auras_repository.h
+	repositories/base/base_character_bandolier_repository.h
+	repositories/base/base_character_bind_repository.h
+	repositories/base/base_character_buffs_repository.h
+	repositories/base/base_character_corpse_items_repository.h
+	repositories/base/base_character_corpses_repository.h
+	repositories/base/base_character_currency_repository.h
+	repositories/base/base_character_data_repository.h
+	repositories/base/base_character_disciplines_repository.h
+	repositories/base/base_character_evolving_items_repository.h
+	repositories/base/base_character_exp_modifiers_repository.h
+	repositories/base/base_character_expedition_lockouts_repository.h
+	repositories/base/base_character_inspect_messages_repository.h
+	repositories/base/base_character_instance_safereturns_repository.h
+	repositories/base/base_character_item_recast_repository.h
+	repositories/base/base_character_languages_repository.h
+	repositories/base/base_character_leadership_abilities_repository.h
+	repositories/base/base_character_material_repository.h
+	repositories/base/base_character_memmed_spells_repository.h
+	repositories/base/base_character_parcels_containers_repository.h
+	repositories/base/base_character_parcels_repository.h
+	repositories/base/base_character_peqzone_flags_repository.h
+	repositories/base/base_character_pet_buffs_repository.h
+	repositories/base/base_character_pet_info_repository.h
+	repositories/base/base_character_pet_inventory_repository.h
+	repositories/base/base_character_potionbelt_repository.h
+	repositories/base/base_character_skills_repository.h
+	repositories/base/base_character_spells_repository.h
+	repositories/base/base_character_task_timers_repository.h
+	repositories/base/base_character_tasks_repository.h
+	repositories/base/base_chatchannel_reserved_names_repository.h
+	repositories/base/base_chatchannels_repository.h
+	repositories/base/base_completed_shared_task_activity_state_repository.h
+	repositories/base/base_completed_shared_task_members_repository.h
+	repositories/base/base_completed_shared_tasks_repository.h
+	repositories/base/base_completed_tasks_repository.h
+	repositories/base/base_content_flags_repository.h
+	repositories/base/base_damageshieldtypes_repository.h
+	repositories/base/base_data_buckets_repository.h
+	repositories/base/base_db_str_repository.h
+	repositories/base/base_discord_webhooks_repository.h
+	repositories/base/base_discovered_items_repository.h
+	repositories/base/base_doors_repository.h
+	repositories/base/base_dynamic_zone_lockouts_repository.h
+	repositories/base/base_dynamic_zone_members_repository.h
+	repositories/base/base_dynamic_zone_templates_repository.h
+	repositories/base/base_dynamic_zones_repository.h
+	repositories/base/base_faction_association_repository.h
+	repositories/base/base_faction_base_data_repository.h
+	repositories/base/base_faction_list_mod_repository.h
+	repositories/base/base_faction_list_repository.h
+	repositories/base/base_faction_values_repository.h
+	repositories/base/base_fishing_repository.h
+	repositories/base/base_forage_repository.h
+	repositories/base/base_friends_repository.h
+	repositories/base/base_global_loot_repository.h
+	repositories/base/base_gm_ips_repository.h
+	repositories/base/base_graveyard_repository.h
+	repositories/base/base_grid_entries_repository.h
+	repositories/base/base_grid_repository.h
+	repositories/base/base_ground_spawns_repository.h
+	repositories/base/base_group_id_repository.h
+	repositories/base/base_group_leaders_repository.h
+	repositories/base/base_guild_bank_repository.h
+	repositories/base/base_guild_members_repository.h
+	repositories/base/base_guild_permissions_repository.h
+	repositories/base/base_guild_ranks_repository.h
+	repositories/base/base_guild_relations_repository.h
+	repositories/base/base_guilds_repository.h
+	repositories/base/base_horses_repository.h
+	repositories/base/base_instance_list_player_repository.h
+	repositories/base/base_instance_list_repository.h
+	repositories/base/base_inventory_repository.h
+	repositories/base/base_inventory_snapshots_repository.h
+	repositories/base/base_ip_exemptions_repository.h
+	repositories/base/base_items_evolving_details_repository.h
+	repositories/base/base_items_repository.h
+	repositories/base/base_ldon_trap_entries_repository.h
+	repositories/base/base_ldon_trap_templates_repository.h
+	repositories/base/base_level_exp_mods_repository.h
+	repositories/base/base_lfguild_repository.h
+	repositories/base/base_login_accounts_repository.h
+	repositories/base/base_login_api_tokens_repository.h
+	repositories/base/base_login_server_admins_repository.h
+	repositories/base/base_login_server_list_types_repository.h
+	repositories/base/base_login_world_servers_repository.h
+	repositories/base/base_logsys_categories_repository.h
+	repositories/base/base_lootdrop_entries_repository.h
+	repositories/base/base_lootdrop_repository.h
+	repositories/base/base_loottable_entries_repository.h
+	repositories/base/base_loottable_repository.h
+	repositories/base/base_mail_repository.h
+	repositories/base/base_merchantlist_repository.h
+	repositories/base/base_merchantlist_temp_repository.h
+	repositories/base/base_name_filter_repository.h
+	repositories/base/base_npc_emotes_repository.h
+	repositories/base/base_npc_faction_entries_repository.h
+	repositories/base/base_npc_faction_repository.h
+	repositories/base/base_npc_scale_global_base_repository.h
+	repositories/base/base_npc_spells_effects_entries_repository.h
+	repositories/base/base_npc_spells_effects_repository.h
+	repositories/base/base_npc_spells_entries_repository.h
+	repositories/base/base_npc_spells_repository.h
+	repositories/base/base_npc_types_repository.h
+	repositories/base/base_npc_types_tint_repository.h
+	repositories/base/base_object_contents_repository.h
+	repositories/base/base_object_repository.h
+	repositories/base/base_perl_event_export_settings_repository.h
+	repositories/base/base_petitions_repository.h
+	repositories/base/base_pets_beastlord_data_repository.h
+	repositories/base/base_pets_equipmentset_entries_repository.h
+	repositories/base/base_pets_equipmentset_repository.h
+	repositories/base/base_pets_repository.h
+	repositories/base/base_player_event_aa_purchase_repository.h
+	repositories/base/base_player_event_killed_named_npc_repository.h
+	repositories/base/base_player_event_killed_npc_repository.h
+	repositories/base/base_player_event_killed_raid_npc_repository.h
+	repositories/base/base_player_event_log_settings_repository.h
+	repositories/base/base_player_event_logs_repository.h
+	repositories/base/base_player_event_loot_items_repository.h
+	repositories/base/base_player_event_merchant_purchase_repository.h
+	repositories/base/base_player_event_merchant_sell_repository.h
+	repositories/base/base_player_event_npc_handin_entries_repository.h
+	repositories/base/base_player_event_npc_handin_repository.h
+	repositories/base/base_player_event_speech_repository.h
+	repositories/base/base_player_event_trade_entries_repository.h
+	repositories/base/base_player_event_trade_repository.h
+	repositories/base/base_player_titlesets_repository.h
+	repositories/base/base_quest_globals_repository.h
+	repositories/base/base_raid_details_repository.h
+	repositories/base/base_raid_members_repository.h
+	repositories/base/base_reports_repository.h
+	repositories/base/base_respawn_times_repository.h
+	repositories/base/base_rule_sets_repository.h
+	repositories/base/base_rule_values_repository.h
+	repositories/base/base_saylink_repository.h
+	repositories/base/base_server_scheduled_events_repository.h
+	repositories/base/base_shared_task_activity_state_repository.h
+	repositories/base/base_shared_task_dynamic_zones_repository.h
+	repositories/base/base_shared_task_members_repository.h
+	repositories/base/base_shared_tasks_repository.h
+	repositories/base/base_skill_caps_repository.h
+	repositories/base/base_spawn2_repository.h
+	repositories/base/base_spawn_condition_values_repository.h
+	repositories/base/base_spawn_conditions_repository.h
+	repositories/base/base_spawn_events_repository.h
+	repositories/base/base_spawnentry_repository.h
+	repositories/base/base_spawngroup_repository.h
+	repositories/base/base_spell_buckets_repository.h
+	repositories/base/base_spell_globals_repository.h
+	repositories/base/base_spells_new_repository.h
+	repositories/base/base_start_zones_repository.h
+	repositories/base/base_starting_items_repository.h
+	repositories/base/base_task_activities_repository.h
+	repositories/base/base_tasks_repository.h
+	repositories/base/base_tasksets_repository.h
+	repositories/base/base_timers_repository.h
+	repositories/base/base_titles_repository.h
+	repositories/base/base_trader_repository.h
+	repositories/base/base_tradeskill_recipe_entries_repository.h
+	repositories/base/base_tradeskill_recipe_repository.h
+	repositories/base/base_traps_repository.h
+	repositories/base/base_tribute_levels_repository.h
+	repositories/base/base_tributes_repository.h
+	repositories/base/base_veteran_reward_templates_repository.h
+	repositories/base/base_zone_points_repository.h
+	repositories/base/base_zone_repository.h
 
-    # Extended Repositories
-    repositories/aa_ability_repository.h
-    repositories/aa_rank_effects_repository.h
-    repositories/aa_rank_prereqs_repository.h
-    repositories/aa_ranks_repository.h
-    repositories/account_flags_repository.h
-    repositories/account_ip_repository.h
-    repositories/account_repository.h
-    repositories/account_rewards_repository.h
-    repositories/adventure_details_repository.h
-    repositories/adventure_members_repository.h
-    repositories/adventure_stats_repository.h
-    repositories/adventure_template_entry_flavor_repository.h
-    repositories/adventure_template_entry_repository.h
-    repositories/adventure_template_repository.h
-    repositories/alternate_currency_repository.h
-    repositories/auras_repository.h
-    repositories/base_data_repository.h
-    repositories/blocked_spells_repository.h
-    repositories/books_repository.h
-    repositories/bug_reports_repository.h
-    repositories/bugs_repository.h
-    repositories/buyer_buy_lines_repository.h
-    repositories/buyer_trade_items_repository.h
-    repositories/char_create_combinations_repository.h
-    repositories/char_create_point_allocations_repository.h
-    repositories/char_recipe_list_repository.h
-    repositories/character_activities_repository.h
-    repositories/character_alt_currency_repository.h
-    repositories/character_alternate_abilities_repository.h
-    repositories/character_auras_repository.h
-    repositories/character_bandolier_repository.h
-    repositories/character_bind_repository.h
-    repositories/character_buffs_repository.h
-    repositories/character_corpse_items_repository.h
-    repositories/character_corpses_repository.h
-    repositories/character_currency_repository.h
-    repositories/character_data_repository.h
-    repositories/character_disciplines_repository.h
-    repositories/character_evolving_items_repository.h
-    repositories/character_exp_modifiers_repository.h
-    repositories/character_expedition_lockouts_repository.h
-    repositories/character_inspect_messages_repository.h
-    repositories/character_instance_safereturns_repository.h
-    repositories/character_item_recast_repository.h
-    repositories/character_languages_repository.h
-    repositories/character_leadership_abilities_repository.h
-    repositories/character_material_repository.h
-    repositories/character_memmed_spells_repository.h
-    repositories/character_parcels_containers_repository.h
-    repositories/character_parcels_repository.h
-    repositories/character_peqzone_flags_repository.h
-    repositories/character_pet_buffs_repository.h
-    repositories/character_pet_info_repository.h
-    repositories/character_pet_inventory_repository.h
-    repositories/character_potionbelt_repository.h
-    repositories/character_skills_repository.h
-    repositories/character_spells_repository.h
-    repositories/character_task_timers_repository.h
-    repositories/character_tasks_repository.h
-    repositories/chatchannel_reserved_names_repository.h
-    repositories/chatchannels_repository.h
-    repositories/completed_shared_task_activity_state_repository.h
-    repositories/completed_shared_task_members_repository.h
-    repositories/completed_shared_tasks_repository.h
-    repositories/completed_tasks_repository.h
-    repositories/content_flags_repository.h
-    repositories/damageshieldtypes_repository.h
-    repositories/data_buckets_repository.h
-    repositories/db_str_repository.h
-    repositories/discord_webhooks_repository.h
-    repositories/discovered_items_repository.h
-    repositories/doors_repository.h
-    repositories/dynamic_zone_lockouts_repository.h
-    repositories/dynamic_zone_members_repository.h
-    repositories/dynamic_zone_templates_repository.h
-    repositories/dynamic_zones_repository.h
-    repositories/faction_association_repository.h
-    repositories/faction_base_data_repository.h
-    repositories/faction_list_mod_repository.h
-    repositories/faction_list_repository.h
-    repositories/faction_values_repository.h
-    repositories/fishing_repository.h
-    repositories/forage_repository.h
-    repositories/friends_repository.h
-    repositories/global_loot_repository.h
-    repositories/gm_ips_repository.h
-    repositories/graveyard_repository.h
-    repositories/ground_spawns_repository.h
-    repositories/group_id_repository.h
-    repositories/group_leaders_repository.h
-    repositories/guild_bank_repository.h
-    repositories/guild_members_repository.h
-    repositories/guild_permissions_repository.h
-    repositories/guild_ranks_repository.h
-    repositories/guild_relations_repository.h
-    repositories/guilds_repository.h
-    repositories/horses_repository.h
-    repositories/instance_list_player_repository.h
-    repositories/instance_list_repository.h
-    repositories/inventory_repository.h
-    repositories/inventory_snapshots_repository.h
-    repositories/ip_exemptions_repository.h
-    repositories/items_evolving_details_repository.h
-    repositories/items_repository.h
-    repositories/ldon_trap_entries_repository.h
-    repositories/ldon_trap_templates_repository.h
-    repositories/level_exp_mods_repository.h
-    repositories/lfguild_repository.h
-    repositories/login_accounts_repository.h
-    repositories/login_api_tokens_repository.h
-    repositories/login_server_admins_repository.h
-    repositories/login_server_list_types_repository.h
-    repositories/login_world_servers_repository.h
-    repositories/logsys_categories_repository.h
-    repositories/lootdrop_entries_repository.h
-    repositories/lootdrop_repository.h
-    repositories/loottable_entries_repository.h
-    repositories/loottable_repository.h
-    repositories/mail_repository.h
-    repositories/merchantlist_repository.h
-    repositories/merchantlist_temp_repository.h
-    repositories/name_filter_repository.h
-    repositories/npc_emotes_repository.h
-    repositories/npc_faction_entries_repository.h
-    repositories/npc_faction_repository.h
-    repositories/npc_scale_global_base_repository.h
-    repositories/npc_spells_effects_entries_repository.h
-    repositories/npc_spells_effects_repository.h
-    repositories/npc_spells_entries_repository.h
-    repositories/npc_spells_repository.h
-    repositories/npc_types_repository.h
-    repositories/npc_types_tint_repository.h
-    repositories/object_contents_repository.h
-    repositories/object_repository.h
-    repositories/perl_event_export_settings_repository.h
-    repositories/petitions_repository.h
-    repositories/pets_beastlord_data_repository.h
-    repositories/pets_equipmentset_entries_repository.h
-    repositories/pets_equipmentset_repository.h
-    repositories/pets_repository.h
-    repositories/player_event_aa_purchase_repository.h
-    repositories/player_event_killed_named_npc_repository.h
-    repositories/player_event_killed_npc_repository.h
-    repositories/player_event_killed_raid_npc_repository.h
-    repositories/player_event_log_settings_repository.h
-    repositories/player_event_logs_repository.h
-    repositories/player_event_loot_items_repository.h
-    repositories/player_event_merchant_purchase_repository.h
-    repositories/player_event_merchant_sell_repository.h
-    repositories/player_event_npc_handin_entries_repository.h
-    repositories/player_event_npc_handin_repository.h
-    repositories/player_event_speech_repository.h
-    repositories/player_event_trade_entries_repository.h
-    repositories/player_event_trade_repository.h
-    repositories/player_titlesets_repository.h
-    repositories/quest_globals_repository.h
-    repositories/raid_details_repository.h
-    repositories/raid_members_repository.h
-    repositories/reports_repository.h
-    repositories/respawn_times_repository.h
-    repositories/rule_sets_repository.h
-    repositories/rule_values_repository.h
-    repositories/saylink_repository.h
-    repositories/server_scheduled_events_repository.h
-    repositories/shared_task_activity_state_repository.h
-    repositories/shared_task_dynamic_zones_repository.h
-    repositories/shared_task_members_repository.h
-    repositories/shared_tasks_repository.h
-    repositories/skill_caps_repository.h
-    repositories/spawn2_repository.h
-    repositories/spawn_condition_values_repository.h
-    repositories/spawn_conditions_repository.h
-    repositories/spawn_events_repository.h
-    repositories/spawnentry_repository.h
-    repositories/spawngroup_repository.h
-    repositories/spell_buckets_repository.h
-    repositories/spell_globals_repository.h
-    repositories/spells_new_repository.h
-    repositories/start_zones_repository.h
-    repositories/starting_items_repository.h
-    repositories/task_activities_repository.h
-    repositories/tasks_repository.h
-    repositories/tasksets_repository.h
-    repositories/timers_repository.h
-    repositories/titles_repository.h
-    repositories/trader_repository.h
-    repositories/tradeskill_recipe_entries_repository.h
-    repositories/tradeskill_recipe_repository.h
-    repositories/traps_repository.h
-    repositories/tribute_levels_repository.h
-    repositories/tributes_repository.h
-    repositories/veteran_reward_templates_repository.h
-    repositories/zone_points_repository.h
-    repositories/zone_repository.h
+	# Extended Repositories
+	repositories/aa_ability_repository.h
+	repositories/aa_rank_effects_repository.h
+	repositories/aa_rank_prereqs_repository.h
+	repositories/aa_ranks_repository.h
+	repositories/account_flags_repository.h
+	repositories/account_ip_repository.h
+	repositories/account_repository.h
+	repositories/account_rewards_repository.h
+	repositories/adventure_details_repository.h
+	repositories/adventure_members_repository.h
+	repositories/adventure_stats_repository.h
+	repositories/adventure_template_entry_flavor_repository.h
+	repositories/adventure_template_entry_repository.h
+	repositories/adventure_template_repository.h
+	repositories/alternate_currency_repository.h
+	repositories/auras_repository.h
+	repositories/base_data_repository.h
+	repositories/blocked_spells_repository.h
+	repositories/books_repository.h
+	repositories/bug_reports_repository.h
+	repositories/bugs_repository.h
+	repositories/buyer_buy_lines_repository.h
+	repositories/buyer_trade_items_repository.h
+	repositories/char_create_combinations_repository.h
+	repositories/char_create_point_allocations_repository.h
+	repositories/char_recipe_list_repository.h
+	repositories/character_activities_repository.h
+	repositories/character_alt_currency_repository.h
+	repositories/character_alternate_abilities_repository.h
+	repositories/character_auras_repository.h
+	repositories/character_bandolier_repository.h
+	repositories/character_bind_repository.h
+	repositories/character_buffs_repository.h
+	repositories/character_corpse_items_repository.h
+	repositories/character_corpses_repository.h
+	repositories/character_currency_repository.h
+	repositories/character_data_repository.h
+	repositories/character_disciplines_repository.h
+	repositories/character_evolving_items_repository.h
+	repositories/character_exp_modifiers_repository.h
+	repositories/character_expedition_lockouts_repository.h
+	repositories/character_inspect_messages_repository.h
+	repositories/character_instance_safereturns_repository.h
+	repositories/character_item_recast_repository.h
+	repositories/character_languages_repository.h
+	repositories/character_leadership_abilities_repository.h
+	repositories/character_material_repository.h
+	repositories/character_memmed_spells_repository.h
+	repositories/character_parcels_containers_repository.h
+	repositories/character_parcels_repository.h
+	repositories/character_peqzone_flags_repository.h
+	repositories/character_pet_buffs_repository.h
+	repositories/character_pet_info_repository.h
+	repositories/character_pet_inventory_repository.h
+	repositories/character_potionbelt_repository.h
+	repositories/character_skills_repository.h
+	repositories/character_spells_repository.h
+	repositories/character_task_timers_repository.h
+	repositories/character_tasks_repository.h
+	repositories/chatchannel_reserved_names_repository.h
+	repositories/chatchannels_repository.h
+	repositories/completed_shared_task_activity_state_repository.h
+	repositories/completed_shared_task_members_repository.h
+	repositories/completed_shared_tasks_repository.h
+	repositories/completed_tasks_repository.h
+	repositories/content_flags_repository.h
+	repositories/damageshieldtypes_repository.h
+	repositories/data_buckets_repository.h
+	repositories/db_str_repository.h
+	repositories/discord_webhooks_repository.h
+	repositories/discovered_items_repository.h
+	repositories/doors_repository.h
+	repositories/dynamic_zone_lockouts_repository.h
+	repositories/dynamic_zone_members_repository.h
+	repositories/dynamic_zone_templates_repository.h
+	repositories/dynamic_zones_repository.h
+	repositories/faction_association_repository.h
+	repositories/faction_base_data_repository.h
+	repositories/faction_list_mod_repository.h
+	repositories/faction_list_repository.h
+	repositories/faction_values_repository.h
+	repositories/fishing_repository.h
+	repositories/forage_repository.h
+	repositories/friends_repository.h
+	repositories/global_loot_repository.h
+	repositories/gm_ips_repository.h
+	repositories/graveyard_repository.h
+	repositories/ground_spawns_repository.h
+	repositories/group_id_repository.h
+	repositories/group_leaders_repository.h
+	repositories/guild_bank_repository.h
+	repositories/guild_members_repository.h
+	repositories/guild_permissions_repository.h
+	repositories/guild_ranks_repository.h
+	repositories/guild_relations_repository.h
+	repositories/guilds_repository.h
+	repositories/horses_repository.h
+	repositories/instance_list_player_repository.h
+	repositories/instance_list_repository.h
+	repositories/inventory_repository.h
+	repositories/inventory_snapshots_repository.h
+	repositories/ip_exemptions_repository.h
+	repositories/items_evolving_details_repository.h
+	repositories/items_repository.h
+	repositories/ldon_trap_entries_repository.h
+	repositories/ldon_trap_templates_repository.h
+	repositories/level_exp_mods_repository.h
+	repositories/lfguild_repository.h
+	repositories/login_accounts_repository.h
+	repositories/login_api_tokens_repository.h
+	repositories/login_server_admins_repository.h
+	repositories/login_server_list_types_repository.h
+	repositories/login_world_servers_repository.h
+	repositories/logsys_categories_repository.h
+	repositories/lootdrop_entries_repository.h
+	repositories/lootdrop_repository.h
+	repositories/loottable_entries_repository.h
+	repositories/loottable_repository.h
+	repositories/mail_repository.h
+	repositories/merchantlist_repository.h
+	repositories/merchantlist_temp_repository.h
+	repositories/name_filter_repository.h
+	repositories/npc_emotes_repository.h
+	repositories/npc_faction_entries_repository.h
+	repositories/npc_faction_repository.h
+	repositories/npc_scale_global_base_repository.h
+	repositories/npc_spells_effects_entries_repository.h
+	repositories/npc_spells_effects_repository.h
+	repositories/npc_spells_entries_repository.h
+	repositories/npc_spells_repository.h
+	repositories/npc_types_repository.h
+	repositories/npc_types_tint_repository.h
+	repositories/object_contents_repository.h
+	repositories/object_repository.h
+	repositories/perl_event_export_settings_repository.h
+	repositories/petitions_repository.h
+	repositories/pets_beastlord_data_repository.h
+	repositories/pets_equipmentset_entries_repository.h
+	repositories/pets_equipmentset_repository.h
+	repositories/pets_repository.h
+	repositories/player_event_aa_purchase_repository.h
+	repositories/player_event_killed_named_npc_repository.h
+	repositories/player_event_killed_npc_repository.h
+	repositories/player_event_killed_raid_npc_repository.h
+	repositories/player_event_log_settings_repository.h
+	repositories/player_event_logs_repository.h
+	repositories/player_event_loot_items_repository.h
+	repositories/player_event_merchant_purchase_repository.h
+	repositories/player_event_merchant_sell_repository.h
+	repositories/player_event_npc_handin_entries_repository.h
+	repositories/player_event_npc_handin_repository.h
+	repositories/player_event_speech_repository.h
+	repositories/player_event_trade_entries_repository.h
+	repositories/player_event_trade_repository.h
+	repositories/player_titlesets_repository.h
+	repositories/quest_globals_repository.h
+	repositories/raid_details_repository.h
+	repositories/raid_members_repository.h
+	repositories/reports_repository.h
+	repositories/respawn_times_repository.h
+	repositories/rule_sets_repository.h
+	repositories/rule_values_repository.h
+	repositories/saylink_repository.h
+	repositories/server_scheduled_events_repository.h
+	repositories/shared_task_activity_state_repository.h
+	repositories/shared_task_dynamic_zones_repository.h
+	repositories/shared_task_members_repository.h
+	repositories/shared_tasks_repository.h
+	repositories/skill_caps_repository.h
+	repositories/spawn2_repository.h
+	repositories/spawn_condition_values_repository.h
+	repositories/spawn_conditions_repository.h
+	repositories/spawn_events_repository.h
+	repositories/spawnentry_repository.h
+	repositories/spawngroup_repository.h
+	repositories/spell_buckets_repository.h
+	repositories/spell_globals_repository.h
+	repositories/spells_new_repository.h
+	repositories/start_zones_repository.h
+	repositories/starting_items_repository.h
+	repositories/task_activities_repository.h
+	repositories/tasks_repository.h
+	repositories/tasksets_repository.h
+	repositories/timers_repository.h
+	repositories/titles_repository.h
+	repositories/trader_repository.h
+	repositories/tradeskill_recipe_entries_repository.h
+	repositories/tradeskill_recipe_repository.h
+	repositories/traps_repository.h
+	repositories/tribute_levels_repository.h
+	repositories/tributes_repository.h
+	repositories/veteran_reward_templates_repository.h
+	repositories/zone_points_repository.h
+	repositories/zone_repository.h
 )
 
 set(common_headers
-    additive_lagged_fibonacci_engine.h
-    base_packet.h
-    bazaar.h
-    bodytypes.h
-    classes.h
-    cli/argh.h
-    cli/eqemu_command_handler.h
-    cli/terminal_color.hpp
-    compression.h
-    content/world_content_service.h
-    crash.h
-    crc16.h
-    crc32.h
-    cron/croncpp.h
-    data_verification.h
-    database_schema.h
-    database.h
-    database/database_dump_service.h
-    database/database_update_manifest_bots.h
-    database/database_update_manifest_custom.h
-    database/database_update_manifest.h
-    database/database_update.h
-    dbcore.h
-    deity.h
-    discord/discord_manager.h
-    discord/discord.h
-    dynamic_zone_base.h
-    dynamic_zone_lockout.h
-    emu_constants.h
-    emu_limits.h
-    emu_opcodes.h
-    emu_oplist.h
-    emu_versions.h
-    eq_constants.h
-    eq_limits.h
-    eq_packet_structs.h
-    eq_packet.h
-    eq_stream_ident.h
-    eq_stream_intf.h
-    eq_stream_locator.h
-    eq_stream_proxy.h
-    eqdb_res.h
-    eqdb.h
-    eqemu_config_elements.h
-    eqemu_config.h
-    eqemu_exception.h
-    eqemu_logsys_log_aliases.h
-    eqemu_logsys.h
-    eqtime.h
-    event_sub.h
-    event/event_loop.h
-    event/task.h
-    event/timer.h
-    events/player_event_discord_formatter.h
-    events/player_event_logs.h
-    events/player_events.h
-    evolving_items.h
-    extprofile.h
-    faction.h
-    features.h
-    file.h
-    fixed_memory_hash_set.h
-    fixed_memory_variable_hash_set.h
-    guild_base.h
-    guilds.h
-    http/httplib.h
-    http/uri.h
-    inventory_profile.h
-    inventory_slot.h
-    ip_util.h
-    ipc_mutex.h
-    item_data.h
-    item_instance.h
-    json_config.h
-    json/json_archive_single_line.h
-    json/json-forwards.h
-    json/json.h
-    json/json.hpp
-    light_source.h
-    linked_list.h
-    loot.h
-    mail_oplist.h
-    md5.h
-    memory_buffer.h
-    memory_mapped_file.h
-    memory/ksm.h
-    misc_functions.h
-    misc.h
-    mysql_request_result.h
-    mysql_request_row.h
-    mysql_stmt.h
-    net/console_server_connection.h
-    net/console_server.h
-    net/crc32.h
-    net/dns.h
-    net/endian.h
-    net/eqstream.h
-    net/packet.h
-    net/reliable_stream_connection.h
-    net/reliable_stream_pooling.h
-    net/reliable_stream_structs.h
-    net/servertalk_client_connection.h
-    net/servertalk_common.h
-    net/servertalk_legacy_client_connection.h
-    net/servertalk_server_connection.h
-    net/servertalk_server.h
-    net/tcp_connection_pooling.h
-    net/tcp_connection.h
-    net/tcp_server.h
-    net/websocket_server_connection.h
-    net/websocket_server.h
-    op_codes.h
-    opcode_dispatch.h
-    opcodemgr.h
-    packet_dump_file.h
-    packet_dump.h
-    packet_functions.h
+	additive_lagged_fibonacci_engine.h
+	base_packet.h
+	bazaar.h
+	bodytypes.h
+	classes.h
+	cli/argh.h
+	cli/eqemu_command_handler.h
+	cli/terminal_color.hpp
+	compression.h
+	content/world_content_service.h
+	crash.h
+	crc16.h
+	crc32.h
+	cron/croncpp.h
+	data_verification.h
+	database_schema.h
+	database.h
+	database/database_dump_service.h
+	database/database_update_manifest_bots.h
+	database/database_update_manifest_custom.h
+	database/database_update_manifest.h
+	database/database_update.h
+	dbcore.h
+	deity.h
+	discord/discord_manager.h
+	discord/discord.h
+	dynamic_zone_base.h
+	dynamic_zone_lockout.h
+	emu_constants.h
+	emu_limits.h
+	emu_opcodes.h
+	emu_oplist.h
+	emu_versions.h
+	eq_constants.h
+	eq_limits.h
+	eq_packet_structs.h
+	eq_packet.h
+	eq_stream_ident.h
+	eq_stream_intf.h
+	eq_stream_locator.h
+	eq_stream_proxy.h
+	eqdb_res.h
+	eqdb.h
+	eqemu_config_elements.h
+	eqemu_config.h
+	eqemu_exception.h
+	eqemu_logsys_log_aliases.h
+	eqemu_logsys.h
+	eqtime.h
+	event_sub.h
+	event/event_loop.h
+	event/task.h
+	event/timer.h
+	events/player_event_discord_formatter.h
+	events/player_event_logs.h
+	events/player_events.h
+	evolving_items.h
+	extprofile.h
+	faction.h
+	features.h
+	file.h
+	fixed_memory_hash_set.h
+	fixed_memory_variable_hash_set.h
+	guild_base.h
+	guilds.h
+	http/httplib.h
+	http/uri.h
+	inventory_profile.h
+	inventory_slot.h
+	ip_util.h
+	ipc_mutex.h
+	item_data.h
+	item_instance.h
+	json_config.h
+	json/json_archive_single_line.h
+	json/json-forwards.h
+	json/json.h
+	json/json.hpp
+	light_source.h
+	linked_list.h
+	loot.h
+	mail_oplist.h
+	md5.h
+	memory_buffer.h
+	memory_mapped_file.h
+	memory/ksm.h
+	misc_functions.h
+	misc.h
+	mysql_request_result.h
+	mysql_request_row.h
+	mysql_stmt.h
+	net/console_server_connection.h
+	net/console_server.h
+	net/crc32.h
+	net/dns.h
+	net/endian.h
+	net/eqstream.h
+	net/packet.h
+	net/reliable_stream_connection.h
+	net/reliable_stream_pooling.h
+	net/reliable_stream_structs.h
+	net/servertalk_client_connection.h
+	net/servertalk_common.h
+	net/servertalk_legacy_client_connection.h
+	net/servertalk_server_connection.h
+	net/servertalk_server.h
+	net/tcp_connection_pooling.h
+	net/tcp_connection.h
+	net/tcp_server.h
+	net/websocket_server_connection.h
+	net/websocket_server.h
+	op_codes.h
+	opcode_dispatch.h
+	opcodemgr.h
+	packet_dump_file.h
+	packet_dump.h
+	packet_functions.h
 	patches/IBuff.h
 	patches/IMessage.h
 	patches/client_version.h
-    patches/patches.h
-    patches/rof_limits.h
-    patches/rof_ops.h
-    patches/rof_structs.h
-    patches/rof.h
-    patches/rof2_limits.h
-    patches/rof2_ops.h
-    patches/rof2_structs.h
-    patches/rof2.h
-    patches/sod_limits.h
-    patches/sod_ops.h
-    patches/sod_structs.h
-    patches/sod.h
-    patches/sof_limits.h
-    patches/sof_ops.h
-    patches/sof_structs.h
+	patches/patches.h
+	patches/rof_limits.h
+	patches/rof_ops.h
+	patches/rof_structs.h
+	patches/rof.h
+	patches/rof2_limits.h
+	patches/rof2_ops.h
+	patches/rof2_structs.h
+	patches/rof2.h
+	patches/sod_limits.h
+	patches/sod_ops.h
+	patches/sod_structs.h
+	patches/sod.h
+	patches/sof_limits.h
+	patches/sof_ops.h
+	patches/sof_structs.h
 	patches/sof.h
-    patches/ss_declare.h
-    patches/ss_define.h
-    patches/ss_register.h
-    patches/titanium_limits.h
-    patches/titanium_ops.h
-    patches/titanium_structs.h
-    patches/titanium.h
+	patches/ss_declare.h
+	patches/ss_define.h
+	patches/ss_register.h
+	patches/titanium_limits.h
+	patches/titanium_ops.h
+	patches/titanium_structs.h
+	patches/titanium.h
 	patches/tob.h
-    patches/tob_limits.h
-    patches/tob_ops.h
-    patches/tob_structs.h  
-    patches/uf_limits.h
-    patches/uf_ops.h
-    patches/uf_structs.h
-    patches/uf.h
-    platform.h
-    platform/inet.h
-    platform/platform.h
-    platform/posix/include_inet.h
-    platform/posix/include_pthreads.h
-    platform/win/include_windows.h
-    platform/win/include_winsock2.h
-    proc_launcher.h
-    process.h
-    process/process.h
-    profanity_manager.h
-    profiler.h
-    ptimer.h
-    queue.h
-    races.h
-    raid.h
-    random.h
-    rdtsc.h
-    rulesys.h
-    ruletypes.h
-    say_link.h
-    seperator.h
-    serialize_buffer.h
-    server_event_scheduler.h
-    server_reload_types.h
-    serverinfo.h
-    servertalk.h
-    shared_tasks.h
-    shareddb.h
-    skill_caps.h
-    skills.h
-    spdat.h
-    stacktrace/backward.hpp
-    StackWalker/StackWalker.h
-    strings.h
-    struct_strategy.h
-    tasks.h
-    termcolor/rang.hpp
-    textures.h
-    timer.h
-    types.h
-    unix.h
-    useperl.h
-    util/directory.h
-    util/memory_stream.h
-    util/uuid.h
-    version.h
+	patches/tob_limits.h
+	patches/tob_ops.h
+	patches/tob_structs.h
+	patches/uf_limits.h
+	patches/uf_ops.h
+	patches/uf_structs.h
+	patches/uf.h
+	platform.h
+	platform/inet.h
+	platform/platform.h
+	platform/posix/include_inet.h
+	platform/posix/include_pthreads.h
+	platform/win/include_windows.h
+	platform/win/include_winsock2.h
+	proc_launcher.h
+	process.h
+	process/process.h
+	profanity_manager.h
+	profiler.h
+	ptimer.h
+	queue.h
+	races.h
+	raid.h
+	random.h
+	rdtsc.h
+	rulesys.h
+	ruletypes.h
+	say_link.h
+	seperator.h
+	serialize_buffer.h
+	server_event_scheduler.h
+	server_reload_types.h
+	serverinfo.h
+	servertalk.h
+	shared_tasks.h
+	shareddb.h
+	skill_caps.h
+	skills.h
+	spdat.h
+	stacktrace/backward.hpp
+	StackWalker/StackWalker.h
+	strings.h
+	struct_strategy.h
+	tasks.h
+	termcolor/rang.hpp
+	textures.h
+	timer.h
+	types.h
+	unix.h
+	useperl.h
+	util/directory.h
+	util/memory_stream.h
+	util/uuid.h
+	version.h
 	zone_store.h
 	links.h
 )
@@ -757,8 +755,8 @@ set(EQEMU_CUSTOM_PRNG_ENGINE "" CACHE STRING "Custom random engine. (ex. std::de
 mark_as_advanced(EQEMU_CUSTOM_PRNG_ENGINE)
 
 if(CMAKE_COMPILER_IS_GNUCXX)
-    option(EQEMU_SFMT19937 "Use GCC's extention for SIMD Fast MT19937." OFF)
-    mark_as_advanced(EQEMU_SFMT19937)
+	option(EQEMU_SFMT19937 "Use GCC's extention for SIMD Fast MT19937." OFF)
+	mark_as_advanced(EQEMU_SFMT19937)
 endif()
 
 include_directories(Patches StackWalker)
@@ -767,58 +765,51 @@ add_library(common ${common_sources} ${common_headers} ${repositories})
 
 target_compile_definitions(common PUBLIC BOOST_BIND_GLOBAL_PLACEHOLDERS GLM_FORCE_RADIANS GLM_FORCE_CTOR_INIT GLM_ENABLE_EXPERIMENTAL ENABLE_SECURITY)
 target_include_directories(common PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../submodules/websocketpp")
-target_include_directories(common PRIVATE ..)
 target_link_libraries(common PUBLIC cereal::cereal fmt::fmt unofficial::libmariadb $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv> OpenSSL::SSL OpenSSL::Crypto ZLIB::ZLIB unofficial-sodium::sodium)
 
 # Requires libgoogle-perftools-dev google-perftools packages for linux (debian)
 if(EQEMU_ADD_PROFILER)
-    set(CMAKE_EXE_LINKER_FLAGS "-Wl,--no-as-needed,-lprofiler,--as-needed")
+	set(CMAKE_EXE_LINKER_FLAGS "-Wl,--no-as-needed,-lprofiler,--as-needed")
 endif()
 
 if(EQEMU_ADDITIVE_LFIB_PRNG)
-    target_compile_definitions(common PUBLIC USE_ADDITIVE_LFIB_PRNG)
-    if(EQEMU_SFMT19937)
-        message(STATUS "SFMT19937 and ADDITITVE_LFIB_PRNG both set, SFMT19937 ignored.")
-        set(EQEMU_SFMT19937 OFF)
-    endif()
-    if(NOT EQEMU_CUSTOM_PRNG_ENGINE STREQUAL "")
-        message(STATUS "CUSTOM_PRNG_ENGINE and ADDITITVE_LFIB_PRNG both set, CUSTOM_PRNG_ENGINE ignored.")
-        set(EQEMU_CUSTOM_PRNG_ENGINE "")
-    endif()
+	target_compile_definitions(common PUBLIC USE_ADDITIVE_LFIB_PRNG)
+	if(EQEMU_SFMT19937)
+		message(STATUS "SFMT19937 and ADDITITVE_LFIB_PRNG both set, SFMT19937 ignored.")
+		set(EQEMU_SFMT19937 OFF)
+	endif()
+	if(NOT EQEMU_CUSTOM_PRNG_ENGINE STREQUAL "")
+		message(STATUS "CUSTOM_PRNG_ENGINE and ADDITITVE_LFIB_PRNG both set, CUSTOM_PRNG_ENGINE ignored.")
+		set(EQEMU_CUSTOM_PRNG_ENGINE "")
+	endif()
 endif()
 
 if(EQEMU_SFMT19937)
-    target_compile_definitions(common PUBLIC USE_SFMT19937)
-    if(NOT EQEMU_CUSTOM_PRNG_ENGINE STREQUAL "")
-        message(STATUS "CUSTOM_PRNG_ENGINE and SFMT19937 both set, CUSTOM_PRNG_ENGINE ignored.")
-        set(EQEMU_CUSTOM_PRNG_ENGINE "")
-    endif()
+	target_compile_definitions(common PUBLIC USE_SFMT19937)
+	if(NOT EQEMU_CUSTOM_PRNG_ENGINE STREQUAL "")
+		message(STATUS "CUSTOM_PRNG_ENGINE and SFMT19937 both set, CUSTOM_PRNG_ENGINE ignored.")
+		set(EQEMU_CUSTOM_PRNG_ENGINE "")
+	endif()
 endif()
 
 if(NOT EQEMU_CUSTOM_PRNG_ENGINE STREQUAL "")
-    target_compile_definitions(common PUBLIC USE_CUSTOM_PRNG_ENGINE=${EQEMU_CUSTOM_PRNG_ENGINE})
+	target_compile_definitions(common PUBLIC USE_CUSTOM_PRNG_ENGINE=${EQEMU_CUSTOM_PRNG_ENGINE})
 endif()
 
 if(EQEMU_BIASED_INT_DIST)
-    target_compile_definitions(common PUBLIC BIASED_INT_DIST)
+	target_compile_definitions(common PUBLIC BIASED_INT_DIST)
 endif()
 
 if(${OPENSSL_VERSION} VERSION_GREATER_EQUAL "1.1.1")
-    target_compile_definitions(common PUBLIC CPPHTTPLIB_OPENSSL_SUPPORT)
+	target_compile_definitions(common PUBLIC CPPHTTPLIB_OPENSSL_SUPPORT)
 endif()
 
 if(UNIX)
-    target_link_libraries(common PUBLIC uuid)
-    set_source_files_properties("patches/sod.cpp" "patches/sof.cpp" "patches/rof.cpp" "patches/rof2.cpp" "patches/uf.cpp" PROPERTIES COMPILE_FLAGS -O0)
+	target_link_libraries(common PUBLIC uuid)
 endif()
 
 if(EQEMU_BUILD_PCH)
-    TARGET_PRECOMPILE_HEADERS(common PRIVATE pch/std-pch.h)
-    # Avoid PCH/__OPTIMIZE__ mismatch when compiling certain patch sources with -O0
-    # These files are compiled with -O0 on UNIX (see COMPILE_FLAGS above), which
-    # disables the __OPTIMIZE__ predefined macro. Disabling PCH for them prevents
-    # Clang from erroring due to macro state differences between the PCH and TU.
-    set_source_files_properties("patches/sod.cpp" "patches/sof.cpp" "patches/rof.cpp" "patches/rof2.cpp" "patches/uf.cpp" PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
+	TARGET_PRECOMPILE_HEADERS(common PRIVATE pch/std-pch.h)
 endif()
 
 set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
diff --git a/eqlaunch/CMakeLists.txt b/eqlaunch/CMakeLists.txt
index b4b4f9975..ac602001d 100644
--- a/eqlaunch/CMakeLists.txt
+++ b/eqlaunch/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.20)
-
 set(eqlaunch_sources
 	eqlaunch.cpp
 	worldserver.cpp
@@ -16,7 +14,6 @@ add_executable(eqlaunch ${eqlaunch_sources} ${eqlaunch_headers})
 install(TARGETS eqlaunch RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
 target_link_libraries(eqlaunch common)
-target_include_directories(eqlaunch PRIVATE ..)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 set_property(TARGET eqlaunch PROPERTY FOLDER executables/tools)
diff --git a/libs/perlbind/CMakeLists.txt b/libs/perlbind/CMakeLists.txt
index dcbcdb9f8..4c2c40e3e 100644
--- a/libs/perlbind/CMakeLists.txt
+++ b/libs/perlbind/CMakeLists.txt
@@ -3,58 +3,58 @@ cmake_minimum_required(VERSION 3.20.0)
 project(perlbind LANGUAGES CXX)
 
 set(PERLBIND_HEADERS
-  include/perlbind/array.h
-  include/perlbind/forward.h
-  include/perlbind/function.h
-  include/perlbind/hash.h
-  include/perlbind/interpreter.h
-  include/perlbind/iterator.h
-  include/perlbind/package.h
-  include/perlbind/perlbind.h
-  include/perlbind/scalar.h
-  include/perlbind/stack.h
-  include/perlbind/stack_push.h
-  include/perlbind/stack_read.h
-  include/perlbind/subcaller.h
-  include/perlbind/traits.h
-  include/perlbind/typemap.h
-  include/perlbind/types.h
-  include/perlbind/util.h
-  include/perlbind/version.h
+	include/perlbind/array.h
+	include/perlbind/forward.h
+	include/perlbind/function.h
+	include/perlbind/hash.h
+	include/perlbind/interpreter.h
+	include/perlbind/iterator.h
+	include/perlbind/package.h
+	include/perlbind/perlbind.h
+	include/perlbind/scalar.h
+	include/perlbind/stack.h
+	include/perlbind/stack_push.h
+	include/perlbind/stack_read.h
+	include/perlbind/subcaller.h
+	include/perlbind/traits.h
+	include/perlbind/typemap.h
+	include/perlbind/types.h
+	include/perlbind/util.h
+	include/perlbind/version.h
 )
 
 set(PERLBIND_SOURCES
-  src/function.cpp
-  src/hash.cpp
-  src/interpreter.cpp
-  src/package.cpp
+	src/function.cpp
+	src/hash.cpp
+	src/interpreter.cpp
+	src/package.cpp
 )
 
 if(MSVC)
-  set(PERLBIND_SOURCES ${PERLBIND_SOURCES} src/perlbind.natvis)
+	set(PERLBIND_SOURCES ${PERLBIND_SOURCES} src/perlbind.natvis)
 endif()
 
 add_library(perlbind ${PERLBIND_SOURCES} ${PERLBIND_HEADERS})
 
 target_include_directories(perlbind PUBLIC
-  ${PERL_INCLUDE_PATH}
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-  $<INSTALL_INTERFACE:include>)
+	${PERL_INCLUDE_PATH}
+	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+	$<INSTALL_INTERFACE:include>)
 
 option(PERLBIND_BUILD_TESTS "Build tests" OFF)
 option(PERLBIND_ENABLE_ASAN "Build with address sanitizer" OFF)
 
 if(PERLBIND_ENABLE_ASAN)
-  target_compile_options(perlbind PRIVATE -fsanitize=address -fno-omit-frame-pointer)
-  target_link_options(perlbind PRIVATE -fsanitize=address -fno-omit-frame-pointer)
+	target_compile_options(perlbind PRIVATE -fsanitize=address -fno-omit-frame-pointer)
+	target_link_options(perlbind PRIVATE -fsanitize=address -fno-omit-frame-pointer)
 endif()
 
 if(PERLBIND_BUILD_TESTS)
-  enable_testing()
-  add_subdirectory(test)
-  set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT tests)
+	enable_testing()
+	add_subdirectory(test)
+	set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT tests)
 
-  target_include_directories(tests PRIVATE
-    ${PERL_INCLUDE_PATH}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include)
+	target_include_directories(tests PRIVATE
+		${PERL_INCLUDE_PATH}
+		${CMAKE_CURRENT_SOURCE_DIR}/include)
 endif()
diff --git a/loginserver/CMakeLists.txt b/loginserver/CMakeLists.txt
index 67d0658c2..fa57f6cf5 100644
--- a/loginserver/CMakeLists.txt
+++ b/loginserver/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.20)
-
 set(eqlogin_sources
 	account_management.cpp
 	client.cpp
@@ -33,17 +31,16 @@ add_executable(loginserver ${eqlogin_sources} ${eqlogin_headers})
 install(TARGETS loginserver RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
 target_link_libraries(loginserver common)
-target_include_directories(loginserver PRIVATE ..)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 set_property(TARGET loginserver PROPERTY FOLDER executables/servers)
 
 # vcpkg doesn't copy legacy.dll automatically because it is loaded at runtime, not via the import table.
 if(WIN32 AND DEFINED VCPKG_INSTALLED_DIR AND DEFINED VCPKG_TARGET_TRIPLET)
-    add_custom_command(TARGET loginserver POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different
-            "$<IF:$<CONFIG:Debug>,${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/bin/legacy.dll,${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin/legacy.dll>"
-            "$<TARGET_FILE_DIR:loginserver>/legacy.dll"
-        VERBATIM
-    )
+	add_custom_command(TARGET loginserver POST_BUILD
+		COMMAND ${CMAKE_COMMAND} -E copy_if_different
+			"$<IF:$<CONFIG:Debug>,${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/bin/legacy.dll,${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin/legacy.dll>"
+			"$<TARGET_FILE_DIR:loginserver>/legacy.dll"
+		VERBATIM
+	)
 endif()
diff --git a/queryserv/CMakeLists.txt b/queryserv/CMakeLists.txt
index 641d3385e..71004e76e 100644
--- a/queryserv/CMakeLists.txt
+++ b/queryserv/CMakeLists.txt
@@ -1,22 +1,20 @@
-cmake_minimum_required(VERSION 3.20)
-
 set(qserv_sources
-    database.cpp
-    lfguild.cpp
-    queryserv.cpp
-    queryservconfig.cpp
-    worldserver.cpp
-    zonelist.cpp
-    zoneserver.cpp
+	database.cpp
+	lfguild.cpp
+	queryserv.cpp
+	queryservconfig.cpp
+	worldserver.cpp
+	zonelist.cpp
+	zoneserver.cpp
 )
 
 set(qserv_headers
-    database.h
-    lfguild.h
-    queryservconfig.h
-    worldserver.h
-    zonelist.h
-    zoneserver.h
+	database.h
+	lfguild.h
+	queryservconfig.h
+	worldserver.h
+	zonelist.h
+	zoneserver.h
 )
 
 add_executable(queryserv ${qserv_sources} ${qserv_headers})
@@ -26,7 +24,6 @@ install(TARGETS queryserv RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 add_definitions(-DQSERV)
 
 target_link_libraries(queryserv common)
-target_include_directories(queryserv PRIVATE ..)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 set_property(TARGET queryserv PROPERTY FOLDER executables/servers)
diff --git a/shared_memory/CMakeLists.txt b/shared_memory/CMakeLists.txt
index 6284291d0..b7182a2d6 100644
--- a/shared_memory/CMakeLists.txt
+++ b/shared_memory/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.17.0)
-
 set(shared_memory_sources
 	items.cpp
 	main.cpp
@@ -16,7 +14,6 @@ add_executable(shared_memory ${shared_memory_sources} ${shared_memory_headers})
 install(TARGETS shared_memory RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
 target_link_libraries(shared_memory common)
-target_include_directories(shared_memory PRIVATE ..)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 set_property(TARGET shared_memory PROPERTY FOLDER executables/servers)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 346128d60..e88051a5a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.20.0)
-
 add_subdirectory(cppunit)
 
 set(tests_sources
@@ -22,7 +20,6 @@ set(tests_headers
 add_executable(tests ${tests_sources} ${tests_headers})
 
 target_link_libraries(tests common cppunit)
-target_include_directories(tests PRIVATE ..)
 
 install(TARGETS tests RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
diff --git a/tests/cppunit/CMakeLists.txt b/tests/cppunit/CMakeLists.txt
index 4b4763d95..d054b1255 100644
--- a/tests/cppunit/CMakeLists.txt
+++ b/tests/cppunit/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.20.0)
-
 set(cppunit_sources
 	collectoroutput.cpp
 	compileroutput.cpp
diff --git a/ucs/CMakeLists.txt b/ucs/CMakeLists.txt
index f33fa9a51..8652b7928 100644
--- a/ucs/CMakeLists.txt
+++ b/ucs/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.20)
-
 set(ucs_sources
 	chatchannel.cpp
 	clientlist.cpp
@@ -24,7 +22,6 @@ install(TARGETS ucs RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 add_definitions(-DUCS)
 
 target_link_libraries(ucs common)
-target_include_directories(ucs PRIVATE ..)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 set_property(TARGET ucs PROPERTY FOLDER executables/servers)
diff --git a/utils/deprecated/pfs_list/CMakeLists.txt b/utils/deprecated/pfs_list/CMakeLists.txt
index 2bac1ac69..ad9d90efc 100644
--- a/utils/deprecated/pfs_list/CMakeLists.txt
+++ b/utils/deprecated/pfs_list/CMakeLists.txt
@@ -1,9 +1,7 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-
 PROJECT(PFSUtil)
 
 IF(NOT CMAKE_BUILD_TYPE)
-    SET(CMAKE_BUILD_TYPE "Debug")
+	SET(CMAKE_BUILD_TYPE "Debug")
 ENDIF(NOT CMAKE_BUILD_TYPE)
 
 IF(WIN32)
diff --git a/utils/deprecated/pfs_list/Common/CMakeLists.txt b/utils/deprecated/pfs_list/Common/CMakeLists.txt
index 250862e49..d79fd6fea 100644
--- a/utils/deprecated/pfs_list/Common/CMakeLists.txt
+++ b/utils/deprecated/pfs_list/Common/CMakeLists.txt
@@ -1,15 +1,13 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-
 SET(common_sources
-    Source/PFSArchive.cpp
-    Source/Compression.cpp
+	Source/PFSArchive.cpp
+	Source/Compression.cpp
 )
 
 SET(common_headers
-    Include/Archive.h
-    Include/PFSArchive.h
-    Include/PFSDataStructs.h
-    Include/Compression.h
+	Include/Archive.h
+	Include/PFSArchive.h
+	Include/PFSDataStructs.h
+	Include/Compression.h
 )
 
 INCLUDE_DIRECTORIES(Include)
diff --git a/utils/deprecated/pfs_list/PFSList/CMakeLists.txt b/utils/deprecated/pfs_list/PFSList/CMakeLists.txt
index 9a36798f2..2f4ba719c 100644
--- a/utils/deprecated/pfs_list/PFSList/CMakeLists.txt
+++ b/utils/deprecated/pfs_list/PFSList/CMakeLists.txt
@@ -1,13 +1,11 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-
 SET(pfslist_sources
-    Source/main.cpp
+	Source/main.cpp
 )
 
 SET(pfslist_headers
 )
 
-INCLUDE_DIRECTORIES(Include 
+INCLUDE_DIRECTORIES(Include
 	../Common/Include
 )
 
@@ -17,7 +15,7 @@ TARGET_LINK_LIBRARIES(PFSList Common ${ZLIB_LIBRARY} "Ws2_32.lib")
 
 IF(MSVC)
 	ADD_DEFINITIONS(/D _CONSOLE)
-    SET_TARGET_PROPERTIES(PFSList PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF")
+	SET_TARGET_PROPERTIES(PFSList PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF")
 ENDIF(MSVC)
 
 SET(EXECUTABLE_OUTPUT_PATH ../Build/PFSList)
diff --git a/utils/scripts/build/linux-build.sh b/utils/scripts/build/linux-build.sh
index 767d06046..d5d4e8a3a 100755
--- a/utils/scripts/build/linux-build.sh
+++ b/utils/scripts/build/linux-build.sh
@@ -14,12 +14,12 @@ perl utils/scripts/build/tag-version.pl
 
 mkdir -p build && cd build && \
   cmake -DEQEMU_BUILD_TESTS=ON \
-      -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+      -DCMAKE_BUILD_TYPE=Release \
       -DEQEMU_BUILD_STATIC=ON \
       -DEQEMU_BUILD_LOGIN=ON \
       -DEQEMU_BUILD_LUA=ON \
       -DEQEMU_BUILD_PERL=ON \
-      -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="-g -Wno-everything" \
+      -DCMAKE_CXX_FLAGS_RELEASE:STRING="-g -Wno-everything" \
       -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
       -G 'Unix Makefiles' \
       .. && make -j$((`nproc`-2))
diff --git a/world/CMakeLists.txt b/world/CMakeLists.txt
index 80be6aeb8..bd51ea03e 100644
--- a/world/CMakeLists.txt
+++ b/world/CMakeLists.txt
@@ -1,92 +1,90 @@
-cmake_minimum_required(VERSION 3.20)
-
 set(world_sources
-    adventure.cpp
-    adventure_manager.cpp
-    cli/cli_bots_disable.cpp
-    cli/cli_bots_enable.cpp
-    cli/cli_copy_character.cpp
-    cli/cli_database_concurrency.cpp
-    cli/cli_database_dump.cpp
-    cli/cli_database_get_schema.cpp
-    cli/cli_database_set_account_status.cpp
-    cli/cli_database_updates.cpp
-    cli/cli_database_version.cpp
-    cli/cli_etl_get_settings.cpp
-    cli/cli_mercs_disable.cpp
-    cli/cli_mercs_enable.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
-    client.cpp
-    cliententry.cpp
-    clientlist.cpp
-    console.cpp
-    dynamic_zone.cpp
-    dynamic_zone_manager.cpp
-    eqemu_api_world_data_service.cpp
-    eql_config.cpp
-    launcher_link.cpp
-    launcher_list.cpp
-    lfplist.cpp
-    login_server.cpp
-    login_server_list.cpp
-    main.cpp
-    queryserv.cpp
-    shared_task_manager.cpp
-    shared_task_world_messaging.cpp
-    ucs.cpp
-    web_interface.cpp
-    web_interface_eqw.cpp
-    wguild_mgr.cpp
-    world_boot.cpp
-    world_config.cpp
-    world_console_connection.cpp
-    world_event_scheduler.cpp
-    world_server_cli.cpp
-    worlddb.cpp
-    zonelist.cpp
-    zoneserver.cpp
+	adventure.cpp
+	adventure_manager.cpp
+	cli/cli_bots_disable.cpp
+	cli/cli_bots_enable.cpp
+	cli/cli_copy_character.cpp
+	cli/cli_database_concurrency.cpp
+	cli/cli_database_dump.cpp
+	cli/cli_database_get_schema.cpp
+	cli/cli_database_set_account_status.cpp
+	cli/cli_database_updates.cpp
+	cli/cli_database_version.cpp
+	cli/cli_etl_get_settings.cpp
+	cli/cli_mercs_disable.cpp
+	cli/cli_mercs_enable.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
+	client.cpp
+	cliententry.cpp
+	clientlist.cpp
+	console.cpp
+	dynamic_zone.cpp
+	dynamic_zone_manager.cpp
+	eqemu_api_world_data_service.cpp
+	eql_config.cpp
+	launcher_link.cpp
+	launcher_list.cpp
+	lfplist.cpp
+	login_server.cpp
+	login_server_list.cpp
+	main.cpp
+	queryserv.cpp
+	shared_task_manager.cpp
+	shared_task_world_messaging.cpp
+	ucs.cpp
+	web_interface.cpp
+	web_interface_eqw.cpp
+	wguild_mgr.cpp
+	world_boot.cpp
+	world_config.cpp
+	world_console_connection.cpp
+	world_event_scheduler.cpp
+	world_server_cli.cpp
+	worlddb.cpp
+	zonelist.cpp
+	zoneserver.cpp
 )
 
 set(world_headers
-    adventure.h
-    adventure_manager.h
-    adventure_template.h
-    client.h
-    cliententry.h
-    clientlist.h
-    console.h
-    dynamic_zone.h
-    dynamic_zone_manager.h
-    eqemu_api_world_data_service.h
-    eql_config.h
-    launcher_link.h
-    launcher_list.h
-    lfplist.h
-    login_server.h
-    login_server_list.h
-    queryserv.h
-    shared_task_manager.h
-    shared_task_world_messaging.h
-    sof_char_create_data.h
-    ucs.h
-    web_interface.h
-    web_interface_eqw.h
-    wguild_mgr.h
-    world_boot.h
-    world_config.h
-    world_console_connection.h
-    world_event_scheduler.h
-    world_server_cli.h
-    world_tcp_connection.h
-    worlddb.h
-    zonelist.h
-    zoneserver.h
+	adventure.h
+	adventure_manager.h
+	adventure_template.h
+	client.h
+	cliententry.h
+	clientlist.h
+	console.h
+	dynamic_zone.h
+	dynamic_zone_manager.h
+	eqemu_api_world_data_service.h
+	eql_config.h
+	launcher_link.h
+	launcher_list.h
+	lfplist.h
+	login_server.h
+	login_server_list.h
+	queryserv.h
+	shared_task_manager.h
+	shared_task_world_messaging.h
+	sof_char_create_data.h
+	ucs.h
+	web_interface.h
+	web_interface_eqw.h
+	wguild_mgr.h
+	world_boot.h
+	world_config.h
+	world_console_connection.h
+	world_event_scheduler.h
+	world_server_cli.h
+	world_tcp_connection.h
+	worlddb.h
+	zonelist.h
+	zoneserver.h
 )
 
 source_group("cli" REGULAR_EXPRESSION "cli/.*")
@@ -96,10 +94,9 @@ 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)
+if(EQEMU_BUILD_PCH)
+	target_precompile_headers(world PRIVATE ../common/pch/std-pch.h)
 endif()
 
 install(TARGETS world RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
diff --git a/zone/CMakeLists.txt b/zone/CMakeLists.txt
index 0a9d97178..4582b3ca7 100644
--- a/zone/CMakeLists.txt
+++ b/zone/CMakeLists.txt
@@ -1,665 +1,661 @@
-cmake_minimum_required(VERSION 3.20)
-
 set(zone_sources
-    aa.cpp
-    aa_ability.cpp
-    aggro.cpp
-    aggromanager.cpp
-    api_service.cpp
-    attack.cpp
-    aura.cpp
-    beacon.cpp
-    bonuses.cpp
-    bot.cpp
-    bot_database.cpp
-    bot_raid.cpp
-    botspellsai.cpp
-    cheat_manager.cpp
-    cli/cli_benchmark_databuckets.cpp
-    cli/cli_sidecar_serve_http.cpp
-    cli/tests/cli_databuckets.cpp
-    cli/tests/cli_npc_handins.cpp
-    cli/tests/cli_npc_handins_multiquest.cpp
-    cli/tests/cli_test_util.cpp
-    cli/tests/cli_zone_state.cpp
-    client.cpp
-    client_bot.cpp
-    client_evolving_items.cpp
-    client_mods.cpp
-    client_packet.cpp
-    client_process.cpp
-    client_version.cpp
-    combat_record.cpp
-    corpse.cpp
-    dialogue_window.cpp
-    doors.cpp
-    dynamic_zone.cpp
-    effects.cpp
-    embparser.cpp
-    embparser_api.cpp
-    embperl.cpp
-    encounter.cpp
-    entity.cpp
-    exp.cpp
-    expedition_request.cpp
-    fastmath.cpp
-    fearpath.cpp
-    forage.cpp
-    global_loot_manager.cpp
-    groups.cpp
-    guild.cpp
-    guild_mgr.cpp
-    hate_list.cpp
-    heal_rotation.cpp
-    horse.cpp
-    inventory.cpp
-    loot.cpp
-    main.cpp
-    map.cpp
-    merc.cpp
-    mob.cpp
-    mob_ai.cpp
-    mob_appearance.cpp
-    mob_info.cpp
-    mob_movement_manager.cpp
-    npc.cpp
-    npc_scale_manager.cpp
-    object.cpp
-    oriented_bounding_box.cpp
-    parcels.cpp
-    pathfinder_interface.cpp
-    pathfinder_nav_mesh.cpp
-    pathfinder_null.cpp
-    pathing.cpp
-    petitions.cpp
-    pets.cpp
-    position.cpp
-    qglobals.cpp
-    queryserv.cpp
-    quest_db.cpp
-    quest_parser_collection.cpp
-    questmgr.cpp
-    raids.cpp
-    raycast_mesh.cpp
-    shared_task_zone_messaging.cpp
-    sidecar_api/loot_simulator_controller.cpp
-    sidecar_api/sidecar_api.cpp
-    spawn2.cpp
-    spawngroup.cpp
-    special_attacks.cpp
-    spell_effects.cpp
-    spells.cpp
-    task_client_state.cpp
-    task_manager.cpp
-    tasks.cpp
-    titles.cpp
-    tradeskills.cpp
-    trading.cpp
-    trap.cpp
-    tribute.cpp
-    tune.cpp
-    water_map.cpp
-    water_map_v1.cpp
-    water_map_v2.cpp
-    waypoints.cpp
-    worldserver.cpp
-    xtargetautohaters.cpp
-    zone.cpp
-    zone_base_data.cpp
-    zone_cli.cpp
-    zone_config.cpp
-    zone_event_scheduler.cpp
-    zone_loot.cpp
-    zone_npc_factions.cpp
-    zone_reload.cpp
-    zone_save_state.cpp
-    zonedb.cpp
-    zoning.cpp
+	aa.cpp
+	aa_ability.cpp
+	aggro.cpp
+	aggromanager.cpp
+	api_service.cpp
+	attack.cpp
+	aura.cpp
+	beacon.cpp
+	bonuses.cpp
+	bot.cpp
+	bot_database.cpp
+	bot_raid.cpp
+	botspellsai.cpp
+	cheat_manager.cpp
+	cli/cli_benchmark_databuckets.cpp
+	cli/cli_sidecar_serve_http.cpp
+	cli/tests/cli_databuckets.cpp
+	cli/tests/cli_npc_handins.cpp
+	cli/tests/cli_npc_handins_multiquest.cpp
+	cli/tests/cli_test_util.cpp
+	cli/tests/cli_zone_state.cpp
+	client.cpp
+	client_bot.cpp
+	client_evolving_items.cpp
+	client_mods.cpp
+	client_packet.cpp
+	client_process.cpp
+	client_version.cpp
+	combat_record.cpp
+	corpse.cpp
+	dialogue_window.cpp
+	doors.cpp
+	dynamic_zone.cpp
+	effects.cpp
+	embparser.cpp
+	embparser_api.cpp
+	embperl.cpp
+	encounter.cpp
+	entity.cpp
+	exp.cpp
+	expedition_request.cpp
+	fastmath.cpp
+	fearpath.cpp
+	forage.cpp
+	global_loot_manager.cpp
+	groups.cpp
+	guild.cpp
+	guild_mgr.cpp
+	hate_list.cpp
+	heal_rotation.cpp
+	horse.cpp
+	inventory.cpp
+	loot.cpp
+	main.cpp
+	map.cpp
+	merc.cpp
+	mob.cpp
+	mob_ai.cpp
+	mob_appearance.cpp
+	mob_info.cpp
+	mob_movement_manager.cpp
+	npc.cpp
+	npc_scale_manager.cpp
+	object.cpp
+	oriented_bounding_box.cpp
+	parcels.cpp
+	pathfinder_interface.cpp
+	pathfinder_nav_mesh.cpp
+	pathfinder_null.cpp
+	pathing.cpp
+	petitions.cpp
+	pets.cpp
+	position.cpp
+	qglobals.cpp
+	queryserv.cpp
+	quest_db.cpp
+	quest_parser_collection.cpp
+	questmgr.cpp
+	raids.cpp
+	raycast_mesh.cpp
+	shared_task_zone_messaging.cpp
+	sidecar_api/loot_simulator_controller.cpp
+	sidecar_api/sidecar_api.cpp
+	spawn2.cpp
+	spawngroup.cpp
+	special_attacks.cpp
+	spell_effects.cpp
+	spells.cpp
+	task_client_state.cpp
+	task_manager.cpp
+	tasks.cpp
+	titles.cpp
+	tradeskills.cpp
+	trading.cpp
+	trap.cpp
+	tribute.cpp
+	tune.cpp
+	water_map.cpp
+	water_map_v1.cpp
+	water_map_v2.cpp
+	waypoints.cpp
+	worldserver.cpp
+	xtargetautohaters.cpp
+	zone.cpp
+	zone_base_data.cpp
+	zone_cli.cpp
+	zone_config.cpp
+	zone_event_scheduler.cpp
+	zone_loot.cpp
+	zone_npc_factions.cpp
+	zone_reload.cpp
+	zone_save_state.cpp
+	zonedb.cpp
+	zoning.cpp
 )
 
 set(zone_headers
-    aa.h
-    aa_ability.h
-    aggromanager.h
-    api_service.h
-    aura.h
-    beacon.h
-    bot.h
-    bot_command.h
-    bot_database.h
-    bot_structs.h
-    cheat_manager.h
-    client.h
-    client_packet.h
-    client_version.h
-    combat_record.h
-    command.h
-    common.h
-    corpse.h
-    dialogue_window.h
-    doors.h
-    dynamic_zone.h
-    embparser.h
-    embperl.h
-    encounter.h
-    entity.h
-    event_codes.h
-    expedition_request.h
-    fastmath.h
-    forage.h
-    global_loot_manager.h
-    groups.h
-    guild_mgr.h
-    hate_list.h
-    heal_rotation.h
-    horse.h
-    lua_bit.h
-    lua_bot.h
-    lua_buff.h
-    lua_client.h
-    lua_corpse.h
-    lua_database.h
-    lua_door.h
-    lua_encounter.h
-    lua_entity.h
-    lua_entity_list.h
-    lua_expedition.h
-    lua_general.h
-    lua_group.h
-    lua_hate_list.h
-    lua_inventory.h
-    lua_item.h
-    lua_iteminst.h
-    lua_merc.h
-    lua_mob.h
-    lua_mod.h
-    lua_npc.h
-    lua_object.h
-    lua_packet.h
-    lua_parser.h
-    lua_parser_events.h
-    lua_ptr.h
-    lua_raid.h
-    lua_spawn.h
-    lua_spell.h
-    lua_stat_bonuses.h
-    lua_zone.h
-    map.h
-    masterentity.h
-    merc.h
-    mob.h
-    mob_movement_manager.h
-    npc.h
-    npc_scale_manager.h
-    object.h
-    oriented_bounding_box.h
-    pathfinder_interface.h
-    pathfinder_nav_mesh.h
-    pathfinder_null.h
-    perl_database.h
-    perlpacket.h
-    petitions.h
-    pets.h
-    position.h
-    qglobals.h
-    queryserv.h
-    quest_db.h
-    quest_interface.h
-    quest_parser_collection.h
-    questmgr.h
-    raids.h
-    raycast_mesh.h
-    shared_task_zone_messaging.h
-    sidecar_api/sidecar_api.h
-    spawn2.h
-    spawngroup.h
-    string_ids.h
-    task_client_state.h
-    task_manager.h
-    tasks.h
-    titles.h
-    trap.h
-    water_map.h
-    water_map_v1.h
-    water_map_v2.h
-    worldserver.h
-    xtargetautohaters.h
-    zone.h
-    zone_cli.h
-    zone_config.h
-    zone_event_scheduler.h
-    zone_reload.h
-    zone_save_state.h
-    zonedb.h
-    zonedump.h
+	aa.h
+	aa_ability.h
+	aggromanager.h
+	api_service.h
+	aura.h
+	beacon.h
+	bot.h
+	bot_command.h
+	bot_database.h
+	bot_structs.h
+	cheat_manager.h
+	client.h
+	client_packet.h
+	client_version.h
+	combat_record.h
+	command.h
+	common.h
+	corpse.h
+	dialogue_window.h
+	doors.h
+	dynamic_zone.h
+	embparser.h
+	embperl.h
+	encounter.h
+	entity.h
+	event_codes.h
+	expedition_request.h
+	fastmath.h
+	forage.h
+	global_loot_manager.h
+	groups.h
+	guild_mgr.h
+	hate_list.h
+	heal_rotation.h
+	horse.h
+	lua_bit.h
+	lua_bot.h
+	lua_buff.h
+	lua_client.h
+	lua_corpse.h
+	lua_database.h
+	lua_door.h
+	lua_encounter.h
+	lua_entity.h
+	lua_entity_list.h
+	lua_expedition.h
+	lua_general.h
+	lua_group.h
+	lua_hate_list.h
+	lua_inventory.h
+	lua_item.h
+	lua_iteminst.h
+	lua_merc.h
+	lua_mob.h
+	lua_mod.h
+	lua_npc.h
+	lua_object.h
+	lua_packet.h
+	lua_parser.h
+	lua_parser_events.h
+	lua_ptr.h
+	lua_raid.h
+	lua_spawn.h
+	lua_spell.h
+	lua_stat_bonuses.h
+	lua_zone.h
+	map.h
+	masterentity.h
+	merc.h
+	mob.h
+	mob_movement_manager.h
+	npc.h
+	npc_scale_manager.h
+	object.h
+	oriented_bounding_box.h
+	pathfinder_interface.h
+	pathfinder_nav_mesh.h
+	pathfinder_null.h
+	perl_database.h
+	perlpacket.h
+	petitions.h
+	pets.h
+	position.h
+	qglobals.h
+	queryserv.h
+	quest_db.h
+	quest_interface.h
+	quest_parser_collection.h
+	questmgr.h
+	raids.h
+	raycast_mesh.h
+	shared_task_zone_messaging.h
+	sidecar_api/sidecar_api.h
+	spawn2.h
+	spawngroup.h
+	string_ids.h
+	task_client_state.h
+	task_manager.h
+	tasks.h
+	titles.h
+	trap.h
+	water_map.h
+	water_map_v1.h
+	water_map_v2.h
+	worldserver.h
+	xtargetautohaters.h
+	zone.h
+	zone_cli.h
+	zone_config.h
+	zone_event_scheduler.h
+	zone_reload.h
+	zone_save_state.h
+	zonedb.h
+	zonedump.h
 )
 
 set(lua_sources
-    lua_bit.cpp
-    lua_bot.cpp
-    lua_buff.cpp
-    lua_client.cpp
-    lua_corpse.cpp
-    lua_database.cpp
-    lua_door.cpp
-    lua_encounter.cpp
-    lua_entity.cpp
-    lua_entity_list.cpp
-    lua_expedition.cpp
-    lua_general.cpp
-    lua_group.cpp
-    lua_hate_list.cpp
-    lua_inventory.cpp
-    lua_item.cpp
-    lua_iteminst.cpp
-    lua_merc.cpp
-    lua_mob.cpp
-    lua_mod.cpp
-    lua_npc.cpp
-    lua_object.cpp
-    lua_packet.cpp
-    lua_parser.cpp
-    lua_parser_events.cpp
-    lua_raid.cpp
-    lua_spawn.cpp
-    lua_spell.cpp
-    lua_stat_bonuses.cpp
-    lua_zone.cpp
+	lua_bit.cpp
+	lua_bot.cpp
+	lua_buff.cpp
+	lua_client.cpp
+	lua_corpse.cpp
+	lua_database.cpp
+	lua_door.cpp
+	lua_encounter.cpp
+	lua_entity.cpp
+	lua_entity_list.cpp
+	lua_expedition.cpp
+	lua_general.cpp
+	lua_group.cpp
+	lua_hate_list.cpp
+	lua_inventory.cpp
+	lua_item.cpp
+	lua_iteminst.cpp
+	lua_merc.cpp
+	lua_mob.cpp
+	lua_mod.cpp
+	lua_npc.cpp
+	lua_object.cpp
+	lua_packet.cpp
+	lua_parser.cpp
+	lua_parser_events.cpp
+	lua_raid.cpp
+	lua_spawn.cpp
+	lua_spell.cpp
+	lua_stat_bonuses.cpp
+	lua_zone.cpp
 )
 
 add_library(lua_zone STATIC ${lua_sources})
 
 set_property(TARGET lua_zone PROPERTY FOLDER libraries)
 set_target_properties(lua_zone PROPERTIES UNITY_BUILD ON UNITY_BUILD_BATCH_SIZE 8)
-target_include_directories(lua_zone PRIVATE ..)
 
 set(perl_sources
-    perl_bot.cpp
-    perl_buff.cpp
-    perl_client.cpp
-    perl_database.cpp
-    perl_doors.cpp
-    perl_entity.cpp
-    perl_expedition.cpp
-    perl_groups.cpp
-    perl_hateentry.cpp
-    perl_inventory.cpp
-    perl_merc.cpp
-    perl_mob.cpp
-    perl_npc.cpp
-    perl_object.cpp
-    perl_perlpacket.cpp
-    perl_player_corpse.cpp
-    perl_questitem.cpp
-    perl_questitem_data.cpp
-    perl_raids.cpp
-    perl_spawn.cpp
-    perl_spell.cpp
-    perl_stat_bonuses.cpp
-    perl_zone.cpp
-    perlpacket.cpp
+	perl_bot.cpp
+	perl_buff.cpp
+	perl_client.cpp
+	perl_database.cpp
+	perl_doors.cpp
+	perl_entity.cpp
+	perl_expedition.cpp
+	perl_groups.cpp
+	perl_hateentry.cpp
+	perl_inventory.cpp
+	perl_merc.cpp
+	perl_mob.cpp
+	perl_npc.cpp
+	perl_object.cpp
+	perl_perlpacket.cpp
+	perl_player_corpse.cpp
+	perl_questitem.cpp
+	perl_questitem_data.cpp
+	perl_raids.cpp
+	perl_spawn.cpp
+	perl_spell.cpp
+	perl_stat_bonuses.cpp
+	perl_zone.cpp
+	perlpacket.cpp
 )
 
 add_library(perl_zone STATIC ${perl_sources})
 set_property(TARGET perl_zone PROPERTY FOLDER libraries)
 set_target_properties(perl_zone PROPERTIES UNITY_BUILD ON UNITY_BUILD_BATCH_SIZE 8)
 target_link_libraries(perl_zone PUBLIC cereal::cereal fmt::fmt unofficial::libmariadb)
-target_include_directories(perl_zone PRIVATE ..)
 
 set(gm_command_sources
-    bot_command.cpp
-    bot_commands/bot_actionable.cpp
-    bot_commands/bot_appearance.cpp
-    bot_commands/bot_apply_poison.cpp
-    bot_commands/bot_apply_potion.cpp
-    bot_commands/bot_attack.cpp
-    bot_commands/bot_behind_mob.cpp
-    bot_commands/bot_blocked_buffs.cpp
-    bot_commands/bot_bot.cpp
-    bot_commands/bot_bot_settings.cpp
-    bot_commands/bot_cast.cpp
-    bot_commands/bot_class_race_list.cpp
-    bot_commands/bot_click_item.cpp
-    bot_commands/bot_copy_settings.cpp
-    bot_commands/bot_default_settings.cpp
-    bot_commands/bot_depart.cpp
-    bot_commands/bot_discipline.cpp
-    bot_commands/bot_distance_ranged.cpp
-    bot_commands/bot_find_aliases.cpp
-    bot_commands/bot_follow.cpp
-    bot_commands/bot_guard.cpp
-    bot_commands/bot_heal_rotation.cpp
-    bot_commands/bot_help.cpp
-    bot_commands/bot_hold.cpp
-    bot_commands/bot_illusion_block.cpp
-    bot_commands/bot_inventory.cpp
-    bot_commands/bot_item_use.cpp
-    bot_commands/bot_max_melee_range.cpp
-    bot_commands/bot_name.cpp
-    bot_commands/bot_owner_option.cpp
-    bot_commands/bot_pet.cpp
-    bot_commands/bot_pick_lock.cpp
-    bot_commands/bot_pickpocket.cpp
-    bot_commands/bot_precombat.cpp
-    bot_commands/bot_pull.cpp
-    bot_commands/bot_release.cpp
-    bot_commands/bot_set_assistee.cpp
-    bot_commands/bot_sit_hp_percent.cpp
-    bot_commands/bot_sit_in_combat.cpp
-    bot_commands/bot_sit_mana_percent.cpp
-    bot_commands/bot_spell.cpp
-    bot_commands/bot_spell_aggro_checks.cpp
-    bot_commands/bot_spell_announce_cast.cpp
-    bot_commands/bot_spell_delays.cpp
-    bot_commands/bot_spell_engaged_priority.cpp
-    bot_commands/bot_spell_holds.cpp
-    bot_commands/bot_spell_idle_priority.cpp
-    bot_commands/bot_spell_max_hp_pct.cpp
-    bot_commands/bot_spell_max_mana_pct.cpp
-    bot_commands/bot_spell_max_thresholds.cpp
-    bot_commands/bot_spell_min_hp_pct.cpp
-    bot_commands/bot_spell_min_mana_pct.cpp
-    bot_commands/bot_spell_min_thresholds.cpp
-    bot_commands/bot_spell_pursue_priority.cpp
-    bot_commands/bot_spell_resist_limits.cpp
-    bot_commands/bot_spell_target_count.cpp
-    bot_commands/bot_spelltypes.cpp
-    bot_commands/bot_suspend.cpp
-    bot_commands/bot_taunt.cpp
-    bot_commands/bot_timer.cpp
-    bot_commands/bot_track.cpp
-    bot_commands/bot_view_combos.cpp
-    command.cpp
-    gm_commands/acceptrules.cpp
-    gm_commands/advnpcspawn.cpp
-    gm_commands/aggrozone.cpp
-    gm_commands/ai.cpp
-    gm_commands/appearance.cpp
-    gm_commands/appearanceeffects.cpp
-    gm_commands/attack.cpp
-    gm_commands/augmentitem.cpp
-    gm_commands/ban.cpp
-    gm_commands/bugs.cpp
-    gm_commands/camerashake.cpp
-    gm_commands/castspell.cpp
-    gm_commands/chat.cpp
-    gm_commands/clearxtargets.cpp
-    gm_commands/copycharacter.cpp
-    gm_commands/corpse.cpp
-    gm_commands/corpsefix.cpp
-    gm_commands/countitem.cpp
-    gm_commands/damage.cpp
-    gm_commands/databuckets.cpp
-    gm_commands/dbspawn2.cpp
-    gm_commands/delacct.cpp
-    gm_commands/delpetition.cpp
-    gm_commands/depop.cpp
-    gm_commands/depopzone.cpp
-    gm_commands/devtools.cpp
-    gm_commands/disablerecipe.cpp
-    gm_commands/disarmtrap.cpp
-    gm_commands/doanim.cpp
-    gm_commands/door.cpp
-    gm_commands/door_manipulation.cpp
-    gm_commands/dye.cpp
-    gm_commands/dz.cpp
-    gm_commands/dzkickplayers.cpp
-    gm_commands/editmassrespawn.cpp
-    gm_commands/emote.cpp
-    gm_commands/emptyinventory.cpp
-    gm_commands/enablerecipe.cpp
-    gm_commands/entityvariable.cpp
-    gm_commands/evolving_items.cpp
-    gm_commands/exptoggle.cpp
-    gm_commands/faction.cpp
-    gm_commands/faction_association.cpp
-    gm_commands/feature.cpp
-    gm_commands/find.cpp
-    gm_commands/find/find_aa.cpp
-    gm_commands/find/find_account.cpp
-    gm_commands/find/find_body_type.cpp
-    gm_commands/find/find_bot.cpp
-    gm_commands/find/find_bug_category.cpp
-    gm_commands/find/find_character.cpp
-    gm_commands/find/find_class.cpp
-    gm_commands/find/find_comparison_type.cpp
-    gm_commands/find/find_currency.cpp
-    gm_commands/find/find_deity.cpp
-    gm_commands/find/find_emote.cpp
-    gm_commands/find/find_faction.cpp
-    gm_commands/find/find_item.cpp
-    gm_commands/find/find_language.cpp
-    gm_commands/find/find_ldon_theme.cpp
-    gm_commands/find/find_npctype.cpp
-    gm_commands/find/find_object_type.cpp
-    gm_commands/find/find_race.cpp
-    gm_commands/find/find_recipe.cpp
-    gm_commands/find/find_skill.cpp
-    gm_commands/find/find_special_ability.cpp
-    gm_commands/find/find_spell.cpp
-    gm_commands/find/find_stance.cpp
-    gm_commands/find/find_task.cpp
-    gm_commands/find/find_zone.cpp
-    gm_commands/fish.cpp
-    gm_commands/fixmob.cpp
-    gm_commands/flagedit.cpp
-    gm_commands/fleeinfo.cpp
-    gm_commands/forage.cpp
-    gm_commands/gearup.cpp
-    gm_commands/giveitem.cpp
-    gm_commands/givemoney.cpp
-    gm_commands/gmzone.cpp
-    gm_commands/goto.cpp
-    gm_commands/grantaa.cpp
-    gm_commands/grid.cpp
-    gm_commands/guild.cpp
-    gm_commands/hp.cpp
-    gm_commands/illusion_block.cpp
-    gm_commands/instance.cpp
-    gm_commands/interrogateinv.cpp
-    gm_commands/interrupt.cpp
-    gm_commands/invsnapshot.cpp
-    gm_commands/ipban.cpp
-    gm_commands/kick.cpp
-    gm_commands/kill.cpp
-    gm_commands/killallnpcs.cpp
-    gm_commands/list.cpp
-    gm_commands/loc.cpp
-    gm_commands/logs.cpp
-    gm_commands/lootsim.cpp
-    gm_commands/makepet.cpp
-    gm_commands/memspell.cpp
-    gm_commands/merchantshop.cpp
-    gm_commands/modifynpcstat.cpp
-    gm_commands/movechar.cpp
-    gm_commands/movement.cpp
-    gm_commands/myskills.cpp
-    gm_commands/mysql.cpp
-    gm_commands/mystats.cpp
-    gm_commands/npccast.cpp
-    gm_commands/npcedit.cpp
-    gm_commands/npceditmass.cpp
-    gm_commands/npcemote.cpp
-    gm_commands/npcloot.cpp
-    gm_commands/npcsay.cpp
-    gm_commands/npcshout.cpp
-    gm_commands/npcspawn.cpp
-    gm_commands/npctypespawn.cpp
-    gm_commands/nudge.cpp
-    gm_commands/nukebuffs.cpp
-    gm_commands/nukeitem.cpp
-    gm_commands/object.cpp
-    gm_commands/object_manipulation.cpp
-    gm_commands/parcels.cpp
-    gm_commands/path.cpp
-    gm_commands/peqzone.cpp
-    gm_commands/petitems.cpp
-    gm_commands/petname.cpp
-    gm_commands/picklock.cpp
-    gm_commands/profanity.cpp
-    gm_commands/push.cpp
-    gm_commands/raidloot.cpp
-    gm_commands/randomfeatures.cpp
-    gm_commands/refreshgroup.cpp
-    gm_commands/reload.cpp
-    gm_commands/removeitem.cpp
-    gm_commands/repop.cpp
-    gm_commands/resetaa.cpp
-    gm_commands/resetaa_timer.cpp
-    gm_commands/resetdisc_timer.cpp
-    gm_commands/revoke.cpp
-    gm_commands/roambox.cpp
-    gm_commands/rules.cpp
-    gm_commands/save.cpp
-    gm_commands/scale.cpp
-    gm_commands/scribespell.cpp
-    gm_commands/scribespells.cpp
-    gm_commands/sendzonespawns.cpp
-    gm_commands/sensetrap.cpp
-    gm_commands/serverrules.cpp
-    gm_commands/set.cpp
-    gm_commands/set/set_aa_exp.cpp
-    gm_commands/set/set_aa_points.cpp
-    gm_commands/set/set_adventure_points.cpp
-    gm_commands/set/set_alternate_currency.cpp
-    gm_commands/set/set_animation.cpp
-    gm_commands/set/set_anon.cpp
-    gm_commands/set/set_auto_login.cpp
-    gm_commands/set/set_bind_point.cpp
-    gm_commands/set/set_checksum.cpp
-    gm_commands/set/set_class_permanent.cpp
-    gm_commands/set/set_crystals.cpp
-    gm_commands/set/set_date.cpp
-    gm_commands/set/set_endurance.cpp
-    gm_commands/set/set_endurance_full.cpp
-    gm_commands/set/set_exp.cpp
-    gm_commands/set/set_flymode.cpp
-    gm_commands/set/set_frozen.cpp
-    gm_commands/set/set_gender.cpp
-    gm_commands/set/set_gender_permanent.cpp
-    gm_commands/set/set_gm.cpp
-    gm_commands/set/set_gm_speed.cpp
-    gm_commands/set/set_gm_status.cpp
-    gm_commands/set/set_god_mode.cpp
-    gm_commands/set/set_haste.cpp
-    gm_commands/set/set_hero_model.cpp
-    gm_commands/set/set_hide_me.cpp
-    gm_commands/set/set_hp.cpp
-    gm_commands/set/set_hp_full.cpp
-    gm_commands/set/set_invulnerable.cpp
-    gm_commands/set/set_language.cpp
-    gm_commands/set/set_last_name.cpp
-    gm_commands/set/set_level.cpp
-    gm_commands/set/set_loginserver_info.cpp
-    gm_commands/set/set_mana.cpp
-    gm_commands/set/set_mana_full.cpp
-    gm_commands/set/set_motd.cpp
-    gm_commands/set/set_name.cpp
-    gm_commands/set/set_ooc_mute.cpp
-    gm_commands/set/set_password.cpp
-    gm_commands/set/set_pvp.cpp
-    gm_commands/set/set_pvp_points.cpp
-    gm_commands/set/set_race.cpp
-    gm_commands/set/set_race_permanent.cpp
-    gm_commands/set/set_server_locked.cpp
-    gm_commands/set/set_skill.cpp
-    gm_commands/set/set_skill_all.cpp
-    gm_commands/set/set_skill_all_max.cpp
-    gm_commands/set/set_start_zone.cpp
-    gm_commands/set/set_temporary_name.cpp
-    gm_commands/set/set_texture.cpp
-    gm_commands/set/set_time.cpp
-    gm_commands/set/set_time_zone.cpp
-    gm_commands/set/set_title.cpp
-    gm_commands/set/set_title_suffix.cpp
-    gm_commands/set/set_weather.cpp
-    gm_commands/set/set_zone.cpp
-    gm_commands/show.cpp
-    gm_commands/show/show_aa_points.cpp
-    gm_commands/show/show_aas.cpp
-    gm_commands/show/show_aggro.cpp
-    gm_commands/show/show_auto_login.cpp
-    gm_commands/show/show_buffs.cpp
-    gm_commands/show/show_buried_corpse_count.cpp
-    gm_commands/show/show_client_version_summary.cpp
-    gm_commands/show/show_content_flags.cpp
-    gm_commands/show/show_currencies.cpp
-    gm_commands/show/show_distance.cpp
-    gm_commands/show/show_emotes.cpp
-    gm_commands/show/show_field_of_view.cpp
-    gm_commands/show/show_flags.cpp
-    gm_commands/show/show_group_info.cpp
-    gm_commands/show/show_hatelist.cpp
-    gm_commands/show/show_inventory.cpp
-    gm_commands/show/show_ip_lookup.cpp
-    gm_commands/show/show_keyring.cpp
-    gm_commands/show/show_line_of_sight.cpp
-    gm_commands/show/show_network.cpp
-    gm_commands/show/show_network_stats.cpp
-    gm_commands/show/show_npc_global_loot.cpp
-    gm_commands/show/show_npc_stats.cpp
-    gm_commands/show/show_npc_type.cpp
-    gm_commands/show/show_peqzone_flags.cpp
-    gm_commands/show/show_petition.cpp
-    gm_commands/show/show_petition_info.cpp
-    gm_commands/show/show_proximity.cpp
-    gm_commands/show/show_quest_errors.cpp
-    gm_commands/show/show_quest_globals.cpp
-    gm_commands/show/show_recipe.cpp
-    gm_commands/show/show_server_info.cpp
-    gm_commands/show/show_skills.cpp
-    gm_commands/show/show_spawn_status.cpp
-    gm_commands/show/show_special_abilities.cpp
-    gm_commands/show/show_spells.cpp
-    gm_commands/show/show_spells_list.cpp
-    gm_commands/show/show_stats.cpp
-    gm_commands/show/show_timers.cpp
-    gm_commands/show/show_traps.cpp
-    gm_commands/show/show_uptime.cpp
-    gm_commands/show/show_variable.cpp
-    gm_commands/show/show_version.cpp
-    gm_commands/show/show_waypoints.cpp
-    gm_commands/show/show_who.cpp
-    gm_commands/show/show_xtargets.cpp
-    gm_commands/show/show_zone_data.cpp
-    gm_commands/show/show_zone_global_loot.cpp
-    gm_commands/show/show_zone_loot.cpp
-    gm_commands/show/show_zone_points.cpp
-    gm_commands/show/show_zone_status.cpp
-    gm_commands/show/show_zone_variables.cpp
-    gm_commands/shutdown.cpp
-    gm_commands/spawn.cpp
-    gm_commands/spawneditmass.cpp
-    gm_commands/spawnfix.cpp
-    gm_commands/stun.cpp
-    gm_commands/summon.cpp
-    gm_commands/summonburiedplayercorpse.cpp
-    gm_commands/summonitem.cpp
-    gm_commands/suspend.cpp
-    gm_commands/suspendmulti.cpp
-    gm_commands/takeplatinum.cpp
-    gm_commands/task.cpp
-    gm_commands/traindisc.cpp
-    gm_commands/tune.cpp
-    gm_commands/undye.cpp
-    gm_commands/unmemspell.cpp
-    gm_commands/unmemspells.cpp
-    gm_commands/unscribespell.cpp
-    gm_commands/unscribespells.cpp
-    gm_commands/untraindisc.cpp
-    gm_commands/untraindiscs.cpp
-    gm_commands/wc.cpp
-    gm_commands/worldshutdown.cpp
-    gm_commands/worldwide.cpp
-    gm_commands/wp.cpp
-    gm_commands/wpadd.cpp
-    gm_commands/zone.cpp
-    gm_commands/zone_instance.cpp
-    gm_commands/zone_shard.cpp
-    gm_commands/zonebootup.cpp
-    gm_commands/zoneshutdown.cpp
-    gm_commands/zonevariable.cpp
-    gm_commands/zsave.cpp
+	bot_command.cpp
+	bot_commands/bot_actionable.cpp
+	bot_commands/bot_appearance.cpp
+	bot_commands/bot_apply_poison.cpp
+	bot_commands/bot_apply_potion.cpp
+	bot_commands/bot_attack.cpp
+	bot_commands/bot_behind_mob.cpp
+	bot_commands/bot_blocked_buffs.cpp
+	bot_commands/bot_bot.cpp
+	bot_commands/bot_bot_settings.cpp
+	bot_commands/bot_cast.cpp
+	bot_commands/bot_class_race_list.cpp
+	bot_commands/bot_click_item.cpp
+	bot_commands/bot_copy_settings.cpp
+	bot_commands/bot_default_settings.cpp
+	bot_commands/bot_depart.cpp
+	bot_commands/bot_discipline.cpp
+	bot_commands/bot_distance_ranged.cpp
+	bot_commands/bot_find_aliases.cpp
+	bot_commands/bot_follow.cpp
+	bot_commands/bot_guard.cpp
+	bot_commands/bot_heal_rotation.cpp
+	bot_commands/bot_help.cpp
+	bot_commands/bot_hold.cpp
+	bot_commands/bot_illusion_block.cpp
+	bot_commands/bot_inventory.cpp
+	bot_commands/bot_item_use.cpp
+	bot_commands/bot_max_melee_range.cpp
+	bot_commands/bot_name.cpp
+	bot_commands/bot_owner_option.cpp
+	bot_commands/bot_pet.cpp
+	bot_commands/bot_pick_lock.cpp
+	bot_commands/bot_pickpocket.cpp
+	bot_commands/bot_precombat.cpp
+	bot_commands/bot_pull.cpp
+	bot_commands/bot_release.cpp
+	bot_commands/bot_set_assistee.cpp
+	bot_commands/bot_sit_hp_percent.cpp
+	bot_commands/bot_sit_in_combat.cpp
+	bot_commands/bot_sit_mana_percent.cpp
+	bot_commands/bot_spell.cpp
+	bot_commands/bot_spell_aggro_checks.cpp
+	bot_commands/bot_spell_announce_cast.cpp
+	bot_commands/bot_spell_delays.cpp
+	bot_commands/bot_spell_engaged_priority.cpp
+	bot_commands/bot_spell_holds.cpp
+	bot_commands/bot_spell_idle_priority.cpp
+	bot_commands/bot_spell_max_hp_pct.cpp
+	bot_commands/bot_spell_max_mana_pct.cpp
+	bot_commands/bot_spell_max_thresholds.cpp
+	bot_commands/bot_spell_min_hp_pct.cpp
+	bot_commands/bot_spell_min_mana_pct.cpp
+	bot_commands/bot_spell_min_thresholds.cpp
+	bot_commands/bot_spell_pursue_priority.cpp
+	bot_commands/bot_spell_resist_limits.cpp
+	bot_commands/bot_spell_target_count.cpp
+	bot_commands/bot_spelltypes.cpp
+	bot_commands/bot_suspend.cpp
+	bot_commands/bot_taunt.cpp
+	bot_commands/bot_timer.cpp
+	bot_commands/bot_track.cpp
+	bot_commands/bot_view_combos.cpp
+	command.cpp
+	gm_commands/acceptrules.cpp
+	gm_commands/advnpcspawn.cpp
+	gm_commands/aggrozone.cpp
+	gm_commands/ai.cpp
+	gm_commands/appearance.cpp
+	gm_commands/appearanceeffects.cpp
+	gm_commands/attack.cpp
+	gm_commands/augmentitem.cpp
+	gm_commands/ban.cpp
+	gm_commands/bugs.cpp
+	gm_commands/camerashake.cpp
+	gm_commands/castspell.cpp
+	gm_commands/chat.cpp
+	gm_commands/clearxtargets.cpp
+	gm_commands/copycharacter.cpp
+	gm_commands/corpse.cpp
+	gm_commands/corpsefix.cpp
+	gm_commands/countitem.cpp
+	gm_commands/damage.cpp
+	gm_commands/databuckets.cpp
+	gm_commands/dbspawn2.cpp
+	gm_commands/delacct.cpp
+	gm_commands/delpetition.cpp
+	gm_commands/depop.cpp
+	gm_commands/depopzone.cpp
+	gm_commands/devtools.cpp
+	gm_commands/disablerecipe.cpp
+	gm_commands/disarmtrap.cpp
+	gm_commands/doanim.cpp
+	gm_commands/door.cpp
+	gm_commands/door_manipulation.cpp
+	gm_commands/dye.cpp
+	gm_commands/dz.cpp
+	gm_commands/dzkickplayers.cpp
+	gm_commands/editmassrespawn.cpp
+	gm_commands/emote.cpp
+	gm_commands/emptyinventory.cpp
+	gm_commands/enablerecipe.cpp
+	gm_commands/entityvariable.cpp
+	gm_commands/evolving_items.cpp
+	gm_commands/exptoggle.cpp
+	gm_commands/faction.cpp
+	gm_commands/faction_association.cpp
+	gm_commands/feature.cpp
+	gm_commands/find.cpp
+	gm_commands/find/find_aa.cpp
+	gm_commands/find/find_account.cpp
+	gm_commands/find/find_body_type.cpp
+	gm_commands/find/find_bot.cpp
+	gm_commands/find/find_bug_category.cpp
+	gm_commands/find/find_character.cpp
+	gm_commands/find/find_class.cpp
+	gm_commands/find/find_comparison_type.cpp
+	gm_commands/find/find_currency.cpp
+	gm_commands/find/find_deity.cpp
+	gm_commands/find/find_emote.cpp
+	gm_commands/find/find_faction.cpp
+	gm_commands/find/find_item.cpp
+	gm_commands/find/find_language.cpp
+	gm_commands/find/find_ldon_theme.cpp
+	gm_commands/find/find_npctype.cpp
+	gm_commands/find/find_object_type.cpp
+	gm_commands/find/find_race.cpp
+	gm_commands/find/find_recipe.cpp
+	gm_commands/find/find_skill.cpp
+	gm_commands/find/find_special_ability.cpp
+	gm_commands/find/find_spell.cpp
+	gm_commands/find/find_stance.cpp
+	gm_commands/find/find_task.cpp
+	gm_commands/find/find_zone.cpp
+	gm_commands/fish.cpp
+	gm_commands/fixmob.cpp
+	gm_commands/flagedit.cpp
+	gm_commands/fleeinfo.cpp
+	gm_commands/forage.cpp
+	gm_commands/gearup.cpp
+	gm_commands/giveitem.cpp
+	gm_commands/givemoney.cpp
+	gm_commands/gmzone.cpp
+	gm_commands/goto.cpp
+	gm_commands/grantaa.cpp
+	gm_commands/grid.cpp
+	gm_commands/guild.cpp
+	gm_commands/hp.cpp
+	gm_commands/illusion_block.cpp
+	gm_commands/instance.cpp
+	gm_commands/interrogateinv.cpp
+	gm_commands/interrupt.cpp
+	gm_commands/invsnapshot.cpp
+	gm_commands/ipban.cpp
+	gm_commands/kick.cpp
+	gm_commands/kill.cpp
+	gm_commands/killallnpcs.cpp
+	gm_commands/list.cpp
+	gm_commands/loc.cpp
+	gm_commands/logs.cpp
+	gm_commands/lootsim.cpp
+	gm_commands/makepet.cpp
+	gm_commands/memspell.cpp
+	gm_commands/merchantshop.cpp
+	gm_commands/modifynpcstat.cpp
+	gm_commands/movechar.cpp
+	gm_commands/movement.cpp
+	gm_commands/myskills.cpp
+	gm_commands/mysql.cpp
+	gm_commands/mystats.cpp
+	gm_commands/npccast.cpp
+	gm_commands/npcedit.cpp
+	gm_commands/npceditmass.cpp
+	gm_commands/npcemote.cpp
+	gm_commands/npcloot.cpp
+	gm_commands/npcsay.cpp
+	gm_commands/npcshout.cpp
+	gm_commands/npcspawn.cpp
+	gm_commands/npctypespawn.cpp
+	gm_commands/nudge.cpp
+	gm_commands/nukebuffs.cpp
+	gm_commands/nukeitem.cpp
+	gm_commands/object.cpp
+	gm_commands/object_manipulation.cpp
+	gm_commands/parcels.cpp
+	gm_commands/path.cpp
+	gm_commands/peqzone.cpp
+	gm_commands/petitems.cpp
+	gm_commands/petname.cpp
+	gm_commands/picklock.cpp
+	gm_commands/profanity.cpp
+	gm_commands/push.cpp
+	gm_commands/raidloot.cpp
+	gm_commands/randomfeatures.cpp
+	gm_commands/refreshgroup.cpp
+	gm_commands/reload.cpp
+	gm_commands/removeitem.cpp
+	gm_commands/repop.cpp
+	gm_commands/resetaa.cpp
+	gm_commands/resetaa_timer.cpp
+	gm_commands/resetdisc_timer.cpp
+	gm_commands/revoke.cpp
+	gm_commands/roambox.cpp
+	gm_commands/rules.cpp
+	gm_commands/save.cpp
+	gm_commands/scale.cpp
+	gm_commands/scribespell.cpp
+	gm_commands/scribespells.cpp
+	gm_commands/sendzonespawns.cpp
+	gm_commands/sensetrap.cpp
+	gm_commands/serverrules.cpp
+	gm_commands/set.cpp
+	gm_commands/set/set_aa_exp.cpp
+	gm_commands/set/set_aa_points.cpp
+	gm_commands/set/set_adventure_points.cpp
+	gm_commands/set/set_alternate_currency.cpp
+	gm_commands/set/set_animation.cpp
+	gm_commands/set/set_anon.cpp
+	gm_commands/set/set_auto_login.cpp
+	gm_commands/set/set_bind_point.cpp
+	gm_commands/set/set_checksum.cpp
+	gm_commands/set/set_class_permanent.cpp
+	gm_commands/set/set_crystals.cpp
+	gm_commands/set/set_date.cpp
+	gm_commands/set/set_endurance.cpp
+	gm_commands/set/set_endurance_full.cpp
+	gm_commands/set/set_exp.cpp
+	gm_commands/set/set_flymode.cpp
+	gm_commands/set/set_frozen.cpp
+	gm_commands/set/set_gender.cpp
+	gm_commands/set/set_gender_permanent.cpp
+	gm_commands/set/set_gm.cpp
+	gm_commands/set/set_gm_speed.cpp
+	gm_commands/set/set_gm_status.cpp
+	gm_commands/set/set_god_mode.cpp
+	gm_commands/set/set_haste.cpp
+	gm_commands/set/set_hero_model.cpp
+	gm_commands/set/set_hide_me.cpp
+	gm_commands/set/set_hp.cpp
+	gm_commands/set/set_hp_full.cpp
+	gm_commands/set/set_invulnerable.cpp
+	gm_commands/set/set_language.cpp
+	gm_commands/set/set_last_name.cpp
+	gm_commands/set/set_level.cpp
+	gm_commands/set/set_loginserver_info.cpp
+	gm_commands/set/set_mana.cpp
+	gm_commands/set/set_mana_full.cpp
+	gm_commands/set/set_motd.cpp
+	gm_commands/set/set_name.cpp
+	gm_commands/set/set_ooc_mute.cpp
+	gm_commands/set/set_password.cpp
+	gm_commands/set/set_pvp.cpp
+	gm_commands/set/set_pvp_points.cpp
+	gm_commands/set/set_race.cpp
+	gm_commands/set/set_race_permanent.cpp
+	gm_commands/set/set_server_locked.cpp
+	gm_commands/set/set_skill.cpp
+	gm_commands/set/set_skill_all.cpp
+	gm_commands/set/set_skill_all_max.cpp
+	gm_commands/set/set_start_zone.cpp
+	gm_commands/set/set_temporary_name.cpp
+	gm_commands/set/set_texture.cpp
+	gm_commands/set/set_time.cpp
+	gm_commands/set/set_time_zone.cpp
+	gm_commands/set/set_title.cpp
+	gm_commands/set/set_title_suffix.cpp
+	gm_commands/set/set_weather.cpp
+	gm_commands/set/set_zone.cpp
+	gm_commands/show.cpp
+	gm_commands/show/show_aa_points.cpp
+	gm_commands/show/show_aas.cpp
+	gm_commands/show/show_aggro.cpp
+	gm_commands/show/show_auto_login.cpp
+	gm_commands/show/show_buffs.cpp
+	gm_commands/show/show_buried_corpse_count.cpp
+	gm_commands/show/show_client_version_summary.cpp
+	gm_commands/show/show_content_flags.cpp
+	gm_commands/show/show_currencies.cpp
+	gm_commands/show/show_distance.cpp
+	gm_commands/show/show_emotes.cpp
+	gm_commands/show/show_field_of_view.cpp
+	gm_commands/show/show_flags.cpp
+	gm_commands/show/show_group_info.cpp
+	gm_commands/show/show_hatelist.cpp
+	gm_commands/show/show_inventory.cpp
+	gm_commands/show/show_ip_lookup.cpp
+	gm_commands/show/show_keyring.cpp
+	gm_commands/show/show_line_of_sight.cpp
+	gm_commands/show/show_network.cpp
+	gm_commands/show/show_network_stats.cpp
+	gm_commands/show/show_npc_global_loot.cpp
+	gm_commands/show/show_npc_stats.cpp
+	gm_commands/show/show_npc_type.cpp
+	gm_commands/show/show_peqzone_flags.cpp
+	gm_commands/show/show_petition.cpp
+	gm_commands/show/show_petition_info.cpp
+	gm_commands/show/show_proximity.cpp
+	gm_commands/show/show_quest_errors.cpp
+	gm_commands/show/show_quest_globals.cpp
+	gm_commands/show/show_recipe.cpp
+	gm_commands/show/show_server_info.cpp
+	gm_commands/show/show_skills.cpp
+	gm_commands/show/show_spawn_status.cpp
+	gm_commands/show/show_special_abilities.cpp
+	gm_commands/show/show_spells.cpp
+	gm_commands/show/show_spells_list.cpp
+	gm_commands/show/show_stats.cpp
+	gm_commands/show/show_timers.cpp
+	gm_commands/show/show_traps.cpp
+	gm_commands/show/show_uptime.cpp
+	gm_commands/show/show_variable.cpp
+	gm_commands/show/show_version.cpp
+	gm_commands/show/show_waypoints.cpp
+	gm_commands/show/show_who.cpp
+	gm_commands/show/show_xtargets.cpp
+	gm_commands/show/show_zone_data.cpp
+	gm_commands/show/show_zone_global_loot.cpp
+	gm_commands/show/show_zone_loot.cpp
+	gm_commands/show/show_zone_points.cpp
+	gm_commands/show/show_zone_status.cpp
+	gm_commands/show/show_zone_variables.cpp
+	gm_commands/shutdown.cpp
+	gm_commands/spawn.cpp
+	gm_commands/spawneditmass.cpp
+	gm_commands/spawnfix.cpp
+	gm_commands/stun.cpp
+	gm_commands/summon.cpp
+	gm_commands/summonburiedplayercorpse.cpp
+	gm_commands/summonitem.cpp
+	gm_commands/suspend.cpp
+	gm_commands/suspendmulti.cpp
+	gm_commands/takeplatinum.cpp
+	gm_commands/task.cpp
+	gm_commands/traindisc.cpp
+	gm_commands/tune.cpp
+	gm_commands/undye.cpp
+	gm_commands/unmemspell.cpp
+	gm_commands/unmemspells.cpp
+	gm_commands/unscribespell.cpp
+	gm_commands/unscribespells.cpp
+	gm_commands/untraindisc.cpp
+	gm_commands/untraindiscs.cpp
+	gm_commands/wc.cpp
+	gm_commands/worldshutdown.cpp
+	gm_commands/worldwide.cpp
+	gm_commands/wp.cpp
+	gm_commands/wpadd.cpp
+	gm_commands/zone.cpp
+	gm_commands/zone_instance.cpp
+	gm_commands/zone_shard.cpp
+	gm_commands/zonebootup.cpp
+	gm_commands/zoneshutdown.cpp
+	gm_commands/zonevariable.cpp
+	gm_commands/zsave.cpp
 )
 
 source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" PREFIX "Source Files" FILES ${zone_sources})
@@ -668,7 +664,6 @@ source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" PREFIX "Source Files" FILES ${gm
 
 add_library(gm_commands_zone STATIC ${gm_command_sources})
 target_link_libraries(gm_commands_zone PRIVATE common)
-target_include_directories(gm_commands_zone PRIVATE ..)
 
 set_target_properties(gm_commands_zone PROPERTIES UNITY_BUILD ON UNITY_BUILD_BATCH_SIZE 32)
 set_property(TARGET gm_commands_zone PROPERTY FOLDER libraries)
@@ -680,38 +675,37 @@ target_include_directories(zone PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 install(TARGETS zone RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
 if(EQEMU_BUILD_PCH)
-    TARGET_PRECOMPILE_HEADERS(zone PRIVATE ../common/pch/app-pch.h)
-    TARGET_PRECOMPILE_HEADERS(zone PRIVATE ../common/pch/std-pch.h)
-    TARGET_PRECOMPILE_HEADERS(zone PRIVATE ./pch/pch.h)
+	TARGET_PRECOMPILE_HEADERS(zone PRIVATE ../common/pch/app-pch.h)
+	TARGET_PRECOMPILE_HEADERS(zone PRIVATE ../common/pch/std-pch.h)
+	TARGET_PRECOMPILE_HEADERS(zone PRIVATE ./pch/pch.h)
 endif()
 
 add_definitions(-DZONE)
 
 if(EQEMU_BUILD_LUA)
-    target_compile_definitions(lua_zone PUBLIC LUA_EQEMU)
-    target_link_libraries(lua_zone PUBLIC luabind Boost::dynamic_bitset Boost::tuple Boost::foreach common)
-    if (EQEMU_BUILD_STATIC AND LUA_LIBRARY)
-        target_link_libraries(zone PRIVATE ${LUA_LIBRARY})
-    endif()
+	target_compile_definitions(lua_zone PUBLIC LUA_EQEMU)
+	target_link_libraries(lua_zone PUBLIC luabind Boost::dynamic_bitset Boost::tuple Boost::foreach common)
+	if (EQEMU_BUILD_STATIC AND LUA_LIBRARY)
+		target_link_libraries(zone PRIVATE ${LUA_LIBRARY})
+	endif()
 endif()
 
 if(EQEMU_BUILD_PERL)
-    target_compile_definitions(perl_zone PUBLIC EMBPERL EMBPERL_PLUGIN PERLBIND_NO_STRICT_SCALAR_TYPES)
-    target_link_libraries(perl_zone PUBLIC perlbind common ${PERL_LIBRARY})
-    if (EQEMU_BUILD_STATIC AND PERL_LIBRARY)
-        target_link_libraries(zone PRIVATE ${PERL_LIBRARY})
-    endif()
+	target_compile_definitions(perl_zone PUBLIC EMBPERL EMBPERL_PLUGIN PERLBIND_NO_STRICT_SCALAR_TYPES)
+	target_link_libraries(perl_zone PUBLIC perlbind common ${PERL_LIBRARY})
+	if (EQEMU_BUILD_STATIC AND PERL_LIBRARY)
+		target_link_libraries(zone PRIVATE ${PERL_LIBRARY})
+	endif()
 endif()
 
 target_link_libraries(zone PRIVATE gm_commands_zone common RecastNavigation::Detour)
-target_include_directories(zone PRIVATE ..)
 
 if(EQEMU_BUILD_LUA)
-    target_link_libraries(zone PRIVATE lua_zone)
+	target_link_libraries(zone PRIVATE lua_zone)
 endif()
 
 if(EQEMU_BUILD_PERL)
-    target_link_libraries(zone PRIVATE perl_zone)
+	target_link_libraries(zone PRIVATE perl_zone)
 endif()
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)