M7 cleanup
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.internet.monitor.core/META-INF/MANIFEST.MF
index 57f4849..d3591b4 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.internet.monitor.core/META-INF/MANIFEST.MF
@@ -6,8 +6,8 @@
Bundle-Activator: org.eclipse.wst.internet.monitor.core.internal.MonitorPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.internet.monitor.core.internal.provisional,
- org.eclipse.wst.internet.monitor.core.internal,
- org.eclipse.wst.internet.monitor.core.internal.http
+Export-Package: org.eclipse.wst.internet.monitor.core.internal;x-friends:="org.eclipse.wst.internet.monitor.ui",
+ org.eclipse.wst.internet.monitor.core.internal.http;x-friends:="org.eclipse.wst.internet.monitor.ui",
+ org.eclipse.wst.internet.monitor.core.internal.provisional
Require-Bundle: org.eclipse.core.runtime
Eclipse-AutoStart: true
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.internet.monitor.ui/META-INF/MANIFEST.MF
index 85e5bf2..c8e7695 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/META-INF/MANIFEST.MF
@@ -6,10 +6,10 @@
Bundle-Activator: org.eclipse.wst.internet.monitor.ui.internal.MonitorUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.internet.monitor.ui.internal,
+Export-Package: org.eclipse.wst.internet.monitor.ui.internal;x-internal:=true,
org.eclipse.wst.internet.monitor.ui.internal.provisional,
- org.eclipse.wst.internet.monitor.ui.internal.view,
- org.eclipse.wst.internet.monitor.ui.internal.viewers
+ org.eclipse.wst.internet.monitor.ui.internal.view;x-internal:=true,
+ org.eclipse.wst.internet.monitor.ui.internal.viewers;x-internal:=true
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui.ide,
org.eclipse.ui,