diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java
index 525d8d0690c..996029379bd 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java
@@ -1467,7 +1467,10 @@ abstract class BaseScanner implements IScanner {
      * @see org.eclipse.cdt.core.parser.IScanner#isOnTopContext()
      */
     public boolean isOnTopContext() {
-        return bufferStackPos <= 0;
+		for (int i = 1; i <= bufferStackPos; ++i)
+			if (bufferData[i] instanceof InclusionData)
+				return false;
+		return true;
     }
 
     protected IToken lastToken;