Make sure OPENSSL_SYS_... is defined when we need it.

crypto/cast/cast_lcl.h

@@ -56,13 +56,14 @@
  * [including the GNU Public Licence.]
  */
 
+
+#include "e_os.h"
+
 #ifdef OPENSSL_SYS_WIN32
 #include <stdlib.h>
 #endif
 
 
-#include "e_os.h" /* OPENSSL_EXTERN */
-
 #ifdef OPENSSL_BUILD_SHLIBCRYPTO
 # undef OPENSSL_EXTERN
 # define OPENSSL_EXTERN OPENSSL_EXPORT

crypto/rand/rand_egd.c

@@ -54,6 +54,7 @@
  *
  */
 
+#include <openssl/e_os2.h>
 #include <openssl/rand.h>
 
 /*