diff --git a/dsf/org.eclipse.cdt.dsf.ui/.settings/.api_filters b/dsf/org.eclipse.cdt.dsf.ui/.settings/.api_filters
index 9dd163b85df..8956dd93790 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/.settings/.api_filters
+++ b/dsf/org.eclipse.cdt.dsf.ui/.settings/.api_filters
@@ -1,11 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <component id="org.eclipse.cdt.dsf.ui" version="2">
-<resource path="src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java" type="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.DisassemblyPart">
-<filter id="571473929">
-<message_arguments>
-<message_argument value="WorkbenchPart"/>
-<message_argument value="DisassemblyPart"/>
-</message_arguments>
-</filter>
-</resource>
+    <resource path="src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java" type="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.DisassemblyPart">
+        <filter id="571473929">
+            <message_arguments>
+                <message_argument value="WorkbenchPart"/>
+                <message_argument value="DisassemblyPart"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/DisassemblySelection.java" type="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.DisassemblySelection">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.DisassemblySelection"/>
+                <message_argument value="org.eclipse.cdt.dsf.ui_2.2.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/IBreakpointLocationProvider.java" type="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.IBreakpointLocationProvider">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.IBreakpointLocationProvider"/>
+                <message_argument value="org.eclipse.cdt.dsf.ui_2.2.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/IDisassemblyPart.java" type="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.IDisassemblyPart">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.IDisassemblyPart"/>
+                <message_argument value="org.eclipse.cdt.dsf.ui_2.2.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/IDisassemblySelection.java" type="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.IDisassemblySelection">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.IDisassemblySelection"/>
+                <message_argument value="org.eclipse.cdt.dsf.ui_2.2.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
 </component>
diff --git a/dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF b/dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF
index 19672f3604f..8b826ad585d 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF
+++ b/dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF
@@ -27,7 +27,7 @@ Export-Package: org.eclipse.cdt.dsf.debug.internal.ui;x-internal:=true,
  org.eclipse.cdt.dsf.debug.internal.ui.disassembly.model;x-internal:=true,
  org.eclipse.cdt.dsf.debug.internal.ui.disassembly.preferences;x-internal:=true,
  org.eclipse.cdt.dsf.debug.internal.ui.disassembly.presentation;x-internal:=true,
- org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional,
+ org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional;x-friends:="org.eclipse.cdt.dsf.gdb.ui",
  org.eclipse.cdt.dsf.debug.internal.ui.disassembly.text;x-internal:=true,
  org.eclipse.cdt.dsf.debug.internal.ui.disassembly.util;x-internal:=true,
  org.eclipse.cdt.dsf.debug.internal.ui.preferences;x-internal:=true,