diff --git a/library/ecp.c b/library/ecp.c
index 31a6b9e305..07784f92fd 100644
--- a/library/ecp.c
+++ b/library/ecp.c
@@ -146,6 +146,7 @@ static inline int ecp_drbg_random(void *p_rng,
     return mbedtls_hmac_drbg_random(p_rng, output, output_len);
 }
 
+#if !defined(MBEDTLS_ECP_MUL_ALT)
 /* DRBG context seeding */
 static int ecp_drbg_seed(ecp_drbg_context *ctx,
                          const mbedtls_mpi *secret, size_t secret_len)
@@ -172,6 +173,7 @@ cleanup:
 
     return ret;
 }
+#endif /* MBEDTLS_ECP_MUL_ALT */
 
 #elif defined(MBEDTLS_CTR_DRBG_C)
 
@@ -1354,6 +1356,7 @@ cleanup:
 #endif /* !defined(MBEDTLS_ECP_NO_FALLBACK) || !defined(MBEDTLS_ECP_NORMALIZE_JAC_ALT) */
 }
 
+#if !defined(MBEDTLS_ECP_MUL_ALT)
 /*
  * Normalize jacobian coordinates of an array of (pointers to) points,
  * using Montgomery's trick to perform only one inversion mod P.
@@ -1479,6 +1482,7 @@ cleanup:
 
     return ret;
 }
+#endif /* MBEDTLS_ECP_MUL_ALT */
 
 /*
  * Point doubling R = 2 P, Jacobian coordinates
@@ -1676,6 +1680,7 @@ cleanup:
 #endif /* !defined(MBEDTLS_ECP_NO_FALLBACK) || !defined(MBEDTLS_ECP_ADD_MIXED_ALT) */
 }
 
+#if !defined(MBEDTLS_ECP_MUL_ALT)
 /*
  * Randomize jacobian coordinates:
  * (X, Y, Z) -> (l^2 X, l^3 Y, l Z) for random l
@@ -2431,6 +2436,8 @@ cleanup:
     return ret;
 }
 
+#endif /* MBEDTLS_ECP_MUL_ALT */
+
 #endif /* MBEDTLS_ECP_SHORT_WEIERSTRASS_ENABLED */
 
 #if defined(MBEDTLS_ECP_MONTGOMERY_ENABLED)
@@ -2442,6 +2449,7 @@ cleanup:
  * For scalar multiplication, we'll use a Montgomery ladder.
  */
 
+#if !defined(MBEDTLS_ECP_MUL_ALT)
 /*
  * Normalize Montgomery x/z coordinates: X = X/Z, Z = 1
  * Cost: 1M + 1I
@@ -2675,15 +2683,24 @@ cleanup:
     return ret;
 }
 
+#endif /* MBEDTLS_ECP_MUL_ALT */
 #endif /* MBEDTLS_ECP_MONTGOMERY_ENABLED */
 
+#if !defined(MBEDTLS_ECP_MUL_ALT)
 /*
  * Restartable multiplication R = m * P
  */
+#if defined(MBEDTLS_ECP_MUL_ALT_SOFT_FALLBACK)
+int mbedtls_ecp_mul_restartable_soft( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
+             const mbedtls_mpi *m, const mbedtls_ecp_point *P,
+             int (*f_rng)(void *, unsigned char *, size_t), void *p_rng,
+             mbedtls_ecp_restart_ctx *rs_ctx )
+#else
 int mbedtls_ecp_mul_restartable(mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
                                 const mbedtls_mpi *m, const mbedtls_ecp_point *P,
                                 int (*f_rng)(void *, unsigned char *, size_t), void *p_rng,
                                 mbedtls_ecp_restart_ctx *rs_ctx)
+#endif
 {
     int ret = MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
 #if defined(MBEDTLS_ECP_INTERNAL_ALT)
@@ -2751,6 +2768,7 @@ cleanup:
 
     return ret;
 }
+#endif /* MBEDTLS_ECP_MUL_ALT */
 
 /*
  * Multiplication R = m * P
@@ -2766,7 +2784,10 @@ int mbedtls_ecp_mul(mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
     return mbedtls_ecp_mul_restartable(grp, R, m, P, f_rng, p_rng, NULL);
 }
 
+#if !defined(MBEDTLS_ECP_VERIFY_ALT)
+
 #if defined(MBEDTLS_ECP_SHORT_WEIERSTRASS_ENABLED)
+
 /*
  * Check that an affine point is valid as a public key,
  * short weierstrass curves (SEC1 3.2.3.1)
@@ -2814,6 +2835,7 @@ cleanup:
     return ret;
 }
 #endif /* MBEDTLS_ECP_SHORT_WEIERSTRASS_ENABLED */
+#endif /* MBEDTLS_ECP_VERIFY_ALT */
 
 #if defined(MBEDTLS_ECP_SHORT_WEIERSTRASS_ENABLED)
 /*
@@ -2973,6 +2995,8 @@ int mbedtls_ecp_muladd(mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
 }
 #endif /* MBEDTLS_ECP_SHORT_WEIERSTRASS_ENABLED */
 
+#if !defined(MBEDTLS_ECP_VERIFY_ALT)
+
 #if defined(MBEDTLS_ECP_MONTGOMERY_ENABLED)
 #if defined(MBEDTLS_ECP_DP_CURVE25519_ENABLED)
 #define ECP_MPI_INIT(s, n, p) { s, (n), (mbedtls_mpi_uint *) (p) }
@@ -3084,11 +3108,19 @@ static int ecp_check_pubkey_mx(const mbedtls_ecp_group *grp, const mbedtls_ecp_p
 }
 #endif /* MBEDTLS_ECP_MONTGOMERY_ENABLED */
 
+#endif /* MBEDTLS_ECP_VERIFY_ALT */
+
+#if !defined(MBEDTLS_ECP_VERIFY_ALT)
 /*
  * Check that a point is valid as a public key
  */
+#if defined(MBEDTLS_ECP_VERIFY_ALT_SOFT_FALLBACK)
+int mbedtls_ecp_check_pubkey_soft( const mbedtls_ecp_group *grp,
+                              const mbedtls_ecp_point *pt )
+#else
 int mbedtls_ecp_check_pubkey(const mbedtls_ecp_group *grp,
                              const mbedtls_ecp_point *pt)
+#endif
 {
     ECP_VALIDATE_RET(grp != NULL);
     ECP_VALIDATE_RET(pt  != NULL);
@@ -3110,6 +3142,7 @@ int mbedtls_ecp_check_pubkey(const mbedtls_ecp_group *grp,
 #endif
     return MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
 }
+#endif /* MBEDTLS_ECP_VERIFY_ALT */
 
 /*
  * Check that an mbedtls_mpi is valid as a private key