diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/.settings/.api_filters b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/.settings/.api_filters
new file mode 100644
index 00000000000..e70d7175758
--- /dev/null
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/.settings/.api_filters
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui" version="2">
+    <resource path="src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/MulticoreVisualizerUIPlugin.java" type="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.MulticoreVisualizerUIPlugin">
+        <filter comment="Multicore Visualizer was meant to be internal" id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.MulticoreVisualizerUIPlugin"/>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/actions/RefreshAction.java" type="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.actions.RefreshAction">
+        <filter comment="The Multicore Visualizer code was meant to be internal" id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.actions.RefreshAction"/>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/actions/SelectAllAction.java" type="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.actions.SelectAllAction">
+        <filter comment="Multicore Visualizer was meant to be internal" id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.actions.SelectAllAction"/>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerCPU.java" type="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model.VisualizerCPU">
+        <filter comment="Multicore Visualizer was meant to be internal" id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model.VisualizerCPU"/>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerCore.java" type="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model.VisualizerCore">
+        <filter comment="Multicore Visualizer was meant to be internal" id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model.VisualizerCore"/>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerExecutionState.java" type="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model.VisualizerExecutionState">
+        <filter comment="Multicore Visualizer was meant to be internal" id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model.VisualizerExecutionState"/>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerModel.java" type="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model.VisualizerModel">
+        <filter comment="Multicore Visualizer was meant to be internal" id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model.VisualizerModel"/>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerThread.java" type="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model.VisualizerThread">
+        <filter comment="Multicore Visualizer was meant to be internal" id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model.VisualizerThread"/>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/IMulticoreVisualizerConstants.java" type="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view.IMulticoreVisualizerConstants">
+        <filter comment="Multicore Visualizer was meant to be internal" id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view.IMulticoreVisualizerConstants"/>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizer.java" type="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view.MulticoreVisualizer">
+        <filter comment="Multicore Visualizer was meant to be internal" id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view.MulticoreVisualizer"/>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCPU.java" type="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view.MulticoreVisualizerCPU">
+        <filter comment="Multicore Visualizer was meant to be internal" id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view.MulticoreVisualizerCPU"/>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCanvas.java" type="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view.MulticoreVisualizerCanvas">
+        <filter comment="Multicore Visualizer was meant to be internal" id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view.MulticoreVisualizerCanvas"/>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCore.java" type="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view.MulticoreVisualizerCore">
+        <filter comment="Multicore Visualizer was meant to be internal" id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view.MulticoreVisualizerCore"/>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerEventListener.java" type="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view.MulticoreVisualizerEventListener">
+        <filter comment="Multicore Visualizer was meant to be internal" id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view.MulticoreVisualizerEventListener"/>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerGraphicObject.java" type="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view.MulticoreVisualizerGraphicObject">
+        <filter comment="Multicore Visualizer was meant to be internal" id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view.MulticoreVisualizerGraphicObject"/>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerMarquee.java" type="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view.MulticoreVisualizerMarquee">
+        <filter comment="Multicore Visualizer was meant to be internal" id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view.MulticoreVisualizerMarquee"/>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerSelectionFinder.java" type="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view.MulticoreVisualizerSelectionFinder">
+        <filter comment="Multicore Visualizer was meant to be internal" id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view.MulticoreVisualizerSelectionFinder"/>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerThread.java" type="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view.MulticoreVisualizerThread">
+        <filter comment="Multicore Visualizer was meant to be internal" id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view.MulticoreVisualizerThread"/>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/DSFDebugModel.java" type="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.utils.DSFDebugModel">
+        <filter comment="Multicore Visualizer was meant to be internal" id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.utils.DSFDebugModel"/>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/DSFDebugModelListener.java" type="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.utils.DSFDebugModelListener">
+        <filter comment="Multicore Visualizer was meant to be internal" id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.utils.DSFDebugModelListener"/>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/DSFSessionState.java" type="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.utils.DSFSessionState">
+        <filter comment="Multicore Visualizer was meant to be internal" id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.utils.DSFSessionState"/>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/DebugViewTreeWalker.java" type="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.utils.DebugViewTreeWalker">
+        <filter comment="Multicore Visualizer was meant to be internal" id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.utils.DebugViewTreeWalker"/>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/DebugViewUtils.java" type="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.utils.DebugViewUtils">
+        <filter comment="Multicore Visualizer was meant to be internal" id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.utils.DebugViewUtils"/>
+                <message_argument value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/META-INF/MANIFEST.MF b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/META-INF/MANIFEST.MF
index b761cf5ccf9..7b35047f936 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/META-INF/MANIFEST.MF
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/META-INF/MANIFEST.MF
@@ -18,8 +18,8 @@ Require-Bundle: org.eclipse.ui,
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: com.ibm.icu.text
-Export-Package: org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui,
- org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.actions,
- org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model,
- org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view,
- org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.utils
+Export-Package: org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui;x-internal:=true,
+ org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.actions;x-internal:=true,
+ org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model;x-internal:=true,
+ org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view;x-internal:=true,
+ org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.utils;x-internal:=true