diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9486ef58..6fbe4a00 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,6 +76,7 @@ endif()
 
 # Our output dir
 set(CMAKE_BINARY_DIR ${PROJECT_BINARY_DIR})
+#set(CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON) # unfortunately, serializes everything
 
 # TODO make this not have to override the build type directories
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_BINARY_DIR})
@@ -201,6 +202,14 @@ foreach(file ${SQL_FILES})
 	configure_file(${CMAKE_SOURCE_DIR}/migrations/cdserver/${file} ${PROJECT_BINARY_DIR}/migrations/cdserver/${file})
 endforeach()
 
+# Add system specfic includes for Apple, Windows and Other Unix OS' (including Linux)
+if (APPLE)
+	include_directories("/usr/local/include/")
+endif()
+
+# Load all of our third party directories
+add_subdirectory(thirdparty)
+
 # Create our list of include directories
 set(INCLUDED_DIRECTORIES
 	"dCommon"
@@ -214,14 +223,6 @@ set(INCLUDED_DIRECTORIES
 	"dNavigation"
 	"dNavigation/dTerrain"
 
-	"dDatabase"
-	"dDatabase/CDClientDatabase"
-	"dDatabase/CDClientDatabase/CDClientTables"
-	"dDatabase/GameDatabase"
-	"dDatabase/GameDatabase/ITables"
-	"dDatabase/GameDatabase/MySQL"
-	"dDatabase/GameDatabase/MySQL/Tables"
-
 	"dNet"
 
 	"thirdparty/magic_enum/include/magic_enum"
@@ -257,19 +258,6 @@ include_directories("${PROJECT_SOURCE_DIR}/thirdparty/libbcrypt/include")
 # Add linking directories:
 link_directories(${PROJECT_BINARY_DIR})
 
-# Load all of our third party directories
-add_subdirectory(thirdparty)
-
-# Glob together all headers that need to be precompiled
-file(
-	GLOB HEADERS_DDATABASE
-	LIST_DIRECTORIES false
-	${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase/*.h
-	${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase/CDClientTables/*.h
-	${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase/ITables/*.h
-	${PROJECT_SOURCE_DIR}/thirdparty/SQLite/*.h
-)
-
 file(
 	GLOB HEADERS_DZONEMANAGER
 	LIST_DIRECTORIES false
@@ -325,12 +313,6 @@ target_precompile_headers(
 	${HEADERS_DZONEMANAGER}
 )
 
-# Need to specify to use the CXX compiler language here or else we get errors including <string>.
-target_precompile_headers(
-	dDatabase PRIVATE
-	"$<$<COMPILE_LANGUAGE:CXX>:${HEADERS_DDATABASE}>"
-)
-
 target_precompile_headers(
 	dCommon PRIVATE
 	${HEADERS_DCOMMON}
diff --git a/dCommon/CMakeLists.txt b/dCommon/CMakeLists.txt
index 5300a4f2..419462de 100644
--- a/dCommon/CMakeLists.txt
+++ b/dCommon/CMakeLists.txt
@@ -26,11 +26,15 @@ foreach(file ${DCOMMON_DCLIENT_SOURCES})
 	set(DCOMMON_SOURCES ${DCOMMON_SOURCES} "dClient/${file}")
 endforeach()
 
-include_directories(${PROJECT_SOURCE_DIR}/dCommon/)
-
 add_library(dCommon STATIC ${DCOMMON_SOURCES})
-
-target_link_libraries(dCommon bcrypt dDatabase tinyxml2)
+target_include_directories(dCommon
+	PUBLIC "." "dClient" "dEnums"
+	PRIVATE
+	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase"
+	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase/ITables"
+	"${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase"
+	"${PROJECT_SOURCE_DIR}/thirdparty/mariadb-connector-cpp/include"
+)
 
 if (UNIX)
 	find_package(ZLIB REQUIRED)
@@ -61,4 +65,6 @@ else ()
 	)
 endif ()
 
-target_link_libraries(dCommon ZLIB::ZLIB)
+target_link_libraries(dCommon
+	PRIVATE ZLIB::ZLIB bcrypt tinyxml2
+	INTERFACE dDatabase)
diff --git a/dDatabase/CDClientDatabase/CMakeLists.txt b/dDatabase/CDClientDatabase/CMakeLists.txt
index 2645c215..f83bd6a4 100644
--- a/dDatabase/CDClientDatabase/CMakeLists.txt
+++ b/dDatabase/CDClientDatabase/CMakeLists.txt
@@ -9,4 +9,24 @@ foreach(file ${DDATABASE_CDCLIENTDATABASE_CDCLIENTTABLES_SOURCES})
 	set(DDATABASE_CDCLIENTDATABASE_SOURCES ${DDATABASE_CDCLIENTDATABASE_SOURCES} "CDClientTables/${file}")
 endforeach()
 
-set(DDATABASE_CDCLIENTDATABASE_SOURCES ${DDATABASE_CDCLIENTDATABASE_SOURCES} PARENT_SCOPE)
+add_library(dDatabaseCDClient STATIC ${DDATABASE_CDCLIENTDATABASE_SOURCES})
+target_include_directories(dDatabaseCDClient PUBLIC "." "CDClientTables")
+target_link_libraries(dDatabaseCDClient PRIVATE sqlite3)
+
+if (${CDCLIENT_CACHE_ALL})
+	add_compile_definitions(dDatabaseCDClient PRIVATE CDCLIENT_CACHE_ALL=${CDCLIENT_CACHE_ALL})
+endif()
+
+file(
+	GLOB HEADERS_DDATABASE_CDCLIENT
+	LIST_DIRECTORIES false
+	${PROJECT_SOURCE_DIR}/thirdparty/SQLite/*.h
+	CDClientTables/*.h
+	*.h
+)
+
+# Need to specify to use the CXX compiler language here or else we get errors including <string>.
+target_precompile_headers(
+	dDatabaseCDClient PRIVATE
+	"$<$<COMPILE_LANGUAGE:CXX>:${HEADERS_DDATABASE_CDCLIENT}>"
+)
diff --git a/dDatabase/CMakeLists.txt b/dDatabase/CMakeLists.txt
index f0fe54b4..004bdc14 100644
--- a/dDatabase/CMakeLists.txt
+++ b/dDatabase/CMakeLists.txt
@@ -1,20 +1,7 @@
-set(DDATABASE_SOURCES)
-
 add_subdirectory(CDClientDatabase)
-
-foreach(file ${DDATABASE_CDCLIENTDATABASE_SOURCES})
-	set(DDATABASE_SOURCES ${DDATABASE_SOURCES} "CDClientDatabase/${file}")
-endforeach()
-
 add_subdirectory(GameDatabase)
 
-foreach(file ${DDATABASE_GAMEDATABASE_SOURCES})
-	set(DDATABASE_SOURCES ${DDATABASE_SOURCES} "GameDatabase/${file}")
-endforeach()
-
-add_library(dDatabase STATIC ${DDATABASE_SOURCES})
-target_link_libraries(dDatabase sqlite3 mariadbConnCpp)
-
-if (${CDCLIENT_CACHE_ALL})
-	add_compile_definitions(dDatabase CDCLIENT_CACHE_ALL=${CDCLIENT_CACHE_ALL})
-endif()
+add_library(dDatabase STATIC "MigrationRunner.cpp")
+target_include_directories(dDatabase PUBLIC ".")
+target_link_libraries(dDatabase
+	PUBLIC dDatabaseCDClient dDatabaseGame)
diff --git a/dDatabase/GameDatabase/CMakeLists.txt b/dDatabase/GameDatabase/CMakeLists.txt
index c32007bb..c9897e2e 100644
--- a/dDatabase/GameDatabase/CMakeLists.txt
+++ b/dDatabase/GameDatabase/CMakeLists.txt
@@ -1,6 +1,5 @@
 set(DDATABASE_GAMEDATABASE_SOURCES
 	"Database.cpp"
-	"MigrationRunner.cpp"
 )
 
 add_subdirectory(MySQL)
@@ -9,4 +8,21 @@ foreach(file ${DDATABSE_DATABSES_MYSQL_SOURCES})
 	set(DDATABASE_GAMEDATABASE_SOURCES ${DDATABASE_GAMEDATABASE_SOURCES} "MySQL/${file}")
 endforeach()
 
-set(DDATABASE_GAMEDATABASE_SOURCES ${DDATABASE_GAMEDATABASE_SOURCES} PARENT_SCOPE)
+add_library(dDatabaseGame STATIC ${DDATABASE_GAMEDATABASE_SOURCES})
+target_include_directories(dDatabaseGame PUBLIC "." "ITables" PRIVATE "MySQL")
+target_link_libraries(dDatabaseGame
+	PUBLIC mariadbConnCpp
+	INTERFACE dCommon)
+
+# Glob together all headers that need to be precompiled
+file(
+	GLOB HEADERS_DDATABASE_GAME
+	LIST_DIRECTORIES false
+	ITables/*.h
+)
+
+# Need to specify to use the CXX compiler language here or else we get errors including <string>.
+target_precompile_headers(
+	dDatabaseGame PRIVATE
+	"$<$<COMPILE_LANGUAGE:CXX>:${HEADERS_DDATABASE_GAME}>"
+)
diff --git a/dDatabase/GameDatabase/ITables/IAccounts.h b/dDatabase/GameDatabase/ITables/IAccounts.h
index 1b1f85a7..3f27dda6 100644
--- a/dDatabase/GameDatabase/ITables/IAccounts.h
+++ b/dDatabase/GameDatabase/ITables/IAccounts.h
@@ -3,6 +3,7 @@
 
 #include <cstdint>
 #include <optional>
+#include <string>
 #include <string_view>
 
 enum class eGameMasterLevel : uint8_t;
diff --git a/dDatabase/GameDatabase/MigrationRunner.cpp b/dDatabase/MigrationRunner.cpp
similarity index 100%
rename from dDatabase/GameDatabase/MigrationRunner.cpp
rename to dDatabase/MigrationRunner.cpp
diff --git a/dDatabase/GameDatabase/MigrationRunner.h b/dDatabase/MigrationRunner.h
similarity index 100%
rename from dDatabase/GameDatabase/MigrationRunner.h
rename to dDatabase/MigrationRunner.h
diff --git a/dGame/dBehaviors/CMakeLists.txt b/dGame/dBehaviors/CMakeLists.txt
index 6b667356..92afb7b0 100644
--- a/dGame/dBehaviors/CMakeLists.txt
+++ b/dGame/dBehaviors/CMakeLists.txt
@@ -57,7 +57,7 @@ set(DGAME_DBEHAVIORS_SOURCES "AirMovementBehavior.cpp"
 	"VerifyBehavior.cpp")
 
 add_library(dBehaviors STATIC ${DGAME_DBEHAVIORS_SOURCES})
-target_link_libraries(dBehaviors PUBLIC dPhysics)
+target_link_libraries(dBehaviors PUBLIC dDatabaseCDClient dPhysics)
 target_include_directories(dBehaviors PUBLIC "."
 	"${PROJECT_SOURCE_DIR}/dGame/dGameMessages" # via BehaviorContext.h
 	PRIVATE
diff --git a/dGame/dInventory/CMakeLists.txt b/dGame/dInventory/CMakeLists.txt
index 52d012bb..c4bcc11e 100644
--- a/dGame/dInventory/CMakeLists.txt
+++ b/dGame/dInventory/CMakeLists.txt
@@ -16,5 +16,5 @@ target_include_directories(dInventory PUBLIC "."
 	"${PROJECT_SOURCE_DIR}/dGame/dMission" # via MissionComponent.h
 	"${PROJECT_SOURCE_DIR}/dZoneManager" # via Item.cpp
 )
-target_link_libraries(dInventory INTERFACE dNet)
+target_link_libraries(dInventory PRIVATE dDatabaseCDClient INTERFACE dNet)
 target_precompile_headers(dInventory REUSE_FROM dGameBase)
diff --git a/dGame/dPropertyBehaviors/CMakeLists.txt b/dGame/dPropertyBehaviors/CMakeLists.txt
index 618e57fc..42fe7449 100644
--- a/dGame/dPropertyBehaviors/CMakeLists.txt
+++ b/dGame/dPropertyBehaviors/CMakeLists.txt
@@ -13,6 +13,7 @@ foreach(file ${DGAME_DPROPERTYBEHAVIORS_CONTROLBEHAVIORMESSAGES})
 endforeach()
 
 add_library(dPropertyBehaviors STATIC ${DGAME_DPROPERTYBEHAVIORS_SOURCES})
+target_link_libraries(dPropertyBehaviors PRIVATE dDatabaseCDClient)
 target_include_directories(dPropertyBehaviors PUBLIC "." "ControlBehaviorMessages"
 	PRIVATE
 	"${PROJECT_SOURCE_DIR}/dGame/dGameMessages" # GameMessages.h
diff --git a/dZoneManager/CMakeLists.txt b/dZoneManager/CMakeLists.txt
index ef6c8092..0b2f5252 100644
--- a/dZoneManager/CMakeLists.txt
+++ b/dZoneManager/CMakeLists.txt
@@ -5,6 +5,7 @@ set(DZONEMANAGER_SOURCES "dZoneManager.cpp"
 
 add_library(dZoneManager STATIC ${DZONEMANAGER_SOURCES})
 target_link_libraries(dZoneManager
+	PRIVATE dDatabaseCDClient
 	PUBLIC dPhysics
 	INTERFACE dWorldServer)
 target_include_directories(dZoneManager PUBLIC "."
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index 11d278c0..12667df8 100644
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -19,7 +19,7 @@ add_library(bcrypt ${SOURCES_LIBBCRYPT})
 # Because we are not using the libbcrypt CMakeLists.txt, we need to include these headers for the library to use.
 # fortunately they are only needed for building the libbcrypt directory and nothing else, so these are marked private.
 
-target_include_directories(bcrypt PRIVATE "libbcrypt/include")
+target_include_directories(bcrypt PRIVATE "libbcrypt/include/bcrypt")
 target_include_directories(bcrypt PRIVATE "libbcrypt/src")
 
 # Source code for sqlite