diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/ITypeEntry.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/ITypeEntry.java
index 902e6c2c5ad..385286aa705 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/ITypeEntry.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/ITypeEntry.java
@@ -41,6 +41,6 @@ public interface ITypeEntry extends INamedEntry  {
 	 * Returns the types that are inherited 
 	 * @return an array of char arrays - each representing a separate type that this entry inherits from
 	 */
-	public char[][] getBaseTypes();
+	public IIndexEntry[] getBaseTypes();
 	
 }
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/TypeEntry.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/TypeEntry.java
index 2f667cf46fe..54609db036f 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/TypeEntry.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/TypeEntry.java
@@ -11,10 +11,11 @@
 
 package org.eclipse.cdt.internal.core.index;
 
+
 public class TypeEntry  extends NamedEntry implements ITypeEntry {
 
 	int type_kind;
-	char[][] baseTypes;
+	IIndexEntry[] baseTypes;
 	       
 	public TypeEntry(int type_kind, int entry_type, char[][] fullName, int modifiers, int fileNumber){
 		super(IIndex.TYPE, entry_type, fullName, modifiers, fileNumber);
@@ -29,11 +30,11 @@ public class TypeEntry  extends NamedEntry implements ITypeEntry {
 		return type_kind;
 	}
 	
-	public void setBaseTypes(char[][] baseTypes) {
+	public void setBaseTypes(IIndexEntry[] baseTypes) {
 		this.baseTypes=baseTypes;
 	}
 
-	public char[][] getBaseTypes() {
+	public IIndexEntry[] getBaseTypes() {
 		return baseTypes;
 	}