diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index e32d67cbb3..c846aab618 100644
--- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -111,12 +111,6 @@
     <Compile Include="config\ToolDialogSettings.cs" />
     <Compile Include="ControllerBinding.cs" />
     <Compile Include="CoreFileProvider.cs" />
-    <Compile Include="ExceptionBox.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ExceptionBox.Designer.cs">
-      <DependentUpon>ExceptionBox.cs</DependentUpon>
-    </Compile>
     <Compile Include="ExceptionClasses.cs" />
     <Compile Include="FirmwareManager.cs" />
     <Compile Include="GLManager.cs">
@@ -275,11 +269,6 @@
       <Name>BizHawk.Bizware.BizwareGL</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="ExceptionBox.resx">
-      <DependentUpon>ExceptionBox.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>
diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 1e39cdc4cc..8ae3af69a0 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -466,6 +466,12 @@
     <Compile Include="CoreFeatureAnalysis.Designer.cs">
       <DependentUpon>CoreFeatureAnalysis.cs</DependentUpon>
     </Compile>
+    <Compile Include="CustomControls\ExceptionBox.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="CustomControls\ExceptionBox.designer.cs">
+      <DependentUpon>ExceptionBox.cs</DependentUpon>
+    </Compile>
     <Compile Include="CustomControls\FolderBrowserDialogEx.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -1290,6 +1296,9 @@
     <EmbeddedResource Include="CoreFeatureAnalysis.resx">
       <DependentUpon>CoreFeatureAnalysis.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="CustomControls\ExceptionBox.resx">
+      <DependentUpon>ExceptionBox.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="CustomControls\InputConfigBase.resx">
       <DependentUpon>InputConfigBase.cs</DependentUpon>
     </EmbeddedResource>
diff --git a/BizHawk.Client.Common/ExceptionBox.Designer.cs b/BizHawk.Client.EmuHawk/CustomControls/ExceptionBox.Designer.cs
similarity index 95%
rename from BizHawk.Client.Common/ExceptionBox.Designer.cs
rename to BizHawk.Client.EmuHawk/CustomControls/ExceptionBox.Designer.cs
index 36bda19aca..172af1ff8b 100644
--- a/BizHawk.Client.Common/ExceptionBox.Designer.cs
+++ b/BizHawk.Client.EmuHawk/CustomControls/ExceptionBox.Designer.cs
@@ -1,4 +1,4 @@
-namespace BizHawk.Client.Common
+namespace BizHawk.Client.EmuHawk
 {
 	partial class ExceptionBox
 	{
@@ -34,7 +34,7 @@
 			this.txtException = new System.Windows.Forms.TextBox();
 			this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
 			this.btnCopy = new System.Windows.Forms.Button();
-			this.lblDone = new BizHawk.Client.Common.ExceptionBox.MyLabel();
+			this.lblDone = new ExceptionBox.MyLabel();
 			this.timer1 = new System.Windows.Forms.Timer(this.components);
 			this.tableLayoutPanel1.SuspendLayout();
 			this.flowLayoutPanel1.SuspendLayout();
diff --git a/BizHawk.Client.Common/ExceptionBox.cs b/BizHawk.Client.EmuHawk/CustomControls/ExceptionBox.cs
similarity index 87%
rename from BizHawk.Client.Common/ExceptionBox.cs
rename to BizHawk.Client.EmuHawk/CustomControls/ExceptionBox.cs
index b92dc91103..59f71001c7 100644
--- a/BizHawk.Client.Common/ExceptionBox.cs
+++ b/BizHawk.Client.EmuHawk/CustomControls/ExceptionBox.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-namespace BizHawk.Client.Common
+namespace BizHawk.Client.EmuHawk
 {
 	public partial class ExceptionBox : Form
 	{
@@ -26,10 +26,10 @@ namespace BizHawk.Client.Common
 		void DoCopy()
 		{
 			string txt = txtException.Text;
-			System.Windows.Forms.Clipboard.SetText(txt);
+			Clipboard.SetText(txt);
 			try 
 			{
-				if (System.Windows.Forms.Clipboard.GetText() == txt)
+				if (Clipboard.GetText() == txt)
 				{
 					lblDone.Text = "Done!";
 					lblDone.ForeColor = SystemColors.ControlText;
diff --git a/BizHawk.Client.Common/ExceptionBox.resx b/BizHawk.Client.EmuHawk/CustomControls/ExceptionBox.resx
similarity index 100%
rename from BizHawk.Client.Common/ExceptionBox.resx
rename to BizHawk.Client.EmuHawk/CustomControls/ExceptionBox.resx