#include "hw/block-common.h"
#include "blockjob.h"
#include "monitor.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"
#include "qemu-option.h"
#include "qemu-config.h"
-#include "qemu-objects.h"
+#include "qapi/qmp/types.h"
#include "sysemu.h"
#include "block_int.h"
#include "qmp-commands.h"