diff --git a/android/opengl/system/GLESv1_enc/gl_client_proc.h b/android/opengl/system/GLESv1_enc/gl_client_proc.h
index 707c524..a94fc76 100644
--- a/android/opengl/system/GLESv1_enc/gl_client_proc.h
+++ b/android/opengl/system/GLESv1_enc/gl_client_proc.h
@@ -6,6 +6,8 @@
 
 
 #include "gl_types.h"
+
+#include "emugl/common/logging.h"
 #ifndef gl_APIENTRY
 #define gl_APIENTRY 
 #endif
diff --git a/android/opengl/system/GLESv2_enc/gl2_client_proc.h b/android/opengl/system/GLESv2_enc/gl2_client_proc.h
index 445910d..a57df23 100644
--- a/android/opengl/system/GLESv2_enc/gl2_client_proc.h
+++ b/android/opengl/system/GLESv2_enc/gl2_client_proc.h
@@ -6,6 +6,8 @@
 
 
 #include "gl2_types.h"
+
+#include "emugl/common/logging.h"
 #ifndef gl2_APIENTRY
 #define gl2_APIENTRY 
 #endif
diff --git a/android/opengl/system/renderControl_enc/renderControl_client_proc.h b/android/opengl/system/renderControl_enc/renderControl_client_proc.h
index cdc372e..3d422e0 100644
--- a/android/opengl/system/renderControl_enc/renderControl_client_proc.h
+++ b/android/opengl/system/renderControl_enc/renderControl_client_proc.h
@@ -7,6 +7,7 @@
 
 #include "renderControl_types.h"
 
+#include "emugl/common/logging.h"
 #ifndef renderControl_APIENTRY
 #define renderControl_APIENTRY 
 #endif
diff --git a/external/android-emugl/host/libs/GLESv2_dec/gles2.attrib b/external/android-emugl/host/libs/GLESv2_dec/gles2.attrib
index 5cba008..d84a8b6 100644
--- a/external/android-emugl/host/libs/GLESv2_dec/gles2.attrib
+++ b/external/android-emugl/host/libs/GLESv2_dec/gles2.attrib
@@ -1,6 +1,6 @@
 GLOBAL
 	base_opcode 2048
-	encoder_headers <string.h> "glUtils.h" "GLESv2EncoderUtils.h"
+	encoder_headers <string.h> "glUtils.h" "GL2EncoderUtils.h"
 
 #void glBindAttribLocation(GLuint program, GLuint index, GLchar *name)
 glBindAttribLocation