diff --git a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIArgument.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIArgument.java
index 9ff05256099..e287db49ad1 100644
--- a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIArgument.java
+++ b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIArgument.java
@@ -17,5 +17,5 @@ package org.eclipse.cdt.debug.core.cdi.model;
  * 
  * @since Jul 22, 2002
  */
-public interface ICDIArgument extends ICDIVariable, ICDIArgumentDescriptor {
+public interface ICDIArgument extends ICDILocalVariable, ICDIArgumentDescriptor {
 }
diff --git a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIGlobalVariable.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIGlobalVariable.java
index 72fe1ce08e2..cf48fa3faa3 100644
--- a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIGlobalVariable.java
+++ b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIGlobalVariable.java
@@ -14,6 +14,6 @@ package org.eclipse.cdt.debug.core.cdi.model;
 /**
  * ICDIGlobalVariable
  */
-public interface ICDIGlobalVariable extends ICDIVariable {
+public interface ICDIGlobalVariable extends ICDIVariable, ICDIGlobalVariableDescriptor {
 
 }
diff --git a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDILocalVariable.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDILocalVariable.java
index b3eb67ca6b5..b6976aef394 100644
--- a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDILocalVariable.java
+++ b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDILocalVariable.java
@@ -11,16 +11,9 @@
 
 package org.eclipse.cdt.debug.core.cdi.model;
 
-import org.eclipse.cdt.debug.core.cdi.CDIException;
-
 /**
  * ICDILocalVariable
  */
-public interface ICDILocalVariable extends ICDIVariable {
+public interface ICDILocalVariable extends ICDIVariable, ICDILocalVariableDescriptor {
 
-	/**
-	 * 
-	 * @return ICDIStackFrame
-	 */
-	ICDIStackFrame getStackFrame() throws CDIException;
 }
diff --git a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIThreadStorage.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIThreadStorage.java
index 4c8077bc1d7..7ca5cba5a60 100644
--- a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIThreadStorage.java
+++ b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIThreadStorage.java
@@ -11,15 +11,9 @@
 
 package org.eclipse.cdt.debug.core.cdi.model;
 
-import org.eclipse.cdt.debug.core.cdi.CDIException;
-
 /**
  * ICDIThreadStorage
  */
-public interface ICDIThreadStorage extends ICDIVariable {
+public interface ICDIThreadStorage extends ICDIVariable, ICDIThreadStorageDescriptor {
 
-	/**
-	 * @return ICDIThread
-	 */
-	ICDIThread getThread() throws CDIException;
 }
diff --git a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIThreadStorageDescriptor.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIThreadStorageDescriptor.java
index 863c196dbfc..b2cbc571c2e 100644
--- a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIThreadStorageDescriptor.java
+++ b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIThreadStorageDescriptor.java
@@ -16,8 +16,7 @@ import org.eclipse.cdt.debug.core.cdi.CDIException;
 /**
  * ICDIThreadStorageDescriptor
  */
-public interface ICDIThreadStorageDescriptor extends
-		ICDIVariableDescriptor {
+public interface ICDIThreadStorageDescriptor extends ICDIVariableDescriptor {
 
 	/**
 	 * Return the thread.