diff --git a/crypto/bio/bio_err.c b/crypto/bio/bio_err.c
index 68a119d89..5df17ff89 100644
--- a/crypto/bio/bio_err.c
+++ b/crypto/bio/bio_err.c
@@ -61,6 +61,7 @@
 #include <stdio.h>
 #include <openssl/err.h>
 #include <openssl/bio.h>
+#include <openssl/opensslconf.h> /* To see if OPENSSL_NO_ERR is defined */
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
diff --git a/crypto/bn/bn_err.c b/crypto/bn/bn_err.c
index bcc7ff97a..747591f9c 100644
--- a/crypto/bn/bn_err.c
+++ b/crypto/bn/bn_err.c
@@ -61,6 +61,7 @@
 #include <stdio.h>
 #include <openssl/err.h>
 #include <openssl/bn.h>
+#include <openssl/opensslconf.h> /* To see if OPENSSL_NO_ERR is defined */
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
diff --git a/crypto/buffer/buf_err.c b/crypto/buffer/buf_err.c
index 5eee653e1..655906078 100644
--- a/crypto/buffer/buf_err.c
+++ b/crypto/buffer/buf_err.c
@@ -61,6 +61,7 @@
 #include <stdio.h>
 #include <openssl/err.h>
 #include <openssl/buffer.h>
+#include <openssl/opensslconf.h> /* To see if OPENSSL_NO_ERR is defined */
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
diff --git a/crypto/comp/comp_err.c b/crypto/comp/comp_err.c
index 1652b8c2c..54edbb0e9 100644
--- a/crypto/comp/comp_err.c
+++ b/crypto/comp/comp_err.c
@@ -61,6 +61,7 @@
 #include <stdio.h>
 #include <openssl/err.h>
 #include <openssl/comp.h>
+#include <openssl/opensslconf.h> /* To see if OPENSSL_NO_ERR is defined */
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
diff --git a/crypto/conf/conf_err.c b/crypto/conf/conf_err.c
index ee07bfe9d..bc16eeaa5 100644
--- a/crypto/conf/conf_err.c
+++ b/crypto/conf/conf_err.c
@@ -61,6 +61,7 @@
 #include <stdio.h>
 #include <openssl/err.h>
 #include <openssl/conf.h>
+#include <openssl/opensslconf.h> /* To see if OPENSSL_NO_ERR is defined */
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
diff --git a/crypto/dh/dh_err.c b/crypto/dh/dh_err.c
index d837950ae..443a741da 100644
--- a/crypto/dh/dh_err.c
+++ b/crypto/dh/dh_err.c
@@ -61,6 +61,7 @@
 #include <stdio.h>
 #include <openssl/err.h>
 #include <openssl/dh.h>
+#include <openssl/opensslconf.h> /* To see if OPENSSL_NO_ERR is defined */
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
diff --git a/crypto/dsa/dsa_err.c b/crypto/dsa/dsa_err.c
index 79aa4ff52..b1064f07e 100644
--- a/crypto/dsa/dsa_err.c
+++ b/crypto/dsa/dsa_err.c
@@ -61,6 +61,7 @@
 #include <stdio.h>
 #include <openssl/err.h>
 #include <openssl/dsa.h>
+#include <openssl/opensslconf.h> /* To see if OPENSSL_NO_ERR is defined */
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
diff --git a/crypto/dso/dso_err.c b/crypto/dso/dso_err.c
index ac783e279..8ec7ba9f9 100644
--- a/crypto/dso/dso_err.c
+++ b/crypto/dso/dso_err.c
@@ -61,6 +61,7 @@
 #include <stdio.h>
 #include <openssl/err.h>
 #include <openssl/dso.h>
+#include <openssl/opensslconf.h> /* To see if OPENSSL_NO_ERR is defined */
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
diff --git a/crypto/ecdsa/ecs_err.c b/crypto/ecdsa/ecs_err.c
index 75c789448..c9bed9dd8 100644
--- a/crypto/ecdsa/ecs_err.c
+++ b/crypto/ecdsa/ecs_err.c
@@ -61,6 +61,7 @@
 #include <stdio.h>
 #include <openssl/err.h>
 #include <openssl/ecdsa.h>
+#include <openssl/opensslconf.h> /* To see if OPENSSL_NO_ERR is defined */
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR