@@ -19,19 +19,11 @@
 #include <errno.h>
 
 #ifdef HAVE_DIRENT_H
 # include <dirent.h>
 #endif
-#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
+#include "unistd_wrapper.h"
 
 #ifdef HAVE_PWD_H
 # include <pwd.h>
 #endif
 #ifdef HAVE_GRP_H