diff --git a/library/aesni.c b/library/aesni.c
index cc3a3b3f38..427c2fdc6d 100644
--- a/library/aesni.c
+++ b/library/aesni.c
@@ -39,7 +39,8 @@
 #include <immintrin.h>
 #endif
 
-#if !defined(MBEDTLS_AES_USE_HARDWARE_ONLY)
+#if !defined(MBEDTLS_AES_USE_HARDWARE_ONLY) || \
+    (defined(MBEDTLS_HAVE_X86) && defined(MBEDTLS_PADLOCK_C))
 /*
  * AES-NI support detection routine
  */
diff --git a/library/aesni.h b/library/aesni.h
index 1cf01ec9e8..9e07905724 100644
--- a/library/aesni.h
+++ b/library/aesni.h
@@ -97,7 +97,8 @@ extern "C" {
  *
  * \return         1 if CPU has support for the feature, 0 otherwise
  */
-#if !defined(MBEDTLS_AES_USE_HARDWARE_ONLY)
+#if !defined(MBEDTLS_AES_USE_HARDWARE_ONLY) || \
+    (defined(MBEDTLS_HAVE_X86) && defined(MBEDTLS_PADLOCK_C))
 int mbedtls_aesni_has_support(unsigned int what);
 #else
 #define mbedtls_aesni_has_support(what) 1