diff --git a/MAINTAINERS b/MAINTAINERS
index 7128672934..9e9cb83989 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1994,7 +1994,7 @@ F: hw/core/numa.c
 F: hw/cpu/cluster.c
 F: qapi/machine.json
 F: qapi/machine-common.json
-F: include/hw/boards.h
+F: include/hw/core/boards.h
 F: include/hw/core/cpu.h
 F: include/hw/cpu/cluster.h
 F: include/system/numa.h
diff --git a/accel/accel-system.c b/accel/accel-system.c
index 1e97c64fdc..150af05bf5 100644
--- a/accel/accel-system.c
+++ b/accel/accel-system.c
@@ -27,7 +27,7 @@
 #include "qemu/accel.h"
 #include "qapi/qapi-commands-accelerator.h"
 #include "monitor/monitor.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/core/cpu.h"
 #include "accel/accel-ops.h"
 #include "accel/accel-cpu-ops.h"
diff --git a/accel/hvf/hvf-all.c b/accel/hvf/hvf-all.c
index 0a4b498e83..77f4e4e4f3 100644
--- a/accel/hvf/hvf-all.c
+++ b/accel/hvf/hvf-all.c
@@ -16,7 +16,7 @@
 #include "system/hvf.h"
 #include "system/hvf_int.h"
 #include "hw/core/cpu.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "trace.h"
 
 bool hvf_allowed;
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 28006d73c5..02b78717b1 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -53,7 +53,7 @@
 #include "system/dirtylimit.h"
 #include "qemu/range.h"
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/stats.h"
 
 /* This check must be after config-host.h is included */
diff --git a/accel/mshv/mshv-all.c b/accel/mshv/mshv-all.c
index 80428d130d..47c67ef8cc 100644
--- a/accel/mshv/mshv-all.c
+++ b/accel/mshv/mshv-all.c
@@ -19,7 +19,7 @@
 #include "qemu/event_notifier.h"
 #include "qemu/module.h"
 #include "qemu/main-loop.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 #include "hw/hyperv/hvhdk.h"
 #include "hw/hyperv/hvhdk_mini.h"
diff --git a/accel/tcg/tcg-accel-ops-mttcg.c b/accel/tcg/tcg-accel-ops-mttcg.c
index cf1ee7ac25..89299829c3 100644
--- a/accel/tcg/tcg-accel-ops-mttcg.c
+++ b/accel/tcg/tcg-accel-ops-mttcg.c
@@ -30,7 +30,7 @@
 #include "qemu/main-loop.h"
 #include "qemu/notify.h"
 #include "qemu/guest-random.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "tcg/startup.h"
 #include "tcg-accel-ops.h"
 #include "tcg-accel-ops-mttcg.h"
diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c
index 18ea0c58b0..8eb4a6b89e 100644
--- a/accel/tcg/tcg-all.c
+++ b/accel/tcg/tcg-all.c
@@ -37,7 +37,7 @@
 #include "qemu/units.h"
 #include "qemu/target-info.h"
 #ifndef CONFIG_USER_ONLY
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "exec/tb-flush.h"
 #include "system/runstate.h"
 #endif
diff --git a/accel/xen/xen-all.c b/accel/xen/xen-all.c
index 97377d67d1..bb2d02cb22 100644
--- a/accel/xen/xen-all.c
+++ b/accel/xen/xen-all.c
@@ -26,7 +26,7 @@
 #include "system/runstate.h"
 #include "migration/misc.h"
 #include "migration/global_state.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 bool xen_allowed;
 
diff --git a/backends/hostmem.c b/backends/hostmem.c
index 35734d6f4d..d583491664 100644
--- a/backends/hostmem.c
+++ b/backends/hostmem.c
@@ -12,7 +12,7 @@
 
 #include "qemu/osdep.h"
 #include "system/hostmem.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qapi/error.h"
 #include "qapi/qapi-builtin-visit.h"
 #include "qapi/visitor.h"
diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c
index 3640d1f3dc..3391cee4d2 100644
--- a/block/monitor/block-hmp-cmds.c
+++ b/block/monitor/block-hmp-cmds.c
@@ -36,7 +36,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/block-backend.h"
 #include "system/blockdev.h"
 #include "qapi/qapi-commands-block.h"
diff --git a/docs/conf.py b/docs/conf.py
index 0c9ec74097..bc4e9622dc 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -136,7 +136,7 @@ if micro >= 50:
 
 # These thresholds must match the constants
 # MACHINE_VER_DELETION_MAJOR  & MACHINE_VER_DEPRECATION_MAJOR
-# defined in include/hw/boards.h and the introductory text in
+# defined in include/hw/core/boards.h and the introductory text in
 # docs/about/deprecated.rst
 ver_machine_deprecation_version = "%d.%d.0" % (major - 3, minor)
 ver_machine_deletion_version = "%d.%d.0" % (major - 6, minor)
diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c
index 5b2fc06e58..1f8cd11892 100644
--- a/gdbstub/gdbstub.c
+++ b/gdbstub/gdbstub.c
@@ -38,7 +38,7 @@
 #include "gdbstub/user.h"
 #else
 #include "hw/cpu/cluster.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #endif
 #include "hw/core/cpu.h"
 
diff --git a/gdbstub/system.c b/gdbstub/system.c
index e2220c1ae4..79f80256e3 100644
--- a/gdbstub/system.c
+++ b/gdbstub/system.c
@@ -25,7 +25,7 @@
 #include "system/replay.h"
 #include "hw/core/cpu.h"
 #include "hw/cpu/cluster.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "chardev/char.h"
 #include "chardev/char-fe.h"
 #include "monitor/monitor.h"
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index 2d5826a8f1..dad4cfcc7d 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -25,7 +25,7 @@
 #include "qemu/bswap.h"
 #include "qemu/bitops.h"
 #include "system/numa.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/acpi/tpm.h"
 #include "hw/pci/pci_host.h"
 #include "hw/pci/pci_bus.h"
diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c
index 9b974b7274..2f17d45907 100644
--- a/hw/acpi/memory_hotplug.c
+++ b/hw/acpi/memory_hotplug.c
@@ -1,7 +1,7 @@
 #include "qemu/osdep.h"
 #include "hw/acpi/memory_hotplug.h"
 #include "hw/mem/pc-dimm.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-core.h"
 #include "migration/vmstate.h"
 #include "trace.h"
diff --git a/hw/acpi/pci.c b/hw/acpi/pci.c
index 2228f1245e..8c7ed10479 100644
--- a/hw/acpi/pci.c
+++ b/hw/acpi/pci.c
@@ -27,7 +27,7 @@
 #include "qemu/error-report.h"
 #include "qom/object_interfaces.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/acpi/aml-build.h"
 #include "hw/acpi/pci.h"
 #include "hw/pci/pci_bridge.h"
diff --git a/hw/alpha/alpha_sys.h b/hw/alpha/alpha_sys.h
index a303c58438..6e6691d116 100644
--- a/hw/alpha/alpha_sys.h
+++ b/hw/alpha/alpha_sys.h
@@ -5,7 +5,7 @@
 
 #include "target/alpha/cpu-qom.h"
 #include "hw/pci/pci.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/intc/i8259.h"
 
 
diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c
index dc910d4177..1886df0383 100644
--- a/hw/arm/allwinner-a10.c
+++ b/hw/arm/allwinner-a10.c
@@ -24,7 +24,7 @@
 #include "hw/arm/allwinner-a10.h"
 #include "hw/misc/unimp.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/usb/hcd-ohci.h"
 #include "hw/loader.h"
 #include "target/arm/cpu-qom.h"
diff --git a/hw/arm/allwinner-r40.c b/hw/arm/allwinner-r40.c
index c8eda39957..313bd21fad 100644
--- a/hw/arm/allwinner-r40.c
+++ b/hw/arm/allwinner-r40.c
@@ -22,7 +22,7 @@
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "qemu/units.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-core.h"
 #include "hw/sysbus.h"
 #include "hw/char/serial-mm.h"
diff --git a/hw/arm/aspeed_ast27x0-fc.c b/hw/arm/aspeed_ast27x0-fc.c
index b96ef3f97a..a0cbe50d78 100644
--- a/hw/arm/aspeed_ast27x0-fc.c
+++ b/hw/arm/aspeed_ast27x0-fc.c
@@ -15,7 +15,7 @@
 #include "system/block-backend.h"
 #include "system/system.h"
 #include "hw/arm/aspeed.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-clock.h"
 #include "hw/arm/aspeed_soc.h"
 #include "hw/loader.h"
diff --git a/hw/arm/b-l475e-iot01a.c b/hw/arm/b-l475e-iot01a.c
index f1fbc774e5..a724b5fdb2 100644
--- a/hw/arm/b-l475e-iot01a.c
+++ b/hw/arm/b-l475e-iot01a.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "qemu/error-report.h"
 #include "hw/arm/boot.h"
diff --git a/hw/arm/bananapi_m2u.c b/hw/arm/bananapi_m2u.c
index 0f6d98684b..fd347e18d2 100644
--- a/hw/arm/bananapi_m2u.c
+++ b/hw/arm/bananapi_m2u.c
@@ -22,7 +22,7 @@
 #include "system/address-spaces.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/i2c/i2c.h"
 #include "hw/qdev-properties.h"
 #include "hw/arm/allwinner-r40.h"
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index b91660208f..9b6eaf642e 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -22,7 +22,7 @@
 #include "system/system.h"
 #include "system/memory.h"
 #include "system/numa.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/reset.h"
 #include "hw/loader.h"
 #include "hw/mem/memory-device.h"
diff --git a/hw/arm/collie.c b/hw/arm/collie.c
index 5a80b7a223..73c40bc57d 100644
--- a/hw/arm/collie.c
+++ b/hw/arm/collie.c
@@ -12,7 +12,7 @@
 #include "qemu/units.h"
 #include "qemu/cutils.h"
 #include "hw/sysbus.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "strongarm.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"
diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c
index aa51c0a703..9fe282342a 100644
--- a/hw/arm/cubieboard.c
+++ b/hw/arm/cubieboard.c
@@ -18,7 +18,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "hw/arm/allwinner-a10.h"
 #include "hw/arm/boot.h"
diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c
index 23b596d0c8..d986e8f7a2 100644
--- a/hw/arm/digic_boards.c
+++ b/hw/arm/digic_boards.c
@@ -26,7 +26,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/datadir.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qemu/error-report.h"
 #include "hw/arm/digic.h"
 #include "hw/arm/machines-qom.h"
diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c
index 89f0e94463..66af0e2376 100644
--- a/hw/arm/exynos4_boards.c
+++ b/hw/arm/exynos4_boards.c
@@ -33,7 +33,7 @@
 #include "hw/arm/exynos4210.h"
 #include "hw/net/lan9118.h"
 #include "hw/qdev-properties.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/irq.h"
 #include "target/arm/cpu-qom.h"
 
diff --git a/hw/arm/fby35.c b/hw/arm/fby35.c
index e61a6438fe..3e036cfd2b 100644
--- a/hw/arm/fby35.c
+++ b/hw/arm/fby35.c
@@ -10,7 +10,7 @@
 #include "qapi/error.h"
 #include "system/system.h"
 #include "system/block-backend.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-clock.h"
 #include "hw/arm/aspeed_soc.h"
 #include "hw/arm/boot.h"
diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c
index f3a60022d8..50b34139fa 100644
--- a/hw/arm/fsl-imx6.c
+++ b/hw/arm/fsl-imx6.c
@@ -24,7 +24,7 @@
 #include "hw/arm/fsl-imx6.h"
 #include "hw/misc/unimp.h"
 #include "hw/usb/imx-usb-phy.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "system/system.h"
 #include "chardev/char.h"
diff --git a/hw/arm/fsl-imx6ul.c b/hw/arm/fsl-imx6ul.c
index 883c7fc534..225e179126 100644
--- a/hw/arm/fsl-imx6ul.c
+++ b/hw/arm/fsl-imx6ul.c
@@ -21,7 +21,7 @@
 #include "hw/arm/fsl-imx6ul.h"
 #include "hw/misc/unimp.h"
 #include "hw/usb/imx-usb-phy.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/system.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"
diff --git a/hw/arm/fsl-imx7.c b/hw/arm/fsl-imx7.c
index 02f7602077..9a230d222f 100644
--- a/hw/arm/fsl-imx7.c
+++ b/hw/arm/fsl-imx7.c
@@ -22,7 +22,7 @@
 #include "qapi/error.h"
 #include "hw/arm/fsl-imx7.h"
 #include "hw/misc/unimp.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/system.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"
diff --git a/hw/arm/fsl-imx8mp.c b/hw/arm/fsl-imx8mp.c
index ee6f3e42d2..79f9142777 100644
--- a/hw/arm/fsl-imx8mp.c
+++ b/hw/arm/fsl-imx8mp.c
@@ -13,7 +13,7 @@
 #include "hw/arm/bsa.h"
 #include "hw/arm/fsl-imx8mp.h"
 #include "hw/misc/unimp.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/kvm.h"
 #include "system/system.h"
 #include "target/arm/cpu.h"
diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c
index bd60ab2689..82fa964711 100644
--- a/hw/arm/highbank.c
+++ b/hw/arm/highbank.c
@@ -28,7 +28,7 @@
 #include "net/net.h"
 #include "system/runstate.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qemu/error-report.h"
 #include "hw/char/pl011.h"
 #include "hw/ide/ahci-sysbus.h"
diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c
index 71a4606203..21860ed14d 100644
--- a/hw/arm/imx25_pdk.c
+++ b/hw/arm/imx25_pdk.c
@@ -29,7 +29,7 @@
 #include "hw/arm/fsl-imx25.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qemu/error-report.h"
 #include "system/qtest.h"
 #include "hw/i2c/i2c.h"
diff --git a/hw/arm/imx8mp-evk.c b/hw/arm/imx8mp-evk.c
index 44e0601967..ed8c52e1bd 100644
--- a/hw/arm/imx8mp-evk.c
+++ b/hw/arm/imx8mp-evk.c
@@ -11,7 +11,7 @@
 #include "hw/arm/boot.h"
 #include "hw/arm/fsl-imx8mp.h"
 #include "hw/arm/machines-qom.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "system/kvm.h"
 #include "system/qtest.h"
diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index b030710b29..436fcdd510 100644
--- a/hw/arm/integratorcp.c
+++ b/hw/arm/integratorcp.c
@@ -11,7 +11,7 @@
 #include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"
 #include "hw/misc/arm_integrator_debug.h"
diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c
index b446dc1547..168ecf35d0 100644
--- a/hw/arm/kzm.c
+++ b/hw/arm/kzm.c
@@ -18,7 +18,7 @@
 #include "hw/arm/fsl-imx31.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qemu/error-report.h"
 #include "system/address-spaces.h"
 #include "net/net.h"
diff --git a/hw/arm/max78000fthr.c b/hw/arm/max78000fthr.c
index c4f6b5b1b0..e4ceb7efcd 100644
--- a/hw/arm/max78000fthr.c
+++ b/hw/arm/max78000fthr.c
@@ -8,7 +8,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-clock.h"
 #include "qemu/error-report.h"
diff --git a/hw/arm/mcimx6ul-evk.c b/hw/arm/mcimx6ul-evk.c
index f47a265650..5fe6526ba0 100644
--- a/hw/arm/mcimx6ul-evk.c
+++ b/hw/arm/mcimx6ul-evk.c
@@ -15,7 +15,7 @@
 #include "hw/arm/fsl-imx6ul.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "qemu/error-report.h"
 #include "system/qtest.h"
diff --git a/hw/arm/mcimx7d-sabre.c b/hw/arm/mcimx7d-sabre.c
index fc8f35c581..b1b56b920d 100644
--- a/hw/arm/mcimx7d-sabre.c
+++ b/hw/arm/mcimx7d-sabre.c
@@ -17,7 +17,7 @@
 #include "hw/arm/fsl-imx7.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "qemu/error-report.h"
 #include "system/qtest.h"
diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c
index 0f3161fd93..cd035fffc7 100644
--- a/hw/arm/microbit.c
+++ b/hw/arm/microbit.c
@@ -10,7 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"
 #include "system/system.h"
diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c
index 55dd68c57e..3188caf222 100644
--- a/hw/arm/mps2-tz.c
+++ b/hw/arm/mps2-tz.c
@@ -54,7 +54,7 @@
 #include "hw/arm/armv7m.h"
 #include "hw/arm/machines-qom.h"
 #include "hw/or-irq.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/address-spaces.h"
 #include "system/system.h"
 #include "system/reset.h"
diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c
index fa4b200577..bf5e07019f 100644
--- a/hw/arm/mps2.c
+++ b/hw/arm/mps2.c
@@ -33,7 +33,7 @@
 #include "hw/arm/armv7m.h"
 #include "hw/arm/machines-qom.h"
 #include "hw/or-irq.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/address-spaces.h"
 #include "system/system.h"
 #include "hw/qdev-properties.h"
diff --git a/hw/arm/mps3r.c b/hw/arm/mps3r.c
index fcb8777caf..b63002f483 100644
--- a/hw/arm/mps3r.c
+++ b/hw/arm/mps3r.c
@@ -31,7 +31,7 @@
 #include "system/address-spaces.h"
 #include "cpu.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/or-irq.h"
 #include "hw/qdev-clock.h"
 #include "hw/qdev-properties.h"
diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c
index c26feccb15..78d98c4a40 100644
--- a/hw/arm/msf2-som.c
+++ b/hw/arm/msf2-som.c
@@ -29,7 +29,7 @@
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"
diff --git a/hw/arm/musca.c b/hw/arm/musca.c
index a3494c96bf..7b30d9bd44 100644
--- a/hw/arm/musca.c
+++ b/hw/arm/musca.c
@@ -27,7 +27,7 @@
 #include "hw/arm/boot.h"
 #include "hw/arm/armsse.h"
 #include "hw/arm/machines-qom.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/char/pl011.h"
 #include "hw/core/split-irq.h"
 #include "hw/misc/tz-mpc.h"
diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index 675707691c..3e62454096 100644
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -18,7 +18,7 @@
 #include "hw/arm/machines-qom.h"
 #include "net/net.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/char/serial-mm.h"
 #include "qemu/timer.h"
 #include "hw/ptimer.h"
diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c
index bce0d6f87a..1657612fe7 100644
--- a/hw/arm/netduino2.c
+++ b/hw/arm/netduino2.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-clock.h"
 #include "qemu/error-report.h"
diff --git a/hw/arm/netduinoplus2.c b/hw/arm/netduinoplus2.c
index 8594081fe4..746a3deef8 100644
--- a/hw/arm/netduinoplus2.c
+++ b/hw/arm/netduinoplus2.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-clock.h"
 #include "qemu/error-report.h"
diff --git a/hw/arm/npcm8xx.c b/hw/arm/npcm8xx.c
index a276fea698..3ad7643b4b 100644
--- a/hw/arm/npcm8xx.c
+++ b/hw/arm/npcm8xx.c
@@ -16,7 +16,7 @@
 
 #include "qemu/osdep.h"
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/bsa.h"
 #include "hw/arm/npcm8xx.h"
diff --git a/hw/arm/npcm8xx_boards.c b/hw/arm/npcm8xx_boards.c
index b179eadef5..f775b32402 100644
--- a/hw/arm/npcm8xx_boards.c
+++ b/hw/arm/npcm8xx_boards.c
@@ -17,7 +17,7 @@
 #include "qemu/osdep.h"
 
 #include "chardev/char.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/arm/npcm8xx.h"
 #include "hw/arm/machines-qom.h"
 #include "hw/core/cpu.h"
diff --git a/hw/arm/olimex-stm32-h405.c b/hw/arm/olimex-stm32-h405.c
index c5f6038333..d15545ff07 100644
--- a/hw/arm/olimex-stm32-h405.c
+++ b/hw/arm/olimex-stm32-h405.c
@@ -25,7 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-clock.h"
 #include "qemu/error-report.h"
diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c
index 730525be2d..d858dab325 100644
--- a/hw/arm/omap_sx1.c
+++ b/hw/arm/omap_sx1.c
@@ -30,7 +30,7 @@
 #include "qapi/error.h"
 #include "ui/console.h"
 #include "hw/arm/omap.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"
 #include "hw/block/flash.h"
diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c
index 3e237e78fa..c0dd32f13c 100644
--- a/hw/arm/orangepi.c
+++ b/hw/arm/orangepi.c
@@ -22,7 +22,7 @@
 #include "system/address-spaces.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "hw/arm/allwinner-h3.h"
 #include "hw/arm/boot.h"
diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
index 81d2fa1b67..910c18213a 100644
--- a/hw/arm/raspi.c
+++ b/hw/arm/raspi.c
@@ -22,7 +22,7 @@
 #include "hw/arm/raspi_platform.h"
 #include "hw/registerfields.h"
 #include "qemu/error-report.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"
diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c
index 0422ae0f00..058df2c4c9 100644
--- a/hw/arm/raspi4b.c
+++ b/hw/arm/raspi4b.c
@@ -17,7 +17,7 @@
 #include "hw/registerfields.h"
 #include "qemu/error-report.h"
 #include "system/device_tree.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/arm/boot.h"
 #include "qom/object.h"
diff --git a/hw/arm/realview.c b/hw/arm/realview.c
index d8327a50d2..97008490f6 100644
--- a/hw/arm/realview.c
+++ b/hw/arm/realview.c
@@ -21,7 +21,7 @@
 #include "hw/qdev-core.h"
 #include "net/net.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/i2c/i2c.h"
 #include "qemu/error-report.h"
 #include "hw/char/pl011.h"
diff --git a/hw/arm/sabrelite.c b/hw/arm/sabrelite.c
index 5b4ab7d77a..99cbd5e2fe 100644
--- a/hw/arm/sabrelite.c
+++ b/hw/arm/sabrelite.c
@@ -15,7 +15,7 @@
 #include "hw/arm/fsl-imx6.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "qemu/error-report.h"
 #include "system/qtest.h"
diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c
index 3ba69d37d7..32d4c52bf5 100644
--- a/hw/arm/sbsa-ref.c
+++ b/hw/arm/sbsa-ref.c
@@ -37,7 +37,7 @@
 #include "hw/arm/smmuv3.h"
 #include "hw/arm/machines-qom.h"
 #include "hw/block/flash.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/ide/ide-bus.h"
 #include "hw/ide/ahci-sysbus.h"
 #include "hw/intc/arm_gicv3_common.h"
diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index 8113bbd5d8..d1cbf43777 100644
--- a/hw/arm/stellaris.c
+++ b/hw/arm/stellaris.c
@@ -19,7 +19,7 @@
 #include "qemu/timer.h"
 #include "hw/i2c/i2c.h"
 #include "net/net.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qemu/log.h"
 #include "system/address-spaces.h"
 #include "system/system.h"
diff --git a/hw/arm/stm32vldiscovery.c b/hw/arm/stm32vldiscovery.c
index c11029f8bd..4843c5565b 100644
--- a/hw/arm/stm32vldiscovery.c
+++ b/hw/arm/stm32vldiscovery.c
@@ -25,7 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-clock.h"
 #include "qemu/error-report.h"
diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
index c3c99a2da6..dd1047f6c6 100644
--- a/hw/arm/versatilepb.c
+++ b/hw/arm/versatilepb.c
@@ -20,7 +20,7 @@
 #include "hw/i2c/i2c.h"
 #include "hw/i2c/arm_sbcon_i2c.h"
 #include "hw/irq.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/block/flash.h"
 #include "qemu/error-report.h"
 #include "hw/char/pl011.h"
diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
index 3492e03a65..2f61ad0dd6 100644
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@ -32,7 +32,7 @@
 #include "hw/i2c/i2c.h"
 #include "net/net.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/block/flash.h"
 #include "system/device_tree.h"
diff --git a/hw/arm/xen-pvh.c b/hw/arm/xen-pvh.c
index 86a0296616..10cac28a91 100644
--- a/hw/arm/xen-pvh.c
+++ b/hw/arm/xen-pvh.c
@@ -7,7 +7,7 @@
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
 #include "qapi/qapi-commands-migration.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/system.h"
 #include "hw/xen/xen-pvh-common.h"
 #include "hw/arm/machines-qom.h"
diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c
index c82edd3bed..a6dc644d0b 100644
--- a/hw/arm/xilinx_zynq.c
+++ b/hw/arm/xilinx_zynq.c
@@ -23,7 +23,7 @@
 #include "hw/arm/machines-qom.h"
 #include "net/net.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/block/flash.h"
 #include "hw/loader.h"
 #include "hw/adc/zynq-xadc.h"
diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c
index 5e05521a57..e82ac8e353 100644
--- a/hw/arm/xlnx-versal-virt.c
+++ b/hw/arm/xlnx-versal-virt.c
@@ -16,7 +16,7 @@
 #include "system/device_tree.h"
 #include "system/address-spaces.h"
 #include "hw/block/flash.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/sysbus.h"
 #include "hw/arm/fdt.h"
 #include "hw/arm/xlnx-versal.h"
diff --git a/hw/arm/xlnx-zcu102.c b/hw/arm/xlnx-zcu102.c
index 06a3d7dfe7..3ba2736bab 100644
--- a/hw/arm/xlnx-zcu102.c
+++ b/hw/arm/xlnx-zcu102.c
@@ -20,7 +20,7 @@
 #include "hw/arm/xlnx-zynqmp.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qemu/error-report.h"
 #include "qemu/log.h"
 #include "system/device_tree.h"
diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c
index ffed6e5126..5f0e34ccec 100644
--- a/hw/arm/xlnx-zynqmp.c
+++ b/hw/arm/xlnx-zynqmp.c
@@ -21,7 +21,7 @@
 #include "hw/arm/xlnx-zynqmp.h"
 #include "hw/intc/arm_gic_common.h"
 #include "hw/misc/unimp.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/system.h"
 #include "target/arm/cpu-qom.h"
 #include "target/arm/gtimer.h"
diff --git a/hw/avr/boot.h b/hw/avr/boot.h
index 684d553322..9eed205559 100644
--- a/hw/avr/boot.h
+++ b/hw/avr/boot.h
@@ -11,7 +11,7 @@
 #ifndef HW_AVR_BOOT_H
 #define HW_AVR_BOOT_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "cpu.h"
 
 /**
diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c
index 8c306c89e4..fb8421184d 100644
--- a/hw/core/cpu-common.c
+++ b/hw/core/cpu-common.c
@@ -31,7 +31,7 @@
 #include "exec/log.h"
 #include "exec/gdbstub.h"
 #include "system/tcg.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "trace.h"
 #ifdef CONFIG_PLUGIN
diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c
index 433efb7387..be4fe867e4 100644
--- a/hw/core/generic-loader.c
+++ b/hw/core/generic-loader.c
@@ -33,7 +33,7 @@
 #include "qemu/osdep.h"
 #include "system/dma.h"
 #include "system/reset.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/qdev-properties.h"
 #include "qapi/error.h"
diff --git a/hw/core/guest-loader.c b/hw/core/guest-loader.c
index 618455e556..07c3646404 100644
--- a/hw/core/guest-loader.c
+++ b/hw/core/guest-loader.c
@@ -33,7 +33,7 @@
 #include "qemu/module.h"
 #include "guest-loader.h"
 #include "system/device_tree.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 /*
  * Insert some FDT nodes for the loaded blob.
diff --git a/hw/core/loader.c b/hw/core/loader.c
index 590c5b02aa..385730e8ef 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -61,7 +61,7 @@
 #include "hw/loader.h"
 #include "hw/nvram/fw_cfg.h"
 #include "system/memory.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qemu/cutils.h"
 #include "system/runstate.h"
 #include "tcg/debuginfo.h"
diff --git a/hw/core/machine-hmp-cmds.c b/hw/core/machine-hmp-cmds.c
index 74a56600be..46846f741a 100644
--- a/hw/core/machine-hmp-cmds.c
+++ b/hw/core/machine-hmp-cmds.c
@@ -24,7 +24,7 @@
 #include "qapi/string-output-visitor.h"
 #include "qemu/error-report.h"
 #include "system/numa.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 void hmp_info_cpus(Monitor *mon, const QDict *qdict)
 {
diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c
index 28dfd3e15b..d23466177d 100644
--- a/hw/core/machine-qmp-cmds.c
+++ b/hw/core/machine-qmp-cmds.c
@@ -9,7 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/acpi/vmgenid.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/intc/intc.h"
 #include "hw/mem/memory-device.h"
 #include "qapi/error.h"
diff --git a/hw/core/machine-smp.c b/hw/core/machine-smp.c
index 0be0ac044c..189c70015f 100644
--- a/hw/core/machine-smp.c
+++ b/hw/core/machine-smp.c
@@ -18,7 +18,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 27372bb01e..1106f86bf5 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -14,7 +14,7 @@
 #include "qemu/units.h"
 #include "qemu/accel.h"
 #include "system/replay.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c
index 67b769bd3e..c52b022d3a 100644
--- a/hw/core/null-machine.c
+++ b/hw/core/null-machine.c
@@ -13,7 +13,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/address-spaces.h"
 #include "hw/core/cpu.h"
 #include "hw/arm/machines-qom.h"
diff --git a/hw/core/numa.c b/hw/core/numa.c
index 218576f745..fa78dacb6b 100644
--- a/hw/core/numa.c
+++ b/hw/core/numa.c
@@ -35,7 +35,7 @@
 #include "system/qtest.h"
 #include "hw/core/cpu.h"
 #include "hw/mem/pc-dimm.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/mem/memory-device.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"
diff --git a/hw/core/qdev-hotplug.c b/hw/core/qdev-hotplug.c
index ff176dc1bb..d2c39806c5 100644
--- a/hw/core/qdev-hotplug.c
+++ b/hw/core/qdev-hotplug.c
@@ -11,7 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/qdev-core.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qapi/error.h"
 
 HotplugHandler *qdev_get_machine_hotplug_handler(DeviceState *dev)
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index fab42a7270..423a3a1d66 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -34,7 +34,7 @@
 #include "qemu/option.h"
 #include "hw/irq.h"
 #include "hw/qdev-properties.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/sysbus.h"
 #include "hw/qdev-clock.h"
 #include "migration/vmstate.h"
diff --git a/hw/cpu/core.c b/hw/cpu/core.c
index 5cb2e9a7f5..26e488f3d8 100644
--- a/hw/cpu/core.c
+++ b/hw/cpu/core.c
@@ -9,7 +9,7 @@
 
 #include "qemu/osdep.h"
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/cpu/core.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
diff --git a/hw/cxl/cxl-host.c b/hw/cxl/cxl-host.c
index 0d891c651d..f3479b1991 100644
--- a/hw/cxl/cxl-host.c
+++ b/hw/cxl/cxl-host.c
@@ -11,7 +11,7 @@
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "system/qtest.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 #include "qapi/qapi-visit-machine.h"
 #include "hw/cxl/cxl.h"
diff --git a/hw/hyperv/hv-balloon.c b/hw/hyperv/hv-balloon.c
index 2d6d7db4ee..ac024accfc 100644
--- a/hw/hyperv/hv-balloon.c
+++ b/hw/hyperv/hv-balloon.c
@@ -13,7 +13,7 @@
 #include "system/address-spaces.h"
 #include "exec/cpu-common.h"
 #include "system/ramblock.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/hyperv/dynmem-proto.h"
 #include "hw/hyperv/hv-balloon.h"
 #include "hw/hyperv/vmbus.h"
diff --git a/hw/i2c/pm_smbus.c b/hw/i2c/pm_smbus.c
index 4e685fd26e..ead53d2724 100644
--- a/hw/i2c/pm_smbus.c
+++ b/hw/i2c/pm_smbus.c
@@ -19,7 +19,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/i2c/pm_smbus.h"
 #include "hw/i2c/smbus_master.h"
 #include "migration/vmstate.h"
diff --git a/hw/i2c/smbus_eeprom.c b/hw/i2c/smbus_eeprom.c
index 26e211b31a..ce3723e148 100644
--- a/hw/i2c/smbus_eeprom.c
+++ b/hw/i2c/smbus_eeprom.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/i2c/i2c.h"
 #include "hw/i2c/smbus_slave.h"
 #include "hw/qdev-properties.h"
diff --git a/hw/i386/acpi-common.h b/hw/i386/acpi-common.h
index e305aaac15..57ef024cd3 100644
--- a/hw/i386/acpi-common.h
+++ b/hw/i386/acpi-common.h
@@ -1,7 +1,7 @@
 #ifndef HW_I386_ACPI_COMMON_H
 #define HW_I386_ACPI_COMMON_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/acpi/bios-linker-loader.h"
 #include "hw/i386/x86.h"
 
diff --git a/hw/i386/fw_cfg.h b/hw/i386/fw_cfg.h
index e560fd7be8..e7e70ff237 100644
--- a/hw/i386/fw_cfg.h
+++ b/hw/i386/fw_cfg.h
@@ -9,7 +9,7 @@
 #ifndef HW_I386_FW_CFG_H
 #define HW_I386_FW_CFG_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/i386/pc.h"
 #include "hw/nvram/fw_cfg.h"
 
diff --git a/hw/i386/vapic.c b/hw/i386/vapic.c
index f1089f0a7c..3a4254638b 100644
--- a/hw/i386/vapic.c
+++ b/hw/i386/vapic.c
@@ -20,7 +20,7 @@
 #include "system/address-spaces.h"
 #include "hw/i386/apic_internal.h"
 #include "hw/sysbus.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "migration/vmstate.h"
 #include "qom/object.h"
 
diff --git a/hw/i386/vmport.c b/hw/i386/vmport.c
index 6d93457c52..32e02e1eeb 100644
--- a/hw/i386/vmport.c
+++ b/hw/i386/vmport.c
@@ -32,7 +32,7 @@
 #include "hw/isa/isa.h"
 #include "hw/i386/vmport.h"
 #include "hw/qdev-properties.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/system.h"
 #include "system/hw_accel.h"
 #include "system/qtest.h"
diff --git a/hw/i386/xen/xen-pvh.c b/hw/i386/xen/xen-pvh.c
index 067f73e977..ab90c83a83 100644
--- a/hw/i386/xen/xen-pvh.c
+++ b/hw/i386/xen/xen-pvh.c
@@ -9,7 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/system.h"
 #include "hw/xen/arch_hvm.h"
 #include <xen/hvm/hvm_info_table.h>
diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c
index ec9e978b0b..83e1bc2d75 100644
--- a/hw/intc/apic_common.c
+++ b/hw/intc/apic_common.c
@@ -27,7 +27,7 @@
 #include "hw/i386/apic_internal.h"
 #include "hw/intc/kvm_irqcount.h"
 #include "trace.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/kvm.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
diff --git a/hw/intc/loongarch_ipi.c b/hw/intc/loongarch_ipi.c
index fc8005c944..2a4557a8ba 100644
--- a/hw/intc/loongarch_ipi.c
+++ b/hw/intc/loongarch_ipi.c
@@ -7,7 +7,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qapi/error.h"
 #include "hw/intc/loongarch_ipi.h"
 #include "hw/qdev-properties.h"
diff --git a/hw/intc/loongarch_pic_kvm.c b/hw/intc/loongarch_pic_kvm.c
index 6cfddf4520..7a8b4e7b66 100644
--- a/hw/intc/loongarch_pic_kvm.c
+++ b/hw/intc/loongarch_pic_kvm.c
@@ -7,7 +7,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/intc/loongarch_pch_pic.h"
 #include "hw/loongarch/virt.h"
 #include "system/kvm.h"
diff --git a/hw/intc/riscv_aplic.c b/hw/intc/riscv_aplic.c
index a2041e7022..a559664c40 100644
--- a/hw/intc/riscv_aplic.c
+++ b/hw/intc/riscv_aplic.c
@@ -25,7 +25,7 @@
 #include "system/address-spaces.h"
 #include "hw/sysbus.h"
 #include "hw/pci/msi.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "hw/intc/riscv_aplic.h"
 #include "hw/irq.h"
diff --git a/hw/intc/riscv_imsic.c b/hw/intc/riscv_imsic.c
index 6174e1a05d..513e38d9c1 100644
--- a/hw/intc/riscv_imsic.c
+++ b/hw/intc/riscv_imsic.c
@@ -25,7 +25,7 @@
 #include "system/address-spaces.h"
 #include "hw/sysbus.h"
 #include "hw/pci/msi.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "hw/intc/riscv_imsic.h"
 #include "hw/irq.h"
diff --git a/hw/loongarch/fw_cfg.h b/hw/loongarch/fw_cfg.h
index 27ee68286e..809b06c545 100644
--- a/hw/loongarch/fw_cfg.h
+++ b/hw/loongarch/fw_cfg.h
@@ -8,7 +8,7 @@
 #ifndef HW_LOONGARCH_FW_CFG_H
 #define HW_LOONGARCH_FW_CFG_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/nvram/fw_cfg.h"
 
 FWCfgState *virt_fw_cfg_init(ram_addr_t ram_size, MachineState *ms);
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index 49434ad182..a78a9bc03d 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -9,7 +9,7 @@
 #include "qemu/datadir.h"
 #include "qapi/error.h"
 #include "exec/target_page.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/char/serial-mm.h"
 #include "system/kvm.h"
 #include "system/tcg.h"
diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c
index ff21d7779e..f67611ba0b 100644
--- a/hw/m68k/an5206.c
+++ b/hw/m68k/an5206.c
@@ -10,7 +10,7 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "hw/m68k/mcf.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "elf.h"
 #include "qemu/error-report.h"
diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c
index a25e782403..6359aa81d0 100644
--- a/hw/m68k/mcf5206.c
+++ b/hw/m68k/mcf5206.c
@@ -11,7 +11,7 @@
 #include "qemu/log.h"
 #include "cpu.h"
 #include "hw/qdev-properties.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/irq.h"
 #include "hw/m68k/mcf.h"
 #include "qemu/timer.h"
diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
index 4a585b231d..c1067435bf 100644
--- a/hw/m68k/mcf5208.c
+++ b/hw/m68k/mcf5208.c
@@ -29,7 +29,7 @@
 #include "system/system.h"
 #include "system/qtest.h"
 #include "net/net.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/sysbus.h"
 #include "elf.h"
diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c
index cfb2b319e5..d7c460bcd4 100644
--- a/hw/m68k/next-cube.c
+++ b/hw/m68k/next-cube.c
@@ -17,7 +17,7 @@
 #include "system/qtest.h"
 #include "hw/irq.h"
 #include "hw/m68k/next-cube.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/scsi/esp.h"
 #include "hw/sysbus.h"
diff --git a/hw/m68k/q800-glue.c b/hw/m68k/q800-glue.c
index 36de67c328..d663d124fc 100644
--- a/hw/m68k/q800-glue.c
+++ b/hw/m68k/q800-glue.c
@@ -23,7 +23,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "hw/m68k/q800-glue.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/irq.h"
 #include "hw/nmi.h"
 #include "hw/qdev-properties.h"
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index b8676feb41..1aaaada346 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -27,7 +27,7 @@
 #include "exec/target_page.h"
 #include "system/system.h"
 #include "cpu.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/or-irq.h"
 #include "elf.h"
 #include "hw/loader.h"
diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
index 3f65d91556..6f2b7bb5a0 100644
--- a/hw/m68k/virt.c
+++ b/hw/m68k/virt.c
@@ -13,7 +13,7 @@
 #include "exec/target_page.h"
 #include "system/system.h"
 #include "cpu.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "elf.h"
 #include "hw/loader.h"
diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c
index 1a432e9bd2..9cf82b84cf 100644
--- a/hw/mem/memory-device.c
+++ b/hw/mem/memory-device.c
@@ -13,7 +13,7 @@
 #include "qemu/error-report.h"
 #include "hw/mem/memory-device.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qemu/range.h"
 #include "hw/virtio/vhost.h"
 #include "system/kvm.h"
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index f701d5b5f9..33e5a376ff 100644
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -19,7 +19,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/mem/pc-dimm.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
index ec38107f50..39eb2386e8 100644
--- a/hw/microblaze/boot.c
+++ b/hw/microblaze/boot.c
@@ -33,7 +33,7 @@
 #include "qemu/guest-random.h"
 #include "system/device_tree.h"
 #include "system/reset.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "elf.h"
 #include "qemu/cutils.h"
diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c
index 6e923c49cf..f5b9b2e890 100644
--- a/hw/microblaze/petalogix_ml605_mmu.c
+++ b/hw/microblaze/petalogix_ml605_mmu.c
@@ -33,7 +33,7 @@
 #include "net/net.h"
 #include "hw/block/flash.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/char/serial-mm.h"
 #include "hw/qdev-properties.h"
 #include "system/address-spaces.h"
diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c
index e8d0ddfdf8..266ecf9e8a 100644
--- a/hw/microblaze/petalogix_s3adsp1800_mmu.c
+++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c
@@ -31,7 +31,7 @@
 #include "net/net.h"
 #include "hw/block/flash.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/misc/unimp.h"
 #include "system/address-spaces.h"
 #include "hw/char/xilinx_uartlite.h"
diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pmu.c
index e909802bb7..f4c55589b7 100644
--- a/hw/microblaze/xlnx-zynqmp-pmu.c
+++ b/hw/microblaze/xlnx-zynqmp-pmu.c
@@ -18,7 +18,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "system/address-spaces.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "cpu.h"
 #include "boot.h"
 
diff --git a/hw/mips/boston.c b/hw/mips/boston.c
index 6a4fcdd9ca..dc9da0b040 100644
--- a/hw/mips/boston.c
+++ b/hw/mips/boston.c
@@ -21,7 +21,7 @@
 #include "qemu/units.h"
 
 #include "elf.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/char/serial-mm.h"
 #include "hw/ide/pci.h"
 #include "hw/ide/ahci-pci.h"
diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c
index 5fe40eee65..e777863703 100644
--- a/hw/mips/fuloong2e.c
+++ b/hw/mips/fuloong2e.c
@@ -25,7 +25,7 @@
 #include "cpu.h"
 #include "hw/clock.h"
 #include "net/net.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/i2c/smbus_eeprom.h"
 #include "hw/block/flash.h"
 #include "hw/mips/mips.h"
diff --git a/hw/mips/fw_cfg.h b/hw/mips/fw_cfg.h
index e317d5b9a3..8a42d98cdf 100644
--- a/hw/mips/fw_cfg.h
+++ b/hw/mips/fw_cfg.h
@@ -9,7 +9,7 @@
 #ifndef HW_MIPS_FW_CFG_H
 #define HW_MIPS_FW_CFG_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/nvram/fw_cfg.h"
 
 /* Data for BIOS to identify machine */
diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c
index 1d6bdc0091..1708cec3f8 100644
--- a/hw/mips/jazz.c
+++ b/hw/mips/jazz.c
@@ -33,7 +33,7 @@
 #include "hw/isa/isa.h"
 #include "hw/block/fdc.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "net/net.h"
 #include "hw/scsi/esp.h"
 #include "hw/loader.h"
diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index a4e2ea98ad..f39e56d279 100644
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -34,7 +34,7 @@
 #include "hw/isa/superio.h"
 #include "hw/char/serial-mm.h"
 #include "net/net.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/i2c/smbus_eeprom.h"
 #include "hw/block/flash.h"
 #include "hw/mips/mips.h"
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index aa24050493..b696bf39e1 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -28,7 +28,7 @@
 #include "system/dma.h"
 #include "system/reset.h"
 #include "system/address-spaces.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/nvram/fw_cfg.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
index b7d9cdd900..769107e835 100644
--- a/hw/openrisc/openrisc_sim.c
+++ b/hw/openrisc/openrisc_sim.c
@@ -23,7 +23,7 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "hw/irq.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/char/serial-mm.h"
 #include "net/net.h"
 #include "hw/openrisc/boot.h"
diff --git a/hw/openrisc/virt.c b/hw/openrisc/virt.c
index a98071c936..3cfd1c0b5c 100644
--- a/hw/openrisc/virt.c
+++ b/hw/openrisc/virt.c
@@ -13,7 +13,7 @@
 #include "cpu.h"
 #include "system/address-spaces.h"
 #include "hw/irq.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/char/serial-mm.h"
 #include "hw/core/split-irq.h"
 #include "hw/openrisc/boot.h"
diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expander_bridge.c
index 1bcceddbc4..b3a5f16e22 100644
--- a/hw/pci-bridge/pci_expander_bridge.c
+++ b/hw/pci-bridge/pci_expander_bridge.c
@@ -24,7 +24,7 @@
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "system/numa.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qom/object.h"
 
 enum BusType { PCI, PCIE, CXL };
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index b1eba348e0..e03953813c 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -46,7 +46,7 @@
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
 #include "hw/hotplug.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/nvram/fw_cfg.h"
 #include "qapi/error.h"
 #include "qemu/cutils.h"
diff --git a/hw/ppc/amigaone.c b/hw/ppc/amigaone.c
index 74a1fa3b63..3df4724a72 100644
--- a/hw/ppc/amigaone.c
+++ b/hw/ppc/amigaone.c
@@ -14,7 +14,7 @@
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "hw/ppc/ppc.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/pci-host/articia.h"
 #include "hw/isa/vt82c686.h"
diff --git a/hw/ppc/e500.h b/hw/ppc/e500.h
index 00f490519c..cda539bda1 100644
--- a/hw/ppc/e500.h
+++ b/hw/ppc/e500.h
@@ -1,7 +1,7 @@
 #ifndef PPCE500_H
 #define PPCE500_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/platform-bus.h"
 #include "qom/object.h"
 
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 739f1af3e1..bdc6c7ed7f 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -54,7 +54,7 @@
 #include "hw/ppc/ppc.h"
 #include "hw/qdev-properties.h"
 #include "hw/nvram/mac_nvram.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/pci-host/uninorth.h"
 #include "hw/input/adb.h"
 #include "hw/ppc/mac_dbdma.h"
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index cd2bb46442..8d35080b9d 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -31,7 +31,7 @@
 #include "exec/target_page.h"
 #include "hw/ppc/ppc.h"
 #include "hw/qdev-properties.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/input/adb.h"
 #include "system/system.h"
 #include "net/net.h"
diff --git a/hw/ppc/pegasos.c b/hw/ppc/pegasos.c
index 8ce185de3e..3b48a54e7a 100644
--- a/hw/ppc/pegasos.c
+++ b/hw/ppc/pegasos.c
@@ -24,7 +24,7 @@
 #include "system/reset.h"
 #include "system/runstate.h"
 #include "system/qtest.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/fw-path-provider.h"
 #include "elf.h"
diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index 7e739a2114..824dd91ed5 100644
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -18,7 +18,7 @@
 #include "exec/page-protection.h"
 #include "net/net.h"
 #include "hw/pci/pci.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/kvm.h"
 #include "system/device_tree.h"
 #include "hw/loader.h"
diff --git a/hw/ppc/ppe42_machine.c b/hw/ppc/ppe42_machine.c
index f14a91b4e4..6c9bc89e2d 100644
--- a/hw/ppc/ppe42_machine.c
+++ b/hw/ppc/ppe42_machine.c
@@ -10,7 +10,7 @@
 #include "qemu/units.h"
 #include "qemu/error-report.h"
 #include "system/address-spaces.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/ppc/ppc.h"
 #include "system/system.h"
 #include "system/reset.h"
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 5654a60c59..0d5e1f604e 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -31,7 +31,7 @@
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_host.h"
 #include "hw/ppc/ppc.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/log.h"
diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
index 038b98d0b8..992bfe39a3 100644
--- a/hw/ppc/sam460ex.c
+++ b/hw/ppc/sam460ex.c
@@ -16,7 +16,7 @@
 #include "qemu/datadir.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/kvm.h"
 #include "kvm_ppc.h"
 #include "system/device_tree.h"
diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index 43a6d505a8..8221a01639 100644
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -32,7 +32,7 @@
 #include "hw/block/flash.h"
 #include "system/system.h"
 #include "system/reset.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/device_tree.h"
 #include "hw/loader.h"
 #include "elf.h"
diff --git a/hw/remote/vfio-user-obj.c b/hw/remote/vfio-user-obj.c
index 216b4876e2..13cda2f481 100644
--- a/hw/remote/vfio-user-obj.c
+++ b/hw/remote/vfio-user-obj.c
@@ -44,7 +44,7 @@
 #include "qemu/error-report.h"
 #include "trace.h"
 #include "system/runstate.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/remote/machine.h"
 #include "qapi/error.h"
 #include "qapi/qapi-visit-sockets.h"
diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
index 75f34287ff..4f207dee28 100644
--- a/hw/riscv/boot.c
+++ b/hw/riscv/boot.c
@@ -22,7 +22,7 @@
 #include "qemu/units.h"
 #include "qemu/error-report.h"
 #include "exec/cpu-defs.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/riscv/boot.h"
 #include "hw/riscv/boot_opensbi.h"
diff --git a/hw/riscv/microblaze-v-generic.c b/hw/riscv/microblaze-v-generic.c
index e863c50cbc..8a461a0dd5 100644
--- a/hw/riscv/microblaze-v-generic.c
+++ b/hw/riscv/microblaze-v-generic.c
@@ -20,7 +20,7 @@
 #include "hw/sysbus.h"
 #include "system/system.h"
 #include "net/net.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/char/serial-mm.h"
 #include "system/address-spaces.h"
 #include "hw/char/xilinx_uartlite.h"
diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c
index a17f62cd08..4398f7b182 100644
--- a/hw/riscv/microchip_pfsoc.c
+++ b/hw/riscv/microchip_pfsoc.c
@@ -40,7 +40,7 @@
 #include "qemu/cutils.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/sysbus.h"
 #include "chardev/char.h"
diff --git a/hw/riscv/numa.c b/hw/riscv/numa.c
index 7a7b012007..726df2daf1 100644
--- a/hw/riscv/numa.c
+++ b/hw/riscv/numa.c
@@ -20,7 +20,7 @@
 #include "qemu/units.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "hw/riscv/numa.h"
 #include "system/device_tree.h"
diff --git a/hw/riscv/opentitan.c b/hw/riscv/opentitan.c
index d369a8a7dc..309125e854 100644
--- a/hw/riscv/opentitan.c
+++ b/hw/riscv/opentitan.c
@@ -23,7 +23,7 @@
 #include "hw/riscv/opentitan.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/misc/unimp.h"
 #include "hw/riscv/boot.h"
 #include "qemu/units.h"
diff --git a/hw/riscv/shakti_c.c b/hw/riscv/shakti_c.c
index 3e7f441172..d309ea2e39 100644
--- a/hw/riscv/shakti_c.c
+++ b/hw/riscv/shakti_c.c
@@ -17,7 +17,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/riscv/shakti_c.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c
index 7baed1958e..abe411e305 100644
--- a/hw/riscv/sifive_e.c
+++ b/hw/riscv/sifive_e.c
@@ -32,7 +32,7 @@
 #include "qemu/cutils.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/sysbus.h"
 #include "hw/misc/unimp.h"
diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
index a7492aa27a..6839a2635e 100644
--- a/hw/riscv/sifive_u.c
+++ b/hw/riscv/sifive_u.c
@@ -39,7 +39,7 @@
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/irq.h"
 #include "hw/loader.h"
 #include "hw/sysbus.h"
diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c
index b0bab3fe00..6aa688acf3 100644
--- a/hw/riscv/spike.c
+++ b/hw/riscv/spike.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/sysbus.h"
 #include "target/riscv/cpu.h"
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
index 17909206c7..45a845318e 100644
--- a/hw/riscv/virt.c
+++ b/hw/riscv/virt.c
@@ -23,7 +23,7 @@
 #include "qemu/error-report.h"
 #include "qemu/guest-random.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/sysbus.h"
 #include "hw/qdev-properties.h"
diff --git a/hw/riscv/xiangshan_kmh.c b/hw/riscv/xiangshan_kmh.c
index a95fd6174f..e831954cb3 100644
--- a/hw/riscv/xiangshan_kmh.c
+++ b/hw/riscv/xiangshan_kmh.c
@@ -32,7 +32,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "system/address-spaces.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/char/serial-mm.h"
 #include "hw/intc/riscv_aclint.h"
 #include "hw/intc/riscv_aplic.h"
diff --git a/hw/rx/rx-gdbsim.c b/hw/rx/rx-gdbsim.c
index ed91c63178..1a33082857 100644
--- a/hw/rx/rx-gdbsim.c
+++ b/hw/rx/rx-gdbsim.c
@@ -27,7 +27,7 @@
 #include "system/qtest.h"
 #include "system/device_tree.h"
 #include "system/reset.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qom/object.h"
 
 /* Same address of GDB integrated simulator */
diff --git a/hw/s390x/cpu-topology.c b/hw/s390x/cpu-topology.c
index b513f8936e..9182ddb628 100644
--- a/hw/s390x/cpu-topology.c
+++ b/hw/s390x/cpu-topology.c
@@ -19,7 +19,7 @@
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "hw/qdev-properties.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "target/s390x/cpu.h"
 #include "hw/s390x/s390-virtio-ccw.h"
 #include "hw/s390x/cpu-topology.h"
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index 3843d2a850..f1c2af15f7 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -21,7 +21,7 @@
 #include "elf.h"
 #include "hw/loader.h"
 #include "hw/qdev-properties.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/s390x/virtio-ccw.h"
 #include "hw/s390x/vfio-ccw.h"
 #include "hw/s390x/css.h"
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index 52820894fa..3eea2f0c9d 100644
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -20,7 +20,7 @@
 #include "hw/s390x/s390-pci-kvm.h"
 #include "hw/s390x/s390-pci-vfio.h"
 #include "hw/s390x/s390-virtio-ccw.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/qdev-properties.h"
 #include "hw/pci/pci_bridge.h"
diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c
index 5841dfc4fe..6b67c3c109 100644
--- a/hw/s390x/s390-pci-inst.c
+++ b/hw/s390x/s390-pci-inst.c
@@ -18,7 +18,7 @@
 #include "qemu/error-report.h"
 #include "qemu/bswap.h"
 #include "system/hw_accel.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/pci/pci_device.h"
 #include "hw/s390x/s390-pci-inst.h"
 #include "hw/s390x/s390-pci-bus.h"
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 64b81345f1..29d95be2c6 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -14,7 +14,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "system/confidential-guest-support.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/s390x/sclp.h"
 #include "hw/s390x/s390_flic.h"
 #include "virtio-ccw.h"
diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c
index c9a9c4bb37..b9c3983df1 100644
--- a/hw/s390x/sclp.c
+++ b/hw/s390x/sclp.c
@@ -15,7 +15,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/memory.h"
 #include "hw/s390x/sclp.h"
 #include "hw/s390x/event-facility.h"
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index c29ee69069..bccd40f571 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -33,7 +33,7 @@
 #include "system/reset.h"
 #include "system/runstate.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/pci/pci.h"
 #include "hw/qdev-properties.h"
 #include "net/net.h"
diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
index 7558b2ad83..071c3b5e62 100644
--- a/hw/smbios/smbios.c
+++ b/hw/smbios/smbios.c
@@ -26,7 +26,7 @@
 #include "qemu/uuid.h"
 #include "hw/firmware/smbios.h"
 #include "hw/loader.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/pci/pci_device.h"
 #include "smbios_build.h"
diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index 631c6113b5..367beecf19 100644
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -37,7 +37,7 @@
 #include "system/system.h"
 #include "system/qtest.h"
 #include "system/reset.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "elf.h"
 #include "trace.h"
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 53d7ae08ae..b0d2d6f8bc 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -40,7 +40,7 @@
 #include "system/runstate.h"
 #include "system/system.h"
 #include "net/net.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/scsi/esp.h"
 #include "hw/nvram/sun_nvram.h"
 #include "hw/qdev-properties.h"
diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c
index 1ffe92060a..334bec14ba 100644
--- a/hw/sparc64/niagara.c
+++ b/hw/sparc64/niagara.c
@@ -26,7 +26,7 @@
 #include "block/block_int-common.h"
 #include "qemu/units.h"
 #include "cpu.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/char/serial-mm.h"
 #include "hw/misc/unimp.h"
 #include "hw/loader.h"
diff --git a/hw/sparc64/sparc64.c b/hw/sparc64/sparc64.c
index 9cffc92aa3..ce7eded143 100644
--- a/hw/sparc64/sparc64.c
+++ b/hw/sparc64/sparc64.c
@@ -26,7 +26,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "cpu.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/sparc/sparc64.h"
 #include "qemu/timer.h"
 #include "system/reset.h"
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index 82c3e7c855..961d599f48 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -46,7 +46,7 @@
 #include "qemu/timer.h"
 #include "system/runstate.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/nvram/sun_nvram.h"
 #include "hw/nvram/chrp_nvram.h"
 #include "hw/sparc/sparc64.h"
diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c
index 3facfdfd61..21b119712c 100644
--- a/hw/tricore/tricore_testboard.c
+++ b/hw/tricore/tricore_testboard.c
@@ -23,7 +23,7 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "net/net.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "elf.h"
 #include "hw/tricore/tricore.h"
diff --git a/hw/uefi/ovmf-log.c b/hw/uefi/ovmf-log.c
index 850ef21f88..3a24afd941 100644
--- a/hw/uefi/ovmf-log.c
+++ b/hw/uefi/ovmf-log.c
@@ -9,7 +9,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "qemu/target-info-qapi.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/i386/x86.h"
 #include "hw/arm/virt.h"
 #include "system/dma.h"
diff --git a/hw/vfio/igd.c b/hw/vfio/igd.c
index 4bfa2e0fcd..cff413c16f 100644
--- a/hw/vfio/igd.c
+++ b/hw/vfio/igd.c
@@ -15,7 +15,7 @@
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/hw.h"
 #include "hw/nvram/fw_cfg.h"
 #include "pci.h"
diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
index 02cdd807d7..bcf6ab6443 100644
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -21,7 +21,7 @@
 #include "hw/virtio/virtio.h"
 #include "hw/mem/pc-dimm.h"
 #include "hw/qdev-properties.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/balloon.h"
 #include "system/ramblock.h"
 #include "hw/virtio/virtio-balloon.h"
diff --git a/hw/virtio/virtio-iommu-pci.c b/hw/virtio/virtio-iommu-pci.c
index 8123c6f83a..dd4100033f 100644
--- a/hw/virtio/virtio-iommu-pci.c
+++ b/hw/virtio/virtio-iommu-pci.c
@@ -16,7 +16,7 @@
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/pci/pci_bus.h"
 #include "qom/object.h"
 
diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
index ae7c13e33c..5d1d90edc5 100644
--- a/hw/virtio/virtio-mem.c
+++ b/hw/virtio/virtio-mem.c
@@ -27,7 +27,7 @@
 #include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "migration/misc.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "hw/acpi/acpi.h"
 #include "trace.h"
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 99cb30fe59..263e112a5c 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -20,7 +20,7 @@
 #include "exec/memop.h"
 #include "standard-headers/linux/virtio_pci.h"
 #include "standard-headers/linux/virtio_ids.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/virtio/virtio.h"
 #include "migration/qemu-file-types.h"
 #include "hw/pci/pci.h"
diff --git a/hw/vmapple/vmapple.c b/hw/vmapple/vmapple.c
index 62d33525ba..5da28cf72b 100644
--- a/hw/vmapple/vmapple.c
+++ b/hw/vmapple/vmapple.c
@@ -25,7 +25,7 @@
 #include "qemu/option.h"
 #include "qemu/units.h"
 #include "monitor/qdev.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/irq.h"
 #include "hw/loader.h"
 #include "hw/qdev-properties.h"
diff --git a/hw/xen/xen-hvm-common.c b/hw/xen/xen-hvm-common.c
index b40ae0b3af..5d11b50db9 100644
--- a/hw/xen/xen-hvm-common.c
+++ b/hw/xen/xen-hvm-common.c
@@ -11,7 +11,7 @@
 #include "hw/pci/pci_host.h"
 #include "hw/xen/xen-hvm-common.h"
 #include "hw/xen/xen-bus.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/xen/arch_hvm.h"
 #include "system/memory.h"
 #include "system/runstate.h"
diff --git a/hw/xen/xen-legacy-backend.c b/hw/xen/xen-legacy-backend.c
index 5ed53f8943..da9a8e5213 100644
--- a/hw/xen/xen-legacy-backend.c
+++ b/hw/xen/xen-legacy-backend.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 
 #include "hw/sysbus.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "qemu/main-loop.h"
 #include "qapi/error.h"
diff --git a/hw/xen/xen-pvh-common.c b/hw/xen/xen-pvh-common.c
index b93ff80c85..c3fc501fe6 100644
--- a/hw/xen/xen-pvh-common.c
+++ b/hw/xen/xen-pvh-common.c
@@ -10,7 +10,7 @@
 #include "qemu/error-report.h"
 #include "qemu/units.h"
 #include "qapi/visitor.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/irq.h"
 #include "system/tpm.h"
 #include "system/tpm_backend.h"
diff --git a/hw/xenpv/xen_machine_pv.c b/hw/xenpv/xen_machine_pv.c
index 99c02492ef..c406821c34 100644
--- a/hw/xenpv/xen_machine_pv.c
+++ b/hw/xenpv/xen_machine_pv.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/xen/xen-legacy-backend.h"
 #include "hw/xen/xen-bus.h"
 #include "system/block-backend.h"
diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c
index 49d17e7bb2..37acc562d2 100644
--- a/hw/xtensa/sim.c
+++ b/hw/xtensa/sim.c
@@ -29,7 +29,7 @@
 #include "qapi/error.h"
 #include "system/reset.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "elf.h"
 #include "system/memory.h"
diff --git a/hw/xtensa/virt.c b/hw/xtensa/virt.c
index b10866ccd8..b9e324c285 100644
--- a/hw/xtensa/virt.c
+++ b/hw/xtensa/virt.c
@@ -28,7 +28,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "system/reset.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/pci-host/gpex.h"
 #include "net/net.h"
diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
index db3b015549..694456aa0a 100644
--- a/hw/xtensa/xtfpga.c
+++ b/hw/xtensa/xtfpga.c
@@ -30,7 +30,7 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/qdev-properties.h"
 #include "elf.h"
diff --git a/include/hw/acpi/cpu.h b/include/hw/acpi/cpu.h
index 32654dc274..95dc58b5ad 100644
--- a/include/hw/acpi/cpu.h
+++ b/include/hw/acpi/cpu.h
@@ -16,7 +16,7 @@
 #include "hw/qdev-core.h"
 #include "hw/acpi/acpi.h"
 #include "hw/acpi/aml-build.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/hotplug.h"
 
 #define ACPI_CPU_HOTPLUG_REG_LEN 12
diff --git a/include/hw/arm/aspeed.h b/include/hw/arm/aspeed.h
index 714bbd326c..a00238ed74 100644
--- a/include/hw/arm/aspeed.h
+++ b/include/hw/arm/aspeed.h
@@ -9,7 +9,7 @@
 #ifndef ARM_ASPEED_H
 #define ARM_ASPEED_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qom/object.h"
 #include "hw/arm/aspeed_soc.h"
 
diff --git a/include/hw/arm/machines-qom.h b/include/hw/arm/machines-qom.h
index 3f64d5eb02..3ed39384e5 100644
--- a/include/hw/arm/machines-qom.h
+++ b/include/hw/arm/machines-qom.h
@@ -9,7 +9,7 @@
 #ifndef HW_ARM_MACHINES_QOM_H
 #define HW_ARM_MACHINES_QOM_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 #define TYPE_TARGET_ARM_MACHINE \
         "target-info-arm-machine"
diff --git a/include/hw/arm/npcm7xx.h b/include/hw/arm/npcm7xx.h
index 56536565b7..eef7cc5332 100644
--- a/include/hw/arm/npcm7xx.h
+++ b/include/hw/arm/npcm7xx.h
@@ -16,7 +16,7 @@
 #ifndef NPCM7XX_H
 #define NPCM7XX_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/adc/npcm7xx_adc.h"
 #include "hw/core/split-irq.h"
 #include "hw/cpu/a9mpcore.h"
diff --git a/include/hw/arm/raspi_platform.h b/include/hw/arm/raspi_platform.h
index 7bc4807fa5..c52b9e298d 100644
--- a/include/hw/arm/raspi_platform.h
+++ b/include/hw/arm/raspi_platform.h
@@ -28,7 +28,7 @@
 #ifndef HW_ARM_RASPI_PLATFORM_H
 #define HW_ARM_RASPI_PLATFORM_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/arm/boot.h"
 
 /* Registered machine type (matches RPi Foundation bootloader and U-Boot) */
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
index c77a33f6df..8694aaa4e2 100644
--- a/include/hw/arm/virt.h
+++ b/include/hw/arm/virt.h
@@ -32,7 +32,7 @@
 
 #include "exec/hwaddr.h"
 #include "qemu/notify.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/acpi/ghes.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/bsa.h"
diff --git a/include/hw/boards.h b/include/hw/core/boards.h
similarity index 100%
rename from include/hw/boards.h
rename to include/hw/core/boards.h
diff --git a/include/hw/cxl/cxl_host.h b/include/hw/cxl/cxl_host.h
index cd3c368c86..21619bb748 100644
--- a/include/hw/cxl/cxl_host.h
+++ b/include/hw/cxl/cxl_host.h
@@ -8,7 +8,7 @@
  */
 
 #include "hw/cxl/cxl.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 #ifndef CXL_HOST_H
 #define CXL_HOST_H
diff --git a/include/hw/i386/microvm.h b/include/hw/i386/microvm.h
index e73d1e65de..6b9a506527 100644
--- a/include/hw/i386/microvm.h
+++ b/include/hw/i386/microvm.h
@@ -21,7 +21,7 @@
 #include "exec/hwaddr.h"
 #include "qemu/notify.h"
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/i386/x86.h"
 #include "hw/acpi/acpi_dev_interface.h"
 #include "hw/pci-host/gpex.h"
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index e83157ab35..ade2da92ba 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -4,7 +4,7 @@
 #include "qemu/notify.h"
 #include "qapi/qapi-types-common.h"
 #include "qemu/uuid.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/block/fdc.h"
 #include "hw/block/flash.h"
 #include "hw/i386/x86.h"
diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h
index 8755cad50a..0dffba95f9 100644
--- a/include/hw/i386/x86.h
+++ b/include/hw/i386/x86.h
@@ -20,7 +20,7 @@
 #include "exec/hwaddr.h"
 #include "system/memory.h"
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/i386/topology.h"
 #include "hw/intc/ioapic.h"
 #include "hw/isa/isa.h"
diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h
index 27b1755802..8a04dd8314 100644
--- a/include/hw/loongarch/virt.h
+++ b/include/hw/loongarch/virt.h
@@ -8,7 +8,7 @@
 #ifndef HW_LOONGARCH_H
 #define HW_LOONGARCH_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qemu/queue.h"
 #include "hw/block/flash.h"
 #include "hw/loongarch/boot.h"
diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h
index 9caaed9692..c92da2e2ac 100644
--- a/include/hw/m68k/q800.h
+++ b/include/hw/m68k/q800.h
@@ -23,7 +23,7 @@
 #ifndef HW_Q800_H
 #define HW_Q800_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qom/object.h"
 #include "target/m68k/cpu-qom.h"
 #include "system/memory.h"
diff --git a/include/hw/misc/lasi.h b/include/hw/misc/lasi.h
index 0e95be1c32..5e40c6aebd 100644
--- a/include/hw/misc/lasi.h
+++ b/include/hw/misc/lasi.h
@@ -13,7 +13,7 @@
 #define LASI_H
 
 #include "system/address-spaces.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/sysbus.h"
 
 #define TYPE_LASI_CHIP "lasi-chip"
diff --git a/include/hw/openrisc/boot.h b/include/hw/openrisc/boot.h
index 9b4d88072c..3c481bdea6 100644
--- a/include/hw/openrisc/boot.h
+++ b/include/hw/openrisc/boot.h
@@ -20,7 +20,7 @@
 #define OPENRISC_BOOT_H
 
 #include "exec/cpu-defs.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 hwaddr openrisc_load_kernel(ram_addr_t ram_size,
                             const char *kernel_filename,
diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h
index cbdddfc73c..a8c1968f28 100644
--- a/include/hw/ppc/pnv.h
+++ b/include/hw/ppc/pnv.h
@@ -21,7 +21,7 @@
 #define PPC_PNV_H
 
 #include "cpu.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/sysbus.h"
 #include "hw/ipmi/ipmi.h"
 #include "hw/ppc/pnv_pnor.h"
diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
index 28cf2723d8..5476ac7ce7 100644
--- a/include/hw/ppc/spapr.h
+++ b/include/hw/ppc/spapr.h
@@ -3,7 +3,7 @@
 
 #include "qemu/units.h"
 #include "system/dma.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/ppc/spapr_drc.h"
 #include "hw/mem/pc-dimm.h"
 #include "hw/ppc/spapr_ovec.h"
diff --git a/include/hw/ppc/spapr_numa.h b/include/hw/ppc/spapr_numa.h
index 7cb3367400..e07edf2ee6 100644
--- a/include/hw/ppc/spapr_numa.h
+++ b/include/hw/ppc/spapr_numa.h
@@ -13,7 +13,7 @@
 #ifndef HW_SPAPR_NUMA_H
 #define HW_SPAPR_NUMA_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/ppc/spapr.h"
 
 /*
diff --git a/include/hw/remote/machine.h b/include/hw/remote/machine.h
index ac32fda387..748b69c6fc 100644
--- a/include/hw/remote/machine.h
+++ b/include/hw/remote/machine.h
@@ -12,7 +12,7 @@
 #define REMOTE_MACHINE_H
 
 #include "qom/object.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/pci-host/remote.h"
 #include "io/channel.h"
 #include "hw/remote/iohub.h"
diff --git a/include/hw/riscv/microchip_pfsoc.h b/include/hw/riscv/microchip_pfsoc.h
index 7ca9b976c1..a30b944afa 100644
--- a/include/hw/riscv/microchip_pfsoc.h
+++ b/include/hw/riscv/microchip_pfsoc.h
@@ -22,7 +22,7 @@
 #ifndef HW_MICROCHIP_PFSOC_H
 #define HW_MICROCHIP_PFSOC_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/char/mchp_pfsoc_mmuart.h"
 #include "hw/cpu/cluster.h"
 #include "hw/dma/sifive_pdma.h"
diff --git a/include/hw/riscv/numa.h b/include/hw/riscv/numa.h
index 147f01619b..2d9c41ba81 100644
--- a/include/hw/riscv/numa.h
+++ b/include/hw/riscv/numa.h
@@ -19,7 +19,7 @@
 #ifndef RISCV_NUMA_H
 #define RISCV_NUMA_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/sysbus.h"
 #include "system/numa.h"
 
diff --git a/include/hw/riscv/opentitan.h b/include/hw/riscv/opentitan.h
index 609473d07b..5b9016e1d8 100644
--- a/include/hw/riscv/opentitan.h
+++ b/include/hw/riscv/opentitan.h
@@ -24,7 +24,7 @@
 #include "hw/char/ibex_uart.h"
 #include "hw/timer/ibex_timer.h"
 #include "hw/ssi/ibex_spi_host.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qom/object.h"
 
 #define TYPE_RISCV_IBEX_SOC "riscv.lowrisc.ibex.soc"
diff --git a/include/hw/riscv/shakti_c.h b/include/hw/riscv/shakti_c.h
index 539fe1156d..f90a3bca8d 100644
--- a/include/hw/riscv/shakti_c.h
+++ b/include/hw/riscv/shakti_c.h
@@ -20,7 +20,7 @@
 #define HW_SHAKTI_C_H
 
 #include "hw/riscv/riscv_hart.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/char/shakti_uart.h"
 
 #define TYPE_RISCV_SHAKTI_SOC "riscv.shakti.cclass.soc"
diff --git a/include/hw/riscv/sifive_e.h b/include/hw/riscv/sifive_e.h
index 31180a680e..4cf902ebc0 100644
--- a/include/hw/riscv/sifive_e.h
+++ b/include/hw/riscv/sifive_e.h
@@ -23,7 +23,7 @@
 #include "hw/riscv/sifive_cpu.h"
 #include "hw/gpio/sifive_gpio.h"
 #include "hw/misc/sifive_e_aon.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 #define TYPE_RISCV_E_SOC "riscv.sifive.e.soc"
 #define RISCV_E_SOC(obj) \
diff --git a/include/hw/riscv/sifive_u.h b/include/hw/riscv/sifive_u.h
index 0696f85942..e4c9860d50 100644
--- a/include/hw/riscv/sifive_u.h
+++ b/include/hw/riscv/sifive_u.h
@@ -19,7 +19,7 @@
 #ifndef HW_SIFIVE_U_H
 #define HW_SIFIVE_U_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/cpu/cluster.h"
 #include "hw/dma/sifive_pdma.h"
 #include "hw/net/cadence_gem.h"
diff --git a/include/hw/riscv/spike.h b/include/hw/riscv/spike.h
index 0c2a223763..acd41e9058 100644
--- a/include/hw/riscv/spike.h
+++ b/include/hw/riscv/spike.h
@@ -19,7 +19,7 @@
 #ifndef HW_RISCV_SPIKE_H
 #define HW_RISCV_SPIKE_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/riscv/riscv_hart.h"
 #include "hw/sysbus.h"
 
diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h
index 7b4c2c8b7d..806b78cc63 100644
--- a/include/hw/riscv/virt.h
+++ b/include/hw/riscv/virt.h
@@ -19,7 +19,7 @@
 #ifndef HW_RISCV_VIRT_H
 #define HW_RISCV_VIRT_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/riscv/riscv_hart.h"
 #include "hw/sysbus.h"
 #include "hw/block/flash.h"
diff --git a/include/hw/riscv/xiangshan_kmh.h b/include/hw/riscv/xiangshan_kmh.h
index c5dc6b1a9a..5a5af93dff 100644
--- a/include/hw/riscv/xiangshan_kmh.h
+++ b/include/hw/riscv/xiangshan_kmh.h
@@ -10,7 +10,7 @@
 #ifndef HW_XIANGSHAN_KMH_H
 #define HW_XIANGSHAN_KMH_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/riscv/riscv_hart.h"
 
 #define XIANGSHAN_KMH_MAX_CPUS 16
diff --git a/include/hw/s390x/cpu-topology.h b/include/hw/s390x/cpu-topology.h
index d5e9aa43f8..2d5a5fa364 100644
--- a/include/hw/s390x/cpu-topology.h
+++ b/include/hw/s390x/cpu-topology.h
@@ -12,7 +12,7 @@
 #ifndef CONFIG_USER_ONLY
 
 #include "qemu/queue.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qapi/qapi-types-machine-s390x.h"
 
 #define S390_TOPOLOGY_CPU_IFL   0x03
diff --git a/include/hw/s390x/s390-virtio-ccw.h b/include/hw/s390x/s390-virtio-ccw.h
index 526078a4e2..f1f06119d6 100644
--- a/include/hw/s390x/s390-virtio-ccw.h
+++ b/include/hw/s390x/s390-virtio-ccw.h
@@ -11,7 +11,7 @@
 #ifndef HW_S390X_S390_VIRTIO_CCW_H
 #define HW_S390X_S390_VIRTIO_CCW_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qom/object.h"
 #include "hw/s390x/sclp.h"
 
diff --git a/include/hw/tricore/triboard.h b/include/hw/tricore/triboard.h
index ca49a0c752..c6be4dc3f3 100644
--- a/include/hw/tricore/triboard.h
+++ b/include/hw/tricore/triboard.h
@@ -19,7 +19,7 @@
  */
 
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/system.h"
 #include "system/address-spaces.h"
 #include "qom/object.h"
diff --git a/include/hw/xen/xen-pvh-common.h b/include/hw/xen/xen-pvh-common.h
index 5db83d88ec..0ed07c5694 100644
--- a/include/hw/xen/xen-pvh-common.h
+++ b/include/hw/xen/xen-pvh-common.h
@@ -11,7 +11,7 @@
 
 #include "system/memory.h"
 #include "qom/object.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/pci-host/gpex.h"
 #include "hw/xen/xen-hvm-common.h"
 
diff --git a/include/system/kvm_int.h b/include/system/kvm_int.h
index 9247493b02..baeb166d39 100644
--- a/include/system/kvm_int.h
+++ b/include/system/kvm_int.h
@@ -15,7 +15,7 @@
 #include "qemu/queue.h"
 #include "system/kvm.h"
 #include "accel/accel-ops.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/i386/topology.h"
 #include "io/channel-socket.h"
 
diff --git a/migration/migration.c b/migration/migration.c
index b316ee01ab..697f460c4a 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -54,7 +54,7 @@
 #include "io/channel-buffer.h"
 #include "io/channel-tls.h"
 #include "migration/colo.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "monitor/monitor.h"
 #include "net/announce.h"
 #include "qemu/queue.h"
diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index 715ef021a9..15997f7151 100644
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -30,7 +30,7 @@
 #include "system/system.h"
 #include "qemu/error-report.h"
 #include "trace.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/ramblock.h"
 #include "socket.h"
 #include "yank_functions.h"
diff --git a/migration/ram.c b/migration/ram.c
index 29f016cb25..6b469238ad 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -64,7 +64,7 @@
 #include "system/dirtylimit.h"
 #include "system/kvm.h"
 
-#include "hw/boards.h" /* for machine_dump_guest_core() */
+#include "hw/core/boards.h" /* for machine_dump_guest_core() */
 
 #if defined(__linux__)
 #include "qemu/userfaultfd.h"
diff --git a/migration/savevm.c b/migration/savevm.c
index 62cc2ce25c..73e185caf5 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -27,7 +27,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "net/net.h"
 #include "migration.h"
 #include "migration/snapshot.h"
diff --git a/monitor/qemu-config-qmp.c b/monitor/qemu-config-qmp.c
index 8bd28fc232..2980102356 100644
--- a/monitor/qemu-config-qmp.c
+++ b/monitor/qemu-config-qmp.c
@@ -6,7 +6,7 @@
 #include "qobject/qlist.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 static CommandLineParameterInfoList *query_option_descs(const QemuOptDesc *desc)
 {
diff --git a/plugins/api-system.c b/plugins/api-system.c
index cc190b167e..9a70b9caa6 100644
--- a/plugins/api-system.c
+++ b/plugins/api-system.c
@@ -14,7 +14,7 @@
 #include "qemu/main-loop.h"
 #include "qapi/error.h"
 #include "migration/blocker.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qemu/plugin-memory.h"
 #include "qemu/plugin.h"
 
diff --git a/plugins/system.c b/plugins/system.c
index b3ecc33ba5..88ff60ee2b 100644
--- a/plugins/system.c
+++ b/plugins/system.c
@@ -11,7 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/plugin.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 #include "plugin.h"
 
diff --git a/scripts/compare-machine-types.py b/scripts/compare-machine-types.py
index 2af3995eb8..b4f899082a 100755
--- a/scripts/compare-machine-types.py
+++ b/scripts/compare-machine-types.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Script to compare machine type compatible properties (include/hw/boards.h).
+# Script to compare machine type compatible properties (include/hw/core/boards.h).
 # compat_props are applied to the driver during initialization to change
 # default values, for instance, to maintain compatibility.
 # This script constructs table with machines and values of their compat_props
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index c5a07cb947..2e9fa5842f 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -48,7 +48,7 @@
 #else
 #include "qemu/cutils.h"
 #include "hw/loader.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #endif
 
 #define TARGET_SYS_OPEN        0x01
diff --git a/system/bootdevice.c b/system/bootdevice.c
index 1845be4507..8acdbfb0a5 100644
--- a/system/bootdevice.c
+++ b/system/bootdevice.c
@@ -29,7 +29,7 @@
 #include "qemu/error-report.h"
 #include "system/reset.h"
 #include "hw/qdev-core.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 typedef struct FWBootEntry FWBootEntry;
 
diff --git a/system/cpus.c b/system/cpus.c
index ef2d2f241f..0b1eabd3c4 100644
--- a/system/cpus.c
+++ b/system/cpus.c
@@ -44,7 +44,7 @@
 #include "system/runstate.h"
 #include "system/cpu-timers.h"
 #include "system/whpx.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/hw.h"
 #include "trace.h"
 
diff --git a/system/device_tree.c b/system/device_tree.c
index 7850b90fa7..3ccdf33374 100644
--- a/system/device_tree.c
+++ b/system/device_tree.c
@@ -25,7 +25,7 @@
 #include "qemu/guest-random.h"
 #include "system/device_tree.h"
 #include "hw/loader.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qemu/config-file.h"
 #include "qapi/qapi-commands-machine.h"
 #include "qobject/qdict.h"
diff --git a/system/dirtylimit.c b/system/dirtylimit.c
index b48c0d4b3d..a0c327533c 100644
--- a/system/dirtylimit.c
+++ b/system/dirtylimit.c
@@ -21,7 +21,7 @@
 #include "monitor/monitor.h"
 #include "system/memory.h"
 #include "exec/target_page.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/kvm.h"
 #include "trace.h"
 #include "migration/misc.h"
diff --git a/system/memory.c b/system/memory.c
index 8b84661ae3..b65219c2e4 100644
--- a/system/memory.c
+++ b/system/memory.c
@@ -32,7 +32,7 @@
 #include "system/tcg.h"
 #include "qemu/accel.h"
 #include "accel/accel-ops.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "migration/vmstate.h"
 #include "system/address-spaces.h"
 
diff --git a/system/physmem.c b/system/physmem.c
index c9869e4049..edc384f4fa 100644
--- a/system/physmem.c
+++ b/system/physmem.c
@@ -38,7 +38,7 @@
 #include "exec/translation-block.h"
 #include "hw/qdev-core.h"
 #include "hw/qdev-properties.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/xen.h"
 #include "system/kvm.h"
 #include "system/tcg.h"
diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c
index f2aa400a77..3babf81e33 100644
--- a/system/qdev-monitor.c
+++ b/system/qdev-monitor.c
@@ -42,7 +42,7 @@
 #include "qemu/cutils.h"
 #include "hw/qdev-properties.h"
 #include "hw/clock.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 /*
  * Aliases were a bad idea from the start.  Let's keep them
diff --git a/system/runstate.c b/system/runstate.c
index e3ec16ab74..89bbfe7fbf 100644
--- a/system/runstate.c
+++ b/system/runstate.c
@@ -31,7 +31,7 @@
 #include "crypto/init.h"
 #include "exec/cpu-common.h"
 #include "gdbstub/syscalls.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/resettable.h"
 #include "migration/misc.h"
 #include "migration/postcopy-ram.h"
diff --git a/target-info-stub.c b/target-info-stub.c
index d96d8249c1..8392d81e8f 100644
--- a/target-info-stub.c
+++ b/target-info-stub.c
@@ -9,7 +9,7 @@
 #include "qemu/osdep.h"
 #include "qemu/target-info.h"
 #include "qemu/target-info-impl.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "cpu.h"
 
 /* Validate correct placement of CPUArchState. */
diff --git a/target/arm/arm-qmp-cmds.c b/target/arm/arm-qmp-cmds.c
index d292c974c4..45df15de78 100644
--- a/target/arm/arm-qmp-cmds.c
+++ b/target/arm/arm-qmp-cmds.c
@@ -22,7 +22,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/target-info.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "kvm_arm.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index 39292fb9bc..7720d27a3c 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -37,7 +37,7 @@
 #include "hw/qdev-properties.h"
 #if !defined(CONFIG_USER_ONLY)
 #include "hw/loader.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #ifdef CONFIG_TCG
 #include "hw/intc/armv7m_nvic.h"
 #endif /* CONFIG_TCG */
diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c
index 8288b60529..7c48f21543 100644
--- a/target/arm/hvf/hvf.c
+++ b/target/arm/hvf/hvf.c
@@ -25,7 +25,7 @@
 
 #include "system/address-spaces.h"
 #include "system/memory.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/irq.h"
 #include "qemu/main-loop.h"
 #include "system/cpus.h"
diff --git a/target/arm/kvm.c b/target/arm/kvm.c
index 0d57081e69..c7ea6fc2f6 100644
--- a/target/arm/kvm.c
+++ b/target/arm/kvm.c
@@ -33,7 +33,7 @@
 #include "exec/memattrs.h"
 #include "system/address-spaces.h"
 #include "gdbstub/enums.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/irq.h"
 #include "qapi/visitor.h"
 #include "qemu/log.h"
diff --git a/target/arm/tcg/cpu32.c b/target/arm/tcg/cpu32.c
index f0761410ad..0b0bc96bac 100644
--- a/target/arm/tcg/cpu32.c
+++ b/target/arm/tcg/cpu32.c
@@ -14,7 +14,7 @@
 #include "internals.h"
 #include "target/arm/idau.h"
 #if !defined(CONFIG_USER_ONLY)
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #endif
 #include "cpregs.h"
 
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 6417775786..4216ca9ec1 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -42,7 +42,7 @@
 #include "system/reset.h"
 #include "qapi/qapi-commands-machine.h"
 #include "system/address-spaces.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/i386/sgx-epc.h"
 #endif
 #include "system/qtest.h"
diff --git a/target/i386/hvf/hvf-cpu.c b/target/i386/hvf/hvf-cpu.c
index 94ee096ecf..316c1b0ba0 100644
--- a/target/i386/hvf/hvf-cpu.c
+++ b/target/i386/hvf/hvf-cpu.c
@@ -12,7 +12,7 @@
 #include "host-cpu.h"
 #include "qapi/error.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/hvf.h"
 #include "accel/accel-cpu-target.h"
 #include "hvf-i386.h"
diff --git a/target/i386/kvm/kvm-cpu.c b/target/i386/kvm/kvm-cpu.c
index 9c25b55839..33a8c26bc2 100644
--- a/target/i386/kvm/kvm-cpu.c
+++ b/target/i386/kvm/kvm-cpu.c
@@ -12,7 +12,7 @@
 #include "host-cpu.h"
 #include "qapi/error.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/i386/x86.h"
 
 #include "kvm_i386.h"
diff --git a/target/i386/kvm/vmsr_energy.c b/target/i386/kvm/vmsr_energy.c
index 890322ae37..d24e827a21 100644
--- a/target/i386/kvm/vmsr_energy.c
+++ b/target/i386/kvm/vmsr_energy.c
@@ -16,7 +16,7 @@
 #include "vmsr_energy.h"
 #include "io/channel.h"
 #include "io/channel-socket.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "cpu.h"
 #include "host-cpu.h"
 
diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c
index 6bf8d5f4bb..db184e1b0d 100644
--- a/target/i386/whpx/whpx-all.c
+++ b/target/i386/whpx/whpx-all.c
@@ -19,7 +19,7 @@
 #include "system/cpus.h"
 #include "system/runstate.h"
 #include "qemu/main-loop.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/intc/ioapic.h"
 #include "hw/i386/apic_internal.h"
 #include "qemu/error-report.h"
diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c
index 26e40c9bdc..6412584e1b 100644
--- a/target/loongarch/kvm/kvm.c
+++ b/target/loongarch/kvm/kvm.c
@@ -19,7 +19,7 @@
 #include "hw/pci/pci.h"
 #include "exec/memattrs.h"
 #include "system/address-spaces.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/irq.h"
 #include "hw/loongarch/virt.h"
 #include "qemu/log.h"
diff --git a/target/m68k/m68k-semi.c b/target/m68k/m68k-semi.c
index 6fbbd140f3..578a08dfee 100644
--- a/target/m68k/m68k-semi.c
+++ b/target/m68k/m68k-semi.c
@@ -28,7 +28,7 @@
 #include "gdbstub/helpers.h"
 #include "semihosting/syscalls.h"
 #include "semihosting/uaccess.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qemu/log.h"
 
 #define HOSTED_EXIT  0
diff --git a/target/mips/kvm.c b/target/mips/kvm.c
index 912cd5dfa0..a85e162409 100644
--- a/target/mips/kvm.c
+++ b/target/mips/kvm.c
@@ -22,7 +22,7 @@
 #include "system/kvm_int.h"
 #include "system/runstate.h"
 #include "kvm_mips.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "fpu_helper.h"
 
 #define DEBUG_KVM 0
diff --git a/target/openrisc/sys_helper.c b/target/openrisc/sys_helper.c
index 7ad908b632..ca627bd719 100644
--- a/target/openrisc/sys_helper.c
+++ b/target/openrisc/sys_helper.c
@@ -25,7 +25,7 @@
 #include "exec/helper-proto.h"
 #include "exception.h"
 #ifndef CONFIG_USER_ONLY
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #endif
 #include "tcg/insn-start-words.h"
 
diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
index 86ead740ee..a3b14ccead 100644
--- a/target/ppc/cpu_init.c
+++ b/target/ppc/cpu_init.c
@@ -46,7 +46,7 @@
 #include "spr_common.h"
 #include "power8-pmu.h"
 #ifndef CONFIG_USER_ONLY
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/intc/intc.h"
 #include "kvm_ppc.h"
 #endif
diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c
index 47e672c7aa..301d8de67f 100644
--- a/target/riscv/kvm/kvm-cpu.c
+++ b/target/riscv/kvm/kvm-cpu.c
@@ -37,7 +37,7 @@
 #include "exec/memattrs.h"
 #include "system/address-spaces.h"
 #include "system/memory.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/irq.h"
 #include "hw/intc/riscv_imsic.h"
 #include "qemu/log.h"
diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c
index d3968251fa..bb03f8dc0c 100644
--- a/target/riscv/tcg/tcg-cpu.c
+++ b/target/riscv/tcg/tcg-cpu.c
@@ -34,7 +34,7 @@
 #include "accel/tcg/cpu-ops.h"
 #include "tcg/tcg.h"
 #ifndef CONFIG_USER_ONLY
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/tcg.h"
 #include "exec/icount.h"
 #endif
diff --git a/target/s390x/cpu-system.c b/target/s390x/cpu-system.c
index f3a9ffb2a2..c7a6fd7e75 100644
--- a/target/s390x/cpu-system.c
+++ b/target/s390x/cpu-system.c
@@ -34,7 +34,7 @@
 #include "system/hw_accel.h"
 
 #include "target/s390x/kvm/pv.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/system.h"
 #include "system/tcg.h"
 #include "hw/core/sysemu-cpu-ops.h"
diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c
index 3b1e75f783..7a7b381059 100644
--- a/target/s390x/mmu_helper.c
+++ b/target/s390x/mmu_helper.c
@@ -28,7 +28,7 @@
 #include "exec/target_page.h"
 #include "hw/hw.h"
 #include "hw/s390x/storage-keys.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 /* Fetch/store bits in the translation exception code: */
 #define FS_READ  0x800
diff --git a/target/s390x/sigp.c b/target/s390x/sigp.c
index f5d7bc0fa2..b6d44c5c31 100644
--- a/target/s390x/sigp.c
+++ b/target/s390x/sigp.c
@@ -11,7 +11,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "s390x-internal.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/hw_accel.h"
 #include "system/memory.h"
 #include "system/runstate.h"
diff --git a/target/s390x/tcg/excp_helper.c b/target/s390x/tcg/excp_helper.c
index c6641280bc..54f051ae9e 100644
--- a/target/s390x/tcg/excp_helper.c
+++ b/target/s390x/tcg/excp_helper.c
@@ -33,7 +33,7 @@
 #include "system/memory.h"
 #include "hw/s390x/ioinst.h"
 #include "hw/s390x/s390_flic.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #endif
 #include "qemu/plugin.h"
 
diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c
index 24675fc818..9e5bd3ed07 100644
--- a/target/s390x/tcg/mem_helper.c
+++ b/target/s390x/tcg/mem_helper.c
@@ -40,7 +40,7 @@
 #include "user/page-protection.h"
 #else
 #include "hw/s390x/storage-keys.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #endif
 
 #ifdef CONFIG_USER_ONLY
diff --git a/target/s390x/tcg/misc_helper.c b/target/s390x/tcg/misc_helper.c
index 215b5b9d93..1fd900fbbf 100644
--- a/target/s390x/tcg/misc_helper.c
+++ b/target/s390x/tcg/misc_helper.c
@@ -42,7 +42,7 @@
 #include "hw/s390x/s390_flic.h"
 #include "hw/s390x/ioinst.h"
 #include "hw/s390x/s390-pci-inst.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/s390x/tod.h"
 #include CONFIG_DEVICES
 #endif
diff --git a/tests/qtest/fuzz/generic_fuzz.c b/tests/qtest/fuzz/generic_fuzz.c
index f12080eda4..c848eec3b9 100644
--- a/tests/qtest/fuzz/generic_fuzz.c
+++ b/tests/qtest/fuzz/generic_fuzz.c
@@ -25,7 +25,7 @@
 #include "hw/qdev-core.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_device.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "generic_fuzz_configs.h"
 #include "hw/mem/sparse-mem.h"
 
diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c
index 326045ecbb..28ea9158e7 100644
--- a/tests/unit/test-smp-parse.c
+++ b/tests/unit/test-smp-parse.c
@@ -15,7 +15,7 @@
 #include "qemu/module.h"
 #include "qapi/error.h"
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 #define T true
 #define F false