diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index 37ce2cd4ef9..8dfa50582e8 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -76,32 +76,32 @@
             targetID="org.eclipse.debug.ui.DebugPerspective">
          <view
                relative="org.eclipse.debug.ui.VariableView"
-               id="org.eclipse.cdt.debug.ui.RegistersView"
-               relationship="stack">
+               relationship="stack"
+               id="org.eclipse.cdt.debug.ui.RegistersView">
          </view>
          <viewShortcut
                id="org.eclipse.cdt.debug.ui.RegistersView">
          </viewShortcut>
          <view
                relative="org.eclipse.debug.ui.VariableView"
-               id="org.eclipse.cdt.debug.ui.MemoryView"
-               relationship="stack">
+               relationship="stack"
+               id="org.eclipse.cdt.debug.ui.MemoryView">
          </view>
          <viewShortcut
                id="org.eclipse.cdt.debug.ui.MemoryView">
          </viewShortcut>
          <view
                relative="org.eclipse.debug.ui.VariableView"
-               id="org.eclipse.cdt.debug.ui.SharedLibrariesView"
-               relationship="stack">
+               relationship="stack"
+               id="org.eclipse.cdt.debug.ui.SharedLibrariesView">
          </view>
          <viewShortcut
                id="org.eclipse.cdt.debug.ui.SharedLibrariesView">
          </viewShortcut>
          <view
                relative="org.eclipse.debug.ui.VariableView"
-               id="org.eclipse.cdt.debug.ui.SignalsView"
-               relationship="stack">
+               relationship="stack"
+               id="org.eclipse.cdt.debug.ui.SignalsView">
          </view>
          <viewShortcut
                id="org.eclipse.cdt.debug.ui.SignalsView">
@@ -316,8 +316,8 @@
          </action>
          <action
                label="%ShowFullPathsAction.label"
-               icon="icons/full/clcl16/show_paths.gif"
                style="toggle"
+               icon="icons/full/clcl16/show_paths.gif"
                helpContextId="show_full_paths_action_context"
                class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                menubarPath="renderGroup"
@@ -331,8 +331,8 @@
          </action>
          <action
                label="%SwitchToDisassemblyAction.label"
-               icon="icons/full/clcl16/disassembly.gif"
                style="toggle"
+               icon="icons/full/clcl16/disassembly.gif"
                helpContextId="switch_to_disassembly_action_context"
                class="org.eclipse.cdt.debug.internal.ui.actions.SwitchToDisassemblyActionDelegate"
                menubarPath="renderGroup"
@@ -347,8 +347,8 @@
          </action>
          <action
                label="%ShowDebuggerConsoleAction.label"
-               icon="icons/full/clcl16/debugger_console.gif"
                style="toggle"
+               icon="icons/full/clcl16/debugger_console.gif"
                helpContextId="show_debugger_console_action_context"
                class="org.eclipse.cdt.debug.internal.ui.actions.DebuggerConsoleActionDelegate"
                menubarPath="renderGroup"
@@ -486,8 +486,8 @@
             id="org.eclipse.cdt.debug.ui.breakpointview.popupMenu">
          <action
                label="%ShowFullPathsAction.label"
-               icon="icons/full/clcl16/show_paths.gif"
                style="toggle"
+               icon="icons/full/clcl16/show_paths.gif"
                helpContextId="show_full_paths_action_context"
                class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                menubarPath="renderGroup"
@@ -762,8 +762,8 @@
             id="org.eclipse.cdt.debug.ui.SharedLibrariesViewPopupActions">
          <action
                label="%ShowFullPathsAction.label"
-               icon="icons/full/clcl16/show_paths.gif"
                style="toggle"
+               icon="icons/full/clcl16/show_paths.gif"
                helpContextId="show_full_paths_action_context"
                class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                menubarPath="renderGroup"
@@ -839,8 +839,8 @@
          <action
                label="%RestoreDefaultTypeAction.label"
                helpContextId="restore_default_type_action_context"
-               class="org.eclipse.cdt.debug.internal.ui.actions.RestoreDefaultTypeActionDelegate"
                tooltip="%RestoreDefaultTypeAction.tooltip"
+               class="org.eclipse.cdt.debug.internal.ui.actions.RestoreDefaultTypeActionDelegate"
                menubarPath="additions"
                enablesFor="1"
                id="org.eclipse.cdt.debug.internal.ui.actions.RestoreDefaultTypeActionDelegate">
@@ -855,8 +855,8 @@
                label="%CastToTypeAction.label"
                icon="icons/full/clcl16/casttotype_co.gif"
                helpContextId="cast_to_type_action_context"
-               class="org.eclipse.cdt.debug.internal.ui.actions.CastToTypeActionDelegate"
                tooltip="%CastToTypeAction.tooltip"
+               class="org.eclipse.cdt.debug.internal.ui.actions.CastToTypeActionDelegate"
                menubarPath="additions"
                enablesFor="1"
                id="org.eclipse.cdt.debug.internal.ui.actions.CastToTypeActionDelegate">
@@ -871,8 +871,8 @@
                label="%CastToArrayAction.label"
                icon="icons/full/clcl16/showasarray_co.gif"
                helpContextId="cast_to_array_action_context"
-               class="org.eclipse.cdt.debug.internal.ui.actions.CastToArrayActionDelegate"
                tooltip="%CastToArrayAction.tooltip"
+               class="org.eclipse.cdt.debug.internal.ui.actions.CastToArrayActionDelegate"
                menubarPath="additions"
                enablesFor="1"
                id="org.eclipse.cdt.debug.internal.ui.actions.CastToArrayActionDelegate">
@@ -891,8 +891,8 @@
                label="%ManageFunctionBreakpointAction.label"
                icon="icons/full/obj16/funbrkp_obj.gif"
                helpContextId="manage_function_breakpoint_action_context"
-               class="org.eclipse.cdt.debug.internal.ui.actions.ManageFunctionBreakpointActionDelegate"
                tooltip="%ManageFunctionBreakpointAction.tooltip"
+               class="org.eclipse.cdt.debug.internal.ui.actions.ManageFunctionBreakpointActionDelegate"
                menubarPath="additions"
                enablesFor="1"
                id="org.eclipse.cdt.debug.internal.ui.actions.ManageFunctionBreakpointActionDelegate">
@@ -911,8 +911,8 @@
                label="%DisableVariablesAction.label"
                icon="icons/full/clcl16/disabled_co.gif"
                helpContextId="disable_variables_action_context"
-               class="org.eclipse.cdt.debug.internal.ui.actions.DisableVariablesActionDelegate"
                tooltip="%DisableVariablesAction.tooltip"
+               class="org.eclipse.cdt.debug.internal.ui.actions.DisableVariablesActionDelegate"
                menubarPath="variableGroup"
                enablesFor="2+"
                id="org.eclipse.cdt.debug.internal.ui.actions.DisableVariablesActionDelegate">
@@ -924,8 +924,8 @@
                label="%EnableVariablesAction.label"
                icon="icons/full/clcl16/enabled_co.gif"
                helpContextId="enable_variables_action_context"
-               class="org.eclipse.cdt.debug.internal.ui.actions.EnableVariablesActionDelegate"
                tooltip="%EnableVariablesAction.tooltip"
+               class="org.eclipse.cdt.debug.internal.ui.actions.EnableVariablesActionDelegate"
                menubarPath="variableGroup"
                enablesFor="2+"
                id="org.eclipse.cdt.debug.internal.ui.actions.EnableVariablesActionDelegate">
@@ -948,8 +948,8 @@
                disabledIcon="icons/full/dlcl16/restart.gif"
                enablesFor="1"
                icon="icons/full/elcl16/restart.gif"
-               label="%RestartAction.label"
                helpContextId="restart_action_context"
+               label="%RestartAction.label"
                tooltip="%RestartAction.tooltip">
             <enablement>
                <pluginState
@@ -966,8 +966,8 @@
                class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                disabledIcon="icons/full/dlcl16/show_paths.gif"
                icon="icons/full/elcl16/show_parents.gif"
-               label="%ShowFullPathsAction.label"
                helpContextId="show_full_paths_action_context"
+               label="%ShowFullPathsAction.label"
                tooltip="%ShowFullPathsAction.tooltip">
             <enablement>
                <pluginState
@@ -985,8 +985,8 @@
                disabledIcon="icons/full/dlcl16/disassembly.gif"
                enablesFor="1"
                icon="icons/full/elcl16/disassembly.gif"
-               label="%SwitchToDisassemblyAction.label"
                helpContextId="switch_to_disassembly_action_context"
+               label="%SwitchToDisassemblyAction.label"
                tooltip="%SwitchToDisassemblyAction.tooltip">
             <enablement>
                <pluginState
@@ -1004,8 +1004,8 @@
                disabledIcon="icons/full/dlcl16/debugger_console.gif"
                enablesFor="1"
                icon="icons/full/elcl16/debugger_console.gif"
-               label="%ShowDebuggerConsoleAction.label"
                helpContextId="show_debugger_console_action_context"
+               label="%ShowDebuggerConsoleAction.label"
                tooltip="%ShowDebuggerConsoleAction.tooltip">
             <enablement>
                <pluginState
@@ -1026,8 +1026,8 @@
                class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                disabledIcon="icons/full/dlcl16/show_paths.gif"
                icon="icons/full/elcl16/show_parents.gif"
-               label="%ShowFullPathsAction.label"
                helpContextId="show_full_paths_action_context"
+               label="%ShowFullPathsAction.label"
                tooltip="%ShowFullPathsAction.tooltip">
             <enablement>
                <pluginState
@@ -1048,8 +1048,8 @@
                disabledIcon="icons/full/dlcl16/watch_globals.gif"
                enablesFor="1"
                icon="icons/full/elcl16/watch_globals.gif"
-               label="%AddGlobalsAction.label"
                helpContextId="add_globals_action_context"
+               label="%AddGlobalsAction.label"
                tooltip="%AddGlobalsAction.tooltip">
             <enablement>
                <pluginState
@@ -1070,8 +1070,8 @@
                class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                disabledIcon="icons/full/dlcl16/show_paths.gif"
                icon="icons/full/elcl16/show_parents.gif"
-               label="%ShowFullPathsAction.label"
                helpContextId="show_full_paths_action_context"
+               label="%ShowFullPathsAction.label"
                tooltip="%ShowFullPathsAction.tooltip">
             <enablement>
                <pluginState
@@ -1161,20 +1161,20 @@
    <extension
          point="org.eclipse.debug.core.statusHandlers">
       <statusHandler
-            code="10000"
             plugin="org.eclipse.cdt.debug.core"
+            code="10000"
             class="org.eclipse.cdt.debug.internal.ui.QuestionStatusHandler"
             id="org.eclipse.cdt.debug.internal.ui.QuestionStatusHandler">
       </statusHandler>
       <statusHandler
-            code="10001"
             plugin="org.eclipse.cdt.debug.core"
+            code="10001"
             class="org.eclipse.cdt.debug.internal.ui.InfoStatusHandler"
             id="org.eclipse.cdt.debug.internal.ui.InfoStatusHandler">
       </statusHandler>
       <statusHandler
-            code="10002"
             plugin="org.eclipse.cdt.debug.core"
+            code="10002"
             class="org.eclipse.cdt.debug.internal.ui.ErrorStatusHandler"
             id="org.eclipse.cdt.debug.internal.ui.ErrorStatusHandler">
       </statusHandler>
@@ -1237,16 +1237,16 @@
          point="org.eclipse.ui.editors">
       <editor
             name="%DisassemblyEditor.name"
-            extensions="dasm"
             icon="icons/full/obj16/disassembly_obj.gif"
+            extensions="dasm"
             class="org.eclipse.cdt.debug.internal.ui.editors.DisassemblyEditor"
             id="org.eclipse.cdt.debug.ui.DisassemblyEditor">
       </editor>
       <editor
             name="%CDebugEditor.name"
             icon="icons/full/obj16/filenotfound_obj.gif"
-            class="org.eclipse.cdt.debug.internal.ui.editors.CDebugEditor"
             contributorClass="org.eclipse.cdt.internal.ui.editor.CEditorActionContributor"
+            class="org.eclipse.cdt.debug.internal.ui.editors.CDebugEditor"
             id="org.eclipse.cdt.debug.ui.editor.CDebugEditor">
       </editor>
    </extension>
@@ -1263,5 +1263,21 @@
             id="org.eclipse.cdt.launch.DefaultSourceLocator">
       </sourceLocator>
    </extension>
+   <extension
+         point="org.eclipse.ui.contexts">
+      <context
+            name="Debugging C/C++"
+            description="Debugging C/C++ Programs"
+            parentId="org.eclipse.debug.ui.debugging"
+            id="org.eclipse.cdt.debug.ui.debugging">
+      </context>
+   </extension>
+   <extension
+         point="org.eclipse.debug.ui.debugModelContextBindings">
+      <modelContextBinding
+            debugModelId="org.eclipse.cdt.debug.core"
+            contextId="org.eclipse.cdt.debug.ui.debugging">
+      </modelContextBinding>
+   </extension>
 
 </plugin>