diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.protocol.dnssd/META-INF/MANIFEST.MF
index 3cb11514525..c0051ac70be 100644
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/META-INF/MANIFEST.MF
+++ b/discovery/org.eclipse.tm.discovery.protocol.dnssd/META-INF/MANIFEST.MF
@@ -13,3 +13,4 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Export-Package: org.eclipse.tm.internal.discovery.protocol.dnssd;x-internal:=true
diff --git a/discovery/org.eclipse.tm.discovery.view/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.view/META-INF/MANIFEST.MF
index c2296e5656c..c64722d7879 100644
--- a/discovery/org.eclipse.tm.discovery.view/META-INF/MANIFEST.MF
+++ b/discovery/org.eclipse.tm.discovery.view/META-INF/MANIFEST.MF
@@ -20,6 +20,6 @@ Import-Package: org.eclipse.emf.common.ui,
  org.eclipse.tm.internal.discovery.engine,
  org.eclipse.tm.internal.discovery.model.provider,
  org.eclipse.tm.internal.discovery.model.util
-Export-Package: org.eclipse.tm.internal.discovery.view
+Export-Package: org.eclipse.tm.internal.discovery.view;x-internal:=true
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF
index c0687ce6dd4..a9ba09fc715 100644
--- a/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF
@@ -17,6 +17,11 @@ Export-Package: org.eclipse.dstore.core,
  org.eclipse.dstore.core.model,
  org.eclipse.dstore.core.server,
  org.eclipse.dstore.core.util,
- org.eclipse.dstore.core.util.ssl
+ org.eclipse.dstore.core.util.ssl,
+ org.eclipse.dstore.internal.core.client;x-internal:=true,
+ org.eclipse.dstore.internal.core.model;x-internal:=true,
+ org.eclipse.dstore.internal.core.server;x-internal:=true,
+ org.eclipse.dstore.internal.core.util;x-internal:=true,
+ org.eclipse.dstore.internal.core.util.ssl;x-internal:=true
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF
index 0e497cd53af..473c8adb8c1 100644
--- a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF
@@ -15,6 +15,10 @@ Export-Package: org.eclipse.rse.core,
  org.eclipse.rse.core.model,
  org.eclipse.rse.core.references,
  org.eclipse.rse.core.subsystems,
+ org.eclipse.rse.internal.core;x-internal:=true,
+ org.eclipse.rse.internal.core.subsystems;x-internal:=true,
+ org.eclipse.rse.internal.persistence;x-internal:=true,
+ org.eclipse.rse.internal.persistence.dom;x-internal:=true,
  org.eclipse.rse.internal.references;x-internal:=true,
  org.eclipse.rse.persistence,
  org.eclipse.rse.persistence.dom
diff --git a/rse/plugins/org.eclipse.rse.logging/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.logging/META-INF/MANIFEST.MF
index 5cc744bc1da..58f85ff979e 100644
--- a/rse/plugins/org.eclipse.rse.logging/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.logging/META-INF/MANIFEST.MF
@@ -8,7 +8,8 @@ Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime
 Eclipse-LazyStart: true
-Export-Package: org.eclipse.rse.logging,
+Export-Package: org.eclipse.rse.internal.logging;x-internal:=true,
+ org.eclipse.rse.logging,
  org.eclipse.rse.logging.performance,
  org.eclipse.rse.logging.ui
 Bundle-Vendor: %providerName