diff --git a/dataengines/activities/activityengine.cpp b/dataengines/activities/activityengine.cpp
index 1b930ee00..d969f5a32 100644
--- a/dataengines/activities/activityengine.cpp
+++ b/dataengines/activities/activityengine.cpp
@@ -253,6 +253,6 @@ Plasma::Service *ActivityEngine::serviceForSource(const QString &source)
     return service;
 }
 
-K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(activities, ActivityEngine, "plasma-dataengine-activities.json")
+K_PLUGIN_CLASS_WITH_JSON(ActivityEngine, "plasma-dataengine-activities.json")
 
 #include "activityengine.moc"
diff --git a/dataengines/applicationjobs/kuiserverengine.cpp b/dataengines/applicationjobs/kuiserverengine.cpp
index c82809fb6..4065289f1 100644
--- a/dataengines/applicationjobs/kuiserverengine.cpp
+++ b/dataengines/applicationjobs/kuiserverengine.cpp
@@ -269,6 +269,6 @@ void KuiserverEngine::updateEta(Job *job)
     setData(source, QStringLiteral("eta"), remaining / job->speed());
 }
 
-K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(kuiserver, KuiserverEngine, "plasma-dataengine-applicationjobs.json")
+K_PLUGIN_CLASS_WITH_JSON(KuiserverEngine, "plasma-dataengine-applicationjobs.json")
 
 #include "kuiserverengine.moc"
diff --git a/dataengines/apps/appsengine.cpp b/dataengines/apps/appsengine.cpp
index 30d241f80..f79cf0fd0 100644
--- a/dataengines/apps/appsengine.cpp
+++ b/dataengines/apps/appsengine.cpp
@@ -83,6 +83,6 @@ void AppsEngine::addApp(KService::Ptr app)
     addSource(appSource);
 }
 
-K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(apps, AppsEngine, "plasma-dataengine-apps.json")
+K_PLUGIN_CLASS_WITH_JSON(AppsEngine, "plasma-dataengine-apps.json")
 
 #include "appsengine.moc"
diff --git a/dataengines/devicenotifications/devicenotificationsengine.cpp b/dataengines/devicenotifications/devicenotificationsengine.cpp
index 654a7fd60..edd25b54b 100644
--- a/dataengines/devicenotifications/devicenotificationsengine.cpp
+++ b/dataengines/devicenotifications/devicenotificationsengine.cpp
@@ -52,6 +52,6 @@ void DeviceNotificationsEngine::clearNotification(const QString &udi)
     removeSource(QStringLiteral("%1 notification").arg(udi));
 }
 
-K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(devicenotifications, DeviceNotificationsEngine, "plasma-dataengine-devicenotifications.json")
+K_PLUGIN_CLASS_WITH_JSON(DeviceNotificationsEngine, "plasma-dataengine-devicenotifications.json")
 
 #include "devicenotificationsengine.moc"
diff --git a/dataengines/dict/dictengine.cpp b/dataengines/dict/dictengine.cpp
index 77b8fc248..630962249 100644
--- a/dataengines/dict/dictengine.cpp
+++ b/dataengines/dict/dictengine.cpp
@@ -256,6 +256,6 @@ bool DictEngine::sourceRequestEvent(const QString &query)
     return true;
 }
 
-K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(dict, DictEngine, "plasma-dataengine-dict.json")
+K_PLUGIN_CLASS_WITH_JSON(DictEngine, "plasma-dataengine-dict.json")
 
 #include "dictengine.moc"
diff --git a/dataengines/executable/executable.cpp b/dataengines/executable/executable.cpp
index da97bfd04..15c26ae11 100644
--- a/dataengines/executable/executable.cpp
+++ b/dataengines/executable/executable.cpp
@@ -72,6 +72,6 @@ bool ExecutableEngine::sourceRequestEvent(const QString &source)
     return true;
 }
 
-K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(executable, ExecutableEngine, "plasma-dataengine-executable.json")
+K_PLUGIN_CLASS_WITH_JSON(ExecutableEngine, "plasma-dataengine-executable.json")
 
 #include "executable.moc"
diff --git a/dataengines/favicons/favicons.cpp b/dataengines/favicons/favicons.cpp
index 1721ae80d..a58c2f569 100644
--- a/dataengines/favicons/favicons.cpp
+++ b/dataengines/favicons/favicons.cpp
@@ -66,6 +66,6 @@ void FaviconsEngine::error(FaviconProvider *provider)
     provider->deleteLater();
 }
 
-K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(favicons, FaviconsEngine, "plasma-dataengine-favicons.json")
+K_PLUGIN_CLASS_WITH_JSON(FaviconsEngine, "plasma-dataengine-favicons.json")
 
 #include "favicons.moc"
diff --git a/dataengines/filebrowser/filebrowserengine.cpp b/dataengines/filebrowser/filebrowserengine.cpp
index 7499d9222..dfcd6a4c6 100644
--- a/dataengines/filebrowser/filebrowserengine.cpp
+++ b/dataengines/filebrowser/filebrowserengine.cpp
@@ -156,6 +156,6 @@ void FileBrowserEngine::clearData(const QString &path)
     }
 }
 
-K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(filebrowser, FileBrowserEngine, "plasma-dataengine-filebrowser.json")
+K_PLUGIN_CLASS_WITH_JSON(FileBrowserEngine, "plasma-dataengine-filebrowser.json")
 
 #include "filebrowserengine.moc"
diff --git a/dataengines/geolocation/geolocation.cpp b/dataengines/geolocation/geolocation.cpp
index 69d8e63c4..558a81074 100644
--- a/dataengines/geolocation/geolocation.cpp
+++ b/dataengines/geolocation/geolocation.cpp
@@ -146,6 +146,6 @@ void Geolocation::actuallySetData()
     setData(SOURCE, m_data);
 }
 
-K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(geolocation, Geolocation, "plasma-dataengine-geolocation.json")
+K_PLUGIN_CLASS_WITH_JSON(Geolocation, "plasma-dataengine-geolocation.json")
 
 #include "geolocation.moc"
diff --git a/dataengines/hotplug/hotplugengine.cpp b/dataengines/hotplug/hotplugengine.cpp
index 07aaefaa0..e06f99b9c 100644
--- a/dataengines/hotplug/hotplugengine.cpp
+++ b/dataengines/hotplug/hotplugengine.cpp
@@ -280,6 +280,6 @@ void HotplugEngine::onDeviceRemoved(const QString &udi)
     removeSource(udi);
 }
 
-K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(hotplug, HotplugEngine, "plasma-dataengine-hotplug.json")
+K_PLUGIN_CLASS_WITH_JSON(HotplugEngine, "plasma-dataengine-hotplug.json")
 
 #include "hotplugengine.moc"
diff --git a/dataengines/keystate/keystate.cpp b/dataengines/keystate/keystate.cpp
index c728f4062..b5f8d410c 100644
--- a/dataengines/keystate/keystate.cpp
+++ b/dataengines/keystate/keystate.cpp
@@ -137,6 +137,6 @@ void KeyStatesEngine::keyRemoved(Qt::Key key)
     }
 }
 
-K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(keystate, KeyStatesEngine, "plasma-dataengine-keystate.json")
+K_PLUGIN_CLASS_WITH_JSON(KeyStatesEngine, "plasma-dataengine-keystate.json")
 
 #include "keystate.moc"
diff --git a/dataengines/mouse/mouseengine.cpp b/dataengines/mouse/mouseengine.cpp
index 78145eb69..a7b09fdbb 100644
--- a/dataengines/mouse/mouseengine.cpp
+++ b/dataengines/mouse/mouseengine.cpp
@@ -89,6 +89,6 @@ void MouseEngine::updateCursorName(const QString &name)
     setData(QLatin1String("Name"), QVariant(name));
 }
 
-K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(mouse, MouseEngine, "plasma-dataengine-mouse.json")
+K_PLUGIN_CLASS_WITH_JSON(MouseEngine, "plasma-dataengine-mouse.json")
 
 #include "mouseengine.moc"
diff --git a/dataengines/mpris2/mpris2engine.cpp b/dataengines/mpris2/mpris2engine.cpp
index ac298a325..5b9c419be 100644
--- a/dataengines/mpris2/mpris2engine.cpp
+++ b/dataengines/mpris2/mpris2engine.cpp
@@ -191,6 +191,6 @@ void Mpris2Engine::createMultiplexer()
     addSource(m_multiplexer.data());
 }
 
-K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(mpris2, Mpris2Engine, "plasma-dataengine-mpris2.json")
+K_PLUGIN_CLASS_WITH_JSON(Mpris2Engine, "plasma-dataengine-mpris2.json")
 
 #include "mpris2engine.moc"
diff --git a/dataengines/notifications/notificationsengine.cpp b/dataengines/notifications/notificationsengine.cpp
index 615ed731a..f2f2a3733 100644
--- a/dataengines/notifications/notificationsengine.cpp
+++ b/dataengines/notifications/notificationsengine.cpp
@@ -246,6 +246,6 @@ QSharedPointer<NotificationInhibiton> NotificationsEngine::createInhibition(cons
     return rc;
 }
 
-K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(notifications, NotificationsEngine, "plasma-dataengine-notifications.json")
+K_PLUGIN_CLASS_WITH_JSON(NotificationsEngine, "plasma-dataengine-notifications.json")
 
 #include "notificationsengine.moc"
diff --git a/dataengines/packagekit/packagekitengine.cpp b/dataengines/packagekit/packagekitengine.cpp
index 569f998da..5c409a469 100644
--- a/dataengines/packagekit/packagekitengine.cpp
+++ b/dataengines/packagekit/packagekitengine.cpp
@@ -59,6 +59,6 @@ Plasma::Service *PackagekitEngine::serviceForSource(const QString &source)
     return Plasma::DataEngine::serviceForSource(source);
 }
 
-K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(packagekit, PackagekitEngine, "plasma-dataengine-packagekit.json")
+K_PLUGIN_CLASS_WITH_JSON(PackagekitEngine, "plasma-dataengine-packagekit.json")
 
 #include "packagekitengine.moc"
diff --git a/dataengines/places/placesengine.cpp b/dataengines/places/placesengine.cpp
index 9e9dc8f9a..22177ef00 100644
--- a/dataengines/places/placesengine.cpp
+++ b/dataengines/places/placesengine.cpp
@@ -46,6 +46,6 @@ Plasma::Service *PlacesEngine::serviceForSource(const QString &source)
     return DataEngine::serviceForSource(source);
 }
 
-K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(places, PlacesEngine, "plasma-dataengine-places.json")
+K_PLUGIN_CLASS_WITH_JSON(PlacesEngine, "plasma-dataengine-places.json")
 
 #include "placesengine.moc"
diff --git a/dataengines/powermanagement/powermanagementengine.cpp b/dataengines/powermanagement/powermanagementengine.cpp
index 33c011817..a178db615 100644
--- a/dataengines/powermanagement/powermanagementengine.cpp
+++ b/dataengines/powermanagement/powermanagementengine.cpp
@@ -710,6 +710,6 @@ void PowermanagementEngine::chargeStopThresholdChanged(int threshold)
     setData(QStringLiteral("Battery"), QStringLiteral("Charge Stop Threshold"), threshold);
 }
 
-K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(powermanagement, PowermanagementEngine, "plasma-dataengine-powermanagement.json")
+K_PLUGIN_CLASS_WITH_JSON(PowermanagementEngine, "plasma-dataengine-powermanagement.json")
 
 #include "powermanagementengine.moc"
diff --git a/dataengines/soliddevice/soliddeviceengine.cpp b/dataengines/soliddevice/soliddeviceengine.cpp
index 4eac42200..82e9e2eda 100644
--- a/dataengines/soliddevice/soliddeviceengine.cpp
+++ b/dataengines/soliddevice/soliddeviceengine.cpp
@@ -685,6 +685,6 @@ void SolidDeviceEngine::deviceChanged(const QString &udi, const QString &propert
     updateSourceEvent(udi);
 }
 
-K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(soliddevice, SolidDeviceEngine, "plasma-dataengine-soliddevice.json")
+K_PLUGIN_CLASS_WITH_JSON(SolidDeviceEngine, "plasma-dataengine-soliddevice.json")
 
 #include "soliddeviceengine.moc"
diff --git a/dataengines/statusnotifieritem/statusnotifieritem_engine.cpp b/dataengines/statusnotifieritem/statusnotifieritem_engine.cpp
index 50cefcefe..b06cebecb 100644
--- a/dataengines/statusnotifieritem/statusnotifieritem_engine.cpp
+++ b/dataengines/statusnotifieritem/statusnotifieritem_engine.cpp
@@ -165,6 +165,6 @@ void StatusNotifierItemEngine::newItem(const QString &service)
     addSource(itemSource);
 }
 
-K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(statusnotifieritem, StatusNotifierItemEngine, "plasma-dataengine-statusnotifieritem.json")
+K_PLUGIN_CLASS_WITH_JSON(StatusNotifierItemEngine, "plasma-dataengine-statusnotifieritem.json")
 
 #include "statusnotifieritem_engine.moc"
diff --git a/dataengines/systemmonitor/systemmonitor.cpp b/dataengines/systemmonitor/systemmonitor.cpp
index 907e8c161..06c035761 100644
--- a/dataengines/systemmonitor/systemmonitor.cpp
+++ b/dataengines/systemmonitor/systemmonitor.cpp
@@ -186,6 +186,6 @@ void SystemMonitorEngine::sensorLost(int)
     m_waitingFor--;
 }
 
-K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(systemmonitor, SystemMonitorEngine, "plasma-dataengine-systemmonitor.json")
+K_PLUGIN_CLASS_WITH_JSON(SystemMonitorEngine, "plasma-dataengine-systemmonitor.json")
 
 #include "systemmonitor.moc"
diff --git a/dataengines/time/timeengine.cpp b/dataengines/time/timeengine.cpp
index 124cb07cc..3077120f7 100644
--- a/dataengines/time/timeengine.cpp
+++ b/dataengines/time/timeengine.cpp
@@ -144,6 +144,6 @@ bool TimeEngine::updateSourceEvent(const QString &tz)
     return false;
 }
 
-K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(time, TimeEngine, "plasma-dataengine-time.json")
+K_PLUGIN_CLASS_WITH_JSON(TimeEngine, "plasma-dataengine-time.json")
 
 #include "timeengine.moc"
diff --git a/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp b/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp
index dc121cfee..6456f9ea5 100644
--- a/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp
+++ b/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp
@@ -1015,6 +1015,6 @@ void UKMETIon::dataUpdated(const QString &sourceName, const Plasma::DataEngine::
     }
 }
 
-K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(bbcukmet, UKMETIon, "ion-bbcukmet.json")
+K_PLUGIN_CLASS_WITH_JSON(UKMETIon, "ion-bbcukmet.json")
 
 #include "ion_bbcukmet.moc"
diff --git a/dataengines/weather/ions/envcan/ion_envcan.cpp b/dataengines/weather/ions/envcan/ion_envcan.cpp
index ffe1fae10..08400bd9f 100644
--- a/dataengines/weather/ions/envcan/ion_envcan.cpp
+++ b/dataengines/weather/ions/envcan/ion_envcan.cpp
@@ -1635,6 +1635,6 @@ void EnvCanadaIon::dataUpdated(const QString &sourceName, const Plasma::DataEngi
     }
 }
 
-K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(envcan, EnvCanadaIon, "ion-envcan.json")
+K_PLUGIN_CLASS_WITH_JSON(EnvCanadaIon, "ion-envcan.json")
 
 #include "ion_envcan.moc"
diff --git a/dataengines/weather/ions/noaa/ion_noaa.cpp b/dataengines/weather/ions/noaa/ion_noaa.cpp
index dd9a62d2a..0ce1d24a7 100644
--- a/dataengines/weather/ions/noaa/ion_noaa.cpp
+++ b/dataengines/weather/ions/noaa/ion_noaa.cpp
@@ -917,6 +917,6 @@ void NOAAIon::dataUpdated(const QString &sourceName, const Plasma::DataEngine::D
     }
 }
 
-K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(noaa, NOAAIon, "ion-noaa.json")
+K_PLUGIN_CLASS_WITH_JSON(NOAAIon, "ion-noaa.json")
 
 #include "ion_noaa.moc"
diff --git a/dataengines/weather/ions/wetter.com/ion_wettercom.cpp b/dataengines/weather/ions/wetter.com/ion_wettercom.cpp
index cef5c2535..1782959f6 100644
--- a/dataengines/weather/ions/wetter.com/ion_wettercom.cpp
+++ b/dataengines/weather/ions/wetter.com/ion_wettercom.cpp
@@ -790,6 +790,6 @@ int WeatherData::ForecastPeriod::getMinTemp(const QVector<WeatherData::ForecastI
     return result;
 }
 
-K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(wettercom, WetterComIon, "ion-wettercom.json")
+K_PLUGIN_CLASS_WITH_JSON(WetterComIon, "ion-wettercom.json")
 
 #include "ion_wettercom.moc"
diff --git a/dataengines/weather/weatherengine.cpp b/dataengines/weather/weatherengine.cpp
index 8c9cc5111..661923e08 100644
--- a/dataengines/weather/weatherengine.cpp
+++ b/dataengines/weather/weatherengine.cpp
@@ -223,6 +223,6 @@ IonInterface *WeatherEngine::ionForSource(const QString &source, QString *ionNam
     return result;
 }
 
-K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(weather, WeatherEngine, "plasma-dataengine-weather.json")
+K_PLUGIN_CLASS_WITH_JSON(WeatherEngine, "plasma-dataengine-weather.json")
 
 #include "weatherengine.moc"
diff --git a/klipper/clipboardengine.cpp b/klipper/clipboardengine.cpp
index e8788b449..ac082aa5d 100644
--- a/klipper/clipboardengine.cpp
+++ b/klipper/clipboardengine.cpp
@@ -57,6 +57,6 @@ Plasma::Service *ClipboardEngine::serviceForSource(const QString &source)
     return service;
 }
 
-K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(org.kde.plasma.clipboard, ClipboardEngine, "plasma-dataengine-clipboard.json")
+K_PLUGIN_CLASS_WITH_JSON(ClipboardEngine, "plasma-dataengine-clipboard.json")
 
 #include "clipboardengine.moc"