diff --git a/renderdoc/driver/gl/egl_hooks.cpp b/renderdoc/driver/gl/egl_hooks.cpp
index 19d8f827e..2093d4f01 100644
--- a/renderdoc/driver/gl/egl_hooks.cpp
+++ b/renderdoc/driver/gl/egl_hooks.cpp
@@ -260,7 +260,7 @@ HOOK_EXPORT EGLBoolean EGLAPIENTRY eglMakeCurrent(EGLDisplay display, EGLSurface
     data.egl_dpy = display;
     data.egl_wnd = draw;
     data.egl_ctx = ctx;
-    data.wnd = eglhook.windows[draw];
+    data.wnd = (decltype(data.wnd))eglhook.windows[draw];
 
     if(!data.wnd)
     {
diff --git a/renderdoc/driver/gl/egl_platform.cpp b/renderdoc/driver/gl/egl_platform.cpp
index 7d1bd4f93..922cce2ef 100644
--- a/renderdoc/driver/gl/egl_platform.cpp
+++ b/renderdoc/driver/gl/egl_platform.cpp
@@ -226,7 +226,7 @@ class EGLPlatform : public GLPlatform
         RDCERR("Couldn't create a suitable PBuffer");
     }
 
-    ret.wnd = window;
+    ret.wnd = (decltype(ret.wnd))window;
     ret.egl_wnd = surface;
 
     return ret;
diff --git a/renderdoc/driver/gl/gl_common.h b/renderdoc/driver/gl/gl_common.h
index 95611860e..4c566603f 100644
--- a/renderdoc/driver/gl/gl_common.h
+++ b/renderdoc/driver/gl/gl_common.h
@@ -168,7 +168,7 @@ struct GLWindowingData
   typedef void *GLESDisplayPtr;
   typedef void *GLESContextPtr;
   typedef void *GLESWindowPtr;
-  typedef vpod *GLESConfigPtr;
+  typedef void *GLESConfigPtr;
 #endif
 
   union