diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am
index 378338ea..92e6c57d 100644
--- a/src/libsodium/Makefile.am
+++ b/src/libsodium/Makefile.am
@@ -40,16 +40,16 @@ libsodium_la_SOURCES = \
 	crypto_auth/hmacsha512256/ref/api.h \
 	crypto_auth/hmacsha512256/ref/hmac_hmacsha512256.c \
 	crypto_auth/hmacsha512256/ref/verify_hmacsha512256.c \
-	crypto_stream/salsa20/ref/crypto_stream.h \
+	crypto_stream/salsa20/ref/api.h \
 	crypto_stream/salsa20/ref/stream_salsa20.c \
 	crypto_stream/salsa20/ref/xor_salsa20.c \
-	crypto_stream/salsa2012/ref/crypto_stream.h \
+	crypto_stream/salsa2012/ref/api.h \
 	crypto_stream/salsa2012/ref/stream_salsa2012.c \
 	crypto_stream/salsa2012/ref/xor_salsa2012.c \
-	crypto_stream/salsa208/ref/crypto_stream.h \
+	crypto_stream/salsa208/ref/api.h \
 	crypto_stream/salsa208/ref/stream_salsa208.c \
 	crypto_stream/salsa208/ref/xor_salsa208.c \
-	crypto_stream/xsalsa20/ref/crypto_stream.h \
+	crypto_stream/xsalsa20/ref/api.h \
 	crypto_stream/xsalsa20/ref/stream_xsalsa20.c \
 	crypto_stream/xsalsa20/ref/xor_xsalsa20.c \
 	crypto_onetimeauth/poly1305/onetimeauth_poly1305.c \
diff --git a/src/libsodium/crypto_stream/aes128ctr/portable/afternm_aes128ctr.c b/src/libsodium/crypto_stream/aes128ctr/portable/afternm_aes128ctr.c
index 93c96e42..4a3785eb 100644
--- a/src/libsodium/crypto_stream/aes128ctr/portable/afternm_aes128ctr.c
+++ b/src/libsodium/crypto_stream/aes128ctr/portable/afternm_aes128ctr.c
@@ -2,10 +2,10 @@
  * Date: 2009-03-19
  * Public domain */
 
+#include "api.h"
 #include "int128.h"
 #include "common.h"
 #include "consts.h"
-#include "crypto_stream.h"
 
 int crypto_stream_afternm(unsigned char *outp, unsigned long long len, const unsigned char *noncep, const unsigned char *c)
 {
diff --git a/src/libsodium/crypto_stream/aes128ctr/portable/crypto_stream.h b/src/libsodium/crypto_stream/aes128ctr/portable/api.h
similarity index 100%
rename from src/libsodium/crypto_stream/aes128ctr/portable/crypto_stream.h
rename to src/libsodium/crypto_stream/aes128ctr/portable/api.h
diff --git a/src/libsodium/crypto_stream/aes128ctr/portable/beforenm_aes128ctr.c b/src/libsodium/crypto_stream/aes128ctr/portable/beforenm_aes128ctr.c
index 8fa2673d..f8623dd2 100644
--- a/src/libsodium/crypto_stream/aes128ctr/portable/beforenm_aes128ctr.c
+++ b/src/libsodium/crypto_stream/aes128ctr/portable/beforenm_aes128ctr.c
@@ -2,10 +2,10 @@
  * Date: 2009-03-19
  * Public domain */
 
+#include "api.h"
 #include "consts.h"
 #include "int128.h"
 #include "common.h"
-#include "crypto_stream.h"
 
 int crypto_stream_beforenm(unsigned char *c, const unsigned char *k)
 {
diff --git a/src/libsodium/crypto_stream/aes128ctr/portable/stream_aes128ctr.c b/src/libsodium/crypto_stream/aes128ctr/portable/stream_aes128ctr.c
index 963fa8c1..8f4ec72a 100644
--- a/src/libsodium/crypto_stream/aes128ctr/portable/stream_aes128ctr.c
+++ b/src/libsodium/crypto_stream/aes128ctr/portable/stream_aes128ctr.c
@@ -1,4 +1,4 @@
-#include "crypto_stream.h"
+#include "api.h"
 
 int crypto_stream(
         unsigned char *out,
diff --git a/src/libsodium/crypto_stream/aes128ctr/portable/xor_afternm_aes128ctr.c b/src/libsodium/crypto_stream/aes128ctr/portable/xor_afternm_aes128ctr.c
index f2ff8ff6..6734fb93 100644
--- a/src/libsodium/crypto_stream/aes128ctr/portable/xor_afternm_aes128ctr.c
+++ b/src/libsodium/crypto_stream/aes128ctr/portable/xor_afternm_aes128ctr.c
@@ -3,10 +3,10 @@
  * Public domain */
 
 #include <stdio.h>
+#include "api.h"
 #include "int128.h"
 #include "common.h"
 #include "consts.h"
-#include "crypto_stream.h"
 
 int crypto_stream_xor_afternm(unsigned char *outp, const unsigned char *inp, unsigned long long len, const unsigned char *noncep, const unsigned char *c)
 {
diff --git a/src/libsodium/crypto_stream/salsa20/ref/crypto_stream.h b/src/libsodium/crypto_stream/salsa20/ref/api.h
similarity index 100%
rename from src/libsodium/crypto_stream/salsa20/ref/crypto_stream.h
rename to src/libsodium/crypto_stream/salsa20/ref/api.h
diff --git a/src/libsodium/crypto_stream/salsa20/ref/stream_salsa20.c b/src/libsodium/crypto_stream/salsa20/ref/stream_salsa20.c
index 2f0262eb..d47e8bb4 100644
--- a/src/libsodium/crypto_stream/salsa20/ref/stream_salsa20.c
+++ b/src/libsodium/crypto_stream/salsa20/ref/stream_salsa20.c
@@ -4,8 +4,8 @@ D. J. Bernstein
 Public domain.
 */
 
+#include "api.h"
 #include "crypto_core_salsa20.h"
-#include "crypto_stream.h"
 
 typedef unsigned int uint32;
 
diff --git a/src/libsodium/crypto_stream/salsa20/ref/xor_salsa20.c b/src/libsodium/crypto_stream/salsa20/ref/xor_salsa20.c
index 11c7e9f0..bc6baf1b 100644
--- a/src/libsodium/crypto_stream/salsa20/ref/xor_salsa20.c
+++ b/src/libsodium/crypto_stream/salsa20/ref/xor_salsa20.c
@@ -4,8 +4,8 @@ D. J. Bernstein
 Public domain.
 */
 
+#include "api.h"
 #include "crypto_core_salsa20.h"
-#include "crypto_stream.h"
 
 typedef unsigned int uint32;
 
diff --git a/src/libsodium/crypto_stream/salsa2012/ref/crypto_stream.h b/src/libsodium/crypto_stream/salsa2012/ref/api.h
similarity index 100%
rename from src/libsodium/crypto_stream/salsa2012/ref/crypto_stream.h
rename to src/libsodium/crypto_stream/salsa2012/ref/api.h
diff --git a/src/libsodium/crypto_stream/salsa2012/ref/stream_salsa2012.c b/src/libsodium/crypto_stream/salsa2012/ref/stream_salsa2012.c
index 86053337..42340f88 100644
--- a/src/libsodium/crypto_stream/salsa2012/ref/stream_salsa2012.c
+++ b/src/libsodium/crypto_stream/salsa2012/ref/stream_salsa2012.c
@@ -4,8 +4,8 @@ D. J. Bernstein
 Public domain.
 */
 
+#include "api.h"
 #include "crypto_core_salsa2012.h"
-#include "crypto_stream.h"
 
 typedef unsigned int uint32;
 
diff --git a/src/libsodium/crypto_stream/salsa2012/ref/xor_salsa2012.c b/src/libsodium/crypto_stream/salsa2012/ref/xor_salsa2012.c
index 90206426..fafe1f9b 100644
--- a/src/libsodium/crypto_stream/salsa2012/ref/xor_salsa2012.c
+++ b/src/libsodium/crypto_stream/salsa2012/ref/xor_salsa2012.c
@@ -4,8 +4,8 @@ D. J. Bernstein
 Public domain.
 */
 
+#include "api.h"
 #include "crypto_core_salsa2012.h"
-#include "crypto_stream.h"
 
 typedef unsigned int uint32;
 
diff --git a/src/libsodium/crypto_stream/salsa208/ref/crypto_stream.h b/src/libsodium/crypto_stream/salsa208/ref/api.h
similarity index 100%
rename from src/libsodium/crypto_stream/salsa208/ref/crypto_stream.h
rename to src/libsodium/crypto_stream/salsa208/ref/api.h
diff --git a/src/libsodium/crypto_stream/salsa208/ref/stream_salsa208.c b/src/libsodium/crypto_stream/salsa208/ref/stream_salsa208.c
index cdcfbc0e..0f88aa36 100644
--- a/src/libsodium/crypto_stream/salsa208/ref/stream_salsa208.c
+++ b/src/libsodium/crypto_stream/salsa208/ref/stream_salsa208.c
@@ -4,8 +4,8 @@ D. J. Bernstein
 Public domain.
 */
 
+#include "api.h"
 #include "crypto_core_salsa208.h"
-#include "crypto_stream.h"
 
 typedef unsigned int uint32;
 
diff --git a/src/libsodium/crypto_stream/salsa208/ref/xor_salsa208.c b/src/libsodium/crypto_stream/salsa208/ref/xor_salsa208.c
index c017ac42..f2b63723 100644
--- a/src/libsodium/crypto_stream/salsa208/ref/xor_salsa208.c
+++ b/src/libsodium/crypto_stream/salsa208/ref/xor_salsa208.c
@@ -4,8 +4,8 @@ D. J. Bernstein
 Public domain.
 */
 
+#include "api.h"
 #include "crypto_core_salsa208.h"
-#include "crypto_stream.h"
 
 typedef unsigned int uint32;
 
diff --git a/src/libsodium/crypto_stream/xsalsa20/ref/crypto_stream.h b/src/libsodium/crypto_stream/xsalsa20/ref/api.h
similarity index 100%
rename from src/libsodium/crypto_stream/xsalsa20/ref/crypto_stream.h
rename to src/libsodium/crypto_stream/xsalsa20/ref/api.h
diff --git a/src/libsodium/crypto_stream/xsalsa20/ref/stream_xsalsa20.c b/src/libsodium/crypto_stream/xsalsa20/ref/stream_xsalsa20.c
index 2d710709..d276e126 100644
--- a/src/libsodium/crypto_stream/xsalsa20/ref/stream_xsalsa20.c
+++ b/src/libsodium/crypto_stream/xsalsa20/ref/stream_xsalsa20.c
@@ -4,9 +4,9 @@ D. J. Bernstein
 Public domain.
 */
 
+#include "api.h"
 #include "crypto_core_hsalsa20.h"
 #include "crypto_stream_salsa20.h"
-#include "crypto_stream.h"
 
 static const unsigned char sigma[16] = "expand 32-byte k";
 
diff --git a/src/libsodium/crypto_stream/xsalsa20/ref/xor_xsalsa20.c b/src/libsodium/crypto_stream/xsalsa20/ref/xor_xsalsa20.c
index 13f3134a..1014d6d2 100644
--- a/src/libsodium/crypto_stream/xsalsa20/ref/xor_xsalsa20.c
+++ b/src/libsodium/crypto_stream/xsalsa20/ref/xor_xsalsa20.c
@@ -4,9 +4,9 @@ D. J. Bernstein
 Public domain.
 */
 
+#include "api.h"
 #include "crypto_core_hsalsa20.h"
 #include "crypto_stream_salsa20.h"
-#include "crypto_stream.h"
 
 static const unsigned char sigma[16] = "expand 32-byte k";