diff --git a/classes/cmake_kf5.bbclass b/classes/cmake_kf5.bbclass
--- a/classes/cmake_kf5.bbclass
+++ b/classes/cmake_kf5.bbclass
@@ -22,3 +22,8 @@
 }
 
 BBCLASSEXTEND = "native nativesdk"
+
+FILES_${PN}-dev += " \
+    ${libdir}/cmake/KF5*/*.cmake \
+    ${prefix}/mkspecs/modules/qt_*.pri \
+"
diff --git a/recipes-kf5/tier1/attica.inc b/recipes-kf5/tier1/attica.inc
--- a/recipes-kf5/tier1/attica.inc
+++ b/recipes-kf5/tier1/attica.inc
@@ -11,8 +11,3 @@
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5Attica/*.cmake \
-    ${prefix}/mkspecs/modules/qt_Attica.pri \
-"
diff --git a/recipes-kf5/tier1/karchive.inc b/recipes-kf5/tier1/karchive.inc
--- a/recipes-kf5/tier1/karchive.inc
+++ b/recipes-kf5/tier1/karchive.inc
@@ -11,8 +11,3 @@
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5Archive/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KArchive.pri \
-"
diff --git a/recipes-kf5/tier1/kcodecs.inc b/recipes-kf5/tier1/kcodecs.inc
--- a/recipes-kf5/tier1/kcodecs.inc
+++ b/recipes-kf5/tier1/kcodecs.inc
@@ -11,8 +11,3 @@
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5Codecs/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KCodecs.pri \
-"
diff --git a/recipes-kf5/tier1/kconfig.inc b/recipes-kf5/tier1/kconfig.inc
--- a/recipes-kf5/tier1/kconfig.inc
+++ b/recipes-kf5/tier1/kconfig.inc
@@ -22,8 +22,3 @@
     mkdir -p ${SYSROOT_DESTDIR}${libexecdir}/kf5
     cp ${D}${libexecdir}/kf5/kconf_update ${SYSROOT_DESTDIR}${libexecdir}/kf5
 }
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5Config/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KConfig*.pri \
-"
diff --git a/recipes-kf5/tier1/kcoreaddons.inc b/recipes-kf5/tier1/kcoreaddons.inc
--- a/recipes-kf5/tier1/kcoreaddons.inc
+++ b/recipes-kf5/tier1/kcoreaddons.inc
@@ -12,11 +12,6 @@
 
 inherit cmake_kf5
 
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5CoreAddons/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KCoreAddons.pri \
-"
-
 FILES_${PN} += " \
     /usr/share/mime/packages/kde5.xml \
     /usr/share/kf5/licenses/* \
diff --git a/recipes-kf5/tier1/kdbusaddons.inc b/recipes-kf5/tier1/kdbusaddons.inc
--- a/recipes-kf5/tier1/kdbusaddons.inc
+++ b/recipes-kf5/tier1/kdbusaddons.inc
@@ -11,8 +11,3 @@
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5DBusAddons/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KDBusAddons.pri \
-"
diff --git a/recipes-kf5/tier1/kdnssd.inc b/recipes-kf5/tier1/kdnssd.inc
--- a/recipes-kf5/tier1/kdnssd.inc
+++ b/recipes-kf5/tier1/kdnssd.inc
@@ -11,8 +11,3 @@
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5DNSSD/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KDNSSD.pri \
-"
diff --git a/recipes-kf5/tier1/kguiaddons.inc b/recipes-kf5/tier1/kguiaddons.inc
--- a/recipes-kf5/tier1/kguiaddons.inc
+++ b/recipes-kf5/tier1/kguiaddons.inc
@@ -11,8 +11,3 @@
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5GuiAddons/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KGuiAddons.pri \
-"
diff --git a/recipes-kf5/tier1/ki18n.inc b/recipes-kf5/tier1/ki18n.inc
--- a/recipes-kf5/tier1/ki18n.inc
+++ b/recipes-kf5/tier1/ki18n.inc
@@ -17,9 +17,7 @@
 EXTRA_OECMAKE += " -DBUILD_TESTING=OFF"
 
 FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5I18n/*.cmake \
     ${libdir}/cmake/KF5I18n/*.py \
-    ${prefix}/mkspecs/modules/qt_KI18n.pri \
 "
 
 FILES_${PN}-dbg += " \
diff --git a/recipes-kf5/tier1/kidletime.inc b/recipes-kf5/tier1/kidletime.inc
--- a/recipes-kf5/tier1/kidletime.inc
+++ b/recipes-kf5/tier1/kidletime.inc
@@ -11,8 +11,3 @@
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5IdleTime/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KIdleTime.pri \
-"
diff --git a/recipes-kf5/tier1/kimageformats.inc b/recipes-kf5/tier1/kimageformats.inc
--- a/recipes-kf5/tier1/kimageformats.inc
+++ b/recipes-kf5/tier1/kimageformats.inc
@@ -12,11 +12,6 @@
 
 inherit cmake_kf5
 
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5ImageFormats/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KImageFormats.pri \
-"
-
 FILES_${PN}-dbg += " \
     ${libdir}/plugins/imageformats/.debug/*.so \
 "
diff --git a/recipes-kf5/tier1/kitemmodels.inc b/recipes-kf5/tier1/kitemmodels.inc
--- a/recipes-kf5/tier1/kitemmodels.inc
+++ b/recipes-kf5/tier1/kitemmodels.inc
@@ -11,8 +11,3 @@
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5ItemModels/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KItemModels.pri \
-"
diff --git a/recipes-kf5/tier1/kitemviews.inc b/recipes-kf5/tier1/kitemviews.inc
--- a/recipes-kf5/tier1/kitemviews.inc
+++ b/recipes-kf5/tier1/kitemviews.inc
@@ -11,8 +11,3 @@
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5ItemViews/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KItemViews.pri \
-"
diff --git a/recipes-kf5/tier1/kplotting.inc b/recipes-kf5/tier1/kplotting.inc
--- a/recipes-kf5/tier1/kplotting.inc
+++ b/recipes-kf5/tier1/kplotting.inc
@@ -11,8 +11,3 @@
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5Plotting/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KPlotting.pri \
-"
diff --git a/recipes-kf5/tier1/kwayland.inc b/recipes-kf5/tier1/kwayland.inc
--- a/recipes-kf5/tier1/kwayland.inc
+++ b/recipes-kf5/tier1/kwayland.inc
@@ -11,8 +11,3 @@
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5Wayland/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KWayland*.pri \
-"
diff --git a/recipes-kf5/tier1/kwidgetsaddons.inc b/recipes-kf5/tier1/kwidgetsaddons.inc
--- a/recipes-kf5/tier1/kwidgetsaddons.inc
+++ b/recipes-kf5/tier1/kwidgetsaddons.inc
@@ -12,11 +12,6 @@
 
 inherit cmake_kf5
 
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5WidgetsAddons/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KWidgetsAddons.pri \
-"
-
 FILES_${PN} += " \
     /usr/share/kf5/kcharselect/kcharselect-data \
 "
diff --git a/recipes-kf5/tier1/kwindowsystem.inc b/recipes-kf5/tier1/kwindowsystem.inc
--- a/recipes-kf5/tier1/kwindowsystem.inc
+++ b/recipes-kf5/tier1/kwindowsystem.inc
@@ -15,8 +15,3 @@
 FILES_${PN} += " \
     ${libdir}/plugins/kf5/org.kde.kwindowsystem.platforms/* \
 "
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5WindowSystem/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KWindowSystem.pri \
-"
diff --git a/recipes-kf5/tier1/prison.inc b/recipes-kf5/tier1/prison.inc
--- a/recipes-kf5/tier1/prison.inc
+++ b/recipes-kf5/tier1/prison.inc
@@ -11,8 +11,3 @@
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5Prison/*.cmake \
-    ${prefix}/mkspecs/modules/qt_Prison.pri \
-"
diff --git a/recipes-kf5/tier1/solid.inc b/recipes-kf5/tier1/solid.inc
--- a/recipes-kf5/tier1/solid.inc
+++ b/recipes-kf5/tier1/solid.inc
@@ -12,11 +12,6 @@
 
 inherit cmake_kf5
 
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5Solid/*.cmake \
-    ${prefix}/mkspecs/modules/qt_Solid.pri \
-"
-
 FILES_${PN}-dbg += " \
     ${libdir}/qml/org/kde/solid/.debug/*.so \
 "
diff --git a/recipes-kf5/tier1/sonnet.inc b/recipes-kf5/tier1/sonnet.inc
--- a/recipes-kf5/tier1/sonnet.inc
+++ b/recipes-kf5/tier1/sonnet.inc
@@ -19,8 +19,3 @@
 FILES_${PN} += " \
     ${datadir}/kf5/sonnet/* \
 "
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5Sonnet/*.cmake \
-    ${prefix}/mkspecs/modules/qt_Sonnet*.pri \
-"
diff --git a/recipes-kf5/tier1/threadweaver.inc b/recipes-kf5/tier1/threadweaver.inc
--- a/recipes-kf5/tier1/threadweaver.inc
+++ b/recipes-kf5/tier1/threadweaver.inc
@@ -11,8 +11,3 @@
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5ThreadWeaver/*.cmake \
-    ${prefix}/mkspecs/modules/qt_ThreadWeaver.pri \
-"
diff --git a/recipes-kf5/tier2/kactivities.inc b/recipes-kf5/tier2/kactivities.inc
--- a/recipes-kf5/tier2/kactivities.inc
+++ b/recipes-kf5/tier2/kactivities.inc
@@ -14,8 +14,3 @@
 FILES_${PN} += " \
     ${libdir}/qml/org/kde/activities/* \
 "
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5Activities/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KActivities.pri \
-"
diff --git a/recipes-kf5/tier2/kauth.inc b/recipes-kf5/tier2/kauth.inc
--- a/recipes-kf5/tier2/kauth.inc
+++ b/recipes-kf5/tier2/kauth.inc
@@ -18,11 +18,6 @@
     ${datadir}/kf5/kauth/*.stub \
 "
 
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5Auth/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KAuth.pri \
-"
-
 FILES_${PN}-dbg += " \
     ${libdir}/plugins/kauth/helper/.debug/kauth_helper_plugin.so \
 "
diff --git a/recipes-kf5/tier2/kcompletion.inc b/recipes-kf5/tier2/kcompletion.inc
--- a/recipes-kf5/tier2/kcompletion.inc
+++ b/recipes-kf5/tier2/kcompletion.inc
@@ -11,8 +11,3 @@
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5Completion/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KCompletion.pri \
-"
diff --git a/recipes-kf5/tier2/kcrash.inc b/recipes-kf5/tier2/kcrash.inc
--- a/recipes-kf5/tier2/kcrash.inc
+++ b/recipes-kf5/tier2/kcrash.inc
@@ -14,8 +14,3 @@
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5Crash/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KCrash.pri \
-"
diff --git a/recipes-kf5/tier2/kfilemetadata.inc b/recipes-kf5/tier2/kfilemetadata.inc
--- a/recipes-kf5/tier2/kfilemetadata.inc
+++ b/recipes-kf5/tier2/kfilemetadata.inc
@@ -16,8 +16,3 @@
 FILES_${PN} += " \
   ${libdir}/plugins/kf5/kfilemetadata/*.so \
 "
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5FileMetaData/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KFileMetaData.pri \
-"
diff --git a/recipes-kf5/tier2/kjobwidgets.inc b/recipes-kf5/tier2/kjobwidgets.inc
--- a/recipes-kf5/tier2/kjobwidgets.inc
+++ b/recipes-kf5/tier2/kjobwidgets.inc
@@ -15,8 +15,3 @@
 FILES_${PN} += " \
     /usr/share/dbus-1/interfaces/*.xml \
 "
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5JobWidgets/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KJobWidgets.pri \
-"
diff --git a/recipes-kf5/tier2/knotifications.inc b/recipes-kf5/tier2/knotifications.inc
--- a/recipes-kf5/tier2/knotifications.inc
+++ b/recipes-kf5/tier2/knotifications.inc
@@ -18,6 +18,4 @@
 
 FILES_${PN}-dev += " \
     ${datadir}/dbus-1/interfaces/*.xml \
-    ${libdir}/cmake/KF5Notifications/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KNotifications.pri \
 "
diff --git a/recipes-kf5/tier2/kpackage.inc b/recipes-kf5/tier2/kpackage.inc
--- a/recipes-kf5/tier2/kpackage.inc
+++ b/recipes-kf5/tier2/kpackage.inc
@@ -17,8 +17,3 @@
 FILES_${PN} += " \
     ${datadir}/kservicetypes5/* \
 "
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5Package/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KPackage.pri \
-"
diff --git a/recipes-kf5/tier2/kpty.inc b/recipes-kf5/tier2/kpty.inc
--- a/recipes-kf5/tier2/kpty.inc
+++ b/recipes-kf5/tier2/kpty.inc
@@ -13,8 +13,3 @@
 inherit cmake_kf5
 inherit gettext
 inherit python3native
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5Pty/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KPty.pri \
-"
diff --git a/recipes-kf5/tier2/kunitconversion.inc b/recipes-kf5/tier2/kunitconversion.inc
--- a/recipes-kf5/tier2/kunitconversion.inc
+++ b/recipes-kf5/tier2/kunitconversion.inc
@@ -13,8 +13,3 @@
 inherit cmake_kf5
 inherit python3native
 inherit gettext
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5UnitConversion/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KUnitConversion.pri \
-"
diff --git a/recipes-kf5/tier3/kconfigwidgets.inc b/recipes-kf5/tier3/kconfigwidgets.inc
--- a/recipes-kf5/tier3/kconfigwidgets.inc
+++ b/recipes-kf5/tier3/kconfigwidgets.inc
@@ -12,8 +12,3 @@
 inherit cmake_kf5
 inherit gettext
 inherit python3native
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5ConfigWidgets/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KConfigWidgets.pri \
-"
diff --git a/recipes-kf5/tier3/kglobalaccel.inc b/recipes-kf5/tier3/kglobalaccel.inc
--- a/recipes-kf5/tier3/kglobalaccel.inc
+++ b/recipes-kf5/tier3/kglobalaccel.inc
@@ -22,12 +22,10 @@
 inherit cmake_kf5
 
 FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5GlobalAccel/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KGlobalAccel.pri \
+    /usr/share/dbus-1/interfaces/kf5_org.*.xml \
 "
 
 FILES_${PN} += " \
-    /usr/share/dbus-1/interfaces/kf5_org.*.xml \
     /usr/share/dbus-1/services/org.kde.kglobalaccel.service \
     /usr/share/kservices5/kglobalaccel5.desktop \
 "
diff --git a/recipes-kf5/tier3/kiconthemes.inc b/recipes-kf5/tier3/kiconthemes.inc
--- a/recipes-kf5/tier3/kiconthemes.inc
+++ b/recipes-kf5/tier3/kiconthemes.inc
@@ -12,8 +12,3 @@
 inherit cmake_kf5
 inherit gettext
 inherit python3native
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5IconThemes/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KIconThemes.pri \
-"
diff --git a/recipes-kf5/tier3/kservice.inc b/recipes-kf5/tier3/kservice.inc
--- a/recipes-kf5/tier3/kservice.inc
+++ b/recipes-kf5/tier3/kservice.inc
@@ -16,8 +16,3 @@
 FILES_${PN} += " \
     ${datadir}/kservicetypes5/*.desktop \
 "
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5Service/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KService.pri \
-"
diff --git a/recipes-kf5/tier3/ktextwidgets.inc b/recipes-kf5/tier3/ktextwidgets.inc
--- a/recipes-kf5/tier3/ktextwidgets.inc
+++ b/recipes-kf5/tier3/ktextwidgets.inc
@@ -16,8 +16,3 @@
 FILES_${PN} += " \
   ${datadir}/kservicetypes5/*.desktop \
 "
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5TextWidgets/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KTextWidgets.pri \
-"