diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index 9390d09765..8f568e4796 100644
--- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -101,8 +101,11 @@
     <Compile Include="Global.cs" />
     <Compile Include="helpers\InputValidate.cs" />
     <Compile Include="KeyTurbo.cs" />
+    <Compile Include="lua\EmuLuaLibrary.Bit.cs" />
+    <Compile Include="lua\LuaDocumentation.cs" />
     <Compile Include="lua\LuaFile.cs" />
     <Compile Include="lua\LuaFunctionList.cs" />
+    <Compile Include="lua\LuaLibraryBase.cs" />
     <Compile Include="lua\NamedLuaFunction.cs" />
     <Compile Include="movie\InputAdapters.cs" />
     <Compile Include="movie\Movie.cs" />
diff --git a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Bit.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.Bit.cs
similarity index 92%
rename from BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Bit.cs
rename to BizHawk.Client.Common/lua/EmuLuaLibrary.Bit.cs
index 9558634460..206be6caf5 100644
--- a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Bit.cs
+++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.Bit.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.Common
 {
 	public class BitLuaLibrary : LuaLibraryBase
 	{
diff --git a/BizHawk.MultiClient/tools/Lua/LuaDocumentation.cs b/BizHawk.Client.Common/lua/LuaDocumentation.cs
similarity index 94%
rename from BizHawk.MultiClient/tools/Lua/LuaDocumentation.cs
rename to BizHawk.Client.Common/lua/LuaDocumentation.cs
index e4da749a54..c3f22b38fb 100644
--- a/BizHawk.MultiClient/tools/Lua/LuaDocumentation.cs
+++ b/BizHawk.Client.Common/lua/LuaDocumentation.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.Common
 {
 	public interface ILuaDocumentation
 	{
diff --git a/BizHawk.MultiClient/tools/Lua/Libraries/LuaLibraryBase.cs b/BizHawk.Client.Common/lua/LuaLibraryBase.cs
similarity index 93%
rename from BizHawk.MultiClient/tools/Lua/Libraries/LuaLibraryBase.cs
rename to BizHawk.Client.Common/lua/LuaLibraryBase.cs
index 9af8c0be70..41d8b312af 100644
--- a/BizHawk.MultiClient/tools/Lua/Libraries/LuaLibraryBase.cs
+++ b/BizHawk.Client.Common/lua/LuaLibraryBase.cs
@@ -2,7 +2,7 @@
 
 using LuaInterface;
 
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.Common
 {
 	public abstract class LuaLibraryBase
 	{
diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index 212b1b9cb7..0d81d8d0cf 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -443,7 +443,6 @@
     <Compile Include="tools\HexEditor\MemoryViewer.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.Bit.cs" />
     <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.Client.cs" />
     <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.Common.cs" />
     <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.Console.cs" />
@@ -460,7 +459,6 @@
     <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.NES.cs" />
     <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.Savestate.cs" />
     <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.SNES.cs" />
-    <Compile Include="tools\Lua\Libraries\LuaLibraryBase.cs" />
     <Compile Include="tools\Lua\LuaButton.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -470,7 +468,6 @@
     <Compile Include="tools\Lua\LuaConsole.Designer.cs">
       <DependentUpon>LuaConsole.cs</DependentUpon>
     </Compile>
-    <Compile Include="tools\Lua\LuaDocumentation.cs" />
     <Compile Include="tools\Lua\LuaFunctionsForm.cs">
       <SubType>Form</SubType>
     </Compile>
diff --git a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Console.cs b/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Console.cs
index 91f6fa2ba6..a446187e60 100644
--- a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Console.cs
+++ b/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Console.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using System.Text;
 
 using LuaInterface;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {
diff --git a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Forms.cs b/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Forms.cs
index 28494f83c6..e776c94a5f 100644
--- a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Forms.cs
+++ b/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Forms.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Windows.Forms;
 
 using LuaInterface;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {
diff --git a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Input.cs b/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Input.cs
index 4c91481bd2..5a0177bba8 100644
--- a/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Input.cs
+++ b/BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Input.cs
@@ -1,6 +1,8 @@
 using System.Drawing;
 using System.Windows.Forms;
+
 using LuaInterface;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {
diff --git a/BizHawk.MultiClient/tools/Lua/LuaFunctionsForm.cs b/BizHawk.MultiClient/tools/Lua/LuaFunctionsForm.cs
index e9bcd57b2e..5495b82e8e 100644
--- a/BizHawk.MultiClient/tools/Lua/LuaFunctionsForm.cs
+++ b/BizHawk.MultiClient/tools/Lua/LuaFunctionsForm.cs
@@ -2,7 +2,8 @@
 using System.Linq;
 using System.Windows.Forms;
 using System.Text;
-using BizHawk.MultiClient;
+
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {