diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c
index 0a5037464..841631d3c 100644
--- a/crypto/rand/md_rand.c
+++ b/crypto/rand/md_rand.c
@@ -126,8 +126,6 @@
 
 #include <openssl/crypto.h>
 #include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/sha.h>
 
 #ifdef BN_DEBUG
 # define PREDICT
diff --git a/crypto/rand/rand_lcl.h b/crypto/rand/rand_lcl.h
index c69d6a978..21070efa7 100644
--- a/crypto/rand/rand_lcl.h
+++ b/crypto/rand/rand_lcl.h
@@ -133,18 +133,22 @@
 #define MD_Update(a,b,c)	EVP_DigestUpdate(a,b,c)
 #define	MD_Final(a,b)		EVP_DigestFinal(a,b,NULL)
 #if defined(USE_MD5_RAND)
+#include <openssl/md5.h>
 #define MD_DIGEST_LENGTH	MD5_DIGEST_LENGTH
 #define MD_Init(a)		EVP_DigestInit(a,EVP_md5())
 #define	MD(a,b,c)		EVP_Digest(a,b,c,NULL,EVP_md5())
 #elif defined(USE_SHA1_RAND)
+#include <openssl/sha.h>
 #define MD_DIGEST_LENGTH	SHA_DIGEST_LENGTH
 #define MD_Init(a)		EVP_DigestInit(a,EVP_sha1())
 #define	MD(a,b,c)		EVP_Digest(a,b,c,NULL,EVP_sha1())
 #elif defined(USE_MDC2_RAND)
+#include <openssl/mdc2.h>
 #define MD_DIGEST_LENGTH	MDC2_DIGEST_LENGTH
 #define MD_Init(a)		EVP_DigestInit(a,EVP_mdc2())
 #define	MD(a,b,c)		EVP_Digest(a,b,c,NULL,EVP_mdc2())
 #elif defined(USE_MD2_RAND)
+#include <openssl/md2.h>
 #define MD_DIGEST_LENGTH	MD2_DIGEST_LENGTH
 #define MD_Init(a)		EVP_DigestInit(a,EVP_md2())
 #define	MD(a,b,c)		EVP_Digest(a,b,c,NULL,EVP_md2())