@@ -19,24 +19,15 @@
 #include <errno.h>
 #include <string.h>
 
 #include <signal.h>
 
-#ifdef HAVE_UNISTD_H
-# ifdef __GLIBC__
-#  undef __USE_XOPEN	/* Needed to avoid old glibc using __block */
-# endif
-# include <unistd.h>
-# ifdef __GLIBC__
-#  define __USE_XOPEN 1
-# endif
-#endif
-
 #ifdef HAVE_SYS_WAIT_H
 # include <sys/wait.h>
 #endif
 
+#include "unistd_wrapper.h"
 #ifdef HAVE_SPAWN_H
 # include <spawn.h>
 #endif
 
 #import "OFProcess.h"