diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/IIndexQuery.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/IIndexQuery.java
index daea3765b84..14e7d5eaf05 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/IIndexQuery.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/IIndexQuery.java
@@ -15,7 +15,8 @@ import org.eclipse.core.runtime.IPath;
 
 /**
  * Generic indexer query interface to allow for queries of any existing indexer storage mechanism
- * To be considered in development.
+ * To be considered in development - not currently hooked up, but as a placeholder for future clients.
+ * See Bugzilla # 96775 for more details.
  * @author bgheorgh
  * @since 3.0
  */
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/ctagsindexer/CTagEntry.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/ctagsindexer/CTagEntry.java
index 7b724f06ffc..0c3bf9af4c6 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/ctagsindexer/CTagEntry.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/ctagsindexer/CTagEntry.java
@@ -192,7 +192,7 @@ class CTagEntry{
 			typeEntry.setBaseTypes(getInherits());
 			typeEntry.serialize(output);
     	} else if (kind.equals(CTagsConsoleParser.TYPEDEF)){
-			TypeEntry typeEntry = new TypeEntry(IIndex.TYPE_TYPEDEF,IIndex.DEFINITION, fullName, getModifiers(), fileNum);
+			TypeEntry typeEntry = new TypeEntry(IIndex.TYPE_TYPEDEF,IIndex.DECLARATION, fullName, getModifiers(), fileNum);
 			typeEntry.setNameOffset(lineNumber, 1, IIndex.LINE);
 			typeEntry.serialize(output);
     	} else if (kind.equals(CTagsConsoleParser.UNION)){