diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/CygwinDebuggerPage.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/CygwinDebuggerPage.java
index 4849e6e3425..fcd54b36173 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/CygwinDebuggerPage.java
+++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/CygwinDebuggerPage.java
@@ -29,7 +29,6 @@ public class CygwinDebuggerPage extends AbstractLaunchConfigurationTab {
 
 	protected Text fGDBCommandText;
 	protected Text fGDBInitText;
-	private Button fGDBButton;
 
 	public void createControl(Composite parent) {
 		GridData gd;
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBDebuggerPage.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBDebuggerPage.java
index fcf0ec4fcbe..4e853bf4e23 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBDebuggerPage.java
+++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBDebuggerPage.java
@@ -30,7 +30,6 @@ public class GDBDebuggerPage extends AbstractLaunchConfigurationTab {
 	protected Text fGDBCommandText;
 	protected Text fGDBInitText;
 	private Button fAutoSoLibButton;
-	private Button fGDBButton;
 
 	public void createControl(Composite parent) {
 		GridData gd;
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractEditorActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractEditorActionDelegate.java
index f245814ddb6..4859f7048be 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractEditorActionDelegate.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractEditorActionDelegate.java
@@ -20,6 +20,7 @@ import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+import org.eclipse.ui.actions.ActionDelegate;
 
 /**
  * 
@@ -27,7 +28,8 @@ import org.eclipse.ui.IWorkbenchWindowActionDelegate;
  * 
  * @since Sep 19, 2002
  */
-public abstract class AbstractEditorActionDelegate implements IWorkbenchWindowActionDelegate,
+public abstract class AbstractEditorActionDelegate extends ActionDelegate 
+												   implements IWorkbenchWindowActionDelegate,
 															  IEditorActionDelegate,
 															  IPartListener,
 															  ISelectionListener,
@@ -36,7 +38,6 @@ public abstract class AbstractEditorActionDelegate implements IWorkbenchWindowAc
 	private IAction fAction;
 	private IWorkbenchWindow fWorkbenchWindow;
 	private IWorkbenchPart fTargetPart;
-	private IEditorPart fTargetEditor;
 	private IDebugTarget fDebugTarget = null;
 
 	/**
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddGlobalsActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddGlobalsActionDelegate.java
index 55a9be6975b..7e942f2704e 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddGlobalsActionDelegate.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddGlobalsActionDelegate.java
@@ -32,6 +32,7 @@ import org.eclipse.ui.IViewActionDelegate;
 import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.actions.ActionDelegate;
 import org.eclipse.ui.dialogs.ListSelectionDialog;
 
 /**
@@ -39,7 +40,8 @@ import org.eclipse.ui.dialogs.ListSelectionDialog;
  * 
  * @since: Nov 4, 2002
  */
-public class AddGlobalsActionDelegate implements IViewActionDelegate, 
+public class AddGlobalsActionDelegate extends ActionDelegate
+									  implements IViewActionDelegate, 
 												 ISelectionListener,
 												 IPartListener
 {
@@ -251,7 +253,7 @@ public class AddGlobalsActionDelegate implements IViewActionDelegate,
 		return fSelection;
 	}
 
-	protected void dispose()
+	public void dispose()
 	{
 		if ( getView() != null ) 
 		{
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointActionDelegate.java
index 47ea5264394..6508ef8287b 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointActionDelegate.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointActionDelegate.java
@@ -24,6 +24,7 @@ import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+import org.eclipse.ui.actions.ActionDelegate;
 import org.eclipse.ui.texteditor.ITextEditor;
 
 /**
@@ -33,7 +34,8 @@ import org.eclipse.ui.texteditor.ITextEditor;
  * 
  * @since Sep 4, 2002
  */
-public class AddWatchpointActionDelegate implements IWorkbenchWindowActionDelegate,
+public class AddWatchpointActionDelegate extends ActionDelegate
+										 implements IWorkbenchWindowActionDelegate,
 													IPartListener
 {
 	private boolean fInitialized = false;