diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ConflictSet.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ConflictSet.java
index 4ac4a574ad0..05a682db4b1 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ConflictSet.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ConflictSet.java
@@ -27,7 +27,7 @@ import org.eclipse.core.runtime.IPath;
 
 public class ConflictSet {
 	public static final IConflict[] EMPTY_CONFLICT_ARRAY = new IConflict[0];
-	public static final IRealBuildObjectAssociation[] EMPTY_BO_ARRAY = new IRealBuildObjectAssociation[0];
+	public static final IBuildObject[] EMPTY_BO_ARRAY = new IBuildObject[0];
 	
 	private PerTypeMapStorage fConflictStorage;
 	private List fConflictMatchList;
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/PerTypeMapStorage.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/PerTypeMapStorage.java
index f3d64772042..367f899a4f4 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/PerTypeMapStorage.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/PerTypeMapStorage.java
@@ -19,8 +19,8 @@ import org.eclipse.cdt.managedbuilder.internal.core.IRealBuildObjectAssociation;
 public class PerTypeMapStorage implements Cloneable {
 	private ObjectTypeBasedStorage fStorage = new ObjectTypeBasedStorage();
 	
-	public Map getMap(int type, boolean create){
-		Map<IRealBuildObjectAssociation, Set> map = (Map<IRealBuildObjectAssociation, Set>)fStorage.get(type);
+	public Map/*<IRealBuildObjectAssociation, ?>*/ getMap(int type, boolean create){
+		Map<IRealBuildObjectAssociation, ?> map = (Map<IRealBuildObjectAssociation, ?>)fStorage.get(type);
 		if(map == null && create){
 			map = createMap(null);
 			fStorage.set(type, map);