diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java
index 95482531e03..250607d1710 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java
@@ -175,7 +175,7 @@ public class CHViewPart extends ViewPart {
 
 	public void reportNotIndexed(ICElement input) {
 		if (input != null && getInput() == input) {
-			setMessage(IndexUI.getFleNotIndexedMessage(input));
+			setMessage(IndexUI.getFileNotIndexedMessage(input));
 		}
 	}
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java
index cde9983f815..86c5ddebdaa 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java
@@ -210,12 +210,12 @@ public class IBViewPart extends ViewPart
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
-					IIndex index= CCorePlugin.getIndexManager().getIndex(input.getCProject());
+					final ICProject[] projects= CoreModel.getDefault().getCModel().getCProjects();
+					IIndex index= CCorePlugin.getIndexManager().getIndex(projects);
 					index.acquireReadLock();
 					try {
 						if (!IndexUI.isIndexed(index, input)) {
-							final String msg = IndexUI
-									.getFleNotIndexedMessage(input);
+							final String msg = IndexUI.getFileNotIndexedMessage(input);
 							display.asyncExec(new Runnable() {
 								public void run() {
 									if (fTreeViewer.getInput() == input) {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHierarchyModel.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHierarchyModel.java
index 308c367cfdc..bb656d97199 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHierarchyModel.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHierarchyModel.java
@@ -319,7 +319,7 @@ class THHierarchyModel {
 					fGraph= graph;
 					THGraphNode inputNode= fGraph.getInputNode();
 					if (!fGraph.isFileIndexed()) {
-						fView.setMessage(IndexUI.getFleNotIndexedMessage(fInput));
+						fView.setMessage(IndexUI.getFileNotIndexedMessage(fInput));
 					}
 					else if (inputNode == null) {
 						fView.setMessage(Messages.THHierarchyModel_errorComputingHierarchy);
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexUI.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexUI.java
index de036d09e3f..981ec640e2e 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexUI.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexUI.java
@@ -394,7 +394,7 @@ public class IndexUI {
 		return result[0];
 	}
 
-	public static String getFleNotIndexedMessage(ICElement input) {
+	public static String getFileNotIndexedMessage(ICElement input) {
 		ITranslationUnit tu= null;
 		if (input instanceof ISourceReference) {
 			ISourceReference ref= (ISourceReference) input;