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/Makefile.common b/Makefile.common
index 6ba7044..cb34601 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -417,8 +417,6 @@
bt-host.c \
bt-vhci.c \
buffered_file.c \
- cbuffer.c \
- charpipe.c \
input.c \
iohandler.c \
ioport.c \
@@ -428,6 +426,8 @@
savevm.c \
tcpdump.c \
android/boot-properties.c \
+ android/cbuffer.c \
+ android/charpipe.c \
android/config.c \
android/core-init-utils.c \
android/gps.c \
diff --git a/aio-android.c b/aio-android.c
index e2e55cf..3e39280 100644
--- a/aio-android.c
+++ b/aio-android.c
@@ -12,7 +12,7 @@
*/
#include "qemu-common.h"
-#include "block.h"
+#include "block/block.h"
#include "qemu-queue.h"
#include "qemu_socket.h"
#include "android/iolooper.h"
diff --git a/aio.c b/aio.c
index 2f08655..1d13179 100644
--- a/aio.c
+++ b/aio.c
@@ -12,7 +12,7 @@
*/
#include "qemu-common.h"
-#include "block.h"
+#include "block/block.h"
#include "qemu-queue.h"
#include "qemu_socket.h"
diff --git a/cbuffer.c b/android/cbuffer.c
similarity index 98%
rename from cbuffer.c
rename to android/cbuffer.c
index 0e99237..81e546a 100644
--- a/cbuffer.c
+++ b/android/cbuffer.c
@@ -9,7 +9,7 @@
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
*/
-#include "cbuffer.h"
+#include "android/cbuffer.h"
#include "android/utils/stralloc.h"
#include <string.h>
#include <stdlib.h>
diff --git a/charpipe.c b/android/charpipe.c
similarity index 98%
rename from charpipe.c
rename to android/charpipe.c
index 992b45a..34b6a65 100644
--- a/charpipe.c
+++ b/android/charpipe.c
@@ -10,8 +10,8 @@
** GNU General Public License for more details.
*/
#include "qemu-char.h"
-#include "cbuffer.h"
-#include "qemu_debug.h"
+#include "android/cbuffer.h"
+#include "android/qemu-debug.h"
#define xxDEBUG
diff --git a/android/hw-control.c b/android/hw-control.c
index e010c6f..1be0b19 100644
--- a/android/hw-control.c
+++ b/android/hw-control.c
@@ -21,7 +21,7 @@
* - flashlight
*/
#include "android/hw-control.h"
-#include "cbuffer.h"
+#include "android/cbuffer.h"
#include "android/hw-qemud.h"
#include "android/globals.h"
#include "android/utils/misc.h"
diff --git a/android/hw-kmsg.c b/android/hw-kmsg.c
index 987943b..4e50eb1 100644
--- a/android/hw-kmsg.c
+++ b/android/hw-kmsg.c
@@ -11,7 +11,7 @@
*/
#include "android/hw-kmsg.h"
#include "qemu-char.h"
-#include "charpipe.h"
+#include "android/charpipe.h"
#include "android/utils/debug.h"
static CharDriverState* android_kmsg_cs;
diff --git a/android/hw-qemud.c b/android/hw-qemud.c
index e80abed..ad06ccd 100644
--- a/android/hw-qemud.c
+++ b/android/hw-qemud.c
@@ -18,8 +18,8 @@
#include "hw/hw.h"
#include "hw/goldfish_pipe.h"
#include "qemu-char.h"
-#include "charpipe.h"
-#include "cbuffer.h"
+#include "android/charpipe.h"
+#include "android/cbuffer.h"
#include "utils/panic.h"
#define D(...) VERBOSE_PRINT(qemud,__VA_ARGS__)
diff --git a/android/sockets.c b/android/sockets.c
index 2250ee8..e57b428 100644
--- a/android/sockets.c
+++ b/android/sockets.c
@@ -17,7 +17,7 @@
#include "android/sockets.h"
#include <fcntl.h>
#include <stddef.h>
-#include "qemu_debug.h"
+#include "android/qemu-debug.h"
#include "qemu-char.h"
#include <stdlib.h>
#include <string.h>
diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index d7cc677..10aab8f 100644
--- a/audio/alsaaudio.c
+++ b/audio/alsaaudio.c
@@ -35,7 +35,7 @@
#include "audio_int.h"
#include <dlfcn.h>
#include <pthread.h>
-#include "qemu_debug.h"
+#include "android/qemu-debug.h"
#define DEBUG 1
diff --git a/audio/audio.c b/audio/audio.c
index 85da022..0303958 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -31,7 +31,7 @@
#define AUDIO_CAP "audio"
#include "audio_int.h"
#include "android/utils/system.h"
-#include "qemu_debug.h"
+#include "android/qemu-debug.h"
#include "android/android.h"
/* #define DEBUG_PLIVE */
diff --git a/audio/esdaudio.c b/audio/esdaudio.c
index 68df8a0..5b6f6ff 100644
--- a/audio/esdaudio.c
+++ b/audio/esdaudio.c
@@ -30,7 +30,7 @@
#include "audio_int.h"
#include "audio_pt_int.h"
-#include "qemu_debug.h"
+#include "android/qemu-debug.h"
#define DEBUG 1
diff --git a/audio/paaudio.c b/audio/paaudio.c
index 157bc8a..da05671 100644
--- a/audio/paaudio.c
+++ b/audio/paaudio.c
@@ -13,7 +13,7 @@
#define DEBUG 1
#if DEBUG
-# include "qemu_debug.h"
+# include "android/qemu-debug.h"
# include <stdio.h>
# define D(...) VERBOSE_PRINT(audio,__VA_ARGS__)
# define D_ACTIVE VERBOSE_CHECK(audio)
diff --git a/block.c b/block.c
index 549d377..0427b2d 100644
--- a/block.c
+++ b/block.c
@@ -24,7 +24,7 @@
#include "config-host.h"
#include "qemu-common.h"
#include "monitor/monitor.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "qemu/module.h"
#include "qemu-objects.h"
diff --git a/block/bochs.c b/block/bochs.c
index f32ad53..4c445b5 100644
--- a/block/bochs.c
+++ b/block/bochs.c
@@ -23,7 +23,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "qemu/module.h"
/**************************************************************/
diff --git a/block/cloop.c b/block/cloop.c
index 11b3193..3ba2027 100644
--- a/block/cloop.c
+++ b/block/cloop.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "qemu/module.h"
#include <zlib.h>
diff --git a/block/cow.c b/block/cow.c
index 318a5e6..cce970e 100644
--- a/block/cow.c
+++ b/block/cow.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "qemu/module.h"
/**************************************************************/
diff --git a/block/dmg.c b/block/dmg.c
index 243e6b1..49f0caf 100644
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "qemu/bswap.h"
#include "qemu/module.h"
#include <zlib.h>
diff --git a/block/parallels.c b/block/parallels.c
index 2ec331b..61c7a0f 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -24,7 +24,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "qemu/module.h"
/**************************************************************/
diff --git a/block/qcow.c b/block/qcow.c
index e932d5d..6d7da92 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "qemu/module.h"
#include <zlib.h>
#include "qemu/aes.h"
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 166922f..949e377 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -25,7 +25,7 @@
#include <zlib.h>
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "block/qcow2.h"
int qcow2_grow_l1_table(BlockDriverState *bs, int min_size)
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 4c19e7e..d59c466 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "block/qcow2.h"
static int64_t alloc_clusters_noref(BlockDriverState *bs, int64_t size);
diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c
index 6228612..56871d9 100644
--- a/block/qcow2-snapshot.c
+++ b/block/qcow2-snapshot.c
@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "block/qcow2.h"
typedef struct __attribute__((packed)) QCowSnapshotHeader {
diff --git a/block/qcow2.c b/block/qcow2.c
index 99a0a33..5b24fe2 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "qemu/module.h"
#include <zlib.h>
#include "qemu/aes.h"
diff --git a/block/raw-posix.c b/block/raw-posix.c
index 8d78127..3abf184 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -24,8 +24,8 @@
#include "qemu-common.h"
#include "qemu/timer.h"
#include "qemu-char.h"
-#include "qemu-log.h"
-#include "block_int.h"
+#include "qemu/log.h"
+#include "block/block_int.h"
#include "qemu/module.h"
#include "block/raw-posix-aio.h"
diff --git a/block/raw-win32.c b/block/raw-win32.c
index 3c39033..983447a 100644
--- a/block/raw-win32.c
+++ b/block/raw-win32.c
@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
#include "qemu/timer.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "qemu/module.h"
#include <windows.h>
#include <winioctl.h>
diff --git a/block/raw.c b/block/raw.c
index 29462b4..a9c6b88 100644
--- a/block/raw.c
+++ b/block/raw.c
@@ -1,6 +1,6 @@
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "qemu/module.h"
static int raw_open(BlockDriverState *bs, int flags)
diff --git a/block/vmdk.c b/block/vmdk.c
index 84a02bc..600b554 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -24,7 +24,7 @@
*/
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "qemu/module.h"
#define VMDK3_MAGIC (('C' << 24) | ('O' << 16) | ('W' << 8) | 'D')
diff --git a/block/vpc.c b/block/vpc.c
index 6ea1f2e..d1d0913 100644
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -23,7 +23,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "qemu/module.h"
/**************************************************************/
diff --git a/block/vvfat.c b/block/vvfat.c
index 9fe3138..5b631fb 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -25,7 +25,7 @@
#include <sys/stat.h>
#include <dirent.h>
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "qemu/module.h"
#ifndef S_IWGRP
diff --git a/blockdev.c b/blockdev.c
index b21657f..ae39b3e 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -7,7 +7,7 @@
* later. See the COPYING file in the top-level directory.
*/
-#include "block.h"
+#include "block/block.h"
#include "sysemu/blockdev.h"
#include "monitor/monitor.h"
#include "qapi/qmp/qerror.h"
diff --git a/cpu-exec.c b/cpu-exec.c
index d4b0783..79172a2 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -21,8 +21,8 @@
#include "disas/disas.h"
#include "tcg.h"
#include "sysemu/kvm.h"
-#include "hax.h"
-#include "qemu-barrier.h"
+#include "exec/hax.h"
+#include "qemu/atomic.h"
#if !defined(CONFIG_SOFTMMU)
#undef EAX
diff --git a/cpus.c b/cpus.c
index c7abb3d..40d6965 100644
--- a/cpus.c
+++ b/cpus.c
@@ -28,7 +28,7 @@
#include "exec/gdbstub.h"
#include "sysemu/dma.h"
#include "sysemu/kvm.h"
-#include "hax.h"
+#include "exec/hax.h"
#include "cpus.h"
diff --git a/dma-helpers.c b/dma-helpers.c
index 2cc2d63..280ace4 100644
--- a/dma-helpers.c
+++ b/dma-helpers.c
@@ -8,7 +8,7 @@
*/
#include "sysemu/dma.h"
-#include "block_int.h"
+#include "block/block_int.h"
void qemu_sglist_init(QEMUSGList *qsg, int alloc_hint)
{
diff --git a/exec.c b/exec.c
index 82d5b25..f054039 100644
--- a/exec.c
+++ b/exec.c
@@ -39,7 +39,7 @@
#include "hw/hw.h"
#include "qemu/osdep.h"
#include "sysemu/kvm.h"
-#include "hax.h"
+#include "exec/hax.h"
#include "qemu/timer.h"
#if defined(CONFIG_USER_ONLY)
#include <qemu.h>
diff --git a/hw/goldfish_audio.c b/hw/goldfish_audio.c
index 2219d70..c713aee 100644
--- a/hw/goldfish_audio.c
+++ b/hw/goldfish_audio.c
@@ -12,7 +12,7 @@
#include "migration/qemu-file.h"
#include "goldfish_device.h"
#include "audio/audio.h"
-#include "qemu_debug.h"
+#include "android/qemu-debug.h"
#include "android/globals.h"
#define DEBUG 1
diff --git a/hw/goldfish_mmc.c b/hw/goldfish_mmc.c
index cd5e054..f4de0f1 100644
--- a/hw/goldfish_mmc.c
+++ b/hw/goldfish_mmc.c
@@ -13,7 +13,7 @@
#include "goldfish_device.h"
#include "mmc.h"
#include "sd.h"
-#include "block.h"
+#include "block/block.h"
enum {
/* status register */
diff --git a/hw/goldfish_nand.c b/hw/goldfish_nand.c
index d1b2131..13b4bec 100644
--- a/hw/goldfish_nand.c
+++ b/hw/goldfish_nand.c
@@ -14,7 +14,7 @@
#include "goldfish_nand.h"
#include "goldfish_vmem.h"
#include "android/utils/tempfile.h"
-#include "qemu_debug.h"
+#include "android/qemu-debug.h"
#include "android/android.h"
#define DEBUG 1
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index a4bad88..4976dcb 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -15,7 +15,7 @@
#include "sysemu/sysemu.h"
#include "boards.h"
#include "flash.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#include "mips-bios.h"
#include "ide.h"
#include "loader.h"
diff --git a/hw/msmouse.c b/hw/msmouse.c
index 24fd38c..06b4363 100644
--- a/hw/msmouse.c
+++ b/hw/msmouse.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include <stdlib.h>
-#include "../qemu-common.h"
+#include "qemu-common.h"
#include "../qemu-char.h"
#include "ui/console.h"
#include "msmouse.h"
diff --git a/hw/pc.c b/hw/pc.c
index 8b543c0..7853bef 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -25,7 +25,7 @@
#include "pc.h"
#include "fdc.h"
#include "pci.h"
-#include "block.h"
+#include "block/block.h"
#include "sysemu/sysemu.h"
#include "sysemu/blockdev.h"
#include "audio/audio.h"
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 4f93eaa..8a8f3b2 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -29,7 +29,7 @@
do { fprintf(stderr, "scsi-disk: " fmt , ## __VA_ARGS__); } while (0)
#include "qemu-common.h"
-#include "block.h"
+#include "block/block.h"
#include "scsi-disk.h"
#define SENSE_NO_SENSE 0
diff --git a/hw/usb-msd.c b/hw/usb-msd.c
index da4100c..6c44e08 100644
--- a/hw/usb-msd.c
+++ b/hw/usb-msd.c
@@ -9,7 +9,7 @@
#include "qemu-common.h"
#include "usb.h"
-#include "block.h"
+#include "block/block.h"
#include "scsi-disk.h"
#include "ui/console.h"
diff --git a/hw/usb.h b/hw/usb.h
index 8381795..28723be 100644
--- a/hw/usb.h
+++ b/hw/usb.h
@@ -25,7 +25,7 @@
#ifndef _HW_USB_H
#define _HW_USB_H
-#include "block.h"
+#include "block/block.h"
#define USB_TOKEN_SETUP 0x2d
#define USB_TOKEN_IN 0x69 /* device -> host */
diff --git a/cbuffer.h b/include/android/cbuffer.h
similarity index 100%
rename from cbuffer.h
rename to include/android/cbuffer.h
diff --git a/charpipe.h b/include/android/charpipe.h
similarity index 100%
rename from charpipe.h
rename to include/android/charpipe.h
diff --git a/qemu_debug.h b/include/android/qemu-debug.h
similarity index 100%
rename from qemu_debug.h
rename to include/android/qemu-debug.h
diff --git a/block.h b/include/block/block.h
similarity index 100%
rename from block.h
rename to include/block/block.h
diff --git a/block_int.h b/include/block/block_int.h
similarity index 99%
rename from block_int.h
rename to include/block/block_int.h
index b863451..f0445a5 100644
--- a/block_int.h
+++ b/include/block/block_int.h
@@ -24,7 +24,7 @@
#ifndef BLOCK_INT_H
#define BLOCK_INT_H
-#include "block.h"
+#include "block/block.h"
#include "qemu-option.h"
#include "qemu-queue.h"
diff --git a/elf.h b/include/elf.h
similarity index 100%
rename from elf.h
rename to include/elf.h
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
index ddbb5ee..9220175 100644
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -65,7 +65,7 @@
extern target_ulong gen_opc_jump_pc[2];
extern uint32_t gen_opc_hflags[OPC_BUF_SIZE];
-#include "qemu-log.h"
+#include "qemu/log.h"
void gen_intermediate_code(CPUState *env, struct TranslationBlock *tb);
void gen_intermediate_code_pc(CPUState *env, struct TranslationBlock *tb);
@@ -342,7 +342,7 @@
extern CPUReadMemoryFunc *io_mem_read[IO_MEM_NB_ENTRIES][4];
extern void *io_mem_opaque[IO_MEM_NB_ENTRIES];
-#include "qemu-lock.h"
+#include "exec/spinlock.h"
extern spinlock_t tb_lock;
diff --git a/hax.h b/include/exec/hax.h
similarity index 100%
rename from hax.h
rename to include/exec/hax.h
diff --git a/qemu-lock.h b/include/exec/spinlock.h
similarity index 100%
rename from qemu-lock.h
rename to include/exec/spinlock.h
diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
index 8f17944..7ee9d31 100644
--- a/include/monitor/monitor.h
+++ b/include/monitor/monitor.h
@@ -5,7 +5,7 @@
#include "qemu-char.h"
#include "qapi/qmp/qerror.h"
#include "qapi/qmp/qdict.h"
-#include "block.h"
+#include "block/block.h"
extern Monitor *cur_mon;
extern Monitor *default_mon;
diff --git a/readline.h b/include/monitor/readline.h
similarity index 100%
rename from readline.h
rename to include/monitor/readline.h
diff --git a/qemu-common.h b/include/qemu-common.h
similarity index 100%
rename from qemu-common.h
rename to include/qemu-common.h
diff --git a/qemu-barrier.h b/include/qemu/atomic.h
similarity index 100%
rename from qemu-barrier.h
rename to include/qemu/atomic.h
diff --git a/qemu-log.h b/include/qemu/log.h
similarity index 100%
rename from qemu-log.h
rename to include/qemu/log.h
diff --git a/include/sysemu/blockdev.h b/include/sysemu/blockdev.h
index 89dcd9a..cc7f9d8 100644
--- a/include/sysemu/blockdev.h
+++ b/include/sysemu/blockdev.h
@@ -10,7 +10,7 @@
#ifndef BLOCKDEV_H
#define BLOCKDEV_H
-#include "block.h"
+#include "block/block.h"
#include "qemu-queue.h"
void blockdev_mark_auto_del(BlockDriverState *bs);
diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h
index f3bb275..9951ddd 100644
--- a/include/sysemu/dma.h
+++ b/include/sysemu/dma.h
@@ -13,7 +13,7 @@
#include <stdio.h>
//#include "cpu.h"
#include "hw/hw.h"
-#include "block.h"
+#include "block/block.h"
typedef struct {
target_phys_addr_t base;
diff --git a/migration-dummy-android.c b/migration-dummy-android.c
index e62ff4d..c4335c8 100755
--- a/migration-dummy-android.c
+++ b/migration-dummy-android.c
@@ -16,7 +16,7 @@
#include "monitor/monitor.h"
#include "buffered_file.h"
#include "sysemu/sysemu.h"
-#include "block.h"
+#include "block/block.h"
#include "qemu_socket.h"
//#define DEBUG_MIGRATION
diff --git a/migration-exec.c b/migration-exec.c
index 424273d..37cae4d 100644
--- a/migration-exec.c
+++ b/migration-exec.c
@@ -19,7 +19,7 @@
#include "qemu-char.h"
#include "sysemu/sysemu.h"
#include "buffered_file.h"
-#include "block.h"
+#include "block/block.h"
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/migration-tcp-android.c b/migration-tcp-android.c
index 3455812..e7e5216 100644
--- a/migration-tcp-android.c
+++ b/migration-tcp-android.c
@@ -17,7 +17,7 @@
#include "qemu-char.h"
#include "sysemu/sysemu.h"
#include "buffered_file.h"
-#include "block.h"
+#include "block/block.h"
//#define DEBUG_MIGRATION_TCP
diff --git a/migration-tcp.c b/migration-tcp.c
index 93e5b02..a54548d 100644
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -17,7 +17,7 @@
#include "qemu-char.h"
#include "sysemu/sysemu.h"
#include "buffered_file.h"
-#include "block.h"
+#include "block/block.h"
//#define DEBUG_MIGRATION_TCP
diff --git a/migration.c b/migration.c
index e95a362..1795538 100644
--- a/migration.c
+++ b/migration.c
@@ -16,7 +16,7 @@
#include "monitor/monitor.h"
#include "buffered_file.h"
#include "sysemu/sysemu.h"
-#include "block.h"
+#include "block/block.h"
#include "qemu_socket.h"
//#define DEBUG_MIGRATION
diff --git a/monitor.c b/monitor.c
index d57aff7..4619cb9 100644
--- a/monitor.c
+++ b/monitor.c
@@ -34,7 +34,7 @@
#include "qemu-char.h"
#include "sysemu/sysemu.h"
#include "monitor/monitor.h"
-#include "readline.h"
+#include "monitor/readline.h"
#include "ui/console.h"
#include "sysemu/blockdev.h"
#include "audio/audio.h"
diff --git a/net/net-android.c b/net/net-android.c
index a5da70c..c2d570a 100644
--- a/net/net-android.c
+++ b/net/net-android.c
@@ -120,7 +120,7 @@
#include "qemu-char.h"
#include "audio/audio.h"
#include "qemu_socket.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#if defined(CONFIG_SLIRP)
#include "libslirp.h"
diff --git a/net/net.c b/net/net.c
index 7caf235..5a5bb05 100644
--- a/net/net.c
+++ b/net/net.c
@@ -118,7 +118,7 @@
#include "qemu-char.h"
#include "audio/audio.h"
#include "qemu_socket.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#if defined(CONFIG_SLIRP)
#include "libslirp.h"
diff --git a/posix-aio-compat.c b/posix-aio-compat.c
index 0db4ff9..f88af0f 100644
--- a/posix-aio-compat.c
+++ b/posix-aio-compat.c
@@ -26,7 +26,7 @@
#include "qemu/osdep.h"
#include "sysemu/sysemu.h"
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "block/raw-posix-aio.h"
diff --git a/qemu-char.c b/qemu-char.c
index a4658dd..7b2d5bd 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -29,7 +29,7 @@
#include "sysemu/sysemu.h"
#include "qemu/timer.h"
#include "qemu-char.h"
-#include "block.h"
+#include "block/block.h"
#include "hw/usb.h"
#include "hw/baum.h"
#include "hw/msmouse.h"
@@ -103,7 +103,7 @@
#define READ_BUF_LEN 4096
#ifdef CONFIG_ANDROID
-#include "charpipe.h"
+#include "android/charpipe.h"
#include "modem_driver.h"
#include "android/gps.h"
#include "android/hw-kmsg.h"
diff --git a/qemu-io.c b/qemu-io.c
index 376b0ab..a85a208 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -15,7 +15,7 @@
#include <libgen.h>
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "cmd.h"
#define VERSION "0.0.1"
diff --git a/readline.c b/readline.c
index bb35632..a16a0fd 100644
--- a/readline.c
+++ b/readline.c
@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#include "readline.h"
+#include "monitor/readline.h"
#include "monitor/monitor.h"
#define IS_NORM 0
diff --git a/savevm.c b/savevm.c
index 71e2d5a..5ee29d9 100644
--- a/savevm.c
+++ b/savevm.c
@@ -78,7 +78,7 @@
#include "qemu/timer.h"
#include "qemu-char.h"
#include "sysemu/blockdev.h"
-#include "block.h"
+#include "block/block.h"
#include "audio/audio.h"
#include "migration/migration.h"
#include "qemu_socket.h"
diff --git a/target-arm/translate.c b/target-arm/translate.c
index 7c07408..559a674 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -28,7 +28,7 @@
#include "exec/exec-all.h"
#include "disas/disas.h"
#include "tcg-op.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#include "helper.h"
#define GEN_HELPER 1
diff --git a/target-i386/exec.h b/target-i386/exec.h
index 3ab94b8..3adc0dd 100644
--- a/target-i386/exec.h
+++ b/target-i386/exec.h
@@ -32,7 +32,7 @@
GLOBAL_REGISTER_VARIABLE_DECL struct CPUX86State *env asm(AREG0);
#include "qemu-common.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#define EAX (env->regs[R_EAX])
#define ECX (env->regs[R_ECX])
diff --git a/target-i386/hax-i386.h b/target-i386/hax-i386.h
index 66869da..8e47a4b 100644
--- a/target-i386/hax-i386.h
+++ b/target-i386/hax-i386.h
@@ -15,7 +15,7 @@
#define _HAX_I386_H
#include "android/utils/debug.h"
-#include "hax.h"
+#include "exec/hax.h"
#ifdef CONFIG_DARWIN
typedef int hax_fd;
diff --git a/target-i386/helper.c b/target-i386/helper.c
index 77f6a44..b49ef14 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -28,7 +28,7 @@
#include "exec/exec-all.h"
#include "qemu-common.h"
#include "sysemu/kvm.h"
-#include "hax.h"
+#include "exec/hax.h"
//#define DEBUG_MMU
diff --git a/target-i386/translate.c b/target-i386/translate.c
index ef58521..2b6617e 100644
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -32,7 +32,7 @@
#include "helper.h"
#define GEN_HELPER 1
#include "helper.h"
-#include "hax.h"
+#include "exec/hax.h"
#define PREFIX_REPZ 0x01
#define PREFIX_REPNZ 0x02
diff --git a/vl-android-ui.c b/vl-android-ui.c
index b711032..54a60ed 100644
--- a/vl-android-ui.c
+++ b/vl-android-ui.c
@@ -41,12 +41,12 @@
#include "ui/console.h"
#include "qemu/timer.h"
#include "qemu-char.h"
-#include "block.h"
+#include "block/block.h"
#include "android/sockets.h"
#include "audio/audio.h"
#include "android/android.h"
-#include "charpipe.h"
+#include "android/charpipe.h"
#include "android/globals.h"
#include "android/utils/bufprint.h"
#include "android/utils/system.h"
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
diff --git a/vl.c b/vl.c
index c4bf0ee..6f8d41a 100644
--- a/vl.c
+++ b/vl.c
@@ -153,7 +153,7 @@
#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"