diff --git a/classes/cmake_qt5_extra.bbclass b/classes/cmake_qt5_extra.bbclass
new file mode 100644
index 00000000..29c1854a
--- /dev/null
+++ b/classes/cmake_qt5_extra.bbclass
@@ -0,0 +1,5 @@
+inherit cmake_qt5 
+
+EXTRA_OECMAKE += " \
+    -DCMAKE_QT5_EX_PATH_HOST_HEADERS=${STAGING_INCDIR} \
+"
diff --git a/classes/kde-base.bbclass b/classes/kde-base.bbclass
index 5121af4f..d4c69405 100644
--- a/classes/kde-base.bbclass
+++ b/classes/kde-base.bbclass
@@ -17,7 +17,7 @@ ${KDE_MIRROR}	http://kde.c3sl.ufpr.br \n \
 SRC_URI = "${KDE_MIRROR}/stable/${BPN}/${PV}/src/${BPN}-${PV}.tar.xz"
 
 # extra-cmake-modules cause dependent to check for python
-inherit cmake_qt5 cmake_extra_sanity pythonnative
+inherit cmake_qt5_extra cmake_extra_sanity pythonnative
 
 do_compile_prepend() {
     export XDG_DATA_HOME=${STAGING_DATADIR}
@@ -33,7 +33,6 @@ EXTRA_OECMAKE += " \
     -DCMAKE_INSTALL_DBUSINTERFACEDIR=share/dbus-1/interfaces \
     -DKDE_INSTALL_QTPLUGINDIR=${OE_QMAKE_PATH_PLUGINS} \
     -DKDE_INSTALL_QMLDIR=${OE_QMAKE_PATH_QML} \
-    -DKDE_PATH_HOST_HEADERS=${STAGING_INCDIR} \
     -DKDE_PATH_EXTERNAL_HOST_LIBEXECS=${STAGING_LIBEXECDIR_NATIVE} \
     -DKDE_PATH_EXTERNAL_HOST_BINS=${STAGING_BINDIR_NATIVE} \
 "
diff --git a/classes/lxqt.bbclass b/classes/lxqt.bbclass
index 8de070b2..1189c1e4 100644
--- a/classes/lxqt.bbclass
+++ b/classes/lxqt.bbclass
@@ -1,4 +1,4 @@
-inherit cmake_qt5 cmake_extra_sanity
+inherit cmake_qt5_extra cmake_extra_sanity
 
 HOMEPAGE = "http://lxqt.org/"
 
diff --git a/recipes-kde/other/polkit-qt-1/polkit-qt-1_0.112.0.bb b/recipes-kde/other/polkit-qt-1/polkit-qt-1_0.112.0.bb
index 2affc0f1..e9040539 100644
--- a/recipes-kde/other/polkit-qt-1/polkit-qt-1_0.112.0.bb
+++ b/recipes-kde/other/polkit-qt-1/polkit-qt-1_0.112.0.bb
@@ -12,5 +12,5 @@ SRC_URI[sha256sum] = "67fb03bf6ca3e0bdbd98d374dfb5b1651a07d17ae6c23e11a81b4b0844
 
 CMAKE_ALIGN_SYSROOT[1] = "PolkitQt5-1, -S${libdir}, -s${OE_QMAKE_PATH_HOST_LIBS}/"
 CMAKE_ALIGN_SYSROOT[2] = "PolkitQt5-1, -s${POLKITQT-1_LIB_DIR}, -s${OE_QMAKE_PATH_HOST_LIBS}"
-CMAKE_ALIGN_SYSROOT[3] = "PolkitQt5-1, -S${includedir}, -s${KDE_PATH_HOST_HEADERS}"
-CMAKE_ALIGN_SYSROOT[4] = "PolkitQt5-1, -s${PACKAGE_PREFIX_DIR}/include, -s${KDE_PATH_HOST_HEADERS}"
+CMAKE_ALIGN_SYSROOT[3] = "PolkitQt5-1, -S${includedir}, -s${CMAKE_QT5_EX_PATH_HOST_HEADERS}"
+CMAKE_ALIGN_SYSROOT[4] = "PolkitQt5-1, -s${PACKAGE_PREFIX_DIR}/include, -s${CMAKE_QT5_EX_PATH_HOST_HEADERS}"
diff --git a/recipes-kde/other/qca/qca_2.1.1.bb b/recipes-kde/other/qca/qca_2.1.1.bb
index e8314dd2..68b13096 100644
--- a/recipes-kde/other/qca/qca_2.1.1.bb
+++ b/recipes-kde/other/qca/qca_2.1.1.bb
@@ -27,4 +27,4 @@ EXTRA_OECMAKE += "-DQCA_FEATURE_INSTALL_DIR=${libdir}${QT_DIR_NAME}/mkspecs/feat
 FILES_${PN} += "${libdir}/qca-qt5/crypto"
 
 CMAKE_ALIGN_SYSROOT[1] = "Qca-qt5, -S${libdir}/lib, -s${OE_QMAKE_PATH_HOST_LIBS}/lib"
-CMAKE_ALIGN_SYSROOT[2] = "Qca-qt5, -S${includedir}, -s${KDE_PATH_HOST_HEADERS}"
+CMAKE_ALIGN_SYSROOT[2] = "Qca-qt5, -S${includedir}, -s${CMAKE_QT5_EX_PATH_HOST_HEADERS}"