diff --git a/dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF b/dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF
index 68aaab0f012..10938d6e195 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF
+++ b/dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF
@@ -28,20 +28,20 @@ Export-Package: org.eclipse.cdt.dsf.debug.internal.ui.viewmodel.update.provision
  org.eclipse.cdt.dsf.debug.ui.contexts,
  org.eclipse.cdt.dsf.debug.ui.memory,
  org.eclipse.cdt.dsf.debug.ui.sourcelookup,
- org.eclipse.cdt.dsf.debug.ui.viewmodel,
- org.eclipse.cdt.dsf.debug.ui.viewmodel.actions,
- org.eclipse.cdt.dsf.debug.ui.viewmodel.expression;x-internal:=true,
- org.eclipse.cdt.dsf.debug.ui.viewmodel.launch;x-internal:=true,
- org.eclipse.cdt.dsf.debug.ui.viewmodel.launch.actions,
- org.eclipse.cdt.dsf.debug.ui.viewmodel.modules;x-internal:=true,
- org.eclipse.cdt.dsf.debug.ui.viewmodel.modules.detail,
- org.eclipse.cdt.dsf.debug.ui.viewmodel.numberformat,
- org.eclipse.cdt.dsf.debug.ui.viewmodel.register;x-internal:=true,
- org.eclipse.cdt.dsf.debug.ui.viewmodel.update,
- org.eclipse.cdt.dsf.debug.ui.viewmodel.variable;x-internal:=true,
+ org.eclipse.cdt.dsf.debug.ui.viewmodel;x-friends:="org.eclipse.cdt.dsf.gdb.ui,org.eclipse.cdt.examples.dsf,org.eclipse.cdt.examples.dsf.pda.ui",
+ org.eclipse.cdt.dsf.debug.ui.viewmodel.actions;x-friends:="org.eclipse.cdt.dsf.gdb.ui,org.eclipse.cdt.examples.dsf,org.eclipse.cdt.examples.dsf.pda.ui",
+ org.eclipse.cdt.dsf.debug.ui.viewmodel.expression;x-friends:="org.eclipse.cdt.dsf.gdb.ui,org.eclipse.cdt.examples.dsf,org.eclipse.cdt.examples.dsf.pda.ui",
+ org.eclipse.cdt.dsf.debug.ui.viewmodel.launch;x-friends:="org.eclipse.cdt.dsf.gdb.ui,org.eclipse.cdt.examples.dsf,org.eclipse.cdt.examples.dsf.pda.ui",
+ org.eclipse.cdt.dsf.debug.ui.viewmodel.launch.actions;x-friends:="org.eclipse.cdt.dsf.gdb.ui,org.eclipse.cdt.examples.dsf,org.eclipse.cdt.examples.dsf.pda.ui",
+ org.eclipse.cdt.dsf.debug.ui.viewmodel.modules;x-friends:="org.eclipse.cdt.dsf.gdb.ui,org.eclipse.cdt.examples.dsf,org.eclipse.cdt.examples.dsf.pda.ui",
+ org.eclipse.cdt.dsf.debug.ui.viewmodel.modules.detail;x-friends:="org.eclipse.cdt.dsf.gdb.ui,org.eclipse.cdt.examples.dsf,org.eclipse.cdt.examples.dsf.pda.ui",
+ org.eclipse.cdt.dsf.debug.ui.viewmodel.numberformat;x-friends:="org.eclipse.cdt.dsf.gdb.ui,org.eclipse.cdt.examples.dsf,org.eclipse.cdt.examples.dsf.pda.ui",
+ org.eclipse.cdt.dsf.debug.ui.viewmodel.register;x-friends:="org.eclipse.cdt.dsf.gdb.ui,org.eclipse.cdt.examples.dsf,org.eclipse.cdt.examples.dsf.pda.ui",
+ org.eclipse.cdt.dsf.debug.ui.viewmodel.update;x-friends:="org.eclipse.cdt.dsf.gdb.ui,org.eclipse.cdt.examples.dsf,org.eclipse.cdt.examples.dsf.pda.ui",
+ org.eclipse.cdt.dsf.debug.ui.viewmodel.variable;x-friends:="org.eclipse.cdt.dsf.gdb.ui,org.eclipse.cdt.examples.dsf,org.eclipse.cdt.examples.dsf.pda.ui",
  org.eclipse.cdt.dsf.ui.concurrent,
- org.eclipse.cdt.dsf.ui.viewmodel,
- org.eclipse.cdt.dsf.ui.viewmodel.datamodel,
- org.eclipse.cdt.dsf.ui.viewmodel.properties,
- org.eclipse.cdt.dsf.ui.viewmodel.update
+ org.eclipse.cdt.dsf.ui.viewmodel;x-friends:="org.eclipse.cdt.dsf.gdb.ui,org.eclipse.cdt.examples.dsf,org.eclipse.cdt.examples.dsf.pda.ui",
+ org.eclipse.cdt.dsf.ui.viewmodel.datamodel;x-friends:="org.eclipse.cdt.dsf.gdb.ui,org.eclipse.cdt.examples.dsf,org.eclipse.cdt.examples.dsf.pda.ui",
+ org.eclipse.cdt.dsf.ui.viewmodel.properties;x-friends:="org.eclipse.cdt.dsf.gdb.ui,org.eclipse.cdt.examples.dsf,org.eclipse.cdt.examples.dsf.pda.ui",
+ org.eclipse.cdt.dsf.ui.viewmodel.update;x-friends:="org.eclipse.cdt.dsf.gdb.ui,org.eclipse.cdt.examples.dsf,org.eclipse.cdt.examples.dsf.pda.ui"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/AbstractDebugVMAdapter.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/AbstractDebugVMAdapter.java
index 6a6c8e7fc46..c4c2d69ae65 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/AbstractDebugVMAdapter.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/AbstractDebugVMAdapter.java
@@ -26,7 +26,6 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationCont
  * 
  * @since 1.1
  */
-@SuppressWarnings("restriction")
 public class AbstractDebugVMAdapter extends AbstractDMVMAdapter
     implements ISteppingControlParticipant 
 {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/actions/AbstractVMProviderActionDelegate.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/actions/AbstractVMProviderActionDelegate.java
index 8bbd0226f4d..7edb54e78cc 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/actions/AbstractVMProviderActionDelegate.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/actions/AbstractVMProviderActionDelegate.java
@@ -32,7 +32,6 @@ import org.eclipse.ui.IViewPart;
 /**
  * @since 1.1
  */
-@SuppressWarnings("restriction")
 abstract public class AbstractVMProviderActionDelegate implements IViewActionDelegate, IDebugContextListener, IActionDelegate2 {
 
     private IViewPart fView = null;
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/actions/VMHandlerUtils.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/actions/VMHandlerUtils.java
index 594c89290ce..a219d3f3769 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/actions/VMHandlerUtils.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/actions/VMHandlerUtils.java
@@ -37,7 +37,6 @@ import org.eclipse.ui.services.IServiceLocator;
  * 
  * @since 1.1
  */
-@SuppressWarnings("restriction")
 public class VMHandlerUtils {
 
     /**
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/AbstractExpressionVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/AbstractExpressionVMNode.java
index 51a32d02772..a88978c8221 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/AbstractExpressionVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/AbstractExpressionVMNode.java
@@ -39,7 +39,6 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate;
  * by the sub-class as well.   
  * </p>
  */
-@SuppressWarnings("restriction")
 public abstract class AbstractExpressionVMNode extends AbstractDMVMNode 
     implements IExpressionVMNode
 {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionColumnPresentation.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionColumnPresentation.java
index 8c5b437d712..cff84cf1512 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionColumnPresentation.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionColumnPresentation.java
@@ -19,7 +19,6 @@ import org.eclipse.jface.resource.ImageDescriptor;
 /**
  * 
  */
-@SuppressWarnings("restriction")
 public class ExpressionColumnPresentation implements IColumnPresentation {
 
     public static final String ID = DsfUIPlugin.PLUGIN_ID + ".EXPRESSION_COLUMN_PRESENTATION_ID"; //$NON-NLS-1$
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderContentStragegy.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderContentStragegy.java
index 55535acc67c..b0ab48badee 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderContentStragegy.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderContentStragegy.java
@@ -23,7 +23,6 @@ import org.eclipse.core.runtime.Status;
  * 
  * @see ExpressionVMProvider
  */
-@SuppressWarnings("restriction")
 public class ExpressionVMProviderContentStragegy extends DefaultVMContentProviderStrategy {
     public ExpressionVMProviderContentStragegy(ExpressionVMProvider provider) {
         super(provider);
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderModelProxyStrategy.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderModelProxyStrategy.java
index fb59a74e02e..d6c779ef281 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderModelProxyStrategy.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderModelProxyStrategy.java
@@ -28,7 +28,6 @@ import org.eclipse.jface.viewers.TreePath;
  * 
  * @see ExpressionVMProvider
  */
-@SuppressWarnings("restriction")
 public class ExpressionVMProviderModelProxyStrategy extends DefaultVMModelProxyStrategy {
 
     public ExpressionVMProviderModelProxyStrategy(ExpressionVMProvider provider, Object rootElement) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/IExpressionUpdate.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/IExpressionUpdate.java
index e3fd41fc4a7..841077934dd 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/IExpressionUpdate.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/IExpressionUpdate.java
@@ -18,7 +18,6 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate;
  * this update needs to create an expression element based on the tree path and the
  * expression object in this update.
  */
-@SuppressWarnings("restriction")
 public interface IExpressionUpdate extends IViewerUpdate {
 
     /**
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/InvalidExpressionVMContext.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/InvalidExpressionVMContext.java
index 9731351bb98..e4cfb097f72 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/InvalidExpressionVMContext.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/InvalidExpressionVMContext.java
@@ -24,7 +24,6 @@ import org.eclipse.jface.resource.JFaceResources;
  * 
  * @since 1.1
  */
-@SuppressWarnings("restriction")
 public class InvalidExpressionVMContext extends AbstractVMContext implements IElementLabelProvider {
     
     final private IExpression fExpression;
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/VMExpressionUpdate.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/VMExpressionUpdate.java
index 8f64c623b28..9764fd135eb 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/VMExpressionUpdate.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/VMExpressionUpdate.java
@@ -25,7 +25,6 @@ import org.eclipse.jface.viewers.TreePath;
 /**
  * 
  */
-@SuppressWarnings("restriction")
 class VMExpressionUpdate extends VMViewerUpdate implements IExpressionUpdate {
 
     private final IExpression fExpression;
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractLaunchVMProvider.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractLaunchVMProvider.java
index 28de36ba1d8..eadaecc7203 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractLaunchVMProvider.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractLaunchVMProvider.java
@@ -58,7 +58,6 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 /**
  * @since 1.1
  */
-@SuppressWarnings("restriction")
 public class AbstractLaunchVMProvider extends AbstractDMVMProvider 
     implements IDebugEventSetListener, ILaunchesListener2
 {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DefaultDsfModelSelectionPolicyFactory.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DefaultDsfModelSelectionPolicyFactory.java
index 7a05904d4a4..bf82b8ce831 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DefaultDsfModelSelectionPolicyFactory.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DefaultDsfModelSelectionPolicyFactory.java
@@ -22,7 +22,6 @@ import org.eclipse.debug.ui.IDebugUIConstants;
  * Default model selection policy factory for DSF.
  * @since 1.1
  */
-@SuppressWarnings("restriction")
 public class DefaultDsfModelSelectionPolicyFactory implements IModelSelectionPolicyFactory {
 
 	/*
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DefaultDsfSelectionPolicy.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DefaultDsfSelectionPolicy.java
index cb1e8faffbc..2a1fa35c176 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DefaultDsfSelectionPolicy.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DefaultDsfSelectionPolicy.java
@@ -32,7 +32,6 @@ import org.eclipse.jface.viewers.TreeSelection;
  * (<code>DefaultSelectionPolicy</code>).
  * @since 1.1
  */
-@SuppressWarnings("restriction")
 public class DefaultDsfSelectionPolicy implements IModelSelectionPolicy {
 
 	private IDMContext fDMContext;
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/LaunchRootVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/LaunchRootVMNode.java
index faed099a305..b653a57542b 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/LaunchRootVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/LaunchRootVMNode.java
@@ -35,7 +35,6 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
  * the root of a hierarchy.  It does not implement the label provider
  * functionality, so the default adapters should be used to retrieve the label.  
  */
-@SuppressWarnings("restriction")
 public class LaunchRootVMNode extends RootVMNode 
     implements IRootVMNode
 {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/NumberFormatsPropertyTester.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/NumberFormatsPropertyTester.java
index fde73af243b..c7683e70031 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/NumberFormatsPropertyTester.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/NumberFormatsPropertyTester.java
@@ -43,7 +43,6 @@ import org.eclipse.ui.IWorkbenchPart;
  *  
  * @since 1.0
  */
-@SuppressWarnings("restriction")
 public class NumberFormatsPropertyTester extends PropertyTester {
 
     private static final String SUPPORTED = "areNumberFormatsSupported"; //$NON-NLS-1$
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterBitFieldCellModifier.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterBitFieldCellModifier.java
index 247be83c710..f8455894298 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterBitFieldCellModifier.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterBitFieldCellModifier.java
@@ -25,7 +25,6 @@ import org.eclipse.cdt.dsf.ui.viewmodel.update.AbstractCachingVMProvider;
 import org.eclipse.cdt.dsf.ui.viewmodel.update.UserEditEvent;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
 
-@SuppressWarnings("restriction")
 public class RegisterBitFieldCellModifier extends WatchExpressionCellModifier {
     
     public static enum BitFieldEditorStyle { NOTHING, BITFIELDCOMBO, BITFIELDTEXT }
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterCellModifier.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterCellModifier.java
index cc065cb46b6..e93465348a4 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterCellModifier.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterCellModifier.java
@@ -24,7 +24,6 @@ import org.eclipse.cdt.dsf.ui.viewmodel.update.AbstractCachingVMProvider;
 import org.eclipse.cdt.dsf.ui.viewmodel.update.UserEditEvent;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
 
-@SuppressWarnings("restriction")
 public class RegisterCellModifier extends WatchExpressionCellModifier {
     
     private AbstractCachingVMProvider fProvider; 
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterColumnPresentation.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterColumnPresentation.java
index 03ef9ee3ff5..fb66d78c861 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterColumnPresentation.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterColumnPresentation.java
@@ -19,7 +19,6 @@ import org.eclipse.jface.resource.ImageDescriptor;
 /**
  * 
  */
-@SuppressWarnings("restriction")
 public class RegisterColumnPresentation implements IColumnPresentation {
 
     public static final String ID = DsfUIPlugin.PLUGIN_ID + ".REGISTERS_COLUMN_PRESENTATION_ID"; //$NON-NLS-1$
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterRootDMVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterRootDMVMNode.java
index 316a0477d2f..dd3529f1ae4 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterRootDMVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterRootDMVMNode.java
@@ -25,7 +25,6 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoRe
  * Register View does not collapse and redraw when going from frame to frame 
  * when stepping or just when selecting within the view. 
  */
-@SuppressWarnings("restriction")
 public class RegisterRootDMVMNode extends RootDMVMNode implements IElementMementoProvider {
 	
 	public RegisterRootDMVMNode(AbstractVMProvider provider) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterVMProvider.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterVMProvider.java
index 4e2a3e4d359..7f269ccc221 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterVMProvider.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterVMProvider.java
@@ -44,7 +44,6 @@ import org.eclipse.jface.util.PropertyChangeEvent;
 /**
  *  Provides the VIEW MODEL for the DEBUG MODEL REGISTER view.
  */
-@SuppressWarnings("restriction")
 public class RegisterVMProvider extends AbstractDMVMProvider 
 {
     private IPropertyChangeListener fPreferencesListener = new IPropertyChangeListener() {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableCellModifier.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableCellModifier.java
index d18ac1ae65b..6d2f50e7640 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableCellModifier.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableCellModifier.java
@@ -21,7 +21,6 @@ import org.eclipse.cdt.dsf.ui.viewmodel.update.UserEditEvent;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
 
-@SuppressWarnings("restriction")
 public class VariableCellModifier extends WatchExpressionCellModifier {
     
     private AbstractCachingVMProvider fProvider;
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableColumnPresentation.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableColumnPresentation.java
index 725b02c0c59..fb208f38f86 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableColumnPresentation.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableColumnPresentation.java
@@ -19,7 +19,6 @@ import org.eclipse.jface.resource.ImageDescriptor;
 /**
  * 
  */
-@SuppressWarnings("restriction")
 public class VariableColumnPresentation implements IColumnPresentation {
     public static final String ID = DsfUIPlugin.PLUGIN_ID + ".VARIABLES_COLUMN_PRESENTATION_ID"; //$NON-NLS-1$
     
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/concurrent/ViewerCountingRequestMonitor.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/concurrent/ViewerCountingRequestMonitor.java
index a448f461290..68428571ed1 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/concurrent/ViewerCountingRequestMonitor.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/concurrent/ViewerCountingRequestMonitor.java
@@ -24,7 +24,6 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate;
  * 
  * @since 1.0
  */
-@SuppressWarnings("restriction")
 public class ViewerCountingRequestMonitor extends CountingRequestMonitor {
 
     private final IViewerUpdate fUpdate;
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMAdapter.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMAdapter.java
index 8115d679d15..d8217fbe86d 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMAdapter.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMAdapter.java
@@ -43,7 +43,6 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate;
  * @since 1.0
  */
 @ThreadSafe
-@SuppressWarnings("restriction")
 abstract public class AbstractVMAdapter implements IVMAdapter
 {
  
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMNode.java
index 69c1223550d..07665a290d7 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMNode.java
@@ -29,7 +29,6 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate;
  * 
  * @since 1.0
  */
-@SuppressWarnings("restriction")
 abstract public class AbstractVMNode implements IVMNode {
 
     private final AbstractVMProvider fProvider;
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/DefaultVMContentProviderStrategy.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/DefaultVMContentProviderStrategy.java
index f5a455e4f15..02a97da2c46 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/DefaultVMContentProviderStrategy.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/DefaultVMContentProviderStrategy.java
@@ -44,7 +44,6 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate;
  * @since 1.0
  */
 @ConfinedToDsfExecutor("#getExecutor()")
-@SuppressWarnings("restriction")
 public class DefaultVMContentProviderStrategy implements IElementContentProvider {
 
     private final AbstractVMProvider fVMProvider;
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/IVMModelProxy.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/IVMModelProxy.java
index cc73f972e23..9f83281cc96 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/IVMModelProxy.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/IVMModelProxy.java
@@ -26,7 +26,6 @@ import org.eclipse.jface.viewers.Viewer;
  * 
  * @since 1.0
  */
-@SuppressWarnings("restriction")
 public interface IVMModelProxy extends IModelProxy {
 
     /**
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/IVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/IVMNode.java
index cefec680bb7..09452c03bec 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/IVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/IVMNode.java
@@ -46,7 +46,6 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
  * @since 1.0
  */
 @ConfinedToDsfExecutor("")
-@SuppressWarnings("restriction")
 public interface IVMNode extends IElementContentProvider
 {
     /**
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/IVMProvider.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/IVMProvider.java
index fc9df61250e..8d0581665c6 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/IVMProvider.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/IVMProvider.java
@@ -50,7 +50,6 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerInputProvi
  * @since 1.0
  */
 @ConfinedToDsfExecutor("#getExecutor()")
-@SuppressWarnings("restriction")
 public interface IVMProvider 
     extends IElementContentProvider, IModelProxyFactory, IColumnPresentationFactory, IViewerInputProvider
 {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/ModelProxyInstalledEvent.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/ModelProxyInstalledEvent.java
index a5af7a778d5..29e15f64c72 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/ModelProxyInstalledEvent.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/ModelProxyInstalledEvent.java
@@ -19,7 +19,6 @@ import org.eclipse.jface.viewers.Viewer;
  * 
  * @since 1.0
  */
-@SuppressWarnings("restriction")
 public class ModelProxyInstalledEvent {
     private final IModelProxy fProxy;
     private final Viewer fViewer;
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/RootVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/RootVMNode.java
index f593d548c04..74a129b1647 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/RootVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/RootVMNode.java
@@ -23,7 +23,6 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
  * 
  * @since 1.0
  */
-@SuppressWarnings("restriction")
 public class RootVMNode extends AbstractVMNode implements IRootVMNode {
 
     public RootVMNode(AbstractVMProvider provider) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMChildrenCountUpdate.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMChildrenCountUpdate.java
index 21bd34ab1de..9286770aef5 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMChildrenCountUpdate.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMChildrenCountUpdate.java
@@ -24,7 +24,6 @@ import org.eclipse.jface.viewers.TreePath;
  * 
  * @since 1.0
  */
-@SuppressWarnings("restriction")
 public class VMChildrenCountUpdate extends VMViewerUpdate implements IChildrenCountUpdate {
     final private DataRequestMonitor<Integer> fCountRequestMonitor;
     
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMChildrenUpdate.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMChildrenUpdate.java
index 90ee9e32767..eb4c04334f4 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMChildrenUpdate.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMChildrenUpdate.java
@@ -27,7 +27,6 @@ import org.eclipse.jface.viewers.TreePath;
  * 
  * @since 1.0
  */
-@SuppressWarnings("restriction")
 public class VMChildrenUpdate extends VMViewerUpdate implements IChildrenUpdate {
     private final int fOffset;
     private final int fLength;
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMDelta.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMDelta.java
index 211765dee6b..c9025b7453f 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMDelta.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMDelta.java
@@ -24,7 +24,6 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta;
  * 
  * @since 1.0
  */
-@SuppressWarnings("restriction")
 public class VMDelta extends ModelDelta {
 
 	private VMDelta fParent;
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMHasChildrenUpdate.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMHasChildrenUpdate.java
index e95a5c06ee1..84e1e22b09d 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMHasChildrenUpdate.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMHasChildrenUpdate.java
@@ -24,7 +24,6 @@ import org.eclipse.jface.viewers.TreePath;
  * 
  * @since 1.0
  */
-@SuppressWarnings("restriction")
 public class VMHasChildrenUpdate extends VMViewerUpdate implements IHasChildrenUpdate {
 
     final private DataRequestMonitor<Boolean> fHasElemsRequestMonitor;
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMViewerUpdate.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMViewerUpdate.java
index f3e80d04970..44950c7368f 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMViewerUpdate.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMViewerUpdate.java
@@ -37,7 +37,6 @@ import org.eclipse.jface.viewers.TreePath;
  * 
  * @since 1.0
  */
-@SuppressWarnings("restriction")
 public class VMViewerUpdate implements IViewerUpdate {
     
     /**
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/datamodel/AbstractDMVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/datamodel/AbstractDMVMNode.java
index fafe9f3cebd..f6477628a11 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/datamodel/AbstractDMVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/datamodel/AbstractDMVMNode.java
@@ -48,7 +48,6 @@ import org.eclipse.jface.viewers.TreePath;
  * 
  * @since 1.0
  */
-@SuppressWarnings("restriction")
 abstract public class AbstractDMVMNode extends AbstractVMNode implements IVMNode {
 
     /**
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/datamodel/CompositeDMVMContext.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/datamodel/CompositeDMVMContext.java
index 61e7fd405b4..12becf04334 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/datamodel/CompositeDMVMContext.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/datamodel/CompositeDMVMContext.java
@@ -25,7 +25,6 @@ import org.eclipse.jface.viewers.TreePath;
  * 
  * @since 1.0
  */
-@SuppressWarnings("restriction")
 public class CompositeDMVMContext extends CompositeDMContext {
     
     /**
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/IPropertiesUpdate.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/IPropertiesUpdate.java
index d3752ddc3f3..b0052db9c42 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/IPropertiesUpdate.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/IPropertiesUpdate.java
@@ -20,7 +20,6 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate;
  * 
  * @since 1.0
  */
-@SuppressWarnings("restriction")
 public interface IPropertiesUpdate extends IViewerUpdate {
     /**
      * Returns the set of element properties that the provider should update.
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelAttribute.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelAttribute.java
index 1812f2ff531..a282edaef06 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelAttribute.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelAttribute.java
@@ -33,7 +33,6 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate;
  * 
  * @since 1.0
  */
-@SuppressWarnings("restriction")
 abstract public class LabelAttribute {
     public static final String[] EMPTY_PROPERTY_NAMES_ARRAY = new String[0];
     
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelColor.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelColor.java
index 3b6dfcd0e16..7d65da3e7e8 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelColor.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelColor.java
@@ -27,7 +27,6 @@ import org.eclipse.swt.graphics.RGB;
  * @since 1.0
  */
 
-@SuppressWarnings("restriction")
 public class LabelColor extends LabelAttribute {
     private RGB fForeground;
     private RGB fBackground;
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelColumnInfo.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelColumnInfo.java
index 495f25c23c6..2e9f6866cbf 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelColumnInfo.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelColumnInfo.java
@@ -16,7 +16,6 @@ import java.util.Map;
 
 import org.eclipse.cdt.dsf.concurrent.ThreadSafe;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.ListenerList;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate;
 
 /**
@@ -34,19 +33,6 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate;
  */
 @ThreadSafe
 public class LabelColumnInfo  {
-
-    /**
-     * @since 2.0
-     */
-    private static final LabelAttribute[] DEFAULT_FAILED_UPDATE_ATTRIBUTES = new LabelAttribute[] {
-        new LabelText("...", new String[0])
-    };
-    
-    /**
-     * @since 2.0
-     */
-    private static final LabelAttribute[] EMPTY_ATTRIBUTES = new LabelAttribute[0]; 
-    
     /** 
      * Calculated list of property names that need to be retrieved to 
      * generate the label for this column.
@@ -58,11 +44,6 @@ public class LabelColumnInfo  {
      */
     private LabelAttribute[] fLabelAttributes;
 
-    /**
-     * Listeners for when column attributes are modified.
-     */
-    private ListenerList fListeners = new ListenerList();
-        
     /**
      * Creates the column info object with given array of attributes.
      * @param attributeInfos Attributes for the label.
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelFont.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelFont.java
index b3650dfe7a1..78e10c872d3 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelFont.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelFont.java
@@ -26,7 +26,6 @@ import org.eclipse.swt.graphics.FontData;
  * 
  * @since 1.0
  */
-@SuppressWarnings("restriction")
 public class LabelFont extends LabelAttribute {
     private static final FontData DEFAULT_FONT = JFaceResources.getDefaultFontDescriptor().getFontData()[0];
     
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelImage.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelImage.java
index 09a2569900e..b8d319d9da6 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelImage.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelImage.java
@@ -25,7 +25,6 @@ import org.eclipse.jface.resource.ImageDescriptor;
  * 
  * @since 1.0
  */
-@SuppressWarnings("restriction")
 public class LabelImage extends LabelAttribute {
     private ImageDescriptor fImageDescriptor;
 
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelText.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelText.java
index 8b57d6699bf..52915f1ec53 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelText.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/LabelText.java
@@ -30,7 +30,6 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate;
  * 
  * @since 1.0
  */
-@SuppressWarnings("restriction")
 public class LabelText extends LabelAttribute {
     
     public static final MessageFormat DEFAULT_MESSAGE = new MessageFormat(MessagesForProperties.DefaultLabelMessage_label);
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/PropertiesBasedLabelProvider.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/PropertiesBasedLabelProvider.java
index 4d46cac60cd..b5ac48a6b42 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/PropertiesBasedLabelProvider.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/PropertiesBasedLabelProvider.java
@@ -38,7 +38,6 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate;
  * 
  * @since 2.0 - Renamed from PropertyBasedLabelProvider 
  */
-@SuppressWarnings("restriction")
 @ThreadSafe
 public class PropertiesBasedLabelProvider 
     implements IElementLabelProvider
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/MultiLevelUpdateHandler.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/MultiLevelUpdateHandler.java
index dd4fe25728a..9d97d07ad42 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/MultiLevelUpdateHandler.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/MultiLevelUpdateHandler.java
@@ -41,7 +41,6 @@ import org.eclipse.swt.graphics.RGB;
 /**
  * @since 1.1
  */
-@SuppressWarnings("restriction")
 class MultiLevelUpdateHandler extends DataRequestMonitor<List<Object>> {
 	
 	private static final boolean DEBUG = Boolean.parseBoolean(Platform.getDebugOption("org.eclipse.cdt.dsf.ui/debug/vm/atomicUpdate")); //$NON-NLS-1$ //;