diff --git a/discovery/org.eclipse.tm.discovery.engine/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.engine/META-INF/MANIFEST.MF
index 340c0ba70eb..5e406608c0e 100644
--- a/discovery/org.eclipse.tm.discovery.engine/META-INF/MANIFEST.MF
+++ b/discovery/org.eclipse.tm.discovery.engine/META-INF/MANIFEST.MF
@@ -12,8 +12,6 @@ Require-Bundle: org.eclipse.ui,
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.tm.discovery.protocol,
  org.eclipse.tm.discovery.transport,
- org.eclipse.tm.internal.discovery.engine;x-friends:="org.eclipse.tm.internal.discovery.wizard"
-Import-Package: org.eclipse.tm.discovery.model,
- org.eclipse.tm.internal.discovery.model.util
+ org.eclipse.tm.internal.discovery.engine;x-friends:="org.eclipse.tm.discovery.view,org.eclipse.tm.discovery.wizard"
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.model.edit/META-INF/MANIFEST.MF
index 3a871cc780c..738c049c3e0 100644
--- a/discovery/org.eclipse.tm.discovery.model.edit/META-INF/MANIFEST.MF
+++ b/discovery/org.eclipse.tm.discovery.model.edit/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.tm.internal.discovery.model.provider.DiscoveryModelEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.tm.internal.discovery.model.provider;x-friends:="org.eclipse.tm.internal.discovery.wizard"
+Export-Package: org.eclipse.tm.internal.discovery.model.provider;x-friends:="org.eclipse.tm.discovery.view,org.eclipse.tm.discovery.wizard"
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.edit;visibility:=reexport,
  org.eclipse.tm.discovery.model
diff --git a/discovery/org.eclipse.tm.discovery.model/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.model/META-INF/MANIFEST.MF
index e66c5c88a02..e7620a9b381 100644
--- a/discovery/org.eclipse.tm.discovery.model/META-INF/MANIFEST.MF
+++ b/discovery/org.eclipse.tm.discovery.model/META-INF/MANIFEST.MF
@@ -12,6 +12,6 @@ Require-Bundle: org.eclipse.ui,
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.tm.discovery.model,
  org.eclipse.tm.internal.discovery.model.impl;x-internal:=true,
- org.eclipse.tm.internal.discovery.model.util;x-internal:=true
+ org.eclipse.tm.internal.discovery.model.util;x-friends:="org.eclipse.tm.discovery.engine,org.eclipse.tm.discovery.model.edit"
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/discovery/org.eclipse.tm.discovery.wizard/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.wizard/META-INF/MANIFEST.MF
index a6cf5032260..97c7c868e8e 100644
--- a/discovery/org.eclipse.tm.discovery.wizard/META-INF/MANIFEST.MF
+++ b/discovery/org.eclipse.tm.discovery.wizard/META-INF/MANIFEST.MF
@@ -13,6 +13,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.tm.discovery.model,
  org.eclipse.tm.discovery.model.edit
 Eclipse-LazyStart: true
-Export-Package: org.eclipse.tm.internal.discovery.wizard;x-friends:="org.eclipse.rse.internal.discovery"
+Export-Package: org.eclipse.tm.internal.discovery.wizard;x-friends:="org.eclipse.rse.discovery,org.eclipse.tm.discovery.view"
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.4