Index: nbd.c
===================================================================
--- nbd.c	(revision 4745)
+++ nbd.c	(working copy)
@@ -388,8 +388,8 @@
 	}
 
 	if (len > sizeof(data)) {
-		LOG("len (%u) is larger than max len (%u)",
-		    len, sizeof(data));
+		LOG("len (%u) is larger than max len (%lu)",
+		    len, (unsigned long)sizeof(data));
 		errno = EINVAL;
 		return -1;
 	}
Index: qemu-nbd.c
===================================================================
--- qemu-nbd.c	(revision 4745)
+++ qemu-nbd.c	(working copy)
@@ -21,7 +21,6 @@
 #include "block_int.h"
 #include "nbd.h"
 
-#include <malloc.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <getopt.h>