diff --git a/classes/cmake_kf5.bbclass b/classes/cmake_kf5.bbclass
index 7fb0f1a..432ec08 100644
--- a/classes/cmake_kf5.bbclass
+++ b/classes/cmake_kf5.bbclass
@@ -1,39 +1,39 @@
 inherit cmake_qt5
 
 EXTRA_OECMAKE += " \
     -DOE_KF5_PATH_HOST_ROOT=${STAGING_DIR_HOST} \
     -DBUILD_TESTING=OFF \
 "
 
 DEPENDS += "extra-cmake-modules qttools-native"
 
 # don't bother with translations for host tools
 do_configure_prepend_class-native() {
     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} += " \
     ${datadir}/dbus-1/services/*.service \
     ${datadir}/knotifications5/*.notifyrc \
     ${datadir}/kservices5/*.desktop \
     ${datadir}/kservices5/*.protocol \
     ${datadir}/kservicetypes5/*.desktop \
     ${datadir}/kservices5/*.desktop \
 "
 
 FILES_${PN}-dev += " \
     ${datadir}/dbus-1/interfaces/*.xml \
     ${datadir}/kdevappwizard/templates/*.tar.bz2 \
-    ${libdir}/cmake/KF5*/*.cmake \
+    ${libdir}/cmake \
     ${prefix}/mkspecs/modules/qt_*.pri \
 "
diff --git a/recipes-kf5/obsolete/kdelibs4support.inc b/recipes-kf5/obsolete/kdelibs4support.inc
index 5819a38..4b67dc0 100644
--- a/recipes-kf5/obsolete/kdelibs4support.inc
+++ b/recipes-kf5/obsolete/kdelibs4support.inc
@@ -1,66 +1,64 @@
 DESCRIPTION = "KDELibs4Support"
 HOMEPAGE = "https://api.kde.org/frameworks/kdelibs4support/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = " \
     qtbase \
     qtsvg \
     kcompletion \
     kconfigwidgets \
     kcrash \
     kded \
     kemoticons \
     kglobalaccel \
     kiconthemes \
     kio \
     knotifications \
     kparts \
     kunitconversion \
     liburi-perl-native \
     openssl \
 "
 
 SRC_URI = " \
     git://anongit.kde.org/kdelibs4support;nobranch=1 \
     file://0001-optional-kdoctools.patch \
     file://0002-optional-kdesignerplugin.patch \
     file://0003-unexport-kf5-config.patch \
 "
 S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE += " -DHAVE_GOOD_GETADDRINFO=ON"
 
 inherit cmake_kf5
 inherit gettext
 inherit python3native
 inherit perlnative
 
 do_compile_prepend() {
     # desktoptojson needs to find installed service type files
     export XDG_DATA_DIRS=${STAGING_DATADIR}:$XDG_DATA_DIRS
 }
 
 FILES_${PN} += " \
     ${libdir}/plugins/*.so \
     ${libdir}/plugins/kf5/kio/*.so \
     ${libdir}/plugins/kf5/kded/*.so \
     ${datadir}/kservices5/qimageioplugins/*.desktop \
     ${datadir}/kf5/kssl/ca-bundle.crt \
     ${datadir}/kf5/locale/currency/*.desktop \
     ${datadir}/kf5/locale/countries/*.desktop \
     ${datadir}/kf5/locale/countries/*/country.desktop \
     ${datadir}/kf5/locale/countries/*/flag.png \
     ${datadir}/kf5/kdoctools/customization/catalog4.xml \
     ${datadir}/kf5/kdoctools/customization/dtd/kdex.dtd \
 "
 
 FILES_${PN}-dev += " \
-    ${libdir}/cmake/KDELibs4/* \
-    ${libdir}/cmake/KF5KDELibs4Support/* \
     ${datadir}/kf5/widgets/pics/*.png \
 "
 
 RDEPENDS_kdelibs4support += "perl"
diff --git a/recipes-kf5/tier1/kdbusaddons.inc b/recipes-kf5/tier1/kdbusaddons.inc
index e12c9d7..e5af6c5 100644
--- a/recipes-kf5/tier1/kdbusaddons.inc
+++ b/recipes-kf5/tier1/kdbusaddons.inc
@@ -1,17 +1,13 @@
 DESCRIPTION = "KDBusAddons"
 HOMEPAGE = "https://api.kde.org/frameworks/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 \
-"
diff --git a/recipes-kf5/tier1/ki18n.inc b/recipes-kf5/tier1/ki18n.inc
index b9b0fc4..876011f 100644
--- a/recipes-kf5/tier1/ki18n.inc
+++ b/recipes-kf5/tier1/ki18n.inc
@@ -1,42 +1,38 @@
 DESCRIPTION = "Ki18n"
 HOMEPAGE = "https://api.kde.org/frameworks/ki18n/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS_class-native += " \
     qtbase \
     gettext-native \
     extra-cmake-modules \
 "
 DEPENDS_class-target += " \
     qtscript \
     gettext-native \
     extra-cmake-modules \
 "
 
 SRC_URI = " \
     git://anongit.kde.org/ki18n;nobranch=1 \
     file://0001-libintl.patch \
 "
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 inherit python3native
 
 # autotests add an extra dependency on QtQml
 EXTRA_OECMAKE += " -DBUILD_TESTING=OFF"
 EXTRA_OECMAKE_class-native += " -DBUILD_WITH_QTSCRIPT=OFF -DLibIntl_SEARCH_PATH=/usr/include"
 
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5I18n/*.py \
-"
-
 FILES_${PN}-dbg += " \
     ${libdir}/plugins/kf5/.debug/ktranscript.so \
 "
 
 FILES_${PN} += " \
     ${libdir}/plugins/kf5/ktranscript.so \
 "
diff --git a/recipes-kf5/tier3/kded.inc b/recipes-kf5/tier3/kded.inc
index 17ac782..910f9e8 100644
--- a/recipes-kf5/tier3/kded.inc
+++ b/recipes-kf5/tier3/kded.inc
@@ -1,33 +1,29 @@
 DESCRIPTION = "KDED"
 HOMEPAGE = "https://api.kde.org/frameworks/kded/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 PR = "r0"
 
 DEPENDS = " \
     qtbase \
     kconfig \
     kcoreaddons \
     kcrash \
     kdbusaddons \
     kio \
     kinit \
     kservice \
 "
 
 SRC_URI = " \
     git://anongit.kde.org/kded;nobranch=1 \
     file://0001-unexport-kded5.patch \
 "
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 
 FILES_SOLIBSDEV = ""
 FILES_${PN} += " \
     ${libdir}/libkdeinit5_kded5.so \
 "
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KDED/*.cmake \
-"
diff --git a/recipes-kf5/tier3/kinit.inc b/recipes-kf5/tier3/kinit.inc
index f76e722..6278801 100644
--- a/recipes-kf5/tier3/kinit.inc
+++ b/recipes-kf5/tier3/kinit.inc
@@ -1,33 +1,29 @@
 DESCRIPTION = "KInit"
 HOMEPAGE = "https://api.kde.org/frameworks/kinit/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 PR = "r0"
 
 DEPENDS = " \
     qtbase \
     kservice \
     kio \
     ki18n \
     kwindowsystem \
     kcrash \
     kconfig \
 "
 
 SRC_URI = " \
     git://anongit.kde.org/kinit;nobranch=1 \
 "
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 inherit gettext
 inherit python3native
 
 FILES_SOLIBSDEV = ""
 FILES_${PN} += " \
     ${libdir}/libkdeinit5_klauncher.so \
 "
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5Init/kde5init_dummy.cpp.in \
-"