diff --git a/events/x11/x11eventsplugin.cpp b/events/x11/x11eventsplugin.cpp
index 696ece53..89da5207 100644
--- a/events/x11/x11eventsplugin.cpp
+++ b/events/x11/x11eventsplugin.cpp
@@ -24,8 +24,7 @@
 #include <KPluginFactory>
 #include <QX11Info>
 
-K_PLUGIN_FACTORY_WITH_JSON(X11EventsPluginFactory, "krfb_events_x11.json",
-               registerPlugin<X11EventsPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(X11EventsPlugin, "krfb_events_x11.json")
 
 X11EventsPlugin::X11EventsPlugin(QObject *parent, const QVariantList &args)
     : EventsPlugin(parent, args)
diff --git a/events/xdp/xdpeventsplugin.cpp b/events/xdp/xdpeventsplugin.cpp
index bb4c44e4..a6dae61e 100644
--- a/events/xdp/xdpeventsplugin.cpp
+++ b/events/xdp/xdpeventsplugin.cpp
@@ -25,8 +25,7 @@
 
 #include <KPluginFactory>
 
-K_PLUGIN_FACTORY_WITH_JSON(XdpEventsPluginFactory, "krfb_events_xdp.json",
-               registerPlugin<XdpEventsPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(XdpEventsPlugin, "krfb_events_xdp.json")
 
 XdpEventsPlugin::XdpEventsPlugin(QObject *parent, const QVariantList &args)
     : EventsPlugin(parent, args)
diff --git a/framebuffers/pipewire/pw_framebufferplugin.cpp b/framebuffers/pipewire/pw_framebufferplugin.cpp
index 34ab7f5e..67ac8436 100644
--- a/framebuffers/pipewire/pw_framebufferplugin.cpp
+++ b/framebuffers/pipewire/pw_framebufferplugin.cpp
@@ -22,9 +22,7 @@
 #include "pw_framebuffer.h"
 #include <KPluginFactory>
 
-
-K_PLUGIN_FACTORY_WITH_JSON(PWFrameBufferPluginFactory, "krfb_framebuffer_pw.json",
-               registerPlugin<PWFrameBufferPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(PWFrameBufferPlugin, "krfb_framebuffer_pw.json")
 
 PWFrameBufferPlugin::PWFrameBufferPlugin(QObject *parent, const QVariantList &args)
     : FrameBufferPlugin(parent, args)
diff --git a/framebuffers/qt/qtframebufferplugin.cpp b/framebuffers/qt/qtframebufferplugin.cpp
index d60c0c98..e2ccc891 100644
--- a/framebuffers/qt/qtframebufferplugin.cpp
+++ b/framebuffers/qt/qtframebufferplugin.cpp
@@ -24,8 +24,7 @@
 
 #include <KPluginFactory>
 
-K_PLUGIN_FACTORY_WITH_JSON(QtFrameBufferPluginFactory, "krfb_framebuffer_qt.json",
-			   registerPlugin<QtFrameBufferPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(QtFrameBufferPlugin, "krfb_framebuffer_qt.json")
 
 QtFrameBufferPlugin::QtFrameBufferPlugin(QObject *parent, const QVariantList &args)
     : FrameBufferPlugin(parent, args)
diff --git a/framebuffers/xcb/xcb_framebufferplugin.cpp b/framebuffers/xcb/xcb_framebufferplugin.cpp
index 5d7a4e42..739af056 100644
--- a/framebuffers/xcb/xcb_framebufferplugin.cpp
+++ b/framebuffers/xcb/xcb_framebufferplugin.cpp
@@ -22,9 +22,7 @@
 #include "xcb_framebuffer.h"
 #include <KPluginFactory>
 
-
-K_PLUGIN_FACTORY_WITH_JSON(XCBFrameBufferPluginFactory, "krfb_framebuffer_xcb.json",
-               registerPlugin<XCBFrameBufferPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(XCBFrameBufferPlugin, "krfb_framebuffer_xcb.json")
 
 XCBFrameBufferPlugin::XCBFrameBufferPlugin(QObject *parent, const QVariantList &args)
     : FrameBufferPlugin(parent, args)