#include "hw.h"
#include "boards.h"
-#include "net.h"
#include "blockdev.h"
-#include "qemu-config.h"
+#include "qemu/config-file.h"
#include "sysemu.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
DriveInfo *add_init_drive(const char *optstr)
{