Do not include "e_os.h" anymore. Simply pull in the necessary headers.

ok miod@, deraadt@

33 files changed, 89 insertions, 69 deletions

diff --git a/src/lib/libssl/d1_clnt.c b/src/lib/libssl/d1_clnt.c
index 48e5e06bde..eb6ea6c0ec 100644
--- a/src/lib/libssl/d1_clnt.c
+++ b/src/lib/libssl/d1_clnt.c
@@ -158,7 +158,7 @@ int dtls1_connect(SSL *s)
 
         RAND_add(&Time,sizeof(Time),0);
         ERR_clear_error();
-        clear_sys_error();
+        errno = 0;
 
         if (s->info_callback != NULL)
                 cb=s->info_callback;
diff --git a/src/lib/libssl/d1_lib.c b/src/lib/libssl/d1_lib.c
index 106939f241..7565ce7e36 100644
--- a/src/lib/libssl/d1_lib.c
+++ b/src/lib/libssl/d1_lib.c
@@ -57,8 +57,12 @@
  *
  */
 
+#include <sys/param.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+
 #include <stdio.h>
-#define USE_SOCKETS
 #include <openssl/objects.h>
 #include "ssl_locl.h"
 
diff --git a/src/lib/libssl/d1_pkt.c b/src/lib/libssl/d1_pkt.c
index 8186462d4a..52f7fc022f 100644
--- a/src/lib/libssl/d1_pkt.c
+++ b/src/lib/libssl/d1_pkt.c
@@ -115,7 +115,6 @@
 
 #include <stdio.h>
 #include <errno.h>
-#define USE_SOCKETS
 #include "ssl_locl.h"
 #include <openssl/evp.h>
 #include <openssl/buffer.h>
diff --git a/src/lib/libssl/d1_srvr.c b/src/lib/libssl/d1_srvr.c
index 9975e20873..aacf8fd380 100644
--- a/src/lib/libssl/d1_srvr.c
+++ b/src/lib/libssl/d1_srvr.c
@@ -158,7 +158,7 @@ int dtls1_accept(SSL *s)
 
         RAND_add(&Time,sizeof(Time),0);
         ERR_clear_error();
-        clear_sys_error();
+        errno = 0;
 
         if (s->info_callback != NULL)
                 cb=s->info_callback;
diff --git a/src/lib/libssl/s23_clnt.c b/src/lib/libssl/s23_clnt.c
index 2b93c639dd..6315e9d876 100644
--- a/src/lib/libssl/s23_clnt.c
+++ b/src/lib/libssl/s23_clnt.c
@@ -152,7 +152,7 @@ int ssl23_connect(SSL *s)
 
         RAND_add(&Time,sizeof(Time),0);
         ERR_clear_error();
-        clear_sys_error();
+        errno = 0;
 
         if (s->info_callback != NULL)
                 cb=s->info_callback;
diff --git a/src/lib/libssl/s23_lib.c b/src/lib/libssl/s23_lib.c
index 3bf728318a..a6285b767f 100644
--- a/src/lib/libssl/s23_lib.c
+++ b/src/lib/libssl/s23_lib.c
@@ -121,7 +121,7 @@ int ssl23_read(SSL *s, void *buf, int len)
         {
         int n;
 
-        clear_sys_error();
+        errno = 0;
         if (SSL_in_init(s) && (!s->in_handshake))
                 {
                 n=s->handshake_func(s);
@@ -144,7 +144,7 @@ int ssl23_peek(SSL *s, void *buf, int len)
         {
         int n;
 
-        clear_sys_error();
+        errno = 0;
         if (SSL_in_init(s) && (!s->in_handshake))
                 {
                 n=s->handshake_func(s);
@@ -167,7 +167,7 @@ int ssl23_write(SSL *s, const void *buf, int len)
         {
         int n;
 
-        clear_sys_error();
+        errno = 0;
         if (SSL_in_init(s) && (!s->in_handshake))
                 {
                 n=s->handshake_func(s);
diff --git a/src/lib/libssl/s23_pkt.c b/src/lib/libssl/s23_pkt.c
index 4ca6a1b258..eba8d9d8fc 100644
--- a/src/lib/libssl/s23_pkt.c
+++ b/src/lib/libssl/s23_pkt.c
@@ -58,7 +58,6 @@
 
 #include <stdio.h>
 #include <errno.h>
-#define USE_SOCKETS
 #include "ssl_locl.h"
 #include <openssl/evp.h>
 #include <openssl/buffer.h>
diff --git a/src/lib/libssl/s23_srvr.c b/src/lib/libssl/s23_srvr.c
index 4877849013..2ac8786c62 100644
--- a/src/lib/libssl/s23_srvr.c
+++ b/src/lib/libssl/s23_srvr.c
@@ -154,7 +154,7 @@ int ssl23_accept(SSL *s)
 
         RAND_add(&Time,sizeof(Time),0);
         ERR_clear_error();
-        clear_sys_error();
+        errno = 0;
 
         if (s->info_callback != NULL)
                 cb=s->info_callback;
diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c
index a6b3c01afa..64e7be8d67 100644
--- a/src/lib/libssl/s3_clnt.c
+++ b/src/lib/libssl/s3_clnt.c
@@ -193,7 +193,7 @@ int ssl3_connect(SSL *s)
 
         RAND_add(&Time,sizeof(Time),0);
         ERR_clear_error();
-        clear_sys_error();
+        errno = 0;
 
         if (s->info_callback != NULL)
                 cb=s->info_callback;
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index 6b2739161d..fd1e7b80d8 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/s3_lib.c
@@ -4167,7 +4167,7 @@ int ssl3_write(SSL *s, const void *buf, int len)
                 return(0);
                 }
 #endif
-        clear_sys_error();
+        errno = 0;
         if (s->s3->renegotiate) ssl3_renegotiate_check(s);
 
         /* This is an experimental flag that sends the
@@ -4213,7 +4213,7 @@ static int ssl3_read_internal(SSL *s, void *buf, int len, int peek)
         {
         int ret;
         
-        clear_sys_error();
+        errno = 0;
         if (s->s3->renegotiate) ssl3_renegotiate_check(s);
         s->s3->in_read_app_data=1;
         ret=s->method->ssl_read_bytes(s,SSL3_RT_APPLICATION_DATA,buf,len,peek);
diff --git a/src/lib/libssl/s3_pkt.c b/src/lib/libssl/s3_pkt.c
index 96ba63262e..6b55d21a3e 100644
--- a/src/lib/libssl/s3_pkt.c
+++ b/src/lib/libssl/s3_pkt.c
@@ -232,7 +232,7 @@ int ssl3_read_n(SSL *s, int n, int max, int extend)
                  * and need to read in more until we have len+n (up to
                  * len+max if possible) */
 
-                clear_sys_error();
+                errno = 0;
                 if (s->rbio != NULL)
                         {
                         s->rwstate=SSL_READING;
@@ -874,7 +874,7 @@ int ssl3_write_pending(SSL *s, int type, const unsigned char *buf,
 
         for (;;)
                 {
-                clear_sys_error();
+                errno = 0;
                 if (s->wbio != NULL)
                         {
                         s->rwstate=SSL_WRITING;
diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c
index 9ac19c05f2..518dfcd5e2 100644
--- a/src/lib/libssl/s3_srvr.c
+++ b/src/lib/libssl/s3_srvr.c
@@ -220,7 +220,7 @@ int ssl3_accept(SSL *s)
 
         RAND_add(&Time,sizeof(Time),0);
         ERR_clear_error();
-        clear_sys_error();
+        errno = 0;
 
         if (s->info_callback != NULL)
                 cb=s->info_callback;
diff --git a/src/lib/libssl/src/ssl/d1_clnt.c b/src/lib/libssl/src/ssl/d1_clnt.c
index 48e5e06bde..eb6ea6c0ec 100644
--- a/src/lib/libssl/src/ssl/d1_clnt.c
+++ b/src/lib/libssl/src/ssl/d1_clnt.c
@@ -158,7 +158,7 @@ int dtls1_connect(SSL *s)
 
         RAND_add(&Time,sizeof(Time),0);
         ERR_clear_error();
-        clear_sys_error();
+        errno = 0;
 
         if (s->info_callback != NULL)
                 cb=s->info_callback;
diff --git a/src/lib/libssl/src/ssl/d1_lib.c b/src/lib/libssl/src/ssl/d1_lib.c
index 106939f241..7565ce7e36 100644
--- a/src/lib/libssl/src/ssl/d1_lib.c
+++ b/src/lib/libssl/src/ssl/d1_lib.c
@@ -57,8 +57,12 @@
  *
  */
 
+#include <sys/param.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+
 #include <stdio.h>
-#define USE_SOCKETS
 #include <openssl/objects.h>
 #include "ssl_locl.h"
 
diff --git a/src/lib/libssl/src/ssl/d1_pkt.c b/src/lib/libssl/src/ssl/d1_pkt.c
index 8186462d4a..52f7fc022f 100644
--- a/src/lib/libssl/src/ssl/d1_pkt.c
+++ b/src/lib/libssl/src/ssl/d1_pkt.c
@@ -115,7 +115,6 @@
 
 #include <stdio.h>
 #include <errno.h>
-#define USE_SOCKETS
 #include "ssl_locl.h"
 #include <openssl/evp.h>
 #include <openssl/buffer.h>
diff --git a/src/lib/libssl/src/ssl/d1_srvr.c b/src/lib/libssl/src/ssl/d1_srvr.c
index 9975e20873..aacf8fd380 100644
--- a/src/lib/libssl/src/ssl/d1_srvr.c
+++ b/src/lib/libssl/src/ssl/d1_srvr.c
@@ -158,7 +158,7 @@ int dtls1_accept(SSL *s)
 
         RAND_add(&Time,sizeof(Time),0);
         ERR_clear_error();
-        clear_sys_error();
+        errno = 0;
 
         if (s->info_callback != NULL)
                 cb=s->info_callback;
diff --git a/src/lib/libssl/src/ssl/s23_clnt.c b/src/lib/libssl/src/ssl/s23_clnt.c
index 2b93c639dd..6315e9d876 100644
--- a/src/lib/libssl/src/ssl/s23_clnt.c
+++ b/src/lib/libssl/src/ssl/s23_clnt.c
@@ -152,7 +152,7 @@ int ssl23_connect(SSL *s)
 
         RAND_add(&Time,sizeof(Time),0);
         ERR_clear_error();
-        clear_sys_error();
+        errno = 0;
 
         if (s->info_callback != NULL)
                 cb=s->info_callback;
diff --git a/src/lib/libssl/src/ssl/s23_lib.c b/src/lib/libssl/src/ssl/s23_lib.c
index 3bf728318a..a6285b767f 100644
--- a/src/lib/libssl/src/ssl/s23_lib.c
+++ b/src/lib/libssl/src/ssl/s23_lib.c
@@ -121,7 +121,7 @@ int ssl23_read(SSL *s, void *buf, int len)
         {
         int n;
 
-        clear_sys_error();
+        errno = 0;
         if (SSL_in_init(s) && (!s->in_handshake))
                 {
                 n=s->handshake_func(s);
@@ -144,7 +144,7 @@ int ssl23_peek(SSL *s, void *buf, int len)
         {
         int n;
 
-        clear_sys_error();
+        errno = 0;
         if (SSL_in_init(s) && (!s->in_handshake))
                 {
                 n=s->handshake_func(s);
@@ -167,7 +167,7 @@ int ssl23_write(SSL *s, const void *buf, int len)
         {
         int n;
 
-        clear_sys_error();
+        errno = 0;
         if (SSL_in_init(s) && (!s->in_handshake))
                 {
                 n=s->handshake_func(s);
diff --git a/src/lib/libssl/src/ssl/s23_pkt.c b/src/lib/libssl/src/ssl/s23_pkt.c
index 4ca6a1b258..eba8d9d8fc 100644
--- a/src/lib/libssl/src/ssl/s23_pkt.c
+++ b/src/lib/libssl/src/ssl/s23_pkt.c
@@ -58,7 +58,6 @@
 
 #include <stdio.h>
 #include <errno.h>
-#define USE_SOCKETS
 #include "ssl_locl.h"
 #include <openssl/evp.h>
 #include <openssl/buffer.h>
diff --git a/src/lib/libssl/src/ssl/s23_srvr.c b/src/lib/libssl/src/ssl/s23_srvr.c
index 4877849013..2ac8786c62 100644
--- a/src/lib/libssl/src/ssl/s23_srvr.c
+++ b/src/lib/libssl/src/ssl/s23_srvr.c
@@ -154,7 +154,7 @@ int ssl23_accept(SSL *s)
 
         RAND_add(&Time,sizeof(Time),0);
         ERR_clear_error();
-        clear_sys_error();
+        errno = 0;
 
         if (s->info_callback != NULL)
                 cb=s->info_callback;
diff --git a/src/lib/libssl/src/ssl/s2_clnt.c b/src/lib/libssl/src/ssl/s2_clnt.c
index 03b6cf9673..15fbef9c77 100644
--- a/src/lib/libssl/src/ssl/s2_clnt.c
+++ b/src/lib/libssl/src/ssl/s2_clnt.c
@@ -152,7 +152,7 @@ int ssl2_connect(SSL *s)
 
         RAND_add(&l,sizeof(l),0);
         ERR_clear_error();
-        clear_sys_error();
+        errno = 0;
 
         if (s->info_callback != NULL)
                 cb=s->info_callback;
diff --git a/src/lib/libssl/src/ssl/s2_pkt.c b/src/lib/libssl/src/ssl/s2_pkt.c
index 8bb6ab8baa..7efad40153 100644
--- a/src/lib/libssl/src/ssl/s2_pkt.c
+++ b/src/lib/libssl/src/ssl/s2_pkt.c
@@ -113,7 +113,6 @@
 #ifndef OPENSSL_NO_SSL2
 #include <stdio.h>
 #include <errno.h>
-#define USE_SOCKETS
 
 static int read_n(SSL *s,unsigned int n,unsigned int max,unsigned int extend);
 static int n_do_ssl_write(SSL *s, const unsigned char *buf, unsigned int len);
@@ -144,7 +143,7 @@ static int ssl2_read_internal(SSL *s, void *buf, int len, int peek)
                         }
                 }
 
-        clear_sys_error();
+        errno = 0;
         s->rwstate=SSL_NOTHING;
         if (len <= 0) return(len);
 
@@ -372,7 +371,7 @@ static int read_n(SSL *s, unsigned int n, unsigned int max,
         s->packet=s->s2->rbuf;
         while (newb < (int)n)
                 {
-                clear_sys_error();
+                errno = 0;
                 if (s->rbio != NULL)
                         {
                         s->rwstate=SSL_READING;
@@ -438,7 +437,7 @@ int ssl2_write(SSL *s, const void *_buf, int len)
                         return(-1);
                 }
 
-        clear_sys_error();
+        errno = 0;
         s->rwstate=SSL_NOTHING;
         if (len <= 0) return(len);
 
@@ -483,7 +482,7 @@ static int write_pending(SSL *s, const unsigned char *buf, unsigned int len)
 
         for (;;)
                 {
-                clear_sys_error();
+                errno = 0;
                 if (s->wbio != NULL)
                         {
                         s->rwstate=SSL_WRITING;
diff --git a/src/lib/libssl/src/ssl/s2_srvr.c b/src/lib/libssl/src/ssl/s2_srvr.c
index 2cba426bb7..cac405db7c 100644
--- a/src/lib/libssl/src/ssl/s2_srvr.c
+++ b/src/lib/libssl/src/ssl/s2_srvr.c
@@ -153,7 +153,7 @@ int ssl2_accept(SSL *s)
 
         RAND_add(&l,sizeof(l),0);
         ERR_clear_error();
-        clear_sys_error();
+        errno = 0;
 
         if (s->info_callback != NULL)
                 cb=s->info_callback;
@@ -170,7 +170,7 @@ int ssl2_accept(SSL *s)
                 return(-1);
                 }
 
-        clear_sys_error();
+        errno = 0;
         for (;;)
                 {
                 state=s->state;
diff --git a/src/lib/libssl/src/ssl/s3_clnt.c b/src/lib/libssl/src/ssl/s3_clnt.c
index a6b3c01afa..64e7be8d67 100644
--- a/src/lib/libssl/src/ssl/s3_clnt.c
+++ b/src/lib/libssl/src/ssl/s3_clnt.c
@@ -193,7 +193,7 @@ int ssl3_connect(SSL *s)
 
         RAND_add(&Time,sizeof(Time),0);
         ERR_clear_error();
-        clear_sys_error();
+        errno = 0;
 
         if (s->info_callback != NULL)
                 cb=s->info_callback;
diff --git a/src/lib/libssl/src/ssl/s3_lib.c b/src/lib/libssl/src/ssl/s3_lib.c
index 6b2739161d..fd1e7b80d8 100644
--- a/src/lib/libssl/src/ssl/s3_lib.c
+++ b/src/lib/libssl/src/ssl/s3_lib.c
@@ -4167,7 +4167,7 @@ int ssl3_write(SSL *s, const void *buf, int len)
                 return(0);
                 }
 #endif
-        clear_sys_error();
+        errno = 0;
         if (s->s3->renegotiate) ssl3_renegotiate_check(s);
 
         /* This is an experimental flag that sends the
@@ -4213,7 +4213,7 @@ static int ssl3_read_internal(SSL *s, void *buf, int len, int peek)
         {
         int ret;
         
-        clear_sys_error();
+        errno = 0;
         if (s->s3->renegotiate) ssl3_renegotiate_check(s);
         s->s3->in_read_app_data=1;
         ret=s->method->ssl_read_bytes(s,SSL3_RT_APPLICATION_DATA,buf,len,peek);
diff --git a/src/lib/libssl/src/ssl/s3_pkt.c b/src/lib/libssl/src/ssl/s3_pkt.c
index 96ba63262e..6b55d21a3e 100644
--- a/src/lib/libssl/src/ssl/s3_pkt.c
+++ b/src/lib/libssl/src/ssl/s3_pkt.c
@@ -232,7 +232,7 @@ int ssl3_read_n(SSL *s, int n, int max, int extend)
                  * and need to read in more until we have len+n (up to
                  * len+max if possible) */
 
-                clear_sys_error();
+                errno = 0;
                 if (s->rbio != NULL)
                         {
                         s->rwstate=SSL_READING;
@@ -874,7 +874,7 @@ int ssl3_write_pending(SSL *s, int type, const unsigned char *buf,
 
         for (;;)
                 {
-                clear_sys_error();
+                errno = 0;
                 if (s->wbio != NULL)
                         {
                         s->rwstate=SSL_WRITING;
diff --git a/src/lib/libssl/src/ssl/s3_srvr.c b/src/lib/libssl/src/ssl/s3_srvr.c
index 9ac19c05f2..518dfcd5e2 100644
--- a/src/lib/libssl/src/ssl/s3_srvr.c
+++ b/src/lib/libssl/src/ssl/s3_srvr.c
@@ -220,7 +220,7 @@ int ssl3_accept(SSL *s)
 
         RAND_add(&Time,sizeof(Time),0);
         ERR_clear_error();
-        clear_sys_error();
+        errno = 0;
 
         if (s->info_callback != NULL)
                 cb=s->info_callback;
diff --git a/src/lib/libssl/src/ssl/ssl_cert.c b/src/lib/libssl/src/ssl/ssl_cert.c
index 5123a89182..6d144077f9 100644
--- a/src/lib/libssl/src/ssl/ssl_cert.c
+++ b/src/lib/libssl/src/ssl/ssl_cert.c
@@ -114,13 +114,13 @@
  * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
  */
 
-#include <stdio.h>
+#include <sys/types.h>
 
-#include "e_os.h"
-#ifndef NO_SYS_TYPES_H
-# include <sys/types.h>
-#endif
+#include <stdio.h>
+#include <unistd.h>
 
+#include <openssl/opensslconf.h>
+#include <openssl/e_os2.h>
 #include "o_dir.h"
 #include <openssl/objects.h>
 #include <openssl/bio.h>
@@ -837,7 +837,7 @@ int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
 
         if (errno)
                 {
-                SYSerr(SYS_F_OPENDIR, get_last_sys_error());
+                SYSerr(SYS_F_OPENDIR, errno);
                 ERR_add_error_data(3, "OPENSSL_DIR_read(&ctx, '", dir, "')");
                 SSLerr(SSL_F_SSL_ADD_DIR_CERT_SUBJECTS_TO_STACK, ERR_R_SYS_LIB);
                 goto err;
diff --git a/src/lib/libssl/src/ssl/ssl_locl.h b/src/lib/libssl/src/ssl/ssl_locl.h
index e485907748..e7fecbc3cb 100644
--- a/src/lib/libssl/src/ssl/ssl_locl.h
+++ b/src/lib/libssl/src/ssl/ssl_locl.h
@@ -142,13 +142,17 @@
 
 #ifndef HEADER_SSL_LOCL_H
 #define HEADER_SSL_LOCL_H
+
+#include <sys/types.h>
+
 #include <stdlib.h>
 #include <time.h>
 #include <string.h>
 #include <errno.h>
+#include <unistd.h>
 
-#include "e_os.h"
-
+#include <openssl/opensslconf.h>
+#include <openssl/e_os2.h>
 #include <openssl/buffer.h>
 #ifndef OPENSSL_NO_COMP
 #include <openssl/comp.h>
diff --git a/src/lib/libssl/src/ssl/ssl_task.c b/src/lib/libssl/src/ssl/ssl_task.c
index 416fb16743..366204f097 100644
--- a/src/lib/libssl/src/ssl/ssl_task.c
+++ b/src/lib/libssl/src/ssl/ssl_task.c
@@ -114,6 +114,8 @@
  * Author: Dave Jones
  * Date:   22-JUL-1996
  */
+#include <sys/types.h>
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <iodef.h>              /* VMS IO$_ definitions */
@@ -123,9 +125,10 @@ int LIB$INIT_TIMER(), LIB$SHOW_TIMER();
 
 #include <string.h>             /* from ssltest.c */
 #include <errno.h>
+#include <unistd.h>
 
-#include "e_os.h"
-
+#include <openssl/opensslconf.h>
+#include <openssl/e_os2.h>
 #include <openssl/buffer.h>
 #include <openssl/x509.h>
 #include <openssl/ssl.h>
diff --git a/src/lib/libssl/src/ssl/ssltest.c b/src/lib/libssl/src/ssl/ssltest.c
index 8a602cc551..1e285a5c52 100644
--- a/src/lib/libssl/src/ssl/ssltest.c
+++ b/src/lib/libssl/src/ssl/ssltest.c
@@ -142,17 +142,21 @@
 
 #define _BSD_SOURCE 1           /* Or gethostname won't be declared properly
                                    on Linux and GNU platforms. */
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
 
 #include <assert.h>
 #include <errno.h>
 #include <limits.h>
+#include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-
-#define USE_SOCKETS
-#include "e_os.h"
+#include <unistd.h>
 
 #ifdef OPENSSL_SYS_VMS
 #define _XOPEN_SOURCE 500       /* Or isascii won't be declared properly on
@@ -161,6 +165,8 @@
 
 #include <ctype.h>
 
+#include <openssl/opensslconf.h>
+#include <openssl/e_os2.h>
 #include <openssl/bio.h>
 #include <openssl/crypto.h>
 #include <openssl/evp.h>
@@ -586,7 +592,7 @@ int main(int argc, char *argv[])
                         fips_mode=1;
 #else
                         fprintf(stderr,"not compiled with FIPS support, so exitting without running.\n");
-                        EXIT(0);
+                        exit(0);
 #endif
                         }
                 else if (strcmp(*argv,"-server_auth") == 0)
@@ -785,7 +791,7 @@ bad:
                 {
                 /* ensure that the cipher list are correctly sorted and exit */
                 if (do_test_cipherlist() == 0)
-                        EXIT(1);
+                        exit(1);
                 ret = 0;
                 goto end;
                 }
@@ -796,7 +802,7 @@ bad:
                         "the test anyway (and\n-d to see what happens), "
                         "or add one of -ssl2, -ssl3, -tls1, -reuse\n"
                         "to avoid protocol mismatch.\n");
-                EXIT(1);
+                exit(1);
                 }
 
 #ifdef OPENSSL_FIPS
@@ -806,7 +812,7 @@ bad:
                         {
                         ERR_load_crypto_strings();
                         ERR_print_errors(BIO_new_fp(stderr,BIO_NOCLOSE));
-                        EXIT(1);
+                        exit(1);
                         }
                 else
                         fprintf(stderr,"*** IN FIPS MODE ***\n");
@@ -1150,7 +1156,7 @@ end:
         EVP_cleanup();
         CRYPTO_mem_leaks(bio_err);
         if (bio_err != NULL) BIO_free(bio_err);
-        EXIT(ret);
+        exit(ret);
         return ret;
         }
 
@@ -2144,7 +2150,7 @@ static int process_proxy_cond_multipliers(unsigned int letters[26],
                         default:
                                 fprintf(stderr, "SOMETHING IS SERIOUSLY WRONG!"
                                         " STOPPING\n");
-                                EXIT(1);
+                                exit(1);
                                 }
                         }
                         break;
@@ -2207,7 +2213,7 @@ static int process_proxy_cond_adders(unsigned int letters[26],
                         default:
                                 fprintf(stderr, "SOMETHING IS SERIOUSLY WRONG!"
                                         " STOPPING\n");
-                                EXIT(1);
+                                exit(1);
                                 }
                         }
                         break;
@@ -2306,7 +2312,7 @@ static int app_verify_callback(X509_STORE_CTX *ctx, void *arg)
                                 cb_arg->proxy_cond, &cond_end);
 
                         if (ok < 0)
-                                EXIT(3);
+                                exit(3);
                         if (*cond_end)
                                 {
                                 fprintf(stderr, "Stopped processing condition before it's end.\n");
diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c
index 5123a89182..6d144077f9 100644
--- a/src/lib/libssl/ssl_cert.c
+++ b/src/lib/libssl/ssl_cert.c
@@ -114,13 +114,13 @@
  * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
  */
 
-#include <stdio.h>
+#include <sys/types.h>
 
-#include "e_os.h"
-#ifndef NO_SYS_TYPES_H
-# include <sys/types.h>
-#endif
+#include <stdio.h>
+#include <unistd.h>
 
+#include <openssl/opensslconf.h>
+#include <openssl/e_os2.h>
 #include "o_dir.h"
 #include <openssl/objects.h>
 #include <openssl/bio.h>
@@ -837,7 +837,7 @@ int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
 
         if (errno)
                 {
-                SYSerr(SYS_F_OPENDIR, get_last_sys_error());
+                SYSerr(SYS_F_OPENDIR, errno);
                 ERR_add_error_data(3, "OPENSSL_DIR_read(&ctx, '", dir, "')");
                 SSLerr(SSL_F_SSL_ADD_DIR_CERT_SUBJECTS_TO_STACK, ERR_R_SYS_LIB);
                 goto err;
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index e485907748..e7fecbc3cb 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/lib/libssl/ssl_locl.h
@@ -142,13 +142,17 @@
 
 #ifndef HEADER_SSL_LOCL_H
 #define HEADER_SSL_LOCL_H
+
+#include <sys/types.h>
+
 #include <stdlib.h>
 #include <time.h>
 #include <string.h>
 #include <errno.h>
+#include <unistd.h>
 
-#include "e_os.h"
-
+#include <openssl/opensslconf.h>
+#include <openssl/e_os2.h>
 #include <openssl/buffer.h>
 #ifndef OPENSSL_NO_COMP
 #include <openssl/comp.h>