move opengl/include/EGL/android_natives.h to include/ui/egl/android_natives.h and don't include it from egl.h
the android_native_ types are just forward declared in egl.h
diff --git a/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp b/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp
index ca96e14..374f2e2 100644
--- a/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp
+++ b/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp
@@ -30,7 +30,6 @@
#include <GLES/gl.h>
#include <EGL/egl.h>
#include <EGL/eglext.h>
-#include <EGL/android_natives.h>
#include <pixelflinger/pixelflinger.h>
diff --git a/libs/surfaceflinger/LayerBitmap.h b/libs/surfaceflinger/LayerBitmap.h
index 6e136a2..824e0f2 100644
--- a/libs/surfaceflinger/LayerBitmap.h
+++ b/libs/surfaceflinger/LayerBitmap.h
@@ -28,12 +28,10 @@
#include <ui/Rect.h>
#include <ui/Surface.h>
-#include <EGL/android_natives.h>
-
#include <pixelflinger/pixelflinger.h>
#include <private/ui/SharedState.h>
-
+#include <private/ui/SurfaceBuffer.h>
class copybit_image_t;
struct android_native_buffer_t;