diff --git a/src/fileitemactionplugin/sharefileitemaction.cpp b/src/fileitemactionplugin/sharefileitemaction.cpp
--- a/src/fileitemactionplugin/sharefileitemaction.cpp
+++ b/src/fileitemactionplugin/sharefileitemaction.cpp
@@ -36,7 +36,7 @@
 #include "menu.h"
 #include "alternativesmodel.h"
 
-K_PLUGIN_FACTORY_WITH_JSON(ShareFileItemActionFactory, "sharefileitemaction.json", registerPlugin<ShareFileItemAction>();)
+K_PLUGIN_CLASS_WITH_JSON(ShareFileItemAction, "sharefileitemaction.json")
 
 Q_LOGGING_CATEGORY(PURPOSE_FILEITEMACTION, "purpose.fileitemaction")
 
diff --git a/src/plugins/bluetooth/bluetoothplugin.cpp b/src/plugins/bluetooth/bluetoothplugin.cpp
--- a/src/plugins/bluetooth/bluetoothplugin.cpp
+++ b/src/plugins/bluetooth/bluetoothplugin.cpp
@@ -90,6 +90,6 @@
         }
 };
 
-K_PLUGIN_FACTORY_WITH_JSON(Bluetooth, "bluetoothplugin.json", registerPlugin<BluetoothPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(BluetoothPlugin, "bluetoothplugin.json")
 
 #include "bluetoothplugin.moc"
diff --git a/src/plugins/email/emailplugin.cpp b/src/plugins/email/emailplugin.cpp
--- a/src/plugins/email/emailplugin.cpp
+++ b/src/plugins/email/emailplugin.cpp
@@ -138,6 +138,6 @@
     }
 };
 
-K_PLUGIN_FACTORY_WITH_JSON(Email, "emailplugin.json", registerPlugin<EmailPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(EmailPlugin, "emailplugin.json")
 
 #include "emailplugin.moc"
diff --git a/src/plugins/imgur/imgurplugin.cpp b/src/plugins/imgur/imgurplugin.cpp
--- a/src/plugins/imgur/imgurplugin.cpp
+++ b/src/plugins/imgur/imgurplugin.cpp
@@ -172,6 +172,6 @@
         }
 };
 
-K_PLUGIN_FACTORY_WITH_JSON(ImgurShare, "imgurplugin.json", registerPlugin<ImgurPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(ImgurPlugin, "imgurplugin.json">)
 
 #include "imgurplugin.moc"
diff --git a/src/plugins/kdeconnect/kdeconnectplugin.cpp b/src/plugins/kdeconnect/kdeconnectplugin.cpp
--- a/src/plugins/kdeconnect/kdeconnectplugin.cpp
+++ b/src/plugins/kdeconnect/kdeconnectplugin.cpp
@@ -90,6 +90,6 @@
         }
 };
 
-K_PLUGIN_FACTORY_WITH_JSON(KDEConnect, "kdeconnectplugin.json", registerPlugin<KDEConnectPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(KDEConnectPlugin, "kdeconnectplugin.json")
 
 #include "kdeconnectplugin.moc"
diff --git a/src/plugins/ktp-sendfile/ktpsendfileplugin.cpp b/src/plugins/ktp-sendfile/ktpsendfileplugin.cpp
--- a/src/plugins/ktp-sendfile/ktpsendfileplugin.cpp
+++ b/src/plugins/ktp-sendfile/ktpsendfileplugin.cpp
@@ -82,6 +82,6 @@
         }
 };
 
-K_PLUGIN_FACTORY_WITH_JSON(KTpSendFileShare, "ktpsendfileplugin.json", registerPlugin<KTpSendFilePlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(KTpSendFilePlugin, "ktpsendfileplugin.json")
 
 #include "ktpsendfileplugin.moc"
diff --git a/src/plugins/nextcloud/nextcloudplugin.cpp b/src/plugins/nextcloud/nextcloudplugin.cpp
--- a/src/plugins/nextcloud/nextcloudplugin.cpp
+++ b/src/plugins/nextcloud/nextcloudplugin.cpp
@@ -37,7 +37,7 @@
     }
 };
 
-K_PLUGIN_FACTORY_WITH_JSON(NextcloudShare, "nextcloudplugin.json", registerPlugin<NextcloudPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(NextcloudPlugin, "nextcloudplugin.json")
 
 EXPORT_SHARE_VERSION
 
diff --git a/src/plugins/pastebin/pastebinplugin.cpp b/src/plugins/pastebin/pastebinplugin.cpp
--- a/src/plugins/pastebin/pastebinplugin.cpp
+++ b/src/plugins/pastebin/pastebinplugin.cpp
@@ -133,6 +133,6 @@
         }
 };
 
-K_PLUGIN_FACTORY_WITH_JSON(Pastebin, "pastebinplugin.json", registerPlugin<PastebinPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(PastebinPlugin, "pastebinplugin.json")
 
 #include "pastebinplugin.moc"
diff --git a/src/plugins/phabricator/phabricatorplugin.cpp b/src/plugins/phabricator/phabricatorplugin.cpp
--- a/src/plugins/phabricator/phabricatorplugin.cpp
+++ b/src/plugins/phabricator/phabricatorplugin.cpp
@@ -148,6 +148,6 @@
         }
 };
 
-K_PLUGIN_FACTORY_WITH_JSON(PhabricatorPluginFactory, "phabricatorplugin.json", registerPlugin<PhabricatorPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(PhabricatorPlugin, "phabricatorplugin.json")
 
 #include "phabricatorplugin.moc"
diff --git a/src/plugins/reviewboard/reviewboardplugin.cpp b/src/plugins/reviewboard/reviewboardplugin.cpp
--- a/src/plugins/reviewboard/reviewboardplugin.cpp
+++ b/src/plugins/reviewboard/reviewboardplugin.cpp
@@ -123,6 +123,6 @@
         }
 };
 
-K_PLUGIN_FACTORY_WITH_JSON(ReviewBoardPluginFactory, "reviewboardplugin.json", registerPlugin<ReviewBoardPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(ReviewBoardPlugin, "reviewboardplugin.json")
 
 #include "reviewboardplugin.moc"
diff --git a/src/plugins/saveas/saveasplugin.cpp b/src/plugins/saveas/saveasplugin.cpp
--- a/src/plugins/saveas/saveasplugin.cpp
+++ b/src/plugins/saveas/saveasplugin.cpp
@@ -122,6 +122,6 @@
         }
 };
 
-K_PLUGIN_FACTORY_WITH_JSON(SaveAsShare, "saveasplugin.json", registerPlugin<SaveAsPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(SaveAsPlugin, "saveasplugin.json")
 
 #include "saveasplugin.moc"
diff --git a/src/plugins/telegram/telegramplugin.cpp b/src/plugins/telegram/telegramplugin.cpp
--- a/src/plugins/telegram/telegramplugin.cpp
+++ b/src/plugins/telegram/telegramplugin.cpp
@@ -124,6 +124,6 @@
         }
 };
 
-K_PLUGIN_FACTORY_WITH_JSON(Telegram, "telegramplugin.json", registerPlugin<TelegramPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(TelegramPlugin, "telegramplugin.json")
 
 #include "telegramplugin.moc"
diff --git a/src/plugins/youtube/youtubeplugin.cpp b/src/plugins/youtube/youtubeplugin.cpp
--- a/src/plugins/youtube/youtubeplugin.cpp
+++ b/src/plugins/youtube/youtubeplugin.cpp
@@ -38,7 +38,7 @@
     }
 };
 
-K_PLUGIN_FACTORY_WITH_JSON(YoutubeShare, "youtubeplugin.json", registerPlugin<YoutubePlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(YoutubePlugin, "youtubeplugin.json")
 
 EXPORT_SHARE_VERSION