diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index cce9650871e..9a9fe54fd7f 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -31,8 +31,8 @@
             icon="icons/full/wizban/newmngcc_app.gif"
             category="org.eclipse.cdt.ui.newCCWizards"
             class="org.eclipse.cdt.managedbuilder.ui.wizards.NewManagedCCProjectWizard"
-            finalPerspective="org.eclipse.cdt.ui.CPerspective"
             project="true"
+            finalPerspective="org.eclipse.cdt.ui.CPerspective"
             id="org.eclipse.cdt.managedbuilder.ui.wizards.StdCCWizard">
          <description>
             %MngCCWizard.description
@@ -43,8 +43,8 @@
             icon="icons/full/wizban/newmngc_app.gif"
             category="org.eclipse.cdt.ui.newCWizards"
             class="org.eclipse.cdt.managedbuilder.ui.wizards.NewManagedCProjectWizard"
-            finalPerspective="org.eclipse.cdt.ui.CPerspective"
             project="true"
+            finalPerspective="org.eclipse.cdt.ui.CPerspective"
             id="org.eclipse.cdt.managedbuilder.ui.wizards.StdCWizard">
          <description>
             %MngCWizard.description
@@ -54,8 +54,8 @@
    <extension
          point="org.eclipse.ui.propertyPages">
       <page
-            adaptable="true"
             objectClass="org.eclipse.core.resources.IProject"
+            adaptable="true"
             name="%MngBuildProp.name"
             class="org.eclipse.cdt.managedbuilder.ui.properties.BuildPropertyPage"
             id="org.eclipse.cdt.managedbuilder.ui.properties.BuildProperties">
@@ -70,9 +70,6 @@
          id="cdt.managed.build.info"
          name="Managed Build Tools Description"
          point="org.eclipse.cdt.managedbuilder.core.ManagedBuildInfo">
-      <version
-            version="2.0.0">
-      </version>
       <target
             name="%TargetName.cygw"
             id="cygwin"
@@ -85,12 +82,12 @@
             osList="win32">
          <tool
                natureFilter="cnature"
-               name="%ToolName.compiler.c"
                sources="c"
+               name="%ToolName.compiler.c"
                headerExtensions="h"
                outputFlag="-o"
-               command="gcc"
                outputs="o"
+               command="gcc"
                id="cdt.build.tool.cygwin.gnu.c.compiler">
             <optionCategory
                   owner="cdt.build.tool.cygwin.gnu.c.compiler"
@@ -102,16 +99,16 @@
                   name="%Option.Posix.Nostdinc"
                   category="cygwin.gnu.c.compiler.category.preprocessor"
                   command="-nostdinc"
-                  id="cygwin.gnu.c.compiler.preprocessor.nostdinc"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.c.compiler.preprocessor.nostdinc">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.PreprocOnly"
                   category="cygwin.gnu.c.compiler.category.preprocessor"
                   command="-E"
-                  id="cygwin.gnu.c.compiler.preprocessor.preprocess"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.c.compiler.preprocessor.preprocess">
             </option>
             <optionCategory
                   owner="cdt.build.tool.cygwin.gnu.c.compiler"
@@ -122,103 +119,103 @@
                   name="%Option.Posix.DefSym"
                   category="cygwin.gnu.c.compiler.category.symbols"
                   command="-D"
-                  id="cygwin.gnu.c.preprocessor.def.symbols"
-                  valueType="definedSymbols">
+                  valueType="definedSymbols"
+                  id="cygwin.gnu.c.preprocessor.def.symbols">
                <listOptionValue
-                     builtIn="true"
-                     value="_X86_=1">
+                     value="_X86_=1"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__OPTIMIZE__">
+                     value="__OPTIMIZE__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__STDC_HOSTED__=1">
+                     value="__STDC_HOSTED__=1"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="i386">
+                     value="i386"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__i386">
+                     value="__i386"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__i386__">
+                     value="__i386__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__tune_i686__">
+                     value="__tune_i686__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__tune_pentiumpro__">
+                     value="__tune_pentiumpro__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__tune_pentium2__">
+                     value="__tune_pentium2__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__tune_pentium3__">
+                     value="__tune_pentium3__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__stdcall=__attribute__((__stdcall__))">
+                     value="__stdcall=__attribute__((__stdcall__))"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__fastcall=__attribute__((__fastcall__))">
+                     value="__fastcall=__attribute__((__fastcall__))"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__cdecl=__attribute__((__cdecl__))">
+                     value="__cdecl=__attribute__((__cdecl__))"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="_stdcall=__attribute__((__stdcall__))">
+                     value="_stdcall=__attribute__((__stdcall__))"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="_fastcall=__attribute__((__fastcall__))">
+                     value="_fastcall=__attribute__((__fastcall__))"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="_cdecl=__attribute__((__cdecl__))">
+                     value="_cdecl=__attribute__((__cdecl__))"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__declspec(x)=__attribute__((x))">
+                     value="__declspec(x)=__attribute__((x))"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__CYGWIN32__">
+                     value="__CYGWIN32__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__CYGWIN__">
+                     value="__CYGWIN__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="unix">
+                     value="unix"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__unix__">
+                     value="__unix__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__unix">
+                     value="__unix"
+                     builtIn="true">
                </listOptionValue>
             </option>
             <option
                   name="%Option.Posix.UndefSym"
                   category="cygwin.gnu.c.compiler.category.symbols"
                   command="-U"
-                  id="cygwin.gnu.c.preprocessor.undef.symbol"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="cygwin.gnu.c.preprocessor.undef.symbol">
             </option>
             <optionCategory
                   owner="cdt.build.tool.cygwin.gnu.c.compiler"
@@ -229,11 +226,11 @@
                   name="%Option.Posix.InclPaths"
                   category="cygwin.gnu.c.compiler.category.dirs"
                   command="-I"
-                  id="cygwin.gnu.c.compiler.general.include.paths"
-                  valueType="includePath">
+                  valueType="includePath"
+                  id="cygwin.gnu.c.compiler.general.include.paths">
                <listOptionValue
-                     builtIn="true"
-                     value="C:\cygwin\usr\include\w32api">
+                     value="C:\cygwin\usr\include\w32api"
+                     builtIn="true">
                </listOptionValue>
             </option>
             <optionCategory
@@ -244,8 +241,8 @@
             <option
                   name="%Option.Posix.OptLevel"
                   category="cygwin.gnu.c.compiler.category.optimization"
-                  id="cygwin.gnu.c.compiler.general.optimization.level"
-                  valueType="enumerated">
+                  valueType="enumerated"
+                  id="cygwin.gnu.c.compiler.general.optimization.level">
                <enumeratedOptionValue
                      name="%Option.Posix.Optimize.None"
                      isDefault="false"
@@ -272,8 +269,8 @@
             <option
                   name="%Option.Posix.Optimize.Flags"
                   category="cygwin.gnu.c.compiler.category.optimization"
-                  id="cygwin.gnu.c.compiler.optimization.flags"
-                  valueType="string">
+                  valueType="string"
+                  id="cygwin.gnu.c.compiler.optimization.flags">
             </option>
             <optionCategory
                   owner="cdt.build.tool.cygwin.gnu.c.compiler"
@@ -283,8 +280,8 @@
             <option
                   name="%Option.Posix.DebugLevel"
                   category="cygwin.gnu.c.compiler.category.debug"
-                  id="cygwin.c.compiler.debugging.level"
-                  valueType="enumerated">
+                  valueType="enumerated"
+                  id="cygwin.c.compiler.debugging.level">
                <enumeratedOptionValue
                      name="%Option.Posix.Debug.None"
                      isDefault="false"
@@ -312,24 +309,24 @@
                   defaultValue="-gstabs"
                   name="%Option.Posix.Debug.Other"
                   category="cygwin.gnu.c.compiler.category.debug"
-                  id="cygwin.gnu.c.compiler.debugging.other"
-                  valueType="string">
+                  valueType="string"
+                  id="cygwin.gnu.c.compiler.debugging.other">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.gprof"
                   category="cygwin.gnu.c.compiler.category.debug"
                   command="-pg"
-                  id="cygwin.gnu.c.compiler.debugging.gprof"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.c.compiler.debugging.gprof">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.prof"
                   category="cygwin.gnu.c.compiler.category.debug"
                   command="-p"
-                  id="cygwin.gnu.c.compiler.debugging.prof"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.c.compiler.debugging.prof">
             </option>
             <optionCategory
                   owner="cdt.build.tool.cygwin.gnu.c.compiler"
@@ -341,48 +338,48 @@
                   name="%Option.Posix.Warn.Syntax"
                   category="cygwin.c.compiler.category.warnings"
                   command="-fsyntax-only"
-                  id="cygwin.gnu.c.compiler.warnings.syntax"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.c.compiler.warnings.syntax">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.Pedandic"
                   category="cygwin.c.compiler.category.warnings"
                   command="-pedantic"
-                  id="cygwin.gnu.c.compiler.warnings.pedantic"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.c.compiler.warnings.pedantic">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.PedErrors"
                   category="cygwin.c.compiler.category.warnings"
                   command="-pedantic-errors"
-                  id="cygwin.gnu.c.compiler.warnings.pedantic.error"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.c.compiler.warnings.pedantic.error">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.nowarn"
                   category="cygwin.c.compiler.category.warnings"
                   command="-w"
-                  id="cygwin.gnu.c.compiler.warnings.nowarn"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.c.compiler.warnings.nowarn">
             </option>
             <option
                   defaultValue="true"
                   name="%Option.Posix.Warn.allwarn"
                   category="cygwin.c.compiler.category.warnings"
                   command="-Wall"
-                  id="cygwin.gnu.c.compiler.warnings.allwarn"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.c.compiler.warnings.allwarn">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.toerrs"
                   category="cygwin.c.compiler.category.warnings"
                   command="-Werror"
-                  id="cygwin.gnu.c.compiler.warnings.toerrors"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.c.compiler.warnings.toerrors">
             </option>
             <optionCategory
                   owner="cdt.build.tool.cygwin.gnu.c.compiler"
@@ -393,34 +390,34 @@
                   defaultValue="-c"
                   name="%Option.OtherFlags"
                   category="cygwin.c.compiler.category.other"
-                  id="cygwin.gnu.c.compiler.misc.other"
-                  valueType="string">
+                  valueType="string"
+                  id="cygwin.gnu.c.compiler.misc.other">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Verbose"
                   category="cygwin.c.compiler.category.other"
                   command="-v"
-                  id="cygwin.gnu.c.compiler.misc.verbose"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.c.compiler.misc.verbose">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Ansi"
                   category="cygwin.c.compiler.category.other"
                   command="-ansi"
-                  id="cygwin.gnu.c.compiler.misc.ansi"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.c.compiler.misc.ansi">
             </option>
          </tool>
          <tool
                natureFilter="ccnature"
-               name="%ToolName.compiler.cpp"
                sources="c,cc,cpp,cxx,C"
+               name="%ToolName.compiler.cpp"
                headerExtensions="h,H,hpp"
                outputFlag="-o"
-               command="g++"
                outputs="o"
+               command="g++"
                id="org.eclipse.cdt.build.tool.cygwin.compiler">
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.compiler"
@@ -432,16 +429,16 @@
                   name="%Option.Posix.Nostdinc"
                   category="cygwin.compiler.category.preprocessor"
                   command="-nostdinc"
-                  id="cygwin.gnu.compiler.preprocessor.nostdinc"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.compiler.preprocessor.nostdinc">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.PreprocOnly"
                   category="cygwin.compiler.category.preprocessor"
                   command="-E"
-                  id="cygwin.gnu.compiler.preprocessor.preprocess"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.compiler.preprocessor.preprocess">
             </option>
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.compiler"
@@ -452,103 +449,103 @@
                   name="%Option.Posix.DefSym"
                   category="cygwin.gnu.compiler.category.symbols"
                   command="-D"
-                  id="cygwin.preprocessor.def.symbols"
-                  valueType="definedSymbols">
+                  valueType="definedSymbols"
+                  id="cygwin.preprocessor.def.symbols">
                <listOptionValue
-                     builtIn="true"
-                     value="_X86_=1">
+                     value="_X86_=1"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__OPTIMIZE__">
+                     value="__OPTIMIZE__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__STDC_HOSTED__=1">
+                     value="__STDC_HOSTED__=1"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="i386">
+                     value="i386"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__i386">
+                     value="__i386"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__i386__">
+                     value="__i386__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__tune_i686__">
+                     value="__tune_i686__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__tune_pentiumpro__">
+                     value="__tune_pentiumpro__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__tune_pentium2__">
+                     value="__tune_pentium2__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__tune_pentium3__">
+                     value="__tune_pentium3__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__stdcall=__attribute__((__stdcall__))">
+                     value="__stdcall=__attribute__((__stdcall__))"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__fastcall=__attribute__((__fastcall__))">
+                     value="__fastcall=__attribute__((__fastcall__))"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__cdecl=__attribute__((__cdecl__))">
+                     value="__cdecl=__attribute__((__cdecl__))"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="_stdcall=__attribute__((__stdcall__))">
+                     value="_stdcall=__attribute__((__stdcall__))"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="_fastcall=__attribute__((__fastcall__))">
+                     value="_fastcall=__attribute__((__fastcall__))"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="_cdecl=__attribute__((__cdecl__))">
+                     value="_cdecl=__attribute__((__cdecl__))"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__declspec(x)=__attribute__((x))">
+                     value="__declspec(x)=__attribute__((x))"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__CYGWIN32__">
+                     value="__CYGWIN32__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__CYGWIN__">
+                     value="__CYGWIN__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="unix">
+                     value="unix"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__unix__">
+                     value="__unix__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__unix">
+                     value="__unix"
+                     builtIn="true">
                </listOptionValue>
             </option>
             <option
                   name="%Option.Posix.UndefSym"
                   category="cygwin.gnu.compiler.category.symbols"
                   command="-U"
-                  id="cygwin.preprocessor.undef.symbol"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="cygwin.preprocessor.undef.symbol">
             </option>
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.compiler"
@@ -559,11 +556,11 @@
                   name="%Option.Posix.InclPaths"
                   category="cygwin.gnu.compiler.category.dirs"
                   command="-I"
-                  id="cygwin.compiler.general.include.paths"
-                  valueType="includePath">
+                  valueType="includePath"
+                  id="cygwin.compiler.general.include.paths">
                <listOptionValue
-                     builtIn="true"
-                     value="C:\cygwin\usr\include\w32api">
+                     value="C:\cygwin\usr\include\w32api"
+                     builtIn="true">
                </listOptionValue>
             </option>
             <optionCategory
@@ -574,8 +571,8 @@
             <option
                   name="%Option.Posix.OptLevel"
                   category="cygwin.gnu.compiler.category.optimization"
-                  id="cygwin.compiler.general.optimization.level"
-                  valueType="enumerated">
+                  valueType="enumerated"
+                  id="cygwin.compiler.general.optimization.level">
                <enumeratedOptionValue
                      name="%Option.Posix.Optimize.None"
                      isDefault="false"
@@ -602,8 +599,8 @@
             <option
                   name="%Option.Posix.Optimize.Flags"
                   category="cygwin.gnu.compiler.category.optimization"
-                  id="cygwin.compiler.optimization.flags"
-                  valueType="string">
+                  valueType="string"
+                  id="cygwin.compiler.optimization.flags">
             </option>
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.compiler"
@@ -613,8 +610,8 @@
             <option
                   name="%Option.Posix.DebugLevel"
                   category="cygwin.gnu.compiler.category.debug"
-                  id="cygwin.compiler.debugging.level"
-                  valueType="enumerated">
+                  valueType="enumerated"
+                  id="cygwin.compiler.debugging.level">
                <enumeratedOptionValue
                      name="%Option.Posix.Debug.None"
                      isDefault="false"
@@ -642,24 +639,24 @@
                   defaultValue="-gstabs"
                   name="%Option.Posix.Debug.Other"
                   category="cygwin.gnu.compiler.category.debug"
-                  id="cygwin.gnu.compiler.debugging.other"
-                  valueType="string">
+                  valueType="string"
+                  id="cygwin.gnu.compiler.debugging.other">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.prof"
                   category="cygwin.gnu.compiler.category.debug"
                   command="-p"
-                  id="cygwin.gnu.compiler.debugging.prof"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.compiler.debugging.prof">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.gprof"
                   category="cygwin.gnu.compiler.category.debug"
                   command="-pg"
-                  id="cygwin.gnu.compiler.debugging.gprof"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.compiler.debugging.gprof">
             </option>
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.compiler"
@@ -671,51 +668,51 @@
                   name="%Option.Posix.Warn.Syntax"
                   category="cygwin.compiler.category.warnings"
                   command="-fsyntax-only"
-                  id="cygwin.gnu.compiler.warnings.syntax"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.compiler.warnings.syntax">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.Pedandic"
                   category="cygwin.compiler.category.warnings"
                   command="-pedantic"
-                  id="cygwin.gnu.compiler.warnings.pedantic"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.compiler.warnings.pedantic">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.PedErrors"
                   category="cygwin.compiler.category.warnings"
                   command="-pedantic-errors"
-                  id="cygwin.gnu.compiler.warnings.pedantic.error"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.compiler.warnings.pedantic.error">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.nowarn"
                   category="cygwin.compiler.category.warnings"
                   command="-w"
-                  id="cygwin.gnu.compiler.warnings.nowarn"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.compiler.warnings.nowarn">
             </option>
             <option
                   defaultValue="true"
                   name="%Option.Posix.Warn.allwarn"
                   category="cygwin.compiler.category.warnings"
                   command="-Wall"
-                  id="cygwin.gnu.compiler.warnings.allwarn"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.compiler.warnings.allwarn">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.toerrs"
                   category="cygwin.compiler.category.warnings"
                   command="-Werror"
-                  id="cygwin.gnu.compiler.warnings.toerrors"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.compiler.warnings.toerrors">
             </option>
             <optionCategory
-                  owner="cdt.build.tool.linux.gnu.compiler"
+                  owner="org.eclipse.cdt.build.tool.cygwin.compiler"
                   name="%OptionCategory.Misc"
                   id="cygwin.compiler.category.other">
             </optionCategory>
@@ -723,24 +720,24 @@
                   defaultValue="-c"
                   name="%Option.OtherFlags"
                   category="cygwin.compiler.category.other"
-                  id="cygwin.compiler.misc.other"
-                  valueType="string">
+                  valueType="string"
+                  id="cygwin.compiler.misc.other">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Verbose"
                   category="cygwin.compiler.category.other"
                   command="-v"
-                  id="cygwin.compiler.misc.verbose"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.compiler.misc.verbose">
             </option>
          </tool>
       </target>
       <target
             isTest="false"
             name="%TargetName.cygw.exe"
-            binaryParser="org.eclipse.cdt.core.PE"
             parent="cygwin"
+            binaryParser="org.eclipse.cdt.core.PE"
             defaultExtension="exe"
             isAbstract="false"
             id="cygwin.exec">
@@ -803,8 +800,8 @@
                natureFilter="cnature"
                name="%ToolName.linker.c"
                outputFlag="-o"
-               command="gcc"
                outputs="exe"
+               command="gcc"
                id="cdt.build.tool.cygwin.c.link">
             <optionCategory
                   owner="cdt.build.tool.cygwin.c.link"
@@ -816,40 +813,40 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="cygwin.gnu.c.linker.category.general"
                   command="-nostartfiles"
-                  id="cygwin.gnu.c.link.options.nostart"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.c.link.options.nostart">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="cygwin.gnu.c.linker.category.general"
                   command="-nodefaultlibs"
-                  id="cygwin.gnu.c.link.options.nodeflibs"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.c.link.options.nodeflibs">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="cygwin.gnu.c.linker.category.general"
                   command="-nostdlib"
-                  id="cygwin.gnu.c.link.options.nostdlibs"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.c.link.options.nostdlibs">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="cygwin.gnu.c.linker.category.general"
                   command="-s"
-                  id="cygwin.gnu.c.link.options.strip"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.c.link.options.strip">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Static"
                   category="cygwin.gnu.c.linker.category.general"
                   command="-static"
-                  id="cygwin.gnu.c.link.options.noshared"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.c.link.options.noshared">
             </option>
             <optionCategory
                   owner="cdt.build.tool.cygwin.c.link"
@@ -860,15 +857,15 @@
                   name="%Option.Posix.Libs"
                   category="cygwin.gnu.c.linker.category.libs"
                   command="-l"
-                  id="cygwin.gnu.c.link.libs"
-                  valueType="libs">
+                  valueType="libs"
+                  id="cygwin.gnu.c.link.libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="cygwin.gnu.c.linker.category.libs"
                   command="-L"
-                  id="cygwin.gnu.c.link.paths"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="cygwin.gnu.c.link.paths">
             </option>
             <optionCategory
                   owner="cdt.build.tool.cygwin.c.link"
@@ -878,29 +875,29 @@
             <option
                   name="%Option.Posix.Linker.Flags"
                   category="cygwin.gnu.c.linker.category.other"
-                  id="cygwin.gnu.c.link.ldflags"
-                  valueType="string">
+                  valueType="string"
+                  id="cygwin.gnu.c.link.ldflags">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="cygwin.gnu.c.linker.category.other"
                   command="-Xlinker"
-                  id="cygwin.gnu.c.link.options.other"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="cygwin.gnu.c.link.options.other">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="cygwin.gnu.c.linker.category.other"
-                  id="cygwin.gnu.c.link.ld.userobjs"
-                  valueType="userObjs">
+                  valueType="userObjs"
+                  id="cygwin.gnu.c.link.ld.userobjs">
             </option>
          </tool>
          <tool
                natureFilter="ccnature"
                name="%ToolName.linker.cpp"
                outputFlag="-o"
-               command="g++"
                outputs="exe"
+               command="g++"
                id="org.eclipse.cdt.build.tool.cygwin.link">
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.link"
@@ -912,40 +909,40 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="cygwin.linker.category.general"
                   command="-nostartfiles"
-                  id="cygwin.gnu.linker.options.nostart"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.linker.options.nostart">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="cygwin.linker.category.general"
                   command="-nodefaultlibs"
-                  id="cygwin.gnu.linker.options.nodeflibs"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.linker.options.nodeflibs">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="cygwin.linker.category.general"
                   command="-nostdlib"
-                  id="cygwin.gnu.linker.options.nostdlibs"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.linker.options.nostdlibs">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="cygwin.linker.category.general"
                   command="-s"
-                  id="cygwin.gnu.linker.options.strip"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.linker.options.strip">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Static"
                   category="cygwin.linker.category.general"
                   command="-static"
-                  id="cygwin.gnu.linker.options.noshared"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.linker.options.noshared">
             </option>
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.link"
@@ -956,15 +953,15 @@
                   name="%Option.Posix.Libs"
                   category="cygwin.gnu.linker.category.libs"
                   command="-l"
-                  id="cygwin.link.libs"
-                  valueType="libs">
+                  valueType="libs"
+                  id="cygwin.link.libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="cygwin.gnu.linker.category.libs"
                   command="-L"
-                  id="cygwin.link.ld.paths"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="cygwin.link.ld.paths">
             </option>
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.link"
@@ -974,29 +971,29 @@
             <option
                   name="%Option.Posix.Linker.Flags"
                   category="cygwin.gnu.linker.category.other"
-                  id="cygwin.link.ld.flags"
-                  valueType="string">
+                  valueType="string"
+                  id="cygwin.link.ld.flags">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="cygwin.gnu.linker.category.other"
                   command="-Xlinker"
-                  id="cygwin.gnu.linker.options.other"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="cygwin.gnu.linker.options.other">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="cygwin.gnu.linker.category.other"
-                  id="cygwin.gnu.link.ld.userobjs"
-                  valueType="userObjs">
+                  valueType="userObjs"
+                  id="cygwin.gnu.link.ld.userobjs">
             </option>
          </tool>
       </target>
       <target
             isTest="false"
             name="%TargetName.cygw.so"
-            binaryParser="org.eclipse.cdt.core.PE"
             parent="cygwin"
+            binaryParser="org.eclipse.cdt.core.PE"
             defaultExtension="dll"
             isAbstract="false"
             id="cygwin.so">
@@ -1059,9 +1056,9 @@
                natureFilter="cnature"
                name="%ToolName.linker.c"
                outputFlag="-o"
-               command="gcc"
-               outputPrefix="lib"
                outputs="dll"
+               outputPrefix="lib"
+               command="gcc"
                id="cdt.build.tool.cygwin.c.solink">
             <optionCategory
                   owner="cdt.build.tool.cygwin.c.solink"
@@ -1073,40 +1070,40 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="cygwin.gnu.c.solink.category.general"
                   command="-nostartfiles"
-                  id="cygwin.gnu.c.solink.options.nostart"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.c.solink.options.nostart">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="cygwin.gnu.c.solink.category.general"
                   command="-nodefaultlibs"
-                  id="cygwin.gnu.c.solink.options.nodeflibs"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.c.solink.options.nodeflibs">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="cygwin.gnu.c.solink.category.general"
                   command="-nostdlib"
-                  id="cygwin.gnu.c.solink.options.nostdlibs"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.c.solink.options.nostdlibs">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="cygwin.gnu.c.solink.category.general"
                   command="-s"
-                  id="cygwin.gnu.c.solink.options.strip"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.c.solink.options.strip">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Static"
                   category="cygwin.gnu.c.solink.category.general"
                   command="-static"
-                  id="cygwin.gnu.c.solink.options.noshared"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.c.solink.options.noshared">
             </option>
             <optionCategory
                   owner="cdt.build.tool.cygwin.c.solink"
@@ -1117,15 +1114,15 @@
                   name="%Option.Posix.Libs"
                   category="cygwin.gnu.c.solink.category.libs"
                   command="-l"
-                  id="cygwin.gnu.c.solink.libs"
-                  valueType="libs">
+                  valueType="libs"
+                  id="cygwin.gnu.c.solink.libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="cygwin.gnu.c.solink.category.libs"
                   command="-L"
-                  id="cygwin.gnu.c.solink.paths"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="cygwin.gnu.c.solink.paths">
             </option>
             <optionCategory
                   owner="cdt.build.tool.cygwin.c.solink"
@@ -1136,30 +1133,30 @@
                   defaultValue="-shared"
                   name="%Option.Posix.Linker.Flags"
                   category="cygwin.gnu.c.solink.category.other"
-                  id="cygwin.gnu.c.solink.ldflags"
-                  valueType="string">
+                  valueType="string"
+                  id="cygwin.gnu.c.solink.ldflags">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="cygwin.gnu.c.solink.category.other"
                   command="-Xlinker"
-                  id="cygwin.gnu.c.solink.options.other"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="cygwin.gnu.c.solink.options.other">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="cygwin.gnu.c.solink.category.other"
-                  id="cygwin.gnu.c.solink.userobjs"
-                  valueType="userObjs">
+                  valueType="userObjs"
+                  id="cygwin.gnu.c.solink.userobjs">
             </option>
          </tool>
          <tool
                natureFilter="ccnature"
                name="%ToolName.linker.cpp"
                outputFlag="-o"
-               command="g++"
-               outputPrefix="lib"
                outputs="dll"
+               outputPrefix="lib"
+               command="g++"
                id="org.eclipse.cdt.build.tool.cygwin.solink">
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.solink"
@@ -1171,32 +1168,32 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="cygwin.gnu.solink.category.general"
                   command="-nostartfiles"
-                  id="cygwin.gnu.solink.options.nostart"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.solink.options.nostart">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="cygwin.gnu.solink.category.general"
                   command="-nodefaultlibs"
-                  id="cygwin.gnu.solink.options.nodeflibs"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.solink.options.nodeflibs">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="cygwin.gnu.solink.category.general"
                   command="-nostdlib"
-                  id="cygwin.gnu.solink.options.nostdlibs"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.solink.options.nostdlibs">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="cygwin.gnu.solink.category.general"
                   command="-s"
-                  id="cygwin.gnu.solink.options.strip"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="cygwin.gnu.solink.options.strip">
             </option>
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.solink"
@@ -1207,15 +1204,15 @@
                   name="%Option.Posix.Libs"
                   category="cygwin.gnu.solink.category.libs"
                   command="-l"
-                  id="cygwin.solink.libs"
-                  valueType="libs">
+                  valueType="libs"
+                  id="cygwin.solink.libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="cygwin.gnu.solink.category.libs"
                   command="-L"
-                  id="cygwin.solink.ld.paths"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="cygwin.solink.ld.paths">
             </option>
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.solink"
@@ -1226,29 +1223,29 @@
                   defaultValue="-shared"
                   name="%Option.Posix.Linker.Flags"
                   category="cygwin.gnu.solink.category.other"
-                  id="cygwin.solink.ld.flags"
-                  valueType="string">
+                  valueType="string"
+                  id="cygwin.solink.ld.flags">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="cygwin.gnu.solink.category.other"
                   command="-Xlinker"
-                  id="cygwin.gnu.solinker.options.other"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="cygwin.gnu.solinker.options.other">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="cygwin.gnu.solink.category.other"
-                  id="cygwin.gnu.solink.userobjs"
-                  valueType="userObjs">
+                  valueType="userObjs"
+                  id="cygwin.gnu.solink.userobjs">
             </option>
          </tool>
       </target>
       <target
             isTest="true"
             name="%TargetName.cygw.dll"
-            binaryParser="org.eclipse.cdt.core.PE"
             parent="cygwin"
+            binaryParser="org.eclipse.cdt.core.PE"
             defaultExtension="dll.a"
             isAbstract="false"
             id="cygwin.exp">
@@ -1289,9 +1286,9 @@
                natureFilter="ccnature"
                name="%ToolName.linker.cpp"
                outputFlag="-o"
-               command="g++ -shared"
-               outputPrefix="cyg"
                outputs="dll"
+               outputPrefix="cyg"
+               command="g++ -shared"
                id="org.eclipse.cdt.build.tool.cygwin.explink">
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.explink"
@@ -1302,30 +1299,30 @@
                   defaultValue="-Wl,--export-all-symbols -Wl,--enable-auto-import"
                   name="%Option.Posix.Linker.Flags"
                   category="cygwin.explink.category.general"
-                  id="cygwin.explink.ld.flags"
-                  valueType="string">
+                  valueType="string"
+                  id="cygwin.explink.ld.flags">
             </option>
             <option
                   name="%Option.Posix.Libs"
                   category="cygwin.explink.category.general"
                   command="-l"
-                  id="cygwin.explink.libs"
-                  valueType="libs">
+                  valueType="libs"
+                  id="cygwin.explink.libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="cygwin.explink.category.general"
                   command="-L"
-                  id="cygwin.explink.ld.paths"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="cygwin.explink.ld.paths">
             </option>
          </tool>
       </target>
       <target
             isTest="false"
             name="%TargetName.cygw.lib"
-            binaryParser="org.eclipse.cdt.core.PE"
             parent="cygwin"
+            binaryParser="org.eclipse.cdt.core.PE"
             defaultExtension="a"
             isAbstract="false"
             id="cygwin.lib">
@@ -1387,9 +1384,9 @@
          <tool
                natureFilter="both"
                name="%ToolName.archiver"
-               command="ar"
-               outputPrefix="lib"
                outputs="a"
+               outputPrefix="lib"
+               command="ar"
                id="org.eclipse.cdt.build.tool.cygwin.ar">
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.ar"
@@ -1400,8 +1397,8 @@
                   defaultValue="-r"
                   name="%Option.Posix.Archiver.Flags"
                   category="cygwin.ar.category.general"
-                  id="cygwin.ar.flags"
-                  valueType="string">
+                  valueType="string"
+                  id="cygwin.ar.flags">
             </option>
          </tool>
       </target>
@@ -1417,12 +1414,12 @@
             osList="linux">
          <tool
                natureFilter="cnature"
-               name="%ToolName.compiler.c"
                sources="c"
+               name="%ToolName.compiler.c"
                headerExtensions="h"
                outputFlag="-o"
-               command="gcc"
                outputs="o"
+               command="gcc"
                id="cdt.build.tool.linux.gnu.c.compiler">
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.compiler"
@@ -1434,16 +1431,16 @@
                   name="%Option.Posix.Nostdinc"
                   category="linux.gnu.c.compiler.category.preprocessor"
                   command="-nostdinc"
-                  id="linux.gnu.c.compiler.preprocessor.nostdinc"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.c.compiler.preprocessor.nostdinc">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.PreprocOnly"
                   category="linux.gnu.c.compiler.category.preprocessor"
                   command="-E"
-                  id="linux.gnu.c.compiler.preprocessor.preprocess"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.c.compiler.preprocessor.preprocess">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.compiler"
@@ -1454,75 +1451,75 @@
                   name="%Option.Posix.DefSym"
                   category="linux.gnu.c.compiler.category.symbols"
                   command="-D"
-                  id="linux.gnu.c.preprocessor.def.symbols"
-                  valueType="definedSymbols">
+                  valueType="definedSymbols"
+                  id="linux.gnu.c.preprocessor.def.symbols">
                <listOptionValue
-                     builtIn="true"
-                     value="__ELF__">
+                     value="__ELF__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="unix">
+                     value="unix"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__gnu_linux__">
+                     value="__gnu_linux__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="linux">
+                     value="linux"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__unix__">
+                     value="__unix__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__linux__">
+                     value="__linux__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__unix">
+                     value="__unix"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__linux">
+                     value="__linux"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__OPTIMIZE__">
+                     value="__OPTIMIZE__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__STDC_HOSTED__=1">
+                     value="__STDC_HOSTED__=1"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="_GNU_SOURCE">
+                     value="_GNU_SOURCE"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="i386">
+                     value="i386"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__i386">
+                     value="__i386"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__i386__">
+                     value="__i386__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__tune_i386__">
+                     value="__tune_i386__"
+                     builtIn="true">
                </listOptionValue>
             </option>
             <option
                   name="%Option.Posix.UndefSym"
                   category="linux.gnu.c.compiler.category.symbols"
                   command="-U"
-                  id="linux.gnu.c.preprocessor.undef.symbol"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="linux.gnu.c.preprocessor.undef.symbol">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.compiler"
@@ -1533,8 +1530,8 @@
                   name="%Option.Posix.InclPaths"
                   category="linux.gnu.c.compiler.category.dirs"
                   command="-I"
-                  id="linux.gnu.c.compiler.general.include.paths"
-                  valueType="includePath">
+                  valueType="includePath"
+                  id="linux.gnu.c.compiler.general.include.paths">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.compiler"
@@ -1544,8 +1541,8 @@
             <option
                   name="%Option.Posix.OptLevel"
                   category="linux.gnu.c.compiler.category.optimization"
-                  id="linux.gnu.c.compiler.general.optimization.level"
-                  valueType="enumerated">
+                  valueType="enumerated"
+                  id="linux.gnu.c.compiler.general.optimization.level">
                <enumeratedOptionValue
                      name="%Option.Posix.Optimize.None"
                      isDefault="false"
@@ -1572,8 +1569,8 @@
             <option
                   name="%Option.Posix.Optimize.Flags"
                   category="linux.gnu.c.compiler.category.optimization"
-                  id="linux.gnu.c.compiler.optimization.flags"
-                  valueType="string">
+                  valueType="string"
+                  id="linux.gnu.c.compiler.optimization.flags">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.compiler"
@@ -1583,8 +1580,8 @@
             <option
                   name="%Option.Posix.DebugLevel"
                   category="linux.gnu.c.compiler.category.debug"
-                  id="linux.c.compiler.debugging.level"
-                  valueType="enumerated">
+                  valueType="enumerated"
+                  id="linux.c.compiler.debugging.level">
                <enumeratedOptionValue
                      name="%Option.Posix.Debug.None"
                      isDefault="false"
@@ -1611,24 +1608,24 @@
             <option
                   name="%Option.Posix.Debug.Other"
                   category="linux.gnu.c.compiler.category.debug"
-                  id="linux.gnu.c.compiler.debugging.other"
-                  valueType="string">
+                  valueType="string"
+                  id="linux.gnu.c.compiler.debugging.other">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.gprof"
                   category="linux.gnu.c.compiler.category.debug"
                   command="-pg"
-                  id="linux.gnu.c.compiler.debugging.gprof"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.c.compiler.debugging.gprof">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.prof"
                   category="linux.gnu.c.compiler.category.debug"
                   command="-p"
-                  id="linux.gnu.c.compiler.debugging.prof"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.c.compiler.debugging.prof">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.compiler"
@@ -1640,48 +1637,48 @@
                   name="%Option.Posix.Warn.Syntax"
                   category="linux.c.compiler.category.warnings"
                   command="-fsyntax-only"
-                  id="linux.gnu.c.compiler.warnings.syntax"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.c.compiler.warnings.syntax">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.Pedandic"
                   category="linux.c.compiler.category.warnings"
                   command="-pedantic"
-                  id="linux.gnu.c.compiler.warnings.pedantic"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.c.compiler.warnings.pedantic">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.PedErrors"
                   category="linux.c.compiler.category.warnings"
                   command="-pedantic-errors"
-                  id="linux.gnu.c.compiler.warnings.pedantic.error"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.c.compiler.warnings.pedantic.error">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.nowarn"
                   category="linux.c.compiler.category.warnings"
                   command="-w"
-                  id="linux.gnu.c.compiler.warnings.nowarn"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.c.compiler.warnings.nowarn">
             </option>
             <option
                   defaultValue="true"
                   name="%Option.Posix.Warn.allwarn"
                   category="linux.c.compiler.category.warnings"
                   command="-Wall"
-                  id="linux.gnu.c.compiler.warnings.allwarn"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.c.compiler.warnings.allwarn">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.toerrs"
                   category="linux.c.compiler.category.warnings"
                   command="-Werror"
-                  id="linux.gnu.c.compiler.warnings.toerrors"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.c.compiler.warnings.toerrors">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.compiler"
@@ -1692,34 +1689,34 @@
                   defaultValue="-c"
                   name="%Option.OtherFlags"
                   category="linux.c.compiler.category.other"
-                  id="linux.gnu.c.compiler.misc.other"
-                  valueType="string">
+                  valueType="string"
+                  id="linux.gnu.c.compiler.misc.other">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Verbose"
                   category="linux.c.compiler.category.other"
                   command="-v"
-                  id="linux.gnu.c.compiler.misc.verbose"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.c.compiler.misc.verbose">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Ansi"
                   category="linux.c.compiler.category.other"
                   command="-ansi"
-                  id="linux.gnu.c.compiler.misc.ansi"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.c.compiler.misc.ansi">
             </option>
          </tool>
          <tool
                natureFilter="ccnature"
-               name="%ToolName.compiler.cpp"
                sources="c,C,cc,cxx,cpp"
+               name="%ToolName.compiler.cpp"
                headerExtensions="h,H,hpp"
                outputFlag="-o"
-               command="g++"
                outputs="o"
+               command="g++"
                id="cdt.build.tool.linux.gnu.compiler">
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.compiler"
@@ -1731,90 +1728,90 @@
                   name="%Option.Posix.Nostdinc"
                   category="linux.gnu.compiler.category.preprocessor"
                   command="-nostdinc"
-                  id="linux.gnu.compiler.preprocessor.nostdinc"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.compiler.preprocessor.nostdinc">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.PreprocOnly"
                   category="linux.gnu.compiler.category.preprocessor"
                   command="-E"
-                  id="linux.gnu.compiler.preprocessor.preprocess"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.compiler.preprocessor.preprocess">
             </option>
             <option
                   name="%Option.Posix.DefSym"
                   category="linux.gnu.compiler.category.preprocessor"
                   command="-D"
-                  id="linux.gnu.compiler.preprocessor.def"
-                  valueType="definedSymbols">
+                  valueType="definedSymbols"
+                  id="linux.gnu.compiler.preprocessor.def">
                <listOptionValue
-                     builtIn="true"
-                     value="__ELF__">
+                     value="__ELF__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="unix">
+                     value="unix"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__gnu_linux__">
+                     value="__gnu_linux__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="linux">
+                     value="linux"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__unix__">
+                     value="__unix__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__linux__">
+                     value="__linux__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__unix">
+                     value="__unix"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__linux">
+                     value="__linux"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__OPTIMIZE__">
+                     value="__OPTIMIZE__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__STDC_HOSTED__=1">
+                     value="__STDC_HOSTED__=1"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="_GNU_SOURCE">
+                     value="_GNU_SOURCE"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="i386">
+                     value="i386"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__i386">
+                     value="__i386"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__i386__">
+                     value="__i386__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__tune_i386__">
+                     value="__tune_i386__"
+                     builtIn="true">
                </listOptionValue>
             </option>
             <option
                   name="%Option.Posix.UndefSym"
                   category="linux.gnu.compiler.category.preprocessor"
                   command="-U"
-                  id="linux.gnu.compiler.preprocessor.undef"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="linux.gnu.compiler.preprocessor.undef">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.compiler"
@@ -1825,15 +1822,15 @@
                   name="%Option.Posix.InclPaths"
                   category="linux.gnu.compiler.category.dirs"
                   command="-I"
-                  id="linux.gnu.compiler.dirs.incpaths"
-                  valueType="includePath">
+                  valueType="includePath"
+                  id="linux.gnu.compiler.dirs.incpaths">
                <listOptionValue
-                     builtIn="true"
-                     value="/usr/local/include">
+                     value="/usr/local/include"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="/usr/include">
+                     value="/usr/include"
+                     builtIn="true">
                </listOptionValue>
             </option>
             <optionCategory
@@ -1844,8 +1841,8 @@
             <option
                   name="%Option.Posix.OptLevel"
                   category="linux.gnu.compiler.category.optimization"
-                  id="linux.gnu.compiler.optimization.level"
-                  valueType="enumerated">
+                  valueType="enumerated"
+                  id="linux.gnu.compiler.optimization.level">
                <enumeratedOptionValue
                      name="%Option.Posix.Optimize.None"
                      command="-O0"
@@ -1871,8 +1868,8 @@
             <option
                   name="%Option.Posix.Optimize.Flags"
                   category="linux.gnu.compiler.category.optimization"
-                  id="linux.compiler.optimization.flags"
-                  valueType="string">
+                  valueType="string"
+                  id="linux.compiler.optimization.flags">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.compiler"
@@ -1882,8 +1879,8 @@
             <option
                   name="%Option.Posix.DebugLevel"
                   category="linux.gnu.compiler.category.debug"
-                  id="linux.gnu.compiler.debugging.level"
-                  valueType="enumerated">
+                  valueType="enumerated"
+                  id="linux.gnu.compiler.debugging.level">
                <enumeratedOptionValue
                      name="%Option.Posix.Debug.None"
                      isDefault="false"
@@ -1910,24 +1907,24 @@
             <option
                   name="%Option.Posix.Debug.Other"
                   category="linux.gnu.compiler.category.debug"
-                  id="linux.gnu.compiler.debugging.other"
-                  valueType="string">
+                  valueType="string"
+                  id="linux.gnu.compiler.debugging.other">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.prof"
                   category="linux.gnu.compiler.category.debug"
                   command="-p"
-                  id="linux.gnu.compiler.debugging.prof"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.compiler.debugging.prof">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.gprof"
                   category="linux.gnu.compiler.category.debug"
                   command="-pg"
-                  id="linux.gnu.compiler.debugging.gprof"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.compiler.debugging.gprof">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.compiler"
@@ -1939,48 +1936,48 @@
                   name="%Option.Posix.Warn.Syntax"
                   category="linux.gnu.compiler.category.warnings"
                   command="-fsyntax-only"
-                  id="linux.gnu.compiler.warnings.syntax"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.compiler.warnings.syntax">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.Pedandic"
                   category="linux.gnu.compiler.category.warnings"
                   command="-pedantic"
-                  id="linux.gnu.compiler.warnings.pedantic"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.compiler.warnings.pedantic">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.PedErrors"
                   category="linux.gnu.compiler.category.warnings"
                   command="-pedantic-errors"
-                  id="linux.gnu.compiler.warnings.pedantic.error"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.compiler.warnings.pedantic.error">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.nowarn"
                   category="linux.gnu.compiler.category.warnings"
                   command="-w"
-                  id="linux.gnu.compiler.warnings.nowarn"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.compiler.warnings.nowarn">
             </option>
             <option
                   defaultValue="true"
                   name="%Option.Posix.Warn.allwarn"
                   category="linux.gnu.compiler.category.warnings"
                   command="-Wall"
-                  id="linux.gnu.compiler.warnings.allwarn"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.compiler.warnings.allwarn">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.toerrs"
                   category="linux.gnu.compiler.category.warnings"
                   command="-Werror"
-                  id="linux.gnu.compiler.warnings.toerrors"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.compiler.warnings.toerrors">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.compiler"
@@ -1991,24 +1988,24 @@
                   defaultValue="-c"
                   name="%Option.OtherFlags"
                   category="linux.gnu.compiler.category.other"
-                  id="linux.gnu.compiler.other.other"
-                  valueType="string">
+                  valueType="string"
+                  id="linux.gnu.compiler.other.other">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Verbose"
                   category="linux.gnu.compiler.category.other"
                   command="-v"
-                  id="linux.gnu.compiler.other.verbose"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.compiler.other.verbose">
             </option>
          </tool>
       </target>
       <target
             isTest="false"
             name="%TargetName.linux.exe"
-            binaryParser="org.eclipse.cdt.core.ELF"
             parent="linux.gnu"
+            binaryParser="org.eclipse.cdt.core.ELF"
             isAbstract="false"
             id="linux.gnu.exec">
          <configuration
@@ -2065,8 +2062,8 @@
          </configuration>
          <tool
                natureFilter="cnature"
-               name="%ToolName.linker.c"
                sources="o"
+               name="%ToolName.linker.c"
                outputFlag="-o"
                command="gcc"
                id="cdt.build.tool.linux.c.link">
@@ -2080,40 +2077,40 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="linux.gnu.c.linker.category.general"
                   command="-nostartfiles"
-                  id="linux.gnu.c.link.options.nostart"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.c.link.options.nostart">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="linux.gnu.c.linker.category.general"
                   command="-nodefaultlibs"
-                  id="linux.gnu.c.link.options.nodeflibs"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.c.link.options.nodeflibs">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="linux.gnu.c.linker.category.general"
                   command="-nostdlib"
-                  id="linux.gnu.c.link.options.nostdlibs"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.c.link.options.nostdlibs">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="linux.gnu.c.linker.category.options"
                   command="-s"
-                  id="linux.gnu.c.link.options.strip"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.c.link.options.strip">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Static"
                   category="linux.gnu.c.linker.category.general"
                   command="-static"
-                  id="linux.gnu.c.link.options.noshared"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.c.link.options.noshared">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.c.link"
@@ -2124,15 +2121,15 @@
                   name="%Option.Posix.Libs"
                   category="linux.gnu.c.linker.category.libs"
                   command="-l"
-                  id="linux.gnu.c.link.libs"
-                  valueType="libs">
+                  valueType="libs"
+                  id="linux.gnu.c.link.libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="linux.gnu.c.linker.category.libs"
                   command="-L"
-                  id="linux.gnu.c.link.paths"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="linux.gnu.c.link.paths">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.c.link"
@@ -2142,27 +2139,27 @@
             <option
                   name="%Option.Posix.Linker.Flags"
                   category="linux.gnu.c.linker.category.other"
-                  id="linux.gnu.c.link.ldflags"
-                  valueType="string">
+                  valueType="string"
+                  id="linux.gnu.c.link.ldflags">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="linux.gnu.c.linker.category.other"
                   command="-Xlinker"
-                  id="linux.gnu.c.link.options.other"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="linux.gnu.c.link.options.other">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="linux.gnu.c.linker.category.other"
-                  id="linux.gnu.c.link.ld.userobjs"
-                  valueType="userObjs">
+                  valueType="userObjs"
+                  id="linux.gnu.c.link.ld.userobjs">
             </option>
          </tool>
          <tool
                natureFilter="ccnature"
-               name="%ToolName.linker.cpp"
                sources="o"
+               name="%ToolName.linker.cpp"
                outputFlag="-o"
                command="g++"
                id="cdt.build.tool.linux.gnu.link">
@@ -2176,40 +2173,40 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="linux.gnu.linker.category.options"
                   command="-nostartfiles"
-                  id="linux.gnu.linker.options.nostart"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.linker.options.nostart">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="linux.gnu.linker.category.options"
                   command="-nodefaultlibs"
-                  id="linux.gnu.linker.options.nodeflibs"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.linker.options.nodeflibs">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="linux.gnu.linker.category.options"
                   command="-nostdlib"
-                  id="linux.gnu.linker.options.nostdlibs"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.linker.options.nostdlibs">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="linux.gnu.linker.category.options"
                   command="-s"
-                  id="linux.gnu.linker.options.strip"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.linker.options.strip">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Static"
                   category="linux.gnu.linker.category.options"
                   command="-static"
-                  id="linux.gnu.linker.options.noshared"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.linker.options.noshared">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.link"
@@ -2220,15 +2217,15 @@
                   name="%Option.Posix.Libs"
                   category="linux.gnu.linker.category.libs"
                   command="-l"
-                  id="linux.gnu.linker.libs.libs"
-                  valueType="libs">
+                  valueType="libs"
+                  id="linux.gnu.linker.libs.libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="linux.gnu.linker.category.libs"
                   command="-L"
-                  id="linux.gnu.linker.libs.paths"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="linux.gnu.linker.libs.paths">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.link"
@@ -2238,29 +2235,29 @@
             <option
                   name="%Option.Posix.Linker.Flags"
                   category="linux.gnu.linker.category.other"
-                  id="linux.gnu.linker.libs.flags"
-                  valueType="string">
+                  valueType="string"
+                  id="linux.gnu.linker.libs.flags">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="linux.gnu.linker.category.other"
                   command="-Xlinker"
-                  id="linux.gnu.linker.options.other"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="linux.gnu.linker.options.other">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="linux.gnu.linker.category.other"
-                  id="linux.gnu.linker.userobjs"
-                  valueType="userObjs">
+                  valueType="userObjs"
+                  id="linux.gnu.linker.userobjs">
             </option>
          </tool>
       </target>
       <target
             isTest="false"
             name="%TargetName.linux.so"
-            binaryParser="org.eclipse.cdt.core.ELF"
             parent="linux.gnu"
+            binaryParser="org.eclipse.cdt.core.ELF"
             defaultExtension="so"
             isAbstract="false"
             id="linux.gnu.so">
@@ -2318,12 +2315,12 @@
          </configuration>
          <tool
                natureFilter="cnature"
-               name="%ToolName.linker.c"
                sources="o"
+               name="%ToolName.linker.c"
                outputFlag="-o"
-               command="gcc"
-               outputPrefix="lib"
                outputs="so"
+               outputPrefix="lib"
+               command="gcc"
                id="cdt.build.tool.linux.gnu.c.solink">
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.solink"
@@ -2335,40 +2332,40 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="linux.gnu.c.solink.category.general"
                   command="-nostartfiles"
-                  id="linux.gnu.c.solink.options.nostart"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.c.solink.options.nostart">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="linux.gnu.c.solink.category.general"
                   command="-nodefaultlibs"
-                  id="linux.gnu.c.solink.options.nodeflibs"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.c.solink.options.nodeflibs">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="linux.gnu.c.solink.category.general"
                   command="-nostdlib"
-                  id="linux.gnu.c.solink.options.nostdlibs"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.c.solink.options.nostdlibs">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="linux.gnu.c.solink.category.general"
                   command="-s"
-                  id="linux.gnu.c.solink.options.strip"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.c.solink.options.strip">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Static"
                   category="linux.gnu.c.solink.category.general"
                   command="-static"
-                  id="linux.gnu.c.solink.options.noshared"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.c.solink.options.noshared">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.solink"
@@ -2379,15 +2376,15 @@
                   name="%Option.Posix.Libs"
                   category="linux.gnu.c.solink.category.libs"
                   command="-l"
-                  id="linux.gnu.c.solink.libs"
-                  valueType="libs">
+                  valueType="libs"
+                  id="linux.gnu.c.solink.libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="linux.gnu.c.solink.category.libs"
                   command="-L"
-                  id="linux.gnu.c.solink.paths"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="linux.gnu.c.solink.paths">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.solink"
@@ -2398,31 +2395,31 @@
                   defaultValue="-shared"
                   name="%Option.Posix.Linker.Flags"
                   category="linux.gnu.c.solink.category.other"
-                  id="linux.gnu.c.solink.ldflags"
-                  valueType="string">
+                  valueType="string"
+                  id="linux.gnu.c.solink.ldflags">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="linux.gnu.c.solink.category.other"
                   command="-Xlinker"
-                  id="linux.gnu.c.solink.options.other"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="linux.gnu.c.solink.options.other">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="linux.gnu.c.solink.category.other"
-                  id="linux.gnu.c.solink.userobjs"
-                  valueType="userObjs">
+                  valueType="userObjs"
+                  id="linux.gnu.c.solink.userobjs">
             </option>
          </tool>
          <tool
                natureFilter="ccnature"
-               name="%ToolName.linker.cpp"
                sources="o"
+               name="%ToolName.linker.cpp"
                outputFlag="-o"
-               command="g++"
-               outputPrefix="lib"
                outputs="so"
+               outputPrefix="lib"
+               command="g++"
                id="cdt.build.tool.linux.gnu.solink">
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.solink"
@@ -2434,32 +2431,32 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="linux.gnu.solink.category.options"
                   command="-nostartfiles"
-                  id="linux.gnu.solink.options.nostart"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.solink.options.nostart">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="linux.gnu.solink.category.options"
                   command="-nodefaultlibs"
-                  id="linux.gnu.solink.options.nodeflibs"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.solink.options.nodeflibs">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="linux.gnu.solink.category.options"
                   command="-nostdlib"
-                  id="linux.gnu.solink.options.nostdlibs"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.solink.options.nostdlibs">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="linux.gnu.solink.category.options"
                   command="-s"
-                  id="linux.gnu.solink.options.strip"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="linux.gnu.solink.options.strip">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.solink"
@@ -2470,15 +2467,15 @@
                   name="%Option.Posix.Libs"
                   category="linux.gnu.solink.category.libs"
                   command="-l"
-                  id="linux.gnu.solink.libs.libs"
-                  valueType="libs">
+                  valueType="libs"
+                  id="linux.gnu.solink.libs.libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="linux.gnu.solink.category.libs"
                   command="-L"
-                  id="linux.gnu.solink.libs.paths"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="linux.gnu.solink.libs.paths">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.solink"
@@ -2489,29 +2486,29 @@
                   defaultValue="-shared"
                   name="%Option.Posix.Linker.Flags"
                   category="linux.gnu.solink.category.other"
-                  id="linux.gnu.solink.libs.flags"
-                  valueType="string">
+                  valueType="string"
+                  id="linux.gnu.solink.libs.flags">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="linux.gnu.solink.category.other"
                   command="-Xlinker"
-                  id="linux.gnu.solink.options.other"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="linux.gnu.solink.options.other">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="linux.gnu.solink.category.other"
-                  id="linux.gnu.solink.userobjs"
-                  valueType="userObjs">
+                  valueType="userObjs"
+                  id="linux.gnu.solink.userobjs">
             </option>
          </tool>
       </target>
       <target
             isTest="false"
             name="%TargetName.linux.lib"
-            binaryParser="org.eclipse.cdt.core.ELF"
             parent="linux.gnu"
+            binaryParser="org.eclipse.cdt.core.ELF"
             defaultExtension="a"
             isAbstract="false"
             id="linux.gnu.lib">
@@ -2569,11 +2566,11 @@
          </configuration>
          <tool
                natureFilter="both"
-               name="%ToolName.archiver"
                sources="o"
-               command="ar"
-               outputPrefix="lib"
+               name="%ToolName.archiver"
                outputs="a"
+               outputPrefix="lib"
+               command="ar"
                id="cdt.build.tool.linux.gnu.lib">
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.lib"
@@ -2584,8 +2581,8 @@
                   defaultValue="-r"
                   name="%Option.Posix.Archiver.Flags"
                   category="linux.gnu.lib.category.general"
-                  id="linux.gnu.lib.flags"
-                  valueType="string">
+                  valueType="string"
+                  id="linux.gnu.lib.flags">
             </option>
          </tool>
       </target>
@@ -2601,12 +2598,12 @@
             osList="solaris">
          <tool
                natureFilter="cnature"
-               name="%ToolName.compiler.c"
                sources="c"
+               name="%ToolName.compiler.c"
                headerExtensions="h"
                outputFlag="-o"
-               command="gcc"
                outputs="o"
+               command="gcc"
                id="cdt.build.tool.solaris.gnu.c.compiler">
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.compiler"
@@ -2618,16 +2615,16 @@
                   name="%Option.Posix.Nostdinc"
                   category="solaris.gnu.c.compiler.category.preprocessor"
                   command="-nostdinc"
-                  id="solaris.gnu.c.compiler.preprocessor.nostdinc"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.c.compiler.preprocessor.nostdinc">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.PreprocOnly"
                   category="solaris.gnu.c.compiler.category.preprocessor"
                   command="-E"
-                  id="solaris.gnu.c.compiler.preprocessor.preprocess"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.c.compiler.preprocessor.preprocess">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.compiler"
@@ -2638,67 +2635,67 @@
                   name="%Option.Posix.DefSym"
                   category="solaris.gnu.c.compiler.category.symbols"
                   command="-D"
-                  id="solaris.gnu.c.preprocessor.def.symbols"
-                  valueType="definedSymbols">
+                  valueType="definedSymbols"
+                  id="solaris.gnu.c.preprocessor.def.symbols">
                <listOptionValue
-                     builtIn="true"
-                     value="sun">
+                     value="sun"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="sparc">
+                     value="sparc"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="unix">
+                     value="unix"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__svr4__">
+                     value="__svr4__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__SVR4">
+                     value="__SVR4"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__GCC_NEW_VARARGS__">
+                     value="__GCC_NEW_VARARGS__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__sun__">
+                     value="__sun__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__sparc__">
+                     value="__sparc__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__unix__">
+                     value="__unix__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__sun">
+                     value="__sun"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__sparc">
+                     value="__sparc"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__unix">
+                     value="__unix"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__OPTIMIZE__">
+                     value="__OPTIMIZE__"
+                     builtIn="true">
                </listOptionValue>
             </option>
             <option
                   name="%Option.Posix.UndefSym"
                   category="solaris.gnu.c.compiler.category.symbols"
                   command="-U"
-                  id="solaris.gnu.c.preprocessor.undef.symbol"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="solaris.gnu.c.preprocessor.undef.symbol">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.compiler"
@@ -2709,8 +2706,8 @@
                   name="%Option.Posix.InclPaths"
                   category="solaris.gnu.c.compiler.category.dirs"
                   command="-I"
-                  id="solaris.gnu.c.compiler.general.include.paths"
-                  valueType="includePath">
+                  valueType="includePath"
+                  id="solaris.gnu.c.compiler.general.include.paths">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.compiler"
@@ -2720,8 +2717,8 @@
             <option
                   name="%Option.Posix.OptLevel"
                   category="solaris.gnu.c.compiler.category.optimization"
-                  id="solaris.gnu.c.compiler.general.optimization.level"
-                  valueType="enumerated">
+                  valueType="enumerated"
+                  id="solaris.gnu.c.compiler.general.optimization.level">
                <enumeratedOptionValue
                      name="%Option.Posix.Optimize.None"
                      isDefault="false"
@@ -2748,8 +2745,8 @@
             <option
                   name="%Option.Posix.Optimize.Flags"
                   category="solaris.gnu.c.compiler.category.optimization"
-                  id="solaris.gnu.c.compiler.optimization.flags"
-                  valueType="string">
+                  valueType="string"
+                  id="solaris.gnu.c.compiler.optimization.flags">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.compiler"
@@ -2759,8 +2756,8 @@
             <option
                   name="%Option.Posix.DebugLevel"
                   category="solaris.gnu.c.compiler.category.debug"
-                  id="solaris.c.compiler.debugging.level"
-                  valueType="enumerated">
+                  valueType="enumerated"
+                  id="solaris.c.compiler.debugging.level">
                <enumeratedOptionValue
                      name="%Option.Posix.Debug.None"
                      isDefault="false"
@@ -2787,24 +2784,24 @@
             <option
                   name="%Option.Posix.Debug.Other"
                   category="solaris.gnu.c.compiler.category.debug"
-                  id="solaris.gnu.c.compiler.debugging.other"
-                  valueType="string">
+                  valueType="string"
+                  id="solaris.gnu.c.compiler.debugging.other">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.gprof"
                   category="solaris.gnu.c.compiler.category.debug"
                   command="-pg"
-                  id="solaris.gnu.c.compiler.debugging.gprof"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.c.compiler.debugging.gprof">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.prof"
                   category="solaris.gnu.c.compiler.category.debug"
                   command="-p"
-                  id="solaris.gnu.c.compiler.debugging.prof"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.c.compiler.debugging.prof">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.compiler"
@@ -2816,48 +2813,48 @@
                   name="%Option.Posix.Warn.Syntax"
                   category="solaris.c.compiler.category.warnings"
                   command="-fsyntax-only"
-                  id="solaris.gnu.c.compiler.warnings.syntax"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.c.compiler.warnings.syntax">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.Pedandic"
                   category="solaris.c.compiler.category.warnings"
                   command="-pedantic"
-                  id="solaris.gnu.c.compiler.warnings.pedantic"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.c.compiler.warnings.pedantic">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.PedErrors"
                   category="solaris.c.compiler.category.warnings"
                   command="-pedantic-errors"
-                  id="solaris.gnu.c.compiler.warnings.pedantic.error"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.c.compiler.warnings.pedantic.error">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.nowarn"
                   category="solaris.c.compiler.category.warnings"
                   command="-w"
-                  id="solaris.gnu.c.compiler.warnings.nowarn"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.c.compiler.warnings.nowarn">
             </option>
             <option
                   defaultValue="true"
                   name="%Option.Posix.Warn.allwarn"
                   category="solaris.c.compiler.category.warnings"
                   command="-Wall"
-                  id="solaris.gnu.c.compiler.warnings.allwarn"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.c.compiler.warnings.allwarn">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.toerrs"
                   category="solaris.c.compiler.category.warnings"
                   command="-Werror"
-                  id="solaris.gnu.c.compiler.warnings.toerrors"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.c.compiler.warnings.toerrors">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.compiler"
@@ -2868,34 +2865,34 @@
                   defaultValue="-c"
                   name="%Option.OtherFlags"
                   category="solaris.c.compiler.category.other"
-                  id="solaris.gnu.c.compiler.misc.other"
-                  valueType="string">
+                  valueType="string"
+                  id="solaris.gnu.c.compiler.misc.other">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Verbose"
                   category="solaris.c.compiler.category.other"
                   command="-v"
-                  id="solaris.gnu.c.compiler.misc.verbose"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.c.compiler.misc.verbose">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Ansi"
                   category="solaris.c.compiler.category.other"
                   command="-ansi"
-                  id="solaris.gnu.c.compiler.misc.ansi"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.c.compiler.misc.ansi">
             </option>
          </tool>
          <tool
                natureFilter="ccnature"
-               name="%ToolName.compiler.cpp"
                sources="c,C,cc,cxx,cpp"
+               name="%ToolName.compiler.cpp"
                headerExtensions="h,H,hpp"
                outputFlag="-o"
-               command="g++"
                outputs="o"
+               command="g++"
                id="cdt.build.tool.solaris.gnu.compiler">
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.compiler"
@@ -2907,74 +2904,74 @@
                   name="%Option.Posix.Nostdinc"
                   category="solaris.gnu.compiler.category.preprocessor"
                   command="-nostdinc"
-                  id="solaris.gnu.compiler.preprocessor.nostdinc"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.compiler.preprocessor.nostdinc">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.PreprocOnly"
                   category="solaris.gnu.compiler.category.preprocessor"
                   command="-E"
-                  id="solaris.gnu.compiler.preprocessor.preprocess"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.compiler.preprocessor.preprocess">
             </option>
             <option
                   name="%Option.Posix.DefSym"
                   category="solaris.gnu.compiler.category.preprocessor"
                   command="-D"
-                  id="solaris.gnu.compiler.preprocessor.def"
-                  valueType="definedSymbols">
+                  valueType="definedSymbols"
+                  id="solaris.gnu.compiler.preprocessor.def">
                <listOptionValue
-                     builtIn="true"
-                     value="sun">
+                     value="sun"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="sparc">
+                     value="sparc"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="unix">
+                     value="unix"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__svr4__">
+                     value="__svr4__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__SVR4">
+                     value="__SVR4"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__GCC_NEW_VARARGS__">
+                     value="__GCC_NEW_VARARGS__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__sun__">
+                     value="__sun__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__sparc__">
+                     value="__sparc__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__unix__">
+                     value="__unix__"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__sun">
+                     value="__sun"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__sparc">
+                     value="__sparc"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__unix">
+                     value="__unix"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="__OPTIMIZE__">
+                     value="__OPTIMIZE__"
+                     builtIn="true">
                </listOptionValue>
             </option>
             <optionCategory
@@ -2986,15 +2983,15 @@
                   name="%Option.Posix.InclPaths"
                   category="solaris.gnu.compiler.category.dirs"
                   command="-I"
-                  id="solaris.gnu.compiler.dirs.incpaths"
-                  valueType="includePath">
+                  valueType="includePath"
+                  id="solaris.gnu.compiler.dirs.incpaths">
                <listOptionValue
-                     builtIn="true"
-                     value="/usr/local/include">
+                     value="/usr/local/include"
+                     builtIn="true">
                </listOptionValue>
                <listOptionValue
-                     builtIn="true"
-                     value="/usr/include">
+                     value="/usr/include"
+                     builtIn="true">
                </listOptionValue>
             </option>
             <optionCategory
@@ -3005,8 +3002,8 @@
             <option
                   name="%Option.Posix.OptLevel"
                   category="solaris.gnu.compiler.category.optimization"
-                  id="solaris.gnu.compiler.optimization.level"
-                  valueType="enumerated">
+                  valueType="enumerated"
+                  id="solaris.gnu.compiler.optimization.level">
                <enumeratedOptionValue
                      name="%Option.Posix.Optimize.None"
                      command="-O0"
@@ -3032,8 +3029,8 @@
             <option
                   name="%Option.Posix.Optimize.Flags"
                   category="solaris.gnu.compiler.category.optimization"
-                  id="solaris.compiler.optimization.flags"
-                  valueType="string">
+                  valueType="string"
+                  id="solaris.compiler.optimization.flags">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.compiler"
@@ -3043,8 +3040,8 @@
             <option
                   name="%Option.Posix.DebugLevel"
                   category="solaris.gnu.compiler.category.debug"
-                  id="solaris.gnu.compiler.debugging.level"
-                  valueType="enumerated">
+                  valueType="enumerated"
+                  id="solaris.gnu.compiler.debugging.level">
                <enumeratedOptionValue
                      name="%Option.Posix.Debug.None"
                      isDefault="false"
@@ -3071,24 +3068,24 @@
             <option
                   name="%Option.Posix.Debug.Other"
                   category="solaris.gnu.compiler.category.debug"
-                  id="solaris.gnu.compiler.debugging.other"
-                  valueType="string">
+                  valueType="string"
+                  id="solaris.gnu.compiler.debugging.other">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.prof"
                   category="solaris.gnu.compiler.category.debug"
                   command="-p"
-                  id="solaris.gnu.compiler.debugging.prof"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.compiler.debugging.prof">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.gprof"
                   category="solaris.gnu.compiler.category.debug"
                   command="-pg"
-                  id="solaris.gnu.compiler.debugging.gprof"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.compiler.debugging.gprof">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.compiler"
@@ -3100,48 +3097,48 @@
                   name="%Option.Posix.Warn.Syntax"
                   category="solaris.gnu.compiler.category.warnings"
                   command="-fsyntax-only"
-                  id="solaris.gnu.compiler.warnings.syntax"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.compiler.warnings.syntax">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.Pedandic"
                   category="solaris.gnu.compiler.category.warnings"
                   command="-pedantic"
-                  id="solaris.gnu.compiler.warnings.pedantic"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.compiler.warnings.pedantic">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.PedErrors"
                   category="solaris.gnu.compiler.category.warnings"
                   command="-pedantic-errors"
-                  id="solaris.gnu.compiler.warnings.pedantic.error"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.compiler.warnings.pedantic.error">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.nowarn"
                   category="solaris.gnu.compiler.category.warnings"
                   command="-w"
-                  id="solaris.gnu.compiler.warnings.nowarn"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.compiler.warnings.nowarn">
             </option>
             <option
                   defaultValue="true"
                   name="%Option.Posix.Warn.allwarn"
                   category="solaris.gnu.compiler.category.warnings"
                   command="-Wall"
-                  id="solaris.gnu.compiler.warnings.allwarn"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.compiler.warnings.allwarn">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.toerrs"
                   category="solaris.gnu.compiler.category.warnings"
                   command="-Werror"
-                  id="solaris.gnu.compiler.warnings.toerrors"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.compiler.warnings.toerrors">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.compiler"
@@ -3152,24 +3149,24 @@
                   defaultValue="-c"
                   name="%Option.OtherFlags"
                   category="solaris.gnu.compiler.category.other"
-                  id="solaris.gnu.compiler.other.other"
-                  valueType="string">
+                  valueType="string"
+                  id="solaris.gnu.compiler.other.other">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Verbose"
                   category="solaris.gnu.compiler.category.other"
                   command="-v"
-                  id="solaris.gnu.compiler.other.verbose"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.compiler.other.verbose">
             </option>
          </tool>
       </target>
       <target
             isTest="false"
             name="%TargetName.solaris.exe"
-            binaryParser="org.eclipse.cdt.core.ELF"
             parent="solaris.gnu"
+            binaryParser="org.eclipse.cdt.core.ELF"
             isAbstract="false"
             id="solaris.gnu.exec">
          <configuration
@@ -3226,8 +3223,8 @@
          </configuration>
          <tool
                natureFilter="cnature"
-               name="%ToolName.linker.c"
                sources="o"
+               name="%ToolName.linker.c"
                outputFlag="-o"
                command="gcc"
                id="cdt.build.tool.solaris.gnu.c.link">
@@ -3241,40 +3238,40 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="solaris.gnu.c.linker.category.general"
                   command="-nostartfiles"
-                  id="solaris.gnu.c.link.options.nostart"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.c.link.options.nostart">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="solaris.gnu.c.linker.category.general"
                   command="-nodefaultlibs"
-                  id="solaris.gnu.c.link.options.nodeflibs"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.c.link.options.nodeflibs">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="solaris.gnu.c.linker.category.general"
                   command="-nostdlib"
-                  id="solaris.gnu.c.link.options.nostdlibs"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.c.link.options.nostdlibs">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="solaris.gnu.c.linker.category.options"
                   command="-s"
-                  id="solaris.gnu.c.link.options.strip"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.c.link.options.strip">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Static"
                   category="solaris.gnu.c.linker.category.general"
                   command="-static"
-                  id="solaris.gnu.c.link.options.noshared"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.c.link.options.noshared">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.link"
@@ -3285,15 +3282,15 @@
                   name="%Option.Posix.Libs"
                   category="solaris.gnu.c.linker.category.libs"
                   command="-l"
-                  id="solaris.gnu.c.link.libs"
-                  valueType="libs">
+                  valueType="libs"
+                  id="solaris.gnu.c.link.libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="solaris.gnu.c.linker.category.libs"
                   command="-L"
-                  id="solaris.gnu.c.link.paths"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="solaris.gnu.c.link.paths">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.link"
@@ -3303,27 +3300,27 @@
             <option
                   name="%Option.Posix.Linker.Flags"
                   category="solaris.gnu.c.linker.category.other"
-                  id="solaris.gnu.c.link.ldflags"
-                  valueType="string">
+                  valueType="string"
+                  id="solaris.gnu.c.link.ldflags">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="solaris.gnu.c.linker.category.other"
                   command="-Xlinker"
-                  id="solaris.gnu.c.link.options.other"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="solaris.gnu.c.link.options.other">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="solaris.gnu.c.linker.category.other"
-                  id="solaris.gnu.c.link.ld.userobjs"
-                  valueType="userObjs">
+                  valueType="userObjs"
+                  id="solaris.gnu.c.link.ld.userobjs">
             </option>
          </tool>
          <tool
                natureFilter="ccnature"
-               name="%ToolName.linker.cpp"
                sources="o"
+               name="%ToolName.linker.cpp"
                outputFlag="-o"
                command="g++"
                id="cdt.build.tool.solaris.gnu.link">
@@ -3337,40 +3334,40 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="solaris.gnu.linker.category.options"
                   command="-nostartfiles"
-                  id="solaris.gnu.linker.options.nostart"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.linker.options.nostart">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="solaris.gnu.linker.category.options"
                   command="-nodefaultlibs"
-                  id="solaris.gnu.linker.options.nodeflibs"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.linker.options.nodeflibs">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="solaris.gnu.linker.category.options"
                   command="-nostdlib"
-                  id="solaris.gnu.linker.options.nostdlibs"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.linker.options.nostdlibs">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="solaris.gnu.linker.category.options"
                   command="-s"
-                  id="solaris.gnu.linker.options.strip"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.linker.options.strip">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Static"
                   category="solaris.gnu.linker.category.options"
                   command="-static"
-                  id="solaris.gnu.linker.options.noshared"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.linker.options.noshared">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.link"
@@ -3381,15 +3378,15 @@
                   name="%Option.Posix.Libs"
                   category="solaris.gnu.linker.category.libs"
                   command="-l"
-                  id="solaris.gnu.linker.libs.libs"
-                  valueType="libs">
+                  valueType="libs"
+                  id="solaris.gnu.linker.libs.libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="solaris.gnu.linker.category.libs"
                   command="-L"
-                  id="solaris.gnu.linker.libs.paths"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="solaris.gnu.linker.libs.paths">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.link"
@@ -3399,29 +3396,29 @@
             <option
                   name="%Option.Posix.Linker.Flags"
                   category="solaris.gnu.linker.category.other"
-                  id="solaris.gnu.linker.libs.flags"
-                  valueType="string">
+                  valueType="string"
+                  id="solaris.gnu.linker.libs.flags">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="solaris.gnu.linker.category.other"
                   command="-Xlinker"
-                  id="solaris.gnu.linker.options.other"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="solaris.gnu.linker.options.other">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="solaris.gnu.linker.category.other"
-                  id="solaris.gnu.linker.userobjs"
-                  valueType="userObjs">
+                  valueType="userObjs"
+                  id="solaris.gnu.linker.userobjs">
             </option>
          </tool>
       </target>
       <target
             isTest="false"
             name="%TargetName.solaris.so"
-            binaryParser="org.eclipse.cdt.core.ELF"
             parent="solaris.gnu"
+            binaryParser="org.eclipse.cdt.core.ELF"
             defaultExtension="so"
             isAbstract="false"
             id="solaris.gnu.so">
@@ -3483,12 +3480,12 @@
          </configuration>
          <tool
                natureFilter="cnature"
-               name="%ToolName.linker.c"
                sources="o"
+               name="%ToolName.linker.c"
                outputFlag="-o"
-               command="gcc"
-               outputPrefix="lib"
                outputs="so"
+               outputPrefix="lib"
+               command="gcc"
                id="cdt.build.tool.solaris.gnu.c.solink">
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.solink"
@@ -3500,40 +3497,40 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="solaris.gnu.c.solink.category.general"
                   command="-nostartfiles"
-                  id="solaris.gnu.c.solink.options.nostart"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.c.solink.options.nostart">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="solaris.gnu.c.solink.category.general"
                   command="-nodefaultlibs"
-                  id="solaris.gnu.c.solink.options.nodeflibs"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.c.solink.options.nodeflibs">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="solaris.gnu.c.solink.category.general"
                   command="-nostdlib"
-                  id="solaris.gnu.c.solink.options.nostdlibs"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.c.solink.options.nostdlibs">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="solaris.gnu.c.solink.category.general"
                   command="-s"
-                  id="solaris.gnu.c.solink.options.strip"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.c.solink.options.strip">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Static"
                   category="solaris.gnu.c.solink.category.general"
                   command="-static"
-                  id="solaris.gnu.c.solink.options.noshared"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.c.solink.options.noshared">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.solink"
@@ -3544,15 +3541,15 @@
                   name="%Option.Posix.Libs"
                   category="solaris.gnu.c.solink.category.libs"
                   command="-l"
-                  id="solaris.gnu.c.solink.libs"
-                  valueType="libs">
+                  valueType="libs"
+                  id="solaris.gnu.c.solink.libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="solaris.gnu.c.solink.category.libs"
                   command="-L"
-                  id="solaris.gnu.c.solink.paths"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="solaris.gnu.c.solink.paths">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.solink"
@@ -3563,31 +3560,31 @@
                   defaultValue="-shared -fPIC"
                   name="%Option.Posix.Linker.Flags"
                   category="solaris.gnu.c.solink.category.other"
-                  id="solaris.gnu.c.solink.ldflags"
-                  valueType="string">
+                  valueType="string"
+                  id="solaris.gnu.c.solink.ldflags">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="solaris.gnu.c.solink.category.other"
                   command="-Xlinker"
-                  id="solaris.gnu.c.solink.options.other"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="solaris.gnu.c.solink.options.other">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="solaris.gnu.c.solink.category.other"
-                  id="solaris.gnu.c.solink.userobjs"
-                  valueType="userObjs">
+                  valueType="userObjs"
+                  id="solaris.gnu.c.solink.userobjs">
             </option>
          </tool>
          <tool
                natureFilter="ccnature"
-               name="%ToolName.linker.cpp"
                sources="o"
+               name="%ToolName.linker.cpp"
                outputFlag="-o"
-               command="g++"
-               outputPrefix="lib"
                outputs="so"
+               outputPrefix="lib"
+               command="g++"
                id="cdt.build.tool.solaris.gnu.solink">
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.solink"
@@ -3599,32 +3596,32 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="solaris.gnu.solink.category.options"
                   command="-nostartfiles"
-                  id="solaris.gnu.solink.options.nostart"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.solink.options.nostart">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="solaris.gnu.solink.category.options"
                   command="-nodefaultlibs"
-                  id="solaris.gnu.solink.options.nodeflibs"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.solink.options.nodeflibs">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="solaris.gnu.solink.category.options"
                   command="-nostdlib"
-                  id="solaris.gnu.solink.options.nostdlibs"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.solink.options.nostdlibs">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="solaris.gnu.solink.category.options"
                   command="-s"
-                  id="solaris.gnu.solink.options.strip"
-                  valueType="boolean">
+                  valueType="boolean"
+                  id="solaris.gnu.solink.options.strip">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.solink"
@@ -3635,15 +3632,15 @@
                   name="%Option.Posix.Libs"
                   category="solaris.gnu.solink.category.libs"
                   command="-l"
-                  id="solaris.gnu.solink.libs.libs"
-                  valueType="libs">
+                  valueType="libs"
+                  id="solaris.gnu.solink.libs.libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="solaris.gnu.solink.category.libs"
                   command="-L"
-                  id="solaris.gnu.solink.libs.paths"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="solaris.gnu.solink.libs.paths">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.solink"
@@ -3654,29 +3651,29 @@
                   defaultValue="-shared -fPIC"
                   name="%Option.Posix.Linker.Flags"
                   category="solaris.gnu.solink.category.other"
-                  id="solaris.gnu.solink.libs.flags"
-                  valueType="string">
+                  valueType="string"
+                  id="solaris.gnu.solink.libs.flags">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="solaris.gnu.solink.category.other"
                   command="-Xlinker"
-                  id="solaris.gnu.solink.options.other"
-                  valueType="stringList">
+                  valueType="stringList"
+                  id="solaris.gnu.solink.options.other">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="solaris.gnu.solink.category.other"
-                  id="solaris.gnu.solink.userobjs"
-                  valueType="userObjs">
+                  valueType="userObjs"
+                  id="solaris.gnu.solink.userobjs">
             </option>
          </tool>
       </target>
       <target
             isTest="false"
             name="%TargetName.solaris.lib"
-            binaryParser="org.eclipse.cdt.core.ELF"
             parent="solaris.gnu"
+            binaryParser="org.eclipse.cdt.core.ELF"
             defaultExtension="a"
             isAbstract="false"
             id="solaris.gnu.lib">
@@ -3734,11 +3731,11 @@
          </configuration>
          <tool
                natureFilter="both"
-               name="%ToolName.archiver"
                sources="o"
-               command="ar"
-               outputPrefix="lib"
+               name="%ToolName.archiver"
                outputs="a"
+               outputPrefix="lib"
+               command="ar"
                id="cdt.build.tool.solaris.gnu.lib">
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.lib"
@@ -3749,8 +3746,8 @@
                   defaultValue="-r"
                   name="%Option.Posix.Archiver.Flags"
                   category="solaris.gnu.lib.category.general"
-                  id="solaris.gnu.lib.flags"
-                  valueType="string">
+                  valueType="string"
+                  id="solaris.gnu.lib.flags">
             </option>
          </tool>
       </target>