diff --git a/include/mbedtls/config_adjust_legacy_from_psa.h b/include/mbedtls/config_adjust_legacy_from_psa.h
index 3d2293d34..9e6163f2d 100644
--- a/include/mbedtls/config_adjust_legacy_from_psa.h
+++ b/include/mbedtls/config_adjust_legacy_from_psa.h
@@ -443,40 +443,40 @@
 #if defined(PSA_WANT_DH_RFC7919_2048)
 #if !defined(MBEDTLS_PSA_ACCEL_DH_RFC7919_2048)
 #define MBEDTLS_PSA_BUILTIN_DH_RFC7919_2048 1
-#define MBEDTLS_DHM_C
+#define MBEDTLS_PSA_DH_ACCEL_INCOMPLETE_PARAMS
 #endif /* !MBEDTLS_PSA_BUILTIN_DH_RFC7919_2048 */
 #endif /* PSA_WANT_DH_RFC7919_2048 */
 
 #if defined(PSA_WANT_DH_RFC7919_3072)
 #if !defined(MBEDTLS_PSA_ACCEL_DH_RFC7919_3072)
 #define MBEDTLS_PSA_BUILTIN_DH_RFC7919_3072 1
-#define MBEDTLS_DHM_C
+#define MBEDTLS_PSA_DH_ACCEL_INCOMPLETE_PARAMS
 #endif /* !MBEDTLS_PSA_BUILTIN_DH_RFC7919_3072 */
 #endif /* PSA_WANT_DH_RFC7919_3072 */
 
 #if defined(PSA_WANT_DH_RFC7919_4096)
 #if !defined(MBEDTLS_PSA_ACCEL_DH_RFC7919_4096)
 #define MBEDTLS_PSA_BUILTIN_DH_RFC7919_4096 1
-#define MBEDTLS_DHM_C
+#define MBEDTLS_PSA_DH_ACCEL_INCOMPLETE_PARAMS
 #endif /* !MBEDTLS_PSA_BUILTIN_DH_RFC7919_4096 */
 #endif /* PSA_WANT_DH_RFC7919_4096 */
 
 #if defined(PSA_WANT_DH_RFC7919_6144)
 #if !defined(MBEDTLS_PSA_ACCEL_DH_RFC7919_6144)
 #define MBEDTLS_PSA_BUILTIN_DH_RFC7919_6144 1
-#define MBEDTLS_DHM_C
+#define MBEDTLS_PSA_DH_ACCEL_INCOMPLETE_PARAMS
 #endif /* !MBEDTLS_PSA_BUILTIN_DH_RFC7919_6144 */
 #endif /* PSA_WANT_DH_RFC7919_6144 */
 
 #if defined(PSA_WANT_DH_RFC7919_8192)
 #if !defined(MBEDTLS_PSA_ACCEL_DH_RFC7919_8192)
 #define MBEDTLS_PSA_BUILTIN_DH_RFC7919_8192 1
-#define MBEDTLS_DHM_C
+#define MBEDTLS_PSA_DH_ACCEL_INCOMPLETE_PARAMS
 #endif /* !MBEDTLS_PSA_BUILTIN_DH_RFC7919_8192 */
 #endif /* PSA_WANT_DH_RFC7919_8192 */
 
 #if defined(PSA_WANT_ALG_FFDH)
-#if !defined(MBEDTLS_PSA_ACCEL_ALG_FFDH)
+#if !defined(MBEDTLS_PSA_ACCEL_ALG_FFDH) || defined(MBEDTLS_PSA_DH_ACCEL_INCOMPLETE_PARAMS)
 #define MBEDTLS_PSA_BUILTIN_ALG_FFDH 1
 #define MBEDTLS_BIGNUM_C
 #endif /* !MBEDTLS_PSA_ACCEL_ALG_FFDH */