diff -urN xdispatch_0.7.0_src.orig/Build/Modules/FindBlocksRuntime.cmake xdispatch_0.7.0_src/Build/Modules/FindBlocksRuntime.cmake
--- xdispatch_0.7.0_src.orig/Build/Modules/FindBlocksRuntime.cmake	2012-05-05 21:58:41.000000000 +1000
+++ xdispatch_0.7.0_src/Build/Modules/FindBlocksRuntime.cmake	2012-08-22 05:08:46.116826639 +1000
@@ -1,3 +1,5 @@
+INCLUDE (FindPackageHandleStandardArgs)
+
 FIND_PATH(
 	BLOCKSRUNTIME_INCLUDE_DIRS
 	NAMES
diff -urN xdispatch_0.7.0_src.orig/config xdispatch_0.7.0_src/config
--- xdispatch_0.7.0_src.orig/config	1970-01-01 10:00:00.000000000 +1000
+++ xdispatch_0.7.0_src/config	2012-08-22 05:31:34.723794602 +1000
@@ -0,0 +1,7 @@
+#ifdef __block
+#	undef __block
+#	include_next "unistd.h"
+#	define __block __attribute__((__blocks__(byref)))
+#else
+#	include_next "unistd.h"
+#endif
diff -urN xdispatch_0.7.0_src.orig/core/platform/darwin/platform.h xdispatch_0.7.0_src/core/platform/darwin/platform.h
--- xdispatch_0.7.0_src.orig/core/platform/darwin/platform.h	2012-05-06 06:03:46.000000000 +1000
+++ xdispatch_0.7.0_src/core/platform/darwin/platform.h	2012-08-23 14:06:59.061621892 +1000
@@ -22,7 +22,7 @@
 #define DARWIN_PLATFORM_H_
 
 #include <sys/time.h>
-#include <unistd.h>
+#include "unistd-wrapper.h"
 #include <pthread.h>
 #include <stdbool.h>
 #include <stdint.h>
diff -urN xdispatch_0.7.0_src.orig/core/platform/posix/platform.h xdispatch_0.7.0_src/core/platform/posix/platform.h
--- xdispatch_0.7.0_src.orig/core/platform/posix/platform.h	2011-05-31 05:21:56.000000000 +1000
+++ xdispatch_0.7.0_src/core/platform/posix/platform.h	2012-08-23 14:08:03.658355338 +1000
@@ -21,7 +21,7 @@
 #ifndef POSIX_PLATFORM_H_
 #define POSIX_PLATFORM_H_
 
-#include <unistd.h>
+#include "../unistd-wrapper.h"
 #include <stdbool.h>
 #include <stdint.h>
 #include <errno.h>
diff -urN xdispatch_0.7.0_src.orig/core/platform/unistd-wrapper.h xdispatch_0.7.0_src/core/platform/unistd-wrapper.h
--- xdispatch_0.7.0_src.orig/core/platform/unistd-wrapper.h	1970-01-01 10:00:00.000000000 +1000
+++ xdispatch_0.7.0_src/core/platform/unistd-wrapper.h	2012-08-23 14:02:59.271726679 +1000
@@ -0,0 +1,7 @@
+#ifdef __block
+#       undef __block
+#       include <unistd.h>
+#       define __block __attribute__((__blocks__(byref)))
+#else
+#       include <unistd.h>
+#endif
diff -urN xdispatch_0.7.0_src.orig/core/src/private.h xdispatch_0.7.0_src/core/src/private.h
--- xdispatch_0.7.0_src.orig/core/src/private.h	2012-03-24 06:05:56.000000000 +1100
+++ xdispatch_0.7.0_src/core/src/private.h	2012-08-23 14:07:22.441826194 +1000
@@ -37,7 +37,7 @@
 #include <mach/message.h>
 #endif
 #if HAVE_UNISTD_H
-#include <unistd.h>
+#include "../platform/unistd-wrapper.h"
 #endif
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
diff -urN xdispatch_0.7.0_src.orig/cxx/source.cpp xdispatch_0.7.0_src/cxx/source.cpp
--- xdispatch_0.7.0_src.orig/cxx/source.cpp	2012-05-06 06:03:46.000000000 +1000
+++ xdispatch_0.7.0_src/cxx/source.cpp	2012-08-23 15:42:14.321361195 +1000
@@ -17,7 +17,6 @@
 *
 * @MLBA_OPEN_LICENSE_HEADER_END@
 */
-
 #include <map>
 #include <exception>
 #include <stdexcept>
diff -urN xdispatch_0.7.0_src.orig/libkqueue/kern/test.c xdispatch_0.7.0_src/libkqueue/kern/test.c
--- xdispatch_0.7.0_src.orig/libkqueue/kern/test.c	2011-05-05 22:39:49.000000000 +1000
+++ xdispatch_0.7.0_src/libkqueue/kern/test.c	2012-08-23 14:01:30.582017934 +1000
@@ -20,7 +20,7 @@
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
+#include "unistd-wrapper.h"
 
 #include "../include/sys/event.h"
 
diff -urN xdispatch_0.7.0_src.orig/libkqueue/src/common/alloc.h xdispatch_0.7.0_src/libkqueue/src/common/alloc.h
--- xdispatch_0.7.0_src.orig/libkqueue/src/common/alloc.h	2011-05-05 22:39:49.000000000 +1000
+++ xdispatch_0.7.0_src/libkqueue/src/common/alloc.h	2012-08-23 13:56:26.531785560 +1000
@@ -36,7 +36,7 @@
 #include <stdlib.h>
 
 #ifndef _WIN32
-# include <unistd.h>
+# include "unistd-wrapper.h"
 #endif
 
 static __thread struct {
diff -urN xdispatch_0.7.0_src.orig/libkqueue/src/common/debug.h xdispatch_0.7.0_src/libkqueue/src/common/debug.h
--- xdispatch_0.7.0_src.orig/libkqueue/src/common/debug.h	2011-06-02 06:58:29.000000000 +1000
+++ xdispatch_0.7.0_src/libkqueue/src/common/debug.h	2012-08-23 13:56:16.741997164 +1000
@@ -22,7 +22,7 @@
 #ifdef _WIN32
 # include <Windows.h>
 #else
-# include <unistd.h>
+# include "unistd-wrapper.h"
 #endif
 
 extern int DEBUG_KQUEUE;
diff -urN xdispatch_0.7.0_src.orig/libkqueue/src/common/unistd-wrapper.h xdispatch_0.7.0_src/libkqueue/src/common/unistd-wrapper.h
--- xdispatch_0.7.0_src.orig/libkqueue/src/common/unistd-wrapper.h	1970-01-01 10:00:00.000000000 +1000
+++ xdispatch_0.7.0_src/libkqueue/src/common/unistd-wrapper.h	2012-08-23 13:56:58.115115833 +1000
@@ -0,0 +1,7 @@
+#ifdef __block
+#       undef __block
+#       include <unistd.h>
+#       define __block __attribute__((__blocks__(byref)))
+#else
+#       include <unistd.h>
+#endif
diff -urN xdispatch_0.7.0_src.orig/libkqueue/src/linux/platform.h xdispatch_0.7.0_src/libkqueue/src/linux/platform.h
--- xdispatch_0.7.0_src.orig/libkqueue/src/linux/platform.h	2011-05-05 22:39:49.000000000 +1000
+++ xdispatch_0.7.0_src/libkqueue/src/linux/platform.h	2012-08-23 13:55:55.311999253 +1000
@@ -32,7 +32,7 @@
 # define _GNU_SOURCE
 # include <linux/unistd.h>
 # include <sys/syscall.h>
-# include <unistd.h>
+# include "unistd-wrapper.h"
 extern long int syscall (long int __sysno, ...);
  
 /* Convenience macros to access the epoll descriptor for the kqueue */
diff -urN xdispatch_0.7.0_src.orig/libkqueue/src/linux/proc.c xdispatch_0.7.0_src/libkqueue/src/linux/proc.c
--- xdispatch_0.7.0_src.orig/libkqueue/src/linux/proc.c	2011-05-05 22:39:49.000000000 +1000
+++ xdispatch_0.7.0_src/libkqueue/src/linux/proc.c	2012-08-23 13:55:37.585024605 +1000
@@ -25,7 +25,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <string.h>
-#include <unistd.h>
+#include "unistd-wrapper.h"
 
 #include <limits.h>
 #include <sys/inotify.h>
diff -urN xdispatch_0.7.0_src.orig/libkqueue/src/linux/read.c xdispatch_0.7.0_src/libkqueue/src/linux/read.c
--- xdispatch_0.7.0_src.orig/libkqueue/src/linux/read.c	2011-06-02 06:58:29.000000000 +1000
+++ xdispatch_0.7.0_src/libkqueue/src/linux/read.c	2012-08-23 13:55:28.018431678 +1000
@@ -26,7 +26,7 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <string.h>
-#include <unistd.h>
+#include "unistd-wrapper.h"
 
 #include "private.h"
 
diff -urN xdispatch_0.7.0_src.orig/libkqueue/src/linux/user.c xdispatch_0.7.0_src/libkqueue/src/linux/user.c
--- xdispatch_0.7.0_src.orig/libkqueue/src/linux/user.c	2011-06-02 06:58:29.000000000 +1000
+++ xdispatch_0.7.0_src/libkqueue/src/linux/user.c	2012-08-23 13:55:46.755110893 +1000
@@ -24,7 +24,7 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <string.h>
-#include <unistd.h>
+#include "unistd-wrapper.h"
 
 #include "sys/event.h"
 #include "private.h"
diff -urN xdispatch_0.7.0_src.orig/libkqueue/src/linux/write.c xdispatch_0.7.0_src/libkqueue/src/linux/write.c
--- xdispatch_0.7.0_src.orig/libkqueue/src/linux/write.c	2011-06-02 06:58:29.000000000 +1000
+++ xdispatch_0.7.0_src/libkqueue/src/linux/write.c	2012-08-23 13:56:04.485331920 +1000
@@ -26,7 +26,7 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <string.h>
-#include <unistd.h>
+#include "unistd-wrapper.h"
 
 #include "private.h"
 
diff -urN xdispatch_0.7.0_src.orig/libkqueue/src/posix/platform.h xdispatch_0.7.0_src/libkqueue/src/posix/platform.h
--- xdispatch_0.7.0_src.orig/libkqueue/src/posix/platform.h	2011-06-02 06:58:29.000000000 +1000
+++ xdispatch_0.7.0_src/libkqueue/src/posix/platform.h	2012-08-23 13:57:26.341990114 +1000
@@ -63,7 +63,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/mman.h>
-#include <unistd.h>
+#include "unistd-wrapper.h"
 
 /*
  * Additional members of 'struct eventfd'
diff -urN xdispatch_0.7.0_src.orig/libkqueue/src/posix/proc.c xdispatch_0.7.0_src/libkqueue/src/posix/proc.c
--- xdispatch_0.7.0_src.orig/libkqueue/src/posix/proc.c	2011-05-05 22:39:49.000000000 +1000
+++ xdispatch_0.7.0_src/libkqueue/src/posix/proc.c	2012-08-23 14:00:48.951728743 +1000
@@ -25,7 +25,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <string.h>
-#include <unistd.h>
+#include "unistd-wrapper.h"
 
 #include <limits.h>
 
diff -urN xdispatch_0.7.0_src.orig/libkqueue/src/posix/signal.c xdispatch_0.7.0_src/libkqueue/src/posix/signal.c
--- xdispatch_0.7.0_src.orig/libkqueue/src/posix/signal.c	2011-05-05 22:39:49.000000000 +1000
+++ xdispatch_0.7.0_src/libkqueue/src/posix/signal.c	2012-08-23 14:00:36.964995642 +1000
@@ -24,7 +24,7 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <string.h>
-#include <unistd.h>
+#include "unistd-wrapper.h"
 
 #include "sys/event.h"
 #include "private.h"
diff -urN xdispatch_0.7.0_src.orig/libkqueue/src/posix/timer.c xdispatch_0.7.0_src/libkqueue/src/posix/timer.c
--- xdispatch_0.7.0_src.orig/libkqueue/src/posix/timer.c	2011-05-05 22:39:49.000000000 +1000
+++ xdispatch_0.7.0_src/libkqueue/src/posix/timer.c	2012-08-23 14:01:03.191751125 +1000
@@ -25,7 +25,7 @@
 #include <sys/types.h>
 #include <string.h>
 #include <time.h>
-#include <unistd.h>
+#include "unistd-wrapper.h"
 
 #include "sys/event.h"
 #include "private.h"
diff -urN xdispatch_0.7.0_src.orig/libkqueue/src/posix/user.c xdispatch_0.7.0_src/libkqueue/src/posix/user.c
--- xdispatch_0.7.0_src.orig/libkqueue/src/posix/user.c	2011-05-05 22:39:49.000000000 +1000
+++ xdispatch_0.7.0_src/libkqueue/src/posix/user.c	2012-08-23 14:00:42.855080635 +1000
@@ -24,7 +24,7 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <string.h>
-#include <unistd.h>
+#include "unistd-wrapper.h"
 
 #include "sys/event.h"
 #include "private.h"
diff -urN xdispatch_0.7.0_src.orig/libkqueue/src/solaris/socket.c xdispatch_0.7.0_src/libkqueue/src/solaris/socket.c
--- xdispatch_0.7.0_src.orig/libkqueue/src/solaris/socket.c	2011-06-02 06:58:29.000000000 +1000
+++ xdispatch_0.7.0_src/libkqueue/src/solaris/socket.c	2012-08-23 14:00:21.798411787 +1000
@@ -23,7 +23,7 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <string.h>
-#include <unistd.h>
+#include "unistd-wrapper.h"
 #include <sys/filio.h>
 
 #include <port.h>
diff -urN xdispatch_0.7.0_src.orig/libkqueue/src/solaris/timer.c xdispatch_0.7.0_src/libkqueue/src/solaris/timer.c
--- xdispatch_0.7.0_src.orig/libkqueue/src/solaris/timer.c	2011-06-02 06:58:29.000000000 +1000
+++ xdispatch_0.7.0_src/libkqueue/src/solaris/timer.c	2012-08-23 14:00:30.261724287 +1000
@@ -25,7 +25,7 @@
 #include <sys/types.h>
 #include <string.h>
 #include <time.h>
-#include <unistd.h>
+#include "unistd-wrapper.h"
 
 #include "sys/event.h"
 #include "private.h"
diff -urN xdispatch_0.7.0_src.orig/libkqueue/test/common.h xdispatch_0.7.0_src/libkqueue/test/common.h
--- xdispatch_0.7.0_src.orig/libkqueue/test/common.h	2012-03-01 07:42:52.000000000 +1100
+++ xdispatch_0.7.0_src/libkqueue/test/common.h	2012-08-23 14:01:19.751656044 +1000
@@ -43,7 +43,7 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <unistd.h>
+#include "unistd-wrapper.h"
 #include <sys/event.h>
 #include <arpa/inet.h>
 #include <pthread.h>
diff -urN xdispatch_0.7.0_src.orig/libkqueue/test/libdispatch/main.c xdispatch_0.7.0_src/libkqueue/test/libdispatch/main.c
--- xdispatch_0.7.0_src.orig/libkqueue/test/libdispatch/main.c	2011-05-05 22:39:49.000000000 +1000
+++ xdispatch_0.7.0_src/libkqueue/test/libdispatch/main.c	2012-08-23 14:00:13.078390264 +1000
@@ -16,7 +16,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
+#include "unistd-wrapper.h"
 
 #include <pthread.h> 
 #include <sys/event.h> 
diff -urN xdispatch_0.7.0_src.orig/libkqueue/test/stress/main.c xdispatch_0.7.0_src/libkqueue/test/stress/main.c
--- xdispatch_0.7.0_src.orig/libkqueue/test/stress/main.c	2011-05-05 22:39:49.000000000 +1000
+++ xdispatch_0.7.0_src/libkqueue/test/stress/main.c	2012-08-23 14:00:03.561661869 +1000
@@ -18,7 +18,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
+#include "unistd-wrapper.h"
 #include <err.h>
 
 #include <pthread.h> 
diff -urN xdispatch_0.7.0_src.orig/libpthread_workqueue/src/debug.h xdispatch_0.7.0_src/libpthread_workqueue/src/debug.h
--- xdispatch_0.7.0_src.orig/libpthread_workqueue/src/debug.h	2011-05-05 23:00:20.000000000 +1000
+++ xdispatch_0.7.0_src/libpthread_workqueue/src/debug.h	2012-08-23 13:58:40.531983456 +1000
@@ -26,7 +26,7 @@
 
 #include <linux/unistd.h>
 #include <sys/syscall.h>
-#include <unistd.h>
+#include "unistd-wrapper.h"
 
 # define THREAD_ID ((pid_t)  syscall(__NR_gettid))
 #elif defined(__sun)
diff -urN xdispatch_0.7.0_src.orig/libpthread_workqueue/src/posix/platform.h xdispatch_0.7.0_src/libpthread_workqueue/src/posix/platform.h
--- xdispatch_0.7.0_src.orig/libpthread_workqueue/src/posix/platform.h	2011-07-22 18:08:08.000000000 +1000
+++ xdispatch_0.7.0_src/libpthread_workqueue/src/posix/platform.h	2012-08-23 13:58:53.988648150 +1000
@@ -9,7 +9,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <strings.h>
-#include <unistd.h>
+#include "unistd-wrapper.h"
 #include <pthread.h>
 
 #ifdef __sun
diff -urN xdispatch_0.7.0_src.orig/libpthread_workqueue/src/unistd-wrapper.h xdispatch_0.7.0_src/libpthread_workqueue/src/unistd-wrapper.h
--- xdispatch_0.7.0_src.orig/libpthread_workqueue/src/unistd-wrapper.h	1970-01-01 10:00:00.000000000 +1000
+++ xdispatch_0.7.0_src/libpthread_workqueue/src/unistd-wrapper.h	2012-08-23 13:56:58.000000000 +1000
@@ -0,0 +1,7 @@
+#ifdef __block
+#       undef __block
+#       include <unistd.h>
+#       define __block __attribute__((__blocks__(byref)))
+#else
+#       include <unistd.h>
+#endif
diff -urN xdispatch_0.7.0_src.orig/libpthread_workqueue/testing/idle/main.c xdispatch_0.7.0_src/libpthread_workqueue/testing/idle/main.c
--- xdispatch_0.7.0_src.orig/libpthread_workqueue/testing/idle/main.c	2011-07-22 18:08:08.000000000 +1000
+++ xdispatch_0.7.0_src/libpthread_workqueue/testing/idle/main.c	2012-08-23 13:59:47.205095463 +1000
@@ -28,7 +28,7 @@
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
+#include "unistd-wrapper.h"
 
 #include <pthread_workqueue.h>
 
diff -urN xdispatch_0.7.0_src.orig/libpthread_workqueue/testing/latency/latency.c xdispatch_0.7.0_src/libpthread_workqueue/testing/latency/latency.c
--- xdispatch_0.7.0_src.orig/libpthread_workqueue/testing/latency/latency.c	2011-07-22 18:08:08.000000000 +1000
+++ xdispatch_0.7.0_src/libpthread_workqueue/testing/latency/latency.c	2012-08-23 13:59:20.068645467 +1000
@@ -26,7 +26,7 @@
 #include <time.h>
 
 #ifndef _WIN32
-# include <unistd.h>
+# include "unistd-wrapper.h"
 # include <pthread.h>
 # include <sys/time.h>
 #endif
diff -urN xdispatch_0.7.0_src.orig/libpthread_workqueue/testing/libdispatch/dispatch_api.c xdispatch_0.7.0_src/libpthread_workqueue/testing/libdispatch/dispatch_api.c
--- xdispatch_0.7.0_src.orig/libpthread_workqueue/testing/libdispatch/dispatch_api.c	2011-05-05 22:39:49.000000000 +1000
+++ xdispatch_0.7.0_src/libpthread_workqueue/testing/libdispatch/dispatch_api.c	2012-08-23 13:59:06.005097228 +1000
@@ -21,7 +21,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
+#include "unistd-wrapper.h"
 
 #include <dispatch/dispatch.h>
 
diff -urN xdispatch_0.7.0_src.orig/libpthread_workqueue/testing/witem_cache/test.c xdispatch_0.7.0_src/libpthread_workqueue/testing/witem_cache/test.c
--- xdispatch_0.7.0_src.orig/libpthread_workqueue/testing/witem_cache/test.c	2011-05-05 22:39:49.000000000 +1000
+++ xdispatch_0.7.0_src/libpthread_workqueue/testing/witem_cache/test.c	2012-08-23 13:59:36.678434258 +1000
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
+#include "unistd-wrapper.h"
 
 #include <time.h>