--- xen-4.0.1/tools/blktap2/drivers/bswap.h
+++ xen-4.0.1.mod/tools/blktap2/drivers/bswap.h
@@ -15,6 +15,8 @@
 #define bswap_64(x) swap64(x)
 #else
 
+#define HAVE_BYTESWAP_H
+
 #ifdef HAVE_BYTESWAP_H
 #include <byteswap.h>
 #else
--- xen-4.0.1/tools/blktap2/vhd/lib/Makefile
+++ xen-4.0.1.mod/tools/blktap2/vhd/lib/Makefile
@@ -23,6 +23,8 @@
 LIBS            := -luuid
 endif
 
+LIBS		+= -liconv
+
 # Get gcc to generate the dependencies for us.
 CFLAGS          += -Wp,-MD,.$(@F).d
 DEPS             = .*.d