diff --git a/classes/cmake_kf5.bbclass b/classes/cmake_kf5.bbclass
index d2ac51c..87f047b 100644
--- a/classes/cmake_kf5.bbclass
+++ b/classes/cmake_kf5.bbclass
@@ -1,28 +1,33 @@
 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 \
+"
+
 FILES_${PN}-dev += " \
+    ${datadir}/dbus-1/interfaces/*.xml \
     ${libdir}/cmake/KF5*/*.cmake \
     ${prefix}/mkspecs/modules/qt_*.pri \
 "
diff --git a/recipes-kf5/tier2/kjobwidgets.inc b/recipes-kf5/tier2/kjobwidgets.inc
index 273cc74..d038268 100644
--- a/recipes-kf5/tier2/kjobwidgets.inc
+++ b/recipes-kf5/tier2/kjobwidgets.inc
@@ -1,17 +1,13 @@
 DESCRIPTION = "KJobWidgets"
 HOMEPAGE = "https://api.kde.org/frameworks/kjobwidgets/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = "qtbase kcoreaddons kwidgetsaddons"
 
 SRC_URI = "git://anongit.kde.org/kjobwidgets;nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
-
-FILES_${PN} += " \
-    ${datadir}/dbus-1/interfaces/*.xml \
-"
diff --git a/recipes-kf5/tier2/knotifications.inc b/recipes-kf5/tier2/knotifications.inc
index 385db14..23bf694 100644
--- a/recipes-kf5/tier2/knotifications.inc
+++ b/recipes-kf5/tier2/knotifications.inc
@@ -1,21 +1,17 @@
 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 \
 "
-
-FILES_${PN}-dev += " \
-    ${datadir}/dbus-1/interfaces/*.xml \
-"
diff --git a/recipes-kf5/tier3/baloo.inc b/recipes-kf5/tier3/baloo.inc
index bca9531..7c30b1d 100644
--- a/recipes-kf5/tier3/baloo.inc
+++ b/recipes-kf5/tier3/baloo.inc
@@ -1,40 +1,36 @@
 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 \
 "
-
-FILES_${PN}-dev += " \
-    ${datadir}/dbus-1/interfaces/*.xml \
-"
diff --git a/recipes-kf5/tier3/kded.inc b/recipes-kf5/tier3/kded.inc
index 139a088..1894280 100644
--- a/recipes-kf5/tier3/kded.inc
+++ b/recipes-kf5/tier3/kded.inc
@@ -1,33 +1,31 @@
 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}/dbus-1/services/*.service \
     ${datadir}/kservicetypes5/*.desktop \
 "
 
 FILES_${PN}-dev += " \
     ${libdir}/cmake/KDED/*.cmake \
-    ${datadir}/dbus-1/interfaces/*.xml \
 "
diff --git a/recipes-kf5/tier3/kglobalaccel.inc b/recipes-kf5/tier3/kglobalaccel.inc
index 58f7e6a..f21cb2b 100644
--- a/recipes-kf5/tier3/kglobalaccel.inc
+++ b/recipes-kf5/tier3/kglobalaccel.inc
@@ -1,29 +1,24 @@
 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}-dev += " \
-    ${datadir}/dbus-1/interfaces/kf5_org.*.xml \
-"
-
 FILES_${PN} += " \
-    ${datadir}/dbus-1/services/org.kde.kglobalaccel.service \
     ${datadir}/kservices5/kglobalaccel5.desktop \
 "
diff --git a/recipes-kf5/tier3/kinit.inc b/recipes-kf5/tier3/kinit.inc
index bb73b25..f76e722 100644
--- a/recipes-kf5/tier3/kinit.inc
+++ b/recipes-kf5/tier3/kinit.inc
@@ -1,34 +1,33 @@
 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 \
-    ${datadir}/dbus-1/interfaces/*.xml \
 "
diff --git a/recipes-kf5/tier3/kio.inc b/recipes-kf5/tier3/kio.inc
index b45f894..62d2017 100644
--- a/recipes-kf5/tier3/kio.inc
+++ b/recipes-kf5/tier3/kio.inc
@@ -1,51 +1,46 @@
 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}/dbus-1/services/*.service \
     ${datadir}/kf5/kcookiejar/domain_info \
 "
-
-FILES_${PN}-dev += " \
-    ${datadir}/dbus-1/interfaces/*.xml \
-"
diff --git a/recipes-kf5/tier3/krunner.inc b/recipes-kf5/tier3/krunner.inc
index 452f367..747d24b 100644
--- a/recipes-kf5/tier3/krunner.inc
+++ b/recipes-kf5/tier3/krunner.inc
@@ -1,35 +1,34 @@
 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/* \
-    ${datadir}/dbus-1/interfaces/*.xml \
 "
diff --git a/recipes-kf5/tier3/kwallet.inc b/recipes-kf5/tier3/kwallet.inc
index 7f17642..690e35d 100644
--- a/recipes-kf5/tier3/kwallet.inc
+++ b/recipes-kf5/tier3/kwallet.inc
@@ -1,39 +1,34 @@
 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 \
-    ${datadir}/dbus-1/services/*.service \
-"
-
-FILES_${PN}-dev += " \
-    ${datadir}/dbus-1/interfaces/*.xml \
 "