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/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"