13 files changed, 33 insertions, 7 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 7440cc2d51e..938cde8160a 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -61,8 +61,8 @@ target_include_directories(common
 target_link_libraries(common
   PRIVATE
     process
-  PUBLIC
     trinity-core-interface
+  PUBLIC
     boost
     fmt
     g3dlib
diff --git a/src/server/bnetserver/CMakeLists.txt b/src/server/bnetserver/CMakeLists.txt
index a8047b2398d..e3686cac649 100644
--- a/src/server/bnetserver/CMakeLists.txt
+++ b/src/server/bnetserver/CMakeLists.txt
@@ -40,6 +40,8 @@ if (NOT WIN32)
 endif()
 
 target_link_libraries(bnetserver
+  PRIVATE
+    trinity-core-interface
   PUBLIC
     shared)
 
diff --git a/src/server/database/CMakeLists.txt b/src/server/database/CMakeLists.txt
index bcba7ead06c..e016a274588 100644
--- a/src/server/database/CMakeLists.txt
+++ b/src/server/database/CMakeLists.txt
@@ -48,6 +48,8 @@ target_include_directories(database
 add_definitions(-DTRINITY_API_EXPORT_DATABASE)
 
 target_link_libraries(database
+  PRIVATE
+    trinity-core-interface
   PUBLIC
     common
     mysql)
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index 901cd75a56a..d39c13f2fbd 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -49,10 +49,11 @@ target_include_directories(game
     ${CMAKE_CURRENT_BINARY_DIR})
 
 target_link_libraries(game
-  PUBLIC
-    game-interface
   PRIVATE
-    efsw)
+    trinity-core-interface
+    efsw
+  PUBLIC
+    game-interface)
 
 set_target_properties(game
     PROPERTIES
diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index fdb19bfb440..134cd478656 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -162,6 +162,8 @@ foreach(SCRIPT_MODULE ${SCRIPT_MODULE_LIST})
       ${SCRIPT_MODULE_PRIVATE_SOURCES}
       ${SCRIPT_MODULE_PRIVATE_SCRIPTLOADER})
     target_link_libraries(${SCRIPT_MODULE_PROJECT_NAME}
+      PRIVATE
+        trinity-core-interface
       PUBLIC
         game)
     set_target_properties(${SCRIPT_MODULE_PROJECT_NAME}
@@ -202,6 +204,8 @@ add_library(scripts STATIC
   ${PRIVATE_SOURCES})
 
 target_link_libraries(scripts
+  PRIVATE
+    trinity-core-interface
   PUBLIC
     game-interface)
 
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index b1be342d159..053260aa54b 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -40,6 +40,8 @@ target_include_directories(shared
     ${CMAKE_CURRENT_BINARY_DIR})
 
 target_link_libraries(shared
+  PRIVATE
+    trinity-core-interface
   PUBLIC
     database
     rapidjson
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index df1f993f9b5..d745d16aee0 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -44,6 +44,8 @@ endif()
 set_target_properties(worldserver PROPERTIES LINK_FLAGS "${worldserver_LINK_FLAGS}")
 
 target_link_libraries(worldserver
+  PRIVATE
+    trinity-core-interface
   PUBLIC
     scripts
     game
diff --git a/src/tools/connection_patcher/CMakeLists.txt b/src/tools/connection_patcher/CMakeLists.txt
index 94739370633..3da8c1b4cc8 100644
--- a/src/tools/connection_patcher/CMakeLists.txt
+++ b/src/tools/connection_patcher/CMakeLists.txt
@@ -19,6 +19,8 @@ GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
 add_executable(connection_patcher ${PRIVATE_SOURCES})
 
 target_link_libraries(connection_patcher
+  PRIVATE
+    trinity-core-interface
   PUBLIC
     common
 )
diff --git a/src/tools/extractor_common/CMakeLists.txt b/src/tools/extractor_common/CMakeLists.txt
index 9a79dfeba00..8ec9d63333b 100644
--- a/src/tools/extractor_common/CMakeLists.txt
+++ b/src/tools/extractor_common/CMakeLists.txt
@@ -15,6 +15,8 @@ CollectSourceFiles(
 add_library(extractor_common STATIC ${PRIVATE_SOURCES})
 
 target_link_libraries(extractor_common
+  PRIVATE
+    trinity-core-interface
   PUBLIC
     casc
     common)
diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt
index 6347d3bc807..40122f11f52 100644
--- a/src/tools/map_extractor/CMakeLists.txt
+++ b/src/tools/map_extractor/CMakeLists.txt
@@ -27,6 +27,8 @@ target_include_directories(mapextractor
     ${CMAKE_CURRENT_SOURCE_DIR}/loadlib)
 
 target_link_libraries(mapextractor
+  PRIVATE
+    trinity-core-interface
   PUBLIC
     extractor_common)
 
diff --git a/src/tools/mmaps_generator/CMakeLists.txt b/src/tools/mmaps_generator/CMakeLists.txt
index fad569101f2..0b603a556cc 100644
--- a/src/tools/mmaps_generator/CMakeLists.txt
+++ b/src/tools/mmaps_generator/CMakeLists.txt
@@ -19,6 +19,8 @@ endif()
 add_executable(mmaps_generator ${PRIVATE_SOURCES})
 
 target_link_libraries(mmaps_generator
+  PRIVATE
+    trinity-core-interface
   PUBLIC
     common
     Recast
diff --git a/src/tools/vmap4_assembler/CMakeLists.txt b/src/tools/vmap4_assembler/CMakeLists.txt
index 1eb4de4ad75..b73f84a4d52 100644
--- a/src/tools/vmap4_assembler/CMakeLists.txt
+++ b/src/tools/vmap4_assembler/CMakeLists.txt
@@ -18,9 +18,12 @@ endif()
 add_executable(vmap4assembler ${PRIVATE_SOURCES})
 
 target_link_libraries(vmap4assembler
-  common
-  casc
-  zlib)
+  PRIVATE
+    trinity-core-interface
+  PUBLIC
+    common
+    casc
+    zlib)
 
 set_target_properties(vmap4assembler
     PROPERTIES
diff --git a/src/tools/vmap4_extractor/CMakeLists.txt b/src/tools/vmap4_extractor/CMakeLists.txt
index 8af68c8e8ed..5d476010fb2 100644
--- a/src/tools/vmap4_extractor/CMakeLists.txt
+++ b/src/tools/vmap4_extractor/CMakeLists.txt
@@ -20,6 +20,8 @@ endif()
 add_executable(vmap4extractor ${PRIVATE_SOURCES})
 
 target_link_libraries(vmap4extractor
+  PRIVATE
+    trinity-core-interface
   PUBLIC
     bzip2
     extractor_common)