diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h
index 712f8e75c5b..7e11b8adbc1 100644
--- a/sys/sys/disklabel.h
+++ b/sys/sys/disklabel.h
@@ -392,6 +392,8 @@ struct dos_partition {
 #define DIOCSBAD	_IOW('d', 110, struct dkbad)	/* set kernel dkbad */
 #define DIOCSBADSCAN	_IOW('d', 111, int)	/* set badscan mode */
 
+#ifdef KERNEL
+
 /*
  * XXX encoding of disk minor numbers, should be elsewhere.
  *
@@ -437,8 +439,6 @@ dkunit(dev_t dev)
 	return (((minor(dev) >> 16) & 0x1e0) | ((minor(dev) >> 3) & 0x1f));
 }
 
-#ifdef KERNEL
-
 struct	buf;
 struct	buf_queue_head;
 
diff --git a/sys/sys/diskmbr.h b/sys/sys/diskmbr.h
index 712f8e75c5b..7e11b8adbc1 100644
--- a/sys/sys/diskmbr.h
+++ b/sys/sys/diskmbr.h
@@ -392,6 +392,8 @@ struct dos_partition {
 #define DIOCSBAD	_IOW('d', 110, struct dkbad)	/* set kernel dkbad */
 #define DIOCSBADSCAN	_IOW('d', 111, int)	/* set badscan mode */
 
+#ifdef KERNEL
+
 /*
  * XXX encoding of disk minor numbers, should be elsewhere.
  *
@@ -437,8 +439,6 @@ dkunit(dev_t dev)
 	return (((minor(dev) >> 16) & 0x1e0) | ((minor(dev) >> 3) & 0x1f));
 }
 
-#ifdef KERNEL
-
 struct	buf;
 struct	buf_queue_head;
 
diff --git a/sys/sys/diskpc98.h b/sys/sys/diskpc98.h
index 712f8e75c5b..7e11b8adbc1 100644
--- a/sys/sys/diskpc98.h
+++ b/sys/sys/diskpc98.h
@@ -392,6 +392,8 @@ struct dos_partition {
 #define DIOCSBAD	_IOW('d', 110, struct dkbad)	/* set kernel dkbad */
 #define DIOCSBADSCAN	_IOW('d', 111, int)	/* set badscan mode */
 
+#ifdef KERNEL
+
 /*
  * XXX encoding of disk minor numbers, should be elsewhere.
  *
@@ -437,8 +439,6 @@ dkunit(dev_t dev)
 	return (((minor(dev) >> 16) & 0x1e0) | ((minor(dev) >> 3) & 0x1f));
 }
 
-#ifdef KERNEL
-
 struct	buf;
 struct	buf_queue_head;