diff --git a/tools/emulator/opengl/system/egl/ClientAPIExts.cpp b/tools/emulator/opengl/system/egl/ClientAPIExts.cpp
index 888c23103..5e81afebe 100644
--- a/tools/emulator/opengl/system/egl/ClientAPIExts.cpp
+++ b/tools/emulator/opengl/system/egl/ClientAPIExts.cpp
@@ -129,7 +129,7 @@ void initClientFuncs(const EGLClient_glesInterface *iface, int idx)
 #define API_ENTRY_RET(rtype,fname,params,args) \
     API_ENTRY(fname,params,args)
 
-static struct _client_ext_funcs {
+static const struct _client_ext_funcs {
     const char *fname;
     void* proc;
 } s_client_ext_funcs[] = {
diff --git a/tools/emulator/opengl/system/egl/ClientAPIExts.in b/tools/emulator/opengl/system/egl/ClientAPIExts.in
index c3162ebc6..585070196 100644
--- a/tools/emulator/opengl/system/egl/ClientAPIExts.in
+++ b/tools/emulator/opengl/system/egl/ClientAPIExts.in
@@ -2,7 +2,7 @@
 // Each extension function should have one of the following
 // macro definitions:
 //    API_ENTRY(funcname, paramlist, arglist)
-//  -or- (in case funciton has return value)
+//  -or- (if the function has a return value)
 //    API_ENTRY_RET(return_type,funcname, paramlist, arglist)
 //
 API_ENTRY(glEGLImageTargetTexture2DOES,
diff --git a/tools/emulator/opengl/system/egl/eglDisplay.cpp b/tools/emulator/opengl/system/egl/eglDisplay.cpp
index 78025b1a5..881b8d69a 100644
--- a/tools/emulator/opengl/system/egl/eglDisplay.cpp
+++ b/tools/emulator/opengl/system/egl/eglDisplay.cpp
@@ -19,17 +19,17 @@
 
 static const int systemEGLVersionMajor = 1;
 static const int systemEGLVersionMinor = 4;
-static const char *systemEGLVendor = "Google Android emulator";
+static const char systemEGLVendor[] = "Google Android emulator";
 
 // list of extensions supported by this EGL implementation
 //  NOTE that each extension name should be suffixed with space
-static const char *systemStaticEGLExtensions =
+static const char systemStaticEGLExtensions[] =
             "EGL_ANDROID_image_native_buffer ";
 
 // list of extensions supported by this EGL implementation only if supported
 // on the host implementation.
 //  NOTE that each extension name should be suffixed with space
-static const char *systemDynamicEGLExtensions =
+static const char systemDynamicEGLExtensions[] =
             "EGL_KHR_image_base "
             "EGL_KHR_gl_texture_2d_image ";
 
diff --git a/tools/emulator/opengl/system/egl/egl_ftable.h b/tools/emulator/opengl/system/egl/egl_ftable.h
index ee4058590..2c9d19add 100644
--- a/tools/emulator/opengl/system/egl/egl_ftable.h
+++ b/tools/emulator/opengl/system/egl/egl_ftable.h
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-static struct _egl_funcs_by_name {
+static const struct _egl_funcs_by_name {
     const char *name;
     void *proc;
 } egl_funcs_by_name[] = {
@@ -63,4 +63,4 @@ static struct _egl_funcs_by_name {
     {"eglSetSwapRectangleANDROID", (void *)eglSetSwapRectangleANDROID}
 };
 
-static int egl_num_funcs = sizeof(egl_funcs_by_name) / sizeof(struct _egl_funcs_by_name);
+static const int egl_num_funcs = sizeof(egl_funcs_by_name) / sizeof(struct _egl_funcs_by_name);