diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54d8387de..4e576c6b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,772 +1,775 @@
 cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 
 project(KWin)
 set(PROJECT_VERSION "5.18.80")
 set(PROJECT_VERSION_MAJOR 5)
 
 set(QT_MIN_VERSION "5.12.0")
 set(KF5_MIN_VERSION "5.68.0")
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
 
 find_package(ECM 5.38 REQUIRED NO_MODULE)
 
 include(FeatureSummary)
 include(WriteBasicConfigVersionFile)
 include(GenerateExportHeader)
 
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
 find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
     Concurrent
     Core
     DBus
     Quick
     QuickWidgets
     Script
     Sensors
     UiTools
     Widgets
     X11Extras
 )
 
 find_package(Qt5Test ${QT_MIN_VERSION} CONFIG QUIET)
 set_package_properties(Qt5Test PROPERTIES
     PURPOSE "Required for tests"
     TYPE OPTIONAL
 )
 add_feature_info("Qt5Test" Qt5Test_FOUND "Required for building tests")
 if (NOT Qt5Test_FOUND)
     set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.")
 endif()
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(KDEClangFormat)
 
 include(ECMInstallIcons)
 include(ECMOptionalAddSubdirectory)
 
 add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0 -DQT_USE_QSTRINGBUILDER -DQT_NO_URL_CAST_FROM_STRING)
 
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 find_package(Qt5Multimedia QUIET)
 set_package_properties(Qt5Multimedia PROPERTIES
     PURPOSE "Runtime-only dependency for effect video playback"
     TYPE RUNTIME
 )
 
 # required frameworks by Core
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     Config
     ConfigWidgets
     CoreAddons
     Crash
     GlobalAccel
     I18n
     IconThemes
     IdleTime
     Notifications
     Package
     Plasma
     Wayland
     WidgetsAddons
     WindowSystem
 )
 # required frameworks by config modules
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     Completion
     Declarative
     KCMUtils
     KIO
     NewStuff
     Service
     TextWidgets
     XmlGui
 )
 
 find_package(Threads)
 set_package_properties(Threads PROPERTIES
     PURPOSE "Needed for VirtualTerminal support in KWin Wayland"
     TYPE REQUIRED
 )
 
 # optional frameworks
 find_package(KF5Activities ${KF5_MIN_VERSION} CONFIG)
 set_package_properties(KF5Activities PROPERTIES
     PURPOSE "Enable building of KWin with kactivities support"
     TYPE OPTIONAL
 )
 add_feature_info("KF5Activities" KF5Activities_FOUND "Enable building of KWin with kactivities support")
 
 find_package(KF5DocTools ${KF5_MIN_VERSION} CONFIG)
 set_package_properties(KF5DocTools PROPERTIES
     PURPOSE "Enable building documentation"
     TYPE OPTIONAL
 )
 add_feature_info("KF5DocTools" KF5DocTools_FOUND "Enable building documentation")
 
 find_package(KF5Kirigami2 ${KF5_MIN_VERSION} CONFIG)
 set_package_properties(KF5Kirigami2 PROPERTIES
     DESCRIPTION "A QtQuick based components set"
     PURPOSE "Required at runtime for Virtual desktop KCM and the virtual keyboard"
     TYPE RUNTIME
 )
 
 find_package(KDecoration2 5.18.0 CONFIG REQUIRED)
 
 find_package(KScreenLocker CONFIG REQUIRED)
 set_package_properties(KScreenLocker PROPERTIES
     TYPE REQUIRED
     PURPOSE "For screenlocker integration in kwin_wayland"
 )
 
 find_package(Breeze 5.9.0 CONFIG)
 set_package_properties(Breeze PROPERTIES
     TYPE OPTIONAL
     PURPOSE "For setting the default window decoration plugin"
 )
 if (${Breeze_FOUND})
     if (${BREEZE_WITH_KDECORATION})
         set(HAVE_BREEZE_DECO true)
     else()
         set(HAVE_BREEZE_DECO FALSE)
     endif()
 else()
     set(HAVE_BREEZE_DECO FALSE)
 endif()
 add_feature_info("Breeze-Decoration" HAVE_BREEZE_DECO "Default decoration plugin Breeze")
 
 find_package(EGL)
 set_package_properties(EGL PROPERTIES
     TYPE RUNTIME
     PURPOSE "Required to build KWin with EGL support"
 )
 
 find_package(epoxy)
 set_package_properties(epoxy PROPERTIES
     DESCRIPTION "libepoxy"
     URL "https://github.com/anholt/libepoxy"
     TYPE REQUIRED
     PURPOSE "OpenGL dispatch library"
 )
 
 set(HAVE_DL_LIBRARY FALSE)
 if (epoxy_HAS_GLX)
     find_library(DL_LIBRARY dl)
     if (DL_LIBRARY)
         set(HAVE_DL_LIBRARY TRUE)
     endif()
 endif()
 
 find_package(Wayland 1.2 REQUIRED COMPONENTS Cursor OPTIONAL_COMPONENTS Egl)
 set_package_properties(Wayland PROPERTIES
     TYPE REQUIRED
     PURPOSE "Required for building KWin with Wayland support"
 )
 add_feature_info("Wayland::EGL" Wayland_Egl_FOUND "Enable building of Wayland backend and QPA with EGL support.")
 set(HAVE_WAYLAND_EGL FALSE)
 if (Wayland_Egl_FOUND)
     set(HAVE_WAYLAND_EGL TRUE)
 endif()
 
 find_package(XKB 0.7.0)
 set_package_properties(XKB PROPERTIES
     TYPE REQUIRED
     PURPOSE "Required for building KWin with Wayland support"
 )
 
 find_package(Libinput 1.9)
 set_package_properties(Libinput PROPERTIES TYPE REQUIRED PURPOSE "Required for input handling on Wayland.")
 
 find_package(UDev)
 set_package_properties(UDev PROPERTIES
     URL "https://www.freedesktop.org/wiki/Software/systemd/"
     DESCRIPTION "Linux device library."
     TYPE REQUIRED
     PURPOSE "Required for input handling on Wayland."
 )
 
 find_package(Libdrm 2.4.62)
 set_package_properties(Libdrm PROPERTIES TYPE OPTIONAL PURPOSE "Required for drm output on Wayland.")
 set(HAVE_DRM FALSE)
 if (Libdrm_FOUND)
     set(HAVE_DRM TRUE)
 endif()
 
 find_package(gbm)
 set_package_properties(gbm PROPERTIES TYPE OPTIONAL PURPOSE "Required for egl output of drm backend.")
 set(HAVE_GBM FALSE)
 if (HAVE_DRM AND gbm_FOUND)
     set(HAVE_GBM TRUE)
 endif()
 
 option(KWIN_BUILD_EGL_STREAM_BACKEND "Enable building of EGLStream based DRM backend" ON)
 if (HAVE_DRM AND KWIN_BUILD_EGL_STREAM_BACKEND)
     set(HAVE_EGL_STREAMS TRUE)
 endif()
 
 find_package(libhybris)
 set_package_properties(libhybris PROPERTIES TYPE OPTIONAL PURPOSE "Required for libhybris backend")
 set(HAVE_LIBHYBRIS ${libhybris_FOUND})
 
 find_package(X11)
 set_package_properties(X11 PROPERTIES
     DESCRIPTION "X11 libraries"
     URL "https://www.x.org"
     TYPE REQUIRED
 )
 add_feature_info("XInput" X11_Xinput_FOUND "Required for poll-free mouse cursor updates")
 set(HAVE_X11_XINPUT ${X11_Xinput_FOUND})
 
 # All the required XCB components
 find_package(XCB 1.10 REQUIRED COMPONENTS
     COMPOSITE
     CURSOR
     DAMAGE
     GLX
     ICCCM
     IMAGE
     KEYSYMS
     RANDR
     RENDER
     SHAPE
     SHM
     SYNC
     XCB
     XFIXES
 )
 set_package_properties(XCB PROPERTIES TYPE REQUIRED)
 
 # and the optional XCB dependencies
 if (XCB_ICCCM_VERSION VERSION_LESS "0.4")
     set(XCB_ICCCM_FOUND FALSE)
 endif()
 add_feature_info("XCB-ICCCM" XCB_ICCCM_FOUND "Required for building test applications for KWin")
 
 find_package(X11_XCB)
 set_package_properties(X11_XCB PROPERTIES
     PURPOSE "Required for building X11 windowed backend of kwin_wayland"
     TYPE OPTIONAL
 )
 
 # dependencies for QPA plugin
 find_package(Qt5FontDatabaseSupport REQUIRED)
 find_package(Qt5ThemeSupport REQUIRED)
 find_package(Qt5EventDispatcherSupport REQUIRED)
 
 find_package(Freetype REQUIRED)
 set_package_properties(Freetype PROPERTIES
     DESCRIPTION "A font rendering engine"
     URL "https://www.freetype.org"
     TYPE REQUIRED
     PURPOSE "Needed for KWin's QPA plugin."
 )
 find_package(Fontconfig REQUIRED)
 set_package_properties(Fontconfig PROPERTIES
     TYPE REQUIRED
     PURPOSE "Needed for KWin's QPA plugin."
 )
 
 find_package(Xwayland)
 set_package_properties(Xwayland PROPERTIES
     URL "https://x.org"
     DESCRIPTION "Xwayland X server"
     TYPE RUNTIME
     PURPOSE "Needed for running kwin_wayland"
 )
 
 find_package(Libcap)
 set_package_properties(Libcap PROPERTIES
     TYPE OPTIONAL
     PURPOSE "Needed for running kwin_wayland with real-time scheduling policy"
 )
 set(HAVE_LIBCAP ${Libcap_FOUND})
 
 find_package(hwdata)
 set_package_properties(hwdata PROPERTIES
     TYPE RUNTIME
     PURPOSE "Runtime-only dependency needed for mapping monitor hardware vendor IDs to full names"
     URL "https://github.com/vcrhonek/hwdata"
 )
 
 include(ECMQMLModules)
 ecm_find_qmlmodule(QtQuick 2.3)
 ecm_find_qmlmodule(QtQuick.Controls 1.2)
 ecm_find_qmlmodule(QtQuick.Layouts 1.3)
 ecm_find_qmlmodule(QtQuick.VirtualKeyboard 2.1)
 ecm_find_qmlmodule(QtQuick.Window 2.1)
 ecm_find_qmlmodule(QtMultimedia 5.0)
 ecm_find_qmlmodule(org.kde.kquickcontrolsaddons 2.0)
 ecm_find_qmlmodule(org.kde.plasma.core 2.0)
 ecm_find_qmlmodule(org.kde.plasma.components 2.0)
 
 ########### configure tests ###############
 include(CMakeDependentOption)
 
 option(KWIN_BUILD_DECORATIONS "Enable building of KWin decorations." ON)
 option(KWIN_BUILD_KCMS "Enable building of KWin configuration modules." ON)
 option(KWIN_BUILD_TABBOX "Enable building of KWin Tabbox functionality" ON)
 option(KWIN_BUILD_XRENDER_COMPOSITING "Enable building of KWin with XRender Compositing support" ON)
 cmake_dependent_option(KWIN_BUILD_ACTIVITIES "Enable building of KWin with kactivities support" ON "KF5Activities_FOUND" OFF)
 
 # Binary name of KWin
 set(KWIN_NAME "kwin")
 set(KWIN_INTERNAL_NAME_X11 "kwin_x11")
 set(KWIN_INTERNAL_NAME_WAYLAND "kwin_wayland")
 
 # KWIN_HAVE_XRENDER_COMPOSITING - whether XRender-based compositing support is available: may be disabled
 if (KWIN_BUILD_XRENDER_COMPOSITING)
     set(KWIN_HAVE_XRENDER_COMPOSITING 1)
 endif()
 
 include_directories(${XKB_INCLUDE_DIR})
 
 include_directories(${epoxy_INCLUDE_DIR})
 set(HAVE_EPOXY_GLX ${epoxy_HAS_GLX})
 
 # for things that are also used by kwin libraries
 configure_file(libkwineffects/kwinconfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkwineffects/kwinconfig.h )
 # for kwin internal things
 set(HAVE_X11_XCB ${X11_XCB_FOUND})
 
 include(CheckIncludeFile)
 include(CheckIncludeFiles)
 include(CheckSymbolExists)
 check_include_files(unistd.h HAVE_UNISTD_H)
 check_include_files(malloc.h HAVE_MALLOC_H)
 
 check_include_file("sys/prctl.h" HAVE_SYS_PRCTL_H)
 check_symbol_exists(PR_SET_DUMPABLE "sys/prctl.h" HAVE_PR_SET_DUMPABLE)
 check_symbol_exists(PR_SET_PDEATHSIG "sys/prctl.h" HAVE_PR_SET_PDEATHSIG)
 check_include_file("sys/procctl.h" HAVE_SYS_PROCCTL_H)
 check_symbol_exists(PROC_TRACE_CTL "sys/procctl.h" HAVE_PROC_TRACE_CTL)
 if (HAVE_PR_SET_DUMPABLE OR HAVE_PROC_TRACE_CTL)
     set(CAN_DISABLE_PTRACE TRUE)
 endif()
 add_feature_info("prctl/procctl tracing control"
                  CAN_DISABLE_PTRACE
                  "Required for disallowing ptrace on kwin_wayland process")
 
 check_include_file("sys/sysmacros.h" HAVE_SYS_SYSMACROS_H)
 
 check_include_file("linux/vt.h" HAVE_LINUX_VT_H)
 add_feature_info("linux/vt.h"
                  HAVE_LINUX_VT_H
                  "Required for virtual terminal support under wayland")
 check_include_file("linux/fb.h"    HAVE_LINUX_FB_H)
 add_feature_info("linux/fb.h"
                  HAVE_LINUX_FB_H
                  "Required for the fbdev backend")
 
 check_symbol_exists(SCHED_RESET_ON_FORK "sched.h" HAVE_SCHED_RESET_ON_FORK)
 add_feature_info("SCHED_RESET_ON_FORK"
                  HAVE_SCHED_RESET_ON_FORK
                  "Required for running kwin_wayland with real-time scheduling")
 
 configure_file(config-kwin.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kwin.h)
 
 ########### global ###############
 set(kwin_effects_dbus_xml ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.kwin.Effects.xml)
+qt5_add_dbus_interface(effects_interface_SRCS ${kwin_effects_dbus_xml} kwineffects_interface)
+add_library(KWinEffectsInterface OBJECT ${effects_interface_SRCS})
+target_link_libraries(KWinEffectsInterface Qt5::DBus)
 
 include_directories(BEFORE
     ${CMAKE_CURRENT_BINARY_DIR}/libkwineffects
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/libkwineffects
     ${CMAKE_CURRENT_SOURCE_DIR}/effects
     ${CMAKE_CURRENT_SOURCE_DIR}/tabbox
     ${CMAKE_CURRENT_SOURCE_DIR}/platformsupport
 )
 
 add_subdirectory(libkwineffects)
 if (KWIN_BUILD_KCMS)
     add_subdirectory(kcmkwin)
 endif()
 
 add_subdirectory(data)
 
 add_subdirectory(effects)
 add_subdirectory(scripts)
 add_subdirectory(tabbox)
 add_subdirectory(scripting)
 add_subdirectory(helpers)
 
 ########### next target ###############
 
 set(kwin_SRCS
     abstract_client.cpp
     abstract_opengl_context_attribute_builder.cpp
     abstract_output.cpp
     abstract_wayland_output.cpp
     activation.cpp
     appmenu.cpp
     atoms.cpp
     client_machine.cpp
     colorcorrection/clockskewnotifier.cpp
     colorcorrection/clockskewnotifierengine.cpp
     colorcorrection/colorcorrectdbusinterface.cpp
     colorcorrection/manager.cpp
     colorcorrection/suncalc.cpp
     composite.cpp
     cursor.cpp
     dbusinterface.cpp
     debug_console.cpp
     decorations/decoratedclient.cpp
     decorations/decorationbridge.cpp
     decorations/decorationpalette.cpp
     decorations/decorationrenderer.cpp
     decorations/decorations_logging.cpp
     decorations/settings.cpp
     deleted.cpp
     effectloader.cpp
     effects.cpp
     egl_context_attribute_builder.cpp
     events.cpp
     focuschain.cpp
     geometrytip.cpp
     gestures.cpp
     globalshortcuts.cpp
     group.cpp
     idle_inhibition.cpp
     input.cpp
     input_event.cpp
     input_event_spy.cpp
     internal_client.cpp
     keyboard_input.cpp
     keyboard_layout.cpp
     keyboard_layout_switching.cpp
     keyboard_repeat.cpp
     killwindow.cpp
     layers.cpp
     libinput/connection.cpp
     libinput/context.cpp
     libinput/device.cpp
     libinput/events.cpp
     libinput/libinput_logging.cpp
     linux_dmabuf.cpp
     logind.cpp
     main.cpp
     modifier_only_shortcuts.cpp
     moving_client_x11_filter.cpp
     netinfo.cpp
     onscreennotification.cpp
     options.cpp
     osd.cpp
     outline.cpp
     outputscreens.cpp
     overlaywindow.cpp
     placement.cpp
     platform.cpp
     pointer_input.cpp
     popup_input_filter.cpp
     rootinfo_filter.cpp
     rules.cpp
     rulebooksettings.cpp
     scene.cpp
     screenedge.cpp
     screenlockerwatcher.cpp
     screens.cpp
     scripting/dbuscall.cpp
     scripting/meta.cpp
     scripting/screenedgeitem.cpp
     scripting/scriptedeffect.cpp
     scripting/scripting.cpp
     scripting/scripting_logging.cpp
     scripting/scripting_model.cpp
     scripting/scriptingutils.cpp
     scripting/timer.cpp
     scripting/workspace_wrapper.cpp
     shadow.cpp
     sm.cpp
     thumbnailitem.cpp
     toplevel.cpp
     touch_hide_cursor_spy.cpp
     tablet_input.cpp
     touch_input.cpp
     udev.cpp
     unmanaged.cpp
     useractions.cpp
     utils.cpp
     virtualdesktops.cpp
     virtualdesktopsdbustypes.cpp
     virtualkeyboard.cpp
     virtualkeyboard_dbus.cpp
     was_user_interaction_x11_filter.cpp
     wayland_cursor_theme.cpp
     wayland_server.cpp
     window_property_notify_x11_filter.cpp
     workspace.cpp
     x11client.cpp
     x11eventfilter.cpp
     xcbutils.cpp
     xdgshellclient.cpp
     xkb.cpp
     xwl/xwayland_interface.cpp
 )
 
 if (CMAKE_SYSTEM_NAME MATCHES "Linux")
     set(kwin_SRCS
         ${kwin_SRCS}
         colorcorrection/clockskewnotifierengine_linux.cpp
     )
 endif()
 
 include(ECMQtDeclareLoggingCategory)
 ecm_qt_declare_logging_category(kwin_SRCS
     HEADER
         colorcorrect_logging.h
     IDENTIFIER
         KWIN_COLORCORRECTION
     CATEGORY_NAME
         kwin_colorcorrection
     DEFAULT_SEVERITY
         Critical
 )
 
 if (KWIN_BUILD_TABBOX)
     include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS})
     set(kwin_SRCS ${kwin_SRCS}
         tabbox/clientmodel.cpp
         tabbox/desktopchain.cpp
         tabbox/desktopmodel.cpp
         tabbox/switcheritem.cpp
         tabbox/tabbox.cpp
         tabbox/tabbox_logging.cpp
         tabbox/tabboxconfig.cpp
         tabbox/tabboxhandler.cpp
         tabbox/x11_filter.cpp
     )
 endif()
 
 if (KWIN_BUILD_ACTIVITIES)
     set(kwin_SRCS ${kwin_SRCS}
         activities.cpp
     )
 endif()
 
 if (HAVE_LINUX_VT_H)
     set(kwin_SRCS ${kwin_SRCS}
         virtual_terminal.cpp
     )
 endif()
 
 kconfig_add_kcfg_files(kwin_SRCS settings.kcfgc)
 kconfig_add_kcfg_files(kwin_SRCS colorcorrection/colorcorrect_settings.kcfgc)
 kconfig_add_kcfg_files(kwin_SRCS rulesettings.kcfgc)
 kconfig_add_kcfg_files(kwin_SRCS rulebooksettingsbase.kcfgc)
 
 qt5_add_dbus_adaptor(kwin_SRCS org.kde.KWin.xml dbusinterface.h KWin::DBusInterface)
 qt5_add_dbus_adaptor(kwin_SRCS org.kde.kwin.Compositing.xml dbusinterface.h KWin::CompositorDBusInterface)
 qt5_add_dbus_adaptor(kwin_SRCS org.kde.kwin.ColorCorrect.xml colorcorrection/colorcorrectdbusinterface.h KWin::ColorCorrect::ColorCorrectDBusInterface)
 qt5_add_dbus_adaptor(kwin_SRCS ${kwin_effects_dbus_xml} effects.h KWin::EffectsHandlerImpl)
 qt5_add_dbus_adaptor(kwin_SRCS org.kde.KWin.VirtualDesktopManager.xml dbusinterface.h KWin::VirtualDesktopManagerDBusInterface)
 qt5_add_dbus_adaptor(kwin_SRCS org.kde.KWin.Session.xml sm.h KWin::SessionManager)
 
 qt5_add_dbus_interface(kwin_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface)
 qt5_add_dbus_interface(kwin_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface)
 qt5_add_dbus_interface(kwin_SRCS org.kde.kappmenu.xml appmenu_interface)
 
 ki18n_wrap_ui(kwin_SRCS
     debug_console.ui
     shortcutdialog.ui
 )
 
 ########### target link libraries ###############
 
 set(kwin_OWN_LIBS
     kwineffects
     kwin4_effect_builtins
 )
 
 set(kwin_QT_LIBS
     Qt5::Concurrent
     Qt5::DBus
     Qt5::Quick
     Qt5::Script
     Qt5::Sensors
 )
 
 set(kwin_KDE_LIBS
     KF5::ConfigCore
     KF5::ConfigWidgets
     KF5::CoreAddons
     KF5::GlobalAccel
     KF5::GlobalAccelPrivate
     KF5::I18n
     KF5::Notifications
     KF5::Package
     KF5::Plasma
     KF5::QuickAddons
     KF5::WindowSystem
 
     KDecoration2::KDecoration
     KDecoration2::KDecoration2Private
 
     PW::KScreenLocker
 )
 
 set(kwin_XLIB_LIBS
     ${X11_ICE_LIB}
     ${X11_SM_LIB}
     ${X11_X11_LIB}
 )
 
 set(kwin_XCB_LIBS
     XCB::COMPOSITE
     XCB::DAMAGE
     XCB::GLX
     XCB::ICCCM
     XCB::KEYSYMS
     XCB::RANDR
     XCB::RENDER
     XCB::SHAPE
     XCB::SHM
     XCB::SYNC
     XCB::XCB
     XCB::XFIXES
 )
 
 set(kwin_WAYLAND_LIBS
     KF5::WaylandClient
     KF5::WaylandServer
     Wayland::Cursor
     XKB::XKB
     ${CMAKE_THREAD_LIBS_INIT}
 )
 
 if (KWIN_BUILD_ACTIVITIES)
     set(kwin_KDE_LIBS ${kwin_KDE_LIBS} KF5::Activities)
 endif()
 
 set(kwinLibs
     ${kwin_OWN_LIBS}
     ${kwin_QT_LIBS}
     ${kwin_KDE_LIBS}
     ${kwin_XLIB_LIBS}
     ${kwin_XCB_LIBS}
     ${kwin_WAYLAND_LIBS}
     ${UDEV_LIBS}
     Libinput::Libinput
 )
 
 add_library(kwin SHARED ${kwin_SRCS})
 if (Libinput_VERSION_STRING VERSION_GREATER 1.14)
     target_compile_definitions(kwin PRIVATE -DLIBINPUT_HAS_TOTEM)
 endif ()
 
 set_target_properties(kwin PROPERTIES
    VERSION ${PROJECT_VERSION}
    SOVERSION ${PROJECT_VERSION_MAJOR}
 )
 
 target_link_libraries(kwin ${kwinLibs})
 generate_export_header(kwin EXPORT_FILE_NAME kwin_export.h)
 
 target_link_libraries(kwin kwinglutils ${epoxy_LIBRARY})
 
 add_executable(kwin_x11 main_x11.cpp)
 target_link_libraries(kwin_x11 kwin KF5::Crash Qt5::X11Extras)
 
 install(TARGETS kwin ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
 install(TARGETS kwin_x11 ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 set(kwin_XWAYLAND_SRCS
    ${CMAKE_CURRENT_SOURCE_DIR}/xwl/clipboard.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/xwl/databridge.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/xwl/dnd.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/xwl/drag.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/xwl/drag_wl.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/xwl/drag_x.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/xwl/selection.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/xwl/selection_source.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/xwl/transfer.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/xwl/xwayland.cpp
 )
 include(ECMQtDeclareLoggingCategory)
 ecm_qt_declare_logging_category(kwin_XWAYLAND_SRCS
     HEADER
         xwayland_logging.h
     IDENTIFIER
         KWIN_XWL
     CATEGORY_NAME
         kwin_xwl
     DEFAULT_SEVERITY
         Critical
 )
 
 set(kwin_WAYLAND_SRCS
    main_wayland.cpp
    tabletmodemanager.cpp
 )
 
 add_executable(kwin_wayland ${kwin_WAYLAND_SRCS} ${kwin_XWAYLAND_SRCS})
 target_link_libraries(kwin_wayland kwin KF5::Crash)
 if (HAVE_LIBCAP)
     target_link_libraries(kwin_wayland ${Libcap_LIBRARIES})
 endif()
 
 install(TARGETS kwin_wayland ${INSTALL_TARGETS_DEFAULT_ARGS})
 if (HAVE_LIBCAP)
     install(
     CODE "execute_process(
             COMMAND
                 ${SETCAP_EXECUTABLE}
                 CAP_SYS_NICE=+ep
                 \$ENV{DESTDIR}${CMAKE_INSTALL_FULL_BINDIR}/kwin_wayland)"
     )
 endif()
 
 add_subdirectory(platformsupport)
 add_subdirectory(plugins)
 
 ########### install files ###############
 
 install(FILES kwin.kcfg DESTINATION ${KCFG_INSTALL_DIR} RENAME ${KWIN_NAME}.kcfg)
 install(FILES colorcorrection/colorcorrect_settings.kcfg DESTINATION ${KCFG_INSTALL_DIR} RENAME ${KWIN_NAME}_colorcorrect.kcfg)
 install(FILES kwin.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR} RENAME ${KWIN_NAME}.notifyrc)
 install(
     FILES
         org.kde.KWin.VirtualDesktopManager.xml
         org.kde.KWin.xml
         org.kde.kwin.ColorCorrect.xml
         org.kde.kwin.Compositing.xml
         org.kde.kwin.Effects.xml
     DESTINATION
         ${KDE_INSTALL_DBUSINTERFACEDIR}
 )
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kwin_export.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
 
 # Install the KWin/Script service type
 install(FILES scripting/kwinscript.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
 
 add_subdirectory(qml)
 
 if (BUILD_TESTING)
     add_subdirectory(autotests)
     add_subdirectory(tests)
 endif()
 
 if (KF5DocTools_FOUND)
     add_subdirectory(doc)
 endif()
 
 add_subdirectory(kconf_update)
 
 # add clang-format target for all our real source files
 file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h)
 kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
 include(CMakePackageConfigHelpers)
 set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KWinDBusInterface")
 configure_package_config_file(KWinDBusInterfaceConfig.cmake.in
     "${CMAKE_CURRENT_BINARY_DIR}/KWinDBusInterfaceConfig.cmake"
     PATH_VARS KDE_INSTALL_DBUSINTERFACEDIR
     INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/KWinDBusInterfaceConfig.cmake
     DESTINATION ${CMAKECONFIG_INSTALL_DIR})
diff --git a/autotests/integration/CMakeLists.txt b/autotests/integration/CMakeLists.txt
index 433785a14..39b626150 100644
--- a/autotests/integration/CMakeLists.txt
+++ b/autotests/integration/CMakeLists.txt
@@ -1,89 +1,89 @@
 add_subdirectory(helper)
 
-add_library(KWinIntegrationTestFramework STATIC kwin_wayland_test.cpp test_helpers.cpp ${kwin_XWAYLAND_SRCS})
+add_library(KWinIntegrationTestFramework STATIC kwin_wayland_test.cpp test_helpers.cpp generic_scene_opengl_test.cpp ${kwin_XWAYLAND_SRCS})
 target_link_libraries(KWinIntegrationTestFramework kwin Qt5::Test)
 
 function(integrationTest)
     set(optionArgs WAYLAND_ONLY)
     set(oneValueArgs NAME)
     set(multiValueArgs SRCS LIBS)
     cmake_parse_arguments(ARGS "${optionArgs}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
     add_executable(${ARGS_NAME} ${ARGS_SRCS})
     target_link_libraries(${ARGS_NAME} KWinIntegrationTestFramework kwin Qt5::Test ${ARGS_LIBS})
     add_test(NAME kwin-${ARGS_NAME} COMMAND dbus-run-session ${CMAKE_BINARY_DIR}/bin/${ARGS_NAME})
     if (${ARGS_WAYLAND_ONLY})
         add_executable(${ARGS_NAME}_waylandonly ${ARGS_SRCS})
         set_target_properties(${ARGS_NAME}_waylandonly PROPERTIES COMPILE_DEFINITIONS "NO_XWAYLAND")
         target_link_libraries(${ARGS_NAME}_waylandonly KWinIntegrationTestFramework kwin Qt5::Test ${ARGS_LIBS})
         add_test(NAME kwin-${ARGS_NAME}-waylandonly COMMAND dbus-run-session ${CMAKE_BINARY_DIR}/bin/${ARGS_NAME}_waylandonly)
     endif()
 endfunction()
 
 integrationTest(NAME testDontCrashGlxgears SRCS dont_crash_glxgears.cpp)
 integrationTest(NAME testLockScreen SRCS lockscreen.cpp)
 integrationTest(WAYLAND_ONLY NAME testDecorationInput SRCS decoration_input_test.cpp)
 integrationTest(WAYLAND_ONLY NAME testInternalWindow SRCS internal_window.cpp)
 integrationTest(WAYLAND_ONLY NAME testTouchInput SRCS touch_input_test.cpp)
 integrationTest(WAYLAND_ONLY NAME testInputStackingOrder SRCS input_stacking_order.cpp)
 integrationTest(NAME testPointerInput SRCS pointer_input.cpp)
 integrationTest(NAME testPlatformCursor SRCS platformcursor.cpp)
 integrationTest(WAYLAND_ONLY NAME testDontCrashCancelAnimation SRCS dont_crash_cancel_animation.cpp)
 integrationTest(WAYLAND_ONLY NAME testTransientPlacement SRCS transient_placement.cpp)
 integrationTest(NAME testDebugConsole SRCS debug_console_test.cpp)
 integrationTest(NAME testDontCrashEmptyDeco SRCS dont_crash_empty_deco.cpp)
 integrationTest(WAYLAND_ONLY NAME testPlasmaSurface SRCS plasma_surface_test.cpp)
 integrationTest(WAYLAND_ONLY NAME testMaximized SRCS maximize_test.cpp)
 integrationTest(WAYLAND_ONLY NAME testXdgShellClient SRCS xdgshellclient_test.cpp)
 integrationTest(WAYLAND_ONLY NAME testDontCrashNoBorder SRCS dont_crash_no_border.cpp)
 integrationTest(NAME testXwaylandSelections SRCS xwayland_selections_test.cpp)
-integrationTest(WAYLAND_ONLY NAME testSceneOpenGL SRCS scene_opengl_test.cpp generic_scene_opengl_test.cpp)
+integrationTest(WAYLAND_ONLY NAME testSceneOpenGL SRCS scene_opengl_test.cpp )
 integrationTest(WAYLAND_ONLY NAME testSceneOpenGLShadow SRCS scene_opengl_shadow_test.cpp)
-integrationTest(WAYLAND_ONLY NAME testSceneOpenGLES SRCS scene_opengl_es_test.cpp generic_scene_opengl_test.cpp)
+integrationTest(WAYLAND_ONLY NAME testSceneOpenGLES SRCS scene_opengl_es_test.cpp )
 integrationTest(WAYLAND_ONLY NAME testNoXdgRuntimeDir SRCS no_xdg_runtime_dir_test.cpp)
 integrationTest(WAYLAND_ONLY NAME testScreenChanges SRCS screen_changes_test.cpp)
 integrationTest(NAME testModiferOnlyShortcut SRCS modifier_only_shortcut_test.cpp)
 integrationTest(WAYLAND_ONLY NAME testTabBox SRCS tabbox_test.cpp)
 integrationTest(WAYLAND_ONLY NAME testWindowSelection SRCS window_selection_test.cpp)
 integrationTest(WAYLAND_ONLY NAME testPointerConstraints SRCS pointer_constraints_test.cpp)
 integrationTest(WAYLAND_ONLY NAME testKeyboardLayout SRCS keyboard_layout_test.cpp)
 integrationTest(WAYLAND_ONLY NAME testKeymapCreationFailure SRCS keymap_creation_failure_test.cpp)
 integrationTest(WAYLAND_ONLY NAME testShowingDesktop SRCS showing_desktop_test.cpp)
 integrationTest(WAYLAND_ONLY NAME testDontCrashUseractionsMenu SRCS dont_crash_useractions_menu.cpp)
 integrationTest(WAYLAND_ONLY NAME testKWinBindings SRCS kwinbindings_test.cpp)
 integrationTest(WAYLAND_ONLY NAME testVirtualDesktop SRCS virtual_desktop_test.cpp)
 integrationTest(WAYLAND_ONLY NAME testXdgShellClientRules SRCS xdgshellclient_rules_test.cpp)
 integrationTest(WAYLAND_ONLY NAME testIdleInhibition SRCS idle_inhibition_test.cpp)
 integrationTest(WAYLAND_ONLY NAME testColorCorrectNightColor SRCS colorcorrect_nightcolor_test.cpp)
 integrationTest(WAYLAND_ONLY NAME testDontCrashCursorPhysicalSizeEmpty SRCS dont_crash_cursor_physical_size_empty.cpp)
 integrationTest(WAYLAND_ONLY NAME testDontCrashReinitializeCompositor SRCS dont_crash_reinitialize_compositor.cpp)
 integrationTest(WAYLAND_ONLY NAME testNoGlobalShortcuts SRCS no_global_shortcuts_test.cpp)
-integrationTest(WAYLAND_ONLY NAME testBufferSizeChange SRCS buffer_size_change_test.cpp generic_scene_opengl_test.cpp)
+integrationTest(WAYLAND_ONLY NAME testBufferSizeChange SRCS buffer_size_change_test.cpp )
 integrationTest(WAYLAND_ONLY NAME testPlacement SRCS placement_test.cpp)
 integrationTest(WAYLAND_ONLY NAME testActivation SRCS activation_test.cpp)
 
 if (XCB_ICCCM_FOUND)
     integrationTest(NAME testMoveResize SRCS move_resize_window_test.cpp LIBS XCB::ICCCM)
     integrationTest(NAME testStruts SRCS struts_test.cpp LIBS XCB::ICCCM)
     integrationTest(NAME testShade SRCS shade_test.cpp LIBS XCB::ICCCM)
     integrationTest(NAME testDontCrashAuroraeDestroyDeco SRCS dont_crash_aurorae_destroy_deco.cpp LIBS XCB::ICCCM)
     integrationTest(NAME testPlasmaWindow SRCS plasmawindow_test.cpp LIBS XCB::ICCCM)
     integrationTest(NAME testScreenEdgeClientShow SRCS screenedge_client_show_test.cpp LIBS XCB::ICCCM)
     integrationTest(NAME testX11DesktopWindow SRCS desktop_window_x11_test.cpp LIBS XCB::ICCCM)
     integrationTest(NAME testXwaylandInput SRCS xwayland_input_test.cpp LIBS XCB::ICCCM)
     integrationTest(NAME testWindowRules SRCS window_rules_test.cpp LIBS XCB::ICCCM)
     integrationTest(NAME testX11Client SRCS x11_client_test.cpp LIBS XCB::ICCCM)
     integrationTest(NAME testQuickTiling SRCS quick_tiling_test.cpp LIBS XCB::ICCCM)
     integrationTest(NAME testGlobalShortcuts SRCS globalshortcuts_test.cpp LIBS XCB::ICCCM)
     integrationTest(NAME testSceneQPainter SRCS scene_qpainter_test.cpp LIBS XCB::ICCCM)
     integrationTest(NAME testSceneQPainterShadow SRCS scene_qpainter_shadow_test.cpp LIBS XCB::ICCCM)
     integrationTest(NAME testStackingOrder SRCS stacking_order_test.cpp LIBS XCB::ICCCM)
     integrationTest(NAME testDbusInterface SRCS dbus_interface_test.cpp LIBS XCB::ICCCM)
 
     if (KWIN_BUILD_ACTIVITIES)
         integrationTest(NAME testActivities SRCS activities_test.cpp LIBS XCB::ICCCM)
     endif()
 endif()
 
 add_subdirectory(scripting)
 add_subdirectory(effects)
 add_subdirectory(fakes)
diff --git a/autotests/libinput/CMakeLists.txt b/autotests/libinput/CMakeLists.txt
index 195ac2fdd..3e9d5f241 100644
--- a/autotests/libinput/CMakeLists.txt
+++ b/autotests/libinput/CMakeLists.txt
@@ -1,114 +1,85 @@
 include_directories(${Libinput_INCLUDE_DIRS})
 include_directories(${UDEV_INCLUDE_DIR})
+
+add_library(LibInputTestObjects OBJECT ../../libinput/device.cpp ../../libinput/events.cpp mock_libinput.cpp)
+target_link_libraries(LibInputTestObjects Qt5::Test Qt5::Widgets Qt5::DBus Qt5::Gui KF5::ConfigCore)
+
 ########################################################
 # Test Devices
 ########################################################
-set(testLibinputDevice_SRCS device_test.cpp mock_libinput.cpp ../../libinput/device.cpp )
-add_executable(testLibinputDevice ${testLibinputDevice_SRCS})
-target_link_libraries(testLibinputDevice Qt5::Test Qt5::DBus Qt5::Gui KF5::ConfigCore)
+add_executable(testLibinputDevice device_test.cpp)
+target_link_libraries(testLibinputDevice Qt5::Test Qt5::DBus Qt5::Gui KF5::ConfigCore LibInputTestObjects)
 add_test(NAME kwin-testLibinputDevice COMMAND testLibinputDevice)
 ecm_mark_as_test(testLibinputDevice)
 
 ########################################################
 # Test Key Event
 ########################################################
-set(testLibinputKeyEvent_SRCS
-    ../../libinput/device.cpp
-    ../../libinput/events.cpp
-    key_event_test.cpp
-    mock_libinput.cpp
-)
-add_executable(testLibinputKeyEvent ${testLibinputKeyEvent_SRCS})
-target_link_libraries(testLibinputKeyEvent Qt5::Test Qt5::DBus Qt5::Widgets KF5::ConfigCore)
+add_executable(testLibinputKeyEvent key_event_test.cpp)
+target_link_libraries(testLibinputKeyEvent Qt5::Test Qt5::DBus Qt5::Widgets KF5::ConfigCore LibInputTestObjects)
 add_test(NAME kwin-testLibinputKeyEvent COMMAND testLibinputKeyEvent)
 ecm_mark_as_test(testLibinputKeyEvent)
 
 ########################################################
 # Test Pointer Event
 ########################################################
-set(testLibinputPointerEvent_SRCS
-    ../../libinput/device.cpp
-    ../../libinput/events.cpp
-    mock_libinput.cpp
-    pointer_event_test.cpp
-)
-add_executable(testLibinputPointerEvent ${testLibinputPointerEvent_SRCS})
-target_link_libraries(testLibinputPointerEvent Qt5::Test Qt5::DBus Qt5::Widgets KF5::ConfigCore)
+add_executable(testLibinputPointerEvent pointer_event_test.cpp)
+target_link_libraries(testLibinputPointerEvent Qt5::Test Qt5::DBus Qt5::Widgets KF5::ConfigCore LibInputTestObjects)
 add_test(NAME kwin-testLibinputPointerEvent COMMAND testLibinputPointerEvent)
 ecm_mark_as_test(testLibinputPointerEvent)
 
 ########################################################
 # Test Touch Event
 ########################################################
-set(testLibinputTouchEvent_SRCS
-    ../../libinput/device.cpp
-    ../../libinput/events.cpp
-    mock_libinput.cpp
-    touch_event_test.cpp
-)
-add_executable(testLibinputTouchEvent ${testLibinputTouchEvent_SRCS})
-target_link_libraries(testLibinputTouchEvent Qt5::Test Qt5::DBus Qt5::Widgets KF5::ConfigCore)
+add_executable(testLibinputTouchEvent touch_event_test.cpp)
+target_link_libraries(testLibinputTouchEvent Qt5::Test Qt5::DBus Qt5::Widgets KF5::ConfigCore LibInputTestObjects)
 add_test(NAME kwin-testLibinputTouchEvent COMMAND testLibinputTouchEvent)
 ecm_mark_as_test(testLibinputTouchEvent)
 
 ########################################################
 # Test Gesture Event
 ########################################################
-set(testLibinputGestureEvent_SRCS
-    ../../libinput/device.cpp
-    ../../libinput/events.cpp
-    gesture_event_test.cpp
-    mock_libinput.cpp
-)
-add_executable(testLibinputGestureEvent ${testLibinputGestureEvent_SRCS})
-target_link_libraries(testLibinputGestureEvent Qt5::Test Qt5::DBus Qt5::Widgets KF5::ConfigCore)
+add_executable(testLibinputGestureEvent gesture_event_test.cpp)
+target_link_libraries(testLibinputGestureEvent Qt5::Test Qt5::DBus Qt5::Widgets KF5::ConfigCore LibInputTestObjects)
 add_test(NAME kwin-testLibinputGestureEvent COMMAND testLibinputGestureEvent)
 ecm_mark_as_test(testLibinputGestureEvent)
 
 ########################################################
 # Test Switch Event
 ########################################################
-set(testLibinputSwitchEvent_SRCS
-        ../../libinput/device.cpp
-        ../../libinput/events.cpp
-        mock_libinput.cpp
-        switch_event_test.cpp
-)
-add_executable(testLibinputSwitchEvent ${testLibinputSwitchEvent_SRCS})
-target_link_libraries(testLibinputSwitchEvent Qt5::Test Qt5::DBus Qt5::Widgets KF5::ConfigCore)
+add_executable(testLibinputSwitchEvent switch_event_test.cpp)
+target_link_libraries(testLibinputSwitchEvent Qt5::Test Qt5::DBus Qt5::Widgets KF5::ConfigCore LibInputTestObjects)
 add_test(NAME kwin-testLibinputSwitchEvent COMMAND testLibinputSwitchEvent)
 ecm_mark_as_test(testLibinputSwitchEvent)
 
 ########################################################
 # Test Context
 ########################################################
 set(testLibinputContext_SRCS
         ../../libinput/context.cpp
-        ../../libinput/device.cpp
-        ../../libinput/events.cpp
         ../../libinput/libinput_logging.cpp
         ../../logind.cpp
         context_test.cpp
-        mock_libinput.cpp
         mock_udev.cpp
 )
 add_executable(testLibinputContext ${testLibinputContext_SRCS})
 target_link_libraries(testLibinputContext
+    LibInputTestObjects
+
     Qt5::DBus
     Qt5::Test
     Qt5::Widgets
 
     KF5::ConfigCore
     KF5::WindowSystem
 )
 add_test(NAME kwin-testLibinputContext COMMAND testLibinputContext)
 ecm_mark_as_test(testLibinputContext)
 
 ########################################################
 # Test Input Events
 ########################################################
-set(testInputEvents_SRCS input_event_test.cpp mock_libinput.cpp ../../libinput/device.cpp ../../input_event.cpp)
-add_executable(testInputEvents ${testInputEvents_SRCS})
-target_link_libraries(testInputEvents Qt5::Test Qt5::DBus Qt5::Gui Qt5::Widgets KF5::ConfigCore)
+add_executable(testInputEvents input_event_test.cpp ../../input_event.cpp)
+target_link_libraries(testInputEvents Qt5::Test Qt5::DBus Qt5::Gui Qt5::Widgets KF5::ConfigCore LibInputTestObjects)
 add_test(NAME kwin-testInputEvents COMMAND testInputEvents)
 ecm_mark_as_test(testInputEvents)
diff --git a/effects/blur/CMakeLists.txt b/effects/blur/CMakeLists.txt
index c1d9bd9a4..35db55d5d 100644
--- a/effects/blur/CMakeLists.txt
+++ b/effects/blur/CMakeLists.txt
@@ -1,23 +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
     Qt5::DBus
+    KWinEffectsInterface
 )
 
 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 56b7a8190..f344a0efb 100644
--- a/effects/coverswitch/CMakeLists.txt
+++ b/effects/coverswitch/CMakeLists.txt
@@ -1,26 +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
     Qt5::DBus
+    KWinEffectsInterface
 )
 
 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 c80b3e50a..c9d94605f 100644
--- a/effects/cube/CMakeLists.txt
+++ b/effects/cube/CMakeLists.txt
@@ -1,32 +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
+    KWinEffectsInterface
 )
 
 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 2836614bc..042ae92c0 100644
--- a/effects/cubeslide/CMakeLists.txt
+++ b/effects/cubeslide/CMakeLists.txt
@@ -1,24 +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
     kwineffects
+    KWinEffectsInterface
 )
 
 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 807ff0e69..7fa4b7ace 100644
--- a/effects/desktopgrid/CMakeLists.txt
+++ b/effects/desktopgrid/CMakeLists.txt
@@ -1,31 +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::XmlGui
     Qt5::Quick
     kwineffects
+    KWinEffectsInterface
 )
 
 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 2aad1ea1b..5d6e7d3a1 100644
--- a/effects/diminactive/CMakeLists.txt
+++ b/effects/diminactive/CMakeLists.txt
@@ -1,23 +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
     Qt5::DBus
+    KWinEffectsInterface
 )
 
 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 b1160a027..6829ea590 100644
--- a/effects/flipswitch/CMakeLists.txt
+++ b/effects/flipswitch/CMakeLists.txt
@@ -1,24 +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::XmlGui
+    KWinEffectsInterface
 )
 
 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 7b7c3e17e..cd0a69cb4 100644
--- a/effects/glide/CMakeLists.txt
+++ b/effects/glide/CMakeLists.txt
@@ -1,24 +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
     Qt5::DBus
+    KWinEffectsInterface
 )
 
 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 d20368f13..09dac3fcf 100644
--- a/effects/invert/CMakeLists.txt
+++ b/effects/invert/CMakeLists.txt
@@ -1,25 +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::XmlGui
+    KWinEffectsInterface
 )
 
 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 288d5f2c8..381a790b1 100644
--- a/effects/lookingglass/CMakeLists.txt
+++ b/effects/lookingglass/CMakeLists.txt
@@ -1,27 +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::XmlGui
+    KWinEffectsInterface
 )
 
 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 ebeed364d..b1ea9c94a 100644
--- a/effects/magiclamp/CMakeLists.txt
+++ b/effects/magiclamp/CMakeLists.txt
@@ -1,23 +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
     Qt5::DBus
+    KWinEffectsInterface
 )
 
 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 758a76463..cd3fe05be 100644
--- a/effects/magnifier/CMakeLists.txt
+++ b/effects/magnifier/CMakeLists.txt
@@ -1,24 +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::XmlGui
+    KWinEffectsInterface
 )
 
 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 92b0ae6b8..1b1834d62 100644
--- a/effects/mouseclick/CMakeLists.txt
+++ b/effects/mouseclick/CMakeLists.txt
@@ -1,25 +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::XmlGui
+    KWinEffectsInterface
 )
 
 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 1a8056e07..fd42575f1 100644
--- a/effects/mousemark/CMakeLists.txt
+++ b/effects/mousemark/CMakeLists.txt
@@ -1,25 +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::TextWidgets
     KF5::XmlGui
+    KWinEffectsInterface
 )
 
 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 fc550ae31..9f86c0413 100644
--- a/effects/presentwindows/CMakeLists.txt
+++ b/effects/presentwindows/CMakeLists.txt
@@ -1,29 +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::XmlGui
+    KWinEffectsInterface
 )
 
 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 9b6293b86..5b4393533 100644
--- a/effects/resize/CMakeLists.txt
+++ b/effects/resize/CMakeLists.txt
@@ -1,23 +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
     Qt5::DBus
+    KWinEffectsInterface
 )
 
 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 a3418d9a3..e217e68fa 100644
--- a/effects/showfps/CMakeLists.txt
+++ b/effects/showfps/CMakeLists.txt
@@ -1,24 +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
     Qt5::DBus
+    KWinEffectsInterface
 )
 
 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/slide/CMakeLists.txt b/effects/slide/CMakeLists.txt
index 718b903fb..a579bb630 100644
--- a/effects/slide/CMakeLists.txt
+++ b/effects/slide/CMakeLists.txt
@@ -1,23 +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
     Qt5::DBus
+    KWinEffectsInterface
 )
 
 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 6e5caf6c7..dacfb2a7e 100644
--- a/effects/thumbnailaside/CMakeLists.txt
+++ b/effects/thumbnailaside/CMakeLists.txt
@@ -1,24 +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::XmlGui
+    KWinEffectsInterface
 )
 
 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 f467998fc..c44223a00 100644
--- a/effects/trackmouse/CMakeLists.txt
+++ b/effects/trackmouse/CMakeLists.txt
@@ -1,29 +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::XmlGui
+    KWinEffectsInterface
 )
 
 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 0d13c4fd6..4a460425d 100644
--- a/effects/windowgeometry/CMakeLists.txt
+++ b/effects/windowgeometry/CMakeLists.txt
@@ -1,24 +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::XmlGui
+    KWinEffectsInterface
 )
 
 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 da4b21c1b..fb2e038e9 100644
--- a/effects/wobblywindows/CMakeLists.txt
+++ b/effects/wobblywindows/CMakeLists.txt
@@ -1,23 +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
     Qt5::DBus
+    KWinEffectsInterface
 )
 
 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 81f50a400..b6b47f241 100644
--- a/effects/zoom/CMakeLists.txt
+++ b/effects/zoom/CMakeLists.txt
@@ -1,24 +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::XmlGui
+    KWinEffectsInterface
 )
 
 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
 )
diff --git a/kcmkwin/kwinoptions/main.cpp b/kcmkwin/kwinoptions/main.cpp
index 05e0776a8..2116567c7 100644
--- a/kcmkwin/kwinoptions/main.cpp
+++ b/kcmkwin/kwinoptions/main.cpp
@@ -1,238 +1,237 @@
 /*
  *
  * Copyright (c) 2001 Waldo Bastian <bastian@kde.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "main.h"
 
 #include <QLayout>
 //Added by qt3to4:
 #include <QVBoxLayout>
 
 #include <QtDBus>
 
 #include <KLocalizedString>
 #include <kconfig.h>
 #include <kaboutdata.h>
 #include <KPluginFactory>
 #include <KPluginLoader>
 
 #include "mouse.h"
 #include "windows.h"
 #include "kwinoptions_settings.h"
 
 K_PLUGIN_FACTORY_DECLARATION(KWinOptionsFactory)
 
 class KFocusConfigStandalone : public KFocusConfig
 {
     Q_OBJECT
 public:
     KFocusConfigStandalone(QWidget* parent, const QVariantList &)
         : KFocusConfig(true, new KWinOptionsSettings(this), parent)
     {}
 };
 
 class KMovingConfigStandalone : public KMovingConfig
 {
     Q_OBJECT
 public:
     KMovingConfigStandalone(QWidget* parent, const QVariantList &)
         : KMovingConfig(true, new KWinOptionsSettings(this), parent)
     {}
 };
 
 class KAdvancedConfigStandalone : public KAdvancedConfig
 {
     Q_OBJECT
 public:
     KAdvancedConfigStandalone(QWidget* parent, const QVariantList &)
         : KAdvancedConfig(true, new KWinOptionsSettings(this), parent)
     {}
 };
 
 KWinOptions::KWinOptions(QWidget *parent, const QVariantList &)
     : KCModule(parent)
 {
     mSettings = new KWinOptionsSettings(this);
 
     QVBoxLayout *layout = new QVBoxLayout(this);
     layout->setContentsMargins(0, 0, 0, 0);
     tab = new QTabWidget(this);
     layout->addWidget(tab);
 
     mFocus = new KFocusConfig(false, mSettings, this);
     mFocus->setObjectName(QLatin1String("KWin Focus Config"));
     tab->addTab(mFocus, i18n("&Focus"));
     connect(mFocus, qOverload<bool>(&KCModule::changed), this, qOverload<bool>(&KCModule::changed));
     connect(mFocus, qOverload<bool>(&KCModule::defaulted), this, qOverload<bool>(&KCModule::defaulted));
 
     // Need to relay unmanagedWidgetDefaultState and unmanagedWidgetChangeState to wrapping KCModule
     connect(mFocus, &KFocusConfig::unmanagedWidgetDefaulted, this, &KWinOptions::unmanagedWidgetDefaultState);
     connect(mFocus, &KFocusConfig::unmanagedWidgetStateChanged, this, &KWinOptions::unmanagedWidgetChangeState);
 
     mTitleBarActions = new KTitleBarActionsConfig(false, mSettings, this);
     mTitleBarActions->setObjectName(QLatin1String("KWin TitleBar Actions"));
     tab->addTab(mTitleBarActions, i18n("Titlebar A&ctions"));
     connect(mTitleBarActions, qOverload<bool>(&KCModule::changed), this, qOverload<bool>(&KCModule::changed));
     connect(mTitleBarActions, qOverload<bool>(&KCModule::defaulted), this, qOverload<bool>(&KCModule::defaulted));
 
     mWindowActions = new KWindowActionsConfig(false, mSettings, this);
     mWindowActions->setObjectName(QLatin1String("KWin Window Actions"));
     tab->addTab(mWindowActions, i18n("W&indow Actions"));
     connect(mWindowActions, qOverload<bool>(&KCModule::changed), this, qOverload<bool>(&KCModule::changed));
     connect(mWindowActions, qOverload<bool>(&KCModule::defaulted), this, qOverload<bool>(&KCModule::defaulted));
 
     mMoving = new KMovingConfig(false, mSettings, this);
     mMoving->setObjectName(QLatin1String("KWin Moving"));
     tab->addTab(mMoving, i18n("Mo&vement"));
     connect(mMoving, qOverload<bool>(&KCModule::changed), this, qOverload<bool>(&KCModule::changed));
     connect(mMoving, qOverload<bool>(&KCModule::defaulted), this, qOverload<bool>(&KCModule::defaulted));
 
     mAdvanced = new KAdvancedConfig(false, mSettings, this);
     mAdvanced->setObjectName(QLatin1String("KWin Advanced"));
     tab->addTab(mAdvanced, i18n("Adva&nced"));
     connect(mAdvanced, qOverload<bool>(&KCModule::changed), this, qOverload<bool>(&KCModule::changed));
     connect(mAdvanced, qOverload<bool>(&KCModule::defaulted), this, qOverload<bool>(&KCModule::defaulted));
 
     KAboutData *about =
         new KAboutData(QStringLiteral("kcmkwinoptions"), i18n("Window Behavior Configuration Module"),
                        QString(), QString(), KAboutLicense::GPL,
                        i18n("(c) 1997 - 2002 KWin and KControl Authors"));
 
     about->addAuthor(i18n("Matthias Ettrich"), QString(), "ettrich@kde.org");
     about->addAuthor(i18n("Waldo Bastian"), QString(), "bastian@kde.org");
     about->addAuthor(i18n("Cristian Tibirna"), QString(), "tibirna@kde.org");
     about->addAuthor(i18n("Matthias Kalle Dalheimer"), QString(), "kalle@kde.org");
     about->addAuthor(i18n("Daniel Molkentin"), QString(), "molkentin@kde.org");
     about->addAuthor(i18n("Wynn Wilkes"), QString(), "wynnw@caldera.com");
     about->addAuthor(i18n("Pat Dowler"), QString(), "dowler@pt1B1106.FSH.UVic.CA");
     about->addAuthor(i18n("Bernd Wuebben"), QString(), "wuebben@kde.org");
     about->addAuthor(i18n("Matthias Hoelzer-Kluepfel"), QString(), "hoelzer@kde.org");
     setAboutData(about);
 }
 
 void KWinOptions::load()
 {
     mTitleBarActions->load();
     mWindowActions->load();
     mMoving->load();
     mAdvanced->load();
     // mFocus is last because it may send unmanagedWidgetStateChanged
     // that need to have the final word
     mFocus->load();
 }
 
 void KWinOptions::save()
 {
     mFocus->save();
     mTitleBarActions->save();
     mWindowActions->save();
     mMoving->save();
     mAdvanced->save();
 
     emit KCModule::changed(false);
 
     // Send signal to all kwin instances
     QDBusMessage message =
         QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
     QDBusConnection::sessionBus().send(message);
 }
 
 
 void KWinOptions::defaults()
 {
     mTitleBarActions->defaults();
     mWindowActions->defaults();
     mMoving->defaults();
     mAdvanced->defaults();
     // mFocus is last because it may send unmanagedWidgetDefaulted
     // that need to have the final word
     mFocus->defaults();
 }
 
 QString KWinOptions::quickHelp() const
 {
     return i18n("<p><h1>Window Behavior</h1> Here you can customize the way windows behave when being"
                 " moved, resized or clicked on. You can also specify a focus policy as well as a placement"
                 " policy for new windows.</p>"
                 " <p>Please note that this configuration will not take effect if you do not use"
                 " KWin as your window manager. If you do use a different window manager, please refer to its documentation"
                 " for how to customize window behavior.</p>");
 }
 
 KActionsOptions::KActionsOptions(QWidget *parent, const QVariantList &)
     : KCModule(parent)
 {
     mSettings = new KWinOptionsSettings(this);
 
     QVBoxLayout *layout = new QVBoxLayout(this);
     layout->setContentsMargins(0, 0, 0, 0);
     tab = new QTabWidget(this);
     layout->addWidget(tab);
 
     mTitleBarActions = new KTitleBarActionsConfig(false, mSettings, this);
     mTitleBarActions->setObjectName(QLatin1String("KWin TitleBar Actions"));
     tab->addTab(mTitleBarActions, i18n("&Titlebar Actions"));
     connect(mTitleBarActions, qOverload<bool>(&KCModule::changed), this, qOverload<bool>(&KCModule::changed));
     connect(mTitleBarActions, qOverload<bool>(&KCModule::defaulted), this, qOverload<bool>(&KCModule::defaulted));
 
     mWindowActions = new KWindowActionsConfig(false, mSettings, this);
     mWindowActions->setObjectName(QLatin1String("KWin Window Actions"));
     tab->addTab(mWindowActions, i18n("Window Actio&ns"));
     connect(mWindowActions, qOverload<bool>(&KCModule::changed), this, qOverload<bool>(&KCModule::changed));
     connect(mWindowActions, qOverload<bool>(&KCModule::defaulted), this, qOverload<bool>(&KCModule::defaulted));
 }
 
 void KActionsOptions::load()
 {
     mTitleBarActions->load();
     mWindowActions->load();
 }
 
 void KActionsOptions::save()
 {
     mTitleBarActions->save();
     mWindowActions->save();
 
     emit KCModule::changed(false);
     // Send signal to all kwin instances
     QDBusMessage message =
         QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
     QDBusConnection::sessionBus().send(message);
 }
 
 void KActionsOptions::defaults()
 {
     mTitleBarActions->defaults();
     mWindowActions->defaults();
 }
 
 void KActionsOptions::moduleChanged(bool state)
 {
     emit KCModule::changed(state);
 }
 
 K_PLUGIN_FACTORY_DEFINITION(KWinOptionsFactory,
                             registerPlugin<KActionsOptions>("kwinactions");
                             registerPlugin<KFocusConfigStandalone>("kwinfocus");
                             registerPlugin<KMovingConfigStandalone>("kwinmoving");
                             registerPlugin<KAdvancedConfigStandalone>("kwinadvanced");
                             registerPlugin<KWinOptions>("kwinoptions");
                            )
 
 #include "main.moc"
-#include "moc_main.cpp"
diff --git a/kcmkwin/kwinrules/CMakeLists.txt b/kcmkwin/kwinrules/CMakeLists.txt
index f25e7ff46..77f5742e9 100644
--- a/kcmkwin/kwinrules/CMakeLists.txt
+++ b/kcmkwin/kwinrules/CMakeLists.txt
@@ -1,56 +1,59 @@
 # KI18N Translation Domain for this library
 add_definitions(-DTRANSLATION_DOMAIN=\"kcmkwinrules\")
 add_definitions(-DKCMRULES)
-########### next target ###############
 
 include_directories(../../)
-set(kwinrules_MOC_HDRS yesnobox.h ../../cursor.h ../../plugins/platforms/x11/standalone/x11cursor.h)
-qt5_wrap_cpp(kwinrules_MOC_SRCS ${kwinrules_MOC_HDRS})
-set(kwinrules_SRCS ../../rulebooksettings.cpp ruleswidget.cpp ruleslist.cpp kwinsrc.cpp detectwidget.cpp main.cpp ${kwinrules_MOC_SRCS})
+set(kwinrules_SRCS  ../../rulebooksettings.cpp
+                    ../../cursor.cpp
+                    ../../plugins/platforms/x11/standalone/x11cursor.cpp
+                    ../../rules.cpp
+                    ../../placement.cpp
+                    ../../utils.cpp
+                    yesnobox.cpp
+                    ruleswidget.cpp
+                    ruleslist.cpp
+                    kwinsrc.cpp
+                    detectwidget.cpp
+                    )
 
 ki18n_wrap_ui(kwinrules_SRCS ruleslist.ui detectwidget.ui editshortcut.ui ruleswidgetbase.ui)
 
 kconfig_add_kcfg_files(kwinrules_SRCS ../../rulesettings.kcfgc)
 kconfig_add_kcfg_files(kwinrules_SRCS ../../rulebooksettingsbase.kcfgc)
 
-add_executable(kwin_rules_dialog ${kwinrules_SRCS})
+add_library(KWinRulesObjects OBJECT ${kwinrules_SRCS})
 
 set(kwin_kcm_rules_XCB_LIBS
     XCB::CURSOR
     XCB::XCB
     XCB::XFIXES
 )
 
 set(kcm_libs
     Qt5::Concurrent
     Qt5::X11Extras
 
     KF5::Completion
     KF5::ConfigWidgets
     KF5::I18n
     KF5::Service
     KF5::WindowSystem
     KF5::XmlGui
 )
 
 if (KWIN_BUILD_ACTIVITIES)
     set(kcm_libs ${kcm_libs} KF5::Activities)
 endif()
+target_link_libraries(KWinRulesObjects ${kcm_libs} ${kwin_kcm_rules_XCB_LIBS})
 
-target_link_libraries(kwin_rules_dialog ${kcm_libs} ${kwin_kcm_rules_XCB_LIBS})
-
+add_executable(kwin_rules_dialog main.cpp)
+target_link_libraries(kwin_rules_dialog KWinRulesObjects)
 install(TARGETS kwin_rules_dialog DESTINATION ${LIBEXEC_INSTALL_DIR})
 
-########### next target ###############
-
-set(kcm_kwinrules_PART_SRCS kcm.cpp ${kwinrules_SRCS})
-
-add_library(kcm_kwinrules MODULE ${kcm_kwinrules_PART_SRCS})
-
-target_link_libraries(kcm_kwinrules ${kcm_libs} ${kwin_kcm_rules_XCB_LIBS})
-
+add_library(kcm_kwinrules MODULE kcm.cpp)
+target_link_libraries(kcm_kwinrules KWinRulesObjects)
 install(TARGETS kcm_kwinrules DESTINATION ${PLUGIN_INSTALL_DIR})
 
 ########### install files ###############
 
 install(FILES kwinrules.desktop DESTINATION ${SERVICES_INSTALL_DIR})
diff --git a/kcmkwin/kwinrules/kwinsrc.cpp b/kcmkwin/kwinrules/kwinsrc.cpp
index 4c4482d93..75173a0a3 100644
--- a/kcmkwin/kwinrules/kwinsrc.cpp
+++ b/kcmkwin/kwinrules/kwinsrc.cpp
@@ -1,53 +1,45 @@
 /*
  * Copyright (c) 2004 Lubos Lunak <l.lunak@kde.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-// Include some code from kwin core in order to avoid
-// double implementation.
-
-#include "../../cursor.cpp"
-#include "../../plugins/platforms/x11/standalone/x11cursor.cpp"
-#include "../../rules.cpp"
-#include "../../placement.cpp"
-#include "../../options.cpp"
-#include "../../utils.cpp"
+#include <input.h>
 
 KWin::InputRedirection *KWin::InputRedirection::s_self = nullptr;
 
 Qt::MouseButtons KWin::InputRedirection::qtButtonStates() const
 {
     return Qt::NoButton;
 }
 
 Qt::KeyboardModifiers KWin::InputRedirection::keyboardModifiers() const
 {
     return Qt::NoModifier;
 }
 
 void KWin::InputRedirection::warpPointer(const QPointF&)
 {
 }
 
 bool KWin::InputRedirection::supportsPointerWarping() const
 {
     return false;
 }
 
 QPointF KWin::InputRedirection::globalPointer() const
 {
     return QPointF();
 }
diff --git a/kcmkwin/kwinrules/yesnobox.cpp b/kcmkwin/kwinrules/yesnobox.cpp
new file mode 100644
index 000000000..a20370188
--- /dev/null
+++ b/kcmkwin/kwinrules/yesnobox.cpp
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2011 Thomas Lübking <thomas.luebking@web.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "yesnobox.h"
+
+YesNoBox::YesNoBox( QWidget *parent )
+    : QWidget(parent)
+{
+    QHBoxLayout *l = new QHBoxLayout(this);
+    l->setContentsMargins(0, 0, 0, 0);
+    l->addWidget(yes = new QRadioButton(i18n("Yes"), this));
+    l->addWidget(no = new QRadioButton(i18n("No"), this));
+    l->addStretch(100);
+    no->setChecked(true);
+    connect(yes, SIGNAL(clicked(bool)), this, SIGNAL(clicked(bool)));
+    connect(yes, SIGNAL(toggled(bool)), this, SIGNAL(toggled(bool)));
+    connect(no, SIGNAL(clicked(bool)), this, SLOT(noClicked(bool)));
+}
diff --git a/kcmkwin/kwinrules/yesnobox.h b/kcmkwin/kwinrules/yesnobox.h
index 222ff6e3d..0d4f24036 100644
--- a/kcmkwin/kwinrules/yesnobox.h
+++ b/kcmkwin/kwinrules/yesnobox.h
@@ -1,57 +1,46 @@
 /*
  * Copyright (c) 2011 Thomas Lübking <thomas.luebking@web.de>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 
 #ifndef YESNOBOX_H
 #define YESNOBOX_H
 
 #include <QHBoxLayout>
 #include <QRadioButton>
 
 #include <KLocalizedString>
 
 class YesNoBox : public QWidget {
     Q_OBJECT
 public:
-    explicit YesNoBox( QWidget *parent ) : QWidget(parent)
-    {
-        QHBoxLayout *l = new QHBoxLayout(this);
-        l->setContentsMargins(0, 0, 0, 0);
-        l->addWidget(yes = new QRadioButton(i18n("Yes"), this));
-        l->addWidget(no = new QRadioButton(i18n("No"), this));
-        l->addStretch(100);
-        no->setChecked(true);
-        connect(yes, SIGNAL(clicked(bool)), this, SIGNAL(clicked(bool)));
-        connect(yes, SIGNAL(toggled(bool)), this, SIGNAL(toggled(bool)));
-        connect(no, SIGNAL(clicked(bool)), this, SLOT(noClicked(bool)));
-    }
+    explicit YesNoBox( QWidget *parent );
     bool isChecked() { return yes->isChecked(); }
 public Q_SLOTS:
     void setChecked(bool b) { yes->setChecked(b); }
     void toggle() { yes->toggle(); }
 
 Q_SIGNALS:
     void clicked(bool checked = false);
     void toggled(bool checked);
 private Q_SLOTS:
     void noClicked(bool checked) { emit clicked(!checked); }
 private:
     QRadioButton *yes, *no;
 };
 
 #endif // YESNOBOX_H
diff --git a/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp b/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp
index 25d11251f..e121d6d94 100644
--- a/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp
+++ b/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp
@@ -1,33 +1,31 @@
 /********************************************************************
 Copyright (C) 2012 Martin Gräßlin <mgraesslin@kde.org>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "plastikplugin.h"
 #include "plastikbutton.h"
 #include <QQmlEngine>
 
 void PlastikPlugin::registerTypes(const char *uri)
 {
     Q_UNUSED(uri)
 }
 
 void PlastikPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 {
     Q_ASSERT(QLatin1String(uri) == QLatin1String("org.kde.kwin.decorations.plastik"));
     engine->addImageProvider(QLatin1String("plastik"), new KWin::PlastikButtonProvider());
     QQmlExtensionPlugin::initializeEngine(engine, uri);
 }
-
-#include "moc_plastikplugin.cpp"
diff --git a/utils.cpp b/utils.cpp
index 53864a34d..6323e248d 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -1,206 +1,206 @@
 /********************************************************************
  KWin - the KDE window manager
  This file is part of the KDE project.
 
 Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 Copyright (C) 2003 Lubos Lunak <l.lunak@kde.org>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 
 /*
 
  This file is for (very) small utility functions/classes.
 
 */
 
 #include "utils.h"
 
 #include <QWidget>
 #include <kkeyserver.h>
 
 #ifndef KCMRULES
 #include <QApplication>
 #include <QDebug>
 
 #include "atoms.h"
 #include "platform.h"
 #include "workspace.h"
 
 #include <csignal>
 #include <cstdio>
 
 #endif
 
 Q_LOGGING_CATEGORY(KWIN_CORE, "kwin_core", QtCriticalMsg)
 Q_LOGGING_CATEGORY(KWIN_VIRTUALKEYBOARD, "kwin_virtualkeyboard", QtCriticalMsg)
 namespace KWin
 {
 
 #ifndef KCMRULES
 
 //************************************
 // StrutRect
 //************************************
 
 StrutRect::StrutRect(QRect rect, StrutArea area)
     : QRect(rect)
     , m_area(area)
 {
 }
 
 StrutRect::StrutRect(const StrutRect& other)
     : QRect(other)
     , m_area(other.area())
 {
 }
 
 StrutRect &StrutRect::operator=(const StrutRect &other)
 {
     if (this != &other) {
         QRect::operator=(other);
         m_area = other.area();
     }
     return *this;
 }
 
 #endif
 
+Process::Process(QObject *parent)
+    : QProcess(parent)
+{
+}
+
+Process::~Process() = default;
+
 #ifndef KCMRULES
 void updateXTime()
 {
     kwinApp()->platform()->updateXTime();
 }
 
 static int server_grab_count = 0;
 
 void grabXServer()
 {
     if (++server_grab_count == 1)
         xcb_grab_server(connection());
 }
 
 void ungrabXServer()
 {
     Q_ASSERT(server_grab_count > 0);
     if (--server_grab_count == 0) {
         xcb_ungrab_server(connection());
         xcb_flush(connection());
     }
 }
 
 static bool keyboard_grabbed = false;
 
 bool grabXKeyboard(xcb_window_t w)
 {
     if (QWidget::keyboardGrabber() != nullptr)
         return false;
     if (keyboard_grabbed)
         return false;
     if (qApp->activePopupWidget() != nullptr)
         return false;
     if (w == XCB_WINDOW_NONE)
         w = rootWindow();
     const xcb_grab_keyboard_cookie_t c = xcb_grab_keyboard_unchecked(connection(), false, w, xTime(),
                                                                      XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC);
     ScopedCPointer<xcb_grab_keyboard_reply_t> grab(xcb_grab_keyboard_reply(connection(), c, nullptr));
     if (grab.isNull()) {
         return false;
     }
     if (grab->status != XCB_GRAB_STATUS_SUCCESS) {
         return false;
     }
     keyboard_grabbed = true;
     return true;
 }
 
 void ungrabXKeyboard()
 {
     if (!keyboard_grabbed) {
         // grabXKeyboard() may fail sometimes, so don't fail, but at least warn anyway
         qCDebug(KWIN_CORE) << "ungrabXKeyboard() called but keyboard not grabbed!";
     }
     keyboard_grabbed = false;
     xcb_ungrab_keyboard(connection(), XCB_TIME_CURRENT_TIME);
 }
 
-Process::Process(QObject *parent)
-    : QProcess(parent)
-{
-}
-
-Process::~Process() = default;
-
 void Process::setupChildProcess()
 {
     sigset_t userSiganls;
     sigemptyset(&userSiganls);
     sigaddset(&userSiganls, SIGUSR1);
     sigaddset(&userSiganls, SIGUSR2);
     pthread_sigmask(SIG_UNBLOCK, &userSiganls, nullptr);
 }
 
 #endif
 
 // converting between X11 mouse/keyboard state mask and Qt button/keyboard states
 
 Qt::MouseButton x11ToQtMouseButton(int button)
 {
     if (button == XCB_BUTTON_INDEX_1)
         return Qt::LeftButton;
     if (button == XCB_BUTTON_INDEX_2)
         return Qt::MidButton;
     if (button == XCB_BUTTON_INDEX_3)
         return Qt::RightButton;
     if (button == XCB_BUTTON_INDEX_4)
         return Qt::XButton1;
     if (button == XCB_BUTTON_INDEX_5)
         return Qt::XButton2;
     return Qt::NoButton;
 }
 
 Qt::MouseButtons x11ToQtMouseButtons(int state)
 {
     Qt::MouseButtons ret = {};
     if (state & XCB_KEY_BUT_MASK_BUTTON_1)
         ret |= Qt::LeftButton;
     if (state & XCB_KEY_BUT_MASK_BUTTON_2)
         ret |= Qt::MidButton;
     if (state & XCB_KEY_BUT_MASK_BUTTON_3)
         ret |= Qt::RightButton;
     if (state & XCB_KEY_BUT_MASK_BUTTON_4)
         ret |= Qt::XButton1;
     if (state & XCB_KEY_BUT_MASK_BUTTON_5)
         ret |= Qt::XButton2;
     return ret;
 }
 
 Qt::KeyboardModifiers x11ToQtKeyboardModifiers(int state)
 {
     Qt::KeyboardModifiers ret = {};
     if (state & XCB_KEY_BUT_MASK_SHIFT)
         ret |= Qt::ShiftModifier;
     if (state & XCB_KEY_BUT_MASK_CONTROL)
         ret |= Qt::ControlModifier;
     if (state & KKeyServer::modXAlt())
         ret |= Qt::AltModifier;
     if (state & KKeyServer::modXMeta())
         ret |= Qt::MetaModifier;
     return ret;
 }
 
 } // namespace
 
 #ifndef KCMRULES
 #endif
diff --git a/utils.h b/utils.h
index 0271967ce..a0b36d413 100644
--- a/utils.h
+++ b/utils.h
@@ -1,207 +1,209 @@
 /********************************************************************
  KWin - the KDE window manager
  This file is part of the KDE project.
 
 Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 Copyright (C) 2003 Lubos Lunak <l.lunak@kde.org>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 
 #ifndef KWIN_UTILS_H
 #define KWIN_UTILS_H
 
 // cmake stuff
 #include <config-kwin.h>
 #include <kwinconfig.h>
 // kwin
 #include <kwinglobals.h>
 // Qt
 #include <QLoggingCategory>
 #include <QList>
 #include <QPoint>
 #include <QRect>
 #include <QScopedPointer>
 #include <QProcess>
 // system
 #include <climits>
 Q_DECLARE_LOGGING_CATEGORY(KWIN_CORE)
 Q_DECLARE_LOGGING_CATEGORY(KWIN_VIRTUALKEYBOARD)
 namespace KWin
 {
 
 const QPoint invalidPoint(INT_MIN, INT_MIN);
 
 enum Layer {
     UnknownLayer = -1,
     FirstLayer = 0,
     DesktopLayer = FirstLayer,
     BelowLayer,
     NormalLayer,
     DockLayer,
     AboveLayer,
     NotificationLayer, // layer for windows of type notification
     ActiveLayer, // active fullscreen, or active dialog
     CriticalNotificationLayer, // layer for notifications that should be shown even on top of fullscreen
     OnScreenDisplayLayer, // layer for On Screen Display windows such as volume feedback
     UnmanagedLayer, // layer for override redirect windows.
     NumLayers // number of layers, must be last
 };
 
 enum StrutArea {
     StrutAreaInvalid = 0, // Null
     StrutAreaTop     = 1 << 0,
     StrutAreaRight   = 1 << 1,
     StrutAreaBottom  = 1 << 2,
     StrutAreaLeft    = 1 << 3,
     StrutAreaAll     = StrutAreaTop | StrutAreaRight | StrutAreaBottom | StrutAreaLeft
 };
 Q_DECLARE_FLAGS(StrutAreas, StrutArea)
 
 class StrutRect : public QRect
 {
 public:
     explicit StrutRect(QRect rect = QRect(), StrutArea area = StrutAreaInvalid);
     StrutRect(const StrutRect& other);
     StrutRect &operator=(const StrutRect& other);
     inline StrutArea area() const {
         return m_area;
     }
 private:
     StrutArea m_area;
 };
 typedef QVector<StrutRect> StrutRects;
 
 
 enum ShadeMode {
     ShadeNone, // not shaded
     ShadeNormal, // normally shaded - isShade() is true only here
     ShadeHover, // "shaded", but visible due to hover unshade
     ShadeActivated // "shaded", but visible due to alt+tab to the window
 };
 
 /**
  * Maximize mode. These values specify how a window is maximized.
  *
  * @note these values are written to session files, don't change the order
  */
 enum MaximizeMode {
     MaximizeRestore    = 0, ///< The window is not maximized in any direction.
     MaximizeVertical   = 1, ///< The window is maximized vertically.
     MaximizeHorizontal = 2, ///< The window is maximized horizontally.
     /// Equal to @p MaximizeVertical | @p MaximizeHorizontal
     MaximizeFull = MaximizeVertical | MaximizeHorizontal
 };
 
 inline
 MaximizeMode operator^(MaximizeMode m1, MaximizeMode m2)
 {
     return MaximizeMode(int(m1) ^ int(m2));
 }
 
 enum class QuickTileFlag {
     None        = 0,
     Left        = 1 << 0,
     Right       = 1 << 1,
     Top         = 1 << 2,
     Bottom      = 1 << 3,
     Horizontal  = Left | Right,
     Vertical    = Top | Bottom,
     Maximize    = Left | Right | Top | Bottom,
 };
 Q_DECLARE_FLAGS(QuickTileMode, QuickTileFlag)
 
 template <typename T> using ScopedCPointer = QScopedPointer<T, QScopedPointerPodDeleter>;
 
 void KWIN_EXPORT updateXTime();
 void KWIN_EXPORT grabXServer();
 void KWIN_EXPORT ungrabXServer();
 bool KWIN_EXPORT grabXKeyboard(xcb_window_t w = XCB_WINDOW_NONE);
 void KWIN_EXPORT ungrabXKeyboard();
 
 /**
  * Small helper class which performs grabXServer in the ctor and
  * ungrabXServer in the dtor. Use this class to ensure that grab and
  * ungrab are matched.
  */
 class XServerGrabber
 {
 public:
     XServerGrabber() {
         grabXServer();
     }
     ~XServerGrabber() {
         ungrabXServer();
     }
 };
 
 // the docs say it's UrgencyHint, but it's often #defined as XUrgencyHint
 #ifndef UrgencyHint
 #define UrgencyHint XUrgencyHint
 #endif
 
 // converting between X11 mouse/keyboard state mask and Qt button/keyboard states
 Qt::MouseButton x11ToQtMouseButton(int button);
 Qt::MouseButton KWIN_EXPORT x11ToQtMouseButton(int button);
 Qt::MouseButtons KWIN_EXPORT x11ToQtMouseButtons(int state);
 Qt::KeyboardModifiers KWIN_EXPORT x11ToQtKeyboardModifiers(int state);
 
 /**
  * Separate the concept of an unet QPoint and 0,0
  */
 class ClearablePoint
 {
 public:
     inline bool isValid() const {
         return m_valid;
     }
 
     inline void clear(){
         m_valid = false;
     }
 
     inline void setPoint(const QPoint &point) {
         m_point = point; m_valid = true;
     }
 
     inline QPoint point() const {
         return m_point;
     }
 
 private:
     QPoint m_point;
     bool m_valid = false;
 };
 
 /**
  * QProcess subclass which unblocks SIGUSR in the child process.
  */
 class KWIN_EXPORT Process : public QProcess
 {
     Q_OBJECT
 public:
     explicit Process(QObject *parent = nullptr);
     ~Process() override;
 
+#ifndef KCMRULES
 protected:
     void setupChildProcess() override;
+#endif
 };
 
 } // namespace
 
 // Must be outside namespace
 Q_DECLARE_OPERATORS_FOR_FLAGS(KWin::StrutAreas)
 Q_DECLARE_OPERATORS_FOR_FLAGS(KWin::QuickTileMode)
 
 #endif