From ce50ee07e24d9b3a8384309efa695481fcacb8ff Mon Sep 17 00:00:00 2001
From: Marc Khouzam <marc.khouzam@ericsson.com>
Date: Mon, 20 Sep 2010 09:05:59 +0000
Subject: [PATCH] Bug 321692: Remove dependencies to plugins from features

---
 .../feature.xml                               |  7 ---
 .../org.eclipse.cdt.codan-feature/feature.xml | 15 -----
 .../feature.xml                               | 20 -------
 debug/org.eclipse.cdt.gdb-feature/feature.xml |  6 --
 .../feature.xml                               | 22 -------
 .../feature.xml                               | 24 --------
 .../feature.xml                               | 17 ------
 .../feature.xml                               | 17 ------
 .../feature.xml                               |  6 --
 .../feature.xml                               |  4 --
 .../feature.xml                               | 10 ----
 .../feature.xml                               | 59 -------------------
 .../org.eclipse.cdt.sdk-feature/feature.xml   |  4 --
 .../feature.xml                               | 41 -------------
 upc/org.eclipse.cdt.bupc-feature/feature.xml  | 12 ----
 .../feature.xml                               |  7 ---
 .../feature.xml                               |  4 --
 util/org.eclipse.cdt.util-feature/feature.xml |  7 ---
 xlc/org.eclipse.cdt.xlc.feature/feature.xml   | 26 --------
 .../feature.xml                               |  4 --
 20 files changed, 312 deletions(-)

diff --git a/build/org.eclipse.cdt.gnu.build-feature/feature.xml b/build/org.eclipse.cdt.gnu.build-feature/feature.xml
index f343ab4dddc..0edd1627f5a 100644
--- a/build/org.eclipse.cdt.gnu.build-feature/feature.xml
+++ b/build/org.eclipse.cdt.gnu.build-feature/feature.xml
@@ -21,13 +21,6 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/helios"/>
    </url>
 
-   <requires>
-      <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.cdt.core" version="5.0.0" match="compatible"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.cdt.managedbuilder.core" version="8.0.0" match="compatible"/>
-   </requires>
-
    <plugin
          id="org.eclipse.cdt.managedbuilder.gnu.ui"
          download-size="0"
diff --git a/codan/org.eclipse.cdt.codan-feature/feature.xml b/codan/org.eclipse.cdt.codan-feature/feature.xml
index 913bb7310f2..da08f720e7a 100644
--- a/codan/org.eclipse.cdt.codan-feature/feature.xml
+++ b/codan/org.eclipse.cdt.codan-feature/feature.xml
@@ -21,21 +21,6 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/helios"/>
    </url>
 
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.codan.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.core" version="5.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.codan.core.cxx" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.ide" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jface.text" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.editors" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.codan.checkers" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.ui" version="5.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.5.0" match="greaterOrEqual"/>
-   </requires>
-
    <plugin
          id="org.eclipse.cdt.codan.core"
          download-size="0"
diff --git a/cross/org.eclipse.cdt.launch.remote-feature/feature.xml b/cross/org.eclipse.cdt.launch.remote-feature/feature.xml
index 560f77af32e..014363376a5 100644
--- a/cross/org.eclipse.cdt.launch.remote-feature/feature.xml
+++ b/cross/org.eclipse.cdt.launch.remote-feature/feature.xml
@@ -21,26 +21,6 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/helios"/>
    </url>
 
-   <requires>
-      <import plugin="org.eclipse.rse.ui" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.subsystems.shells.core" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.subsystems.files.core" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.core" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.services" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.cdt.launch"/>
-      <import plugin="org.eclipse.cdt.debug.mi.core"/>
-      <import plugin="org.eclipse.cdt.debug.core"/>
-      <import plugin="org.eclipse.cdt.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.cdt.debug.mi.ui"/>
-      <import plugin="org.eclipse.cdt.debug.ui"/>
-      <import plugin="org.eclipse.rse.files.ui" version="3.0.0" match="compatible"/>
-   </requires>
-
    <plugin
          id="org.eclipse.cdt.launch.remote"
          download-size="0"
diff --git a/debug/org.eclipse.cdt.gdb-feature/feature.xml b/debug/org.eclipse.cdt.gdb-feature/feature.xml
index a41ce417256..3b9d2b5ce01 100644
--- a/debug/org.eclipse.cdt.gdb-feature/feature.xml
+++ b/debug/org.eclipse.cdt.gdb-feature/feature.xml
@@ -22,12 +22,6 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/helios"/>
    </url>
 
-   <requires>
-      <import plugin="org.eclipse.core.runtime" version="3.6.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.debug.ui" version="7.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui" version="3.6.0" match="greaterOrEqual"/>
-   </requires>
-
    <plugin
          id="org.eclipse.cdt.gdb"
          download-size="0"
diff --git a/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml b/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml
index 680c8b75b81..c4a4c0007d6 100644
--- a/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml
+++ b/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml
@@ -21,28 +21,6 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/helios"/>
    </url>
 
-   <requires>
-      <import plugin="org.eclipse.cdt.debug.core" version="7.0.0" match="compatible"/>
-      <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.cdt.core" version="5.0.0" match="compatible"/>
-      <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.variables" version="3.2.200" match="greaterOrEqual"/>
-      <import plugin="com.ibm.icu"/>
-      <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.cdt.debug.ui" version="7.0.0" match="compatible"/>
-      <import plugin="org.eclipse.cdt.ui" version="5.0.0" match="compatible"/>
-      <import plugin="org.eclipse.debug.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.console" version="3.1.100" match="compatible"/>
-      <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.expressions" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.variables" version="3.1.100" match="compatible"/>
-      <import plugin="org.eclipse.ltk.core.refactoring" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.cdt.gdb" version="7.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.debug.mi.core" version="7.0.0" match="compatible"/>
-   </requires>
-
    <plugin
          id="org.eclipse.cdt.debug.mi.core"
          download-size="0"
diff --git a/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/feature.xml b/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/feature.xml
index 1859ba1bf96..ace85c3e72b 100644
--- a/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/feature.xml
+++ b/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/feature.xml
@@ -21,30 +21,6 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/helios"/>
    </url>
 
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.cdt.dsf"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.cdt.core"/>
-      <import plugin="org.eclipse.cdt.debug.core"/>
-      <import plugin="org.eclipse.core.variables"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="com.ibm.icu"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.cdt.dsf.ui"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.cdt.debug.ui"/>
-      <import plugin="org.eclipse.cdt.ui"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.core.expressions"/>
-      <import plugin="org.eclipse.ui.console"/>
-      <import plugin="org.eclipse.cdt.launch" version="6.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.gdb" version="7.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jface.text" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.editors" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.filesystem" version="1.2.0" match="greaterOrEqual"/>
-   </requires>
-
    <plugin
          id="org.eclipse.cdt.dsf.gdb"
          download-size="0"
diff --git a/dsf/org.eclipse.cdt.examples.dsf-feature/feature.xml b/dsf/org.eclipse.cdt.examples.dsf-feature/feature.xml
index 8af946fb8b4..c23c5951386 100644
--- a/dsf/org.eclipse.cdt.examples.dsf-feature/feature.xml
+++ b/dsf/org.eclipse.cdt.examples.dsf-feature/feature.xml
@@ -22,23 +22,6 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/helios"/>
    </url>
 
-   <requires>
-      <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.debug.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.cdt.dsf"/>
-      <import plugin="org.eclipse.cdt.dsf.ui"/>
-      <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.variables" version="3.1.100" match="compatible"/>
-      <import plugin="org.eclipse.cdt.core" version="5.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
-      <import plugin="com.ibm.icu"/>
-   </requires>
-
    <plugin
          id="org.eclipse.cdt.examples.dsf"
          download-size="0"
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml b/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml
index 4f809823f98..0c6b6a2fff5 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml
@@ -22,23 +22,6 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/helios"/>
    </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"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import feature="org.eclipse.cdt.gnu.debug" version="6.0.0"/>
-      <import plugin="com.ibm.icu"/>
-   </requires>
-
    <plugin
          id="org.eclipse.cdt.debug.gdbjtag.core"
          download-size="0"
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.feature/feature.xml b/lrparser/org.eclipse.cdt.core.lrparser.feature/feature.xml
index 20682635456..72b8fd4ba14 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser.feature/feature.xml
+++ b/lrparser/org.eclipse.cdt.core.lrparser.feature/feature.xml
@@ -22,12 +22,6 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/helios"/>
    </url>
 
-   <requires>
-      <import plugin="org.eclipse.cdt.core"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="net.sourceforge.lpg.lpgjavaruntime" version="1.1.0" match="greaterOrEqual"/>
-   </requires>
-
    <plugin
          id="net.sourceforge.lpg.lpgjavaruntime"
          download-size="0"
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/feature.xml b/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/feature.xml
index 0def70dc76c..15ee28fb1da 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/feature.xml
+++ b/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/feature.xml
@@ -26,8 +26,4 @@
          id="org.eclipse.cdt.core.lrparser.source"
          version="0.0.0"/>
 
-   <requires>
-      <import feature="org.eclipse.cdt.core.lrparser.feature"/>
-   </requires>
-
 </feature>
diff --git a/memory/org.eclipse.cdt.debug.ui.memory-feature/feature.xml b/memory/org.eclipse.cdt.debug.ui.memory-feature/feature.xml
index f6a66bf3bcf..5f186bb99bf 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory-feature/feature.xml
+++ b/memory/org.eclipse.cdt.debug.ui.memory-feature/feature.xml
@@ -21,16 +21,6 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/helios"/>
    </url>
 
-   <requires>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.swt"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.search" version="3.4.0" match="greaterOrEqual"/>
-   </requires>
-
    <plugin
          id="org.eclipse.cdt.debug.ui.memory.search"
          download-size="0"
diff --git a/releng/org.eclipse.cdt.platform-feature/feature.xml b/releng/org.eclipse.cdt.platform-feature/feature.xml
index 31bd60ed0fd..d4b5783f5ee 100644
--- a/releng/org.eclipse.cdt.platform-feature/feature.xml
+++ b/releng/org.eclipse.cdt.platform-feature/feature.xml
@@ -21,65 +21,6 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/helios"/>
    </url>
 
-   <requires>
-      <import plugin="org.eclipse.ui.intro" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.cheatsheets" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.contenttype" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.text" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.variables" version="3.1.100" match="compatible"/>
-      <import plugin="org.eclipse.core.filebuffers" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.filesystem" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.ltk.core.refactoring" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="com.ibm.icu"/>
-      <import plugin="org.eclipse.cdt.core" version="5.0.0" match="compatible"/>
-      <import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.filesystem" version="1.2.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.editors" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.debug.ui" version="3.3.100" match="compatible"/>
-      <import plugin="org.eclipse.debug.core" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.cdt.debug.core" version="7.0.0" match="compatible"/>
-      <import plugin="org.eclipse.cdt.ui" version="5.0.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.console" version="3.1.100" match="compatible"/>
-      <import plugin="org.eclipse.ui.views" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.expressions"/>
-      <import plugin="org.eclipse.jface.text" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.cdt.make.core" version="7.0.0" match="compatible"/>
-      <import plugin="org.eclipse.debug.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.compare" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.cdt.managedbuilder.core" version="8.0.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.ide" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.jface.text" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.editors" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.ui" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.forms" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.search" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.help" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.navigator" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ltk.ui.refactoring" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.navigator.resources" version="3.3.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.intro.universal"/>
-      <import plugin="org.eclipse.ui" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.runtime" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.debug.ui" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.dsf" version="2.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.core" version="5.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.debug.core" version="6.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.debug.ui" version="6.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jface.text" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.editors" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.ide" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.ui" version="5.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.expressions" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.core" version="5.2.0" match="compatible"/>
-   </requires>
-
    <plugin
          id="org.eclipse.cdt"
          download-size="0"
diff --git a/releng/org.eclipse.cdt.sdk-feature/feature.xml b/releng/org.eclipse.cdt.sdk-feature/feature.xml
index fffda97e5e4..d4df554a7dd 100644
--- a/releng/org.eclipse.cdt.sdk-feature/feature.xml
+++ b/releng/org.eclipse.cdt.sdk-feature/feature.xml
@@ -45,10 +45,6 @@
          id="org.eclipse.cdt"
          version="0.0.0"/>
 
-   <requires>
-      <import plugin="org.eclipse.help" version="3.2.0" match="compatible"/>
-   </requires>
-
    <plugin
          id="org.eclipse.cdt.sdk"
          download-size="0"
diff --git a/releng/org.eclipse.cdt.testing-feature/feature.xml b/releng/org.eclipse.cdt.testing-feature/feature.xml
index 9c2e9d918ec..aa9b6eca34b 100644
--- a/releng/org.eclipse.cdt.testing-feature/feature.xml
+++ b/releng/org.eclipse.cdt.testing-feature/feature.xml
@@ -22,47 +22,6 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/helios"/>
    </url>
 
-   <requires>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <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"/>
-      <import plugin="org.eclipse.cdt.gdb" version="7.0.0" match="greaterOrEqual"/>
-      <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"/>
-      <import plugin="org.eclipse.help"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.search"/>
-      <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.ltk.core.refactoring" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.filesystem" version="1.2.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.managedbuilder.core"/>
-      <import plugin="org.eclipse.cdt.core.tests" version="5.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.managedbuilder.ui"/>
-      <import plugin="org.eclipse.cdt.core.lrparser" version="4.0.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.core.parser.upc"/>
-      <import plugin="org.eclipse.cdt.core.lrparser.tests" version="4.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.resources" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.codan.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.codan.core.cxx" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.codan.checkers" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.apache.ant" version="1.6.5" match="compatible"/>
-      <import plugin="org.eclipse.ui.ide.application"/>
-      <import plugin="org.eclipse.equinox.app"/>
-   </requires>
-
    <plugin
          id="org.eclipse.cdt.debug.ui.tests"
          download-size="0"
diff --git a/upc/org.eclipse.cdt.bupc-feature/feature.xml b/upc/org.eclipse.cdt.bupc-feature/feature.xml
index d5702c4772e..dd7a5c673ea 100644
--- a/upc/org.eclipse.cdt.bupc-feature/feature.xml
+++ b/upc/org.eclipse.cdt.bupc-feature/feature.xml
@@ -22,18 +22,6 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/helios"/>
    </url>
 
-   <requires>
-      <import plugin="org.eclipse.cdt.ui"/>
-      <import plugin="org.eclipse.cdt.core"/>
-      <import plugin="org.eclipse.cdt.managedbuilder.core"/>
-      <import plugin="org.eclipse.cdt.core.parser.upc"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui.ide"/>
-   </requires>
-
    <plugin
          id="org.eclipse.cdt.managedbuilder.bupc.ui"
          download-size="0"
diff --git a/upc/org.eclipse.cdt.core.parser.upc.feature/feature.xml b/upc/org.eclipse.cdt.core.parser.upc.feature/feature.xml
index 1323f47cb1a..9a3f4e1e387 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.feature/feature.xml
+++ b/upc/org.eclipse.cdt.core.parser.upc.feature/feature.xml
@@ -26,13 +26,6 @@
          id="org.eclipse.cdt.core.lrparser.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.lrparser"/>
-   </requires>
-
    <plugin
          id="org.eclipse.cdt.core.parser.upc"
          download-size="0"
diff --git a/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/feature.xml b/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/feature.xml
index f316338f060..9ec88bd4382 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/feature.xml
+++ b/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/feature.xml
@@ -26,8 +26,4 @@
          id="org.eclipse.cdt.core.parser.upc.source"
          version="0.0.0"/>
 
-   <requires>
-      <import feature="org.eclipse.cdt.core.parser.upc.feature"/>
-   </requires>
-
 </feature>
diff --git a/util/org.eclipse.cdt.util-feature/feature.xml b/util/org.eclipse.cdt.util-feature/feature.xml
index 9e25eda9be4..c9d59f63168 100644
--- a/util/org.eclipse.cdt.util-feature/feature.xml
+++ b/util/org.eclipse.cdt.util-feature/feature.xml
@@ -23,13 +23,6 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/helios"/>
    </url>
 
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.cdt.core"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.junit"/>
-   </requires>
-
    <plugin
          id="org.eclipse.cdt.util"
          download-size="0"
diff --git a/xlc/org.eclipse.cdt.xlc.feature/feature.xml b/xlc/org.eclipse.cdt.xlc.feature/feature.xml
index 979040bf882..8e786dc9075 100644
--- a/xlc/org.eclipse.cdt.xlc.feature/feature.xml
+++ b/xlc/org.eclipse.cdt.xlc.feature/feature.xml
@@ -23,32 +23,6 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/helios"/>
    </url>
 
-   <requires>
-      <import plugin="org.eclipse.ui" version="3.5.0" match="greaterOrEqual"/>
-      <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"/>
-      <import plugin="org.eclipse.cdt.managedbuilder.ui"/>
-      <import plugin="org.eclipse.cdt.ui"/>
-      <import plugin="org.eclipse.ui.ide" version="3.4.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.variables"/>
-      <import plugin="org.eclipse.cdt.make.core"/>
-      <import plugin="org.eclipse.cdt.core" version="5.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.core.lrparser" version="5.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.runtime" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.resources" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.ui" version="5.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.managedbuilder.core" version="5.0.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.core" version="5.0.2" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.resources" version="3.4.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.managedbuilder.ui" version="5.0.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.ui" version="5.0.2" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.variables" version="3.2.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.core.parser.upc" version="5.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.managedbuilder.xlc.ui" version="6.0.0" match="greaterOrEqual"/>
-   </requires>
-
    <plugin
          id="org.eclipse.cdt.errorparsers.xlc"
          download-size="0"
diff --git a/xlc/org.eclipse.cdt.xlc.sdk-feature/feature.xml b/xlc/org.eclipse.cdt.xlc.sdk-feature/feature.xml
index 2c96c442c6f..73d6a434f5a 100644
--- a/xlc/org.eclipse.cdt.xlc.sdk-feature/feature.xml
+++ b/xlc/org.eclipse.cdt.xlc.sdk-feature/feature.xml
@@ -26,8 +26,4 @@
          id="org.eclipse.cdt.xlc.source"
          version="0.0.0"/>
 
-   <requires>
-      <import feature="org.eclipse.cdt.xlc.feature"/>
-   </requires>
-
 </feature>