diff --git a/core/org.eclipse.cdt.core/.settings/.api_filters b/core/org.eclipse.cdt.core/.settings/.api_filters
index 8d6092ca993..a05364d729a 100644
--- a/core/org.eclipse.cdt.core/.settings/.api_filters
+++ b/core/org.eclipse.cdt.core/.settings/.api_filters
@@ -1,29 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <component id="org.eclipse.cdt.core" version="2">
-    <resource path="META-INF/MANIFEST.MF">
-        <filter comment="Ignore warning for accidental increment of version number." id="931135546">
-            <message_arguments>
-                <message_argument value="7.1.100"/>
-                <message_argument value="7.0.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.cdt.core.dom.ast.cpp.ICPPASTDeductionGuide">
-        <filter comment="Bug 567261: This API was backed out and is believed to not be in use so the API breakage is unlikely" id="305324134">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.core.dom.ast.cpp.ICPPASTDeductionGuide"/>
-                <message_argument value="org.eclipse.cdt.core_7.1.100"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.cdt.core.dom.ast.cpp.ICPPASTParameterListOwner">
-        <filter comment="Bug 567261: This API was backed out and is believed to not be in use so the API breakage is unlikely" id="305324134">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.core.dom.ast.cpp.ICPPASTParameterListOwner"/>
-                <message_argument value="org.eclipse.cdt.core_7.1.100"/>
-            </message_arguments>
-        </filter>
-    </resource>
     <resource path="browser/org/eclipse/cdt/core/browser/IndexTypeInfo.java" type="org.eclipse.cdt.core.browser.IndexTypeInfo">
         <filter comment="Squash over zealous warning from PDE. See Bug 558477" id="576725006">
             <message_arguments>
@@ -110,22 +86,6 @@
             </message_arguments>
         </filter>
     </resource>
-    <resource path="parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFunctionDeclarator.java" type="org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFunctionDeclarator">
-        <filter comment="asdf" id="404791350">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFunctionDeclarator"/>
-                <message_argument value="org.eclipse.cdt.core.dom.ast.cpp.ICPPASTParameterListOwner"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFunctionTryBlockDeclarator.java" type="org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFunctionTryBlockDeclarator">
-        <filter comment="asdf" id="404791350">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFunctionTryBlockDeclarator"/>
-                <message_argument value="org.eclipse.cdt.core.dom.ast.cpp.ICPPASTParameterListOwner"/>
-            </message_arguments>
-        </filter>
-    </resource>
     <resource path="parser/org/eclipse/cdt/core/dom/parser/AbstractScannerExtensionConfiguration.java" type="org.eclipse.cdt.core.dom.parser.AbstractScannerExtensionConfiguration">
         <filter comment="Squash over zealous warning from PDE. See Bug 558477" id="576725006">
             <message_arguments>
@@ -222,34 +182,6 @@
             </message_arguments>
         </filter>
     </resource>
-    <resource path="src/org/eclipse/cdt/core/formatter/DefaultCodeFormatterConstants.java" type="org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants">
-        <filter comment="asdf" id="338755678">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants"/>
-                <message_argument value="FORMATTER_INSERT_SPACE_AFTER_DEDUCTION_GUIDE_ARROW"/>
-            </message_arguments>
-        </filter>
-        <filter comment="asdf" id="338755678">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants"/>
-                <message_argument value="FORMATTER_INSERT_SPACE_BEFORE_DEDUCTION_GUIDE_ARROW"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/core/formatter/DefaultCodeFormatterOptions.java" type="org.eclipse.cdt.core.formatter.DefaultCodeFormatterOptions">
-        <filter comment="asdf" id="338755678">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.core.formatter.DefaultCodeFormatterOptions"/>
-                <message_argument value="insert_space_after_deduction_guide_arrow"/>
-            </message_arguments>
-        </filter>
-        <filter comment="asdf" id="338755678">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.core.formatter.DefaultCodeFormatterOptions"/>
-                <message_argument value="insert_space_before_deduction_guide_arrow"/>
-            </message_arguments>
-        </filter>
-    </resource>
     <resource path="utils/org/eclipse/cdt/utils/DefaultCygwinToolFactory.java" type="org.eclipse.cdt.utils.DefaultCygwinToolFactory">
         <filter comment="Squash over zealous warning from PDE. See Bug 558477" id="576725006">
             <message_arguments>
diff --git a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
index 0dd04080bf5..377ca620f10 100644
--- a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.core; singleton:=true
-Bundle-Version: 7.1.100.qualifier
+Bundle-Version: 7.1.200.qualifier
 Bundle-Activator: org.eclipse.cdt.core.CCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/dsf/org.eclipse.cdt.dsf/.settings/.api_filters b/dsf/org.eclipse.cdt.dsf/.settings/.api_filters
index a77dda86506..6e6cecefbf7 100644
--- a/dsf/org.eclipse.cdt.dsf/.settings/.api_filters
+++ b/dsf/org.eclipse.cdt.dsf/.settings/.api_filters
@@ -22,12 +22,4 @@
             </message_arguments>
         </filter>
     </resource>
-    <resource path="src/org/eclipse/cdt/dsf/debug/service/command/ICommandControlService.java" type="org.eclipse.cdt.dsf.debug.service.command.ICommandControlService">
-        <filter comment="CDT allows new default methods that are unlikely to conflict" id="404000815">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.dsf.debug.service.command.ICommandControlService"/>
-                <message_argument value="flushAllCachesAndRefresh(RequestMonitor)"/>
-            </message_arguments>
-        </filter>
-    </resource>
 </component>
diff --git a/dsf/org.eclipse.cdt.dsf/META-INF/MANIFEST.MF b/dsf/org.eclipse.cdt.dsf/META-INF/MANIFEST.MF
index 5ca664bed4b..9c53df588c2 100644
--- a/dsf/org.eclipse.cdt.dsf/META-INF/MANIFEST.MF
+++ b/dsf/org.eclipse.cdt.dsf/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.cdt.dsf;singleton:=true
-Bundle-Version: 2.10.0.qualifier
+Bundle-Version: 2.10.100.qualifier
 Bundle-Activator: org.eclipse.cdt.dsf.internal.DsfPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
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 c2e639b518e..00000000000
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/.settings/.api_filters
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.cdt.debug.gdbjtag.core" version="2">
-    <resource path="META-INF/MANIFEST.MF">
-        <filter comment="Ignore warning for accidental increment of version number." id="926941240">
-            <message_arguments>
-                <message_argument value="10.1.0"/>
-                <message_argument value="10.0.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF b/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF
index 1712c80faae..84af4414ce2 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.debug.gdbjtag.core;singleton:=true
-Bundle-Version: 10.2.0.qualifier
+Bundle-Version: 10.2.100.qualifier
 Bundle-Activator: org.eclipse.cdt.debug.gdbjtag.core.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/launch/org.eclipse.cdt.launch/.settings/.api_filters b/launch/org.eclipse.cdt.launch/.settings/.api_filters
deleted file mode 100644
index 2431564c13c..00000000000
--- a/launch/org.eclipse.cdt.launch/.settings/.api_filters
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.cdt.launch" version="2">
-    <resource path="META-INF/MANIFEST.MF">
-        <filter comment="Ignore warning for accidental increment of version number." id="926941240">
-            <message_arguments>
-                <message_argument value="10.1.0"/>
-                <message_argument value="10.0.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF b/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF
index 0ff2b473d4f..c5adb8958de 100644
--- a/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF
+++ b/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.launch; singleton:=true
-Bundle-Version: 10.2.0.qualifier
+Bundle-Version: 10.2.100.qualifier
 Bundle-Activator: org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/qt/org.eclipse.cdt.qt.core/.settings/.api_filters b/qt/org.eclipse.cdt.qt.core/.settings/.api_filters
deleted file mode 100644
index b7f2c7cf936..00000000000
--- a/qt/org.eclipse.cdt.qt.core/.settings/.api_filters
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.cdt.qt.core" version="2">
-    <resource path="src/org/eclipse/cdt/qt/core/IQMLAnalyzer.java" type="org.eclipse.cdt.qt.core.IQMLAnalyzer">
-        <filter id="404000815">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.qt.core.IQMLAnalyzer"/>
-                <message_argument value="isSupported()"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF b/qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF
index a4f9e96dd4e..832c46236ec 100644
--- a/qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF
+++ b/qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.qt.core;singleton:=true
-Bundle-Version: 2.3.100.qualifier
+Bundle-Version: 2.3.200.qualifier
 Bundle-Activator: org.eclipse.cdt.internal.qt.core.Activator
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,