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 a73a3ba0a4c..c3892fed175 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 @@
-#Mon Jul 06 14:55:59 CEST 2009
+#Sun Feb 07 22:16:52 EST 2010
 ANNOTATION_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
 ANNOTATION_ELEMENT_TYPE_ADDED_FIELD=Error
 ANNOTATION_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
@@ -26,6 +26,8 @@ ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
 ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
 ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_PARAMETERS=Error
 API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
 API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
 CLASS_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
 CLASS_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
@@ -127,7 +129,7 @@ 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_JAVADOC_TAG=Error
 INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
 LEAK_EXTEND=Warning
 LEAK_FIELD_DECL=Warning
@@ -161,6 +163,7 @@ 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
+automatically_removed_unused_problem_filters=false
 eclipse.preferences.version=1
 incompatible_api_component_version=Error
 incompatible_api_component_version_include_major_without_breaking_change=Disabled
diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/OpenTypeMessages.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/OpenTypeMessages.java
index e4bec08dec2..5aef88cb68b 100644
--- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/OpenTypeMessages.java
+++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/OpenTypeMessages.java
@@ -14,7 +14,6 @@ package org.eclipse.cdt.internal.ui.browser.opentype;
 import org.eclipse.osgi.util.NLS;
 
 /**
- * @noextend This class is not intended to be subclassed by clients.
  * @noinstantiate This class is not intended to be instantiated by clients.
  */
 public final class OpenTypeMessages extends NLS {
diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoMessages.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoMessages.java
index b0381ecc66a..f0cf794d1ff 100644
--- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoMessages.java
+++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoMessages.java
@@ -15,7 +15,6 @@ package org.eclipse.cdt.ui.browser.typeinfo;
 import org.eclipse.osgi.util.NLS;
 
 /**
- * @noextend This class is not intended to be subclassed by clients.
  * @noinstantiate This class is not intended to be instantiated by clients.
  */
 public final class TypeInfoMessages extends NLS {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java
index b157c97fcb4..754dbe00461 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java
@@ -144,7 +144,6 @@ public class CUIPlugin extends AbstractUIPlugin {
 	 * (value <code>"org.eclipse.cdt.ui.CHierarchyPerspective"</code>).
 	 * 
 	 * @deprecated This perspective no longer exists.
-	 * @noreference This field is not intended to be referenced by clients.
 	 */	
 	@Deprecated
 	public static final String ID_CHIERARCHY_PERSPECTIVE = PLUGIN_ID + ".CHierarchyPerspective"; //$NON-NLS-1$
@@ -155,7 +154,6 @@ public class CUIPlugin extends AbstractUIPlugin {
 	 * 
 	 * @since 2.0
 	 * @deprecated This perspective no longer exists.
-	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final String ID_CBROWSING_PERSPECTIVE = PLUGIN_ID + ".CBrowsingPerspective"; //$NON-NLS-1$
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/RegexErrorParserOptionPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/RegexErrorParserOptionPage.java
index aa6e90c30fc..849c9cf9319 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/RegexErrorParserOptionPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/RegexErrorParserOptionPage.java
@@ -65,7 +65,6 @@ import org.eclipse.cdt.internal.ui.util.TableLayoutComposite;
 /**
  * Options page for RegexErrorParser in Error Parsers Tab of properties/preferences.
  *
- * @noextend This class is not intended to be subclassed by clients.
  * @since 5.2
  */
 public final class RegexErrorParserOptionPage extends AbstractCOptionPage {
diff --git a/core/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/FileListControl.java b/core/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/FileListControl.java
index dd8533be881..4fa827fb3e2 100644
--- a/core/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/FileListControl.java
+++ b/core/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/FileListControl.java
@@ -337,7 +337,6 @@ public class FileListControl {
 	 * An extended List control with support for cut / copy / paste & undo
 	 * Needs to be public for the copy method to be called by the platform via reflection
 	 * @since 5.2
-	 * @noextend
 	 * @noinstantiate This class is not intended to be instantiated by clients.
 	 */
 	public final class ClipboardList extends List {