diff --git a/src/compat.h b/src/compat.h
index 50691f49..239e04ef 100644
--- a/src/compat.h
+++ b/src/compat.h
@@ -20,12 +20,20 @@
  * Solaris.
  */
 
-#ifdef _WIN32
-#include <windows.h>
-#else
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
+#ifdef TIME_WITH_SYS_TIME
+#  include <sys/time.h>
+#  include <time.h>
+#else
+#  ifdef HAVE_SYS_TIME_H
+#    include <sys/time.h>
+#  else
+#    include <time.h>
+#  endif
+#endif
 
 /* Make sure we define 64 bit types */
 #ifdef _WIN32
diff --git a/src/connection.c b/src/connection.c
index d2c943e7..ff0b3173 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -19,7 +19,6 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
-#include <time.h>
 #ifdef HAVE_POLL
 #include <sys/poll.h>
 #endif
@@ -27,7 +26,6 @@
 #include <sys/stat.h>
 
 #ifndef _WIN32
-#include <sys/time.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #else
diff --git a/src/main.c b/src/main.c
index fbdf9cbe..cc78408c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -56,6 +56,7 @@
 #ifdef _WIN32
 /* For getpid() */
 #include <process.h>
+#include <windows.h>
 #define snprintf _snprintf
 #define getpid _getpid
 #endif
diff --git a/src/slave.c b/src/slave.c
index 93adf14b..cb792ac3 100644
--- a/src/slave.c
+++ b/src/slave.c
@@ -25,11 +25,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 #include <sys/types.h>
 
 #ifndef _WIN32
-#include <sys/time.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #else