diff --git a/src/dev-utils/CMakeLists.txt b/src/dev-utils/CMakeLists.txt
index 464fd9c8f4..e1d8243b03 100644
--- a/src/dev-utils/CMakeLists.txt
+++ b/src/dev-utils/CMakeLists.txt
@@ -36,7 +36,7 @@ function(encoding_check TARGET)
 
         # Add checking of each source file as a subcommand of encoding-check-${TARGET}
         foreach(file ${T_SOURCES})
-            add_custom_command(TARGET encoding-check-${TARGET}
+            add_custom_command(TARGET encoding-check-${TARGET} PRE_BUILD
                 COMMAND $<TARGET_FILE:encoding-check> ${TARGET} ${file}
                 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
             )
diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
index 7369b2a7aa..d85c65fd51 100644
--- a/src/libslic3r/CMakeLists.txt
+++ b/src/libslic3r/CMakeLists.txt
@@ -552,57 +552,59 @@ set(OCCT_LIBS
 
 find_package(libnoise REQUIRED)
 target_link_libraries(libslic3r
-    libnest2d
-    admesh
-    cereal::cereal
-    eigen
-    libigl
-    miniz
-    boost_libs
-    clipper
-    ${EXPAT_LIBRARIES}
-    glu-libtess
-    qhull
-    semver
-    TBB::tbb
-    TBB::tbbmalloc
-    libslic3r_cgal
-    ${CMAKE_DL_LIBS}
-    PNG::PNG
-    ZLIB::ZLIB
-    ${OCCT_LIBS}
-    mcut
-    JPEG::JPEG
-    qoi
-    opencv_world
-    noise::noise
+    PUBLIC
+        admesh
+        libigl
+        libnest2d
+        miniz
+        opencv_world
+    PRIVATE
+        ${CMAKE_DL_LIBS}
+        ${EXPAT_LIBRARIES}
+        ${OCCT_LIBS}
+        boost_libs
+        cereal::cereal
+        clipper
+        eigen
+        glu-libtess
+        JPEG::JPEG
+        libslic3r_cgal
+        mcut
+        noise::noise
+        PNG::PNG
+        qhull
+        qoi
+        semver
+        TBB::tbb
+        TBB::tbbmalloc
+        ZLIB::ZLIB
     )
 
 if(NOT WIN32)
     # Link freetype for OCCT dependency (CAD operations need font rendering)
-    target_link_libraries(libslic3r ${FREETYPE_LIBRARIES})
-    target_link_libraries(libslic3r OpenSSL::Crypto)
+    target_link_libraries(libslic3r PRIVATE ${FREETYPE_LIBRARIES})
+    target_link_libraries(libslic3r PRIVATE OpenSSL::Crypto)
     if (NOT APPLE)
-        target_link_libraries(libslic3r fontconfig)
+        target_link_libraries(libslic3r PRIVATE fontconfig)
     endif()
 endif()
 
 if (APPLE)
     find_library(FOUNDATION Foundation REQUIRED)
     find_library(MODELIO ModelIO REQUIRED)
-    target_link_libraries(libslic3r ${FOUNDATION} ${MODELIO})
+    target_link_libraries(libslic3r PRIVATE ${FOUNDATION} ${MODELIO})
 endif ()
 
 if (TARGET OpenVDB::openvdb)
-    target_link_libraries(libslic3r OpenVDB::openvdb)
+    target_link_libraries(libslic3r PRIVATE OpenVDB::openvdb)
 endif()
 
 if(WIN32)
-    target_link_libraries(libslic3r Psapi.lib)
+    target_link_libraries(libslic3r PRIVATE Psapi.lib)
 endif()
 
 if(SLIC3R_PROFILE)
-    target_link_libraries(libslic3r Shiny)
+    target_link_libraries(libslic3r PRIVATE Shiny)
 endif()
 
 if (SLIC3R_PCH AND NOT SLIC3R_SYNTAXONLY)