diff --git a/src/libsodium/crypto_core/hchacha20/core_hchacha20.h b/src/libsodium/crypto_core/hchacha20/core_hchacha20.h
index 6e1d1c54..25ca03de 100644
--- a/src/libsodium/crypto_core/hchacha20/core_hchacha20.h
+++ b/src/libsodium/crypto_core/hchacha20/core_hchacha20.h
@@ -11,8 +11,6 @@
 #define U8V(v)  ((uint8_t)(v) & U8C(0xFF))
 #define U32V(v) ((uint32_t)(v) & U32C(0xFFFFFFFF))
 
-#define ROTL32(v, n) (U32V((v) << (n)) | ((v) >> (32 - (n))))
-
 #define ROTATE(v, c) (ROTL32(v, c))
 #define XOR(v, w)    ((v) ^ (w))
 #define PLUS(v, w)   (U32V((v) + (w)))
diff --git a/src/libsodium/crypto_hash/sha256/cp/hash_sha256_cp.c b/src/libsodium/crypto_hash/sha256/cp/hash_sha256_cp.c
index a7662971..d902e082 100644
--- a/src/libsodium/crypto_hash/sha256/cp/hash_sha256_cp.c
+++ b/src/libsodium/crypto_hash/sha256/cp/hash_sha256_cp.c
@@ -60,7 +60,7 @@ be32dec_vect(uint32_t *dst, const unsigned char *src, size_t len)
 #define Ch(x, y, z)     ((x & (y ^ z)) ^ z)
 #define Maj(x, y, z)    ((x & (y | z)) | (y & z))
 #define SHR(x, n)       (x >> n)
-#define ROTR(x, n)      ((x >> n) | (x << (32 - n)))
+#define ROTR(x, n)      ROTR32(x, n)
 #define S0(x)           (ROTR(x, 2) ^ ROTR(x, 13) ^ ROTR(x, 22))
 #define S1(x)           (ROTR(x, 6) ^ ROTR(x, 11) ^ ROTR(x, 25))
 #define s0(x)           (ROTR(x, 7) ^ ROTR(x, 18) ^ SHR(x, 3))
diff --git a/src/libsodium/crypto_hash/sha512/cp/hash_sha512_cp.c b/src/libsodium/crypto_hash/sha512/cp/hash_sha512_cp.c
index 2cc7a4dd..31de9817 100644
--- a/src/libsodium/crypto_hash/sha512/cp/hash_sha512_cp.c
+++ b/src/libsodium/crypto_hash/sha512/cp/hash_sha512_cp.c
@@ -60,7 +60,7 @@ be64dec_vect(uint64_t *dst, const unsigned char *src, size_t len)
 #define Ch(x, y, z)     ((x & (y ^ z)) ^ z)
 #define Maj(x, y, z)    ((x & (y | z)) | (y & z))
 #define SHR(x, n)       (x >> n)
-#define ROTR(x, n)      ((x >> n) | (x << (64 - n)))
+#define ROTR(x, n)      ROTR64(x, n)
 #define S0(x)           (ROTR(x, 28) ^ ROTR(x, 34) ^ ROTR(x, 39))
 #define S1(x)           (ROTR(x, 14) ^ ROTR(x, 18) ^ ROTR(x, 41))
 #define s0(x)           (ROTR(x, 1) ^ ROTR(x, 8) ^ SHR(x, 7))
diff --git a/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphash24_ref.c b/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphash24_ref.c
index 27f7b13c..ba194cd2 100644
--- a/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphash24_ref.c
+++ b/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphash24_ref.c
@@ -5,7 +5,7 @@ typedef uint64_t u64;
 typedef uint32_t u32;
 typedef uint8_t   u8;
 
-#define ROTL(x,b) (u64)( ((x) << (b)) | ( (x) >> (64 - (b))) )
+#define ROTL(x, b) ROTL64(x, b)
 
 #define SIPROUND            \
   do {              \
diff --git a/src/libsodium/crypto_stream/chacha20/ref/stream_chacha20_ref.c b/src/libsodium/crypto_stream/chacha20/ref/stream_chacha20_ref.c
index fe4c9773..1a7a32f7 100644
--- a/src/libsodium/crypto_stream/chacha20/ref/stream_chacha20_ref.c
+++ b/src/libsodium/crypto_stream/chacha20/ref/stream_chacha20_ref.c
@@ -30,9 +30,6 @@ typedef struct chacha_ctx chacha_ctx;
 #define U8V(v) ((u8)(v) & U8C(0xFF))
 #define U32V(v) ((u32)(v) & U32C(0xFFFFFFFF))
 
-#define ROTL32(v, n) \
-  (U32V((v) << (n)) | ((v) >> (32 - (n))))
-
 #define ROTATE(v,c) (ROTL32(v,c))
 #define XOR(v,w) ((v) ^ (w))
 #define PLUS(v,w) (U32V((v) + (w)))
diff --git a/src/libsodium/include/sodium/private/common.h b/src/libsodium/include/sodium/private/common.h
index 9d9df3ea..ff93062a 100644
--- a/src/libsodium/include/sodium/private/common.h
+++ b/src/libsodium/include/sodium/private/common.h
@@ -7,6 +7,11 @@
 
 #define COMPILER_ASSERT(X) (void) sizeof(char[(X) ? 1 : -1])
 
+#define ROTL32(x, b) (uint32_t)(((x) << (b)) | ((x) >> (32 - (b))))
+#define ROTL64(x, b) (uint64_t)(((x) << (b)) | ((x) >> (64 - (b))))
+#define ROTR32(x, b) (uint32_t)(((x) >> (b)) | ((x) << (32 - (b))))
+#define ROTR64(x, b) (uint64_t)(((x) >> (b)) | ((x) << (64 - (b))))
+
 #define LOAD64_LE(SRC) load64_le(SRC)
 static inline uint64_t
 load64_le(const uint8_t src[8])