diff --git a/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF
index 05ae0f71e51..0a7b35e0735 100644
--- a/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF
@@ -12,6 +12,7 @@ Export-Package: org.eclipse.cdt.debug.core,
  org.eclipse.cdt.debug.core.cdi.event,
  org.eclipse.cdt.debug.core.cdi.model,
  org.eclipse.cdt.debug.core.cdi.model.type,
+ org.eclipse.cdt.debug.core.command,
  org.eclipse.cdt.debug.core.disassembly,
  org.eclipse.cdt.debug.core.executables,
  org.eclipse.cdt.debug.core.model,
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF
index d958b582571..be8b2e74e65 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF
@@ -11,7 +11,8 @@ Export-Package: org.eclipse.cdt.debug.mi.internal.ui;x-internal:=true,
  org.eclipse.cdt.debug.mi.internal.ui.dialogfields;x-internal:=true,
  org.eclipse.cdt.debug.mi.internal.ui.preferences;x-internal:=true,
  org.eclipse.cdt.debug.mi.internal.ui.propertypages;x-internal:=true,
- org.eclipse.cdt.debug.mi.ui
+ org.eclipse.cdt.debug.mi.ui,
+ org.eclipse.cdt.debug.mi.ui.console
 Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.cdt.debug.mi.core;bundle-version="[7.0.0,8.0.0)",
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/META-INF/MANIFEST.MF b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/META-INF/MANIFEST.MF
index 9f570bcf503..8cee7e6afa5 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/META-INF/MANIFEST.MF
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/META-INF/MANIFEST.MF
@@ -26,10 +26,17 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.cdt.launch;bundle-version="6.1.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.cdt.dsf.gdb.internal.ui.actions;x-internal:=true,
+Export-Package: org.eclipse.cdt.dsf.gdb.internal.ui;x-internal:=true,
+ org.eclipse.cdt.dsf.gdb.internal.ui.actions;x-internal:=true,
  org.eclipse.cdt.dsf.gdb.internal.ui.breakpoints;x-internal:=true,
+ org.eclipse.cdt.dsf.gdb.internal.ui.commands;x-internal:=true,
+ org.eclipse.cdt.dsf.gdb.internal.ui.console;x-internal:=true,
  org.eclipse.cdt.dsf.gdb.internal.ui.launching;x-friends:="org.eclipse.cdt.debug.gdbjtag.ui",
+ org.eclipse.cdt.dsf.gdb.internal.ui.preferences;x-internal:=true,
  org.eclipse.cdt.dsf.gdb.internal.ui.tracepointactions;x-internal:=true,
+ org.eclipse.cdt.dsf.gdb.internal.ui.tracepoints;x-internal:=true,
  org.eclipse.cdt.dsf.gdb.internal.ui.viewmodel;x-internal:=true,
+ org.eclipse.cdt.dsf.gdb.internal.ui.viewmodel.breakpoints;x-internal:=true,
+ org.eclipse.cdt.dsf.gdb.internal.ui.viewmodel.commands;x-internal:=true,
  org.eclipse.cdt.dsf.gdb.internal.ui.viewmodel.launch;x-internal:=true
 Import-Package: com.ibm.icu.text
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF b/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF
index 2a034c791d7..aa048fb7b0d 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF
@@ -20,15 +20,21 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.cdt.dsf.gdb,
  org.eclipse.cdt.dsf.gdb.actions,
  org.eclipse.cdt.dsf.gdb.breakpoints,
- org.eclipse.cdt.dsf.gdb.internal.commands,
+ org.eclipse.cdt.dsf.gdb.internal;x-internal:=true,
+ org.eclipse.cdt.dsf.gdb.internal.commands;x-internal:=true,
  org.eclipse.cdt.dsf.gdb.internal.memory;x-internal:=true,
- org.eclipse.cdt.dsf.gdb.internal.tracepointactions,
+ org.eclipse.cdt.dsf.gdb.internal.service.command.events;x-internal:=true,
+ org.eclipse.cdt.dsf.gdb.internal.tracepointactions;x-internal:=true,
  org.eclipse.cdt.dsf.gdb.launching,
  org.eclipse.cdt.dsf.gdb.service,
  org.eclipse.cdt.dsf.gdb.service.command,
+ org.eclipse.cdt.dsf.gdb.service.macos,
  org.eclipse.cdt.dsf.mi.service,
+ org.eclipse.cdt.dsf.mi.service.breakpoint.actions,
  org.eclipse.cdt.dsf.mi.service.command,
  org.eclipse.cdt.dsf.mi.service.command.commands,
+ org.eclipse.cdt.dsf.mi.service.command.commands.macos,
  org.eclipse.cdt.dsf.mi.service.command.events,
- org.eclipse.cdt.dsf.mi.service.command.output
+ org.eclipse.cdt.dsf.mi.service.command.output,
+ org.eclipse.cdt.dsf.mi.service.command.output.macos
 Import-Package: com.ibm.icu.text
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/META-INF/MANIFEST.MF b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/META-INF/MANIFEST.MF
index de1593e2974..9f1ef065711 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/META-INF/MANIFEST.MF
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/META-INF/MANIFEST.MF
@@ -18,5 +18,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.cdt.dsf.gdb.ui
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
-Export-Package: org.eclipse.cdt.debug.gdbjtag.ui
+Export-Package: org.eclipse.cdt.debug.gdbjtag.internal.ui;x-internal:=true,
+ org.eclipse.cdt.debug.gdbjtag.ui
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF b/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF
index eec6bf19a34..27325259f81 100644
--- a/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF
+++ b/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF
@@ -8,6 +8,7 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.cdt.launch,
  org.eclipse.cdt.launch.internal;x-internal:=true,
+ org.eclipse.cdt.launch.internal.refactoring;x-internal:=true,
  org.eclipse.cdt.launch.internal.ui;x-friends:="org.eclipse.cdt.debug.edc.ui",
  org.eclipse.cdt.launch.ui
 Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",