Index: src/error.c
===================================================================
--- src/error.c	(revision 2517)
+++ src/error.c	(revision 2518)
@@ -36,9 +36,6 @@
 #include <signal.h>
 #include <string.h>
 #include <stdarg.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #include <fcntl.h>
 
 #include "global.h"
@@ -46,6 +43,7 @@
 #include "data.h"
 #include "error.h"
 #include "plug_io.h"
+#include "compat_misc.h"
 
 #define utf8_dup_string(a,b) *(a) = strdup(b)
 
Index: src/select.c
===================================================================
--- src/select.c	(revision 2517)
+++ src/select.c	(revision 2518)
@@ -44,11 +44,7 @@
 #include <sys/types.h>
 #ifdef HAVE_REGEX_H
 #include <regex.h>
-#else
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
 #endif
-#endif
 
 /* ---------------------------------------------------------------------------
  * toggles the selection of any kind of object