diff --git a/builds/msvc/vs2015/libsodium/libsodium.vcxproj b/builds/msvc/vs2015/libsodium/libsodium.vcxproj
index ed82dcc6..8635a8c4 100644
--- a/builds/msvc/vs2015/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2015/libsodium/libsodium.vcxproj
@@ -72,12 +72,12 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-ref.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-sse41.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-ssse3.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\poly1305_donna.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptsalsa208sha256\nosse\pwhash_scryptsalsa208sha256_nosse.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptsalsa208sha256\pwhash_scryptsalsa208sha256.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptsalsa208sha256\sse\pwhash_scryptsalsa208sha256_sse.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\donna_c64\base_curve25519_donna_c64.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\donna_c64\smult_curve25519_donna_c64.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\base_curve25519_ref10.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\donna_c64\curve25519_donna_c64.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\curve25519_ref10.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\fe_0_curve25519_ref10.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\fe_1_curve25519_ref10.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\fe_add_curve25519_ref10.c" />
@@ -90,7 +90,8 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\fe_sq_curve25519_ref10.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\fe_sub_curve25519_ref10.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\fe_tobytes_curve25519_ref10.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\scalarmult_curve25519_ref10.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\scalarmult_curve25519.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\obsolete.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\chacha20\ref\stream_chacha20_ref.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\chacha20\stream_chacha20_api.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\stream_salsa20_ref.c" />
@@ -98,10 +99,16 @@
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-load-sse2.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-load-sse41.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-round.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\poly1305_donna.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\poly1305_donna32.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\poly1305_donna64.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\onetimeauth_poly1305.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\donna_c64\curve25519_donna_c64.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\curve25519_ref10.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\fe.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\montgomery.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\pow225521.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\scalarmult_curve25519.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\chacha20\ref\stream_chacha20_ref.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h" />
@@ -197,7 +204,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha512\cp\hash_sha512.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\crypto_onetimeauth.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\onetimeauth_poly1305.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\auth_poly1305_donna.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptsalsa208sha256\crypto_scrypt-common.c" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptsalsa208sha256\crypto_scrypt.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptsalsa208sha256\scrypt_platform.c" />
@@ -205,7 +211,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptsalsa208sha256\pbkdf2-sha256.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptsalsa208sha256\sysendian.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\crypto_scalarmult.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\scalarmult_curve25519_api.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretbox\crypto_secretbox.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretbox\crypto_secretbox_easy.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretbox\xsalsa20poly1305\secretbox_xsalsa20poly1305_api.c" />
@@ -269,14 +274,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sc_reduce.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sign.c" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sqrtm1.h" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\sign_edwards25519sha512batch_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\fe25519.h" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\fe25519_edwards25519sha512batch.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\ge25519.h" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\ge25519_edwards25519sha512batch.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\sc25519.h" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\sc25519_edwards25519sha512batch.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\sign_edwards25519sha512batch.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\crypto_stream.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\afternm_aes128ctr.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\stream_aes128ctr_api.c" />
@@ -328,4 +325,4 @@
     <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters
index c2e228bc..0fdaa73d 100644
--- a/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters
@@ -163,9 +163,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\auth_hmacsha512256_api.c">
       <Filter>src\crypto_auth\hmacsha512256</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\auth_poly1305_donna.c">
-      <Filter>src\crypto_onetimeauth\poly1305\donna</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\before_curve25519xsalsa20poly1305.c">
       <Filter>src\crypto_box\curve25519xsalsa20poly1305\ref</Filter>
     </ClCompile>
@@ -289,9 +286,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe_tobytes.c">
       <Filter>src\crypto_sign\ed25519\ref10</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\fe25519_edwards25519sha512batch.c">
-      <Filter>src\crypto_sign\edwards25519sha512batch\ref</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_add.c">
       <Filter>src\crypto_sign\ed25519\ref10</Filter>
     </ClCompile>
@@ -346,9 +340,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_tobytes.c">
       <Filter>src\crypto_sign\ed25519\ref10</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\ge25519_edwards25519sha512batch.c">
-      <Filter>src\crypto_sign\edwards25519sha512batch\ref</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\generichash_blake2_api.c">
       <Filter>src\crypto_generichash\blake2</Filter>
     </ClCompile>
@@ -382,12 +373,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sc_reduce.c">
       <Filter>src\crypto_sign\ed25519\ref10</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\sc25519_edwards25519sha512batch.c">
-      <Filter>src\crypto_sign\edwards25519sha512batch\ref</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\scalarmult_curve25519_api.c">
-      <Filter>src\crypto_scalarmult\curve25519</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretbox\xsalsa20poly1305\secretbox_xsalsa20poly1305_api.c">
       <Filter>src\crypto_secretbox\xsalsa20poly1305</Filter>
     </ClCompile>
@@ -403,12 +388,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\sign_ed25519_api.c">
       <Filter>src\crypto_sign\ed25519</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\sign_edwards25519sha512batch.c">
-      <Filter>src\crypto_sign\edwards25519sha512batch\ref</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\sign_edwards25519sha512batch_api.c">
-      <Filter>src\crypto_sign\edwards25519sha512batch</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\stream_aes128ctr.c">
       <Filter>src\crypto_stream\aes128ctr\portable</Filter>
     </ClCompile>
@@ -538,9 +517,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe.h">
       <Filter>src\crypto_sign\ed25519\ref10</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\fe25519.h">
-      <Filter>src\crypto_sign\edwards25519sha512batch\ref</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge.h">
       <Filter>src\crypto_sign\ed25519\ref10</Filter>
     </ClInclude>
@@ -559,9 +535,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_sub.h">
       <Filter>src\crypto_sign\ed25519\ref10</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\ge25519.h">
-      <Filter>src\crypto_sign\edwards25519sha512batch\ref</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\int128.h">
       <Filter>src\crypto_stream\aes128ctr\portable</Filter>
     </ClInclude>
@@ -580,9 +553,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sc.h">
       <Filter>src\crypto_sign\ed25519\ref10</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\sc25519.h">
-      <Filter>src\crypto_sign\edwards25519sha512batch\ref</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptsalsa208sha256\scrypt_platform.c">
       <Filter>src\crypto_pwhash\scryptsalsa208sha256</Filter>
     </ClCompile>
@@ -613,12 +583,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptsalsa208sha256\sse\pwhash_scryptsalsa208sha256_sse.c">
       <Filter>src\crypto_pwhash\scryptsalsa208sha256\sse</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\donna_c64\base_curve25519_donna_c64.c">
-      <Filter>src\crypto_scalarmult\curve25519\donna_c64</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\donna_c64\smult_curve25519_donna_c64.c">
-      <Filter>src\crypto_scalarmult\curve25519\donna_c64</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\stream_salsa20_ref.c">
       <Filter>src\crypto_stream\salsa20\ref</Filter>
     </ClCompile>
@@ -637,15 +601,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\d2.h">
       <Filter>src\crypto_sign\ed25519\ref10</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\fe.h">
-      <Filter>src\crypto_scalarmult\curve25519\ref10</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\montgomery.h">
-      <Filter>src\crypto_scalarmult\curve25519\ref10</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\pow225521.h">
-      <Filter>src\crypto_scalarmult\curve25519\ref10</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\chacha20\ref\stream_chacha20_ref.h">
       <Filter>src\crypto_stream\chacha20\ref</Filter>
     </ClInclude>
@@ -670,6 +625,33 @@
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\onetimeauth_poly1305.h">
       <Filter>src\crypto_onetimeauth\poly1305</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\poly1305_donna.h">
+      <Filter>src\crypto_onetimeauth\poly1305\donna</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\poly1305_donna32.h">
+      <Filter>src\crypto_onetimeauth\poly1305\donna</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\poly1305_donna64.h">
+      <Filter>src\crypto_onetimeauth\poly1305\donna</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\scalarmult_curve25519.h">
+      <Filter>src\crypto_scalarmult\curve25519</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\donna_c64\curve25519_donna_c64.h">
+      <Filter>src\crypto_scalarmult\curve25519\donna_c64</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\curve25519_ref10.h">
+      <Filter>src\crypto_scalarmult\curve25519\ref10</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\fe.h">
+      <Filter>src\crypto_scalarmult\curve25519\ref10</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\montgomery.h">
+      <Filter>src\crypto_scalarmult\curve25519\ref10</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\pow225521.h">
+      <Filter>src\crypto_scalarmult\curve25519\ref10</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\packaging\nuget\package.bat">
@@ -830,9 +812,6 @@
     <Filter Include="src\crypto_sign\ed25519">
       <UniqueIdentifier>{b4a8182e-ac68-44ff-9326-4cc0a9061ed8}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\crypto_sign\edwards25519sha512batch">
-      <UniqueIdentifier>{229af36f-3c18-4cbf-8b60-84a04be8506e}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\crypto_stream\aes128ctr">
       <UniqueIdentifier>{ca40b775-e025-4359-87ae-02c771c1a222}</UniqueIdentifier>
     </Filter>
@@ -860,9 +839,6 @@
     <Filter Include="src\crypto_stream\aes128ctr\portable">
       <UniqueIdentifier>{46eb8265-dc41-4289-aa7d-c1918e05cf75}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\crypto_sign\edwards25519sha512batch\ref">
-      <UniqueIdentifier>{e1301424-0353-47a8-9f5d-2c6f19bdac10}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\crypto_sign\ed25519\ref10">
       <UniqueIdentifier>{996fa5e1-cf7e-4b97-a502-edc874ee020d}</UniqueIdentifier>
     </Filter>
@@ -949,7 +925,37 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\base_curve25519_ref10.c">
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\chacha20\stream_chacha20_api.c">
+      <Filter>src\crypto_stream\chacha20</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\chacha20\ref\stream_chacha20_ref.c">
+      <Filter>src\crypto_stream\chacha20\ref</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\chacha20poly1305\sodium\aead_chacha20poly1305.c">
+      <Filter>src\crypto_aead\chacha20poly1305\sodium</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\aes256gcm\aesni\aead_aes256gcm_aesni.c">
+      <Filter>src\crypto_aead\aes256gcm\aesni</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-ref.c">
+      <Filter>src\crypto_generichash\blake2\ref</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-sse41.c">
+      <Filter>src\crypto_generichash\blake2\ref</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-ssse3.c">
+      <Filter>src\crypto_generichash\blake2\ref</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\poly1305_donna.c">
+      <Filter>src\crypto_onetimeauth\poly1305\donna</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\scalarmult_curve25519.c">
+      <Filter>src\crypto_scalarmult\curve25519</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\donna_c64\curve25519_donna_c64.c">
+      <Filter>src\crypto_scalarmult\curve25519\donna_c64</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\curve25519_ref10.c">
       <Filter>src\crypto_scalarmult\curve25519\ref10</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\fe_0_curve25519_ref10.c">
@@ -988,29 +994,8 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\fe_tobytes_curve25519_ref10.c">
       <Filter>src\crypto_scalarmult\curve25519\ref10</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\scalarmult_curve25519_ref10.c">
-      <Filter>src\crypto_scalarmult\curve25519\ref10</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\chacha20\stream_chacha20_api.c">
-      <Filter>src\crypto_stream\chacha20</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\chacha20\ref\stream_chacha20_ref.c">
-      <Filter>src\crypto_stream\chacha20\ref</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\chacha20poly1305\sodium\aead_chacha20poly1305.c">
-      <Filter>src\crypto_aead\chacha20poly1305\sodium</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\aes256gcm\aesni\aead_aes256gcm_aesni.c">
-      <Filter>src\crypto_aead\aes256gcm\aesni</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-ref.c">
-      <Filter>src\crypto_generichash\blake2\ref</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-sse41.c">
-      <Filter>src\crypto_generichash\blake2\ref</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-compress-ssse3.c">
-      <Filter>src\crypto_generichash\blake2\ref</Filter>
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\obsolete.c">
+      <Filter>src\crypto_sign\ed25519\ref10</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file