diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/META-INF/MANIFEST.MF
index 4fdc56b39..efe6c0529 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.embedcdt.internal.managedbuild.cross.arm.core.Acti
 Require-Bundle: org.eclipse.embedcdt.core;bundle-version="6.3.1",
  org.eclipse.embedcdt.managedbuild.cross.core;bundle-version="2.1.0",
  org.eclipse.cdt.core;bundle-version="7.0.0",
- org.eclipse.cdt.managedbuilder.core;bundle-version="9.0.0",
+ org.eclipse.cdt.managedbuilder.core;bundle-version="9.5.0",
  org.eclipse.core.expressions;bundle-version="3.7.0",
  org.eclipse.core.resources;bundle-version="3.13.800",
  org.eclipse.core.runtime;bundle-version="3.19.0"
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.xml b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.xml
index cac982ce7..f8ee90abd 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.xml
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.xml
@@ -3614,7 +3614,7 @@
 			class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector"
 			id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector"
 			name="%GCCBuiltinSpecsDetector.name"
-			parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD "${INPUTS}""
+			parameter="${COMMAND} ${ALL_FLAGS} ${cross_toolchain_flags} -E -P -v -dD "${INPUTS}""
 			prefer-non-shared="true">
 			<language-scope id="org.eclipse.cdt.core.gcc">
 			</language-scope>
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/META-INF/MANIFEST.MF
index 55959f063..d3b934e3a 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.embedcdt.core;bundle-version="6.3.1",
  org.eclipse.embedcdt.debug.core;bundle-version="2.0.0",
  org.eclipse.embedcdt.managedbuild.cross.core;bundle-version="2.1.0",
  org.eclipse.cdt.core;bundle-version="7.0.0",
- org.eclipse.cdt.managedbuilder.core;bundle-version="9.0.0",
+ org.eclipse.cdt.managedbuilder.core;bundle-version="9.5.0",
  org.eclipse.core.expressions;bundle-version="3.7.0",
  org.eclipse.core.resources;bundle-version="3.13.800",
  org.eclipse.core.runtime;bundle-version="3.19.0",
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/plugin.xml b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/plugin.xml
index 007090cf9..f983038a5 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/plugin.xml
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/plugin.xml
@@ -2529,7 +2529,7 @@
 			class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector"
 			id="org.eclipse.embedcdt.managedbuild.cross.riscv.core.GCCBuiltinSpecsDetector"
 			name="%GCCBuiltinSpecsDetector.name"
-			parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;"
+			parameter="${COMMAND} ${ALL_FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;"
 			prefer-non-shared="true">
 			<language-scope id="org.eclipse.cdt.core.gcc">
 			</language-scope>