diff --git a/core/org.eclipse.cdt.core/index/ChangeLog b/core/org.eclipse.cdt.core/index/ChangeLog
index 3a683b3b557..ed5b01eb8e7 100644
--- a/core/org.eclipse.cdt.core/index/ChangeLog
+++ b/core/org.eclipse.cdt.core/index/ChangeLog
@@ -1,3 +1,6 @@
+2004-06-13 Bogdan Gheorghe
+	Fix for Bug 63275 - Ensured that only declarations and references are found for enumerations/enumerators
+	
 2004-05-28 Bogdan Gheorghe
     Fix for Bug 63831 - Ability to determine when the index is incomplete
     Provided a way for external clients to query the index state of a project
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/AbstractIndexer.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/AbstractIndexer.java
index bb374e8c763..8b3447e2721 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/AbstractIndexer.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/AbstractIndexer.java
@@ -543,9 +543,13 @@ public abstract class AbstractIndexer implements IIndexer, IIndexConstants, ICSe
 			prefix = ENUMTOR_REF;
 		} else if( limitTo == DECLARATIONS ){
 			prefix = ENUMTOR_DECL;
-		} else {
+		} else if (limitTo == ALL_OCCURRENCES){
 			return ENUMTOR_ALL;
 		}
+		else {
+			//Definitions
+			return "noEnumtorDefs".toCharArray();
+		}
 		
 		return bestPrefix( prefix, (char)0, enumeratorName, containingTypes, matchMode, isCaseSensitive );
 	}  
diff --git a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/MatchLocator.java b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/MatchLocator.java
index d2ae789b8d2..04e54added2 100644
--- a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/MatchLocator.java
+++ b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/MatchLocator.java
@@ -202,7 +202,6 @@ public class MatchLocator implements IMatchLocator{
 			IASTEnumerator enumerator = (IASTEnumerator) iter.next();
 			lastDeclaration = enumerator;
 			check ( DECLARATIONS, enumerator );
-			check ( DEFINITIONS, enumerator );
 		}  
 	}