diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj b/builds/msvc/vs2010/libsodium/libsodium.vcxproj
index e36a02df..1c91ec22 100644
--- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj
@@ -173,43 +173,34 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\cp\hmac_hmacsha512.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\cp\verify_hmacsha512.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\auth_hmacsha512256_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\hmac_hmacsha512256.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\verify_hmacsha512256.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box_easy.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box_seal.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\box_curve25519xsalsa20poly1305_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\after_curve25519xsalsa20poly1305.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\before_curve25519xsalsa20poly1305.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\box_curve25519xsalsa20poly1305.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\keypair_curve25519xsalsa20poly1305.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\ref2\core_hsalsa20.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\core_hsalsa20_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\ref2\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa20\ref\core_salsa20.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa20\core_salsa20_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa20\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\ref\core_salsa2012.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\core_salsa2012_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa208\ref\core_salsa208.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa208\core_salsa208_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa208\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\crypto_generichash.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\generichash_blake2_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\api.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2-impl.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-ref.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\generichash_blake2b.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\crypto_hash.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha256\hash_sha256_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_hash\sha256\cp\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha256\cp\hash_sha256.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha512\hash_sha512_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_hash\sha512\cp\api.h" />
     <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" />
@@ -223,19 +214,14 @@
     <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" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_secretbox\xsalsa20poly1305\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretbox\xsalsa20poly1305\ref\box_xsalsa20poly1305.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_shorthash\crypto_shorthash.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_shorthash\siphash24\shorthash_siphash24_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_shorthash\siphash24\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_shorthash\siphash24\ref\shorthash_siphash24.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\crypto_sign.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha256\cp\api.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\cp\api.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base2.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\sign_ed25519_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\api.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" />
@@ -291,7 +277,6 @@
     <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" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\beforenm_aes128ctr.c" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common_aes128ctr.c" />
@@ -302,29 +287,21 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\stream_aes128ctr.c" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\types.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\xor_afternm_aes128ctr.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\amd64_xmm6\api.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\stream_salsa20_api.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\stream_salsa2012_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\ref\stream_salsa2012.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\ref\xor_salsa2012.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\stream_salsa208_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\ref\stream_salsa208.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\ref\xor_salsa208.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\stream_xsalsa20_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\ref\stream_xsalsa20.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\ref\xor_xsalsa20.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\16\verify_16_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\16\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\16\ref\verify_16.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\32\verify_32_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\32\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\32\ref\verify_32.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\64\verify_64_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\64\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\64\ref\verify_64.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\randombytes\randombytes.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\randombytes\salsa20\randombytes_salsa20_random.c" />
diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
index 2eb70981..c650cb31 100644
--- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
@@ -583,72 +583,12 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptsalsa208sha256\sse\pwhash_scryptsalsa208sha256_sse.c">
       <Filter>src\crypto_pwhash\scryptsalsa208sha256\sse</Filter>
     </ClCompile>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\api.h">
-      <Filter>src\crypto_auth\hmacsha512256\cp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\api.h">
-      <Filter>src\crypto_box\curve25519xsalsa20poly1305\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\api.h">
-      <Filter>src\crypto_generichash\blake2\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_hash\sha256\cp\api.h">
-      <Filter>src\crypto_hash\sha256\cp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_hash\sha512\cp\api.h">
-      <Filter>src\crypto_hash\sha512\cp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_secretbox\xsalsa20poly1305\ref\api.h">
-      <Filter>src\crypto_secretbox\xsalsa20poly1305\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_shorthash\siphash24\ref\api.h">
-      <Filter>src\crypto_shorthash\siphash24\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\api.h">
-      <Filter>src\crypto_stream\aes128ctr\portable</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\16\ref\api.h">
-      <Filter>src\crypto_verify\16\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\32\ref\api.h">
-      <Filter>src\crypto_verify\32\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\64\ref\api.h">
-      <Filter>src\crypto_verify\64\ref</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\stream_salsa20_ref.c">
       <Filter>src\crypto_stream\salsa20\ref</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\xor_salsa20_ref.c">
       <Filter>src\crypto_stream\salsa20\ref</Filter>
     </ClCompile>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa20\ref\api.h">
-      <Filter>src\crypto_core\salsa20\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa208\ref\api.h">
-      <Filter>src\crypto_core\salsa208\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\ref\api.h">
-      <Filter>src\crypto_core\salsa2012\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\ref2\api.h">
-      <Filter>src\crypto_core\hsalsa20\ref2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\ref\api.h">
-      <Filter>src\crypto_stream\salsa208\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\ref\api.h">
-      <Filter>src\crypto_stream\salsa2012\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\ref\api.h">
-      <Filter>src\crypto_stream\xsalsa20\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\api.h">
-      <Filter>src\crypto_stream\salsa20\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\amd64_xmm6\api.h">
-      <Filter>src\crypto_stream\salsa20\amd64_xmm6</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base.h">
       <Filter>src\crypto_sign\ed25519\ref10</Filter>
     </ClInclude>
@@ -661,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_sign\ed25519\ref10\api.h">
-      <Filter>src\crypto_sign\ed25519\ref10</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha256\cp\api.h">
-      <Filter>src\crypto_auth\hmacsha256\cp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\cp\api.h">
-      <Filter>src\crypto_auth\hmacsha512\cp</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\fe.h">
       <Filter>src\crypto_scalarmult\curve25519\ref10</Filter>
     </ClInclude>
diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj b/builds/msvc/vs2012/libsodium/libsodium.vcxproj
index 763c0835..316bf6f4 100644
--- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj
@@ -104,7 +104,6 @@
     <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\api.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" />
@@ -174,43 +173,34 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\cp\hmac_hmacsha512.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\cp\verify_hmacsha512.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\auth_hmacsha512256_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\hmac_hmacsha512256.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\verify_hmacsha512256.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box_easy.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box_seal.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\box_curve25519xsalsa20poly1305_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\after_curve25519xsalsa20poly1305.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\before_curve25519xsalsa20poly1305.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\box_curve25519xsalsa20poly1305.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\keypair_curve25519xsalsa20poly1305.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\ref2\core_hsalsa20.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\core_hsalsa20_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\ref2\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa20\ref\core_salsa20.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa20\core_salsa20_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa20\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\ref\core_salsa2012.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\core_salsa2012_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa208\ref\core_salsa208.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa208\core_salsa208_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa208\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\crypto_generichash.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\generichash_blake2_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\api.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2-impl.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-ref.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\generichash_blake2b.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\crypto_hash.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha256\hash_sha256_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_hash\sha256\cp\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha256\cp\hash_sha256.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha512\hash_sha512_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_hash\sha512\cp\api.h" />
     <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" />
@@ -224,19 +214,14 @@
     <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" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_secretbox\xsalsa20poly1305\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretbox\xsalsa20poly1305\ref\box_xsalsa20poly1305.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_shorthash\crypto_shorthash.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_shorthash\siphash24\shorthash_siphash24_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_shorthash\siphash24\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_shorthash\siphash24\ref\shorthash_siphash24.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\crypto_sign.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha256\cp\api.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\cp\api.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base2.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\sign_ed25519_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\api.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" />
@@ -292,7 +277,6 @@
     <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" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\beforenm_aes128ctr.c" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common_aes128ctr.c" />
@@ -303,29 +287,21 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\stream_aes128ctr.c" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\types.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\xor_afternm_aes128ctr.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\amd64_xmm6\api.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\stream_salsa20_api.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\stream_salsa2012_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\ref\stream_salsa2012.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\ref\xor_salsa2012.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\stream_salsa208_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\ref\stream_salsa208.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\ref\xor_salsa208.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\stream_xsalsa20_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\ref\stream_xsalsa20.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\ref\xor_xsalsa20.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\16\verify_16_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\16\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\16\ref\verify_16.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\32\verify_32_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\32\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\32\ref\verify_32.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\64\verify_64_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\64\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\64\ref\verify_64.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\randombytes\randombytes.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\randombytes\salsa20\randombytes_salsa20_random.c" />
diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
index 28e6e768..dc3b222e 100644
--- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
@@ -583,72 +583,12 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptsalsa208sha256\sse\pwhash_scryptsalsa208sha256_sse.c">
       <Filter>src\crypto_pwhash\scryptsalsa208sha256\sse</Filter>
     </ClCompile>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\api.h">
-      <Filter>src\crypto_auth\hmacsha512256\cp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\api.h">
-      <Filter>src\crypto_box\curve25519xsalsa20poly1305\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\api.h">
-      <Filter>src\crypto_generichash\blake2\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_hash\sha256\cp\api.h">
-      <Filter>src\crypto_hash\sha256\cp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_hash\sha512\cp\api.h">
-      <Filter>src\crypto_hash\sha512\cp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_secretbox\xsalsa20poly1305\ref\api.h">
-      <Filter>src\crypto_secretbox\xsalsa20poly1305\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_shorthash\siphash24\ref\api.h">
-      <Filter>src\crypto_shorthash\siphash24\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\api.h">
-      <Filter>src\crypto_stream\aes128ctr\portable</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\16\ref\api.h">
-      <Filter>src\crypto_verify\16\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\32\ref\api.h">
-      <Filter>src\crypto_verify\32\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\64\ref\api.h">
-      <Filter>src\crypto_verify\64\ref</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\stream_salsa20_ref.c">
       <Filter>src\crypto_stream\salsa20\ref</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\xor_salsa20_ref.c">
       <Filter>src\crypto_stream\salsa20\ref</Filter>
     </ClCompile>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa20\ref\api.h">
-      <Filter>src\crypto_core\salsa20\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa208\ref\api.h">
-      <Filter>src\crypto_core\salsa208\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\ref\api.h">
-      <Filter>src\crypto_core\salsa2012\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\ref2\api.h">
-      <Filter>src\crypto_core\hsalsa20\ref2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\ref\api.h">
-      <Filter>src\crypto_stream\salsa208\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\ref\api.h">
-      <Filter>src\crypto_stream\salsa2012\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\ref\api.h">
-      <Filter>src\crypto_stream\xsalsa20\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\api.h">
-      <Filter>src\crypto_stream\salsa20\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\amd64_xmm6\api.h">
-      <Filter>src\crypto_stream\salsa20\amd64_xmm6</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base.h">
       <Filter>src\crypto_sign\ed25519\ref10</Filter>
     </ClInclude>
@@ -661,18 +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_sign\ed25519\ref10\api.h">
-      <Filter>src\crypto_sign\ed25519\ref10</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha256\cp\api.h">
-      <Filter>src\crypto_auth\hmacsha256\cp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\cp\api.h">
-      <Filter>src\crypto_auth\hmacsha512\cp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\api.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>
diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj b/builds/msvc/vs2013/libsodium/libsodium.vcxproj
index 080fcb4c..76e3ea1f 100644
--- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj
@@ -173,43 +173,34 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\cp\hmac_hmacsha512.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\cp\verify_hmacsha512.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\auth_hmacsha512256_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\hmac_hmacsha512256.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\verify_hmacsha512256.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box_easy.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box_seal.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\box_curve25519xsalsa20poly1305_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\after_curve25519xsalsa20poly1305.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\before_curve25519xsalsa20poly1305.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\box_curve25519xsalsa20poly1305.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\keypair_curve25519xsalsa20poly1305.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\ref2\core_hsalsa20.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\core_hsalsa20_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\ref2\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa20\ref\core_salsa20.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa20\core_salsa20_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa20\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\ref\core_salsa2012.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\core_salsa2012_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa208\ref\core_salsa208.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa208\core_salsa208_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa208\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\crypto_generichash.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\generichash_blake2_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\api.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2-impl.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-ref.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\generichash_blake2b.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\crypto_hash.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha256\hash_sha256_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_hash\sha256\cp\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha256\cp\hash_sha256.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha512\hash_sha512_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_hash\sha512\cp\api.h" />
     <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" />
@@ -223,19 +214,14 @@
     <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" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_secretbox\xsalsa20poly1305\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretbox\xsalsa20poly1305\ref\box_xsalsa20poly1305.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_shorthash\crypto_shorthash.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_shorthash\siphash24\shorthash_siphash24_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_shorthash\siphash24\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_shorthash\siphash24\ref\shorthash_siphash24.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\crypto_sign.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha256\cp\api.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\cp\api.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base2.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\sign_ed25519_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\api.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" />
@@ -291,7 +277,6 @@
     <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" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\beforenm_aes128ctr.c" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common_aes128ctr.c" />
@@ -302,29 +287,21 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\stream_aes128ctr.c" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\types.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\xor_afternm_aes128ctr.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\amd64_xmm6\api.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\stream_salsa20_api.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\stream_salsa2012_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\ref\stream_salsa2012.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\ref\xor_salsa2012.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\stream_salsa208_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\ref\stream_salsa208.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\ref\xor_salsa208.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\stream_xsalsa20_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\ref\stream_xsalsa20.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\ref\xor_xsalsa20.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\16\verify_16_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\16\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\16\ref\verify_16.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\32\verify_32_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\32\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\32\ref\verify_32.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\64\verify_64_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\64\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\64\ref\verify_64.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\randombytes\randombytes.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\randombytes\salsa20\randombytes_salsa20_random.c" />
diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters
index 3e940ba0..81e42f23 100644
--- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters
@@ -583,72 +583,12 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptsalsa208sha256\sse\pwhash_scryptsalsa208sha256_sse.c">
       <Filter>src\crypto_pwhash\scryptsalsa208sha256\sse</Filter>
     </ClCompile>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\api.h">
-      <Filter>src\crypto_auth\hmacsha512256\cp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\api.h">
-      <Filter>src\crypto_box\curve25519xsalsa20poly1305\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\api.h">
-      <Filter>src\crypto_generichash\blake2\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_hash\sha256\cp\api.h">
-      <Filter>src\crypto_hash\sha256\cp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_hash\sha512\cp\api.h">
-      <Filter>src\crypto_hash\sha512\cp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_secretbox\xsalsa20poly1305\ref\api.h">
-      <Filter>src\crypto_secretbox\xsalsa20poly1305\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_shorthash\siphash24\ref\api.h">
-      <Filter>src\crypto_shorthash\siphash24\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\api.h">
-      <Filter>src\crypto_stream\aes128ctr\portable</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\16\ref\api.h">
-      <Filter>src\crypto_verify\16\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\32\ref\api.h">
-      <Filter>src\crypto_verify\32\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\64\ref\api.h">
-      <Filter>src\crypto_verify\64\ref</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\stream_salsa20_ref.c">
       <Filter>src\crypto_stream\salsa20\ref</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\xor_salsa20_ref.c">
       <Filter>src\crypto_stream\salsa20\ref</Filter>
     </ClCompile>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa20\ref\api.h">
-      <Filter>src\crypto_core\salsa20\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa208\ref\api.h">
-      <Filter>src\crypto_core\salsa208\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\ref\api.h">
-      <Filter>src\crypto_core\salsa2012\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\ref2\api.h">
-      <Filter>src\crypto_core\hsalsa20\ref2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\ref\api.h">
-      <Filter>src\crypto_stream\salsa208\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\ref\api.h">
-      <Filter>src\crypto_stream\salsa2012\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\ref\api.h">
-      <Filter>src\crypto_stream\xsalsa20\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\api.h">
-      <Filter>src\crypto_stream\salsa20\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\amd64_xmm6\api.h">
-      <Filter>src\crypto_stream\salsa20\amd64_xmm6</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base.h">
       <Filter>src\crypto_sign\ed25519\ref10</Filter>
     </ClInclude>
@@ -661,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_sign\ed25519\ref10\api.h">
-      <Filter>src\crypto_sign\ed25519\ref10</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha256\cp\api.h">
-      <Filter>src\crypto_auth\hmacsha256\cp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\cp\api.h">
-      <Filter>src\crypto_auth\hmacsha512\cp</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\fe.h">
       <Filter>src\crypto_scalarmult\curve25519\ref10</Filter>
     </ClInclude>
diff --git a/builds/msvc/vs2015/libsodium/libsodium.vcxproj b/builds/msvc/vs2015/libsodium/libsodium.vcxproj
index 5ef697db..ed82dcc6 100644
--- a/builds/msvc/vs2015/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2015/libsodium/libsodium.vcxproj
@@ -99,7 +99,6 @@
     <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\onetimeauth_poly1305.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\api.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" />
@@ -167,47 +166,37 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\cp\hmac_hmacsha512.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\cp\verify_hmacsha512.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\auth_hmacsha512256_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\hmac_hmacsha512256.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\verify_hmacsha512256.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box_easy.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box_seal.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\box_curve25519xsalsa20poly1305_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\after_curve25519xsalsa20poly1305.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\before_curve25519xsalsa20poly1305.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\box_curve25519xsalsa20poly1305.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\keypair_curve25519xsalsa20poly1305.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\ref2\core_hsalsa20.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\core_hsalsa20_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\ref2\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa20\ref\core_salsa20.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa20\core_salsa20_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa20\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\ref\core_salsa2012.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\core_salsa2012_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa208\ref\core_salsa208.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa208\core_salsa208_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa208\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\crypto_generichash.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\generichash_blake2_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\api.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2-impl.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-ref.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\generichash_blake2b.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\crypto_hash.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha256\hash_sha256_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_hash\sha256\cp\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha256\cp\hash_sha256.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha512\hash_sha512_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_hash\sha512\cp\api.h" />
     <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" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\api.h" />
     <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" />
@@ -217,23 +206,17 @@
     <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" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\donna_c64\api.h" />
     <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" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_secretbox\xsalsa20poly1305\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretbox\xsalsa20poly1305\ref\box_xsalsa20poly1305.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_shorthash\crypto_shorthash.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_shorthash\siphash24\shorthash_siphash24_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_shorthash\siphash24\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_shorthash\siphash24\ref\shorthash_siphash24.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\crypto_sign.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha256\cp\api.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\cp\api.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base2.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\sign_ed25519_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\api.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" />
@@ -287,7 +270,6 @@
     <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\api.h" />
     <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" />
@@ -298,7 +280,6 @@
     <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" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\beforenm_aes128ctr.c" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common_aes128ctr.c" />
@@ -309,29 +290,21 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\stream_aes128ctr.c" />
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\types.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\xor_afternm_aes128ctr.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\amd64_xmm6\api.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\stream_salsa20_api.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\stream_salsa2012_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\ref\stream_salsa2012.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\ref\xor_salsa2012.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\stream_salsa208_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\ref\stream_salsa208.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\ref\xor_salsa208.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\stream_xsalsa20_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\ref\stream_xsalsa20.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\ref\xor_xsalsa20.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\16\verify_16_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\16\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\16\ref\verify_16.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\32\verify_32_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\32\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\32\ref\verify_32.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\64\verify_64_api.c" />
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\64\ref\api.h" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\64\ref\verify_64.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\randombytes\randombytes.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\randombytes\salsa20\randombytes_salsa20_random.c" />
diff --git a/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters
index 23d35111..c2e228bc 100644
--- a/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters
@@ -613,45 +613,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptsalsa208sha256\sse\pwhash_scryptsalsa208sha256_sse.c">
       <Filter>src\crypto_pwhash\scryptsalsa208sha256\sse</Filter>
     </ClCompile>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\api.h">
-      <Filter>src\crypto_auth\hmacsha512256\cp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\api.h">
-      <Filter>src\crypto_box\curve25519xsalsa20poly1305\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\api.h">
-      <Filter>src\crypto_generichash\blake2\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_hash\sha256\cp\api.h">
-      <Filter>src\crypto_hash\sha256\cp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_hash\sha512\cp\api.h">
-      <Filter>src\crypto_hash\sha512\cp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\api.h">
-      <Filter>src\crypto_onetimeauth\poly1305\donna</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_secretbox\xsalsa20poly1305\ref\api.h">
-      <Filter>src\crypto_secretbox\xsalsa20poly1305\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_shorthash\siphash24\ref\api.h">
-      <Filter>src\crypto_shorthash\siphash24\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\api.h">
-      <Filter>src\crypto_sign\edwards25519sha512batch\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\api.h">
-      <Filter>src\crypto_stream\aes128ctr\portable</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\16\ref\api.h">
-      <Filter>src\crypto_verify\16\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\32\ref\api.h">
-      <Filter>src\crypto_verify\32\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\64\ref\api.h">
-      <Filter>src\crypto_verify\64\ref</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\donna_c64\base_curve25519_donna_c64.c">
       <Filter>src\crypto_scalarmult\curve25519\donna_c64</Filter>
     </ClCompile>
@@ -664,36 +625,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\xor_salsa20_ref.c">
       <Filter>src\crypto_stream\salsa20\ref</Filter>
     </ClCompile>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa20\ref\api.h">
-      <Filter>src\crypto_core\salsa20\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa208\ref\api.h">
-      <Filter>src\crypto_core\salsa208\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\ref\api.h">
-      <Filter>src\crypto_core\salsa2012\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\ref2\api.h">
-      <Filter>src\crypto_core\hsalsa20\ref2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\ref\api.h">
-      <Filter>src\crypto_stream\salsa208\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\ref\api.h">
-      <Filter>src\crypto_stream\salsa2012\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\ref\api.h">
-      <Filter>src\crypto_stream\xsalsa20\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\donna_c64\api.h">
-      <Filter>src\crypto_scalarmult\curve25519\donna_c64</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\api.h">
-      <Filter>src\crypto_stream\salsa20\ref</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\amd64_xmm6\api.h">
-      <Filter>src\crypto_stream\salsa20\amd64_xmm6</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base.h">
       <Filter>src\crypto_sign\ed25519\ref10</Filter>
     </ClInclude>
@@ -706,18 +637,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\d2.h">
       <Filter>src\crypto_sign\ed25519\ref10</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\api.h">
-      <Filter>src\crypto_sign\ed25519\ref10</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha256\cp\api.h">
-      <Filter>src\crypto_auth\hmacsha256\cp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\cp\api.h">
-      <Filter>src\crypto_auth\hmacsha512\cp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref10\api.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>