diff --git a/qbs/modules/buildconfig/buildconfig.qbs b/qbs/modules/buildconfig/buildconfig.qbs
index 325f8ca1a..8d7a93ba5 100644
--- a/qbs/modules/buildconfig/buildconfig.qbs
+++ b/qbs/modules/buildconfig/buildconfig.qbs
@@ -813,7 +813,21 @@ Module {
         cpp.systemIncludePaths: {
             var paths = [FileInfo.joinPaths(product.buildDirectory, "qt.headers")];
 
-            if (Utilities.versionCompare(qbs.version, "1.22") < 0) {
+            if (Utilities.versionCompare(Qt.core.version, "6") >= 0 && !useConanPackages)
+            {
+                var includePaths = product.cpp.includePaths;
+
+                for(var i = 0; i < includePaths.length; i++)
+                {
+                    if (includePaths[i].includes("xerces-c"))
+                    {
+                        paths.push(includePaths[i]);
+                    }
+                }
+            }
+
+            if (Utilities.versionCompare(qbs.version, "1.22") < 0)
+            {
                 var qtLibs = [
                     "QtCore",
                     "QtSvg",
diff --git a/src/app/tape/tape.qbs b/src/app/tape/tape.qbs
index eb5403b01..58a4809e4 100644
--- a/src/app/tape/tape.qbs
+++ b/src/app/tape/tape.qbs
@@ -15,7 +15,16 @@ VToolApp {
     Depends { name: "ebr" }
     Depends { name: "multibundle"; }
     Depends { name: "VGAnalyticsLib" }
-    Depends { name: "conan.XercesC"; condition: buildconfig.useConanPackages }
+
+    Depends {
+        name: "xerces-c";
+        condition: Utilities.versionCompare(Qt.core.version, "6") >= 0 && !buildconfig.useConanPackages
+    }
+
+    Depends {
+        name: "conan.XercesC";
+        condition: Utilities.versionCompare(Qt.core.version, "6") >= 0 && buildconfig.useConanPackages
+    }
 
     name: "Tape"
     buildconfig.appTarget: qbs.targetOS.contains("macos") ? "Tape" : "tape"
diff --git a/src/libs/ifc/ifc.qbs b/src/libs/ifc/ifc.qbs
index b889a77d6..84f01269d 100644
--- a/src/libs/ifc/ifc.qbs
+++ b/src/libs/ifc/ifc.qbs
@@ -98,9 +98,10 @@ VLib {
 
     Export {
         Depends { name: "cpp" }
-        Depends { name: "Qt"; submodules: ["xml"] }
+        Depends { name: "Qt"; submodules: ["core", "xml"] }
         Depends { name: "VMiscLib" }
-        Depends { name: "conan.XercesC"; condition: buildconfig.useConanPackages }
+        Depends { name: "xerces-c"; condition: Utilities.versionCompare(Qt.core.version, "6") >= 0 && !buildconfig.useConanPackages }
+        Depends { name: "conan.XercesC"; condition: Utilities.versionCompare(Qt.core.version, "6") >= 0 && buildconfig.useConanPackages }
         cpp.includePaths: [exportingProduct.sourceDirectory]
     }
 }