diff --git a/src/channel.c b/src/channel.c
index 353912e0..27010b05 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -36,12 +36,13 @@
  */
 
 #include "libssh2_priv.h"
-#ifndef WIN32
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#include <fcntl.h>
 #endif
-
+#include <fcntl.h>
+#ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
+#endif
 
 
 /*
diff --git a/src/misc.c b/src/misc.c
index bd69a452..43a98dc8 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -36,7 +36,9 @@
  */
 
 #include "libssh2_priv.h"
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 
 /* {{{ libssh2_ntohu32
  */
diff --git a/src/packet.c b/src/packet.c
index c7fc1247..8cdf856d 100644
--- a/src/packet.c
+++ b/src/packet.c
@@ -38,18 +38,25 @@
 #include "libssh2_priv.h"
 #include <errno.h>
 #include <fcntl.h>
-#ifndef WIN32
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+
 /* Needed for struct iovec on some platforms */
 #ifdef HAVE_SYS_UIO_H
 #include <sys/uio.h>
 #endif
 
-#include <sys/time.h>
 #include <sys/types.h>
-#include <inttypes.h>
 
 /* {{{ libssh2_packet_queue_listener
  * Queue a connection request for a listener