4 files changed, 7 insertions, 5 deletions
diff --git a/target/arm/monitor.c b/target/arm/monitor.c
index 299cb80ae7..4cdd2676dd 100644
--- a/target/arm/monitor.c
+++ b/target/arm/monitor.c
@@ -19,10 +19,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
-#include "qmp-commands.h"
 #include "hw/boards.h"
 #include "kvm_arm.h"
+#include "qapi/qapi-commands-misc.h"
 
 static GICCapability *gic_cap_new(int version)
 {
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index b5e431e769..2c04645cea 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -31,10 +31,10 @@
 #include "qemu/option.h"
 #include "qemu/config-file.h"
 #include "qapi/error.h"
+#include "qapi/qapi-visit-misc.h"
+#include "qapi/qapi-visit-run-state.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qerror.h"
-
-#include "qapi-visit.h"
 #include "qapi/visitor.h"
 #include "qom/qom-qobject.h"
 #include "sysemu/arch_init.h"
diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
index 627002b225..c2b775f4eb 100644
--- a/target/s390x/cpu.c
+++ b/target/s390x/cpu.c
@@ -35,7 +35,8 @@
 #include "qemu/error-report.h"
 #include "trace.h"
 #include "qapi/visitor.h"
-#include "qapi-visit.h"
+#include "qapi/qapi-visit-misc.h"
+#include "qapi/qapi-visit-run-state.h"
 #include "sysemu/hw_accel.h"
 #include "exec/exec-all.h"
 #include "hw/qdev-properties.h"
diff --git a/target/s390x/sigp.c b/target/s390x/sigp.c
index 92b2830940..aff1530c82 100644
--- a/target/s390x/sigp.c
+++ b/target/s390x/sigp.c
@@ -17,7 +17,7 @@
 #include "exec/exec-all.h"
 #include "sysemu/sysemu.h"
 #include "trace.h"
-#include "qapi-types.h"
+#include "qapi/qapi-types-misc.h"
 
 QemuMutex qemu_sigp_mutex;