2 files changed, 4 insertions, 2 deletions
diff --git a/driver.c b/driver.c
index f9e53e91..a63ddb0f 100644
--- a/driver.c
+++ b/driver.c
@@ -13,7 +13,10 @@
 
 #include  <config.h>
 #include  <stdio.h>
+#if defined(STDC_HEADERS)
 #include  <stdlib.h>
+#include  <string.h>
+#endif
 #if defined(HAVE_STDARG_H)
 #include  <stdarg.h>
 #else
@@ -21,7 +24,6 @@
 #endif
 #include  <sys/time.h>
 #include  <signal.h>
-#include  <string.h>
 
 #ifdef KERBEROS_V4
 #include <krb.h>
diff --git a/socket.c b/socket.c
index 1a6c6047..9347e367 100644
--- a/socket.c
+++ b/socket.c
@@ -22,6 +22,7 @@
 #include <sys/ioctl.h>
 #if defined(STDC_HEADERS)
 #include <string.h>
+#include <stdlib.h>
 #endif
 #if defined(HAVE_UNISTD_H)
 #include <unistd.h>
@@ -31,7 +32,6 @@
 #else
 #include <varargs.h>
 #endif
-#include <stdlib.h>
 #include <errno.h>
 #include "socket.h"