diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c
index d055933890f..1371374e341 100644
--- a/usr.sbin/sade/config.c
+++ b/usr.sbin/sade/config.c
@@ -44,6 +44,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <sys/mount.h>
+#include <libdisk.h>
 #include <time.h>
 #include <kenv.h>
 
diff --git a/usr.sbin/sade/devices.c b/usr.sbin/sade/devices.c
index c0dcc8ab18e..2b87e1cab25 100644
--- a/usr.sbin/sade/devices.c
+++ b/usr.sbin/sade/devices.c
@@ -48,6 +48,7 @@
 #include <netinet/in_var.h>
 #include <arpa/inet.h>
 #include <ctype.h>
+#include <libdisk.h>
 
 /* how much to bias minor number for a given /dev/<ct#><un#>s<s#> slice */
 #define SLICE_DELTA	(0x10000)
diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c
index f3743b2afd9..234c59c5f13 100644
--- a/usr.sbin/sade/disks.c
+++ b/usr.sbin/sade/disks.c
@@ -38,6 +38,7 @@
 #include <ctype.h>
 #include <fcntl.h>
 #include <inttypes.h>
+#include <libdisk.h>
 #include <sys/stat.h>
 #include <sys/disklabel.h>
 
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index e52d0e2149e..d98bc503640 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/install.c
@@ -50,6 +50,7 @@
 #undef MSDOSFS
 #include <sys/stat.h>
 #include <sys/sysctl.h>
+#include <libdisk.h>
 #include <limits.h>
 #include <unistd.h>
 #include <termios.h>
diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c
index 3f27e58954d..ddd568a08fb 100644
--- a/usr.sbin/sade/label.c
+++ b/usr.sbin/sade/label.c
@@ -37,6 +37,7 @@
 #include "sysinstall.h"
 #include <ctype.h>
 #include <inttypes.h>
+#include <libdisk.h>
 #include <sys/disklabel.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h
index 938cfad0be7..8655ea78ec9 100644
--- a/usr.sbin/sade/sade.h
+++ b/usr.sbin/sade/sade.h
@@ -48,7 +48,6 @@
 #include "ui_objects.h"
 #include "dir.h"
 #include "colors.h"
-#include "libdisk.h"
 #include "dist.h"
 
 /*** Defines ***/
diff --git a/usr.sbin/sade/wizard.c b/usr.sbin/sade/wizard.c
index 3a078871738..98e0a5caf99 100644
--- a/usr.sbin/sade/wizard.c
+++ b/usr.sbin/sade/wizard.c
@@ -13,6 +13,7 @@
 #include "sysinstall.h"
 #include <fcntl.h>
 #include <err.h>
+#include <libdisk.h>
 
 int
 scan_block(int fd, daddr_t block)
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c
index d055933890f..1371374e341 100644
--- a/usr.sbin/sysinstall/config.c
+++ b/usr.sbin/sysinstall/config.c
@@ -44,6 +44,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <sys/mount.h>
+#include <libdisk.h>
 #include <time.h>
 #include <kenv.h>
 
diff --git a/usr.sbin/sysinstall/devices.c b/usr.sbin/sysinstall/devices.c
index c0dcc8ab18e..2b87e1cab25 100644
--- a/usr.sbin/sysinstall/devices.c
+++ b/usr.sbin/sysinstall/devices.c
@@ -48,6 +48,7 @@
 #include <netinet/in_var.h>
 #include <arpa/inet.h>
 #include <ctype.h>
+#include <libdisk.h>
 
 /* how much to bias minor number for a given /dev/<ct#><un#>s<s#> slice */
 #define SLICE_DELTA	(0x10000)
diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c
index f3743b2afd9..234c59c5f13 100644
--- a/usr.sbin/sysinstall/disks.c
+++ b/usr.sbin/sysinstall/disks.c
@@ -38,6 +38,7 @@
 #include <ctype.h>
 #include <fcntl.h>
 #include <inttypes.h>
+#include <libdisk.h>
 #include <sys/stat.h>
 #include <sys/disklabel.h>
 
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index e52d0e2149e..d98bc503640 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -50,6 +50,7 @@
 #undef MSDOSFS
 #include <sys/stat.h>
 #include <sys/sysctl.h>
+#include <libdisk.h>
 #include <limits.h>
 #include <unistd.h>
 #include <termios.h>
diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c
index 3f27e58954d..ddd568a08fb 100644
--- a/usr.sbin/sysinstall/label.c
+++ b/usr.sbin/sysinstall/label.c
@@ -37,6 +37,7 @@
 #include "sysinstall.h"
 #include <ctype.h>
 #include <inttypes.h>
+#include <libdisk.h>
 #include <sys/disklabel.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index 938cfad0be7..8655ea78ec9 100644
--- a/usr.sbin/sysinstall/sysinstall.h
+++ b/usr.sbin/sysinstall/sysinstall.h
@@ -48,7 +48,6 @@
 #include "ui_objects.h"
 #include "dir.h"
 #include "colors.h"
-#include "libdisk.h"
 #include "dist.h"
 
 /*** Defines ***/
diff --git a/usr.sbin/sysinstall/wizard.c b/usr.sbin/sysinstall/wizard.c
index 3a078871738..98e0a5caf99 100644
--- a/usr.sbin/sysinstall/wizard.c
+++ b/usr.sbin/sysinstall/wizard.c
@@ -13,6 +13,7 @@
 #include "sysinstall.h"
 #include <fcntl.h>
 #include <err.h>
+#include <libdisk.h>
 
 int
 scan_block(int fd, daddr_t block)