diff --git a/build/org.eclipse.cdt.autotools.ui/.settings/.api_filters b/build/org.eclipse.cdt.autotools.ui/.settings/.api_filters
index f7d62077297..44fa5a372cd 100644
--- a/build/org.eclipse.cdt.autotools.ui/.settings/.api_filters
+++ b/build/org.eclipse.cdt.autotools.ui/.settings/.api_filters
@@ -1,6 +1,260 @@
 <?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"/>
@@ -9,6 +263,278 @@
             </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>