diff --git a/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c b/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c
index 5b1a6ce2..43c26100 100644
--- a/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c
+++ b/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c
@@ -260,7 +260,7 @@ fe25519_notsquare(const fe25519 x)
  r = p + q
  */
 
-void
+static void
 ge25519_add_cached(ge25519_p1p1 *r, const ge25519_p3 *p, const ge25519_cached *q)
 {
     fe25519 t0;
@@ -533,7 +533,7 @@ ge25519_cached_0(ge25519_cached *h)
  r = p
  */
 
-void
+static void
 ge25519_p3_to_cached(ge25519_cached *r, const ge25519_p3 *p)
 {
     fe25519_add(r->YplusX, p->Y, p->X);
@@ -709,7 +709,7 @@ ge25519_cmov8_cached(ge25519_cached *t, const ge25519_cached cached[8], const si
  r = p - q
  */
 
-void
+static void
 ge25519_sub_cached(ge25519_p1p1 *r, const ge25519_p3 *p, const ge25519_cached *q)
 {
     fe25519 t0;
diff --git a/src/libsodium/include/sodium/private/ed25519_ref10.h b/src/libsodium/include/sodium/private/ed25519_ref10.h
index ddce4c75..1d5476c1 100644
--- a/src/libsodium/include/sodium/private/ed25519_ref10.h
+++ b/src/libsodium/include/sodium/private/ed25519_ref10.h
@@ -27,7 +27,6 @@ void fe25519_tobytes(unsigned char *s, const fe25519 h);
 # include "ed25519_ref10_fe_25_5.h"
 #endif
 
-
 /*
  ge means group element.
 
@@ -83,18 +82,12 @@ int ge25519_frombytes(ge25519_p3 *h, const unsigned char *s);
 
 int ge25519_frombytes_negate_vartime(ge25519_p3 *h, const unsigned char *s);
 
-void ge25519_p3_to_cached(ge25519_cached *r, const ge25519_p3 *p);
-
 void ge25519_p1p1_to_p2(ge25519_p2 *r, const ge25519_p1p1 *p);
 
 void ge25519_p1p1_to_p3(ge25519_p3 *r, const ge25519_p1p1 *p);
 
 void ge25519_p2_to_p3(ge25519_p3 *r, const ge25519_p2 *p);
 
-void ge25519_add_cached(ge25519_p1p1 *r, const ge25519_p3 *p, const ge25519_cached *q);
-
-void ge25519_sub_cached(ge25519_p1p1 *r, const ge25519_p3 *p, const ge25519_cached *q);
-
 void ge25519_p3_add(ge25519_p3 *r, const ge25519_p3 *p, const ge25519_p3 *q);
 
 void ge25519_p3_sub(ge25519_p3 *r, const ge25519_p3 *p, const ge25519_p3 *q);
diff --git a/src/libsodium/include/sodium/private/quirks.h b/src/libsodium/include/sodium/private/quirks.h
index 8c6eba45..a04484f7 100644
--- a/src/libsodium/include/sodium/private/quirks.h
+++ b/src/libsodium/include/sodium/private/quirks.h
@@ -51,7 +51,7 @@
 #define fe25519_frombytes _sodium_fe25519_frombytes
 #define fe25519_invert _sodium_fe25519_invert
 #define fe25519_tobytes _sodium_fe25519_tobytes
-#define ge25519_add_cached _sodium_ge25519_add_cached
+#define ge25519_clear_cofactor _sodium_ge25519_clear_cofactor
 #define ge25519_double_scalarmult_vartime _sodium_ge25519_double_scalarmult_vartime
 #define ge25519_from_hash _sodium_ge25519_from_hash
 #define ge25519_from_uniform _sodium_ge25519_from_uniform
@@ -63,11 +63,12 @@
 #define ge25519_is_on_main_subgroup _sodium_ge25519_is_on_main_subgroup
 #define ge25519_p1p1_to_p2 _sodium_ge25519_p1p1_to_p2
 #define ge25519_p1p1_to_p3 _sodium_ge25519_p1p1_to_p3
-#define ge25519_p3_to_cached _sodium_ge25519_p3_to_cached
+#define ge25519_p2_to_p3 _sodium_ge25519_p2_to_p3
+#define ge25519_p3_add _sodium_ge25519_p3_add
+#define ge25519_p3_sub _sodium_ge25519_p3_sub
 #define ge25519_p3_tobytes _sodium_ge25519_p3_tobytes
 #define ge25519_scalarmult _sodium_ge25519_scalarmult
 #define ge25519_scalarmult_base _sodium_ge25519_scalarmult_base
-#define ge25519_sub_cached _sodium_ge25519_sub_cached
 #define ge25519_tobytes _sodium_ge25519_tobytes
 #define ristretto255_from_hash _sodium_ristretto255_from_hash
 #define ristretto255_frombytes _sodium_ristretto255_frombytes
diff --git a/test/symbols/all-symbols.txt b/test/symbols/all-symbols.txt
index b5937f65..ee069f10 100644
--- a/test/symbols/all-symbols.txt
+++ b/test/symbols/all-symbols.txt
@@ -455,10 +455,13 @@ crypto_pwhash_strbytes
 crypto_pwhash_strprefix
 crypto_scalarmult
 crypto_scalarmult_base
+crypto_scalarmult_base_noclamp
 crypto_scalarmult_bytes
 crypto_scalarmult_curve25519
 crypto_scalarmult_curve25519_base
+crypto_scalarmult_curve25519_base_noclamp
 crypto_scalarmult_curve25519_bytes
+crypto_scalarmult_curve25519_noclamp
 crypto_scalarmult_curve25519_scalarbytes
 crypto_scalarmult_ed25519
 crypto_scalarmult_ed25519_base
@@ -466,6 +469,7 @@ crypto_scalarmult_ed25519_base_noclamp
 crypto_scalarmult_ed25519_bytes
 crypto_scalarmult_ed25519_noclamp
 crypto_scalarmult_ed25519_scalarbytes
+crypto_scalarmult_noclamp
 crypto_scalarmult_primitive
 crypto_scalarmult_ristretto255
 crypto_scalarmult_ristretto255_base
@@ -641,7 +645,7 @@ escrypt_r
 fe25519_frombytes
 fe25519_invert
 fe25519_tobytes
-ge25519_add_cached
+ge25519_clear_cofactor
 ge25519_double_scalarmult_vartime
 ge25519_from_hash
 ge25519_from_uniform
@@ -653,11 +657,12 @@ ge25519_is_on_curve
 ge25519_is_on_main_subgroup
 ge25519_p1p1_to_p2
 ge25519_p1p1_to_p3
-ge25519_p3_to_cached
+ge25519_p2_to_p3
+ge25519_p3_add
+ge25519_p3_sub
 ge25519_p3_tobytes
 ge25519_scalarmult
 ge25519_scalarmult_base
-ge25519_sub_cached
 ge25519_tobytes
 randombytes
 randombytes_buf