1 files changed, 4 insertions, 5 deletions
diff --git a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
index 8e64b0da1c0..34c052c3b3a 100644
--- a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 5.7.0.qualifier
 Bundle-Activator: org.eclipse.cdt.core.CCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.cdt.core,
+Export-Package: org.eclipse.cdt.core;org.eclipse.cdt.core=split;mandatory=org.eclipse.cdt.core,
  org.eclipse.cdt.core.browser,
  org.eclipse.cdt.core.cdtvariables,
  org.eclipse.cdt.core.dom,
@@ -94,7 +94,7 @@ Export-Package: org.eclipse.cdt.core,
  org.eclipse.cdt.internal.formatter;x-friends:="org.eclipse.cdt.ui",
  org.eclipse.cdt.internal.formatter.align;x-internal:=true,
  org.eclipse.cdt.internal.formatter.scanner;x-friends:="org.eclipse.cdt.ui",
- org.eclipse.cdt.utils,
+ org.eclipse.cdt.utils;org.eclipse.cdt.core=split;mandatory=org.eclipse.cdt.core,
  org.eclipse.cdt.utils.cdtvariables,
  org.eclipse.cdt.utils.coff,
  org.eclipse.cdt.utils.coff.parser,
@@ -107,13 +107,12 @@ Export-Package: org.eclipse.cdt.core,
  org.eclipse.cdt.utils.envvar,
  org.eclipse.cdt.utils.macho,
  org.eclipse.cdt.utils.macho.parser,
- org.eclipse.cdt.utils.pty,
  org.eclipse.cdt.utils.som,
  org.eclipse.cdt.utils.som.parser,
- org.eclipse.cdt.utils.spawner,
  org.eclipse.cdt.utils.xcoff,
  org.eclipse.cdt.utils.xcoff.parser
-Require-Bundle: org.eclipse.core.contenttype;bundle-version="[3.3.0,4.0.0)",
+Require-Bundle: org.eclipse.cdt.core.spawner;bundle-version="[5.7.0,6.0.0)";visibility:=reexport,
+ org.eclipse.core.contenttype;bundle-version="[3.3.0,4.0.0)",
  org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.core.filebuffers;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)",