diff --git a/engine/server/library/serverDatabase/src/CMakeLists.txt b/engine/server/library/serverDatabase/src/CMakeLists.txt
index e3da7997..0dbe652c 100644
--- a/engine/server/library/serverDatabase/src/CMakeLists.txt
+++ b/engine/server/library/serverDatabase/src/CMakeLists.txt
@@ -175,3 +175,8 @@ add_library(serverDatabase STATIC
 	${SHARED_SOURCES}
 	${PLATFORM_SOURCES}
 )
+
+
+target_link_libraries(serverDatabase
+	sharedCommandParser
+)
diff --git a/engine/server/library/serverGame/src/CMakeLists.txt b/engine/server/library/serverGame/src/CMakeLists.txt
index 177ac731..c4a092e5 100644
--- a/engine/server/library/serverGame/src/CMakeLists.txt
+++ b/engine/server/library/serverGame/src/CMakeLists.txt
@@ -778,3 +778,10 @@ add_library(serverGame STATIC
 	${PLATFORM_SOURCES}
 	${CMAKE_CURRENT_BINARY_DIR}/shared/generated/Packager.cpp
 )
+
+target_link_libraries(serverGame
+	sharedCommandParser
+	sharedPathfinding
+	sharedSkillSystem
+	sharedTerrain
+)
diff --git a/engine/shared/library/sharedCollision/src/CMakeLists.txt b/engine/shared/library/sharedCollision/src/CMakeLists.txt
index d43f63e2..259cd944 100644
--- a/engine/shared/library/sharedCollision/src/CMakeLists.txt
+++ b/engine/shared/library/sharedCollision/src/CMakeLists.txt
@@ -154,3 +154,8 @@ add_library(sharedCollision STATIC
 	${SHARED_SOURCES}
 	${PLATFORM_SOURCES}
 )
+
+target_link_libraries(sharedCollision
+	sharedMath
+	sharedObject
+)
diff --git a/engine/shared/library/sharedCompression/src/CMakeLists.txt b/engine/shared/library/sharedCompression/src/CMakeLists.txt
index 121d658e..fbb8e487 100644
--- a/engine/shared/library/sharedCompression/src/CMakeLists.txt
+++ b/engine/shared/library/sharedCompression/src/CMakeLists.txt
@@ -37,3 +37,7 @@ add_library(sharedCompression STATIC
 	${SHARED_SOURCES}
 	${PLATFORM_SOURCES}
 )
+
+target_link_libraries(sharedCompression
+	${ZLIB_LIBRARY}
+)
diff --git a/engine/shared/library/sharedFile/src/CMakeLists.txt b/engine/shared/library/sharedFile/src/CMakeLists.txt
index e779be57..c16205fc 100644
--- a/engine/shared/library/sharedFile/src/CMakeLists.txt
+++ b/engine/shared/library/sharedFile/src/CMakeLists.txt
@@ -63,3 +63,8 @@ add_library(sharedFile STATIC
 	${SHARED_SOURCES}
 	${PLATFORM_SOURCES}
 )
+
+target_link_libraries(sharedFile
+	sharedCompression
+	sharedDebug
+)
diff --git a/engine/shared/library/sharedGame/src/CMakeLists.txt b/engine/shared/library/sharedGame/src/CMakeLists.txt
index 385968f3..b3392761 100644
--- a/engine/shared/library/sharedGame/src/CMakeLists.txt
+++ b/engine/shared/library/sharedGame/src/CMakeLists.txt
@@ -337,3 +337,9 @@ add_library(sharedGame STATIC
 	${SHARED_SOURCES}
 	${PLATFORM_SOURCES}
 )
+
+target_link_libraries(sharedGame
+	sharedFoundation
+	sharedUtility
+	archive
+)
diff --git a/engine/shared/library/sharedMath/src/CMakeLists.txt b/engine/shared/library/sharedMath/src/CMakeLists.txt
index e1c27ed1..eab4eac7 100644
--- a/engine/shared/library/sharedMath/src/CMakeLists.txt
+++ b/engine/shared/library/sharedMath/src/CMakeLists.txt
@@ -131,3 +131,7 @@ add_library(sharedMath STATIC
 	${SHARED_SOURCES}
 	${PLATFORM_SOURCES}
 )
+
+target_link_libraries(sharedMath
+	sharedFile
+)
diff --git a/engine/shared/library/sharedObject/src/CMakeLists.txt b/engine/shared/library/sharedObject/src/CMakeLists.txt
index e9cb7767..b83d7afc 100644
--- a/engine/shared/library/sharedObject/src/CMakeLists.txt
+++ b/engine/shared/library/sharedObject/src/CMakeLists.txt
@@ -196,3 +196,7 @@ add_library(sharedObject STATIC
 	${SHARED_SOURCES}
 	${PLATFORM_SOURCES}
 )
+
+target_link_libraries(sharedObject
+	sharedCollision
+)
diff --git a/engine/shared/library/sharedTerrain/src/CMakeLists.txt b/engine/shared/library/sharedTerrain/src/CMakeLists.txt
index b89b33ff..b65351fc 100644
--- a/engine/shared/library/sharedTerrain/src/CMakeLists.txt
+++ b/engine/shared/library/sharedTerrain/src/CMakeLists.txt
@@ -126,6 +126,7 @@ include_directories(
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundationTypes/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFractal/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedImage/include/public
+	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedLog/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMath/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMemoryManager/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedObject/include/public
@@ -139,3 +140,7 @@ add_library(sharedTerrain STATIC
 	${SHARED_SOURCES}
 	${PLATFORM_SOURCES}
 )
+
+target_link_libraries(sharedTerrain
+	sharedFractal
+)
diff --git a/game/server/application/SwgDatabaseServer/src/CMakeLists.txt b/game/server/application/SwgDatabaseServer/src/CMakeLists.txt
index 3d47bd8e..635743f0 100644
--- a/game/server/application/SwgDatabaseServer/src/CMakeLists.txt
+++ b/game/server/application/SwgDatabaseServer/src/CMakeLists.txt
@@ -186,6 +186,8 @@ include_directories(
     ${SWG_ENGINE_SOURCE_DIR}/server/library/serverUtility/include/public
     ${SWG_GAME_SOURCE_DIR}/shared/library/swgSharedUtility/include/public
     ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/archive/include
+    ${SWG_GAME_SOURCE_DIR}/shared/library/swgSharedNetworkMessages/include/public
+    ${SWG_GAME_SOURCE_DIR}/server/library/swgServerNetworkMessages/include/public
     ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/fileInterface/include/public
     ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/localization/include
     ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/localizationArchive/include/public
@@ -336,6 +338,8 @@ target_link_libraries(SwgDatabaseServer
     serverNetworkMessages
     serverUtility
     swgSharedUtility
+    swgSharedNetworkMessages
+    swgServerNetworkMessages
     archive
     fileInterface
     localization
diff --git a/game/shared/library/swgSharedNetworkMessages/src/CMakeLists.txt b/game/shared/library/swgSharedNetworkMessages/src/CMakeLists.txt
index d1aa2353..d6facdae 100644
--- a/game/shared/library/swgSharedNetworkMessages/src/CMakeLists.txt
+++ b/game/shared/library/swgSharedNetworkMessages/src/CMakeLists.txt
@@ -62,3 +62,8 @@ add_library(swgSharedNetworkMessages STATIC
 	${SHARED_SOURCES}
 	${PLATFORM_SOURCES}
 )
+
+target_link_libraries(swgSharedNetworkMessages
+	sharedGame
+	sharedObject
+)