diff --git a/BizHawk.Client.Common/tools/RamSearchEngine/IMiniWatch.cs b/BizHawk.Client.Common/tools/RamSearchEngine/IMiniWatch.cs
index cb5f59d5e6..044d64ea6d 100644
--- a/BizHawk.Client.Common/tools/RamSearchEngine/IMiniWatch.cs
+++ b/BizHawk.Client.Common/tools/RamSearchEngine/IMiniWatch.cs
@@ -1,6 +1,6 @@
 using BizHawk.Emulation.Common;
 
-namespace BizHawk.Client.Common
+namespace BizHawk.Client.Common.RamSearchEngine
 {
 	/// <summary>
 	/// Represents a Ram address for watching in the <see cref="RamSearchEngine" />
diff --git a/BizHawk.Client.Common/tools/RamSearchEngine/IMiniWatchDetails.cs b/BizHawk.Client.Common/tools/RamSearchEngine/IMiniWatchDetails.cs
index cc0f5a38f3..48648c88ca 100644
--- a/BizHawk.Client.Common/tools/RamSearchEngine/IMiniWatchDetails.cs
+++ b/BizHawk.Client.Common/tools/RamSearchEngine/IMiniWatchDetails.cs
@@ -1,6 +1,6 @@
 using BizHawk.Emulation.Common;
 
-namespace  BizHawk.Client.Common
+namespace  BizHawk.Client.Common.RamSearchEngine
 {
 	/// <summary>
 	/// Represents a <see cref="IMiniWatch" /> but with added details
diff --git a/BizHawk.Client.Common/tools/RamSearchEngine/RamSearchEngine.cs b/BizHawk.Client.Common/tools/RamSearchEngine/RamSearchEngine.cs
index ca3c041a11..f2754987cc 100644
--- a/BizHawk.Client.Common/tools/RamSearchEngine/RamSearchEngine.cs
+++ b/BizHawk.Client.Common/tools/RamSearchEngine/RamSearchEngine.cs
@@ -7,7 +7,7 @@ using BizHawk.Common.CollectionExtensions;
 using BizHawk.Emulation.Common;
 
 // ReSharper disable PossibleInvalidCastExceptionInForeachLoop
-namespace BizHawk.Client.Common
+namespace BizHawk.Client.Common.RamSearchEngine
 {
 	public class RamSearchEngine
 	{
diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
index 0faf707b8b..79bbbdedbe 100644
--- a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
+++ b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
@@ -10,6 +10,7 @@ using System.Text;
 using System.Windows.Forms;
 
 using BizHawk.Client.Common;
+using BizHawk.Client.Common.RamSearchEngine;
 using BizHawk.Client.EmuHawk.ToolExtensions;
 using BizHawk.Common.NumberExtensions;
 using BizHawk.Emulation.Common;