diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/messages.properties b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/messages.properties
index 543e72388e7..abafa867ef6 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/messages.properties
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/messages.properties
@@ -12,11 +12,12 @@
 
 engine.searching = Searching...
 exception.wrongFormat = Wrong format
-process.name = CDT Indexer
+process.name = C/C++ Indexer
 manager.filesToIndex = {0} files to index
 indexerJob = C/C++ Indexer
 indexerMarker.prefix= C/C++ Indexer Problem:
 indexerMarker.processing= Processing C/C++ Index Markers
+indexNotificationJob=Updating C/C++ Indexer clients
 
 convention.illegalIdentifier= Illegal identifier
 convention.invalid= Invalid identifier
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/IndexManager.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/IndexManager.java
index 19552a27f2d..18fe7a6957e 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/IndexManager.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/IndexManager.java
@@ -29,8 +29,8 @@ import org.eclipse.cdt.core.ICLogConstants;
 import org.eclipse.cdt.core.index.IIndexChangeListener;
 import org.eclipse.cdt.core.index.IndexChangeEvent;
 import org.eclipse.cdt.core.model.ICModelMarker;
-import org.eclipse.cdt.core.model.IElementChangedListener;
 import org.eclipse.cdt.internal.core.CharOperation;
+import org.eclipse.cdt.internal.core.Util;
 import org.eclipse.cdt.internal.core.index.IIndex;
 import org.eclipse.cdt.internal.core.index.impl.Index;
 import org.eclipse.cdt.internal.core.index.impl.IndexDelta;
@@ -96,7 +96,8 @@ public class IndexManager extends JobManager implements IIndexConstants {
 	 * Collection of listeners for indexer deltas
 	 */
 	protected List indexChangeListeners = Collections.synchronizedList(new ArrayList());
-
+	public static final String INDEX_NOTIFICATION_NAME = Util.bind( "indexNotificationJob" ); //$NON-NLS-1$
+	
 	public final static String INDEX_MODEL_ID = CCorePlugin.PLUGIN_ID + ".newindexmodel"; //$NON-NLS-1$
 	public final static String ACTIVATION = "enable"; //$NON-NLS-1$
 	public final static String PROBLEM_ACTIVATION = "problemEnable"; //$NON-NLS-1$
@@ -832,7 +833,7 @@ public class IndexManager extends JobManager implements IIndexConstants {
 				}
 				
 				// wrap callbacks with Safe runnable for subsequent listeners to be called when some are causing grief
-				Job job = new Job("Update Index Listeners"){
+				Job job = new Job(INDEX_NOTIFICATION_NAME){
 					protected IStatus run(IProgressMonitor monitor)	{	
 						Platform.run(new ISafeRunnable() {
 							public void handleException(Throwable exception) {
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/SourceIndexerRequestor.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/SourceIndexerRequestor.java
index c6a71ccaf08..a69cc360829 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/SourceIndexerRequestor.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/SourceIndexerRequestor.java
@@ -754,7 +754,10 @@ public class SourceIndexerRequestor implements ISourceElementRequestor, IIndexCo
 	}
 	
 	public boolean shouldRecordProblem( IProblem problem ){
-		 return problem.checkCategory( IProblem.PREPROCESSOR_RELATED );
+		if( problem.checkCategory( IProblem.PREPROCESSOR_RELATED ) ){
+			return problem.getID() != IProblem.PREPROCESSOR_CIRCULAR_INCLUSION;
+		}
+		return false;
 	}
 
 	public void requestRemoveMarkers(IFile resource, IFile originator ){
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 2e0887eec2e..2365191a532 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
@@ -23,10 +23,10 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
+
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.model.IWorkingCopy;
-import org.eclipse.cdt.core.parser.DefaultProblemHandler;
 import org.eclipse.cdt.core.parser.IParser;
 import org.eclipse.cdt.core.parser.IProblem;
 import org.eclipse.cdt.core.parser.IScanner;