Move more headers.
cbuffer.h, charpipe.h -> include/android/
cbuffer.c, charpipe.c -> android/
qemu_debug.h -> include/android/qemu-debug.h
block.h, block_int.h -> include/block/
elf.h -> include/
hax.h -> include/exec/
qemu-lock.h -> include/exec/spinlock.h
readline.h -> include/monitor/readline.h
qemu-common.h - include
qemu-barrier.h -> include/qemu/atomic.h
qemu-log.h -> include/qemu/log.h
Change-Id: I86b998932461caa35d347cd71b40bd6e4ec7d84d
diff --git a/vl-android.c b/vl-android.c
index 50f337e..9a34d36 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -48,7 +48,7 @@
#include "migration/qemu-file.h"
#include "android/android.h"
-#include "charpipe.h"
+#include "android/charpipe.h"
#include "modem_driver.h"
#include "android/gps.h"
#include "android/hw-kmsg.h"
@@ -195,12 +195,12 @@
#include "qemu/timer.h"
#include "qemu-char.h"
#include "qemu/cache-utils.h"
-#include "block.h"
+#include "block/block.h"
#include "sysemu/dma.h"
#include "audio/audio.h"
#include "migration/migration.h"
#include "sysemu/kvm.h"
-#include "hax.h"
+#include "exec/hax.h"
#ifdef CONFIG_KVM
#include "android/kvm.h"
#endif