diff --git a/src/BizHawk.Client.EmuHawk/DisplayManager/DisplaySurface.cs b/src/BizHawk.Client.Common/DisplayManager/DisplaySurface.cs
similarity index 92%
rename from src/BizHawk.Client.EmuHawk/DisplayManager/DisplaySurface.cs
rename to src/BizHawk.Client.Common/DisplayManager/DisplaySurface.cs
index ffb6b7eb3c..ee56983ba0 100644
--- a/src/BizHawk.Client.EmuHawk/DisplayManager/DisplaySurface.cs
+++ b/src/BizHawk.Client.Common/DisplayManager/DisplaySurface.cs
@@ -2,10 +2,9 @@ using System.Drawing;
 using System.Drawing.Imaging;
 using System.Runtime.InteropServices;
 
-using BizHawk.Client.Common;
 using BizHawk.Common;
 
-namespace BizHawk.Client.EmuHawk
+namespace BizHawk.Client.Common
 {
 	/// <summary>
 	/// This is a wrapper for a Bitmap, basically, which can also be a int[].