diff --git a/features/org.jkiss.dbeaver.core/feature.xml b/features/org.jkiss.dbeaver.core/feature.xml
index ec3523599cda14e23730698b66210e085aa0d35c..5dfc63a4e6ecfe582c1a6891baba1b9600f6c64c 100644
--- a/features/org.jkiss.dbeaver.core/feature.xml
+++ b/features/org.jkiss.dbeaver.core/feature.xml
@@ -29,6 +29,8 @@
         <import plugin="org.eclipse.jface"/>
         <import plugin="org.eclipse.jface.text"/>
         <import plugin="org.eclipse.ui.views"/>
+        <import plugin="org.eclipse.draw2d"/>
+        <import plugin="org.eclipse.gef"/>
     </requires>
 
     <plugin
@@ -66,20 +68,6 @@
             version="0.0.0"
             unpack="false"/>
 
-    <plugin
-            id="com.jcraft.jsch"
-            download-size="0"
-            install-size="0"
-            version="0.0.0"
-            unpack="false"/>
-
-    <plugin
-            id="org.apache.commons.logging"
-            download-size="0"
-            install-size="0"
-            version="0.0.0"
-            unpack="false"/>
-
     <plugin
             id="org.apache.commons.jexl"
             download-size="0"
@@ -87,25 +75,4 @@
             version="0.0.0"
             unpack="false"/>
 
-    <plugin
-            id="org.objectweb.asm"
-            download-size="0"
-            install-size="0"
-            version="0.0.0"
-            unpack="false"/>
-
-    <plugin
-            id="org.eclipse.draw2d"
-            download-size="0"
-            install-size="0"
-            version="0.0.0"
-            unpack="false"/>
-
-    <plugin
-            id="org.eclipse.gef"
-            download-size="0"
-            install-size="0"
-            version="0.0.0"
-            unpack="false"/>
-
 </feature>
diff --git a/features/org.jkiss.dbeaver.rcp/feature.xml b/features/org.jkiss.dbeaver.rcp/feature.xml
index abda49d0527d195bbadc98f5d430ec0037250512..843487a625d54d1cc732d19d4ae30f7acf0a5994 100644
--- a/features/org.jkiss.dbeaver.rcp/feature.xml
+++ b/features/org.jkiss.dbeaver.rcp/feature.xml
@@ -738,4 +738,25 @@
             version="0.0.0"
             unpack="false"/>
 
+    <plugin
+            id="com.jcraft.jsch"
+            download-size="0"
+            install-size="0"
+            version="0.0.0"
+            unpack="false"/>
+
+    <plugin
+            id="org.apache.commons.logging"
+            download-size="0"
+            install-size="0"
+            version="0.0.0"
+            unpack="false"/>
+
+    <plugin
+            id="org.objectweb.asm"
+            download-size="0"
+            install-size="0"
+            version="0.0.0"
+            unpack="false"/>
+
 </feature>
diff --git a/features/org.jkiss.dbeaver.runtime/feature.xml b/features/org.jkiss.dbeaver.runtime/feature.xml
index d898708f564c5d1d0154b79282adbe96863d9331..33019257100310f9f7e814eff2f72426f87c51b0 100644
--- a/features/org.jkiss.dbeaver.runtime/feature.xml
+++ b/features/org.jkiss.dbeaver.runtime/feature.xml
@@ -42,25 +42,4 @@
             version="0.0.0"
             unpack="false"/>
 
-    <plugin
-            id="org.objectweb.asm"
-            download-size="0"
-            install-size="0"
-            version="0.0.0"
-            unpack="false"/>
-
-    <plugin
-            id="org.eclipse.draw2d"
-            download-size="0"
-            install-size="0"
-            version="0.0.0"
-            unpack="false"/>
-
-    <plugin
-            id="org.eclipse.gef"
-            download-size="0"
-            install-size="0"
-            version="0.0.0"
-            unpack="false"/>
-
 </feature>