#include <sys/mman.h>
#endif
#include "config.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "sysemu.h"
#include "bitops.h"
#include "bitmap.h"
#include "hw/audiodev.h"
#include "kvm.h"
#include "migration.h"
-#include "net.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
#include "hw/smbios.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
#include "hw/pcspk.h"
#include "qemu/page_cache.h"
+#include "qemu-config.h"
#include "qmp-commands.h"
#include "trace.h"