diff --git a/classes/cmake_kf5.bbclass b/classes/cmake_kf5.bbclass
index 87f047b..7fb0f1a 100644
--- a/classes/cmake_kf5.bbclass
+++ b/classes/cmake_kf5.bbclass
@@ -1,33 +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 \
     ${prefix}/mkspecs/modules/qt_*.pri \
 "
diff --git a/recipes-kf5/tier1/solid.inc b/recipes-kf5/tier1/solid.inc
index c1b856a..044d9a0 100644
--- a/recipes-kf5/tier1/solid.inc
+++ b/recipes-kf5/tier1/solid.inc
@@ -1,22 +1,18 @@
 DESCRIPTION = "Solid"
 HOMEPAGE = "https://api.kde.org/frameworks/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}-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/tier2/kauth.inc b/recipes-kf5/tier2/kauth.inc
index 1babce4..479ded0 100644
--- a/recipes-kf5/tier2/kauth.inc
+++ b/recipes-kf5/tier2/kauth.inc
@@ -1,42 +1,38 @@
 DESCRIPTION = "KAuth"
 HOMEPAGE = "https://api.kde.org/frameworks/kauth/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS_class-native = "extra-cmake-modules qtbase-native kcoreaddons-native"
 DEPENDS_class-target = "qtbase kcoreaddons kauth-native polkit-qt-1"
 
 SRC_URI = " \
     git://anongit.kde.org/kauth;nobranch=1 \
     file://0001-codegen-only.patch \
 "
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 
 EXTRA_OECMAKE_class-native += " \
     -DKAUTH_BUILD_CODEGENERATOR_ONLY=ON \
     -DKAUTH_BACKEND_NAME=POLKITQT5-1 \
     -DKAUTH_POLICY_FILES_INSTALL_DIR=${datadir}/polkit-1/actions \
 "
 
 sysroot_stage_all_append_class-target () {
     mkdir -p ${SYSROOT_DESTDIR}${libexecdir}/kauth
     cp ${STAGING_LIBEXECDIR_NATIVE}/kauth/kauth-policy-gen ${SYSROOT_DESTDIR}/${libexecdir}/kauth
 }
 
 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 += " \
     ${libexecdir}/kauth/kauth-policy-gen \
 "
-
-FILES_${PN}-dbg += " \
-    ${libdir}/plugins/kauth/helper/.debug/kauth_helper_plugin.so \
-"
diff --git a/recipes-kf5/tier2/knotifications.inc b/recipes-kf5/tier2/knotifications.inc
index 23bf694..2139e59 100644
--- a/recipes-kf5/tier2/knotifications.inc
+++ b/recipes-kf5/tier2/knotifications.inc
@@ -1,17 +1,13 @@
 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 kcodecs kcoreaddons phonon"
 
 SRC_URI = "git://anongit.kde.org/knotifications;nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
-
-FILES_${PN} += " \
-    ${datadir}/kservicetypes5/knotificationplugin.desktop \
-"
diff --git a/recipes-kf5/tier2/kpackage.inc b/recipes-kf5/tier2/kpackage.inc
index 1da769b..a6310fe 100644
--- a/recipes-kf5/tier2/kpackage.inc
+++ b/recipes-kf5/tier2/kpackage.inc
@@ -1,24 +1,20 @@
 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 ki18n"
 
 SRC_URI = "git://anongit.kde.org/kpackage;nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 inherit gettext
 inherit python3native
 
 sysroot_stage_all_append_class-target() {
     mkdir -p ${SYSROOT_DESTDIR}/${bindir}
     cp ${D}${bindir}//kpackagetool5 ${SYSROOT_DESTDIR}/${bindir}/
 }
-
-FILES_${PN} += " \
-    ${datadir}/kservicetypes5/* \
-"
diff --git a/recipes-kf5/tier3/baloo.inc b/recipes-kf5/tier3/baloo.inc
index 7c30b1d..052f900 100644
--- a/recipes-kf5/tier3/baloo.inc
+++ b/recipes-kf5/tier3/baloo.inc
@@ -1,36 +1,35 @@
 DESCRIPTION = "Baloo"
 HOMEPAGE = "https://api.kde.org/frameworks/baloo/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
 PR = "r0"
 
 DEPENDS = " \
     qtbase \
     qtdeclarative \
     kcoreaddons \
     kconfig \
     kdbusaddons \
     ki18n \
     kidletime \
     solid \
     kfilemetadata \
     kcrash \
     kio \
     lmdb \
 "
 
 SRC_URI = "git://anongit.kde.org/baloo;nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 inherit gettext
 inherit python3native
 
 FILES_${PN} += " \
     ${libdir}/plugins/kf5/kio/*.so \
     ${libdir}/plugins/kf5/kded/*.so \
     ${libdir}/qml/org/kde/baloo/* \
     ${libdir}/qml/org/kde/baloo/experimental/* \
     ${datadir}/icons/hicolor/128x128/apps/baloo.png \
-    ${datadir}/kservices5/*.protocol \
 "
diff --git a/recipes-kf5/tier3/kcmutils.inc b/recipes-kf5/tier3/kcmutils.inc
index 91d4d2c..6678e32 100644
--- a/recipes-kf5/tier3/kcmutils.inc
+++ b/recipes-kf5/tier3/kcmutils.inc
@@ -1,29 +1,25 @@
 DESCRIPTION = "KCMUtils"
 HOMEPAGE = "https://api.kde.org/frameworks/kcmutils/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 PR = "r0"
 
 DEPENDS = " \
     qtbase \
     kitemviews \
     kconfigwidgets \
     kcoreaddons \
     kiconthemes \
     ki18n \
     kservice \
     kxmlgui \
     kdeclarative \
     kpackage \
 "
 
 SRC_URI = "git://anongit.kde.org/kcmutils;nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 inherit gettext
 inherit python3native
-
-FILES_${PN} += " \
-    ${datadir}/kservicetypes5/*.desktop \
-"
diff --git a/recipes-kf5/tier3/kded.inc b/recipes-kf5/tier3/kded.inc
index 1894280..3bd9c3e 100644
--- a/recipes-kf5/tier3/kded.inc
+++ b/recipes-kf5/tier3/kded.inc
@@ -1,31 +1,30 @@
 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"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 
 FILES_SOLIBSDEV = ""
 FILES_${PN} += " \
     ${libdir}/libkdeinit5_kded5.so \
-    ${datadir}/kservicetypes5/*.desktop \
 "
 
 FILES_${PN}-dev += " \
     ${libdir}/cmake/KDED/*.cmake \
 "
diff --git a/recipes-kf5/tier3/kemoticons.inc b/recipes-kf5/tier3/kemoticons.inc
index 81f474f..8cf41b4 100644
--- a/recipes-kf5/tier3/kemoticons.inc
+++ b/recipes-kf5/tier3/kemoticons.inc
@@ -1,31 +1,29 @@
 DESCRIPTION = "KEmoticons"
 HOMEPAGE = "https://api.kde.org/frameworks/kemoticons/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 PR = "r0"
 
 DEPENDS = " \
     qtbase \
     karchive \
     kcoreaddons \
     kconfig \
     kservice \
 "
 
 SRC_URI = "git://anongit.kde.org/kemoticons;nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 
 FILES_${PN} += " \
     ${libdir}/plugins/kf5/*.so \
     ${libdir}/plugins/kf5/emoticonsthemes/*.so \
-    ${datadir}/kservices5/*.desktop \
-    ${datadir}/kservicetypes5/*.desktop \
     ${datadir}/emoticons/Konqi/*.png \
     ${datadir}/emoticons/Konqi/emoticons.xml \
     ${datadir}/emoticons/EmojiOne/*.png \
     ${datadir}/emoticons/EmojiOne/emoticons.xml \
     ${datadir}/emoticons/Breeze/*.png \
     ${datadir}/emoticons/Breeze/emoticons.xml \
 "
diff --git a/recipes-kf5/tier3/kglobalaccel.inc b/recipes-kf5/tier3/kglobalaccel.inc
index f21cb2b..a9b4637 100644
--- a/recipes-kf5/tier3/kglobalaccel.inc
+++ b/recipes-kf5/tier3/kglobalaccel.inc
@@ -1,24 +1,20 @@
 DESCRIPTION = "KGlobalAccel"
 HOMEPAGE = "https://api.kde.org/frameworks/kglobalaccel/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = " \
     qtbase \
     kcoreaddons \
     kconfig \
     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} += " \
-    ${datadir}/kservices5/kglobalaccel5.desktop \
-"
diff --git a/recipes-kf5/tier3/kio.inc b/recipes-kf5/tier3/kio.inc
index 62d2017..f56b556 100644
--- a/recipes-kf5/tier3/kio.inc
+++ b/recipes-kf5/tier3/kio.inc
@@ -1,46 +1,42 @@
 DESCRIPTION = "KIO"
 HOMEPAGE = "https://api.kde.org/frameworks/kio/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 PR = "r0"
 
 DEPENDS = " \
     qtbase \
     karchive \
     kconfig \
     kcoreaddons \
     kdbusaddons \
     ki18n \
     kservice \
     solid \
     kbookmarks \
     kcompletion \
     kconfigwidgets \
     kiconthemes \
     kitemviews \
     kjobwidgets \
     kwidgetsaddons \
     kwindowsystem\
 "
 
 SRC_URI = "git://anongit.kde.org/kio;nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 inherit gettext
 inherit python3native
 
 FILES_${PN} += " \
     ${libdir}/plugins/kcm_*.so \
     ${libdir}/plugins/kf5/kio/*.so \
     ${libdir}/plugins/kf5/kded/*.so \
     ${libdir}/plugins/kf5/kiod/*.so \
     ${libdir}/plugins/kf5/urifilters/*.so \
-    ${datadir}/knotifications5/proxyscout.notifyrc \
-    ${datadir}/kservices5/*.protocol \
-    ${datadir}/kservices5/*.desktop \
     ${datadir}/kservices5/useragentstrings/*.desktop \
     ${datadir}/kservices5/searchproviders/*.desktop \
-    ${datadir}/kservicetypes5/*.desktop \
     ${datadir}/kf5/kcookiejar/domain_info \
 "
diff --git a/recipes-kf5/tier3/kparts.inc b/recipes-kf5/tier3/kparts.inc
index 2484e88..0e8dfe6 100644
--- a/recipes-kf5/tier3/kparts.inc
+++ b/recipes-kf5/tier3/kparts.inc
@@ -1,34 +1,26 @@
 DESCRIPTION = "KParts"
 HOMEPAGE = "https://api.kde.org/frameworks/kparts/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 PR = "r0"
 
 DEPENDS = " \
     qtbase \
     kconfig \
     kcoreaddons \
     ki18n \
     kiconthemes \
     kio \
     kjobwidgets \
     kservice \
     ktextwidgets \
     kwidgetsaddons \
     kxmlgui \
 "
 
 SRC_URI = "git://anongit.kde.org/kparts;nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 inherit gettext
 inherit python3native
-
-FILES_${PN} += " \
-    ${datadir}/kservicetypes5/*.desktop \
-"
-
-FILES_${PN}-dev += " \
-    ${datadir}/kdevappwizard/templates/*.tar.bz2 \
-"
diff --git a/recipes-kf5/tier3/kpeople.inc b/recipes-kf5/tier3/kpeople.inc
index ba18b86..cb172b5 100644
--- a/recipes-kf5/tier3/kpeople.inc
+++ b/recipes-kf5/tier3/kpeople.inc
@@ -1,28 +1,27 @@
 DESCRIPTION = "KPeople"
 HOMEPAGE = "https://api.kde.org/frameworks/kpeople/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 PR = "r0"
 
 DEPENDS = " \
     qtbase \
     qtdeclarative \
     kcoreaddons \
     ki18n \
     kwidgetsaddons \
     kservice \
     kitemviews \
 "
 
 SRC_URI = "git://anongit.kde.org/kpeople;nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 inherit gettext
 inherit python3native
 
 FILES_${PN} += " \
     ${libdir}/qml/org/kde/people/* \
-    ${datadir}/kservicetypes5/*.desktop \
     ${datadir}/kf5/kpeople/*.png \
 "
diff --git a/recipes-kf5/tier3/krunner.inc b/recipes-kf5/tier3/krunner.inc
index 747d24b..b7a5b22 100644
--- a/recipes-kf5/tier3/krunner.inc
+++ b/recipes-kf5/tier3/krunner.inc
@@ -1,34 +1,29 @@
 DESCRIPTION = "KRunner"
 HOMEPAGE = "https://api.kde.org/frameworks/krunner/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
 PR = "r0"
 
 DEPENDS = " \
     qtbase \
     qtdeclarative \
     kconfig \
     kcoreaddons \
     ki18n \
     kio \
     kservice \
     plasma-framework \
     solid \
     threadweaver \
 "
 
 SRC_URI = "git://anongit.kde.org/krunner;nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 inherit gettext
 inherit python3native
 
 FILES_${PN} += " \
   ${libdir}/qml/org/kde/runnermodel/* \
-  ${datadir}/kservicetypes5/*.desktop \
-"
-
-FILES_${PN}-dev += " \
-    ${datadir}/kdevappwizard/templates/* \
 "
diff --git a/recipes-kf5/tier3/kservice.inc b/recipes-kf5/tier3/kservice.inc
index 1c29003..326b7bb 100644
--- a/recipes-kf5/tier3/kservice.inc
+++ b/recipes-kf5/tier3/kservice.inc
@@ -1,18 +1,14 @@
 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 kcoreaddons 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 \
-"
diff --git a/recipes-kf5/tier3/ktexteditor.inc b/recipes-kf5/tier3/ktexteditor.inc
index 486f882..a4438bc 100644
--- a/recipes-kf5/tier3/ktexteditor.inc
+++ b/recipes-kf5/tier3/ktexteditor.inc
@@ -1,45 +1,39 @@
 DESCRIPTION = "KTextEditor"
 HOMEPAGE = "https://api.kde.org/frameworks/ktexteditor/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 PR = "r0"
 
 DEPENDS = " \
     qtbase \
     karchive \
     kconfig \
     kguiaddons \
     ki18n \
     kio \
     kparts \
     sonnet \
     kiconthemes \
     ksyntaxhighlighting \
 "
 
 SRC_URI = " \
     git://anongit.kde.org/ktexteditor;nobranch=1 \
 "
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 inherit gettext
 inherit python3native
 
 do_compile_prepend() {
     # desktoptojson needs to find installed service type files
     export XDG_DATA_DIRS=${STAGING_DATADIR}:$XDG_DATA_DIRS
 }
 
 FILES_${PN} += " \
   ${libdir}/plugins/kf5/parts/katepart.so \
-  ${datadir}/kservices5/*.desktop \
-  ${datadir}/kservicetypes5/*.desktop \
   ${datadir}/dbus-1/system-services/*.service \
   ${datadir}/polkit-1/actions/*.policy \
   ${datadir}/katepart5/script/README.md \
 "
-
-FILES_${PN}-dev += " \
-    ${datadir}/kdevappwizard/templates/*.bz2 \
-"
diff --git a/recipes-kf5/tier3/ktextwidgets.inc b/recipes-kf5/tier3/ktextwidgets.inc
index d7325fb..3dc9251 100644
--- a/recipes-kf5/tier3/ktextwidgets.inc
+++ b/recipes-kf5/tier3/ktextwidgets.inc
@@ -1,18 +1,14 @@
 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 kconfigwidgets ki18n kiconthemes kservice kwidgetsaddons kwindowsystem sonnet"
 
 SRC_URI = "git://anongit.kde.org/ktextwidgets;nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 inherit gettext
 inherit python3native
-
-FILES_${PN} += " \
-  ${datadir}/kservicetypes5/*.desktop \
-"
diff --git a/recipes-kf5/tier3/kwallet.inc b/recipes-kf5/tier3/kwallet.inc
index 690e35d..6d6de1e 100644
--- a/recipes-kf5/tier3/kwallet.inc
+++ b/recipes-kf5/tier3/kwallet.inc
@@ -1,34 +1,29 @@
 DESCRIPTION = "KWallet"
 HOMEPAGE = "https://api.kde.org/frameworks/kwallet/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 PR = "r0"
 
 DEPENDS = " \
     qtbase \
     kconfig \
     kconfigwidgets \
     kcoreaddons \
     kdbusaddons \
     kiconthemes \
     knotifications \
     ki18n \
     kservice \
     kwidgetsaddons \
     kwindowsystem \
     libgcrypt \
 "
 
 SRC_URI = " \
     git://anongit.kde.org/kwallet;nobranch=1 \
 "
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 inherit gettext
 inherit python3native
-
-FILES_${PN} += " \
-    ${datadir}/knotifications5/*.notifyrc \
-    ${datadir}/kservices5/*.desktop \
-"
diff --git a/recipes-kf5/tier3/plasma-framework.inc b/recipes-kf5/tier3/plasma-framework.inc
index 44e9f64..035946b 100644
--- a/recipes-kf5/tier3/plasma-framework.inc
+++ b/recipes-kf5/tier3/plasma-framework.inc
@@ -1,71 +1,65 @@
 DESCRIPTION = "Plama Framework"
 HOMEPAGE = "https://api.kde.org/plasma-framework/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 PR = "r0"
 
 DEPENDS = " \
     qtbase \
     kactivities \
     karchive \
     kconfig \
     kconfigwidgets \
     kdbusaddons \
     kdeclarative \
     kglobalaccel \
     kguiaddons \
     ki18n \
     kiconthemes \
     kio \
     kservice \
     kwindowsystem \
     kxmlgui \
     knotifications \
     kpackage \
     kwayland \
 "
 
 SRC_URI = " \
     git://anongit.kde.org/plasma-framework;nobranch=1 \
 "
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 inherit gettext
 inherit python3native
 
 FILES_${PN} += " \
     ${libdir}/plugins/*.so \
     ${libdir}/plugins/kpackage/packagestructure/*.so \
     ${libdir}/plugins/plasma/scriptengines/*.so \
     ${libdir}/qml/org/kde/plasma/accessdenied/* \
     ${libdir}/qml/org/kde/plasma/components.3/* \
     ${libdir}/qml/org/kde/plasma/extras/* \
     ${libdir}/qml/org/kde/plasma/extras/animations/* \
     ${libdir}/qml/org/kde/plasma/components/* \
     ${libdir}/qml/org/kde/plasma/components/private/* \
     ${libdir}/qml/org/kde/plasma/core/* \
     ${libdir}/qml/org/kde/plasma/core/private/* \
     ${libdir}/qml/org/kde/plasma/calendar/* \
     ${libdir}/qml/org/kde/plasma/platformcomponents/* \
     ${libdir}/qml/QtQuick/Controls.2/Plasma/* \
     ${libdir}/qml/QtQuick/Controls.2/Plasma/private/* \
     ${libdir}/qml/QtQuick/Controls/Styles/Plasma/* \
-    ${datadir}/kservices5/*.desktop \
-    ${datadir}/kservicetypes5/*.desktop \
     ${datadir}/plasma/services/*.operations \
     ${datadir}/plasma/desktoptheme/air/* \
     ${datadir}/plasma/desktoptheme/air/*/* \
     ${datadir}/plasma/desktoptheme/breeze-dark/* \
     ${datadir}/plasma/desktoptheme/breeze-dark/*/* \
     ${datadir}/plasma/desktoptheme/breeze-light/* \
     ${datadir}/plasma/desktoptheme/breeze-light/*/* \
     ${datadir}/plasma/desktoptheme/default/* \
     ${datadir}/plasma/desktoptheme/default/*/* \
     ${datadir}/plasma/desktoptheme/oxygen/* \
     ${datadir}/plasma/desktoptheme/oxygen/*/* \
 "
-
-FILES_${PN}-dev += " \
-    ${datadir}/kdevappwizard/templates/* \
-"