11 files changed, 15 insertions, 16 deletions
diff --git a/Makefile.android b/Makefile.android
index 1896cf0..1e103fd 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -873,7 +873,7 @@ endif
 
 # include other sources
 #
-VL_SOURCES := framebuffer.c \
+VL_SOURCES := android/framebuffer.c \
               user-events-qemu.c \
               android/cmdline-option.c \
               android/looper-qemu.c \
@@ -1053,7 +1053,7 @@ LOCAL_LDLIBS  += $(AUDIO_LDLIBS)
 
 # include other sources
 #
-VL_SOURCES := framebuffer.c \
+VL_SOURCES := android/framebuffer.c \
               user-events-qemu.c \
               android/looper-qemu.c \
               android/looper-generic.c \
@@ -1206,7 +1206,7 @@ endif
 
 # include other sources
 #
-VL_SOURCES := framebuffer.c \
+VL_SOURCES := android/framebuffer.c \
               android/cmdline-option.c \
               android/config.c \
               android/display.c \
diff --git a/android/display-core.h b/android/display-core.h
index 6204e56..edeccac 100644
--- a/android/display-core.h
+++ b/android/display-core.h
@@ -18,7 +18,7 @@
 #ifndef _ANDROID_DISPLAY_CORE_H
 #define _ANDROID_DISPLAY_CORE_H
 
-#include "framebuffer.h"
+#include "android/framebuffer.h"
 #include "android/display.h"
 #include "android/protocol/fb-updates-proxy.h"
 
diff --git a/android/display.h b/android/display.h
index 111979c..4b9e908 100644
--- a/android/display.h
+++ b/android/display.h
@@ -13,7 +13,7 @@
 #define _ANDROID_DISPLAY_H
 
 #include "console.h"
-#include "framebuffer.h"
+#include "android/framebuffer.h"
 
 extern void android_display_init(DisplayState* ds, QFrameBuffer* qfbuff);
 
diff --git a/framebuffer.c b/android/framebuffer.c
index a90a1e8..53c6a48 100644
--- a/framebuffer.c
+++ b/android/framebuffer.c
@@ -9,7 +9,7 @@
 ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ** GNU General Public License for more details.
 */
-#include "framebuffer.h"
+#include "android/framebuffer.h"
 #include <memory.h>
 #include <stdlib.h>
 
diff --git a/framebuffer.h b/android/framebuffer.h
index 7a69440..9d1f626 100644
--- a/framebuffer.h
+++ b/android/framebuffer.h
@@ -9,8 +9,8 @@
 ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ** GNU General Public License for more details.
 */
-#ifndef _QEMU_FRAMEBUFFER_H_
-#define _QEMU_FRAMEBUFFER_H_
+#ifndef _ANDROID_FRAMEBUFFER_H_
+#define _ANDROID_FRAMEBUFFER_H_
 
 /* A simple abstract interface to framebuffer displays. this is used to
  * de-couple hardware emulation from final display.
@@ -215,5 +215,4 @@ qframebuffer_fifo_get( void );
 
 /* */
 
-#endif /* _QEMU_FRAMEBUFFER_H_ */
-
+#endif /* _ANDROID_FRAMEBUFFER_H_ */
diff --git a/android/main-ui.c b/android/main-ui.c
index 051f3e8..9981b76 100644
--- a/android/main-ui.c
+++ b/android/main-ui.c
@@ -59,7 +59,7 @@
 #include "android/protocol/ui-commands-impl.h"
 #include "android/protocol/attach-ui-impl.h"
 
-#include "framebuffer.h"
+#include "android/framebuffer.h"
 #include "iolooper.h"
 
 AndroidRotation  android_framebuffer_rotation;
diff --git a/android/main.c b/android/main.c
index 64fe617..e38c0e3 100644
--- a/android/main.c
+++ b/android/main.c
@@ -53,7 +53,7 @@
 
 #include "android/snapshot.h"
 
-#include "framebuffer.h"
+#include "android/framebuffer.h"
 #include "iolooper.h"
 
 AndroidRotation  android_framebuffer_rotation;
diff --git a/android/protocol/fb-updates-impl.h b/android/protocol/fb-updates-impl.h
index 2572b5e..c4dd2e0 100644
--- a/android/protocol/fb-updates-impl.h
+++ b/android/protocol/fb-updates-impl.h
@@ -19,7 +19,7 @@
 #define _ANDROID_FRAMEBUFFER_UI_H
 
 #include "console.h"
-#include "framebuffer.h"
+#include "android/framebuffer.h"
 #include "android/looper.h"
 #include "android/async-utils.h"
 
diff --git a/android/protocol/fb-updates-proxy.c b/android/protocol/fb-updates-proxy.c
index fee1195..359c942 100644
--- a/android/protocol/fb-updates-proxy.c
+++ b/android/protocol/fb-updates-proxy.c
@@ -16,7 +16,7 @@
  */
 
 #include "console.h"
-#include "framebuffer.h"
+#include "android/framebuffer.h"
 #include "android/looper.h"
 #include "android/display-core.h"
 #include "android/async-utils.h"
diff --git a/android/skin/file.h b/android/skin/file.h
index 6f88063..4e3a8fc 100644
--- a/android/skin/file.h
+++ b/android/skin/file.h
@@ -14,7 +14,7 @@
 
 #include "android/skin/image.h"
 #include "android/config.h"
-#include "framebuffer.h"
+#include "android/framebuffer.h"
 
 /**  Layout
  **/
diff --git a/android/skin/window.c b/android/skin/window.c
index c2d0bf4..2755763 100644
--- a/android/skin/window.c
+++ b/android/skin/window.c
@@ -21,7 +21,7 @@
 #include "user-events.h"
 #include <math.h>
 
-#include "framebuffer.h"
+#include "android/framebuffer.h"
 
 /* when shrinking, we reduce the pixel ratio by this fixed amount */
 #define  SHRINK_SCALE  0.6