diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54ed1b3b5..e044321aa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -161,9 +161,9 @@ if(EQEMU_BUILD_SERVER)
 	add_subdirectory(shared_memory)
 	add_subdirectory(world)
 	#add_subdirectory(zone)
-	#add_subdirectory(ucs)
-	#add_subdirectory(queryserv)
-	#add_subdirectory(eqlaunch)
+	add_subdirectory(ucs)
+	add_subdirectory(queryserv)
+	add_subdirectory(eqlaunch)
 endif()
 
 #if(EQEMU_BUILD_LOGIN)
diff --git a/eqlaunch/CMakeLists.txt b/eqlaunch/CMakeLists.txt
index f0cdc987d..beafeb7f0 100644
--- a/eqlaunch/CMakeLists.txt
+++ b/eqlaunch/CMakeLists.txt
@@ -15,6 +15,6 @@ add_executable(eqlaunch ${eqlaunch_sources} ${eqlaunch_headers})
 
 install(TARGETS eqlaunch RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
-target_link_libraries(eqlaunch ${SERVER_LIBS})
+target_link_libraries(eqlaunch common)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
diff --git a/queryserv/CMakeLists.txt b/queryserv/CMakeLists.txt
index 093fa0bc1..39dc0b048 100644
--- a/queryserv/CMakeLists.txt
+++ b/queryserv/CMakeLists.txt
@@ -25,6 +25,6 @@ install(TARGETS queryserv RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
 add_definitions(-DQSERV)
 
-target_link_libraries(queryserv ${SERVER_LIBS})
+target_link_libraries(queryserv common)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
diff --git a/ucs/CMakeLists.txt b/ucs/CMakeLists.txt
index e4238b0dd..188b79a93 100644
--- a/ucs/CMakeLists.txt
+++ b/ucs/CMakeLists.txt
@@ -23,6 +23,6 @@ install(TARGETS ucs RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
 add_definitions(-DUCS)
 
-target_link_libraries(ucs ${SERVER_LIBS})
+target_link_libraries(ucs common)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)