diff --git a/src/BizHawk.Client.Common/DisplayManager/IBlitter.cs b/src/BizHawk.Client.Common/DisplayManager/IBlitter.cs
new file mode 100644
index 0000000000..7d5c8e11d0
--- /dev/null
+++ b/src/BizHawk.Client.Common/DisplayManager/IBlitter.cs
@@ -0,0 +1,19 @@
+using System.Drawing;
+
+using BizHawk.Bizware.BizwareGL;
+
+namespace BizHawk.Client.Common
+{
+	/// <summary>
+	/// This is an old abstracted rendering class that the OSD system is using to get its work done.
+	/// We should probably just use a GuiRenderer (it was designed to do that) although wrapping it with
+	/// more information for OSDRendering could be helpful I suppose
+	/// </summary>
+	public interface IBlitter
+	{
+		StringRenderer GetFontType(string fontType);
+		void DrawString(string s, StringRenderer font, Color color, float x, float y);
+		SizeF MeasureString(string s, StringRenderer font);
+		Rectangle ClipBounds { get; set; }
+	}
+}
diff --git a/src/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs b/src/BizHawk.Client.Common/DisplayManager/OSDManager.cs
similarity index 88%
rename from src/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs
rename to src/BizHawk.Client.Common/DisplayManager/OSDManager.cs
index 7c2050f777..751e564a9e 100644
--- a/src/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs
+++ b/src/BizHawk.Client.Common/DisplayManager/OSDManager.cs
@@ -6,37 +6,9 @@ using System.Collections.Generic;
 
 using BizHawk.Bizware.BizwareGL;
 using BizHawk.Emulation.Common;
-using BizHawk.Client.Common;
 
-namespace BizHawk.Client.EmuHawk
+namespace BizHawk.Client.Common
 {
-	/// <summary>
-	/// This is an old abstracted rendering class that the OSD system is using to get its work done.
-	/// We should probably just use a GuiRenderer (it was designed to do that) although wrapping it with
-	/// more information for OSDRendering could be helpful I suppose
-	/// </summary>
-	public interface IBlitter
-	{
-		StringRenderer GetFontType(string fontType);
-		void DrawString(string s, StringRenderer font, Color color, float x, float y);
-		SizeF MeasureString(string s, StringRenderer font);
-		Rectangle ClipBounds { get; set; }
-	}
-
-	public class UIMessage
-	{
-		public string Message { get; set; }
-		public DateTime ExpireAt { get; set; }
-	}
-
-	public class UIDisplay
-	{
-		public string Message { get; set; }
-		public MessagePosition Position { get; set; }
-		public Color ForeColor { get; set; }
-		public Color BackGround { get; set; }
-	}
-
 	public class OSDManager
 	{
 		private Config _config;
diff --git a/src/BizHawk.Client.Common/DisplayManager/UIDisplay.cs b/src/BizHawk.Client.Common/DisplayManager/UIDisplay.cs
new file mode 100644
index 0000000000..04466e7ac7
--- /dev/null
+++ b/src/BizHawk.Client.Common/DisplayManager/UIDisplay.cs
@@ -0,0 +1,12 @@
+using System.Drawing;
+
+namespace BizHawk.Client.Common
+{
+	public class UIDisplay
+	{
+		public string Message { get; set; }
+		public MessagePosition Position { get; set; }
+		public Color ForeColor { get; set; }
+		public Color BackGround { get; set; }
+	}
+}
diff --git a/src/BizHawk.Client.Common/DisplayManager/UIMessage.cs b/src/BizHawk.Client.Common/DisplayManager/UIMessage.cs
new file mode 100644
index 0000000000..2cbf8ee9b2
--- /dev/null
+++ b/src/BizHawk.Client.Common/DisplayManager/UIMessage.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace BizHawk.Client.Common
+{
+	public class UIMessage
+	{
+		public string Message { get; set; }
+		public DateTime ExpireAt { get; set; }
+	}
+}