diff --git a/build/org.eclipse.cdt.make.core/.project b/build/org.eclipse.cdt.make.core/.project
index 8a04c072ab5..f448e9a452b 100644
--- a/build/org.eclipse.cdt.make.core/.project
+++ b/build/org.eclipse.cdt.make.core/.project
@@ -3,7 +3,6 @@
 	<name>org.eclipse.cdt.make.core</name>
 	<comment></comment>
 	<projects>
-		<project>org.eclipse.cdt.core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/build/org.eclipse.cdt.make.ui/.project b/build/org.eclipse.cdt.make.ui/.project
index 1b1d4a96461..577e3294f59 100644
--- a/build/org.eclipse.cdt.make.ui/.project
+++ b/build/org.eclipse.cdt.make.ui/.project
@@ -3,9 +3,6 @@
 	<name>org.eclipse.cdt.make.ui</name>
 	<comment></comment>
 	<projects>
-		<project>org.eclipse.cdt.core</project>
-		<project>org.eclipse.cdt.make.core</project>
-		<project>org.eclipse.cdt.ui</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/build/org.eclipse.cdt.managedbuilder.core/.project b/build/org.eclipse.cdt.managedbuilder.core/.project
index 35661dd74df..d7e94687d3b 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/.project
+++ b/build/org.eclipse.cdt.managedbuilder.core/.project
@@ -3,7 +3,6 @@
 	<name>org.eclipse.cdt.managedbuilder.core</name>
 	<comment></comment>
 	<projects>
-		<project>org.eclipse.cdt.core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/.project b/build/org.eclipse.cdt.managedbuilder.ui/.project
index eabd99fc85d..08a4cc93e2d 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/.project
+++ b/build/org.eclipse.cdt.managedbuilder.ui/.project
@@ -3,13 +3,6 @@
 	<name>org.eclipse.cdt.managedbuilder.ui</name>
 	<comment></comment>
 	<projects>
-		<project>org.eclipse.cdt.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.ui</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/core/org.eclipse.cdt.core.tests/.project b/core/org.eclipse.cdt.core.tests/.project
index 873e177f7c8..466f1c10b80 100644
--- a/core/org.eclipse.cdt.core.tests/.project
+++ b/core/org.eclipse.cdt.core.tests/.project
@@ -3,10 +3,6 @@
 	<name>org.eclipse.cdt.core.tests</name>
 	<comment></comment>
 	<projects>
-		<project>org.eclipse.cdt.core</project>
-		<project>org.eclipse.cdt.make.core</project>
-		<project>org.eclipse.cdt.managedbuilder.core</project>
-		<project>org.eclipse.cdt.ui</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/core/org.eclipse.cdt.core.win32/.project b/core/org.eclipse.cdt.core.win32/.project
index 0c2dc05e8ad..09821b72158 100644
--- a/core/org.eclipse.cdt.core.win32/.project
+++ b/core/org.eclipse.cdt.core.win32/.project
@@ -3,7 +3,6 @@
 	<name>org.eclipse.cdt.core.win32</name>
 	<comment></comment>
 	<projects>
-		<project>org.eclipse.cdt.core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/core/org.eclipse.cdt.ui.tests/.project b/core/org.eclipse.cdt.ui.tests/.project
index 541f11085f0..4ba31c199ae 100644
--- a/core/org.eclipse.cdt.ui.tests/.project
+++ b/core/org.eclipse.cdt.ui.tests/.project
@@ -3,9 +3,6 @@
 	<name>org.eclipse.cdt.ui.tests</name>
 	<comment></comment>
 	<projects>
-		<project>org.eclipse.cdt.core</project>
-		<project>org.eclipse.cdt.core.tests</project>
-		<project>org.eclipse.cdt.ui</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/core/org.eclipse.cdt.ui/.project b/core/org.eclipse.cdt.ui/.project
index 04403a7b87c..7b5064ca1f4 100644
--- a/core/org.eclipse.cdt.ui/.project
+++ b/core/org.eclipse.cdt.ui/.project
@@ -3,7 +3,6 @@
 	<name>org.eclipse.cdt.ui</name>
 	<comment></comment>
 	<projects>
-		<project>org.eclipse.cdt.core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginResources.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginResources.properties
index 3b7457891d2..11d3c2dba3a 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginResources.properties
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginResources.properties
@@ -45,7 +45,7 @@ ErrorParserBlock.desc=Set the error parsers for this project
 BinaryParserBlock.label=Binary Parser
 BinaryParserBlock.desc=Set required binary parser for this project
 
-BaseIndexerBlock.usePDOM=Use PDOM
+BaseIndexerBlock.usePDOM=Use PDOM (Work in progress)
 BaseIndexerBlock.label=C/C++ Indexer
 BaseIndexerBlock.desc=C/C++ Indexer setting for this project.
 BaseIndexerBlock.comboLabel=Available indexers
diff --git a/debug/org.eclipse.cdt.debug.core/.project b/debug/org.eclipse.cdt.debug.core/.project
index a0751078e2e..d42c04bc6a1 100644
--- a/debug/org.eclipse.cdt.debug.core/.project
+++ b/debug/org.eclipse.cdt.debug.core/.project
@@ -3,7 +3,6 @@
 	<name>org.eclipse.cdt.debug.core</name>
 	<comment></comment>
 	<projects>
-		<project>org.eclipse.cdt.core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/debug/org.eclipse.cdt.debug.mi.core/.project b/debug/org.eclipse.cdt.debug.mi.core/.project
index 016309439c3..9039e6a47ea 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/.project
+++ b/debug/org.eclipse.cdt.debug.mi.core/.project
@@ -3,8 +3,6 @@
 	<name>org.eclipse.cdt.debug.mi.core</name>
 	<comment></comment>
 	<projects>
-		<project>org.eclipse.cdt.core</project>
-		<project>org.eclipse.cdt.debug.core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/.project b/debug/org.eclipse.cdt.debug.mi.ui/.project
index ee92c3d5275..d50943d5462 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/.project
+++ b/debug/org.eclipse.cdt.debug.mi.ui/.project
@@ -3,11 +3,6 @@
 	<name>org.eclipse.cdt.debug.mi.ui</name>
 	<comment></comment>
 	<projects>
-		<project>org.eclipse.cdt.debug.core</project>
-		<project>org.eclipse.cdt.debug.mi.core</project>
-		<project>org.eclipse.cdt.debug.ui</project>
-		<project>org.eclipse.cdt.launch</project>
-		<project>org.eclipse.cdt.ui</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/debug/org.eclipse.cdt.debug.ui.tests/.project b/debug/org.eclipse.cdt.debug.ui.tests/.project
index bec51f088aa..05c3409f881 100644
--- a/debug/org.eclipse.cdt.debug.ui.tests/.project
+++ b/debug/org.eclipse.cdt.debug.ui.tests/.project
@@ -3,9 +3,6 @@
 	<name>org.eclipse.cdt.debug.ui.tests</name>
 	<comment></comment>
 	<projects>
-		<project>org.eclipse.cdt.core</project>
-		<project>org.eclipse.cdt.debug.core</project>
-		<project>org.eclipse.cdt.debug.mi.core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/debug/org.eclipse.cdt.debug.ui/.project b/debug/org.eclipse.cdt.debug.ui/.project
index 9786a16312f..2f8de369392 100644
--- a/debug/org.eclipse.cdt.debug.ui/.project
+++ b/debug/org.eclipse.cdt.debug.ui/.project
@@ -3,9 +3,6 @@
 	<name>org.eclipse.cdt.debug.ui</name>
 	<comment></comment>
 	<projects>
-		<project>org.eclipse.cdt.core</project>
-		<project>org.eclipse.cdt.debug.core</project>
-		<project>org.eclipse.cdt.ui</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/launch/org.eclipse.cdt.launch/.project b/launch/org.eclipse.cdt.launch/.project
index 94d34bf6d81..b39fb88039a 100644
--- a/launch/org.eclipse.cdt.launch/.project
+++ b/launch/org.eclipse.cdt.launch/.project
@@ -3,15 +3,6 @@
 	<name>org.eclipse.cdt.launch</name>
 	<comment></comment>
 	<projects>
-		<project>org.eclipse.cdt.core</project>
-		<project>org.eclipse.cdt.core.aix</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>
 	</projects>
 	<buildSpec>
 		<buildCommand>