diff --git a/MacOS/OpenSSL.mcp.hqx b/MacOS/OpenSSL.mcp.hqx
index dcbcf2edadfd65eef7b4f4004c6bfbaf105ffb14..813288a68311556e15d8b9f7ee381ad4f5a9aa3b 100644
--- a/MacOS/OpenSSL.mcp.hqx
+++ b/MacOS/OpenSSL.mcp.hqx
@@ -8,8 +8,8 @@ VN!!!!kbi!!!25!!!!+-"!J%!!!!!!!!!!!"$Ef4P9f&bFQP[FL"3FQpUC@0d!!!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$+J!
 !!d!!!'%r!!"N!!!!!bS!!!"I!!8!!!!!!'!!!3!!!!!!CJ!!!P`!!!*J!!!E2`!
-!(!!!!!*F!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$!!!!$!!!!!-!!!!-Y)+VS2r
-rhp-!!!!!!!!!!!!!!!!!!!!!$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!(!!!!!*F!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$!!!!$!!!!!-!!!!-Y),)q`!
+!HMS!!!!!!!!!!!!!!!!!!!!!$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -2427,8 +2427,8 @@ TCA-!!!!#4e*98!!!!!!!!!!h!e"33`!!!!*'58a&!J!!"NC*6%8#!!-94e*98!!
 -D@*bBA*TCA-!!!!#4e*98!!!!!!!!!!e!e"33`!!!!K'58a&!J!!#NC*6%8#!!!
 )4NP-43)!!!P'58a&!J!"PNC*6%8#!!!H4NP-43)!!"e'58a&!J!!&8C*6%8#!!!
 84e*98!!!!!!!!!!j!cBiD`!!!!9'58a&$!!$3NC*6%8-!!0$4NP-43`!!d4'58a
-&$!!$48C*6%8-!!0'H`#++E"[HfplEhY[HfplEhY[HfplEhY[HfplEhY[HfplEhY
-[H`!!!!%!!!!#!!!!!`!!!!!!!!&q!!!!#3!!!!S!!!!,!!!!$!!!!!d!!!!1!!!
+&$!!$48C*6%8-!!0'!!%1cd!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!%!!!!#!!!!!`!!!!!!!!&q!!!!#3!!!!S!!!!,!!!!$!!!!!d!!!!1!!!
 !$`!!!"!!!!!4!!!!%J!!!"-!!!!8!!!!&3!!!"B!!!!A!!!!'!!!!"N!!!!D!!!
 !'`!!!"`!!!!G!!!!(J!!!"m!!!!J!!!!)3!!!#)!!!!M!!!!*!!!!#8!!!!Q!!!
 !*`!!!#J!!!!T!!!!+J!!!#X!!!!X!!!!,3!!!#i!!!![!!!!-!!!!$%!!!!b!!!
@@ -5100,4 +5100,4 @@ J!J%!!!!!!!%!!3%!!!!!!!!!!!!!!!!"!!!!!!!!!!!#!!-k!!!"i!)"!!!!!!!
 !!!!!!!#1D3!!!!T`FQ9Q!!3UPJ!!!b3!!!!!!!#1F`!!!!a`FQ9Q!!6#J!!!!b8
 !!!!!!!$[bJ!!!-4`FQ9Q!!5%A!!!!bB!!!!!!!$aDJ!!!4K`FQ9Q!!5EfJ!!!bF
 !!!!!!!&9$J!!!+K`FQ9Q!!38Y3!!!bJ!!!!!!!$`MJ!!!#j`FQ9Q!!4U(3!!!bN
-!!!!!!!'bF!!!!Ja`FQ9Q!!5"83!!!bS!!!!!pP)!!!:
+!!!!!!!'bF!!!!Ja`FQ9Q!!5"83!!!bS!!!!!eT8!!!:
diff --git a/MacOS/opensslconf.h b/MacOS/opensslconf.h
index e7c6b7c9817eede4f160f9fad56644fdb2eb0c07..4a6d85d33c6e94f170548b6c87dbe9a430d440ff 100644
--- a/MacOS/opensslconf.h
+++ b/MacOS/opensslconf.h
@@ -6,8 +6,6 @@
 #endif
 #endif
 
-#define OPENSSL_UNISTD <unistd.h>
-
 #if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
 #define IDEA_INT unsigned int
 #endif
@@ -115,4 +113,5 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
 
 #ifndef __POWERPC__
 #define SHA_XARRAY
-#endif
\ No newline at end of file
+#endif
+
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 5142b6b6bf76f641398fac7d7698b91f562b2004..a8f29f1e65c2ac938959920a45d2283ed27e1905 100644
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -183,7 +183,7 @@ unsigned long CRYPTO_thread_id(void)
 		ret=(unsigned long)GetCurrentTask();
 #elif defined(WIN32)
 		ret=(unsigned long)GetCurrentThreadId();
-#elif defined(MSDOS)
+#elif defined(GETPID_IS_MEANINGLESS)
 		ret=1L;
 #else
 		ret=(unsigned long)getpid();
diff --git a/crypto/md32_common.h b/crypto/md32_common.h
index 8d9059f95a16bff6286032697b75e8742480bc7a..470a8c3e512175a27554a7dff288085049399f63 100644
--- a/crypto/md32_common.h
+++ b/crypto/md32_common.h
@@ -183,11 +183,10 @@
 #  define ROTATE(a,n)	_lrotl(a,n)
 # elif defined(__MWERKS__)
 #  ifdef __POWERPC__
-#   defined ROTATE(a,n)	__rlwinm(a,n,0,31)
+#   define ROTATE(a,n)	__rlwinm(a,n,0,31)
 #  else
 #   define ROTATE(a,n)	__rol(a,n)
 #  endif
- B
 # elif defined(__GNUC__) && __GNUC__>=2 && !defined(NO_ASM)
   /*
    * Some GNU C inline assembler templates. Note that these are
diff --git a/crypto/mem.c b/crypto/mem.c
index a9529ee274efe119044ba791309cc0947eac49b5..67f8d12cc027fa04ab5a5ef15c09cd3aa0f65d03 100644
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -93,7 +93,7 @@ static void (*free_func)(void *)            = free;
   static void (*realloc_debug_func)()= NULL;
   static void (*free_debug_func)()= NULL;
   static void (*set_debug_options_func)()= NULL;
-  static int (*get_debug_options_func)()= NULL;
+  static long (*get_debug_options_func)()= NULL;
 #endif
 
 
diff --git a/e_os.h b/e_os.h
index 0c4fcf87411c8d6adadbaac3c72bbf60c1764551..12f39788ebf70fa116184db6ec84c55231bce4e7 100644
--- a/e_os.h
+++ b/e_os.h
@@ -251,7 +251,11 @@ extern "C" {
 #    endif
 #  else
      /* !defined VMS */
-#    include OPENSLL_UNISTD
+#    ifdef OPENSSL_UNISTD
+#      include OPENSLL_UNISTD
+#    else
+#      include <unistd.h>
+#    endif
 #    ifndef NO_SYS_TYPES_H
 #      include <sys/types.h>
 #    endif