diff --git a/src/node/db_proxy/clickhouse/CMakeLists.txt b/src/node/db_proxy/clickhouse/CMakeLists.txt
index db6467b0..e7d72af5 100644
--- a/src/node/db_proxy/clickhouse/CMakeLists.txt
+++ b/src/node/db_proxy/clickhouse/CMakeLists.txt
@@ -19,4 +19,5 @@ else()
 endif()
 
 LinkStruct(${ProjectName})
+LinkCore(${ProjectName})
 SquickOut(${ProjectName} "node/db_proxy" ${SQUICK_BUILD_PLUGIN_SERVER_PATH}/db_proxy "clickhouse")
diff --git a/src/node/db_proxy/logic/CMakeLists.txt b/src/node/db_proxy/logic/CMakeLists.txt
index 6ee2d838..f67f03ea 100644
--- a/src/node/db_proxy/logic/CMakeLists.txt
+++ b/src/node/db_proxy/logic/CMakeLists.txt
@@ -3,4 +3,5 @@ file(GLOB soruces *.cc)
 file(GLOB headers *.h)
 add_library(${ProjectName} SHARED ${soruces} ${headers})
 LinkStruct(${ProjectName})
+LinkCore(${ProjectName})
 SquickOut(${ProjectName} "node/db_proxy" ${SQUICK_BUILD_PLUGIN_SERVER_PATH}/db_proxy "logic")
\ No newline at end of file
diff --git a/src/node/db_proxy/mongo/CMakeLists.txt b/src/node/db_proxy/mongo/CMakeLists.txt
index 47b59a3c..8fcd7dc1 100644
--- a/src/node/db_proxy/mongo/CMakeLists.txt
+++ b/src/node/db_proxy/mongo/CMakeLists.txt
@@ -16,4 +16,5 @@ else()
 endif()
 
 LinkStruct(${ProjectName})
+LinkCore(${ProjectName})
 SquickOut(${ProjectName} "node/db_proxy" ${SQUICK_BUILD_PLUGIN_SERVER_PATH}/db_proxy "mongo")
diff --git a/src/node/db_proxy/mysql/CMakeLists.txt b/src/node/db_proxy/mysql/CMakeLists.txt
index c21ae23d..1339667a 100644
--- a/src/node/db_proxy/mysql/CMakeLists.txt
+++ b/src/node/db_proxy/mysql/CMakeLists.txt
@@ -13,4 +13,5 @@ else()
 endif()
 
 LinkStruct(${ProjectName})
+LinkCore(${ProjectName})
 SquickOut(${ProjectName} "node/db_proxy" ${SQUICK_BUILD_PLUGIN_SERVER_PATH}/db_proxy "mysql")
\ No newline at end of file
diff --git a/src/node/db_proxy/redis/CMakeLists.txt b/src/node/db_proxy/redis/CMakeLists.txt
index 30fbebc1..2eee4db3 100644
--- a/src/node/db_proxy/redis/CMakeLists.txt
+++ b/src/node/db_proxy/redis/CMakeLists.txt
@@ -16,4 +16,5 @@ else()
 endif()
 
 LinkStruct(${ProjectName})
+LinkCore(${ProjectName})
 SquickOut(${ProjectName} "node/db_proxy" ${SQUICK_BUILD_PLUGIN_SERVER_PATH}/db_proxy "redis")
diff --git a/src/node/game/logic/CMakeLists.txt b/src/node/game/logic/CMakeLists.txt
index f78b7a56..cb9c1ca4 100644
--- a/src/node/game/logic/CMakeLists.txt
+++ b/src/node/game/logic/CMakeLists.txt
@@ -3,4 +3,5 @@ file(GLOB soruces *.cc)
 file(GLOB headers *.h)
 add_library(${ProjectName} SHARED ${soruces} ${headers})
 LinkStruct(${ProjectName})
+LinkCore(${ProjectName})
 SquickOut(${ProjectName} "node/game" ${SQUICK_BUILD_PLUGIN_SERVER_PATH}/game "logic")
\ No newline at end of file
diff --git a/src/node/global/logic/CMakeLists.txt b/src/node/global/logic/CMakeLists.txt
index 6575c3a9..34fa7a3d 100644
--- a/src/node/global/logic/CMakeLists.txt
+++ b/src/node/global/logic/CMakeLists.txt
@@ -3,4 +3,5 @@ file(GLOB soruces *.cc)
 file(GLOB headers *.h)
 add_library(${ProjectName} SHARED ${soruces} ${headers})
 LinkStruct(${ProjectName})
+LinkCore(${ProjectName})
 SquickOut(${ProjectName} "node/global" ${SQUICK_BUILD_PLUGIN_SERVER_PATH}/global "logic")
\ No newline at end of file
diff --git a/src/node/login/logic/CMakeLists.txt b/src/node/login/logic/CMakeLists.txt
index 23875b2a..e94c6e65 100644
--- a/src/node/login/logic/CMakeLists.txt
+++ b/src/node/login/logic/CMakeLists.txt
@@ -8,4 +8,5 @@ file(GLOB headers *.h
 
 add_library(${ProjectName} SHARED ${soruces} ${headers})
 LinkStruct(${ProjectName})
+LinkCore(${ProjectName})
 SquickOut(${ProjectName} "node/login" ${SQUICK_BUILD_PLUGIN_SERVER_PATH}/login "logic")
\ No newline at end of file
diff --git a/src/node/master/logic/CMakeLists.txt b/src/node/master/logic/CMakeLists.txt
index 0721f953..f3b41489 100644
--- a/src/node/master/logic/CMakeLists.txt
+++ b/src/node/master/logic/CMakeLists.txt
@@ -3,4 +3,5 @@ file(GLOB soruces *.cc)
 file(GLOB headers *.h)
 add_library(${ProjectName} SHARED ${soruces} ${headers})
 LinkStruct(${ProjectName})
+LinkCore(${ProjectName})
 SquickOut(${ProjectName} "node/master" ${SQUICK_BUILD_PLUGIN_SERVER_PATH}/master "logic")
\ No newline at end of file
diff --git a/src/node/player/logic/CMakeLists.txt b/src/node/player/logic/CMakeLists.txt
index 3daf2e75..6bad943c 100644
--- a/src/node/player/logic/CMakeLists.txt
+++ b/src/node/player/logic/CMakeLists.txt
@@ -12,4 +12,5 @@ else()
 endif()
 
 LinkStruct(${ProjectName})
+LinkCore(${ProjectName})
 SquickOut(${ProjectName} "node/player" ${SQUICK_BUILD_PLUGIN_SERVER_PATH}/player "logic")
\ No newline at end of file
diff --git a/src/node/proxy/logic/CMakeLists.txt b/src/node/proxy/logic/CMakeLists.txt
index b1c7451b..d0304e09 100644
--- a/src/node/proxy/logic/CMakeLists.txt
+++ b/src/node/proxy/logic/CMakeLists.txt
@@ -3,4 +3,5 @@ file(GLOB soruces *.cc)
 file(GLOB headers *.h)
 add_library(${ProjectName} SHARED ${soruces} ${headers})
 LinkStruct(${ProjectName})
+LinkCore(${ProjectName})
 SquickOut(${ProjectName} "node/proxy" ${SQUICK_BUILD_PLUGIN_SERVER_PATH}/proxy "logic")
\ No newline at end of file
diff --git a/src/node/web/logic/CMakeLists.txt b/src/node/web/logic/CMakeLists.txt
index a321a809..133db2cd 100644
--- a/src/node/web/logic/CMakeLists.txt
+++ b/src/node/web/logic/CMakeLists.txt
@@ -8,4 +8,5 @@ file(GLOB headers *.h
 
 add_library(${ProjectName} SHARED ${soruces} ${headers})
 LinkStruct(${ProjectName})
+LinkCore(${ProjectName})
 SquickOut(${ProjectName} "node/web" ${SQUICK_BUILD_PLUGIN_SERVER_PATH}/web "logic")
\ No newline at end of file
diff --git a/src/node/world/logic/CMakeLists.txt b/src/node/world/logic/CMakeLists.txt
index 578b45c3..76cf285e 100644
--- a/src/node/world/logic/CMakeLists.txt
+++ b/src/node/world/logic/CMakeLists.txt
@@ -3,4 +3,5 @@ file(GLOB soruces *.cc)
 file(GLOB headers *.h)
 add_library(${ProjectName} SHARED ${soruces} ${headers})
 LinkStruct(${ProjectName})
+LinkCore(${ProjectName})
 SquickOut(${ProjectName} "node/world" ${SQUICK_BUILD_PLUGIN_SERVER_PATH}/world "logic")
\ No newline at end of file
diff --git a/src/squick/plugin/actor/CMakeLists.txt b/src/squick/plugin/actor/CMakeLists.txt
index 6fe57158..98b1a5c1 100644
--- a/src/squick/plugin/actor/CMakeLists.txt
+++ b/src/squick/plugin/actor/CMakeLists.txt
@@ -2,4 +2,5 @@ set(ProjectName "core_actor")
 file(GLOB soruces *.cc)
 file(GLOB headers *.h)
 add_library(${ProjectName} SHARED ${soruces} ${headers})
+LinkCore(${ProjectName})
 SquickOut(${ProjectName} "squick/plugin" ${SQUICK_BUILD_PLUGIN_CORE_PATH} "actor")
diff --git a/src/squick/plugin/config/CMakeLists.txt b/src/squick/plugin/config/CMakeLists.txt
index 15e488f5..484514e1 100644
--- a/src/squick/plugin/config/CMakeLists.txt
+++ b/src/squick/plugin/config/CMakeLists.txt
@@ -2,4 +2,5 @@ set(ProjectName "core_config")
 file(GLOB soruces *.cc)
 file(GLOB headers *.h)
 add_library(${ProjectName} SHARED ${soruces} ${headers})
+LinkCore(${ProjectName})
 SquickOut(${ProjectName} "squick/plugin" ${SQUICK_BUILD_PLUGIN_CORE_PATH} "config")
diff --git a/src/squick/plugin/log/CMakeLists.txt b/src/squick/plugin/log/CMakeLists.txt
index dba2d1f5..bb18fd8f 100644
--- a/src/squick/plugin/log/CMakeLists.txt
+++ b/src/squick/plugin/log/CMakeLists.txt
@@ -2,4 +2,5 @@ set(ProjectName "core_log")
 file(GLOB soruces *.cc)
 file(GLOB headers *.h)
 add_library(${ProjectName} SHARED ${soruces} ${headers})
+LinkCore(${ProjectName})
 SquickOut(${ProjectName} "squick/plugin" ${SQUICK_BUILD_PLUGIN_CORE_PATH} "log")
diff --git a/src/squick/plugin/lua/CMakeLists.txt b/src/squick/plugin/lua/CMakeLists.txt
index 3e4876f1..b4e3d074 100644
--- a/src/squick/plugin/lua/CMakeLists.txt
+++ b/src/squick/plugin/lua/CMakeLists.txt
@@ -12,4 +12,5 @@ else()
 endif()
 
 LinkStruct(${ProjectName})
+LinkCore(${ProjectName})
 SquickOut(${ProjectName} "squick/plugin" ${SQUICK_BUILD_PLUGIN_CORE_PATH} "lua")
diff --git a/src/squick/plugin/navigation/CMakeLists.txt b/src/squick/plugin/navigation/CMakeLists.txt
index 433bc1ad..32a1ef4d 100644
--- a/src/squick/plugin/navigation/CMakeLists.txt
+++ b/src/squick/plugin/navigation/CMakeLists.txt
@@ -7,4 +7,5 @@ target_include_directories(${ProjectName} PUBLIC
 	${SolutionDir}/third_party/navigation/)
 
 target_link_libraries(${ProjectName} recastnavigation)
+LinkCore(${ProjectName})
 SquickOut(${ProjectName} "squick/plugin" ${SQUICK_BUILD_PLUGIN_CORE_PATH} "navigation")
diff --git a/src/squick/plugin/net/CMakeLists.txt b/src/squick/plugin/net/CMakeLists.txt
index 5d0937e3..84f3257f 100644
--- a/src/squick/plugin/net/CMakeLists.txt
+++ b/src/squick/plugin/net/CMakeLists.txt
@@ -35,4 +35,5 @@ else()
 endif()
 
 LinkStruct(${ProjectName})
+LinkCore(${ProjectName})
 SquickOut(${ProjectName} "squick/plugin" ${SQUICK_BUILD_PLUGIN_CORE_PATH} "net")
diff --git a/src/squick/plugin/node/CMakeLists.txt b/src/squick/plugin/node/CMakeLists.txt
index 7dac856c..edfc8949 100644
--- a/src/squick/plugin/node/CMakeLists.txt
+++ b/src/squick/plugin/node/CMakeLists.txt
@@ -3,4 +3,5 @@ file(GLOB soruces *.cc)
 file(GLOB headers *.h)
 add_library(${ProjectName} SHARED ${soruces} ${headers})
 LinkStruct(${ProjectName})
+LinkCore(${ProjectName})
 SquickOut(${ProjectName} "squick/plugin" ${SQUICK_BUILD_PLUGIN_CORE_PATH} "node")
\ No newline at end of file
diff --git a/src/squick/plugin/thread/CMakeLists.txt b/src/squick/plugin/thread/CMakeLists.txt
index 3a852b4f..4aebdf14 100644
--- a/src/squick/plugin/thread/CMakeLists.txt
+++ b/src/squick/plugin/thread/CMakeLists.txt
@@ -2,4 +2,5 @@ set(ProjectName "core_thread")
 file(GLOB soruces *.cc)
 file(GLOB headers *.h)
 add_library(${ProjectName} SHARED ${soruces} ${headers})
+LinkCore(${ProjectName})
 SquickOut(${ProjectName} "squick/plugin" ${SQUICK_BUILD_PLUGIN_CORE_PATH} "thread")
diff --git a/src/squick/plugin/utils/CMakeLists.txt b/src/squick/plugin/utils/CMakeLists.txt
index b0463dbe..69b2816d 100644
--- a/src/squick/plugin/utils/CMakeLists.txt
+++ b/src/squick/plugin/utils/CMakeLists.txt
@@ -2,4 +2,5 @@ set(ProjectName "core_utils")
 file(GLOB soruces *.cc)
 file(GLOB headers *.h)
 add_library(${ProjectName} SHARED ${soruces} ${headers})
+LinkCore(${ProjectName})
 SquickOut(${ProjectName} "squick/plugin" ${SQUICK_BUILD_PLUGIN_CORE_PATH} "utils")
diff --git a/src/squick/plugin/world/CMakeLists.txt b/src/squick/plugin/world/CMakeLists.txt
index 9705afff..11f3eaa3 100644
--- a/src/squick/plugin/world/CMakeLists.txt
+++ b/src/squick/plugin/world/CMakeLists.txt
@@ -2,4 +2,5 @@ set(ProjectName "core_world")
 file(GLOB soruces *.cc)
 file(GLOB headers *.h)
 add_library(${ProjectName} SHARED ${soruces} ${headers})
+LinkCore(${ProjectName})
 SquickOut(${ProjectName} "squick/plugin" ${SQUICK_BUILD_PLUGIN_CORE_PATH} "world")
diff --git a/src/tools/sqkcli/core/CMakeLists.txt b/src/tools/sqkcli/core/CMakeLists.txt
index 0c85da34..68f2dc29 100644
--- a/src/tools/sqkcli/core/CMakeLists.txt
+++ b/src/tools/sqkcli/core/CMakeLists.txt
@@ -3,4 +3,5 @@ file(GLOB soruces *.cc)
 file(GLOB headers *.h)
 add_library(${ProjectName} SHARED ${soruces} ${headers})
 LinkStruct(${ProjectName})
+LinkCore(${ProjectName})
 SquickOut(${ProjectName} "tools/sqkcli/plugin" ${SQUICK_BUILD_PLUGIN_SQKCLI_PATH} "core")
\ No newline at end of file
diff --git a/src/tutorial/t2_property/CMakeLists.txt b/src/tutorial/t2_property/CMakeLists.txt
index 715609f0..97c77cec 100644
--- a/src/tutorial/t2_property/CMakeLists.txt
+++ b/src/tutorial/t2_property/CMakeLists.txt
@@ -2,4 +2,5 @@ set(ProjectName "tutorial_t2_property")
 file(GLOB soruces *.cc)
 file(GLOB headers *.h)
 add_library(${ProjectName} SHARED ${soruces} ${headers})
+LinkCore(${ProjectName})
 SquickOut(${ProjectName} "tutorial" ${SQUICK_BUILD_PLUGIN_TUTORIAL_PATH} "t2_property")
diff --git a/src/tutorial/t3_event/CMakeLists.txt b/src/tutorial/t3_event/CMakeLists.txt
index 9a2e370b..e74c4555 100644
--- a/src/tutorial/t3_event/CMakeLists.txt
+++ b/src/tutorial/t3_event/CMakeLists.txt
@@ -2,4 +2,5 @@ set(ProjectName "tutorial_t3_event")
 file(GLOB soruces *.cc)
 file(GLOB headers *.h)
 add_library(${ProjectName} SHARED ${soruces} ${headers})
+LinkCore(${ProjectName})
 SquickOut(${ProjectName} "tutorial" ${SQUICK_BUILD_PLUGIN_TUTORIAL_PATH} "t3_event")