hw/goldfish_*.h -> include/hw/android/goldfish/*.h
Change-Id: If7f9a46496fad5d936800215b21794bbab185b8a
diff --git a/android/console.c b/android/console.c
index a66b788..e30e724 100644
--- a/android/console.c
+++ b/android/console.c
@@ -26,7 +26,7 @@
#include "sysemu/sysemu.h"
#include "android/android.h"
#include "cpu.h"
-#include "hw/goldfish_device.h"
+#include "hw/android/goldfish/device.h"
#include "hw/power_supply.h"
#include "android/shaper.h"
#include "modem_driver.h"
diff --git a/android/hw-pipe-net.c b/android/hw-pipe-net.c
index f1c1411..c9db019 100644
--- a/android/hw-pipe-net.c
+++ b/android/hw-pipe-net.c
@@ -25,7 +25,7 @@
#include "android/async-utils.h"
#include "android/opengles.h"
#include "android/looper.h"
-#include "hw/goldfish_pipe.h"
+#include "hw/android/goldfish/pipe.h"
/* Implement the OpenGL fast-pipe */
diff --git a/android/hw-qemud.c b/android/hw-qemud.c
index ae38aca..df2d5ac 100644
--- a/android/hw-qemud.c
+++ b/android/hw-qemud.c
@@ -16,7 +16,7 @@
#include "android/utils/bufprint.h"
#include "android/looper.h"
#include "hw/hw.h"
-#include "hw/goldfish_pipe.h"
+#include "hw/android/goldfish/pipe.h"
#include "sysemu/char.h"
#include "android/charpipe.h"
#include "android/cbuffer.h"