diff --git a/source/cl_slist.c b/source/cl_slist.c
index c0c90d6..0a12a34 100644
--- a/source/cl_slist.c
+++ b/source/cl_slist.c
@@ -34,8 +34,12 @@
 #endif
 
 #include <string.h>
-#ifndef WIN32
+
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
diff --git a/source/menu.c b/source/menu.c
index 2704bdb..59d97a3 100644
--- a/source/menu.c
+++ b/source/menu.c
@@ -30,8 +30,11 @@
 # include "config.h"
 #endif
 
-#ifndef _WIN32
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
@@ -56,7 +59,7 @@
 #include "cl_input.h"
 #include "net.h"
 
-#ifndef _WIN32
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif