diff --git a/features/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/TARGET_NUMAKER_PFM_NUC472/mbedtls_device.h b/features/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/TARGET_NUMAKER_PFM_NUC472/mbedtls_device.h
index 7f0f6c8142..3a4009a23b 100644
--- a/features/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/TARGET_NUMAKER_PFM_NUC472/mbedtls_device.h
+++ b/features/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/TARGET_NUMAKER_PFM_NUC472/mbedtls_device.h
@@ -22,9 +22,5 @@
 #define MBEDTLS_SHA256_ALT
 
 #define MBEDTLS_AES_ALT
-#define MBEDTLS_AES_SETKEY_ENC_ALT
-#define MBEDTLS_AES_SETKEY_DEC_ALT
-#define MBEDTLS_AES_ENCRYPT_ALT
-#define MBEDTLS_AES_DECRYPT_ALT
 
 #endif /* MBEDTLS_DEVICE_H */
diff --git a/features/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/aes/aes_alt.c b/features/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/aes/aes_alt.c
index 7f1cd8d56a..0cbcc875ec 100644
--- a/features/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/aes/aes_alt.c
+++ b/features/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/aes/aes_alt.c
@@ -153,7 +153,6 @@ void mbedtls_aes_free( mbedtls_aes_context *ctx )
 /*
  * AES key schedule (encryption)
  */
-#if defined(MBEDTLS_AES_SETKEY_ENC_ALT)
 int mbedtls_aes_setkey_enc( mbedtls_aes_context *ctx, const unsigned char *key,
                     unsigned int keybits )
 {
@@ -189,12 +188,10 @@ int mbedtls_aes_setkey_enc( mbedtls_aes_context *ctx, const unsigned char *key,
 
     return( 0 );
 }
-#endif /* MBEDTLS_AES_SETKEY_ENC_ALT */
 
 /*
  * AES key schedule (decryption)
  */
-#if defined(MBEDTLS_AES_SETKEY_DEC_ALT)
 int mbedtls_aes_setkey_dec( mbedtls_aes_context *ctx, const unsigned char *key,
                     unsigned int keybits )
 {
@@ -209,7 +206,6 @@ exit:
 
     return( ret );
 }
-#endif /* MBEDTLS_AES_SETKEY_DEC_ALT */
 
 
 static void __nvt_aes_crypt( mbedtls_aes_context *ctx,
@@ -249,7 +245,6 @@ static void __nvt_aes_crypt( mbedtls_aes_context *ctx,
 /*
  * AES-ECB block encryption
  */
-#if defined(MBEDTLS_AES_ENCRYPT_ALT)
 void mbedtls_aes_encrypt( mbedtls_aes_context *ctx,
                           const unsigned char input[16],
                           unsigned char output[16] )
@@ -260,12 +255,10 @@ void mbedtls_aes_encrypt( mbedtls_aes_context *ctx,
 	  __nvt_aes_crypt(ctx, input, output, 16);
   
 }
-#endif /* MBEDTLS_AES_ENCRYPT_ALT */
 
 /*
  * AES-ECB block decryption
  */
-#if defined(MBEDTLS_AES_DECRYPT_ALT)
 void mbedtls_aes_decrypt( mbedtls_aes_context *ctx,
                           const unsigned char input[16],
                           unsigned char output[16] )
@@ -277,7 +270,6 @@ void mbedtls_aes_decrypt( mbedtls_aes_context *ctx,
 
 
 }
-#endif /* MBEDTLS_AES_DECRYPT_ALT */
 
 /*
  * AES-ECB block encryption/decryption