diff --git a/library/padlock.c b/library/padlock.c
index 001172200e..38d110e0b3 100644
--- a/library/padlock.c
+++ b/library/padlock.c
@@ -33,7 +33,10 @@
 
 #if defined(MBEDTLS_HAVE_X86)
 
-#if !defined(MBEDTLS_AES_USE_HARDWARE_ONLY)
+#if defined(MBEDTLS_AES_USE_HARDWARE_ONLY)
+#error "MBEDTLS_PADLOCK_C defined, but not all prerequisites"
+#endif
+
 /*
  * PadLock detection routine
  */
@@ -63,7 +66,6 @@ int mbedtls_padlock_has_support(int feature)
 
     return flags & feature;
 }
-#endif
 
 /*
  * PadLock AES-ECB block en(de)cryption
diff --git a/library/padlock.h b/library/padlock.h
index c031f4bb54..b5f0d7d7a3 100644
--- a/library/padlock.h
+++ b/library/padlock.h
@@ -69,11 +69,7 @@ extern "C" {
  *
  * \return         non-zero if CPU has support for the feature, 0 otherwise
  */
-#if !defined(MBEDTLS_AES_USE_HARDWARE_ONLY)
 int mbedtls_padlock_has_support(int feature);
-#else
-#define /* no-check-names */ mbedtls_padlock_has_support(feature) 1
-#endif
 
 /**
  * \brief          Internal PadLock AES-ECB block en(de)cryption