diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3ed805d14..a16f0563a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -47,7 +47,7 @@ if(CPR_FORCE_USE_SYSTEM_CURL)
     install(EXPORT komputeTargets
             FILE komputeTargets.cmake
             NAMESPACE kompute::
-	    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/kompute)
+	        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/kompute)
 
     install(FILES ${PROJECT_BINARY_DIR}/kompute/komputeConfig.cmake
             ${PROJECT_BINARY_DIR}/kompute/komputeConfigVersion.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/kompute)
@@ -81,14 +81,13 @@ endif()
 
 if(KOMPUTE_OPT_ANDROID_BUILD)
     target_link_libraries(kompute PUBLIC kompute_vk_ndk_wrapper
-                                         fmt::fmt
-                                         log
                                          android
-                                         logger)
+                                  PRIVATE logger
+                                          fmt::fmt)
 else()
     target_link_libraries(kompute PUBLIC Vulkan::Vulkan
-                                         fmt::fmt
-                                         logger)
+                                  PRIVATE fmt::fmt
+                                          logger)
 endif()
 
 if(KOMPUTE_OPT_USE_BUILD_IN_VULKAN_HEADER)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 49e8f0356..31cb1b792 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -15,9 +15,9 @@ macro(add_kompute_test _TEST_NAME)
     add_executable("${_TEST_NAME}_tests" "Test${_TEST_NAME}.cpp"
                                          ${ARGN})
     target_link_libraries("${_TEST_NAME}_tests" PRIVATE GTest::GTest
-                                                      kompute::kompute
-                                                      test_shaders
-                                                      test_shaders_glsl)
+                                                        kompute::kompute
+                                                        test_shaders
+                                                        test_shaders_glsl)
     add_test(NAME "kompute_${_TEST_NAME}_tests" COMMAND "${_TEST_NAME}_tests")
     # Group under the "tests" project folder in IDEs such as Visual Studio.
     set_property(TARGET ${_TEST_NAME}_tests PROPERTY FOLDER "tests")