diff --git a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
index 6bfcd2b842b..1b857c13b09 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
@@ -16,6 +16,7 @@
       <import plugin="org.eclipse.cdt.core"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.core.runtime.compatibility"/>
+      <import plugin="org.apache.xerces"/>
    </requires>
 
 
diff --git a/debug/org.eclipse.cdt.debug.core/plugin.xml b/debug/org.eclipse.cdt.debug.core/plugin.xml
index 58a1379566e..6d62ec84b89 100644
--- a/debug/org.eclipse.cdt.debug.core/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.core/plugin.xml
@@ -17,6 +17,7 @@
       <import plugin="org.eclipse.debug.core"/>
       <import plugin="org.eclipse.cdt.core"/>
       <import plugin="org.eclipse.core.runtime.compatibility"/>
+      <import plugin="org.apache.xerces"/>
    </requires>
 
 
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index 6d8ea673e3d..bd0db10aa5a 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -25,6 +25,7 @@
       <import plugin="org.eclipse.cdt.ui"/>
       <import plugin="org.eclipse.cdt.core"/>
       <import plugin="org.eclipse.core.runtime.compatibility"/>
+      <import plugin="org.apache.xerces"/>
    </requires>
 
 
@@ -68,24 +69,24 @@
             targetID="org.eclipse.debug.ui.DebugPerspective">
          <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">
@@ -291,8 +292,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"
@@ -307,8 +308,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"
@@ -713,8 +714,8 @@
                label="%LoadSymbolsAction.label"
                icon="icons/full/clcl16/load_symbols_co.gif"
                helpContextId="load_symbols_action_context"
-               tooltip="%LoadSymbolsAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.LoadSymbolsActionDelegate"
+               tooltip="%LoadSymbolsAction.tooltip"
                menubarPath="sharedLibrariesGroup"
                enablesFor="1"
                id="org.eclipse.cdt.debug.internal.ui.actions.LoadSymbolsActionDelegate">
@@ -733,8 +734,8 @@
                label="%SignalAction.label"
                icon="icons/full/clcl16/signal_co.gif"
                helpContextId="signal_action_context"
-               tooltip="%SignalAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.SignalActionDelegate"
+               tooltip="%SignalAction.tooltip"
                menubarPath="additions"
                enablesFor="1"
                id="org.eclipse.cdt.debug.internal.ui.actions.SignalActionDelegate">
@@ -771,8 +772,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">
@@ -787,8 +788,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">
@@ -803,8 +804,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">
@@ -823,8 +824,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">
@@ -843,8 +844,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">
@@ -856,8 +857,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">
@@ -880,8 +881,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
@@ -899,8 +900,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
@@ -918,8 +919,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
@@ -933,14 +934,14 @@
             targetID="org.eclipse.debug.ui.DebugView"
             id="org.eclipse.cdt.debug.ui.debugView.menu">
          <action
-               menubarPath="cDebugActions"
                label="%ShowFullPathsAction.label"
-               id="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
-               class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
-               style="toggle"
                icon="icons/full/clcl16/show_paths.gif"
+               style="toggle"
                helpContextId="show_full_paths_context"
-               tooltip="%ShowFullPathsAction.tooltip">
+               tooltip="%ShowFullPathsAction.tooltip"
+               class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
+               menubarPath="cDebugActions"
+               id="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction">
             <enablement>
                <pluginState
                      value="activated"
@@ -957,14 +958,14 @@
             targetID="org.eclipse.debug.ui.BreakpointView"
             id="org.eclipse.cdt.debug.ui.breakpointView.menu">
          <action
-               menubarPath="cDebugActions"
                label="%ShowFullPathsAction.label"
-               id="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
-               class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
-               style="toggle"
                icon="icons/full/clcl16/show_paths.gif"
+               style="toggle"
                helpContextId="show_full_paths_context"
-               tooltip="%ShowFullPathsAction.tooltip">
+               tooltip="%ShowFullPathsAction.tooltip"
+               class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
+               menubarPath="cDebugActions"
+               id="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction">
             <enablement>
                <pluginState
                      value="activated"
@@ -984,8 +985,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
@@ -1000,17 +1001,17 @@
             id="org.eclipse.debug.ui.sharedLibrariesView.menu">
          <action
                label="%ShowFullPathsAction.label"
-               icon="icons/full/clcl16/show_paths.gif"
                style="toggle"
+               icon="icons/full/clcl16/show_paths.gif"
                helpContextId="show_full_paths_context"
-               tooltip="%ShowFullPathsAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
+               tooltip="%ShowFullPathsAction.tooltip"
                menubarPath="cDebugActions"
                id="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction">
             <enablement>
                <pluginState
-                     id="org.eclipse.cdt.debug.ui"
-                     value="activated">
+                     value="activated"
+                     id="org.eclipse.cdt.debug.ui">
                </pluginState>
             </enablement>
          </action>
@@ -1095,20 +1096,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>
@@ -1171,16 +1172,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>
@@ -1202,8 +1203,8 @@
       <context
             name="Debugging C/C++"
             description="Debugging C/C++ Programs"
-            id="org.eclipse.cdt.debug.ui.debugging"
-            parentId="org.eclipse.debug.ui.debugging">
+            parentId="org.eclipse.debug.ui.debugging"
+            id="org.eclipse.cdt.debug.ui.debugging">
       </context>
    </extension>
    <extension
@@ -1217,23 +1218,23 @@
          point="org.eclipse.debug.ui.contextViewBindings">
       <contextViewBinding
             viewId="org.eclipse.cdt.debug.ui.MemoryView"
-            autoClose="false"
-            contextId="org.eclipse.cdt.debug.ui.debugging">
+            contextId="org.eclipse.cdt.debug.ui.debugging"
+            autoClose="false">
       </contextViewBinding>
       <contextViewBinding
             viewId="org.eclipse.cdt.debug.ui.SharedLibrariesView"
-            autoClose="false"
-            contextId="org.eclipse.cdt.debug.ui.debugging">
+            contextId="org.eclipse.cdt.debug.ui.debugging"
+            autoClose="false">
       </contextViewBinding>
       <contextViewBinding
             viewId="org.eclipse.cdt.debug.ui.SignalsView"
-            autoClose="false"
-            contextId="org.eclipse.cdt.debug.ui.debugging">
+            contextId="org.eclipse.cdt.debug.ui.debugging"
+            autoClose="false">
       </contextViewBinding>
       <contextViewBinding
             viewId="org.eclipse.debug.ui.RegistersView"
-            autoClose="false"
-            contextId="org.eclipse.cdt.debug.ui.debugging">
+            contextId="org.eclipse.cdt.debug.ui.debugging"
+            autoClose="false">
       </contextViewBinding>
    </extension>