diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.core/META-INF/MANIFEST.MF
index 3b91d1fe23c..e7255d6b4d9 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.core,
  org.eclipse.rse.ui
 Eclipse-LazyStart: true
-Export-Package: org.eclipse.rse.internal.subsystems.files.core;x-internal:=true,
+Export-Package: org.eclipse.rse.internal.subsystems.files.core;x-friends:="org.eclipse.rse.subsystems.files.dstore,org.eclipse.rse.subsystems.files.local",
  org.eclipse.rse.internal.subsystems.files.core.model;x-internal:=true,
  org.eclipse.rse.subsystems.files.core,
  org.eclipse.rse.subsystems.files.core.model,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/.classpath b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/.classpath
index 045b0fcb3a4..b7464f3ca24 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/.classpath
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/.classpath
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/dstore/**"/>
-			<accessrule kind="discouraged" pattern="**/internal/**"/>
-		</accessrules>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>