diff --git a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java
index 60de2f5d9ec..51373ff7d84 100644
--- a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java
+++ b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java
@@ -183,6 +183,16 @@ public class GCCToolChain extends PlatformObject implements IToolChain {
 			addDiscoveryOptions(commandLine);
 			commandLine.addAll(commandStrings.subList(1, commandStrings.size()));
 
+			// Strip quotes from the args on Windows
+			if (Platform.OS_WIN32.equals(Platform.getOS())) {
+				for (int i = 0; i < commandLine.size(); i++) {
+					String arg = commandLine.get(i);
+					if (arg.contains("\"")) { //$NON-NLS-1$
+						commandLine.set(i, arg.replaceAll("\"", "")); //$NON-NLS-1$ //$NON-NLS-2$
+					}
+				}
+			}
+
 			// Change output to stdout
 			boolean haveOut = false;
 			for (int i = 0; i < commandLine.size() - 1; ++i) {
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/.settings/.api_filters b/jtag/org.eclipse.cdt.debug.gdbjtag.core/.settings/.api_filters
deleted file mode 100644
index 697d2241993..00000000000
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/.settings/.api_filters
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.cdt.debug.gdbjtag.core" version="2">
-    <resource path="src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/extensions/GDBJtagControl_HEAD.java" type="org.eclipse.cdt.debug.gdbjtag.core.dsf.gdb.service.extensions.GDBJtagControl_HEAD">
-        <filter comment="This change is understood and will not break the API" id="338849923">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.debug.gdbjtag.core.dsf.gdb.service.extensions.GDBJtagControl_HEAD"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>