diff --git a/include/mbedtls/aesni.h b/include/mbedtls/aesni.h
index 49bc9e1..0da40a0 100644
--- a/include/mbedtls/aesni.h
+++ b/include/mbedtls/aesni.h
@@ -176,6 +176,6 @@
 #endif
 
 #endif /* MBEDTLS_AESNI_HAVE_CODE */
-#endif  /* MBEDTLS_AESNI_C */
+#endif /* MBEDTLS_AESNI_C && (MBEDTLS_HAVE_X86_64 || MBEDTLS_HAVE_X86) */
 
 #endif /* MBEDTLS_AESNI_H */
diff --git a/include/mbedtls/padlock.h b/include/mbedtls/padlock.h
index 184e183..13c65fc 100644
--- a/include/mbedtls/padlock.h
+++ b/include/mbedtls/padlock.h
@@ -123,6 +123,6 @@
 }
 #endif
 
-#endif /* MBEDTLS_VIA_PADLOCK_HAVE_CODE  */
+#endif /* MBEDTLS_VIA_PADLOCK_HAVE_CODE */
 
 #endif /* padlock.h */