diff --git a/com.google.eclipse.protobuf.feature/feature.xml b/com.google.eclipse.protobuf.feature/feature.xml
index 4fac131..f07a5de 100644
--- a/com.google.eclipse.protobuf.feature/feature.xml
+++ b/com.google.eclipse.protobuf.feature/feature.xml
@@ -25,22 +25,15 @@
       <import plugin="org.antlr.runtime"/>
       <import plugin="org.apache.commons.logging"/>
       <import plugin="org.apache.log4j"/>
-      <import plugin="org.eclipse.emf.ecore"/>
-      <import plugin="org.eclipse.emf.common"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.util"/>
-      <import plugin="com.ibm.icu"/>
       <import plugin="org.eclipse.compare.core" version="3.5.200" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.filesystem" version="1.3.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.ui.console" version="3.5.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.editors" version="3.7.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.ide" version="3.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.builder"/>
-      <import plugin="org.eclipse.xtext.ui" version="2.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.ui.shared"/>
-      <import plugin="org.eclipse.xtext" version="2.4.2" match="greaterOrEqual"/>
+      <import feature="org.eclipse.xtext.runtime" version="2.4.2" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/com.google.eclipse.protobuf.ui/META-INF/MANIFEST.MF b/com.google.eclipse.protobuf.ui/META-INF/MANIFEST.MF
index 67642e8..3969ddf 100644
--- a/com.google.eclipse.protobuf.ui/META-INF/MANIFEST.MF
+++ b/com.google.eclipse.protobuf.ui/META-INF/MANIFEST.MF
@@ -3,10 +3,10 @@
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Version: 1.5.1.qualifier
+Bundle-Activator: com.google.eclipse.protobuf.ui.internal.ProtobufActivator
 Bundle-SymbolicName: com.google.eclipse.protobuf.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: com.google.eclipse.protobuf;visibility:=reexport,
- com.ibm.icu,
+Require-Bundle: com.google.eclipse.protobuf,
  org.antlr.runtime,
  org.apache.commons.logging,
  org.apache.log4j,
@@ -19,7 +19,7 @@
  org.eclipse.ui.editors,
  org.eclipse.ui.ide,
  org.eclipse.xtext.builder,
- org.eclipse.xtext.ui;bundle-version="[2.4.0,2.4.3)",
+ org.eclipse.xtext.ui,
  org.eclipse.xtext.ui.shared
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: com.google.eclipse.protobuf.ui.contentassist,
@@ -30,4 +30,3 @@
  com.google.eclipse.protobuf.ui.preferences.compiler,
  com.google.eclipse.protobuf.ui.util,
  com.google.eclipse.protobuf.ui.quickfix
-Bundle-Activator: com.google.eclipse.protobuf.ui.internal.ProtobufActivator
diff --git a/com.google.eclipse.protobuf/META-INF/MANIFEST.MF b/com.google.eclipse.protobuf/META-INF/MANIFEST.MF
index 7a531b1..b9c7a36 100644
--- a/com.google.eclipse.protobuf/META-INF/MANIFEST.MF
+++ b/com.google.eclipse.protobuf/META-INF/MANIFEST.MF
@@ -6,20 +6,14 @@
 Bundle-Version: 1.5.1.qualifier
 Bundle-SymbolicName: com.google.eclipse.protobuf; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: com.ibm.icu;resolution:=optional,
- org.antlr.runtime,
+Require-Bundle: org.antlr.runtime,
  org.apache.commons.logging,
  org.apache.log4j,
- org.eclipse.emf.codegen.ecore;resolution:=optional,
- org.eclipse.emf.ecore,
- org.eclipse.emf.common,
- org.eclipse.emf.mwe.utils;resolution:=optional,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
  org.eclipse.core.resources,
  org.eclipse.core.runtime,
- org.eclipse.xtext.util,
- org.eclipse.xtext;bundle-version="2.4.0",
- org.eclipse.xtext.generator;resolution:=optional
+ org.eclipse.xtext,
+ org.eclipse.xtext.generator;resolution:=optional,
+ org.eclipse.xtext.util
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: com.google.eclipse.protobuf,
  com.google.eclipse.protobuf.conversion,
@@ -39,3 +33,4 @@
  com.google.eclipse.protobuf.services,
  com.google.eclipse.protobuf.util,
  com.google.eclipse.protobuf.validation
+Import-Package: org.apache.log4j