diff --git a/BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.cs b/BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.cs
index 2a35ca3afc..b09573ba1e 100644
--- a/BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.cs
+++ b/BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.cs
@@ -5,11 +5,11 @@ using System.Text.RegularExpressions;
 using System.Windows.Forms;
 
 using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Common.IEmulatorExtensions;
 using BizHawk.Client.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
+	[ToolAttributes(false, null)]
 	public partial class GBGameGenie : Form, IToolFormAutoConfig
 	{
 		// TODO: fix the use of Global.Game.System and Emulator.SystemId
diff --git a/BizHawk.Client.EmuHawk/tools/Genesis/GenGameGenie.cs b/BizHawk.Client.EmuHawk/tools/Genesis/GenGameGenie.cs
index 3d5b730ab2..a00b0858f2 100644
--- a/BizHawk.Client.EmuHawk/tools/Genesis/GenGameGenie.cs
+++ b/BizHawk.Client.EmuHawk/tools/Genesis/GenGameGenie.cs
@@ -12,6 +12,7 @@ using BizHawk.Emulation.Cores.Consoles.Sega.gpgx;
 
 namespace BizHawk.Client.EmuHawk
 {
+	[ToolAttributes(false, null)]
 	public partial class GenGameGenie : Form, IToolFormAutoConfig
 	{
 		#pragma warning disable 675
diff --git a/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs b/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs
index 9bce0c8c31..6cbfcfc980 100644
--- a/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs
+++ b/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs
@@ -4,11 +4,11 @@ using System.Globalization;
 using System.Windows.Forms;
 
 using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Common.IEmulatorExtensions;
 using BizHawk.Client.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
+	[ToolAttributes(false, null)]
 	public partial class NESGameGenie : Form, IToolFormAutoConfig
 	{
 		[RequiredService]
diff --git a/BizHawk.Client.EmuHawk/tools/SNES/SNESGameGenie.cs b/BizHawk.Client.EmuHawk/tools/SNES/SNESGameGenie.cs
index 160d08cfb3..e527112d68 100644
--- a/BizHawk.Client.EmuHawk/tools/SNES/SNESGameGenie.cs
+++ b/BizHawk.Client.EmuHawk/tools/SNES/SNESGameGenie.cs
@@ -5,12 +5,12 @@ using System.Text.RegularExpressions;
 using System.Windows.Forms;
 
 using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Common.IEmulatorExtensions;
 using BizHawk.Emulation.Cores.Nintendo.SNES;
 using BizHawk.Client.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
+	[ToolAttributes(false, null)]
 	public partial class SNESGameGenie : Form, IToolFormAutoConfig
 	{
 		[RequiredService]