diff --git a/builds/msvc/libsodium.rc b/builds/msvc/libsodium.rc
index 1e47e0c7..5c13a895 100644
Binary files a/builds/msvc/libsodium.rc and b/builds/msvc/libsodium.rc differ
diff --git a/builds/msvc/vs2010/properties/Common.props b/builds/msvc/properties/Common.props
similarity index 100%
rename from builds/msvc/vs2010/properties/Common.props
rename to builds/msvc/properties/Common.props
diff --git a/builds/msvc/vs2010/properties/Console.props b/builds/msvc/properties/Console.props
similarity index 100%
rename from builds/msvc/vs2010/properties/Console.props
rename to builds/msvc/properties/Console.props
diff --git a/builds/msvc/vs2010/properties/ConsoleDebugDynamic.props b/builds/msvc/properties/ConsoleDebugDynamic.props
similarity index 100%
rename from builds/msvc/vs2010/properties/ConsoleDebugDynamic.props
rename to builds/msvc/properties/ConsoleDebugDynamic.props
diff --git a/builds/msvc/vs2010/properties/ConsoleDebugLinkTimeCodeGeneration.props b/builds/msvc/properties/ConsoleDebugLinkTimeCodeGeneration.props
similarity index 100%
rename from builds/msvc/vs2010/properties/ConsoleDebugLinkTimeCodeGeneration.props
rename to builds/msvc/properties/ConsoleDebugLinkTimeCodeGeneration.props
diff --git a/builds/msvc/vs2010/properties/ConsoleDebugStatic.props b/builds/msvc/properties/ConsoleDebugStatic.props
similarity index 100%
rename from builds/msvc/vs2010/properties/ConsoleDebugStatic.props
rename to builds/msvc/properties/ConsoleDebugStatic.props
diff --git a/builds/msvc/vs2010/properties/ConsoleReleaseDynamic.props b/builds/msvc/properties/ConsoleReleaseDynamic.props
similarity index 100%
rename from builds/msvc/vs2010/properties/ConsoleReleaseDynamic.props
rename to builds/msvc/properties/ConsoleReleaseDynamic.props
diff --git a/builds/msvc/vs2010/properties/ConsoleReleaseLinkTimeCodeGeneration.props b/builds/msvc/properties/ConsoleReleaseLinkTimeCodeGeneration.props
similarity index 100%
rename from builds/msvc/vs2010/properties/ConsoleReleaseLinkTimeCodeGeneration.props
rename to builds/msvc/properties/ConsoleReleaseLinkTimeCodeGeneration.props
diff --git a/builds/msvc/vs2010/properties/ConsoleReleaseStatic.props b/builds/msvc/properties/ConsoleReleaseStatic.props
similarity index 100%
rename from builds/msvc/vs2010/properties/ConsoleReleaseStatic.props
rename to builds/msvc/properties/ConsoleReleaseStatic.props
diff --git a/builds/msvc/vs2010/properties/Debug.props b/builds/msvc/properties/Debug.props
similarity index 100%
rename from builds/msvc/vs2010/properties/Debug.props
rename to builds/msvc/properties/Debug.props
diff --git a/builds/msvc/vs2010/properties/Dynamic.props b/builds/msvc/properties/Dynamic.props
similarity index 100%
rename from builds/msvc/vs2010/properties/Dynamic.props
rename to builds/msvc/properties/Dynamic.props
diff --git a/builds/msvc/vs2010/properties/DynamicDebug.props b/builds/msvc/properties/DynamicDebug.props
similarity index 100%
rename from builds/msvc/vs2010/properties/DynamicDebug.props
rename to builds/msvc/properties/DynamicDebug.props
diff --git a/builds/msvc/vs2010/properties/DynamicRelease.props b/builds/msvc/properties/DynamicRelease.props
similarity index 100%
rename from builds/msvc/vs2010/properties/DynamicRelease.props
rename to builds/msvc/properties/DynamicRelease.props
diff --git a/builds/msvc/vs2010/properties/LinkTimeCodeGeneration.props b/builds/msvc/properties/LinkTimeCodeGeneration.props
similarity index 100%
rename from builds/msvc/vs2010/properties/LinkTimeCodeGeneration.props
rename to builds/msvc/properties/LinkTimeCodeGeneration.props
diff --git a/builds/msvc/vs2010/properties/Release.props b/builds/msvc/properties/Release.props
similarity index 100%
rename from builds/msvc/vs2010/properties/Release.props
rename to builds/msvc/properties/Release.props
diff --git a/builds/msvc/vs2010/properties/Static.props b/builds/msvc/properties/Static.props
similarity index 100%
rename from builds/msvc/vs2010/properties/Static.props
rename to builds/msvc/properties/Static.props
diff --git a/builds/msvc/vs2010/properties/StaticDebug.props b/builds/msvc/properties/StaticDebug.props
similarity index 100%
rename from builds/msvc/vs2010/properties/StaticDebug.props
rename to builds/msvc/properties/StaticDebug.props
diff --git a/builds/msvc/vs2010/properties/StaticDebugLinkTimeCodeGeneration.props b/builds/msvc/properties/StaticDebugLinkTimeCodeGeneration.props
similarity index 100%
rename from builds/msvc/vs2010/properties/StaticDebugLinkTimeCodeGeneration.props
rename to builds/msvc/properties/StaticDebugLinkTimeCodeGeneration.props
diff --git a/builds/msvc/vs2010/properties/StaticLinkTimeCodeGeneration.props b/builds/msvc/properties/StaticLinkTimeCodeGeneration.props
similarity index 100%
rename from builds/msvc/vs2010/properties/StaticLinkTimeCodeGeneration.props
rename to builds/msvc/properties/StaticLinkTimeCodeGeneration.props
diff --git a/builds/msvc/vs2010/properties/StaticRelease.props b/builds/msvc/properties/StaticRelease.props
similarity index 100%
rename from builds/msvc/vs2010/properties/StaticRelease.props
rename to builds/msvc/properties/StaticRelease.props
diff --git a/builds/msvc/vs2010/properties/StaticReleaseLinkTimeCodeGeneration.props b/builds/msvc/properties/StaticReleaseLinkTimeCodeGeneration.props
similarity index 100%
rename from builds/msvc/vs2010/properties/StaticReleaseLinkTimeCodeGeneration.props
rename to builds/msvc/properties/StaticReleaseLinkTimeCodeGeneration.props
diff --git a/builds/msvc/vs2010/properties/Win32.props b/builds/msvc/properties/Win32.props
similarity index 100%
rename from builds/msvc/vs2010/properties/Win32.props
rename to builds/msvc/properties/Win32.props
diff --git a/builds/msvc/vs2010/properties/x64.props b/builds/msvc/properties/x64.props
similarity index 100%
rename from builds/msvc/vs2010/properties/x64.props
rename to builds/msvc/properties/x64.props
diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj b/builds/msvc/vs2010/libsodium/libsodium.vcxproj
index db3532bb..d419c10a 100644
--- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj
@@ -99,159 +99,77 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\DynamicDebug.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\DynamicDebug.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\DynamicRelease.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\DynamicRelease.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\DynamicDebug.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\DynamicDebug.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\DynamicRelease.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\DynamicRelease.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\StaticDebugLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\StaticDebugLinkTimeCodeGeneration.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\StaticReleaseLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\StaticReleaseLinkTimeCodeGeneration.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\StaticDebugLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\StaticDebugLinkTimeCodeGeneration.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\StaticReleaseLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\StaticReleaseLinkTimeCodeGeneration.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\StaticDebug.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\StaticDebug.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\StaticRelease.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\StaticRelease.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\StaticDebug.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\StaticDebug.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\StaticRelease.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\StaticRelease.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha256\cp\api.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2-impl.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\portable-jane.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\crypto_scrypt.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\pbkdf2-sha256.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\sysendian.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base2.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\d.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\d2.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_add.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_madd.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_msub.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p2_dbl.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_sub.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\pow22523.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\pow225521.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sc.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sqrtm1.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\fe25519.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\ge25519.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\sc25519.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\consts.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\int128.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\types.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-be.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-le.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes256.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\ecrypt-sync.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth_hmacsha256.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth_hmacsha512256.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_box.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_box_curve25519xsalsa20poly1305.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_hsalsa20.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa20.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa2012.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa208.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash_blake2b.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash_sha256.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash_sha512.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_int32.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_int64.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_onetimeauth.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_onetimeauth_poly1305.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_onetimeauth_poly1305_donna.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_scalarmult.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_scalarmult_curve25519.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_secretbox.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_secretbox_xsalsa20poly1305.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_shorthash.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_shorthash_siphash24.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_sign.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_sign_ed25519.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_sign_edwards25519sha512batch.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes128ctr.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes256estream.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa20.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa2012.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa208.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_xsalsa20.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint16.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint32.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint64.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint8.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_verify_16.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_verify_32.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_verify_64.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\randombytes.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\randombytes_salsa20_random.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\randombytes_sysrandom.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\utils.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h" />
   </ItemGroup>
   <ItemGroup>
diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
index 9d125afb..d8a14326 100644
--- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
@@ -390,258 +390,12 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth_hmacsha256.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth_hmacsha512256.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_box.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_box_curve25519xsalsa20poly1305.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_hsalsa20.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa20.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa208.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa2012.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash_blake2b.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash_sha256.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash_sha512.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_int32.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_int64.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_onetimeauth.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_onetimeauth_poly1305.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_onetimeauth_poly1305_donna.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_scalarmult.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_scalarmult_curve25519.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_secretbox.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_secretbox_xsalsa20poly1305.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_shorthash.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_shorthash_siphash24.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_sign.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_sign_ed25519.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_sign_edwards25519sha512batch.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes128ctr.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes256estream.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa20.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa208.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa2012.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_xsalsa20.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint8.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint16.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint32.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint64.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_verify_16.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_verify_32.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h">
-      <Filter>include</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\utils.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\randombytes_sysrandom.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\randombytes_salsa20_random.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\randombytes.h">
-      <Filter>include</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\resource.h">
       <Filter>resource</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha256\cp\api.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2-impl.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_verify_64.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-be.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-le.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes256.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base2.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\consts.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\crypto_scrypt.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\d2.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\ecrypt-sync.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\fe25519.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_add.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_madd.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_msub.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p2_dbl.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_sub.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\ge25519.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\int128.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\pbkdf2-sha256.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\portable-jane.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\pow22523.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\pow225521.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\d.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sc.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\sc25519.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sqrtm1.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\sysendian.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\types.h">
-      <Filter>include</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium.h">
       <Filter>include</Filter>
     </ClInclude>
diff --git a/builds/msvc/vs2010/test/test.vcxproj b/builds/msvc/vs2010/test/test.vcxproj
index 13d15254..303cd804 100644
--- a/builds/msvc/vs2010/test/test.vcxproj
+++ b/builds/msvc/vs2010/test/test.vcxproj
@@ -14,74 +14,74 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="DebugDEXE|Win32">
diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj b/builds/msvc/vs2012/libsodium/libsodium.vcxproj
index 17ff47c4..1f384ff8 100644
--- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj
@@ -99,159 +99,77 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\DynamicDebug.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\DynamicDebug.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\DynamicRelease.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\DynamicRelease.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\DynamicDebug.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\DynamicDebug.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\DynamicRelease.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\DynamicRelease.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\StaticDebugLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\StaticDebugLinkTimeCodeGeneration.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\StaticReleaseLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\StaticReleaseLinkTimeCodeGeneration.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\StaticDebugLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\StaticDebugLinkTimeCodeGeneration.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\StaticReleaseLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\StaticReleaseLinkTimeCodeGeneration.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\StaticDebug.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\StaticDebug.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\StaticRelease.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\StaticRelease.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\StaticDebug.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\StaticDebug.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\StaticRelease.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\StaticRelease.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha256\cp\api.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2-impl.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\portable-jane.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\crypto_scrypt.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\pbkdf2-sha256.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\sysendian.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base2.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\d.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\d2.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_add.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_madd.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_msub.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p2_dbl.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_sub.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\pow22523.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\pow225521.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sc.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sqrtm1.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\fe25519.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\ge25519.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\sc25519.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\consts.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\int128.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\types.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-be.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-le.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes256.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\ecrypt-sync.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth_hmacsha256.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth_hmacsha512256.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_box.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_box_curve25519xsalsa20poly1305.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_hsalsa20.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa20.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa2012.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa208.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash_blake2b.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash_sha256.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash_sha512.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_int32.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_int64.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_onetimeauth.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_onetimeauth_poly1305.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_onetimeauth_poly1305_donna.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_scalarmult.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_scalarmult_curve25519.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_secretbox.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_secretbox_xsalsa20poly1305.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_shorthash.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_shorthash_siphash24.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_sign.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_sign_ed25519.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_sign_edwards25519sha512batch.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes128ctr.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes256estream.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa20.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa2012.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa208.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_xsalsa20.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint16.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint32.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint64.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint8.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_verify_16.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_verify_32.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_verify_64.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\randombytes.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\randombytes_salsa20_random.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\randombytes_sysrandom.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\utils.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h" />
   </ItemGroup>
   <ItemGroup>
diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
index 9d125afb..d8a14326 100644
--- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
@@ -390,258 +390,12 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth_hmacsha256.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth_hmacsha512256.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_box.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_box_curve25519xsalsa20poly1305.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_hsalsa20.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa20.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa208.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa2012.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash_blake2b.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash_sha256.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash_sha512.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_int32.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_int64.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_onetimeauth.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_onetimeauth_poly1305.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_onetimeauth_poly1305_donna.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_scalarmult.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_scalarmult_curve25519.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_secretbox.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_secretbox_xsalsa20poly1305.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_shorthash.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_shorthash_siphash24.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_sign.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_sign_ed25519.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_sign_edwards25519sha512batch.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes128ctr.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes256estream.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa20.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa208.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa2012.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_xsalsa20.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint8.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint16.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint32.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint64.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_verify_16.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_verify_32.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h">
-      <Filter>include</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\utils.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\randombytes_sysrandom.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\randombytes_salsa20_random.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\randombytes.h">
-      <Filter>include</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\resource.h">
       <Filter>resource</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha256\cp\api.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2-impl.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_verify_64.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-be.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-le.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes256.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base2.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\consts.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\crypto_scrypt.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\d2.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\ecrypt-sync.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\fe25519.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_add.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_madd.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_msub.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p2_dbl.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_sub.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\ge25519.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\int128.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\pbkdf2-sha256.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\portable-jane.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\pow22523.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\pow225521.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\d.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sc.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\sc25519.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sqrtm1.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\sysendian.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\types.h">
-      <Filter>include</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium.h">
       <Filter>include</Filter>
     </ClInclude>
diff --git a/builds/msvc/vs2012/properties/Common.props b/builds/msvc/vs2012/properties/Common.props
deleted file mode 100644
index 2acf2e6f..00000000
--- a/builds/msvc/vs2012/properties/Common.props
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Common Settings</_PropertySheetDisplayName>
-    <CharacterSet>Unicode</CharacterSet>
-    <TargetName>$(ProjectName)</TargetName>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <!-- Windows and CRT definitions for unicode. Note that Linux only supports unicode so char is 16 bit. -->
-      <PreprocessorDefinitions>UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-  <Target Name="ConfigInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="ConfigurationType : $(ConfigurationType)" Importance="high"/>
-    <Message Text="Configuration     : $(Configuration)" Importance="high"/>
-    <Message Text="PlatformToolset   : $(PlatformToolset)" Importance="high"/>
-    <Message Text="Building..." Importance="high"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2012/properties/Console.props b/builds/msvc/vs2012/properties/Console.props
deleted file mode 100644
index 414c98ae..00000000
--- a/builds/msvc/vs2012/properties/Console.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Common.props" />
-  </ImportGroup>
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Application</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2012/properties/ConsoleDebugDynamic.props b/builds/msvc/vs2012/properties/ConsoleDebugDynamic.props
deleted file mode 100644
index 5872b5c4..00000000
--- a/builds/msvc/vs2012/properties/ConsoleDebugDynamic.props
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Console.props" />
-    <Import Project="Debug.props" />
-  </ImportGroup>
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Debug Dynamic</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- Linking CRT dynamically when building a dynamic library is conventional. -->
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <LinkIncremental>true</LinkIncremental>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2012/properties/ConsoleDebugLinkTimeCodeGeneration.props b/builds/msvc/vs2012/properties/ConsoleDebugLinkTimeCodeGeneration.props
deleted file mode 100644
index 1e752c21..00000000
--- a/builds/msvc/vs2012/properties/ConsoleDebugLinkTimeCodeGeneration.props
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Console.props" />
-    <Import Project="Debug.props" />
-    <Import Project="LinkTimeCodeGeneration.props" />
-  </ImportGroup>
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Debug Link Time Code Generation Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <LinkIncremental>false</LinkIncremental>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2012/properties/ConsoleDebugStatic.props b/builds/msvc/vs2012/properties/ConsoleDebugStatic.props
deleted file mode 100644
index 5d72bbc4..00000000
--- a/builds/msvc/vs2012/properties/ConsoleDebugStatic.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Console.props" />
-    <Import Project="Debug.props" />
-  </ImportGroup>
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Debug Static</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <LinkIncremental>true</LinkIncremental>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2012/properties/ConsoleReleaseDynamic.props b/builds/msvc/vs2012/properties/ConsoleReleaseDynamic.props
deleted file mode 100644
index f15070dd..00000000
--- a/builds/msvc/vs2012/properties/ConsoleReleaseDynamic.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Console.props" />
-    <Import Project="Release.props" />
-  </ImportGroup>
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Release Dynamic</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- Linking CRT dynamically when building a dynamic library is conventional. -->
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2012/properties/ConsoleReleaseLinkTimeCodeGeneration.props b/builds/msvc/vs2012/properties/ConsoleReleaseLinkTimeCodeGeneration.props
deleted file mode 100644
index 984891b3..00000000
--- a/builds/msvc/vs2012/properties/ConsoleReleaseLinkTimeCodeGeneration.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Console.props" />
-    <Import Project="Release.props" />
-    <Import Project="LinkTimeCodeGeneration.props" />
-  </ImportGroup>
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Release Link Time Code Generation Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2012/properties/ConsoleReleaseStatic.props b/builds/msvc/vs2012/properties/ConsoleReleaseStatic.props
deleted file mode 100644
index 2aaf3032..00000000
--- a/builds/msvc/vs2012/properties/ConsoleReleaseStatic.props
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Console.props" />
-    <Import Project="Release.props" />
-  </ImportGroup>
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Release Static</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2012/properties/Debug.props b/builds/msvc/vs2012/properties/Debug.props
deleted file mode 100644
index a2867772..00000000
--- a/builds/msvc/vs2012/properties/Debug.props
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Debug Configuration</_PropertySheetDisplayName>
-    <!-- RootNamespace is used to deconflict output files from differing project versions. -->
-    <IntDir>$(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\</IntDir>
-    <OutDir>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\</OutDir>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile><DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\$(TargetName).imp.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2012/properties/Dynamic.props b/builds/msvc/vs2012/properties/Dynamic.props
deleted file mode 100644
index 9e749175..00000000
--- a/builds/msvc/vs2012/properties/Dynamic.props
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Common.props" />
-  </ImportGroup>
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Dynamic Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>_DLL;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2012/properties/DynamicDebug.props b/builds/msvc/vs2012/properties/DynamicDebug.props
deleted file mode 100644
index ee40a01f..00000000
--- a/builds/msvc/vs2012/properties/DynamicDebug.props
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Dynamic.props" />
-    <Import Project="Debug.props" />
-  </ImportGroup>
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Dynamic Debug Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- Linking CRT dynamically when building a dynamic library is conventional. -->
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <LinkIncremental>true</LinkIncremental>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2012/properties/DynamicRelease.props b/builds/msvc/vs2012/properties/DynamicRelease.props
deleted file mode 100644
index c3f36f89..00000000
--- a/builds/msvc/vs2012/properties/DynamicRelease.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Dynamic.props" />
-    <Import Project="Release.props" />
-  </ImportGroup>
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Dynamic Release Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- Linking CRT dynamically when building a dynamic library is conventional. -->
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2012/properties/LinkTimeCodeGeneration.props b/builds/msvc/vs2012/properties/LinkTimeCodeGeneration.props
deleted file mode 100644
index 644462f0..00000000
--- a/builds/msvc/vs2012/properties/LinkTimeCodeGeneration.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-   
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Link Time Code Generation Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-    </ClCompile>
-    <Link>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-    </Link>
-    <Lib>
-      <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
-    </Lib>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2012/properties/Release.props b/builds/msvc/vs2012/properties/Release.props
deleted file mode 100644
index c2111288..00000000
--- a/builds/msvc/vs2012/properties/Release.props
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Release Configuration</_PropertySheetDisplayName>
-    <!-- RootNamespace is used to deconflict output files from differing project versions. -->
-    <IntDir>$(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\</IntDir>
-    <OutDir>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\Release\$(RootNamespace)\</OutDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalOptions>/Oy- %(AdditionalOptions)</AdditionalOptions>
-      <!--<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>-->
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <MinimalRebuild>false</MinimalRebuild>
-      <Optimization>MaxSpeed</Optimization>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <!--<GenerateDebugInformation>true</GenerateDebugInformation>-->
-      <ImportLibrary>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\Release\$(RootNamespace)\$(TargetName).imp.lib</ImportLibrary>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
-    <ClCompile>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2012/properties/Static.props b/builds/msvc/vs2012/properties/Static.props
deleted file mode 100644
index 85207e49..00000000
--- a/builds/msvc/vs2012/properties/Static.props
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Common.props" />
-  </ImportGroup>
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Static Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2012/properties/StaticDebug.props b/builds/msvc/vs2012/properties/StaticDebug.props
deleted file mode 100644
index 8668424c..00000000
--- a/builds/msvc/vs2012/properties/StaticDebug.props
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Static.props" />
-    <Import Project="Debug.props" />
-  </ImportGroup>
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Static Debug Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- Linking CRT statically when building a static library is conventional. -->
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <LinkIncremental>true</LinkIncremental>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2012/properties/StaticDebugLinkTimeCodeGeneration.props b/builds/msvc/vs2012/properties/StaticDebugLinkTimeCodeGeneration.props
deleted file mode 100644
index a35e0e7a..00000000
--- a/builds/msvc/vs2012/properties/StaticDebugLinkTimeCodeGeneration.props
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Debug.props" />
-    <Import Project="StaticLinkTimeCodeGeneration.props" />
-  </ImportGroup>
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Static Debug Link Time Code Generation Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- Linking CRT statically when building a static library is conventional. -->
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <LinkIncremental>false</LinkIncremental>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2012/properties/StaticLinkTimeCodeGeneration.props b/builds/msvc/vs2012/properties/StaticLinkTimeCodeGeneration.props
deleted file mode 100644
index 6a8d8837..00000000
--- a/builds/msvc/vs2012/properties/StaticLinkTimeCodeGeneration.props
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Static.props" />
-    <Import Project="LinkTimeCodeGeneration.props" />
-  </ImportGroup>
- 
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Static Link Time Code Generation Library</_PropertySheetDisplayName>
-    
-    <!-- This overrides Static.props->Common.props->TargetName and therefore this 
-    reference must always be set after Static.props->Common.props is included. -->
-    <TargetName>$(TargetName).ltcg</TargetName>
-  </PropertyGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2012/properties/StaticRelease.props b/builds/msvc/vs2012/properties/StaticRelease.props
deleted file mode 100644
index 5eaadae8..00000000
--- a/builds/msvc/vs2012/properties/StaticRelease.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Static.props" />
-    <Import Project="Release.props" />
-  </ImportGroup>
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Static Release Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- Linking CRT statically when building a static library is conventional. -->
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2012/properties/StaticReleaseLinkTimeCodeGeneration.props b/builds/msvc/vs2012/properties/StaticReleaseLinkTimeCodeGeneration.props
deleted file mode 100644
index 4515bef4..00000000
--- a/builds/msvc/vs2012/properties/StaticReleaseLinkTimeCodeGeneration.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Release.props" />
-    <Import Project="StaticLinkTimeCodeGeneration.props" />
-  </ImportGroup>
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Static Release Link Time Code Generation Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- Linking CRT statically when building a static library is conventional. -->
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2012/properties/Win32.props b/builds/msvc/vs2012/properties/Win32.props
deleted file mode 100644
index 8d611a09..00000000
--- a/builds/msvc/vs2012/properties/Win32.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Win32 Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2012/properties/x64.props b/builds/msvc/vs2012/properties/x64.props
deleted file mode 100644
index ddf9c14a..00000000
--- a/builds/msvc/vs2012/properties/x64.props
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>x64 Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- Note that Win64 defines may cause WIN32 to become defined when using windows headers, 
-      but _WIN32 implies Windows 32 bit or above. If the standard headers are not included 
-      these are sometimes required even for 64 bit builds and should never cause harm there.-->
-      <PreprocessorDefinitions>WIN32;_WIN32;WIN64;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X64 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2012/test/test.vcxproj b/builds/msvc/vs2012/test/test.vcxproj
index f0f19925..87ba9a4b 100644
--- a/builds/msvc/vs2012/test/test.vcxproj
+++ b/builds/msvc/vs2012/test/test.vcxproj
@@ -14,74 +14,74 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="DebugDEXE|Win32">
diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj b/builds/msvc/vs2013/libsodium/libsodium.vcxproj
index 0c380cc4..7a000f05 100644
--- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj
@@ -99,159 +99,77 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\DynamicDebug.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\DynamicDebug.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\DynamicRelease.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\DynamicRelease.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\DynamicDebug.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\DynamicDebug.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\DynamicRelease.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\DynamicRelease.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\StaticDebugLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\StaticDebugLinkTimeCodeGeneration.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\StaticReleaseLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\StaticReleaseLinkTimeCodeGeneration.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\StaticDebugLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\StaticDebugLinkTimeCodeGeneration.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\StaticReleaseLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\StaticReleaseLinkTimeCodeGeneration.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\StaticDebug.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\StaticDebug.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\StaticRelease.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\StaticRelease.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\StaticDebug.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\StaticDebug.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\StaticRelease.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\StaticRelease.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha256\cp\api.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2-impl.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\portable-jane.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\crypto_scrypt.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\pbkdf2-sha256.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\sysendian.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base2.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\d.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\d2.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_add.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_madd.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_msub.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p2_dbl.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_sub.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\pow22523.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\pow225521.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sc.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sqrtm1.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\fe25519.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\ge25519.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\sc25519.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\consts.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\int128.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\types.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-be.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-le.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes256.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\ecrypt-sync.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth_hmacsha256.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth_hmacsha512256.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_box.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_box_curve25519xsalsa20poly1305.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_hsalsa20.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa20.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa2012.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa208.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash_blake2b.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash_sha256.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash_sha512.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_int32.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_int64.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_onetimeauth.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_onetimeauth_poly1305.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_onetimeauth_poly1305_donna.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_scalarmult.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_scalarmult_curve25519.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_secretbox.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_secretbox_xsalsa20poly1305.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_shorthash.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_shorthash_siphash24.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_sign.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_sign_ed25519.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_sign_edwards25519sha512batch.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes128ctr.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes256estream.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa20.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa2012.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa208.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_xsalsa20.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint16.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint32.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint64.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint8.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_verify_16.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_verify_32.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_verify_64.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\randombytes.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\randombytes_salsa20_random.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\randombytes_sysrandom.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\utils.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h" />
   </ItemGroup>
   <ItemGroup>
diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters
index 9d125afb..d8a14326 100644
--- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters
@@ -390,258 +390,12 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth_hmacsha256.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth_hmacsha512256.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_box.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_box_curve25519xsalsa20poly1305.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_hsalsa20.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa20.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa208.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa2012.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash_blake2b.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash_sha256.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash_sha512.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_int32.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_int64.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_onetimeauth.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_onetimeauth_poly1305.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_onetimeauth_poly1305_donna.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_scalarmult.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_scalarmult_curve25519.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_secretbox.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_secretbox_xsalsa20poly1305.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_shorthash.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_shorthash_siphash24.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_sign.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_sign_ed25519.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_sign_edwards25519sha512batch.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes128ctr.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes256estream.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa20.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa208.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa2012.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_xsalsa20.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint8.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint16.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint32.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint64.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_verify_16.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_verify_32.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h">
-      <Filter>include</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\utils.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\randombytes_sysrandom.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\randombytes_salsa20_random.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\randombytes.h">
-      <Filter>include</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\resource.h">
       <Filter>resource</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha256\cp\api.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2-impl.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_verify_64.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-be.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-le.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes256.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base2.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\consts.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\crypto_scrypt.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\d2.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\ecrypt-sync.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\fe25519.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_add.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_madd.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_msub.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p2_dbl.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_sub.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\ge25519.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\int128.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\pbkdf2-sha256.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\portable-jane.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\pow22523.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\pow225521.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\d.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sc.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\sc25519.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sqrtm1.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\sysendian.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\types.h">
-      <Filter>include</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium.h">
       <Filter>include</Filter>
     </ClInclude>
diff --git a/builds/msvc/vs2013/properties/Common.props b/builds/msvc/vs2013/properties/Common.props
deleted file mode 100644
index 2acf2e6f..00000000
--- a/builds/msvc/vs2013/properties/Common.props
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Common Settings</_PropertySheetDisplayName>
-    <CharacterSet>Unicode</CharacterSet>
-    <TargetName>$(ProjectName)</TargetName>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <!-- Windows and CRT definitions for unicode. Note that Linux only supports unicode so char is 16 bit. -->
-      <PreprocessorDefinitions>UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-  <Target Name="ConfigInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="ConfigurationType : $(ConfigurationType)" Importance="high"/>
-    <Message Text="Configuration     : $(Configuration)" Importance="high"/>
-    <Message Text="PlatformToolset   : $(PlatformToolset)" Importance="high"/>
-    <Message Text="Building..." Importance="high"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2013/properties/Console.props b/builds/msvc/vs2013/properties/Console.props
deleted file mode 100644
index 414c98ae..00000000
--- a/builds/msvc/vs2013/properties/Console.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Common.props" />
-  </ImportGroup>
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Application</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2013/properties/ConsoleDebugDynamic.props b/builds/msvc/vs2013/properties/ConsoleDebugDynamic.props
deleted file mode 100644
index 5872b5c4..00000000
--- a/builds/msvc/vs2013/properties/ConsoleDebugDynamic.props
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Console.props" />
-    <Import Project="Debug.props" />
-  </ImportGroup>
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Debug Dynamic</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- Linking CRT dynamically when building a dynamic library is conventional. -->
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <LinkIncremental>true</LinkIncremental>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2013/properties/ConsoleDebugLinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/ConsoleDebugLinkTimeCodeGeneration.props
deleted file mode 100644
index 1e752c21..00000000
--- a/builds/msvc/vs2013/properties/ConsoleDebugLinkTimeCodeGeneration.props
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Console.props" />
-    <Import Project="Debug.props" />
-    <Import Project="LinkTimeCodeGeneration.props" />
-  </ImportGroup>
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Debug Link Time Code Generation Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <LinkIncremental>false</LinkIncremental>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2013/properties/ConsoleDebugStatic.props b/builds/msvc/vs2013/properties/ConsoleDebugStatic.props
deleted file mode 100644
index 5d72bbc4..00000000
--- a/builds/msvc/vs2013/properties/ConsoleDebugStatic.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Console.props" />
-    <Import Project="Debug.props" />
-  </ImportGroup>
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Debug Static</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <LinkIncremental>true</LinkIncremental>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2013/properties/ConsoleReleaseDynamic.props b/builds/msvc/vs2013/properties/ConsoleReleaseDynamic.props
deleted file mode 100644
index f15070dd..00000000
--- a/builds/msvc/vs2013/properties/ConsoleReleaseDynamic.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Console.props" />
-    <Import Project="Release.props" />
-  </ImportGroup>
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Release Dynamic</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- Linking CRT dynamically when building a dynamic library is conventional. -->
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2013/properties/ConsoleReleaseLinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/ConsoleReleaseLinkTimeCodeGeneration.props
deleted file mode 100644
index 984891b3..00000000
--- a/builds/msvc/vs2013/properties/ConsoleReleaseLinkTimeCodeGeneration.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Console.props" />
-    <Import Project="Release.props" />
-    <Import Project="LinkTimeCodeGeneration.props" />
-  </ImportGroup>
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Release Link Time Code Generation Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2013/properties/ConsoleReleaseStatic.props b/builds/msvc/vs2013/properties/ConsoleReleaseStatic.props
deleted file mode 100644
index 2aaf3032..00000000
--- a/builds/msvc/vs2013/properties/ConsoleReleaseStatic.props
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Console.props" />
-    <Import Project="Release.props" />
-  </ImportGroup>
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Release Static</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2013/properties/Debug.props b/builds/msvc/vs2013/properties/Debug.props
deleted file mode 100644
index a2867772..00000000
--- a/builds/msvc/vs2013/properties/Debug.props
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Debug Configuration</_PropertySheetDisplayName>
-    <!-- RootNamespace is used to deconflict output files from differing project versions. -->
-    <IntDir>$(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\</IntDir>
-    <OutDir>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\</OutDir>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile><DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\$(TargetName).imp.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2013/properties/Dynamic.props b/builds/msvc/vs2013/properties/Dynamic.props
deleted file mode 100644
index 9e749175..00000000
--- a/builds/msvc/vs2013/properties/Dynamic.props
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Common.props" />
-  </ImportGroup>
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Dynamic Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>_DLL;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2013/properties/DynamicDebug.props b/builds/msvc/vs2013/properties/DynamicDebug.props
deleted file mode 100644
index ee40a01f..00000000
--- a/builds/msvc/vs2013/properties/DynamicDebug.props
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Dynamic.props" />
-    <Import Project="Debug.props" />
-  </ImportGroup>
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Dynamic Debug Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- Linking CRT dynamically when building a dynamic library is conventional. -->
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <LinkIncremental>true</LinkIncremental>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2013/properties/DynamicRelease.props b/builds/msvc/vs2013/properties/DynamicRelease.props
deleted file mode 100644
index c3f36f89..00000000
--- a/builds/msvc/vs2013/properties/DynamicRelease.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Dynamic.props" />
-    <Import Project="Release.props" />
-  </ImportGroup>
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Dynamic Release Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- Linking CRT dynamically when building a dynamic library is conventional. -->
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props
deleted file mode 100644
index 644462f0..00000000
--- a/builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-   
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Link Time Code Generation Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-    </ClCompile>
-    <Link>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-    </Link>
-    <Lib>
-      <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
-    </Lib>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2013/properties/Release.props b/builds/msvc/vs2013/properties/Release.props
deleted file mode 100644
index c2111288..00000000
--- a/builds/msvc/vs2013/properties/Release.props
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Release Configuration</_PropertySheetDisplayName>
-    <!-- RootNamespace is used to deconflict output files from differing project versions. -->
-    <IntDir>$(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\</IntDir>
-    <OutDir>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\Release\$(RootNamespace)\</OutDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalOptions>/Oy- %(AdditionalOptions)</AdditionalOptions>
-      <!--<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>-->
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <MinimalRebuild>false</MinimalRebuild>
-      <Optimization>MaxSpeed</Optimization>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <!--<GenerateDebugInformation>true</GenerateDebugInformation>-->
-      <ImportLibrary>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\Release\$(RootNamespace)\$(TargetName).imp.lib</ImportLibrary>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
-    <ClCompile>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2013/properties/Static.props b/builds/msvc/vs2013/properties/Static.props
deleted file mode 100644
index 85207e49..00000000
--- a/builds/msvc/vs2013/properties/Static.props
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Common.props" />
-  </ImportGroup>
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Static Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2013/properties/StaticDebug.props b/builds/msvc/vs2013/properties/StaticDebug.props
deleted file mode 100644
index 8668424c..00000000
--- a/builds/msvc/vs2013/properties/StaticDebug.props
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Static.props" />
-    <Import Project="Debug.props" />
-  </ImportGroup>
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Static Debug Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- Linking CRT statically when building a static library is conventional. -->
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <LinkIncremental>true</LinkIncremental>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props
deleted file mode 100644
index a35e0e7a..00000000
--- a/builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Debug.props" />
-    <Import Project="StaticLinkTimeCodeGeneration.props" />
-  </ImportGroup>
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Static Debug Link Time Code Generation Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- Linking CRT statically when building a static library is conventional. -->
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <LinkIncremental>false</LinkIncremental>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2013/properties/StaticLinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/StaticLinkTimeCodeGeneration.props
deleted file mode 100644
index 6a8d8837..00000000
--- a/builds/msvc/vs2013/properties/StaticLinkTimeCodeGeneration.props
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Static.props" />
-    <Import Project="LinkTimeCodeGeneration.props" />
-  </ImportGroup>
- 
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Static Link Time Code Generation Library</_PropertySheetDisplayName>
-    
-    <!-- This overrides Static.props->Common.props->TargetName and therefore this 
-    reference must always be set after Static.props->Common.props is included. -->
-    <TargetName>$(TargetName).ltcg</TargetName>
-  </PropertyGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2013/properties/StaticRelease.props b/builds/msvc/vs2013/properties/StaticRelease.props
deleted file mode 100644
index 5eaadae8..00000000
--- a/builds/msvc/vs2013/properties/StaticRelease.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Static.props" />
-    <Import Project="Release.props" />
-  </ImportGroup>
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Static Release Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- Linking CRT statically when building a static library is conventional. -->
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2013/properties/StaticReleaseLinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/StaticReleaseLinkTimeCodeGeneration.props
deleted file mode 100644
index 4515bef4..00000000
--- a/builds/msvc/vs2013/properties/StaticReleaseLinkTimeCodeGeneration.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Release.props" />
-    <Import Project="StaticLinkTimeCodeGeneration.props" />
-  </ImportGroup>
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Static Release Link Time Code Generation Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- Linking CRT statically when building a static library is conventional. -->
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2013/properties/Win32.props b/builds/msvc/vs2013/properties/Win32.props
deleted file mode 100644
index 8d611a09..00000000
--- a/builds/msvc/vs2013/properties/Win32.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Win32 Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2013/properties/x64.props b/builds/msvc/vs2013/properties/x64.props
deleted file mode 100644
index ddf9c14a..00000000
--- a/builds/msvc/vs2013/properties/x64.props
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>x64 Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- Note that Win64 defines may cause WIN32 to become defined when using windows headers, 
-      but _WIN32 implies Windows 32 bit or above. If the standard headers are not included 
-      these are sometimes required even for 64 bit builds and should never cause harm there.-->
-      <PreprocessorDefinitions>WIN32;_WIN32;WIN64;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X64 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2013/test/test.vcxproj b/builds/msvc/vs2013/test/test.vcxproj
index 6f4815f7..e3db2a0d 100644
--- a/builds/msvc/vs2013/test/test.vcxproj
+++ b/builds/msvc/vs2013/test/test.vcxproj
@@ -14,74 +14,74 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" />
-    <Import Project="$(ProjectDir)..\properties\Win32.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" />
-    <Import Project="$(ProjectDir)..\properties\x64.props" />
+    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
+    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
   </ImportGroup>
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="DebugDEXE|Win32">
diff --git a/packaging/nuget/package.config b/packaging/nuget/package.config
index 2cc46ae0..832a5f93 100644
--- a/packaging/nuget/package.config
+++ b/packaging/nuget/package.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- These values are populated into the package.gsl templates by package.bat. -->
 <!-- The target attribute controls path and file name only, id controls package naming. -->
-<package id="libsodium_vc120" target="libsodium" namespace="libsodium12" version = "0.4.5.1" pathversion="0_4_5_1" platformtoolset="v120" />
\ No newline at end of file
+<package id="libsodium_vc120" target="libsodium" namespace="libsodium12" version = "0.4.5.2" pathversion="0_4_5_2" platformtoolset="v120" />
\ No newline at end of file
diff --git a/packaging/nuget/package.gsl b/packaging/nuget/package.gsl
index f2f07457..43d12d9e 100644
--- a/packaging/nuget/package.gsl
+++ b/packaging/nuget/package.gsl
@@ -35,56 +35,58 @@
     <files>
         <!-- include -->
                 
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\core.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_auth.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_auth_hmacsha256.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_auth_hmacsha512256.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_box.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_box_curve25519xsalsa20poly1305.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_core_hsalsa20.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_core_salsa20.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_core_salsa2012.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_core_salsa208.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_generichash.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_generichash_blake2b.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_hash.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_hashblocks_sha256.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_hashblocks_sha512.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_hash_sha256.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_hash_sha512.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_int32.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_int64.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_onetimeauth.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_onetimeauth_poly1305.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_onetimeauth_poly1305_donna.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_scalarmult.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_scalarmult_curve25519.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_secretbox.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_secretbox_xsalsa20poly1305.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_shorthash.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_shorthash_siphash24.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_sign.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_sign_ed25519.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_sign_edwards25519sha512batch.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_stream.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_stream_aes128ctr.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_stream_aes256estream.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_stream_salsa20.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_stream_salsa2012.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_stream_salsa208.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_stream_xsalsa20.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_uint16.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_uint32.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_uint64.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_uint8.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_verify_16.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_verify_32.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\export.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\randombytes.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\randombytes_salsa20_random.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\randombytes_sysrandom.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\utils.h" target="build\\native\\include" />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\version.h" target="build\\native\\include" />        
+        <file src="..\\..\\src\\libsodium\\include\\sodium.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\core.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_auth.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_auth_hmacsha256.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_auth_hmacsha512.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_auth_hmacsha512256.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_box.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_box_curve25519xsalsa20poly1305.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_core_hsalsa20.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_core_salsa20.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_core_salsa2012.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_core_salsa208.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_generichash.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_generichash_blake2b.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_hash.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_hash_sha256.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_hash_sha512.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_onetimeauth.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_onetimeauth_poly1305.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_onetimeauth_poly1305_53.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_onetimeauth_poly1305_donna.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_scalarmult.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_scalarmult_curve25519.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_secretbox.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_secretbox_xsalsa20poly1305.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_shorthash.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_shorthash_siphash24.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_sign.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_sign_ed25519.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_sign_edwards25519sha512batch.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_stream.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_stream_aes128ctr.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_stream_aes256estream.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_stream_salsa20.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_stream_salsa2012.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_stream_salsa208.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_stream_xsalsa20.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_int32.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_int64.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_uint16.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_uint32.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_uint64.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_uint8.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_verify_16.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_verify_32.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_verify_64.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\export.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\randombytes.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\randombytes_salsa20_random.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\randombytes_sysrandom.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\utils.h" target="build\\native\\include"  />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\version.h" target="build\\native\\include"  />     
 
         <!-- targets -->
       
diff --git a/packaging/nuget/package.nuspec b/packaging/nuget/package.nuspec
index 20dd0f61..ed7ce368 100644
--- a/packaging/nuget/package.nuspec
+++ b/packaging/nuget/package.nuspec
@@ -7,7 +7,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
     <metadata minClientVersion="2.5">
         <id>libsodium_vc120</id>
-        <version>0.4.5.1</version>
+        <version>0.4.5.2</version>
         <title>libsodium_vc120</title>
         <authors>libsodium contributors</authors>
         <owners>Eric Voskuil</owners>
@@ -15,7 +15,7 @@
         <projectUrl>https://github.com/jedisct1/libsodium</projectUrl>
         <iconUrl>http://upload.wikimedia.org/wikipedia/commons/thumb/7/78/Salt_shaker_on_white_background.jpg/220px-Salt_shaker_on_white_background.jpg</iconUrl>
         <requireLicenseAcceptance>true</requireLicenseAcceptance>
-        <developmentDependency>true</developmentDependency>
+        <developmentDependency>false</developmentDependency>
         <description>Sodium is a portable, cross-compilable, installable, packageable fork of NaCl (based on the latest released upstream version nacl-20110221), with a compatible API.</description>
         <summary>Portable fork of NaCl, packaged for Visual Studio 2013 (v120) and CTP_Nov2013 compilers.</summary>
         <releaseNotes>https://raw.github.com/jedisct1/libsodium/master/ChangeLog</releaseNotes>
@@ -27,56 +27,58 @@
     <files>
         <!-- include -->
                 
-        <file src="..\..\src\libsodium\include\sodium\core.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_auth.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_auth_hmacsha256.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_auth_hmacsha512256.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_box.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_box_curve25519xsalsa20poly1305.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_core_hsalsa20.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_core_salsa20.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_core_salsa2012.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_core_salsa208.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_generichash.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_generichash_blake2b.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_hash.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_hashblocks_sha256.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_hashblocks_sha512.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_hash_sha256.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_hash_sha512.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_int32.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_int64.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_onetimeauth.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_onetimeauth_poly1305.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_onetimeauth_poly1305_donna.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_scalarmult.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_scalarmult_curve25519.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_secretbox.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_secretbox_xsalsa20poly1305.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_shorthash.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_shorthash_siphash24.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_sign.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_sign_ed25519.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_sign_edwards25519sha512batch.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_stream.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_stream_aes128ctr.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_stream_aes256estream.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_stream_salsa20.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_stream_salsa2012.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_stream_salsa208.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_stream_xsalsa20.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_uint16.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_uint32.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_uint64.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_uint8.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_verify_16.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\crypto_verify_32.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\export.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\randombytes.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\randombytes_salsa20_random.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\randombytes_sysrandom.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\utils.h" target="build\native\include" />
-        <file src="..\..\src\libsodium\include\sodium\version.h" target="build\native\include" />                
+        <file src="..\..\src\libsodium\include\sodium.h" target="build\native\include"         />
+        <file src="..\..\src\libsodium\include\sodium\core.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_auth.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_auth_hmacsha256.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_auth_hmacsha512.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_auth_hmacsha512256.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_box.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_box_curve25519xsalsa20poly1305.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_core_hsalsa20.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_core_salsa20.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_core_salsa2012.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_core_salsa208.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_generichash.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_generichash_blake2b.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_hash.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_hash_sha256.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_hash_sha512.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_onetimeauth.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_onetimeauth_poly1305.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_onetimeauth_poly1305_53.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_onetimeauth_poly1305_donna.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_scalarmult.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_scalarmult_curve25519.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_secretbox.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_secretbox_xsalsa20poly1305.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_shorthash.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_shorthash_siphash24.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_sign.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_sign_ed25519.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_sign_edwards25519sha512batch.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_stream.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_stream_aes128ctr.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_stream_aes256estream.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_stream_salsa20.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_stream_salsa2012.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_stream_salsa208.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_stream_xsalsa20.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_int32.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_int64.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_uint16.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_uint32.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_uint64.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_uint8.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_verify_16.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_verify_32.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\crypto_verify_64.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\export.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\randombytes.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\randombytes_salsa20_random.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\randombytes_sysrandom.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\utils.h" target="build\native\include"          />
+        <file src="..\..\src\libsodium\include\sodium\version.h" target="build\native\include"          />     
 
         <!-- targets -->
       
@@ -91,52 +93,52 @@
         <!-- libraries -->
 
         <!-- x86 Dynamic libraries (.dll) -->
-        <file src="..\..\bin\Win32\Release\libsodium12\libsodium.dll" target="build\native\bin\libsodium-x86-v120-mt-0_4_5_1.dll" />
-        <file src="..\..\bin\Win32\Debug\libsodium12\libsodium.dll" target="build\native\bin\libsodium-x86-v120-mt-gd-0_4_5_1.dll" />
+        <file src="..\..\bin\Win32\Release\libsodium12\libsodium.dll" target="build\native\bin\libsodium-x86-v120-mt-0_4_5_2.dll" />
+        <file src="..\..\bin\Win32\Debug\libsodium12\libsodium.dll" target="build\native\bin\libsodium-x86-v120-mt-gd-0_4_5_2.dll" />
 
         <!-- x86 Debugging symbols (.pdb) -->
-        <!--<file src="..\..\bin\Win32\Release\libsodium12\libsodium.pdb" target="build\native\bin\libsodium-x86-v120-mt-0_4_5_1.pdb" />-->
-        <file src="..\..\bin\Win32\Debug\libsodium12\libsodium.pdb" target="build\native\bin\libsodium-x86-v120-mt-gd-0_4_5_1.pdb" />
+        <!--<file src="..\..\bin\Win32\Release\libsodium12\libsodium.pdb" target="build\native\bin\libsodium-x86-v120-mt-0_4_5_2.pdb" />-->
+        <file src="..\..\bin\Win32\Debug\libsodium12\libsodium.pdb" target="build\native\bin\libsodium-x86-v120-mt-gd-0_4_5_2.pdb" />
 
         <!-- x86 Static libraries (.lib) -->
-        <file src="..\..\bin\Win32\Release\libsodium12\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-s-0_4_5_1.lib" />
-        <file src="..\..\bin\Win32\Debug\libsodium12\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-sgd-0_4_5_1.lib" />
+        <file src="..\..\bin\Win32\Release\libsodium12\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-s-0_4_5_2.lib" />
+        <file src="..\..\bin\Win32\Debug\libsodium12\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-sgd-0_4_5_2.lib" />
 
         <!-- x86 Static link time code generation libraries (.ltcg.lib) -->
-        <file src="..\..\bin\Win32\Release\libsodium12\libsodium.ltcg.lib" target="build\native\bin\libsodium-x86-v120-mt-s-0_4_5_1.ltcg.lib" />
-        <file src="..\..\bin\Win32\Debug\libsodium12\libsodium.ltcg.lib" target="build\native\bin\libsodium-x86-v120-mt-sgd-0_4_5_1.ltcg.lib" />
+        <file src="..\..\bin\Win32\Release\libsodium12\libsodium.ltcg.lib" target="build\native\bin\libsodium-x86-v120-mt-s-0_4_5_2.ltcg.lib" />
+        <file src="..\..\bin\Win32\Debug\libsodium12\libsodium.ltcg.lib" target="build\native\bin\libsodium-x86-v120-mt-sgd-0_4_5_2.ltcg.lib" />
 
         <!-- x86 Import libraries (.imp.lib) -->
-        <file src="..\..\bin\Win32\Release\libsodium12\libsodium.imp.lib" target="build\native\bin\libsodium-x86-v120-mt-0_4_5_1.imp.lib" />
-        <file src="..\..\bin\Win32\Debug\libsodium12\libsodium.imp.lib" target="build\native\bin\libsodium-x86-v120-mt-gd-0_4_5_1.imp.lib" />
+        <file src="..\..\bin\Win32\Release\libsodium12\libsodium.imp.lib" target="build\native\bin\libsodium-x86-v120-mt-0_4_5_2.imp.lib" />
+        <file src="..\..\bin\Win32\Debug\libsodium12\libsodium.imp.lib" target="build\native\bin\libsodium-x86-v120-mt-gd-0_4_5_2.imp.lib" />
 
         <!-- x86 Export libraries (.exp) -->
-        <file src="..\..\bin\Win32\Release\libsodium12\libsodium.imp.exp" target="build\native\bin\libsodium-x86-v120-mt-0_4_5_1.exp" />
-        <file src="..\..\bin\Win32\Debug\libsodium12\libsodium.imp.exp" target="build\native\bin\libsodium-x86-v120-mt-gd-0_4_5_1.exp" />
+        <file src="..\..\bin\Win32\Release\libsodium12\libsodium.imp.exp" target="build\native\bin\libsodium-x86-v120-mt-0_4_5_2.exp" />
+        <file src="..\..\bin\Win32\Debug\libsodium12\libsodium.imp.exp" target="build\native\bin\libsodium-x86-v120-mt-gd-0_4_5_2.exp" />
 
         <!-- x64 Dynamic libraries (.dll) -->
-        <file src="..\..\bin\x64\Release\libsodium12\libsodium.dll" target="build\native\bin\libsodium-x64-v120-mt-0_4_5_1.dll" />
-        <file src="..\..\bin\x64\Debug\libsodium12\libsodium.dll" target="build\native\bin\libsodium-x64-v120-mt-gd-0_4_5_1.dll" />
+        <file src="..\..\bin\x64\Release\libsodium12\libsodium.dll" target="build\native\bin\libsodium-x64-v120-mt-0_4_5_2.dll" />
+        <file src="..\..\bin\x64\Debug\libsodium12\libsodium.dll" target="build\native\bin\libsodium-x64-v120-mt-gd-0_4_5_2.dll" />
 
         <!-- x64 Debugging symbols (.pdb) -->
-        <!--<file src="..\..\bin\x64\Release\libsodium12\libsodium.pdb" target="build\native\bin\libsodium-x64-v120-mt-0_4_5_1.pdb" />-->
-        <file src="..\..\bin\x64\Debug\libsodium12\libsodium.pdb" target="build\native\bin\libsodium-x64-v120-mt-gd-0_4_5_1.pdb" />
+        <!--<file src="..\..\bin\x64\Release\libsodium12\libsodium.pdb" target="build\native\bin\libsodium-x64-v120-mt-0_4_5_2.pdb" />-->
+        <file src="..\..\bin\x64\Debug\libsodium12\libsodium.pdb" target="build\native\bin\libsodium-x64-v120-mt-gd-0_4_5_2.pdb" />
 
         <!-- x64 Static libraries (.lib) -->
-        <file src="..\..\bin\x64\Release\libsodium12\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-s-0_4_5_1.lib" />
-        <file src="..\..\bin\x64\Debug\libsodium12\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-sgd-0_4_5_1.lib" />
+        <file src="..\..\bin\x64\Release\libsodium12\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-s-0_4_5_2.lib" />
+        <file src="..\..\bin\x64\Debug\libsodium12\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-sgd-0_4_5_2.lib" />
 
         <!-- x64 Static link time code generation libraries (.ltcg.lib) -->
-        <file src="..\..\bin\Win32\Release\libsodium12\libsodium.ltcg.lib" target="build\native\bin\libsodium-x64-v120-mt-s-0_4_5_1.ltcg.lib" />
-        <file src="..\..\bin\Win32\Debug\libsodium12\libsodium.ltcg.lib" target="build\native\bin\libsodium-x64-v120-mt-sgd-0_4_5_1.ltcg.lib" />
+        <file src="..\..\bin\Win32\Release\libsodium12\libsodium.ltcg.lib" target="build\native\bin\libsodium-x64-v120-mt-s-0_4_5_2.ltcg.lib" />
+        <file src="..\..\bin\Win32\Debug\libsodium12\libsodium.ltcg.lib" target="build\native\bin\libsodium-x64-v120-mt-sgd-0_4_5_2.ltcg.lib" />
 
         <!-- x64 Import libraries (.imp.lib) -->
-        <file src="..\..\bin\x64\Release\libsodium12\libsodium.imp.lib" target="build\native\bin\libsodium-x64-v120-mt-0_4_5_1.imp.lib" />
-        <file src="..\..\bin\x64\Debug\libsodium12\libsodium.imp.lib" target="build\native\bin\libsodium-x64-v120-mt-gd-0_4_5_1.imp.lib" />
+        <file src="..\..\bin\x64\Release\libsodium12\libsodium.imp.lib" target="build\native\bin\libsodium-x64-v120-mt-0_4_5_2.imp.lib" />
+        <file src="..\..\bin\x64\Debug\libsodium12\libsodium.imp.lib" target="build\native\bin\libsodium-x64-v120-mt-gd-0_4_5_2.imp.lib" />
 
         <!-- x64 Export libraries (.exp) -->
-        <file src="..\..\bin\x64\Release\libsodium12\libsodium.imp.exp" target="build\native\bin\libsodium-x64-v120-mt-0_4_5_1.exp" />
-        <file src="..\..\bin\x64\Debug\libsodium12\libsodium.imp.exp" target="build\native\bin\libsodium-x64-v120-mt-gd-0_4_5_1.exp" />
+        <file src="..\..\bin\x64\Release\libsodium12\libsodium.imp.exp" target="build\native\bin\libsodium-x64-v120-mt-0_4_5_2.exp" />
+        <file src="..\..\bin\x64\Debug\libsodium12\libsodium.imp.exp" target="build\native\bin\libsodium-x64-v120-mt-gd-0_4_5_2.exp" />
     </files>
 <!--
 #################################################################
diff --git a/packaging/nuget/package.targets b/packaging/nuget/package.targets
index 5efd4f76..ab1a7f84 100644
--- a/packaging/nuget/package.targets
+++ b/packaging/nuget/package.targets
@@ -29,66 +29,66 @@
   <!-- static libraries -->
   <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'static' And $(Configuration.IndexOf('Release')) != -1">
     <Link>
-      <AdditionalDependencies>libsodium-x86-v120-mt-s-0_4_5_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsodium-x86-v120-mt-s-0_4_5_2.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'static' And $(Configuration.IndexOf('Debug')) != -1">
     <Link>
-      <AdditionalDependencies>libsodium-x86-v120-mt-sgd-0_4_5_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsodium-x86-v120-mt-sgd-0_4_5_2.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'static' And $(Configuration.IndexOf('Release')) != -1">
     <Link>
-      <AdditionalDependencies>libsodium-x64-v120-mt-s-0_4_5_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsodium-x64-v120-mt-s-0_4_5_2.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'static' And $(Configuration.IndexOf('Debug')) != -1">
     <Link>
-      <AdditionalDependencies>libsodium-x64-v120-mt-sgd-0_4_5_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsodium-x64-v120-mt-sgd-0_4_5_2.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 
   <!-- static ltcg libraries -->
   <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'ltcg' And $(Configuration.IndexOf('Release')) != -1">
     <Link>
-      <AdditionalDependencies>libsodium-x86-v120-mt-s-0_4_5_1.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsodium-x86-v120-mt-s-0_4_5_2.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'ltcg' And $(Configuration.IndexOf('Debug')) != -1">
     <Link>
-      <AdditionalDependencies>libsodium-x86-v120-mt-sgd-0_4_5_1.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsodium-x86-v120-mt-sgd-0_4_5_2.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'ltcg' And $(Configuration.IndexOf('Release')) != -1">
     <Link>
-      <AdditionalDependencies>libsodium-x64-v120-mt-s-0_4_5_1.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsodium-x64-v120-mt-s-0_4_5_2.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'ltcg' And $(Configuration.IndexOf('Debug')) != -1">
     <Link>
-      <AdditionalDependencies>libsodium-x64-v120-mt-sgd-0_4_5_1.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsodium-x64-v120-mt-sgd-0_4_5_2.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   
   <!-- dynamic import libraries -->
   <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1">
     <Link>
-      <AdditionalDependencies>libsodium-x86-v120-mt-0_4_5_1.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsodium-x86-v120-mt-0_4_5_2.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1">
     <Link>
-      <AdditionalDependencies>libsodium-x86-v120-mt-gd-0_4_5_1.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsodium-x86-v120-mt-gd-0_4_5_2.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1">
     <Link>
-      <AdditionalDependencies>libsodium-x64-v120-mt-0_4_5_1.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsodium-x64-v120-mt-0_4_5_2.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1">
     <Link>
-      <AdditionalDependencies>libsodium-x64-v120-mt-gd-0_4_5_1.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsodium-x64-v120-mt-gd-0_4_5_2.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 
@@ -97,26 +97,26 @@
   <Target Name="libsodium_AfterBuild_Win32_v120_Dynamic_Release"
           Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1"
           AfterTargets="libsodium_AfterBuild">
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-0_4_5_1.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
-    <!--<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-0_4_5_1.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />-->
+    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-0_4_5_2.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
+    <!--<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-0_4_5_2.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />-->
   </Target>
   <Target Name="libsodium_AfterBuild_Win32_v120_Dynamic_Debug"
           Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1"
           AfterTargets="libsodium_AfterBuild">
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-gd-0_4_5_1.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-gd-0_4_5_1.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-gd-0_4_5_2.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-gd-0_4_5_2.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />
   </Target>
   <Target Name="libsodium_AfterBuild_x64_v120_Dynamic_Release"
           Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1"
           AfterTargets="libsodium_AfterBuild">
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-0_4_5_1.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
-    <!--<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-0_4_5_1.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />-->
+    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-0_4_5_2.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
+    <!--<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-0_4_5_2.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />-->
   </Target>
   <Target Name="libsodium_AfterBuild_x64_v120_Dynamic_Debug"
           Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1"
           AfterTargets="libsodium_AfterBuild">
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-gd-0_4_5_1.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-gd-0_4_5_1.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-gd-0_4_5_2.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-gd-0_4_5_2.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />
   </Target>
 
 <!--