diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/CIndex.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/CIndex.java
index 86651061148..c5907a0da4e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/CIndex.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/CIndex.java
@@ -680,7 +680,9 @@ public class CIndex implements IIndex {
 		HashMap<IIndexFileLocation, IIndexFile> result= new HashMap<IIndexFileLocation, IIndexFile>();
 		for (IIndexFragment fragment : fFragments) {
 			for (IIndexFragmentFile file : fragment.getAllFiles()) {
-				result.put(file.getLocation(), file);
+				if (file.hasContent()) { 
+					result.put(file.getLocation(), file);
+				}
 			}
 		}
 		return result.values().toArray(new IIndexFile[result.size()]);