OPENSSL_EXTERN
diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h
index 3d684e7..041a832 100644
--- a/crypto/bn/bn_lcl.h
+++ b/crypto/bn/bn_lcl.h
@@ -231,16 +231,16 @@
 
 #endif
 
-EXTERN int bn_limit_bits;
-EXTERN int bn_limit_num;        /* (1<<bn_limit_bits) */
+OPENSSL_EXTERN int bn_limit_bits;
+OPENSSL_EXTERN int bn_limit_num;        /* (1<<bn_limit_bits) */
 /* Recursive 'low' limit */
-EXTERN int bn_limit_bits_low;
-EXTERN int bn_limit_num_low;    /* (1<<bn_limit_bits_low) */
+OPENSSL_EXTERN int bn_limit_bits_low;
+OPENSSL_EXTERN int bn_limit_num_low;    /* (1<<bn_limit_bits_low) */
 /* Do modified 'high' part calculation' */
-EXTERN int bn_limit_bits_high;
-EXTERN int bn_limit_num_high;   /* (1<<bn_limit_bits_high) */
-EXTERN int bn_limit_bits_mont;
-EXTERN int bn_limit_num_mont;   /* (1<<bn_limit_bits_mont) */
+OPENSSL_EXTERN int bn_limit_bits_high;
+OPENSSL_EXTERN int bn_limit_num_high;   /* (1<<bn_limit_bits_high) */
+OPENSSL_EXTERN int bn_limit_bits_mont;
+OPENSSL_EXTERN int bn_limit_num_mont;   /* (1<<bn_limit_bits_mont) */
 
 
 BIGNUM *bn_expand2(BIGNUM *b, int bits);
diff --git a/crypto/cast/cast_lcl.h b/crypto/cast/cast_lcl.h
index cfe7aea..2694bc4 100644
--- a/crypto/cast/cast_lcl.h
+++ b/crypto/cast/cast_lcl.h
@@ -60,7 +60,7 @@
 #include <stdlib.h>
 #endif
 
-#include <openssl/e_os.h>	/* EXTERN */
+#include <openssl/e_os.h>	/* OPENSSL_EXTERN */
 
 #undef c2l
 #define c2l(c,l)	(l =((unsigned long)(*((c)++)))    , \
@@ -215,11 +215,11 @@
 	}
 #endif
 
-EXTERN CAST_LONG CAST_S_table0[256];
-EXTERN CAST_LONG CAST_S_table1[256];
-EXTERN CAST_LONG CAST_S_table2[256];
-EXTERN CAST_LONG CAST_S_table3[256];
-EXTERN CAST_LONG CAST_S_table4[256];
-EXTERN CAST_LONG CAST_S_table5[256];
-EXTERN CAST_LONG CAST_S_table6[256];
-EXTERN CAST_LONG CAST_S_table7[256];
+OPENSSL_EXTERN CAST_LONG CAST_S_table0[256];
+OPENSSL_EXTERN CAST_LONG CAST_S_table1[256];
+OPENSSL_EXTERN CAST_LONG CAST_S_table2[256];
+OPENSSL_EXTERN CAST_LONG CAST_S_table3[256];
+OPENSSL_EXTERN CAST_LONG CAST_S_table4[256];
+OPENSSL_EXTERN CAST_LONG CAST_S_table5[256];
+OPENSSL_EXTERN CAST_LONG CAST_S_table6[256];
+OPENSSL_EXTERN CAST_LONG CAST_S_table7[256];
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 076129c..4fc870d 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -345,9 +345,9 @@
 	COMP_METHOD *method; /* The method :-) */
 	} SSL3_COMP;
 
-EXTERN SSL3_ENC_METHOD ssl3_undef_enc_method;
-EXTERN SSL_CIPHER ssl2_ciphers[];
-EXTERN SSL_CIPHER ssl3_ciphers[];
+OPENSSL_EXTERN SSL3_ENC_METHOD ssl3_undef_enc_method;
+OPENSSL_EXTERN SSL_CIPHER ssl2_ciphers[];
+OPENSSL_EXTERN SSL_CIPHER ssl3_ciphers[];
 
 #ifdef VMS
 #undef SSL_COMP_get_compression_methods