diff --git a/debug/org.eclipse.debug.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.debug.ui/META-INF/MANIFEST.MF
index 57e0cc28dd2..ac2c8f724ae 100644
--- a/debug/org.eclipse.debug.ui/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.debug.ui/META-INF/MANIFEST.MF
@@ -49,7 +49,7 @@ Export-Package: org.eclipse.debug.internal.ui;
  org.eclipse.debug.internal.ui.viewers.model;x-friends:="org.eclipse.debug.tests,org.eclipse.jdt.debug.tests,org.eclipse.debug.examples.ui",
  org.eclipse.debug.internal.ui.viewers.model.provisional;
   x-friends:="org.eclipse.cdt.dsf.gdb.ui,
- org.eclipse.debug.internal.ui.views.memory.renderings;x-internal:=true,
+   org.eclipse.debug.internal.ui.views.memory.renderings;x-internal:=true,
    org.eclipse.cdt.dsf.ui,
    org.eclipse.debug.examples.ui,
    org.eclipse.debug.tests,
@@ -72,13 +72,94 @@ Export-Package: org.eclipse.debug.internal.ui;
  org.eclipse.debug.internal.ui.views.registers;x-internal:=true,
  org.eclipse.debug.internal.ui.views.variables;x-friends:="org.eclipse.jdt.debug.ui,org.eclipse.debug.examples.ui,org.eclipse.debug.tests",
  org.eclipse.debug.internal.ui.views.variables.details;x-friends:="org.eclipse.jdt.debug.ui,org.eclipse.wst.jsdt.debug.ui",
- org.eclipse.debug.ui,
- org.eclipse.debug.ui.actions,
- org.eclipse.debug.ui.console,
- org.eclipse.debug.ui.contexts,
- org.eclipse.debug.ui.memory,
- org.eclipse.debug.ui.sourcelookup,
- org.eclipse.debug.ui.stringsubstitution
+ org.eclipse.debug.ui;
+  uses:="org.eclipse.core.commands,
+   org.eclipse.core.commands.operations,
+   org.eclipse.core.resources,
+   org.eclipse.core.runtime,
+   org.eclipse.core.runtime.jobs,
+   org.eclipse.core.variables,
+   org.eclipse.debug.core,
+   org.eclipse.debug.core.model,
+   org.eclipse.debug.internal.ui.launchConfigurations,
+   org.eclipse.debug.ui.actions,
+   org.eclipse.debug.ui.contexts,
+   org.eclipse.debug.ui.memory,
+   org.eclipse.debug.ui.sourcelookup,
+   org.eclipse.jface.action,
+   org.eclipse.jface.dialogs,
+   org.eclipse.jface.operation,
+   org.eclipse.jface.preference,
+   org.eclipse.jface.resource,
+   org.eclipse.jface.text,
+   org.eclipse.jface.text.source,
+   org.eclipse.jface.util,
+   org.eclipse.jface.viewers,
+   org.eclipse.swt.events,
+   org.eclipse.swt.graphics,
+   org.eclipse.swt.widgets,
+   org.eclipse.ui,
+   org.eclipse.ui.console,
+   org.eclipse.ui.dialogs,
+   org.eclipse.ui.model,
+   org.eclipse.ui.part,
+   org.eclipse.ui.progress,
+   org.eclipse.ui.texteditor",
+ org.eclipse.debug.ui.actions;
+  uses:="org.eclipse.core.commands,
+   org.eclipse.core.resources,
+   org.eclipse.core.runtime,
+   org.eclipse.debug.core,
+   org.eclipse.debug.core.model,
+   org.eclipse.debug.internal.ui,
+   org.eclipse.debug.internal.ui.actions,
+   org.eclipse.debug.internal.ui.actions.breakpoints,
+   org.eclipse.debug.internal.ui.launchConfigurations,
+   org.eclipse.debug.ui.contexts,
+   org.eclipse.jface.action,
+   org.eclipse.jface.operation,
+   org.eclipse.jface.resource,
+   org.eclipse.jface.text,
+   org.eclipse.jface.text.source,
+   org.eclipse.jface.viewers,
+   org.eclipse.swt.widgets,
+   org.eclipse.ui,
+   org.eclipse.ui.actions,
+   org.eclipse.ui.menus,
+   org.eclipse.ui.services,
+   org.eclipse.ui.texteditor",
+ org.eclipse.debug.ui.console;
+  uses:="org.eclipse.core.resources,
+   org.eclipse.debug.core.model,
+   org.eclipse.jface.text,
+   org.eclipse.swt.graphics,
+   org.eclipse.ui.console",
+ org.eclipse.debug.ui.contexts;uses:="org.eclipse.debug.core,org.eclipse.jface.viewers,org.eclipse.ui",
+ org.eclipse.debug.ui.memory;
+  uses:="org.eclipse.core.runtime,
+   org.eclipse.debug.core,
+   org.eclipse.debug.core.model,
+   org.eclipse.debug.internal.ui.views.memory.renderings,
+   org.eclipse.debug.ui,
+   org.eclipse.jface.action,
+   org.eclipse.jface.util,
+   org.eclipse.jface.viewers,
+   org.eclipse.swt.graphics,
+   org.eclipse.swt.widgets,
+   org.eclipse.ui",
+ org.eclipse.debug.ui.sourcelookup;
+  uses:="org.eclipse.core.runtime,
+   org.eclipse.debug.core,
+   org.eclipse.debug.core.sourcelookup,
+   org.eclipse.debug.core.sourcelookup.containers,
+   org.eclipse.debug.ui,
+   org.eclipse.jface.dialogs,
+   org.eclipse.jface.resource,
+   org.eclipse.swt.graphics,
+   org.eclipse.swt.widgets,
+   org.eclipse.ui,
+   org.eclipse.ui.part",
+ org.eclipse.debug.ui.stringsubstitution;uses:="org.eclipse.core.variables,org.eclipse.swt.widgets"
 Require-Bundle: org.eclipse.core.variables;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.208.0,4.0.0)",
  org.eclipse.ui.console;bundle-version="[3.17.0,4.0.0)",