diff --git a/android/console.c b/android/console.c
index b356d7c..284608d 100644
--- a/android/console.c
+++ b/android/console.c
@@ -38,7 +38,7 @@
 #include "android/config/config.h"
 #include "tcpdump.h"
 #include "net/net.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/arch_init.c b/arch_init.c
index d5c91a1..eaeb15f 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -29,7 +29,7 @@
 #include <sys/mman.h>
 #endif
 #include "config.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "sysemu.h"
 #include "arch_init.h"
 #include "audio/audio.h"
diff --git a/audio/audio.c b/audio/audio.c
index b9780c9..419fb73 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -24,7 +24,7 @@
  */
 #include "hw/hw.h"
 #include "audio.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "qemu/timer.h"
 #include "sysemu.h"
 
diff --git a/audio/wavcapture.c b/audio/wavcapture.c
index 1f49cd1..151acdf 100644
--- a/audio/wavcapture.c
+++ b/audio/wavcapture.c
@@ -1,5 +1,5 @@
 #include "hw/hw.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "audio.h"
 
 typedef struct {
diff --git a/block.c b/block.c
index 23a7ad5..549d377 100644
--- a/block.c
+++ b/block.c
@@ -23,7 +23,7 @@
  */
 #include "config-host.h"
 #include "qemu-common.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "block_int.h"
 #include "qemu/module.h"
 #include "qemu-objects.h"
diff --git a/blockdev.c b/blockdev.c
index 55d60f8..ec57fcc 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -9,7 +9,7 @@
 
 #include "block.h"
 #include "blockdev.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu-option.h"
 #include "qemu/config-file.h"
diff --git a/cpus.c b/cpus.c
index 73d5f2d..2570cc5 100644
--- a/cpus.c
+++ b/cpus.c
@@ -23,7 +23,7 @@
  */
 #include "config-host.h"
 
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "sysemu.h"
 #include "exec/gdbstub.h"
 #include "dma.h"
diff --git a/disas.c b/disas.c
index 96b2551..4b1a9f0 100644
--- a/disas.c
+++ b/disas.c
@@ -335,7 +335,7 @@
 
 #if !defined(CONFIG_USER_ONLY)
 
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 static int monitor_disas_is_physical;
 static CPUState *monitor_disas_env;
diff --git a/gdbstub.c b/gdbstub.c
index 1c0b793..37cfa0a 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -29,7 +29,7 @@
 
 #include "qemu.h"
 #else
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "qemu-char.h"
 #include "sysemu.h"
 #include "exec/gdbstub.h"
diff --git a/hw/i8259.c b/hw/i8259.c
index 0049e73..9342309 100644
--- a/hw/i8259.c
+++ b/hw/i8259.c
@@ -24,7 +24,7 @@
 #include "hw.h"
 #include "pc.h"
 #include "isa.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "goldfish_device.h"
 
 /* debug PIC */
diff --git a/hw/pc.c b/hw/pc.c
index ef83c74..279b415 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -33,7 +33,7 @@
 //#include "smbus.h"
 #include "boards.h"
 #include "android/globals.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "fw_cfg.h"
 //#include "hpet_emul.h"
 #include "watchdog.h"
diff --git a/hw/pci.c b/hw/pci.c
index 66c9bdf..a6022b0 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -23,7 +23,7 @@
  */
 #include "hw.h"
 #include "pci.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "net/net.h"
 #include "sysemu.h"
 
diff --git a/hw/qdev.c b/hw/qdev.c
index 14c0dde..26c0bc0 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -29,7 +29,7 @@
 #include "net/net.h"
 #include "qdev.h"
 #include "sysemu.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "blockdev.h"
 
 struct DeviceProperty {
diff --git a/hw/sysbus.c b/hw/sysbus.c
index ef3a701..1648dca 100644
--- a/hw/sysbus.c
+++ b/hw/sysbus.c
@@ -20,7 +20,7 @@
 
 #include "sysbus.h"
 #include "sysemu.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 void sysbus_connect_irq(SysBusDevice *dev, int n, qemu_irq irq)
 {
diff --git a/monitor-android.h b/include/android/monitor.h
similarity index 100%
rename from monitor-android.h
rename to include/android/monitor.h
diff --git a/monitor.h b/include/monitor/monitor.h
similarity index 100%
rename from monitor.h
rename to include/monitor/monitor.h
diff --git a/input.c b/input.c
index 2699e80..66958a7 100644
--- a/input.c
+++ b/input.c
@@ -24,7 +24,7 @@
 
 #include "sysemu.h"
 #include "net/net.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "ui/console.h"
 #include "qapi/qmp/qjson.h"
 
diff --git a/migration-dummy-android.c b/migration-dummy-android.c
index 6c81c82..dce8b81 100755
--- a/migration-dummy-android.c
+++ b/migration-dummy-android.c
@@ -13,7 +13,7 @@
 
 #include "qemu-common.h"
 #include "migration.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "buffered_file.h"
 #include "sysemu.h"
 #include "block.h"
diff --git a/migration.c b/migration.c
index 190b37e..271a277 100644
--- a/migration.c
+++ b/migration.c
@@ -13,7 +13,7 @@
 
 #include "qemu-common.h"
 #include "migration.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "buffered_file.h"
 #include "sysemu.h"
 #include "block.h"
diff --git a/monitor.c b/monitor.c
index 7046aeb..51273c1 100644
--- a/monitor.c
+++ b/monitor.c
@@ -33,7 +33,7 @@
 #include "net/net.h"
 #include "qemu-char.h"
 #include "sysemu.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "readline.h"
 #include "ui/console.h"
 #include "blockdev.h"
@@ -96,7 +96,7 @@
 };
 
 #ifdef CONFIG_ANDROID
-#include "monitor-android.h"
+#include "android/monitor.h"
 #endif
 
 static QLIST_HEAD(mon_list, Monitor) mon_list;
diff --git a/net/net-android.c b/net/net-android.c
index eb225bc..7eaba2d 100644
--- a/net/net-android.c
+++ b/net/net-android.c
@@ -114,7 +114,7 @@
 
 #include "qemu-common.h"
 #include "net/net.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "sysemu.h"
 #include "qemu/timer.h"
 #include "qemu-char.h"
diff --git a/net/net.c b/net/net.c
index f2b956d..7208e21 100644
--- a/net/net.c
+++ b/net/net.c
@@ -112,7 +112,7 @@
 
 #include "qemu-common.h"
 #include "net/net.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "sysemu.h"
 #include "qemu/timer.h"
 #include "qemu-char.h"
diff --git a/qemu-char.c b/qemu-char.c
index 7ae4e7a..514c1d8 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -24,7 +24,7 @@
 #include "qemu-common.h"
 #include "android/sockets.h"
 #include "net/net.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "ui/console.h"
 #include "sysemu.h"
 #include "qemu/timer.h"
diff --git a/qemu-timer.c b/qemu-timer.c
index 9bb8aac..b7fbb8b 100644
--- a/qemu-timer.c
+++ b/qemu-timer.c
@@ -24,7 +24,7 @@
 
 #include "sysemu.h"
 #include "net/net.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "ui/console.h"
 
 #include "hw/hw.h"
diff --git a/qobject/qerror.c b/qobject/qerror.c
index a64ca97..0f47be0 100644
--- a/qobject/qerror.c
+++ b/qobject/qerror.c
@@ -10,7 +10,7 @@
  * See the COPYING.LIB file in the top-level directory.
  */
 
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "qapi/qmp/qjson.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu-common.h"
diff --git a/readline.c b/readline.c
index 16ec704..bb35632 100644
--- a/readline.c
+++ b/readline.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "readline.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 #define IS_NORM 0
 #define IS_ESC  1
diff --git a/savevm.c b/savevm.c
index fe44e2d..ad676df 100644
--- a/savevm.c
+++ b/savevm.c
@@ -73,7 +73,7 @@
 #include "qemu-common.h"
 #include "hw/hw.h"
 #include "net/net.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "sysemu.h"
 #include "qemu/timer.h"
 #include "qemu-char.h"
diff --git a/slirp-android/misc.c b/slirp-android/misc.c
index a6063a9..4dab1d8 100644
--- a/slirp-android/misc.c
+++ b/slirp-android/misc.c
@@ -513,7 +513,7 @@
 #endif
 
 #ifdef CONFIG_QEMU
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 void lprint(const char *format, ...)
 {
diff --git a/slirp/misc.c b/slirp/misc.c
index 1391d49..20d32bd 100644
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -549,7 +549,7 @@
 #endif
 
 #ifdef CONFIG_QEMU
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 void lprint(const char *format, ...)
 {
diff --git a/ui/vnc.h b/ui/vnc.h
index d0f1b03..71ac448 100644
--- a/ui/vnc.h
+++ b/ui/vnc.h
@@ -29,7 +29,7 @@
 
 #include "qemu-common.h"
 #include "ui/console.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "audio/audio.h"
 #include <zlib.h>
 
diff --git a/usb-dummy-android.c b/usb-dummy-android.c
index 903e398..6f76240 100755
--- a/usb-dummy-android.c
+++ b/usb-dummy-android.c
@@ -24,7 +24,7 @@
 
 #include "qemu-common.h"
 #include "qemu/timer.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "hw/usb.h"
 
 USBDevice *usb_host_device_open(const char *devname)
diff --git a/usb-linux.c b/usb-linux.c
index a6e5fe4..4b0f640 100644
--- a/usb-linux.c
+++ b/usb-linux.c
@@ -32,7 +32,7 @@
 
 #include "qemu-common.h"
 #include "qemu/timer.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 #include <dirent.h>
 #include <sys/ioctl.h>
diff --git a/util/qemu-error.c b/util/qemu-error.c
index 41c191d..642bff9 100644
--- a/util/qemu-error.c
+++ b/util/qemu-error.c
@@ -11,7 +11,7 @@
  */
 
 #include <stdio.h>
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 /*
  * Print to current monitor if we have one, else to stderr.
diff --git a/vl-android.c b/vl-android.c
index 255b554..36b3452 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -188,7 +188,7 @@
 #include "hw/xen.h"
 #include "bt-host.h"
 #include "net/net.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "ui/console.h"
 #include "sysemu.h"
 #include "exec/gdbstub.h"
diff --git a/vl.c b/vl.c
index a7285a7..f13fa1a 100644
--- a/vl.c
+++ b/vl.c
@@ -146,7 +146,7 @@
 #include "hw/xen.h"
 #include "bt-host.h"
 #include "net/net.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "ui/console.h"
 #include "sysemu.h"
 #include "exec/gdbstub.h"