diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index ab76f21dd7..a64adf95c3 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -25,10 +25,10 @@
 
 #include <config.h>
 
+#include <unistd.h>
 #include <arpa/inet.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
 #include <dirent.h>
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 23fd0e3264..be51366d4b 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -23,10 +23,6 @@
 
 #include <config.h>
 
-/* Windows socket compatibility functions. */
-#include <errno.h>
-#include <sys/socket.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -37,7 +33,11 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#ifndef HAVE_WINSOCK2_H		/* Unix & Cygwin. */
+/* Windows socket compatibility functions. */
+#include <errno.h>
+#include <sys/socket.h>
+
+#ifndef HAVE_WINSOCK2_H /* Unix & Cygwin. */
 # include <sys/un.h>
 # include <net/if.h>
 # include <netinet/in.h>
diff --git a/src/util/util.h b/src/util/util.h
index 49b27f2cdd..d556daa414 100644
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -27,6 +27,7 @@
 
 #include "verify.h"
 #include "internal.h"
+#include <unistd.h>
 #include <sys/select.h>
 #include <sys/types.h>