diff -rupN angle-8613f49/include/GLES2/gl2.h angle-8613f49-new/include/GLES2/gl2.h
--- angle-8613f49/include/GLES2/gl2.h	2016-02-11 20:53:41.000000000 +0100
+++ angle-8613f49-new/include/GLES2/gl2.h	2017-01-16 23:20:11.169771616 +0100
@@ -57,6 +57,7 @@ extern "C" {
 #ifndef GL_ES_VERSION_2_0
 #define GL_ES_VERSION_2_0 1
 #include <KHR/khrplatform.h>
+#include <stddef.h>
 typedef khronos_int8_t GLbyte;
 typedef khronos_float_t GLclampf;
 typedef khronos_int32_t GLfixed;
@@ -70,8 +71,8 @@ typedef unsigned int GLenum;
 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;
diff -rupN angle-8613f49/include/GLES3/gl31.h angle-8613f49-new/include/GLES3/gl31.h
--- angle-8613f49/include/GLES3/gl31.h	2016-02-11 20:53:41.000000000 +0100
+++ angle-8613f49-new/include/GLES3/gl31.h	2017-01-16 23:20:05.972833465 +0100
@@ -57,6 +57,7 @@ extern "C" {
 #ifndef GL_ES_VERSION_2_0
 #define GL_ES_VERSION_2_0 1
 #include <KHR/khrplatform.h>
+#include <stddef.h>
 typedef khronos_int8_t GLbyte;
 typedef khronos_float_t GLclampf;
 typedef khronos_int32_t GLfixed;
@@ -70,8 +71,8 @@ typedef unsigned int GLenum;
 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;
diff -rupN angle-8613f49/include/GLES3/gl32.h angle-8613f49-new/include/GLES3/gl32.h
--- angle-8613f49/include/GLES3/gl32.h	2016-02-11 20:53:41.000000000 +0100
+++ angle-8613f49-new/include/GLES3/gl32.h	2017-01-16 23:18:52.732710041 +0100
@@ -57,6 +57,7 @@ extern "C" {
 #ifndef GL_ES_VERSION_2_0
 #define GL_ES_VERSION_2_0 1
 #include <KHR/khrplatform.h>
+#include <stddef.h>
 typedef khronos_int8_t GLbyte;
 typedef khronos_float_t GLclampf;
 typedef khronos_int32_t GLfixed;
@@ -70,8 +71,8 @@ typedef unsigned int GLenum;
 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;
diff -rupN angle-8613f49/include/GLES3/gl3.h angle-8613f49-new/include/GLES3/gl3.h
--- angle-8613f49/include/GLES3/gl3.h	2016-02-11 20:53:41.000000000 +0100
+++ angle-8613f49-new/include/GLES3/gl3.h	2017-01-16 23:19:47.341055571 +0100
@@ -57,6 +57,7 @@ extern "C" {
 #ifndef GL_ES_VERSION_2_0
 #define GL_ES_VERSION_2_0 1
 #include <KHR/khrplatform.h>
+#include <stddef.h>
 typedef khronos_int8_t GLbyte;
 typedef khronos_float_t GLclampf;
 typedef khronos_int32_t GLfixed;
@@ -70,8 +71,8 @@ typedef unsigned int GLenum;
 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;
diff -rupN angle-8613f49/src/libANGLE/renderer/gl/functionsgl_typedefs.h angle-8613f49-new/src/libANGLE/renderer/gl/functionsgl_typedefs.h
--- angle-8613f49/src/libANGLE/renderer/gl/functionsgl_typedefs.h	2016-02-11 20:53:41.000000000 +0100
+++ angle-8613f49-new/src/libANGLE/renderer/gl/functionsgl_typedefs.h	2017-01-17 11:18:47.274654875 +0100
@@ -13,6 +13,7 @@
 
 #include <KHR/khrplatform.h>
 #include <stdint.h>
+#include <stddef.h>
 
 #ifndef INTERNAL_GL_APIENTRY
 #   ifdef ANGLE_PLATFORM_WINDOWS
@@ -39,8 +40,8 @@ typedef khronos_float_t  GLclampf;
 typedef double           GLdouble;
 typedef double           GLclampd;
 typedef khronos_int32_t  GLfixed;
-typedef khronos_intptr_t GLintptr;
-typedef khronos_ssize_t  GLsizeiptr;
+typedef ptrdiff_t GLintptr;
+typedef ptrdiff_t  GLsizeiptr;
 typedef unsigned short   GLhalf;
 typedef khronos_int64_t  GLint64;
 typedef khronos_uint64_t GLuint64;
