diff --git a/src/rlgl.h b/src/rlgl.h
index 5fba0ed55..beeaa2d85 100644
--- a/src/rlgl.h
+++ b/src/rlgl.h
@@ -864,7 +864,7 @@ RLAPI void rlLoadDrawQuad(void);     // Load and draw a quad
     #define RLGL_API_PTR
     #endif
 
-    typedef void (RLGL_API_PTR *glShaderSourcePROC) (GLuint shader, GLsizei count, const GLchar *const*string, const GLint *length);
+    typedef void (RLGL_API_PTR *glShaderSourcePROC) (GLuint shader, int count, const GLchar *const*string, const int *length);
     typedef GLuint (RLGL_API_PTR *glCreateShaderPROC) (GLenum type);
     typedef void (RLGL_API_PTR *glCompileShaderPROC) (GLuint shader);
     typedef GLuint (RLGL_API_PTR *glCreateProgramPROC) (void);
@@ -872,74 +872,74 @@ RLAPI void rlLoadDrawQuad(void);     // Load and draw a quad
     typedef void (RLGL_API_PTR *glBindAttribLocationPROC) (GLuint program, GLuint index, const GLchar *name);
     typedef void (RLGL_API_PTR *glLinkProgramPROC) (GLuint program);
     typedef void (RLGL_API_PTR *glBindBufferPROC) (GLenum target, GLuint buffer);
-    typedef void (RLGL_API_PTR *glBufferDataPROC) (GLenum target, GLsizeiptr size, const void *data, GLenum usage);
+    typedef void (RLGL_API_PTR *glBufferDataPROC) (GLenum target, int* size, const void *data, GLenum usage);
     typedef void (RLGL_API_PTR *glEnableVertexAttribArrayPROC) (GLuint index);
-    typedef void (RLGL_API_PTR *glVertexAttribPointerPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
+    typedef void (RLGL_API_PTR *glVertexAttribPointerPROC) (GLuint index, int size, GLenum type, GLboolean normalized, int stride, const void *pointer);
     typedef void (RLGL_API_PTR *glDisableVertexAttribArrayPROC) (GLuint index);
-    typedef void (RLGL_API_PTR *glDeleteBuffersPROC) (GLsizei n, const GLuint *buffers);
-    typedef void (RLGL_API_PTR *glDeleteVertexArraysPROC) (GLsizei n, const GLuint *arrays);
+    typedef void (RLGL_API_PTR *glDeleteBuffersPROC) (int n, const GLuint *buffers);
+    typedef void (RLGL_API_PTR *glDeleteVertexArraysPROC) (int n, const GLuint *arrays);
     typedef void (RLGL_API_PTR *glUseProgramPROC) (GLuint program);
     typedef void (RLGL_API_PTR *glDetachShaderPROC) (GLuint program, GLuint shader);
     typedef void (RLGL_API_PTR *glDeleteShaderPROC) (GLuint shader);
     typedef void (RLGL_API_PTR *glDeleteProgramPROC) (GLuint program);
-    typedef void (RLGL_API_PTR *glBufferSubDataPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const void *data);
-    typedef void (RLGL_API_PTR *glGetShaderivPROC)(GLuint shader, GLenum pname, GLint *params);
-    typedef void (RLGL_API_PTR *glGetShaderInfoLogPROC)(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-    typedef void (RLGL_API_PTR *glGetProgramivPROC)(GLuint program, GLenum pname, GLint *params);
-    typedef void (RLGL_API_PTR *glGetProgramInfoLogPROC)(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-    typedef void (RLGL_API_PTR *glGenVertexArraysPROC)(GLsizei n, GLuint *arrays);
-    typedef void (RLGL_API_PTR *glGenBuffersPROC)(GLsizei n, GLuint *buffers);
+    typedef void (RLGL_API_PTR *glBufferSubDataPROC) (GLenum target, int* offset, int* size, const void *data);
+    typedef void (RLGL_API_PTR *glGetShaderivPROC)(GLuint shader, GLenum pname, int *params);
+    typedef void (RLGL_API_PTR *glGetShaderInfoLogPROC)(GLuint shader, int bufSize, int *length, GLchar *infoLog);
+    typedef void (RLGL_API_PTR *glGetProgramivPROC)(GLuint program, GLenum pname, int *params);
+    typedef void (RLGL_API_PTR *glGetProgramInfoLogPROC)(GLuint program, int bufSize, int *length, GLchar *infoLog);
+    typedef void (RLGL_API_PTR *glGenVertexArraysPROC)(int n, GLuint *arrays);
+    typedef void (RLGL_API_PTR *glGenBuffersPROC)(int n, GLuint *buffers);
     typedef void (RLGL_API_PTR *glBindVertexArrayPROC)(GLuint array);
-    typedef GLint (RLGL_API_PTR *glGetUniformLocationPROC)(GLuint program, const GLchar *name);
-    typedef void (RLGL_API_PTR *glUniformMatrix4fvPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    typedef void (RLGL_API_PTR *glTexImage2DPROC)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
+    typedef int (RLGL_API_PTR *glGetUniformLocationPROC)(GLuint program, const GLchar *name);
+    typedef void (RLGL_API_PTR *glUniformMatrix4fvPROC)(int location, int count, GLboolean transpose, const GLfloat *value);
+    typedef void (RLGL_API_PTR *glTexImage2DPROC)(GLenum target, int level, int internalformat, int width, int height, int border, GLenum format, GLenum type, const void *pixels);
     typedef void (RLGL_API_PTR *glActiveTexturePROC) (GLenum texture);
     typedef void (RLGL_API_PTR *glBindFramebufferPROC) (GLenum target, GLuint framebuffer);
-    typedef void (RLGL_API_PTR *glBlitFramebufferPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-    typedef void (RLGL_API_PTR *glDrawBuffersPROC) (GLsizei n, const GLenum *bufs);
+    typedef void (RLGL_API_PTR *glBlitFramebufferPROC) (int srcX0, int srcY0, int srcX1, int srcY1, int dstX0, int dstY0, int dstX1, int dstY1, GLbitfield mask, GLenum filter);
+    typedef void (RLGL_API_PTR *glDrawBuffersPROC) (int n, const GLenum *bufs);
     typedef void (RLGL_API_PTR *glBlendEquationPROC) (GLenum mode);
     typedef void (RLGL_API_PTR *glBlendFuncSeparatePROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
     typedef void (RLGL_API_PTR *glBlendEquationSeparatePROC) (GLenum modeRGB, GLenum modeAlpha);
-    typedef void (RLGL_API_PTR *glUniform4fPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-    typedef void (RLGL_API_PTR *glUniformiPROC) (GLint location, GLint v0);
-    typedef void (RLGL_API_PTR *glCompressedTexImageDPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
+    typedef void (RLGL_API_PTR *glUniform4fPROC) (int location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+    typedef void (RLGL_API_PTR *glUniformiPROC) (int location, int v0);
+    typedef void (RLGL_API_PTR *glCompressedTexImageDPROC) (GLenum target, int level, GLenum internalformat, int width, int height, int border, int imageSize, const void *data);
     typedef GLuint (RLGL_API_PTR *glLoadTextureDepthPROC) (const char *filename, int *width, int *height, int *depth);
-    typedef void (RLGL_API_PTR *glGenRenderbuffersPROC) (GLsizei n, GLuint *renderbuffers);
+    typedef void (RLGL_API_PTR *glGenRenderbuffersPROC) (int n, GLuint *renderbuffers);
     typedef void (RLGL_API_PTR *glBindRenderbufferPROC) (GLenum target, GLuint renderbuffer);
-    typedef void (RLGL_API_PTR *glRenderbufferStoragePROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+    typedef void (RLGL_API_PTR *glRenderbufferStoragePROC) (GLenum target, GLenum internalformat, int width, int height);
     typedef void (RLGL_API_PTR *glGenerateMipmapPROC) (GLenum target);
-    typedef void (RLGL_API_PTR *glGenFramebuffersPROC) (GLsizei n, GLuint *framebuffers);
-    typedef void (RLGL_API_PTR *glFramebufferTextureDPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+    typedef void (RLGL_API_PTR *glGenFramebuffersPROC) (int n, GLuint *framebuffers);
+    typedef void (RLGL_API_PTR *glFramebufferTextureDPROC) (GLenum target, GLenum attachment, GLuint texture, int level);
     typedef void (RLGL_API_PTR *glFramebufferRenderbufferPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
     typedef GLenum (RLGL_API_PTR *glCheckFramebufferStatusPROC) (GLenum target);
-    typedef void (RLGL_API_PTR *glGetFramebufferAttachmentParameterivPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
-    typedef void (RLGL_API_PTR *glDeleteRenderbuffersPROC) (GLsizei n, const GLuint *renderbuffers);
-    typedef void (RLGL_API_PTR *glDeleteFramebuffersPROC) (GLsizei n, const GLuint *framebuffers);
-    typedef void (RLGL_API_PTR *glDrawArraysInstancedPROC) (GLenum mode, GLint first, GLsizei count, GLsizei instancecount);
-    typedef void (RLGL_API_PTR *glDrawElementsInstancedPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount);
+    typedef void (RLGL_API_PTR *glGetFramebufferAttachmentParameterivPROC) (GLenum target, GLenum attachment, GLenum pname, int *params);
+    typedef void (RLGL_API_PTR *glDeleteRenderbuffersPROC) (int n, const GLuint *renderbuffers);
+    typedef void (RLGL_API_PTR *glDeleteFramebuffersPROC) (int n, const GLuint *framebuffers);
+    typedef void (RLGL_API_PTR *glDrawArraysInstancedPROC) (GLenum mode, int first, int count, int instancecount);
+    typedef void (RLGL_API_PTR *glDrawElementsInstancedPROC) (GLenum mode, int count, GLenum type, const void *indices, int instancecount);
     typedef void (RLGL_API_PTR *glVertexAttribDivisorPROC) (GLuint index, GLuint divisor);
-    typedef GLint (RLGL_API_PTR *glGetAttribLocationPROC) (GLuint program, const GLchar *name);
-    typedef void (RLGL_API_PTR *glUniformfvPROC) (GLint location, GLsizei count, const GLfloat *value);
-    typedef void (RLGL_API_PTR *glUniform3fvPROC) (GLint location, GLsizei count, const GLfloat *value);
-    typedef void (RLGL_API_PTR *glUniform4fvPROC) (GLint location, GLsizei count, const GLfloat *value);
-    typedef void (RLGL_API_PTR *glUniformivPROC) (GLint location, GLsizei count, const GLint *value);
-    typedef void (RLGL_API_PTR *glUniform3ivPROC) (GLint location, GLsizei count, const GLint *value);
-    typedef void (RLGL_API_PTR *glUniform4ivPROC) (GLint location, GLsizei count, const GLint *value);
+    typedef int (RLGL_API_PTR *glGetAttribLocationPROC) (GLuint program, const GLchar *name);
+    typedef void (RLGL_API_PTR *glUniformfvPROC) (int location, int count, const GLfloat *value);
+    typedef void (RLGL_API_PTR *glUniform3fvPROC) (int location, int count, const GLfloat *value);
+    typedef void (RLGL_API_PTR *glUniform4fvPROC) (int location, int count, const GLfloat *value);
+    typedef void (RLGL_API_PTR *glUniformivPROC) (int location, int count, const int *value);
+    typedef void (RLGL_API_PTR *glUniform3ivPROC) (int location, int count, const int *value);
+    typedef void (RLGL_API_PTR *glUniform4ivPROC) (int location, int count, const int *value);
     typedef void (RLGL_API_PTR *glVertexAttribfvPROC) (GLuint index, const GLfloat *v);
     typedef void (RLGL_API_PTR *glVertexAttrib3fvPROC) (GLuint index, const GLfloat *v);
     typedef void (RLGL_API_PTR *glVertexAttrib4fvPROC) (GLuint index, const GLfloat *v);
-    typedef void (RLGL_API_PTR *glUniform1iPROC) (GLint location, GLint v0);
-    typedef void (RLGL_API_PTR *glCompressedTexImage2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
-    typedef void (RLGL_API_PTR *glFramebufferTexture2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-    typedef void (RLGL_API_PTR *glUniform1fvPROC) (GLint location, GLsizei count, const GLfloat *value);
-    typedef void (RLGL_API_PTR *glUniform1fPROC) (GLint location, const GLfloat value);
-    typedef void (RLGL_API_PTR *glUniform2fvPROC) (GLint location, GLsizei count, const GLfloat *value);
-    typedef void (RLGL_API_PTR *glUniform1ivPROC) (GLint location, GLsizei count, const GLint *value);
-    typedef void (RLGL_API_PTR *glUniform2ivPROC) (GLint location, GLsizei count, const GLint *value);
+    typedef void (RLGL_API_PTR *glUniform1iPROC) (int location, int v0);
+    typedef void (RLGL_API_PTR *glCompressedTexImage2DPROC) (GLenum target, int level, GLenum internalformat, int width, int height, int border, int imageSize, const void *data);
+    typedef void (RLGL_API_PTR *glFramebufferTexture2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, int level);
+    typedef void (RLGL_API_PTR *glUniform1fvPROC) (int location, int count, const GLfloat *value);
+    typedef void (RLGL_API_PTR *glUniform1fPROC) (int location, const GLfloat value);
+    typedef void (RLGL_API_PTR *glUniform2fvPROC) (int location, int count, const GLfloat *value);
+    typedef void (RLGL_API_PTR *glUniform1ivPROC) (int location, int count, const int *value);
+    typedef void (RLGL_API_PTR *glUniform2ivPROC) (int location, int count, const int *value);
     typedef void (RLGL_API_PTR *glVertexAttrib1fvPROC) (GLuint index, const GLfloat *v);
     typedef void (RLGL_API_PTR *glVertexAttrib2fvPROC) (GLuint index, const GLfloat *v);
     typedef const GLubyte* (RLGL_API_PTR *glGetStringiPROC) (GLenum name, GLuint index);
-
+    
     #ifndef RLGL_IMPLEMENTATION
     #define RLGL_GL extern
     #else