diff --git a/build/org.eclipse.cdt.make.core/.classpath b/build/org.eclipse.cdt.make.core/.classpath
index 0aeb87a163a..c5cfc924bbd 100644
--- a/build/org.eclipse.cdt.make.core/.classpath
+++ b/build/org.eclipse.cdt.make.core/.classpath
@@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
     <classpathentry kind="src" path="src/"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.linux"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.qnx"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.solaris"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.win32"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
+    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
     <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/.project b/build/org.eclipse.cdt.make.core/.project
index 01c697756df..177b525e7d9 100644
--- a/build/org.eclipse.cdt.make.core/.project
+++ b/build/org.eclipse.cdt.make.core/.project
@@ -3,15 +3,11 @@
 	<name>org.eclipse.cdt.make.core</name>
 	<comment></comment>
 	<projects>
-		<project>org.apache.xerces</project>
 		<project>org.eclipse.cdt.core</project>
 		<project>org.eclipse.cdt.core.linux</project>
 		<project>org.eclipse.cdt.core.qnx</project>
 		<project>org.eclipse.cdt.core.solaris</project>
 		<project>org.eclipse.cdt.core.win32</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/build/org.eclipse.cdt.make.core/plugin.xml b/build/org.eclipse.cdt.make.core/plugin.xml
index d0d4ca08a20..90dd2e3edc2 100644
--- a/build/org.eclipse.cdt.make.core/plugin.xml
+++ b/build/org.eclipse.cdt.make.core/plugin.xml
@@ -2,7 +2,7 @@
 <plugin
    id="org.eclipse.cdt.make.core"
    name="%pluginName"
-   version="1.2.0"
+   version="1.2.1"
    provider-name="%providerName"
    class="org.eclipse.cdt.make.core.MakeCorePlugin">
 
diff --git a/build/org.eclipse.cdt.make.ui/.classpath b/build/org.eclipse.cdt.make.ui/.classpath
index 06335bb89f8..c5cfc924bbd 100644
--- a/build/org.eclipse.cdt.make.ui/.classpath
+++ b/build/org.eclipse.cdt.make.ui/.classpath
@@ -1,17 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
     <classpathentry kind="src" path="src/"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.linux"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.qnx"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.solaris"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.win32"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.make.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
+    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
     <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/.project b/build/org.eclipse.cdt.make.ui/.project
index 36dd5636da8..4d8db9f7ba4 100644
--- a/build/org.eclipse.cdt.make.ui/.project
+++ b/build/org.eclipse.cdt.make.ui/.project
@@ -10,10 +10,6 @@
 		<project>org.eclipse.cdt.core.win32</project>
 		<project>org.eclipse.cdt.make.core</project>
 		<project>org.eclipse.cdt.ui</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.ui</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/build/org.eclipse.cdt.make.ui/plugin.xml b/build/org.eclipse.cdt.make.ui/plugin.xml
index 42ad19187e3..b46c8e46981 100644
--- a/build/org.eclipse.cdt.make.ui/plugin.xml
+++ b/build/org.eclipse.cdt.make.ui/plugin.xml
@@ -2,7 +2,7 @@
 <plugin
    id="org.eclipse.cdt.make.ui"
    name="%pluginName"
-   version="1.2.0"
+   version="1.2.1"
    provider-name="%providerName"
    class="org.eclipse.cdt.make.internal.ui.MakeUIPlugin">
 
@@ -315,9 +315,7 @@
          </action>
       </actionSet>
    </extension>
-
-<!-- Makefile Editor comment out for CDT 1.2 -->
-   <!--extension
+<!--extension
          id="org.eclipse.cdt.make.editor"
          name="MakefileEditor"
          point="org.eclipse.ui.editors">
@@ -330,6 +328,7 @@
             id="org.eclipse.cdt.make.editor">
       </editor>
    </extension -->
+<!-- Makefile Editor comment out for CDT 1.2 -->
    <extension
          point="org.eclipse.ui.startup">
       <startup>
diff --git a/build/org.eclipse.cdt.managedbuilder.core/.classpath b/build/org.eclipse.cdt.managedbuilder.core/.classpath
index 37a7e5c72df..c5cfc924bbd 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/.classpath
+++ b/build/org.eclipse.cdt.managedbuilder.core/.classpath
@@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
     <classpathentry kind="src" path="src/"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.linux"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.qnx"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.solaris"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.win32"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
+    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
     <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/.project b/build/org.eclipse.cdt.managedbuilder.core/.project
index fe252f677b2..2baba398bf7 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/.project
+++ b/build/org.eclipse.cdt.managedbuilder.core/.project
@@ -3,15 +3,11 @@
 	<name>org.eclipse.cdt.managedbuilder.core</name>
 	<comment></comment>
 	<projects>
-		<project>org.apache.xerces</project>
 		<project>org.eclipse.cdt.core</project>
 		<project>org.eclipse.cdt.core.linux</project>
 		<project>org.eclipse.cdt.core.qnx</project>
 		<project>org.eclipse.cdt.core.solaris</project>
 		<project>org.eclipse.cdt.core.win32</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
index aa65e7256d2..002247b2e55 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
@@ -2,7 +2,7 @@
 <plugin
    id="org.eclipse.cdt.managedbuilder.core"
    name="%pluginName"
-   version="1.2.0"
+   version="1.2.1"
    provider-name="%providerName"
    class="org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin">
 
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/.classpath b/build/org.eclipse.cdt.managedbuilder.ui/.classpath
index 9090477e799..c5cfc924bbd 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/.classpath
+++ b/build/org.eclipse.cdt.managedbuilder.ui/.classpath
@@ -1,17 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
     <classpathentry kind="src" path="src/"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.linux"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.qnx"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.solaris"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.win32"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.managedbuilder.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
+    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.ui"/>
     <classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/.project b/build/org.eclipse.cdt.managedbuilder.ui/.project
index 9091b32f7a0..5e5d10da61c 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/.project
+++ b/build/org.eclipse.cdt.managedbuilder.ui/.project
@@ -10,10 +10,6 @@
 		<project>org.eclipse.cdt.core.win32</project>
 		<project>org.eclipse.cdt.managedbuilder.core</project>
 		<project>org.eclipse.cdt.ui</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.ui</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index acee39dac41..ed3a305e2e6 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -2,7 +2,7 @@
 <plugin
    id="org.eclipse.cdt.managedbuilder.ui"
    name="%pluginName"
-   version="1.2.0"
+   version="1.2.1"
    provider-name="%providerName"
    class="org.eclipse.cdt.managedbuilder.internal.ui.ManagedBuilderUIPlugin">
 
diff --git a/core/org.eclipse.cdt.core.linux/.classpath b/core/org.eclipse.cdt.core.linux/.classpath
index d2b793e8a1f..c5cfc924bbd 100644
--- a/core/org.eclipse.cdt.core.linux/.classpath
+++ b/core/org.eclipse.cdt.core.linux/.classpath
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.search"/>
-    <classpathentry kind="src" path="/org.eclipse.compare"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="src" path="src"/>
+    <classpathentry kind="src" path="src/"/>
+    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
     <classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/org.eclipse.cdt.core.linux/.project b/core/org.eclipse.cdt.core.linux/.project
index fe06d602a6d..43f20bda72b 100644
--- a/core/org.eclipse.cdt.core.linux/.project
+++ b/core/org.eclipse.cdt.core.linux/.project
@@ -3,14 +3,7 @@
 	<name>org.eclipse.cdt.core.linux</name>
 	<comment></comment>
 	<projects>
-		<project>org.apache.xerces</project>
 		<project>org.eclipse.cdt.core</project>
-		<project>org.eclipse.compare</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.debug.core</project>
-		<project>org.eclipse.search</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/core/org.eclipse.cdt.core.linux/fragment.xml b/core/org.eclipse.cdt.core.linux/fragment.xml
index 08cc3ea37d2..6903e806374 100644
--- a/core/org.eclipse.cdt.core.linux/fragment.xml
+++ b/core/org.eclipse.cdt.core.linux/fragment.xml
@@ -2,10 +2,10 @@
 <fragment
    id="org.eclipse.cdt.core.linux"
    name="%fragmentName"
-   version="1.2.0"
+   version="1.2.1"
    provider-name="%providerName"
    plugin-id="org.eclipse.cdt.core"
-   plugin-version="1.2.0">
+   plugin-version="1.2.1">
 
    <runtime>
       <library name="cdt_linux.jar"/>
diff --git a/core/org.eclipse.cdt.core.qnx/.classpath b/core/org.eclipse.cdt.core.qnx/.classpath
index d317cd64b8f..c5cfc924bbd 100644
--- a/core/org.eclipse.cdt.core.qnx/.classpath
+++ b/core/org.eclipse.cdt.core.qnx/.classpath
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="src"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.search"/>
-    <classpathentry kind="src" path="/org.eclipse.compare"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
+    <classpathentry kind="src" path="src/"/>
+    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
     <classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/org.eclipse.cdt.core.qnx/.project b/core/org.eclipse.cdt.core.qnx/.project
index 7e3a64e9bd3..9aa2652590a 100644
--- a/core/org.eclipse.cdt.core.qnx/.project
+++ b/core/org.eclipse.cdt.core.qnx/.project
@@ -3,14 +3,7 @@
 	<name>org.eclipse.cdt.core.qnx</name>
 	<comment></comment>
 	<projects>
-		<project>org.apache.xerces</project>
 		<project>org.eclipse.cdt.core</project>
-		<project>org.eclipse.compare</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.debug.core</project>
-		<project>org.eclipse.search</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/core/org.eclipse.cdt.core.qnx/fragment.xml b/core/org.eclipse.cdt.core.qnx/fragment.xml
index b6feb38bb44..282ab037728 100644
--- a/core/org.eclipse.cdt.core.qnx/fragment.xml
+++ b/core/org.eclipse.cdt.core.qnx/fragment.xml
@@ -2,10 +2,10 @@
 <fragment
    id="org.eclipse.cdt.core.qnx"
    name="%fragmentName"
-   version="1.2.0"
+   version="1.2.1"
    provider-name="%providerName"
    plugin-id="org.eclipse.cdt.core"
-   plugin-version="1.2.0">
+   plugin-version="1.2.1">
 
    <runtime>
       <library name="cdt_qnx.jar"/>
diff --git a/core/org.eclipse.cdt.core.solaris/.classpath b/core/org.eclipse.cdt.core.solaris/.classpath
index d317cd64b8f..c5cfc924bbd 100644
--- a/core/org.eclipse.cdt.core.solaris/.classpath
+++ b/core/org.eclipse.cdt.core.solaris/.classpath
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="src"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.search"/>
-    <classpathentry kind="src" path="/org.eclipse.compare"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
+    <classpathentry kind="src" path="src/"/>
+    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
     <classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/org.eclipse.cdt.core.solaris/.project b/core/org.eclipse.cdt.core.solaris/.project
index 7b718d54ba7..d02ba7f9f05 100644
--- a/core/org.eclipse.cdt.core.solaris/.project
+++ b/core/org.eclipse.cdt.core.solaris/.project
@@ -3,14 +3,7 @@
 	<name>org.eclipse.cdt.core.solaris</name>
 	<comment></comment>
 	<projects>
-		<project>org.apache.xerces</project>
 		<project>org.eclipse.cdt.core</project>
-		<project>org.eclipse.compare</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.debug.core</project>
-		<project>org.eclipse.search</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/core/org.eclipse.cdt.core.solaris/fragment.xml b/core/org.eclipse.cdt.core.solaris/fragment.xml
index 3ea0df9dfef..8fdfd80486c 100644
--- a/core/org.eclipse.cdt.core.solaris/fragment.xml
+++ b/core/org.eclipse.cdt.core.solaris/fragment.xml
@@ -2,10 +2,10 @@
 <fragment
    id="org.eclipse.cdt.core.solaris"
    name="%fragmentName"
-   version="1.2.0"
+   version="1.2.1"
    provider-name="%providerName"
    plugin-id="org.eclipse.cdt.core"
-   plugin-version="1.2.0">
+   plugin-version="1.2.1">
 
    <runtime>
       <library name="cdt_solaris.jar"/>
diff --git a/core/org.eclipse.cdt.core.tests/.classpath b/core/org.eclipse.cdt.core.tests/.classpath
index cdd4b6956fe..646164983b5 100644
--- a/core/org.eclipse.cdt.core.tests/.classpath
+++ b/core/org.eclipse.cdt.core.tests/.classpath
@@ -8,21 +8,7 @@
     <classpathentry kind="src" path="suite/"/>
     <classpathentry kind="src" path="indexer/"/>
     <classpathentry kind="src" path="search/"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.linux"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.qnx"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.solaris"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.win32"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.swt"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="src" path="/org.junit"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.managedbuilder.core"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.make.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
+    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
     <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/.project b/core/org.eclipse.cdt.core.tests/.project
index 85e78223521..132ec729ab8 100644
--- a/core/org.eclipse.cdt.core.tests/.project
+++ b/core/org.eclipse.cdt.core.tests/.project
@@ -3,7 +3,6 @@
 	<name>org.eclipse.cdt.core.tests</name>
 	<comment></comment>
 	<projects>
-		<project>org.apache.xerces</project>
 		<project>org.eclipse.cdt.core</project>
 		<project>org.eclipse.cdt.core.linux</project>
 		<project>org.eclipse.cdt.core.qnx</project>
@@ -12,12 +11,6 @@
 		<project>org.eclipse.cdt.make.core</project>
 		<project>org.eclipse.cdt.managedbuilder.core</project>
 		<project>org.eclipse.cdt.ui</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.swt</project>
-		<project>org.eclipse.ui</project>
-		<project>org.junit</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/core/org.eclipse.cdt.core.tests/plugin.xml b/core/org.eclipse.cdt.core.tests/plugin.xml
index cccbd12232e..b49c0844729 100644
--- a/core/org.eclipse.cdt.core.tests/plugin.xml
+++ b/core/org.eclipse.cdt.core.tests/plugin.xml
@@ -2,7 +2,7 @@
 <plugin
    id="org.eclipse.cdt.core.tests"
    name="org.eclipse.cdt.core.tests"
-   version="1.2.0"
+   version="1.2.1"
    class="org.eclipse.cdt.testplugin.CTestPlugin">
 
    <runtime>
@@ -203,7 +203,7 @@
                      builtIn="false">
                </listOptionValue>
                <listOptionValue
-		             value="&quot;../includes&quot;"
+                     value="&quot;../includes&quot;"
                      builtIn="false">
                </listOptionValue>
             </option>
diff --git a/core/org.eclipse.cdt.core.win32/.classpath b/core/org.eclipse.cdt.core.win32/.classpath
index d2b793e8a1f..c5cfc924bbd 100644
--- a/core/org.eclipse.cdt.core.win32/.classpath
+++ b/core/org.eclipse.cdt.core.win32/.classpath
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.search"/>
-    <classpathentry kind="src" path="/org.eclipse.compare"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="src" path="src"/>
+    <classpathentry kind="src" path="src/"/>
+    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+    <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/.project b/core/org.eclipse.cdt.core.win32/.project
index c0dc3c4eb89..0c2dc05e8ad 100644
--- a/core/org.eclipse.cdt.core.win32/.project
+++ b/core/org.eclipse.cdt.core.win32/.project
@@ -3,14 +3,7 @@
 	<name>org.eclipse.cdt.core.win32</name>
 	<comment></comment>
 	<projects>
-		<project>org.apache.xerces</project>
 		<project>org.eclipse.cdt.core</project>
-		<project>org.eclipse.compare</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.debug.core</project>
-		<project>org.eclipse.search</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/core/org.eclipse.cdt.core.win32/fragment.xml b/core/org.eclipse.cdt.core.win32/fragment.xml
index 8af9d240a15..2b939353cac 100644
--- a/core/org.eclipse.cdt.core.win32/fragment.xml
+++ b/core/org.eclipse.cdt.core.win32/fragment.xml
@@ -2,10 +2,10 @@
 <fragment
    id="org.eclipse.cdt.core.win32"
    name="%fragmentName"
-   version="1.2.0"
+   version="1.2.1"
    provider-name="%providerName"
    plugin-id="org.eclipse.cdt.core"
-   plugin-version="1.2.0">
+   plugin-version="1.2.1">
 
    <runtime>
       <library name="cdt_win32.jar"/>
diff --git a/core/org.eclipse.cdt.core/.classpath b/core/org.eclipse.cdt.core/.classpath
index 0755b6ef457..eeb0ac1ef7b 100644
--- a/core/org.eclipse.cdt.core/.classpath
+++ b/core/org.eclipse.cdt.core/.classpath
@@ -8,14 +8,7 @@
     <classpathentry kind="src" path="parser/"/>
     <classpathentry kind="src" path="search/"/>
     <classpathentry kind="src" path="dependency/"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.search"/>
-    <classpathentry kind="src" path="/org.eclipse.compare"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.team.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
+    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
     <classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/org.eclipse.cdt.core/.project b/core/org.eclipse.cdt.core/.project
index ba2680f0072..95eceb11fac 100644
--- a/core/org.eclipse.cdt.core/.project
+++ b/core/org.eclipse.cdt.core/.project
@@ -3,14 +3,6 @@
 	<name>org.eclipse.cdt.core</name>
 	<comment></comment>
 	<projects>
-		<project>org.apache.xerces</project>
-		<project>org.eclipse.compare</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.debug.core</project>
-		<project>org.eclipse.search</project>
-		<project>org.eclipse.team.core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml
index 19d589f7f9c..ccab5b7f4fc 100644
--- a/core/org.eclipse.cdt.core/plugin.xml
+++ b/core/org.eclipse.cdt.core/plugin.xml
@@ -2,7 +2,7 @@
 <plugin
    id="org.eclipse.cdt.core"
    name="%pluginName"
-   version="1.2.0"
+   version="1.2.1"
    provider-name="%providerName"
    class="org.eclipse.cdt.core.CCorePlugin">
 
diff --git a/core/org.eclipse.cdt.ui.tests/.classpath b/core/org.eclipse.cdt.ui.tests/.classpath
index 8dc73d06a59..f72a7b76156 100644
--- a/core/org.eclipse.cdt.ui.tests/.classpath
+++ b/core/org.eclipse.cdt.ui.tests/.classpath
@@ -3,14 +3,7 @@
     <classpathentry kind="src" path="src/"/>
     <classpathentry kind="src" path="ui/"/>
     <classpathentry kind="src" path="core/"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.swt"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="src" path="/org.junit"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
+    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
     <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/.project b/core/org.eclipse.cdt.ui.tests/.project
index 3f4f6406025..f26a6c9dca9 100644
--- a/core/org.eclipse.cdt.ui.tests/.project
+++ b/core/org.eclipse.cdt.ui.tests/.project
@@ -3,14 +3,12 @@
 	<name>org.eclipse.cdt.ui.tests</name>
 	<comment></comment>
 	<projects>
-		<project>org.apache.xerces</project>
+		<project>org.eclipse.cdt.core</project>
+		<project>org.eclipse.cdt.core.linux</project>
+		<project>org.eclipse.cdt.core.qnx</project>
+		<project>org.eclipse.cdt.core.solaris</project>
+		<project>org.eclipse.cdt.core.win32</project>
 		<project>org.eclipse.cdt.ui</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.swt</project>
-		<project>org.eclipse.ui</project>
-		<project>org.junit</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/core/org.eclipse.cdt.ui.tests/plugin.xml b/core/org.eclipse.cdt.ui.tests/plugin.xml
index e1f3ce42b85..fdf8f55343f 100644
--- a/core/org.eclipse.cdt.ui.tests/plugin.xml
+++ b/core/org.eclipse.cdt.ui.tests/plugin.xml
@@ -2,7 +2,7 @@
 <plugin
    id="org.eclipse.cdt.ui.tests"
    name="org.eclipse.cdt.ui.tests"
-   version="1.2.0"
+   version="1.2.1"
    class="org.eclipse.cdt.testplugin.CTestPlugin">
 
    <runtime>
diff --git a/core/org.eclipse.cdt.ui/.classpath b/core/org.eclipse.cdt.ui/.classpath
index 0bcc542d2a9..0c1c1e838d7 100644
--- a/core/org.eclipse.cdt.ui/.classpath
+++ b/core/org.eclipse.cdt.ui/.classpath
@@ -2,16 +2,7 @@
 <classpath>
     <classpathentry kind="src" path="src/"/>
     <classpathentry kind="src" path="utils.ui/"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.search"/>
-    <classpathentry kind="src" path="/org.eclipse.compare"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
+    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
     <classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/org.eclipse.cdt.ui/.project b/core/org.eclipse.cdt.ui/.project
index 3b1e639d37a..d29026e31ba 100644
--- a/core/org.eclipse.cdt.ui/.project
+++ b/core/org.eclipse.cdt.ui/.project
@@ -3,16 +3,11 @@
 	<name>org.eclipse.cdt.ui</name>
 	<comment></comment>
 	<projects>
-		<project>org.apache.xerces</project>
 		<project>org.eclipse.cdt.core</project>
-		<project>org.eclipse.compare</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.debug.core</project>
-		<project>org.eclipse.debug.ui</project>
-		<project>org.eclipse.search</project>
-		<project>org.eclipse.ui</project>
+		<project>org.eclipse.cdt.core.linux</project>
+		<project>org.eclipse.cdt.core.qnx</project>
+		<project>org.eclipse.cdt.core.solaris</project>
+		<project>org.eclipse.cdt.core.win32</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 536cbb149b9..a2bc0c1ce64 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -2,7 +2,7 @@
 <plugin
    id="org.eclipse.cdt.ui"
    name="%pluginName"
-   version="1.2.0"
+   version="1.2.1"
    provider-name="%providerName"
    class="org.eclipse.cdt.ui.CUIPlugin">
 
@@ -27,9 +27,9 @@
    <extension-point id="CElementFilters" name="%elementFiltersName"/>
    <extension-point id="BinaryParserPage" name="Binary Parser Page"/>
 <!-- =========================================================================== -->
-<!-- Extension Implementation: must implement org.eclipse.jface.text.ITextHover  -->
-<!-- Purpose: Provide a perspective specific text hovering for CEditor files     -->
 <!-- Extension point: org.eclipse.cdt.ui.textHovers                        -->
+<!-- Purpose: Provide a perspective specific text hovering for CEditor files     -->
+<!-- Extension Implementation: must implement org.eclipse.jface.text.ITextHover  -->
 <!-- =========================================================================== -->
    <extension-point id="textHovers" name="%textHoversName"/>
 
@@ -130,8 +130,8 @@
             id="org.eclipse.cdt.ui.CView">
       </view>
    </extension>
-<!-- The wizards -->
 <!-- For C Wizards -->
+<!-- The wizards -->
    <extension
          point="org.eclipse.ui.newWizards">
       <category
diff --git a/debug/org.eclipse.cdt.debug.core/.classpath b/debug/org.eclipse.cdt.debug.core/.classpath
index c7ba04bb859..db4ecf29def 100644
--- a/debug/org.eclipse.cdt.debug.core/.classpath
+++ b/debug/org.eclipse.cdt.debug.core/.classpath
@@ -2,12 +2,7 @@
 <classpath>
     <classpathentry kind="src" path="src"/>
     <classpathentry kind="src" path="schema"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
+    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+    <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/.project b/debug/org.eclipse.cdt.debug.core/.project
index 730404d6973..950902cfb86 100644
--- a/debug/org.eclipse.cdt.debug.core/.project
+++ b/debug/org.eclipse.cdt.debug.core/.project
@@ -3,12 +3,11 @@
 	<name>org.eclipse.cdt.debug.core</name>
 	<comment></comment>
 	<projects>
-		<project>org.apache.xerces</project>
 		<project>org.eclipse.cdt.core</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.debug.core</project>
+		<project>org.eclipse.cdt.core.linux</project>
+		<project>org.eclipse.cdt.core.qnx</project>
+		<project>org.eclipse.cdt.core.solaris</project>
+		<project>org.eclipse.cdt.core.win32</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/debug/org.eclipse.cdt.debug.core/plugin.xml b/debug/org.eclipse.cdt.debug.core/plugin.xml
index 8db11ec524e..934609ee7d2 100644
--- a/debug/org.eclipse.cdt.debug.core/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.core/plugin.xml
@@ -2,7 +2,7 @@
 <plugin
    id="org.eclipse.cdt.debug.core"
    name="%pluginName"
-   version="1.2.0"
+   version="1.2.1"
    provider-name="%providerName"
    class="org.eclipse.cdt.debug.core.CDebugCorePlugin">
 
diff --git a/debug/org.eclipse.cdt.debug.mi.core/.classpath b/debug/org.eclipse.cdt.debug.mi.core/.classpath
index 43c9b09db27..c5cfc924bbd 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/.classpath
+++ b/debug/org.eclipse.cdt.debug.mi.core/.classpath
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
     <classpathentry kind="src" path="src/"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
+    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+    <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/.project b/debug/org.eclipse.cdt.debug.mi.core/.project
index 7434461909b..94e8d2c01e0 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/.project
+++ b/debug/org.eclipse.cdt.debug.mi.core/.project
@@ -4,11 +4,11 @@
 	<comment></comment>
 	<projects>
 		<project>org.eclipse.cdt.core</project>
+		<project>org.eclipse.cdt.core.linux</project>
+		<project>org.eclipse.cdt.core.qnx</project>
+		<project>org.eclipse.cdt.core.solaris</project>
+		<project>org.eclipse.cdt.core.win32</project>
 		<project>org.eclipse.cdt.debug.core</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.debug.core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/debug/org.eclipse.cdt.debug.mi.core/plugin.xml b/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
index 45ac5cfec97..234f629b963 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
@@ -2,7 +2,7 @@
 <plugin
    id="org.eclipse.cdt.debug.mi.core"
    name="%pluginName"
-   version="1.2.0"
+   version="1.2.1"
    provider-name="%providerName"
    class="org.eclipse.cdt.debug.mi.core.MIPlugin">
 
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/.classpath b/debug/org.eclipse.cdt.debug.mi.ui/.classpath
index 8b37395920f..c5cfc924bbd 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/.classpath
+++ b/debug/org.eclipse.cdt.debug.mi.ui/.classpath
@@ -1,17 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
     <classpathentry kind="src" path="src/"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <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.launch"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
+    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+    <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/.project b/debug/org.eclipse.cdt.debug.mi.ui/.project
index 97bee48cc25..ee92c3d5275 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/.project
+++ b/debug/org.eclipse.cdt.debug.mi.ui/.project
@@ -8,12 +8,6 @@
 		<project>org.eclipse.cdt.debug.ui</project>
 		<project>org.eclipse.cdt.launch</project>
 		<project>org.eclipse.cdt.ui</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.debug.core</project>
-		<project>org.eclipse.debug.ui</project>
-		<project>org.eclipse.ui</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml b/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml
index 4dbd7e2a110..40e7c75633a 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml
@@ -2,7 +2,7 @@
 <plugin
    id="org.eclipse.cdt.debug.mi.ui"
    name="%pluginName"
-   version="1.2.0"
+   version="1.2.1"
    provider-name="%providerName"
    class="org.eclipse.cdt.debug.mi.internal.ui.MIUIPlugin">
 
diff --git a/debug/org.eclipse.cdt.debug.ui.tests/.classpath b/debug/org.eclipse.cdt.debug.ui.tests/.classpath
index f106e2d20bd..01b3a88fddf 100644
--- a/debug/org.eclipse.cdt.debug.ui.tests/.classpath
+++ b/debug/org.eclipse.cdt.debug.ui.tests/.classpath
@@ -2,21 +2,7 @@
 <classpath>
     <classpathentry kind="src" path="src/"/>
     <classpathentry kind="src" path="core/"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.swt"/>
-    <classpathentry kind="src" path="/org.junit"/>
-    <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 kind="src" path="/org.eclipse.cdt.core.linux"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.qnx"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.solaris"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.win32"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.update.core"/>
+    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
     <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/.project b/debug/org.eclipse.cdt.debug.ui.tests/.project
index 891a6c4d5f5..9ad345638b8 100644
--- a/debug/org.eclipse.cdt.debug.ui.tests/.project
+++ b/debug/org.eclipse.cdt.debug.ui.tests/.project
@@ -3,7 +3,6 @@
 	<name>org.eclipse.cdt.debug.ui.tests</name>
 	<comment></comment>
 	<projects>
-		<project>org.apache.xerces</project>
 		<project>org.eclipse.cdt.core</project>
 		<project>org.eclipse.cdt.core.linux</project>
 		<project>org.eclipse.cdt.core.qnx</project>
@@ -11,13 +10,6 @@
 		<project>org.eclipse.cdt.core.win32</project>
 		<project>org.eclipse.cdt.debug.core</project>
 		<project>org.eclipse.cdt.debug.mi.core</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.swt</project>
-		<project>org.eclipse.ui</project>
-		<project>org.eclipse.update.core</project>
-		<project>org.junit</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml b/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml
index f97864993cb..e6bf917abeb 100644
--- a/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml
@@ -2,7 +2,7 @@
 <plugin
    id="org.eclipse.cdt.debug.ui.tests"
    name="org.eclipse.cdt.debug.ui.tests"
-   version="1.2.0"
+   version="1.2.1"
    class="org.eclipse.cdt.debug.testplugin.CTestPlugin">
 
    <runtime>
diff --git a/debug/org.eclipse.cdt.debug.ui/.classpath b/debug/org.eclipse.cdt.debug.ui/.classpath
index 712ef3d8f53..c5cfc924bbd 100644
--- a/debug/org.eclipse.cdt.debug.ui/.classpath
+++ b/debug/org.eclipse.cdt.debug.ui/.classpath
@@ -1,16 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
     <classpathentry kind="src" path="src/"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
-    <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="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
+    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+    <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/.project b/debug/org.eclipse.cdt.debug.ui/.project
index f5ffeabe9d4..18966da5b92 100644
--- a/debug/org.eclipse.cdt.debug.ui/.project
+++ b/debug/org.eclipse.cdt.debug.ui/.project
@@ -3,16 +3,13 @@
 	<name>org.eclipse.cdt.debug.ui</name>
 	<comment></comment>
 	<projects>
-		<project>org.apache.xerces</project>
 		<project>org.eclipse.cdt.core</project>
+		<project>org.eclipse.cdt.core.linux</project>
+		<project>org.eclipse.cdt.core.qnx</project>
+		<project>org.eclipse.cdt.core.solaris</project>
+		<project>org.eclipse.cdt.core.win32</project>
 		<project>org.eclipse.cdt.debug.core</project>
 		<project>org.eclipse.cdt.ui</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.debug.core</project>
-		<project>org.eclipse.debug.ui</project>
-		<project>org.eclipse.ui</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index 58ce745ff35..47083faee2e 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -2,7 +2,7 @@
 <plugin
    id="org.eclipse.cdt.debug.ui"
    name="%pluginName"
-   version="1.2.0"
+   version="1.2.1"
    provider-name="%providerName"
    class="org.eclipse.cdt.debug.ui.CDebugUIPlugin">
 
@@ -1252,8 +1252,8 @@
             id="org.eclipse.cdt.debug.ui.DefaultSourceLocator">
       </sourceLocator>
       <sourceLocator
-            class="org.eclipse.cdt.debug.ui.sourcelookup.DefaultSourceLocator"
             name="%OldDefaultSourceLocator.name"
+            class="org.eclipse.cdt.debug.ui.sourcelookup.DefaultSourceLocator"
             id="org.eclipse.cdt.launch.DefaultSourceLocator">
       </sourceLocator>
    </extension>
diff --git a/doc/org.eclipse.cdt.doc.user/plugin.xml b/doc/org.eclipse.cdt.doc.user/plugin.xml
index e52cb71e732..d9e5611d8c4 100644
--- a/doc/org.eclipse.cdt.doc.user/plugin.xml
+++ b/doc/org.eclipse.cdt.doc.user/plugin.xml
@@ -2,14 +2,14 @@
 <plugin
    id="org.eclipse.cdt.doc.user"
    name="C/C++ Development User Guide"
-   version="1.2.0"
+   version="1.2.1"
    provider-name="eclipse.org">
 
    <runtime>
    </runtime>
 
-<!-- Configure the help contribution for this plugin -->
 <!-- This part should be in a documentation plugin -->
+<!-- Configure the help contribution for this plugin -->
    <extension
          point="org.eclipse.help.toc">
       <toc
diff --git a/launch/org.eclipse.cdt.launch/.classpath b/launch/org.eclipse.cdt.launch/.classpath
index 0bf3d237864..c5cfc924bbd 100644
--- a/launch/org.eclipse.cdt.launch/.classpath
+++ b/launch/org.eclipse.cdt.launch/.classpath
@@ -1,17 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
     <classpathentry kind="src" path="src/"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <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 kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
+    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
     <classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/launch/org.eclipse.cdt.launch/.project b/launch/org.eclipse.cdt.launch/.project
index c1a7b1fb1b6..d82b34d53fe 100644
--- a/launch/org.eclipse.cdt.launch/.project
+++ b/launch/org.eclipse.cdt.launch/.project
@@ -3,17 +3,14 @@
 	<name>org.eclipse.cdt.launch</name>
 	<comment></comment>
 	<projects>
-		<project>org.apache.xerces</project>
 		<project>org.eclipse.cdt.core</project>
+		<project>org.eclipse.cdt.core.linux</project>
+		<project>org.eclipse.cdt.core.qnx</project>
+		<project>org.eclipse.cdt.core.solaris</project>
+		<project>org.eclipse.cdt.core.win32</project>
 		<project>org.eclipse.cdt.debug.core</project>
 		<project>org.eclipse.cdt.debug.ui</project>
 		<project>org.eclipse.cdt.ui</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.debug.core</project>
-		<project>org.eclipse.debug.ui</project>
-		<project>org.eclipse.ui</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/launch/org.eclipse.cdt.launch/plugin.xml b/launch/org.eclipse.cdt.launch/plugin.xml
index 9d61e8bbe75..7e2f4ea69ac 100644
--- a/launch/org.eclipse.cdt.launch/plugin.xml
+++ b/launch/org.eclipse.cdt.launch/plugin.xml
@@ -2,7 +2,7 @@
 <plugin
    id="org.eclipse.cdt.launch"
    name="%pluginName"
-   version="1.2.0"
+   version="1.2.1"
    provider-name="%providerName"
    class="org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin">
 
diff --git a/releng/org.eclipse.cdt-feature/feature.xml b/releng/org.eclipse.cdt-feature/feature.xml
index c03144d66c0..26be958088a 100644
--- a/releng/org.eclipse.cdt-feature/feature.xml
+++ b/releng/org.eclipse.cdt-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt"
       label="%featureName"
-      version="1.2.0"
+      version="1.2.1"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -19,61 +19,69 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.platform" version="2.1.0" match="compatible"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.apache.xerces"/>
+      <import plugin="org.eclipse.search"/>
+      <import plugin="org.eclipse.compare"/>
+      <import plugin="org.eclipse.debug.core"/>
+      <import plugin="org.eclipse.team.core"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.debug.ui"/>
    </requires>
 
    <plugin
          id="org.eclipse.cdt.core"
          download-size="0"
          install-size="0"
-         version="1.2.0"/>
+         version="1.2.1"/>
 
    <plugin
          id="org.eclipse.cdt.ui"
          download-size="0"
          install-size="0"
-         version="1.2.0"/>
+         version="1.2.1"/>
 
    <plugin
          id="org.eclipse.cdt"
          download-size="0"
          install-size="0"
-         version="1.2.0"/>
+         version="1.2.1"/>
 
    <plugin
          id="org.eclipse.cdt.debug.core"
          download-size="0"
          install-size="0"
-         version="1.2.0"/>
+         version="1.2.1"/>
 
    <plugin
          id="org.eclipse.cdt.debug.mi.core"
          download-size="0"
          install-size="0"
-         version="1.2.0"/>
+         version="1.2.1"/>
 
    <plugin
          id="org.eclipse.cdt.debug.ui"
          download-size="0"
          install-size="0"
-         version="1.2.0"/>
+         version="1.2.1"/>
 
    <plugin
          id="org.eclipse.cdt.launch"
          download-size="0"
          install-size="0"
-         version="1.2.0"/>
+         version="1.2.1"/>
 
    <plugin
          id="org.eclipse.cdt.debug.mi.ui"
          download-size="0"
          install-size="0"
-         version="1.2.0"/>
+         version="1.2.1"/>
 
    <plugin
          id="org.eclipse.cdt.doc.user"
          download-size="0"
          install-size="0"
-         version="1.2.0"/>
+         version="1.2.1"/>
 
 </feature>
diff --git a/releng/org.eclipse.cdt.testing-feature/feature.xml b/releng/org.eclipse.cdt.testing-feature/feature.xml
index d3d4546d687..b3881cab06d 100644
--- a/releng/org.eclipse.cdt.testing-feature/feature.xml
+++ b/releng/org.eclipse.cdt.testing-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.cdt.testing"
       label="%featureName"
-      version="1.2.0"
+      version="1.2.1"
       provider-name="%providerName"
       os=""
       ws=""
@@ -22,8 +22,8 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.platform" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.cdt" version="1.2.0" match="equivalent"/>
+      <import plugin="org.eclipse.platform" version="2.1.2" match="compatible"/>
+      <import plugin="org.eclipse.cdt" version="1.2.1" match="equivalent"/>
       <import plugin="org.eclipse.test" version="2.1.0" match="equivalent"/>
    </requires>
 
@@ -31,24 +31,24 @@
          id="org.eclipse.cdt.debug.ui.tests"
          download-size="0"
          install-size="0"
-         version="1.2.0"/>
+         version="1.2.1"/>
 
    <plugin
          id="org.eclipse.cdt.ui.tests"
          download-size="0"
          install-size="0"
-         version="1.2.0"/>
+         version="1.2.1"/>
 
    <plugin
          id="org.eclipse.cdt.testing"
          download-size="0"
          install-size="0"
-         version="1.2.0"/>
+         version="1.2.1"/>
 
    <plugin
          id="org.eclipse.cdt.core.tests"
          download-size="0"
          install-size="0"
-         version="1.2.0"/>
+         version="1.2.1"/>
 
 </feature>
diff --git a/releng/org.eclipse.cdt.testing/plugin.xml b/releng/org.eclipse.cdt.testing/plugin.xml
index f4a973bd113..c439361fa6c 100644
--- a/releng/org.eclipse.cdt.testing/plugin.xml
+++ b/releng/org.eclipse.cdt.testing/plugin.xml
@@ -2,7 +2,7 @@
 <plugin
    id="org.eclipse.cdt.testing"
    name="%pluginName"
-   version="1.2.0"
+   version="1.2.1"
    provider-name="%providerName">
 
    <runtime>
diff --git a/releng/org.eclipse.cdt/plugin.xml b/releng/org.eclipse.cdt/plugin.xml
index 839d4fee9e5..3d9cb456811 100644
--- a/releng/org.eclipse.cdt/plugin.xml
+++ b/releng/org.eclipse.cdt/plugin.xml
@@ -2,7 +2,7 @@
 <plugin
    id="org.eclipse.cdt"
    name="%pluginName"
-   version="1.2.0"
+   version="1.2.1"
    provider-name="%providerName">
 
    <runtime>