--- xen-4.0.0/tools/blktap/drivers/blktapctrl.c.orig	2010-02-02 20:43:00.000000000 +0000
+++ xen-4.0.0/tools/blktap/drivers/blktapctrl.c	2010-03-15 12:12:26.288469365 +0000
@@ -51,6 +51,7 @@
 #include <sys/time.h>
 #include <syslog.h>
 #include <memshr.h>
+#include <sys/stat.h>
                                                                      
 #include "blktaplib.h"
 #include "blktapctrl.h"
--- xen-4.0.0/tools/blktap/drivers/Makefile.orig	2010-02-02 20:43:00.000000000 +0000
+++ xen-4.0.0/tools/blktap/drivers/Makefile	2010-03-15 12:26:15.806465401 +0000
@@ -29,7 +29,7 @@
 MEMSHRLIBS += $(MEMSHR_DIR)/libmemshr.a
 endif
 
-LDFLAGS_blktapctrl := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) $(MEMSHRLIBS) -L../lib -lblktap -lrt -lm
+LDFLAGS_blktapctrl := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) $(MEMSHRLIBS) -L../lib -lblktap -lrt -lm -lpthread
 LDFLAGS_img := $(LIBAIO_DIR)/libaio.a $(CRYPT_LIB) -lpthread -lz
 
 BLK-OBJS-y  := block-aio.o
--- xen-4.0.0/tools/blktap/drivers/block-qcow2.c.orig	2010-02-02 20:43:00.000000000 +0000
+++ xen-4.0.0/tools/blktap/drivers/block-qcow2.c	2010-03-15 12:36:38.251469402 +0000
@@ -30,6 +30,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/stat.h>
 
 #include "tapdisk.h"
 #include "tapaio.h"
--- xen-4.0.0/tools/blktap2/vhd/lib/libvhd.c.orig	2010-02-02 20:43:00.000000000 +0000
+++ xen-4.0.0/tools/blktap2/vhd/lib/libvhd.c	2010-03-15 12:47:48.890468945 +0000
@@ -36,6 +36,7 @@
 #include <libgen.h>
 #include <iconv.h>
 #include <sys/mman.h>
+#include <sys/stat.h>
 
 #include "libvhd.h"
 #include "relative-path.h"
--- xen-4.0.0/tools/blktap2/vhd/lib/vhd-util-scan.c.orig	2010-02-02 20:43:00.000000000 +0000
+++ xen-4.0.0/tools/blktap2/vhd/lib/vhd-util-scan.c	2010-03-15 12:58:03.549470966 +0000
@@ -34,6 +34,7 @@
 #include <unistd.h>
 #include <fnmatch.h>
 #include <libgen.h>	/* for basename() */
+#include <sys/stat.h>
 
 #include "list.h"
 #include "libvhd.h"
--- xen-4.0.0/tools/blktap2/drivers/block-remus.c.orig	2010-02-16 19:44:27.000000000 +0000
+++ xen-4.0.0/tools/blktap2/drivers/block-remus.c	2010-03-15 13:08:12.418467077 +0000
@@ -57,6 +57,7 @@
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <unistd.h>
+#include <sys/stat.h>
 
 /* timeout for reads and writes in ms */
 #define HEARTBEAT_MS 1000
--- xen-4.0.0/tools/fs-back/Makefile.orig	2010-02-02 20:43:01.000000000 +0000
+++ xen-4.0.0/tools/fs-back/Makefile	2010-03-15 13:19:41.504472549 +0000
@@ -16,7 +16,7 @@
 LIBS      := -L. -L.. -L../lib
 LIBS      += $(LDFLAGS_libxenctrl)
 LIBS      += $(LDFLAGS_libxenstore)
-LIBS      += -lrt 
+LIBS      += -lrt -lpthread
 
 OBJS	  := fs-xenbus.o fs-ops.o