diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
index 9fc74c5973..529dbd6de2 100644
--- a/tools/libxl/libxl.h
+++ b/tools/libxl/libxl.h
@@ -20,6 +20,7 @@
 #include <netinet/in.h>
 #include <xenctrl.h>
 #include <xs.h>
+#include <sys/wait.h> /* for pid_t */
 
 typedef void (*libxl_log_callback)(void *userdata, int loglevel, const char *file,
                                    int line, const char *func, char *s);
diff --git a/tools/libxl/xl.c b/tools/libxl/xl.c
index 996965bc22..3be7acf0a4 100644
--- a/tools/libxl/xl.c
+++ b/tools/libxl/xl.c
@@ -53,7 +53,7 @@ static int domain_qualifier_to_domid(struct libxl_ctx *ctx, char *p, uint32_t *d
 
     alldigit = 1;
     for (i = 0; p[i]; i++) {
-        if (!isdigit(p[i])) {
+        if (!isdigit((uint8_t)p[i])) {
             alldigit = 0;
             break;
         }
diff --git a/tools/xenpaging/file_ops.c b/tools/xenpaging/file_ops.c
index 0b90459de1..2d52827669 100644
--- a/tools/xenpaging/file_ops.c
+++ b/tools/xenpaging/file_ops.c
@@ -36,7 +36,7 @@ static int file_op(int fd, void *page, int i,
     int bytes;
     int ret;
 
-    seek_ret = lseek64(fd, i << PAGE_SHIFT, SEEK_SET);
+    seek_ret = lseek(fd, i << PAGE_SHIFT, SEEK_SET);
 
     total = 0;
     while ( total < PAGE_SIZE )