diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/Index.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/Index.java
index 94b992a58c1..d0783ab2b4c 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/Index.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/Index.java
@@ -32,6 +32,7 @@ import org.eclipse.cdt.internal.core.index.cindexstorage.io.IndexInput;
 import org.eclipse.cdt.internal.core.index.cindexstorage.io.IndexOutput;
 import org.eclipse.cdt.internal.core.index.cindexstorage.io.MergeFactory;
 import org.eclipse.cdt.internal.core.index.cindexstorage.io.SimpleIndexInput;
+import org.eclipse.cdt.internal.core.index.ctagsindexer.CTagsIndexer;
 import org.eclipse.cdt.internal.core.index.impl.IndexDelta;
 import org.eclipse.cdt.internal.core.index.impl.Int;
 import org.eclipse.cdt.internal.core.index.sourceindexer.SourceIndexer;
@@ -315,6 +316,9 @@ public class Index implements IIndex, ICIndexStorageConstants, ICSearchConstants
 			if (indexer instanceof SourceIndexer){
 				IndexDelta indexDelta = new IndexDelta(null,null,IIndexDelta.MERGE_DELTA);
 				((SourceIndexer) indexer).notifyListeners(indexDelta);
+			} else if (indexer instanceof CTagsIndexer) {
+				IndexDelta indexDelta = new IndexDelta(null,null,IIndexDelta.MERGE_DELTA);
+				((CTagsIndexer) indexer).notifyListeners(indexDelta);
 			}
 		}
 	}
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java
index d238669eef0..598e8941f9b 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java
@@ -1098,7 +1098,7 @@ public class CoreModel {
 
 	public static boolean isScannerInformationEmpty(IResource resource) {
 		final int PATH_ENTRY_MASK = IPathEntry.CDT_INCLUDE | IPathEntry.CDT_MACRO |
-									IPathEntry.CDT_INCLUDE_FILE | IPathEntry.CDT_MACRO_FILE | IPathEntry.CDT_SOURCE;
+									IPathEntry.CDT_INCLUDE_FILE | IPathEntry.CDT_MACRO_FILE;
 		boolean rc = true;
 		IPath resPath = resource.getFullPath();
 		IProject project = resource.getProject();
diff --git a/core/org.eclipse.cdt.ui.tests/plugin.xml b/core/org.eclipse.cdt.ui.tests/plugin.xml
index 83c621813b6..af580df3816 100644
--- a/core/org.eclipse.cdt.ui.tests/plugin.xml
+++ b/core/org.eclipse.cdt.ui.tests/plugin.xml
@@ -30,6 +30,7 @@
       <import plugin="org.eclipse.compare"/>
       <import plugin="org.eclipse.ui.console"/>
       <import plugin="org.eclipse.core.expressions"/>
+      <import plugin="org.eclipse.cdt.make.core"/>
    </requires>
 
    <extension
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selectiontests/CPPSelectionTestsCTagsIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selectiontests/CPPSelectionTestsCTagsIndexer.java
index 8e5d3fceb7a..57dfb2009df 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selectiontests/CPPSelectionTestsCTagsIndexer.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selectiontests/CPPSelectionTestsCTagsIndexer.java
@@ -16,6 +16,7 @@ import junit.framework.AssertionFailedError;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+import org.eclipse.cdt.core.CCProjectNature;
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.dom.ast.IASTName;
 import org.eclipse.cdt.core.dom.ast.IASTNode;
@@ -26,8 +27,13 @@ import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
 import org.eclipse.cdt.internal.core.index.ctagsindexer.CTagsIndexer;
 import org.eclipse.cdt.internal.core.index.sourceindexer.SourceIndexer;
 import org.eclipse.cdt.internal.core.search.indexing.IndexManager;
+import org.eclipse.cdt.make.core.MakeProjectNature;
+import org.eclipse.cdt.make.core.scannerconfig.ScannerConfigNature;
+import org.eclipse.cdt.make.internal.core.scannerconfig2.PerProjectSICollector;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.NullProgressMonitor;
@@ -70,8 +76,12 @@ public class CPPSelectionTestsCTagsIndexer extends BaseSelectionTestsIndexer
 		//Enable indexing on test project
 		project.setSessionProperty(SourceIndexer.activationKey,new Boolean(true));
 		
-		if (project==null)
-			fail("Unable to create project");	 //$NON-NLS-1$
+		if (project==null) fail("Unable to create project");	 //$NON-NLS-1$
+		IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(project.getName());
+		CCProjectNature.addCCNature(project,monitor); 
+		MakeProjectNature.addNature(project, new NullProgressMonitor());
+		ScannerConfigNature.addScannerConfigNature(project);
+		PerProjectSICollector.calculateCompilerBuiltins(project);
 		
 		indexManager = CCorePlugin.getDefault().getCoreModel().getIndexManager();
 		
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selectiontests/CPPSelectionTestsDOMIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selectiontests/CPPSelectionTestsDOMIndexer.java
index ab217903bb9..45a59df731a 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selectiontests/CPPSelectionTestsDOMIndexer.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selectiontests/CPPSelectionTestsDOMIndexer.java
@@ -18,6 +18,7 @@ import junit.framework.AssertionFailedError;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+import org.eclipse.cdt.core.CCProjectNature;
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.dom.ast.IASTName;
 import org.eclipse.cdt.core.dom.ast.IASTNode;
@@ -27,8 +28,13 @@ import org.eclipse.cdt.core.testplugin.CProjectHelper;
 import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
 import org.eclipse.cdt.internal.core.index.sourceindexer.SourceIndexer;
 import org.eclipse.cdt.internal.core.search.indexing.IndexManager;
+import org.eclipse.cdt.make.core.MakeProjectNature;
+import org.eclipse.cdt.make.core.scannerconfig.ScannerConfigNature;
+import org.eclipse.cdt.make.internal.core.scannerconfig2.PerProjectSICollector;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.NullProgressMonitor;
@@ -69,8 +75,12 @@ public class CPPSelectionTestsDOMIndexer extends BaseSelectionTestsIndexer imple
 		//Enable indexing on test project
 		project.setSessionProperty(SourceIndexer.activationKey,new Boolean(true));
 		
-		if (project==null)
-			fail("Unable to create project");	 //$NON-NLS-1$
+		if (project==null) fail("Unable to create project");	 //$NON-NLS-1$
+		IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(project.getName());
+		CCProjectNature.addCCNature(project,monitor); 
+		MakeProjectNature.addNature(project, new NullProgressMonitor());
+		ScannerConfigNature.addScannerConfigNature(project);
+		PerProjectSICollector.calculateCompilerBuiltins(project);
 		
 		indexManager = CCorePlugin.getDefault().getCoreModel().getIndexManager();
 
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selectiontests/CSelectionTestsCTagsIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selectiontests/CSelectionTestsCTagsIndexer.java
index 3d5e3e68552..dd4afccab31 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selectiontests/CSelectionTestsCTagsIndexer.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selectiontests/CSelectionTestsCTagsIndexer.java
@@ -26,8 +26,14 @@ import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
 import org.eclipse.cdt.internal.core.index.ctagsindexer.CTagsIndexer;
 import org.eclipse.cdt.internal.core.index.sourceindexer.SourceIndexer;
 import org.eclipse.cdt.internal.core.search.indexing.IndexManager;
+import org.eclipse.cdt.make.core.MakeProjectNature;
+import org.eclipse.cdt.make.core.scannerconfig.ScannerConfigNature;
+import org.eclipse.cdt.make.internal.core.scannerconfig2.PerProjectSICollector;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.NullProgressMonitor;
@@ -71,10 +77,13 @@ public class CSelectionTestsCTagsIndexer extends BaseSelectionTestsIndexer
 		
 		//Enable indexing on test project
 		project.setSessionProperty(SourceIndexer.activationKey,new Boolean(true));
-		
-		if (project==null)
-			fail("Unable to create project");	 //$NON-NLS-1$
-		
+
+		if (project==null) fail("Unable to create project");	 //$NON-NLS-1$
+		IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(project.getName());
+		MakeProjectNature.addNature(project, new NullProgressMonitor());
+		ScannerConfigNature.addScannerConfigNature(project);
+		PerProjectSICollector.calculateCompilerBuiltins(project);
+
 		indexManager = CCorePlugin.getDefault().getCoreModel().getIndexManager();
 		
 		resetIndexer(sourceIndexerID); // set indexer
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selectiontests/CSelectionTestsDOMIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selectiontests/CSelectionTestsDOMIndexer.java
index 369a559d2f7..c62eaa5c379 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selectiontests/CSelectionTestsDOMIndexer.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selectiontests/CSelectionTestsDOMIndexer.java
@@ -25,8 +25,13 @@ import org.eclipse.cdt.core.testplugin.CProjectHelper;
 import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
 import org.eclipse.cdt.internal.core.index.sourceindexer.SourceIndexer;
 import org.eclipse.cdt.internal.core.search.indexing.IndexManager;
+import org.eclipse.cdt.make.core.MakeProjectNature;
+import org.eclipse.cdt.make.core.scannerconfig.ScannerConfigNature;
+import org.eclipse.cdt.make.internal.core.scannerconfig2.PerProjectSICollector;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.NullProgressMonitor;
@@ -66,9 +71,12 @@ public class CSelectionTestsDOMIndexer extends BaseSelectionTestsIndexer impleme
 		
 		//Enable indexing on test project
 		project.setSessionProperty(SourceIndexer.activationKey,new Boolean(true));
-		
-		if (project==null)
-			fail("Unable to create project");	 //$NON-NLS-1$
+
+		if (project==null) fail("Unable to create project");	 //$NON-NLS-1$
+		IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(project.getName());
+		MakeProjectNature.addNature(project, new NullProgressMonitor());
+		ScannerConfigNature.addScannerConfigNature(project);
+		PerProjectSICollector.calculateCompilerBuiltins(project);
 		
 		indexManager = CCorePlugin.getDefault().getCoreModel().getIndexManager();