diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/DependencyManager.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/DependencyManager.java
index 8ea663adc88..6a81db1fc5c 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/DependencyManager.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/DependencyManager.java
@@ -33,6 +33,7 @@
 import org.eclipse.pde.core.plugin.PluginRegistry;
 import org.eclipse.pde.core.target.ITargetPlatformService;
 import org.eclipse.pde.core.target.NameVersionDescriptor;
+import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
 import org.osgi.framework.Version;
 import org.osgi.framework.namespace.HostNamespace;
@@ -187,8 +188,7 @@ public static Set<BundleDescription> findRequirementsClosure(Collection<BundleDe
 			if (wiring == null || !wiring.isInUse()) {
 				continue;
 			}
-
-			if (includeAllFragments || includeNonTestFragments) {
+			if (includeAllFragments || includeNonTestFragments || isExtensibleApi(bundle)) {
 				// A fragment's host is already required by a wire
 				for (BundleDescription fragment : bundle.getFragments()) {
 					if (includeAllFragments || !isTestWorkspaceProject(fragment)) {
@@ -229,6 +229,25 @@ public static Set<BundleDescription> findRequirementsClosure(Collection<BundleDe
 		return closure;
 	}
 
+	private static boolean isExtensibleApi(BundleDescription bundleDescription) {
+		if (bundleDescription.getFragments().length == 0) {
+			return false;
+		}
+		Object userObject = bundleDescription.getUserObject();
+		if (userObject instanceof IPluginModelBase model) {
+			return ClasspathUtilCore.hasExtensibleAPI(model);
+		}
+		IPluginModelBase model = PluginRegistry.findModel((Resource) bundleDescription);
+		if (model != null) {
+			return ClasspathUtilCore.hasExtensibleAPI(model);
+		}
+		Bundle bundle = bundleDescription.getBundle();
+		if (bundle != null) {
+			return Boolean.parseBoolean(bundle.getHeaders().get(ICoreConstants.EXTENSIBLE_API));
+		}
+		return false;
+	}
+
 	private static void addNewRequiredBundle(BundleDescription bundle, Set<BundleDescription> requiredBundles,
 			Queue<BundleDescription> pending) {
 		if (bundle != null && bundle.isResolved() && !bundle.isRemovalPending() && requiredBundles.add(bundle)) {
diff --git a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/BundleLauncherHelper.java b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/BundleLauncherHelper.java
index 605e6f82f1f..1092df4e5a1 100644
--- a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/BundleLauncherHelper.java
+++ b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/BundleLauncherHelper.java
@@ -602,6 +602,7 @@ private static void addPluginBundle(IPluginModelBase plugin, State launchState,
 				throw new IllegalStateException("Plugins have different TP state"); //$NON-NLS-1$
 			}
 			BundleDescription launchBundle = launchState.getFactory().createBundleDescription(bundle);
+			launchBundle.setUserObject(plugin);
 			if (!launchState.addBundle(launchBundle)) {
 				throw new IllegalStateException("Failed to add bundle to launch state: " + launchBundle); //$NON-NLS-1$
 			}