diff --git a/crypto/aes/aes_cbc.c b/crypto/aes/aes_cbc.c
index bf1a808cf0e1ea168cba4403ae7819e92ee5c77a..8974dc35a5be0e1a1406992ec89bea767d4f2643 100644
--- a/crypto/aes/aes_cbc.c
+++ b/crypto/aes/aes_cbc.c
@@ -49,7 +49,13 @@
  *
  */
 
+#ifndef AES_DEBUG
+# ifndef NDEBUG
+#  define NDEBUG
+# endif
+#endif
 #include <assert.h>
+
 #include <openssl/aes.h>
 #include "aes_locl.h"
 
diff --git a/crypto/aes/aes_cfb.c b/crypto/aes/aes_cfb.c
index 41c2a5ec3df51dce1a082fd014cdaec8f6218133..9b569dda903e983ae3514fa93099a4ab9d23d639 100644
--- a/crypto/aes/aes_cfb.c
+++ b/crypto/aes/aes_cfb.c
@@ -105,7 +105,13 @@
  * [including the GNU Public Licence.]
  */
 
+#ifndef AES_DEBUG
+# ifndef NDEBUG
+#  define NDEBUG
+# endif
+#endif
 #include <assert.h>
+
 #include <openssl/aes.h>
 #include "aes_locl.h"
 
diff --git a/crypto/aes/aes_core.c b/crypto/aes/aes_core.c
index 937988dd8c60775ae3fee4f5e11162af47817f0c..ea884f6f9e84d8f3c50a7acb563a409a5b4c4ccb 100644
--- a/crypto/aes/aes_core.c
+++ b/crypto/aes/aes_core.c
@@ -28,7 +28,13 @@
 /* Note: rewritten a little bit to provide error control and an OpenSSL-
    compatible API */
 
+#ifndef AES_DEBUG
+# ifndef NDEBUG
+#  define NDEBUG
+# endif
+#endif
 #include <assert.h>
+
 #include <stdlib.h>
 #include <openssl/aes.h>
 #include "aes_locl.h"
diff --git a/crypto/aes/aes_ctr.c b/crypto/aes/aes_ctr.c
index 142ca4a142bb2e4e7d5cb0d218751e6d863da264..59088499a0a9b738e37cabb58f94aa9b179ac989 100644
--- a/crypto/aes/aes_ctr.c
+++ b/crypto/aes/aes_ctr.c
@@ -49,7 +49,13 @@
  *
  */
 
+#ifndef AES_DEBUG
+# ifndef NDEBUG
+#  define NDEBUG
+# endif
+#endif
 #include <assert.h>
+
 #include <openssl/aes.h>
 #include "aes_locl.h"
 
diff --git a/crypto/aes/aes_ecb.c b/crypto/aes/aes_ecb.c
index 1cb2e07d3dd1b2c5a648973428c82baea10e1492..28aa561c2d89a216c3a5f98693f681da90aaa5bd 100644
--- a/crypto/aes/aes_ecb.c
+++ b/crypto/aes/aes_ecb.c
@@ -49,7 +49,13 @@
  *
  */
 
+#ifndef AES_DEBUG
+# ifndef NDEBUG
+#  define NDEBUG
+# endif
+#endif
 #include <assert.h>
+
 #include <openssl/aes.h>
 #include "aes_locl.h"
 
diff --git a/crypto/aes/aes_ofb.c b/crypto/aes/aes_ofb.c
index e33bdaea285c36a39a2bb1d912cbb8025b39d183..f358bb39e27c806060b8aa377fad4e7d38f1d0a9 100644
--- a/crypto/aes/aes_ofb.c
+++ b/crypto/aes/aes_ofb.c
@@ -105,7 +105,13 @@
  * [including the GNU Public Licence.]
  */
 
+#ifndef AES_DEBUG
+# ifndef NDEBUG
+#  define NDEBUG
+# endif
+#endif
 #include <assert.h>
+
 #include <openssl/aes.h>
 #include "aes_locl.h"