diff --git a/components/shellprivate/CMakeLists.txt b/components/shellprivate/CMakeLists.txt
index 64ecf659f..d90130037 100644
--- a/components/shellprivate/CMakeLists.txt
+++ b/components/shellprivate/CMakeLists.txt
@@ -25,7 +25,6 @@ target_link_libraries(plasmashellprivateplugin
         KF5::NewStuff
         KF5::KIOFileWidgets
         KF5::WindowSystem
-        KF5::Declarative
         KF5::Activities
         KF5::TextWidgets
 )
diff --git a/components/shellprivate/widgetexplorer/plasmaappletitemmodel.cpp b/components/shellprivate/widgetexplorer/plasmaappletitemmodel.cpp
index 4617e404f..a2f843cc9 100644
--- a/components/shellprivate/widgetexplorer/plasmaappletitemmodel.cpp
+++ b/components/shellprivate/widgetexplorer/plasmaappletitemmodel.cpp
@@ -13,10 +13,10 @@
 #include "config-workspace.h"
 #include <KAboutData>
 #include <KConfig>
-#include <KDeclarative/KDeclarative>
 #include <KJsonUtils>
 #include <KLocalizedString>
 #include <KPackage/PackageLoader>
+#include <KRuntimePlatform>
 #include <KSycoca>
 
 PlasmaAppletItem::PlasmaAppletItem(const KPluginMetaData &info)
@@ -294,7 +294,7 @@ void PlasmaAppletItemModel::populateModel()
             return false;
         }
 
-        static const auto formFactors = KDeclarative::KDeclarative::runtimePlatform();
+        static const auto formFactors = KRuntimePlatform::runtimePlatform();
         // If runtimePlatformis not defined, accept everything
         bool inFormFactor = formFactors.isEmpty();
 
diff --git a/shell/packageplugins/qmlWallpaper/CMakeLists.txt b/shell/packageplugins/qmlWallpaper/CMakeLists.txt
index b166a812b..04995ab6a 100644
--- a/shell/packageplugins/qmlWallpaper/CMakeLists.txt
+++ b/shell/packageplugins/qmlWallpaper/CMakeLists.txt
@@ -3,7 +3,6 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasma_package_wallpaper\")
 kcoreaddons_add_plugin(plasma_packagestructure_wallpaper SOURCES wallpaper.cpp INSTALL_NAMESPACE "kpackage/packagestructure")
 
 target_link_libraries(plasma_packagestructure_wallpaper
-   KF5::Declarative
    KF5::I18n
    KF5::Package
 )
diff --git a/shell/packageplugins/qmlWallpaper/wallpaper.cpp b/shell/packageplugins/qmlWallpaper/wallpaper.cpp
index ff562b9d5..41a157fc4 100644
--- a/shell/packageplugins/qmlWallpaper/wallpaper.cpp
+++ b/shell/packageplugins/qmlWallpaper/wallpaper.cpp
@@ -7,15 +7,15 @@
 
 #include "wallpaper.h"
 
-#include <KDeclarative/KDeclarative>
 #include <KLocalizedString>
+#include <KRuntimePlatform>
 
 void QmlWallpaperPackage::initPackage(KPackage::Package *package)
 {
     package->addFileDefinition("mainscript", QStringLiteral("ui/main.qml"), i18n("Main Script File"));
     package->setRequired("mainscript", true);
 
-    QStringList platform = KDeclarative::KDeclarative::runtimePlatform();
+    QStringList platform = KRuntimePlatform::runtimePlatform();
     if (!platform.isEmpty()) {
         QMutableStringListIterator it(platform);
         while (it.hasNext()) {
diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp
index e26b97c37..4e477ae0e 100644
--- a/shell/shellcorona.cpp
+++ b/shell/shellcorona.cpp
@@ -347,13 +347,6 @@ void ShellCorona::setShell(const QString &shell)
         t->setThemeName(themeName);
     }
 
-    // FIXME: this would change the runtime platform to a fixed one if available
-    // but a different way to load platform specific components is needed beforehand
-    // because if we import and use two different components plugin, the second time
-    // the import is called it will fail
-    /* KConfigGroup cg(KSharedConfig::openConfig(package.filePath("defaults")), "General");
-     KDeclarative::KDeclarative::setRuntimePlatform(cg.readEntry("DefaultRuntimePlatform", QStringList()));*/
-
     unload();
 
     /*