diff --git a/src/windows/Stella.vcxproj b/src/windows/Stella.vcxproj
index c9225f627..021ec6dcb 100644
--- a/src/windows/Stella.vcxproj
+++ b/src/windows/Stella.vcxproj
@@ -228,6 +228,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\common\AudioQueue.cxx" />
     <ClCompile Include="..\common\Base.cxx" />
     <ClCompile Include="..\common\EventHandlerSDL2.cxx" />
     <ClCompile Include="..\common\FBSurfaceSDL2.cxx" />
@@ -325,6 +326,8 @@
     <ClCompile Include="..\emucore\MindLink.cxx" />
     <ClCompile Include="..\emucore\PointingDevice.cxx" />
     <ClCompile Include="..\emucore\TIASurface.cxx" />
+    <ClCompile Include="..\emucore\tia\Audio.cxx" />
+    <ClCompile Include="..\emucore\tia\AudioChannel.cxx" />
     <ClCompile Include="..\emucore\tia\Background.cxx" />
     <ClCompile Include="..\emucore\tia\Ball.cxx" />
     <ClCompile Include="..\emucore\tia\DrawCounterDecodes.cxx" />
@@ -407,7 +410,6 @@
     <ClCompile Include="..\emucore\Switches.cxx" />
     <ClCompile Include="..\emucore\System.cxx" />
     <ClCompile Include="..\emucore\Thumbulator.cxx" />
-    <ClCompile Include="..\emucore\TIASnd.cxx" />
     <ClCompile Include="..\cheat\BankRomCheat.cxx" />
     <ClCompile Include="..\cheat\CheatCodeDialog.cxx" />
     <ClCompile Include="..\cheat\CheatManager.cxx" />
@@ -508,6 +510,7 @@
     <ClCompile Include="..\libpng\pngwutil.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\common\AudioQueue.hxx" />
     <ClInclude Include="..\common\Base.hxx" />
     <ClInclude Include="..\common\bspf.hxx" />
     <ClInclude Include="..\common\EventHandlerSDL2.hxx" />
@@ -620,6 +623,8 @@
     <ClInclude Include="..\emucore\MindLink.hxx" />
     <ClInclude Include="..\emucore\PointingDevice.hxx" />
     <ClInclude Include="..\emucore\TIASurface.hxx" />
+    <ClInclude Include="..\emucore\tia\Audio.hxx" />
+    <ClInclude Include="..\emucore\tia\AudioChannel.hxx" />
     <ClInclude Include="..\emucore\tia\Background.hxx" />
     <ClInclude Include="..\emucore\tia\Ball.hxx" />
     <ClInclude Include="..\emucore\tia\DelayQueue.hxx" />
@@ -726,7 +731,6 @@
     <ClInclude Include="..\emucore\Switches.hxx" />
     <ClInclude Include="..\emucore\System.hxx" />
     <ClInclude Include="..\emucore\Thumbulator.hxx" />
-    <ClInclude Include="..\emucore\TIASnd.hxx" />
     <ClInclude Include="..\debugger\gui\AudioWidget.hxx" />
     <ClInclude Include="..\debugger\CartDebug.hxx" />
     <ClInclude Include="..\debugger\CpuDebug.hxx" />
diff --git a/src/windows/Stella.vcxproj.filters b/src/windows/Stella.vcxproj.filters
index 7997369dd..f43f77d34 100644
--- a/src/windows/Stella.vcxproj.filters
+++ b/src/windows/Stella.vcxproj.filters
@@ -237,9 +237,6 @@
     <ClCompile Include="..\emucore\Thumbulator.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
-    <ClCompile Include="..\emucore\TIASnd.cxx">
-      <Filter>Source Files\emucore</Filter>
-    </ClCompile>
     <ClCompile Include="..\cheat\BankRomCheat.cxx">
       <Filter>Source Files\cheat</Filter>
     </ClCompile>
@@ -891,6 +888,15 @@
     <ClCompile Include="..\emucore\tia\frame-manager\YStartDetector.cxx">
       <Filter>Source Files\emucore\tia</Filter>
     </ClCompile>
+    <ClCompile Include="..\common\AudioQueue.cxx">
+      <Filter>Source Files\emucore</Filter>
+    </ClCompile>
+    <ClCompile Include="..\emucore\tia\AudioChannel.cxx">
+      <Filter>Source Files\emucore\tia</Filter>
+    </ClCompile>
+    <ClCompile Include="..\emucore\tia\Audio.cxx">
+      <Filter>Source Files\emucore\tia</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\common\bspf.hxx">
@@ -1103,9 +1109,6 @@
     <ClInclude Include="..\emucore\Thumbulator.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
-    <ClInclude Include="..\emucore\TIASnd.hxx">
-      <Filter>Header Files\emucore</Filter>
-    </ClInclude>
     <ClInclude Include="..\debugger\gui\AudioWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
@@ -1823,6 +1826,15 @@
     <ClInclude Include="..\emucore\tia\TIAConstants.hxx">
       <Filter>Header Files\emucore\tia</Filter>
     </ClInclude>
+    <ClInclude Include="..\common\AudioQueue.hxx">
+      <Filter>Header Files\emucore</Filter>
+    </ClInclude>
+    <ClInclude Include="..\emucore\tia\AudioChannel.hxx">
+      <Filter>Header Files\emucore\tia</Filter>
+    </ClInclude>
+    <ClInclude Include="..\emucore\tia\Audio.hxx">
+      <Filter>Header Files\emucore\tia</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="stella.ico">