diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/AbstractCachingVMProvider.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/AbstractCachingVMProvider.java
index 2894d83b327..9b1107887b6 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/AbstractCachingVMProvider.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/AbstractCachingVMProvider.java
@@ -51,6 +51,7 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelChangedList
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelProxy;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
+import org.eclipse.debug.internal.ui.viewers.model.provisional.ITreeModelViewer;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdateListener;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta;
@@ -815,13 +816,12 @@ public class AbstractCachingVMProvider extends AbstractVMProvider
     // interface in platform, but it is more generic than the public TreeModelViewer.
     // Using ITreeModelViewer will allow us to write unit tests using the 
     // VirtualTreeModelViewer.
-    @SuppressWarnings("restriction") 
     private class ViewUpdateFinishedListener implements IViewerUpdateListener, IModelChangedListener {
-        private final org.eclipse.debug.internal.ui.viewers.model.ITreeModelViewer fViewer;
+        private final ITreeModelViewer fViewer;
         private boolean fViewerChangeStarted = false;
         private RequestMonitor fRm;
         
-        ViewUpdateFinishedListener(org.eclipse.debug.internal.ui.viewers.model.ITreeModelViewer viewer) {
+        ViewUpdateFinishedListener(ITreeModelViewer viewer) {
             fViewer = viewer;
         }
 
@@ -891,9 +891,7 @@ public class AbstractCachingVMProvider extends AbstractVMProvider
                         // If we need to wait for the view to finish updating, then before posting the delta to the 
                         // viewer install a listener, which will in turn call rm.done().
                         if (fDelayEventHandleForViewUpdate) {
-                            @SuppressWarnings("restriction")
-                            org.eclipse.debug.internal.ui.viewers.model.ITreeModelViewer viewer = 
-                                (org.eclipse.debug.internal.ui.viewers.model.ITreeModelViewer) proxyStrategy.getViewer();
+                            ITreeModelViewer viewer = (ITreeModelViewer) proxyStrategy.getViewer();
                             new ViewUpdateFinishedListener(viewer).start(rm);
                         }