12 files changed, 2 insertions, 12 deletions
diff --git a/src/hw/ahci.c b/src/hw/ahci.c
index 719d0739..05a80b37 100644
--- a/src/hw/ahci.c
+++ b/src/hw/ahci.c
@@ -8,7 +8,6 @@
 #include "ata.h" // ATA_CB_STAT
 #include "biosvar.h" // GET_GLOBAL
 #include "blockcmd.h" // CDB_CMD_READ_10
-#include "boot.h" // add_bcv_hd
 #include "ioport.h" // inb
 #include "malloc.h" // free
 #include "output.h" // dprintf
diff --git a/src/hw/ata.c b/src/hw/ata.c
index 4ea6cd19..34ba119d 100644
--- a/src/hw/ata.c
+++ b/src/hw/ata.c
@@ -9,7 +9,6 @@
 #include "biosvar.h" // GET_GLOBAL
 #include "block.h" // struct drive_s
 #include "blockcmd.h" // CDB_CMD_READ_10
-#include "boot.h" // boot_add_hd
 #include "byteorder.h" // be16_to_cpu
 #include "cmos.h" // inb_cmos
 #include "ioport.h" // inb
diff --git a/src/hw/blockcmd.c b/src/hw/blockcmd.c
index b9e61cd5..7bdcf386 100644
--- a/src/hw/blockcmd.c
+++ b/src/hw/blockcmd.c
@@ -10,7 +10,6 @@
 #include "biosvar.h" // GET_GLOBAL
 #include "block.h" // struct disk_op_s
 #include "blockcmd.h" // struct cdb_request_sense
-#include "boot.h" // boot_add_hd
 #include "byteorder.h" // be32_to_cpu
 #include "esp-scsi.h" // esp_scsi_cmd_data
 #include "lsi-scsi.h" // lsi_scsi_cmd_data
diff --git a/src/hw/esp-scsi.c b/src/hw/esp-scsi.c
index e6533af4..118a1f52 100644
--- a/src/hw/esp-scsi.c
+++ b/src/hw/esp-scsi.c
@@ -13,7 +13,6 @@
 #include "biosvar.h" // GET_GLOBAL
 #include "block.h" // struct drive_s
 #include "blockcmd.h" // scsi_drive_setup
-#include "boot.h" // bootprio_find_scsi_device
 #include "config.h" // CONFIG_*
 #include "fw/paravirt.h" // runningOnQEMU
 #include "malloc.h" // free
diff --git a/src/hw/floppy.c b/src/hw/floppy.c
index 05c518f0..39efaadc 100644
--- a/src/hw/floppy.c
+++ b/src/hw/floppy.c
@@ -7,7 +7,6 @@
 
 #include "biosvar.h" // SET_BDA
 #include "block.h" // struct drive_s
-#include "boot.h" // boot_add_floppy
 #include "bregs.h" // struct bregs
 #include "cmos.h" // inb_cmos
 #include "config.h" // CONFIG_FLOPPY
diff --git a/src/hw/lsi-scsi.c b/src/hw/lsi-scsi.c
index b7eb1f12..021aa61f 100644
--- a/src/hw/lsi-scsi.c
+++ b/src/hw/lsi-scsi.c
@@ -13,7 +13,6 @@
 #include "biosvar.h" // GET_GLOBAL
 #include "block.h" // struct drive_s
 #include "blockcmd.h" // scsi_drive_setup
-#include "boot.h" // bootprio_find_scsi_device
 #include "config.h" // CONFIG_*
 #include "fw/paravirt.h" // runningOnQEMU
 #include "malloc.h" // free
diff --git a/src/hw/megasas.c b/src/hw/megasas.c
index 772fc755..ebc49f92 100644
--- a/src/hw/megasas.c
+++ b/src/hw/megasas.c
@@ -13,7 +13,6 @@
 #include "biosvar.h" // GET_GLOBAL
 #include "block.h" // struct drive_s
 #include "blockcmd.h" // scsi_drive_setup
-#include "boot.h" // bootprio_find_scsi_device
 #include "config.h" // CONFIG_*
 #include "malloc.h" // free
 #include "output.h" // dprintf
diff --git a/src/hw/ramdisk.c b/src/hw/ramdisk.c
index f57affd4..eeddf256 100644
--- a/src/hw/ramdisk.c
+++ b/src/hw/ramdisk.c
@@ -6,7 +6,6 @@
 
 #include "biosvar.h" // GET_GLOBAL
 #include "block.h" // struct drive_s
-#include "boot.h" // boot_add_floppy
 #include "bregs.h" // struct bregs
 #include "malloc.h" // malloc_fseg
 #include "memmap.h" // add_e820
diff --git a/src/hw/usb-msc.c b/src/hw/usb-msc.c
index 975ec7a9..8ee448f0 100644
--- a/src/hw/usb-msc.c
+++ b/src/hw/usb-msc.c
@@ -7,7 +7,6 @@
 #include "biosvar.h" // GET_GLOBAL
 #include "block.h" // DTYPE_USB
 #include "blockcmd.h" // cdb_read
-#include "boot.h" // bootprio_find_usb
 #include "config.h" // CONFIG_USB_MSC
 #include "malloc.h" // free
 #include "output.h" // dprintf
@@ -15,6 +14,7 @@
 #include "string.h" // memset
 #include "usb.h" // struct usb_s
 #include "usb-msc.h" // usb_msc_setup
+#include "util.h" // bootprio_find_usb
 
 struct usbdrive_s {
     struct drive_s drive;
diff --git a/src/hw/usb-uas.c b/src/hw/usb-uas.c
index 9f4b558b..1a9773ae 100644
--- a/src/hw/usb-uas.c
+++ b/src/hw/usb-uas.c
@@ -17,7 +17,6 @@
 #include "biosvar.h" // GET_GLOBAL
 #include "block.h" // DTYPE_USB
 #include "blockcmd.h" // cdb_read
-#include "boot.h" // bootprio_find_usb
 #include "config.h" // CONFIG_USB_UAS
 #include "malloc.h" // free
 #include "output.h" // dprintf
@@ -25,6 +24,7 @@
 #include "string.h" // memset
 #include "usb.h" // struct usb_s
 #include "usb-uas.h" // usb_uas_init
+#include "util.h" // bootprio_find_usb
 
 #define UAS_UI_COMMAND              0x01
 #define UAS_UI_SENSE                0x03
diff --git a/src/hw/virtio-blk.c b/src/hw/virtio-blk.c
index c48ea453..0de83b49 100644
--- a/src/hw/virtio-blk.c
+++ b/src/hw/virtio-blk.c
@@ -8,7 +8,6 @@
 // This file may be distributed under the terms of the GNU LGPLv3 license.
 
 #include "biosvar.h" // GET_GLOBAL
-#include "boot.h" // boot_add_hd
 #include "config.h" // CONFIG_*
 #include "block.h" // struct drive_s
 #include "malloc.h" // free
diff --git a/src/hw/virtio-scsi.c b/src/hw/virtio-scsi.c
index f50e3356..7cde3bcb 100644
--- a/src/hw/virtio-scsi.c
+++ b/src/hw/virtio-scsi.c
@@ -10,7 +10,6 @@
 #include "biosvar.h" // GET_GLOBAL
 #include "block.h" // struct drive_s
 #include "blockcmd.h" // scsi_drive_setup
-#include "boot.h" // bootprio_find_scsi_device
 #include "config.h" // CONFIG_*
 #include "malloc.h" // free
 #include "output.h" // dprintf