--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/META-INF/MANIFEST.MF	Fri Jul 31 12:18:13 2009 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/META-INF/MANIFEST.MF	Mon Aug 03 17:18:01 2009 -0500
@@ -20,6 +20,7 @@
  org.eclipse.ui.console,
  com.nokia.carbide.cpp.support,
  com.nokia.carbide.cdt.builder,
+ org.eclipse.help,
  com.nokia.carbide.cpp.sdk.core,
  com.nokia.carbide.cpp.ui,
  org.eclipse.jface.text,

--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/ui/executables/SymbianSourceFileRemapping.java	Fri Jul 31 12:18:13 2009 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/ui/executables/SymbianSourceFileRemapping.java	Mon Aug 03 17:18:01 2009 -0500
@@ -16,6 +16,7 @@
 */
 package com.nokia.cdt.debug.cw.symbian.ui.executables;
 
+import org.eclipse.cdt.debug.core.executables.Executable;
 import org.eclipse.cdt.debug.core.executables.ISourceFileRemapping;
 import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator;
 import org.eclipse.cdt.debug.internal.core.sourcelookup.CSourceLookupDirector;
@@ -33,13 +34,13 @@
 
 public class SymbianSourceFileRemapping implements ISourceFileRemapping {
 
-	public String remapSourceFile(IPath executable, String filePath) {
+	public String remapSourceFile(Executable executable, String filePath) {
 
 		String epocRoot = "";
-		String[] segs = executable.segments();
+		String[] segs = executable.getPath().segments();
 		for (int i = 0; i < segs.length; i++) {
 			if (segs[i].equalsIgnoreCase("epoc32"))
-				epocRoot = executable.removeLastSegments(segs.length - i).toOSString();				
+				epocRoot = executable.getPath().removeLastSegments(segs.length - i).toOSString();				
 		}
 		if (epocRoot.length() > 0)
 		{

--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/ExecutablesTab.java	Fri Jul 31 12:18:13 2009 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/ExecutablesTab.java	Mon Aug 03 17:18:01 2009 -0500
@@ -412,7 +412,7 @@
 			// ignore 'urel', 'udeb' and 'lib' directories when getting the binaries for the same target
 			// removeLastSegments(2) will strip the filename and 'urel', 'udeb' or 'lib'
 			IPath launchExeTargetPath = new Path(new File(launchExeName).getCanonicalPath()).removeLastSegments(2); 
-			for (Executable executable : ExecutablesManager.getExecutablesManager().getExecutables(true)) {
+			for (Executable executable : ExecutablesManager.getExecutablesManager().getExecutables()) {
 				IPath exePath = executable.getPath();
 				if (launchExeTargetPath.isPrefixOf(exePath))
 						files.add(new ExeFileToDebug(exePath.toOSString(), true));