diff --git a/build/org.eclipse.cdt.make.core/.settings/.api_filters b/build/org.eclipse.cdt.make.core/.settings/.api_filters
deleted file mode 100644
index b0fd282cb0d..00000000000
--- a/build/org.eclipse.cdt.make.core/.settings/.api_filters
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.cdt.make.core" version="2">
-    <resource path="src/org/eclipse/cdt/make/core/MakeCorePlugin.java" type="org.eclipse.cdt.make.core.MakeCorePlugin">
-        <filter id="388194388">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.make.core.MakeCorePlugin"/>
-                <message_argument value="MAKEFILE_DIRS"/>
-                <message_argument value="org.eclipse.cdt.make.coreeditor_makefile_dirs"/>
-            </message_arguments>
-        </filter>
-        <filter id="388194388">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.make.core.MakeCorePlugin"/>
-                <message_argument value="MAKEFILE_STYLE"/>
-                <message_argument value="org.eclipse.cdt.make.coreeditor_makefile_style"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/codan/org.eclipse.cdt.codan.core/.settings/.api_filters b/codan/org.eclipse.cdt.codan.core/.settings/.api_filters
deleted file mode 100644
index 2133a51480f..00000000000
--- a/codan/org.eclipse.cdt.codan.core/.settings/.api_filters
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.cdt.codan.core" version="2">
-    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.cdt.codan.core.Messages">
-        <filter id="305324134">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.codan.core.Messages"/>
-                <message_argument value="org.eclipse.cdt.codan.core_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/core/org.eclipse.cdt.ui/.settings/.api_filters b/core/org.eclipse.cdt.ui/.settings/.api_filters
deleted file mode 100644
index 792064e6a14..00000000000
--- a/core/org.eclipse.cdt.ui/.settings/.api_filters
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.cdt.ui" version="2">
-    <resource path="src/org/eclipse/cdt/ui/dialogs/DialogsMessages.java" type="org.eclipse.cdt.ui.dialogs.DialogsMessages">
-        <filter id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.ui.dialogs.DialogsMessages"/>
-                <message_argument value="org.eclipse.cdt.ui_5.7.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/ui/refactoring/actions/Messages.java" type="org.eclipse.cdt.ui.refactoring.actions.Messages">
-        <filter id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.ui.refactoring.actions.Messages"/>
-                <message_argument value="org.eclipse.cdt.ui_5.6.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/debug/org.eclipse.cdt.debug.core/.settings/.api_filters b/debug/org.eclipse.cdt.debug.core/.settings/.api_filters
index b48cbd7bed6..f61833797a8 100644
--- a/debug/org.eclipse.cdt.debug.core/.settings/.api_filters
+++ b/debug/org.eclipse.cdt.debug.core/.settings/.api_filters
@@ -1,78 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <component id="org.eclipse.cdt.debug.core" version="2">
-    <resource path="src/org/eclipse/cdt/debug/core/ICDebugConstants.java" type="org.eclipse.cdt.debug.core.ICDebugConstants">
-        <filter id="403853384">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.debug.core.ICDebugConstants"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/debug/core/model/ICAddressBreakpoint.java" type="org.eclipse.cdt.debug.core.model.ICAddressBreakpoint">
-        <filter comment="Binay backward compatible change." id="403767336">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.debug.core.model.ICAddressBreakpoint"/>
-                <message_argument value="C_ADDRESS_BREAKPOINT_MARKER"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/debug/core/model/ICEventBreakpoint.java" type="org.eclipse.cdt.debug.core.model.ICEventBreakpoint">
-        <filter comment="Binary backward compatible change." id="403767336">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.debug.core.model.ICEventBreakpoint"/>
-                <message_argument value="C_EVENT_BREAKPOINT_MARKER"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/debug/core/model/ICFunctionBreakpoint.java" type="org.eclipse.cdt.debug.core.model.ICFunctionBreakpoint">
-        <filter comment="Binay backward compatible change." id="403767336">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.debug.core.model.ICFunctionBreakpoint"/>
-                <message_argument value="C_FUNCTION_BREAKPOINT_MARKER"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/debug/core/model/ICLineBreakpoint.java" type="org.eclipse.cdt.debug.core.model.ICLineBreakpoint">
-        <filter id="403767336">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.debug.core.model.ICLineBreakpoint"/>
-                <message_argument value="C_LINE_BREAKPOINT_MARKER"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/debug/core/model/ICTracepoint.java" type="org.eclipse.cdt.debug.core.model.ICTracepoint">
-        <filter comment="Binay backward compatible change." id="403767336">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.debug.core.model.ICTracepoint"/>
-                <message_argument value="C_ADDRESS_TRACEPOINT_MARKER"/>
-            </message_arguments>
-        </filter>
-        <filter comment="Binay backward compatible change." id="403767336">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.debug.core.model.ICTracepoint"/>
-                <message_argument value="C_FUNCTION_TRACEPOINT_MARKER"/>
-            </message_arguments>
-        </filter>
-        <filter comment="Binary backward compatible change." id="403767336">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.debug.core.model.ICTracepoint"/>
-                <message_argument value="C_LINE_TRACEPOINT_MARKER"/>
-            </message_arguments>
-        </filter>
-        <filter comment="Binary backward compatible change." id="403767336">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.debug.core.model.ICTracepoint"/>
-                <message_argument value="C_TRACEPOINT_MARKER"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/debug/core/model/ICWatchpoint.java" type="org.eclipse.cdt.debug.core.model.ICWatchpoint">
-        <filter comment="Binay backward compatible change." id="403767336">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.debug.core.model.ICWatchpoint"/>
-                <message_argument value="C_WATCHPOINT_MARKER"/>
-            </message_arguments>
-        </filter>
-    </resource>
     <resource path="src/org/eclipse/cdt/debug/core/sourcelookup/MappingSourceContainer.java" type="org.eclipse.cdt.debug.core.sourcelookup.MappingSourceContainer">
         <filter id="643846161">
             <message_arguments>
@@ -103,14 +30,6 @@
             </message_arguments>
         </filter>
     </resource>
-    <resource path="src/org/eclipse/cdt/debug/core/sourcelookup/SourceLookupMessages.java" type="org.eclipse.cdt.debug.core.sourcelookup.SourceLookupMessages">
-        <filter comment="SourceLookupMessages class is no longer public." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.debug.core.sourcelookup.SourceLookupMessages"/>
-                <message_argument value="org.eclipse.cdt.debug.core_7.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
     <resource path="src/org/eclipse/cdt/debug/internal/core/DebugStringVariableSubstitutor.java" type="org.eclipse.cdt.debug.internal.core.DebugStringVariableSubstitutor">
         <filter id="574619656">
             <message_arguments>
@@ -127,14 +46,6 @@
             </message_arguments>
         </filter>
     </resource>
-    <resource path="src/org/eclipse/cdt/debug/internal/core/Trace.java" type="org.eclipse.cdt.debug.internal.core.Trace">
-        <filter id="574619656">
-            <message_arguments>
-                <message_argument value="DebugTrace"/>
-                <message_argument value="Trace"/>
-            </message_arguments>
-        </filter>
-    </resource>
     <resource path="src/org/eclipse/cdt/debug/internal/core/srcfinder/CSourceFinder.java" type="org.eclipse.cdt.debug.internal.core.srcfinder.CSourceFinder">
         <filter id="574619656">
             <message_arguments>
diff --git a/debug/org.eclipse.cdt.debug.ui/.settings/.api_filters b/debug/org.eclipse.cdt.debug.ui/.settings/.api_filters
index e8df87ef673..48c6c7be8f5 100644
--- a/debug/org.eclipse.cdt.debug.ui/.settings/.api_filters
+++ b/debug/org.eclipse.cdt.debug.ui/.settings/.api_filters
@@ -9,11 +9,4 @@
             </message_arguments>
         </filter>
     </resource>
-    <resource path="src/org/eclipse/cdt/debug/ui/breakpoints/ICBreakpointsUIContribution.java" type="org.eclipse.cdt.debug.ui.breakpoints.ICBreakpointsUIContribution">
-        <filter comment="@noimplement and @noextend attributes were previously implied in interface declaration." id="403853384">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.debug.ui.breakpoints.ICBreakpointsUIContribution"/>
-            </message_arguments>
-        </filter>
-    </resource>
 </component>
diff --git a/dsf/org.eclipse.cdt.dsf/.settings/.api_filters b/dsf/org.eclipse.cdt.dsf/.settings/.api_filters
deleted file mode 100644
index 4cde327ba3a..00000000000
--- a/dsf/org.eclipse.cdt.dsf/.settings/.api_filters
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.cdt.dsf" version="2">
-    <resource path="src/org/eclipse/cdt/dsf/concurrent/Transaction.java" type="org.eclipse.cdt.dsf.concurrent.Transaction">
-        <filter comment="Utility is not in common use.  I changed erasure type for argument, but at worse this should only cause a warning." id="420679712">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.dsf.concurrent.Transaction.validate(ICache&lt;?&gt;[])"/>
-                <message_argument value="T"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>