diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index 8be9a35a14..1ab8842d52 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -3,7 +3,7 @@
 ########################################################
 set( testScreenPaintData_SRCS test_screen_paint_data.cpp )
 add_executable(testScreenPaintData ${testScreenPaintData_SRCS})
-target_link_libraries( testScreenPaintData kwineffects Qt5::Test Qt5::Widgets)
+target_link_libraries( testScreenPaintData kwineffects Qt5::Test Qt5::Widgets KF5::WindowSystem)
 add_test(kwin-testScreenPaintData testScreenPaintData)
 ecm_mark_as_test(testScreenPaintData)
 
@@ -55,6 +55,7 @@ target_link_libraries( testClientMachine
                        Qt5::Widgets
                        KF5::ConfigCore
                        KF5::WindowSystem
+                       KF5::Service
                        XCB::XCB
                        XCB::XFIXES
                        ${X11_X11_LIB} # to make jenkins happy
diff --git a/libkwineffects/CMakeLists.txt b/libkwineffects/CMakeLists.txt
index a16adcd290..112b2a4361 100644
--- a/libkwineffects/CMakeLists.txt
+++ b/libkwineffects/CMakeLists.txt
@@ -29,6 +29,7 @@ set(kwineffects_XCB_LIBS
 add_library(kwineffects SHARED ${kwin_EFFECTSLIB_SRCS})
 generate_export_header(kwineffects EXPORT_FILE_NAME kwineffects_export.h)
 target_link_libraries(kwineffects
+PUBLIC
     ${kwineffects_QT_LIBS}
     ${kwineffects_KDE_LIBS}
     ${kwineffects_XCB_LIBS}
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f7f504ca0f..39566e1671 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,7 +1,7 @@
 if (XCB_ICCCM_FOUND)
     set(normalhintsbasesizetest_SRCS normalhintsbasesizetest.cpp)
     add_executable(normalhintsbasesizetest ${normalhintsbasesizetest_SRCS})
-    target_link_libraries(normalhintsbasesizetest XCB::XCB XCB::ICCCM)
+    target_link_libraries(normalhintsbasesizetest XCB::XCB XCB::ICCCM KF5::WindowSystem)
 endif()
 
 # next target