diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java
index 01091f4ba98..3bd32602f2f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java
@@ -45,6 +45,7 @@ import org.eclipse.cdt.core.dom.ast.gnu.cpp.GPPLanguage;
 import org.eclipse.cdt.core.model.ILanguage;
 import org.eclipse.cdt.internal.core.Util;
 import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPBlockScope;
+import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalFunction;
 import org.eclipse.cdt.internal.core.pdom.PDOM;
 import org.eclipse.cdt.internal.core.pdom.db.IBTreeComparator;
 import org.eclipse.cdt.internal.core.pdom.dom.IPDOMMemberOwner;
@@ -177,10 +178,12 @@ class PDOMCPPLinkage extends PDOMLinkage {
 		} else if (binding instanceof ICPPMethod && parent instanceof PDOMCPPClassType) {
 			pdomBinding = new PDOMCPPMethod(pdom, parent, (ICPPMethod)binding);
 		} else if (binding instanceof ICPPFunction) {
-			ICPPFunction func= (ICPPFunction) binding;
-//			if (!func.isStatic()) {  // bug 161216
+			ICPPFunction func = (ICPPFunction)binding;
+			if (binding instanceof ICPPInternalFunction) {
+				if (!((ICPPInternalFunction)binding).isStatic(false))
+					pdomBinding = new PDOMCPPFunction(pdom, parent, func);
+			} else
 				pdomBinding = new PDOMCPPFunction(pdom, parent, func);
-//			}
 		} else if (binding instanceof ICPPClassType) {
 			pdomBinding= new PDOMCPPClassType(pdom, parent, (ICPPClassType) binding);
 		} else if (binding instanceof ICPPNamespaceAlias) {
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CCorePluginResources.properties b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CCorePluginResources.properties
index 254b01d6d14..3a067836af0 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CCorePluginResources.properties
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CCorePluginResources.properties
@@ -9,7 +9,7 @@
 #     QNX Software Systems - Initial API and implementation
 ###############################################################################
 CBuilder.build_error= Build Error	
-CoreModel.BinaryRunner.Binary_Search_Thread=Binary Search Thread
+CoreModel.BinaryRunner.Binary_Search_Thread=Searching for Binaries
 CoreModel.CModelBuilder.Parser_Construction_Failure=Parser/Scanner construction failure.
 CoreModel.CModelBuilder.Parse_Failure=Parse failure
 CoreModel.ArchiveContainer.Archives=Archives