diff --git a/remote/org.eclipse.cdt.remote.core/META-INF/MANIFEST.MF b/remote/org.eclipse.cdt.remote.core/META-INF/MANIFEST.MF
index b13e1a5ea86..ccb0220bca9 100644
--- a/remote/org.eclipse.cdt.remote.core/META-INF/MANIFEST.MF
+++ b/remote/org.eclipse.cdt.remote.core/META-INF/MANIFEST.MF
@@ -12,4 +12,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %pluginProvider
 Import-Package: org.eclipse.core.resources
-Export-Package: org.eclipse.cdt.remote.core;x-friends="org.eclipse.cdt.autotools.core,org.eclipse.cdt.autotools.ui"
+Export-Package: org.eclipse.cdt.remote.core;x-friends:="org.eclipse.cdt.autotools.core,org.eclipse.cdt.autotools.ui",
+ org.eclipse.cdt.remote.internal.core;x-internal:=true,
+ org.eclipse.cdt.remote.internal.core.messages;x-internal:=true