diff --git a/plugins/org.eclipse.jst.server.generic.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.generic.core/META-INF/MANIFEST.MF
index 0a8c0a9..d31aa41 100644
--- a/plugins/org.eclipse.jst.server.generic.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.generic.core/META-INF/MANIFEST.MF
@@ -6,13 +6,13 @@
 Bundle-Activator: org.eclipse.jst.server.generic.core.internal.CorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.server.generic.core.internal,
- org.eclipse.jst.server.generic.core.internal.publishers,
- org.eclipse.jst.server.generic.internal.core.util,
- org.eclipse.jst.server.generic.internal.servertype.definition,
- org.eclipse.jst.server.generic.internal.servertype.definition.impl,
- org.eclipse.jst.server.generic.internal.servertype.definition.util,
- org.eclipse.jst.server.generic.internal.xml,
+Export-Package: org.eclipse.jst.server.generic.core.internal;x-internal:=true,
+ org.eclipse.jst.server.generic.core.internal.publishers;x-internal:=true,
+ org.eclipse.jst.server.generic.internal.core.util;x-internal:=true,
+ org.eclipse.jst.server.generic.internal.servertype.definition;x-internal:=true,
+ org.eclipse.jst.server.generic.internal.servertype.definition.impl;x-internal:=true,
+ org.eclipse.jst.server.generic.internal.servertype.definition.util;x-internal:=true,
+ org.eclipse.jst.server.generic.internal.xml;x-internal:=true,
  org.eclipse.jst.server.generic.servertype.definition
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
diff --git a/plugins/org.eclipse.jst.server.generic.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.generic.ui/META-INF/MANIFEST.MF
index 912637b..164369b 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.generic.ui/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
 Bundle-Activator: org.eclipse.jst.server.generic.ui.internal.GenericUiPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.server.generic.ui.internal
+Export-Package: org.eclipse.jst.server.generic.ui.internal;x-internal:=true
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.wst.server.ui,
diff --git a/plugins/org.eclipse.jst.server.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.ui/META-INF/MANIFEST.MF
index cfeda5c..c9eae02 100644
--- a/plugins/org.eclipse.jst.server.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.ui/META-INF/MANIFEST.MF
@@ -6,7 +6,8 @@
 Bundle-Activator: org.eclipse.jst.server.ui.internal.JavaServerUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.server.ui.internal;x-internal:=true
+Export-Package: org.eclipse.jst.server.ui.internal;x-internal:=true,
+ org.eclipse.jst.server.ui.internal.cactus;x-internal:=true
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.debug.core,
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 e878842..8ccc642 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
@@ -8,6 +8,6 @@
 Bundle-Localization: plugin
 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
+ org.eclipse.wst.internet.monitor.core.internal.provisional;x-internal:=true
 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 4469ec3..689a128 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
@@ -7,7 +7,7 @@
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 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.provisional;x-internal:=true,
  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,
diff --git a/plugins/org.eclipse.wst.server.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.server.core/META-INF/MANIFEST.MF
index 3aa3329..b413ef8 100644
--- a/plugins/org.eclipse.wst.server.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.server.core/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@
 Bundle-Localization: plugin
 Export-Package: org.eclipse.wst.server.core,
  org.eclipse.wst.server.core.internal;x-friends:="org.eclipse.wst.server.ui",
- org.eclipse.wst.server.core.internal.provisional,
+ org.eclipse.wst.server.core.internal.provisional;x-internal:=true,
  org.eclipse.wst.server.core.model,
  org.eclipse.wst.server.core.util
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF
index 38ac222..0685968 100644
--- a/plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF
@@ -10,11 +10,13 @@
  org.eclipse.wst.server.ui.editor,
  org.eclipse.wst.server.ui.internal;x-internal:=true,
  org.eclipse.wst.server.ui.internal.actions;x-internal:=true,
+ org.eclipse.wst.server.ui.internal.audio;x-internal:=true,
  org.eclipse.wst.server.ui.internal.command;x-internal:=true,
  org.eclipse.wst.server.ui.internal.editor;x-internal:=true,
  org.eclipse.wst.server.ui.internal.provisional;x-internal:=true,
  org.eclipse.wst.server.ui.internal.view.servers;x-internal:=true,
  org.eclipse.wst.server.ui.internal.viewers;x-internal:=true,
+ org.eclipse.wst.server.ui.internal.webbrowser;x-internal:=true,
  org.eclipse.wst.server.ui.internal.wizard;x-internal:=true,
  org.eclipse.wst.server.ui.internal.wizard.fragment;x-internal:=true,
  org.eclipse.wst.server.ui.internal.wizard.page;x-internal:=true,