diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c
index e5ecc6e36..c52d89bab 100644
--- a/crypto/rand/md_rand.c
+++ b/crypto/rand/md_rand.c
@@ -57,9 +57,11 @@
  */
 
 #include <stdio.h>
-#include "cryptlib.h"
 #include <sys/types.h>
 #include <time.h>
+#include <string.h>
+#include "e_os.h"
+#include "crypto.h"
 
 #if !defined(USE_MD5_RAND) && !defined(USE_SHA1_RAND) && !defined(USE_MDC2_RAND) && !defined(USE_MD2_RAND)
 #ifndef NO_MD5
diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index de7567bc4..468da4f87 100644
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -57,10 +57,13 @@
  */
 
 #include <stdio.h>
-#include "cryptlib.h"
+#include <stdlib.h>
+#include <string.h>
+#include <memory.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include "e_os.h"
 #include "rand.h"
 
 #undef BUFSIZE