diff --git a/library/psa_crypto_hash.c b/library/psa_crypto_hash.c
index 44df552..ed933c0 100644
--- a/library/psa_crypto_hash.c
+++ b/library/psa_crypto_hash.c
@@ -74,11 +74,22 @@
             mbedtls_sha512_free(&operation->ctx.sha512);
             break;
 #endif
-#if defined(MBEDTLS_PSA_BUILTIN_ALG_SHA_3)
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_224)
         case PSA_ALG_SHA3_224:
+#endif
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_256)
         case PSA_ALG_SHA3_256:
+#endif
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_384)
         case PSA_ALG_SHA3_384:
+#endif
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_512)
         case PSA_ALG_SHA3_512:
+#endif
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_224) || \
+    defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_256) || \
+    defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_384) || \
+    defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_512)
             mbedtls_sha3_free(&operation->ctx.sha3);
             break;
 #endif
@@ -143,19 +154,25 @@
             ret = mbedtls_sha512_starts(&operation->ctx.sha512, 0);
             break;
 #endif
-#if defined(MBEDTLS_PSA_BUILTIN_ALG_SHA_3)
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_224)
         case PSA_ALG_SHA3_224:
             mbedtls_sha3_init(&operation->ctx.sha3);
             ret = mbedtls_sha3_starts(&operation->ctx.sha3, MBEDTLS_SHA3_224);
             break;
+#endif
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_256)
         case PSA_ALG_SHA3_256:
             mbedtls_sha3_init(&operation->ctx.sha3);
             ret = mbedtls_sha3_starts(&operation->ctx.sha3, MBEDTLS_SHA3_256);
             break;
+#endif
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_384)
         case PSA_ALG_SHA3_384:
             mbedtls_sha3_init(&operation->ctx.sha3);
             ret = mbedtls_sha3_starts(&operation->ctx.sha3, MBEDTLS_SHA3_384);
             break;
+#endif
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_512)
         case PSA_ALG_SHA3_512:
             mbedtls_sha3_init(&operation->ctx.sha3);
             ret = mbedtls_sha3_starts(&operation->ctx.sha3, MBEDTLS_SHA3_512);
@@ -223,11 +240,22 @@
                                  &source_operation->ctx.sha512);
             break;
 #endif
-#if defined(MBEDTLS_PSA_BUILTIN_ALG_SHA_3)
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_224)
         case PSA_ALG_SHA3_224:
+#endif
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_256)
         case PSA_ALG_SHA3_256:
+#endif
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_384)
         case PSA_ALG_SHA3_384:
+#endif
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_512)
         case PSA_ALG_SHA3_512:
+#endif
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_224) || \
+    defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_256) || \
+    defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_384) || \
+    defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_512)
             mbedtls_sha3_clone(&target_operation->ctx.sha3,
                                &source_operation->ctx.sha3);
             break;
@@ -292,11 +320,22 @@
                                         input, input_length);
             break;
 #endif
-#if defined(MBEDTLS_PSA_BUILTIN_ALG_SHA_3)
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_224)
         case PSA_ALG_SHA3_224:
+#endif
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_256)
         case PSA_ALG_SHA3_256:
+#endif
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_384)
         case PSA_ALG_SHA3_384:
+#endif
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_512)
         case PSA_ALG_SHA3_512:
+#endif
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_224) || \
+    defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_256) || \
+    defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_384) || \
+    defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_512)
             ret = mbedtls_sha3_update(&operation->ctx.sha3,
                                         input, input_length);
             break;
@@ -371,11 +410,22 @@
             ret = mbedtls_sha512_finish(&operation->ctx.sha512, hash);
             break;
 #endif
-#if defined(MBEDTLS_PSA_BUILTIN_ALG_SHA_3)
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_224)
         case PSA_ALG_SHA3_224:
+#endif
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_256)
         case PSA_ALG_SHA3_256:
+#endif
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_384)
         case PSA_ALG_SHA3_384:
+#endif
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_512)
         case PSA_ALG_SHA3_512:
+#endif
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_224) || \
+    defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_256) || \
+    defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_384) || \
+    defined(MBEDTLS_PSA_BUILTIN_ALG_SHA3_512)
             ret = mbedtls_sha3_finish(&operation->ctx.sha3, hash, hash_size);
             break;
 #endif