diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CDirectorySourceLocation.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CDirectorySourceLocation.java
index a9bae3e18c1..d8f2118652d 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CDirectorySourceLocation.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CDirectorySourceLocation.java
@@ -29,9 +29,9 @@ import org.eclipse.cdt.debug.core.CDebugCorePlugin;
 import org.eclipse.cdt.debug.core.CDebugUtils;
 import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation;
 import org.eclipse.cdt.debug.core.sourcelookup.IDirectorySourceLocation;
+import org.eclipse.cdt.internal.core.resources.ResourceLookup;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
@@ -196,7 +196,7 @@ public class CDirectorySourceLocation implements IDirectorySourceLocation {
 		}
 
 		// Try for a file in another workspace project
-		IFile[] wsFiles = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(filePath);
+		IFile[] wsFiles = ResourceLookup.findFilesForLocation(filePath);
 		LinkedList<IFile> list = new LinkedList<IFile>();
 		for (int j = 0; j < wsFiles.length; ++j)
 			if (wsFiles[j].exists()) {
@@ -247,7 +247,7 @@ public class CDirectorySourceLocation implements IDirectorySourceLocation {
 		File file = path.toFile();
 		if (file.exists() && file.isFile()) {
 			path = new Path(file.getAbsolutePath());
-			IFile[] wsFiles = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(path);
+			IFile[] wsFiles = ResourceLookup.findFilesForLocation(path);
 			LinkedList<IFile> list = new LinkedList<IFile>();
 			for (int j = 0; j < wsFiles.length; ++j)
 				if (wsFiles[j].exists()) {
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/MapEntrySourceContainer.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/MapEntrySourceContainer.java
index 39519e3b549..cc7afeda399 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/MapEntrySourceContainer.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/MapEntrySourceContainer.java
@@ -19,8 +19,8 @@ import org.eclipse.cdt.core.model.ICProject;
 import org.eclipse.cdt.debug.core.CDebugCorePlugin;
 import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.internal.core.model.ExternalTranslationUnit;
+import org.eclipse.cdt.internal.core.resources.ResourceLookup;
 import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
@@ -117,7 +117,7 @@ public class MapEntrySourceContainer extends AbstractSourceContainer {
 			path = path.removeFirstSegments(getBackendPath().segmentCount());
 			path = getLocalPath().append(path);
 
-			IFile[] wsFiles = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(path);
+			IFile[] wsFiles = ResourceLookup.findFilesForLocation(path);
 			ArrayList<IFile> list = new ArrayList<IFile>();
 			for (int j = 0; j < wsFiles.length; ++j) {
 				if (wsFiles[j].exists()) {