diff --git a/examples/testcontainmentactionsplugin/test.cpp b/examples/testcontainmentactionsplugin/test.cpp
index e09c84297..3a587dac4 100644
--- a/examples/testcontainmentactionsplugin/test.cpp
+++ b/examples/testcontainmentactionsplugin/test.cpp
@@ -64,6 +64,6 @@ void ContextTest::save(KConfigGroup &config)
     config.writeEntry("test-text", m_text);
 }
 
-K_EXPORT_PLASMA_CONTAINMENTACTIONS_WITH_JSON(containmentactions_test, ContextTest, "plasma-containmentactions-test.desktop")
+K_PLUGIN_CLASS_WITH_JSON(ContextTest, "plasma-containmentactions-test.desktop")
 
 #include "test.moc"
diff --git a/src/plasma/packagestructure/containmentactionspackage.cpp b/src/plasma/packagestructure/containmentactionspackage.cpp
index 8fde43524..31e62ec21 100644
--- a/src/plasma/packagestructure/containmentactionspackage.cpp
+++ b/src/plasma/packagestructure/containmentactionspackage.cpp
@@ -27,6 +27,6 @@ public:
     }
 };
 
-K_EXPORT_KPACKAGE_PACKAGE_WITH_JSON(ContainmentActionsPackage, "containmentactions-packagestructure.json")
+K_PLUGIN_CLASS_WITH_JSON(ContainmentActionsPackage, "containmentactions-packagestructure.json")
 
 #include "containmentactionspackage.moc"
diff --git a/src/plasma/packagestructure/dataenginepackage.cpp b/src/plasma/packagestructure/dataenginepackage.cpp
index 08189362b..3405f811a 100644
--- a/src/plasma/packagestructure/dataenginepackage.cpp
+++ b/src/plasma/packagestructure/dataenginepackage.cpp
@@ -40,6 +40,6 @@ public:
     }
 };
 
-K_EXPORT_KPACKAGE_PACKAGE_WITH_JSON(DataEnginePackage, "dataengine-packagestructure.json")
+K_PLUGIN_CLASS_WITH_JSON(DataEnginePackage, "dataengine-packagestructure.json")
 
 #include "dataenginepackage.moc"
diff --git a/src/plasma/packagestructure/plasmagenericpackage.cpp b/src/plasma/packagestructure/plasmagenericpackage.cpp
index eef1cf636..0ff604d41 100644
--- a/src/plasma/packagestructure/plasmagenericpackage.cpp
+++ b/src/plasma/packagestructure/plasmagenericpackage.cpp
@@ -11,6 +11,7 @@
 #include <kpackage/package.h>
 #include <kpackage/packagestructure.h>
 
-K_EXPORT_KPACKAGE_PACKAGE_WITH_JSON(Plasma::GenericPackage, "plasmageneric-packagestructure.json")
+using namespace Plasma;
+K_PLUGIN_CLASS_WITH_JSON(GenericPackage, "plasmageneric-packagestructure.json")
 
 #include "plasmagenericpackage.moc"
diff --git a/src/plasma/packagestructure/plasmathemepackage.cpp b/src/plasma/packagestructure/plasmathemepackage.cpp
index dc569b234..a3dfb5be5 100644
--- a/src/plasma/packagestructure/plasmathemepackage.cpp
+++ b/src/plasma/packagestructure/plasmathemepackage.cpp
@@ -75,6 +75,6 @@ public:
     }
 };
 
-K_EXPORT_KPACKAGE_PACKAGE_WITH_JSON(ThemePackage, "plasmatheme-packagestructure.json")
+K_PLUGIN_CLASS_WITH_JSON(ThemePackage, "plasmatheme-packagestructure.json")
 
 #include "plasmathemepackage.moc"
diff --git a/src/plasma/packagestructure/plasmoidpackage.cpp b/src/plasma/packagestructure/plasmoidpackage.cpp
index af70f6c2f..6a00e6f52 100644
--- a/src/plasma/packagestructure/plasmoidpackage.cpp
+++ b/src/plasma/packagestructure/plasmoidpackage.cpp
@@ -45,6 +45,6 @@ public:
     }
 };
 
-K_EXPORT_KPACKAGE_PACKAGE_WITH_JSON(PlasmoidPackage, "plasmoid-packagestructure.json")
+K_PLUGIN_CLASS_WITH_JSON(PlasmoidPackage, "plasmoid-packagestructure.json")
 
 #include "plasmoidpackage.moc"