diff --git a/src/libsodium/include/sodium/crypto_auth_hmacsha256.h b/src/libsodium/include/sodium/crypto_auth_hmacsha256.h
index 5ee65505..a79ec8e6 100644
--- a/src/libsodium/include/sodium/crypto_auth_hmacsha256.h
+++ b/src/libsodium/include/sodium/crypto_auth_hmacsha256.h
@@ -4,7 +4,6 @@
 #define crypto_auth_hmacsha256_ref_BYTES 32
 #define crypto_auth_hmacsha256_ref_KEYBYTES 32
 #ifdef __cplusplus
-#include <string>
 extern "C" {
 #endif
 extern int crypto_auth_hmacsha256_ref(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *);
diff --git a/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h b/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h
index 0806264d..e65d042e 100644
--- a/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h
+++ b/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h
@@ -4,7 +4,6 @@
 #define crypto_auth_hmacsha512256_ref_BYTES 32
 #define crypto_auth_hmacsha512256_ref_KEYBYTES 32
 #ifdef __cplusplus
-#include <string>
 extern "C" {
 #endif
 extern int crypto_auth_hmacsha512256_ref(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *);
diff --git a/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h b/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h
index 9dd6b895..bfd15a12 100644
--- a/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h
+++ b/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h
@@ -8,7 +8,6 @@
 #define crypto_box_curve25519xsalsa20poly1305_ref_ZEROBYTES 32
 #define crypto_box_curve25519xsalsa20poly1305_ref_BOXZEROBYTES 16
 #ifdef __cplusplus
-#include <string>
 extern "C" {
 #endif
 extern int crypto_box_curve25519xsalsa20poly1305_ref(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *,const unsigned char *);
diff --git a/src/libsodium/include/sodium/crypto_core_hsalsa20.h b/src/libsodium/include/sodium/crypto_core_hsalsa20.h
index 7330eeb0..99dd42c1 100644
--- a/src/libsodium/include/sodium/crypto_core_hsalsa20.h
+++ b/src/libsodium/include/sodium/crypto_core_hsalsa20.h
@@ -6,7 +6,6 @@
 #define crypto_core_hsalsa20_ref2_KEYBYTES 32
 #define crypto_core_hsalsa20_ref2_CONSTBYTES 16
 #ifdef __cplusplus
-#include <string>
 extern "C" {
 #endif
 extern int crypto_core_hsalsa20_ref2(unsigned char *,const unsigned char *,const unsigned char *,const unsigned char *);
diff --git a/src/libsodium/include/sodium/crypto_core_salsa20.h b/src/libsodium/include/sodium/crypto_core_salsa20.h
index bd8fbf99..aa5c253f 100644
--- a/src/libsodium/include/sodium/crypto_core_salsa20.h
+++ b/src/libsodium/include/sodium/crypto_core_salsa20.h
@@ -6,7 +6,6 @@
 #define crypto_core_salsa20_ref_KEYBYTES 32
 #define crypto_core_salsa20_ref_CONSTBYTES 16
 #ifdef __cplusplus
-#include <string>
 extern "C" {
 #endif
 extern int crypto_core_salsa20_ref(unsigned char *,const unsigned char *,const unsigned char *,const unsigned char *);
diff --git a/src/libsodium/include/sodium/crypto_core_salsa2012.h b/src/libsodium/include/sodium/crypto_core_salsa2012.h
index 36c1ce2d..fdbc5b96 100644
--- a/src/libsodium/include/sodium/crypto_core_salsa2012.h
+++ b/src/libsodium/include/sodium/crypto_core_salsa2012.h
@@ -6,7 +6,6 @@
 #define crypto_core_salsa2012_ref_KEYBYTES 32
 #define crypto_core_salsa2012_ref_CONSTBYTES 16
 #ifdef __cplusplus
-#include <string>
 extern "C" {
 #endif
 extern int crypto_core_salsa2012_ref(unsigned char *,const unsigned char *,const unsigned char *,const unsigned char *);
diff --git a/src/libsodium/include/sodium/crypto_core_salsa208.h b/src/libsodium/include/sodium/crypto_core_salsa208.h
index 3aee4cd3..8a0de9b9 100644
--- a/src/libsodium/include/sodium/crypto_core_salsa208.h
+++ b/src/libsodium/include/sodium/crypto_core_salsa208.h
@@ -6,7 +6,6 @@
 #define crypto_core_salsa208_ref_KEYBYTES 32
 #define crypto_core_salsa208_ref_CONSTBYTES 16
 #ifdef __cplusplus
-#include <string>
 extern "C" {
 #endif
 extern int crypto_core_salsa208_ref(unsigned char *,const unsigned char *,const unsigned char *,const unsigned char *);
diff --git a/src/libsodium/include/sodium/crypto_hash_sha256.h b/src/libsodium/include/sodium/crypto_hash_sha256.h
index 62e61c76..d451cf13 100644
--- a/src/libsodium/include/sodium/crypto_hash_sha256.h
+++ b/src/libsodium/include/sodium/crypto_hash_sha256.h
@@ -3,7 +3,6 @@
 
 #define crypto_hash_sha256_ref_BYTES 32
 #ifdef __cplusplus
-#include <string>
 extern "C" {
 #endif
 extern int crypto_hash_sha256_ref(unsigned char *,const unsigned char *,unsigned long long);
diff --git a/src/libsodium/include/sodium/crypto_hash_sha512.h b/src/libsodium/include/sodium/crypto_hash_sha512.h
index 8c3459c0..0e92bddb 100644
--- a/src/libsodium/include/sodium/crypto_hash_sha512.h
+++ b/src/libsodium/include/sodium/crypto_hash_sha512.h
@@ -3,7 +3,6 @@
 
 #define crypto_hash_sha512_ref_BYTES 64
 #ifdef __cplusplus
-#include <string>
 extern "C" {
 #endif
 extern int crypto_hash_sha512_ref(unsigned char *,const unsigned char *,unsigned long long);
diff --git a/src/libsodium/include/sodium/crypto_hashblocks_sha256.h b/src/libsodium/include/sodium/crypto_hashblocks_sha256.h
index d12eda33..4c0a4ce0 100644
--- a/src/libsodium/include/sodium/crypto_hashblocks_sha256.h
+++ b/src/libsodium/include/sodium/crypto_hashblocks_sha256.h
@@ -4,7 +4,6 @@
 #define crypto_hashblocks_sha256_ref_STATEBYTES 32
 #define crypto_hashblocks_sha256_ref_BLOCKBYTES 64
 #ifdef __cplusplus
-#include <string>
 extern "C" {
 #endif
 extern int crypto_hashblocks_sha256_ref(unsigned char *,const unsigned char *,unsigned long long);
diff --git a/src/libsodium/include/sodium/crypto_hashblocks_sha512.h b/src/libsodium/include/sodium/crypto_hashblocks_sha512.h
index af61e8f7..65953ba5 100644
--- a/src/libsodium/include/sodium/crypto_hashblocks_sha512.h
+++ b/src/libsodium/include/sodium/crypto_hashblocks_sha512.h
@@ -4,7 +4,6 @@
 #define crypto_hashblocks_sha512_ref_STATEBYTES 64
 #define crypto_hashblocks_sha512_ref_BLOCKBYTES 128
 #ifdef __cplusplus
-#include <string>
 extern "C" {
 #endif
 extern int crypto_hashblocks_sha512_ref(unsigned char *,const unsigned char *,unsigned long long);
diff --git a/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h b/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h
index d8963308..6ccb5574 100644
--- a/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h
+++ b/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h
@@ -4,7 +4,6 @@
 #define crypto_onetimeauth_poly1305_ref_BYTES 16
 #define crypto_onetimeauth_poly1305_ref_KEYBYTES 32
 #ifdef __cplusplus
-#include <string>
 extern "C" {
 #endif
 extern int crypto_onetimeauth_poly1305_ref(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *);
diff --git a/src/libsodium/include/sodium/crypto_scalarmult_curve25519.h b/src/libsodium/include/sodium/crypto_scalarmult_curve25519.h
index d3f677ab..72ad7df0 100644
--- a/src/libsodium/include/sodium/crypto_scalarmult_curve25519.h
+++ b/src/libsodium/include/sodium/crypto_scalarmult_curve25519.h
@@ -4,7 +4,6 @@
 #define crypto_scalarmult_curve25519_ref_BYTES 32
 #define crypto_scalarmult_curve25519_ref_SCALARBYTES 32
 #ifdef __cplusplus
-#include <string>
 extern "C" {
 #endif
 extern int crypto_scalarmult_curve25519_ref(unsigned char *,const unsigned char *,const unsigned char *);
diff --git a/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h b/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h
index f6079fc8..cc5898c1 100644
--- a/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h
+++ b/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h
@@ -6,7 +6,6 @@
 #define crypto_secretbox_xsalsa20poly1305_ref_ZEROBYTES 32
 #define crypto_secretbox_xsalsa20poly1305_ref_BOXZEROBYTES 16
 #ifdef __cplusplus
-#include <string>
 extern "C" {
 #endif
 extern int crypto_secretbox_xsalsa20poly1305_ref(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
diff --git a/src/libsodium/include/sodium/crypto_shorthash_siphash24.h b/src/libsodium/include/sodium/crypto_shorthash_siphash24.h
index cf19f0b9..e49e0b90 100644
--- a/src/libsodium/include/sodium/crypto_shorthash_siphash24.h
+++ b/src/libsodium/include/sodium/crypto_shorthash_siphash24.h
@@ -4,7 +4,6 @@
 #define crypto_shorthash_siphash24_ref_BYTES 8
 #define crypto_shorthash_siphash24_ref_KEYBYTES 16
 #ifdef __cplusplus
-#include <string>
 extern "C" {
 #endif
 extern int crypto_shorthash_siphash24_ref(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *);
diff --git a/src/libsodium/include/sodium/crypto_sign_ed25519.h b/src/libsodium/include/sodium/crypto_sign_ed25519.h
index 8666f5ea..c6b8d4e8 100644
--- a/src/libsodium/include/sodium/crypto_sign_ed25519.h
+++ b/src/libsodium/include/sodium/crypto_sign_ed25519.h
@@ -6,7 +6,6 @@
 #define crypto_sign_ed25519_ref_BYTES 64
 
 #ifdef __cplusplus
-#include <string>
 extern "C" {
 #endif
 extern int crypto_sign_ed25519_ref(unsigned char *,unsigned long long *,const unsigned char *,unsigned long long,const unsigned char *);
diff --git a/src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h b/src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h
index c6da6fe3..b7284469 100644
--- a/src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h
+++ b/src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h
@@ -5,7 +5,6 @@
 #define crypto_sign_edwards25519sha512batch_ref_PUBLICKEYBYTES 32
 #define crypto_sign_edwards25519sha512batch_ref_BYTES 64
 #ifdef __cplusplus
-#include <string>
 extern "C" {
 #endif
 extern int crypto_sign_edwards25519sha512batch_ref(unsigned char *,unsigned long long *,const unsigned char *,unsigned long long,const unsigned char *);
diff --git a/src/libsodium/include/sodium/crypto_stream_aes128ctr.h b/src/libsodium/include/sodium/crypto_stream_aes128ctr.h
index 3ce8ffce..dcb0bc42 100644
--- a/src/libsodium/include/sodium/crypto_stream_aes128ctr.h
+++ b/src/libsodium/include/sodium/crypto_stream_aes128ctr.h
@@ -5,7 +5,6 @@
 #define crypto_stream_aes128ctr_portable_NONCEBYTES 16
 #define crypto_stream_aes128ctr_portable_BEFORENMBYTES 1408
 #ifdef __cplusplus
-#include <string>
 extern "C" {
 #endif
 extern int crypto_stream_aes128ctr_portable(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
diff --git a/src/libsodium/include/sodium/crypto_stream_salsa20.h b/src/libsodium/include/sodium/crypto_stream_salsa20.h
index d8563ed9..588e2c3f 100644
--- a/src/libsodium/include/sodium/crypto_stream_salsa20.h
+++ b/src/libsodium/include/sodium/crypto_stream_salsa20.h
@@ -4,7 +4,6 @@
 #define crypto_stream_salsa20_ref_KEYBYTES 32
 #define crypto_stream_salsa20_ref_NONCEBYTES 8
 #ifdef __cplusplus
-#include <string>
 extern "C" {
 #endif
 extern int crypto_stream_salsa20_ref(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
diff --git a/src/libsodium/include/sodium/crypto_stream_salsa2012.h b/src/libsodium/include/sodium/crypto_stream_salsa2012.h
index fc5e8fd3..3cda90e5 100644
--- a/src/libsodium/include/sodium/crypto_stream_salsa2012.h
+++ b/src/libsodium/include/sodium/crypto_stream_salsa2012.h
@@ -4,7 +4,6 @@
 #define crypto_stream_salsa2012_ref_KEYBYTES 32
 #define crypto_stream_salsa2012_ref_NONCEBYTES 8
 #ifdef __cplusplus
-#include <string>
 extern "C" {
 #endif
 extern int crypto_stream_salsa2012_ref(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
diff --git a/src/libsodium/include/sodium/crypto_stream_salsa208.h b/src/libsodium/include/sodium/crypto_stream_salsa208.h
index 1a15e3c0..3277803d 100644
--- a/src/libsodium/include/sodium/crypto_stream_salsa208.h
+++ b/src/libsodium/include/sodium/crypto_stream_salsa208.h
@@ -4,7 +4,6 @@
 #define crypto_stream_salsa208_ref_KEYBYTES 32
 #define crypto_stream_salsa208_ref_NONCEBYTES 8
 #ifdef __cplusplus
-#include <string>
 extern "C" {
 #endif
 extern int crypto_stream_salsa208_ref(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
diff --git a/src/libsodium/include/sodium/crypto_stream_xsalsa20.h b/src/libsodium/include/sodium/crypto_stream_xsalsa20.h
index 72e8c2e8..2786ff22 100644
--- a/src/libsodium/include/sodium/crypto_stream_xsalsa20.h
+++ b/src/libsodium/include/sodium/crypto_stream_xsalsa20.h
@@ -4,7 +4,6 @@
 #define crypto_stream_xsalsa20_ref_KEYBYTES 32
 #define crypto_stream_xsalsa20_ref_NONCEBYTES 24
 #ifdef __cplusplus
-#include <string>
 extern "C" {
 #endif
 extern int crypto_stream_xsalsa20_ref(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
diff --git a/src/libsodium/include/sodium/crypto_verify_16.h b/src/libsodium/include/sodium/crypto_verify_16.h
index 3f396522..2057ffde 100644
--- a/src/libsodium/include/sodium/crypto_verify_16.h
+++ b/src/libsodium/include/sodium/crypto_verify_16.h
@@ -3,7 +3,6 @@
 
 #define crypto_verify_16_ref_BYTES 16
 #ifdef __cplusplus
-#include <string>
 extern "C" {
 #endif
 extern int crypto_verify_16_ref(const unsigned char *,const unsigned char *);
diff --git a/src/libsodium/include/sodium/crypto_verify_32.h b/src/libsodium/include/sodium/crypto_verify_32.h
index 978d8452..f5f67192 100644
--- a/src/libsodium/include/sodium/crypto_verify_32.h
+++ b/src/libsodium/include/sodium/crypto_verify_32.h
@@ -3,7 +3,6 @@
 
 #define crypto_verify_32_ref_BYTES 32
 #ifdef __cplusplus
-#include <string>
 extern "C" {
 #endif
 extern int crypto_verify_32_ref(const unsigned char *,const unsigned char *);