diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexer.java
index 3d2cf1749ef..85a54be9b28 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexer.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexer.java
@@ -209,6 +209,13 @@ public abstract class StandaloneIndexer {
 		return fIndexAllFiles;
 	}
 	
+	/**
+	 * If true then all files will be indexed.
+	 */
+	public void setIndexAllFiles(boolean indexAllFiles) {
+		fIndexAllFiles = indexAllFiles;
+	}
+	
 	/**
 	 * Returns the collection of valid file extensions for C/C++ source.
 	 */
@@ -373,6 +380,7 @@ public abstract class StandaloneIndexer {
 			clearIndex();
 			fDelegate= createTask(getFilesAdded(tus), NO_TUS, NO_TUS);
 			fDelegate.setUpdateFlags(fUpdateOptions);
+			fDelegate.setParseUpFront();
 			
 			if (fDelegate != null) {
 				fDelegate.run(monitor);