diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/ArgumentObject.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/ArgumentObject.java
index e9988eab60d..a6108bab492 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/ArgumentObject.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/ArgumentObject.java
@@ -7,14 +7,14 @@
 package org.eclipse.cdt.debug.mi.core.cdi.model;
 
 import org.eclipse.cdt.debug.core.cdi.model.ICDIArgumentObject;
+import org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame;
 import org.eclipse.cdt.debug.core.cdi.model.ICDITarget;
-import org.eclipse.cdt.debug.mi.core.cdi.model.*;
 
 /**
  */
 public class ArgumentObject extends VariableObject implements ICDIArgumentObject {
 
-	public ArgumentObject(ICDITarget target, String name, StackFrame frame, int pos, int depth) {
+	public ArgumentObject(ICDITarget target, String name, ICDIStackFrame frame, int pos, int depth) {
 		super(target, name, frame, pos, depth);
 	}
 
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/RegisterObject.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/RegisterObject.java
index 58c35a56e0f..8f4e00c4b2b 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/RegisterObject.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/RegisterObject.java
@@ -2,7 +2,6 @@ package org.eclipse.cdt.debug.mi.core.cdi.model;
 
 import org.eclipse.cdt.debug.core.cdi.model.ICDIRegisterObject;
 import org.eclipse.cdt.debug.core.cdi.model.ICDITarget;
-import org.eclipse.cdt.debug.mi.core.cdi.model.*;
 
 /**
  */
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/VariableObject.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/VariableObject.java
index c2c91237045..946827807b4 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/VariableObject.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/VariableObject.java
@@ -5,6 +5,7 @@
  */
 package org.eclipse.cdt.debug.mi.core.cdi.model;
 
+import org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame;
 import org.eclipse.cdt.debug.core.cdi.model.ICDITarget;
 import org.eclipse.cdt.debug.core.cdi.model.ICDIVariableObject;
 
@@ -14,10 +15,10 @@ public class VariableObject extends CObject implements ICDIVariableObject {
 
 	String name;
 	int position;
-	StackFrame frame;
+	ICDIStackFrame frame;
 	int stackdepth;
 
-	public VariableObject(ICDITarget target, String n, StackFrame stack, int pos, int depth) {
+	public VariableObject(ICDITarget target, String n, ICDIStackFrame stack, int pos, int depth) {
 		super(target);
 		name = n;
 		frame = stack;
@@ -29,7 +30,7 @@ public class VariableObject extends CObject implements ICDIVariableObject {
 		return target;
 	}
 
-	public StackFrame getStackFrame() {
+	public ICDIStackFrame getStackFrame() {
 		return frame;
 	}