diff --git a/core/org.eclipse.cdt.core.tests/plugin.xml b/core/org.eclipse.cdt.core.tests/plugin.xml
index e6eb767026e..f59149b1d61 100644
--- a/core/org.eclipse.cdt.core.tests/plugin.xml
+++ b/core/org.eclipse.cdt.core.tests/plugin.xml
@@ -14,7 +14,6 @@
    <requires>
       <import plugin="org.eclipse.ui.ide"/>
       <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.apache.xerces"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.cdt.core"/>
       <import plugin="org.eclipse.cdt.ui"/>
@@ -49,8 +48,8 @@
                defaultValue="Live free or die"
                name="String in Free"
                category="indy.cat.free"
-               id="org.eclipse.cdt.core.tests.option1"
-               valueType="string">
+               valueType="string"
+               id="org.eclipse.cdt.core.tests.option1">
          </option>
          <optionCategory
                owner="indy.cat.free"
@@ -61,8 +60,8 @@
                defaultValue="false"
                name="Boolean in Chained"
                category="indy.cat.chained"
-               id="org.eclipse.cdt.core.tests.option2"
-               valueType="boolean">
+               valueType="boolean"
+               id="org.eclipse.cdt.core.tests.option2">
          </option>
       </tool>
       <target
@@ -73,17 +72,17 @@
             defaultExtension="toor"
             isAbstract="false"
             makeCommand="make"
-            makeFlags="-k"
             binaryParser="org.eclipse.cdt.core.PE"
+            makeFlags="-k"
             osList="win32">
          <tool
                natureFilter="cnature"
-               name="Root Tool"
                sources="foo,bar"
+               name="Root Tool"
                headerExtensions="baz"
                outputFlag="-r"
-               command="doIt"
                outputs="toor"
+               command="doIt"
                id="root.tool">
             <optionCategory
                   owner="root.tool"
@@ -93,47 +92,47 @@
             <option
                   name="List Option in Top"
                   command="-L"
-                  id="list.option"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="list.option">
                <listOptionValue
                      value="a">
                </listOptionValue>
                <listOptionValue
-                     builtIn="false"
-                     value="b">
+                     value="b"
+                     builtIn="false">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="c">
+                     value="c"
+                     builtIn="true">
                </listOptionValue>
             </option>
             <option
                   defaultValue="false"
                   name="Boolean Option in Top"
                   command="-b"
-                  id="boolean.option"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="boolean.option">
             </option>
             <option
                   defaultValue="x"
                   name="String Option in Category"
                   category="category"
-                  id="string.option"
-                  valueType="string">
+                  valueType="string"
+                  id="string.option">
             </option>
             <option
                   defaultValue=""
                   name="Another String Option in Category"
                   category="category"
-                  valueType="string"
                   command="-str"
+                  valueType="string"
                   id="another.string.option">
             </option>
             <option
                   name="Enumerated Option in Category"
                   category="category"
-                  id="enumerated.option"
-                  valueType="enumerated">
+                  valueType="enumerated"
+                  id="enumerated.option">
                <enumeratedOptionValue
                      name="Default Enum"
                      isDefault="true"
@@ -147,11 +146,11 @@
                </enumeratedOptionValue>
             </option>
             <option
-                                                name="Boolean Option in Category"
+                  commandFalse="-nob"
+                  name="Boolean Option in Category"
                   category="category"
                   valueType="boolean"
-                  id="boolean.false.option"
-                  commandFalse="-nob">
+                  id="boolean.false.option">
             </option>
          </tool>
          <configuration
@@ -221,17 +220,17 @@
          </configuration>
          <tool
                natureFilter="both"
-               name="Sub Tool"
                sources="yarf"
+               name="Sub Tool"
                headerExtensions="arf,barf"
-               outputPrefix="lib"
                outputs="bus"
+               outputPrefix="lib"
                id="tool.sub">
             <option
                   name="Include Paths"
                   command="-I"
-                  id="sub.tool.opt.inc.paths"
-                  valueType="includePath">
+                  valueType="includePath"
+                  id="sub.tool.opt.inc.paths">
                <listOptionValue
                      value="/usr/include">
                </listOptionValue>
@@ -239,45 +238,45 @@
                      value="/opt/gnome/include">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="/usr/gnu/include">
+                     value="/usr/gnu/include"
+                     builtIn="true">
                </listOptionValue>
             </option>
             <option
                   name="Defined Symbols"
                   command="-D"
-                  id="sub.tool.opt.def.symbols"
-                  valueType="definedSymbols">
+                  valueType="definedSymbols"
+                  id="sub.tool.opt.def.symbols">
                <listOptionValue
-                     builtIn="true"
-                     value="BUILTIN">
+                     value="BUILTIN"
+                     builtIn="true">
                </listOptionValue>
             </option>
             <option
                   name="More Includes"
                   command="-I"
-                  id="sub.tool.opts.inc.paths.more"
-                  valueType="includePath">
+                  valueType="includePath"
+                  id="sub.tool.opts.inc.paths.more">
                <listOptionValue
-                     builtIn="false"
-                     value="C:\home\tester/include">
+                     value="C:\home\tester/include"
+                     builtIn="false">
                </listOptionValue>
                <listOptionValue
-                     builtIn="false"
-                     value="&quot;../includes&quot;">
+                     value="&quot;../includes&quot;"
+                     builtIn="false">
                </listOptionValue>
             </option>
             <option
                   name="User Objects"
-                  id="sub.tool.opt.objs"
-                  valueType="userObjs">
+                  valueType="userObjs"
+                  id="sub.tool.opt.objs">
                <listOptionValue
-                     builtIn="false"
-                     value="obj1.o">
+                     value="obj1.o"
+                     builtIn="false">
                </listOptionValue>
                <listOptionValue
-                     builtIn="false"
-                     value="obj2.o">
+                     value="obj2.o"
+                     builtIn="false">
                </listOptionValue>
             </option>
          </tool>
@@ -285,8 +284,8 @@
       <target
             isTest="true"
             name="Test Sub Sub"
-            binaryParser="org.eclipse.cdt.core.ELF"
             parent="test.sub"
+            binaryParser="org.eclipse.cdt.core.ELF"
             defaultExtension="tss"
             makeCommand="nmake"
             id="test.sub.sub">
@@ -300,8 +299,8 @@
       <target
             isTest="true"
             name="Forward Grandchild"
-            binaryParser="org.eclipse.cdt.core.tests.target1"
             parent="test.forward.child.target"
+            binaryParser="org.eclipse.cdt.core.tests.target1"
             id="test.forward.grandchild.target">
          <toolReference
                command="newcommand"
diff --git a/releng/org.eclipse.cdt-feature/feature.xml b/releng/org.eclipse.cdt-feature/feature.xml
index a8d717f63ea..86c1cef8d1a 100644
--- a/releng/org.eclipse.cdt-feature/feature.xml
+++ b/releng/org.eclipse.cdt-feature/feature.xml
@@ -21,7 +21,6 @@
    <requires>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.apache.xerces"/>
       <import plugin="org.eclipse.search"/>
       <import plugin="org.eclipse.compare"/>
       <import plugin="org.eclipse.debug.core"/>