Move net.h to include/net/
+ Move net-android.c and net.c to net/
+ Rename net-checksum.c to net/checksum.c
+ Move sockets.h and shaper.h to include/android/
and sockets.c + shaper.c to android/
+ Move vgafont.h to ui/
Change-Id: I2659a919a316d3f95aac0f9924833eeee4cb5592
diff --git a/Makefile.common b/Makefile.common
index dcfd53d..08e62f4 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -98,7 +98,6 @@
# Android utility functions
#
common_LOCAL_SRC_FILES += \
- sockets.c \
iolooper-select.c \
android/async-console.c \
android/async-utils.c \
@@ -108,6 +107,7 @@
android/avd/hw-config.c \
android/avd/info.c \
android/avd/util.c \
+ android/sockets.c \
android/sync-utils.c \
android/utils/assert.c \
android/utils/bufprint.c \
@@ -422,12 +422,10 @@
input.c \
iohandler.c \
ioport.c \
- net-android.c \
qemu-char.c \
qemu-malloc.c \
readline.c \
savevm.c \
- shaper.c \
tcpdump.c \
android/boot-properties.c \
android/config.c \
@@ -442,6 +440,7 @@
android/looper-qemu.c \
android/hw-pipe-net.c \
android/qemu-setup.c \
+ android/shaper.c \
android/snapshot.c \
android/async-socket-connector.c \
android/async-socket.c \
@@ -456,6 +455,7 @@
android/multitouch-screen.c \
android/multitouch-port.c \
android/utils/jpeg-compress.c \
+ net/net-android.c \
qobject/qerror.c \
ui/console.c \
ui/d3des.c \
diff --git a/android/adb-server.c b/android/adb-server.c
index 41b2ffd..bc7baa1 100644
--- a/android/adb-server.c
+++ b/android/adb-server.c
@@ -15,7 +15,7 @@
*/
#include "qemu-common.h"
-#include "sockets.h"
+#include "android/sockets.h"
#include "iolooper.h"
#include "android/async-utils.h"
#include "android/utils/debug.h"
diff --git a/android/async-utils.h b/android/async-utils.h
index 30dfbe3..da5e506 100644
--- a/android/async-utils.h
+++ b/android/async-utils.h
@@ -17,7 +17,7 @@
#define ANDROID_ASYNC_UTILS_H
#include "android/looper.h"
-#include "sockets.h"
+#include "android/sockets.h"
/* A set of useful data types to perform asynchronous operations.
*
diff --git a/android/console.c b/android/console.c
index 07a59d2..51209cf 100644
--- a/android/console.c
+++ b/android/console.c
@@ -21,14 +21,14 @@
*
*/
-#include "sockets.h"
+#include "android/sockets.h"
#include "qemu-char.h"
#include "sysemu.h"
#include "android/android.h"
#include "cpu.h"
#include "hw/goldfish_device.h"
#include "hw/power_supply.h"
-#include "shaper.h"
+#include "android/shaper.h"
#include "modem_driver.h"
#include "android/gps.h"
#include "android/globals.h"
@@ -37,7 +37,7 @@
#include "android/utils/stralloc.h"
#include "android/config/config.h"
#include "tcpdump.h"
-#include "net.h"
+#include "net/net.h"
#include "monitor.h"
#include <stdlib.h>
diff --git a/android/core-init-utils.c b/android/core-init-utils.c
index 97d5f05..aa676f8 100644
--- a/android/core-init-utils.c
+++ b/android/core-init-utils.c
@@ -19,7 +19,7 @@
#include <stdlib.h>
#include <errno.h>
#include "qemu-common.h"
-#include "sockets.h"
+#include "android/sockets.h"
#include "android/android.h"
#include "android/core-init-utils.h"
#include "android/utils/bufprint.h"
diff --git a/android/hw-pipe-net.c b/android/hw-pipe-net.c
index 1c71f18..f1c1411 100644
--- a/android/hw-pipe-net.c
+++ b/android/hw-pipe-net.c
@@ -18,7 +18,7 @@
* guest clients to directly connect to a TCP port through /dev/qemu_pipe.
*/
-#include "sockets.h"
+#include "android/sockets.h"
#include "android/utils/assert.h"
#include "android/utils/panic.h"
#include "android/utils/system.h"
diff --git a/android/looper-generic.c b/android/looper-generic.c
index ddc0824..9fd4f0b 100644
--- a/android/looper-generic.c
+++ b/android/looper-generic.c
@@ -16,7 +16,7 @@
#include "android/utils/system.h"
#include "android/looper.h"
#include "iolooper.h"
-#include "sockets.h"
+#include "android/sockets.h"
#include <inttypes.h>
#include <limits.h>
#include <errno.h>
diff --git a/android/looper-qemu.c b/android/looper-qemu.c
index 6ea64ca..df40afe 100644
--- a/android/looper-qemu.c
+++ b/android/looper-qemu.c
@@ -17,7 +17,7 @@
#include "qemu-common.h"
#include "qemu/timer.h"
#include "qemu-char.h"
-#include "sockets.h" /* for socket_set_nonblock() */
+#include "android/sockets.h" /* for socket_set_nonblock() */
/**********************************************************************
**********************************************************************
diff --git a/android/main.c b/android/main.c
index 1ca94df..757a05f 100644
--- a/android/main.c
+++ b/android/main.c
@@ -18,7 +18,7 @@
#include <process.h>
#endif
-#include "sockets.h"
+#include "android/sockets.h"
#include "android/android.h"
#include "qemu-common.h"
diff --git a/android/protocol/attach-ui-impl.h b/android/protocol/attach-ui-impl.h
index 3adc83a..db63955 100644
--- a/android/protocol/attach-ui-impl.h
+++ b/android/protocol/attach-ui-impl.h
@@ -13,7 +13,7 @@
#ifndef _ANDROID_PROTOCOL_ATTACH_UI_IMPL_H
#define _ANDROID_PROTOCOL_ATTACH_UI_IMPL_H
-#include "sockets.h"
+#include "android/sockets.h"
/*
* Contains the UI-side implementation of the "attach-ui" service that is
diff --git a/android/protocol/core-commands-proxy.h b/android/protocol/core-commands-proxy.h
index 4283296..289421f 100644
--- a/android/protocol/core-commands-proxy.h
+++ b/android/protocol/core-commands-proxy.h
@@ -13,7 +13,7 @@
#ifndef _ANDROID_PROTOCOL_CORE_COMMANDS_PROXY_H
#define _ANDROID_PROTOCOL_CORE_COMMANDS_PROXY_H
-#include "sockets.h"
+#include "android/sockets.h"
/*
* Contains the UI-side implementation of the "ui-core-control" service that is
diff --git a/android/protocol/core-connection.c b/android/protocol/core-connection.c
index 6de5386..35f4d6a 100644
--- a/android/protocol/core-connection.c
+++ b/android/protocol/core-connection.c
@@ -12,7 +12,7 @@
#include <unistd.h>
-#include "sockets.h"
+#include "android/sockets.h"
#include "qemu-common.h"
#include "errno.h"
#include "iolooper.h"
diff --git a/android/protocol/ui-commands-impl.h b/android/protocol/ui-commands-impl.h
index f575bd0..717f6b6 100644
--- a/android/protocol/ui-commands-impl.h
+++ b/android/protocol/ui-commands-impl.h
@@ -13,7 +13,7 @@
#ifndef _ANDROID_PROTOCOL_UI_COMMANDS_IMPL_H
#define _ANDROID_PROTOCOL_UI_COMMANDS_IMPL_H
-#include "sockets.h"
+#include "android/sockets.h"
#include "android/looper.h"
#include "android/protocol/ui-commands.h"
diff --git a/shaper.c b/android/shaper.c
similarity index 99%
rename from shaper.c
rename to android/shaper.c
index da9e3bd..4dbb8ea 100644
--- a/shaper.c
+++ b/android/shaper.c
@@ -9,7 +9,7 @@
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
*/
-#include "shaper.h"
+#include "android/shaper.h"
#include "qemu-common.h"
#include "qemu/timer.h"
#include <stdlib.h>
diff --git a/sockets.c b/android/sockets.c
similarity index 99%
rename from sockets.c
rename to android/sockets.c
index 0879c06..2250ee8 100644
--- a/sockets.c
+++ b/android/sockets.c
@@ -14,7 +14,7 @@
# define _GNU_SOURCE 1
#endif
-#include "sockets.h"
+#include "android/sockets.h"
#include <fcntl.h>
#include <stddef.h>
#include "qemu_debug.h"
diff --git a/android/sync-utils.c b/android/sync-utils.c
index 617ba8b..cab0fa6 100644
--- a/android/sync-utils.c
+++ b/android/sync-utils.c
@@ -22,7 +22,7 @@
#include "qemu-common.h"
#include "errno.h"
#include "iolooper.h"
-#include "sockets.h"
+#include "android/sockets.h"
#include "android/utils/debug.h"
#include "android/sync-utils.h"
#include "android/utils/system.h"
diff --git a/android/sync-utils.h b/android/sync-utils.h
index bb54f3c..adb68a7 100644
--- a/android/sync-utils.h
+++ b/android/sync-utils.h
@@ -23,7 +23,7 @@
#define ANDROID_SYNC_UTILS_H
#include "android/android.h"
-#include "sockets.h"
+#include "android/sockets.h"
/* Descriptor for a connected non-blocking socket providing synchronous I/O */
typedef struct SyncSocket SyncSocket;
diff --git a/arch_init.c b/arch_init.c
index ba92c87..d5c91a1 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -38,7 +38,7 @@
#include "hw/audiodev.h"
#include "kvm.h"
#include "migration.h"
-#include "net.h"
+#include "net/net.h"
#include "exec/gdbstub.h"
#include "hw/smbios.h"
diff --git a/bt-host.c b/bt-host.c
index 095254d..038566a 100644
--- a/bt-host.c
+++ b/bt-host.c
@@ -19,7 +19,7 @@
#include "qemu-common.h"
#include "qemu-char.h"
-#include "net.h"
+#include "net/net.h"
#include "bt-host.h"
#ifndef _WIN32
diff --git a/bt-vhci.c b/bt-vhci.c
index 3c57720..eab761f 100644
--- a/bt-vhci.c
+++ b/bt-vhci.c
@@ -19,7 +19,7 @@
#include "qemu-common.h"
#include "qemu-char.h"
-#include "net.h"
+#include "net/net.h"
#include "hw/bt.h"
#define VHCI_DEV "/dev/vhci"
diff --git a/hw/android_arm.c b/hw/android_arm.c
index e217b59..4b78bdb 100644
--- a/hw/android_arm.c
+++ b/hw/android_arm.c
@@ -12,7 +12,7 @@
#include "hw.h"
#include "boards.h"
#include "devices.h"
-#include "net.h"
+#include "net/net.h"
#include "arm_pic.h"
#include "sysemu.h"
#include "goldfish_device.h"
diff --git a/hw/android_mips.c b/hw/android_mips.c
index d8621ab..d44b725 100644
--- a/hw/android_mips.c
+++ b/hw/android_mips.c
@@ -12,7 +12,7 @@
#include "hw.h"
#include "boards.h"
#include "devices.h"
-#include "net.h"
+#include "net/net.h"
#include "sysemu.h"
#include "mips.h"
#include "goldfish_device.h"
diff --git a/hw/bt-hci-csr.c b/hw/bt-hci-csr.c
index 0eabd2b..6e23c33 100644
--- a/hw/bt-hci-csr.c
+++ b/hw/bt-hci-csr.c
@@ -23,7 +23,7 @@
#include "qemu/timer.h"
#include "irq.h"
#include "sysemu.h"
-#include "net.h"
+#include "net/net.h"
#include "bt.h"
struct csrhci_s {
diff --git a/hw/bt-hci.c b/hw/bt-hci.c
index 9b403f8..3d061aa 100644
--- a/hw/bt-hci.c
+++ b/hw/bt-hci.c
@@ -21,7 +21,7 @@
#include "qemu-common.h"
#include "qemu/timer.h"
#include "usb.h"
-#include "net.h"
+#include "net/net.h"
#include "bt.h"
struct bt_hci_s {
diff --git a/hw/bt.c b/hw/bt.c
index 34bf004..7ad9990 100644
--- a/hw/bt.c
+++ b/hw/bt.c
@@ -18,7 +18,7 @@
*/
#include "qemu-common.h"
-#include "net.h"
+#include "net/net.h"
#include "bt.h"
/* Slave implementations can ignore this */
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index b69d7c3..3783697 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -11,7 +11,7 @@
#include "mips.h"
#include "pc.h"
#include "isa.h"
-#include "net.h"
+#include "net/net.h"
#include "sysemu.h"
#include "boards.h"
#include "flash.h"
diff --git a/hw/ne2000.c b/hw/ne2000.c
index 66ae9ab..4d896f1 100644
--- a/hw/ne2000.c
+++ b/hw/ne2000.c
@@ -24,7 +24,7 @@
#include "hw.h"
#include "pci.h"
#include "pc.h"
-#include "net.h"
+#include "net/net.h"
/* debug NE2000 card */
//#define DEBUG_NE2000
diff --git a/hw/pc.c b/hw/pc.c
index 973635a..ef83c74 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -29,7 +29,7 @@
#include "sysemu.h"
#include "blockdev.h"
#include "audio/audio.h"
-#include "net.h"
+#include "net/net.h"
//#include "smbus.h"
#include "boards.h"
#include "android/globals.h"
diff --git a/hw/pci.c b/hw/pci.c
index 0a738db..66c9bdf 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -24,7 +24,7 @@
#include "hw.h"
#include "pci.h"
#include "monitor.h"
-#include "net.h"
+#include "net/net.h"
#include "sysemu.h"
//#define DEBUG_PCI
diff --git a/hw/qdev.c b/hw/qdev.c
index ef6384e..14c0dde 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -26,7 +26,7 @@
inherit from a particular bus (e.g. PCI or I2C) rather than
this API directly. */
-#include "net.h"
+#include "net/net.h"
#include "qdev.h"
#include "sysemu.h"
#include "monitor.h"
diff --git a/hw/smc91c111.c b/hw/smc91c111.c
index 1eaba74..5793a2e 100644
--- a/hw/smc91c111.c
+++ b/hw/smc91c111.c
@@ -8,7 +8,7 @@
*/
#include "sysbus.h"
-#include "net.h"
+#include "net/net.h"
#include "devices.h"
#include "hw/hw.h"
/* For crc32 */
diff --git a/shaper.h b/include/android/shaper.h
similarity index 100%
rename from shaper.h
rename to include/android/shaper.h
diff --git a/sockets.h b/include/android/sockets.h
similarity index 100%
rename from sockets.h
rename to include/android/sockets.h
diff --git a/net.h b/include/net/net.h
similarity index 100%
rename from net.h
rename to include/net/net.h
diff --git a/input.c b/input.c
index 39a03f7..2699e80 100644
--- a/input.c
+++ b/input.c
@@ -23,7 +23,7 @@
*/
#include "sysemu.h"
-#include "net.h"
+#include "net/net.h"
#include "monitor.h"
#include "ui/console.h"
#include "qapi/qmp/qjson.h"
diff --git a/iolooper-select.c b/iolooper-select.c
index 5024c9a..7055781 100644
--- a/iolooper-select.c
+++ b/iolooper-select.c
@@ -8,7 +8,7 @@
# include <sys/types.h>
# include <sys/select.h>
#endif
-#include "sockets.h"
+#include "android/sockets.h"
struct IoLooper {
fd_set reads[1];
diff --git a/monitor.c b/monitor.c
index 9f2a63d..7046aeb 100644
--- a/monitor.c
+++ b/monitor.c
@@ -30,7 +30,7 @@
#include "hw/pci.h"
#include "hw/watchdog.h"
#include "exec/gdbstub.h"
-#include "net.h"
+#include "net/net.h"
#include "qemu-char.h"
#include "sysemu.h"
#include "monitor.h"
diff --git a/net-checksum.c b/net/checksum.c
similarity index 98%
rename from net-checksum.c
rename to net/checksum.c
index 4956c5c..4ec6d67 100644
--- a/net-checksum.c
+++ b/net/checksum.c
@@ -16,7 +16,7 @@
*/
#include "hw/hw.h"
-#include "net.h"
+#include "net/net.h"
#define PROTO_TCP 6
#define PROTO_UDP 17
diff --git a/net-android.c b/net/net-android.c
similarity index 99%
rename from net-android.c
rename to net/net-android.c
index 2ee4ddb..eb225bc 100644
--- a/net-android.c
+++ b/net/net-android.c
@@ -113,7 +113,7 @@
#endif
#include "qemu-common.h"
-#include "net.h"
+#include "net/net.h"
#include "monitor.h"
#include "sysemu.h"
#include "qemu/timer.h"
@@ -127,7 +127,7 @@
#endif
#if defined(CONFIG_ANDROID)
-#include "shaper.h"
+#include "android/shaper.h"
#endif
#include "android/android.h"
diff --git a/net.c b/net/net.c
similarity index 99%
rename from net.c
rename to net/net.c
index fe6f73f..f2b956d 100644
--- a/net.c
+++ b/net/net.c
@@ -111,7 +111,7 @@
#endif
#include "qemu-common.h"
-#include "net.h"
+#include "net/net.h"
#include "monitor.h"
#include "sysemu.h"
#include "qemu/timer.h"
diff --git a/os-posix.c b/os-posix.c
index 324bf13..483aa5e 100644
--- a/os-posix.c
+++ b/os-posix.c
@@ -36,7 +36,7 @@
/* Needed early for CONFIG_BSD etc. */
#include "config-host.h"
#include "sysemu.h"
-#include "net.h"
+#include "net/net.h"
#include "qemu-options.h"
#ifdef CONFIG_LINUX
diff --git a/proxy/proxy_common.c b/proxy/proxy_common.c
index 3a04eb8..74e2929 100644
--- a/proxy/proxy_common.c
+++ b/proxy/proxy_common.c
@@ -10,7 +10,7 @@
** GNU General Public License for more details.
*/
#include "proxy_int.h"
-#include "sockets.h"
+#include "android/sockets.h"
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
diff --git a/proxy/proxy_common.h b/proxy/proxy_common.h
index 5c5789f..0a52810 100644
--- a/proxy/proxy_common.h
+++ b/proxy/proxy_common.h
@@ -12,7 +12,7 @@
#ifndef _PROXY_COMMON_H_
#define _PROXY_COMMON_H_
-#include "sockets.h"
+#include "android/sockets.h"
#ifdef _WIN32
#include <winsock2.h>
diff --git a/proxy/proxy_int.h b/proxy/proxy_int.h
index 739bb75..b22cdf2 100644
--- a/proxy/proxy_int.h
+++ b/proxy/proxy_int.h
@@ -13,7 +13,7 @@
#define _PROXY_INT_H
#include "proxy_common.h"
-#include "sockets.h"
+#include "android/sockets.h"
#include "android/utils/stralloc.h"
extern int proxy_log;
diff --git a/qemu-char.c b/qemu-char.c
index b73cb9f..7ae4e7a 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -22,8 +22,8 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "sockets.h"
-#include "net.h"
+#include "android/sockets.h"
+#include "net/net.h"
#include "monitor.h"
#include "ui/console.h"
#include "sysemu.h"
diff --git a/qemu-timer.c b/qemu-timer.c
index 87a85d6..9bb8aac 100644
--- a/qemu-timer.c
+++ b/qemu-timer.c
@@ -23,7 +23,7 @@
*/
#include "sysemu.h"
-#include "net.h"
+#include "net/net.h"
#include "monitor.h"
#include "ui/console.h"
diff --git a/qemu_socket.h b/qemu_socket.h
index ada6e40..5f6e3bd 100644
--- a/qemu_socket.h
+++ b/qemu_socket.h
@@ -4,7 +4,7 @@
#include "qemu-option.h"
-#include "sockets.h"
+#include "android/sockets.h"
#define socket_error() errno
#define closesocket socket_close
diff --git a/savevm.c b/savevm.c
index 04b3263..fe44e2d 100644
--- a/savevm.c
+++ b/savevm.c
@@ -72,7 +72,7 @@
#include "qemu-common.h"
#include "hw/hw.h"
-#include "net.h"
+#include "net/net.h"
#include "monitor.h"
#include "sysemu.h"
#include "qemu/timer.h"
diff --git a/slirp-android/ip_icmp.c b/slirp-android/ip_icmp.c
index c1edd6b..9d3c3bc 100644
--- a/slirp-android/ip_icmp.c
+++ b/slirp-android/ip_icmp.c
@@ -32,7 +32,7 @@
#include "slirp.h"
#include "ip_icmp.h"
-#include "sockets.h"
+#include "android/sockets.h"
#ifdef LOG_ENABLED
struct icmpstat icmpstat;
diff --git a/slirp-android/libslirp.h b/slirp-android/libslirp.h
index e8b63a8..01003bf 100644
--- a/slirp-android/libslirp.h
+++ b/slirp-android/libslirp.h
@@ -3,7 +3,7 @@
#include <stdint.h>
#include <stdio.h>
-#include "sockets.h"
+#include "android/sockets.h"
#include "slirp.h"
#ifdef _WIN32
# define WIN32_LEAN_AND_MEAN
diff --git a/slirp-android/slirp.c b/slirp-android/slirp.c
index 6a62e4b..5ae6648 100644
--- a/slirp-android/slirp.c
+++ b/slirp-android/slirp.c
@@ -30,7 +30,7 @@
#include "android/utils/debug.h" /* for dprint */
#include "android/utils/bufprint.h"
#include "android/android.h"
-#include "sockets.h"
+#include "android/sockets.h"
#include "qemu-queue.h"
diff --git a/slirp-android/slirp.h b/slirp-android/slirp.h
index e882a7f..b592093 100644
--- a/slirp-android/slirp.h
+++ b/slirp-android/slirp.h
@@ -21,7 +21,7 @@
#include "slirp_config.h"
#include <stddef.h>
-#include "sockets.h"
+#include "android/sockets.h"
#ifdef _WIN32
# include <inttypes.h>
diff --git a/slirp-android/socket.c b/slirp-android/socket.c
index 439590a..0b46f7b 100644
--- a/slirp-android/socket.c
+++ b/slirp-android/socket.c
@@ -14,7 +14,7 @@
#include <sys/filio.h>
#endif
#define SLIRP_COMPILATION 1
-#include "sockets.h"
+#include "android/sockets.h"
#include "proxy_common.h"
static void sofcantrcvmore(struct socket *so);
diff --git a/slirp-android/udp.c b/slirp-android/udp.c
index 1de938a..15fed77 100644
--- a/slirp-android/udp.c
+++ b/slirp-android/udp.c
@@ -41,7 +41,7 @@
#include <slirp.h>
#include "ip_icmp.h"
#define SLIRP_COMPILATION 1
-#include "sockets.h"
+#include "android/sockets.h"
#ifdef LOG_ENABLED
struct udpstat udpstat;
diff --git a/tap-win32.c b/tap-win32.c
index ce30a50..6a55a25 100644
--- a/tap-win32.c
+++ b/tap-win32.c
@@ -27,7 +27,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "qemu-common.h"
-#include "net.h"
+#include "net/net.h"
#include "sysemu.h"
#include <stdio.h>
#include <windows.h>
diff --git a/telephony/remote_call.c b/telephony/remote_call.c
index d7b6b17..c36347d 100644
--- a/telephony/remote_call.c
+++ b/telephony/remote_call.c
@@ -15,7 +15,7 @@
#include "sysdeps.h"
#include "gsm.h"
#include "android/android.h"
-#include "sockets.h"
+#include "android/sockets.h"
#include <stdlib.h>
#define DEBUG 1
diff --git a/telephony/sysdeps_qemu.c b/telephony/sysdeps_qemu.c
index f180de8..443029b 100644
--- a/telephony/sysdeps_qemu.c
+++ b/telephony/sysdeps_qemu.c
@@ -9,7 +9,7 @@
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
*/
-#include "sockets.h"
+#include "android/sockets.h"
#include "sysdeps.h"
#include "qemu-common.h"
#include "qemu/timer.h"
diff --git a/vgafont.h b/ui/vgafont.h
similarity index 100%
rename from vgafont.h
rename to ui/vgafont.h
diff --git a/vl-android-ui.c b/vl-android-ui.c
index c14fd9b..b711032 100644
--- a/vl-android-ui.c
+++ b/vl-android-ui.c
@@ -37,12 +37,12 @@
#endif
#include "qemu-common.h"
-#include "net.h"
+#include "net/net.h"
#include "ui/console.h"
#include "qemu/timer.h"
#include "qemu-char.h"
#include "block.h"
-#include "sockets.h"
+#include "android/sockets.h"
#include "audio/audio.h"
#include "android/android.h"
diff --git a/vl-android.c b/vl-android.c
index f2dce01..6403414 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -37,7 +37,7 @@
#include "hw/isa.h"
#include "hw/baum.h"
#include "hw/goldfish_nand.h"
-#include "net.h"
+#include "net/net.h"
#include "ui/console.h"
#include "sysemu.h"
#include "exec/gdbstub.h"
@@ -187,7 +187,7 @@
#include "hw/smbios.h"
#include "hw/xen.h"
#include "bt-host.h"
-#include "net.h"
+#include "net/net.h"
#include "monitor.h"
#include "ui/console.h"
#include "sysemu.h"
diff --git a/vl.c b/vl.c
index 21c11b5..a7285a7 100644
--- a/vl.c
+++ b/vl.c
@@ -145,7 +145,7 @@
#include "hw/smbios.h"
#include "hw/xen.h"
#include "bt-host.h"
-#include "net.h"
+#include "net/net.h"
#include "monitor.h"
#include "ui/console.h"
#include "sysemu.h"