Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging

[qemu.git] / hw / timer / mc146818rtc.c

diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c
index 9d93a16e0fc50893cb9e7ffe3477daaf7ed114b4..6f1f723b1f09151e58c155f693fbecfb12a8f2bc 100644 (file)
--- a/hw/timer/mc146818rtc.c
+++ b/hw/timer/mc146818rtc.c
@@ -31,9 +31,9 @@
 #include "sysemu/replay.h"
 #include "hw/timer/mc146818rtc.h"
 #include "qapi/error.h"
+#include "qapi/qapi-commands-misc.h"
+#include "qapi/qapi-events-misc.h"
 #include "qapi/visitor.h"
-#include "qapi-event.h"
-#include "qmp-commands.h"
 
 #ifdef TARGET_I386
 #include "hw/i386/apic.h"