diff --git a/rse/plugins/org.eclipse.dstore.extra/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.dstore.extra/META-INF/MANIFEST.MF
index e38897e5f5a..b2dfc8bf368 100644
--- a/rse/plugins/org.eclipse.dstore.extra/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.dstore.extra/META-INF/MANIFEST.MF
@@ -12,4 +12,4 @@ Eclipse-LazyStart: true
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Export-Package: org.eclipse.dstore.extra,
- org.eclipse.dstore.internal.extra;x-internal:=true
+ org.eclipse.dstore.internal.extra;x-friends:="org.eclipse.rse.subsystems.files.dstore"
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF
index 5c065ec87f6..ad7a26147f0 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF
@@ -17,11 +17,11 @@ Export-Package: org.eclipse.rse.dstore.universal.miners,
  org.eclipse.rse.internal.dstore.universal.miners.filesystem;x-internal:=true,
  org.eclipse.rse.internal.dstore.universal.miners.processes;x-internal:=true,
  org.eclipse.rse.internal.services.dstore;x-internal:=true,
- org.eclipse.rse.internal.services.dstore.files;x-internal:=true,
- org.eclipse.rse.internal.services.dstore.processes;x-internal:=true,
+ org.eclipse.rse.internal.services.dstore.files;x-friends:="org.eclipse.rse.subsystems.files.dstore",
+ org.eclipse.rse.internal.services.dstore.processes;x-friends:="org.eclipse.rse.subsystems.processes.dstore",
  org.eclipse.rse.internal.services.dstore.rmtservice;x-internal:=true,
- org.eclipse.rse.internal.services.dstore.search;x-internal:=true,
- org.eclipse.rse.internal.services.dstore.shells;x-internal:=true,
+ org.eclipse.rse.internal.services.dstore.search;x-friends:="org.eclipse.rse.subsystems.files.dstore",
+ org.eclipse.rse.internal.services.dstore.shells;x-friends:="org.eclipse.rse.subsystems.shells.dstore",
  org.eclipse.rse.services.dstore,
  org.eclipse.rse.services.dstore.util
 Bundle-Vendor: %providerName
diff --git a/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF
index 49cf83435c9..2a7d85b6dce 100644
--- a/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF
@@ -21,7 +21,7 @@ Import-Package: com.ibm.icu.lang,
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.core.servicesubsystem,
  org.eclipse.rse.core.subsystems,
- org.eclipse.rse.internal.ui;x-internal:=true,
+ org.eclipse.rse.internal.ui;x-friends:="org.eclipse.rse.connectorservice.dstore,org.eclipse.rse.processes.ui",
  org.eclipse.rse.internal.ui.actions;x-internal:=true,
  org.eclipse.rse.internal.ui.dialogs;x-internal:=true,
  org.eclipse.rse.internal.ui.filters;x-internal:=true,