* later. See the COPYING file in the top-level directory.
*/
-#include "blockdev.h"
-#include "hw/block-common.h"
+#include "sysemu/blockdev.h"
+#include "hw/block/block.h"
#include "monitor/monitor.h"
#include "qapi/qmp/qerror.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qmp-commands.h"
#include "trace.h"
#include "block/nbd.h"