diff --git a/sys/arch/bebox/bebox/disksubr.c b/sys/arch/bebox/bebox/disksubr.c
index 80870fa3b969..86bcfef2648e 100644
--- a/sys/arch/bebox/bebox/disksubr.c
+++ b/sys/arch/bebox/bebox/disksubr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: disksubr.c,v 1.12 2003/05/10 23:12:31 thorpej Exp $	*/
+/*	$NetBSD: disksubr.c,v 1.13 2003/05/12 14:48:12 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -39,6 +39,7 @@
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/disklabel.h>
+#include <sys/disk.h>
 #include <sys/syslog.h>
 
 #include "opt_mbr.h"
diff --git a/sys/arch/hp300/hp300/disksubr.c b/sys/arch/hp300/hp300/disksubr.c
index ce3d86943d4d..7e417cdbb8d6 100644
--- a/sys/arch/hp300/hp300/disksubr.c
+++ b/sys/arch/hp300/hp300/disksubr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: disksubr.c,v 1.16 2003/05/10 23:12:32 thorpej Exp $	*/
+/*	$NetBSD: disksubr.c,v 1.17 2003/05/12 14:48:13 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1988, 1993
@@ -41,12 +41,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.16 2003/05/10 23:12:32 thorpej Exp $");                                                  
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.17 2003/05/12 14:48:13 thorpej Exp $");                                                  
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/disklabel.h>
+#include <sys/disk.h>
 #include <sys/syslog.h>
 
 #define	b_cylinder	b_resid
diff --git a/sys/arch/mvmeppc/mvmeppc/disksubr.c b/sys/arch/mvmeppc/mvmeppc/disksubr.c
index b4fcba0f9aa9..57935c7ba775 100644
--- a/sys/arch/mvmeppc/mvmeppc/disksubr.c
+++ b/sys/arch/mvmeppc/mvmeppc/disksubr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: disksubr.c,v 1.5 2003/05/10 23:12:35 thorpej Exp $	*/
+/*	$NetBSD: disksubr.c,v 1.6 2003/05/12 14:48:13 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -39,6 +39,7 @@
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/disklabel.h>
+#include <sys/disk.h>
 #include <sys/syslog.h>
 
 #include "opt_mbr.h"
diff --git a/sys/arch/pmppc/pmppc/disksubr.c b/sys/arch/pmppc/pmppc/disksubr.c
index c4b49105efe1..e30cabdaf594 100644
--- a/sys/arch/pmppc/pmppc/disksubr.c
+++ b/sys/arch/pmppc/pmppc/disksubr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: disksubr.c,v 1.4 2003/05/10 23:12:37 thorpej Exp $	*/
+/*	$NetBSD: disksubr.c,v 1.5 2003/05/12 14:48:13 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -39,6 +39,7 @@
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/disklabel.h>
+#include <sys/disk.h>
 #include <sys/syslog.h>
 
 #include "opt_mbr.h"
diff --git a/sys/arch/prep/prep/disksubr.c b/sys/arch/prep/prep/disksubr.c
index 403528b0005a..86d14ad468b5 100644
--- a/sys/arch/prep/prep/disksubr.c
+++ b/sys/arch/prep/prep/disksubr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: disksubr.c,v 1.7 2003/05/10 23:12:38 thorpej Exp $	*/
+/*	$NetBSD: disksubr.c,v 1.8 2003/05/12 14:48:13 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -39,6 +39,7 @@
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/disklabel.h>
+#include <sys/disk.h>
 #include <sys/syslog.h>
 
 #include "opt_mbr.h"
diff --git a/sys/arch/sandpoint/sandpoint/disksubr.c b/sys/arch/sandpoint/sandpoint/disksubr.c
index eb722e6c45fd..336e7eca4fca 100644
--- a/sys/arch/sandpoint/sandpoint/disksubr.c
+++ b/sys/arch/sandpoint/sandpoint/disksubr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: disksubr.c,v 1.5 2003/05/10 23:12:38 thorpej Exp $	*/
+/*	$NetBSD: disksubr.c,v 1.6 2003/05/12 14:48:14 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -39,6 +39,7 @@
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/disklabel.h>
+#include <sys/disk.h>
 #include <sys/syslog.h>
 
 #include "opt_mbr.h"
diff --git a/sys/arch/sh3/sh3/disksubr.c b/sys/arch/sh3/sh3/disksubr.c
index afd410ea5930..f666102e578b 100644
--- a/sys/arch/sh3/sh3/disksubr.c
+++ b/sys/arch/sh3/sh3/disksubr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: disksubr.c,v 1.12 2003/05/10 23:12:39 thorpej Exp $	*/
+/*	$NetBSD: disksubr.c,v 1.13 2003/05/12 14:48:14 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -41,6 +41,7 @@
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/disklabel.h>
+#include <sys/disk.h>
 #include <sys/syslog.h>
 
 #include <machine/bswap.h>
diff --git a/sys/arch/vax/vax/disksubr.c b/sys/arch/vax/vax/disksubr.c
index 9994614cd456..3d4e43f6c2d6 100644
--- a/sys/arch/vax/vax/disksubr.c
+++ b/sys/arch/vax/vax/disksubr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: disksubr.c,v 1.34 2003/05/10 23:12:42 thorpej Exp $	*/
+/*	$NetBSD: disksubr.c,v 1.35 2003/05/12 14:48:14 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -40,6 +40,7 @@
 #include <sys/buf.h>
 #include <sys/dkbad.h>
 #include <sys/disklabel.h>
+#include <sys/disk.h>
 #include <sys/syslog.h>
 #include <sys/proc.h>
 #include <sys/user.h>