17 files changed, 4 insertions, 21 deletions

diff --git a/sys/boot/alpha/libalpha/bootinfo.c b/sys/boot/alpha/libalpha/bootinfo.c
index 60fd45ddf92d8..cb41bfb709060 100644
--- a/sys/boot/alpha/libalpha/bootinfo.c
+++ b/sys/boot/alpha/libalpha/bootinfo.c
@@ -29,7 +29,6 @@
 #include <stand.h>
 #include <string.h>
 #include <sys/param.h>
-#include <sys/reboot.h>
 #include <sys/linker.h>
 #include <machine/elf.h>
 #include <machine/prom.h>
diff --git a/sys/boot/alpha/libalpha/srmdisk.c b/sys/boot/alpha/libalpha/srmdisk.c
index d7b832df41f05..fc96872f13dac 100644
--- a/sys/boot/alpha/libalpha/srmdisk.c
+++ b/sys/boot/alpha/libalpha/srmdisk.c
@@ -40,7 +40,6 @@
 #include <stand.h>
 
 #include <sys/disklabel.h>
-#include <sys/diskslice.h>
 
 #include <machine/stdarg.h>
 #include <machine/prom.h>
diff --git a/sys/boot/arc/lib/arcdisk.c b/sys/boot/arc/lib/arcdisk.c
index 116c07cf455c2..a6e99a9ec1f88 100644
--- a/sys/boot/arc/lib/arcdisk.c
+++ b/sys/boot/arc/lib/arcdisk.c
@@ -40,7 +40,6 @@
 #include <stand.h>
 
 #include <sys/disklabel.h>
-#include <sys/diskslice.h>
 
 #include <machine/stdarg.h>
 
diff --git a/sys/boot/arc/lib/bootinfo.c b/sys/boot/arc/lib/bootinfo.c
index a0b858c80ecdd..cea3b1b966e94 100644
--- a/sys/boot/arc/lib/bootinfo.c
+++ b/sys/boot/arc/lib/bootinfo.c
@@ -29,7 +29,6 @@
 #include <stand.h>
 #include <string.h>
 #include <sys/param.h>
-#include <sys/reboot.h>
 #include <sys/linker.h>
 #include <machine/elf.h>
 #include <machine/prom.h>
diff --git a/sys/boot/common/commands.c b/sys/boot/common/commands.c
index 75b60bcdaca82..be696064fc3fa 100644
--- a/sys/boot/common/commands.c
+++ b/sys/boot/common/commands.c
@@ -28,7 +28,6 @@
 
 #include <stand.h>
 #include <string.h>
-#include <sys/reboot.h>
 
 #include "bootstrap.h"
 
diff --git a/sys/boot/common/load_elf.c b/sys/boot/common/load_elf.c
index cae8d2447a0d6..63f5d6418e190 100644
--- a/sys/boot/common/load_elf.c
+++ b/sys/boot/common/load_elf.c
@@ -29,7 +29,6 @@
 
 #include <sys/param.h>
 #include <sys/exec.h>
-#include <sys/reboot.h>
 #include <sys/linker.h>
 #include <sys/module.h>
 #include <string.h>
diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c
index 50f84001fe299..75216ed414e64 100644
--- a/sys/boot/i386/boot2/boot2.c
+++ b/sys/boot/i386/boot2/boot2.c
@@ -18,8 +18,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/reboot.h>
-#include <sys/diskslice.h>
 #include <sys/disklabel.h>
 #include <sys/diskmbr.h>
 #include <sys/dirent.h>
diff --git a/sys/boot/i386/gptboot/gptboot.c b/sys/boot/i386/gptboot/gptboot.c
index 50f84001fe299..75216ed414e64 100644
--- a/sys/boot/i386/gptboot/gptboot.c
+++ b/sys/boot/i386/gptboot/gptboot.c
@@ -18,8 +18,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/reboot.h>
-#include <sys/diskslice.h>
 #include <sys/disklabel.h>
 #include <sys/diskmbr.h>
 #include <sys/dirent.h>
diff --git a/sys/boot/i386/libi386/bioscd.c b/sys/boot/i386/libi386/bioscd.c
index d957596063cb6..88f1c115458b9 100644
--- a/sys/boot/i386/libi386/bioscd.c
+++ b/sys/boot/i386/libi386/bioscd.c
@@ -40,7 +40,7 @@
 #include <stand.h>
 
 #include <sys/param.h>
-#include <sys/reboot.h>
+#include <machine/bootinfo.h>
 #include <machine/psl.h>
 
 #include <stdarg.h>
diff --git a/sys/boot/i386/libi386/biosdisk.c b/sys/boot/i386/libi386/biosdisk.c
index ff41c1ad57b45..658a39c0bda46 100644
--- a/sys/boot/i386/libi386/biosdisk.c
+++ b/sys/boot/i386/libi386/biosdisk.c
@@ -40,7 +40,7 @@
 
 #include <sys/disklabel.h>
 #include <sys/diskmbr.h>
-#include <sys/reboot.h>
+#include <machine/bootinfo.h>
 
 #include <stdarg.h>
 
diff --git a/sys/boot/i386/libi386/elf32_freebsd.c b/sys/boot/i386/libi386/elf32_freebsd.c
index c35cc5acb6260..514183db144c2 100644
--- a/sys/boot/i386/libi386/elf32_freebsd.c
+++ b/sys/boot/i386/libi386/elf32_freebsd.c
@@ -28,7 +28,6 @@
 
 #include <sys/param.h>
 #include <sys/exec.h>
-#include <sys/reboot.h>
 #include <sys/linker.h>
 #include <string.h>
 #include <machine/bootinfo.h>
diff --git a/sys/boot/i386/libi386/elf64_freebsd.c b/sys/boot/i386/libi386/elf64_freebsd.c
index c35cc5acb6260..514183db144c2 100644
--- a/sys/boot/i386/libi386/elf64_freebsd.c
+++ b/sys/boot/i386/libi386/elf64_freebsd.c
@@ -28,7 +28,6 @@
 
 #include <sys/param.h>
 #include <sys/exec.h>
-#include <sys/reboot.h>
 #include <sys/linker.h>
 #include <string.h>
 #include <machine/bootinfo.h>
diff --git a/sys/boot/i386/libi386/elf_freebsd.c b/sys/boot/i386/libi386/elf_freebsd.c
index c35cc5acb6260..514183db144c2 100644
--- a/sys/boot/i386/libi386/elf_freebsd.c
+++ b/sys/boot/i386/libi386/elf_freebsd.c
@@ -28,7 +28,6 @@
 
 #include <sys/param.h>
 #include <sys/exec.h>
-#include <sys/reboot.h>
 #include <sys/linker.h>
 #include <string.h>
 #include <machine/bootinfo.h>
diff --git a/sys/boot/pc98/boot2/disk.c b/sys/boot/pc98/boot2/disk.c
index f0eaf67505f23..f8636eb478809 100644
--- a/sys/boot/pc98/boot2/disk.c
+++ b/sys/boot/pc98/boot2/disk.c
@@ -43,8 +43,8 @@
 
 #include "boot.h"
 #include <sys/disklabel.h>
-#include <sys/diskslice.h>
 #include <sys/diskpc98.h>
+#include <machine/bootinfo.h>
 
 #define	BIOS_DEV_FLOPPY	0x0
 #define	BIOS_DEV_WIN	0x80
diff --git a/sys/boot/pc98/boot2/sys.c b/sys/boot/pc98/boot2/sys.c
index eb65d33cbeec6..9963ae5d6703a 100644
--- a/sys/boot/pc98/boot2/sys.c
+++ b/sys/boot/pc98/boot2/sys.c
@@ -33,7 +33,6 @@
 
 #include "boot.h"
 #include <sys/dirent.h>
-#include <sys/reboot.h>
 
 #if 0
 /* #define BUFSIZE 4096 */
diff --git a/sys/boot/pc98/libpc98/biosdisk.c b/sys/boot/pc98/libpc98/biosdisk.c
index d1427f91ec84c..dd251a75480e2 100644
--- a/sys/boot/pc98/libpc98/biosdisk.c
+++ b/sys/boot/pc98/libpc98/biosdisk.c
@@ -39,9 +39,8 @@
 #include <stand.h>
 
 #include <sys/disklabel.h>
-#include <sys/diskslice.h>
 #include <sys/diskpc98.h>
-#include <sys/reboot.h>
+#include <machine/bootinfo.h>
 
 #include <stdarg.h>
 
diff --git a/sys/boot/sparc64/boot1/boot1.c b/sys/boot/sparc64/boot1/boot1.c
index 1eeb5564bdd8a..b650f8b5c5228 100644
--- a/sys/boot/sparc64/boot1/boot1.c
+++ b/sys/boot/sparc64/boot1/boot1.c
@@ -20,8 +20,6 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/reboot.h>
-#include <sys/diskslice.h>
 #include <sys/disklabel.h>
 #include <sys/dirent.h>
 #include <machine/elf.h>