diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index c846aab618..66e8d42993 100644
--- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -113,9 +113,6 @@
     <Compile Include="CoreFileProvider.cs" />
     <Compile Include="ExceptionClasses.cs" />
     <Compile Include="FirmwareManager.cs" />
-    <Compile Include="GLManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Global.cs" />
     <Compile Include="inputAdapters\AutoPattern.cs" />
     <Compile Include="inputAdapters\BitwiseAdapters.cs" />
diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 8ae3af69a0..7f99012e03 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -549,6 +549,7 @@
     <Compile Include="Extensions\ControlExtensions.cs" />
     <Compile Include="Extensions\CoreExtensions.cs" />
     <Compile Include="Extensions\ToolExtensions.cs" />
+    <Compile Include="GLManager.cs" />
     <Compile Include="GlobalWin.cs" />
     <Compile Include="Input\GamePad.cs" Condition=" '$(OS)' == 'Windows_NT' " />
     <Compile Include="Input\GamePad360.cs" />
diff --git a/BizHawk.Client.Common/GLManager.cs b/BizHawk.Client.EmuHawk/GLManager.cs
similarity index 94%
rename from BizHawk.Client.Common/GLManager.cs
rename to BizHawk.Client.EmuHawk/GLManager.cs
index de6826d67d..85000bab91 100644
--- a/BizHawk.Client.Common/GLManager.cs
+++ b/BizHawk.Client.EmuHawk/GLManager.cs
@@ -2,7 +2,7 @@ using System;
 using BizHawk.Bizware.BizwareGL;
 
 
-namespace BizHawk.Client.Common
+namespace BizHawk.Client.EmuHawk
 {
 	/// <summary>
 	/// This singleton class manages OpenGL contexts, in an effort to minimize context changes.
diff --git a/BizHawk.Client.MultiHawk/DisplayManager/DisplayManager.cs b/BizHawk.Client.MultiHawk/DisplayManager/DisplayManager.cs
index 5c7719286b..add6a9f198 100644
--- a/BizHawk.Client.MultiHawk/DisplayManager/DisplayManager.cs
+++ b/BizHawk.Client.MultiHawk/DisplayManager/DisplayManager.cs
@@ -9,6 +9,7 @@ using System.Drawing;
 
 using BizHawk.Emulation.Common;
 using BizHawk.Client.Common;
+using BizHawk.Client.EmuHawk;
 using BizHawk.Client.EmuHawk.FilterManager;
 using BizHawk.Bizware.BizwareGL;
 
diff --git a/BizHawk.Client.MultiHawk/EmulatorWindow.cs b/BizHawk.Client.MultiHawk/EmulatorWindow.cs
index cc1734a8d0..8b3f57e0a2 100644
--- a/BizHawk.Client.MultiHawk/EmulatorWindow.cs
+++ b/BizHawk.Client.MultiHawk/EmulatorWindow.cs
@@ -9,6 +9,7 @@ using System.Windows.Forms;
 
 using BizHawk.Common;
 using BizHawk.Common.BufferExtensions;
+using BizHawk.Client.EmuHawk;
 using BizHawk.Bizware.BizwareGL;
 using BizHawk.Client.Common;
 using BizHawk.Emulation.Common;
diff --git a/BizHawk.Client.MultiHawk/Mainform.cs b/BizHawk.Client.MultiHawk/Mainform.cs
index 4483834a48..7f4d753066 100644
--- a/BizHawk.Client.MultiHawk/Mainform.cs
+++ b/BizHawk.Client.MultiHawk/Mainform.cs
@@ -13,6 +13,7 @@ using System.Windows.Forms;
 
 using BizHawk.Common;
 using BizHawk.Common.IOExtensions;
+using BizHawk.Client.EmuHawk;
 using BizHawk.Bizware.BizwareGL;
 using BizHawk.Emulation.Common;
 using BizHawk.Emulation.Common.IEmulatorExtensions;
@@ -32,7 +33,7 @@ namespace BizHawk.Client.MultiHawk
 
 		public Mainform(string[] args)
 		{
-			BizHawk.Client.Common.GLManager.CreateInstance();
+			GLManager.CreateInstance();
 
 			InitializeComponent();
 			_throttle = new BizHawk.Client.EmuHawk.Throttle();
@@ -319,7 +320,7 @@ namespace BizHawk.Client.MultiHawk
 					Emulator = loader.LoadedEmulator,
 
 					GL = new Bizware.BizwareGL.Drivers.OpenTK.IGL_TK(),
-					GLManager = BizHawk.Client.Common.GLManager.Instance,
+					GLManager = GLManager.Instance,
 					Game = loader.Game,
 					CurrentRomPath = loader.CanonicalFullPath
 				};