diff --git a/BizHawk.Client.Common/Api/EmuHawkInterfaces/IGui.cs b/BizHawk.Client.Common/Api/EmuHawkInterfaces/IGui.cs
index 93a1867fcf..02ea7f117f 100644
--- a/BizHawk.Client.Common/Api/EmuHawkInterfaces/IGui.cs
+++ b/BizHawk.Client.Common/Api/EmuHawkInterfaces/IGui.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Drawing;
 using System.Drawing.Imaging;
-using System.Windows.Forms;
 
 namespace BizHawk.Client.Common
 {
@@ -19,7 +18,7 @@ namespace BizHawk.Client.Common
 
 		bool HasGUISurface { get; }
 
-		Padding Padding { get; set; }
+		(int Left, int Top, int Right, int Bottom) Padding { get; set; }
 
 		void AddMessage(string message);
 
diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index c8b75cc9c7..bab9b91f90 100644
--- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -18,7 +18,7 @@
 		<!--<Reference Include="System.Drawing" />-->
 		<Reference Include="System.IO.Compression" />
 		<Reference Include="System.Net.Http" />
-		<Reference Include="System.Windows.Forms" />
+		<!--<Reference Include="System.Windows.Forms" />-->
 		<!--<Reference Include="System.Xml" />-->
 		<!--<Reference Include="System.Xml.Linq" />-->
 	</ItemGroup>
diff --git a/BizHawk.Client.EmuHawk/Api/Libraries/GuiApi.cs b/BizHawk.Client.EmuHawk/Api/Libraries/GuiApi.cs
index d5ac1dbc89..06e575c44b 100644
--- a/BizHawk.Client.EmuHawk/Api/Libraries/GuiApi.cs
+++ b/BizHawk.Client.EmuHawk/Api/Libraries/GuiApi.cs
@@ -5,7 +5,6 @@ using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
 using System.Drawing.Text;
 using System.IO;
-using System.Windows.Forms;
 
 using BizHawk.Client.Common;
 using BizHawk.Emulation.Common;
@@ -77,7 +76,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public bool HasGUISurface => _GUISurface != null;
 
-		public Padding Padding { get; set; } = new Padding(0);
+		public (int Left, int Top, int Right, int Bottom) Padding { get; set; } = (0, 0, 0, 0);
 
 		public void AddMessage(string message) => GlobalWin.OSD.AddMessage(message);