diff --git a/local/recipes/kde/sddm/wayland-patch.sh b/local/recipes/kde/sddm/wayland-patch.sh
index f2390b4e6e..967a18e4a9 100755
--- a/local/recipes/kde/sddm/wayland-patch.sh
+++ b/local/recipes/kde/sddm/wayland-patch.sh
@@ -17,8 +17,8 @@ sed -i 's/find_package(XCB)/# Wayland-only: XCB not needed/' "$CMAKE"
 
 for cmakelists in "$SRC/src/daemon/CMakeLists.txt" "$SRC/src/helper/CMakeLists.txt" "$SRC/src/greeter/CMakeLists.txt"; do
     if [ -f "$cmakelists" ]; then
-        sed -i 's/"\${LIBXCB_INCLUDE_DIR}"/# Wayland-only: XCB not needed/' "$cmakelists"
-        sed -i 's/\${LIBXCB_LIBRARIES}/# Wayland-only: XCB not needed/' "$cmakelists"
+        sed -i 's/"\${LIBXCB_INCLUDE_DIR}"//' "$cmakelists"
+        sed -i 's/\${LIBXCB_LIBRARIES}//' "$cmakelists"
     fi
 done
 
diff --git a/local/scripts/lib/qt-sysroot.sh b/local/scripts/lib/qt-sysroot.sh
index ddb565894a..5c31aa064d 100644
--- a/local/scripts/lib/qt-sysroot.sh
+++ b/local/scripts/lib/qt-sysroot.sh
@@ -155,9 +155,14 @@ redbear_qt_ensure_dep_sysroots() {
             if [ -L "${dep_sysroot}/lib" ] || [ -e "${dep_sysroot}/lib" ]; then
                 rm -rf "${dep_sysroot}/lib"
             fi
-            mkdir -p "${dep_sysroot}"
-            ln -sf "${sysroot}/usr/include" "${dep_sysroot}/include"
-            ln -sf "${sysroot}/usr/lib" "${dep_sysroot}/lib"
+            local dep_target_dir dep_stage_usr
+            dep_target_dir=$(dirname "${dep_sysroot}")
+            dep_stage_usr="${dep_target_dir}/stage/usr"
+            if [ -d "${dep_stage_usr}/include" ]; then
+                mkdir -p "${dep_sysroot}"
+                ln -sf "${dep_stage_usr}/include" "${dep_sysroot}/include"
+                ln -sf "${dep_stage_usr}/lib" "${dep_sysroot}/lib"
+            fi
         fi
     done
 }