diff --git a/hw/misc/riscv_cmgcr.c b/hw/misc/riscv_cmgcr.c
index b0294e7663..ab9b6c7d87 100644
--- a/hw/misc/riscv_cmgcr.c
+++ b/hw/misc/riscv_cmgcr.c
@@ -20,7 +20,7 @@
 #include "hw/misc/riscv_cmgcr.h"
 #include "hw/core/qdev-properties.h"
 
-#include "cpu.h"
+#include "target/riscv/cpu.h"
 
 #define CM_RESET_VEC 0x1FC00000
 #define GCR_ADDRSPACE_SZ        0x8000
diff --git a/hw/misc/riscv_cpc.c b/hw/misc/riscv_cpc.c
index e04ccdf54f..37fdd0b39b 100644
--- a/hw/misc/riscv_cpc.c
+++ b/hw/misc/riscv_cpc.c
@@ -13,7 +13,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "cpu.h"
+#include "target/riscv/cpu.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "qemu/timer.h"
diff --git a/hw/riscv/microblaze-v-generic.c b/hw/riscv/microblaze-v-generic.c
index d56b64792d..b0494b1ac5 100644
--- a/hw/riscv/microblaze-v-generic.c
+++ b/hw/riscv/microblaze-v-generic.c
@@ -16,7 +16,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
-#include "cpu.h"
+#include "target/riscv/cpu.h"
 #include "hw/core/sysbus.h"
 #include "system/system.h"
 #include "net/net.h"