diff --git a/src/BizHawk.Client.EmuHawk/AVOut/AviWriter.cs b/src/BizHawk.Client.EmuHawk/AVOut/AviWriter.cs
index da792ef0d4..87b6121708 100644
--- a/src/BizHawk.Client.EmuHawk/AVOut/AviWriter.cs
+++ b/src/BizHawk.Client.EmuHawk/AVOut/AviWriter.cs
@@ -3,8 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
-
-using BizHawk.Client.Common;
 using BizHawk.Common;
 using BizHawk.Emulation.Common;
 
diff --git a/src/BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.cs b/src/BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.cs
index 386cc83cf1..bcbde1d971 100644
--- a/src/BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.cs
+++ b/src/BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Windows.Forms;
 
-using BizHawk.Client.Common;
-
 namespace BizHawk.Client.EmuHawk
 {
 	/// <summary>
diff --git a/src/BizHawk.Client.EmuHawk/AVOut/GifWriter.cs b/src/BizHawk.Client.EmuHawk/AVOut/GifWriter.cs
index 5d14dfb45a..4f4496e542 100644
--- a/src/BizHawk.Client.EmuHawk/AVOut/GifWriter.cs
+++ b/src/BizHawk.Client.EmuHawk/AVOut/GifWriter.cs
@@ -1,8 +1,6 @@
 using System;
 using System.IO;
 using System.Drawing;
-
-using BizHawk.Client.Common;
 using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.EmuHawk
diff --git a/src/BizHawk.Client.EmuHawk/AVOut/GifWriterForm.cs b/src/BizHawk.Client.EmuHawk/AVOut/GifWriterForm.cs
index 7f3aed22cb..c8ee465270 100644
--- a/src/BizHawk.Client.EmuHawk/AVOut/GifWriterForm.cs
+++ b/src/BizHawk.Client.EmuHawk/AVOut/GifWriterForm.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Windows.Forms;
-using BizHawk.Client.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
diff --git a/src/BizHawk.Client.EmuHawk/AVOut/JMDWriter.cs b/src/BizHawk.Client.EmuHawk/AVOut/JMDWriter.cs
index ae7ff22575..d6dc4e2d74 100644
--- a/src/BizHawk.Client.EmuHawk/AVOut/JMDWriter.cs
+++ b/src/BizHawk.Client.EmuHawk/AVOut/JMDWriter.cs
@@ -10,7 +10,6 @@ using ICSharpCode.SharpZipLib.Zip.Compression.Streams;
 using ICSharpCode.SharpZipLib.Zip.Compression;
 
 using BizHawk.Emulation.Common;
-using BizHawk.Client.Common;
 using BizHawk.Common;
 
 namespace BizHawk.Client.EmuHawk
diff --git a/src/BizHawk.Client.EmuHawk/Communication.cs b/src/BizHawk.Client.EmuHawk/Communication.cs
index 602e065593..4125a6389c 100644
--- a/src/BizHawk.Client.EmuHawk/Communication.cs
+++ b/src/BizHawk.Client.EmuHawk/Communication.cs
@@ -9,7 +9,6 @@ using System.IO.MemoryMappedFiles;
 using BizHawk.Bizware.BizwareGL;
 using System.Drawing;
 using BizHawk.Emulation.Common;
-using BizHawk.Client.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
diff --git a/src/BizHawk.Client.EmuHawk/Input/KeyboardMapping.cs b/src/BizHawk.Client.EmuHawk/Input/KeyboardMapping.cs
index 5d1948e973..4325054c02 100644
--- a/src/BizHawk.Client.EmuHawk/Input/KeyboardMapping.cs
+++ b/src/BizHawk.Client.EmuHawk/Input/KeyboardMapping.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
-using BizHawk.Client.Common;
 using SlimDX.DirectInput;
 
 namespace BizHawk.Client.EmuHawk
diff --git a/src/BizHawk.Client.EmuHawk/Sound/Output/DirectSoundSoundOutput.cs b/src/BizHawk.Client.EmuHawk/Sound/Output/DirectSoundSoundOutput.cs
index 0724ca4951..4bf81c8955 100644
--- a/src/BizHawk.Client.EmuHawk/Sound/Output/DirectSoundSoundOutput.cs
+++ b/src/BizHawk.Client.EmuHawk/Sound/Output/DirectSoundSoundOutput.cs
@@ -6,8 +6,6 @@ using System.Linq;
 using SlimDX.DirectSound;
 using SlimDX.Multimedia;
 
-using BizHawk.Client.Common;
-
 namespace BizHawk.Client.EmuHawk
 {
 	public class DirectSoundSoundOutput : ISoundOutput
diff --git a/src/BizHawk.Client.EmuHawk/Sound/Output/DummySoundOutput.cs b/src/BizHawk.Client.EmuHawk/Sound/Output/DummySoundOutput.cs
index 92934744db..b454c160d8 100644
--- a/src/BizHawk.Client.EmuHawk/Sound/Output/DummySoundOutput.cs
+++ b/src/BizHawk.Client.EmuHawk/Sound/Output/DummySoundOutput.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Diagnostics;
 
-using BizHawk.Client.Common;
-
 namespace BizHawk.Client.EmuHawk
 {
 	public class DummySoundOutput : ISoundOutput
diff --git a/src/BizHawk.Client.EmuHawk/Sound/Output/OpenALSoundOutput.cs b/src/BizHawk.Client.EmuHawk/Sound/Output/OpenALSoundOutput.cs
index 3ad8fc0800..07706d113c 100644
--- a/src/BizHawk.Client.EmuHawk/Sound/Output/OpenALSoundOutput.cs
+++ b/src/BizHawk.Client.EmuHawk/Sound/Output/OpenALSoundOutput.cs
@@ -5,8 +5,6 @@ using System.Linq;
 using OpenTK.Audio;
 using OpenTK.Audio.OpenAL;
 
-using BizHawk.Client.Common;
-
 namespace BizHawk.Client.EmuHawk
 {
 	public class OpenALSoundOutput : ISoundOutput
diff --git a/src/BizHawk.Client.EmuHawk/Sound/Output/XAudio2SoundOutput.cs b/src/BizHawk.Client.EmuHawk/Sound/Output/XAudio2SoundOutput.cs
index bd3d91a724..bfe2037145 100644
--- a/src/BizHawk.Client.EmuHawk/Sound/Output/XAudio2SoundOutput.cs
+++ b/src/BizHawk.Client.EmuHawk/Sound/Output/XAudio2SoundOutput.cs
@@ -6,8 +6,6 @@ using SlimDX;
 using SlimDX.Multimedia;
 using SlimDX.XAudio2;
 
-using BizHawk.Client.Common;
-
 namespace BizHawk.Client.EmuHawk
 {
 	public class XAudio2SoundOutput : ISoundOutput
diff --git a/src/BizHawk.Client.EmuHawk/Sound/Utilities/SoundOutputProvider.cs b/src/BizHawk.Client.EmuHawk/Sound/Utilities/SoundOutputProvider.cs
index 9ec03e1498..01d3213475 100644
--- a/src/BizHawk.Client.EmuHawk/Sound/Utilities/SoundOutputProvider.cs
+++ b/src/BizHawk.Client.EmuHawk/Sound/Utilities/SoundOutputProvider.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-
-using BizHawk.Client.Common;
 using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.EmuHawk
diff --git a/src/BizHawk.Client.EmuHawk/config/FileExtensionPreferencesPicker.cs b/src/BizHawk.Client.EmuHawk/config/FileExtensionPreferencesPicker.cs
index 451df3d4f9..8b6eb14a13 100644
--- a/src/BizHawk.Client.EmuHawk/config/FileExtensionPreferencesPicker.cs
+++ b/src/BizHawk.Client.EmuHawk/config/FileExtensionPreferencesPicker.cs
@@ -4,7 +4,6 @@ using System.Linq;
 using System.Windows.Forms;
 
 using BizHawk.Emulation.Common;
-using BizHawk.Client.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
diff --git a/src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.cs b/src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.cs
index f84749040a..de823dd36f 100644
--- a/src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.cs
+++ b/src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.cs
@@ -1,7 +1,6 @@
 using System.Windows.Forms;
 
 using BizHawk.Emulation.Cores.Nintendo.Gameboy;
-using BizHawk.Client.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
diff --git a/src/BizHawk.Client.EmuHawk/config/NES/NESSoundConfig.cs b/src/BizHawk.Client.EmuHawk/config/NES/NESSoundConfig.cs
index ad433032c7..586d66f268 100644
--- a/src/BizHawk.Client.EmuHawk/config/NES/NESSoundConfig.cs
+++ b/src/BizHawk.Client.EmuHawk/config/NES/NESSoundConfig.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Windows.Forms;
-
 using BizHawk.Client.Common;
 using BizHawk.Emulation.Cores.Nintendo.NES;
 using BizHawk.Emulation.Common;
diff --git a/src/BizHawk.Client.EmuHawk/tools/BatchRunner.cs b/src/BizHawk.Client.EmuHawk/tools/BatchRunner.cs
index db7ee96a7b..f4d0ddd8d7 100644
--- a/src/BizHawk.Client.EmuHawk/tools/BatchRunner.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/BatchRunner.cs
@@ -4,7 +4,6 @@ using System.IO;
 using BizHawk.Common;
 using BizHawk.Client.Common;
 using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Cores.Nintendo.GBA;
 
 namespace BizHawk.Client.EmuHawk
 {
diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs
index a6e2368b62..714f44d381 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.cs b/src/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.cs
index 2b056a8695..793059cec2 100644
--- a/src/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Windows.Forms;
-
 using BizHawk.Client.Common;
 using BizHawk.Emulation.Cores.Nintendo.NES;
 using BizHawk.Emulation.Common;
diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/NameTableViewer.cs b/src/BizHawk.Client.EmuHawk/tools/NES/NameTableViewer.cs
index afdfb03c2e..f94d73bba3 100644
--- a/src/BizHawk.Client.EmuHawk/tools/NES/NameTableViewer.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/NES/NameTableViewer.cs
@@ -1,10 +1,5 @@
 using System.Drawing;
 using System.Windows.Forms;
-using System.IO;
-using System.Drawing.Imaging;
-
-using BizHawk.Client.Common;
-using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.cs
index 16a3951c84..fccb7d6dce 100644
--- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
-
-using BizHawk.Client.Common;
 using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.EmuHawk
diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadButton.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadButton.cs
index 99fe50a098..7449931479 100644
--- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadButton.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadButton.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Windows.Forms;
 using System.Drawing;
-
-using BizHawk.Client.Common;
 using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.EmuHawk
diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.cs
index d89739646e..c041498caf 100644
--- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
-
-using BizHawk.Client.Common;
 using BizHawk.Emulation.Common;
 using BizHawk.Emulation.Cores.Sony.PSX;
 
diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadTargetScreen.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadTargetScreen.cs
index c98d10a678..4428c62069 100644
--- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadTargetScreen.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadTargetScreen.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
-
-using BizHawk.Client.Common;
 using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.EmuHawk
diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PcfxSchema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PcfxSchema.cs
index e8ceec6d72..1d0a1aa31e 100644
--- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PcfxSchema.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PcfxSchema.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Drawing;
 using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Cores.Consoles.NEC.PCFX;
 
 namespace BizHawk.Client.EmuHawk
 {
diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs
index ae021a366f..314e68dc35 100644
--- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs
@@ -1,11 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Windows.Forms;
-
 using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Cores.Consoles.Sega.Saturn;
 
 namespace BizHawk.Client.EmuHawk
 {