diff --git a/stand/kshim/bsd_kernel.h b/stand/kshim/bsd_kernel.h
--- a/stand/kshim/bsd_kernel.h
+++ b/stand/kshim/bsd_kernel.h
@@ -667,7 +667,7 @@
 #endif
 
 /* Should be defined in user application since it is machine-dependent */
-extern int delay(unsigned int);
+extern void delay(int);
 
 /* BUS dma */
 #define	BUS_SPACE_MAXADDR_24BIT	0xFFFFFF
diff --git a/stand/usb/storage/umass_loader.c b/stand/usb/storage/umass_loader.c
--- a/stand/usb/storage/umass_loader.c
+++ b/stand/usb/storage/umass_loader.c
@@ -30,6 +30,7 @@
  */
 
 #include <sys/param.h>
+#include <sys/disk.h>
 
 #include <bootstrap.h>
 #include <stdarg.h>
@@ -181,6 +182,7 @@
 umass_disk_print(int verbose)
 {
 	struct disk_devdesc dev;
+	int ret;
 
 	printf("%s devices:", umass_disk.dv_name);
 	if (pager_output("\n") != 0)
@@ -191,8 +193,8 @@
 	ret = pager_output("    umass0   UMASS device\n");
 	if (ret != 0)
 		return (ret);
-	dev.d_dev = &umass_disk;
-	dev.d_unit = 0;
+	dev.dd.d_dev = &umass_disk;
+	dev.dd.d_unit = 0;
 	dev.d_slice = D_SLICENONE;
 	dev.d_partition = D_PARTNONE;
 
diff --git a/stand/usb/usb_busdma_loader.c b/stand/usb/usb_busdma_loader.c
--- a/stand/usb/usb_busdma_loader.c
+++ b/stand/usb/usb_busdma_loader.c
@@ -174,12 +174,6 @@
 	usb_size_t rem;
 	bus_size_t off;
 	bus_addr_t phys = (uintptr_t)vaddr;	/* XXX */
-	uint32_t nseg;
-
-	if (length == 0)
-		nseg = 1;
-	else
-		nseg = ((length + USB_PAGE_SIZE - 1) / USB_PAGE_SIZE);
 
 	pg = pc->page_start;
 	pg->physaddr = phys & ~(USB_PAGE_SIZE - 1);