diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java
index 10656406854..8a55afcaead 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java
@@ -1427,7 +1427,7 @@ public class Configuration extends BuildObject implements IConfiguration, IBuild
 			set.toArray(result);
 			return result;
 		}
-		return ErrorParserManager.getErrorParserAvailableIds();
+		return ErrorParserManager.getErrorParserAvailableIdsInContext(ErrorParserManager.BUILD_CONTEXT);
 	}
 
 	public Set<String> contributeErrorParsers(Set<String> set, boolean includeChildren) {
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Target.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Target.java
index 2e03f2b5576..1f080d6851c 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Target.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Target.java
@@ -483,7 +483,7 @@ public class Target extends BuildObject implements ITarget {
 		} else {
 			// If no error parsers are specified by the target, the default is
 			// all error parsers
-			errorParsers = ErrorParserManager.getErrorParserAvailableIds();
+			errorParsers = ErrorParserManager.getErrorParserAvailableIdsInContext(ErrorParserManager.BUILD_CONTEXT);
 		}
 		return errorParsers;
 	}
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java
index 2357f2e4473..0a0e0e3d19f 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java
@@ -1000,7 +1000,7 @@ public class CCorePlugin extends Plugin {
 	@Deprecated
 	public String[] getAllErrorParsersIDs() {
 		ErrorParserExtensionManager.loadErrorParserExtensions();
-		return ErrorParserExtensionManager.getErrorParserAvailableIds();
+		return ErrorParserExtensionManager.getErrorParserAvailableIdsInContext(ErrorParserManager.BUILD_CONTEXT);
 	}
 
 	/**
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/IErrorParser3.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/IErrorParser3.java
index 92c2ac2b26b..9fcadeee62a 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/IErrorParser3.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/IErrorParser3.java
@@ -13,7 +13,7 @@ package org.eclipse.cdt.core;
 /**
  * @since 5.4
  */
-public interface IErrorParser3 extends IErrorParser2 {
+public interface IErrorParser3 extends IErrorParser {
 	/**
 	 * Called to let the parser know that the end of the error stream has been reached.
 	 * Can be used by the parser to flush its internal buffers.
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/internal/core/Pair.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/internal/core/Pair.java
deleted file mode 100644
index 3be11ee6541..00000000000
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/internal/core/Pair.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 Google, Inc and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Alex Ruiz (Google) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.internal.core;
-
-/**
- * A pair of values.
- */
-public class Pair<F, S> {
-	public final F first;
-	public final S second;
-
-	public Pair(F first, S second) {
-		this.first = first;
-		this.second = second;
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("<"); //$NON-NLS-1$
-		builder.append(first);
-		builder.append(">, <"); //$NON-NLS-1$
-		builder.append(second);
-		builder.append(">"); //$NON-NLS-1$
-		return builder.toString();
-	}
-}