Index: Core/Common/src/Core.Common.Controls/Views/ISelectionProvider.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r67e77262b9f0f183db81f8c95d7b12aa5fcdb8e9
--- Core/Common/src/Core.Common.Controls/Views/ISelectionProvider.cs	(.../ISelectionProvider.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Common/src/Core.Common.Controls/Views/ISelectionProvider.cs	(.../ISelectionProvider.cs)	(revision 67e77262b9f0f183db81f8c95d7b12aa5fcdb8e9)
@@ -26,7 +26,7 @@
     /// <summary>
     /// Interface for views which can influence the selection on an application level.
     /// </summary>
-    public interface ISelectionProvider : IView
+    public interface ISelectionProvider
     {
         /// <summary>
         /// Fired when the provider's selection has been changed.
Index: Core/Common/src/Core.Common.Gui/Forms/IProjectExplorer.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r67e77262b9f0f183db81f8c95d7b12aa5fcdb8e9
--- Core/Common/src/Core.Common.Gui/Forms/IProjectExplorer.cs	(.../IProjectExplorer.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Common/src/Core.Common.Gui/Forms/IProjectExplorer.cs	(.../IProjectExplorer.cs)	(revision 67e77262b9f0f183db81f8c95d7b12aa5fcdb8e9)
@@ -27,5 +27,5 @@
     /// <summary>
     /// View to show the contents of a <see cref="IProject"/> instance.
     /// </summary>
-    public interface IProjectExplorer : ISelectionProvider {}
+    public interface IProjectExplorer : ISelectionProvider, IView {}
 }
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui/GuiCore.cs
===================================================================
diff -u -r75f679b341a9a7b82f35a623e6409ed28c74632f -r67e77262b9f0f183db81f8c95d7b12aa5fcdb8e9
--- Core/Common/src/Core.Common.Gui/GuiCore.cs	(.../GuiCore.cs)	(revision 75f679b341a9a7b82f35a623e6409ed28c74632f)
+++ Core/Common/src/Core.Common.Gui/GuiCore.cs	(.../GuiCore.cs)	(revision 67e77262b9f0f183db81f8c95d7b12aa5fcdb8e9)
@@ -547,7 +547,7 @@
 
         private void HandleDeactivatingCurrentSelectionProvidingDocumentView()
         {
-            if (currentSelectionProvider != null && ViewHost.DocumentViews.Contains(currentSelectionProvider))
+            if (currentSelectionProvider != null && ViewHost.DocumentViews.Contains((IView) currentSelectionProvider))
             {
                 currentSelectionProvider.SelectionChanged -= OnSelectionChanged;
             }
Index: Core/Common/test/Core.Common.Gui.Test/GuiCoreTest.cs
===================================================================
diff -u -rfae525350cc755ecc783bd4ac3fc13aed2e4ccaa -r67e77262b9f0f183db81f8c95d7b12aa5fcdb8e9
--- Core/Common/test/Core.Common.Gui.Test/GuiCoreTest.cs	(.../GuiCoreTest.cs)	(revision fae525350cc755ecc783bd4ac3fc13aed2e4ccaa)
+++ Core/Common/test/Core.Common.Gui.Test/GuiCoreTest.cs	(.../GuiCoreTest.cs)	(revision 67e77262b9f0f183db81f8c95d7b12aa5fcdb8e9)
@@ -1525,7 +1525,7 @@
             return projectFactory;
         }
 
-        private class TestSelectionProvider : Control, ISelectionProvider
+        private class TestSelectionProvider : Control, ISelectionProvider, IView
         {
             public event EventHandler<EventArgs> SelectionChanged;
 
Index: Core/Plugins/src/Core.Plugins.Chart/Legend/ChartLegendView.cs
===================================================================
diff -u -r75f679b341a9a7b82f35a623e6409ed28c74632f -r67e77262b9f0f183db81f8c95d7b12aa5fcdb8e9
--- Core/Plugins/src/Core.Plugins.Chart/Legend/ChartLegendView.cs	(.../ChartLegendView.cs)	(revision 75f679b341a9a7b82f35a623e6409ed28c74632f)
+++ Core/Plugins/src/Core.Plugins.Chart/Legend/ChartLegendView.cs	(.../ChartLegendView.cs)	(revision 67e77262b9f0f183db81f8c95d7b12aa5fcdb8e9)
@@ -38,7 +38,7 @@
     /// <summary>
     /// This class defines a view which shows the data that have been added to a <see cref="IChartControl"/>.
     /// </summary>
-    public sealed partial class ChartLegendView : UserControl, ISelectionProvider
+    public sealed partial class ChartLegendView : UserControl, ISelectionProvider, IView
     {
         private readonly IContextMenuBuilderProvider contextMenuBuilderProvider;
         private IChartControl chartControl;
Index: Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendView.cs
===================================================================
diff -u -r75f679b341a9a7b82f35a623e6409ed28c74632f -r67e77262b9f0f183db81f8c95d7b12aa5fcdb8e9
--- Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendView.cs	(.../MapLegendView.cs)	(revision 75f679b341a9a7b82f35a623e6409ed28c74632f)
+++ Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendView.cs	(.../MapLegendView.cs)	(revision 67e77262b9f0f183db81f8c95d7b12aa5fcdb8e9)
@@ -36,7 +36,7 @@
     /// <summary>
     /// The view which shows the data that is added to a <see cref="Components.DotSpatial.Forms.MapControl"/>.
     /// </summary>
-    public sealed partial class MapLegendView : UserControl, ISelectionProvider
+    public sealed partial class MapLegendView : UserControl, ISelectionProvider, IView
     {
         private readonly IContextMenuBuilderProvider contextMenuBuilderProvider;
 
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/LocationsView.cs
===================================================================
diff -u -r8ba742d2139563c9571e32f074c7c4b3077f45ee -r67e77262b9f0f183db81f8c95d7b12aa5fcdb8e9
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/LocationsView.cs	(.../LocationsView.cs)	(revision 8ba742d2139563c9571e32f074c7c4b3077f45ee)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/LocationsView.cs	(.../LocationsView.cs)	(revision 67e77262b9f0f183db81f8c95d7b12aa5fcdb8e9)
@@ -34,7 +34,7 @@
     /// Base view for selecting locations and starting calculation for said objects.
     /// </summary>
     /// <typeparam name="T">The type of the location object.</typeparam>
-    public abstract partial class LocationsView<T> : UserControl, ISelectionProvider where T : class
+    public abstract partial class LocationsView<T> : UserControl, ISelectionProvider, IView where T : class
     {
         private const int calculateColumnIndex = 0;
         private bool updatingDataSource;
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneLocationsViewBase.cs
===================================================================
diff -u -r75f679b341a9a7b82f35a623e6409ed28c74632f -r67e77262b9f0f183db81f8c95d7b12aa5fcdb8e9
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneLocationsViewBase.cs	(.../DuneLocationsViewBase.cs)	(revision 75f679b341a9a7b82f35a623e6409ed28c74632f)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneLocationsViewBase.cs	(.../DuneLocationsViewBase.cs)	(revision 67e77262b9f0f183db81f8c95d7b12aa5fcdb8e9)
@@ -33,7 +33,7 @@
     /// <summary>
     /// Base view for selecting calculatable locations and starting calculation for said objects.
     /// </summary>
-    public abstract partial class DuneLocationsViewBase : UserControl, ISelectionProvider
+    public abstract partial class DuneLocationsViewBase : UserControl, ISelectionProvider, IView
     {
         private const int calculateColumnIndex = 0;
         private bool updatingDataSource;
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsCalculationsView.cs
===================================================================
diff -u -r75f679b341a9a7b82f35a623e6409ed28c74632f -r67e77262b9f0f183db81f8c95d7b12aa5fcdb8e9
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsCalculationsView.cs	(.../MacroStabilityInwardsCalculationsView.cs)	(revision 75f679b341a9a7b82f35a623e6409ed28c74632f)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsCalculationsView.cs	(.../MacroStabilityInwardsCalculationsView.cs)	(revision 67e77262b9f0f183db81f8c95d7b12aa5fcdb8e9)
@@ -45,7 +45,7 @@
     /// <summary>
     /// This class is a view for configuring macro stability inwards calculations.
     /// </summary>
-    public partial class MacroStabilityInwardsCalculationsView : UserControl, ISelectionProvider
+    public partial class MacroStabilityInwardsCalculationsView : UserControl, ISelectionProvider, IView
     {
         private const int stochasticSoilModelColumnIndex = 1;
         private const int stochasticSoilProfileColumnIndex = 2;
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs
===================================================================
diff -u -r75f679b341a9a7b82f35a623e6409ed28c74632f -r67e77262b9f0f183db81f8c95d7b12aa5fcdb8e9
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs	(.../PipingCalculationsView.cs)	(revision 75f679b341a9a7b82f35a623e6409ed28c74632f)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs	(.../PipingCalculationsView.cs)	(revision 67e77262b9f0f183db81f8c95d7b12aa5fcdb8e9)
@@ -45,7 +45,7 @@
     /// <summary>
     /// This class is a view for configuring piping calculations.
     /// </summary>
-    public partial class PipingCalculationsView : UserControl, ISelectionProvider
+    public partial class PipingCalculationsView : UserControl, ISelectionProvider, IView
     {
         private const int stochasticSoilModelColumnIndex = 1;
         private const int stochasticSoilProfileColumnIndex = 2;