Fix up feature dependencies.

jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml

@@ -22,6 +22,20 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/europa"/>
    </url>
 
+   <requires>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.debug.core"/>
+      <import plugin="org.eclipse.cdt.launch"/>
+      <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.core.variables"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.debug.ui"/>
+      <import plugin="org.eclipse.cdt.ui"/>
+      <import plugin="org.eclipse.cdt.managedbuilder.ui"/>
+   </requires>
+
    <plugin
          id="org.eclipse.cdt.debug.gdbjtag.core"
          download-size="0"

releng/org.eclipse.cdt.testing-feature/feature.xml

@@ -23,15 +23,14 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.cdt.ui"/>
-      <import plugin="org.eclipse.swt"/>
-      <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.junit"/>
       <import plugin="org.eclipse.cdt.core"/>
-      <import plugin="org.eclipse.cdt.make.core"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.cdt.ui"/>
+      <import plugin="org.eclipse.swt"/>
       <import plugin="org.eclipse.ui.editors"/>
       <import plugin="org.eclipse.ui.views"/>
       <import plugin="org.eclipse.ui.workbench.texteditor"/>
@@ -41,12 +40,17 @@
       <import plugin="org.eclipse.compare"/>
       <import plugin="org.eclipse.ui.console"/>
       <import plugin="org.eclipse.core.expressions"/>
+      <import plugin="org.eclipse.cdt.make.core"/>
       <import plugin="com.ibm.icu"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.core.filebuffers"/>
       <import plugin="org.eclipse.cdt.refactoring"/>
       <import plugin="org.eclipse.ltk.core.refactoring"/>
       <import plugin="org.eclipse.ltk.ui.refactoring"/>
+      <import plugin="org.eclipse.cdt.debug.core"/>
+      <import plugin="org.eclipse.cdt.debug.mi.core"/>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
+      <import plugin="org.eclipse.core.filesystem"/>
+      <import plugin="org.eclipse.cdt.managedbuilder.core"/>
+      <import plugin="org.eclipse.cdt.managedbuilder.ui"/>
    </requires>
 
    <plugin

upc/org.eclipse.cdt.core.parser.upc.feature/feature.xml

@@ -25,6 +25,13 @@
          id="org.eclipse.cdt.core.parser.c99.feature"
          version="0.0.0"/>
 
+   <requires>
+      <import plugin="org.eclipse.cdt.core"/>
+      <import plugin="net.sourceforge.lpg.lpgjavaruntime" version="1.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.cdt.core.parser.c99"/>
+   </requires>
+
    <plugin
          id="org.eclipse.cdt.core.parser.upc"
          download-size="0"

xlc/org.eclipse.cdt.xlc.feature/feature.xml

@@ -27,7 +27,6 @@
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.cdt.core"/>
       <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.cdt.managedbuilder.core" version="4.0.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin