diff --git a/recipes-kde/packagegroups/kde-apps-world.bb b/recipes-kde/packagegroups/kde-apps-world.bb
index fc44e359..bb47fd6e 100644
--- a/recipes-kde/packagegroups/kde-apps-world.bb
+++ b/recipes-kde/packagegroups/kde-apps-world.bb
@@ -2,7 +2,7 @@ SUMMARY = "All KDE applications packages - just for build test"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690"
 
-inherit packagegroup distro_features_check
+inherit packagegroup
 
 RDEPENDS_${PN} = " \
     filelight \
diff --git a/recipes-kde/packagegroups/kf5-world.bb b/recipes-kde/packagegroups/kf5-world.bb
index d481f3d0..b4742d16 100644
--- a/recipes-kde/packagegroups/kf5-world.bb
+++ b/recipes-kde/packagegroups/kf5-world.bb
@@ -2,7 +2,7 @@ SUMMARY = "All KF5 packages - just for build test"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690"
 
-inherit packagegroup distro_features_check
+inherit packagegroup
 
 TIER_1 = " \
     attica \
diff --git a/recipes-kde/packagegroups/plasma-world.bb b/recipes-kde/packagegroups/plasma-world.bb
index ce440e13..2c36ce91 100644
--- a/recipes-kde/packagegroups/plasma-world.bb
+++ b/recipes-kde/packagegroups/plasma-world.bb
@@ -2,7 +2,7 @@ SUMMARY = "All KF5 packages - just for build test"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690"
 
-inherit packagegroup distro_features_check
+inherit packagegroup
 
 TIER_1 = " \
     bluez-qt \
@@ -45,7 +45,7 @@ UNTIER = " \
     plasma-nm \
     plasma-workspace-wallpapers \
     polkit-kde-agent-1 \
-    powerdevil \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "powerdevil", "",d)} \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "sddm-kcm", "",d)} \
     systemsettings \
 "
diff --git a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
index 3f396195..f7651a20 100644
--- a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
+++ b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
@@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
 "
 
-inherit kde-plasma cmake-lib
+REQUIRED_DISTRO_FEATURES = "x11"
+
+inherit kde-plasma cmake-lib distro_features_check
 
 DEPENDS += " \
     baloo \
diff --git a/recipes-kde/plasma/untier/kde-gtk-config/kde-gtk-config.bb b/recipes-kde/plasma/untier/kde-gtk-config/kde-gtk-config.bb
index c92ed73e..3a31cbce 100644
--- a/recipes-kde/plasma/untier/kde-gtk-config/kde-gtk-config.bb
+++ b/recipes-kde/plasma/untier/kde-gtk-config/kde-gtk-config.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-inherit kde-plasma
+inherit kde-plasma distro_features_check
 
 DEPENDS += " \
     gtk+3 \
diff --git a/recipes-kde/plasma/untier/khotkeys/khotkeys.bb b/recipes-kde/plasma/untier/khotkeys/khotkeys.bb
index 7c804460..5dd2cbd2 100644
--- a/recipes-kde/plasma/untier/khotkeys/khotkeys.bb
+++ b/recipes-kde/plasma/untier/khotkeys/khotkeys.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-inherit kde-plasma
+inherit kde-plasma distro_features_check
 
 DEPENDS += " \
     kglobalaccel \
diff --git a/recipes-kde/plasma/untier/kwin/kwin.bb b/recipes-kde/plasma/untier/kwin/kwin.bb
index 381ca70c..71ee99fa 100644
--- a/recipes-kde/plasma/untier/kwin/kwin.bb
+++ b/recipes-kde/plasma/untier/kwin/kwin.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-inherit kde-plasma
+inherit kde-plasma distro_features_check
 
 DEPENDS += " \
 	kconfig \
diff --git a/recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb b/recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb
index 7c4b548e..e5b323ae 100644
--- a/recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb
+++ b/recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-inherit kde-plasma
+inherit kde-plasma distro_features_check
 
 DEPENDS += " \
     kcoreaddons \