diff --git a/CMakeLists.txt b/CMakeLists.txt
index aac2c545..91494228 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,9 @@ if(ENABLE_SANITIZERS)
     add_link_options(-fsanitize=address,undefined)
 endif()
 
+# disable <regex> in cxxopts to silence compile warnings
+add_compile_options(-DCXXOPTS_NO_REGEX)
+
 # Enable testing support
 enable_testing()
 
@@ -163,6 +166,11 @@ configure_file(
 # =============================================================================
 # Generate database headers / implementations
 # =============================================================================
+if(NOT DEFINED MUDITOR_DIR)
+    set(MUDITOR_DIR ${CMAKE_CURRENT_LIST_DIR}/../muditor)
+endif()
+
+
 find_package(Python3 REQUIRED COMPONENTS Interpreter)
 execute_process(
     COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/scripts/generate_db_headers.py --list
@@ -180,7 +188,7 @@ list(FILTER DB_HEADERS INCLUDE REGEX "hpp$")
 add_custom_command(
     OUTPUT ${DB_SOURCES} ${DB_HEADERS}
     COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/scripts/generate_db_headers.py
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../muditor/packages/db/prisma/schema.prisma
+    DEPENDS ${MUDITOR_DIR}/packages/db/prisma/schema.prisma
             ${CMAKE_CURRENT_SOURCE_DIR}/scripts/generate_db_headers.py
 )
 
diff --git a/scripts/generate_db_headers.py b/scripts/generate_db_headers.py
index 32843eb9..97d2178c 100755
--- a/scripts/generate_db_headers.py
+++ b/scripts/generate_db_headers.py
@@ -304,7 +304,6 @@ def generate_enums(self, group_name: str, basename: str) -> tuple[str, str]:
             '',
             '#include <string_view>',
             '#include <optional>',
-            '#include <unordered_map>',
             '',
             'namespace db {',
             '',
@@ -325,6 +324,7 @@ def generate_enums(self, group_name: str, basename: str) -> tuple[str, str]:
             ' */',
             '',
             f'#include "database/generated/{basename}.hpp"',
+            '#include <unordered_map>',
             '',
             'namespace db {',
             '',
diff --git a/src/scripting/script_timer_manager.hpp b/src/scripting/script_timer_manager.hpp
index 76a42b81..2cfdd78f 100644
--- a/src/scripting/script_timer_manager.hpp
+++ b/src/scripting/script_timer_manager.hpp
@@ -8,7 +8,8 @@
 #include <string>
 
 #define SOL_ALL_SAFETIES_ON 1
-#include <sol/sol.hpp>
+#include <sol/forward.hpp>
+#include <sol/function.hpp>
 
 namespace FieryMUD {
 
diff --git a/tests/common/lightweight_test_harness.hpp b/tests/common/lightweight_test_harness.hpp
index 67778590..55fa9f37 100644
--- a/tests/common/lightweight_test_harness.hpp
+++ b/tests/common/lightweight_test_harness.hpp
@@ -3,10 +3,15 @@
 #include <chrono>
 #include <iostream>
 #include <memory>
-#include <regex>
 #include <string>
 #include <vector>
 
+// Silence spurious warnings in <regex> header
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#include <regex>
+#pragma GCC diagnostic pop
+
 #include <catch2/catch_test_macros.hpp>
 #include <fmt/format.h>
 #include <magic_enum/magic_enum.hpp>