--- xorgbase-git-180305.old/mesa/mesa/include/GLES2/gl2.h
+++ xorgbase-git-180305/mesa/mesa/include/GLES2/gl2.h
@@ -34,6 +34,7 @@
 **   https://github.com/KhronosGroup/OpenGL-Registry
 */
 
+#include <stddef.h>
 #include <GLES2/gl2platform.h>
 
 #ifndef GL_APIENTRYP
@@ -72,8 +73,8 @@
 typedef unsigned int GLuint;
 typedef char GLchar;
 typedef khronos_float_t GLfloat;
-typedef khronos_ssize_t GLsizeiptr;
-typedef khronos_intptr_t GLintptr;
+typedef ptrdiff_t GLsizeiptr;
+typedef ptrdiff_t GLintptr;
 typedef unsigned int GLbitfield;
 typedef int GLint;
 typedef unsigned char GLboolean;
--- xorgbase-git-180305.old/mesa/mesa/include/GLES3/gl3.h
+++ xorgbase-git-180305/mesa/mesa/include/GLES3/gl3.h
@@ -34,6 +34,7 @@
 **   https://github.com/KhronosGroup/OpenGL-Registry
 */
 
+#include <stddef.h>
 #include <GLES3/gl3platform.h>
 
 #ifndef GL_APIENTRYP
@@ -72,8 +73,8 @@
 typedef unsigned int GLuint;
 typedef char GLchar;
 typedef khronos_float_t GLfloat;
-typedef khronos_ssize_t GLsizeiptr;
-typedef khronos_intptr_t GLintptr;
+typedef ptrdiff_t GLsizeiptr;
+typedef ptrdiff_t GLintptr;
 typedef unsigned int GLbitfield;
 typedef int GLint;
 typedef unsigned char GLboolean;