diff --git a/qemu/include/hw/hw.h b/qemu/include/hw/hw.h
index 51d4d629..c757dad0 100644
--- a/qemu/include/hw/hw.h
+++ b/qemu/include/hw/hw.h
@@ -6,9 +6,9 @@
 #error Cannot include hw/hw.h from user emulation
 #endif
 
-#include "qemu-common.h"
 #include "exec/cpu-common.h"
-#include "exec/ioport.h"
+#include "qom/object.h"
+#include "exec/memory.h"
 
 #ifdef NEED_CPU_H
 #if TARGET_LONG_BITS == 64