@@ -17,24 +17,23 @@
 #include "config.h"
 
 #include <errno.h>
 #include <string.h>
 
-/* Work around __block being used by glibc */
-#ifdef __GLIBC__
-# undef __USE_XOPEN
-#endif
-
-#include "platform.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
 
-#ifndef OF_WINDOWS
+#ifdef HAVE_SYS_WAIT_H
 # include <sys/wait.h>
 #endif
 
 #ifdef HAVE_SPAWN_H
 # include <spawn.h>