--- a/builder/com.nokia.carbide.cdt.builder.test/META-INF/MANIFEST.MF	Mon Feb 01 19:58:21 2010 -0600
+++ b/builder/com.nokia.carbide.cdt.builder.test/META-INF/MANIFEST.MF	Mon Feb 01 20:09:12 2010 -0600
@@ -13,9 +13,7 @@
  org.eclipse.core.runtime,
  org.junit,
  com.nokia.carbide.cpp.sdk.core,
- org.eclipse.emf.common,
  com.nokia.carbide.cpp.project.core,
- org.eclipse.core.resources,
  com.nokia.carbide.automation.utils,
  com.nokia.carbide.cdt.builder,
  com.nokia.carbide.cpp.epoc.engine,

--- a/builder/com.nokia.carbide.cdt.builder/META-INF/MANIFEST.MF	Mon Feb 01 19:58:21 2010 -0600
+++ b/builder/com.nokia.carbide.cdt.builder/META-INF/MANIFEST.MF	Mon Feb 01 20:09:12 2010 -0600
@@ -8,7 +8,6 @@
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.core.resources,
  org.eclipse.cdt.core,
  org.eclipse.cdt.ui,
  com.nokia.cpp.utils.core,
@@ -16,7 +15,6 @@
  com.nokia.sdt.utils,
  com.nokia.carbide.cpp.sdk.core,
  com.nokia.carbide.cpp.epoc.engine,
- org.eclipse.emf.edit,
  org.eclipse.emf.ecore.xmi,
  org.eclipse.ui.ide,
  com.nokia.carbide.cpp.sdk.ui,

--- a/connectivity/com.nokia.carbide.remoteConnections/META-INF/MANIFEST.MF	Mon Feb 01 19:58:21 2010 -0600
+++ b/connectivity/com.nokia.carbide.remoteConnections/META-INF/MANIFEST.MF	Mon Feb 01 20:09:12 2010 -0600
@@ -11,7 +11,6 @@
  com.nokia.cpp.utils.core,
  org.eclipse.emf.ecore.xmi;bundle-version="2.4.0",
  org.eclipse.core.net;bundle-version="1.1.0",
- org.eclipse.help;bundle-version="3.4.0",
  com.nokia.cpp.utils.ui
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy

--- a/core/com.nokia.carbide.cpp.api.test.support/META-INF/MANIFEST.MF	Mon Feb 01 19:58:21 2010 -0600
+++ b/core/com.nokia.carbide.cpp.api.test.support/META-INF/MANIFEST.MF	Mon Feb 01 20:09:12 2010 -0600
@@ -4,20 +4,7 @@
 Bundle-SymbolicName: com.nokia.carbide.cpp.api.test.support;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Nokia, Inc.
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.junit,
- org.eclipse.core.resources,
- com.nokia.carbide.cpp.project.core,
- com.nokia.carbide.cdt.builder,
- com.nokia.carbide.cpp.epoc.engine,
- com.nokia.carbide.cpp.sdk.core,
- org.eclipse.cdt.core,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.emf.edit,
- org.eclipse.emf.ecore.xmi
+Require-Bundle: org.eclipse.emf.ecore.xmi;visibility:=reexport
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: com.nokia.carbide.cpp.api.test.support.gen.InfImportTestData,
  com.nokia.carbide.cpp.api.test.support.gen.InfImportTestData.impl,

--- a/core/com.nokia.carbide.cpp.sdk.core.test/META-INF/MANIFEST.MF	Mon Feb 01 19:58:21 2010 -0600
+++ b/core/com.nokia.carbide.cpp.sdk.core.test/META-INF/MANIFEST.MF	Mon Feb 01 20:09:12 2010 -0600
@@ -9,10 +9,9 @@
  org.eclipse.core.runtime,
  org.junit,
  com.nokia.carbide.cpp.sdk.core,
- org.eclipse.emf.common,
  com.nokia.cpp.utils.core,
  com.nokia.carbide.cpp.epoc.engine,
- org.eclipse.emf.ecore 
+ org.eclipse.emf.ecore
 Bundle-ActivationPolicy: lazy
 Export-Package: com.nokia.carbide.cpp.sdk.core.test
 Bundle-RequiredExecutionEnvironment: J2SE-1.5

--- a/core/com.nokia.carbide.cpp.sdk.core/META-INF/MANIFEST.MF	Mon Feb 01 19:58:21 2010 -0600
+++ b/core/com.nokia.carbide.cpp.sdk.core/META-INF/MANIFEST.MF	Mon Feb 01 20:09:12 2010 -0600
@@ -6,9 +6,7 @@
 Bundle-Activator: com.nokia.carbide.cpp.sdk.core.SDKCorePlugin
 Bundle-Vendor: Nokia
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.edit,
  org.eclipse.emf.ecore.xmi,
- org.eclipse.core.resources,
  org.eclipse.cdt.core,
  org.eclipse.ui,
  com.nokia.cpp.utils.core,

--- a/core/com.nokia.carbide.templatewizard.symbian.tests/META-INF/MANIFEST.MF	Mon Feb 01 19:58:21 2010 -0600
+++ b/core/com.nokia.carbide.templatewizard.symbian.tests/META-INF/MANIFEST.MF	Mon Feb 01 20:09:12 2010 -0600
@@ -9,9 +9,7 @@
  org.eclipse.core.runtime,
  org.junit,
  com.nokia.carbide.templatewizard,
- org.eclipse.emf.common,
  org.eclipse.emf.ecore,
- org.eclipse.core.resources,
  com.nokia.cpp.utils.core,
  com.nokia.carbide.cpp.sdk.core,
  com.nokia.carbide.cpp.sdk.ui,

--- a/core/com.nokia.carbide.templatewizard.tests/META-INF/MANIFEST.MF	Mon Feb 01 19:58:21 2010 -0600
+++ b/core/com.nokia.carbide.templatewizard.tests/META-INF/MANIFEST.MF	Mon Feb 01 20:09:12 2010 -0600
@@ -9,9 +9,7 @@
  org.eclipse.core.runtime,
  org.junit,
  com.nokia.carbide.templatewizard,
- org.eclipse.emf.common,
  org.eclipse.emf.ecore,
- org.eclipse.core.resources,
  com.nokia.cpp.utils.core;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: com.nokia.carbide.templatewizard.tests

--- a/core/com.nokia.carbide.templatewizard/META-INF/MANIFEST.MF	Mon Feb 01 19:58:21 2010 -0600
+++ b/core/com.nokia.carbide.templatewizard/META-INF/MANIFEST.MF	Mon Feb 01 20:09:12 2010 -0600
@@ -9,11 +9,9 @@
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore.xmi,
- org.eclipse.core.resources,
  org.eclipse.ui.ide,
  com.nokia.cpp.utils.core,
- com.nokia.cpp.utils.ui,
- org.eclipse.emf.edit;bundle-version="2.4.0";resolution:=optional
+ com.nokia.cpp.utils.ui
 Bundle-ActivationPolicy: lazy
 Export-Package: com.nokia.carbide.internal.api.template.engine,
  com.nokia.carbide.internal.api.templatewizard.ui,

--- a/debuggercdi/com.nokia.carbide.trk.support/META-INF/MANIFEST.MF	Mon Feb 01 19:58:21 2010 -0600
+++ b/debuggercdi/com.nokia.carbide.trk.support/META-INF/MANIFEST.MF	Mon Feb 01 20:09:12 2010 -0600
@@ -5,11 +5,7 @@
 Bundle-Version: 1.4.0.qualifier
 Bundle-Vendor: Nokia
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.help.ui,
+Require-Bundle: org.eclipse.help.ui,
  com.freescale.cdt.debug.cw.core,
  com.nokia.carbide.remoteConnections,
  com.nokia.cpp.utils.core,

--- a/project/com.nokia.carbide.cpp.project.core.tests/META-INF/MANIFEST.MF	Mon Feb 01 19:58:21 2010 -0600
+++ b/project/com.nokia.carbide.cpp.project.core.tests/META-INF/MANIFEST.MF	Mon Feb 01 20:09:12 2010 -0600
@@ -9,14 +9,12 @@
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.junit,
- org.eclipse.core.resources,
  com.nokia.carbide.cpp.project.core,
  com.nokia.carbide.cdt.builder,
  com.nokia.cpp.utils.core,
  com.nokia.carbide.cpp.epoc.engine,
  com.nokia.carbide.cpp.sdk.core,
  org.eclipse.cdt.core,
- org.eclipse.emf.common,
  com.nokia.carbide.cpp.project.ui,
  com.nokia.carbide.cpp.api.test.support;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy

--- a/qt/com.nokia.carbide.cpp.qt.ui/META-INF/MANIFEST.MF	Mon Feb 01 19:58:21 2010 -0600
+++ b/qt/com.nokia.carbide.cpp.qt.ui/META-INF/MANIFEST.MF	Mon Feb 01 20:09:12 2010 -0600
@@ -26,5 +26,3 @@
  com.nokia.cpp.utils.ui
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
-Import-Package: com.trolltech.qtcppproject,
- com.trolltech.qtcppproject.qmake