diff --git a/examples/libnyquist-examples.vcxproj/libnyquist-examples.sln b/examples/libnyquist-examples.vcxproj/libnyquist-examples.sln
index 8ce69bd..52af300 100644
--- a/examples/libnyquist-examples.vcxproj/libnyquist-examples.sln
+++ b/examples/libnyquist-examples.vcxproj/libnyquist-examples.sln
@@ -5,6 +5,8 @@ VisualStudioVersion = 12.0.30723.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnyquist-examples", "libnyquist-examples.vcxproj", "{C0C0C270-FB9E-4EEB-8F22-180BB2FA800B}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnyquist", "..\..\libnyquist.vcxproj\libnyquist.vcxproj", "{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -15,6 +17,10 @@ Global
 		{C0C0C270-FB9E-4EEB-8F22-180BB2FA800B}.Debug|Win32.Build.0 = Debug|Win32
 		{C0C0C270-FB9E-4EEB-8F22-180BB2FA800B}.Release|Win32.ActiveCfg = Release|Win32
 		{C0C0C270-FB9E-4EEB-8F22-180BB2FA800B}.Release|Win32.Build.0 = Release|Win32
+		{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}.Debug|Win32.Build.0 = Debug|Win32
+		{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}.Release|Win32.ActiveCfg = Release|Win32
+		{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/examples/libnyquist-examples.vcxproj/libnyquist-examples.vcxproj b/examples/libnyquist-examples.vcxproj/libnyquist-examples.vcxproj
index 09953b0..96e9a56 100644
--- a/examples/libnyquist-examples.vcxproj/libnyquist-examples.vcxproj
+++ b/examples/libnyquist-examples.vcxproj/libnyquist-examples.vcxproj
@@ -45,6 +45,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(SolutionDir)../../include;$(SolutionDir)../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>__WINDOWS_DS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -58,6 +59,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(SolutionDir)../../include;$(SolutionDir)../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>__WINDOWS_DS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -72,6 +74,16 @@
   <ItemGroup>
     <ClInclude Include="..\..\third_party\rtaudio\RtAudio.h" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\libnyquist.vcxproj\libnyquist.vcxproj">
+      <Project>{0eec3739-f60a-4b90-8b75-9e1aff28106a}</Project>
+      <Private>false</Private>
+      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+      <UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/examples/libnyquist-examples.vcxproj/libnyquist-examples.vcxproj.filters b/examples/libnyquist-examples.vcxproj/libnyquist-examples.vcxproj.filters
index 8e6e979..6580e30 100644
--- a/examples/libnyquist-examples.vcxproj/libnyquist-examples.vcxproj.filters
+++ b/examples/libnyquist-examples.vcxproj/libnyquist-examples.vcxproj.filters
@@ -11,15 +11,15 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\Main.cpp">
+    <ClCompile Include="..\src\Main.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\third_party\rtaudio\RtAudio.cpp">
+    <ClCompile Include="..\..\third_party\rtaudio\RtAudio.cpp">
       <Filter>third_party</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\third_party\rtaudio\RtAudio.h">
+    <ClInclude Include="..\..\third_party\rtaudio\RtAudio.h">
       <Filter>third_party</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/libnyquist.vcxproj/libnyquist.vcxproj b/libnyquist.vcxproj/libnyquist.vcxproj
index 026656b..0571693 100644
--- a/libnyquist.vcxproj/libnyquist.vcxproj
+++ b/libnyquist.vcxproj/libnyquist.vcxproj
@@ -11,49 +11,49 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="$(SolutionDir)..\third_party\rtaudio\RtAudio.cpp" />
-    <ClCompile Include="$(SolutionDir)..\src\AudioDecoder.cpp" />
-    <ClCompile Include="$(SolutionDir)..\src\Common.cpp" />
-    <ClCompile Include="$(SolutionDir)..\src\FlacDecoder.cpp" />
-    <ClCompile Include="$(SolutionDir)..\src\OpusDecoder.cpp" />
-    <ClCompile Include="$(SolutionDir)..\src\WavDecoder.cpp" />
-    <ClCompile Include="$(SolutionDir)..\src\AudioDevice.cpp" />
-    <ClCompile Include="$(SolutionDir)..\src\WavPackDecoder.cpp" />
-    <ClCompile Include="..\src\CafDecoder.cpp" />
-    <ClCompile Include="..\src\FlacDependencies.c" />
-    <ClCompile Include="..\src\OpusDependencies.c" />
-    <ClCompile Include="..\src\VorbisDecoder.cpp" />
-    <ClCompile Include="..\src\VorbisDependencies.c" />
-    <ClCompile Include="..\src\WavEncoder.cpp" />
-    <ClCompile Include="..\third_party\opus\celt\celt_decoder.c" />
-    <ClCompile Include="..\third_party\opus\celt\celt_encoder.c" />
-    <ClCompile Include="..\third_party\wavpack\src\bits.c" />
-    <ClCompile Include="..\third_party\wavpack\src\extra1.c" />
-    <ClCompile Include="..\third_party\wavpack\src\extra2.c" />
-    <ClCompile Include="..\third_party\wavpack\src\float.c" />
-    <ClCompile Include="..\third_party\wavpack\src\metadata.c" />
-    <ClCompile Include="..\third_party\wavpack\src\pack.c" />
-    <ClCompile Include="..\third_party\wavpack\src\tags.c" />
-    <ClCompile Include="..\third_party\wavpack\src\unpack.c" />
-    <ClCompile Include="..\third_party\wavpack\src\unpack3.c" />
-    <ClCompile Include="..\third_party\wavpack\src\words.c" />
-    <ClCompile Include="..\third_party\wavpack\src\wputils.c" />
+    <ClCompile Include="$(ProjectDir)..\src\AudioDecoder.cpp" />
+    <ClCompile Include="$(ProjectDir)..\src\Common.cpp" />
+    <ClCompile Include="$(ProjectDir)..\src\FlacDecoder.cpp" />
+    <ClCompile Include="$(ProjectDir)..\src\OpusDecoder.cpp" />
+    <ClCompile Include="$(ProjectDir)..\src\WavDecoder.cpp" />
+    <ClCompile Include="$(ProjectDir)..\src\AudioDevice.cpp" />
+    <ClCompile Include="$(ProjectDir)..\src\WavPackDecoder.cpp" />
+    <ClCompile Include="$(ProjectDir)..\src\CafDecoder.cpp" />
+    <ClCompile Include="$(ProjectDir)..\src\FlacDependencies.c" />
+    <ClCompile Include="$(ProjectDir)..\src\OpusDependencies.c" />
+    <ClCompile Include="$(ProjectDir)..\src\VorbisDecoder.cpp" />
+    <ClCompile Include="$(ProjectDir)..\src\VorbisDependencies.c" />
+    <ClCompile Include="$(ProjectDir)..\src\WavEncoder.cpp" />
+    <ClCompile Include="$(ProjectDir)..\src\RiffUtils.cpp" />
+    <ClCompile Include="$(ProjectDir)..\third_party\opus\celt\celt_decoder.c" />
+    <ClCompile Include="$(ProjectDir)..\third_party\opus\celt\celt_encoder.c" />
+    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\bits.c" />
+    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\extra1.c" />
+    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\extra2.c" />
+    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\float.c" />
+    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\metadata.c" />
+    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\pack.c" />
+    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\tags.c" />
+    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\unpack.c" />
+    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\unpack3.c" />
+    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\words.c" />
+    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\wputils.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(SolutionDir)..\third_party\rtaudio\RtAudio.h" />
-    <ClInclude Include="$(SolutionDir)..\include\libnyquist\AudioDecoder.h" />
-    <ClInclude Include="$(SolutionDir)..\include\libnyquist\FlacDecoder.h" />
-    <ClInclude Include="$(SolutionDir)..\include\libnyquist\OpusDecoder.h" />
-    <ClInclude Include="$(SolutionDir)..\include\libnyquist\PostProcess.h" />
-    <ClInclude Include="$(SolutionDir)..\include\libnyquist\WavDecoder.h" />
-    <ClInclude Include="$(SolutionDir)..\include\libnyquist\AudioDevice.h" />
-    <ClInclude Include="$(SolutionDir)..\include\libnyquist\Common.h" />
-    <ClInclude Include="$(SolutionDir)..\include\libnyquist\Dither.h" />
-    <ClInclude Include="$(SolutionDir)..\include\libnyquist\RingBuffer.h" />
-    <ClInclude Include="$(SolutionDir)..\include\libnyquist\WavPackDecoder.h" />
-    <ClInclude Include="..\include\libnyquist\CafDecoder.h" />
-    <ClInclude Include="..\include\libnyquist\VorbisDecoder.h" />
-    <ClInclude Include="..\include\libnyquist\WavEncoder.h" />
+    <ClInclude Include="$(ProjectDir)..\include\libnyquist\AudioDecoder.h" />
+    <ClInclude Include="$(ProjectDir)..\include\libnyquist\FlacDecoder.h" />
+    <ClInclude Include="$(ProjectDir)..\include\libnyquist\OpusDecoder.h" />
+    <ClInclude Include="$(ProjectDir)..\include\libnyquist\PostProcess.h" />
+    <ClInclude Include="$(ProjectDir)..\include\libnyquist\WavDecoder.h" />
+    <ClInclude Include="$(ProjectDir)..\include\libnyquist\AudioDevice.h" />
+    <ClInclude Include="$(ProjectDir)..\include\libnyquist\Common.h" />
+    <ClInclude Include="$(ProjectDir)..\include\libnyquist\Dither.h" />
+    <ClInclude Include="$(ProjectDir)..\include\libnyquist\RingBuffer.h" />
+    <ClInclude Include="$(ProjectDir)..\include\libnyquist\WavPackDecoder.h" />
+    <ClInclude Include="$(ProjectDir)..\include\libnyquist\CafDecoder.h" />
+    <ClInclude Include="$(ProjectDir)..\include\libnyquist\VorbisDecoder.h" />
+    <ClInclude Include="$(ProjectDir)..\include\libnyquist\WavEncoder.h" />
+    <ClInclude Include="$(ProjectDir)..\include\libnyquist\RiffUtils.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}</ProjectGuid>
@@ -89,8 +89,8 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_MBCS;__WINDOWS_DS__;D_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNING;WIN32;_WIN32;USE_ALLOCA;OPUS_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\third_party\;$(SolutionDir)..\include\libnyquist\;$(SolutionDir)..\third_party\libvorbis\include;$(SolutionDir)..\third_party\libogg\include;$(SolutionDir)..\third_party\wavpack\include;$(SolutionDir)..\third_party\flac\src\include;$(SolutionDir)..\third_party\opus\celt;$(SolutionDir)..\third_party\opus\libopus\include;$(SolutionDir)..\third_party\opus\libopus\src;$(SolutionDir)..\third_party\opus\opusfile\include;$(SolutionDir)..\third_party\opus\opusfile\src;$(SolutionDir)..\third_party\opus\opusfile\src\include;$(SolutionDir)..\third_party\opus\silk;$(SolutionDir)..\third_party\opus\silk\float;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_MBCS;D_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNING;WIN32;_WIN32;USE_ALLOCA;OPUS_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\third_party\;$(ProjectDir)..\include\libnyquist\;$(ProjectDir)..\third_party\libvorbis\include;$(ProjectDir)..\third_party\libogg\include;$(ProjectDir)..\third_party\wavpack\include;$(ProjectDir)..\third_party\flac\src\include;$(ProjectDir)..\third_party\opus\celt;$(ProjectDir)..\third_party\opus\libopus\include;$(ProjectDir)..\third_party\opus\libopus\src;$(ProjectDir)..\third_party\opus\opusfile\include;$(ProjectDir)..\third_party\opus\opusfile\src;$(ProjectDir)..\third_party\opus\opusfile\src\include;$(ProjectDir)..\third_party\opus\silk;$(ProjectDir)..\third_party\opus\silk\float;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -103,8 +103,8 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_MBCS;__WINDOWS_DS__;D_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNING;WIN32;_WIN32;USE_ALLOCA;OPUS_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\third_party\;$(SolutionDir)..\include\libnyquist\;$(SolutionDir)..\third_party\libvorbis\include;$(SolutionDir)..\third_party\libogg\include;$(SolutionDir)..\third_party\wavpack\include;$(SolutionDir)..\third_party\flac\src\include;$(SolutionDir)..\third_party\opus\celt;$(SolutionDir)..\third_party\opus\libopus\include;$(SolutionDir)..\third_party\opus\libopus\src;$(SolutionDir)..\third_party\opus\opusfile\include;$(SolutionDir)..\third_party\opus\opusfile\src;$(SolutionDir)..\third_party\opus\opusfile\src\include;$(SolutionDir)..\third_party\opus\silk;$(SolutionDir)..\third_party\opus\silk\float;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_MBCS;D_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNING;WIN32;_WIN32;USE_ALLOCA;OPUS_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\third_party\;$(ProjectDir)..\include\libnyquist\;$(ProjectDir)..\third_party\libvorbis\include;$(ProjectDir)..\third_party\libogg\include;$(ProjectDir)..\third_party\wavpack\include;$(ProjectDir)..\third_party\flac\src\include;$(ProjectDir)..\third_party\opus\celt;$(ProjectDir)..\third_party\opus\libopus\include;$(ProjectDir)..\third_party\opus\libopus\src;$(ProjectDir)..\third_party\opus\opusfile\include;$(ProjectDir)..\third_party\opus\opusfile\src;$(ProjectDir)..\third_party\opus\opusfile\src\include;$(ProjectDir)..\third_party\opus\silk;$(ProjectDir)..\third_party\opus\silk\float;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
diff --git a/libnyquist.vcxproj/libnyquist.vcxproj.filters b/libnyquist.vcxproj/libnyquist.vcxproj.filters
index 55cb7dc..af7390d 100644
--- a/libnyquist.vcxproj/libnyquist.vcxproj.filters
+++ b/libnyquist.vcxproj/libnyquist.vcxproj.filters
@@ -1,131 +1,127 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="$(SolutionDir)..\src\AudioDecoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)..\src\AudioDevice.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)..\src\Common.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)..\src\FlacDecoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)..\src\OpusDecoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)..\src\WavDecoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)..\src\WavPackDecoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\CafDecoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)..\third_party\rtaudio\RtAudio.cpp">
-      <Filter>third_party\rtaudio</Filter>
-    </ClCompile>
-    <ClCompile Include="..\third_party\wavpack\src\bits.c">
-      <Filter>third_party\wavpack</Filter>
-    </ClCompile>
-    <ClCompile Include="..\third_party\wavpack\src\extra1.c">
-      <Filter>third_party\wavpack</Filter>
-    </ClCompile>
-    <ClCompile Include="..\third_party\wavpack\src\extra2.c">
-      <Filter>third_party\wavpack</Filter>
-    </ClCompile>
-    <ClCompile Include="..\third_party\wavpack\src\float.c">
-      <Filter>third_party\wavpack</Filter>
-    </ClCompile>
-    <ClCompile Include="..\third_party\wavpack\src\metadata.c">
-      <Filter>third_party\wavpack</Filter>
-    </ClCompile>
-    <ClCompile Include="..\third_party\wavpack\src\pack.c">
-      <Filter>third_party\wavpack</Filter>
-    </ClCompile>
-    <ClCompile Include="..\third_party\wavpack\src\tags.c">
-      <Filter>third_party\wavpack</Filter>
-    </ClCompile>
-    <ClCompile Include="..\third_party\wavpack\src\unpack.c">
-      <Filter>third_party\wavpack</Filter>
-    </ClCompile>
-    <ClCompile Include="..\third_party\wavpack\src\unpack3.c">
-      <Filter>third_party\wavpack</Filter>
-    </ClCompile>
-    <ClCompile Include="..\third_party\wavpack\src\words.c">
-      <Filter>third_party\wavpack</Filter>
-    </ClCompile>
-    <ClCompile Include="..\third_party\wavpack\src\wputils.c">
-      <Filter>third_party\wavpack</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\VorbisDecoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\third_party\opus\celt\celt_decoder.c">
+    <ClCompile Include="$(ProjectDir)..\third_party\opus\celt\celt_encoder.c">
       <Filter>third_party\celt</Filter>
     </ClCompile>
-    <ClCompile Include="..\third_party\opus\celt\celt_encoder.c">
+    <ClCompile Include="$(ProjectDir)..\third_party\opus\celt\celt_decoder.c">
       <Filter>third_party\celt</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\FlacDependencies.c">
+    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\bits.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\extra1.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\extra2.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\float.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\pack.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\tags.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\unpack.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\unpack3.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\words.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\wputils.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\metadata.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\src\VorbisDependencies.c">
       <Filter>src\deps</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\OpusDependencies.c">
+    <ClCompile Include="$(ProjectDir)..\src\OpusDependencies.c">
       <Filter>src\deps</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\VorbisDependencies.c">
+    <ClCompile Include="$(ProjectDir)..\src\FlacDependencies.c">
       <Filter>src\deps</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\WavEncoder.cpp">
+    <ClCompile Include="$(ProjectDir)..\src\AudioDecoder.cpp">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\src\CafDecoder.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\src\AudioDevice.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\src\FlacDecoder.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\src\VorbisDecoder.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\src\WavDecoder.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\src\WavPackDecoder.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\src\WavEncoder.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\src\OpusDecoder.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\src\Common.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\src\RiffUtils.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(SolutionDir)..\include\libnyquist\AudioDecoder.h">
+    <ClInclude Include="$(ProjectDir)..\include\libnyquist\OpusDecoder.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\include\libnyquist\AudioDecoder.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)..\include\libnyquist\AudioDevice.h">
+    <ClInclude Include="$(ProjectDir)..\include\libnyquist\AudioDevice.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)..\include\libnyquist\Common.h">
+    <ClInclude Include="$(ProjectDir)..\include\libnyquist\CafDecoder.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)..\include\libnyquist\FlacDecoder.h">
+    <ClInclude Include="$(ProjectDir)..\include\libnyquist\Common.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)..\include\libnyquist\OpusDecoder.h">
+    <ClInclude Include="$(ProjectDir)..\include\libnyquist\FlacDecoder.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)..\include\libnyquist\WavDecoder.h">
+    <ClInclude Include="$(ProjectDir)..\include\libnyquist\VorbisDecoder.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)..\include\libnyquist\WavPackDecoder.h">
+    <ClInclude Include="$(ProjectDir)..\include\libnyquist\WavDecoder.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\libnyquist\CafDecoder.h">
+    <ClInclude Include="$(ProjectDir)..\include\libnyquist\WavEncoder.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)..\third_party\rtaudio\RtAudio.h">
-      <Filter>third_party\rtaudio</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\libnyquist\VorbisDecoder.h">
+    <ClInclude Include="$(ProjectDir)..\include\libnyquist\WavPackDecoder.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)..\include\libnyquist\Dither.h">
+    <ClInclude Include="$(ProjectDir)..\include\libnyquist\RingBuffer.h">
       <Filter>include\util</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)..\include\libnyquist\RingBuffer.h">
+    <ClInclude Include="$(ProjectDir)..\include\libnyquist\PostProcess.h">
       <Filter>include\util</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)..\include\libnyquist\PostProcess.h">
+    <ClInclude Include="$(ProjectDir)..\include\libnyquist\Dither.h">
       <Filter>include\util</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\libnyquist\WavEncoder.h">
-      <Filter>include</Filter>
-    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\include\libnyquist\RiffUtils.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="include">
@@ -137,9 +133,6 @@
     <Filter Include="third_party">
       <UniqueIdentifier>{33572766-230e-4a7f-8c06-885c4780c1d1}</UniqueIdentifier>
     </Filter>
-    <Filter Include="third_party\rtaudio">
-      <UniqueIdentifier>{4d1d563a-f52c-4a30-b1cb-11c6a9da8fbc}</UniqueIdentifier>
-    </Filter>
     <Filter Include="third_party\wavpack">
       <UniqueIdentifier>{d40a1038-d11f-45dc-820b-e32743336269}</UniqueIdentifier>
     </Filter>