diff --git a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
index 7cc1a178d48..be7308cea99 100644
--- a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.core; singleton:=true
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 5.2.0.qualifier
 Bundle-Activator: org.eclipse.cdt.core.CCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.ui/.settings/.api_filters b/core/org.eclipse.cdt.ui/.settings/.api_filters
deleted file mode 100644
index 580a529ff83..00000000000
--- a/core/org.eclipse.cdt.ui/.settings/.api_filters
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.cdt.ui" version="2">
-    <resource path="src/org/eclipse/cdt/ui/actions/WorkingSetConfigAction.java" type="org.eclipse.cdt.ui.actions.WorkingSetConfigAction">
-        <filter id="338755678">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.ui.actions.WorkingSetConfigAction"/>
-                <message_argument value="IMG_CONF"/>
-            </message_arguments>
-        </filter>
-        <filter id="338755678">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.ui.actions.WorkingSetConfigAction"/>
-                <message_argument value="IMG_PROJ"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/core/org.eclipse.cdt.ui/.settings/org.eclipse.pde.api.tools.prefs b/core/org.eclipse.cdt.ui/.settings/org.eclipse.pde.api.tools.prefs
index cb19e6d0e9a..a73a3ba0a4c 100644
--- a/core/org.eclipse.cdt.ui/.settings/org.eclipse.pde.api.tools.prefs
+++ b/core/org.eclipse.cdt.ui/.settings/org.eclipse.pde.api.tools.prefs
@@ -1,4 +1,4 @@
-#Wed Jun 18 09:56:50 CEST 2008
+#Mon Jul 06 14:55:59 CEST 2009
 ANNOTATION_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
 ANNOTATION_ELEMENT_TYPE_ADDED_FIELD=Error
 ANNOTATION_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
@@ -15,9 +15,11 @@ ANNOTATION_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
 ANNOTATION_ELEMENT_TYPE_CHANGED_TO_CLASS=Error
 ANNOTATION_ELEMENT_TYPE_CHANGED_TO_ENUM=Error
 ANNOTATION_ELEMENT_TYPE_CHANGED_TO_INTERFACE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
 ANNOTATION_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
 ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
 ANNOTATION_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
 ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD_WITHOUT_DEFAULT_VALUE=Error
 ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD_WITH_DEFAULT_VALUE=Error
 ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
@@ -29,6 +31,7 @@ CLASS_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
 CLASS_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
 CLASS_ELEMENT_TYPE_ADDED_INTERFACE_BOUNDS=Error
 CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
 CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
 CLASS_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
 CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERCLASS_SET=Error
@@ -42,12 +45,14 @@ CLASS_ELEMENT_TYPE_CHANGED_SUPERCLASS=Error
 CLASS_ELEMENT_TYPE_CHANGED_TO_ANNOTATION=Error
 CLASS_ELEMENT_TYPE_CHANGED_TO_ENUM=Error
 CLASS_ELEMENT_TYPE_CHANGED_TO_INTERFACE=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
 CLASS_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
 CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
 CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
 CLASS_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
 CLASS_ELEMENT_TYPE_REMOVED_INTERFACE_BOUNDS=Error
 CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
 CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
 CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
 CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETERS=Error
@@ -75,6 +80,7 @@ ENUM_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
 ENUM_ELEMENT_TYPE_CHANGED_TO_ANNOTATION=Error
 ENUM_ELEMENT_TYPE_CHANGED_TO_CLASS=Error
 ENUM_ELEMENT_TYPE_CHANGED_TO_INTERFACE=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
 ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
 ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
 ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
@@ -87,6 +93,7 @@ FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
 FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
 FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
 FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
 FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENTS=Error
 FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
 ILLEGAL_EXTEND=Warning
@@ -99,6 +106,8 @@ INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
 INTERFACE_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
 INTERFACE_ELEMENT_TYPE_ADDED_INTERFACE_BOUNDS=Error
 INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
 INTERFACE_ELEMENT_TYPE_ADDED_TYPE_MEMBER=Error
 INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
 INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETERS=Error
@@ -110,13 +119,16 @@ INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
 INTERFACE_ELEMENT_TYPE_CHANGED_TO_ANNOTATION=Error
 INTERFACE_ELEMENT_TYPE_CHANGED_TO_CLASS=Error
 INTERFACE_ELEMENT_TYPE_CHANGED_TO_ENUM=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
 INTERFACE_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
 INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
 INTERFACE_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
 INTERFACE_ELEMENT_TYPE_REMOVED_INTERFACE_BOUNDS=Error
 INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
 INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
 INVALID_JAVADOC_TAG=Ignore
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
 LEAK_EXTEND=Warning
 LEAK_FIELD_DECL=Warning
 LEAK_IMPLEMENT=Warning
@@ -125,6 +137,7 @@ LEAK_METHOD_RETURN_TYPE=Warning
 METHOD_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
 METHOD_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
 METHOD_ELEMENT_TYPE_ADDED_INTERFACE_BOUNDS=Error
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
 METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
 METHOD_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
 METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
@@ -141,6 +154,13 @@ METHOD_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
 METHOD_ELEMENT_TYPE_REMOVED_INTERFACE_BOUNDS=Error
 METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
 METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETERS=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Warning
 eclipse.preferences.version=1
 incompatible_api_component_version=Error
 incompatible_api_component_version_include_major_without_breaking_change=Disabled
@@ -148,3 +168,5 @@ incompatible_api_component_version_include_minor_without_api_change=Disabled
 invalid_since_tag_version=Error
 malformed_since_tag=Error
 missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF
index cce8aedf86f..f6ba672a592 100644
--- a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.ui; singleton:=true
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 5.1.100.qualifier
 Bundle-Activator: org.eclipse.cdt.ui.CUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin