diff --git a/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml b/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml
index 92d0c1ab03e..32e2aab00e7 100644
--- a/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml
+++ b/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml
@@ -30,6 +30,7 @@
       <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"/>
@@ -38,7 +39,8 @@
       <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.debug.ui" version="7.0.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
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 5c60424918d..0f5f8772058 100644
--- a/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/feature.xml
+++ b/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/feature.xml
@@ -29,6 +29,7 @@
       <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"/>
@@ -37,7 +38,11 @@
       <import plugin="org.eclipse.ui.ide"/>
       <import plugin="org.eclipse.core.expressions"/>
       <import plugin="org.eclipse.ui.console"/>
-      <import plugin="com.ibm.icu"/>
+      <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
@@ -54,11 +59,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.cdt.gdb"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>