diff --git a/build/org.eclipse.cdt.autotools.core/.settings/.api_filters b/build/org.eclipse.cdt.autotools.core/.settings/.api_filters
deleted file mode 100644
index 91d8ec36040..00000000000
--- a/build/org.eclipse.cdt.autotools.core/.settings/.api_filters
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.cdt.autotools.core" version="2">
-    <resource path="META-INF/MANIFEST.MF">
-        <filter comment="Bug 561406 - Revise API for CDT Autotools" id="923795461">
-            <message_arguments>
-                <message_argument value="2.1.0"/>
-                <message_argument value="2.0.2"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/core/AutotoolsNewProjectNature.java" type="org.eclipse.cdt.autotools.core.AutotoolsNewProjectNature">
-        <filter comment="Bug 561406 - Revise API for CDT Autotools" id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.core.AutotoolsNewProjectNature"/>
-                <message_argument value="org.eclipse.cdt.autotools.core_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/core/AutotoolsOptionConstants.java" type="org.eclipse.cdt.autotools.core.AutotoolsOptionConstants">
-        <filter comment="Bug 561406 - Revise API for CDT Autotools" id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.core.AutotoolsOptionConstants"/>
-                <message_argument value="org.eclipse.cdt.autotools.core_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/core/AutotoolsPlugin.java" type="org.eclipse.cdt.autotools.core.AutotoolsPlugin">
-        <filter comment="Bug 561406 - Revise API for CDT Autotools" id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.core.AutotoolsPlugin"/>
-                <message_argument value="org.eclipse.cdt.autotools.core_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/core/IAutotoolsOption.java" type="org.eclipse.cdt.autotools.core.IAutotoolsOption">
-        <filter comment="Bug 561406 - Revise API for CDT Autotools" id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.core.IAutotoolsOption"/>
-                <message_argument value="org.eclipse.cdt.autotools.core_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/build/org.eclipse.cdt.autotools.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.autotools.core/META-INF/MANIFEST.MF
index ec909b020c9..8ad430cb6ae 100644
--- a/build/org.eclipse.cdt.autotools.core/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.autotools.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.cdt.autotools.core;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.1.100.qualifier
 Bundle-Activator: org.eclipse.cdt.autotools.core.AutotoolsPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui;bundle-version="3.4.0",
diff --git a/build/org.eclipse.cdt.autotools.ui/.settings/.api_filters b/build/org.eclipse.cdt.autotools.ui/.settings/.api_filters
index 44fa5a372cd..950216df09c 100644
--- a/build/org.eclipse.cdt.autotools.ui/.settings/.api_filters
+++ b/build/org.eclipse.cdt.autotools.ui/.settings/.api_filters
@@ -1,540 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <component id="org.eclipse.cdt.autotools.ui" version="2">
-    <resource path="src/org/eclipse/cdt/autotools/ui/AutotoolsUIPlugin.java" type="org.eclipse.cdt.autotools.ui.AutotoolsUIPlugin">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.AutotoolsUIPlugin"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/AcInitElement.java" type="org.eclipse.cdt.autotools.ui.editors.AcInitElement">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.AcInitElement"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/AutoconfAnnotationHover.java" type="org.eclipse.cdt.autotools.ui.editors.AutoconfAnnotationHover">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.AutoconfAnnotationHover"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java" type="org.eclipse.cdt.autotools.ui.editors.AutoconfCodeScanner">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.AutoconfCodeScanner"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java" type="org.eclipse.cdt.autotools.ui.editors.AutoconfDocumentProvider">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.AutoconfDocumentProvider"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/AutoconfDocumentSetupParticipant.java" type="org.eclipse.cdt.autotools.ui.editors.AutoconfDocumentSetupParticipant">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.AutoconfDocumentSetupParticipant"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java" type="org.eclipse.cdt.autotools.ui.editors.AutoconfEditor">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.AutoconfEditor"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/AutoconfEditorMacroValidator.java" type="org.eclipse.cdt.autotools.ui.editors.AutoconfEditorMacroValidator">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.AutoconfEditorMacroValidator"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.java" type="org.eclipse.cdt.autotools.ui.editors.AutoconfEditorMessages">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.AutoconfEditorMessages"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/AutoconfErrorHandler.java" type="org.eclipse.cdt.autotools.ui.editors.AutoconfErrorHandler">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.AutoconfErrorHandler"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/AutoconfIdentifierRule.java" type="org.eclipse.cdt.autotools.ui.editors.AutoconfIdentifierRule">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.AutoconfIdentifierRule"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/AutoconfKeywordDetector.java" type="org.eclipse.cdt.autotools.ui.editors.AutoconfKeywordDetector">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.AutoconfKeywordDetector"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/AutoconfM4WordDetector.java" type="org.eclipse.cdt.autotools.ui.editors.AutoconfM4WordDetector">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.AutoconfM4WordDetector"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/AutoconfMacro.java" type="org.eclipse.cdt.autotools.ui.editors.AutoconfMacro">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.AutoconfMacro"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/AutoconfMacroCodeScanner.java" type="org.eclipse.cdt.autotools.ui.editors.AutoconfMacroCodeScanner">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.AutoconfMacroCodeScanner"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java" type="org.eclipse.cdt.autotools.ui.editors.AutoconfMacroContentAssistProcessor">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.AutoconfMacroContentAssistProcessor"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java" type="org.eclipse.cdt.autotools.ui.editors.AutoconfMacroDamagerRepairer">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.AutoconfMacroDamagerRepairer"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/AutoconfMacroParameterListValidator.java" type="org.eclipse.cdt.autotools.ui.editors.AutoconfMacroParameterListValidator">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.AutoconfMacroParameterListValidator"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/AutoconfMacroPartitionRule.java" type="org.eclipse.cdt.autotools.ui.editors.AutoconfMacroPartitionRule">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.AutoconfMacroPartitionRule"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/AutoconfMacroProposalContextInformation.java" type="org.eclipse.cdt.autotools.ui.editors.AutoconfMacroProposalContextInformation">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.AutoconfMacroProposalContextInformation"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/AutoconfMacroRule.java" type="org.eclipse.cdt.autotools.ui.editors.AutoconfMacroRule">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.AutoconfMacroRule"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/AutoconfMacroWordDetector.java" type="org.eclipse.cdt.autotools.ui.editors.AutoconfMacroWordDetector">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.AutoconfMacroWordDetector"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/AutoconfPKGWordDetector.java" type="org.eclipse.cdt.autotools.ui.editors.AutoconfPKGWordDetector">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.AutoconfPKGWordDetector"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/AutoconfPartitionScanner.java" type="org.eclipse.cdt.autotools.ui.editors.AutoconfPartitionScanner">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.AutoconfPartitionScanner"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/AutoconfPartitioner.java" type="org.eclipse.cdt.autotools.ui.editors.AutoconfPartitioner">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.AutoconfPartitioner"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/AutoconfReconcilingStrategy.java" type="org.eclipse.cdt.autotools.ui.editors.AutoconfReconcilingStrategy">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.AutoconfReconcilingStrategy"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java" type="org.eclipse.cdt.autotools.ui.editors.AutoconfSourceViewerConfiguration">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.AutoconfSourceViewerConfiguration"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/AutoconfWhitespaceDetector.java" type="org.eclipse.cdt.autotools.ui.editors.AutoconfWhitespaceDetector">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.AutoconfWhitespaceDetector"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/AutoconfWordDetector.java" type="org.eclipse.cdt.autotools.ui.editors.AutoconfWordDetector">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.AutoconfWordDetector"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/IAutotoolEditorActionDefinitionIds.java" type="org.eclipse.cdt.autotools.ui.editors.IAutotoolEditorActionDefinitionIds">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.IAutotoolEditorActionDefinitionIds"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/IAutotoolHelpContextIds.java" type="org.eclipse.cdt.autotools.ui.editors.IAutotoolHelpContextIds">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.IAutotoolHelpContextIds"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/IAutotoolsEditor.java" type="org.eclipse.cdt.autotools.ui.editors.IAutotoolsEditor">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.IAutotoolsEditor"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="IReconcilingParticipant"/>
-                <message_argument value="IAutotoolsEditor"/>
-                <message_argument value="addReconcilingParticipant(IReconcilingParticipant)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/InlineDataRule.java" type="org.eclipse.cdt.autotools.ui.editors.InlineDataRule">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.InlineDataRule"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/MultilineRuleDamagerRepairer.java" type="org.eclipse.cdt.autotools.ui.editors.MultilineRuleDamagerRepairer">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.MultilineRuleDamagerRepairer"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/ParseException.java" type="org.eclipse.cdt.autotools.ui.editors.ParseException">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.ParseException"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/RecursiveSingleLineRule.java" type="org.eclipse.cdt.autotools.ui.editors.RecursiveSingleLineRule">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.RecursiveSingleLineRule"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/RestrictedEndOfLineRule.java" type="org.eclipse.cdt.autotools.ui.editors.RestrictedEndOfLineRule">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.RestrictedEndOfLineRule"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage.java" type="org.eclipse.cdt.autotools.ui.editors.outline.AutoconfContentOutlinePage">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.outline.AutoconfContentOutlinePage"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/outline/AutoconfContentProvider.java" type="org.eclipse.cdt.autotools.ui.editors.outline.AutoconfContentProvider">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.outline.AutoconfContentProvider"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/outline/AutoconfLabelProvider.java" type="org.eclipse.cdt.autotools.ui.editors.outline.AutoconfLabelProvider">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.outline.AutoconfLabelProvider"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfCaseConditionElement.java" type="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfCaseConditionElement">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfCaseConditionElement"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfCaseElement.java" type="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfCaseElement">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfCaseElement"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfElement.java" type="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfElement">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfElement"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfElifElement.java" type="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfElifElement">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfElifElement"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfElseElement.java" type="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfElseElement">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfElseElement"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfForElement.java" type="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfForElement">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfForElement"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfIfElement.java" type="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfIfElement">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfIfElement"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfMacroArgumentElement.java" type="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfMacroArgumentElement">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfMacroArgumentElement"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfMacroDetector.java" type="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfMacroDetector">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfMacroDetector"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfMacroElement.java" type="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfMacroElement">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfMacroElement"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfOutlineErrorHandler.java" type="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfOutlineErrorHandler">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfOutlineErrorHandler"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfParser.java" type="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfParser">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfParser"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfRootElement.java" type="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfRootElement">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfRootElement"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfSelectElement.java" type="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfSelectElement">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfSelectElement"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfTokenizer.java" type="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfTokenizer">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfTokenizer"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfUntilElement.java" type="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfUntilElement">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfUntilElement"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfWhileElement.java" type="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfWhileElement">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.parser.AutoconfWhileElement"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/parser/IAutoconfErrorHandler.java" type="org.eclipse.cdt.autotools.ui.editors.parser.IAutoconfErrorHandler">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.parser.IAutoconfErrorHandler"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/parser/IAutoconfMacroDetector.java" type="org.eclipse.cdt.autotools.ui.editors.parser.IAutoconfMacroDetector">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.parser.IAutoconfMacroDetector"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/parser/IAutoconfMacroValidator.java" type="org.eclipse.cdt.autotools.ui.editors.parser.IAutoconfMacroValidator">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.parser.IAutoconfMacroValidator"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/parser/IMacroDetector.java" type="org.eclipse.cdt.autotools.ui.editors.parser.IMacroDetector">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.parser.IMacroDetector"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/parser/ITokenConstants.java" type="org.eclipse.cdt.autotools.ui.editors.parser.ITokenConstants">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.parser.ITokenConstants"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/parser/InvalidMacroArgumentException.java" type="org.eclipse.cdt.autotools.ui.editors.parser.InvalidMacroArgumentException">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.parser.InvalidMacroArgumentException"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/parser/InvalidMacroException.java" type="org.eclipse.cdt.autotools.ui.editors.parser.InvalidMacroException">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.parser.InvalidMacroException"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/parser/ParseException.java" type="org.eclipse.cdt.autotools.ui.editors.parser.ParseException">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.parser.ParseException"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/autotools/ui/editors/parser/Token.java" type="org.eclipse.cdt.autotools.ui.editors.parser.Token">
-        <filter comment="Bug 561406 - internalize classes that wasn't ever supposed to be public API." id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.autotools.ui.editors.parser.Token"/>
-                <message_argument value="org.eclipse.cdt.autotools.ui_2.1.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
     <resource path="src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AbstractMakefile.java" type="org.eclipse.cdt.internal.autotools.ui.editors.automake.AbstractMakefile">
         <filter id="574619656">
             <message_arguments>
diff --git a/build/org.eclipse.cdt.autotools.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.autotools.ui/META-INF/MANIFEST.MF
index f3388d1ad5e..0127f66e387 100644
--- a/build/org.eclipse.cdt.autotools.ui/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.autotools.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.cdt.autotools.ui;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.1.100.qualifier
 Bundle-Activator: org.eclipse.cdt.autotools.ui.AutotoolsUIPlugin
 Bundle-Localization: plugin
 Bundle-Vendor: %provider
diff --git a/build/org.eclipse.cdt.core.autotools.core/.settings/.api_filters b/build/org.eclipse.cdt.core.autotools.core/.settings/.api_filters
deleted file mode 100644
index 3e0d6286d7d..00000000000
--- a/build/org.eclipse.cdt.core.autotools.core/.settings/.api_filters
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.cdt.core.autotools.core" version="2">
-    <resource path="src/org/eclipse/cdt/core/autotools/core/AutotoolsBuildConfiguration.java" type="org.eclipse.cdt.core.autotools.core.AutotoolsBuildConfiguration">
-        <filter comment="Bug 561406: Stop publishing packages as API that were never intended to be API" id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.core.autotools.core.AutotoolsBuildConfiguration"/>
-                <message_argument value="org.eclipse.cdt.core.autotools.core_1.2.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/core/autotools/core/AutotoolsBuildConfigurationProvider.java" type="org.eclipse.cdt.core.autotools.core.AutotoolsBuildConfigurationProvider">
-        <filter comment="Bug 561406: Stop publishing packages as API that were never intended to be API" id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.core.autotools.core.AutotoolsBuildConfigurationProvider"/>
-                <message_argument value="org.eclipse.cdt.core.autotools.core_1.2.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/core/autotools/core/AutotoolsNature.java" type="org.eclipse.cdt.core.autotools.core.AutotoolsNature">
-        <filter comment="Bug 561406: Stop publishing packages as API that were never intended to be API" id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.core.autotools.core.AutotoolsNature"/>
-                <message_argument value="org.eclipse.cdt.core.autotools.core_1.2.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/core/autotools/core/AutotoolsProjectGenerator.java" type="org.eclipse.cdt.core.autotools.core.AutotoolsProjectGenerator">
-        <filter comment="Bug 561406: Stop publishing packages as API that were never intended to be API" id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.core.autotools.core.AutotoolsProjectGenerator"/>
-                <message_argument value="org.eclipse.cdt.core.autotools.core_1.2.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/build/org.eclipse.cdt.core.autotools.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.core.autotools.core/META-INF/MANIFEST.MF
index 5ebbca2c65f..c47a84b966d 100644
--- a/build/org.eclipse.cdt.core.autotools.core/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.core.autotools.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.autotools.core;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.100.qualifier
 Bundle-Activator: org.eclipse.cdt.core.autotools.core.internal.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.tools.templates.freemarker;bundle-version="1.0.0",
diff --git a/codan/org.eclipse.cdt.codan.checkers/.settings/.api_filters b/codan/org.eclipse.cdt.codan.checkers/.settings/.api_filters
deleted file mode 100644
index 9cb5bfa5171..00000000000
--- a/codan/org.eclipse.cdt.codan.checkers/.settings/.api_filters
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.cdt.codan.checkers" version="2">
-    <resource path="META-INF/MANIFEST.MF">
-        <filter comment="Bug 561582 - Revise API for CDT Codan" id="923795461">
-            <message_arguments>
-                <message_argument value="3.4.0"/>
-                <message_argument value="3.3.400"/>
-            </message_arguments>
-        </filter>
-        <filter comment="Bug 561582 - Revise API for CDT Codan" id="926941240">
-            <message_arguments>
-                <message_argument value="3.4.0"/>
-                <message_argument value="3.3.400"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/codan/checkers/CodanCheckersActivator.java" type="org.eclipse.cdt.codan.checkers.CodanCheckersActivator">
-        <filter comment="Bug 561582 - Revise API for CDT Codan" id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.codan.checkers.CodanCheckersActivator"/>
-                <message_argument value="org.eclipse.cdt.codan.checkers_3.4.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/codan/org.eclipse.cdt.codan.checkers/META-INF/MANIFEST.MF b/codan/org.eclipse.cdt.codan.checkers/META-INF/MANIFEST.MF
index 6dbb7f25bbd..cec8b0c38a5 100644
--- a/codan/org.eclipse.cdt.codan.checkers/META-INF/MANIFEST.MF
+++ b/codan/org.eclipse.cdt.codan.checkers/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.cdt.codan.checkers;singleton:=true
-Bundle-Version: 3.4.0.qualifier
+Bundle-Version: 3.4.100.qualifier
 Bundle-Activator: org.eclipse.cdt.codan.checkers.CodanCheckersActivator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
diff --git a/core/org.eclipse.cdt.core/.settings/.api_filters b/core/org.eclipse.cdt.core/.settings/.api_filters
index 6c1ca58b678..127cbb64807 100644
--- a/core/org.eclipse.cdt.core/.settings/.api_filters
+++ b/core/org.eclipse.cdt.core/.settings/.api_filters
@@ -1,18 +1,14 @@
 <?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.0.1"/>
-            </message_arguments>
-        </filter>
-        <filter comment="deduction guides have been reverted post release" id="305324134">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.core.dom.ast.cpp.ICPPASTDeductionGuide"/>
-                <message_argument value="org.eclipse.cdt.core_7.1.0"/>
-            </message_arguments>
-        </filter>
         <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"/>
@@ -21,18 +17,6 @@
         </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.0.1"/>
-            </message_arguments>
-        </filter>
-        <filter comment="deduction guides have been reverted post release" id="305324134">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.core.dom.ast.cpp.ICPPASTParameterListOwner"/>
-                <message_argument value="org.eclipse.cdt.core_7.1.0"/>
-            </message_arguments>
-        </filter>
         <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"/>
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/.settings/.api_filters b/jtag/org.eclipse.cdt.debug.gdbjtag.core/.settings/.api_filters
new file mode 100644
index 00000000000..c2e639b518e
--- /dev/null
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/.settings/.api_filters
@@ -0,0 +1,11 @@
+<?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/launch/org.eclipse.cdt.launch/.settings/.api_filters b/launch/org.eclipse.cdt.launch/.settings/.api_filters
new file mode 100644
index 00000000000..2431564c13c
--- /dev/null
+++ b/launch/org.eclipse.cdt.launch/.settings/.api_filters
@@ -0,0 +1,11 @@
+<?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/launchbar/org.eclipse.launchbar.core/.settings/.api_filters b/launchbar/org.eclipse.launchbar.core/.settings/.api_filters
deleted file mode 100644
index 39186c5a62b..00000000000
--- a/launchbar/org.eclipse.launchbar.core/.settings/.api_filters
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.launchbar.core" version="2">
-    <resource path="src/org/eclipse/launchbar/core/ILaunchDescriptorType.java" type="org.eclipse.launchbar.core.ILaunchDescriptorType">
-        <filter comment="Interfaces are allowed new default methods in CDT." id="404000815">
-            <message_arguments>
-                <message_argument value="org.eclipse.launchbar.core.ILaunchDescriptorType"/>
-                <message_argument value="canDelete()"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/launchbar/org.eclipse.launchbar.core/META-INF/MANIFEST.MF b/launchbar/org.eclipse.launchbar.core/META-INF/MANIFEST.MF
index 054003311cb..605aa0c27b2 100644
--- a/launchbar/org.eclipse.launchbar.core/META-INF/MANIFEST.MF
+++ b/launchbar/org.eclipse.launchbar.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.launchbar.core;singleton:=true
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.4.100.qualifier
 Bundle-Activator: org.eclipse.launchbar.core.internal.Activator
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/.settings/.api_filters b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/.settings/.api_filters
deleted file mode 100644
index 4160358c7da..00000000000
--- a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/.settings/.api_filters
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.cdt.managedbuilder.llvm.ui" version="2">
-    <resource path="META-INF/MANIFEST.MF">
-        <filter comment="Bug 560039 - Mark LlvmPreferencePage for deletion" id="923795461">
-            <message_arguments>
-                <message_argument value="1.2.0"/>
-                <message_argument value="1.1.200"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.cdt.managedbuilder.llvm.ui.preferences.LlvmPreferencePage">
-        <filter comment="Bug 560039 - Mark LlvmPreferencePage for deletion" id="305324134">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.managedbuilder.llvm.ui.preferences.LlvmPreferencePage"/>
-                <message_argument value="org.eclipse.cdt.managedbuilder.llvm.ui_1.2.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.cdt.managedbuilder.llvm.util.LlvmResourceListener">
-        <filter comment="Bug 560038 - Mark LlvmResourceListener for deletion" id="305324134">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.managedbuilder.llvm.util.LlvmResourceListener"/>
-                <message_argument value="org.eclipse.cdt.managedbuilder.llvm.ui_1.1.200"/>
-            </message_arguments>
-        </filter>
-        <filter comment="Bug 560038 - Mark LlvmResourceListener for deletion" id="305324134">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.managedbuilder.llvm.util.LlvmResourceListener"/>
-                <message_argument value="org.eclipse.cdt.managedbuilder.llvm.ui_1.2.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/META-INF/MANIFEST.MF b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/META-INF/MANIFEST.MF
index f4a756be918..d1a93397ea3 100755
--- a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/META-INF/MANIFEST.MF
+++ b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.llvm.ui;singleton:=true
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.3.100.qualifier
 Bundle-Activator: org.eclipse.cdt.managedbuilder.llvm.ui.LlvmUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/tools.templates/org.eclipse.tools.templates.ui/.settings/.api_filters b/tools.templates/org.eclipse.tools.templates.ui/.settings/.api_filters
deleted file mode 100644
index e0fbcd2f33b..00000000000
--- a/tools.templates/org.eclipse.tools.templates.ui/.settings/.api_filters
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.tools.templates.ui" version="2">
-    <resource path="src/org/eclipse/tools/templates/ui/internal/Activator.java" type="org.eclipse.tools.templates.ui.internal.Activator">
-        <filter comment="Bug 561389: Mark package as internal to match name of package" id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.tools.templates.ui.internal.Activator"/>
-                <message_argument value="org.eclipse.tools.templates.ui_1.2.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/tools/templates/ui/internal/Tag.java" type="org.eclipse.tools.templates.ui.internal.Tag">
-        <filter comment="Bug 561389: Mark package as internal to match name of package" id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.tools.templates.ui.internal.Tag"/>
-                <message_argument value="org.eclipse.tools.templates.ui_1.2.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/tools/templates/ui/internal/TagListViewer.java" type="org.eclipse.tools.templates.ui.internal.TagListViewer">
-        <filter comment="Bug 561389: Mark package as internal to match name of package" id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.tools.templates.ui.internal.TagListViewer"/>
-                <message_argument value="org.eclipse.tools.templates.ui_1.2.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/tools/templates/ui/internal/Template.java" type="org.eclipse.tools.templates.ui.internal.Template">
-        <filter comment="Bug 561389: Mark package as internal to match name of package" id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.tools.templates.ui.internal.Template"/>
-                <message_argument value="org.eclipse.tools.templates.ui_1.2.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/tools/templates/ui/internal/TemplateExtension.java" type="org.eclipse.tools.templates.ui.internal.TemplateExtension">
-        <filter comment="Bug 561389: Mark package as internal to match name of package" id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.tools.templates.ui.internal.TemplateExtension"/>
-                <message_argument value="org.eclipse.tools.templates.ui_1.2.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/tools/templates/ui/internal/TemplateTable.java" type="org.eclipse.tools.templates.ui.internal.TemplateTable">
-        <filter comment="Bug 561389: Mark package as internal to match name of package" id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.tools.templates.ui.internal.TemplateTable"/>
-                <message_argument value="org.eclipse.tools.templates.ui_1.2.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/tools.templates/org.eclipse.tools.templates.ui/META-INF/MANIFEST.MF b/tools.templates/org.eclipse.tools.templates.ui/META-INF/MANIFEST.MF
index 59f55a9bb9d..4725f316753 100644
--- a/tools.templates/org.eclipse.tools.templates.ui/META-INF/MANIFEST.MF
+++ b/tools.templates/org.eclipse.tools.templates.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.tools.templates.ui
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.tools.templates.ui;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.100.qualifier
 Bundle-Activator: org.eclipse.tools.templates.ui.internal.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/windows/org.eclipse.cdt.msw.build/.settings/.api_filters b/windows/org.eclipse.cdt.msw.build/.settings/.api_filters
deleted file mode 100644
index 5503f90917e..00000000000
--- a/windows/org.eclipse.cdt.msw.build/.settings/.api_filters
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.cdt.msw.build" version="2">
-    <resource path="src/org/eclipse/cdt/msw/build/Activator.java" type="org.eclipse.cdt.msw.build.Activator">
-        <filter comment="Old constant name was completely wrong." id="388194388">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.msw.build.Activator"/>
-                <message_argument value="PLUGIN_ID"/>
-                <message_argument value="net.sf.wascana.msvc.build"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>