diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22bcbe6c5..6466753eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -296,15 +296,15 @@ IF(EQEMU_BUILD_SERVER OR EQEMU_BUILD_LOGIN OR EQEMU_BUILD_TESTS OR EQEMU_BUILD_H
 	ADD_SUBDIRECTORY(libs)
 ENDIF(EQEMU_BUILD_SERVER OR EQEMU_BUILD_LOGIN OR EQEMU_BUILD_TESTS OR EQEMU_BUILD_HC)
 
-#IF(EQEMU_BUILD_SERVER)
-#	ADD_SUBDIRECTORY(shared_memory)
+IF(EQEMU_BUILD_SERVER)
+	ADD_SUBDIRECTORY(shared_memory)
 #	ADD_SUBDIRECTORY(world)
 #	ADD_SUBDIRECTORY(zone)
 #	ADD_SUBDIRECTORY(ucs)
 #	ADD_SUBDIRECTORY(queryserv)
 #	ADD_SUBDIRECTORY(eqlaunch)
-#ENDIF(EQEMU_BUILD_SERVER)
-#
+ENDIF(EQEMU_BUILD_SERVER)
+
 #IF(EQEMU_BUILD_LOGIN)
 #	ADD_SUBDIRECTORY(loginserver)
 #ENDIF(EQEMU_BUILD_LOGIN)
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index d2eb1fca0..5835a874b 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -835,7 +835,7 @@ INCLUDE_DIRECTORIES(Patches SocketLib StackWalker)
 
 ADD_LIBRARY(common ${common_sources} ${common_headers} ${repositories})
 
-target_link_libraries(common PRIVATE cereal::cereal fmt::fmt unofficial::libmariadb $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv> zlib-ng::zlib)
+target_link_libraries(common PUBLIC cereal::cereal fmt::fmt unofficial::libmariadb $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv> zlib-ng::zlib OpenSSL::SSL OpenSSL::Crypto)
 
 IF (UNIX)
     SET_SOURCE_FILES_PROPERTIES("SocketLib/Mime.cpp" PROPERTY COMPILE_FLAGS -Wno-unused-result)