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/opengl/libagl/TextureObjectManager.cpp b/opengl/libagl/TextureObjectManager.cpp
index 9eb99f0..e5d4ed2 100644
--- a/opengl/libagl/TextureObjectManager.cpp
+++ b/opengl/libagl/TextureObjectManager.cpp
@@ -19,6 +19,8 @@
#include "context.h"
#include "TextureObjectManager.h"
+#include <ui/egl/android_natives.h>
+
namespace android {
// ----------------------------------------------------------------------------
diff --git a/opengl/libagl/TextureObjectManager.h b/opengl/libagl/TextureObjectManager.h
index 29d5037..e0eadf1 100644
--- a/opengl/libagl/TextureObjectManager.h
+++ b/opengl/libagl/TextureObjectManager.h
@@ -30,7 +30,7 @@
#include <private/pixelflinger/ggl_context.h>
#include <GLES/gl.h>
-#include <EGL/android_natives.h>
+#include <EGL/egl.h>
#include "Tokenizer.h"
#include "TokenManager.h"
diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp
index 720ba0b..0950f3e 100644
--- a/opengl/libagl/egl.cpp
+++ b/opengl/libagl/egl.cpp
@@ -33,13 +33,14 @@
#include <EGL/egl.h>
#include <EGL/eglext.h>
-#include <EGL/android_natives.h>
#include <GLES/gl.h>
#include <GLES/glext.h>
#include <pixelflinger/format.h>
#include <pixelflinger/pixelflinger.h>
+#include <ui/egl/android_natives.h>
+
#include "context.h"
#include "state.h"
#include "texture.h"
diff --git a/opengl/libagl/texture.cpp b/opengl/libagl/texture.cpp
index 1189643..0211208 100644
--- a/opengl/libagl/texture.cpp
+++ b/opengl/libagl/texture.cpp
@@ -23,7 +23,7 @@
#include "texture.h"
#include "TextureObjectManager.h"
-#include <EGL/android_natives.h>
+#include <ui/egl/android_natives.h>
#ifdef LIBAGL_USE_GRALLOC_COPYBITS
#include "copybit.h"