diff -r c04dad02ffa3 tools/libxl/Makefile
--- a/tools/libxl/Makefile	Wed Jul 28 11:37:51 2010 +0200
+++ b/tools/libxl/Makefile	Wed Jul 28 11:46:52 2010 +0200
@@ -15,7 +15,7 @@ CFLAGS += -Werror -Wno-format-zero-lengt
 CFLAGS += -I. -fPIC
 CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) $(CFLAGS_libblktapctl)
 
-LIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore) $(LDFLAGS_libblktapctl) -lutil
+LIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore) $(LDFLAGS_libblktapctl) $(UTIL_LIBS)
 
 LIBXL_OBJS-y = osdeps.o libxl_paths.o libxl_bootloader.o
 LIBXL_OBJS = flexarray.o libxl.o libxl_pci.o libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o libxl_internal.o xenguest.o libxl_utils.o $(LIBXL_OBJS-y)
diff -r c04dad02ffa3 tools/libxl/libxl_bootloader.c
--- a/tools/libxl/libxl_bootloader.c	Wed Jul 28 11:37:51 2010 +0200
+++ b/tools/libxl/libxl_bootloader.c	Wed Jul 28 11:46:52 2010 +0200
@@ -15,9 +15,9 @@
 #include "libxl_osdeps.h"
 
 #include <string.h>
-#include <pty.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <termios.h>
 
 #include <sys/stat.h>
 #include <sys/types.h>
diff -r c04dad02ffa3 tools/libxl/libxl_osdeps.h
--- a/tools/libxl/libxl_osdeps.h	Wed Jul 28 11:37:51 2010 +0200
+++ b/tools/libxl/libxl_osdeps.h	Wed Jul 28 11:46:52 2010 +0200
@@ -23,6 +23,14 @@
 
 #define _GNU_SOURCE
 
+#if defined(__NetBSD__) || defined(__OpenBSD__)
+#include <util.h>
+#elif defined(__linux__)
+#include <pty.h>
+#elif defined(__sun__)
+#include <stropts.h>
+#endif
+
 #ifdef NEED_OWN_ASPRINTF
 #include <stdarg.h>