diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICBreakpoint.java
index 4fa26bbc63d..a75a1bddd69 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICBreakpoint.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICBreakpoint.java
@@ -21,6 +21,7 @@ package org.eclipse.cdt.debug.core.cdi;
  */
 public interface ICBreakpoint extends ICSessionObject
 {
+	final static public int REGULAR = 0x0;
 	final static public int TEMPORARY = 0x1;
 	final static public int HARDWARE = 0x2;
 
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICBreakpointManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICBreakpointManager.java
index 89e24415826..3e0295a4560 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICBreakpointManager.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICBreakpointManager.java
@@ -52,17 +52,15 @@ public interface ICBreakpointManager extends ICSessionObject
 	 * @param type - a combination of TEMPORARY and HARDWARE or 0
 	 * @param location - the location 
 	 * @param condition - the condition or <code>null</code>
-	 * @param enabled - whether this breakpoint should be enabled
 	 * @param threadId - the thread identifier if this is 
 	 * a thread-specific breakpoint or <code>null</code>
 	 * @return a breakpoint
 	 * @throws CDIException on failure. Reasons include:
 	 */
 	ICLocationBreakpoint setLocationBreakpoint( int type,
-												  ICLocation location,
-												  ICCondition condition,
-												  boolean enabled,
-												  String threadId ) throws CDIException;
+												ICLocation location,
+												ICCondition condition,
+												String threadId ) throws CDIException;
 	
 	/**
 	 * Sets a watchpoint for the given expression.
@@ -70,28 +68,24 @@ public interface ICBreakpointManager extends ICSessionObject
 	 * @param watchType - a combination of READ and WRITE
 	 * @param expression - the expression to watch
 	 * @param condition - the condition or <code>null</code>
-	 * @param enabled - whether this watchpoint should be enabled
 	 * @return a watchpoint
 	 * @throws CDIException on failure. Reasons include:
 	 */
 	ICWatchpoint setWatchpoint( int type,
-								  int watchType,
-								  String expression,
-								  ICCondition condition,
-								  boolean enabled ) throws CDIException;
+								int watchType,
+								String expression,
+								ICCondition condition ) throws CDIException;
 	
 	/**
 	 * Sets a catchpoint for the given catch event.
 	 * @param type - a combination of TEMPORARY and HARDWARE or 0
 	 * @param event - the event to catch
 	 * @param condition - the condition or <code>null</code>
-	 * @param enabled - whether this catchpoint should be enabled
 	 * @return a catchpoint
 	 * @throws CDIException on failure. Reasons include:
 	 */
 	ICCatchpoint setCatchpoint( int type,
-								  ICCatchEvent event,
-								  String expression,
-								  ICCondition condition,
-								  boolean enabled ) throws CDIException;
+								ICCatchEvent event,
+								String expression,
+								ICCondition condition ) throws CDIException;
 }
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICLocation.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICLocation.java
index 0661ca9ffaa..64984ce0b28 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICLocation.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICLocation.java
@@ -5,8 +5,6 @@
  */
 package org.eclipse.cdt.debug.core.cdi;
 
-import java.io.File;
-
 import org.eclipse.cdt.debug.core.cdi.model.ICInstruction;
 
 /**
@@ -30,7 +28,7 @@ public interface ICLocation
 	 *  
 	 * @return the source file of this location
 	 */
-	File getFile();
+	String getFile();
 
 	/**
 	 * Returns the function of this location or <code>null</code>