diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index d37eb87e2cc..2688d158cfe 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -965,11 +965,11 @@
             sequence="M1+G"
             contextId="org.eclipse.cdt.ui.cEditorScope"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
-     <!--key
+     <key
             sequence="F4"
             contextId="org.eclipse.cdt.ui.cEditorScope"
-            commandId="org.eclipse.cdt.ui.edit.text.c.open.type.hierarchy"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/-->
+            commandId="org.eclipse.cdt.ui.edit.open.type.hierarchy"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
      <!--key
             sequence="M1+M2+H"
             contextId="org.eclipse.cdt.ui.cEditorScope"
@@ -1095,12 +1095,12 @@
             description="%ActionDefinition.openCallHierarchy.description"
             name="%ActionDefinition.openCallHierarchy.name"
             id="org.eclipse.cdt.ui.edit.open.call.hierarchy"/>
-      <!--command
+      <command
             name="%ActionDefinition.openTypeHierarchy.name"
             description="%ActionDefinition.openTypeHierarchy.description"
             categoryId="org.eclipse.ui.category.navigate"
-            id="org.eclipse.cdt.ui.edit.text.c.open.type.hierarchy">
-      </command-->
+            id="org.eclipse.cdt.ui.edit.open.type.hierarchy">
+      </command>
       <!--command
             name="%ActionDefinition.openTypeInHierarchy.name"
             description="%ActionDefinition.openTypeInHierarchy.description"
@@ -1191,13 +1191,13 @@
                retarget="true"
                tooltip="%OpenCallHierarchy.tooltip">
          </action>
-        <!--action
-               definitionId="org.eclipse.cdt.ui.edit.text.c.open.type.hierarchy"
+         <action
+               definitionId="org.eclipse.cdt.ui.edit.open.type.hierarchy"
                label="%OpenTypeHierarchyAction.label"
                retarget="true"
                menubarPath="navigate/open.ext"
                id="org.eclipse.cdt.ui.actions.OpenTypeHierarchy">
-         </action-->
+         </action>
          <!--action
                id="org.eclipse.cdt.ui.actions.openTypeInHierarchy"
                class="org.eclipse.cdt.internal.ui.browser.typehierarchy.OpenTypeInHierarchyAction"
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
index e39a6a8b2a1..4a962bd29bd 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
@@ -2284,10 +2284,6 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IR
 //        action.setActionDefinitionId(ICEditorActionDefinitionIds.OPEN_DEF);
 //        setAction("OpenDefinition", action); //$NON-NLS-1$
         
-//		action = new OpenTypeHierarchyAction(this);
-//		action.setActionDefinitionId(ICEditorActionDefinitionIds.OPEN_TYPE_HIERARCHY);
-//		setAction("OpenTypeHierarchy", action); //$NON-NLS-1$
-
 		fShowInCViewAction = new ShowInCViewAction(this);
 		action = fShowInCViewAction;
 		action.setActionDefinitionId(ICEditorActionDefinitionIds.OPEN_CVIEW);
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ICEditorActionDefinitionIds.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ICEditorActionDefinitionIds.java
index c006ca381bd..4c91af299e9 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ICEditorActionDefinitionIds.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ICEditorActionDefinitionIds.java
@@ -125,7 +125,7 @@ public interface ICEditorActionDefinitionIds extends ITextEditorActionDefinition
 	 * Action definition ID of the navigate -> open type hierarchy action
 	 * (value <code>"org.eclipse.cdt.ui.edit.text.c.open.type.hierarchy"</code>).
 	 */
-	public static final String OPEN_TYPE_HIERARCHY= "org.eclipse.cdt.ui.edit.text.c.open.type.hierarchy"; //$NON-NLS-1$
+	public static final String OPEN_TYPE_HIERARCHY= "org.eclipse.cdt.ui.edit.open.type.hierarchy"; //$NON-NLS-1$
 
 	/**
 	 * Action definition ID of the navigate -> open action
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THGraphNode.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THGraphNode.java
index 31d671e7936..1d5620c458e 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THGraphNode.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THGraphNode.java
@@ -21,11 +21,10 @@ import java.util.List;
 import org.eclipse.cdt.core.model.ICElement;
 
 class THGraphNode {
-	private static final Object[] NO_MEMBERS= new Object[0];
 	private List fOutgoing= Collections.EMPTY_LIST;
 	private List fIncoming= Collections.EMPTY_LIST;
 	private ICElement fElement;
-	private Object[] fMembers= NO_MEMBERS;
+	private Object[] fMembers= null;
 	
 	THGraphNode(ICElement element) {
 		fElement= element;
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 b9444a84375..4d528d29e38 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
@@ -288,7 +288,10 @@ class THHierarchyModel {
 	public Object[] getMembers() {
 		if (fHierarchySelection != null) {
 			THGraphNode gnode= fGraph.getNode(fHierarchySelection.getRepresentedDeclaration());
-			return gnode.getMembers(fShowInheritedMembers);
+			Object[] result= gnode.getMembers(fShowInheritedMembers);
+			if (result != null) {
+				return result;
+			}
 		}
 		return NO_CHILDREN;
 	}