diff --git a/plugins/org.eclipse.uml2.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.common/META-INF/MANIFEST.MF
index 8081342..b819b23 100644
--- a/plugins/org.eclipse.uml2.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.common/META-INF/MANIFEST.MF
@@ -9,8 +9,8 @@
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.uml2.common,
  org.eclipse.uml2.common.util
-Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.14.0,3.0.0)";visibility:=reexport,
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)"
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional;x-installation:=greedy,
+ org.eclipse.emf.ecore;bundle-version="[2.14.0,3.0.0)";visibility:=reexport
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.uml2.common.CommonPlugin$Implementation
diff --git a/plugins/org.eclipse.uml2.types/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.types/META-INF/MANIFEST.MF
index 1006e84..8049e58 100644
--- a/plugins/org.eclipse.uml2.types/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.types/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.uml2.types,
  org.eclipse.uml2.types.internal.impl;x-internal:=true
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional;x-installation:=greedy,
  org.eclipse.emf.ecore;bundle-version="[2.14.0,3.0.0)";visibility:=reexport,
  org.eclipse.uml2.common;bundle-version="[2.4.0,3.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.uml.profile.standard/META-INF/MANIFEST.MF
index bd7f21f..a245ffb 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/META-INF/MANIFEST.MF
@@ -12,6 +12,6 @@
  org.eclipse.uml2.uml.profile.standard.internal.impl,
  org.eclipse.uml2.uml.profile.standard.internal.operations,
  org.eclipse.uml2.uml.profile.standard.util
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional;x-installation:=greedy,
  org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.uml2.uml.resources/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.uml.resources/META-INF/MANIFEST.MF
index 3b12225..9aae0f0 100644
--- a/plugins/org.eclipse.uml2.uml.resources/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.uml.resources/META-INF/MANIFEST.MF
@@ -9,9 +9,9 @@
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.uml2.uml.resources,
  org.eclipse.uml2.uml.resources.util
-Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)";visibility:=reexport,
- org.eclipse.uml2.uml.profile.standard;bundle-version="[1.4.0,2.0.0)";visibility:=reexport,
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)"
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional;x-installation:=greedy,
+ org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)";visibility:=reexport,
+ org.eclipse.uml2.uml.profile.standard;bundle-version="[1.4.0,2.0.0)";visibility:=reexport 
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.uml2.uml.resources.ResourcesPlugin$Implementation
diff --git a/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF
index 4dd0db5..ba1a4dd 100644
--- a/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@
  org.eclipse.uml2.uml.internal.resource;x-internal:=true,
  org.eclipse.uml2.uml.resource,
  org.eclipse.uml2.uml.util
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional;x-installation:=greedy,
  org.eclipse.emf.ecore;bundle-version="[2.14.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="[2.14.0,3.0.0)";visibility:=reexport,
  org.eclipse.uml2.common;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,