diff --git a/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index ae44f5f6a6..fae488fd55 100644
--- a/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -4,7 +4,6 @@
 	</PropertyGroup>
 	<Import Project="../MainSlnCommon.props" />
 	<PropertyGroup>
-		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<Nullable>disable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
diff --git a/src/BizHawk.Client.Common/DisplayManager/DisplaySurface.cs b/src/BizHawk.Client.EmuHawk/DisplayManager/DisplaySurface.cs
similarity index 92%
rename from src/BizHawk.Client.Common/DisplayManager/DisplaySurface.cs
rename to src/BizHawk.Client.EmuHawk/DisplayManager/DisplaySurface.cs
index 30befb7933..ffb6b7eb3c 100644
--- a/src/BizHawk.Client.Common/DisplayManager/DisplaySurface.cs
+++ b/src/BizHawk.Client.EmuHawk/DisplayManager/DisplaySurface.cs
@@ -1,9 +1,11 @@
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.Runtime.InteropServices;
+
+using BizHawk.Client.Common;
 using BizHawk.Common;
 
-namespace BizHawk.Client.Common
+namespace BizHawk.Client.EmuHawk
 {
 	/// <summary>
 	/// This is a wrapper for a Bitmap, basically, which can also be a int[].
diff --git a/src/BizHawk.Client.Common/QuickBmpFile.cs b/src/BizHawk.Client.EmuHawk/QuickBmpFile.cs
similarity index 94%
rename from src/BizHawk.Client.Common/QuickBmpFile.cs
rename to src/BizHawk.Client.EmuHawk/QuickBmpFile.cs
index c9d323dd67..30f5f0f2be 100644
--- a/src/BizHawk.Client.Common/QuickBmpFile.cs
+++ b/src/BizHawk.Client.EmuHawk/QuickBmpFile.cs
@@ -2,6 +2,7 @@
 using System.IO;
 using System.Runtime.InteropServices;
 
+using BizHawk.Client.Common;
 using BizHawk.Common;
 using BizHawk.Emulation.Common;
 
@@ -10,7 +11,7 @@ using BizHawk.Emulation.Common;
 // ReSharper disable StyleCop.SA1304
 // ReSharper disable StyleCop.SA1307
 // ReSharper disable StyleCop.SA1401
-namespace BizHawk.Client.Common
+namespace BizHawk.Client.EmuHawk
 {
 	public readonly struct QuickBmpFile : IQuickBmpFile
 	{