diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 632a6603eb..3a0220059a 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -717,12 +717,14 @@
     <Compile Include="RomStatusPicker.Designer.cs">
       <DependentUpon>RomStatusPicker.cs</DependentUpon>
     </Compile>
+    <Compile Include="Sound\Interfaces\IBufferedSoundProvider.cs" />
     <Compile Include="Sound\Interfaces\ISoundOutput.cs" />
     <Compile Include="Sound\Output\DirectSoundSoundOutput.cs" />
     <Compile Include="Sound\Output\DummySoundOutput.cs" />
     <Compile Include="Sound\Output\OpenALSoundOutput.cs" />
     <Compile Include="Sound\Output\XAudio2SoundOutput.cs" />
     <Compile Include="Sound\Sound.cs" />
+    <Compile Include="Sound\Utilities\BufferedAsync.cs" />
     <Compile Include="Sound\Utilities\SoundOutputProvider.cs" />
     <Compile Include="Throttle.cs" />
     <Compile Include="ToolAttributes.cs" />
diff --git a/BizHawk.Emulation.Common/Interfaces/IBufferedSoundProvider.cs b/BizHawk.Client.EmuHawk/Sound/Interfaces/IBufferedSoundProvider.cs
similarity index 79%
rename from BizHawk.Emulation.Common/Interfaces/IBufferedSoundProvider.cs
rename to BizHawk.Client.EmuHawk/Sound/Interfaces/IBufferedSoundProvider.cs
index aec9efda87..f47c60b057 100644
--- a/BizHawk.Emulation.Common/Interfaces/IBufferedSoundProvider.cs
+++ b/BizHawk.Client.EmuHawk/Sound/Interfaces/IBufferedSoundProvider.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Common
+using BizHawk.Emulation.Common;
+
+namespace BizHawk.Client.EmuHawk
 {
 	public interface IBufferedSoundProvider
 	{
diff --git a/BizHawk.Emulation.Common/Sound/Utilities/BufferedAsync.cs b/BizHawk.Client.EmuHawk/Sound/Utilities/BufferedAsync.cs
similarity index 95%
rename from BizHawk.Emulation.Common/Sound/Utilities/BufferedAsync.cs
rename to BizHawk.Client.EmuHawk/Sound/Utilities/BufferedAsync.cs
index aab88f280b..4b132e6b0c 100644
--- a/BizHawk.Emulation.Common/Sound/Utilities/BufferedAsync.cs
+++ b/BizHawk.Client.EmuHawk/Sound/Utilities/BufferedAsync.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
 
-namespace BizHawk.Emulation.Common
+using BizHawk.Emulation.Common;
+
+namespace BizHawk.Client.EmuHawk
 {
 	// Generates SEMI-synchronous sound, or "buffered asynchronous" sound.
 
diff --git a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
index d3045c5a35..ce06f98ac7 100644
--- a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
+++ b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
@@ -117,7 +117,6 @@
     <Compile Include="EmulationExceptions.cs" />
     <Compile Include="Enums.cs" />
     <Compile Include="Extensions.cs" />
-    <Compile Include="Interfaces\IBufferedSoundProvider.cs" />
     <Compile Include="Interfaces\IController.cs" />
     <Compile Include="Interfaces\ICoreFileProvider.cs" />
     <Compile Include="Interfaces\IEmulator.cs" />
@@ -145,7 +144,6 @@
     <Compile Include="ServiceAttributes.cs" />
     <Compile Include="ServiceInjector.cs" />
     <Compile Include="Sound\Utilities\BlipBuffer.cs" />
-    <Compile Include="Sound\Utilities\BufferedAsync.cs" />
     <Compile Include="Sound\Utilities\DCFilter.cs" />
     <Compile Include="Sound\Utilities\Equalizer.cs" />
     <Compile Include="Sound\Utilities\Metaspu.cs" />