Index: Core/Common/src/Core.Common.Gui/Clipboard/IClipboard.cs
===================================================================
diff -u -r54a27fc5b902c7182e52b2c1ee41a372dcc309b0 -re75ff273f0e261eb9f7534d56b6f6a642b01ff9e
--- Core/Common/src/Core.Common.Gui/Clipboard/IClipboard.cs	(.../IClipboard.cs)	(revision 54a27fc5b902c7182e52b2c1ee41a372dcc309b0)
+++ Core/Common/src/Core.Common.Gui/Clipboard/IClipboard.cs	(.../IClipboard.cs)	(revision e75ff273f0e261eb9f7534d56b6f6a642b01ff9e)
@@ -36,13 +36,6 @@
         void SetDataObject(object data, bool copy = false);
 
         /// <summary>
-        /// Retrieves the data that is currently on the clipboard.
-        /// </summary>
-        /// <returns>The <see cref="object" /> that is on the clipboard, or <c>null</c> if the clipboard
-        /// does not contain any data.</returns>
-        object GetDataObject();
-
-        /// <summary>
         /// Retrieves the textual data that is currently on the clipboard.
         /// </summary>
         /// <returns>The textual data that is on the clipboard, or <c>null</c> if the clipboard does not
Index: Core/Common/src/Core.Common.Gui/Clipboard/SystemClipboard.cs
===================================================================
diff -u -r3d943b67acde4bdf3750ed7127308a0cac570495 -re75ff273f0e261eb9f7534d56b6f6a642b01ff9e
--- Core/Common/src/Core.Common.Gui/Clipboard/SystemClipboard.cs	(.../SystemClipboard.cs)	(revision 3d943b67acde4bdf3750ed7127308a0cac570495)
+++ Core/Common/src/Core.Common.Gui/Clipboard/SystemClipboard.cs	(.../SystemClipboard.cs)	(revision e75ff273f0e261eb9f7534d56b6f6a642b01ff9e)
@@ -19,7 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System.Windows;
+using System.Windows.Forms;
 
 namespace Core.Common.Gui.ClipBoard
 {
@@ -32,12 +32,7 @@
         {
             Clipboard.SetDataObject(data, copy);
         }
-
-        public object GetDataObject()
-        {
-            return Clipboard.GetDataObject();
-        }
-
+        
         public string GetText()
         {
             return Clipboard.GetText();
Index: Core/Common/src/Core.Common.Gui/ExceptionDialog.cs
===================================================================
diff -u -r6cdb90fc3f89fe0c44b62d3be7266a0090a6b891 -re75ff273f0e261eb9f7534d56b6f6a642b01ff9e
--- Core/Common/src/Core.Common.Gui/ExceptionDialog.cs	(.../ExceptionDialog.cs)	(revision 6cdb90fc3f89fe0c44b62d3be7266a0090a6b891)
+++ Core/Common/src/Core.Common.Gui/ExceptionDialog.cs	(.../ExceptionDialog.cs)	(revision e75ff273f0e261eb9f7534d56b6f6a642b01ff9e)
@@ -22,6 +22,7 @@
 using System;
 using System.Windows.Forms;
 using Core.Common.Controls.Dialogs;
+using Core.Common.Gui.ClipBoard;
 using Core.Common.Gui.Commands;
 using Core.Common.Gui.Properties;
 
@@ -98,7 +99,7 @@
 
         private void ButtonCopyTextToClipboardClick(object sender, EventArgs e)
         {
-            Clipboard.SetDataObject(exceptionTextBox.Text, true);
+            ClipboardProvider.Clipboard.SetDataObject(exceptionTextBox.Text, true);
         }
 
         private void ButtonOpenLogClick(object sender, EventArgs e)
Index: Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.cs
===================================================================
diff -u -r6cdb90fc3f89fe0c44b62d3be7266a0090a6b891 -re75ff273f0e261eb9f7534d56b6f6a642b01ff9e
--- Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.cs	(.../MessageWindow.cs)	(revision 6cdb90fc3f89fe0c44b62d3be7266a0090a6b891)
+++ Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.cs	(.../MessageWindow.cs)	(revision e75ff273f0e261eb9f7534d56b6f6a642b01ff9e)
@@ -26,6 +26,7 @@
 using System.Globalization;
 using System.IO;
 using System.Windows.Forms;
+using Core.Common.Gui.ClipBoard;
 using Core.Common.Gui.Properties;
 using log4net.Core;
 
@@ -347,7 +348,7 @@
 
         private void ButtonCopyClick(object sender, EventArgs e)
         {
-            Clipboard.SetDataObject(messagesDataGridView.GetClipboardContent());
+            ClipboardProvider.Clipboard.SetDataObject(messagesDataGridView.GetClipboardContent());
         }
 
         private void ButtonShowDetailsClick(object sender, EventArgs e)
Index: Core/Common/test/Core.Common.Gui.Test/ExceptionDialogTest.cs
===================================================================
diff -u -r4dd97bf1d4dbefa8c8bf846e98cf2fbd4dbc8140 -re75ff273f0e261eb9f7534d56b6f6a642b01ff9e
--- Core/Common/test/Core.Common.Gui.Test/ExceptionDialogTest.cs	(.../ExceptionDialogTest.cs)	(revision 4dd97bf1d4dbefa8c8bf846e98cf2fbd4dbc8140)
+++ Core/Common/test/Core.Common.Gui.Test/ExceptionDialogTest.cs	(.../ExceptionDialogTest.cs)	(revision e75ff273f0e261eb9f7534d56b6f6a642b01ff9e)
@@ -22,6 +22,7 @@
 using System;
 using System.Threading;
 using System.Windows.Forms;
+using Core.Common.Gui.ClipBoard;
 using Core.Common.Gui.Commands;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
@@ -247,7 +248,7 @@
                 button.Click();
 
                 // Assert
-                Assert.AreEqual(exception.ToString(), Clipboard.GetText());
+                Assert.AreEqual(exception.ToString(), ClipboardProvider.Clipboard.GetText());
             }
         }
 
Index: Core/Common/test/Core.Common.Gui.Test/Forms/MessageWindow/MessageWindowTest.cs
===================================================================
diff -u -r56d072b8342f3e54ba89124ab918bd1529e257a3 -re75ff273f0e261eb9f7534d56b6f6a642b01ff9e
--- Core/Common/test/Core.Common.Gui.Test/Forms/MessageWindow/MessageWindowTest.cs	(.../MessageWindowTest.cs)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
+++ Core/Common/test/Core.Common.Gui.Test/Forms/MessageWindow/MessageWindowTest.cs	(.../MessageWindowTest.cs)	(revision e75ff273f0e261eb9f7534d56b6f6a642b01ff9e)
@@ -23,6 +23,7 @@
 using System.Data;
 using System.Threading;
 using System.Windows.Forms;
+using Core.Common.Gui.ClipBoard;
 using log4net.Core;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
@@ -455,10 +456,7 @@
                 button.Click();
 
                 // Assert
-                IDataObject actualDataObject = Clipboard.GetDataObject();
-                Assert.IsTrue(actualDataObject != null && actualDataObject.GetDataPresent(DataFormats.Text));
-                var actualContent = (string) actualDataObject.GetData(DataFormats.Text);
-                Assert.AreEqual("\t00:00:00\tmessage", actualContent);
+                Assert.AreEqual("\t00:00:00\tmessage", ClipboardProvider.Clipboard.GetText());
             }
         }