--- tools/blktap2/control/tap-ctl-allocate.c	2016-04-25 22:33:15.444681888 -0700
+++ tools/blktap2/control/tap-ctl-allocate.c	2016-04-25 22:30:33.288046037 -0700
@@ -36,6 +36,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
+#include <sys/sysmacros.h>
 #include <linux/major.h>
 
 #include "tap-ctl.h"
--- tools/libxl/libxl_osdeps.h	2016-04-25 22:55:04.326527630 -0700
+++ tools/libxl/libxl_osdeps.h	2016-04-25 22:53:36.315440845 -0700
@@ -35,6 +35,7 @@
 #define SYSFS_PCIBACK_DRIVER   "/sys/bus/pci/drivers/pciback"
 #define NETBACK_NIC_NAME       "vif%u.%d"
 #include <pty.h>
+#include <sys/sysmacros.h>
 #elif defined(__sun__)
 #include <stropts.h>
 #elif defined(__FreeBSD__)
--- tools/qemu-xen/include/qemu-common.h	2016-04-25 23:40:56.277045893 -0700
+++ tools/qemu-xen/include/qemu-common.h	2016-04-25 23:40:36.762361461 -0700
@@ -38,6 +38,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/time.h>
+#include <sys/sysmacros.h>
 #include <assert.h>
 #include <signal.h>
 #include "glib-compat.h"