diff --git a/core/org.eclipse.cdt.core/parser/ChangeLog-parser b/core/org.eclipse.cdt.core/parser/ChangeLog-parser
index a88d12fa0e9..6528586bf13 100644
--- a/core/org.eclipse.cdt.core/parser/ChangeLog-parser
+++ b/core/org.eclipse.cdt.core/parser/ChangeLog-parser
@@ -1,3 +1,6 @@
+2004-02-24 John Camelon
+	Fixed https://bugs.eclipse.org/bugs/show_bug.cgi?id=52823
+
 2004-02-24 John Camelon
 	Partial Fix for Bug 52534 - Selection Search offset limit reached is broken 
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java
index 57e04483e0d..5c173a1bde7 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java
@@ -123,6 +123,7 @@ public abstract class Parser extends ExpressionParser implements IParser
      */
     protected void translationUnit()
     {
+  
         try
         {
             compilationUnit = astFactory.createCompilationUnit();
@@ -132,7 +133,14 @@ public abstract class Parser extends ExpressionParser implements IParser
             return;
         }
 
-		compilationUnit.enterScope( requestor );     
+		compilationUnit.enterScope( requestor );
+		try {
+			setCompletionValues(compilationUnit, CompletionKind.VARIABLE_TYPE, Key.DECLARATION );
+		} catch (EndOfFileException e1) {
+			compilationUnit.exitScope( requestor );
+			return;
+		}
+		
         IToken lastBacktrack = null;
         IToken checkToken = null;
         while (true)