diff --git a/code/ryzom/server/src/ai_service/CMakeLists.txt b/code/ryzom/server/src/ai_service/CMakeLists.txt
index 684deab3d..f025c3b6e 100644
--- a/code/ryzom/server/src/ai_service/CMakeLists.txt
+++ b/code/ryzom/server/src/ai_service/CMakeLists.txt
@@ -36,7 +36,7 @@ TARGET_LINK_LIBRARIES(ai_service	admin_modules
 IF(WIN32)
   SET_TARGET_PROPERTIES(ai_service PROPERTIES 
 	LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS"
-	PROJECT_LABEL "Services: Frontend Service (FS)")
+	PROJECT_LABEL "Services: AI Service (FS)")
 ENDIF(WIN32)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
diff --git a/code/ryzom/server/src/ai_share/CMakeLists.txt b/code/ryzom/server/src/ai_share/CMakeLists.txt
index 3a4e3148b..c5443f3ed 100644
--- a/code/ryzom/server/src/ai_share/CMakeLists.txt
+++ b/code/ryzom/server/src/ai_share/CMakeLists.txt
@@ -1,13 +1,14 @@
 FILE(GLOB SRC *.cpp *.h)
 
-# Filter out the source files not actually compiled.
-LIST(REMOVE_ITEM SRC	${CMAKE_CURRENT_SOURCE_DIR}/world_map.cpp
-			${CMAKE_CURRENT_SOURCE_DIR}/world_map.h)
-
 ADD_LIBRARY(ai_share STATIC ${SRC})
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(ai_share ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELGEORGES_LIBRARY} ${NELPACS_LIBRARY})
+TARGET_LINK_LIBRARIES(ai_share	game_share
+				server_share
+				${NELMISC_LIBRARY} 
+				${NELNET_LIBRARY} 
+				${NELGEORGES_LIBRARY} 
+				${NELPACS_LIBRARY})
 SET_TARGET_PROPERTIES(ai_share PROPERTIES VERSION ${NL_VERSION})
 
 IF(WIN32)