diff --git a/kwin/libkdecorations/CMakeLists.txt b/kwin/libkdecorations/CMakeLists.txt
index 4fa03bc1..fc8e83a8 100644
--- a/kwin/libkdecorations/CMakeLists.txt
+++ b/kwin/libkdecorations/CMakeLists.txt
@@ -9,8 +9,8 @@ set(kdecorations_LIB_SRCS
 
 kde4_add_library(kdecorations SHARED ${kdecorations_LIB_SRCS})
 
-target_link_libraries(kdecorations ${KDE4_KDEUI_LIBS})
-target_link_libraries(kdecorations LINK_INTERFACE_LIBRARIES ${KDE4_KDEUI_LIBS})
+target_link_libraries(kdecorations PRIVATE ${KDE4_KDEUI_LIBS})
+target_link_libraries(kdecorations PUBLIC ${KDE4_KDEUI_LIBS})
 
 set_target_properties(kdecorations PROPERTIES
    VERSION ${GENERIC_LIB_VERSION}
diff --git a/kwin/libkwineffects/CMakeLists.txt b/kwin/libkwineffects/CMakeLists.txt
index 6c37e798..ab51b19e 100644
--- a/kwin/libkwineffects/CMakeLists.txt
+++ b/kwin/libkwineffects/CMakeLists.txt
@@ -32,7 +32,7 @@ set(kwineffects_XCB_LIBS
 )
 
 kde4_add_library(kwineffects SHARED ${kwin_EFFECTSLIB_SRCS})
-target_link_libraries(kwineffects
+target_link_libraries(kwineffects PRIVATE
     ${kwineffects_QT_LIBS}
     ${kwineffects_KDE_LIBS}
     ${kwineffects_XLIB_LIBS}
@@ -58,13 +58,13 @@ macro( KWIN4_ADD_GLUTILS_BACKEND name glinclude )
         include_directories(${OPENGLES_EGL_INCLUDE_DIR})
     endif()
     kde4_add_library(${name} SHARED ${kwin_GLUTILSLIB_SRCS})
-    target_link_libraries(${name} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${kwineffects_XLIB_LIBS} ${kwineffects_XCB_LIBS} kwineffects)
+    target_link_libraries(${name} PRIVATE ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${kwineffects_XLIB_LIBS} ${kwineffects_XCB_LIBS} kwineffects)
     if(OPENGL_EGL_FOUND)
-        target_link_libraries(${name} ${OPENGLES_EGL_LIBRARY})
+        target_link_libraries(${name} PRIVATE ${OPENGLES_EGL_LIBRARY})
     endif()
     set_target_properties(${name} PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
-    target_link_libraries(${name} ${ARGN})
-    target_link_libraries(${name} LINK_INTERFACE_LIBRARIES ${ARGN})
+    target_link_libraries(${name} PRIVATE ${ARGN})
+    target_link_libraries(${name} PUBLIC ${ARGN})
 
     install(TARGETS ${name} EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
 endmacro()
@@ -82,12 +82,12 @@ if(OPENGL_FOUND)
         set_target_properties(kwinglutils PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGL_1)
     endif()
 
-    target_link_libraries(kwinglutils ${OPENGL_gl_LIBRARY})
-    target_link_libraries(kwinglutils LINK_INTERFACE_LIBRARIES ${OPENGL_gl_LIBRARY})
+    target_link_libraries(kwinglutils PRIVATE ${OPENGL_gl_LIBRARY})
+    target_link_libraries(kwinglutils PUBLIC ${OPENGL_gl_LIBRARY})
     # -ldl used by OpenGL code
     find_library(DL_LIBRARY dl)
     if (DL_LIBRARY)
-        target_link_libraries(kwinglutils ${DL_LIBRARY})
+        target_link_libraries(kwinglutils PRIVATE ${DL_LIBRARY})
     endif()
 endif()
 
diff --git a/libs/ksysguard/processcore/CMakeLists.txt b/libs/ksysguard/processcore/CMakeLists.txt
index 637d0901..061ff955 100644
--- a/libs/ksysguard/processcore/CMakeLists.txt
+++ b/libs/ksysguard/processcore/CMakeLists.txt
@@ -14,11 +14,11 @@ set(ksysguard_LIB_SRCS
 
 kde4_add_library(processcore SHARED ${ksysguard_LIB_SRCS})
 
-target_link_libraries(processcore ${KDE4_KDECORE_LIBS} ${ZLIB_LIBRARIES} )
-target_link_libraries(processcore LINK_INTERFACE_LIBRARIES ${KDE4_KDECORE_LIBS} )
+target_link_libraries(processcore PRIVATE ${KDE4_KDECORE_LIBS} ${ZLIB_LIBRARIES} )
+target_link_libraries(processcore PUBLIC ${KDE4_KDECORE_LIBS} )
 if( ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" )
   message(STATUS "Adding kvm library on NetBSD")
-  target_link_libraries(processcore kvm)
+  target_link_libraries(processcore PRIVATE kvm)
 endif( ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" )
 
 set_target_properties(processcore PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
diff --git a/libs/ksysguard/processui/CMakeLists.txt b/libs/ksysguard/processui/CMakeLists.txt
index f22262a0..ca535dd0 100644
--- a/libs/ksysguard/processui/CMakeLists.txt
+++ b/libs/ksysguard/processui/CMakeLists.txt
@@ -23,12 +23,12 @@ kde4_add_ui_files( processui_LIB_SRCS
 kde4_add_library(processui SHARED ${processui_LIB_SRCS})
 
 if(X11_XRes_FOUND)
-  target_link_libraries(processui ${X11_XRes_LIB} ${X11_LIBRARIES})
+  target_link_libraries(processui PRIVATE ${X11_XRes_LIB} ${X11_LIBRARIES})
   include_directories(${X11_XRes_INCLUDE_PATH})
 endif(X11_XRes_FOUND)
 
-target_link_libraries(processui ${KDE4_KDEUI_LIBS} ${QT_QTSCRIPT_LIBRARY} ${QT_QTWEBKIT_LIBRARY} processcore)
-target_link_libraries(processui LINK_INTERFACE_LIBRARIES ${KDE4_KDEUI_LIBS} processcore)
+target_link_libraries(processui PRIVATE ${KDE4_KDEUI_LIBS} ${QT_QTSCRIPT_LIBRARY} ${QT_QTWEBKIT_LIBRARY} processcore)
+target_link_libraries(processui PUBLIC ${KDE4_KDEUI_LIBS} processcore)
 
 
 set_target_properties(processui
diff --git a/libs/ksysguard/signalplotter/CMakeLists.txt b/libs/ksysguard/signalplotter/CMakeLists.txt
index e75670cc..6047a3a5 100644
--- a/libs/ksysguard/signalplotter/CMakeLists.txt
+++ b/libs/ksysguard/signalplotter/CMakeLists.txt
@@ -8,8 +8,8 @@ set(ksignalplotter_LIB_SRCS
 
 kde4_add_library(ksignalplotter SHARED ${ksignalplotter_LIB_SRCS})
 
-target_link_libraries(ksignalplotter ${KDE4_KDEUI_LIBS})
-target_link_libraries(ksignalplotter LINK_INTERFACE_LIBRARIES ${KDE4_KDEUI_LIBS})
+target_link_libraries(ksignalplotter PRIVATE ${KDE4_KDEUI_LIBS})
+target_link_libraries(ksignalplotter PUBLIC ${KDE4_KDEUI_LIBS})
 
 set_target_properties(ksignalplotter
    PROPERTIES VERSION ${GENERIC_LIB_VERSION}
diff --git a/plasma/generic/dataengines/geolocation/CMakeLists.txt b/plasma/generic/dataengines/geolocation/CMakeLists.txt
index e911d593..9192834d 100644
--- a/plasma/generic/dataengines/geolocation/CMakeLists.txt
+++ b/plasma/generic/dataengines/geolocation/CMakeLists.txt
@@ -4,9 +4,9 @@ project(geolocation)
 
 set(plasma_geolocation_interface_SRCS geolocationprovider.cpp)
 kde4_add_library(plasma-geolocation-interface SHARED ${plasma_geolocation_interface_SRCS})
-target_link_libraries(plasma-geolocation-interface ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS})
+target_link_libraries(plasma-geolocation-interface PRIVATE ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS})
 target_link_libraries(plasma-geolocation-interface
-                      LINK_INTERFACE_LIBRARIES ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS})
+                      PUBLIC ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS})
 set_target_properties(plasma-geolocation-interface PROPERTIES
    VERSION ${GENERIC_LIB_VERSION}
    SOVERSION ${GENERIC_LIB_SOVERSION}
diff --git a/plasma/generic/dataengines/weather/ions/CMakeLists.txt b/plasma/generic/dataengines/weather/ions/CMakeLists.txt
index 5e2a4ff3..4ff6f2dd 100644
--- a/plasma/generic/dataengines/weather/ions/CMakeLists.txt
+++ b/plasma/generic/dataengines/weather/ions/CMakeLists.txt
@@ -1,8 +1,8 @@
 # the Ion shared library
 set (ionlib_SRCS ion.cpp)
 kde4_add_library (weather_ion SHARED ${ionlib_SRCS})
-target_link_libraries (weather_ion ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS})
-target_link_libraries (weather_ion LINK_INTERFACE_LIBRARIES ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS})
+target_link_libraries (weather_ion PRIVATE ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS})
+target_link_libraries (weather_ion PUBLIC ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS})
 
 set_target_properties(weather_ion PROPERTIES
    VERSION 6.0.0