diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/BindingClassifier.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/BindingClassifier.java
index 17f52971b9a..d2071d2d6bb 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/BindingClassifier.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/BindingClassifier.java
@@ -1236,7 +1236,9 @@ public class BindingClassifier {
 		} else if (binding instanceof ICPPTemplateParameter) {
 			newBindings.add(binding);
 		} else if (binding instanceof ICPPUnknownBinding) {
-			newBindings.add(binding.getOwner());
+			IBinding owner = binding.getOwner();
+			if (owner != null)
+				newBindings.add(owner);
 		} else if (binding instanceof ICPPMethod) {
 			newBindings.add(binding);  // Include the method in case we need its inline definition.
 			if (binding instanceof ICPPConstructor)