diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am
index b203599d..632156e5 100644
--- a/src/libsodium/Makefile.am
+++ b/src/libsodium/Makefile.am
@@ -54,11 +54,11 @@ libsodium_la_SOURCES = \
 	crypto_stream/xsalsa20/ref/xor_xsalsa20.c \
 	crypto_onetimeauth/poly1305/onetimeauth_poly1305.c \
 	crypto_onetimeauth/poly1305/onetimeauth_poly1305_try.c \
+	crypto_onetimeauth/poly1305/53/api.h \
 	crypto_onetimeauth/poly1305/53/auth_poly1305_53.c \
-	crypto_onetimeauth/poly1305/53/crypto_onetimeauth.h \
 	crypto_onetimeauth/poly1305/53/verify_poly1305_53.c \
+	crypto_onetimeauth/poly1305/ref/api.h \
 	crypto_onetimeauth/poly1305/ref/auth_poly1305_ref.c \
-	crypto_onetimeauth/poly1305/ref/crypto_onetimeauth.h \
 	crypto_onetimeauth/poly1305/ref/verify_poly1305_ref.c \
 	crypto_sign/edwards25519sha512batch/ref/crypto_sign.h \
 	crypto_sign/edwards25519sha512batch/ref/fe25519.h \
diff --git a/src/libsodium/crypto_onetimeauth/poly1305/53/crypto_onetimeauth.h b/src/libsodium/crypto_onetimeauth/poly1305/53/api.h
similarity index 100%
rename from src/libsodium/crypto_onetimeauth/poly1305/53/crypto_onetimeauth.h
rename to src/libsodium/crypto_onetimeauth/poly1305/53/api.h
diff --git a/src/libsodium/crypto_onetimeauth/poly1305/53/auth_poly1305_53.c b/src/libsodium/crypto_onetimeauth/poly1305/53/auth_poly1305_53.c
index 7e9c5289..fccfc9d0 100644
--- a/src/libsodium/crypto_onetimeauth/poly1305/53/auth_poly1305_53.c
+++ b/src/libsodium/crypto_onetimeauth/poly1305/53/auth_poly1305_53.c
@@ -8,7 +8,7 @@ Public domain.
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "crypto_onetimeauth.h"
+#include "api.h"
 #include "crypto_onetimeauth_poly1305_53.h"
 
 #pragma STDC FENV_ACCESS ON
diff --git a/src/libsodium/crypto_onetimeauth/poly1305/53/verify_poly1305_53.c b/src/libsodium/crypto_onetimeauth/poly1305/53/verify_poly1305_53.c
index c7e063f1..dea419d9 100644
--- a/src/libsodium/crypto_onetimeauth/poly1305/53/verify_poly1305_53.c
+++ b/src/libsodium/crypto_onetimeauth/poly1305/53/verify_poly1305_53.c
@@ -1,5 +1,5 @@
+#include "api.h"
 #include "crypto_verify_16.h"
-#include "crypto_onetimeauth.h"
 
 int crypto_onetimeauth_verify(const unsigned char *h,const unsigned char *in,unsigned long long inlen,const unsigned char *k)
 {
diff --git a/src/libsodium/crypto_onetimeauth/poly1305/ref/crypto_onetimeauth.h b/src/libsodium/crypto_onetimeauth/poly1305/ref/api.h
similarity index 100%
rename from src/libsodium/crypto_onetimeauth/poly1305/ref/crypto_onetimeauth.h
rename to src/libsodium/crypto_onetimeauth/poly1305/ref/api.h
diff --git a/src/libsodium/crypto_onetimeauth/poly1305/ref/auth_poly1305_ref.c b/src/libsodium/crypto_onetimeauth/poly1305/ref/auth_poly1305_ref.c
index 3a21baab..43aa811e 100644
--- a/src/libsodium/crypto_onetimeauth/poly1305/ref/auth_poly1305_ref.c
+++ b/src/libsodium/crypto_onetimeauth/poly1305/ref/auth_poly1305_ref.c
@@ -4,7 +4,7 @@ D. J. Bernstein
 Public domain.
 */
 
-#include "crypto_onetimeauth.h"
+#include "api.h"
 #include "crypto_onetimeauth_poly1305_ref.h"
 
 static void add(unsigned int h[17],const unsigned int c[17])
diff --git a/src/libsodium/crypto_onetimeauth/poly1305/ref/verify_poly1305_ref.c b/src/libsodium/crypto_onetimeauth/poly1305/ref/verify_poly1305_ref.c
index c7e063f1..dea419d9 100644
--- a/src/libsodium/crypto_onetimeauth/poly1305/ref/verify_poly1305_ref.c
+++ b/src/libsodium/crypto_onetimeauth/poly1305/ref/verify_poly1305_ref.c
@@ -1,5 +1,5 @@
+#include "api.h"
 #include "crypto_verify_16.h"
-#include "crypto_onetimeauth.h"
 
 int crypto_onetimeauth_verify(const unsigned char *h,const unsigned char *in,unsigned long long inlen,const unsigned char *k)
 {