diff --git a/examples/libnyquist-examples.vcxproj/v140/libnyquist-examples.sln b/examples/libnyquist-examples.vcxproj/v140/libnyquist-examples.sln
index c463095..9020131 100644
--- a/examples/libnyquist-examples.vcxproj/v140/libnyquist-examples.sln
+++ b/examples/libnyquist-examples.vcxproj/v140/libnyquist-examples.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30723.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnyquist-examples", "libnyquist-examples.vcxproj", "{C0C0C270-FB9E-4EEB-8F22-180BB2FA800B}"
 EndProject
@@ -10,17 +10,27 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{C0C0C270-FB9E-4EEB-8F22-180BB2FA800B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C0C0C270-FB9E-4EEB-8F22-180BB2FA800B}.Debug|Win32.Build.0 = Debug|Win32
+		{C0C0C270-FB9E-4EEB-8F22-180BB2FA800B}.Debug|x64.ActiveCfg = Debug|x64
+		{C0C0C270-FB9E-4EEB-8F22-180BB2FA800B}.Debug|x64.Build.0 = Debug|x64
 		{C0C0C270-FB9E-4EEB-8F22-180BB2FA800B}.Release|Win32.ActiveCfg = Release|Win32
 		{C0C0C270-FB9E-4EEB-8F22-180BB2FA800B}.Release|Win32.Build.0 = Release|Win32
+		{C0C0C270-FB9E-4EEB-8F22-180BB2FA800B}.Release|x64.ActiveCfg = Release|x64
+		{C0C0C270-FB9E-4EEB-8F22-180BB2FA800B}.Release|x64.Build.0 = Release|x64
 		{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}.Debug|x64.ActiveCfg = Debug|x64
+		{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}.Debug|x64.Build.0 = Debug|x64
 		{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}.Release|Win32.ActiveCfg = Release|Win32
 		{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}.Release|Win32.Build.0 = Release|Win32
+		{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}.Release|x64.ActiveCfg = Release|x64
+		{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/examples/libnyquist-examples.vcxproj/v140/libnyquist-examples.vcxproj b/examples/libnyquist-examples.vcxproj/v140/libnyquist-examples.vcxproj
index f192a14..9165238 100644
--- a/examples/libnyquist-examples.vcxproj/v140/libnyquist-examples.vcxproj
+++ b/examples/libnyquist-examples.vcxproj/v140/libnyquist-examples.vcxproj
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{C0C0C270-FB9E-4EEB-8F22-180BB2FA800B}</ProjectGuid>
@@ -21,6 +29,12 @@
     <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -28,15 +42,28 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -51,6 +78,18 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(SolutionDir)../../../include;$(SolutionDir)../../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>__WINDOWS_DS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -67,6 +106,22 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(SolutionDir)../../include;$(SolutionDir)../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>__WINDOWS_DS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\third_party\rtaudio\RtAudio.cpp" />
     <ClCompile Include="..\..\src\Main.cpp" />
diff --git a/libnyquist.vcxproj/v140/libnyquist.vcxproj b/libnyquist.vcxproj/v140/libnyquist.vcxproj
index 0e20b09..7fbb2e4 100644
--- a/libnyquist.vcxproj/v140/libnyquist.vcxproj
+++ b/libnyquist.vcxproj/v140/libnyquist.vcxproj
@@ -33,19 +33,9 @@
     <ClCompile Include="$(ProjectDir)..\..\src\VorbisDependencies.c" />
     <ClCompile Include="$(ProjectDir)..\..\src\WavEncoder.cpp" />
     <ClCompile Include="$(ProjectDir)..\..\src\RiffUtils.cpp" />
-    <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" />
     <ClCompile Include="..\..\src\MusepackDecoder.cpp" />
     <ClCompile Include="..\..\src\MusepackDependencies.c" />
+    <ClCompile Include="..\..\src\WavPackDependencies.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\AudioDecoder.h" />
diff --git a/libnyquist.vcxproj/v140/libnyquist.vcxproj.filters b/libnyquist.vcxproj/v140/libnyquist.vcxproj.filters
index 4e35854..4c46476 100644
--- a/libnyquist.vcxproj/v140/libnyquist.vcxproj.filters
+++ b/libnyquist.vcxproj/v140/libnyquist.vcxproj.filters
@@ -1,39 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <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>
@@ -82,6 +49,9 @@
     <ClCompile Include="..\..\src\MusepackDecoder.cpp">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\WavPackDependencies.c">
+      <Filter>src\deps</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\OpusDecoder.h">
@@ -140,12 +110,6 @@
     <Filter Include="src">
       <UniqueIdentifier>{a18b19d5-5cd3-49fc-beec-ed17d8e81d6b}</UniqueIdentifier>
     </Filter>
-    <Filter Include="third_party">
-      <UniqueIdentifier>{33572766-230e-4a7f-8c06-885c4780c1d1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="third_party\wavpack">
-      <UniqueIdentifier>{d40a1038-d11f-45dc-820b-e32743336269}</UniqueIdentifier>
-    </Filter>
     <Filter Include="include\util">
       <UniqueIdentifier>{f27e7823-c56c-4e03-af63-2ef0b1e83cbd}</UniqueIdentifier>
     </Filter>