diff --git a/classes/cmake_kf5.bbclass b/classes/cmake_kf5.bbclass
index af63197..6990e19 100644
--- a/classes/cmake_kf5.bbclass
+++ b/classes/cmake_kf5.bbclass
@@ -1,24 +1,29 @@
 inherit cmake_qt5
 
 EXTRA_OECMAKE += " \
     -DOE_KF5_PATH_HOST_ROOT=${STAGING_DIR_HOST} \
     -DKF5_HOST_TOOLING=${STAGING_DIR_NATIVE}/usr/lib/cmake \
     -DBUILD_TESTING=OFF \
 "
 
 DEPENDS += "ecm"
 
 # FIXME: using tags gives us translations, translations require lrelease/lconvert host tools, the ecm recipe can't deal with that yet...
 do_configure_prepend() {
     rm -rf ${S}/po
 }
 
 # This function is rather offensive right now, but it seems to work
 do_install_prepend() {
     if [ "0" -ne $(find . -name \*.cmake | grep _usr | wc -l) ]; then
         sed -i 's/\"\/usr\//\"\$\{OE_KF5_PATH_HOST_ROOT\}\/usr\//g' $(find . -name "*.cmake" | grep _usr)
         sed -i 's/\;\/usr\//\;\$\{OE_KF5_PATH_HOST_ROOT\}\/usr\//g' $(find . -name "*.cmake" | grep _usr)
     fi
 }
 
 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
index 71c00e2..a806e0f 100644
--- a/recipes-kf5/tier1/attica.inc
+++ b/recipes-kf5/tier1/attica.inc
@@ -1,18 +1,13 @@
 DESCRIPTION = "Attica"
 HOMEPAGE = "http://api.kde.org/frameworks-api/frameworks5-apidocs/attica/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=be254b9345b1c2ff33e1a6a96768f2fb \
     "
 PR = "r0"
 
 DEPENDS = "qtbase"
 
 SRC_URI = "git://anongit.kde.org/attica"
 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
index 48aa3df..a55eaef 100644
--- a/recipes-kf5/tier1/karchive.inc
+++ b/recipes-kf5/tier1/karchive.inc
@@ -1,18 +1,13 @@
 DESCRIPTION = "KArchive"
 HOMEPAGE = "http://api.kde.org/frameworks-api/frameworks5-apidocs/karchive/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = "zlib bzip2 xz qtbase"
 
 SRC_URI = "git://anongit.kde.org/karchive;protocol=git"
 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
index 72648bf..d97734c 100644
--- a/recipes-kf5/tier1/kcodecs.inc
+++ b/recipes-kf5/tier1/kcodecs.inc
@@ -1,18 +1,13 @@
 DESCRIPTION = "KCodecs"
 HOMEPAGE = "http://api.kde.org/frameworks-api/frameworks5-apidocs/kcodecs/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = "qtbase gperf-native"
 
 SRC_URI = "git://anongit.kde.org/kcodecs;nobranch=1"
 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
index b280557..f466d59 100644
--- a/recipes-kf5/tier1/kconfig.inc
+++ b/recipes-kf5/tier1/kconfig.inc
@@ -1,29 +1,24 @@
 # requires session management support in QtGui
 # eg. via PACKAGECONFIG_append_pn-qtbase = "sm" in local.conf
 
 DESCRIPTION = "KConfig"
 HOMEPAGE = "https://api.kde.org/frameworks/kconfig/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = "qtbase"
 
 SRC_URI = " \
     git://anongit.kde.org/kconfig;nobranch=1 \
     file://0001-no-gui.patch \
 "
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 
 sysroot_stage_all_append_class-target () {
     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
index 683b3d2..31cba41 100644
--- a/recipes-kf5/tier1/kcoreaddons.inc
+++ b/recipes-kf5/tier1/kcoreaddons.inc
@@ -1,23 +1,18 @@
 DESCRIPTION = "KCoreAddons"
 HOMEPAGE = "http://api.kde.org/frameworks-api/frameworks5-apidocs/kcoreaddons/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = "qtbase"
 
 SRC_URI = "git://anongit.kde.org/kcoreaddons;nobranch=1"
 S = "${WORKDIR}/git"
 
 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
index cf4a851..7e7af2c 100644
--- a/recipes-kf5/tier1/kdbusaddons.inc
+++ b/recipes-kf5/tier1/kdbusaddons.inc
@@ -1,18 +1,13 @@
 DESCRIPTION = "KDBusAddons"
 HOMEPAGE = "http://api.kde.org/frameworks-api/frameworks5-apidocs/kdbusaddons/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = "qtbase"
 
 SRC_URI = "git://anongit.kde.org/kdbusaddons;nobranch=1"
 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
index 72fac5c..6fdbffb 100644
--- a/recipes-kf5/tier1/kdnssd.inc
+++ b/recipes-kf5/tier1/kdnssd.inc
@@ -1,18 +1,13 @@
 DESCRIPTION = "KDNSSD"
 HOMEPAGE = "http://api.kde.org/frameworks-api/frameworks5-apidocs/kdnssd/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = "qtbase"
 
 SRC_URI = "git://anongit.kde.org/kdnssd;nobranch=1"
 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
index 7289740..2f8cc79 100644
--- a/recipes-kf5/tier1/kguiaddons.inc
+++ b/recipes-kf5/tier1/kguiaddons.inc
@@ -1,18 +1,13 @@
 DESCRIPTION = "KGuiAddons"
 HOMEPAGE = "http://api.kde.org/frameworks-api/frameworks5-apidocs/kguiaddons/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = "qtbase"
 
 SRC_URI = "git://anongit.kde.org/kguiaddons"
 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
index 26d863b..bfcf783 100644
--- a/recipes-kf5/tier1/ki18n.inc
+++ b/recipes-kf5/tier1/ki18n.inc
@@ -1,31 +1,29 @@
 DESCRIPTION = "Ki18n"
 HOMEPAGE = "http://api.kde.org/frameworks-api/frameworks5-apidocs/ki18n/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = "qtbase qtscript gettext-native"
 
 SRC_URI = "git://anongit.kde.org/ki18n;nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 inherit python3native
 
 # autotests add an extra dependency on QtQml
 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 += " \
     ${libdir}/plugins/kf5/.debug/ktranscript.so \
 "
 
 FILES_${PN} += " \
     ${libdir}/plugins/kf5/ktranscript.so \
 "
diff --git a/recipes-kf5/tier1/kidletime.inc b/recipes-kf5/tier1/kidletime.inc
index 3ecc4cd..15720da 100644
--- a/recipes-kf5/tier1/kidletime.inc
+++ b/recipes-kf5/tier1/kidletime.inc
@@ -1,18 +1,13 @@
 DESCRIPTION = "KIdleTime"
 HOMEPAGE = "http://api.kde.org/frameworks-api/frameworks5-apidocs/kidletime/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = "qtbase qtx11extras"
 
 SRC_URI = "git://anongit.kde.org/kidletime"
 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
index 95587e1..1d2f9dc 100644
--- a/recipes-kf5/tier1/kimageformats.inc
+++ b/recipes-kf5/tier1/kimageformats.inc
@@ -1,27 +1,22 @@
 DESCRIPTION = "KImageFormats"
 HOMEPAGE = "http://api.kde.org/frameworks-api/frameworks5-apidocs/kimageformats/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = "qtbase"
 
 SRC_URI = "git://anongit.kde.org/kimageformats"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5ImageFormats/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KImageFormats.pri \
-"
-
 FILES_${PN}-dbg += " \
     ${libdir}/plugins/imageformats/.debug/*.so \
 "
 
 FILES_${PN} += " \
     ${libdir}/plugins/imageformats/*.so \
     /usr/share/kservices5/qimageioplugins/*.desktop \
 "
diff --git a/recipes-kf5/tier1/kitemmodels.inc b/recipes-kf5/tier1/kitemmodels.inc
index f4b81c9..bffde13 100644
--- a/recipes-kf5/tier1/kitemmodels.inc
+++ b/recipes-kf5/tier1/kitemmodels.inc
@@ -1,18 +1,13 @@
 DESCRIPTION = "KItemModels"
 HOMEPAGE = "http://api.kde.org/frameworks-api/frameworks5-apidocs/kitemmodels/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = "qtbase"
 
 SRC_URI = "git://anongit.kde.org/kitemmodels"
 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
index 76a4bd6..ca66552 100644
--- a/recipes-kf5/tier1/kitemviews.inc
+++ b/recipes-kf5/tier1/kitemviews.inc
@@ -1,18 +1,13 @@
 DESCRIPTION = "KItemViews"
 HOMEPAGE = "http://api.kde.org/frameworks-api/frameworks5-apidocs/kitemviews/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = "qtbase"
 
 SRC_URI = "git://anongit.kde.org/kitemviews;nobranch=1"
 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
index 809bb33..63d600b 100644
--- a/recipes-kf5/tier1/kplotting.inc
+++ b/recipes-kf5/tier1/kplotting.inc
@@ -1,18 +1,13 @@
 DESCRIPTION = "KPlotting"
 HOMEPAGE = "http://api.kde.org/frameworks-api/frameworks5-apidocs/kplotting/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = "qtbase"
 
 SRC_URI = "git://anongit.kde.org/kplotting"
 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
index 8406070..896510b 100644
--- a/recipes-kf5/tier1/kwayland.inc
+++ b/recipes-kf5/tier1/kwayland.inc
@@ -1,18 +1,13 @@
 DESCRIPTION = "KWayland"
 HOMEPAGE = "https://api.kde.org/frameworks/kwayland/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = "qtbase wayland-native"
 
 SRC_URI = "git://anongit.kde.org/kwayland"
 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
index 7b6b1e9..44bebba 100644
--- a/recipes-kf5/tier1/kwidgetsaddons.inc
+++ b/recipes-kf5/tier1/kwidgetsaddons.inc
@@ -1,22 +1,17 @@
 DESCRIPTION = "KWidgetsAddons"
 HOMEPAGE = "http://api.kde.org/frameworks-api/frameworks5-apidocs/kwidgetsaddons/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = "qtbase"
 
 SRC_URI = "git://anongit.kde.org/kwidgetsaddons;nobranch=1"
 S = "${WORKDIR}/git"
 
 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
index ce70f87..4f833e5 100644
--- a/recipes-kf5/tier1/kwindowsystem.inc
+++ b/recipes-kf5/tier1/kwindowsystem.inc
@@ -1,22 +1,17 @@
 DESCRIPTION = "KWindowSystem"
 HOMEPAGE = "http://api.kde.org/frameworks-api/frameworks5-apidocs/kwindowsystem/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = "qtbase"
 
 SRC_URI = "git://anongit.kde.org/kwindowsystem;nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 
 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
index a8d9264..e0b2bed 100644
--- a/recipes-kf5/tier1/prison.inc
+++ b/recipes-kf5/tier1/prison.inc
@@ -1,18 +1,13 @@
 DESCRIPTION = "Prison"
 HOMEPAGE = "https://api.kde.org/frameworks/prison/html/index.html"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=02744127548d68b579a51bda5af08e2b \
     "
 PR = "r0"
 
 DEPENDS = "qtbase qrencode libdmtx"
 
 SRC_URI = "git://anongit.kde.org/prison"
 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
index a87d999..7121746 100644
--- a/recipes-kf5/tier1/solid.inc
+++ b/recipes-kf5/tier1/solid.inc
@@ -1,27 +1,22 @@
 DESCRIPTION = "Solid"
 HOMEPAGE = "http://api.kde.org/frameworks-api/frameworks5-apidocs/solid/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = "qtbase"
 
 SRC_URI = "git://anongit.kde.org/solid;nobranch=1"
 S = "${WORKDIR}/git"
 
 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 \
 "
 
 FILES_${PN} += " \
     ${libdir}/qml/org/kde/solid/qmldir \
     ${libdir}/qml/org/kde/solid/*.so \
 "
diff --git a/recipes-kf5/tier1/sonnet.inc b/recipes-kf5/tier1/sonnet.inc
index 9e355fa..080b22d 100644
--- a/recipes-kf5/tier1/sonnet.inc
+++ b/recipes-kf5/tier1/sonnet.inc
@@ -1,26 +1,21 @@
 DESCRIPTION = "Sonnet"
 HOMEPAGE = "https://api.kde.org/frameworks/sonnet/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = "qtbase sonnet-native qtbase-native"
 
 SRC_URI = "git://anongit.kde.org/sonnet;nobranch=1 \
     file://0001-no-widgets.patch \
     file://0002-unexport-helpers.patch \
 "
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 EXTRA_OECMAKE += " -DPARSETRIGRAMS_EXECUTABLE=${STAGING_DIR_NATIVE}/usr/bin/parsetrigrams"
 
 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
index 7fb43be..08104ea 100644
--- a/recipes-kf5/tier1/threadweaver.inc
+++ b/recipes-kf5/tier1/threadweaver.inc
@@ -1,18 +1,13 @@
 DESCRIPTION = "ThreadWeaver"
 HOMEPAGE = "http://api.kde.org/frameworks-api/frameworks5-apidocs/threadweaver/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = "qtbase"
 
 SRC_URI = "git://anongit.kde.org/threadweaver"
 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
index 56876fa..28d0e27 100644
--- a/recipes-kf5/tier2/kactivities.inc
+++ b/recipes-kf5/tier2/kactivities.inc
@@ -1,21 +1,16 @@
 DESCRIPTION = "KActivities"
 HOMEPAGE = "https://api.kde.org/frameworks/kactivities/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
 PR = "r0"
 
 DEPENDS = "qtbase qtdeclarative kcoreaddons kcoreaddons-native kconfig kconfig-native kwindowsystem boost"
 
 SRC_URI = "git://anongit.kde.org/kactivities;nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 
 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
index f733faa..da97fc6 100644
--- a/recipes-kf5/tier2/kauth.inc
+++ b/recipes-kf5/tier2/kauth.inc
@@ -1,28 +1,23 @@
 DESCRIPTION = "KAuth"
 HOMEPAGE = "http://api.kde.org/frameworks-api/frameworks5-apidocs/kauth/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = "qtbase kcoreaddons kcoreaddons-native polkit-qt-1"
 
 SRC_URI = "git://anongit.kde.org/kauth;nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 
 FILES_${PN} += " \
     ${libdir}/plugins/kauth/helper/kauth_helper_plugin.so \
     ${libdir}/plugins/kauth/backend/kauth_backend_plugin.so \
     ${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
index a20ef04..d0951d1 100644
--- a/recipes-kf5/tier2/kcompletion.inc
+++ b/recipes-kf5/tier2/kcompletion.inc
@@ -1,18 +1,13 @@
 DESCRIPTION = "KCompletion"
 HOMEPAGE = "https://api.kde.org/frameworks/kcompletion/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = "qtbase kwidgetsaddons kconfig kconfig-native"
 
 SRC_URI = "git://anongit.kde.org/kcompletion;nobranch=1"
 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
index 1b8c610..8ab5bf1 100644
--- a/recipes-kf5/tier2/kcrash.inc
+++ b/recipes-kf5/tier2/kcrash.inc
@@ -1,21 +1,16 @@
 DESCRIPTION = "KCrash"
 HOMEPAGE = "http://api.kde.org/frameworks-api/frameworks5-apidocs/kcrash/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = "kcoreaddons kwindowsystem kcoreaddons-native"
 
 SRC_URI = " \
     git://anongit.kde.org/kcrash \
     file://0001-no-x11.patch \
 "
 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
index 82179d8..baa76a5 100644
--- a/recipes-kf5/tier2/kfilemetadata.inc
+++ b/recipes-kf5/tier2/kfilemetadata.inc
@@ -1,23 +1,18 @@
 DESCRIPTION = "KFileMetaData"
 HOMEPAGE = "https://api.kde.org/frameworks/kfilemetadata/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LGPL-2.1;md5=4fbd65380cdd255951079008b364516c"
 PR = "r0"
 
 DEPENDS = "qtbase ki18n"
 
 SRC_URI = "git://anongit.kde.org/kfilemetadata;nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 inherit gettext
 inherit python3native
 
 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
index e30a095..ab7d7a5 100644
--- a/recipes-kf5/tier2/kjobwidgets.inc
+++ b/recipes-kf5/tier2/kjobwidgets.inc
@@ -1,22 +1,17 @@
 DESCRIPTION = "KJobWidgets"
 HOMEPAGE = "http://api.kde.org/frameworks-api/frameworks5-apidocs/kjobwidgets/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = "qtbase kcoreaddons kwidgetsaddons kcoreaddons-native"
 
 SRC_URI = "git://anongit.kde.org/kjobwidgets;nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 
 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
index 1be1561..4b8bf4e 100644
--- a/recipes-kf5/tier2/knotifications.inc
+++ b/recipes-kf5/tier2/knotifications.inc
@@ -1,23 +1,21 @@
 DESCRIPTION = "KNotifications"
 HOMEPAGE = "https://api.kde.org/frameworks/knotifications/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = "qtbase kwindowsystem kconfig kconfig-native kcodecs kcoreaddons kcoreaddons-native phonon"
 
 SRC_URI = "git://anongit.kde.org/knotifications;nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 
 FILES_${PN} += " \
     ${datadir}/kservicetypes5/knotificationplugin.desktop \
 "
 
 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
index e5768af..4353b32 100644
--- a/recipes-kf5/tier2/kpackage.inc
+++ b/recipes-kf5/tier2/kpackage.inc
@@ -1,24 +1,19 @@
 DESCRIPTION = "KPackage"
 HOMEPAGE = "https://api.kde.org/frameworks/kpackage/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = "qtbase karchive kcoreaddons kcoreaddons-native ki18n"
 
 SRC_URI = "git://anongit.kde.org/kpackage;nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 inherit gettext
 inherit python3native
 
 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
index 5eb3f2c..2cccfb5 100644
--- a/recipes-kf5/tier2/kpty.inc
+++ b/recipes-kf5/tier2/kpty.inc
@@ -1,20 +1,15 @@
 DESCRIPTION = "KPty"
 HOMEPAGE = "http://api.kde.org/frameworks-api/frameworks5-apidocs/kpty/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = "ki18n kcoreaddons kcoreaddons-native"
 
 SRC_URI = "git://anongit.kde.org/kpty;nobranch=1"
 S = "${WORKDIR}/git"
 
 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
index 1463ad4..cb915e2 100644
--- a/recipes-kf5/tier2/kunitconversion.inc
+++ b/recipes-kf5/tier2/kunitconversion.inc
@@ -1,20 +1,15 @@
 DESCRIPTION = "KUnitConversion"
 HOMEPAGE = "http://api.kde.org/frameworks-api/frameworks5-apidocs/kunitconversion/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = "qtbase ki18n"
 
 SRC_URI = "git://anongit.kde.org/kunitconversion;nobranch=1"
 S = "${WORKDIR}/git"
 
 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
index 375dcb4..537c46d 100644
--- a/recipes-kf5/tier3/kconfigwidgets.inc
+++ b/recipes-kf5/tier3/kconfigwidgets.inc
@@ -1,19 +1,14 @@
 DESCRIPTION = "KConfigWidgets"
 HOMEPAGE = "https://api.kde.org/frameworks/kconfigwidgets/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 PR = "r0"
 
 DEPENDS = "qtbase kauth kcoreaddons kcoreaddons-native kcodecs kconfig kconfig-native kguiaddons ki18n kwidgetsaddons"
 
 SRC_URI = "git://anongit.kde.org/kconfigwidgets;nobranch=1"
 S = "${WORKDIR}/git"
 
 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
index c4238fa..b9b25ed 100644
--- a/recipes-kf5/tier3/kglobalaccel.inc
+++ b/recipes-kf5/tier3/kglobalaccel.inc
@@ -1,33 +1,31 @@
 DESCRIPTION = "KGlobalAccel"
 HOMEPAGE = "http://api.kde.org/frameworks-api/frameworks5-apidocs/kglobalaccel/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = " \
     qtbase \
     kcoreaddons \
     kcoreaddons-native \
     kconfig \
     kconfig-native \
     kcrash \
     kdbusaddons \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras", "", d)} \
 "
 
 SRC_URI = "git://anongit.kde.org/kglobalaccel;nobranch=1"
 S = "${WORKDIR}/git"
 
 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
index 6f35589..696c258 100644
--- a/recipes-kf5/tier3/kiconthemes.inc
+++ b/recipes-kf5/tier3/kiconthemes.inc
@@ -1,19 +1,14 @@
 DESCRIPTION = "KIconThemes"
 HOMEPAGE = "https://api.kde.org/frameworks/kiconthemes/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 PR = "r0"
 
 DEPENDS = "qtbase qtsvg karchive ki18n kcoreaddons kcoreaddons-native kconfigwidgets kconfig-native kwidgetsaddons kitemviews"
 
 SRC_URI = "git://anongit.kde.org/kiconthemes;nobranch=1"
 S = "${WORKDIR}/git"
 
 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
index 307ca99..33c2d87 100644
--- a/recipes-kf5/tier3/kservice.inc
+++ b/recipes-kf5/tier3/kservice.inc
@@ -1,23 +1,18 @@
 DESCRIPTION = "KService"
 HOMEPAGE = "https://api.kde.org/frameworks/kservice/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 PR = "r0"
 
 DEPENDS = "qtbase kconfig kconfig-native kcoreaddons kcoreaddons-native kcrash kdbusaddons ki18n"
 
 SRC_URI = "git://anongit.kde.org/kservice;nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 inherit gettext
 inherit python3native
 
 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
index aebbe65..de0c2dd 100644
--- a/recipes-kf5/tier3/ktextwidgets.inc
+++ b/recipes-kf5/tier3/ktextwidgets.inc
@@ -1,23 +1,18 @@
 DESCRIPTION = "KTextWidgets"
 HOMEPAGE = "https://api.kde.org/frameworks/ktextwidgets/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 PR = "r0"
 
 DEPENDS = "qtbase kcompletion kconfig kconfig-native kconfigwidgets ki18n kiconthemes kservice kwidgetsaddons kwindowsystem sonnet kcoreaddons-native"
 
 SRC_URI = "git://anongit.kde.org/ktextwidgets;nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 inherit gettext
 inherit python3native
 
 FILES_${PN} += " \
   ${datadir}/kservicetypes5/*.desktop \
 "
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5TextWidgets/*.cmake \
-    ${prefix}/mkspecs/modules/qt_KTextWidgets.pri \
-"