diff --git a/include/mbedtls/config_adjust_psa_superset_legacy.h b/include/mbedtls/config_adjust_psa_superset_legacy.h
index 5c897ec062..3d9029b575 100644
--- a/include/mbedtls/config_adjust_psa_superset_legacy.h
+++ b/include/mbedtls/config_adjust_psa_superset_legacy.h
@@ -73,77 +73,66 @@
 /* Ensure that the PSA's supported curves (PSA_WANT_ECC_xxx) are always a
  * superset of the builtin ones (MBEDTLS_ECP_DP_xxx). */
 #if defined(MBEDTLS_ECP_DP_BP256R1_ENABLED)
-#define MBEDTLS_SOME_BUILTIN_EC
 #if !defined(PSA_WANT_ECC_BRAINPOOL_P_R1_256)
 #define PSA_WANT_ECC_BRAINPOOL_P_R1_256 1
 #endif /* PSA_WANT_ECC_BRAINPOOL_P_R1_256 */
 #endif /* MBEDTLS_ECP_DP_BP256R1_ENABLED */
 
 #if defined(MBEDTLS_ECP_DP_BP384R1_ENABLED)
-#define MBEDTLS_SOME_BUILTIN_EC
 #if !defined(PSA_WANT_ECC_BRAINPOOL_P_R1_384)
 #define PSA_WANT_ECC_BRAINPOOL_P_R1_384 1
 #endif /* PSA_WANT_ECC_BRAINPOOL_P_R1_384 */
 #endif /*MBEDTLS_ECP_DP_BP384R1_ENABLED  */
 
 #if defined(MBEDTLS_ECP_DP_BP512R1_ENABLED)
-#define MBEDTLS_SOME_BUILTIN_EC
 #if !defined(PSA_WANT_ECC_BRAINPOOL_P_R1_512)
 #define PSA_WANT_ECC_BRAINPOOL_P_R1_512 1
 #endif /* PSA_WANT_ECC_BRAINPOOL_P_R1_512 */
 #endif /* MBEDTLS_ECP_DP_BP512R1_ENABLED */
 
 #if defined(MBEDTLS_ECP_DP_CURVE25519_ENABLED)
-#define MBEDTLS_SOME_BUILTIN_EC
 #if !defined(PSA_WANT_ECC_MONTGOMERY_255)
 #define PSA_WANT_ECC_MONTGOMERY_255 1
 #endif /* PSA_WANT_ECC_MONTGOMERY_255 */
 #endif /* MBEDTLS_ECP_DP_CURVE25519_ENABLED */
 
 #if defined(MBEDTLS_ECP_DP_CURVE448_ENABLED)
-#define MBEDTLS_SOME_BUILTIN_EC
 #if !defined(PSA_WANT_ECC_MONTGOMERY_448)
 #define PSA_WANT_ECC_MONTGOMERY_448 1
 #endif /* PSA_WANT_ECC_MONTGOMERY_448 */
 #endif /* MBEDTLS_ECP_DP_CURVE448_ENABLED */
 
 #if defined(MBEDTLS_ECP_DP_SECP192R1_ENABLED)
-#define MBEDTLS_SOME_BUILTIN_EC
 #if !defined(PSA_WANT_ECC_SECP_R1_192)
 #define PSA_WANT_ECC_SECP_R1_192 1
 #endif /* PSA_WANT_ECC_SECP_R1_192 */
 #endif /* MBEDTLS_ECP_DP_SECP192R1_ENABLED */
 
 #if defined(MBEDTLS_ECP_DP_SECP224R1_ENABLED)
-#define MBEDTLS_SOME_BUILTIN_EC
 #if !defined(PSA_WANT_ECC_SECP_R1_224)
 #define PSA_WANT_ECC_SECP_R1_224 1
 #endif /* PSA_WANT_ECC_SECP_R1_224 */
 #endif /* MBEDTLS_ECP_DP_SECP224R1_ENABLED */
 
 #if defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED)
-#define MBEDTLS_SOME_BUILTIN_EC
 #if !defined(PSA_WANT_ECC_SECP_R1_256)
 #define PSA_WANT_ECC_SECP_R1_256 1
 #endif /* PSA_WANT_ECC_SECP_R1_256 */
 #endif /* MBEDTLS_ECP_DP_SECP256R1_ENABLED */
 
 #if defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED)
-#define MBEDTLS_SOME_BUILTIN_EC
 #if !defined(PSA_WANT_ECC_SECP_R1_384)
 #define PSA_WANT_ECC_SECP_R1_384 1
 #endif /* PSA_WANT_ECC_SECP_R1_384 */
 #endif /* MBEDTLS_ECP_DP_SECP384R1_ENABLED */
 
 #if defined(MBEDTLS_ECP_DP_SECP521R1_ENABLED)
-#define MBEDTLS_SOME_BUILTIN_EC
 #if !defined(PSA_WANT_ECC_SECP_R1_521)
 #define PSA_WANT_ECC_SECP_R1_521 1
 #endif /* PSA_WANT_ECC_SECP_R1_521 */
 #endif /* MBEDTLS_ECP_DP_SECP521R1_ENABLED */
 
 #if defined(MBEDTLS_ECP_DP_SECP192K1_ENABLED)
-#define MBEDTLS_SOME_BUILTIN_EC
 #if !defined(PSA_WANT_ECC_SECP_K1_192)
 #define PSA_WANT_ECC_SECP_K1_192 1
 #endif /* PSA_WANT_ECC_SECP_K1_192 */
@@ -151,14 +140,12 @@
 
 /* SECP224K1 is buggy via the PSA API (https://github.com/Mbed-TLS/mbedtls/issues/3541) */
 #if 0 && defined(MBEDTLS_ECP_DP_SECP224K1_ENABLED)
-#define MBEDTLS_SOME_BUILTIN_EC
 #if !defined(PSA_WANT_ECC_SECP_K1_224)
 #define PSA_WANT_ECC_SECP_K1_224 1
 #endif /* PSA_WANT_ECC_SECP_K1_224 */
 #endif /* MBEDTLS_ECP_DP_SECP224K1_ENABLED */
 
 #if defined(MBEDTLS_ECP_DP_SECP256K1_ENABLED)
-#define MBEDTLS_SOME_BUILTIN_EC
 #if !defined(PSA_WANT_ECC_SECP_K1_256)
 #define PSA_WANT_ECC_SECP_K1_256 1
 #endif /* PSA_WANT_ECC_SECP_K1_256 */