--- a/debuggercdi/com.nokia.cdt.debug.common/META-INF/MANIFEST.MF	Mon Sep 20 13:52:50 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.common/META-INF/MANIFEST.MF	Mon Sep 20 13:13:27 2010 -0600
@@ -11,7 +11,8 @@
  org.eclipse.debug.core;bundle-version="3.6.0",
  com.nokia.carbide.cdt.builder;bundle-version="2.0.0",
  com.nokia.carbide.remoteConnections;bundle-version="1.4.0",
- org.eclipse.core.filesystem;bundle-version="1.3.0"
+ org.eclipse.core.filesystem;bundle-version="1.3.0",
+ org.eclipse.cdt.debug.edc;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: com.nokia.cdt.debug.common.internal.api,

--- a/debuggercdi/com.nokia.cdt.debug.common/src/com/nokia/cdt/debug/common/internal/executables/SymbianSourceFileRemapping.java	Mon Sep 20 13:52:50 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.common/src/com/nokia/cdt/debug/common/internal/executables/SymbianSourceFileRemapping.java	Mon Sep 20 13:13:27 2010 -0600
@@ -46,9 +46,11 @@
 	
 	private Job saveThePrefsJob = new Job(""){
 
+		@SuppressWarnings("restriction")
 		@Override
 		protected IStatus run(IProgressMonitor monitor) {
-			CDebugCorePlugin.getDefault().savePluginPreferences();
+			CSourceLookupDirector director = CDebugCorePlugin.getDefault().getCommonSourceLookupDirector();
+			director.setSourceContainers(director.getSourceContainers()); // force it to write out the prefs
 			return Status.OK_STATUS;
 		}};