diff --git a/libnyquist.vcxproj/v141/libnyquist.vcxproj b/libnyquist.vcxproj/v141/libnyquist.vcxproj
index 1e6b775..a754f1a 100644
--- a/libnyquist.vcxproj/v141/libnyquist.vcxproj
+++ b/libnyquist.vcxproj/v141/libnyquist.vcxproj
@@ -36,6 +36,32 @@
     <ClCompile Include="..\..\src\ModplugDependencies.cpp" />
     <ClCompile Include="..\..\src\MusepackDecoder.cpp" />
     <ClCompile Include="..\..\src\MusepackDependencies.c" />
+    <ClCompile Include="..\..\third_party\wavpack\src\common_utils.c" />
+    <ClCompile Include="..\..\third_party\wavpack\src\decorr_utils.c" />
+    <ClCompile Include="..\..\third_party\wavpack\src\entropy_utils.c" />
+    <ClCompile Include="..\..\third_party\wavpack\src\extra1.c" />
+    <ClCompile Include="..\..\third_party\wavpack\src\extra2.c" />
+    <ClCompile Include="..\..\third_party\wavpack\src\open_filename.c" />
+    <ClCompile Include="..\..\third_party\wavpack\src\open_legacy.c" />
+    <ClCompile Include="..\..\third_party\wavpack\src\open_raw.c" />
+    <ClCompile Include="..\..\third_party\wavpack\src\open_utils.c" />
+    <ClCompile Include="..\..\third_party\wavpack\src\pack.c" />
+    <ClCompile Include="..\..\third_party\wavpack\src\pack_dns.c" />
+    <ClCompile Include="..\..\third_party\wavpack\src\pack_dsd.c" />
+    <ClCompile Include="..\..\third_party\wavpack\src\pack_floats.c" />
+    <ClCompile Include="..\..\third_party\wavpack\src\pack_utils.c" />
+    <ClCompile Include="..\..\third_party\wavpack\src\read_words.c" />
+    <ClCompile Include="..\..\third_party\wavpack\src\tags.c" />
+    <ClCompile Include="..\..\third_party\wavpack\src\tag_utils.c" />
+    <ClCompile Include="..\..\third_party\wavpack\src\unpack.c" />
+    <ClCompile Include="..\..\third_party\wavpack\src\unpack3.c" />
+    <ClCompile Include="..\..\third_party\wavpack\src\unpack3_open.c" />
+    <ClCompile Include="..\..\third_party\wavpack\src\unpack3_seek.c" />
+    <ClCompile Include="..\..\third_party\wavpack\src\unpack_dsd.c" />
+    <ClCompile Include="..\..\third_party\wavpack\src\unpack_floats.c" />
+    <ClCompile Include="..\..\third_party\wavpack\src\unpack_seek.c" />
+    <ClCompile Include="..\..\third_party\wavpack\src\unpack_utils.c" />
+    <ClCompile Include="..\..\third_party\wavpack\src\write_words.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\AudioDecoder.h" />
@@ -165,4 +191,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/libnyquist.vcxproj/v141/libnyquist.vcxproj.filters b/libnyquist.vcxproj/v141/libnyquist.vcxproj.filters
index 41ca4db..1c592fe 100644
--- a/libnyquist.vcxproj/v141/libnyquist.vcxproj.filters
+++ b/libnyquist.vcxproj/v141/libnyquist.vcxproj.filters
@@ -1,114 +1,195 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\..\src\VorbisDependencies.c">
-      <Filter>src\deps</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ProjectDir)..\..\src\OpusDependencies.c">
-      <Filter>src\deps</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ProjectDir)..\..\src\AudioDecoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ProjectDir)..\..\src\CafDecoder.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">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ProjectDir)..\..\src\FlacDependencies.c">
-      <Filter>src\deps</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\MusepackDependencies.c">
-      <Filter>src\deps</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\MusepackDecoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ModplugDependencies.cpp">
-      <Filter>src\deps</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ModplugDecoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\OpusDecoder.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\AudioDecoder.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\CafDecoder.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\Common.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\FlacDecoder.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\VorbisDecoder.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\WavDecoder.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\WavEncoder.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\WavPackDecoder.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\PostProcess.h">
-      <Filter>include\util</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\Dither.h">
-      <Filter>include\util</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\RiffUtils.h">
-      <Filter>include\util</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\libnyquist\MusepackDecoder.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\libnyquist\IMA4Util.h">
-      <Filter>include\util</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="include">
-      <UniqueIdentifier>{f4ea8340-b8ea-4a42-bafb-6cb461e7a2f3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src">
-      <UniqueIdentifier>{a18b19d5-5cd3-49fc-beec-ed17d8e81d6b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="include\util">
-      <UniqueIdentifier>{f27e7823-c56c-4e03-af63-2ef0b1e83cbd}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\deps">
-      <UniqueIdentifier>{d839471f-71d1-471e-95e0-c33af9bb64bc}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="$(ProjectDir)..\..\src\VorbisDependencies.c">
+      <Filter>src\deps</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\OpusDependencies.c">
+      <Filter>src\deps</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\AudioDecoder.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\CafDecoder.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">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\FlacDependencies.c">
+      <Filter>src\deps</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\MusepackDependencies.c">
+      <Filter>src\deps</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\MusepackDecoder.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\ModplugDependencies.cpp">
+      <Filter>src\deps</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\ModplugDecoder.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third_party\wavpack\src\entropy_utils.c">
+      <Filter>src\deps\WavpackDependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third_party\wavpack\src\decorr_utils.c">
+      <Filter>src\deps\WavpackDependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third_party\wavpack\src\open_legacy.c">
+      <Filter>src\deps\WavpackDependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third_party\wavpack\src\open_filename.c">
+      <Filter>src\deps\WavpackDependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third_party\wavpack\src\extra2.c">
+      <Filter>src\deps\WavpackDependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third_party\wavpack\src\extra1.c">
+      <Filter>src\deps\WavpackDependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third_party\wavpack\src\common_utils.c">
+      <Filter>src\deps\WavpackDependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third_party\wavpack\src\open_utils.c">
+      <Filter>src\deps\WavpackDependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third_party\wavpack\src\open_raw.c">
+      <Filter>src\deps\WavpackDependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third_party\wavpack\src\pack.c">
+      <Filter>src\deps\WavpackDependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third_party\wavpack\src\pack_dns.c">
+      <Filter>src\deps\WavpackDependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third_party\wavpack\src\pack_floats.c">
+      <Filter>src\deps\WavpackDependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third_party\wavpack\src\pack_dsd.c">
+      <Filter>src\deps\WavpackDependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third_party\wavpack\src\pack_utils.c">
+      <Filter>src\deps\WavpackDependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third_party\wavpack\src\read_words.c">
+      <Filter>src\deps\WavpackDependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third_party\wavpack\src\tags.c">
+      <Filter>src\deps\WavpackDependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third_party\wavpack\src\unpack.c">
+      <Filter>src\deps\WavpackDependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third_party\wavpack\src\unpack_dsd.c">
+      <Filter>src\deps\WavpackDependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third_party\wavpack\src\unpack_floats.c">
+      <Filter>src\deps\WavpackDependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third_party\wavpack\src\tag_utils.c">
+      <Filter>src\deps\WavpackDependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third_party\wavpack\src\unpack_seek.c">
+      <Filter>src\deps\WavpackDependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third_party\wavpack\src\unpack_utils.c">
+      <Filter>src\deps\WavpackDependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third_party\wavpack\src\unpack3.c">
+      <Filter>src\deps\WavpackDependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third_party\wavpack\src\unpack3_open.c">
+      <Filter>src\deps\WavpackDependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third_party\wavpack\src\unpack3_seek.c">
+      <Filter>src\deps\WavpackDependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\third_party\wavpack\src\write_words.c">
+      <Filter>src\deps\WavpackDependencies</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\OpusDecoder.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\AudioDecoder.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\CafDecoder.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\Common.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\FlacDecoder.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\VorbisDecoder.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\WavDecoder.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\WavEncoder.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\WavPackDecoder.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\PostProcess.h">
+      <Filter>include\util</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\Dither.h">
+      <Filter>include\util</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\RiffUtils.h">
+      <Filter>include\util</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\libnyquist\MusepackDecoder.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\libnyquist\IMA4Util.h">
+      <Filter>include\util</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="include">
+      <UniqueIdentifier>{f4ea8340-b8ea-4a42-bafb-6cb461e7a2f3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src">
+      <UniqueIdentifier>{a18b19d5-5cd3-49fc-beec-ed17d8e81d6b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\util">
+      <UniqueIdentifier>{f27e7823-c56c-4e03-af63-2ef0b1e83cbd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\deps">
+      <UniqueIdentifier>{d839471f-71d1-471e-95e0-c33af9bb64bc}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\deps\WavpackDependencies">
+      <UniqueIdentifier>{4ed41d64-0c09-4382-8ee9-70aad6043650}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+</Project>
\ No newline at end of file