diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/efsextension/tests/EFSExtensionTests.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/efsextension/tests/EFSExtensionTests.java
index 6460adf322b..dbfa0aac4b7 100644
--- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/efsextension/tests/EFSExtensionTests.java
+++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/efsextension/tests/EFSExtensionTests.java
@@ -10,18 +10,17 @@
  *******************************************************************************/
 package org.eclipse.cdt.core.internal.efsextension.tests;
 
-import java.io.File;
 import java.net.URI;
 import java.net.URISyntaxException;
 
-import org.eclipse.cdt.utils.EFSExtensionManager;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
+import org.eclipse.cdt.utils.EFSExtensionManager;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+
 /**
  * Tests the EFSExtensionManager and EFSExtensionProvider classes, as well as the EFSExtensionProvider extension point.
  * 
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ErrorParserManager.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ErrorParserManager.java
index 6cb3fd846e2..74b862247ec 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ErrorParserManager.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ErrorParserManager.java
@@ -455,7 +455,7 @@ outer:
 		URI uri;
 		if (!path.isAbsolute()) {
 			URI workingDirectoryURI = getWorkingDirectoryURI();
-			uri = EFSExtensionManager.getDefault().append(getWorkingDirectoryURI(), path.toString());
+			uri = EFSExtensionManager.getDefault().append(workingDirectoryURI, path.toString());
 		}
 		else {
 			uri = toURI(path);
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/EFSExtensionManager.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/EFSExtensionManager.java
index cce04b65515..6306dd6785b 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/EFSExtensionManager.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/EFSExtensionManager.java
@@ -16,7 +16,6 @@ import java.util.Map;
 
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.EFSExtensionProvider;
-import org.eclipse.core.filesystem.URIUtil;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;
@@ -64,16 +63,16 @@ public class EFSExtensionManager {
 				EXTENSION_ID);
 		if (extension != null) {
 			IExtension[] extensions = extension.getExtensions();
-			for (int i = 0; i < extensions.length; i++) {
-				IConfigurationElement[] configElements = extensions[i].getConfigurationElements();
-				for (int j = 0; j < configElements.length; j++) {
+			for (IExtension extension2 : extensions) {
+				IConfigurationElement[] configElements = extension2.getConfigurationElements();
+				for (IConfigurationElement configElement : configElements) {
 
-					String scheme = configElements[j].getAttribute("scheme"); //$NON-NLS-1$
-					String utility = configElements[j].getAttribute("class"); //$NON-NLS-1$
+					String scheme = configElement.getAttribute("scheme"); //$NON-NLS-1$
+					String utility = configElement.getAttribute("class"); //$NON-NLS-1$
 
 					if (utility != null) {
 						try {
-							Object execExt = configElements[j].createExecutableExtension("class"); //$NON-NLS-1$
+							Object execExt = configElement.createExecutableExtension("class"); //$NON-NLS-1$
 							if (execExt instanceof EFSExtensionProvider) {
 								fSchemeToExtensionProviderMap.put(scheme,
 										(EFSExtensionProvider) execExt);