diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index 6f956b1963..5e197a8736 100644
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -877,6 +877,7 @@ void ASN1_STRING_TABLE_cleanup(void);
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
+void ERR_load_ASN1_strings(void);
 
 /* Error codes for the ASN1 functions. */
 
@@ -1148,4 +1149,3 @@ void ASN1_STRING_TABLE_cleanup(void);
 }
 #endif
 #endif
-
diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h
index edc6cc8715..35dee5fcdd 100644
--- a/crypto/bio/bio.h
+++ b/crypto/bio/bio.h
@@ -615,6 +615,7 @@ int BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args);
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
+void ERR_load_BIO_strings(void);
 
 /* Error codes for the BIO functions. */
 
@@ -684,4 +685,3 @@ int BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args);
 }
 #endif
 #endif
-
diff --git a/crypto/bn/bn.h b/crypto/bn/bn.h
index c423b65122..cadb438aba 100644
--- a/crypto/bn/bn.h
+++ b/crypto/bn/bn.h
@@ -477,6 +477,7 @@ int BN_bntest_rand(BIGNUM *rnd, int bits, int top,int bottom);
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
+void ERR_load_BN_strings(void);
 
 /* Error codes for the BN functions. */
 
@@ -520,4 +521,3 @@ int BN_bntest_rand(BIGNUM *rnd, int bits, int top,int bottom);
 }
 #endif
 #endif
-
diff --git a/crypto/buffer/buffer.h b/crypto/buffer/buffer.h
index bff26bf391..afe7a46d43 100644
--- a/crypto/buffer/buffer.h
+++ b/crypto/buffer/buffer.h
@@ -81,6 +81,7 @@ void ERR_load_BUF_strings(void );
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
+void ERR_load_BUF_strings(void);
 
 /* Error codes for the BUF functions. */
 
@@ -95,4 +96,3 @@ void ERR_load_BUF_strings(void );
 }
 #endif
 #endif
-
diff --git a/crypto/comp/comp.h b/crypto/comp/comp.h
index 0922609542..c26c209f09 100644
--- a/crypto/comp/comp.h
+++ b/crypto/comp/comp.h
@@ -47,6 +47,7 @@ COMP_METHOD *COMP_zlib(void );
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
+void ERR_load_COMP_strings(void);
 
 /* Error codes for the COMP functions. */
 
@@ -58,4 +59,3 @@ COMP_METHOD *COMP_zlib(void );
 }
 #endif
 #endif
-
diff --git a/crypto/conf/conf.h b/crypto/conf/conf.h
index cd40a0db21..7612656f8b 100644
--- a/crypto/conf/conf.h
+++ b/crypto/conf/conf.h
@@ -145,6 +145,7 @@ int NCONF_dump_bio(CONF *conf, BIO *out);
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
+void ERR_load_CONF_strings(void);
 
 /* Error codes for the CONF functions. */
 
@@ -176,4 +177,3 @@ int NCONF_dump_bio(CONF *conf, BIO *out);
 }
 #endif
 #endif
-
diff --git a/crypto/crypto.h b/crypto/crypto.h
index cc4d5c47a3..a7d0c3ea0b 100644
--- a/crypto/crypto.h
+++ b/crypto/crypto.h
@@ -387,6 +387,7 @@ void ERR_load_CRYPTO_strings(void);
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
+void ERR_load_CRYPTO_strings(void);
 
 /* Error codes for the CRYPTO functions. */
 
@@ -403,4 +404,3 @@ void ERR_load_CRYPTO_strings(void);
 }
 #endif
 #endif
-
diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h
index a15fc1c65f..247be9281b 100644
--- a/crypto/dh/dh.h
+++ b/crypto/dh/dh.h
@@ -183,6 +183,7 @@ void	ERR_load_DH_strings(void );
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
+void ERR_load_DH_strings(void);
 
 /* Error codes for the DH functions. */
 
@@ -201,4 +202,3 @@ void	ERR_load_DH_strings(void );
 }
 #endif
 #endif
-
diff --git a/crypto/dsa/dsa.h b/crypto/dsa/dsa.h
index e98fa389bd..79ddc49bff 100644
--- a/crypto/dsa/dsa.h
+++ b/crypto/dsa/dsa.h
@@ -216,6 +216,7 @@ DH *DSA_dup_DH(DSA *r);
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
+void ERR_load_DSA_strings(void);
 
 /* Error codes for the DSA functions. */
 
@@ -242,4 +243,3 @@ DH *DSA_dup_DH(DSA *r);
 }
 #endif
 #endif
-
diff --git a/crypto/dso/dso.h b/crypto/dso/dso.h
index bed7c464a6..a2ff75d8ad 100644
--- a/crypto/dso/dso.h
+++ b/crypto/dso/dso.h
@@ -200,6 +200,7 @@ void ERR_load_DSO_strings(void);
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
+void ERR_load_DSO_strings(void);
 
 /* Error codes for the DSO functions. */
 
@@ -247,4 +248,3 @@ void ERR_load_DSO_strings(void);
 }
 #endif
 #endif
-
diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index 0f27df4603..9e1080e7c2 100644
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -777,6 +777,7 @@ void EVP_PBE_cleanup(void);
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
+void ERR_load_EVP_strings(void);
 
 /* Error codes for the EVP functions. */
 
@@ -849,4 +850,3 @@ void EVP_PBE_cleanup(void);
 }
 #endif
 #endif
-
diff --git a/crypto/objects/objects.h b/crypto/objects/objects.h
index c099e2e84e..96b8cc9ae8 100644
--- a/crypto/objects/objects.h
+++ b/crypto/objects/objects.h
@@ -1017,6 +1017,7 @@ int		OBJ_create_objects(BIO *in);
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
+void ERR_load_OBJ_strings(void);
 
 /* Error codes for the OBJ functions. */
 
@@ -1035,4 +1036,3 @@ int		OBJ_create_objects(BIO *in);
 }
 #endif
 #endif
-
diff --git a/crypto/pem/pem.h b/crypto/pem/pem.h
index 6d3c446577..7dbc94d4bd 100644
--- a/crypto/pem/pem.h
+++ b/crypto/pem/pem.h
@@ -614,6 +614,7 @@ int PEM_write_PKCS8PrivateKey(FILE *fp,EVP_PKEY *x,const EVP_CIPHER *enc,
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
+void ERR_load_PEM_strings(void);
 
 /* Error codes for the PEM functions. */
 
@@ -664,4 +665,3 @@ int PEM_write_PKCS8PrivateKey(FILE *fp,EVP_PKEY *x,const EVP_CIPHER *enc,
 }
 #endif
 #endif
-
diff --git a/crypto/pkcs12/pkcs12.h b/crypto/pkcs12/pkcs12.h
index e529154f26..1241f1f633 100644
--- a/crypto/pkcs12/pkcs12.h
+++ b/crypto/pkcs12/pkcs12.h
@@ -284,6 +284,7 @@ int PKCS12_newpass(PKCS12 *p12, char *oldpass, char *newpass);
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
+void ERR_load_PKCS12_strings(void);
 
 /* Error codes for the PKCS12 functions. */
 
@@ -342,4 +343,3 @@ int PKCS12_newpass(PKCS12 *p12, char *oldpass, char *newpass);
 }
 #endif
 #endif
-
diff --git a/crypto/pkcs7/pkcs7.h b/crypto/pkcs7/pkcs7.h
index 1b817e605d..c5cd4b951a 100644
--- a/crypto/pkcs7/pkcs7.h
+++ b/crypto/pkcs7/pkcs7.h
@@ -422,6 +422,7 @@ int SMIME_text(BIO *in, BIO *out);
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
+void ERR_load_PKCS7_strings(void);
 
 /* Error codes for the PKCS7 functions. */
 
@@ -502,4 +503,3 @@ int SMIME_text(BIO *in, BIO *out);
 }
 #endif
 #endif
-
diff --git a/crypto/rand/rand.h b/crypto/rand/rand.h
index 918f865d90..2ab95c9299 100644
--- a/crypto/rand/rand.h
+++ b/crypto/rand/rand.h
@@ -115,10 +115,15 @@ int RAND_event(UINT, WPARAM, LPARAM);
 #endif
 #endif
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
+void ERR_load_RAND_strings(void);
 
 /* Error codes for the RAND functions. */
 
@@ -128,5 +133,7 @@ int RAND_event(UINT, WPARAM, LPARAM);
 /* Reason codes. */
 #define RAND_R_PRNG_NOT_SEEDED				 100
 
+#ifdef  __cplusplus
+}
+#endif
 #endif
-
diff --git a/crypto/rsa/rsa.h b/crypto/rsa/rsa.h
index b029cbc3a4..9c0637c170 100644
--- a/crypto/rsa/rsa.h
+++ b/crypto/rsa/rsa.h
@@ -275,6 +275,7 @@ void *RSA_get_ex_data(RSA *r, int idx);
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
+void ERR_load_RSA_strings(void);
 
 /* Error codes for the RSA functions. */
 
@@ -343,4 +344,3 @@ void *RSA_get_ex_data(RSA *r, int idx);
 }
 #endif
 #endif
-
diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h
index 813c8adffd..088319a568 100644
--- a/crypto/x509/x509.h
+++ b/crypto/x509/x509.h
@@ -1220,6 +1220,7 @@ int X509_TRUST_get_trust(X509_TRUST *xp);
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
+void ERR_load_X509_strings(void);
 
 /* Error codes for the X509 functions. */
 
@@ -1291,4 +1292,3 @@ int X509_TRUST_get_trust(X509_TRUST *xp);
 }
 #endif
 #endif
-
diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h
index 0453b12d63..07dc5713bb 100644
--- a/crypto/x509v3/x509v3.h
+++ b/crypto/x509v3/x509v3.h
@@ -555,6 +555,7 @@ void X509_email_free(STACK *sk);
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
+void ERR_load_X509V3_strings(void);
 
 /* Error codes for the X509V3 functions. */
 
@@ -650,4 +651,3 @@ void X509_email_free(STACK *sk);
 }
 #endif
 #endif
-
diff --git a/rsaref/rsaref.h b/rsaref/rsaref.h
index 498449f40e..56a5bdfc6f 100644
--- a/rsaref/rsaref.h
+++ b/rsaref/rsaref.h
@@ -134,15 +134,11 @@ int R_RandomFinal(RSARandomState *rnd);
 void ERR_load_RSAREF_strings(void );
 RSA_METHOD *RSA_PKCS1_RSAref(void );
 
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
+void ERR_load_RSAREF_strings(void);
 
 /* Error codes for the RSAREF functions. */
 
@@ -177,4 +173,7 @@ RSA_METHOD *RSA_PKCS1_RSAref(void );
 #define RSAREF_R_SIGNATURE				 0x040b
 #define RSAREF_R_SIGNATURE_ENCODING			 0x040c
 
+#ifdef  __cplusplus
+}
+#endif
 #endif