diff --git a/apps/app_rand.c b/apps/app_rand.c
index f7f133831d2afe62107a4ea8dcf49d5d7912918b..9835c84ed00d4fccb4b90953c271def2f9d9a582 100644
--- a/apps/app_rand.c
+++ b/apps/app_rand.c
@@ -109,7 +109,9 @@
  *
  */
 
+#define NON_MAIN
 #include "apps.h"
+#undef NON_MAIN
 #include <openssl/bio.h>
 #include <openssl/rand.h>
 
diff --git a/crypto/rand/rand.h b/crypto/rand/rand.h
index 28f45ec05269965e4a9b37819b16787016932a7d..f14a115225772c613059709775f9002d7bc09a52 100644
--- a/crypto/rand/rand.h
+++ b/crypto/rand/rand.h
@@ -72,6 +72,10 @@ typedef struct rand_meth_st
 	int (*pseudorand)(unsigned char *buf, int num);
 	} RAND_METHOD;
 
+#ifdef BN_DEBUG
+extern int rand_predictable;
+#endif
+
 void RAND_set_rand_method(RAND_METHOD *meth);
 RAND_METHOD *RAND_get_rand_method(void );
 RAND_METHOD *RAND_SSLeay(void);
@@ -85,7 +89,7 @@ int  RAND_write_file(const char *file);
 const char *RAND_file_name(char *file,int num);
 int RAND_status(void);
 int RAND_egd(const char *path);
-#ifdef WINDOWS
+#if defined(WINDOWS) || defined(WIN32)
 void RAND_screen(void);
 #endif
 void	ERR_load_RAND_strings(void);