diff --git a/src/Cedar/CMakeLists.txt b/src/Cedar/CMakeLists.txt
index 2e5c99f9..120bb4ab 100644
--- a/src/Cedar/CMakeLists.txt
+++ b/src/Cedar/CMakeLists.txt
@@ -19,6 +19,8 @@ set_target_properties(cedar
   RUNTIME_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}"
 )
 
+target_link_libraries(cedar PUBLIC mayaqua)
+
 cmake_host_system_information(RESULT HAS_SSE2 QUERY HAS_SSE2)
 
 set(BLAKE2_SRC_PATH $<IF:$<BOOL:${HAS_SSE2}>,${TOP_DIRECTORY}/3rdparty/BLAKE2/sse,${TOP_DIRECTORY}/3rdparty/BLAKE2/ref>)
diff --git a/src/PenCore/CMakeLists.txt b/src/PenCore/CMakeLists.txt
index 5cb3175c..40e6dfe3 100644
--- a/src/PenCore/CMakeLists.txt
+++ b/src/PenCore/CMakeLists.txt
@@ -12,4 +12,4 @@ set_target_properties(PenCore
   PDB_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}"
 )
 
-target_link_libraries(PenCore cedar mayaqua)
+target_link_libraries(PenCore)
diff --git a/src/vpnbridge/CMakeLists.txt b/src/vpnbridge/CMakeLists.txt
index fbb28522..4efa4cfe 100644
--- a/src/vpnbridge/CMakeLists.txt
+++ b/src/vpnbridge/CMakeLists.txt
@@ -29,7 +29,7 @@ set_target_properties(vpnbridge
   RUNTIME_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}"
 )
 
-target_link_libraries(vpnbridge cedar mayaqua)
+target_link_libraries(vpnbridge cedar)
 
 if(UNIX)
   # Copy binary and "hamcore.se2" to /usr/lib(exec)/softether/, install launch script and systemd service
diff --git a/src/vpnclient/CMakeLists.txt b/src/vpnclient/CMakeLists.txt
index 03b19b0d..528a6378 100644
--- a/src/vpnclient/CMakeLists.txt
+++ b/src/vpnclient/CMakeLists.txt
@@ -29,7 +29,7 @@ set_target_properties(vpnclient
   RUNTIME_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}"
 )
 
-target_link_libraries(vpnclient cedar mayaqua)
+target_link_libraries(vpnclient cedar)
 
 if(UNIX)
   # Copy binary and "hamcore.se2" to /usr/lib(exec)/softether/, install launch script and systemd service
diff --git a/src/vpncmd/CMakeLists.txt b/src/vpncmd/CMakeLists.txt
index 51bfba57..2fd448c4 100644
--- a/src/vpncmd/CMakeLists.txt
+++ b/src/vpncmd/CMakeLists.txt
@@ -29,7 +29,7 @@ if(WIN32)
   )
 endif()
 
-target_link_libraries(vpncmd cedar mayaqua)
+target_link_libraries(vpncmd cedar)
 
 if(UNIX)
   # Copy binary and "hamcore.se2" to /usr/lib(exec)/softether/, install launch script
diff --git a/src/vpncmgr/CMakeLists.txt b/src/vpncmgr/CMakeLists.txt
index 72142f17..ff7fcc60 100644
--- a/src/vpncmgr/CMakeLists.txt
+++ b/src/vpncmgr/CMakeLists.txt
@@ -26,4 +26,4 @@ set_target_properties(vpncmgr
   PDB_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}"
 )
 
-target_link_libraries(vpncmgr cedar mayaqua)
+target_link_libraries(vpncmgr cedar)
diff --git a/src/vpnserver/CMakeLists.txt b/src/vpnserver/CMakeLists.txt
index 3ae08ced..2e86011e 100644
--- a/src/vpnserver/CMakeLists.txt
+++ b/src/vpnserver/CMakeLists.txt
@@ -29,7 +29,7 @@ set_target_properties(vpnserver
   RUNTIME_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}"
 )
 
-target_link_libraries(vpnserver cedar mayaqua)
+target_link_libraries(vpnserver cedar)
 
 if(UNIX)
   # Copy binary and "hamcore.se2" to /usr/lib(exec)/softether/, install launch script and systemd service
diff --git a/src/vpnsetup/CMakeLists.txt b/src/vpnsetup/CMakeLists.txt
index dd29dd01..50502f4f 100644
--- a/src/vpnsetup/CMakeLists.txt
+++ b/src/vpnsetup/CMakeLists.txt
@@ -26,4 +26,4 @@ set_target_properties(vpnsetup
   PDB_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}"
 )
 
-target_link_libraries(vpnsetup cedar mayaqua)
+target_link_libraries(vpnsetup cedar)
diff --git a/src/vpnsmgr/CMakeLists.txt b/src/vpnsmgr/CMakeLists.txt
index 1ffef518..6483a0ab 100644
--- a/src/vpnsmgr/CMakeLists.txt
+++ b/src/vpnsmgr/CMakeLists.txt
@@ -26,4 +26,4 @@ set_target_properties(vpnsmgr
   PDB_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}"
 )
 
-target_link_libraries(vpnsmgr cedar mayaqua)
+target_link_libraries(vpnsmgr cedar)
diff --git a/src/vpntest/CMakeLists.txt b/src/vpntest/CMakeLists.txt
index 5820740a..98f5bb71 100644
--- a/src/vpntest/CMakeLists.txt
+++ b/src/vpntest/CMakeLists.txt
@@ -29,4 +29,4 @@ if(WIN32)
   )
 endif()
 
-target_link_libraries(vpntest cedar mayaqua)
+target_link_libraries(vpntest cedar)