diff --git a/build/org.eclipse.cdt.make.core/.classpath b/build/org.eclipse.cdt.make.core/.classpath
index 065ac06e197..bdd591c40d8 100644
--- a/build/org.eclipse.cdt.make.core/.classpath
+++ b/build/org.eclipse.cdt.make.core/.classpath
@@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.resources_3.0.0/resourcessrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.resources_3.0.0/resources.jar"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.core"/>
+	<classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.xerces_4.0.13/xmlParserAPIs.jar"/>
+	<classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.xerces_4.0.13/xercesImpl.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime.compatibility_3.0.0/compatibilitysrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime.compatibility_3.0.0/compatibility.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime_3.0.0/runtimesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime_3.0.0/runtime.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi.util_3.0.0/utilsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi.util_3.0.0/util.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/osgisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/osgi.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/coresrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/core.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/resolversrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/resolver.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/defaultAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/defaultAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/eclipseAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/eclipseAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.update.configurator_3.0.0/configuratorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.update.configurator_3.0.0/configurator.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/build/org.eclipse.cdt.make.core/plugin.xml b/build/org.eclipse.cdt.make.core/plugin.xml
index f0d5138179c..6903624159b 100644
--- a/build/org.eclipse.cdt.make.core/plugin.xml
+++ b/build/org.eclipse.cdt.make.core/plugin.xml
@@ -16,6 +16,7 @@
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.cdt.core"/>
       <import plugin="org.apache.xerces"/>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
    </requires>
 
 
diff --git a/build/org.eclipse.cdt.make.ui/.classpath b/build/org.eclipse.cdt.make.ui/.classpath
index 065ac06e197..4e3a29e15dc 100644
--- a/build/org.eclipse.cdt.make.ui/.classpath
+++ b/build/org.eclipse.cdt.make.ui/.classpath
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.ide_3.0.0/idesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui.ide_3.0.0/ide.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.views_3.0.0/viewssrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui.views_3.0.0/views.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface.text_3.0.0/jfacetextsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.jface.text_3.0.0/jfacetext.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.text_3.0.0/textsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.text_3.0.0/text.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.workbench.texteditor_3.0.0/texteditorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui.workbench.texteditor_3.0.0/texteditor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.editors_3.0.0/editorssrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui.editors_3.0.0/editors.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.resources_3.0.0/resourcessrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.resources_3.0.0/resources.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui_3.0.0/uisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui_3.0.0/ui.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swtsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-pisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-pi.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-mozillasrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-mozilla.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface_3.0.0/jfacesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.jface_3.0.0/jface.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.workbench_3.0.0/workbenchsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui.workbench_3.0.0/workbench.jar"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.core"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.ui"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.make.core"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime.compatibility_3.0.0/compatibilitysrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime.compatibility_3.0.0/compatibility.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime_3.0.0/runtimesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime_3.0.0/runtime.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi.util_3.0.0/utilsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi.util_3.0.0/util.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/osgisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/osgi.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/coresrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/core.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/resolversrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/resolver.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/defaultAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/defaultAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/eclipseAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/eclipseAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.update.configurator_3.0.0/configuratorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.update.configurator_3.0.0/configurator.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/build/org.eclipse.cdt.make.ui/plugin.xml b/build/org.eclipse.cdt.make.ui/plugin.xml
index 761e8aa0fa4..7bed92a07d9 100644
--- a/build/org.eclipse.cdt.make.ui/plugin.xml
+++ b/build/org.eclipse.cdt.make.ui/plugin.xml
@@ -23,6 +23,7 @@
       <import plugin="org.eclipse.cdt.core"/>
       <import plugin="org.eclipse.cdt.ui"/>
       <import plugin="org.eclipse.cdt.make.core"/>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
    </requires>
 
 
@@ -33,8 +34,8 @@
             icon="icons/ctool16/newc_app.gif"
             category="org.eclipse.cdt.ui.newCWizards"
             class="org.eclipse.cdt.make.ui.wizards.NewMakeCProjectWizard"
-            finalPerspective="org.eclipse.cdt.ui.CPerspective"
             project="true"
+            finalPerspective="org.eclipse.cdt.ui.CPerspective"
             id="org.eclipse.cdt.ui.wizards.NewMakeCProjectWizard">
          <description>
             %WizardNewCMakeProject.description
@@ -60,8 +61,8 @@
             icon="icons/ctool16/newcc_app.gif"
             category="org.eclipse.cdt.ui.newCCWizards"
             class="org.eclipse.cdt.make.ui.wizards.NewMakeCCProjectWizard"
-            finalPerspective="org.eclipse.cdt.ui.CPerspective"
             project="true"
+            finalPerspective="org.eclipse.cdt.ui.CPerspective"
             id="org.eclipse.cdt.make.ui.wizards.NewMakeCCProjectWizard">
          <description>
             %WizardNewCCMakeProject.description
@@ -85,8 +86,8 @@
    <extension
          point="org.eclipse.ui.popupMenus">
       <objectContribution
-            adaptable="false"
             objectClass="org.eclipse.cdt.core.model.ICContainer"
+            adaptable="false"
             id="org.eclipse.cdt.make.ui.popupMenu.CViewContribution">
          <action
                label="%ActionMakeCreateTarget.label"
@@ -108,8 +109,8 @@
          </filter>
       </objectContribution>
       <objectContribution
-            adaptable="false"
             objectClass="org.eclipse.cdt.core.model.ITranslationUnit"
+            adaptable="false"
             id="org.eclipse.cdt.make.ui.popupMenu.CViewContribution">
          <action
                label="%ActionMakeCreateTarget.label"
@@ -131,8 +132,8 @@
          </filter>
       </objectContribution>
       <objectContribution
-            adaptable="false"
             objectClass="org.eclipse.cdt.core.model.IBinary"
+            adaptable="false"
             id="org.eclipse.cdt.make.ui.popupMenu.CViewContribution">
          <action
                label="%ActionMakeCreateTarget.label"
@@ -154,8 +155,8 @@
          </filter>
       </objectContribution>
       <objectContribution
-            adaptable="false"
             objectClass="org.eclipse.cdt.core.model.IArchive"
+            adaptable="false"
             id="org.eclipse.cdt.make.ui.popupMenu.CViewContribution">
          <action
                label="%ActionMakeCreateTarget.label"
@@ -177,8 +178,8 @@
          </filter>
       </objectContribution>
       <objectContribution
-            adaptable="false"
             objectClass="org.eclipse.core.resources.IResource"
+            adaptable="false"
             id="org.eclipse.cdt.make.ui.popupMenu.NavigatorContribution">
          <action
                label="%ActionMakeBuildTarget.label"
@@ -204,14 +205,14 @@
          point="org.eclipse.ui.commands">
       <command
             name="%CommandTargetBuild.name"
-            category="org.eclipse.ui.category.project"
             description="%CommandTargetBuild.description"
+            category="org.eclipse.ui.category.project"
             id="org.eclipse.cdt.make.ui.targetBuildCommand">
       </command>
       <command
             name="%CommandTargetCreate.name"
-            category="org.eclipse.ui.category.project"
             description="%CommandTargetCreate.description"
+            category="org.eclipse.ui.category.project"
             id="org.eclipse.cdt.make.ui.targetCreateCommand">
       </command>
    </extension>
@@ -231,8 +232,8 @@
       </scope>
       <command
             name="%ActionDefinition.comment.name"
-            category="org.eclipse.cdt.make.ui.category.source"
             description="%ActionDefinition.comment.description"
+            category="org.eclipse.cdt.make.ui.category.source"
             id="org.eclipse.cdt.make.ui.edit.text.makefile.comment">
       </command>
       <keyBinding
@@ -243,8 +244,8 @@
       </keyBinding>
       <command
             name="%ActionDefinition.uncomment.name"
-            category="org.eclipse.cdt.make.ui.category.source"
             description="%ActionDefinition.uncomment.description"
+            category="org.eclipse.cdt.make.ui.category.source"
             id="org.eclipse.cdt.make.ui.edit.text.makefile.uncomment">
       </command>
       <keyBinding
@@ -266,8 +267,8 @@
    <extension
          point="org.eclipse.ui.propertyPages">
       <page
-            adaptable="true"
             objectClass="org.eclipse.core.resources.IProject"
+            adaptable="true"
             name="%PropertyMakeProject.name"
             class="org.eclipse.cdt.make.internal.ui.properties.MakePropertyPage"
             id="org.eclipse.cdt.make.ui.properties.MakePropertyPage">
@@ -299,8 +300,8 @@
          <action
                label="%ActionMakeUpdate.label"
                icon="icons/ctool16/update_old.gif"
-               class="org.eclipse.cdt.make.ui.actions.UpdateMakeProjectAction"
                tooltip="%ActionMakeUpdate.tooltip"
+               class="org.eclipse.cdt.make.ui.actions.UpdateMakeProjectAction"
                toolbarPath="Normal"
                id="org.eclipse.cdt.make.ui.UpdateMakeAction">
             <enablement>
@@ -386,8 +387,8 @@
          <view
                relative="org.eclipse.ui.views.ContentOutline"
                visible="true"
-               id="org.eclipse.cdt.make.ui.views.MakeView"
-               relationship="stack">
+               relationship="stack"
+               id="org.eclipse.cdt.make.ui.views.MakeView">
          </view>
          <viewShortcut
                id="org.eclipse.cdt.make.ui.views.MakeView">
diff --git a/build/org.eclipse.cdt.managedbuilder.core/.classpath b/build/org.eclipse.cdt.managedbuilder.core/.classpath
index 065ac06e197..d60f2f2d4a1 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/.classpath
+++ b/build/org.eclipse.cdt.managedbuilder.core/.classpath
@@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.xerces_4.0.13/xmlParserAPIs.jar"/>
+	<classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.xerces_4.0.13/xercesImpl.jar"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.core"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.resources_3.0.0/resourcessrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.resources_3.0.0/resources.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime.compatibility_3.0.0/compatibilitysrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime.compatibility_3.0.0/compatibility.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime_3.0.0/runtimesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime_3.0.0/runtime.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi.util_3.0.0/utilsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi.util_3.0.0/util.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/osgisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/osgi.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/coresrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/core.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/resolversrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/resolver.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/defaultAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/defaultAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/eclipseAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/eclipseAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.update.configurator_3.0.0/configuratorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.update.configurator_3.0.0/configurator.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
index bd23ba81117..adbfc6c5bc8 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
@@ -16,7 +16,7 @@
       <import plugin="org.apache.xerces"/>
       <import plugin="org.eclipse.cdt.core"/>
       <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
    </requires>
 
 
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/.classpath b/build/org.eclipse.cdt.managedbuilder.ui/.classpath
index 065ac06e197..5362f921078 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/.classpath
+++ b/build/org.eclipse.cdt.managedbuilder.ui/.classpath
@@ -1,7 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.ide_3.0.0/idesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui.ide_3.0.0/ide.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.resources_3.0.0/resourcessrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.resources_3.0.0/resources.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui_3.0.0/uisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui_3.0.0/ui.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swtsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-pisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-pi.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-mozillasrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-mozilla.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface_3.0.0/jfacesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.jface_3.0.0/jface.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.workbench_3.0.0/workbenchsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui.workbench_3.0.0/workbench.jar"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.core"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.ui"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.managedbuilder.core"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime.compatibility_3.0.0/compatibilitysrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime.compatibility_3.0.0/compatibility.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime_3.0.0/runtimesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime_3.0.0/runtime.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi.util_3.0.0/utilsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi.util_3.0.0/util.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/osgisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/osgi.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/coresrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/core.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/resolversrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/resolver.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/defaultAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/defaultAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/eclipseAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/eclipseAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.update.configurator_3.0.0/configuratorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.update.configurator_3.0.0/configurator.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index 6be5572eaa4..32c43178444 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -19,6 +19,7 @@
       <import plugin="org.eclipse.cdt.core"/>
       <import plugin="org.eclipse.cdt.ui"/>
       <import plugin="org.eclipse.cdt.managedbuilder.core"/>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
    </requires>
 
 
@@ -30,8 +31,8 @@
             icon="icons/full/wizban/newmngcc_app.gif"
             category="org.eclipse.cdt.ui.newCCWizards"
             class="org.eclipse.cdt.managedbuilder.ui.wizards.NewManagedCCProjectWizard"
-            project="true"
             finalPerspective="org.eclipse.cdt.ui.CPerspective"
+            project="true"
             id="org.eclipse.cdt.managedbuilder.ui.wizards.StdCCWizard">
          <description>
             %MngCCWizard.description
@@ -42,8 +43,8 @@
             icon="icons/full/wizban/newmngc_app.gif"
             category="org.eclipse.cdt.ui.newCWizards"
             class="org.eclipse.cdt.managedbuilder.ui.wizards.NewManagedCProjectWizard"
-            project="true"
             finalPerspective="org.eclipse.cdt.ui.CPerspective"
+            project="true"
             id="org.eclipse.cdt.managedbuilder.ui.wizards.StdCWizard">
          <description>
             %MngCWizard.description
@@ -80,12 +81,12 @@
             osList="win32">
          <tool
                natureFilter="cnature"
-               sources="c"
                name="%ToolName.compiler.c"
+               sources="c"
                headerExtensions="h"
                outputFlag="-o"
-               outputs="o"
                command="gcc"
+               outputs="o"
                id="cdt.build.tool.cygwin.gnu.c.compiler">
             <optionCategory
                   owner="cdt.build.tool.cygwin.gnu.c.compiler"
@@ -97,16 +98,16 @@
                   name="%Option.Posix.Nostdinc"
                   category="cygwin.gnu.c.compiler.category.preprocessor"
                   command="-nostdinc"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.compiler.preprocessor.nostdinc">
+                  id="cygwin.gnu.c.compiler.preprocessor.nostdinc"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.PreprocOnly"
                   category="cygwin.gnu.c.compiler.category.preprocessor"
                   command="-E"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.compiler.preprocessor.preprocess">
+                  id="cygwin.gnu.c.compiler.preprocessor.preprocess"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.cygwin.gnu.c.compiler"
@@ -117,103 +118,103 @@
                   name="%Option.Posix.DefSym"
                   category="cygwin.gnu.c.compiler.category.symbols"
                   command="-D"
-                  valueType="definedSymbols"
-                  id="cygwin.gnu.c.preprocessor.def.symbols">
+                  id="cygwin.gnu.c.preprocessor.def.symbols"
+                  valueType="definedSymbols">
                <listOptionValue
-                     value="_X86_=1"
-                     builtIn="true">
+                     builtIn="true"
+                     value="_X86_=1">
                </listOptionValue>
                <listOptionValue
-                     value="__OPTIMIZE__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__OPTIMIZE__">
                </listOptionValue>
                <listOptionValue
-                     value="__STDC_HOSTED__=1"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__STDC_HOSTED__=1">
                </listOptionValue>
                <listOptionValue
-                     value="i386"
-                     builtIn="true">
+                     builtIn="true"
+                     value="i386">
                </listOptionValue>
                <listOptionValue
-                     value="__i386"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__i386">
                </listOptionValue>
                <listOptionValue
-                     value="__i386__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__i386__">
                </listOptionValue>
                <listOptionValue
-                     value="__tune_i686__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__tune_i686__">
                </listOptionValue>
                <listOptionValue
-                     value="__tune_pentiumpro__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__tune_pentiumpro__">
                </listOptionValue>
                <listOptionValue
-                     value="__tune_pentium2__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__tune_pentium2__">
                </listOptionValue>
                <listOptionValue
-                     value="__tune_pentium3__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__tune_pentium3__">
                </listOptionValue>
                <listOptionValue
-                     value="__stdcall=__attribute__((__stdcall__))"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__stdcall=__attribute__((__stdcall__))">
                </listOptionValue>
                <listOptionValue
-                     value="__fastcall=__attribute__((__fastcall__))"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__fastcall=__attribute__((__fastcall__))">
                </listOptionValue>
                <listOptionValue
-                     value="__cdecl=__attribute__((__cdecl__))"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__cdecl=__attribute__((__cdecl__))">
                </listOptionValue>
                <listOptionValue
-                     value="_stdcall=__attribute__((__stdcall__))"
-                     builtIn="true">
+                     builtIn="true"
+                     value="_stdcall=__attribute__((__stdcall__))">
                </listOptionValue>
                <listOptionValue
-                     value="_fastcall=__attribute__((__fastcall__))"
-                     builtIn="true">
+                     builtIn="true"
+                     value="_fastcall=__attribute__((__fastcall__))">
                </listOptionValue>
                <listOptionValue
-                     value="_cdecl=__attribute__((__cdecl__))"
-                     builtIn="true">
+                     builtIn="true"
+                     value="_cdecl=__attribute__((__cdecl__))">
                </listOptionValue>
                <listOptionValue
-                     value="__declspec(x)=__attribute__((x))"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__declspec(x)=__attribute__((x))">
                </listOptionValue>
                <listOptionValue
-                     value="__CYGWIN32__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__CYGWIN32__">
                </listOptionValue>
                <listOptionValue
-                     value="__CYGWIN__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__CYGWIN__">
                </listOptionValue>
                <listOptionValue
-                     value="unix"
-                     builtIn="true">
+                     builtIn="true"
+                     value="unix">
                </listOptionValue>
                <listOptionValue
-                     value="__unix__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__unix__">
                </listOptionValue>
                <listOptionValue
-                     value="__unix"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__unix">
                </listOptionValue>
             </option>
             <option
                   name="%Option.Posix.UndefSym"
                   category="cygwin.gnu.c.compiler.category.symbols"
                   command="-U"
-                  valueType="stringList"
-                  id="cygwin.gnu.c.preprocessor.undef.symbol">
+                  id="cygwin.gnu.c.preprocessor.undef.symbol"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="cdt.build.tool.cygwin.gnu.c.compiler"
@@ -224,11 +225,11 @@
                   name="%Option.Posix.InclPaths"
                   category="cygwin.gnu.c.compiler.category.dirs"
                   command="-I"
-                  valueType="includePath"
-                  id="cygwin.gnu.c.compiler.general.include.paths">
+                  id="cygwin.gnu.c.compiler.general.include.paths"
+                  valueType="includePath">
                <listOptionValue
-                     value="C:\cygwin\usr\include\w32api"
-                     builtIn="true">
+                     builtIn="true"
+                     value="C:\cygwin\usr\include\w32api">
                </listOptionValue>
             </option>
             <optionCategory
@@ -239,8 +240,8 @@
             <option
                   name="%Option.Posix.OptLevel"
                   category="cygwin.gnu.c.compiler.category.optimization"
-                  valueType="enumerated"
-                  id="cygwin.gnu.c.compiler.general.optimization.level">
+                  id="cygwin.gnu.c.compiler.general.optimization.level"
+                  valueType="enumerated">
                <enumeratedOptionValue
                      name="%Option.Posix.Optimize.None"
                      isDefault="false"
@@ -267,8 +268,8 @@
             <option
                   name="%Option.Posix.Optimize.Flags"
                   category="cygwin.gnu.c.compiler.category.optimization"
-                  valueType="string"
-                  id="cygwin.gnu.c.compiler.optimization.flags">
+                  id="cygwin.gnu.c.compiler.optimization.flags"
+                  valueType="string">
             </option>
             <optionCategory
                   owner="cdt.build.tool.cygwin.gnu.c.compiler"
@@ -278,8 +279,8 @@
             <option
                   name="%Option.Posix.DebugLevel"
                   category="cygwin.gnu.c.compiler.category.debug"
-                  valueType="enumerated"
-                  id="cygwin.c.compiler.debugging.level">
+                  id="cygwin.c.compiler.debugging.level"
+                  valueType="enumerated">
                <enumeratedOptionValue
                      name="%Option.Posix.Debug.None"
                      isDefault="false"
@@ -307,24 +308,24 @@
                   defaultValue="-gstabs"
                   name="%Option.Posix.Debug.Other"
                   category="cygwin.gnu.c.compiler.category.debug"
-                  valueType="string"
-                  id="cygwin.gnu.c.compiler.debugging.other">
+                  id="cygwin.gnu.c.compiler.debugging.other"
+                  valueType="string">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.gprof"
                   category="cygwin.gnu.c.compiler.category.debug"
                   command="-pg"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.compiler.debugging.gprof">
+                  id="cygwin.gnu.c.compiler.debugging.gprof"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.prof"
                   category="cygwin.gnu.c.compiler.category.debug"
                   command="-p"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.compiler.debugging.prof">
+                  id="cygwin.gnu.c.compiler.debugging.prof"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.cygwin.gnu.c.compiler"
@@ -336,48 +337,48 @@
                   name="%Option.Posix.Warn.Syntax"
                   category="cygwin.c.compiler.category.warnings"
                   command="-fsyntax-only"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.compiler.warnings.syntax">
+                  id="cygwin.gnu.c.compiler.warnings.syntax"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.Pedandic"
                   category="cygwin.c.compiler.category.warnings"
                   command="-pedantic"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.compiler.warnings.pedantic">
+                  id="cygwin.gnu.c.compiler.warnings.pedantic"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.PedErrors"
                   category="cygwin.c.compiler.category.warnings"
                   command="-pedantic-errors"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.compiler.warnings.pedantic.error">
+                  id="cygwin.gnu.c.compiler.warnings.pedantic.error"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.nowarn"
                   category="cygwin.c.compiler.category.warnings"
                   command="-w"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.compiler.warnings.nowarn">
+                  id="cygwin.gnu.c.compiler.warnings.nowarn"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="true"
                   name="%Option.Posix.Warn.allwarn"
                   category="cygwin.c.compiler.category.warnings"
                   command="-Wall"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.compiler.warnings.allwarn">
+                  id="cygwin.gnu.c.compiler.warnings.allwarn"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.toerrs"
                   category="cygwin.c.compiler.category.warnings"
                   command="-Werror"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.compiler.warnings.toerrors">
+                  id="cygwin.gnu.c.compiler.warnings.toerrors"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.cygwin.gnu.c.compiler"
@@ -388,34 +389,34 @@
                   defaultValue="-c"
                   name="%Option.OtherFlags"
                   category="cygwin.c.compiler.category.other"
-                  valueType="string"
-                  id="cygwin.gnu.c.compiler.misc.other">
+                  id="cygwin.gnu.c.compiler.misc.other"
+                  valueType="string">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Verbose"
                   category="cygwin.c.compiler.category.other"
                   command="-v"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.compiler.misc.verbose">
+                  id="cygwin.gnu.c.compiler.misc.verbose"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Ansi"
                   category="cygwin.c.compiler.category.other"
                   command="-ansi"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.compiler.misc.ansi">
+                  id="cygwin.gnu.c.compiler.misc.ansi"
+                  valueType="boolean">
             </option>
          </tool>
          <tool
                natureFilter="ccnature"
-               sources="c,cc,cpp,cxx,C"
                name="%ToolName.compiler.cpp"
+               sources="c,cc,cpp,cxx,C"
                headerExtensions="h,H,hpp"
                outputFlag="-o"
-               outputs="o"
                command="g++"
+               outputs="o"
                id="org.eclipse.cdt.build.tool.cygwin.compiler">
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.compiler"
@@ -427,16 +428,16 @@
                   name="%Option.Posix.Nostdinc"
                   category="cygwin.compiler.category.preprocessor"
                   command="-nostdinc"
-                  valueType="boolean"
-                  id="cygwin.gnu.compiler.preprocessor.nostdinc">
+                  id="cygwin.gnu.compiler.preprocessor.nostdinc"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.PreprocOnly"
                   category="cygwin.compiler.category.preprocessor"
                   command="-E"
-                  valueType="boolean"
-                  id="cygwin.gnu.compiler.preprocessor.preprocess">
+                  id="cygwin.gnu.compiler.preprocessor.preprocess"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.compiler"
@@ -447,103 +448,103 @@
                   name="%Option.Posix.DefSym"
                   category="cygwin.gnu.compiler.category.symbols"
                   command="-D"
-                  valueType="definedSymbols"
-                  id="cygwin.preprocessor.def.symbols">
+                  id="cygwin.preprocessor.def.symbols"
+                  valueType="definedSymbols">
                <listOptionValue
-                     value="_X86_=1"
-                     builtIn="true">
+                     builtIn="true"
+                     value="_X86_=1">
                </listOptionValue>
                <listOptionValue
-                     value="__OPTIMIZE__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__OPTIMIZE__">
                </listOptionValue>
                <listOptionValue
-                     value="__STDC_HOSTED__=1"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__STDC_HOSTED__=1">
                </listOptionValue>
                <listOptionValue
-                     value="i386"
-                     builtIn="true">
+                     builtIn="true"
+                     value="i386">
                </listOptionValue>
                <listOptionValue
-                     value="__i386"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__i386">
                </listOptionValue>
                <listOptionValue
-                     value="__i386__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__i386__">
                </listOptionValue>
                <listOptionValue
-                     value="__tune_i686__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__tune_i686__">
                </listOptionValue>
                <listOptionValue
-                     value="__tune_pentiumpro__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__tune_pentiumpro__">
                </listOptionValue>
                <listOptionValue
-                     value="__tune_pentium2__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__tune_pentium2__">
                </listOptionValue>
                <listOptionValue
-                     value="__tune_pentium3__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__tune_pentium3__">
                </listOptionValue>
                <listOptionValue
-                     value="__stdcall=__attribute__((__stdcall__))"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__stdcall=__attribute__((__stdcall__))">
                </listOptionValue>
                <listOptionValue
-                     value="__fastcall=__attribute__((__fastcall__))"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__fastcall=__attribute__((__fastcall__))">
                </listOptionValue>
                <listOptionValue
-                     value="__cdecl=__attribute__((__cdecl__))"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__cdecl=__attribute__((__cdecl__))">
                </listOptionValue>
                <listOptionValue
-                     value="_stdcall=__attribute__((__stdcall__))"
-                     builtIn="true">
+                     builtIn="true"
+                     value="_stdcall=__attribute__((__stdcall__))">
                </listOptionValue>
                <listOptionValue
-                     value="_fastcall=__attribute__((__fastcall__))"
-                     builtIn="true">
+                     builtIn="true"
+                     value="_fastcall=__attribute__((__fastcall__))">
                </listOptionValue>
                <listOptionValue
-                     value="_cdecl=__attribute__((__cdecl__))"
-                     builtIn="true">
+                     builtIn="true"
+                     value="_cdecl=__attribute__((__cdecl__))">
                </listOptionValue>
                <listOptionValue
-                     value="__declspec(x)=__attribute__((x))"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__declspec(x)=__attribute__((x))">
                </listOptionValue>
                <listOptionValue
-                     value="__CYGWIN32__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__CYGWIN32__">
                </listOptionValue>
                <listOptionValue
-                     value="__CYGWIN__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__CYGWIN__">
                </listOptionValue>
                <listOptionValue
-                     value="unix"
-                     builtIn="true">
+                     builtIn="true"
+                     value="unix">
                </listOptionValue>
                <listOptionValue
-                     value="__unix__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__unix__">
                </listOptionValue>
                <listOptionValue
-                     value="__unix"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__unix">
                </listOptionValue>
             </option>
             <option
                   name="%Option.Posix.UndefSym"
                   category="cygwin.gnu.compiler.category.symbols"
                   command="-U"
-                  valueType="stringList"
-                  id="cygwin.preprocessor.undef.symbol">
+                  id="cygwin.preprocessor.undef.symbol"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.compiler"
@@ -554,11 +555,11 @@
                   name="%Option.Posix.InclPaths"
                   category="cygwin.gnu.compiler.category.dirs"
                   command="-I"
-                  valueType="includePath"
-                  id="cygwin.compiler.general.include.paths">
+                  id="cygwin.compiler.general.include.paths"
+                  valueType="includePath">
                <listOptionValue
-                     value="C:\cygwin\usr\include\w32api"
-                     builtIn="true">
+                     builtIn="true"
+                     value="C:\cygwin\usr\include\w32api">
                </listOptionValue>
             </option>
             <optionCategory
@@ -569,8 +570,8 @@
             <option
                   name="%Option.Posix.OptLevel"
                   category="cygwin.gnu.compiler.category.optimization"
-                  valueType="enumerated"
-                  id="cygwin.compiler.general.optimization.level">
+                  id="cygwin.compiler.general.optimization.level"
+                  valueType="enumerated">
                <enumeratedOptionValue
                      name="%Option.Posix.Optimize.None"
                      isDefault="false"
@@ -597,8 +598,8 @@
             <option
                   name="%Option.Posix.Optimize.Flags"
                   category="cygwin.gnu.compiler.category.optimization"
-                  valueType="string"
-                  id="cygwin.compiler.optimization.flags">
+                  id="cygwin.compiler.optimization.flags"
+                  valueType="string">
             </option>
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.compiler"
@@ -608,8 +609,8 @@
             <option
                   name="%Option.Posix.DebugLevel"
                   category="cygwin.gnu.compiler.category.debug"
-                  valueType="enumerated"
-                  id="cygwin.compiler.debugging.level">
+                  id="cygwin.compiler.debugging.level"
+                  valueType="enumerated">
                <enumeratedOptionValue
                      name="%Option.Posix.Debug.None"
                      isDefault="false"
@@ -637,24 +638,24 @@
                   defaultValue="-gstabs"
                   name="%Option.Posix.Debug.Other"
                   category="cygwin.gnu.compiler.category.debug"
-                  valueType="string"
-                  id="cygwin.gnu.compiler.debugging.other">
+                  id="cygwin.gnu.compiler.debugging.other"
+                  valueType="string">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.prof"
                   category="cygwin.gnu.compiler.category.debug"
                   command="-p"
-                  valueType="boolean"
-                  id="cygwin.gnu.compiler.debugging.prof">
+                  id="cygwin.gnu.compiler.debugging.prof"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.gprof"
                   category="cygwin.gnu.compiler.category.debug"
                   command="-pg"
-                  valueType="boolean"
-                  id="cygwin.gnu.compiler.debugging.gprof">
+                  id="cygwin.gnu.compiler.debugging.gprof"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.compiler"
@@ -666,48 +667,48 @@
                   name="%Option.Posix.Warn.Syntax"
                   category="cygwin.compiler.category.warnings"
                   command="-fsyntax-only"
-                  valueType="boolean"
-                  id="cygwin.gnu.compiler.warnings.syntax">
+                  id="cygwin.gnu.compiler.warnings.syntax"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.Pedandic"
                   category="cygwin.compiler.category.warnings"
                   command="-pedantic"
-                  valueType="boolean"
-                  id="cygwin.gnu.compiler.warnings.pedantic">
+                  id="cygwin.gnu.compiler.warnings.pedantic"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.PedErrors"
                   category="cygwin.compiler.category.warnings"
                   command="-pedantic-errors"
-                  valueType="boolean"
-                  id="cygwin.gnu.compiler.warnings.pedantic.error">
+                  id="cygwin.gnu.compiler.warnings.pedantic.error"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.nowarn"
                   category="cygwin.compiler.category.warnings"
                   command="-w"
-                  valueType="boolean"
-                  id="cygwin.gnu.compiler.warnings.nowarn">
+                  id="cygwin.gnu.compiler.warnings.nowarn"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="true"
                   name="%Option.Posix.Warn.allwarn"
                   category="cygwin.compiler.category.warnings"
                   command="-Wall"
-                  valueType="boolean"
-                  id="cygwin.gnu.compiler.warnings.allwarn">
+                  id="cygwin.gnu.compiler.warnings.allwarn"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.toerrs"
                   category="cygwin.compiler.category.warnings"
                   command="-Werror"
-                  valueType="boolean"
-                  id="cygwin.gnu.compiler.warnings.toerrors">
+                  id="cygwin.gnu.compiler.warnings.toerrors"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.compiler"
@@ -718,24 +719,24 @@
                   defaultValue="-c"
                   name="%Option.OtherFlags"
                   category="cygwin.compiler.category.other"
-                  valueType="string"
-                  id="cygwin.compiler.misc.other">
+                  id="cygwin.compiler.misc.other"
+                  valueType="string">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Verbose"
                   category="cygwin.compiler.category.other"
                   command="-v"
-                  valueType="boolean"
-                  id="cygwin.compiler.misc.verbose">
+                  id="cygwin.compiler.misc.verbose"
+                  valueType="boolean">
             </option>
          </tool>
       </target>
       <target
             isTest="false"
             name="Cygwin Executable"
-            parent="cygwin"
             binaryParser="org.eclipse.cdt.core.PE"
+            parent="cygwin"
             defaultExtension="exe"
             isAbstract="false"
             id="cygwin.exec">
@@ -798,8 +799,8 @@
                natureFilter="cnature"
                name="%ToolName.linker.c"
                outputFlag="-o"
-               outputs="exe"
                command="gcc"
+               outputs="exe"
                id="cdt.build.tool.cygwin.c.link">
             <optionCategory
                   owner="cdt.build.tool.cygwin.c.link"
@@ -811,40 +812,40 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="cygwin.gnu.c.linker.category.general"
                   command="-nostartfiles"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.link.options.nostart">
+                  id="cygwin.gnu.c.link.options.nostart"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="cygwin.gnu.c.linker.category.general"
                   command="-nodefaultlibs"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.link.options.nodeflibs">
+                  id="cygwin.gnu.c.link.options.nodeflibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="cygwin.gnu.c.linker.category.general"
                   command="-nostdlib"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.link.options.nostdlibs">
+                  id="cygwin.gnu.c.link.options.nostdlibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="cygwin.gnu.c.linker.category.general"
                   command="-s"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.link.options.strip">
+                  id="cygwin.gnu.c.link.options.strip"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Static"
                   category="cygwin.gnu.c.linker.category.general"
                   command="-static"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.link.options.noshared">
+                  id="cygwin.gnu.c.link.options.noshared"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.cygwin.c.link"
@@ -855,15 +856,15 @@
                   name="%Option.Posix.Libs"
                   category="cygwin.gnu.c.linker.category.libs"
                   command="-l"
-                  valueType="libs"
-                  id="cygwin.gnu.c.link.libs">
+                  id="cygwin.gnu.c.link.libs"
+                  valueType="libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="cygwin.gnu.c.linker.category.libs"
                   command="-L"
-                  valueType="stringList"
-                  id="cygwin.gnu.c.link.paths">
+                  id="cygwin.gnu.c.link.paths"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="cdt.build.tool.cygwin.c.link"
@@ -873,29 +874,29 @@
             <option
                   name="%Option.Posix.Linker.Flags"
                   category="cygwin.gnu.c.linker.category.other"
-                  valueType="string"
-                  id="cygwin.gnu.c.link.ldflags">
+                  id="cygwin.gnu.c.link.ldflags"
+                  valueType="string">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="cygwin.gnu.c.linker.category.other"
                   command="-Xlinker"
-                  valueType="stringList"
-                  id="cygwin.gnu.c.link.options.other">
+                  id="cygwin.gnu.c.link.options.other"
+                  valueType="stringList">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="cygwin.gnu.c.linker.category.other"
-                  valueType="userObjs"
-                  id="cygwin.gnu.c.link.ld.userobjs">
+                  id="cygwin.gnu.c.link.ld.userobjs"
+                  valueType="userObjs">
             </option>
          </tool>
          <tool
                natureFilter="ccnature"
                name="%ToolName.linker.cpp"
                outputFlag="-o"
-               outputs="exe"
                command="g++"
+               outputs="exe"
                id="org.eclipse.cdt.build.tool.cygwin.link">
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.link"
@@ -907,40 +908,40 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="cygwin.linker.category.general"
                   command="-nostartfiles"
-                  valueType="boolean"
-                  id="cygwin.gnu.linker.options.nostart">
+                  id="cygwin.gnu.linker.options.nostart"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="cygwin.linker.category.general"
                   command="-nodefaultlibs"
-                  valueType="boolean"
-                  id="cygwin.gnu.linker.options.nodeflibs">
+                  id="cygwin.gnu.linker.options.nodeflibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="cygwin.linker.category.general"
                   command="-nostdlib"
-                  valueType="boolean"
-                  id="cygwin.gnu.linker.options.nostdlibs">
+                  id="cygwin.gnu.linker.options.nostdlibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="cygwin.linker.category.general"
                   command="-s"
-                  valueType="boolean"
-                  id="cygwin.gnu.linker.options.strip">
+                  id="cygwin.gnu.linker.options.strip"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Static"
                   category="cygwin.linker.category.general"
                   command="-static"
-                  valueType="boolean"
-                  id="cygwin.gnu.linker.options.noshared">
+                  id="cygwin.gnu.linker.options.noshared"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.link"
@@ -951,15 +952,15 @@
                   name="%Option.Posix.Libs"
                   category="cygwin.gnu.linker.category.libs"
                   command="-l"
-                  valueType="libs"
-                  id="cygwin.link.libs">
+                  id="cygwin.link.libs"
+                  valueType="libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="cygwin.gnu.linker.category.libs"
                   command="-L"
-                  valueType="stringList"
-                  id="cygwin.link.ld.paths">
+                  id="cygwin.link.ld.paths"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.link"
@@ -969,29 +970,29 @@
             <option
                   name="%Option.Posix.Linker.Flags"
                   category="cygwin.gnu.linker.category.other"
-                  valueType="string"
-                  id="cygwin.link.ld.flags">
+                  id="cygwin.link.ld.flags"
+                  valueType="string">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="cygwin.gnu.linker.category.other"
                   command="-Xlinker"
-                  valueType="stringList"
-                  id="cygwin.gnu.linker.options.other">
+                  id="cygwin.gnu.linker.options.other"
+                  valueType="stringList">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="cygwin.gnu.linker.category.other"
-                  valueType="userObjs"
-                  id="cygwin.gnu.link.ld.userobjs">
+                  id="cygwin.gnu.link.ld.userobjs"
+                  valueType="userObjs">
             </option>
          </tool>
       </target>
       <target
             isTest="false"
             name="Cygwin Shared Library"
-            parent="cygwin"
             binaryParser="org.eclipse.cdt.core.PE"
+            parent="cygwin"
             defaultExtension="dll"
             isAbstract="false"
             id="cygwin.so">
@@ -1054,9 +1055,9 @@
                natureFilter="cnature"
                name="%ToolName.linker.c"
                outputFlag="-o"
-               outputs="dll"
-               outputPrefix="lib"
                command="gcc"
+               outputPrefix="lib"
+               outputs="dll"
                id="cdt.build.tool.cygwin.c.solink">
             <optionCategory
                   owner="cdt.build.tool.cygwin.c.solink"
@@ -1068,40 +1069,40 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="cygwin.gnu.c.solink.category.general"
                   command="-nostartfiles"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.solink.options.nostart">
+                  id="cygwin.gnu.c.solink.options.nostart"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="cygwin.gnu.c.solink.category.general"
                   command="-nodefaultlibs"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.solink.options.nodeflibs">
+                  id="cygwin.gnu.c.solink.options.nodeflibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="cygwin.gnu.c.solink.category.general"
                   command="-nostdlib"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.solink.options.nostdlibs">
+                  id="cygwin.gnu.c.solink.options.nostdlibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="cygwin.gnu.c.solink.category.general"
                   command="-s"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.solink.options.strip">
+                  id="cygwin.gnu.c.solink.options.strip"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Static"
                   category="cygwin.gnu.c.solink.category.general"
                   command="-static"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.solink.options.noshared">
+                  id="cygwin.gnu.c.solink.options.noshared"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.cygwin.c.solink"
@@ -1112,15 +1113,15 @@
                   name="%Option.Posix.Libs"
                   category="cygwin.gnu.c.solink.category.libs"
                   command="-l"
-                  valueType="libs"
-                  id="cygwin.gnu.c.solink.libs">
+                  id="cygwin.gnu.c.solink.libs"
+                  valueType="libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="cygwin.gnu.c.solink.category.libs"
                   command="-L"
-                  valueType="stringList"
-                  id="cygwin.gnu.c.solink.paths">
+                  id="cygwin.gnu.c.solink.paths"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="cdt.build.tool.cygwin.c.solink"
@@ -1131,30 +1132,30 @@
                   defaultValue="-shared"
                   name="%Option.Posix.Linker.Flags"
                   category="cygwin.gnu.c.solink.category.other"
-                  valueType="string"
-                  id="cygwin.gnu.c.solink.ldflags">
+                  id="cygwin.gnu.c.solink.ldflags"
+                  valueType="string">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="cygwin.gnu.c.solink.category.other"
                   command="-Xlinker"
-                  valueType="stringList"
-                  id="cygwin.gnu.c.solink.options.other">
+                  id="cygwin.gnu.c.solink.options.other"
+                  valueType="stringList">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="cygwin.gnu.c.solink.category.other"
-                  valueType="userObjs"
-                  id="cygwin.gnu.c.solink.userobjs">
+                  id="cygwin.gnu.c.solink.userobjs"
+                  valueType="userObjs">
             </option>
          </tool>
          <tool
                natureFilter="ccnature"
                name="%ToolName.linker.cpp"
                outputFlag="-o"
-               outputs="dll"
-               outputPrefix="lib"
                command="g++"
+               outputPrefix="lib"
+               outputs="dll"
                id="org.eclipse.cdt.build.tool.cygwin.solink">
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.solink"
@@ -1166,32 +1167,32 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="cygwin.gnu.solink.category.general"
                   command="-nostartfiles"
-                  valueType="boolean"
-                  id="cygwin.gnu.solink.options.nostart">
+                  id="cygwin.gnu.solink.options.nostart"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="cygwin.gnu.solink.category.general"
                   command="-nodefaultlibs"
-                  valueType="boolean"
-                  id="cygwin.gnu.solink.options.nodeflibs">
+                  id="cygwin.gnu.solink.options.nodeflibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="cygwin.gnu.solink.category.general"
                   command="-nostdlib"
-                  valueType="boolean"
-                  id="cygwin.gnu.solink.options.nostdlibs">
+                  id="cygwin.gnu.solink.options.nostdlibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="cygwin.gnu.solink.category.general"
                   command="-s"
-                  valueType="boolean"
-                  id="cygwin.gnu.solink.options.strip">
+                  id="cygwin.gnu.solink.options.strip"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.solink"
@@ -1202,15 +1203,15 @@
                   name="%Option.Posix.Libs"
                   category="cygwin.gnu.solink.category.libs"
                   command="-l"
-                  valueType="libs"
-                  id="cygwin.solink.libs">
+                  id="cygwin.solink.libs"
+                  valueType="libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="cygwin.gnu.solink.category.libs"
                   command="-L"
-                  valueType="stringList"
-                  id="cygwin.solink.ld.paths">
+                  id="cygwin.solink.ld.paths"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.solink"
@@ -1221,29 +1222,29 @@
                   defaultValue="-shared"
                   name="%Option.Posix.Linker.Flags"
                   category="cygwin.gnu.solink.category.other"
-                  valueType="string"
-                  id="cygwin.solink.ld.flags">
+                  id="cygwin.solink.ld.flags"
+                  valueType="string">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="cygwin.gnu.solink.category.other"
                   command="-Xlinker"
-                  valueType="stringList"
-                  id="cygwin.gnu.solinker.options.other">
+                  id="cygwin.gnu.solinker.options.other"
+                  valueType="stringList">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="cygwin.gnu.solink.category.other"
-                  valueType="userObjs"
-                  id="cygwin.gnu.solink.userobjs">
+                  id="cygwin.gnu.solink.userobjs"
+                  valueType="userObjs">
             </option>
          </tool>
       </target>
       <target
             isTest="true"
             name="Cygwin Export Library (DLL)"
-            parent="cygwin"
             binaryParser="org.eclipse.cdt.core.PE"
+            parent="cygwin"
             defaultExtension="dll.a"
             isAbstract="false"
             id="cygwin.exp">
@@ -1284,9 +1285,9 @@
                natureFilter="ccnature"
                name="%ToolName.linker.cpp"
                outputFlag="-o"
-               outputs="dll"
-               outputPrefix="cyg"
                command="g++ -shared"
+               outputPrefix="cyg"
+               outputs="dll"
                id="org.eclipse.cdt.build.tool.cygwin.explink">
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.explink"
@@ -1297,30 +1298,30 @@
                   defaultValue="-Wl,--export-all-symbols -Wl,--enable-auto-import"
                   name="%Option.Posix.Linker.Flags"
                   category="cygwin.explink.category.general"
-                  valueType="string"
-                  id="cygwin.explink.ld.flags">
+                  id="cygwin.explink.ld.flags"
+                  valueType="string">
             </option>
             <option
                   name="%Option.Posix.Libs"
                   category="cygwin.explink.category.general"
                   command="-l"
-                  valueType="libs"
-                  id="cygwin.explink.libs">
+                  id="cygwin.explink.libs"
+                  valueType="libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="cygwin.explink.category.general"
                   command="-L"
-                  valueType="stringList"
-                  id="cygwin.explink.ld.paths">
+                  id="cygwin.explink.ld.paths"
+                  valueType="stringList">
             </option>
          </tool>
       </target>
       <target
             isTest="false"
             name="Cygwin Static Library"
-            parent="cygwin"
             binaryParser="org.eclipse.cdt.core.PE"
+            parent="cygwin"
             defaultExtension="a"
             isAbstract="false"
             id="cygwin.lib">
@@ -1382,9 +1383,9 @@
          <tool
                natureFilter="both"
                name="%ToolName.archiver"
-               outputs="a"
-               outputPrefix="lib"
                command="ar"
+               outputPrefix="lib"
+               outputs="a"
                id="org.eclipse.cdt.build.tool.cygwin.ar">
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.ar"
@@ -1395,8 +1396,8 @@
                   defaultValue="-r"
                   name="%Option.Posix.Archiver.Flags"
                   category="cygwin.ar.category.general"
-                  valueType="string"
-                  id="cygwin.ar.flags">
+                  id="cygwin.ar.flags"
+                  valueType="string">
             </option>
          </tool>
       </target>
@@ -1412,12 +1413,12 @@
             osList="linux">
          <tool
                natureFilter="cnature"
-               sources="c"
                name="%ToolName.compiler.c"
+               sources="c"
                headerExtensions="h"
                outputFlag="-o"
-               outputs="o"
                command="gcc"
+               outputs="o"
                id="cdt.build.tool.linux.gnu.c.compiler">
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.compiler"
@@ -1429,16 +1430,16 @@
                   name="%Option.Posix.Nostdinc"
                   category="linux.gnu.c.compiler.category.preprocessor"
                   command="-nostdinc"
-                  valueType="boolean"
-                  id="linux.gnu.c.compiler.preprocessor.nostdinc">
+                  id="linux.gnu.c.compiler.preprocessor.nostdinc"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.PreprocOnly"
                   category="linux.gnu.c.compiler.category.preprocessor"
                   command="-E"
-                  valueType="boolean"
-                  id="linux.gnu.c.compiler.preprocessor.preprocess">
+                  id="linux.gnu.c.compiler.preprocessor.preprocess"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.compiler"
@@ -1449,75 +1450,75 @@
                   name="%Option.Posix.DefSym"
                   category="linux.gnu.c.compiler.category.symbols"
                   command="-D"
-                  valueType="definedSymbols"
-                  id="linux.gnu.c.preprocessor.def.symbols">
+                  id="linux.gnu.c.preprocessor.def.symbols"
+                  valueType="definedSymbols">
                <listOptionValue
-                     value="__ELF__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__ELF__">
                </listOptionValue>
                <listOptionValue
-                     value="unix"
-                     builtIn="true">
+                     builtIn="true"
+                     value="unix">
                </listOptionValue>
                <listOptionValue
-                     value="__gnu_linux__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__gnu_linux__">
                </listOptionValue>
                <listOptionValue
-                     value="linux"
-                     builtIn="true">
+                     builtIn="true"
+                     value="linux">
                </listOptionValue>
                <listOptionValue
-                     value="__unix__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__unix__">
                </listOptionValue>
                <listOptionValue
-                     value="__linux__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__linux__">
                </listOptionValue>
                <listOptionValue
-                     value="__unix"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__unix">
                </listOptionValue>
                <listOptionValue
-                     value="__linux"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__linux">
                </listOptionValue>
                <listOptionValue
-                     value="__OPTIMIZE__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__OPTIMIZE__">
                </listOptionValue>
                <listOptionValue
-                     value="__STDC_HOSTED__=1"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__STDC_HOSTED__=1">
                </listOptionValue>
                <listOptionValue
-                     value="_GNU_SOURCE"
-                     builtIn="true">
+                     builtIn="true"
+                     value="_GNU_SOURCE">
                </listOptionValue>
                <listOptionValue
-                     value="i386"
-                     builtIn="true">
+                     builtIn="true"
+                     value="i386">
                </listOptionValue>
                <listOptionValue
-                     value="__i386"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__i386">
                </listOptionValue>
                <listOptionValue
-                     value="__i386__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__i386__">
                </listOptionValue>
                <listOptionValue
-                     value="__tune_i386__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__tune_i386__">
                </listOptionValue>
             </option>
             <option
                   name="%Option.Posix.UndefSym"
                   category="linux.gnu.c.compiler.category.symbols"
                   command="-U"
-                  valueType="stringList"
-                  id="linux.gnu.c.preprocessor.undef.symbol">
+                  id="linux.gnu.c.preprocessor.undef.symbol"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.compiler"
@@ -1528,8 +1529,8 @@
                   name="%Option.Posix.InclPaths"
                   category="linux.gnu.c.compiler.category.dirs"
                   command="-I"
-                  valueType="includePath"
-                  id="linux.gnu.c.compiler.general.include.paths">
+                  id="linux.gnu.c.compiler.general.include.paths"
+                  valueType="includePath">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.compiler"
@@ -1539,8 +1540,8 @@
             <option
                   name="%Option.Posix.OptLevel"
                   category="linux.gnu.c.compiler.category.optimization"
-                  valueType="enumerated"
-                  id="linux.gnu.c.compiler.general.optimization.level">
+                  id="linux.gnu.c.compiler.general.optimization.level"
+                  valueType="enumerated">
                <enumeratedOptionValue
                      name="%Option.Posix.Optimize.None"
                      isDefault="false"
@@ -1567,8 +1568,8 @@
             <option
                   name="%Option.Posix.Optimize.Flags"
                   category="linux.gnu.c.compiler.category.optimization"
-                  valueType="string"
-                  id="linux.gnu.c.compiler.optimization.flags">
+                  id="linux.gnu.c.compiler.optimization.flags"
+                  valueType="string">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.compiler"
@@ -1578,8 +1579,8 @@
             <option
                   name="%Option.Posix.DebugLevel"
                   category="linux.gnu.c.compiler.category.debug"
-                  valueType="enumerated"
-                  id="linux.c.compiler.debugging.level">
+                  id="linux.c.compiler.debugging.level"
+                  valueType="enumerated">
                <enumeratedOptionValue
                      name="%Option.Posix.Debug.None"
                      isDefault="false"
@@ -1606,24 +1607,24 @@
             <option
                   name="%Option.Posix.Debug.Other"
                   category="linux.gnu.c.compiler.category.debug"
-                  valueType="string"
-                  id="linux.gnu.c.compiler.debugging.other">
+                  id="linux.gnu.c.compiler.debugging.other"
+                  valueType="string">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.gprof"
                   category="linux.gnu.c.compiler.category.debug"
                   command="-pg"
-                  valueType="boolean"
-                  id="linux.gnu.c.compiler.debugging.gprof">
+                  id="linux.gnu.c.compiler.debugging.gprof"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.prof"
                   category="linux.gnu.c.compiler.category.debug"
                   command="-p"
-                  valueType="boolean"
-                  id="linux.gnu.c.compiler.debugging.prof">
+                  id="linux.gnu.c.compiler.debugging.prof"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.compiler"
@@ -1635,48 +1636,48 @@
                   name="%Option.Posix.Warn.Syntax"
                   category="linux.c.compiler.category.warnings"
                   command="-fsyntax-only"
-                  valueType="boolean"
-                  id="linux.gnu.c.compiler.warnings.syntax">
+                  id="linux.gnu.c.compiler.warnings.syntax"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.Pedandic"
                   category="linux.c.compiler.category.warnings"
                   command="-pedantic"
-                  valueType="boolean"
-                  id="linux.gnu.c.compiler.warnings.pedantic">
+                  id="linux.gnu.c.compiler.warnings.pedantic"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.PedErrors"
                   category="linux.c.compiler.category.warnings"
                   command="-pedantic-errors"
-                  valueType="boolean"
-                  id="linux.gnu.c.compiler.warnings.pedantic.error">
+                  id="linux.gnu.c.compiler.warnings.pedantic.error"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.nowarn"
                   category="linux.c.compiler.category.warnings"
                   command="-w"
-                  valueType="boolean"
-                  id="linux.gnu.c.compiler.warnings.nowarn">
+                  id="linux.gnu.c.compiler.warnings.nowarn"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="true"
                   name="%Option.Posix.Warn.allwarn"
                   category="linux.c.compiler.category.warnings"
                   command="-Wall"
-                  valueType="boolean"
-                  id="linux.gnu.c.compiler.warnings.allwarn">
+                  id="linux.gnu.c.compiler.warnings.allwarn"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.toerrs"
                   category="linux.c.compiler.category.warnings"
                   command="-Werror"
-                  valueType="boolean"
-                  id="linux.gnu.c.compiler.warnings.toerrors">
+                  id="linux.gnu.c.compiler.warnings.toerrors"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.compiler"
@@ -1687,34 +1688,34 @@
                   defaultValue="-c"
                   name="%Option.OtherFlags"
                   category="linux.c.compiler.category.other"
-                  valueType="string"
-                  id="linux.gnu.c.compiler.misc.other">
+                  id="linux.gnu.c.compiler.misc.other"
+                  valueType="string">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Verbose"
                   category="linux.c.compiler.category.other"
                   command="-v"
-                  valueType="boolean"
-                  id="linux.gnu.c.compiler.misc.verbose">
+                  id="linux.gnu.c.compiler.misc.verbose"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Ansi"
                   category="linux.c.compiler.category.other"
                   command="-ansi"
-                  valueType="boolean"
-                  id="linux.gnu.c.compiler.misc.ansi">
+                  id="linux.gnu.c.compiler.misc.ansi"
+                  valueType="boolean">
             </option>
          </tool>
          <tool
                natureFilter="ccnature"
-               sources="c,C,cc,cxx,cpp"
                name="%ToolName.compiler.cpp"
+               sources="c,C,cc,cxx,cpp"
                headerExtensions="h,H,hpp"
                outputFlag="-o"
-               outputs="o"
                command="g++"
+               outputs="o"
                id="cdt.build.tool.linux.gnu.compiler">
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.compiler"
@@ -1726,90 +1727,90 @@
                   name="%Option.Posix.Nostdinc"
                   category="linux.gnu.compiler.category.preprocessor"
                   command="-nostdinc"
-                  valueType="boolean"
-                  id="linux.gnu.compiler.preprocessor.nostdinc">
+                  id="linux.gnu.compiler.preprocessor.nostdinc"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.PreprocOnly"
                   category="linux.gnu.compiler.category.preprocessor"
                   command="-E"
-                  valueType="boolean"
-                  id="linux.gnu.compiler.preprocessor.preprocess">
+                  id="linux.gnu.compiler.preprocessor.preprocess"
+                  valueType="boolean">
             </option>
             <option
                   name="%Option.Posix.DefSym"
                   category="linux.gnu.compiler.category.preprocessor"
                   command="-D"
-                  valueType="definedSymbols"
-                  id="linux.gnu.compiler.preprocessor.def">
+                  id="linux.gnu.compiler.preprocessor.def"
+                  valueType="definedSymbols">
                <listOptionValue
-                     value="__ELF__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__ELF__">
                </listOptionValue>
                <listOptionValue
-                     value="unix"
-                     builtIn="true">
+                     builtIn="true"
+                     value="unix">
                </listOptionValue>
                <listOptionValue
-                     value="__gnu_linux__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__gnu_linux__">
                </listOptionValue>
                <listOptionValue
-                     value="linux"
-                     builtIn="true">
+                     builtIn="true"
+                     value="linux">
                </listOptionValue>
                <listOptionValue
-                     value="__unix__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__unix__">
                </listOptionValue>
                <listOptionValue
-                     value="__linux__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__linux__">
                </listOptionValue>
                <listOptionValue
-                     value="__unix"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__unix">
                </listOptionValue>
                <listOptionValue
-                     value="__linux"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__linux">
                </listOptionValue>
                <listOptionValue
-                     value="__OPTIMIZE__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__OPTIMIZE__">
                </listOptionValue>
                <listOptionValue
-                     value="__STDC_HOSTED__=1"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__STDC_HOSTED__=1">
                </listOptionValue>
                <listOptionValue
-                     value="_GNU_SOURCE"
-                     builtIn="true">
+                     builtIn="true"
+                     value="_GNU_SOURCE">
                </listOptionValue>
                <listOptionValue
-                     value="i386"
-                     builtIn="true">
+                     builtIn="true"
+                     value="i386">
                </listOptionValue>
                <listOptionValue
-                     value="__i386"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__i386">
                </listOptionValue>
                <listOptionValue
-                     value="__i386__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__i386__">
                </listOptionValue>
                <listOptionValue
-                     value="__tune_i386__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__tune_i386__">
                </listOptionValue>
             </option>
             <option
                   name="%Option.Posix.UndefSym"
                   category="linux.gnu.compiler.category.preprocessor"
                   command="-U"
-                  valueType="stringList"
-                  id="linux.gnu.compiler.preprocessor.undef">
+                  id="linux.gnu.compiler.preprocessor.undef"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.compiler"
@@ -1820,15 +1821,15 @@
                   name="%Option.Posix.InclPaths"
                   category="linux.gnu.compiler.category.dirs"
                   command="-I"
-                  valueType="includePath"
-                  id="linux.gnu.compiler.dirs.incpaths">
+                  id="linux.gnu.compiler.dirs.incpaths"
+                  valueType="includePath">
                <listOptionValue
-                     value="/usr/local/include"
-                     builtIn="true">
+                     builtIn="true"
+                     value="/usr/local/include">
                </listOptionValue>
                <listOptionValue
-                     value="/usr/include"
-                     builtIn="true">
+                     builtIn="true"
+                     value="/usr/include">
                </listOptionValue>
             </option>
             <optionCategory
@@ -1839,8 +1840,8 @@
             <option
                   name="%Option.Posix.OptLevel"
                   category="linux.gnu.compiler.category.optimization"
-                  valueType="enumerated"
-                  id="linux.gnu.compiler.optimization.level">
+                  id="linux.gnu.compiler.optimization.level"
+                  valueType="enumerated">
                <enumeratedOptionValue
                      name="%Option.Posix.Optimize.None"
                      command="-O0"
@@ -1866,8 +1867,8 @@
             <option
                   name="%Option.Posix.Optimize.Flags"
                   category="linux.gnu.compiler.category.optimization"
-                  valueType="string"
-                  id="linux.compiler.optimization.flags">
+                  id="linux.compiler.optimization.flags"
+                  valueType="string">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.compiler"
@@ -1877,8 +1878,8 @@
             <option
                   name="%Option.Posix.DebugLevel"
                   category="linux.gnu.compiler.category.debug"
-                  valueType="enumerated"
-                  id="linux.gnu.compiler.debugging.level">
+                  id="linux.gnu.compiler.debugging.level"
+                  valueType="enumerated">
                <enumeratedOptionValue
                      name="%Option.Posix.Debug.None"
                      isDefault="false"
@@ -1905,24 +1906,24 @@
             <option
                   name="%Option.Posix.Debug.Other"
                   category="linux.gnu.compiler.category.debug"
-                  valueType="string"
-                  id="linux.gnu.compiler.debugging.other">
+                  id="linux.gnu.compiler.debugging.other"
+                  valueType="string">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.prof"
                   category="linux.gnu.compiler.category.debug"
                   command="-p"
-                  valueType="boolean"
-                  id="linux.gnu.compiler.debugging.prof">
+                  id="linux.gnu.compiler.debugging.prof"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.gprof"
                   category="linux.gnu.compiler.category.debug"
                   command="-pg"
-                  valueType="boolean"
-                  id="linux.gnu.compiler.debugging.gprof">
+                  id="linux.gnu.compiler.debugging.gprof"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.compiler"
@@ -1934,48 +1935,48 @@
                   name="%Option.Posix.Warn.Syntax"
                   category="linux.gnu.compiler.category.warnings"
                   command="-fsyntax-only"
-                  valueType="boolean"
-                  id="linux.gnu.compiler.warnings.syntax">
+                  id="linux.gnu.compiler.warnings.syntax"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.Pedandic"
                   category="linux.gnu.compiler.category.warnings"
                   command="-pedantic"
-                  valueType="boolean"
-                  id="linux.gnu.compiler.warnings.pedantic">
+                  id="linux.gnu.compiler.warnings.pedantic"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.PedErrors"
                   category="linux.gnu.compiler.category.warnings"
                   command="-pedantic-errors"
-                  valueType="boolean"
-                  id="linux.gnu.compiler.warnings.pedantic.error">
+                  id="linux.gnu.compiler.warnings.pedantic.error"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.nowarn"
                   category="linux.gnu.compiler.category.warnings"
                   command="-w"
-                  valueType="boolean"
-                  id="linux.gnu.compiler.warnings.nowarn">
+                  id="linux.gnu.compiler.warnings.nowarn"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="true"
                   name="%Option.Posix.Warn.allwarn"
                   category="linux.gnu.compiler.category.warnings"
                   command="-Wall"
-                  valueType="boolean"
-                  id="linux.gnu.compiler.warnings.allwarn">
+                  id="linux.gnu.compiler.warnings.allwarn"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.toerrs"
                   category="linux.gnu.compiler.category.warnings"
                   command="-Werror"
-                  valueType="boolean"
-                  id="linux.gnu.compiler.warnings.toerrors">
+                  id="linux.gnu.compiler.warnings.toerrors"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.compiler"
@@ -1986,24 +1987,24 @@
                   defaultValue="-c"
                   name="%Option.OtherFlags"
                   category="linux.gnu.compiler.category.other"
-                  valueType="string"
-                  id="linux.gnu.compiler.other.other">
+                  id="linux.gnu.compiler.other.other"
+                  valueType="string">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Verbose"
                   category="linux.gnu.compiler.category.other"
                   command="-v"
-                  valueType="boolean"
-                  id="linux.gnu.compiler.other.verbose">
+                  id="linux.gnu.compiler.other.verbose"
+                  valueType="boolean">
             </option>
          </tool>
       </target>
       <target
             isTest="false"
             name="Linux Executable"
-            parent="linux.gnu"
             binaryParser="org.eclipse.cdt.core.ELF"
+            parent="linux.gnu"
             isAbstract="false"
             id="linux.gnu.exec">
          <configuration
@@ -2060,8 +2061,8 @@
          </configuration>
          <tool
                natureFilter="cnature"
-               sources="o"
                name="%ToolName.linker.c"
+               sources="o"
                outputFlag="-o"
                command="gcc"
                id="cdt.build.tool.linux.c.link">
@@ -2075,40 +2076,40 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="linux.gnu.c.linker.category.general"
                   command="-nostartfiles"
-                  valueType="boolean"
-                  id="linux.gnu.c.link.options.nostart">
+                  id="linux.gnu.c.link.options.nostart"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="linux.gnu.c.linker.category.general"
                   command="-nodefaultlibs"
-                  valueType="boolean"
-                  id="linux.gnu.c.link.options.nodeflibs">
+                  id="linux.gnu.c.link.options.nodeflibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="linux.gnu.c.linker.category.general"
                   command="-nostdlib"
-                  valueType="boolean"
-                  id="linux.gnu.c.link.options.nostdlibs">
+                  id="linux.gnu.c.link.options.nostdlibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="linux.gnu.c.linker.category.options"
                   command="-s"
-                  valueType="boolean"
-                  id="linux.gnu.c.link.options.strip">
+                  id="linux.gnu.c.link.options.strip"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Static"
                   category="linux.gnu.c.linker.category.general"
                   command="-static"
-                  valueType="boolean"
-                  id="linux.gnu.c.link.options.noshared">
+                  id="linux.gnu.c.link.options.noshared"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.c.link"
@@ -2119,15 +2120,15 @@
                   name="%Option.Posix.Libs"
                   category="linux.gnu.c.linker.category.libs"
                   command="-l"
-                  valueType="libs"
-                  id="linux.gnu.c.link.libs">
+                  id="linux.gnu.c.link.libs"
+                  valueType="libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="linux.gnu.c.linker.category.libs"
                   command="-L"
-                  valueType="stringList"
-                  id="linux.gnu.c.link.paths">
+                  id="linux.gnu.c.link.paths"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.c.link"
@@ -2137,27 +2138,27 @@
             <option
                   name="%Option.Posix.Linker.Flags"
                   category="linux.gnu.c.linker.category.other"
-                  valueType="string"
-                  id="linux.gnu.c.link.ldflags">
+                  id="linux.gnu.c.link.ldflags"
+                  valueType="string">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="linux.gnu.c.linker.category.other"
                   command="-Xlinker"
-                  valueType="stringList"
-                  id="linux.gnu.c.link.options.other">
+                  id="linux.gnu.c.link.options.other"
+                  valueType="stringList">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="linux.gnu.c.linker.category.other"
-                  valueType="userObjs"
-                  id="linux.gnu.c.link.ld.userobjs">
+                  id="linux.gnu.c.link.ld.userobjs"
+                  valueType="userObjs">
             </option>
          </tool>
          <tool
                natureFilter="ccnature"
-               sources="o"
                name="%ToolName.linker.cpp"
+               sources="o"
                outputFlag="-o"
                command="g++"
                id="cdt.build.tool.linux.gnu.link">
@@ -2171,40 +2172,40 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="linux.gnu.linker.category.options"
                   command="-nostartfiles"
-                  valueType="boolean"
-                  id="linux.gnu.linker.options.nostart">
+                  id="linux.gnu.linker.options.nostart"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="linux.gnu.linker.category.options"
                   command="-nodefaultlibs"
-                  valueType="boolean"
-                  id="linux.gnu.linker.options.nodeflibs">
+                  id="linux.gnu.linker.options.nodeflibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="linux.gnu.linker.category.options"
                   command="-nostdlib"
-                  valueType="boolean"
-                  id="linux.gnu.linker.options.nostdlibs">
+                  id="linux.gnu.linker.options.nostdlibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="linux.gnu.linker.category.options"
                   command="-s"
-                  valueType="boolean"
-                  id="linux.gnu.linker.options.strip">
+                  id="linux.gnu.linker.options.strip"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Static"
                   category="linux.gnu.linker.category.options"
                   command="-static"
-                  valueType="boolean"
-                  id="linux.gnu.linker.options.noshared">
+                  id="linux.gnu.linker.options.noshared"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.link"
@@ -2215,15 +2216,15 @@
                   name="%Option.Posix.Libs"
                   category="linux.gnu.linker.category.libs"
                   command="-l"
-                  valueType="libs"
-                  id="linux.gnu.linker.libs.libs">
+                  id="linux.gnu.linker.libs.libs"
+                  valueType="libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="linux.gnu.linker.category.libs"
                   command="-L"
-                  valueType="stringList"
-                  id="linux.gnu.linker.libs.paths">
+                  id="linux.gnu.linker.libs.paths"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.link"
@@ -2233,29 +2234,29 @@
             <option
                   name="%Option.Posix.Linker.Flags"
                   category="linux.gnu.linker.category.other"
-                  valueType="string"
-                  id="linux.gnu.linker.libs.flags">
+                  id="linux.gnu.linker.libs.flags"
+                  valueType="string">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="linux.gnu.linker.category.other"
                   command="-Xlinker"
-                  valueType="stringList"
-                  id="linux.gnu.linker.options.other">
+                  id="linux.gnu.linker.options.other"
+                  valueType="stringList">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="linux.gnu.linker.category.other"
-                  valueType="userObjs"
-                  id="linux.gnu.linker.userobjs">
+                  id="linux.gnu.linker.userobjs"
+                  valueType="userObjs">
             </option>
          </tool>
       </target>
       <target
             isTest="false"
             name="Linux Shared Library"
-            parent="linux.gnu"
             binaryParser="org.eclipse.cdt.core.ELF"
+            parent="linux.gnu"
             defaultExtension="so"
             isAbstract="false"
             id="linux.gnu.so">
@@ -2313,12 +2314,12 @@
          </configuration>
          <tool
                natureFilter="cnature"
-               sources="o"
                name="%ToolName.linker.c"
+               sources="o"
                outputFlag="-o"
-               outputs="so"
-               outputPrefix="lib"
                command="gcc"
+               outputPrefix="lib"
+               outputs="so"
                id="cdt.build.tool.linux.gnu.c.solink">
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.solink"
@@ -2330,40 +2331,40 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="linux.gnu.c.solink.category.general"
                   command="-nostartfiles"
-                  valueType="boolean"
-                  id="linux.gnu.c.solink.options.nostart">
+                  id="linux.gnu.c.solink.options.nostart"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="linux.gnu.c.solink.category.general"
                   command="-nodefaultlibs"
-                  valueType="boolean"
-                  id="linux.gnu.c.solink.options.nodeflibs">
+                  id="linux.gnu.c.solink.options.nodeflibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="linux.gnu.c.solink.category.general"
                   command="-nostdlib"
-                  valueType="boolean"
-                  id="linux.gnu.c.solink.options.nostdlibs">
+                  id="linux.gnu.c.solink.options.nostdlibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="linux.gnu.c.solink.category.general"
                   command="-s"
-                  valueType="boolean"
-                  id="linux.gnu.c.solink.options.strip">
+                  id="linux.gnu.c.solink.options.strip"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Static"
                   category="linux.gnu.c.solink.category.general"
                   command="-static"
-                  valueType="boolean"
-                  id="linux.gnu.c.solink.options.noshared">
+                  id="linux.gnu.c.solink.options.noshared"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.solink"
@@ -2374,15 +2375,15 @@
                   name="%Option.Posix.Libs"
                   category="linux.gnu.c.solink.category.libs"
                   command="-l"
-                  valueType="libs"
-                  id="linux.gnu.c.solink.libs">
+                  id="linux.gnu.c.solink.libs"
+                  valueType="libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="linux.gnu.c.solink.category.libs"
                   command="-L"
-                  valueType="stringList"
-                  id="linux.gnu.c.solink.paths">
+                  id="linux.gnu.c.solink.paths"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.solink"
@@ -2393,31 +2394,31 @@
                   defaultValue="-shared"
                   name="%Option.Posix.Linker.Flags"
                   category="linux.gnu.c.solink.category.other"
-                  valueType="string"
-                  id="linux.gnu.c.solink.ldflags">
+                  id="linux.gnu.c.solink.ldflags"
+                  valueType="string">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="linux.gnu.c.solink.category.other"
                   command="-Xlinker"
-                  valueType="stringList"
-                  id="linux.gnu.c.solink.options.other">
+                  id="linux.gnu.c.solink.options.other"
+                  valueType="stringList">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="linux.gnu.c.solink.category.other"
-                  valueType="userObjs"
-                  id="linux.gnu.c.solink.userobjs">
+                  id="linux.gnu.c.solink.userobjs"
+                  valueType="userObjs">
             </option>
          </tool>
          <tool
                natureFilter="ccnature"
-               sources="o"
                name="%ToolName.linker.cpp"
+               sources="o"
                outputFlag="-o"
-               outputs="so"
-               outputPrefix="lib"
                command="g++"
+               outputPrefix="lib"
+               outputs="so"
                id="cdt.build.tool.linux.gnu.solink">
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.solink"
@@ -2429,32 +2430,32 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="linux.gnu.solink.category.options"
                   command="-nostartfiles"
-                  valueType="boolean"
-                  id="linux.gnu.solink.options.nostart">
+                  id="linux.gnu.solink.options.nostart"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="linux.gnu.solink.category.options"
                   command="-nodefaultlibs"
-                  valueType="boolean"
-                  id="linux.gnu.solink.options.nodeflibs">
+                  id="linux.gnu.solink.options.nodeflibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="linux.gnu.solink.category.options"
                   command="-nostdlib"
-                  valueType="boolean"
-                  id="linux.gnu.solink.options.nostdlibs">
+                  id="linux.gnu.solink.options.nostdlibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="linux.gnu.solink.category.options"
                   command="-s"
-                  valueType="boolean"
-                  id="linux.gnu.solink.options.strip">
+                  id="linux.gnu.solink.options.strip"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.solink"
@@ -2465,15 +2466,15 @@
                   name="%Option.Posix.Libs"
                   category="linux.gnu.solink.category.libs"
                   command="-l"
-                  valueType="libs"
-                  id="linux.gnu.solink.libs.libs">
+                  id="linux.gnu.solink.libs.libs"
+                  valueType="libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="linux.gnu.solink.category.libs"
                   command="-L"
-                  valueType="stringList"
-                  id="linux.gnu.solink.libs.paths">
+                  id="linux.gnu.solink.libs.paths"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.solink"
@@ -2484,29 +2485,29 @@
                   defaultValue="-shared"
                   name="%Option.Posix.Linker.Flags"
                   category="linux.gnu.solink.category.other"
-                  valueType="string"
-                  id="linux.gnu.solink.libs.flags">
+                  id="linux.gnu.solink.libs.flags"
+                  valueType="string">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="linux.gnu.solink.category.other"
                   command="-Xlinker"
-                  valueType="stringList"
-                  id="linux.gnu.solink.options.other">
+                  id="linux.gnu.solink.options.other"
+                  valueType="stringList">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="linux.gnu.solink.category.other"
-                  valueType="userObjs"
-                  id="linux.gnu.solink.userobjs">
+                  id="linux.gnu.solink.userobjs"
+                  valueType="userObjs">
             </option>
          </tool>
       </target>
       <target
             isTest="false"
             name="Linux Static Library"
-            parent="linux.gnu"
             binaryParser="org.eclipse.cdt.core.ELF"
+            parent="linux.gnu"
             defaultExtension="a"
             isAbstract="false"
             id="linux.gnu.lib">
@@ -2564,11 +2565,11 @@
          </configuration>
          <tool
                natureFilter="both"
-               sources="o"
                name="%ToolName.archiver"
-               outputs="a"
-               outputPrefix="lib"
+               sources="o"
                command="ar"
+               outputPrefix="lib"
+               outputs="a"
                id="cdt.build.tool.linux.gnu.lib">
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.lib"
@@ -2579,8 +2580,8 @@
                   defaultValue="-r"
                   name="%Option.Posix.Archiver.Flags"
                   category="linux.gnu.lib.category.general"
-                  valueType="string"
-                  id="linux.gnu.lib.flags">
+                  id="linux.gnu.lib.flags"
+                  valueType="string">
             </option>
          </tool>
       </target>
@@ -2596,12 +2597,12 @@
             osList="solaris">
          <tool
                natureFilter="cnature"
-               sources="c"
                name="%ToolName.compiler.c"
+               sources="c"
                headerExtensions="h"
                outputFlag="-o"
-               outputs="o"
                command="gcc"
+               outputs="o"
                id="cdt.build.tool.solaris.gnu.c.compiler">
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.compiler"
@@ -2613,16 +2614,16 @@
                   name="%Option.Posix.Nostdinc"
                   category="solaris.gnu.c.compiler.category.preprocessor"
                   command="-nostdinc"
-                  valueType="boolean"
-                  id="solaris.gnu.c.compiler.preprocessor.nostdinc">
+                  id="solaris.gnu.c.compiler.preprocessor.nostdinc"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.PreprocOnly"
                   category="solaris.gnu.c.compiler.category.preprocessor"
                   command="-E"
-                  valueType="boolean"
-                  id="solaris.gnu.c.compiler.preprocessor.preprocess">
+                  id="solaris.gnu.c.compiler.preprocessor.preprocess"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.compiler"
@@ -2633,67 +2634,67 @@
                   name="%Option.Posix.DefSym"
                   category="solaris.gnu.c.compiler.category.symbols"
                   command="-D"
-                  valueType="definedSymbols"
-                  id="solaris.gnu.c.preprocessor.def.symbols">
+                  id="solaris.gnu.c.preprocessor.def.symbols"
+                  valueType="definedSymbols">
                <listOptionValue
-                     value="sun"
-                     builtIn="true">
+                     builtIn="true"
+                     value="sun">
                </listOptionValue>
                <listOptionValue
-                     value="sparc"
-                     builtIn="true">
+                     builtIn="true"
+                     value="sparc">
                </listOptionValue>
                <listOptionValue
-                     value="unix"
-                     builtIn="true">
+                     builtIn="true"
+                     value="unix">
                </listOptionValue>
                <listOptionValue
-                     value="__svr4__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__svr4__">
                </listOptionValue>
                <listOptionValue
-                     value="__SVR4"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__SVR4">
                </listOptionValue>
                <listOptionValue
-                     value="__GCC_NEW_VARARGS__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__GCC_NEW_VARARGS__">
                </listOptionValue>
                <listOptionValue
-                     value="__sun__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__sun__">
                </listOptionValue>
                <listOptionValue
-                     value="__sparc__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__sparc__">
                </listOptionValue>
                <listOptionValue
-                     value="__unix__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__unix__">
                </listOptionValue>
                <listOptionValue
-                     value="__sun"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__sun">
                </listOptionValue>
                <listOptionValue
-                     value="__sparc"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__sparc">
                </listOptionValue>
                <listOptionValue
-                     value="__unix"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__unix">
                </listOptionValue>
                <listOptionValue
-                     value="__OPTIMIZE__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__OPTIMIZE__">
                </listOptionValue>
             </option>
             <option
                   name="%Option.Posix.UndefSym"
                   category="solaris.gnu.c.compiler.category.symbols"
                   command="-U"
-                  valueType="stringList"
-                  id="solaris.gnu.c.preprocessor.undef.symbol">
+                  id="solaris.gnu.c.preprocessor.undef.symbol"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.compiler"
@@ -2704,8 +2705,8 @@
                   name="%Option.Posix.InclPaths"
                   category="solaris.gnu.c.compiler.category.dirs"
                   command="-I"
-                  valueType="includePath"
-                  id="solaris.gnu.c.compiler.general.include.paths">
+                  id="solaris.gnu.c.compiler.general.include.paths"
+                  valueType="includePath">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.compiler"
@@ -2715,8 +2716,8 @@
             <option
                   name="%Option.Posix.OptLevel"
                   category="solaris.gnu.c.compiler.category.optimization"
-                  valueType="enumerated"
-                  id="solaris.gnu.c.compiler.general.optimization.level">
+                  id="solaris.gnu.c.compiler.general.optimization.level"
+                  valueType="enumerated">
                <enumeratedOptionValue
                      name="%Option.Posix.Optimize.None"
                      isDefault="false"
@@ -2743,8 +2744,8 @@
             <option
                   name="%Option.Posix.Optimize.Flags"
                   category="solaris.gnu.c.compiler.category.optimization"
-                  valueType="string"
-                  id="solaris.gnu.c.compiler.optimization.flags">
+                  id="solaris.gnu.c.compiler.optimization.flags"
+                  valueType="string">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.compiler"
@@ -2754,8 +2755,8 @@
             <option
                   name="%Option.Posix.DebugLevel"
                   category="solaris.gnu.c.compiler.category.debug"
-                  valueType="enumerated"
-                  id="solaris.c.compiler.debugging.level">
+                  id="solaris.c.compiler.debugging.level"
+                  valueType="enumerated">
                <enumeratedOptionValue
                      name="%Option.Posix.Debug.None"
                      isDefault="false"
@@ -2782,24 +2783,24 @@
             <option
                   name="%Option.Posix.Debug.Other"
                   category="solaris.gnu.c.compiler.category.debug"
-                  valueType="string"
-                  id="solaris.gnu.c.compiler.debugging.other">
+                  id="solaris.gnu.c.compiler.debugging.other"
+                  valueType="string">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.gprof"
                   category="solaris.gnu.c.compiler.category.debug"
                   command="-pg"
-                  valueType="boolean"
-                  id="solaris.gnu.c.compiler.debugging.gprof">
+                  id="solaris.gnu.c.compiler.debugging.gprof"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.prof"
                   category="solaris.gnu.c.compiler.category.debug"
                   command="-p"
-                  valueType="boolean"
-                  id="solaris.gnu.c.compiler.debugging.prof">
+                  id="solaris.gnu.c.compiler.debugging.prof"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.compiler"
@@ -2811,48 +2812,48 @@
                   name="%Option.Posix.Warn.Syntax"
                   category="solaris.c.compiler.category.warnings"
                   command="-fsyntax-only"
-                  valueType="boolean"
-                  id="solaris.gnu.c.compiler.warnings.syntax">
+                  id="solaris.gnu.c.compiler.warnings.syntax"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.Pedandic"
                   category="solaris.c.compiler.category.warnings"
                   command="-pedantic"
-                  valueType="boolean"
-                  id="solaris.gnu.c.compiler.warnings.pedantic">
+                  id="solaris.gnu.c.compiler.warnings.pedantic"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.PedErrors"
                   category="solaris.c.compiler.category.warnings"
                   command="-pedantic-errors"
-                  valueType="boolean"
-                  id="solaris.gnu.c.compiler.warnings.pedantic.error">
+                  id="solaris.gnu.c.compiler.warnings.pedantic.error"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.nowarn"
                   category="solaris.c.compiler.category.warnings"
                   command="-w"
-                  valueType="boolean"
-                  id="solaris.gnu.c.compiler.warnings.nowarn">
+                  id="solaris.gnu.c.compiler.warnings.nowarn"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="true"
                   name="%Option.Posix.Warn.allwarn"
                   category="solaris.c.compiler.category.warnings"
                   command="-Wall"
-                  valueType="boolean"
-                  id="solaris.gnu.c.compiler.warnings.allwarn">
+                  id="solaris.gnu.c.compiler.warnings.allwarn"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.toerrs"
                   category="solaris.c.compiler.category.warnings"
                   command="-Werror"
-                  valueType="boolean"
-                  id="solaris.gnu.c.compiler.warnings.toerrors">
+                  id="solaris.gnu.c.compiler.warnings.toerrors"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.compiler"
@@ -2863,34 +2864,34 @@
                   defaultValue="-c"
                   name="%Option.OtherFlags"
                   category="solaris.c.compiler.category.other"
-                  valueType="string"
-                  id="solaris.gnu.c.compiler.misc.other">
+                  id="solaris.gnu.c.compiler.misc.other"
+                  valueType="string">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Verbose"
                   category="solaris.c.compiler.category.other"
                   command="-v"
-                  valueType="boolean"
-                  id="solaris.gnu.c.compiler.misc.verbose">
+                  id="solaris.gnu.c.compiler.misc.verbose"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Ansi"
                   category="solaris.c.compiler.category.other"
                   command="-ansi"
-                  valueType="boolean"
-                  id="solaris.gnu.c.compiler.misc.ansi">
+                  id="solaris.gnu.c.compiler.misc.ansi"
+                  valueType="boolean">
             </option>
          </tool>
          <tool
                natureFilter="ccnature"
-               sources="c,C,cc,cxx,cpp"
                name="%ToolName.compiler.cpp"
+               sources="c,C,cc,cxx,cpp"
                headerExtensions="h,H,hpp"
                outputFlag="-o"
-               outputs="o"
                command="g++"
+               outputs="o"
                id="cdt.build.tool.solaris.gnu.compiler">
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.compiler"
@@ -2902,74 +2903,74 @@
                   name="%Option.Posix.Nostdinc"
                   category="solaris.gnu.compiler.category.preprocessor"
                   command="-nostdinc"
-                  valueType="boolean"
-                  id="solaris.gnu.compiler.preprocessor.nostdinc">
+                  id="solaris.gnu.compiler.preprocessor.nostdinc"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.PreprocOnly"
                   category="solaris.gnu.compiler.category.preprocessor"
                   command="-E"
-                  valueType="boolean"
-                  id="solaris.gnu.compiler.preprocessor.preprocess">
+                  id="solaris.gnu.compiler.preprocessor.preprocess"
+                  valueType="boolean">
             </option>
             <option
                   name="%Option.Posix.DefSym"
                   category="solaris.gnu.compiler.category.preprocessor"
                   command="-D"
-                  valueType="definedSymbols"
-                  id="solaris.gnu.compiler.preprocessor.def">
+                  id="solaris.gnu.compiler.preprocessor.def"
+                  valueType="definedSymbols">
                <listOptionValue
-                     value="sun"
-                     builtIn="true">
+                     builtIn="true"
+                     value="sun">
                </listOptionValue>
                <listOptionValue
-                     value="sparc"
-                     builtIn="true">
+                     builtIn="true"
+                     value="sparc">
                </listOptionValue>
                <listOptionValue
-                     value="unix"
-                     builtIn="true">
+                     builtIn="true"
+                     value="unix">
                </listOptionValue>
                <listOptionValue
-                     value="__svr4__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__svr4__">
                </listOptionValue>
                <listOptionValue
-                     value="__SVR4"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__SVR4">
                </listOptionValue>
                <listOptionValue
-                     value="__GCC_NEW_VARARGS__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__GCC_NEW_VARARGS__">
                </listOptionValue>
                <listOptionValue
-                     value="__sun__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__sun__">
                </listOptionValue>
                <listOptionValue
-                     value="__sparc__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__sparc__">
                </listOptionValue>
                <listOptionValue
-                     value="__unix__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__unix__">
                </listOptionValue>
                <listOptionValue
-                     value="__sun"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__sun">
                </listOptionValue>
                <listOptionValue
-                     value="__sparc"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__sparc">
                </listOptionValue>
                <listOptionValue
-                     value="__unix"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__unix">
                </listOptionValue>
                <listOptionValue
-                     value="__OPTIMIZE__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__OPTIMIZE__">
                </listOptionValue>
             </option>
             <optionCategory
@@ -2981,15 +2982,15 @@
                   name="%Option.Posix.InclPaths"
                   category="solaris.gnu.compiler.category.dirs"
                   command="-I"
-                  valueType="includePath"
-                  id="solaris.gnu.compiler.dirs.incpaths">
+                  id="solaris.gnu.compiler.dirs.incpaths"
+                  valueType="includePath">
                <listOptionValue
-                     value="/usr/local/include"
-                     builtIn="true">
+                     builtIn="true"
+                     value="/usr/local/include">
                </listOptionValue>
                <listOptionValue
-                     value="/usr/include"
-                     builtIn="true">
+                     builtIn="true"
+                     value="/usr/include">
                </listOptionValue>
             </option>
             <optionCategory
@@ -3000,8 +3001,8 @@
             <option
                   name="%Option.Posix.OptLevel"
                   category="solaris.gnu.compiler.category.optimization"
-                  valueType="enumerated"
-                  id="solaris.gnu.compiler.optimization.level">
+                  id="solaris.gnu.compiler.optimization.level"
+                  valueType="enumerated">
                <enumeratedOptionValue
                      name="%Option.Posix.Optimize.None"
                      command="-O0"
@@ -3027,8 +3028,8 @@
             <option
                   name="%Option.Posix.Optimize.Flags"
                   category="solaris.gnu.compiler.category.optimization"
-                  valueType="string"
-                  id="solaris.compiler.optimization.flags">
+                  id="solaris.compiler.optimization.flags"
+                  valueType="string">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.compiler"
@@ -3038,8 +3039,8 @@
             <option
                   name="%Option.Posix.DebugLevel"
                   category="solaris.gnu.compiler.category.debug"
-                  valueType="enumerated"
-                  id="solaris.gnu.compiler.debugging.level">
+                  id="solaris.gnu.compiler.debugging.level"
+                  valueType="enumerated">
                <enumeratedOptionValue
                      name="%Option.Posix.Debug.None"
                      isDefault="false"
@@ -3066,24 +3067,24 @@
             <option
                   name="%Option.Posix.Debug.Other"
                   category="solaris.gnu.compiler.category.debug"
-                  valueType="string"
-                  id="solaris.gnu.compiler.debugging.other">
+                  id="solaris.gnu.compiler.debugging.other"
+                  valueType="string">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.prof"
                   category="solaris.gnu.compiler.category.debug"
                   command="-p"
-                  valueType="boolean"
-                  id="solaris.gnu.compiler.debugging.prof">
+                  id="solaris.gnu.compiler.debugging.prof"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.gprof"
                   category="solaris.gnu.compiler.category.debug"
                   command="-pg"
-                  valueType="boolean"
-                  id="solaris.gnu.compiler.debugging.gprof">
+                  id="solaris.gnu.compiler.debugging.gprof"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.compiler"
@@ -3095,48 +3096,48 @@
                   name="%Option.Posix.Warn.Syntax"
                   category="solaris.gnu.compiler.category.warnings"
                   command="-fsyntax-only"
-                  valueType="boolean"
-                  id="solaris.gnu.compiler.warnings.syntax">
+                  id="solaris.gnu.compiler.warnings.syntax"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.Pedandic"
                   category="solaris.gnu.compiler.category.warnings"
                   command="-pedantic"
-                  valueType="boolean"
-                  id="solaris.gnu.compiler.warnings.pedantic">
+                  id="solaris.gnu.compiler.warnings.pedantic"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.PedErrors"
                   category="solaris.gnu.compiler.category.warnings"
                   command="-pedantic-errors"
-                  valueType="boolean"
-                  id="solaris.gnu.compiler.warnings.pedantic.error">
+                  id="solaris.gnu.compiler.warnings.pedantic.error"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.nowarn"
                   category="solaris.gnu.compiler.category.warnings"
                   command="-w"
-                  valueType="boolean"
-                  id="solaris.gnu.compiler.warnings.nowarn">
+                  id="solaris.gnu.compiler.warnings.nowarn"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="true"
                   name="%Option.Posix.Warn.allwarn"
                   category="solaris.gnu.compiler.category.warnings"
                   command="-Wall"
-                  valueType="boolean"
-                  id="solaris.gnu.compiler.warnings.allwarn">
+                  id="solaris.gnu.compiler.warnings.allwarn"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.toerrs"
                   category="solaris.gnu.compiler.category.warnings"
                   command="-Werror"
-                  valueType="boolean"
-                  id="solaris.gnu.compiler.warnings.toerrors">
+                  id="solaris.gnu.compiler.warnings.toerrors"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.compiler"
@@ -3147,24 +3148,24 @@
                   defaultValue="-c"
                   name="%Option.OtherFlags"
                   category="solaris.gnu.compiler.category.other"
-                  valueType="string"
-                  id="solaris.gnu.compiler.other.other">
+                  id="solaris.gnu.compiler.other.other"
+                  valueType="string">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Verbose"
                   category="solaris.gnu.compiler.category.other"
                   command="-v"
-                  valueType="boolean"
-                  id="solaris.gnu.compiler.other.verbose">
+                  id="solaris.gnu.compiler.other.verbose"
+                  valueType="boolean">
             </option>
          </tool>
       </target>
       <target
             isTest="false"
             name="Solaris Executable"
-            parent="solaris.gnu"
             binaryParser="org.eclipse.cdt.core.ELF"
+            parent="solaris.gnu"
             isAbstract="false"
             id="solaris.gnu.exec">
          <configuration
@@ -3221,8 +3222,8 @@
          </configuration>
          <tool
                natureFilter="cnature"
-               sources="o"
                name="%ToolName.linker.c"
+               sources="o"
                outputFlag="-o"
                command="gcc"
                id="cdt.build.tool.solaris.gnu.c.link">
@@ -3236,40 +3237,40 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="solaris.gnu.c.linker.category.general"
                   command="-nostartfiles"
-                  valueType="boolean"
-                  id="solaris.gnu.c.link.options.nostart">
+                  id="solaris.gnu.c.link.options.nostart"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="solaris.gnu.c.linker.category.general"
                   command="-nodefaultlibs"
-                  valueType="boolean"
-                  id="solaris.gnu.c.link.options.nodeflibs">
+                  id="solaris.gnu.c.link.options.nodeflibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="solaris.gnu.c.linker.category.general"
                   command="-nostdlib"
-                  valueType="boolean"
-                  id="solaris.gnu.c.link.options.nostdlibs">
+                  id="solaris.gnu.c.link.options.nostdlibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="solaris.gnu.c.linker.category.options"
                   command="-s"
-                  valueType="boolean"
-                  id="solaris.gnu.c.link.options.strip">
+                  id="solaris.gnu.c.link.options.strip"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Static"
                   category="solaris.gnu.c.linker.category.general"
                   command="-static"
-                  valueType="boolean"
-                  id="solaris.gnu.c.link.options.noshared">
+                  id="solaris.gnu.c.link.options.noshared"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.link"
@@ -3280,15 +3281,15 @@
                   name="%Option.Posix.Libs"
                   category="solaris.gnu.c.linker.category.libs"
                   command="-l"
-                  valueType="libs"
-                  id="solaris.gnu.c.link.libs">
+                  id="solaris.gnu.c.link.libs"
+                  valueType="libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="solaris.gnu.c.linker.category.libs"
                   command="-L"
-                  valueType="stringList"
-                  id="solaris.gnu.c.link.paths">
+                  id="solaris.gnu.c.link.paths"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.link"
@@ -3298,27 +3299,27 @@
             <option
                   name="%Option.Posix.Linker.Flags"
                   category="solaris.gnu.c.linker.category.other"
-                  valueType="string"
-                  id="solaris.gnu.c.link.ldflags">
+                  id="solaris.gnu.c.link.ldflags"
+                  valueType="string">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="solaris.gnu.c.linker.category.other"
                   command="-Xlinker"
-                  valueType="stringList"
-                  id="solaris.gnu.c.link.options.other">
+                  id="solaris.gnu.c.link.options.other"
+                  valueType="stringList">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="solaris.gnu.c.linker.category.other"
-                  valueType="userObjs"
-                  id="solaris.gnu.c.link.ld.userobjs">
+                  id="solaris.gnu.c.link.ld.userobjs"
+                  valueType="userObjs">
             </option>
          </tool>
          <tool
                natureFilter="ccnature"
-               sources="o"
                name="%ToolName.linker.cpp"
+               sources="o"
                outputFlag="-o"
                command="g++"
                id="cdt.build.tool.solaris.gnu.link">
@@ -3332,40 +3333,40 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="solaris.gnu.linker.category.options"
                   command="-nostartfiles"
-                  valueType="boolean"
-                  id="solaris.gnu.linker.options.nostart">
+                  id="solaris.gnu.linker.options.nostart"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="solaris.gnu.linker.category.options"
                   command="-nodefaultlibs"
-                  valueType="boolean"
-                  id="solaris.gnu.linker.options.nodeflibs">
+                  id="solaris.gnu.linker.options.nodeflibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="solaris.gnu.linker.category.options"
                   command="-nostdlib"
-                  valueType="boolean"
-                  id="solaris.gnu.linker.options.nostdlibs">
+                  id="solaris.gnu.linker.options.nostdlibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="solaris.gnu.linker.category.options"
                   command="-s"
-                  valueType="boolean"
-                  id="solaris.gnu.linker.options.strip">
+                  id="solaris.gnu.linker.options.strip"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Static"
                   category="solaris.gnu.linker.category.options"
                   command="-static"
-                  valueType="boolean"
-                  id="solaris.gnu.linker.options.noshared">
+                  id="solaris.gnu.linker.options.noshared"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.link"
@@ -3376,15 +3377,15 @@
                   name="%Option.Posix.Libs"
                   category="solaris.gnu.linker.category.libs"
                   command="-l"
-                  valueType="libs"
-                  id="solaris.gnu.linker.libs.libs">
+                  id="solaris.gnu.linker.libs.libs"
+                  valueType="libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="solaris.gnu.linker.category.libs"
                   command="-L"
-                  valueType="stringList"
-                  id="solaris.gnu.linker.libs.paths">
+                  id="solaris.gnu.linker.libs.paths"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.link"
@@ -3394,29 +3395,29 @@
             <option
                   name="%Option.Posix.Linker.Flags"
                   category="solaris.gnu.linker.category.other"
-                  valueType="string"
-                  id="solaris.gnu.linker.libs.flags">
+                  id="solaris.gnu.linker.libs.flags"
+                  valueType="string">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="solaris.gnu.linker.category.other"
                   command="-Xlinker"
-                  valueType="stringList"
-                  id="solaris.gnu.linker.options.other">
+                  id="solaris.gnu.linker.options.other"
+                  valueType="stringList">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="solaris.gnu.linker.category.other"
-                  valueType="userObjs"
-                  id="solaris.gnu.linker.userobjs">
+                  id="solaris.gnu.linker.userobjs"
+                  valueType="userObjs">
             </option>
          </tool>
       </target>
       <target
             isTest="false"
             name="Solaris Shared Library"
-            parent="solaris.gnu"
             binaryParser="org.eclipse.cdt.core.ELF"
+            parent="solaris.gnu"
             defaultExtension="so"
             isAbstract="false"
             id="solaris.gnu.so">
@@ -3478,12 +3479,12 @@
          </configuration>
          <tool
                natureFilter="cnature"
-               sources="o"
                name="%ToolName.linker.c"
+               sources="o"
                outputFlag="-o"
-               outputs="so"
-               outputPrefix="lib"
                command="gcc"
+               outputPrefix="lib"
+               outputs="so"
                id="cdt.build.tool.solaris.gnu.c.solink">
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.solink"
@@ -3495,40 +3496,40 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="solaris.gnu.c.solink.category.general"
                   command="-nostartfiles"
-                  valueType="boolean"
-                  id="solaris.gnu.c.solink.options.nostart">
+                  id="solaris.gnu.c.solink.options.nostart"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="solaris.gnu.c.solink.category.general"
                   command="-nodefaultlibs"
-                  valueType="boolean"
-                  id="solaris.gnu.c.solink.options.nodeflibs">
+                  id="solaris.gnu.c.solink.options.nodeflibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="solaris.gnu.c.solink.category.general"
                   command="-nostdlib"
-                  valueType="boolean"
-                  id="solaris.gnu.c.solink.options.nostdlibs">
+                  id="solaris.gnu.c.solink.options.nostdlibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="solaris.gnu.c.solink.category.general"
                   command="-s"
-                  valueType="boolean"
-                  id="solaris.gnu.c.solink.options.strip">
+                  id="solaris.gnu.c.solink.options.strip"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Static"
                   category="solaris.gnu.c.solink.category.general"
                   command="-static"
-                  valueType="boolean"
-                  id="solaris.gnu.c.solink.options.noshared">
+                  id="solaris.gnu.c.solink.options.noshared"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.solink"
@@ -3539,15 +3540,15 @@
                   name="%Option.Posix.Libs"
                   category="solaris.gnu.c.solink.category.libs"
                   command="-l"
-                  valueType="libs"
-                  id="solaris.gnu.c.solink.libs">
+                  id="solaris.gnu.c.solink.libs"
+                  valueType="libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="solaris.gnu.c.solink.category.libs"
                   command="-L"
-                  valueType="stringList"
-                  id="solaris.gnu.c.solink.paths">
+                  id="solaris.gnu.c.solink.paths"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.solink"
@@ -3558,31 +3559,31 @@
                   defaultValue="-shared -fPIC"
                   name="%Option.Posix.Linker.Flags"
                   category="solaris.gnu.c.solink.category.other"
-                  valueType="string"
-                  id="solaris.gnu.c.solink.ldflags">
+                  id="solaris.gnu.c.solink.ldflags"
+                  valueType="string">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="solaris.gnu.c.solink.category.other"
                   command="-Xlinker"
-                  valueType="stringList"
-                  id="solaris.gnu.c.solink.options.other">
+                  id="solaris.gnu.c.solink.options.other"
+                  valueType="stringList">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="solaris.gnu.c.solink.category.other"
-                  valueType="userObjs"
-                  id="solaris.gnu.c.solink.userobjs">
+                  id="solaris.gnu.c.solink.userobjs"
+                  valueType="userObjs">
             </option>
          </tool>
          <tool
                natureFilter="ccnature"
-               sources="o"
                name="%ToolName.linker.cpp"
+               sources="o"
                outputFlag="-o"
-               outputs="so"
-               outputPrefix="lib"
                command="g++"
+               outputPrefix="lib"
+               outputs="so"
                id="cdt.build.tool.solaris.gnu.solink">
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.solink"
@@ -3594,32 +3595,32 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="solaris.gnu.solink.category.options"
                   command="-nostartfiles"
-                  valueType="boolean"
-                  id="solaris.gnu.solink.options.nostart">
+                  id="solaris.gnu.solink.options.nostart"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="solaris.gnu.solink.category.options"
                   command="-nodefaultlibs"
-                  valueType="boolean"
-                  id="solaris.gnu.solink.options.nodeflibs">
+                  id="solaris.gnu.solink.options.nodeflibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="solaris.gnu.solink.category.options"
                   command="-nostdlib"
-                  valueType="boolean"
-                  id="solaris.gnu.solink.options.nostdlibs">
+                  id="solaris.gnu.solink.options.nostdlibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="solaris.gnu.solink.category.options"
                   command="-s"
-                  valueType="boolean"
-                  id="solaris.gnu.solink.options.strip">
+                  id="solaris.gnu.solink.options.strip"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.solink"
@@ -3630,15 +3631,15 @@
                   name="%Option.Posix.Libs"
                   category="solaris.gnu.solink.category.libs"
                   command="-l"
-                  valueType="libs"
-                  id="solaris.gnu.solink.libs.libs">
+                  id="solaris.gnu.solink.libs.libs"
+                  valueType="libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="solaris.gnu.solink.category.libs"
                   command="-L"
-                  valueType="stringList"
-                  id="solaris.gnu.solink.libs.paths">
+                  id="solaris.gnu.solink.libs.paths"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.solink"
@@ -3649,29 +3650,29 @@
                   defaultValue="-shared -fPIC"
                   name="%Option.Posix.Linker.Flags"
                   category="solaris.gnu.solink.category.other"
-                  valueType="string"
-                  id="solaris.gnu.solink.libs.flags">
+                  id="solaris.gnu.solink.libs.flags"
+                  valueType="string">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="solaris.gnu.solink.category.other"
                   command="-Xlinker"
-                  valueType="stringList"
-                  id="solaris.gnu.solink.options.other">
+                  id="solaris.gnu.solink.options.other"
+                  valueType="stringList">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="solaris.gnu.solink.category.other"
-                  valueType="userObjs"
-                  id="solaris.gnu.solink.userobjs">
+                  id="solaris.gnu.solink.userobjs"
+                  valueType="userObjs">
             </option>
          </tool>
       </target>
       <target
             isTest="false"
             name="Solaris Static Library"
-            parent="solaris.gnu"
             binaryParser="org.eclipse.cdt.core.ELF"
+            parent="solaris.gnu"
             defaultExtension="a"
             isAbstract="false"
             id="solaris.gnu.lib">
@@ -3729,11 +3730,11 @@
          </configuration>
          <tool
                natureFilter="both"
-               sources="o"
                name="%ToolName.archiver"
-               outputs="a"
-               outputPrefix="lib"
+               sources="o"
                command="ar"
+               outputPrefix="lib"
+               outputs="a"
                id="cdt.build.tool.solaris.gnu.lib">
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.lib"
@@ -3744,8 +3745,8 @@
                   defaultValue="-r"
                   name="%Option.Posix.Archiver.Flags"
                   category="solaris.gnu.lib.category.general"
-                  valueType="string"
-                  id="solaris.gnu.lib.flags">
+                  id="solaris.gnu.lib.flags"
+                  valueType="string">
             </option>
          </tool>
       </target>
diff --git a/core/org.eclipse.cdt.core.tests/.classpath b/core/org.eclipse.cdt.core.tests/.classpath
index 362b81cae72..daea1cd65bd 100644
--- a/core/org.eclipse.cdt.core.tests/.classpath
+++ b/core/org.eclipse.cdt.core.tests/.classpath
@@ -8,7 +8,32 @@
 	<classpathentry kind="src" path="suite"/>
 	<classpathentry kind="src" path="indexer"/>
 	<classpathentry kind="src" path="search"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.ide_3.0.0/idesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui.ide_3.0.0/ide.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface.text_3.0.0/jfacetextsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.jface.text_3.0.0/jfacetext.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.text_3.0.0/textsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.text_3.0.0/text.jar"/>
+	<classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.xerces_4.0.13/xmlParserAPIs.jar"/>
+	<classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.xerces_4.0.13/xercesImpl.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.resources_3.0.0/resourcessrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.resources_3.0.0/resources.jar"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.core"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.ui"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swtsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-pisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-pi.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-mozillasrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-mozilla.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui_3.0.0/uisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui_3.0.0/ui.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface_3.0.0/jfacesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.jface_3.0.0/jface.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.workbench_3.0.0/workbenchsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui.workbench_3.0.0/workbench.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_JDT_SOURCE_SRC/org.junit_3.8.1/junitsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.junit_3.8.1/junit.jar"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.managedbuilder.core"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.make.core"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime.compatibility_3.0.0/compatibilitysrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime.compatibility_3.0.0/compatibility.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime_3.0.0/runtimesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime_3.0.0/runtime.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi.util_3.0.0/utilsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi.util_3.0.0/util.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/osgisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/osgi.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/coresrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/core.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/resolversrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/resolver.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/defaultAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/defaultAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/eclipseAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/eclipseAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.update.configurator_3.0.0/configuratorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.update.configurator_3.0.0/configurator.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/org.eclipse.cdt.core.tests/plugin.xml b/core/org.eclipse.cdt.core.tests/plugin.xml
index 7114e7571e4..9400bcc3a48 100644
--- a/core/org.eclipse.cdt.core.tests/plugin.xml
+++ b/core/org.eclipse.cdt.core.tests/plugin.xml
@@ -16,7 +16,6 @@
       <import plugin="org.eclipse.jface.text"/>
       <import plugin="org.apache.xerces"/>
       <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.cdt.core"/>
       <import plugin="org.eclipse.cdt.ui"/>
       <import plugin="org.eclipse.swt"/>
@@ -24,6 +23,7 @@
       <import plugin="org.junit"/>
       <import plugin="org.eclipse.cdt.managedbuilder.core"/>
       <import plugin="org.eclipse.cdt.make.core"/>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
    </requires>
 
 
@@ -39,17 +39,17 @@
             defaultExtension="toor"
             isAbstract="false"
             makeCommand="make"
-            binaryParser="org.eclipse.cdt.core.PE"
             makeFlags="-k"
+            binaryParser="org.eclipse.cdt.core.PE"
             osList="win32">
          <tool
                natureFilter="cnature"
-               sources="foo,bar"
                name="Root Tool"
+               sources="foo,bar"
                headerExtensions="baz"
                outputFlag="-r"
-               outputs="toor"
                command="doIt"
+               outputs="toor"
                id="root.tool">
             <optionCategory
                   owner="root.tool"
@@ -59,39 +59,39 @@
             <option
                   name="List Option in Top"
                   command="-L"
-                  valueType="stringList"
-                  id="list.option">
+                  id="list.option"
+                  valueType="stringList">
                <listOptionValue
                      value="a">
                </listOptionValue>
                <listOptionValue
-                     value="b"
-                     builtIn="false">
+                     builtIn="false"
+                     value="b">
                </listOptionValue>
                <listOptionValue
-                     value="c"
-                     builtIn="true">
+                     builtIn="true"
+                     value="c">
                </listOptionValue>
             </option>
             <option
                   defaultValue="false"
                   name="Boolean Option in Top"
                   command="-b"
-                  valueType="boolean"
-                  id="boolean.option">
+                  id="boolean.option"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="x"
                   name="String Option in Category"
                   category="category"
-                  valueType="string"
-                  id="string.option">
+                  id="string.option"
+                  valueType="string">
             </option>
             <option
                   name="Enumerated Option in Category"
                   category="category"
-                  valueType="enumerated"
-                  id="enumerated.option">
+                  id="enumerated.option"
+                  valueType="enumerated">
                <enumeratedOptionValue
                      name="Default Enum"
                      isDefault="true"
@@ -164,17 +164,17 @@
          </configuration>
          <tool
                natureFilter="both"
-               sources="yarf"
                name="Sub Tool"
+               sources="yarf"
                headerExtensions="arf,barf"
-               outputs="bus"
                outputPrefix="lib"
+               outputs="bus"
                id="tool.sub">
             <option
                   name="Include Paths"
                   command="-I"
-                  valueType="includePath"
-                  id="sub.tool.opt.inc.paths">
+                  id="sub.tool.opt.inc.paths"
+                  valueType="includePath">
                <listOptionValue
                      value="/usr/include">
                </listOptionValue>
@@ -182,45 +182,45 @@
                      value="/opt/gnome/include">
                </listOptionValue>
                <listOptionValue
-                     value="/usr/gnu/include"
-                     builtIn="true">
+                     builtIn="true"
+                     value="/usr/gnu/include">
                </listOptionValue>
             </option>
             <option
                   name="Defined Symbols"
                   command="-D"
-                  valueType="definedSymbols"
-                  id="sub.tool.opt.def.symbols">
+                  id="sub.tool.opt.def.symbols"
+                  valueType="definedSymbols">
                <listOptionValue
-                     value="BUILTIN"
-                     builtIn="true">
+                     builtIn="true"
+                     value="BUILTIN">
                </listOptionValue>
             </option>
             <option
                   name="More Includes"
                   command="-I"
-                  valueType="includePath"
-                  id="sub.tool.opts.inc.paths.more">
+                  id="sub.tool.opts.inc.paths.more"
+                  valueType="includePath">
                <listOptionValue
-                     value="C:\home\tester/include"
-                     builtIn="false">
+                     builtIn="false"
+                     value="C:\home\tester/include">
                </listOptionValue>
                <listOptionValue
-                     value="&quot;../includes&quot;"
-                     builtIn="false">
+                     builtIn="false"
+                     value="&quot;../includes&quot;">
                </listOptionValue>
             </option>
             <option
                   name="User Objects"
-                  valueType="userObjs"
-                  id="sub.tool.opt.objs">
+                  id="sub.tool.opt.objs"
+                  valueType="userObjs">
                <listOptionValue
-                     value="obj1.o"
-                     builtIn="false">
+                     builtIn="false"
+                     value="obj1.o">
                </listOptionValue>
                <listOptionValue
-                     value="obj2.o"
-                     builtIn="false">
+                     builtIn="false"
+                     value="obj2.o">
                </listOptionValue>
             </option>
          </tool>
@@ -228,8 +228,8 @@
       <target
             isTest="true"
             name="Test Sub Sub"
-            parent="test.sub"
             binaryParser="org.eclipse.cdt.core.ELF"
+            parent="test.sub"
             defaultExtension="tss"
             makeCommand="nmake"
             id="test.sub.sub">
diff --git a/core/org.eclipse.cdt.core.win32/.classpath b/core/org.eclipse.cdt.core.win32/.classpath
index 065ac06e197..aa8c87a1b98 100644
--- a/core/org.eclipse.cdt.core.win32/.classpath
+++ b/core/org.eclipse.cdt.core.win32/.classpath
@@ -1,7 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.core"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.resources_3.0.0/resourcessrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.resources_3.0.0/resources.jar"/>
+	<classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.xerces_4.0.13/xmlParserAPIs.jar"/>
+	<classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.xerces_4.0.13/xercesImpl.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.team.core_3.0.0/teamsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.team.core_3.0.0/team.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime.compatibility_3.0.0/compatibilitysrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime.compatibility_3.0.0/compatibility.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime_3.0.0/runtimesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime_3.0.0/runtime.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi.util_3.0.0/utilsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi.util_3.0.0/util.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/osgisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/osgi.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/coresrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/core.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/resolversrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/resolver.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/defaultAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/defaultAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/eclipseAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/eclipseAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.update.configurator_3.0.0/configuratorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.update.configurator_3.0.0/configurator.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/org.eclipse.cdt.core.win32/fragment.xml b/core/org.eclipse.cdt.core.win32/fragment.xml
index 4d9859173ab..05f75f8bc55 100644
--- a/core/org.eclipse.cdt.core.win32/fragment.xml
+++ b/core/org.eclipse.cdt.core.win32/fragment.xml
@@ -12,6 +12,10 @@
       <library name="cdt_win32.jar"/>
    </runtime>
 
+   <requires>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
+   </requires>
+
 
    <extension
          point="org.eclipse.cdt.core.ProcessList">
diff --git a/core/org.eclipse.cdt.core/.classpath b/core/org.eclipse.cdt.core/.classpath
index dd175003f60..d586a22f025 100644
--- a/core/org.eclipse.cdt.core/.classpath
+++ b/core/org.eclipse.cdt.core/.classpath
@@ -8,7 +8,19 @@
 	<classpathentry kind="src" path="search"/>
 	<classpathentry kind="src" path="dependency"/>
 	<classpathentry kind="src" path="parser"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.resources_3.0.0/resourcessrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.resources_3.0.0/resources.jar"/>
+	<classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.xerces_4.0.13/xmlParserAPIs.jar"/>
+	<classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.xerces_4.0.13/xercesImpl.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.team.core_3.0.0/teamsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.team.core_3.0.0/team.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime.compatibility_3.0.0/compatibilitysrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime.compatibility_3.0.0/compatibility.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime_3.0.0/runtimesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime_3.0.0/runtime.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi.util_3.0.0/utilsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi.util_3.0.0/util.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/osgisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/osgi.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/coresrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/core.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/resolversrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/resolver.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/defaultAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/defaultAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/eclipseAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/eclipseAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.update.configurator_3.0.0/configuratorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.update.configurator_3.0.0/configurator.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml
index 31688d78655..16642e7ddde 100644
--- a/core/org.eclipse.cdt.core/plugin.xml
+++ b/core/org.eclipse.cdt.core/plugin.xml
@@ -17,9 +17,9 @@
    </runtime>
    <requires>
       <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.apache.xerces"/>
       <import plugin="org.eclipse.team.core"/>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
    </requires>
 
 
diff --git a/core/org.eclipse.cdt.ui.tests/.classpath b/core/org.eclipse.cdt.ui.tests/.classpath
index 7b90a41c7e6..d9f898e0f31 100644
--- a/core/org.eclipse.cdt.ui.tests/.classpath
+++ b/core/org.eclipse.cdt.ui.tests/.classpath
@@ -3,7 +3,26 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="ui"/>
 	<classpathentry kind="src" path="core"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface.text_3.0.0/jfacetextsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.jface.text_3.0.0/jfacetext.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.text_3.0.0/textsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.text_3.0.0/text.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.resources_3.0.0/resourcessrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.resources_3.0.0/resources.jar"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.ui"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swtsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-pisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-pi.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-mozillasrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-mozilla.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui_3.0.0/uisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui_3.0.0/ui.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface_3.0.0/jfacesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.jface_3.0.0/jface.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.workbench_3.0.0/workbenchsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui.workbench_3.0.0/workbench.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_JDT_SOURCE_SRC/org.junit_3.8.1/junitsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.junit_3.8.1/junit.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime.compatibility_3.0.0/compatibilitysrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime.compatibility_3.0.0/compatibility.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime_3.0.0/runtimesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime_3.0.0/runtime.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi.util_3.0.0/utilsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi.util_3.0.0/util.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/osgisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/osgi.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/coresrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/core.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/resolversrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/resolver.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/defaultAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/defaultAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/eclipseAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/eclipseAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.update.configurator_3.0.0/configuratorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.update.configurator_3.0.0/configurator.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/org.eclipse.cdt.ui.tests/plugin.xml b/core/org.eclipse.cdt.ui.tests/plugin.xml
index f858df8da55..69f1bbfc36b 100644
--- a/core/org.eclipse.cdt.ui.tests/plugin.xml
+++ b/core/org.eclipse.cdt.ui.tests/plugin.xml
@@ -14,11 +14,11 @@
    <requires>
       <import plugin="org.eclipse.jface.text"/>
       <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.cdt.ui"/>
       <import plugin="org.eclipse.swt"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.junit"/>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
    </requires>
 
 
diff --git a/core/org.eclipse.cdt.ui/.classpath b/core/org.eclipse.cdt.ui/.classpath
index d585f114592..c62f9404cc6 100644
--- a/core/org.eclipse.cdt.ui/.classpath
+++ b/core/org.eclipse.cdt.ui/.classpath
@@ -2,7 +2,35 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="utils.ui"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.ide_3.0.0/idesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui.ide_3.0.0/ide.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.views_3.0.0/viewssrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui.views_3.0.0/views.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface.text_3.0.0/jfacetextsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.jface.text_3.0.0/jfacetext.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.text_3.0.0/textsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.text_3.0.0/text.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.workbench.texteditor_3.0.0/texteditorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui.workbench.texteditor_3.0.0/texteditor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.editors_3.0.0/editorssrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui.editors_3.0.0/editors.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui_3.0.0/uisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui_3.0.0/ui.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swtsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-pisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-pi.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-mozillasrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-mozilla.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface_3.0.0/jfacesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.jface_3.0.0/jface.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.workbench_3.0.0/workbenchsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui.workbench_3.0.0/workbench.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.resources_3.0.0/resourcessrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.resources_3.0.0/resources.jar"/>
+	<classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.xerces_4.0.13/xmlParserAPIs.jar"/>
+	<classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.xerces_4.0.13/xercesImpl.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.search_3.0.0/searchsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.search_3.0.0/search.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.compare_3.0.0/comparesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.compare_3.0.0/compare.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.debug.ui_3.0.0/dtuisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.debug.ui_3.0.0/dtui.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.debug.core_3.0.0/dtcoresrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.debug.core_3.0.0/dtcore.jar"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.core"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime.compatibility_3.0.0/compatibilitysrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime.compatibility_3.0.0/compatibility.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime_3.0.0/runtimesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime_3.0.0/runtime.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi.util_3.0.0/utilsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi.util_3.0.0/util.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/osgisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/osgi.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/coresrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/core.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/resolversrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/resolver.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/defaultAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/defaultAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/eclipseAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/eclipseAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.update.configurator_3.0.0/configuratorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.update.configurator_3.0.0/configurator.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 8c638a14257..baeca264681 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -26,6 +26,7 @@
       <import plugin="org.eclipse.debug.ui"/>
       <import plugin="org.eclipse.debug.core"/>
       <import plugin="org.eclipse.cdt.core"/>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
    </requires>
 
 
@@ -165,35 +166,35 @@
          id="org.eclipse.cdt.ui.ceditor"
          point="org.eclipse.ui.editors">
       <editor
-            default="true"
             name="%CEditor.name"
-            extensions="c, cc, cpp, cxx"
+            default="true"
             icon="icons/full/obj16/c_file_obj.gif"
-            class="org.eclipse.cdt.internal.ui.editor.CEditor"
+            extensions="c, cc, cpp, cxx"
             contributorClass="org.eclipse.cdt.internal.ui.editor.CEditorActionContributor"
+            class="org.eclipse.cdt.internal.ui.editor.CEditor"
             id="org.eclipse.cdt.ui.editor.CEditor">
       </editor>
       <editor
-            default="true"
             name="%CEditor.name"
-            extensions="h, hh, hpp"
+            default="true"
             icon="icons/full/obj16/h_file_obj.gif"
-            class="org.eclipse.cdt.internal.ui.editor.CEditor"
+            extensions="h, hh, hpp"
             contributorClass="org.eclipse.cdt.internal.ui.editor.CEditorActionContributor"
+            class="org.eclipse.cdt.internal.ui.editor.CEditor"
             id="org.eclipse.cdt.ui.editor.CEditor">
       </editor>
       <editor
             name="%Editors.DefaultTextEditor"
-            extensions="mk"
             icon="icons/full/obj16/file_obj.gif"
-            class="org.eclipse.ui.editors.text.TextEditor"
+            extensions="mk"
             contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor"
+            class="org.eclipse.ui.editors.text.TextEditor"
             id="org.eclipse.ui.DefaultTextEditor">
       </editor>
       <editor
             name="%AsmEditor.name"
-            extensions="s"
             icon="icons/full/obj16/c_file_obj.gif"
+            extensions="s"
             class="org.eclipse.cdt.internal.ui.editor.asm.AsmTextEditor"
             id="org.eclipse.cdt.ui.editor.asm.AsmEditor">
       </editor>
@@ -262,16 +263,16 @@
          <action
                label="%AddTask.label"
                helpContextId="org.eclipse.ui.AddTask_action_context"
-               class="org.eclipse.ui.texteditor.TaskRulerAction"
                tooltip="%AddTask.tooltip"
+               class="org.eclipse.ui.texteditor.TaskRulerAction"
                menubarPath="add"
                id="org.eclipse.ui.texteditor.TaskRulerAction">
          </action>
          <action
                label="%AddBookmark.label"
                helpContextId="org.eclipse.ui.bookmark_action_context"
-               class="org.eclipse.ui.texteditor.BookmarkRulerAction"
                tooltip="%AddBookmark.tooltip"
+               class="org.eclipse.ui.texteditor.BookmarkRulerAction"
                menubarPath="add"
                id="org.eclipse.ui.texteditor.BookmarkRulerAction">
          </action>
@@ -282,16 +283,16 @@
          <action
                label="%AddTask.label"
                helpContextId="org.eclipse.ui.AddTask_action_context"
-               class="org.eclipse.ui.texteditor.TaskRulerAction"
                tooltip="%AddTask.tooltip"
+               class="org.eclipse.ui.texteditor.TaskRulerAction"
                menubarPath="add"
                id="org.eclipse.ui.texteditor.TaskRulerAction">
          </action>
          <action
                label="%AddBookmark.label"
                helpContextId="org.eclipse.ui.bookmark_action_context"
-               class="org.eclipse.ui.texteditor.BookmarkRulerAction"
                tooltip="%AddBookmark.tooltip"
+               class="org.eclipse.ui.texteditor.BookmarkRulerAction"
                menubarPath="add"
                id="org.eclipse.ui.texteditor.BookmarkRulerAction">
          </action>
@@ -321,24 +322,24 @@
          <action
                label="%OpenNewFileWizardAction.label"
                icon="icons/full/ctool16/newfile_wiz.gif"
-               class="org.eclipse.cdt.internal.ui.wizards.OpenNewFileWizardAction"
                tooltip="%OpenNewFileWizardAction.tooltip"
+               class="org.eclipse.cdt.internal.ui.wizards.OpenNewFileWizardAction"
                toolbarPath="Normal/FolderWizards"
                id="org.eclipse.cdt.ui.actions.OpenNewFileWizardAction">
          </action>
          <action
                label="%OpenNewFolderWizardAction.label"
                icon="icons/full/ctool16/newfolder_wiz.gif"
-               class="org.eclipse.cdt.internal.ui.wizards.OpenNewFolderWizardAction"
                tooltip="%OpenNewFolderWizardAction.tooltip"
+               class="org.eclipse.cdt.internal.ui.wizards.OpenNewFolderWizardAction"
                toolbarPath="Normal/FolderWizards"
                id="org.eclipse.cdt.ui.actions.OpenNewFolderWizardAction">
          </action>
          <action
                label="%OpenClassWizardAction.label"
                icon="icons/full/ctool16/newclass_wiz.gif"
-               class="org.eclipse.cdt.ui.actions.OpenClassWizardAction"
                tooltip="%OpenClassWizardAction.tooltip"
+               class="org.eclipse.cdt.ui.actions.OpenClassWizardAction"
                toolbarPath="Normal/FolderWizards"
                id="org.eclipse.cdt.ui.actions.OpenClassWizardAction">
             <enablement>
@@ -379,8 +380,8 @@
       </category>
       <command
             name="%ActionDefinition.comment.name"
-            category="org.eclipse.cdt.ui.category.source"
             description="%ActionDefinition.comment.description"
+            category="org.eclipse.cdt.ui.category.source"
             id="org.eclipse.cdt.ui.edit.text.c.comment">
       </command>
       <keyBinding
@@ -391,8 +392,8 @@
       </keyBinding>
       <command
             name="%ActionDefinition.uncomment.name"
-            category="org.eclipse.cdt.ui.category.source"
             description="%ActionDefinition.uncomment.description"
+            category="org.eclipse.cdt.ui.category.source"
             id="org.eclipse.cdt.ui.edit.text.c.uncomment">
       </command>
       <keyBinding
@@ -403,8 +404,8 @@
       </keyBinding>
       <command
             name="%ActionDefinition.opendecl.name"
-            category="org.eclipse.cdt.ui.category.source"
             description="%ActionDefinition.opendecl.description"
+            category="org.eclipse.cdt.ui.category.source"
             id="org.eclipse.cdt.ui.edit.opendecl">
       </command>
       <keyBinding
@@ -421,8 +422,8 @@
       <page
             showScopeSection="true"
             label="%CSearchPage.label"
-            extensions="c:90,cpp:90, cxx:90, cc:90,C:90, h:90, hh:90, hpp:90, H:90"
             icon="icons/full/obj16/csearch_obj.gif"
+            extensions="c:90,cpp:90, cxx:90, cc:90,C:90, h:90, hh:90, hpp:90, H:90"
             class="org.eclipse.cdt.internal.ui.search.CSearchPage"
             sizeHint="460, 160"
             id="org.eclipse.cdt.ui.CSearchPage">
@@ -434,24 +435,24 @@
             pageId="org.eclipse.cdt.ui.CSearchPage"
             label="%ElementNameSorter.label"
             icon="icons/full/clcl16/search_sortmatch.gif"
-            class="org.eclipse.cdt.internal.ui.search.ElementNameSorter"
             tooltip="%ElementNameSorter.tooltip"
+            class="org.eclipse.cdt.internal.ui.search.ElementNameSorter"
             id="org.eclipse.search.internal.ui.ElementNameSorter">
       </sorter>
       <sorter
             pageId="org.eclipse.cdt.ui.CSearchPage"
             label="%ParentNameSorter.label"
             icon="icons/full/clcl16/search_sortmatch.gif"
-            class="org.eclipse.cdt.internal.ui.search.ParentNameSorter"
             tooltip="%ParentNameSorter.tooltip"
+            class="org.eclipse.cdt.internal.ui.search.ParentNameSorter"
             id="org.eclipse.search.internal.ui.ParentNameSorter">
       </sorter>
       <sorter
             pageId="org.eclipse.cdt.ui.CSearchPage"
             label="%PathNameSorter.label"
             icon="icons/full/clcl16/search_sortmatch.gif"
-            class="org.eclipse.cdt.internal.ui.search.PathNameSorter"
             tooltip="%PathNameSorter.tooltip"
+            class="org.eclipse.cdt.internal.ui.search.PathNameSorter"
             id="org.eclipse.search.internal.ui.PathNameSorter">
       </sorter>
    </extension>
@@ -493,16 +494,16 @@
    <extension
          point="org.eclipse.cdt.ui.BinaryParserPage">
       <parserPage
-            class="org.eclipse.cdt.ui.dialogs.GNUElfBinaryParserPage"
             parserID="org.eclipse.cdt.core.GNU_ELF"
+            class="org.eclipse.cdt.ui.dialogs.GNUElfBinaryParserPage"
             id="ElfBinaryParserPage">
       </parserPage>
    </extension>
    <extension
          point="org.eclipse.cdt.ui.BinaryParserPage">
       <parserPage
-            class="org.eclipse.cdt.ui.dialogs.CygwinPEBinaryParserPage"
             parserID="org.eclipse.cdt.core.Cygwin_PE"
+            class="org.eclipse.cdt.ui.dialogs.CygwinPEBinaryParserPage"
             id="PEBinaryParserPage">
       </parserPage>
    </extension>
diff --git a/debug/org.eclipse.cdt.debug.core/.classpath b/debug/org.eclipse.cdt.debug.core/.classpath
index 5e28d3dce23..269ecbf2bc3 100644
--- a/debug/org.eclipse.cdt.debug.core/.classpath
+++ b/debug/org.eclipse.cdt.debug.core/.classpath
@@ -2,7 +2,20 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="schema"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.resources_3.0.0/resourcessrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.resources_3.0.0/resources.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.debug.core_3.0.0/dtcoresrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.debug.core_3.0.0/dtcore.jar"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.core"/>
+	<classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.xerces_4.0.13/xmlParserAPIs.jar"/>
+	<classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.xerces_4.0.13/xercesImpl.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime.compatibility_3.0.0/compatibilitysrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime.compatibility_3.0.0/compatibility.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime_3.0.0/runtimesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime_3.0.0/runtime.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi.util_3.0.0/utilsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi.util_3.0.0/util.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/osgisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/osgi.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/coresrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/core.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/resolversrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/resolver.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/defaultAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/defaultAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/eclipseAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/eclipseAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.update.configurator_3.0.0/configuratorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.update.configurator_3.0.0/configurator.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/debug/org.eclipse.cdt.debug.core/plugin.xml b/debug/org.eclipse.cdt.debug.core/plugin.xml
index 2eb7e3d3768..159f274e96d 100644
--- a/debug/org.eclipse.cdt.debug.core/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.core/plugin.xml
@@ -17,6 +17,7 @@
       <import plugin="org.eclipse.debug.core"/>
       <import plugin="org.eclipse.cdt.core"/>
       <import plugin="org.apache.xerces"/>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
    </requires>
 
 
diff --git a/debug/org.eclipse.cdt.debug.mi.core/.classpath b/debug/org.eclipse.cdt.debug.mi.core/.classpath
index 065ac06e197..539d244498b 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/.classpath
+++ b/debug/org.eclipse.cdt.debug.mi.core/.classpath
@@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.debug.core"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.resources_3.0.0/resourcessrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.resources_3.0.0/resources.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.debug.core_3.0.0/dtcoresrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.debug.core_3.0.0/dtcore.jar"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.core"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime.compatibility_3.0.0/compatibilitysrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime.compatibility_3.0.0/compatibility.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime_3.0.0/runtimesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime_3.0.0/runtime.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi.util_3.0.0/utilsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi.util_3.0.0/util.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/osgisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/osgi.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/coresrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/core.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/resolversrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/resolver.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/defaultAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/defaultAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/eclipseAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/eclipseAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.update.configurator_3.0.0/configuratorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.update.configurator_3.0.0/configurator.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/debug/org.eclipse.cdt.debug.mi.core/plugin.xml b/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
index f2cf60dba6d..b14464ce5d4 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
@@ -17,6 +17,7 @@
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.debug.core"/>
       <import plugin="org.eclipse.cdt.core"/>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
    </requires>
 
 
@@ -25,25 +26,25 @@
       <debugger
             platform="native"
             name="%GDBDebugger.name"
-            class="org.eclipse.cdt.debug.mi.core.GDBDebugger"
-            cpu="native"
             modes="run,core,attach"
+            cpu="native"
+            class="org.eclipse.cdt.debug.mi.core.GDBDebugger"
             id="org.eclipse.cdt.debug.mi.core.CDebugger">
       </debugger>
       <debugger
             platform="win32"
             name="%CygwinGDBDebugger.name"
-            class="org.eclipse.cdt.debug.mi.core.CygwinGDBDebugger"
-            cpu="native"
             modes="run,core,attach"
+            cpu="native"
+            class="org.eclipse.cdt.debug.mi.core.CygwinGDBDebugger"
             id="org.eclipse.cdt.debug.mi.core.CygwinCDebugger">
       </debugger>
       <debugger
             platform="native"
             name="%GDBServer.name"
-            class="org.eclipse.cdt.debug.mi.core.GDBServerDebugger"
-            cpu="native"
             modes="run"
+            cpu="native"
+            class="org.eclipse.cdt.debug.mi.core.GDBServerDebugger"
             id="org.eclipse.cdt.debug.mi.core.GDBServerCDebugger">
       </debugger>
    </extension>
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/.classpath b/debug/org.eclipse.cdt.debug.mi.ui/.classpath
index 065ac06e197..db29ae9201a 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/.classpath
+++ b/debug/org.eclipse.cdt.debug.mi.ui/.classpath
@@ -1,7 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.resources_3.0.0/resourcessrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.resources_3.0.0/resources.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui_3.0.0/uisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui_3.0.0/ui.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swtsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-pisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-pi.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-mozillasrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-mozilla.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface_3.0.0/jfacesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.jface_3.0.0/jface.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.workbench_3.0.0/workbenchsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui.workbench_3.0.0/workbench.jar"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.debug.mi.core"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.debug.ui"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.debug.core"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.ui"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.debug.core_3.0.0/dtcoresrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.debug.core_3.0.0/dtcore.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.debug.ui_3.0.0/dtuisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.debug.ui_3.0.0/dtui.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime.compatibility_3.0.0/compatibilitysrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime.compatibility_3.0.0/compatibility.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime_3.0.0/runtimesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime_3.0.0/runtime.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi.util_3.0.0/utilsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi.util_3.0.0/util.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/osgisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/osgi.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/coresrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/core.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/resolversrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/resolver.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/defaultAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/defaultAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/eclipseAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/eclipseAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.update.configurator_3.0.0/configuratorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.update.configurator_3.0.0/configurator.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml b/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml
index fae2bdebb94..f27c176b45a 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml
@@ -21,6 +21,7 @@
       <import plugin="org.eclipse.cdt.ui"/>
       <import plugin="org.eclipse.debug.core"/>
       <import plugin="org.eclipse.debug.ui"/>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
    </requires>
 
 
@@ -28,18 +29,18 @@
          point="org.eclipse.cdt.debug.ui.CDebuggerPage">
       <debugPage
             class="org.eclipse.cdt.debug.mi.internal.ui.GDBDebuggerPage"
-            id="org.eclipse.cdt.debug.mi.GDBDebuggerPage"
-            debuggerID="org.eclipse.cdt.debug.mi.core.CDebugger">
+            debuggerID="org.eclipse.cdt.debug.mi.core.CDebugger"
+            id="org.eclipse.cdt.debug.mi.GDBDebuggerPage">
       </debugPage>
       <debugPage
             class="org.eclipse.cdt.debug.mi.internal.ui.CygwinDebuggerPage"
-            id="org.eclipse.cdt.debug.mi.CygwinDebuggerPage"
-            debuggerID="org.eclipse.cdt.debug.mi.core.CygwinCDebugger">
+            debuggerID="org.eclipse.cdt.debug.mi.core.CygwinCDebugger"
+            id="org.eclipse.cdt.debug.mi.CygwinDebuggerPage">
       </debugPage>
       <debuggerPage
             class="org.eclipse.cdt.debug.mi.internal.ui.GDBServerDebuggerPage"
-            id="org.eclipse.cdt.debug.mi.GDBServerDebuggerPage"
-            debuggerID="org.eclipse.cdt.debug.mi.core.GDBServerCDebugger">
+            debuggerID="org.eclipse.cdt.debug.mi.core.GDBServerCDebugger"
+            id="org.eclipse.cdt.debug.mi.GDBServerDebuggerPage">
       </debuggerPage>
    </extension>
    <extension
diff --git a/debug/org.eclipse.cdt.debug.ui.tests/.classpath b/debug/org.eclipse.cdt.debug.ui.tests/.classpath
index d16b7548c1d..9cae39c0198 100644
--- a/debug/org.eclipse.cdt.debug.ui.tests/.classpath
+++ b/debug/org.eclipse.cdt.debug.ui.tests/.classpath
@@ -2,7 +2,27 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="core"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.ide_3.0.0/idesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui.ide_3.0.0/ide.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.resources_3.0.0/resourcessrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.resources_3.0.0/resources.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_JDT_SOURCE_SRC/org.junit_3.8.1/junitsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.junit_3.8.1/junit.jar"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.debug.core"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.debug.mi.core"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.core"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui_3.0.0/uisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui_3.0.0/ui.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swtsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-pisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-pi.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-mozillasrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-mozilla.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface_3.0.0/jfacesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.jface_3.0.0/jface.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.workbench_3.0.0/workbenchsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui.workbench_3.0.0/workbench.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime.compatibility_3.0.0/compatibilitysrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime.compatibility_3.0.0/compatibility.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime_3.0.0/runtimesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime_3.0.0/runtime.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi.util_3.0.0/utilsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi.util_3.0.0/util.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/osgisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/osgi.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/coresrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/core.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/resolversrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/resolver.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/defaultAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/defaultAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/eclipseAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/eclipseAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.update.configurator_3.0.0/configuratorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.update.configurator_3.0.0/configurator.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml b/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml
index 9c553226936..16fbc5fc23f 100644
--- a/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml
@@ -14,12 +14,12 @@
    <requires>
       <import plugin="org.eclipse.ui.ide"/>
       <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.junit"/>
       <import plugin="org.eclipse.cdt.debug.core"/>
       <import plugin="org.eclipse.cdt.debug.mi.core"/>
       <import plugin="org.eclipse.cdt.core"/>
       <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
    </requires>
 
 
diff --git a/debug/org.eclipse.cdt.debug.ui/.classpath b/debug/org.eclipse.cdt.debug.ui/.classpath
index 065ac06e197..cc176d43ea3 100644
--- a/debug/org.eclipse.cdt.debug.ui/.classpath
+++ b/debug/org.eclipse.cdt.debug.ui/.classpath
@@ -1,7 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.ide_3.0.0/idesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui.ide_3.0.0/ide.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface.text_3.0.0/jfacetextsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.jface.text_3.0.0/jfacetext.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.text_3.0.0/textsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.text_3.0.0/text.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.workbench.texteditor_3.0.0/texteditorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui.workbench.texteditor_3.0.0/texteditor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.editors_3.0.0/editorssrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui.editors_3.0.0/editors.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.resources_3.0.0/resourcessrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.resources_3.0.0/resources.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui_3.0.0/uisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui_3.0.0/ui.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swtsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-pisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-pi.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-mozillasrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-mozilla.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface_3.0.0/jfacesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.jface_3.0.0/jface.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.workbench_3.0.0/workbenchsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui.workbench_3.0.0/workbench.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.debug.ui_3.0.0/dtuisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.debug.ui_3.0.0/dtui.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.debug.core_3.0.0/dtcoresrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.debug.core_3.0.0/dtcore.jar"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.debug.core"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.ui"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.core"/>
+	<classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.xerces_4.0.13/xmlParserAPIs.jar"/>
+	<classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.xerces_4.0.13/xercesImpl.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime.compatibility_3.0.0/compatibilitysrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime.compatibility_3.0.0/compatibility.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime_3.0.0/runtimesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime_3.0.0/runtime.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi.util_3.0.0/utilsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi.util_3.0.0/util.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/osgisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/osgi.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/coresrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/core.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/resolversrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/resolver.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/defaultAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/defaultAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/eclipseAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/eclipseAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.update.configurator_3.0.0/configuratorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.update.configurator_3.0.0/configurator.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index dc45ed0d521..37ce2cd4ef9 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -25,6 +25,7 @@
       <import plugin="org.eclipse.cdt.ui"/>
       <import plugin="org.eclipse.cdt.core"/>
       <import plugin="org.apache.xerces"/>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
    </requires>
 
 
@@ -75,32 +76,32 @@
             targetID="org.eclipse.debug.ui.DebugPerspective">
          <view
                relative="org.eclipse.debug.ui.VariableView"
-               relationship="stack"
-               id="org.eclipse.cdt.debug.ui.RegistersView">
+               id="org.eclipse.cdt.debug.ui.RegistersView"
+               relationship="stack">
          </view>
          <viewShortcut
                id="org.eclipse.cdt.debug.ui.RegistersView">
          </viewShortcut>
          <view
                relative="org.eclipse.debug.ui.VariableView"
-               relationship="stack"
-               id="org.eclipse.cdt.debug.ui.MemoryView">
+               id="org.eclipse.cdt.debug.ui.MemoryView"
+               relationship="stack">
          </view>
          <viewShortcut
                id="org.eclipse.cdt.debug.ui.MemoryView">
          </viewShortcut>
          <view
                relative="org.eclipse.debug.ui.VariableView"
-               relationship="stack"
-               id="org.eclipse.cdt.debug.ui.SharedLibrariesView">
+               id="org.eclipse.cdt.debug.ui.SharedLibrariesView"
+               relationship="stack">
          </view>
          <viewShortcut
                id="org.eclipse.cdt.debug.ui.SharedLibrariesView">
          </viewShortcut>
          <view
                relative="org.eclipse.debug.ui.VariableView"
-               relationship="stack"
-               id="org.eclipse.cdt.debug.ui.SignalsView">
+               id="org.eclipse.cdt.debug.ui.SignalsView"
+               relationship="stack">
          </view>
          <viewShortcut
                id="org.eclipse.cdt.debug.ui.SignalsView">
@@ -315,8 +316,8 @@
          </action>
          <action
                label="%ShowFullPathsAction.label"
-               style="toggle"
                icon="icons/full/clcl16/show_paths.gif"
+               style="toggle"
                helpContextId="show_full_paths_action_context"
                class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                menubarPath="renderGroup"
@@ -330,8 +331,8 @@
          </action>
          <action
                label="%SwitchToDisassemblyAction.label"
-               style="toggle"
                icon="icons/full/clcl16/disassembly.gif"
+               style="toggle"
                helpContextId="switch_to_disassembly_action_context"
                class="org.eclipse.cdt.debug.internal.ui.actions.SwitchToDisassemblyActionDelegate"
                menubarPath="renderGroup"
@@ -346,8 +347,8 @@
          </action>
          <action
                label="%ShowDebuggerConsoleAction.label"
-               style="toggle"
                icon="icons/full/clcl16/debugger_console.gif"
+               style="toggle"
                helpContextId="show_debugger_console_action_context"
                class="org.eclipse.cdt.debug.internal.ui.actions.DebuggerConsoleActionDelegate"
                menubarPath="renderGroup"
@@ -485,8 +486,8 @@
             id="org.eclipse.cdt.debug.ui.breakpointview.popupMenu">
          <action
                label="%ShowFullPathsAction.label"
-               style="toggle"
                icon="icons/full/clcl16/show_paths.gif"
+               style="toggle"
                helpContextId="show_full_paths_action_context"
                class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                menubarPath="renderGroup"
@@ -761,8 +762,8 @@
             id="org.eclipse.cdt.debug.ui.SharedLibrariesViewPopupActions">
          <action
                label="%ShowFullPathsAction.label"
-               style="toggle"
                icon="icons/full/clcl16/show_paths.gif"
+               style="toggle"
                helpContextId="show_full_paths_action_context"
                class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                menubarPath="renderGroup"
@@ -838,8 +839,8 @@
          <action
                label="%RestoreDefaultTypeAction.label"
                helpContextId="restore_default_type_action_context"
-               tooltip="%RestoreDefaultTypeAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.RestoreDefaultTypeActionDelegate"
+               tooltip="%RestoreDefaultTypeAction.tooltip"
                menubarPath="additions"
                enablesFor="1"
                id="org.eclipse.cdt.debug.internal.ui.actions.RestoreDefaultTypeActionDelegate">
@@ -854,8 +855,8 @@
                label="%CastToTypeAction.label"
                icon="icons/full/clcl16/casttotype_co.gif"
                helpContextId="cast_to_type_action_context"
-               tooltip="%CastToTypeAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.CastToTypeActionDelegate"
+               tooltip="%CastToTypeAction.tooltip"
                menubarPath="additions"
                enablesFor="1"
                id="org.eclipse.cdt.debug.internal.ui.actions.CastToTypeActionDelegate">
@@ -870,8 +871,8 @@
                label="%CastToArrayAction.label"
                icon="icons/full/clcl16/showasarray_co.gif"
                helpContextId="cast_to_array_action_context"
-               tooltip="%CastToArrayAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.CastToArrayActionDelegate"
+               tooltip="%CastToArrayAction.tooltip"
                menubarPath="additions"
                enablesFor="1"
                id="org.eclipse.cdt.debug.internal.ui.actions.CastToArrayActionDelegate">
@@ -890,8 +891,8 @@
                label="%ManageFunctionBreakpointAction.label"
                icon="icons/full/obj16/funbrkp_obj.gif"
                helpContextId="manage_function_breakpoint_action_context"
-               tooltip="%ManageFunctionBreakpointAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.ManageFunctionBreakpointActionDelegate"
+               tooltip="%ManageFunctionBreakpointAction.tooltip"
                menubarPath="additions"
                enablesFor="1"
                id="org.eclipse.cdt.debug.internal.ui.actions.ManageFunctionBreakpointActionDelegate">
@@ -910,8 +911,8 @@
                label="%DisableVariablesAction.label"
                icon="icons/full/clcl16/disabled_co.gif"
                helpContextId="disable_variables_action_context"
-               tooltip="%DisableVariablesAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.DisableVariablesActionDelegate"
+               tooltip="%DisableVariablesAction.tooltip"
                menubarPath="variableGroup"
                enablesFor="2+"
                id="org.eclipse.cdt.debug.internal.ui.actions.DisableVariablesActionDelegate">
@@ -923,8 +924,8 @@
                label="%EnableVariablesAction.label"
                icon="icons/full/clcl16/enabled_co.gif"
                helpContextId="enable_variables_action_context"
-               tooltip="%EnableVariablesAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.EnableVariablesActionDelegate"
+               tooltip="%EnableVariablesAction.tooltip"
                menubarPath="variableGroup"
                enablesFor="2+"
                id="org.eclipse.cdt.debug.internal.ui.actions.EnableVariablesActionDelegate">
@@ -947,8 +948,8 @@
                disabledIcon="icons/full/dlcl16/restart.gif"
                enablesFor="1"
                icon="icons/full/elcl16/restart.gif"
-               helpContextId="restart_action_context"
                label="%RestartAction.label"
+               helpContextId="restart_action_context"
                tooltip="%RestartAction.tooltip">
             <enablement>
                <pluginState
@@ -965,8 +966,8 @@
                class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                disabledIcon="icons/full/dlcl16/show_paths.gif"
                icon="icons/full/elcl16/show_parents.gif"
-               helpContextId="show_full_paths_action_context"
                label="%ShowFullPathsAction.label"
+               helpContextId="show_full_paths_action_context"
                tooltip="%ShowFullPathsAction.tooltip">
             <enablement>
                <pluginState
@@ -984,8 +985,8 @@
                disabledIcon="icons/full/dlcl16/disassembly.gif"
                enablesFor="1"
                icon="icons/full/elcl16/disassembly.gif"
-               helpContextId="switch_to_disassembly_action_context"
                label="%SwitchToDisassemblyAction.label"
+               helpContextId="switch_to_disassembly_action_context"
                tooltip="%SwitchToDisassemblyAction.tooltip">
             <enablement>
                <pluginState
@@ -1003,8 +1004,8 @@
                disabledIcon="icons/full/dlcl16/debugger_console.gif"
                enablesFor="1"
                icon="icons/full/elcl16/debugger_console.gif"
-               helpContextId="show_debugger_console_action_context"
                label="%ShowDebuggerConsoleAction.label"
+               helpContextId="show_debugger_console_action_context"
                tooltip="%ShowDebuggerConsoleAction.tooltip">
             <enablement>
                <pluginState
@@ -1025,8 +1026,8 @@
                class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                disabledIcon="icons/full/dlcl16/show_paths.gif"
                icon="icons/full/elcl16/show_parents.gif"
-               helpContextId="show_full_paths_action_context"
                label="%ShowFullPathsAction.label"
+               helpContextId="show_full_paths_action_context"
                tooltip="%ShowFullPathsAction.tooltip">
             <enablement>
                <pluginState
@@ -1047,8 +1048,8 @@
                disabledIcon="icons/full/dlcl16/watch_globals.gif"
                enablesFor="1"
                icon="icons/full/elcl16/watch_globals.gif"
-               helpContextId="add_globals_action_context"
                label="%AddGlobalsAction.label"
+               helpContextId="add_globals_action_context"
                tooltip="%AddGlobalsAction.tooltip">
             <enablement>
                <pluginState
@@ -1069,8 +1070,8 @@
                class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                disabledIcon="icons/full/dlcl16/show_paths.gif"
                icon="icons/full/elcl16/show_parents.gif"
-               helpContextId="show_full_paths_action_context"
                label="%ShowFullPathsAction.label"
+               helpContextId="show_full_paths_action_context"
                tooltip="%ShowFullPathsAction.tooltip">
             <enablement>
                <pluginState
@@ -1160,20 +1161,20 @@
    <extension
          point="org.eclipse.debug.core.statusHandlers">
       <statusHandler
-            plugin="org.eclipse.cdt.debug.core"
             code="10000"
+            plugin="org.eclipse.cdt.debug.core"
             class="org.eclipse.cdt.debug.internal.ui.QuestionStatusHandler"
             id="org.eclipse.cdt.debug.internal.ui.QuestionStatusHandler">
       </statusHandler>
       <statusHandler
-            plugin="org.eclipse.cdt.debug.core"
             code="10001"
+            plugin="org.eclipse.cdt.debug.core"
             class="org.eclipse.cdt.debug.internal.ui.InfoStatusHandler"
             id="org.eclipse.cdt.debug.internal.ui.InfoStatusHandler">
       </statusHandler>
       <statusHandler
-            plugin="org.eclipse.cdt.debug.core"
             code="10002"
+            plugin="org.eclipse.cdt.debug.core"
             class="org.eclipse.cdt.debug.internal.ui.ErrorStatusHandler"
             id="org.eclipse.cdt.debug.internal.ui.ErrorStatusHandler">
       </statusHandler>
@@ -1236,16 +1237,16 @@
          point="org.eclipse.ui.editors">
       <editor
             name="%DisassemblyEditor.name"
-            icon="icons/full/obj16/disassembly_obj.gif"
             extensions="dasm"
+            icon="icons/full/obj16/disassembly_obj.gif"
             class="org.eclipse.cdt.debug.internal.ui.editors.DisassemblyEditor"
             id="org.eclipse.cdt.debug.ui.DisassemblyEditor">
       </editor>
       <editor
             name="%CDebugEditor.name"
             icon="icons/full/obj16/filenotfound_obj.gif"
-            contributorClass="org.eclipse.cdt.internal.ui.editor.CEditorActionContributor"
             class="org.eclipse.cdt.debug.internal.ui.editors.CDebugEditor"
+            contributorClass="org.eclipse.cdt.internal.ui.editor.CEditorActionContributor"
             id="org.eclipse.cdt.debug.ui.editor.CDebugEditor">
       </editor>
    </extension>
diff --git a/doc/org.eclipse.cdt.doc.isv/.project b/doc/org.eclipse.cdt.doc.isv/.project
new file mode 100644
index 00000000000..3d7ca9106e0
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.isv/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.cdt.doc.isv</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/launch/org.eclipse.cdt.launch/.classpath b/launch/org.eclipse.cdt.launch/.classpath
index 065ac06e197..2018a8e42d5 100644
--- a/launch/org.eclipse.cdt.launch/.classpath
+++ b/launch/org.eclipse.cdt.launch/.classpath
@@ -1,7 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.ide_3.0.0/idesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui.ide_3.0.0/ide.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.resources_3.0.0/resourcessrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.resources_3.0.0/resources.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.debug.core_3.0.0/dtcoresrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.debug.core_3.0.0/dtcore.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.debug.ui_3.0.0/dtuisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.debug.ui_3.0.0/dtui.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui_3.0.0/uisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui_3.0.0/ui.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swtsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-pisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-pi.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-mozillasrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-mozilla.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface_3.0.0/jfacesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.jface_3.0.0/jface.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.workbench_3.0.0/workbenchsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui.workbench_3.0.0/workbench.jar"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.core"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.ui"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.debug.core"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.debug.ui"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime.compatibility_3.0.0/compatibilitysrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime.compatibility_3.0.0/compatibility.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime_3.0.0/runtimesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime_3.0.0/runtime.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi.util_3.0.0/utilsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi.util_3.0.0/util.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/osgisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/osgi.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/coresrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/core.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/resolversrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/resolver.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/defaultAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/defaultAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/eclipseAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/eclipseAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.update.configurator_3.0.0/configuratorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.update.configurator_3.0.0/configurator.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/launch/org.eclipse.cdt.launch/plugin.xml b/launch/org.eclipse.cdt.launch/plugin.xml
index 3482717311e..197d1145948 100644
--- a/launch/org.eclipse.cdt.launch/plugin.xml
+++ b/launch/org.eclipse.cdt.launch/plugin.xml
@@ -23,6 +23,7 @@
       <import plugin="org.eclipse.cdt.debug.core"/>
       <import plugin="org.eclipse.cdt.debug.ui"/>
       <import plugin="org.eclipse.core.boot"/>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
    </requires>
 
 
@@ -74,8 +75,8 @@
       <shortcut
             label="C Local Application"
             icon="icons/c_app.gif"
-            class="org.eclipse.cdt.launch.internal.CApplicationLaunchShortcut"
             modes="run, debug"
+            class="org.eclipse.cdt.launch.internal.CApplicationLaunchShortcut"
             id="org.eclipse.cdt.debug.ui.localCShortcut">
          <perspective
                id="org.eclipse.cdt.ui.CPerspective">