diff --git a/CMakeLists.txt b/CMakeLists.txt
index 455f51f664..7d25fe1518 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ project(KWin VERSION ${PROJECT_VERSION})
 set(CMAKE_C_STANDARD 99)
 
 set(QT_MIN_VERSION "5.15.0")
-set(KF5_MIN_VERSION "5.86")
+set(KF5_MIN_VERSION "5.88")
 set(KDE_COMPILERSETTINGS_LEVEL "5.82")
 
 find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
diff --git a/autotests/fakeeffectplugin.cpp b/autotests/fakeeffectplugin.cpp
index c2f1e68102..23ce58ecfc 100644
--- a/autotests/fakeeffectplugin.cpp
+++ b/autotests/fakeeffectplugin.cpp
@@ -29,8 +29,7 @@ public:
 
 } // namespace
 
-KWIN_EFFECT_FACTORY_SUPPORTED_ENABLED( FakeEffectPluginFactory,
-                                       KWin::FakeEffect,
+KWIN_EFFECT_FACTORY_SUPPORTED_ENABLED(KWin::FakeEffect,
                                        "fakeeffectplugin.json",
                                        return KWin::FakeEffect::supported();,
                                        return KWin::FakeEffect::enabledByDefault();)
diff --git a/autotests/integration/kwin_wayland_test.cpp b/autotests/integration/kwin_wayland_test.cpp
index db149fdff9..60a6872d1b 100644
--- a/autotests/integration/kwin_wayland_test.cpp
+++ b/autotests/integration/kwin_wayland_test.cpp
@@ -9,7 +9,6 @@
 #include "kwin_wayland_test.h"
 
 #include "composite.h"
-#include "effect_builtins.h"
 #include "effects.h"
 #include "inputmethod.h"
 #include "platform.h"
@@ -38,8 +37,6 @@ Q_IMPORT_PLUGIN(KGlobalAccelImpl)
 Q_IMPORT_PLUGIN(KWindowSystemKWinPlugin)
 Q_IMPORT_PLUGIN(KWinIdleTimePoller)
 
-KWIN_IMPORT_BUILTIN_EFFECTS
-
 namespace KWin
 {
 
diff --git a/src/effectloader.cpp b/src/effectloader.cpp
index 3a1184920f..bcc92e2452 100644
--- a/src/effectloader.cpp
+++ b/src/effectloader.cpp
@@ -202,6 +202,7 @@ StaticPluginEffectLoader::StaticPluginEffectLoader(QObject *parent)
     , m_queue(new EffectLoadQueue<StaticPluginEffectLoader, QString>(this))
 {
     const QVector<QStaticPlugin> staticPlugins = QPluginLoader::staticPlugins();
+    qWarning()<<Q_FUNC_INFO<<staticPlugins.count();
     for (const QStaticPlugin &staticPlugin : staticPlugins) {
         const QJsonObject rootMetaData = staticPlugin.metaData();
         if (rootMetaData.value(QLatin1String("IID")) != QLatin1String(EffectPluginFactory_iid)) {
diff --git a/src/effects/CMakeLists.txt b/src/effects/CMakeLists.txt
index 288e49fe50..2f92ecaf32 100644
--- a/src/effects/CMakeLists.txt
+++ b/src/effects/CMakeLists.txt
@@ -76,8 +76,8 @@ set(kwin_effect_XCB_LIBS
 
 set(kwin_effect_OWN_LIBS ${kwin_effect_OWN_LIBS} kwinglutils)
 
-macro(KWIN4_ADD_EFFECT_BACKEND name type)
-    add_library(${name} ${type} ${ARGN})
+macro(KWIN4_ADD_EFFECT_MODULE name)
+    kcoreaddons_add_plugin(${name} STATIC SOURCES ${ARGN} INSTALL_NAMESPACE "kwin/effects/static")
     target_link_libraries(${name} PRIVATE
         ${kwin_effect_KDE_LIBS}
         ${kwin_effect_OWN_LIBS}
@@ -85,11 +85,6 @@ macro(KWIN4_ADD_EFFECT_BACKEND name type)
         ${kwin_effect_XCB_LIBS}
         ${kwin_effect_XLIB_LIBS}
     )
-endmacro()
-
-macro(KWIN4_ADD_EFFECT_MODULE name)
-    kwin4_add_effect_backend(${name} OBJECT ${ARGN})
-    target_compile_definitions(${name} PRIVATE QT_STATICPLUGIN)
     kwin_strip_builtin_effect_metadata(${name} metadata.json)
     install(FILES metadata.json DESTINATION ${KDE_INSTALL_DATADIR}/${KWIN_NAME}/builtin-effects/${name}/)
 endmacro()
@@ -174,41 +169,12 @@ set(kwin4_effect_builtins_sources
 
 qt5_add_resources(kwin4_effect_builtins_sources shaders.qrc)
 
-kwin4_add_effect_backend(kwin4_effect_builtins STATIC ${kwin4_effect_builtins_sources})
+add_library(kwin4_effect_builtins STATIC ${kwin4_effect_builtins_sources})
+kcoreaddons_target_static_plugins(kwin4_effect_builtins "kwin/effects/static" LINK_OPTION "PRIVATE")
 target_link_libraries(kwin4_effect_builtins PRIVATE
-    kwin4_effect_blur
-    kwin4_effect_colorpicker
-    kwin4_effect_contrast
-    kwin4_effect_desktopgrid
-    kwin4_effect_diminactive
-    kwin4_effect_fallapart
-    kwin4_effect_glide
-    kwin4_effect_highlightwindow
-    kwin4_effect_invert
-    kwin4_effect_kscreen
-    kwin4_effect_lookingglass
-    kwin4_effect_magiclamp
-    kwin4_effect_magnifier
-    kwin4_effect_mouseclick
-    kwin4_effect_mousemark
-    kwin4_effect_overview
-    kwin4_effect_presentwindows
-    kwin4_effect_resize
-    kwin4_effect_screenedge
-    kwin4_effect_screenshot
-    kwin4_effect_screentransform
-    kwin4_effect_sheet
-    kwin4_effect_showfps
-    kwin4_effect_showpaint
-    kwin4_effect_slide
-    kwin4_effect_slideback
-    kwin4_effect_slidingpopups
-    kwin4_effect_snaphelper
-    kwin4_effect_startupfeedback
-    kwin4_effect_thumbnailaside
-    kwin4_effect_touchpoints
-    kwin4_effect_trackmouse
-    kwin4_effect_windowgeometry
-    kwin4_effect_wobblywindows
-    kwin4_effect_zoom
+    ${kwin_effect_KDE_LIBS}
+    ${kwin_effect_OWN_LIBS}
+    ${kwin_effect_QT_LIBS}
+    ${kwin_effect_XCB_LIBS}
+    ${kwin_effect_XLIB_LIBS}
 )
diff --git a/src/effects/backgroundcontrast/main.cpp b/src/effects/backgroundcontrast/main.cpp
index 27d2904e5a..e9047af1fe 100644
--- a/src/effects/backgroundcontrast/main.cpp
+++ b/src/effects/backgroundcontrast/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY_SUPPORTED_ENABLED(ContrastEffectFactory,
-                                      ContrastEffect,
+KWIN_EFFECT_FACTORY_SUPPORTED_ENABLED(ContrastEffect,
                                       "metadata.json.stripped",
                                       return ContrastEffect::supported();,
                                       return ContrastEffect::enabledByDefault();)
diff --git a/src/effects/blur/main.cpp b/src/effects/blur/main.cpp
index 42122d5262..af9e484321 100644
--- a/src/effects/blur/main.cpp
+++ b/src/effects/blur/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY_SUPPORTED_ENABLED(BlurEffectFactory,
-                                      BlurEffect,
+KWIN_EFFECT_FACTORY_SUPPORTED_ENABLED(BlurEffect,
                                       "metadata.json.stripped",
                                       return BlurEffect::supported();,
                                       return BlurEffect::enabledByDefault();)
diff --git a/src/effects/colorpicker/main.cpp b/src/effects/colorpicker/main.cpp
index 431eae2bd5..3f7d7bd20f 100644
--- a/src/effects/colorpicker/main.cpp
+++ b/src/effects/colorpicker/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY_SUPPORTED(ColorPickerEffectFactory,
-                              ColorPickerEffect,
+KWIN_EFFECT_FACTORY_SUPPORTED(ColorPickerEffect,
                               "metadata.json.stripped",
                               return ColorPickerEffect::supported();)
 
diff --git a/src/effects/desktopgrid/main.cpp b/src/effects/desktopgrid/main.cpp
index 3957debaa7..a590fba0a5 100644
--- a/src/effects/desktopgrid/main.cpp
+++ b/src/effects/desktopgrid/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY(DesktopGridEffectFactory,
-                    DesktopGridEffect,
+KWIN_EFFECT_FACTORY(DesktopGridEffect,
                     "metadata.json.stripped")
 
 } // namespace KWin
diff --git a/src/effects/diminactive/main.cpp b/src/effects/diminactive/main.cpp
index 5d8663901d..2bf8705992 100644
--- a/src/effects/diminactive/main.cpp
+++ b/src/effects/diminactive/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY(DimInactiveEffectFactory,
-                    DimInactiveEffect,
+KWIN_EFFECT_FACTORY(DimInactiveEffect,
                     "metadata.json.stripped")
 
 } // namespace KWin
diff --git a/src/effects/effect_builtins.h b/src/effects/effect_builtins.h
deleted file mode 100644
index e01b7574ac..0000000000
--- a/src/effects/effect_builtins.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-    KWin - the KDE window manager
-    This file is part of the KDE project.
-
-    SPDX-FileCopyrightText: 2014 Martin Gräßlin <mgraesslin@kde.org>
-
-    SPDX-License-Identifier: GPL-2.0-or-later
-*/
-#ifndef KWIN_EFFECT_BUILTINS_H
-#define KWIN_EFFECT_BUILTINS_H
-
-#define KWIN_IMPORT_BUILTIN_EFFECTS                                                       \
-    Q_IMPORT_PLUGIN(BlurEffectFactory)                                                    \
-    Q_IMPORT_PLUGIN(ColorPickerEffectFactory)                                             \
-    Q_IMPORT_PLUGIN(ContrastEffectFactory)                                                \
-    Q_IMPORT_PLUGIN(DesktopGridEffectFactory)                                             \
-    Q_IMPORT_PLUGIN(DimInactiveEffectFactory)                                             \
-    Q_IMPORT_PLUGIN(FallApartEffectFactory)                                               \
-    Q_IMPORT_PLUGIN(GlideEffectFactory)                                                   \
-    Q_IMPORT_PLUGIN(HighlightWindowEffectFactory)                                         \
-    Q_IMPORT_PLUGIN(InvertEffectFactory)                                                  \
-    Q_IMPORT_PLUGIN(KscreenEffectFactory)                                                 \
-    Q_IMPORT_PLUGIN(LookingGlassEffectFactory)                                            \
-    Q_IMPORT_PLUGIN(MagicLampEffectFactory)                                               \
-    Q_IMPORT_PLUGIN(MagnifierEffectFactory)                                               \
-    Q_IMPORT_PLUGIN(MouseClickEffectFactory)                                              \
-    Q_IMPORT_PLUGIN(MouseMarkEffectFactory)                                               \
-    Q_IMPORT_PLUGIN(OverviewEffectFactory)                                                \
-    Q_IMPORT_PLUGIN(PresentWindowsEffectFactory)                                          \
-    Q_IMPORT_PLUGIN(ResizeEffectFactory)                                                  \
-    Q_IMPORT_PLUGIN(ScreenEdgeEffectFactory)                                              \
-    Q_IMPORT_PLUGIN(ScreenShotEffectFactory)                                              \
-    Q_IMPORT_PLUGIN(ScreenTransformEffectFactory)                                         \
-    Q_IMPORT_PLUGIN(SheetEffectFactory)                                                   \
-    Q_IMPORT_PLUGIN(ShowFpsEffectFactory)                                                 \
-    Q_IMPORT_PLUGIN(ShowPaintEffectFactory)                                               \
-    Q_IMPORT_PLUGIN(SlideEffectFactory)                                                   \
-    Q_IMPORT_PLUGIN(SlideBackEffectFactory)                                               \
-    Q_IMPORT_PLUGIN(SlidingPopupsEffectFactory)                                           \
-    Q_IMPORT_PLUGIN(SnapHelperEffectFactory)                                              \
-    Q_IMPORT_PLUGIN(StartupFeedbackEffectFactory)                                         \
-    Q_IMPORT_PLUGIN(ThumbnailAsideEffectFactory)                                          \
-    Q_IMPORT_PLUGIN(TouchPointsEffectFactory)                                             \
-    Q_IMPORT_PLUGIN(TrackMouseEffectFactory)                                              \
-    Q_IMPORT_PLUGIN(WindowGeometryFactory)                                                \
-    Q_IMPORT_PLUGIN(WobblyWindowsEffectFactory)                                           \
-    Q_IMPORT_PLUGIN(ZoomEffectFactory)
-
-#endif
diff --git a/src/effects/fallapart/main.cpp b/src/effects/fallapart/main.cpp
index ab286c98f0..2a0a033caa 100644
--- a/src/effects/fallapart/main.cpp
+++ b/src/effects/fallapart/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY_SUPPORTED(FallApartEffectFactory,
-                              FallApartEffect,
+KWIN_EFFECT_FACTORY_SUPPORTED(FallApartEffect,
                               "metadata.json.stripped",
                               return FallApartEffect::supported();)
 
diff --git a/src/effects/glide/main.cpp b/src/effects/glide/main.cpp
index a760b137fb..9e37921528 100644
--- a/src/effects/glide/main.cpp
+++ b/src/effects/glide/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY_SUPPORTED(GlideEffectFactory,
-                              GlideEffect,
+KWIN_EFFECT_FACTORY_SUPPORTED(GlideEffect,
                               "metadata.json.stripped",
                               return GlideEffect::supported();)
 
diff --git a/src/effects/highlightwindow/main.cpp b/src/effects/highlightwindow/main.cpp
index 111ad8c144..39e92628ba 100644
--- a/src/effects/highlightwindow/main.cpp
+++ b/src/effects/highlightwindow/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY(HighlightWindowEffectFactory,
-                    HighlightWindowEffect,
+KWIN_EFFECT_FACTORY(HighlightWindowEffect,
                     "metadata.json.stripped")
 
 } // namespace KWin
diff --git a/src/effects/invert/main.cpp b/src/effects/invert/main.cpp
index bf29d3af95..0c119dbc42 100644
--- a/src/effects/invert/main.cpp
+++ b/src/effects/invert/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY_SUPPORTED(InvertEffectFactory,
-                              InvertEffect,
+KWIN_EFFECT_FACTORY_SUPPORTED(InvertEffect,
                               "metadata.json.stripped",
                               return InvertEffect::supported();)
 
diff --git a/src/effects/kscreen/main.cpp b/src/effects/kscreen/main.cpp
index c4cbe40cad..1b55ba804c 100644
--- a/src/effects/kscreen/main.cpp
+++ b/src/effects/kscreen/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY(KscreenEffectFactory,
-                    KscreenEffect,
+KWIN_EFFECT_FACTORY(KscreenEffect,
                     "metadata.json.stripped")
 
 } // namespace KWin
diff --git a/src/effects/lookingglass/main.cpp b/src/effects/lookingglass/main.cpp
index 68bf7905b0..d98142ff46 100644
--- a/src/effects/lookingglass/main.cpp
+++ b/src/effects/lookingglass/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY_SUPPORTED(LookingGlassEffectFactory,
-                              LookingGlassEffect,
+KWIN_EFFECT_FACTORY_SUPPORTED(LookingGlassEffect,
                               "metadata.json.stripped",
                               return LookingGlassEffect::supported();)
 
diff --git a/src/effects/magiclamp/main.cpp b/src/effects/magiclamp/main.cpp
index 33f4b378b2..67c2a3c30f 100644
--- a/src/effects/magiclamp/main.cpp
+++ b/src/effects/magiclamp/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY_SUPPORTED(MagicLampEffectFactory,
-                              MagicLampEffect,
+KWIN_EFFECT_FACTORY_SUPPORTED(MagicLampEffect,
                               "metadata.json.stripped",
                               return MagicLampEffect::supported();)
 
diff --git a/src/effects/magnifier/main.cpp b/src/effects/magnifier/main.cpp
index d935bc7620..862236f9cc 100644
--- a/src/effects/magnifier/main.cpp
+++ b/src/effects/magnifier/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY_SUPPORTED(MagnifierEffectFactory,
-                              MagnifierEffect,
+KWIN_EFFECT_FACTORY_SUPPORTED(MagnifierEffect,
                               "metadata.json.stripped",
                               return MagnifierEffect::supported();)
 
diff --git a/src/effects/mouseclick/main.cpp b/src/effects/mouseclick/main.cpp
index 24a9d5a8a9..1cac776c3f 100644
--- a/src/effects/mouseclick/main.cpp
+++ b/src/effects/mouseclick/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY(MouseClickEffectFactory,
-                    MouseClickEffect,
+KWIN_EFFECT_FACTORY(MouseClickEffect,
                     "metadata.json.stripped")
 
 } // namespace KWin
diff --git a/src/effects/mousemark/main.cpp b/src/effects/mousemark/main.cpp
index 0e1da7ff0b..6432975fc5 100644
--- a/src/effects/mousemark/main.cpp
+++ b/src/effects/mousemark/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY(MouseMarkEffectFactory,
-                    MouseMarkEffect,
+KWIN_EFFECT_FACTORY(MouseMarkEffect,
                     "metadata.json.stripped")
 
 } // namespace KWin
diff --git a/src/effects/overview/main.cpp b/src/effects/overview/main.cpp
index 8f5ffdf929..bef23bdcea 100644
--- a/src/effects/overview/main.cpp
+++ b/src/effects/overview/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY_SUPPORTED(OverviewEffectFactory,
-                              OverviewEffect,
+KWIN_EFFECT_FACTORY_SUPPORTED(OverviewEffect,
                               "metadata.json.stripped",
                               return OverviewEffect::supported();)
 
diff --git a/src/effects/presentwindows/main.cpp b/src/effects/presentwindows/main.cpp
index 5a4ae6ec1e..ad85428f50 100644
--- a/src/effects/presentwindows/main.cpp
+++ b/src/effects/presentwindows/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY(PresentWindowsEffectFactory,
-                    PresentWindowsEffect,
+KWIN_EFFECT_FACTORY(PresentWindowsEffect,
                     "metadata.json.stripped")
 
 } // namespace KWin
diff --git a/src/effects/resize/main.cpp b/src/effects/resize/main.cpp
index 988410f80e..e5b6b7f8cc 100644
--- a/src/effects/resize/main.cpp
+++ b/src/effects/resize/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY(ResizeEffectFactory,
-                    ResizeEffect,
+KWIN_EFFECT_FACTORY(ResizeEffect,
                     "metadata.json.stripped")
 
 } // namespace KWin
diff --git a/src/effects/screenedge/main.cpp b/src/effects/screenedge/main.cpp
index 0781bdd727..ab453d907a 100644
--- a/src/effects/screenedge/main.cpp
+++ b/src/effects/screenedge/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY(ScreenEdgeEffectFactory,
-                    ScreenEdgeEffect,
+KWIN_EFFECT_FACTORY(ScreenEdgeEffect,
                     "metadata.json.stripped")
 
 } // namespace KWin
diff --git a/src/effects/screenshot/main.cpp b/src/effects/screenshot/main.cpp
index 7dfc547246..2d56f5047c 100644
--- a/src/effects/screenshot/main.cpp
+++ b/src/effects/screenshot/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY_SUPPORTED(ScreenShotEffectFactory,
-                              ScreenShotEffect,
+KWIN_EFFECT_FACTORY_SUPPORTED(ScreenShotEffect,
                               "metadata.json.stripped",
                               return ScreenShotEffect::supported();)
 
diff --git a/src/effects/screenshot/screenshotdbusinterface1.cpp b/src/effects/screenshot/screenshotdbusinterface1.cpp
index 1af34a4b28..c3e4d28311 100644
--- a/src/effects/screenshot/screenshotdbusinterface1.cpp
+++ b/src/effects/screenshot/screenshotdbusinterface1.cpp
@@ -19,6 +19,7 @@
 #include <QtConcurrent>
 
 #include <unistd.h>
+Q_LOGGING_CATEGORY(KWINEFFECTS, "kwineffects", QtWarningMsg)
 
 namespace KWin
 {
diff --git a/src/effects/screentransform/main.cpp b/src/effects/screentransform/main.cpp
index bbd633aefc..1e8a2ba976 100644
--- a/src/effects/screentransform/main.cpp
+++ b/src/effects/screentransform/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY_SUPPORTED(ScreenTransformEffectFactory,
-                              ScreenTransformEffect,
+KWIN_EFFECT_FACTORY_SUPPORTED(ScreenTransformEffect,
                               "metadata.json.stripped",
                               return ScreenTransformEffect::supported();)
 
diff --git a/src/effects/sheet/main.cpp b/src/effects/sheet/main.cpp
index 364fac6ba2..a71c29e23c 100644
--- a/src/effects/sheet/main.cpp
+++ b/src/effects/sheet/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY_SUPPORTED(SheetEffectFactory,
-                              SheetEffect,
+KWIN_EFFECT_FACTORY_SUPPORTED(SheetEffect,
                               "metadata.json.stripped",
                               return SheetEffect::supported();)
 
diff --git a/src/effects/showfps/main.cpp b/src/effects/showfps/main.cpp
index 0283c06992..30169f9bfd 100644
--- a/src/effects/showfps/main.cpp
+++ b/src/effects/showfps/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY(ShowFpsEffectFactory,
-                    ShowFpsEffect,
+KWIN_EFFECT_FACTORY(ShowFpsEffect,
                     "metadata.json.stripped")
 
 } // namespace KWin
diff --git a/src/effects/showpaint/main.cpp b/src/effects/showpaint/main.cpp
index 4266df8e78..cb6bddfad8 100644
--- a/src/effects/showpaint/main.cpp
+++ b/src/effects/showpaint/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY(ShowPaintEffectFactory,
-                    ShowPaintEffect,
+KWIN_EFFECT_FACTORY(ShowPaintEffect,
                     "metadata.json.stripped")
 
 } // namespace KWin
diff --git a/src/effects/slide/main.cpp b/src/effects/slide/main.cpp
index bce05b788f..4fb67ae7fd 100644
--- a/src/effects/slide/main.cpp
+++ b/src/effects/slide/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY_SUPPORTED(SlideEffectFactory,
-                              SlideEffect,
+KWIN_EFFECT_FACTORY_SUPPORTED(SlideEffect,
                               "metadata.json.stripped",
                               return SlideEffect::supported();)
 
diff --git a/src/effects/slideback/main.cpp b/src/effects/slideback/main.cpp
index 2a76c61a21..1bb19f1771 100644
--- a/src/effects/slideback/main.cpp
+++ b/src/effects/slideback/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY(SlideBackEffectFactory,
-                    SlideBackEffect,
+KWIN_EFFECT_FACTORY(SlideBackEffect,
                     "metadata.json.stripped")
 
 } // namespace KWin
diff --git a/src/effects/slidingpopups/main.cpp b/src/effects/slidingpopups/main.cpp
index 38b5f9dc4c..f992843770 100644
--- a/src/effects/slidingpopups/main.cpp
+++ b/src/effects/slidingpopups/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY_SUPPORTED(SlidingPopupsEffectFactory,
-                              SlidingPopupsEffect,
+KWIN_EFFECT_FACTORY_SUPPORTED(SlidingPopupsEffect,
                               "metadata.json.stripped",
                               return SlidingPopupsEffect::supported();)
 
diff --git a/src/effects/snaphelper/main.cpp b/src/effects/snaphelper/main.cpp
index 661397d69c..fafe2d3b44 100644
--- a/src/effects/snaphelper/main.cpp
+++ b/src/effects/snaphelper/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY(SnapHelperEffectFactory,
-                    SnapHelperEffect,
+KWIN_EFFECT_FACTORY(SnapHelperEffect,
                     "metadata.json.stripped")
 
 } // namespace KWin
diff --git a/src/effects/startupfeedback/main.cpp b/src/effects/startupfeedback/main.cpp
index 4c386e0e45..169d9eeed4 100644
--- a/src/effects/startupfeedback/main.cpp
+++ b/src/effects/startupfeedback/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY_SUPPORTED(StartupFeedbackEffectFactory,
-                              StartupFeedbackEffect,
+KWIN_EFFECT_FACTORY_SUPPORTED(StartupFeedbackEffect,
                               "metadata.json.stripped",
                               return StartupFeedbackEffect::supported();)
 
diff --git a/src/effects/thumbnailaside/main.cpp b/src/effects/thumbnailaside/main.cpp
index b531348345..c073db769e 100644
--- a/src/effects/thumbnailaside/main.cpp
+++ b/src/effects/thumbnailaside/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY(ThumbnailAsideEffectFactory,
-                    ThumbnailAsideEffect,
+KWIN_EFFECT_FACTORY(ThumbnailAsideEffect,
                     "metadata.json.stripped")
 
 } // namespace KWin
diff --git a/src/effects/touchpoints/main.cpp b/src/effects/touchpoints/main.cpp
index 1e9fa9812a..8478c68ca3 100644
--- a/src/effects/touchpoints/main.cpp
+++ b/src/effects/touchpoints/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY(TouchPointsEffectFactory,
-                    TouchPointsEffect,
+KWIN_EFFECT_FACTORY(TouchPointsEffect,
                     "metadata.json.stripped")
 
 } // namespace KWin
diff --git a/src/effects/trackmouse/main.cpp b/src/effects/trackmouse/main.cpp
index 836a992856..cff45ce868 100644
--- a/src/effects/trackmouse/main.cpp
+++ b/src/effects/trackmouse/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY(TrackMouseEffectFactory,
-                    TrackMouseEffect,
+KWIN_EFFECT_FACTORY(TrackMouseEffect,
                     "metadata.json.stripped")
 
 } // namespace KWin
diff --git a/src/effects/windowgeometry/main.cpp b/src/effects/windowgeometry/main.cpp
index 53000749d1..30c51e25c9 100644
--- a/src/effects/windowgeometry/main.cpp
+++ b/src/effects/windowgeometry/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY(WindowGeometryFactory,
-                    WindowGeometry,
+KWIN_EFFECT_FACTORY(WindowGeometry,
                     "metadata.json.stripped")
 
 } // namespace KWin
diff --git a/src/effects/wobblywindows/main.cpp b/src/effects/wobblywindows/main.cpp
index e4133dae2e..802bae22a7 100644
--- a/src/effects/wobblywindows/main.cpp
+++ b/src/effects/wobblywindows/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY_SUPPORTED(WobblyWindowsEffectFactory,
-                              WobblyWindowsEffect,
+KWIN_EFFECT_FACTORY_SUPPORTED(WobblyWindowsEffect,
                               "metadata.json.stripped",
                               return WobblyWindowsEffect::supported();)
 
diff --git a/src/effects/zoom/main.cpp b/src/effects/zoom/main.cpp
index 374f2fa0a3..285175d5eb 100644
--- a/src/effects/zoom/main.cpp
+++ b/src/effects/zoom/main.cpp
@@ -9,8 +9,7 @@
 namespace KWin
 {
 
-KWIN_EFFECT_FACTORY(ZoomEffectFactory,
-                    ZoomEffect,
+KWIN_EFFECT_FACTORY(ZoomEffect,
                     "metadata.json.stripped")
 
 } // namespace KWin
diff --git a/src/libkwineffects/kwineffects.h b/src/libkwineffects/kwineffects.h
index 7f6e4e13f3..2c322dde70 100644
--- a/src/libkwineffects/kwineffects.h
+++ b/src/libkwineffects/kwineffects.h
@@ -703,6 +703,7 @@ public:
 };
 
 #define EffectPluginFactory_iid "org.kde.kwin.EffectPluginFactory" KWIN_PLUGIN_VERSION_STRING
+#define KWIN_PLUGIN_FACTORY_NAME KPLUGINFACTORY_PLUGIN_CLASS_INTERNAL_NAME
 
 /**
  * Defines an EffectPluginFactory sub class with customized isSupported and enabledByDefault methods.
@@ -720,15 +721,15 @@ public:
  * @param supported Source code to go into the isSupported() method, must return a boolean
  * @param enabled Source code to go into the enabledByDefault() method, must return a boolean
  */
-#define KWIN_EFFECT_FACTORY_SUPPORTED_ENABLED( factoryName, className, jsonFile, supported, enabled ) \
-    class factoryName : public KWin::EffectPluginFactory \
+#define KWIN_EFFECT_FACTORY_SUPPORTED_ENABLED(className, jsonFile, supported, enabled ) \
+    class KWIN_PLUGIN_FACTORY_NAME : public KWin::EffectPluginFactory \
     { \
         Q_OBJECT \
         Q_PLUGIN_METADATA(IID EffectPluginFactory_iid FILE jsonFile) \
         Q_INTERFACES(KPluginFactory) \
     public: \
-        explicit factoryName() {} \
-        ~factoryName() {} \
+        explicit KWIN_PLUGIN_FACTORY_NAME() {} \
+        ~KWIN_PLUGIN_FACTORY_NAME() {} \
         bool isSupported() const override { \
             supported \
         } \
@@ -740,14 +741,14 @@ public:
         } \
     };
 
-#define KWIN_EFFECT_FACTORY_ENABLED( factoryName, className, jsonFile, enabled ) \
-    KWIN_EFFECT_FACTORY_SUPPORTED_ENABLED( factoryName, className, jsonFile, return true;, enabled )
+#define KWIN_EFFECT_FACTORY_ENABLED(className, jsonFile, enabled ) \
+    KWIN_EFFECT_FACTORY_SUPPORTED_ENABLED(className, jsonFile, return true;, enabled )
 
-#define KWIN_EFFECT_FACTORY_SUPPORTED( factoryName, className, jsonFile, supported ) \
-    KWIN_EFFECT_FACTORY_SUPPORTED_ENABLED( factoryName, className, jsonFile, supported, return true; )
+#define KWIN_EFFECT_FACTORY_SUPPORTED(className, jsonFile, supported ) \
+    KWIN_EFFECT_FACTORY_SUPPORTED_ENABLED(className, jsonFile, supported, return true; )
 
-#define KWIN_EFFECT_FACTORY( factoryName, className, jsonFile ) \
-    KWIN_EFFECT_FACTORY_SUPPORTED_ENABLED( factoryName, className, jsonFile, return true;, return true; )
+#define KWIN_EFFECT_FACTORY(className, jsonFile ) \
+    KWIN_EFFECT_FACTORY_SUPPORTED_ENABLED(className, jsonFile, return true;, return true; )
 
 
 
diff --git a/src/main_wayland.cpp b/src/main_wayland.cpp
index 3e88de30d0..352cc90da9 100644
--- a/src/main_wayland.cpp
+++ b/src/main_wayland.cpp
@@ -8,7 +8,6 @@
 */
 #include "main_wayland.h"
 #include "composite.h"
-#include "effect_builtins.h"
 #include "inputmethod.h"
 #include "workspace.h"
 #include <config-kwin.h>
@@ -59,8 +58,6 @@
 #include <iostream>
 #include <iomanip>
 
-KWIN_IMPORT_BUILTIN_EFFECTS
-
 Q_IMPORT_PLUGIN(KWinIntegrationPlugin)
 Q_IMPORT_PLUGIN(KGlobalAccelImpl)
 Q_IMPORT_PLUGIN(KWindowSystemKWinPlugin)
diff --git a/src/main_x11.cpp b/src/main_x11.cpp
index ea18936824..5b8170d6cd 100644
--- a/src/main_x11.cpp
+++ b/src/main_x11.cpp
@@ -12,7 +12,6 @@
 
 #include <config-kwin.h>
 
-#include "effect_builtins.h"
 #include "platform.h"
 #include "sm.h"
 #include "workspace.h"
@@ -46,8 +45,6 @@
 
 Q_LOGGING_CATEGORY(KWIN_CORE, "kwin_core", QtWarningMsg)
 
-KWIN_IMPORT_BUILTIN_EFFECTS
-
 namespace KWin
 {