diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt
index f44399324..bbd722039 100644
--- a/effects/CMakeLists.txt
+++ b/effects/CMakeLists.txt
@@ -1,207 +1,206 @@
 # KI18N Translation Domain for this library
 add_definitions(-DTRANSLATION_DOMAIN=\"kwin_effects\" -DEFFECT_BUILTINS)
 
 include_directories(${KWIN_SOURCE_DIR}) # for xcbutils.h
 
 set(kwin_effect_OWN_LIBS
     kwineffects
 )
 
 if (KWIN_HAVE_XRENDER_COMPOSITING)
     set(kwin_effect_OWN_LIBS ${kwin_effect_OWN_LIBS} kwinxrenderutils)
 endif()
 
 set(kwin_effect_KDE_LIBS
     KF5::ConfigGui
     KF5::ConfigWidgets
     KF5::GlobalAccel
     KF5::I18n
     KF5::IconThemes
     KF5::Notifications # screenshot effect
     KF5::Plasma # screenedge effect
-    KF5::Service
     KF5::WindowSystem
 )
 
 set(kwin_effect_QT_LIBS
     Qt5::Concurrent
     Qt5::DBus
     Qt5::Quick
     Qt5::X11Extras
 )
 
 set(kwin_effect_XLIB_LIBS
     ${X11_X11_LIB}
 )
 
 set(kwin_effect_XCB_LIBS
     XCB::IMAGE
     XCB::XCB
     XCB::XFIXES
 )
 
 if (KWIN_HAVE_XRENDER_COMPOSITING)
     set(kwin_effect_XCB_LIBS ${kwin_effect_XCB_LIBS} XCB::RENDER)
 endif()
 
 set(kwin_effect_OWN_LIBS ${kwin_effect_OWN_LIBS} kwinglutils)
 
 macro(KWIN4_ADD_EFFECT_BACKEND name)
     add_library(${name} SHARED ${ARGN})
     target_link_libraries(${name} PRIVATE
         ${kwin_effect_KDE_LIBS}
         ${kwin_effect_OWN_LIBS}
         ${kwin_effect_QT_LIBS}
         ${kwin_effect_XCB_LIBS}
         ${kwin_effect_XLIB_LIBS}
     )
 endmacro()
 
 # Adds effect plugin with given name. Sources are given after the name
 macro(KWIN4_ADD_EFFECT name)
     kwin4_add_effect_backend(kwin4_effect_${name} ${ARGN})
 
     set_target_properties(kwin4_effect_${name} PROPERTIES VERSION 1.0.0 SOVERSION 1)
     set_target_properties(kwin4_effect_${name} PROPERTIES OUTPUT_NAME ${KWIN_NAME}4_effect_${name})
     install(TARGETS kwin4_effect_${name} ${INSTALL_TARGETS_DEFAULT_ARGS})
 endmacro()
 
 # Install the KWin/Effect service type
 install(FILES kwineffect.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
 
 # Create initial variables
 set(kwin4_effect_include_directories)
 
 set(kwin4_effect_builtins_sources
     blur/blur.cpp
     blur/blurshader.cpp
     colorpicker/colorpicker.cpp
     coverswitch/coverswitch.cpp
     cube/cube.cpp
     cube/cube_proxy.cpp
     cubeslide/cubeslide.cpp
     desktopgrid/desktopgrid.cpp
     diminactive/diminactive.cpp
     effect_builtins.cpp
     flipswitch/flipswitch.cpp
     glide/glide.cpp
     invert/invert.cpp
     logging.cpp
     lookingglass/lookingglass.cpp
     magiclamp/magiclamp.cpp
     magnifier/magnifier.cpp
     mouseclick/mouseclick.cpp
     mousemark/mousemark.cpp
     presentwindows/presentwindows.cpp
     presentwindows/presentwindows_proxy.cpp
     resize/resize.cpp
     showfps/showfps.cpp
     showpaint/showpaint.cpp
     slide/slide.cpp
     thumbnailaside/thumbnailaside.cpp
     touchpoints/touchpoints.cpp
     trackmouse/trackmouse.cpp
     windowgeometry/windowgeometry.cpp
     wobblywindows/wobblywindows.cpp
     zoom/zoom.cpp
 )
 
 qt5_add_resources(kwin4_effect_builtins_sources shaders.qrc)
 
 kconfig_add_kcfg_files(kwin4_effect_builtins_sources
     blur/blurconfig.kcfgc
     coverswitch/coverswitchconfig.kcfgc
     cube/cubeconfig.kcfgc
     cubeslide/cubeslideconfig.kcfgc
     desktopgrid/desktopgridconfig.kcfgc
     diminactive/diminactiveconfig.kcfgc
     fallapart/fallapartconfig.kcfgc
     flipswitch/flipswitchconfig.kcfgc
     glide/glideconfig.kcfgc
     lookingglass/lookingglassconfig.kcfgc
     magiclamp/magiclampconfig.kcfgc
     magnifier/magnifierconfig.kcfgc
     mouseclick/mouseclickconfig.kcfgc
     mousemark/mousemarkconfig.kcfgc
     presentwindows/presentwindowsconfig.kcfgc
     resize/resizeconfig.kcfgc
     showfps/showfpsconfig.kcfgc
     slide/slideconfig.kcfgc
     slidingpopups/slidingpopupsconfig.kcfgc
     thumbnailaside/thumbnailasideconfig.kcfgc
     trackmouse/trackmouseconfig.kcfgc
     windowgeometry/windowgeometryconfig.kcfgc
     wobblywindows/wobblywindowsconfig.kcfgc
     zoom/zoomconfig.kcfgc
 )
 
 # scripted effects
 function(install_scripted_effect name)
     kpackage_install_package(${name}/package kwin4_effect_${name} effects kwin)
 
     # necessary so tests are found without installing
     file(COPY ${name}/package/contents ${name}/package/metadata.desktop DESTINATION ${CMAKE_BINARY_DIR}/bin/kwin/effects/kwin4_effect_${name})
 endfunction()
 install_scripted_effect(dialogparent)
 install_scripted_effect(dimscreen)
 install_scripted_effect(eyeonscreen)
 install_scripted_effect(fade)
 install_scripted_effect(fadedesktop)
 install_scripted_effect(fadingpopups)
 install_scripted_effect(frozenapp)
 install_scripted_effect(login)
 install_scripted_effect(logout)
 install_scripted_effect(maximize)
 install_scripted_effect(morphingpopups)
 install_scripted_effect(scale)
 install_scripted_effect(squash)
 install_scripted_effect(translucency)
 install_scripted_effect(windowaperture)
 install_scripted_effect(sessionquit)
 
 ###############################################################################
 # Built-in effects go here
 
 # Common effects
 add_subdirectory(desktopgrid)
 add_subdirectory(diminactive)
 include(fallapart/CMakeLists.txt)
 include(highlightwindow/CMakeLists.txt)
 include(kscreen/CMakeLists.txt)
 add_subdirectory(magiclamp)
 add_subdirectory(presentwindows)
 add_subdirectory(resize)
 include(screenedge/CMakeLists.txt)
 add_subdirectory(showfps)
 add_subdirectory(showpaint)
 add_subdirectory(slide)
 include(slideback/CMakeLists.txt)
 include(slidingpopups/CMakeLists.txt)
 add_subdirectory(thumbnailaside)
 add_subdirectory(windowgeometry)
 add_subdirectory(zoom)
 
 # OpenGL-specific effects
 add_subdirectory(blur)
 include(backgroundcontrast/CMakeLists.txt)
 add_subdirectory(coverswitch)
 add_subdirectory(cube)
 add_subdirectory(cubeslide)
 add_subdirectory(flipswitch)
 add_subdirectory(glide)
 add_subdirectory(invert)
 add_subdirectory(lookingglass)
 add_subdirectory(magnifier)
 add_subdirectory(mouseclick)
 add_subdirectory(mousemark)
 include(screenshot/CMakeLists.txt)
 include(sheet/CMakeLists.txt)
 include(snaphelper/CMakeLists.txt)
 include(startupfeedback/CMakeLists.txt)
 add_subdirectory(trackmouse)
 add_subdirectory(wobblywindows)
 
 ###############################################################################
 
 # Add the builtins plugin
 kwin4_add_effect(builtins ${kwin4_effect_builtins_sources})
diff --git a/effects/blur/CMakeLists.txt b/effects/blur/CMakeLists.txt
index 7a84e4ee5..c1d9bd9a4 100644
--- a/effects/blur/CMakeLists.txt
+++ b/effects/blur/CMakeLists.txt
@@ -1,24 +1,23 @@
 #######################################
 # Config
 set(kwin_blur_config_SRCS blur_config.cpp)
 ki18n_wrap_ui(kwin_blur_config_SRCS blur_config.ui)
 qt5_add_dbus_interface(kwin_blur_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface)
 kconfig_add_kcfg_files(kwin_blur_config_SRCS blurconfig.kcfgc)
 
 add_library(kwin_blur_config MODULE ${kwin_blur_config_SRCS})
 
 target_link_libraries(kwin_blur_config
     KF5::ConfigWidgets
     KF5::I18n
-    KF5::Service
     Qt5::DBus
 )
 
 kcoreaddons_desktop_to_json(kwin_blur_config blur_config.desktop SERVICE_TYPES kcmodule.desktop)
 
 install(
     TARGETS
         kwin_blur_config
     DESTINATION
         ${PLUGIN_INSTALL_DIR}/kwin/effects/configs
 )
diff --git a/effects/coverswitch/CMakeLists.txt b/effects/coverswitch/CMakeLists.txt
index af789e8c9..56b7a8190 100644
--- a/effects/coverswitch/CMakeLists.txt
+++ b/effects/coverswitch/CMakeLists.txt
@@ -1,27 +1,26 @@
 #######################################
 # Effect
 
 #######################################
 # Config
 set(kwin_coverswitch_config_SRCS coverswitch_config.cpp)
 ki18n_wrap_ui(kwin_coverswitch_config_SRCS coverswitch_config.ui)
 qt5_add_dbus_interface(kwin_coverswitch_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface)
 kconfig_add_kcfg_files(kwin_coverswitch_config_SRCS coverswitchconfig.kcfgc)
 
 add_library(kwin_coverswitch_config MODULE ${kwin_coverswitch_config_SRCS})
 
 target_link_libraries(kwin_coverswitch_config
     KF5::ConfigWidgets
     KF5::I18n
-    KF5::Service
     Qt5::DBus
 )
 
 kcoreaddons_desktop_to_json(kwin_coverswitch_config coverswitch_config.desktop SERVICE_TYPES kcmodule.desktop)
 
 install(
     TARGETS
         kwin_coverswitch_config
     DESTINATION
         ${PLUGIN_INSTALL_DIR}/kwin/effects/configs
 )
diff --git a/effects/cube/CMakeLists.txt b/effects/cube/CMakeLists.txt
index ae06792b7..c80b3e50a 100644
--- a/effects/cube/CMakeLists.txt
+++ b/effects/cube/CMakeLists.txt
@@ -1,33 +1,32 @@
 #######################################
 # Effect
 
 # Data files
 install(FILES data/cubecap.png DESTINATION ${DATA_INSTALL_DIR}/kwin)
 
 #######################################
 # Config
 
 set(kwin_cube_config_SRCS cube_config.cpp)
 ki18n_wrap_ui(kwin_cube_config_SRCS cube_config.ui)
 qt5_add_dbus_interface(kwin_cube_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface)
 kconfig_add_kcfg_files(kwin_cube_config_SRCS cubeconfig.kcfgc)
 
 add_library(kwin_cube_config MODULE ${kwin_cube_config_SRCS})
 
 target_link_libraries(kwin_cube_config
     KF5::ConfigWidgets
     KF5::GlobalAccel
     KF5::I18n
     KF5::XmlGui
     KF5::KIOWidgets
-    KF5::Service
 )
 
 kcoreaddons_desktop_to_json(kwin_cube_config cube_config.desktop SERVICE_TYPES kcmodule.desktop)
 
 install(
     TARGETS
         kwin_cube_config
     DESTINATION
         ${PLUGIN_INSTALL_DIR}/kwin/effects/configs
 )
diff --git a/effects/cubeslide/CMakeLists.txt b/effects/cubeslide/CMakeLists.txt
index 8bb595121..2836614bc 100644
--- a/effects/cubeslide/CMakeLists.txt
+++ b/effects/cubeslide/CMakeLists.txt
@@ -1,25 +1,24 @@
 #######################################
 # Config
 
 set(kwin_cubeslide_config_SRCS cubeslide_config.cpp)
 ki18n_wrap_ui(kwin_cubeslide_config_SRCS cubeslide_config.ui)
 qt5_add_dbus_interface(kwin_cubeslide_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface)
 kconfig_add_kcfg_files(kwin_cubeslide_config_SRCS cubeslideconfig.kcfgc)
 
 add_library(kwin_cubeslide_config MODULE ${kwin_cubeslide_config_SRCS})
 
 target_link_libraries(kwin_cubeslide_config
     KF5::ConfigWidgets
     KF5::I18n
-    KF5::Service
     kwineffects
 )
 
 kcoreaddons_desktop_to_json(kwin_cubeslide_config cubeslide_config.desktop SERVICE_TYPES kcmodule.desktop)
 
 install(
     TARGETS
         kwin_cubeslide_config
     DESTINATION
         ${PLUGIN_INSTALL_DIR}/kwin/effects/configs
 )
diff --git a/effects/desktopgrid/CMakeLists.txt b/effects/desktopgrid/CMakeLists.txt
index 151021ace..807ff0e69 100644
--- a/effects/desktopgrid/CMakeLists.txt
+++ b/effects/desktopgrid/CMakeLists.txt
@@ -1,32 +1,31 @@
 #######################################
 # Effect
 install(FILES main.qml DESTINATION ${DATA_INSTALL_DIR}/kwin/effects/desktopgrid/)
 
 #######################################
 # Config
 set(kwin_desktopgrid_config_SRCS desktopgrid_config.cpp)
 ki18n_wrap_ui(kwin_desktopgrid_config_SRCS desktopgrid_config.ui)
 qt5_add_dbus_interface(kwin_desktopgrid_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface)
 kconfig_add_kcfg_files(kwin_desktopgrid_config_SRCS desktopgridconfig.kcfgc)
 
 add_library(kwin_desktopgrid_config MODULE ${kwin_desktopgrid_config_SRCS})
 
 target_link_libraries(kwin_desktopgrid_config
     KF5::Completion
     KF5::ConfigWidgets
     KF5::GlobalAccel
     KF5::I18n
-    KF5::Service
     KF5::XmlGui
     Qt5::Quick
     kwineffects
 )
 
 kcoreaddons_desktop_to_json(kwin_desktopgrid_config desktopgrid_config.desktop SERVICE_TYPES kcmodule.desktop SERVICE_TYPES kcmodule.desktop)
 
 install(
     TARGETS
         kwin_desktopgrid_config
     DESTINATION
         ${PLUGIN_INSTALL_DIR}/kwin/effects/configs
 )
diff --git a/effects/diminactive/CMakeLists.txt b/effects/diminactive/CMakeLists.txt
index dc9e46711..2aad1ea1b 100644
--- a/effects/diminactive/CMakeLists.txt
+++ b/effects/diminactive/CMakeLists.txt
@@ -1,24 +1,23 @@
 #######################################
 # Config
 set(kwin_diminactive_config_SRCS diminactive_config.cpp)
 ki18n_wrap_ui(kwin_diminactive_config_SRCS diminactive_config.ui)
 qt5_add_dbus_interface(kwin_diminactive_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface)
 kconfig_add_kcfg_files(kwin_diminactive_config_SRCS diminactiveconfig.kcfgc)
 
 add_library(kwin_diminactive_config MODULE ${kwin_diminactive_config_SRCS})
 
 target_link_libraries(kwin_diminactive_config
     KF5::ConfigWidgets
     KF5::I18n
-    KF5::Service
     Qt5::DBus
 )
 
 kcoreaddons_desktop_to_json(kwin_diminactive_config diminactive_config.desktop SERVICE_TYPES kcmodule.desktop)
 
 install(
     TARGETS
         kwin_diminactive_config
     DESTINATION
         ${PLUGIN_INSTALL_DIR}/kwin/effects/configs
 )
diff --git a/effects/flipswitch/CMakeLists.txt b/effects/flipswitch/CMakeLists.txt
index 691528423..b1160a027 100644
--- a/effects/flipswitch/CMakeLists.txt
+++ b/effects/flipswitch/CMakeLists.txt
@@ -1,25 +1,24 @@
 #######################################
 # Config
 set(kwin_flipswitch_config_SRCS flipswitch_config.cpp)
 ki18n_wrap_ui(kwin_flipswitch_config_SRCS flipswitch_config.ui)
 qt5_add_dbus_interface(kwin_flipswitch_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface)
 kconfig_add_kcfg_files(kwin_flipswitch_config_SRCS flipswitchconfig.kcfgc)
 
 add_library(kwin_flipswitch_config MODULE ${kwin_flipswitch_config_SRCS})
 
 target_link_libraries(kwin_flipswitch_config
     KF5::ConfigWidgets
     KF5::GlobalAccel
     KF5::I18n
-    KF5::Service
     KF5::XmlGui
 )
 
 kcoreaddons_desktop_to_json(kwin_flipswitch_config flipswitch_config.desktop SERVICE_TYPES kcmodule.desktop)
 
 install(
     TARGETS
         kwin_flipswitch_config
     DESTINATION
         ${PLUGIN_INSTALL_DIR}/kwin/effects/configs
 )
diff --git a/effects/glide/CMakeLists.txt b/effects/glide/CMakeLists.txt
index 9beb58782..7b7c3e17e 100644
--- a/effects/glide/CMakeLists.txt
+++ b/effects/glide/CMakeLists.txt
@@ -1,25 +1,24 @@
 #######################################
 # Config
 set(kwin_glide_config_SRCS glide_config.cpp)
 ki18n_wrap_ui(kwin_glide_config_SRCS glide_config.ui)
 qt5_add_dbus_interface(kwin_glide_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface)
 kconfig_add_kcfg_files(kwin_glide_config_SRCS glideconfig.kcfgc)
 
 add_library(kwin_glide_config MODULE ${kwin_glide_config_SRCS})
 
 target_link_libraries(kwin_glide_config
     KF5::ConfigWidgets
     KF5::I18n
-    KF5::Service
     Qt5::DBus
 )
 
 kcoreaddons_desktop_to_json(kwin_glide_config glide_config.desktop SERVICE_TYPES kcmodule.desktop)
 
 install(
     TARGETS
         kwin_glide_config
     DESTINATION
         ${PLUGIN_INSTALL_DIR}/kwin/effects/configs
 )
 
diff --git a/effects/invert/CMakeLists.txt b/effects/invert/CMakeLists.txt
index c81978d0e..d20368f13 100644
--- a/effects/invert/CMakeLists.txt
+++ b/effects/invert/CMakeLists.txt
@@ -1,26 +1,25 @@
 #######################################
 # Effect
 
 #######################################
 # Config
 set(kwin_invert_config_SRCS invert_config.cpp)
 qt5_add_dbus_interface(kwin_invert_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface)
 
 add_library(kwin_invert_config MODULE ${kwin_invert_config_SRCS})
 
 target_link_libraries(kwin_invert_config
     KF5::ConfigWidgets
     KF5::GlobalAccel
     KF5::I18n
-    KF5::Service
     KF5::XmlGui
 )
 
 kcoreaddons_desktop_to_json(kwin_invert_config invert_config.desktop SERVICE_TYPES kcmodule.desktop)
 
 install(
     TARGETS
         kwin_invert_config
     DESTINATION
         ${PLUGIN_INSTALL_DIR}/kwin/effects/configs
 )
diff --git a/effects/lookingglass/CMakeLists.txt b/effects/lookingglass/CMakeLists.txt
index 4e5c3efdb..288d5f2c8 100644
--- a/effects/lookingglass/CMakeLists.txt
+++ b/effects/lookingglass/CMakeLists.txt
@@ -1,28 +1,27 @@
 #######################################
 # Effect
 
 #######################################
 # Config
 set(kwin_lookingglass_config_SRCS lookingglass_config.cpp)
 ki18n_wrap_ui(kwin_lookingglass_config_SRCS lookingglass_config.ui)
 qt5_add_dbus_interface(kwin_lookingglass_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface)
 kconfig_add_kcfg_files(kwin_lookingglass_config_SRCS lookingglassconfig.kcfgc)
 
 add_library(kwin_lookingglass_config MODULE ${kwin_lookingglass_config_SRCS})
 
 target_link_libraries(kwin_lookingglass_config
     KF5::ConfigWidgets
     KF5::GlobalAccel
     KF5::I18n
-    KF5::Service
     KF5::XmlGui
 )
 
 kcoreaddons_desktop_to_json(kwin_lookingglass_config lookingglass_config.desktop SERVICE_TYPES kcmodule.desktop)
 
 install(
     TARGETS
         kwin_lookingglass_config
     DESTINATION
         ${PLUGIN_INSTALL_DIR}/kwin/effects/configs
 )
diff --git a/effects/magiclamp/CMakeLists.txt b/effects/magiclamp/CMakeLists.txt
index 073546bf2..ebeed364d 100644
--- a/effects/magiclamp/CMakeLists.txt
+++ b/effects/magiclamp/CMakeLists.txt
@@ -1,24 +1,23 @@
 #######################################
 # Config
 set(kwin_magiclamp_config_SRCS magiclamp_config.cpp)
 ki18n_wrap_ui(kwin_magiclamp_config_SRCS magiclamp_config.ui)
 qt5_add_dbus_interface(kwin_magiclamp_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface)
 kconfig_add_kcfg_files(kwin_magiclamp_config_SRCS magiclampconfig.kcfgc)
 
 add_library(kwin_magiclamp_config MODULE ${kwin_magiclamp_config_SRCS})
 
 target_link_libraries(kwin_magiclamp_config
     KF5::ConfigWidgets
     KF5::I18n
-    KF5::Service
     Qt5::DBus
 )
 
 kcoreaddons_desktop_to_json(kwin_magiclamp_config magiclamp_config.desktop SERVICE_TYPES kcmodule.desktop)
 
 install(
     TARGETS
         kwin_magiclamp_config
     DESTINATION
         ${PLUGIN_INSTALL_DIR}/kwin/effects/configs
 )
diff --git a/effects/magnifier/CMakeLists.txt b/effects/magnifier/CMakeLists.txt
index 9aa1dcad1..758a76463 100644
--- a/effects/magnifier/CMakeLists.txt
+++ b/effects/magnifier/CMakeLists.txt
@@ -1,25 +1,24 @@
 #######################################
 # Config
 set(kwin_magnifier_config_SRCS magnifier_config.cpp)
 ki18n_wrap_ui(kwin_magnifier_config_SRCS magnifier_config.ui)
 qt5_add_dbus_interface(kwin_magnifier_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface)
 kconfig_add_kcfg_files(kwin_magnifier_config_SRCS magnifierconfig.kcfgc)
 
 add_library(kwin_magnifier_config MODULE ${kwin_magnifier_config_SRCS})
 
 target_link_libraries(kwin_magnifier_config
     KF5::ConfigWidgets
     KF5::GlobalAccel
     KF5::I18n
-    KF5::Service
     KF5::XmlGui
 )
 
 kcoreaddons_desktop_to_json(kwin_magnifier_config magnifier_config.desktop SERVICE_TYPES kcmodule.desktop)
 
 install(
     TARGETS
         kwin_magnifier_config
     DESTINATION
         ${PLUGIN_INSTALL_DIR}/kwin/effects/configs
 )
diff --git a/effects/mouseclick/CMakeLists.txt b/effects/mouseclick/CMakeLists.txt
index f4bdb5ee5..92b0ae6b8 100644
--- a/effects/mouseclick/CMakeLists.txt
+++ b/effects/mouseclick/CMakeLists.txt
@@ -1,26 +1,25 @@
 ##########################
 ## configurtion dialog 
 ##########################
 set(kwin_mouseclick_config_SRCS mouseclick_config.cpp)
 ki18n_wrap_ui(kwin_mouseclick_config_SRCS mouseclick_config.ui)
 qt5_add_dbus_interface(kwin_mouseclick_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface)
 kconfig_add_kcfg_files(kwin_mouseclick_config_SRCS mouseclickconfig.kcfgc)
 
 add_library(kwin_mouseclick_config MODULE ${kwin_mouseclick_config_SRCS})
 
 target_link_libraries(kwin_mouseclick_config
     KF5::ConfigWidgets
     KF5::GlobalAccel
     KF5::I18n
-    KF5::Service
     KF5::XmlGui
 )
 
 kcoreaddons_desktop_to_json(kwin_mouseclick_config mouseclick_config.desktop SERVICE_TYPES kcmodule.desktop)
 
 install(
     TARGETS
         kwin_mouseclick_config
     DESTINATION
         ${PLUGIN_INSTALL_DIR}/kwin/effects/configs
 )
diff --git a/effects/mousemark/CMakeLists.txt b/effects/mousemark/CMakeLists.txt
index 9002f7c34..1a8056e07 100644
--- a/effects/mousemark/CMakeLists.txt
+++ b/effects/mousemark/CMakeLists.txt
@@ -1,26 +1,25 @@
 #######################################
 # Config
 set(kwin_mousemark_config_SRCS mousemark_config.cpp)
 ki18n_wrap_ui(kwin_mousemark_config_SRCS mousemark_config.ui)
 qt5_add_dbus_interface(kwin_mousemark_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface)
 kconfig_add_kcfg_files(kwin_mousemark_config_SRCS mousemarkconfig.kcfgc)
 
 add_library(kwin_mousemark_config MODULE ${kwin_mousemark_config_SRCS})
 
 target_link_libraries(kwin_mousemark_config
     KF5::ConfigWidgets
     KF5::GlobalAccel
     KF5::I18n
-    KF5::Service
     KF5::TextWidgets
     KF5::XmlGui
 )
 
 kcoreaddons_desktop_to_json(kwin_mousemark_config mousemark_config.desktop SERVICE_TYPES kcmodule.desktop)
 
 install(
     TARGETS
         kwin_mousemark_config
     DESTINATION
         ${PLUGIN_INSTALL_DIR}/kwin/effects/configs
 )
diff --git a/effects/presentwindows/CMakeLists.txt b/effects/presentwindows/CMakeLists.txt
index c513fad88..fc550ae31 100644
--- a/effects/presentwindows/CMakeLists.txt
+++ b/effects/presentwindows/CMakeLists.txt
@@ -1,30 +1,29 @@
 #######################################
 # Effect
 install(FILES main.qml DESTINATION ${DATA_INSTALL_DIR}/kwin/effects/presentwindows/)
 
 #######################################
 # Config
 set(kwin_presentwindows_config_SRCS presentwindows_config.cpp)
 ki18n_wrap_ui(kwin_presentwindows_config_SRCS presentwindows_config.ui)
 qt5_add_dbus_interface(kwin_presentwindows_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface)
 kconfig_add_kcfg_files(kwin_presentwindows_config_SRCS presentwindowsconfig.kcfgc)
 
 add_library(kwin_presentwindows_config MODULE ${kwin_presentwindows_config_SRCS})
 
 target_link_libraries(kwin_presentwindows_config
     KF5::Completion
     KF5::ConfigWidgets
     KF5::GlobalAccel
     KF5::I18n
-    KF5::Service
     KF5::XmlGui
 )
 
 kcoreaddons_desktop_to_json(kwin_presentwindows_config presentwindows_config.desktop SERVICE_TYPES kcmodule.desktop)
 
 install(
     TARGETS
         kwin_presentwindows_config
     DESTINATION
         ${PLUGIN_INSTALL_DIR}/kwin/effects/configs
 )
diff --git a/effects/resize/CMakeLists.txt b/effects/resize/CMakeLists.txt
index b6b77ed57..9b6293b86 100644
--- a/effects/resize/CMakeLists.txt
+++ b/effects/resize/CMakeLists.txt
@@ -1,24 +1,23 @@
 #######################################
 # Config
 set(kwin_resize_config_SRCS resize_config.cpp)
 ki18n_wrap_ui(kwin_resize_config_SRCS resize_config.ui)
 qt5_add_dbus_interface(kwin_resize_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface)
 kconfig_add_kcfg_files(kwin_resize_config_SRCS resizeconfig.kcfgc)
 
 add_library(kwin_resize_config MODULE ${kwin_resize_config_SRCS})
 
 target_link_libraries(kwin_resize_config
     KF5::ConfigWidgets
     KF5::I18n
-    KF5::Service
     Qt5::DBus
 )
 
 kcoreaddons_desktop_to_json(kwin_resize_config resize_config.desktop SERVICE_TYPES kcmodule.desktop)
 
 install(
     TARGETS
         kwin_resize_config
     DESTINATION
         ${PLUGIN_INSTALL_DIR}/kwin/effects/configs
 )
diff --git a/effects/showfps/CMakeLists.txt b/effects/showfps/CMakeLists.txt
index 3bdb7d24c..a3418d9a3 100644
--- a/effects/showfps/CMakeLists.txt
+++ b/effects/showfps/CMakeLists.txt
@@ -1,25 +1,24 @@
 #######################################
 # Config
 set(kwin_showfps_config_SRCS showfps_config.cpp)
 ki18n_wrap_ui(kwin_showfps_config_SRCS showfps_config.ui)
 qt5_add_dbus_interface(kwin_showfps_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface)
 kconfig_add_kcfg_files(kwin_showfps_config_SRCS showfpsconfig.kcfgc)
 
 add_library(kwin_showfps_config MODULE ${kwin_showfps_config_SRCS})
 
 target_link_libraries(kwin_showfps_config
     KF5::Completion
     KF5::ConfigWidgets
     KF5::I18n
-    KF5::Service
     Qt5::DBus
 )
 
 kcoreaddons_desktop_to_json(kwin_showfps_config showfps_config.desktop SERVICE_TYPES kcmodule.desktop)
 
 install(
     TARGETS
         kwin_showfps_config
     DESTINATION
         ${PLUGIN_INSTALL_DIR}/kwin/effects/configs
 )
diff --git a/effects/showpaint/CMakeLists.txt b/effects/showpaint/CMakeLists.txt
index dc1d7ef02..db12760d7 100644
--- a/effects/showpaint/CMakeLists.txt
+++ b/effects/showpaint/CMakeLists.txt
@@ -1,25 +1,24 @@
 #######################################
 
 # Config
 set(kwin_showpaint_config_SRCS showpaint_config.cpp)
 ki18n_wrap_ui(kwin_showpaint_config_SRCS showpaint_config.ui)
 
 add_library(kwin_showpaint_config MODULE ${kwin_showpaint_config_SRCS})
 
 target_link_libraries(kwin_showpaint_config
     KF5::ConfigWidgets
     KF5::GlobalAccel
     KF5::I18n
-    KF5::Service
     KF5::XmlGui
 )
 
 kcoreaddons_desktop_to_json(kwin_showpaint_config showpaint_config.desktop SERVICE_TYPES kcmodule.desktop)
 
 install(
     TARGETS
         kwin_showpaint_config
 
     DESTINATION
         ${PLUGIN_INSTALL_DIR}/kwin/effects/configs
 )
diff --git a/effects/slide/CMakeLists.txt b/effects/slide/CMakeLists.txt
index 2a974cd9d..718b903fb 100644
--- a/effects/slide/CMakeLists.txt
+++ b/effects/slide/CMakeLists.txt
@@ -1,24 +1,23 @@
 #######################################
 # Config
 set(kwin_slide_config_SRCS slide_config.cpp)
 ki18n_wrap_ui(kwin_slide_config_SRCS slide_config.ui)
 qt5_add_dbus_interface(kwin_slide_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface)
 kconfig_add_kcfg_files(kwin_slide_config_SRCS slideconfig.kcfgc)
 
 add_library(kwin_slide_config MODULE ${kwin_slide_config_SRCS})
 
 target_link_libraries(kwin_slide_config
     KF5::ConfigWidgets
     KF5::I18n
-    KF5::Service
     Qt5::DBus
 )
 
 kcoreaddons_desktop_to_json(kwin_slide_config slide_config.desktop SERVICE_TYPES kcmodule.desktop)
 
 install(
     TARGETS
         kwin_slide_config
     DESTINATION
         ${PLUGIN_INSTALL_DIR}/kwin/effects/configs
 )
diff --git a/effects/thumbnailaside/CMakeLists.txt b/effects/thumbnailaside/CMakeLists.txt
index ddcc7f06e..6e5caf6c7 100644
--- a/effects/thumbnailaside/CMakeLists.txt
+++ b/effects/thumbnailaside/CMakeLists.txt
@@ -1,25 +1,24 @@
 #######################################
 # Config
 set(kwin_thumbnailaside_config_SRCS thumbnailaside_config.cpp)
 ki18n_wrap_ui(kwin_thumbnailaside_config_SRCS thumbnailaside_config.ui)
 qt5_add_dbus_interface(kwin_thumbnailaside_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface)
 kconfig_add_kcfg_files(kwin_thumbnailaside_config_SRCS thumbnailasideconfig.kcfgc)
 
 add_library(kwin_thumbnailaside_config MODULE ${kwin_thumbnailaside_config_SRCS})
 
 target_link_libraries(kwin_thumbnailaside_config
     KF5::ConfigWidgets
     KF5::GlobalAccel
     KF5::I18n
-    KF5::Service
     KF5::XmlGui
 )
 
 kcoreaddons_desktop_to_json(kwin_thumbnailaside_config thumbnailaside_config.desktop SERVICE_TYPES kcmodule.desktop)
 
 install(
     TARGETS
         kwin_thumbnailaside_config
     DESTINATION
         ${PLUGIN_INSTALL_DIR}/kwin/effects/configs
 )
diff --git a/effects/trackmouse/CMakeLists.txt b/effects/trackmouse/CMakeLists.txt
index 19bad9f87..f467998fc 100644
--- a/effects/trackmouse/CMakeLists.txt
+++ b/effects/trackmouse/CMakeLists.txt
@@ -1,30 +1,29 @@
 #######################################
 # Effect
 # Data files
 install(FILES data/tm_inner.png data/tm_outer.png DESTINATION ${DATA_INSTALL_DIR}/kwin)
 
 #######################################
 # Config
 set(kwin_trackmouse_config_SRCS trackmouse_config.cpp)
 ki18n_wrap_ui(kwin_trackmouse_config_SRCS trackmouse_config.ui)
 qt5_add_dbus_interface(kwin_trackmouse_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface)
 kconfig_add_kcfg_files(kwin_trackmouse_config_SRCS trackmouseconfig.kcfgc)
 
 add_library(kwin_trackmouse_config MODULE ${kwin_trackmouse_config_SRCS})
 
 target_link_libraries(kwin_trackmouse_config
     KF5::ConfigWidgets
     KF5::GlobalAccel
     KF5::I18n
-    KF5::Service
     KF5::XmlGui
 )
 
 kcoreaddons_desktop_to_json(kwin_trackmouse_config trackmouse_config.desktop SERVICE_TYPES kcmodule.desktop)
 
 install(
     TARGETS
         kwin_trackmouse_config
     DESTINATION
         ${PLUGIN_INSTALL_DIR}/kwin/effects/configs
 )
diff --git a/effects/windowgeometry/CMakeLists.txt b/effects/windowgeometry/CMakeLists.txt
index de76562c1..0d13c4fd6 100644
--- a/effects/windowgeometry/CMakeLists.txt
+++ b/effects/windowgeometry/CMakeLists.txt
@@ -1,25 +1,24 @@
 #######################################
 # Config
 set(kwin_windowgeometry_config_SRCS windowgeometry_config.cpp)
 ki18n_wrap_ui(kwin_windowgeometry_config_SRCS windowgeometry_config.ui)
 qt5_add_dbus_interface(kwin_windowgeometry_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface)
 kconfig_add_kcfg_files(kwin_windowgeometry_config_SRCS windowgeometryconfig.kcfgc)
 
 add_library(kwin_windowgeometry_config MODULE ${kwin_windowgeometry_config_SRCS})
 
 target_link_libraries(kwin_windowgeometry_config
     KF5::ConfigWidgets
     KF5::GlobalAccel
     KF5::I18n
-    KF5::Service
     KF5::XmlGui
 )
 
 kcoreaddons_desktop_to_json(kwin_windowgeometry_config windowgeometry_config.desktop SERVICE_TYPES kcmodule.desktop)
 
 install(
     TARGETS
         kwin_windowgeometry_config
     DESTINATION
         ${PLUGIN_INSTALL_DIR}/kwin/effects/configs
 )
diff --git a/effects/wobblywindows/CMakeLists.txt b/effects/wobblywindows/CMakeLists.txt
index f3e78392d..da4b21c1b 100644
--- a/effects/wobblywindows/CMakeLists.txt
+++ b/effects/wobblywindows/CMakeLists.txt
@@ -1,24 +1,23 @@
 #######################################
 # Config
 set(kwin_wobblywindows_config_SRCS wobblywindows_config.cpp)
 ki18n_wrap_ui(kwin_wobblywindows_config_SRCS wobblywindows_config.ui)
 qt5_add_dbus_interface(kwin_wobblywindows_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface)
 kconfig_add_kcfg_files(kwin_wobblywindows_config_SRCS wobblywindowsconfig.kcfgc)
 
 add_library(kwin_wobblywindows_config MODULE ${kwin_wobblywindows_config_SRCS})
 
 target_link_libraries(kwin_wobblywindows_config
     KF5::ConfigWidgets
     KF5::I18n
-    KF5::Service
     Qt5::DBus
 )
 
 kcoreaddons_desktop_to_json(kwin_wobblywindows_config wobblywindows_config.desktop SERVICE_TYPES kcmodule.desktop)
 
 install(
     TARGETS
         kwin_wobblywindows_config
     DESTINATION
         ${PLUGIN_INSTALL_DIR}/kwin/effects/configs
 )
diff --git a/effects/zoom/CMakeLists.txt b/effects/zoom/CMakeLists.txt
index 93139a7bd..81f50a400 100644
--- a/effects/zoom/CMakeLists.txt
+++ b/effects/zoom/CMakeLists.txt
@@ -1,25 +1,24 @@
 #######################################
 # Config
 set(kwin_zoom_config_SRCS zoom_config.cpp)
 ki18n_wrap_ui(kwin_zoom_config_SRCS zoom_config.ui)
 qt5_add_dbus_interface(kwin_zoom_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface)
 kconfig_add_kcfg_files(kwin_zoom_config_SRCS zoomconfig.kcfgc)
 
 add_library(kwin_zoom_config MODULE ${kwin_zoom_config_SRCS})
 
 target_link_libraries(kwin_zoom_config
     KF5::ConfigWidgets
     KF5::GlobalAccel
     KF5::I18n
-    KF5::Service
     KF5::XmlGui
 )
 
 kcoreaddons_desktop_to_json(kwin_zoom_config zoom_config.desktop SERVICE_TYPES kcmodule.desktop)
 
 install(
     TARGETS
         kwin_zoom_config
     DESTINATION
         ${PLUGIN_INSTALL_DIR}/kwin/effects/configs
 )