diff --git a/hw/opentitan/ot_aes.c b/hw/opentitan/ot_aes.c
index 042321f301f4..644f1c1cc2f1 100644
--- a/hw/opentitan/ot_aes.c
+++ b/hw/opentitan/ot_aes.c
@@ -29,6 +29,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/bitmap.h"
+#include "qemu/error-report.h"
 #include "qemu/log.h"
 #include "qemu/main-loop.h"
 #include "qemu/timer.h"
diff --git a/hw/opentitan/ot_csrng.c b/hw/opentitan/ot_csrng.c
index 07a292ec3d0c..488960ffa1ba 100644
--- a/hw/opentitan/ot_csrng.c
+++ b/hw/opentitan/ot_csrng.c
@@ -29,6 +29,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/error-report.h"
 #include "qemu/log.h"
 #include "qemu/main-loop.h"
 #include "qemu/queue.h"
diff --git a/hw/opentitan/ot_dev_proxy.c b/hw/opentitan/ot_dev_proxy.c
index 6b27c7a6dc3f..1ee16ecd76a4 100644
--- a/hw/opentitan/ot_dev_proxy.c
+++ b/hw/opentitan/ot_dev_proxy.c
@@ -26,7 +26,9 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/error-report.h"
 #include "qemu/fifo8.h"
+#include "qemu/log-for-trace.h"
 #include "qemu/typedefs.h"
 #include "qapi/error.h"
 #include "qapi/qapi-commands-misc.h"
diff --git a/hw/opentitan/ot_dma.c b/hw/opentitan/ot_dma.c
index a08f3c7d7180..98aaae5e511e 100644
--- a/hw/opentitan/ot_dma.c
+++ b/hw/opentitan/ot_dma.c
@@ -30,6 +30,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/error-report.h"
 #include "qemu/log.h"
 #include "qemu/timer.h"
 #include "qemu/typedefs.h"
diff --git a/hw/opentitan/ot_flash.c b/hw/opentitan/ot_flash.c
index 4b988c54a17b..c64f0b418549 100644
--- a/hw/opentitan/ot_flash.c
+++ b/hw/opentitan/ot_flash.c
@@ -46,6 +46,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/error-report.h"
 #include "qemu/log.h"
 #include "qemu/memalign.h"
 #include "qemu/timer.h"
diff --git a/hw/opentitan/ot_gpio_dj.c b/hw/opentitan/ot_gpio_dj.c
index 5ffd7d68279b..6430cd1a2444 100644
--- a/hw/opentitan/ot_gpio_dj.c
+++ b/hw/opentitan/ot_gpio_dj.c
@@ -27,6 +27,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/error-report.h"
 #include "qemu/log.h"
 #include "qemu/typedefs.h"
 #include "chardev/char-fe.h"
diff --git a/hw/opentitan/ot_gpio_eg.c b/hw/opentitan/ot_gpio_eg.c
index 2805668a24aa..a71cdedde6b3 100644
--- a/hw/opentitan/ot_gpio_eg.c
+++ b/hw/opentitan/ot_gpio_eg.c
@@ -26,6 +26,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/error-report.h"
 #include "qemu/log.h"
 #include "qemu/typedefs.h"
 #include "chardev/char-fe.h"
diff --git a/hw/opentitan/ot_otp_dj.c b/hw/opentitan/ot_otp_dj.c
index a9bd0ed352d7..6a9b31ff4414 100644
--- a/hw/opentitan/ot_otp_dj.c
+++ b/hw/opentitan/ot_otp_dj.c
@@ -33,6 +33,7 @@
 #define OT_OTP_COMPORTABLE_REGS
 
 #include "qemu/osdep.h"
+#include "qemu/error-report.h"
 #include "qemu/log.h"
 #include "qom/object.h"
 #include "hw/opentitan/ot_otp_dj.h"
diff --git a/hw/opentitan/ot_otp_eg.c b/hw/opentitan/ot_otp_eg.c
index 97370bb2abc1..623c3020aa54 100644
--- a/hw/opentitan/ot_otp_eg.c
+++ b/hw/opentitan/ot_otp_eg.c
@@ -31,6 +31,7 @@
 #define OT_OTP_COMPORTABLE_REGS
 
 #include "qemu/osdep.h"
+#include "qemu/error-report.h"
 #include "qemu/log.h"
 #include "qom/object.h"
 #include "hw/opentitan/ot_otp_eg.h"
diff --git a/hw/opentitan/ot_otp_engine.c b/hw/opentitan/ot_otp_engine.c
index f2d9db69dd85..60d3d6232074 100644
--- a/hw/opentitan/ot_otp_engine.c
+++ b/hw/opentitan/ot_otp_engine.c
@@ -32,6 +32,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/bswap.h"
+#include "qemu/error-report.h"
 #include "qemu/log.h"
 #include "qapi/error.h"
 #include "hw/opentitan/ot_alert.h"
diff --git a/hw/opentitan/ot_rstmgr.c b/hw/opentitan/ot_rstmgr.c
index 54438397c55a..3da096c48a24 100644
--- a/hw/opentitan/ot_rstmgr.c
+++ b/hw/opentitan/ot_rstmgr.c
@@ -31,6 +31,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/bitops.h"
+#include "qemu/error-report.h"
 #include "qemu/log.h"
 #include "qemu/main-loop.h"
 #include "qemu/typedefs.h"
diff --git a/hw/opentitan/ot_usbdev.c b/hw/opentitan/ot_usbdev.c
index 7db759edb4c3..a10cddb2216a 100644
--- a/hw/opentitan/ot_usbdev.c
+++ b/hw/opentitan/ot_usbdev.c
@@ -34,6 +34,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/error-report.h"
 #include "qemu/fifo8.h"
 #include "qemu/log.h"
 #include "chardev/char-fe.h"
diff --git a/hw/opentitan/ot_vmapper.c b/hw/opentitan/ot_vmapper.c
index 55adbb1b8cc0..7dcc6adf7f33 100644
--- a/hw/opentitan/ot_vmapper.c
+++ b/hw/opentitan/ot_vmapper.c
@@ -26,7 +26,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu/log.h"
+#include "qemu/error-report.h"
 #include "qemu/typedefs.h"
 #include "exec/exec-all.h"
 #include "exec/page-protection.h"