Drop GLcontext typedef and use struct gl_context instead

34 files changed, 446 insertions, 446 deletions

diff --git a/src/mesa/drivers/windows/gldirect/dglcontext.c b/src/mesa/drivers/windows/gldirect/dglcontext.c
index a420b36ffb4..10ea0578506 100644
--- a/src/mesa/drivers/windows/gldirect/dglcontext.c
+++ b/src/mesa/drivers/windows/gldirect/dglcontext.c
@@ -42,8 +42,8 @@
 #ifdef _USE_GLD3_WGL
 #include "gld_driver.h"
 
-extern void _gld_mesa_warning(GLcontext *, char *);
-extern void _gld_mesa_fatal(GLcontext *, char *);
+extern void _gld_mesa_warning(struct gl_context *, char *);
+extern void _gld_mesa_fatal(struct gl_context *, char *);
 #endif // _USE_GLD3_WGL
 
 // TODO: Clean out old DX6-specific code from GLD 2.x CAD driver
diff --git a/src/mesa/drivers/windows/gldirect/dglcontext.h b/src/mesa/drivers/windows/gldirect/dglcontext.h
index f46d83eab0f..ce04603c191 100644
--- a/src/mesa/drivers/windows/gldirect/dglcontext.h
+++ b/src/mesa/drivers/windows/gldirect/dglcontext.h
@@ -87,7 +87,7 @@ typedef struct {
 	void				*glPriv;
 
 	// Mesa vars:
-	GLcontext			*glCtx;			// The core Mesa context
+	struct gl_context			*glCtx;			// The core Mesa context
 	struct gl_config			*glVis;			// Describes the color buffer
 	struct gl_framebuffer		*glBuffer;		// Ancillary buffers
 
@@ -135,7 +135,7 @@ typedef struct {
 	//
 	// Mesa context vars:
 	//
-	GLcontext			*glCtx;			// The core Mesa context
+	struct gl_context			*glCtx;			// The core Mesa context
 	struct gl_config			*glVis;			// Describes the color buffer
 	struct gl_framebuffer		*glBuffer;		// Ancillary buffers
 
diff --git a/src/mesa/drivers/windows/gldirect/dglwgl.c b/src/mesa/drivers/windows/gldirect/dglwgl.c
index 74ecb01a5b0..c46cfe162f9 100644
--- a/src/mesa/drivers/windows/gldirect/dglwgl.c
+++ b/src/mesa/drivers/windows/gldirect/dglwgl.c
@@ -874,8 +874,8 @@ BOOL APIENTRY _GLD_WGL_EXPORT(SetPixelFormat)(
 // Copied from GLD2.x. KeithH
 //
 static GLboolean _gldShareLists(
-	GLcontext *ctx1,
-	GLcontext *ctx2)
+	struct gl_context *ctx1,
+	struct gl_context *ctx2)
 {
 	/* Sanity check context pointers */
 	if (ctx1 == NULL || ctx2 == NULL)
@@ -955,7 +955,7 @@ BOOL APIENTRY _GLD_WGL_EXPORT(SwapLayerBuffers)(
 // either MESA glViewport() or GLD wglMakeCurrent().
 
 BOOL dglWglResizeBuffers(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	BOOL bDefaultDriver)
 {
 	DGL_ctx						*dgl = NULL;
diff --git a/src/mesa/drivers/windows/gldirect/dglwgl.h b/src/mesa/drivers/windows/gldirect/dglwgl.h
index aac04103335..3e7e5892ca5 100644
--- a/src/mesa/drivers/windows/gldirect/dglwgl.h
+++ b/src/mesa/drivers/windows/gldirect/dglwgl.h
@@ -118,7 +118,7 @@ BOOL	APIENTRY DGL_UseFontOutlinesA(HDC a, DWORD b, DWORD c, DWORD d, FLOAT e, FL
 BOOL	APIENTRY DGL_UseFontOutlinesW(HDC a, DWORD b, DWORD c, DWORD d, FLOAT e, FLOAT f, int g, LPGLYPHMETRICSFLOAT h);
 #endif //_USE_GLD3_WGL
 
-BOOL	dglWglResizeBuffers(GLcontext *ctx, BOOL bDefaultDriver);
+BOOL	dglWglResizeBuffers(struct gl_context *ctx, BOOL bDefaultDriver);
 
 #ifdef  __cplusplus
 }
diff --git a/src/mesa/drivers/windows/gldirect/dx7/gld_driver_dx7.c b/src/mesa/drivers/windows/gldirect/dx7/gld_driver_dx7.c
index 4a38b35adf3..1c43a38557d 100644
--- a/src/mesa/drivers/windows/gldirect/dx7/gld_driver_dx7.c
+++ b/src/mesa/drivers/windows/gldirect/dx7/gld_driver_dx7.c
@@ -69,7 +69,7 @@ const float _fPersp_33 = 1.6f;
 //---------------------------------------------------------------------------
 
 void _gld_mesa_warning(
-	__GLcontext *gc,
+	__struct gl_context *gc,
 	char *str)
 {
 	// Intercept Mesa's internal warning mechanism
@@ -79,7 +79,7 @@ void _gld_mesa_warning(
 //---------------------------------------------------------------------------
 
 void _gld_mesa_fatal(
-	__GLcontext *gc,
+	__struct gl_context *gc,
 	char *str)
 {
 	// Intercept Mesa's internal fatal-message mechanism
@@ -199,7 +199,7 @@ D3DBLEND _gldConvertBlendFunc(
 //---------------------------------------------------------------------------
 
 void gld_Noop_DX7(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 #ifdef _DEBUG
 	gldLogMessage(GLDLOG_ERROR, "gld_Noop called!\n");
@@ -209,7 +209,7 @@ void gld_Noop_DX7(
 //---------------------------------------------------------------------------
 
 void gld_Error_DX7(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 #ifdef _DEBUG
 	// Quite useless.
@@ -222,7 +222,7 @@ void gld_Error_DX7(
 //---------------------------------------------------------------------------
 
 static GLboolean gld_set_draw_buffer_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLenum mode)
 {
    (void) ctx;
@@ -237,7 +237,7 @@ static GLboolean gld_set_draw_buffer_DX7(
 //---------------------------------------------------------------------------
 
 static void gld_set_read_buffer_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	struct gl_framebuffer *buffer,
 	GLenum mode)
 {
@@ -251,7 +251,7 @@ static void gld_set_read_buffer_DX7(
 //---------------------------------------------------------------------------
 
 void gld_Clear_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLbitfield mask,
 	GLboolean all,
 	GLint x,
@@ -342,7 +342,7 @@ void gld_Clear_DX7(
 
 // Mesa 5: Parameter change
 static void gld_buffer_size_DX7(
-//	GLcontext *ctx,
+//	struct gl_context *ctx,
 	struct gl_framebuffer *fb,
 	GLuint *width,
 	GLuint *height)
@@ -356,14 +356,14 @@ static void gld_buffer_size_DX7(
 //---------------------------------------------------------------------------
 
 static void gld_Finish_DX7(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 }
 
 //---------------------------------------------------------------------------
 
 static void gld_Flush_DX7(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context		*gld	= GLD_GET_CONTEXT(ctx);
 
@@ -379,7 +379,7 @@ static void gld_Flush_DX7(
 //---------------------------------------------------------------------------
 
 void gld_NEW_STENCIL(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx7		*gld	= GLD_GET_DX7_DRIVER(gldCtx);
@@ -404,7 +404,7 @@ void gld_NEW_STENCIL(
 //---------------------------------------------------------------------------
 
 void gld_NEW_COLOR(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx7		*gld	= GLD_GET_DX7_DRIVER(gldCtx);
@@ -438,7 +438,7 @@ void gld_NEW_COLOR(
 //---------------------------------------------------------------------------
 
 void gld_NEW_DEPTH(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx7		*gld	= GLD_GET_DX7_DRIVER(gldCtx);
@@ -451,7 +451,7 @@ void gld_NEW_DEPTH(
 //---------------------------------------------------------------------------
 
 void gld_NEW_POLYGON(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx7		*gld	= GLD_GET_DX7_DRIVER(gldCtx);
@@ -516,7 +516,7 @@ void gld_NEW_POLYGON(
 //---------------------------------------------------------------------------
 
 void gld_NEW_FOG(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx7		*gld	= GLD_GET_DX7_DRIVER(gldCtx);
@@ -571,7 +571,7 @@ void gld_NEW_FOG(
 //---------------------------------------------------------------------------
 
 void gld_NEW_LIGHT(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context		*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx7	*gld	= GLD_GET_DX7_DRIVER(gldCtx);
@@ -591,7 +591,7 @@ void gld_NEW_LIGHT(
 //---------------------------------------------------------------------------
 
 void gld_NEW_MODELVIEW(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx7		*gld	= GLD_GET_DX7_DRIVER(gldCtx);
@@ -639,7 +639,7 @@ void gld_NEW_MODELVIEW(
 //---------------------------------------------------------------------------
 
 void gld_NEW_PROJECTION(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx7		*gld	= GLD_GET_DX7_DRIVER(gldCtx);
@@ -718,7 +718,7 @@ void gldOrthoHook_DX7(
 //---------------------------------------------------------------------------
 
 void gld_NEW_VIEWPORT(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx7		*gld	= GLD_GET_DX7_DRIVER(gldCtx);
@@ -760,7 +760,7 @@ void gld_NEW_VIEWPORT(
 //---------------------------------------------------------------------------
 
 __inline BOOL _gldAnyEvalEnabled(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	struct gl_eval_attrib *eval = &ctx->Eval;
 
@@ -792,7 +792,7 @@ __inline BOOL _gldAnyEvalEnabled(
 //---------------------------------------------------------------------------
 
 BOOL _gldChooseInternalPipeline(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLD_driver_dx7 *gld)
 {
 //	return TRUE;	// DEBUGGING: ALWAYS USE MESA
@@ -856,7 +856,7 @@ BOOL _gldChooseInternalPipeline(
 //---------------------------------------------------------------------------
 
 void gld_update_state_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint new_state)
 {
 	GLD_context		*gldCtx	= GLD_GET_CONTEXT(ctx);
@@ -991,7 +991,7 @@ void gld_update_state_DX7(
 //---------------------------------------------------------------------------
 
 void gld_Viewport_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLint x,
 	GLint y,
 	GLsizei w,
@@ -1053,11 +1053,11 @@ void gld_Viewport_DX7(
 
 //---------------------------------------------------------------------------
 
-extern BOOL dglWglResizeBuffers(GLcontext *ctx, BOOL bDefaultDriver);
+extern BOOL dglWglResizeBuffers(struct gl_context *ctx, BOOL bDefaultDriver);
 
 // Mesa 5: Parameter change
 void gldResizeBuffers_DX7(
-//	GLcontext *ctx)
+//	struct gl_context *ctx)
 	struct gl_framebuffer *fb)
 {
 	GET_CURRENT_CONTEXT(ctx);
@@ -1069,7 +1069,7 @@ void gldResizeBuffers_DX7(
 // This is only for debugging.
 // To use, plug into ctx->Driver.Enable pointer below.
 void gld_Enable(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLenum e,
 	GLboolean b)
 {
@@ -1082,10 +1082,10 @@ void gld_Enable(
 // Driver pointer setup
 //---------------------------------------------------------------------------
 
-extern const GLubyte* _gldGetStringGeneric(GLcontext*, GLenum);
+extern const GLubyte* _gldGetStringGeneric(struct gl_context*, GLenum);
 
 void gldSetupDriverPointers_DX7(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context		*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx7	*gld	= GLD_GET_DX7_DRIVER(gldCtx);
diff --git a/src/mesa/drivers/windows/gldirect/dx7/gld_dx7.h b/src/mesa/drivers/windows/gldirect/dx7/gld_dx7.h
index 6f549c9d196..2e1d1365686 100644
--- a/src/mesa/drivers/windows/gldirect/dx7/gld_dx7.h
+++ b/src/mesa/drivers/windows/gldirect/dx7/gld_dx7.h
@@ -225,68 +225,68 @@ typedef struct {
 //---------------------------------------------------------------------------
 
 PROC	gldGetProcAddress_DX7(LPCSTR a);
-void	gldEnableExtensions_DX7(GLcontext *ctx);
-void	gldInstallPipeline_DX7(GLcontext *ctx);
-void	gldSetupDriverPointers_DX7(GLcontext *ctx);
+void	gldEnableExtensions_DX7(struct gl_context *ctx);
+void	gldInstallPipeline_DX7(struct gl_context *ctx);
+void	gldSetupDriverPointers_DX7(struct gl_context *ctx);
 void	gldResizeBuffers_DX7(struct gl_framebuffer *fb);
 
 
 // Texture functions
 
-void	gldCopyTexImage1D_DX7(GLcontext *ctx, GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border);
-void	gldCopyTexImage2D_DX7(GLcontext *ctx, GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-void	gldCopyTexSubImage1D_DX7(GLcontext *ctx, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width );
-void	gldCopyTexSubImage2D_DX7(GLcontext *ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height );
-void	gldCopyTexSubImage3D_DX7(GLcontext *ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height );
-
-void	gld_NEW_TEXTURE_DX7(GLcontext *ctx);
-void	gld_DrawPixels_DX7(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, const struct gl_pixelstore_attrib *unpack, const GLvoid *pixels);
-void	gld_ReadPixels_DX7(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, const struct gl_pixelstore_attrib *unpack, GLvoid *dest);
-void	gld_CopyPixels_DX7(GLcontext *ctx, GLint srcx, GLint srcy, GLsizei width, GLsizei height, GLint dstx, GLint dsty, GLenum type);
-void	gld_Bitmap_DX7(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height, const struct gl_pixelstore_attrib *unpack, const GLubyte *bitmap);
-const struct gl_texture_format* gld_ChooseTextureFormat_DX7(GLcontext *ctx, GLint internalFormat, GLenum srcFormat, GLenum srcType);
-void	gld_TexImage2D_DX7(GLcontext *ctx, GLenum target, GLint level, GLint internalFormat, GLint width, GLint height, GLint border, GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *tObj, struct gl_texture_image *texImage);
-void	gld_TexImage1D_DX7(GLcontext *ctx, GLenum target, GLint level, GLint internalFormat, GLint width, GLint border, GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *texObj, struct gl_texture_image *texImage );
-void	gld_TexSubImage2D_DX7( GLcontext *ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *texObj, struct gl_texture_image *texImage );
-void	gld_TexSubImage1D_DX7(GLcontext *ctx, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *texObj, struct gl_texture_image *texImage);
-void	gld_DeleteTexture_DX7(GLcontext *ctx, struct gl_texture_object *tObj);
-void	gld_ResetLineStipple_DX7(GLcontext *ctx);
+void	gldCopyTexImage1D_DX7(struct gl_context *ctx, GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border);
+void	gldCopyTexImage2D_DX7(struct gl_context *ctx, GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+void	gldCopyTexSubImage1D_DX7(struct gl_context *ctx, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width );
+void	gldCopyTexSubImage2D_DX7(struct gl_context *ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height );
+void	gldCopyTexSubImage3D_DX7(struct gl_context *ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height );
+
+void	gld_NEW_TEXTURE_DX7(struct gl_context *ctx);
+void	gld_DrawPixels_DX7(struct gl_context *ctx, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, const struct gl_pixelstore_attrib *unpack, const GLvoid *pixels);
+void	gld_ReadPixels_DX7(struct gl_context *ctx, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, const struct gl_pixelstore_attrib *unpack, GLvoid *dest);
+void	gld_CopyPixels_DX7(struct gl_context *ctx, GLint srcx, GLint srcy, GLsizei width, GLsizei height, GLint dstx, GLint dsty, GLenum type);
+void	gld_Bitmap_DX7(struct gl_context *ctx, GLint x, GLint y, GLsizei width, GLsizei height, const struct gl_pixelstore_attrib *unpack, const GLubyte *bitmap);
+const struct gl_texture_format* gld_ChooseTextureFormat_DX7(struct gl_context *ctx, GLint internalFormat, GLenum srcFormat, GLenum srcType);
+void	gld_TexImage2D_DX7(struct gl_context *ctx, GLenum target, GLint level, GLint internalFormat, GLint width, GLint height, GLint border, GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *tObj, struct gl_texture_image *texImage);
+void	gld_TexImage1D_DX7(struct gl_context *ctx, GLenum target, GLint level, GLint internalFormat, GLint width, GLint border, GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *texObj, struct gl_texture_image *texImage );
+void	gld_TexSubImage2D_DX7( struct gl_context *ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *texObj, struct gl_texture_image *texImage );
+void	gld_TexSubImage1D_DX7(struct gl_context *ctx, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *texObj, struct gl_texture_image *texImage);
+void	gld_DeleteTexture_DX7(struct gl_context *ctx, struct gl_texture_object *tObj);
+void	gld_ResetLineStipple_DX7(struct gl_context *ctx);
 
 // 2D primitive functions
 
-void	gld_Points2D_DX7(GLcontext *ctx, GLuint first, GLuint last);
+void	gld_Points2D_DX7(struct gl_context *ctx, GLuint first, GLuint last);
 
-void	gld_Line2DFlat_DX7(GLcontext *ctx, GLuint v0, GLuint v1);
-void	gld_Line2DSmooth_DX7(GLcontext *ctx, GLuint v0, GLuint v1);
+void	gld_Line2DFlat_DX7(struct gl_context *ctx, GLuint v0, GLuint v1);
+void	gld_Line2DSmooth_DX7(struct gl_context *ctx, GLuint v0, GLuint v1);
 
-void	gld_Triangle2DFlat_DX7(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2);
-void	gld_Triangle2DSmooth_DX7(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2);
-void	gld_Triangle2DFlatExtras_DX7(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2);
-void	gld_Triangle2DSmoothExtras_DX7(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2);
+void	gld_Triangle2DFlat_DX7(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);
+void	gld_Triangle2DSmooth_DX7(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);
+void	gld_Triangle2DFlatExtras_DX7(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);
+void	gld_Triangle2DSmoothExtras_DX7(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);
 
-void	gld_Quad2DFlat_DX7(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-void	gld_Quad2DSmooth_DX7(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-void	gld_Quad2DFlatExtras_DX7(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-void	gld_Quad2DSmoothExtras_DX7(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+void	gld_Quad2DFlat_DX7(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+void	gld_Quad2DSmooth_DX7(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+void	gld_Quad2DFlatExtras_DX7(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+void	gld_Quad2DSmoothExtras_DX7(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
 
 // 3D primitive functions
 
-void	gld_Points3D_DX7(GLcontext *ctx, GLuint first, GLuint last);
-void	gld_Line3DFlat_DX7(GLcontext *ctx, GLuint v0, GLuint v1);
-void	gld_Triangle3DFlat_DX7(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2);
-void	gld_Quad3DFlat_DX7(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-void	gld_Line3DSmooth_DX7(GLcontext *ctx, GLuint v0, GLuint v1);
-void	gld_Triangle3DSmooth_DX7(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2);
-void	gld_Quad3DSmooth_DX7(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+void	gld_Points3D_DX7(struct gl_context *ctx, GLuint first, GLuint last);
+void	gld_Line3DFlat_DX7(struct gl_context *ctx, GLuint v0, GLuint v1);
+void	gld_Triangle3DFlat_DX7(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);
+void	gld_Quad3DFlat_DX7(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+void	gld_Line3DSmooth_DX7(struct gl_context *ctx, GLuint v0, GLuint v1);
+void	gld_Triangle3DSmooth_DX7(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);
+void	gld_Quad3DSmooth_DX7(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
 
 // Primitive functions for Two-sided-lighting Vertex Shader
 
-void	gld_Points2DTwoside_DX7(GLcontext *ctx, GLuint first, GLuint last);
-void	gld_Line2DFlatTwoside_DX7(GLcontext *ctx, GLuint v0, GLuint v1);
-void	gld_Line2DSmoothTwoside_DX7(GLcontext *ctx, GLuint v0, GLuint v1);
-void	gld_Triangle2DFlatTwoside_DX7(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2);
-void	gld_Triangle2DSmoothTwoside_DX7(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2);
-void	gld_Quad2DFlatTwoside_DX7(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-void	gld_Quad2DSmoothTwoside_DX7(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+void	gld_Points2DTwoside_DX7(struct gl_context *ctx, GLuint first, GLuint last);
+void	gld_Line2DFlatTwoside_DX7(struct gl_context *ctx, GLuint v0, GLuint v1);
+void	gld_Line2DSmoothTwoside_DX7(struct gl_context *ctx, GLuint v0, GLuint v1);
+void	gld_Triangle2DFlatTwoside_DX7(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);
+void	gld_Triangle2DSmoothTwoside_DX7(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);
+void	gld_Quad2DFlatTwoside_DX7(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+void	gld_Quad2DSmoothTwoside_DX7(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
 
 #endif
diff --git a/src/mesa/drivers/windows/gldirect/dx7/gld_ext_dx7.c b/src/mesa/drivers/windows/gldirect/dx7/gld_ext_dx7.c
index ba60980bbe8..4ed3c3ca052 100644
--- a/src/mesa/drivers/windows/gldirect/dx7/gld_ext_dx7.c
+++ b/src/mesa/drivers/windows/gldirect/dx7/gld_ext_dx7.c
@@ -69,7 +69,7 @@
 #include "extensions.h"
 
 // For some reason this is not defined in an above header...
-extern void _mesa_enable_imaging_extensions(GLcontext *ctx);
+extern void _mesa_enable_imaging_extensions(struct gl_context *ctx);
 
 //---------------------------------------------------------------------------
 // Hack for the SGIS_multitexture extension that was removed from Mesa
@@ -281,7 +281,7 @@ PROC gldGetProcAddress_DX(
 //---------------------------------------------------------------------------
 
 void gldEnableExtensions_DX7(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLuint i;
 
diff --git a/src/mesa/drivers/windows/gldirect/dx7/gld_pipeline_dx7.c b/src/mesa/drivers/windows/gldirect/dx7/gld_pipeline_dx7.c
index 9ccec69b98a..b801542736c 100644
--- a/src/mesa/drivers/windows/gldirect/dx7/gld_pipeline_dx7.c
+++ b/src/mesa/drivers/windows/gldirect/dx7/gld_pipeline_dx7.c
@@ -65,7 +65,7 @@ static const struct tnl_pipeline_stage *gld_pipeline[] = {
 //---------------------------------------------------------------------------
 
 void gldInstallPipeline_DX7(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	// Remove any existing pipeline	stages,
 	// then install GLDirect pipeline stages.
diff --git a/src/mesa/drivers/windows/gldirect/dx7/gld_primitive_dx7.c b/src/mesa/drivers/windows/gldirect/dx7/gld_primitive_dx7.c
index 0b373814fee..7fc50004de8 100644
--- a/src/mesa/drivers/windows/gldirect/dx7/gld_primitive_dx7.c
+++ b/src/mesa/drivers/windows/gldirect/dx7/gld_primitive_dx7.c
@@ -277,7 +277,7 @@
 //---------------------------------------------------------------------------
 
 __inline DWORD _gldComputeFog(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	SWvertex *swv)
 {
 	// Full fog calculation.
@@ -300,7 +300,7 @@ __inline DWORD _gldComputeFog(
 //---------------------------------------------------------------------------
 
 void gld_ResetLineStipple_DX7(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	// TODO: Fake stipple with a 32x32 texture.
 }
@@ -310,7 +310,7 @@ void gld_ResetLineStipple_DX7(
 //---------------------------------------------------------------------------
 
 void gld_Points2D_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint first,
 	GLuint last)
 {
@@ -358,7 +358,7 @@ void gld_Points2D_DX7(
 //---------------------------------------------------------------------------
 
 void gld_Line2DFlat_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1)
 {
@@ -391,7 +391,7 @@ void gld_Line2DFlat_DX7(
 //---------------------------------------------------------------------------
 
 void gld_Line2DSmooth_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1)
 {
@@ -422,7 +422,7 @@ void gld_Line2DSmooth_DX7(
 //---------------------------------------------------------------------------
 
 void gld_Triangle2DFlat_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2)
@@ -461,7 +461,7 @@ void gld_Triangle2DFlat_DX7(
 //---------------------------------------------------------------------------
 
 void gld_Triangle2DSmooth_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2)
@@ -500,7 +500,7 @@ void gld_Triangle2DSmooth_DX7(
 //---------------------------------------------------------------------------
 
 void gld_Triangle2DFlatExtras_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2)
@@ -549,7 +549,7 @@ void gld_Triangle2DFlatExtras_DX7(
 //---------------------------------------------------------------------------
 
 void gld_Triangle2DSmoothExtras_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2)
@@ -589,7 +589,7 @@ void gld_Triangle2DSmoothExtras_DX7(
 //---------------------------------------------------------------------------
 
 void gld_Quad2DFlat_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2,
@@ -653,7 +653,7 @@ void gld_Quad2DFlat_DX7(
 //---------------------------------------------------------------------------
 
 void gld_Quad2DSmooth_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2,
@@ -716,7 +716,7 @@ void gld_Quad2DSmooth_DX7(
 //---------------------------------------------------------------------------
 
 void gld_Quad2DFlatExtras_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2,
@@ -793,7 +793,7 @@ void gld_Quad2DFlatExtras_DX7(
 //---------------------------------------------------------------------------
 
 void gld_Quad2DSmoothExtras_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2,
@@ -860,7 +860,7 @@ void gld_Quad2DSmoothExtras_DX7(
 //---------------------------------------------------------------------------
 
 void gld_Points3D_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint first,
 	GLuint last)
 {
@@ -913,7 +913,7 @@ void gld_Points3D_DX7(
 //---------------------------------------------------------------------------
 
 void gld_Line3DFlat_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1)
 {
@@ -939,7 +939,7 @@ void gld_Line3DFlat_DX7(
 //---------------------------------------------------------------------------
 
 void gld_Line3DSmooth_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1)
 {
@@ -966,7 +966,7 @@ void gld_Line3DSmooth_DX7(
 //---------------------------------------------------------------------------
 
 void gld_Triangle3DFlat_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2)
@@ -999,7 +999,7 @@ void gld_Triangle3DFlat_DX7(
 //---------------------------------------------------------------------------
 
 void gld_Triangle3DSmooth_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2)
@@ -1033,7 +1033,7 @@ void gld_Triangle3DSmooth_DX7(
 //---------------------------------------------------------------------------
 
 void gld_Quad3DFlat_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2,
@@ -1085,7 +1085,7 @@ void gld_Quad3DFlat_DX7(
 //---------------------------------------------------------------------------
 
 void gld_Quad3DSmooth_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2,
@@ -1139,34 +1139,34 @@ void gld_Quad3DSmooth_DX7(
 
 /*
 
-void gld_Points2DTwoside_DX8(GLcontext *ctx, GLuint first, GLuint last)
+void gld_Points2DTwoside_DX8(struct gl_context *ctx, GLuint first, GLuint last)
 {
 	// NOTE: Two-sided lighting does not apply to Points
 }
 
 //---------------------------------------------------------------------------
 
-void gld_Line2DFlatTwoside_DX8(GLcontext *ctx, GLuint v0, GLuint v1)
+void gld_Line2DFlatTwoside_DX8(struct gl_context *ctx, GLuint v0, GLuint v1)
 {
 	// NOTE: Two-sided lighting does not apply to Lines
 }
 
 //---------------------------------------------------------------------------
 
-void gld_Line2DSmoothTwoside_DX8(GLcontext *ctx, GLuint v0, GLuint v1)
+void gld_Line2DSmoothTwoside_DX8(struct gl_context *ctx, GLuint v0, GLuint v1)
 {
 	// NOTE: Two-sided lighting does not apply to Lines
 }
 
 //---------------------------------------------------------------------------
 
-void gld_Triangle2DFlatTwoside_DX8(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2)
+void gld_Triangle2DFlatTwoside_DX8(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2)
 {
 }
 
 //---------------------------------------------------------------------------
 
-void gld_Triangle2DSmoothTwoside_DX8(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2)
+void gld_Triangle2DSmoothTwoside_DX8(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx8		*gld	= GLD_GET_DX8_DRIVER(gldCtx);
@@ -1231,7 +1231,7 @@ void gld_Triangle2DSmoothTwoside_DX8(GLcontext *ctx, GLuint v0, GLuint v1, GLuin
 
 //---------------------------------------------------------------------------
 
-void gld_Quad2DFlatTwoside_DX8(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
+void gld_Quad2DFlatTwoside_DX8(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx8		*gld	= GLD_GET_DX8_DRIVER(gldCtx);
@@ -1338,7 +1338,7 @@ void gld_Quad2DFlatTwoside_DX8(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2,
 
 //---------------------------------------------------------------------------
 
-void gld_Quad2DSmoothTwoside_DX8(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
+void gld_Quad2DSmoothTwoside_DX8(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx8		*gld	= GLD_GET_DX8_DRIVER(gldCtx);
diff --git a/src/mesa/drivers/windows/gldirect/dx7/gld_texture_dx7.c b/src/mesa/drivers/windows/gldirect/dx7/gld_texture_dx7.c
index bbe673516d6..74c3b0d344b 100644
--- a/src/mesa/drivers/windows/gldirect/dx7/gld_texture_dx7.c
+++ b/src/mesa/drivers/windows/gldirect/dx7/gld_texture_dx7.c
@@ -817,7 +817,7 @@ void _gldClearSurface(
 //---------------------------------------------------------------------------
 
 void gldCopyTexImage1D_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLenum target, GLint level,
 	GLenum internalFormat,
 	GLint x, GLint y,
@@ -829,7 +829,7 @@ void gldCopyTexImage1D_DX7(
 //---------------------------------------------------------------------------
 
 void gldCopyTexImage2D_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLenum target,
 	GLint level,
 	GLenum internalFormat,
@@ -845,7 +845,7 @@ void gldCopyTexImage2D_DX7(
 //---------------------------------------------------------------------------
 
 void gldCopyTexSubImage1D_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLenum target, GLint level,
 	GLint xoffset, GLint x, GLint y, GLsizei width )
 {
@@ -855,7 +855,7 @@ void gldCopyTexSubImage1D_DX7(
 //---------------------------------------------------------------------------
 
 void gldCopyTexSubImage2D_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLenum target,
 	GLint level,
 	GLint xoffset,
@@ -871,7 +871,7 @@ void gldCopyTexSubImage2D_DX7(
 //---------------------------------------------------------------------------
 
 void gldCopyTexSubImage3D_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLenum target,
 	GLint level,
 	GLint xoffset,
@@ -903,7 +903,7 @@ typedef struct {
 //---------------------------------------------------------------------------
 
 HRESULT _gldDrawPixels(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	BOOL bChromakey,	// Alpha test for glBitmap() images
 	GLint x,			// GL x position
 	GLint y,			// GL y position (needs flipping)
@@ -1009,7 +1009,7 @@ HRESULT _gldDrawPixels(
 //---------------------------------------------------------------------------
 
 void gld_DrawPixels_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLint x, GLint y, GLsizei width, GLsizei height,
 	GLenum format, GLenum type,
 	const struct gl_pixelstore_attrib *unpack,
@@ -1086,7 +1086,7 @@ void gld_DrawPixels_DX7(
 //---------------------------------------------------------------------------
 
 void gld_ReadPixels_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLint x, GLint y, GLsizei width, GLsizei height,
 	GLenum format, GLenum type,
 	const struct gl_pixelstore_attrib *pack,
@@ -1241,7 +1241,7 @@ gld_ReadPixels_DX7_return:
 //---------------------------------------------------------------------------
 
 void gld_CopyPixels_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLint srcx,
 	GLint srcy,
 	GLsizei width,
@@ -1330,7 +1330,7 @@ void gld_CopyPixels_DX7(
 //---------------------------------------------------------------------------
 
 void gld_Bitmap_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLint x,
 	GLint y,
 	GLsizei width,
@@ -1475,7 +1475,7 @@ void gld_Bitmap_DX7(
 //---------------------------------------------------------------------------
 
 void _gldAllocateTexture(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	struct gl_texture_object *tObj,
 	struct gl_texture_image *texImage)
 {
@@ -1533,7 +1533,7 @@ void _gldAllocateTexture(
 //---------------------------------------------------------------------------
 
 const struct gl_texture_format* gld_ChooseTextureFormat_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLint internalFormat,
 	GLenum srcFormat,
 	GLenum srcType)
@@ -1622,7 +1622,7 @@ const struct gl_texture_format* gld_ChooseTextureFormat_DX7(
 /*
 // Safer(?), slower version.
 void gld_TexImage2D_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLenum target,
 	GLint level,
 	GLint internalFormat,
@@ -1700,7 +1700,7 @@ void gld_TexImage2D_DX7(
 // Faster, more efficient version.
 // Copies subimage straight to dest texture
 void gld_TexImage2D_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLenum target,
 	GLint level,
 	GLint internalFormat,
@@ -1792,7 +1792,7 @@ void gld_TexImage2D_DX7(
 
 //---------------------------------------------------------------------------
 
-void gld_TexImage1D_DX7(GLcontext *ctx, GLenum target, GLint level,
+void gld_TexImage1D_DX7(struct gl_context *ctx, GLenum target, GLint level,
                        GLint internalFormat,
                        GLint width, GLint border,
                        GLenum format, GLenum type, const GLvoid *pixels,
@@ -1807,7 +1807,7 @@ void gld_TexImage1D_DX7(GLcontext *ctx, GLenum target, GLint level,
 //---------------------------------------------------------------------------
 
 /*
-void gld_TexSubImage2D( GLcontext *ctx, GLenum target, GLint level,
+void gld_TexSubImage2D( struct gl_context *ctx, GLenum target, GLint level,
                           GLint xoffset, GLint yoffset,
                           GLsizei width, GLsizei height,
                           GLenum format, GLenum type,
@@ -1883,7 +1883,7 @@ void gld_TexSubImage2D( GLcontext *ctx, GLenum target, GLint level,
 
 // Faster, more efficient version.
 // Copies subimage straight to dest texture
-void gld_TexSubImage2D_DX7( GLcontext *ctx, GLenum target, GLint level,
+void gld_TexSubImage2D_DX7( struct gl_context *ctx, GLenum target, GLint level,
                           GLint xoffset, GLint yoffset,
                           GLsizei width, GLsizei height,
                           GLenum format, GLenum type,
@@ -1963,7 +1963,7 @@ void gld_TexSubImage2D_DX7( GLcontext *ctx, GLenum target, GLint level,
 
 //---------------------------------------------------------------------------
 
-void gld_TexSubImage1D_DX7( GLcontext *ctx, GLenum target, GLint level,
+void gld_TexSubImage1D_DX7( struct gl_context *ctx, GLenum target, GLint level,
                           GLint xoffset, GLsizei width,
                           GLenum format, GLenum type,
                           const GLvoid *pixels,
@@ -1977,7 +1977,7 @@ void gld_TexSubImage1D_DX7( GLcontext *ctx, GLenum target, GLint level,
 //---------------------------------------------------------------------------
 
 void gld_DeleteTexture_DX7(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	struct gl_texture_object *tObj)
 {
 	GLD_context *gld = (GLD_context*)(ctx->DriverCtx);
@@ -2036,7 +2036,7 @@ __inline void _gldSetAlphaOps(
 //---------------------------------------------------------------------------
 
 void gldUpdateTextureUnit(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint unit,
 	BOOL bPassThrough)
 {
@@ -2145,7 +2145,7 @@ void gldUpdateTextureUnit(
 //---------------------------------------------------------------------------
 
 void gld_NEW_TEXTURE_DX7(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	// TODO: Support for three (ATI Radeon) or more (nVidia GeForce3) texture units
 
diff --git a/src/mesa/drivers/windows/gldirect/dx7/gld_vb_d3d_render_dx7.c b/src/mesa/drivers/windows/gldirect/dx7/gld_vb_d3d_render_dx7.c
index c39775cad32..0a1b9479ef7 100644
--- a/src/mesa/drivers/windows/gldirect/dx7/gld_vb_d3d_render_dx7.c
+++ b/src/mesa/drivers/windows/gldirect/dx7/gld_vb_d3d_render_dx7.c
@@ -61,7 +61,7 @@
 //---------------------------------------------------------------------------
 /*
 __inline void _gldSetVertexShaderConstants(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLD_driver_dx8 *gld)
 {
 	D3DXMATRIX mat, matView, matProj;
@@ -116,7 +116,7 @@ __inline void _gldSetVertexShaderConstants(
 //---------------------------------------------------------------------------
 
 static GLboolean gld_d3d_render_stage_run(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	struct tnl_pipeline_stage *stage)
 {
 	GLD_context				*gldCtx	= GLD_GET_CONTEXT(ctx);
diff --git a/src/mesa/drivers/windows/gldirect/dx7/gld_vb_mesa_render_dx7.c b/src/mesa/drivers/windows/gldirect/dx7/gld_vb_mesa_render_dx7.c
index 72e5e1308cc..a8356c0a20e 100644
--- a/src/mesa/drivers/windows/gldirect/dx7/gld_vb_mesa_render_dx7.c
+++ b/src/mesa/drivers/windows/gldirect/dx7/gld_vb_mesa_render_dx7.c
@@ -167,7 +167,7 @@ do {							\
 
 /* TODO: do this for all primitives, verts and elts:
  */
-static void clip_elt_triangles( GLcontext *ctx,
+static void clip_elt_triangles( struct gl_context *ctx,
 				GLuint start,
 				GLuint count,
 				GLuint flags )
@@ -255,7 +255,7 @@ static void clip_elt_triangles( GLcontext *ctx,
 /*              Helper functions for drivers                  */
 /**********************************************************************/
 /*
-void _tnl_RenderClippedPolygon( GLcontext *ctx, const GLuint *elts, GLuint n )
+void _tnl_RenderClippedPolygon( struct gl_context *ctx, const GLuint *elts, GLuint n )
 {
    TNLcontext *tnl = TNL_CONTEXT(ctx);
    struct vertex_buffer *VB = &tnl->vb;
@@ -266,7 +266,7 @@ void _tnl_RenderClippedPolygon( GLcontext *ctx, const GLuint *elts, GLuint n )
    VB->Elts = tmp;
 }
 
-void _tnl_RenderClippedLine( GLcontext *ctx, GLuint ii, GLuint jj )
+void _tnl_RenderClippedLine( struct gl_context *ctx, GLuint ii, GLuint jj )
 {
    TNLcontext *tnl = TNL_CONTEXT(ctx);
    tnl->Driver.Render.Line( ctx, ii, jj );
@@ -306,7 +306,7 @@ tnl_quad_func _gldSetupQuad[4] = {
 //---------------------------------------------------------------------------
 
 static GLboolean _gld_mesa_render_stage_run(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	struct tnl_pipeline_stage *stage)
 {
 	GLD_context				*gldCtx	= GLD_GET_CONTEXT(ctx);
diff --git a/src/mesa/drivers/windows/gldirect/dx7/gld_wgl_dx7.c b/src/mesa/drivers/windows/gldirect/dx7/gld_wgl_dx7.c
index fa44a952a09..0d860dbe1aa 100644
--- a/src/mesa/drivers/windows/gldirect/dx7/gld_wgl_dx7.c
+++ b/src/mesa/drivers/windows/gldirect/dx7/gld_wgl_dx7.c
@@ -57,8 +57,8 @@ extern int nContextError;
 
 #define DDLOG_CRITICAL_OR_WARN	DDLOG_CRITICAL
 
-extern void _gld_mesa_warning(GLcontext *, char *);
-extern void _gld_mesa_fatal(GLcontext *, char *);
+extern void _gld_mesa_warning(struct gl_context *, char *);
+extern void _gld_mesa_fatal(struct gl_context *, char *);
 
 //---------------------------------------------------------------------------
 
@@ -243,7 +243,7 @@ void _gldDestroyPrimitiveBuffer(
 //---------------------------------------------------------------------------
 
 HRESULT _gldCreatePrimitiveBuffer(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLD_driver_dx7 *lpCtx,
 	GLD_pb_dx7 *gldVB)
 {
diff --git a/src/mesa/drivers/windows/gldirect/dx8/gld_driver_dx8.c b/src/mesa/drivers/windows/gldirect/dx8/gld_driver_dx8.c
index e2793ba557a..c4c2e0b5676 100644
--- a/src/mesa/drivers/windows/gldirect/dx8/gld_driver_dx8.c
+++ b/src/mesa/drivers/windows/gldirect/dx8/gld_driver_dx8.c
@@ -69,7 +69,7 @@ const float _fPersp_33 = 1.6f;
 //---------------------------------------------------------------------------
 
 void _gld_mesa_warning(
-	__GLcontext *gc,
+	__struct gl_context *gc,
 	char *str)
 {
 	// Intercept Mesa's internal warning mechanism
@@ -79,7 +79,7 @@ void _gld_mesa_warning(
 //---------------------------------------------------------------------------
 
 void _gld_mesa_fatal(
-	__GLcontext *gc,
+	__struct gl_context *gc,
 	char *str)
 {
 	// Intercept Mesa's internal fatal-message mechanism
@@ -199,7 +199,7 @@ D3DBLEND _gldConvertBlendFunc(
 //---------------------------------------------------------------------------
 
 void gld_Noop_DX8(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 #ifdef _DEBUG
 	gldLogMessage(GLDLOG_ERROR, "gld_Noop called!\n");
@@ -209,7 +209,7 @@ void gld_Noop_DX8(
 //---------------------------------------------------------------------------
 
 void gld_Error_DX8(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 #ifdef _DEBUG
 	// Quite useless.
@@ -222,7 +222,7 @@ void gld_Error_DX8(
 //---------------------------------------------------------------------------
 
 static GLboolean gld_set_draw_buffer_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLenum mode)
 {
    (void) ctx;
@@ -237,7 +237,7 @@ static GLboolean gld_set_draw_buffer_DX8(
 //---------------------------------------------------------------------------
 
 static void gld_set_read_buffer_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	struct gl_framebuffer *buffer,
 	GLenum mode)
 {
@@ -251,7 +251,7 @@ static void gld_set_read_buffer_DX8(
 //---------------------------------------------------------------------------
 
 void gld_Clear_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLbitfield mask,
 	GLboolean all,
 	GLint x,
@@ -342,7 +342,7 @@ void gld_Clear_DX8(
 
 // Mesa 5: Parameter change
 static void gld_buffer_size_DX8(
-//	GLcontext *ctx,
+//	struct gl_context *ctx,
 	struct gl_framebuffer *fb,
 	GLuint *width,
 	GLuint *height)
@@ -356,14 +356,14 @@ static void gld_buffer_size_DX8(
 //---------------------------------------------------------------------------
 
 static void gld_Finish_DX8(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 }
 
 //---------------------------------------------------------------------------
 
 static void gld_Flush_DX8(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context		*gld	= GLD_GET_CONTEXT(ctx);
 
@@ -379,7 +379,7 @@ static void gld_Flush_DX8(
 //---------------------------------------------------------------------------
 
 void gld_NEW_STENCIL(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx8		*gld	= GLD_GET_DX8_DRIVER(gldCtx);
@@ -404,7 +404,7 @@ void gld_NEW_STENCIL(
 //---------------------------------------------------------------------------
 
 void gld_NEW_COLOR(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx8		*gld	= GLD_GET_DX8_DRIVER(gldCtx);
@@ -436,7 +436,7 @@ void gld_NEW_COLOR(
 //---------------------------------------------------------------------------
 
 void gld_NEW_DEPTH(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx8		*gld	= GLD_GET_DX8_DRIVER(gldCtx);
@@ -449,7 +449,7 @@ void gld_NEW_DEPTH(
 //---------------------------------------------------------------------------
 
 void gld_NEW_POLYGON(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx8		*gld	= GLD_GET_DX8_DRIVER(gldCtx);
@@ -514,7 +514,7 @@ void gld_NEW_POLYGON(
 //---------------------------------------------------------------------------
 
 void gld_NEW_FOG(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx8		*gld	= GLD_GET_DX8_DRIVER(gldCtx);
@@ -569,7 +569,7 @@ void gld_NEW_FOG(
 //---------------------------------------------------------------------------
 
 void gld_NEW_LIGHT(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context		*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx8	*gld	= GLD_GET_DX8_DRIVER(gldCtx);
@@ -589,7 +589,7 @@ void gld_NEW_LIGHT(
 //---------------------------------------------------------------------------
 
 void gld_NEW_MODELVIEW(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx8		*gld	= GLD_GET_DX8_DRIVER(gldCtx);
@@ -621,7 +621,7 @@ void gld_NEW_MODELVIEW(
 //---------------------------------------------------------------------------
 
 void gld_NEW_PROJECTION(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx8		*gld	= GLD_GET_DX8_DRIVER(gldCtx);
@@ -700,7 +700,7 @@ void gldOrthoHook_DX8(
 //---------------------------------------------------------------------------
 
 void gld_NEW_VIEWPORT(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx8		*gld	= GLD_GET_DX8_DRIVER(gldCtx);
@@ -742,7 +742,7 @@ void gld_NEW_VIEWPORT(
 //---------------------------------------------------------------------------
 
 __inline BOOL _gldAnyEvalEnabled(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	struct gl_eval_attrib *eval = &ctx->Eval;
 
@@ -774,7 +774,7 @@ __inline BOOL _gldAnyEvalEnabled(
 //---------------------------------------------------------------------------
 
 BOOL _gldChooseInternalPipeline(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLD_driver_dx8 *gld)
 {
 //	return TRUE;	// DEBUGGING: ALWAYS USE MESA
@@ -838,7 +838,7 @@ BOOL _gldChooseInternalPipeline(
 //---------------------------------------------------------------------------
 
 void gld_update_state_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint new_state)
 {
 	GLD_context		*gldCtx	= GLD_GET_CONTEXT(ctx);
@@ -971,7 +971,7 @@ void gld_update_state_DX8(
 //---------------------------------------------------------------------------
 
 void gld_Viewport_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLint x,
 	GLint y,
 	GLsizei w,
@@ -1033,11 +1033,11 @@ void gld_Viewport_DX8(
 
 //---------------------------------------------------------------------------
 
-extern BOOL dglWglResizeBuffers(GLcontext *ctx, BOOL bDefaultDriver);
+extern BOOL dglWglResizeBuffers(struct gl_context *ctx, BOOL bDefaultDriver);
 
 // Mesa 5: Parameter change
 void gldResizeBuffers_DX8(
-//	GLcontext *ctx)
+//	struct gl_context *ctx)
 	struct gl_framebuffer *fb)
 {
 	GET_CURRENT_CONTEXT(ctx);
@@ -1049,7 +1049,7 @@ void gldResizeBuffers_DX8(
 // This is only for debugging.
 // To use, plug into ctx->Driver.Enable pointer below.
 void gld_Enable(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLenum e,
 	GLboolean b)
 {
@@ -1062,10 +1062,10 @@ void gld_Enable(
 // Driver pointer setup
 //---------------------------------------------------------------------------
 
-extern const GLubyte* _gldGetStringGeneric(GLcontext*, GLenum);
+extern const GLubyte* _gldGetStringGeneric(struct gl_context*, GLenum);
 
 void gldSetupDriverPointers_DX8(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context		*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx8	*gld	= GLD_GET_DX8_DRIVER(gldCtx);
diff --git a/src/mesa/drivers/windows/gldirect/dx8/gld_dx8.h b/src/mesa/drivers/windows/gldirect/dx8/gld_dx8.h
index 2446d906360..b207ecc788f 100644
--- a/src/mesa/drivers/windows/gldirect/dx8/gld_dx8.h
+++ b/src/mesa/drivers/windows/gldirect/dx8/gld_dx8.h
@@ -256,69 +256,69 @@ typedef struct {
 //---------------------------------------------------------------------------
 
 PROC	gldGetProcAddress_DX8(LPCSTR a);
-void	gldEnableExtensions_DX8(GLcontext *ctx);
-void	gldInstallPipeline_DX8(GLcontext *ctx);
-void	gldSetupDriverPointers_DX8(GLcontext *ctx);
-//void	gldResizeBuffers_DX8(GLcontext *ctx);
+void	gldEnableExtensions_DX8(struct gl_context *ctx);
+void	gldInstallPipeline_DX8(struct gl_context *ctx);
+void	gldSetupDriverPointers_DX8(struct gl_context *ctx);
+//void	gldResizeBuffers_DX8(struct gl_context *ctx);
 void	gldResizeBuffers_DX8(struct gl_framebuffer *fb);
 
 
 // Texture functions
 
-void	gldCopyTexImage1D_DX8(GLcontext *ctx, GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border);
-void	gldCopyTexImage2D_DX8(GLcontext *ctx, GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-void	gldCopyTexSubImage1D_DX8(GLcontext *ctx, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width );
-void	gldCopyTexSubImage2D_DX8(GLcontext *ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height );
-void	gldCopyTexSubImage3D_DX8(GLcontext *ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height );
-
-void	gld_NEW_TEXTURE_DX8(GLcontext *ctx);
-void	gld_DrawPixels_DX8(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, const struct gl_pixelstore_attrib *unpack, const GLvoid *pixels);
-void	gld_ReadPixels_DX8(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, const struct gl_pixelstore_attrib *unpack, GLvoid *dest);
-void	gld_CopyPixels_DX8(GLcontext *ctx, GLint srcx, GLint srcy, GLsizei width, GLsizei height, GLint dstx, GLint dsty, GLenum type);
-void	gld_Bitmap_DX8(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height, const struct gl_pixelstore_attrib *unpack, const GLubyte *bitmap);
-const struct gl_texture_format* gld_ChooseTextureFormat_DX8(GLcontext *ctx, GLint internalFormat, GLenum srcFormat, GLenum srcType);
-void	gld_TexImage2D_DX8(GLcontext *ctx, GLenum target, GLint level, GLint internalFormat, GLint width, GLint height, GLint border, GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *tObj, struct gl_texture_image *texImage);
-void	gld_TexImage1D_DX8(GLcontext *ctx, GLenum target, GLint level, GLint internalFormat, GLint width, GLint border, GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *texObj, struct gl_texture_image *texImage );
-void	gld_TexSubImage2D_DX8( GLcontext *ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *texObj, struct gl_texture_image *texImage );
-void	gld_TexSubImage1D_DX8(GLcontext *ctx, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *texObj, struct gl_texture_image *texImage);
-void	gld_DeleteTexture_DX8(GLcontext *ctx, struct gl_texture_object *tObj);
-void	gld_ResetLineStipple_DX8(GLcontext *ctx);
+void	gldCopyTexImage1D_DX8(struct gl_context *ctx, GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border);
+void	gldCopyTexImage2D_DX8(struct gl_context *ctx, GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+void	gldCopyTexSubImage1D_DX8(struct gl_context *ctx, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width );
+void	gldCopyTexSubImage2D_DX8(struct gl_context *ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height );
+void	gldCopyTexSubImage3D_DX8(struct gl_context *ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height );
+
+void	gld_NEW_TEXTURE_DX8(struct gl_context *ctx);
+void	gld_DrawPixels_DX8(struct gl_context *ctx, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, const struct gl_pixelstore_attrib *unpack, const GLvoid *pixels);
+void	gld_ReadPixels_DX8(struct gl_context *ctx, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, const struct gl_pixelstore_attrib *unpack, GLvoid *dest);
+void	gld_CopyPixels_DX8(struct gl_context *ctx, GLint srcx, GLint srcy, GLsizei width, GLsizei height, GLint dstx, GLint dsty, GLenum type);
+void	gld_Bitmap_DX8(struct gl_context *ctx, GLint x, GLint y, GLsizei width, GLsizei height, const struct gl_pixelstore_attrib *unpack, const GLubyte *bitmap);
+const struct gl_texture_format* gld_ChooseTextureFormat_DX8(struct gl_context *ctx, GLint internalFormat, GLenum srcFormat, GLenum srcType);
+void	gld_TexImage2D_DX8(struct gl_context *ctx, GLenum target, GLint level, GLint internalFormat, GLint width, GLint height, GLint border, GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *tObj, struct gl_texture_image *texImage);
+void	gld_TexImage1D_DX8(struct gl_context *ctx, GLenum target, GLint level, GLint internalFormat, GLint width, GLint border, GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *texObj, struct gl_texture_image *texImage );
+void	gld_TexSubImage2D_DX8( struct gl_context *ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *texObj, struct gl_texture_image *texImage );
+void	gld_TexSubImage1D_DX8(struct gl_context *ctx, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *texObj, struct gl_texture_image *texImage);
+void	gld_DeleteTexture_DX8(struct gl_context *ctx, struct gl_texture_object *tObj);
+void	gld_ResetLineStipple_DX8(struct gl_context *ctx);
 
 // 2D primitive functions
 
-void	gld_Points2D_DX8(GLcontext *ctx, GLuint first, GLuint last);
+void	gld_Points2D_DX8(struct gl_context *ctx, GLuint first, GLuint last);
 
-void	gld_Line2DFlat_DX8(GLcontext *ctx, GLuint v0, GLuint v1);
-void	gld_Line2DSmooth_DX8(GLcontext *ctx, GLuint v0, GLuint v1);
+void	gld_Line2DFlat_DX8(struct gl_context *ctx, GLuint v0, GLuint v1);
+void	gld_Line2DSmooth_DX8(struct gl_context *ctx, GLuint v0, GLuint v1);
 
-void	gld_Triangle2DFlat_DX8(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2);
-void	gld_Triangle2DSmooth_DX8(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2);
-void	gld_Triangle2DFlatExtras_DX8(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2);
-void	gld_Triangle2DSmoothExtras_DX8(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2);
+void	gld_Triangle2DFlat_DX8(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);
+void	gld_Triangle2DSmooth_DX8(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);
+void	gld_Triangle2DFlatExtras_DX8(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);
+void	gld_Triangle2DSmoothExtras_DX8(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);
 
-void	gld_Quad2DFlat_DX8(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-void	gld_Quad2DSmooth_DX8(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-void	gld_Quad2DFlatExtras_DX8(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-void	gld_Quad2DSmoothExtras_DX8(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+void	gld_Quad2DFlat_DX8(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+void	gld_Quad2DSmooth_DX8(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+void	gld_Quad2DFlatExtras_DX8(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+void	gld_Quad2DSmoothExtras_DX8(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
 
 // 3D primitive functions
 
-void	gld_Points3D_DX8(GLcontext *ctx, GLuint first, GLuint last);
-void	gld_Line3DFlat_DX8(GLcontext *ctx, GLuint v0, GLuint v1);
-void	gld_Triangle3DFlat_DX8(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2);
-void	gld_Quad3DFlat_DX8(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-void	gld_Line3DSmooth_DX8(GLcontext *ctx, GLuint v0, GLuint v1);
-void	gld_Triangle3DSmooth_DX8(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2);
-void	gld_Quad3DSmooth_DX8(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+void	gld_Points3D_DX8(struct gl_context *ctx, GLuint first, GLuint last);
+void	gld_Line3DFlat_DX8(struct gl_context *ctx, GLuint v0, GLuint v1);
+void	gld_Triangle3DFlat_DX8(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);
+void	gld_Quad3DFlat_DX8(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+void	gld_Line3DSmooth_DX8(struct gl_context *ctx, GLuint v0, GLuint v1);
+void	gld_Triangle3DSmooth_DX8(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);
+void	gld_Quad3DSmooth_DX8(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
 
 // Primitive functions for Two-sided-lighting Vertex Shader
 
-void	gld_Points2DTwoside_DX8(GLcontext *ctx, GLuint first, GLuint last);
-void	gld_Line2DFlatTwoside_DX8(GLcontext *ctx, GLuint v0, GLuint v1);
-void	gld_Line2DSmoothTwoside_DX8(GLcontext *ctx, GLuint v0, GLuint v1);
-void	gld_Triangle2DFlatTwoside_DX8(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2);
-void	gld_Triangle2DSmoothTwoside_DX8(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2);
-void	gld_Quad2DFlatTwoside_DX8(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-void	gld_Quad2DSmoothTwoside_DX8(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+void	gld_Points2DTwoside_DX8(struct gl_context *ctx, GLuint first, GLuint last);
+void	gld_Line2DFlatTwoside_DX8(struct gl_context *ctx, GLuint v0, GLuint v1);
+void	gld_Line2DSmoothTwoside_DX8(struct gl_context *ctx, GLuint v0, GLuint v1);
+void	gld_Triangle2DFlatTwoside_DX8(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);
+void	gld_Triangle2DSmoothTwoside_DX8(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);
+void	gld_Quad2DFlatTwoside_DX8(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+void	gld_Quad2DSmoothTwoside_DX8(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
 
 #endif
diff --git a/src/mesa/drivers/windows/gldirect/dx8/gld_ext_dx8.c b/src/mesa/drivers/windows/gldirect/dx8/gld_ext_dx8.c
index b51bba9b3ca..92189458054 100644
--- a/src/mesa/drivers/windows/gldirect/dx8/gld_ext_dx8.c
+++ b/src/mesa/drivers/windows/gldirect/dx8/gld_ext_dx8.c
@@ -69,7 +69,7 @@
 #include "extensions.h"
 
 // For some reason this is not defined in an above header...
-extern void _mesa_enable_imaging_extensions(GLcontext *ctx);
+extern void _mesa_enable_imaging_extensions(struct gl_context *ctx);
 
 //---------------------------------------------------------------------------
 // Hack for the SGIS_multitexture extension that was removed from Mesa
@@ -281,7 +281,7 @@ PROC gldGetProcAddress_DX(
 //---------------------------------------------------------------------------
 
 void gldEnableExtensions_DX8(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLuint i;
 
diff --git a/src/mesa/drivers/windows/gldirect/dx8/gld_pipeline_dx8.c b/src/mesa/drivers/windows/gldirect/dx8/gld_pipeline_dx8.c
index 2baea57443c..9113d703454 100644
--- a/src/mesa/drivers/windows/gldirect/dx8/gld_pipeline_dx8.c
+++ b/src/mesa/drivers/windows/gldirect/dx8/gld_pipeline_dx8.c
@@ -65,7 +65,7 @@ static const struct tnl_pipeline_stage *gld_pipeline[] = {
 //---------------------------------------------------------------------------
 
 void gldInstallPipeline_DX8(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	// Remove any existing pipeline	stages,
 	// then install GLDirect pipeline stages.
diff --git a/src/mesa/drivers/windows/gldirect/dx8/gld_primitive_dx8.c b/src/mesa/drivers/windows/gldirect/dx8/gld_primitive_dx8.c
index 990922580aa..5b9dac09c6d 100644
--- a/src/mesa/drivers/windows/gldirect/dx8/gld_primitive_dx8.c
+++ b/src/mesa/drivers/windows/gldirect/dx8/gld_primitive_dx8.c
@@ -277,7 +277,7 @@
 //---------------------------------------------------------------------------
 
 __inline DWORD _gldComputeFog(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	SWvertex *swv)
 {
 	// Full fog calculation.
@@ -300,7 +300,7 @@ __inline DWORD _gldComputeFog(
 //---------------------------------------------------------------------------
 
 void gld_ResetLineStipple_DX8(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	// TODO: Fake stipple with a 32x32 texture.
 }
@@ -310,7 +310,7 @@ void gld_ResetLineStipple_DX8(
 //---------------------------------------------------------------------------
 
 void gld_Points2D_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint first,
 	GLuint last)
 {
@@ -357,7 +357,7 @@ void gld_Points2D_DX8(
 //---------------------------------------------------------------------------
 
 void gld_Line2DFlat_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1)
 {
@@ -390,7 +390,7 @@ void gld_Line2DFlat_DX8(
 //---------------------------------------------------------------------------
 
 void gld_Line2DSmooth_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1)
 {
@@ -421,7 +421,7 @@ void gld_Line2DSmooth_DX8(
 //---------------------------------------------------------------------------
 
 void gld_Triangle2DFlat_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2)
@@ -460,7 +460,7 @@ void gld_Triangle2DFlat_DX8(
 //---------------------------------------------------------------------------
 
 void gld_Triangle2DSmooth_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2)
@@ -499,7 +499,7 @@ void gld_Triangle2DSmooth_DX8(
 //---------------------------------------------------------------------------
 
 void gld_Triangle2DFlatExtras_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2)
@@ -548,7 +548,7 @@ void gld_Triangle2DFlatExtras_DX8(
 //---------------------------------------------------------------------------
 
 void gld_Triangle2DSmoothExtras_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2)
@@ -588,7 +588,7 @@ void gld_Triangle2DSmoothExtras_DX8(
 //---------------------------------------------------------------------------
 
 void gld_Quad2DFlat_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2,
@@ -652,7 +652,7 @@ void gld_Quad2DFlat_DX8(
 //---------------------------------------------------------------------------
 
 void gld_Quad2DSmooth_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2,
@@ -715,7 +715,7 @@ void gld_Quad2DSmooth_DX8(
 //---------------------------------------------------------------------------
 
 void gld_Quad2DFlatExtras_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2,
@@ -792,7 +792,7 @@ void gld_Quad2DFlatExtras_DX8(
 //---------------------------------------------------------------------------
 
 void gld_Quad2DSmoothExtras_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2,
@@ -859,7 +859,7 @@ void gld_Quad2DSmoothExtras_DX8(
 //---------------------------------------------------------------------------
 
 void gld_Points3D_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint first,
 	GLuint last)
 {
@@ -911,7 +911,7 @@ void gld_Points3D_DX8(
 //---------------------------------------------------------------------------
 
 void gld_Line3DFlat_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1)
 {
@@ -937,7 +937,7 @@ void gld_Line3DFlat_DX8(
 //---------------------------------------------------------------------------
 
 void gld_Line3DSmooth_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1)
 {
@@ -964,7 +964,7 @@ void gld_Line3DSmooth_DX8(
 //---------------------------------------------------------------------------
 
 void gld_Triangle3DFlat_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2)
@@ -997,7 +997,7 @@ void gld_Triangle3DFlat_DX8(
 //---------------------------------------------------------------------------
 
 void gld_Triangle3DSmooth_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2)
@@ -1031,7 +1031,7 @@ void gld_Triangle3DSmooth_DX8(
 //---------------------------------------------------------------------------
 
 void gld_Quad3DFlat_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2,
@@ -1083,7 +1083,7 @@ void gld_Quad3DFlat_DX8(
 //---------------------------------------------------------------------------
 
 void gld_Quad3DSmooth_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2,
@@ -1137,34 +1137,34 @@ void gld_Quad3DSmooth_DX8(
 
 /*
 
-void gld_Points2DTwoside_DX8(GLcontext *ctx, GLuint first, GLuint last)
+void gld_Points2DTwoside_DX8(struct gl_context *ctx, GLuint first, GLuint last)
 {
 	// NOTE: Two-sided lighting does not apply to Points
 }
 
 //---------------------------------------------------------------------------
 
-void gld_Line2DFlatTwoside_DX8(GLcontext *ctx, GLuint v0, GLuint v1)
+void gld_Line2DFlatTwoside_DX8(struct gl_context *ctx, GLuint v0, GLuint v1)
 {
 	// NOTE: Two-sided lighting does not apply to Lines
 }
 
 //---------------------------------------------------------------------------
 
-void gld_Line2DSmoothTwoside_DX8(GLcontext *ctx, GLuint v0, GLuint v1)
+void gld_Line2DSmoothTwoside_DX8(struct gl_context *ctx, GLuint v0, GLuint v1)
 {
 	// NOTE: Two-sided lighting does not apply to Lines
 }
 
 //---------------------------------------------------------------------------
 
-void gld_Triangle2DFlatTwoside_DX8(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2)
+void gld_Triangle2DFlatTwoside_DX8(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2)
 {
 }
 
 //---------------------------------------------------------------------------
 
-void gld_Triangle2DSmoothTwoside_DX8(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2)
+void gld_Triangle2DSmoothTwoside_DX8(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx8		*gld	= GLD_GET_DX8_DRIVER(gldCtx);
@@ -1229,7 +1229,7 @@ void gld_Triangle2DSmoothTwoside_DX8(GLcontext *ctx, GLuint v0, GLuint v1, GLuin
 
 //---------------------------------------------------------------------------
 
-void gld_Quad2DFlatTwoside_DX8(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
+void gld_Quad2DFlatTwoside_DX8(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx8		*gld	= GLD_GET_DX8_DRIVER(gldCtx);
@@ -1336,7 +1336,7 @@ void gld_Quad2DFlatTwoside_DX8(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2,
 
 //---------------------------------------------------------------------------
 
-void gld_Quad2DSmoothTwoside_DX8(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
+void gld_Quad2DSmoothTwoside_DX8(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx8		*gld	= GLD_GET_DX8_DRIVER(gldCtx);
diff --git a/src/mesa/drivers/windows/gldirect/dx8/gld_texture_dx8.c b/src/mesa/drivers/windows/gldirect/dx8/gld_texture_dx8.c
index f24b3cfb74d..6ea670a88a0 100644
--- a/src/mesa/drivers/windows/gldirect/dx8/gld_texture_dx8.c
+++ b/src/mesa/drivers/windows/gldirect/dx8/gld_texture_dx8.c
@@ -760,7 +760,7 @@ const struct gl_texture_format* _gldMesaFormatForD3DFormat(
 //---------------------------------------------------------------------------
 
 void gldCopyTexImage1D_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLenum target, GLint level,
 	GLenum internalFormat,
 	GLint x, GLint y,
@@ -772,7 +772,7 @@ void gldCopyTexImage1D_DX8(
 //---------------------------------------------------------------------------
 
 void gldCopyTexImage2D_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLenum target,
 	GLint level,
 	GLenum internalFormat,
@@ -788,7 +788,7 @@ void gldCopyTexImage2D_DX8(
 //---------------------------------------------------------------------------
 
 void gldCopyTexSubImage1D_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLenum target, GLint level,
 	GLint xoffset, GLint x, GLint y, GLsizei width )
 {
@@ -798,7 +798,7 @@ void gldCopyTexSubImage1D_DX8(
 //---------------------------------------------------------------------------
 
 void gldCopyTexSubImage2D_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLenum target,
 	GLint level,
 	GLint xoffset,
@@ -814,7 +814,7 @@ void gldCopyTexSubImage2D_DX8(
 //---------------------------------------------------------------------------
 
 void gldCopyTexSubImage3D_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLenum target,
 	GLint level,
 	GLint xoffset,
@@ -846,7 +846,7 @@ typedef struct {
 //---------------------------------------------------------------------------
 
 HRESULT _gldDrawPixels(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	BOOL bChromakey,	// Alpha test for glBitmap() images
 	GLint x,			// GL x position
 	GLint y,			// GL y position (needs flipping)
@@ -982,7 +982,7 @@ HRESULT _gldDrawPixels(
 //---------------------------------------------------------------------------
 
 void gld_DrawPixels_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLint x, GLint y, GLsizei width, GLsizei height,
 	GLenum format, GLenum type,
 	const struct gl_pixelstore_attrib *unpack,
@@ -1045,7 +1045,7 @@ void gld_DrawPixels_DX8(
 //---------------------------------------------------------------------------
 
 void gld_ReadPixels_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLint x, GLint y, GLsizei width, GLsizei height,
 	GLenum format, GLenum type,
 	const struct gl_pixelstore_attrib *pack,
@@ -1198,7 +1198,7 @@ gld_ReadPixels_DX8_return:
 //---------------------------------------------------------------------------
 
 void gld_CopyPixels_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLint srcx,
 	GLint srcy,
 	GLsizei width,
@@ -1284,7 +1284,7 @@ void gld_CopyPixels_DX8(
 //---------------------------------------------------------------------------
 
 void gld_Bitmap_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLint x,
 	GLint y,
 	GLsizei width,
@@ -1389,7 +1389,7 @@ void gld_Bitmap_DX8(
 //---------------------------------------------------------------------------
 
 void _gldAllocateTexture(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	struct gl_texture_object *tObj,
 	struct gl_texture_image *texImage)
 {
@@ -1435,7 +1435,7 @@ void _gldAllocateTexture(
 //---------------------------------------------------------------------------
 
 const struct gl_texture_format* gld_ChooseTextureFormat_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLint internalFormat,
 	GLenum srcFormat,
 	GLenum srcType)
@@ -1524,7 +1524,7 @@ const struct gl_texture_format* gld_ChooseTextureFormat_DX8(
 /*
 // Safer(?), slower version.
 void gld_TexImage2D_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLenum target,
 	GLint level,
 	GLint internalFormat,
@@ -1602,7 +1602,7 @@ void gld_TexImage2D_DX8(
 // Faster, more efficient version.
 // Copies subimage straight to dest texture
 void gld_TexImage2D_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLenum target,
 	GLint level,
 	GLint internalFormat,
@@ -1676,7 +1676,7 @@ void gld_TexImage2D_DX8(
 
 //---------------------------------------------------------------------------
 
-void gld_TexImage1D_DX8(GLcontext *ctx, GLenum target, GLint level,
+void gld_TexImage1D_DX8(struct gl_context *ctx, GLenum target, GLint level,
                        GLint internalFormat,
                        GLint width, GLint border,
                        GLenum format, GLenum type, const GLvoid *pixels,
@@ -1691,7 +1691,7 @@ void gld_TexImage1D_DX8(GLcontext *ctx, GLenum target, GLint level,
 //---------------------------------------------------------------------------
 
 /*
-void gld_TexSubImage2D( GLcontext *ctx, GLenum target, GLint level,
+void gld_TexSubImage2D( struct gl_context *ctx, GLenum target, GLint level,
                           GLint xoffset, GLint yoffset,
                           GLsizei width, GLsizei height,
                           GLenum format, GLenum type,
@@ -1767,7 +1767,7 @@ void gld_TexSubImage2D( GLcontext *ctx, GLenum target, GLint level,
 
 // Faster, more efficient version.
 // Copies subimage straight to dest texture
-void gld_TexSubImage2D_DX8( GLcontext *ctx, GLenum target, GLint level,
+void gld_TexSubImage2D_DX8( struct gl_context *ctx, GLenum target, GLint level,
                           GLint xoffset, GLint yoffset,
                           GLsizei width, GLsizei height,
                           GLenum format, GLenum type,
@@ -1828,7 +1828,7 @@ void gld_TexSubImage2D_DX8( GLcontext *ctx, GLenum target, GLint level,
 
 //---------------------------------------------------------------------------
 
-void gld_TexSubImage1D_DX8( GLcontext *ctx, GLenum target, GLint level,
+void gld_TexSubImage1D_DX8( struct gl_context *ctx, GLenum target, GLint level,
                           GLint xoffset, GLsizei width,
                           GLenum format, GLenum type,
                           const GLvoid *pixels,
@@ -1842,7 +1842,7 @@ void gld_TexSubImage1D_DX8( GLcontext *ctx, GLenum target, GLint level,
 //---------------------------------------------------------------------------
 
 void gld_DeleteTexture_DX8(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	struct gl_texture_object *tObj)
 {
 	GLD_context *gld = (GLD_context*)(ctx->DriverCtx);
@@ -1894,7 +1894,7 @@ __inline void _gldSetAlphaOps(
 //---------------------------------------------------------------------------
 
 void gldUpdateTextureUnit(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint unit,
 	BOOL bPassThrough)
 {
@@ -1994,7 +1994,7 @@ void gldUpdateTextureUnit(
 //---------------------------------------------------------------------------
 
 void gld_NEW_TEXTURE_DX8(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	// TODO: Support for three (ATI Radeon) or more (nVidia GeForce3) texture units
 
diff --git a/src/mesa/drivers/windows/gldirect/dx8/gld_vb_d3d_render_dx8.c b/src/mesa/drivers/windows/gldirect/dx8/gld_vb_d3d_render_dx8.c
index 265c81fb4a4..983df9bc097 100644
--- a/src/mesa/drivers/windows/gldirect/dx8/gld_vb_d3d_render_dx8.c
+++ b/src/mesa/drivers/windows/gldirect/dx8/gld_vb_d3d_render_dx8.c
@@ -61,7 +61,7 @@
 //---------------------------------------------------------------------------
 
 __inline void _gldSetVertexShaderConstants(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLD_driver_dx8 *gld)
 {
 	D3DXMATRIX mat, matView, matProj;
@@ -116,7 +116,7 @@ __inline void _gldSetVertexShaderConstants(
 //---------------------------------------------------------------------------
 
 static GLboolean gld_d3d_render_stage_run(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	struct tnl_pipeline_stage *stage)
 {
 	GLD_context				*gldCtx	= GLD_GET_CONTEXT(ctx);
diff --git a/src/mesa/drivers/windows/gldirect/dx8/gld_vb_mesa_render_dx8.c b/src/mesa/drivers/windows/gldirect/dx8/gld_vb_mesa_render_dx8.c
index 9ab562010ce..19ffc72c814 100644
--- a/src/mesa/drivers/windows/gldirect/dx8/gld_vb_mesa_render_dx8.c
+++ b/src/mesa/drivers/windows/gldirect/dx8/gld_vb_mesa_render_dx8.c
@@ -167,7 +167,7 @@ do {							\
 
 /* TODO: do this for all primitives, verts and elts:
  */
-static void clip_elt_triangles( GLcontext *ctx,
+static void clip_elt_triangles( struct gl_context *ctx,
 				GLuint start,
 				GLuint count,
 				GLuint flags )
@@ -255,7 +255,7 @@ static void clip_elt_triangles( GLcontext *ctx,
 /*              Helper functions for drivers                  */
 /**********************************************************************/
 /*
-void _tnl_RenderClippedPolygon( GLcontext *ctx, const GLuint *elts, GLuint n )
+void _tnl_RenderClippedPolygon( struct gl_context *ctx, const GLuint *elts, GLuint n )
 {
    TNLcontext *tnl = TNL_CONTEXT(ctx);
    struct vertex_buffer *VB = &tnl->vb;
@@ -266,7 +266,7 @@ void _tnl_RenderClippedPolygon( GLcontext *ctx, const GLuint *elts, GLuint n )
    VB->Elts = tmp;
 }
 
-void _tnl_RenderClippedLine( GLcontext *ctx, GLuint ii, GLuint jj )
+void _tnl_RenderClippedLine( struct gl_context *ctx, GLuint ii, GLuint jj )
 {
    TNLcontext *tnl = TNL_CONTEXT(ctx);
    tnl->Driver.Render.Line( ctx, ii, jj );
@@ -306,7 +306,7 @@ tnl_quad_func _gldSetupQuad[4] = {
 //---------------------------------------------------------------------------
 
 static GLboolean _gld_mesa_render_stage_run(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	struct tnl_pipeline_stage *stage)
 {
 	GLD_context				*gldCtx	= GLD_GET_CONTEXT(ctx);
diff --git a/src/mesa/drivers/windows/gldirect/dx8/gld_wgl_dx8.c b/src/mesa/drivers/windows/gldirect/dx8/gld_wgl_dx8.c
index 011d810e975..73c76c7d4bf 100644
--- a/src/mesa/drivers/windows/gldirect/dx8/gld_wgl_dx8.c
+++ b/src/mesa/drivers/windows/gldirect/dx8/gld_wgl_dx8.c
@@ -54,8 +54,8 @@ extern int nContextError;
 
 #define DDLOG_CRITICAL_OR_WARN	DDLOG_CRITICAL
 
-extern void _gld_mesa_warning(GLcontext *, char *);
-extern void _gld_mesa_fatal(GLcontext *, char *);
+extern void _gld_mesa_warning(struct gl_context *, char *);
+extern void _gld_mesa_fatal(struct gl_context *, char *);
 
 //---------------------------------------------------------------------------
 
@@ -233,7 +233,7 @@ void _gldDestroyPrimitiveBuffer(
 //---------------------------------------------------------------------------
 
 HRESULT _gldCreatePrimitiveBuffer(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLD_driver_dx8 *lpCtx,
 	GLD_pb_dx8 *gldVB)
 {
diff --git a/src/mesa/drivers/windows/gldirect/dx9/gld_driver_dx9.c b/src/mesa/drivers/windows/gldirect/dx9/gld_driver_dx9.c
index 0186b268324..aab70852016 100644
--- a/src/mesa/drivers/windows/gldirect/dx9/gld_driver_dx9.c
+++ b/src/mesa/drivers/windows/gldirect/dx9/gld_driver_dx9.c
@@ -69,7 +69,7 @@ const float _fPersp_33 = 1.6f;
 //---------------------------------------------------------------------------
 
 void _gld_mesa_warning(
-	__GLcontext *gc,
+	__struct gl_context *gc,
 	char *str)
 {
 	// Intercept Mesa's internal warning mechanism
@@ -79,7 +79,7 @@ void _gld_mesa_warning(
 //---------------------------------------------------------------------------
 
 void _gld_mesa_fatal(
-	__GLcontext *gc,
+	__struct gl_context *gc,
 	char *str)
 {
 	// Intercept Mesa's internal fatal-message mechanism
@@ -199,7 +199,7 @@ D3DBLEND _gldConvertBlendFunc(
 //---------------------------------------------------------------------------
 
 void gld_Noop_DX9(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 #ifdef _DEBUG
 	gldLogMessage(GLDLOG_ERROR, "gld_Noop called!\n");
@@ -209,7 +209,7 @@ void gld_Noop_DX9(
 //---------------------------------------------------------------------------
 
 void gld_Error_DX9(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 #ifdef _DEBUG
 	// Quite useless.
@@ -222,7 +222,7 @@ void gld_Error_DX9(
 //---------------------------------------------------------------------------
 
 static GLboolean gld_set_draw_buffer_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLenum mode)
 {
    (void) ctx;
@@ -237,7 +237,7 @@ static GLboolean gld_set_draw_buffer_DX9(
 //---------------------------------------------------------------------------
 
 static void gld_set_read_buffer_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	struct gl_framebuffer *buffer,
 	GLenum mode)
 {
@@ -251,7 +251,7 @@ static void gld_set_read_buffer_DX9(
 //---------------------------------------------------------------------------
 
 void gld_Clear_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLbitfield mask,
 	GLboolean all,
 	GLint x,
@@ -340,7 +340,7 @@ void gld_Clear_DX9(
 
 // Mesa 5: Parameter change
 static void gld_buffer_size_DX9(
-//	GLcontext *ctx,
+//	struct gl_context *ctx,
 	struct gl_framebuffer *fb,
 	GLuint *width,
 	GLuint *height)
@@ -354,14 +354,14 @@ static void gld_buffer_size_DX9(
 //---------------------------------------------------------------------------
 
 static void gld_Finish_DX9(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 }
 
 //---------------------------------------------------------------------------
 
 static void gld_Flush_DX9(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context		*gld	= GLD_GET_CONTEXT(ctx);
 
@@ -377,7 +377,7 @@ static void gld_Flush_DX9(
 //---------------------------------------------------------------------------
 
 void gld_NEW_STENCIL(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);
@@ -402,7 +402,7 @@ void gld_NEW_STENCIL(
 //---------------------------------------------------------------------------
 
 void gld_NEW_COLOR(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);
@@ -434,7 +434,7 @@ void gld_NEW_COLOR(
 //---------------------------------------------------------------------------
 
 void gld_NEW_DEPTH(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);
@@ -447,7 +447,7 @@ void gld_NEW_DEPTH(
 //---------------------------------------------------------------------------
 
 void gld_NEW_POLYGON(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);
@@ -513,7 +513,7 @@ void gld_NEW_POLYGON(
 //---------------------------------------------------------------------------
 
 void gld_NEW_FOG(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);
@@ -568,7 +568,7 @@ void gld_NEW_FOG(
 //---------------------------------------------------------------------------
 
 void gld_NEW_LIGHT(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context		*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx9	*gld	= GLD_GET_DX9_DRIVER(gldCtx);
@@ -588,7 +588,7 @@ void gld_NEW_LIGHT(
 //---------------------------------------------------------------------------
 
 void gld_NEW_MODELVIEW(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);
@@ -620,7 +620,7 @@ void gld_NEW_MODELVIEW(
 //---------------------------------------------------------------------------
 
 void gld_NEW_PROJECTION(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);
@@ -699,7 +699,7 @@ void gldOrthoHook_DX9(
 //---------------------------------------------------------------------------
 
 void gld_NEW_VIEWPORT(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);
@@ -741,7 +741,7 @@ void gld_NEW_VIEWPORT(
 //---------------------------------------------------------------------------
 
 void gld_NEW_SCISSOR(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);
@@ -768,7 +768,7 @@ void gld_NEW_SCISSOR(
 //---------------------------------------------------------------------------
 
 __inline BOOL _gldAnyEvalEnabled(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	struct gl_eval_attrib *eval = &ctx->Eval;
 
@@ -800,7 +800,7 @@ __inline BOOL _gldAnyEvalEnabled(
 //---------------------------------------------------------------------------
 
 BOOL _gldChooseInternalPipeline(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLD_driver_dx9 *gld)
 {
 //	return TRUE;	// DEBUGGING: ALWAYS USE MESA
@@ -864,7 +864,7 @@ BOOL _gldChooseInternalPipeline(
 //---------------------------------------------------------------------------
 
 void gld_update_state_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint new_state)
 {
 	GLD_context		*gldCtx	= GLD_GET_CONTEXT(ctx);
@@ -1001,7 +1001,7 @@ void gld_update_state_DX9(
 //---------------------------------------------------------------------------
 
 void gld_Viewport_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLint x,
 	GLint y,
 	GLsizei w,
@@ -1063,11 +1063,11 @@ void gld_Viewport_DX9(
 
 //---------------------------------------------------------------------------
 
-extern BOOL dglWglResizeBuffers(GLcontext *ctx, BOOL bDefaultDriver);
+extern BOOL dglWglResizeBuffers(struct gl_context *ctx, BOOL bDefaultDriver);
 
 // Mesa 5: Parameter change
 void gldResizeBuffers_DX9(
-//	GLcontext *ctx)
+//	struct gl_context *ctx)
 	struct gl_framebuffer *fb)
 {
 	GET_CURRENT_CONTEXT(ctx);
@@ -1079,7 +1079,7 @@ void gldResizeBuffers_DX9(
 // This is only for debugging.
 // To use, plug into ctx->Driver.Enable pointer below.
 void gld_Enable(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLenum e,
 	GLboolean b)
 {
@@ -1092,10 +1092,10 @@ void gld_Enable(
 // Driver pointer setup
 //---------------------------------------------------------------------------
 
-extern const GLubyte* _gldGetStringGeneric(GLcontext*, GLenum);
+extern const GLubyte* _gldGetStringGeneric(struct gl_context*, GLenum);
 
 void gldSetupDriverPointers_DX9(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLD_context		*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx9	*gld	= GLD_GET_DX9_DRIVER(gldCtx);
diff --git a/src/mesa/drivers/windows/gldirect/dx9/gld_dx9.h b/src/mesa/drivers/windows/gldirect/dx9/gld_dx9.h
index 201595f7247..67601da7fb6 100644
--- a/src/mesa/drivers/windows/gldirect/dx9/gld_dx9.h
+++ b/src/mesa/drivers/windows/gldirect/dx9/gld_dx9.h
@@ -259,69 +259,69 @@ typedef struct {
 //---------------------------------------------------------------------------
 
 PROC	gldGetProcAddress_DX9(LPCSTR a);
-void	gldEnableExtensions_DX9(GLcontext *ctx);
-void	gldInstallPipeline_DX9(GLcontext *ctx);
-void	gldSetupDriverPointers_DX9(GLcontext *ctx);
-//void	gldResizeBuffers_DX9(GLcontext *ctx);
+void	gldEnableExtensions_DX9(struct gl_context *ctx);
+void	gldInstallPipeline_DX9(struct gl_context *ctx);
+void	gldSetupDriverPointers_DX9(struct gl_context *ctx);
+//void	gldResizeBuffers_DX9(struct gl_context *ctx);
 void	gldResizeBuffers_DX9(struct gl_framebuffer *fb);
 
 
 // Texture functions
 
-void	gldCopyTexImage1D_DX9(GLcontext *ctx, GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border);
-void	gldCopyTexImage2D_DX9(GLcontext *ctx, GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-void	gldCopyTexSubImage1D_DX9(GLcontext *ctx, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width );
-void	gldCopyTexSubImage2D_DX9(GLcontext *ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height );
-void	gldCopyTexSubImage3D_DX9(GLcontext *ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height );
-
-void	gld_NEW_TEXTURE_DX9(GLcontext *ctx);
-void	gld_DrawPixels_DX9(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, const struct gl_pixelstore_attrib *unpack, const GLvoid *pixels);
-void	gld_ReadPixels_DX9(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, const struct gl_pixelstore_attrib *unpack, GLvoid *dest);
-void	gld_CopyPixels_DX9(GLcontext *ctx, GLint srcx, GLint srcy, GLsizei width, GLsizei height, GLint dstx, GLint dsty, GLenum type);
-void	gld_Bitmap_DX9(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height, const struct gl_pixelstore_attrib *unpack, const GLubyte *bitmap);
-const struct gl_texture_format* gld_ChooseTextureFormat_DX9(GLcontext *ctx, GLint internalFormat, GLenum srcFormat, GLenum srcType);
-void	gld_TexImage2D_DX9(GLcontext *ctx, GLenum target, GLint level, GLint internalFormat, GLint width, GLint height, GLint border, GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *tObj, struct gl_texture_image *texImage);
-void	gld_TexImage1D_DX9(GLcontext *ctx, GLenum target, GLint level, GLint internalFormat, GLint width, GLint border, GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *texObj, struct gl_texture_image *texImage );
-void	gld_TexSubImage2D_DX9( GLcontext *ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *texObj, struct gl_texture_image *texImage );
-void	gld_TexSubImage1D_DX9(GLcontext *ctx, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *texObj, struct gl_texture_image *texImage);
-void	gld_DeleteTexture_DX9(GLcontext *ctx, struct gl_texture_object *tObj);
-void	gld_ResetLineStipple_DX9(GLcontext *ctx);
+void	gldCopyTexImage1D_DX9(struct gl_context *ctx, GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border);
+void	gldCopyTexImage2D_DX9(struct gl_context *ctx, GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+void	gldCopyTexSubImage1D_DX9(struct gl_context *ctx, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width );
+void	gldCopyTexSubImage2D_DX9(struct gl_context *ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height );
+void	gldCopyTexSubImage3D_DX9(struct gl_context *ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height );
+
+void	gld_NEW_TEXTURE_DX9(struct gl_context *ctx);
+void	gld_DrawPixels_DX9(struct gl_context *ctx, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, const struct gl_pixelstore_attrib *unpack, const GLvoid *pixels);
+void	gld_ReadPixels_DX9(struct gl_context *ctx, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, const struct gl_pixelstore_attrib *unpack, GLvoid *dest);
+void	gld_CopyPixels_DX9(struct gl_context *ctx, GLint srcx, GLint srcy, GLsizei width, GLsizei height, GLint dstx, GLint dsty, GLenum type);
+void	gld_Bitmap_DX9(struct gl_context *ctx, GLint x, GLint y, GLsizei width, GLsizei height, const struct gl_pixelstore_attrib *unpack, const GLubyte *bitmap);
+const struct gl_texture_format* gld_ChooseTextureFormat_DX9(struct gl_context *ctx, GLint internalFormat, GLenum srcFormat, GLenum srcType);
+void	gld_TexImage2D_DX9(struct gl_context *ctx, GLenum target, GLint level, GLint internalFormat, GLint width, GLint height, GLint border, GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *tObj, struct gl_texture_image *texImage);
+void	gld_TexImage1D_DX9(struct gl_context *ctx, GLenum target, GLint level, GLint internalFormat, GLint width, GLint border, GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *texObj, struct gl_texture_image *texImage );
+void	gld_TexSubImage2D_DX9( struct gl_context *ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *texObj, struct gl_texture_image *texImage );
+void	gld_TexSubImage1D_DX9(struct gl_context *ctx, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *texObj, struct gl_texture_image *texImage);
+void	gld_DeleteTexture_DX9(struct gl_context *ctx, struct gl_texture_object *tObj);
+void	gld_ResetLineStipple_DX9(struct gl_context *ctx);
 
 // 2D primitive functions
 
-void	gld_Points2D_DX9(GLcontext *ctx, GLuint first, GLuint last);
+void	gld_Points2D_DX9(struct gl_context *ctx, GLuint first, GLuint last);
 
-void	gld_Line2DFlat_DX9(GLcontext *ctx, GLuint v0, GLuint v1);
-void	gld_Line2DSmooth_DX9(GLcontext *ctx, GLuint v0, GLuint v1);
+void	gld_Line2DFlat_DX9(struct gl_context *ctx, GLuint v0, GLuint v1);
+void	gld_Line2DSmooth_DX9(struct gl_context *ctx, GLuint v0, GLuint v1);
 
-void	gld_Triangle2DFlat_DX9(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2);
-void	gld_Triangle2DSmooth_DX9(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2);
-void	gld_Triangle2DFlatExtras_DX9(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2);
-void	gld_Triangle2DSmoothExtras_DX9(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2);
+void	gld_Triangle2DFlat_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);
+void	gld_Triangle2DSmooth_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);
+void	gld_Triangle2DFlatExtras_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);
+void	gld_Triangle2DSmoothExtras_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);
 
-void	gld_Quad2DFlat_DX9(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-void	gld_Quad2DSmooth_DX9(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-void	gld_Quad2DFlatExtras_DX9(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-void	gld_Quad2DSmoothExtras_DX9(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+void	gld_Quad2DFlat_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+void	gld_Quad2DSmooth_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+void	gld_Quad2DFlatExtras_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+void	gld_Quad2DSmoothExtras_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
 
 // 3D primitive functions
 
-void	gld_Points3D_DX9(GLcontext *ctx, GLuint first, GLuint last);
-void	gld_Line3DFlat_DX9(GLcontext *ctx, GLuint v0, GLuint v1);
-void	gld_Triangle3DFlat_DX9(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2);
-void	gld_Quad3DFlat_DX9(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-void	gld_Line3DSmooth_DX9(GLcontext *ctx, GLuint v0, GLuint v1);
-void	gld_Triangle3DSmooth_DX9(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2);
-void	gld_Quad3DSmooth_DX9(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+void	gld_Points3D_DX9(struct gl_context *ctx, GLuint first, GLuint last);
+void	gld_Line3DFlat_DX9(struct gl_context *ctx, GLuint v0, GLuint v1);
+void	gld_Triangle3DFlat_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);
+void	gld_Quad3DFlat_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+void	gld_Line3DSmooth_DX9(struct gl_context *ctx, GLuint v0, GLuint v1);
+void	gld_Triangle3DSmooth_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);
+void	gld_Quad3DSmooth_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
 
 // Primitive functions for Two-sided-lighting Vertex Shader
 
-void	gld_Points2DTwoside_DX9(GLcontext *ctx, GLuint first, GLuint last);
-void	gld_Line2DFlatTwoside_DX9(GLcontext *ctx, GLuint v0, GLuint v1);
-void	gld_Line2DSmoothTwoside_DX9(GLcontext *ctx, GLuint v0, GLuint v1);
-void	gld_Triangle2DFlatTwoside_DX9(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2);
-void	gld_Triangle2DSmoothTwoside_DX9(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2);
-void	gld_Quad2DFlatTwoside_DX9(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-void	gld_Quad2DSmoothTwoside_DX9(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+void	gld_Points2DTwoside_DX9(struct gl_context *ctx, GLuint first, GLuint last);
+void	gld_Line2DFlatTwoside_DX9(struct gl_context *ctx, GLuint v0, GLuint v1);
+void	gld_Line2DSmoothTwoside_DX9(struct gl_context *ctx, GLuint v0, GLuint v1);
+void	gld_Triangle2DFlatTwoside_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);
+void	gld_Triangle2DSmoothTwoside_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);
+void	gld_Quad2DFlatTwoside_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+void	gld_Quad2DSmoothTwoside_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
 
 #endif
diff --git a/src/mesa/drivers/windows/gldirect/dx9/gld_ext_dx9.c b/src/mesa/drivers/windows/gldirect/dx9/gld_ext_dx9.c
index e8c73a6ff80..667c59c4917 100644
--- a/src/mesa/drivers/windows/gldirect/dx9/gld_ext_dx9.c
+++ b/src/mesa/drivers/windows/gldirect/dx9/gld_ext_dx9.c
@@ -69,7 +69,7 @@
 #include "extensions.h"
 
 // For some reason this is not defined in an above header...
-extern void _mesa_enable_imaging_extensions(GLcontext *ctx);
+extern void _mesa_enable_imaging_extensions(struct gl_context *ctx);
 
 //---------------------------------------------------------------------------
 // Hack for the SGIS_multitexture extension that was removed from Mesa
@@ -281,7 +281,7 @@ PROC gldGetProcAddress_DX(
 //---------------------------------------------------------------------------
 
 void gldEnableExtensions_DX9(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	GLuint i;
 
diff --git a/src/mesa/drivers/windows/gldirect/dx9/gld_pipeline_dx9.c b/src/mesa/drivers/windows/gldirect/dx9/gld_pipeline_dx9.c
index 2b272aa6281..f9abbdbdfed 100644
--- a/src/mesa/drivers/windows/gldirect/dx9/gld_pipeline_dx9.c
+++ b/src/mesa/drivers/windows/gldirect/dx9/gld_pipeline_dx9.c
@@ -65,7 +65,7 @@ static const struct tnl_pipeline_stage *gld_pipeline[] = {
 //---------------------------------------------------------------------------
 
 void gldInstallPipeline_DX9(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	// Remove any existing pipeline	stages,
 	// then install GLDirect pipeline stages.
diff --git a/src/mesa/drivers/windows/gldirect/dx9/gld_primitive_dx9.c b/src/mesa/drivers/windows/gldirect/dx9/gld_primitive_dx9.c
index fd4dd4ed751..99edd26e9d2 100644
--- a/src/mesa/drivers/windows/gldirect/dx9/gld_primitive_dx9.c
+++ b/src/mesa/drivers/windows/gldirect/dx9/gld_primitive_dx9.c
@@ -277,7 +277,7 @@
 //---------------------------------------------------------------------------
 
 __inline DWORD _gldComputeFog(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	SWvertex *swv)
 {
 	// Full fog calculation.
@@ -300,7 +300,7 @@ __inline DWORD _gldComputeFog(
 //---------------------------------------------------------------------------
 
 void gld_ResetLineStipple_DX9(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	// TODO: Fake stipple with a 32x32 texture.
 }
@@ -310,7 +310,7 @@ void gld_ResetLineStipple_DX9(
 //---------------------------------------------------------------------------
 
 void gld_Points2D_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint first,
 	GLuint last)
 {
@@ -357,7 +357,7 @@ void gld_Points2D_DX9(
 //---------------------------------------------------------------------------
 
 void gld_Line2DFlat_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1)
 {
@@ -390,7 +390,7 @@ void gld_Line2DFlat_DX9(
 //---------------------------------------------------------------------------
 
 void gld_Line2DSmooth_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1)
 {
@@ -421,7 +421,7 @@ void gld_Line2DSmooth_DX9(
 //---------------------------------------------------------------------------
 
 void gld_Triangle2DFlat_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2)
@@ -460,7 +460,7 @@ void gld_Triangle2DFlat_DX9(
 //---------------------------------------------------------------------------
 
 void gld_Triangle2DSmooth_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2)
@@ -499,7 +499,7 @@ void gld_Triangle2DSmooth_DX9(
 //---------------------------------------------------------------------------
 
 void gld_Triangle2DFlatExtras_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2)
@@ -548,7 +548,7 @@ void gld_Triangle2DFlatExtras_DX9(
 //---------------------------------------------------------------------------
 
 void gld_Triangle2DSmoothExtras_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2)
@@ -588,7 +588,7 @@ void gld_Triangle2DSmoothExtras_DX9(
 //---------------------------------------------------------------------------
 
 void gld_Quad2DFlat_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2,
@@ -652,7 +652,7 @@ void gld_Quad2DFlat_DX9(
 //---------------------------------------------------------------------------
 
 void gld_Quad2DSmooth_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2,
@@ -715,7 +715,7 @@ void gld_Quad2DSmooth_DX9(
 //---------------------------------------------------------------------------
 
 void gld_Quad2DFlatExtras_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2,
@@ -792,7 +792,7 @@ void gld_Quad2DFlatExtras_DX9(
 //---------------------------------------------------------------------------
 
 void gld_Quad2DSmoothExtras_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2,
@@ -859,7 +859,7 @@ void gld_Quad2DSmoothExtras_DX9(
 //---------------------------------------------------------------------------
 
 void gld_Points3D_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint first,
 	GLuint last)
 {
@@ -911,7 +911,7 @@ void gld_Points3D_DX9(
 //---------------------------------------------------------------------------
 
 void gld_Line3DFlat_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1)
 {
@@ -937,7 +937,7 @@ void gld_Line3DFlat_DX9(
 //---------------------------------------------------------------------------
 
 void gld_Line3DSmooth_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1)
 {
@@ -964,7 +964,7 @@ void gld_Line3DSmooth_DX9(
 //---------------------------------------------------------------------------
 
 void gld_Triangle3DFlat_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2)
@@ -997,7 +997,7 @@ void gld_Triangle3DFlat_DX9(
 //---------------------------------------------------------------------------
 
 void gld_Triangle3DSmooth_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2)
@@ -1031,7 +1031,7 @@ void gld_Triangle3DSmooth_DX9(
 //---------------------------------------------------------------------------
 
 void gld_Quad3DFlat_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2,
@@ -1083,7 +1083,7 @@ void gld_Quad3DFlat_DX9(
 //---------------------------------------------------------------------------
 
 void gld_Quad3DSmooth_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint v0,
 	GLuint v1,
 	GLuint v2,
@@ -1137,34 +1137,34 @@ void gld_Quad3DSmooth_DX9(
 
 /*
 
-void gld_Points2DTwoside_DX9(GLcontext *ctx, GLuint first, GLuint last)
+void gld_Points2DTwoside_DX9(struct gl_context *ctx, GLuint first, GLuint last)
 {
 	// NOTE: Two-sided lighting does not apply to Points
 }
 
 //---------------------------------------------------------------------------
 
-void gld_Line2DFlatTwoside_DX9(GLcontext *ctx, GLuint v0, GLuint v1)
+void gld_Line2DFlatTwoside_DX9(struct gl_context *ctx, GLuint v0, GLuint v1)
 {
 	// NOTE: Two-sided lighting does not apply to Lines
 }
 
 //---------------------------------------------------------------------------
 
-void gld_Line2DSmoothTwoside_DX9(GLcontext *ctx, GLuint v0, GLuint v1)
+void gld_Line2DSmoothTwoside_DX9(struct gl_context *ctx, GLuint v0, GLuint v1)
 {
 	// NOTE: Two-sided lighting does not apply to Lines
 }
 
 //---------------------------------------------------------------------------
 
-void gld_Triangle2DFlatTwoside_DX9(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2)
+void gld_Triangle2DFlatTwoside_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2)
 {
 }
 
 //---------------------------------------------------------------------------
 
-void gld_Triangle2DSmoothTwoside_DX9(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2)
+void gld_Triangle2DSmoothTwoside_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);
@@ -1229,7 +1229,7 @@ void gld_Triangle2DSmoothTwoside_DX9(GLcontext *ctx, GLuint v0, GLuint v1, GLuin
 
 //---------------------------------------------------------------------------
 
-void gld_Quad2DFlatTwoside_DX9(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
+void gld_Quad2DFlatTwoside_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);
@@ -1336,7 +1336,7 @@ void gld_Quad2DFlatTwoside_DX9(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2,
 
 //---------------------------------------------------------------------------
 
-void gld_Quad2DSmoothTwoside_DX9(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
+void gld_Quad2DSmoothTwoside_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
 	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);
 	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);
diff --git a/src/mesa/drivers/windows/gldirect/dx9/gld_texture_dx9.c b/src/mesa/drivers/windows/gldirect/dx9/gld_texture_dx9.c
index 5a822356164..bd7a64f57f6 100644
--- a/src/mesa/drivers/windows/gldirect/dx9/gld_texture_dx9.c
+++ b/src/mesa/drivers/windows/gldirect/dx9/gld_texture_dx9.c
@@ -760,7 +760,7 @@ const struct gl_texture_format* _gldMesaFormatForD3DFormat(
 //---------------------------------------------------------------------------
 
 void gldCopyTexImage1D_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLenum target, GLint level,
 	GLenum internalFormat,
 	GLint x, GLint y,
@@ -772,7 +772,7 @@ void gldCopyTexImage1D_DX9(
 //---------------------------------------------------------------------------
 
 void gldCopyTexImage2D_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLenum target,
 	GLint level,
 	GLenum internalFormat,
@@ -788,7 +788,7 @@ void gldCopyTexImage2D_DX9(
 //---------------------------------------------------------------------------
 
 void gldCopyTexSubImage1D_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLenum target, GLint level,
 	GLint xoffset, GLint x, GLint y, GLsizei width )
 {
@@ -798,7 +798,7 @@ void gldCopyTexSubImage1D_DX9(
 //---------------------------------------------------------------------------
 
 void gldCopyTexSubImage2D_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLenum target,
 	GLint level,
 	GLint xoffset,
@@ -814,7 +814,7 @@ void gldCopyTexSubImage2D_DX9(
 //---------------------------------------------------------------------------
 
 void gldCopyTexSubImage3D_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLenum target,
 	GLint level,
 	GLint xoffset,
@@ -846,7 +846,7 @@ typedef struct {
 //---------------------------------------------------------------------------
 
 HRESULT _gldDrawPixels(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	BOOL bChromakey,	// Alpha test for glBitmap() images
 	GLint x,			// GL x position
 	GLint y,			// GL y position (needs flipping)
@@ -991,7 +991,7 @@ HRESULT _gldDrawPixels(
 //---------------------------------------------------------------------------
 
 void gld_DrawPixels_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLint x, GLint y, GLsizei width, GLsizei height,
 	GLenum format, GLenum type,
 	const struct gl_pixelstore_attrib *unpack,
@@ -1060,7 +1060,7 @@ void gld_DrawPixels_DX9(
 //---------------------------------------------------------------------------
 
 void gld_ReadPixels_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLint x, GLint y, GLsizei width, GLsizei height,
 	GLenum format, GLenum type,
 	const struct gl_pixelstore_attrib *pack,
@@ -1230,7 +1230,7 @@ gld_ReadPixels_DX9_return:
 //---------------------------------------------------------------------------
 
 void gld_CopyPixels_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLint srcx,
 	GLint srcy,
 	GLsizei width,
@@ -1329,7 +1329,7 @@ void gld_CopyPixels_DX9(
 //---------------------------------------------------------------------------
 
 void gld_Bitmap_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLint x,
 	GLint y,
 	GLsizei width,
@@ -1440,7 +1440,7 @@ void gld_Bitmap_DX9(
 //---------------------------------------------------------------------------
 
 void _gldAllocateTexture(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	struct gl_texture_object *tObj,
 	struct gl_texture_image *texImage)
 {
@@ -1486,7 +1486,7 @@ void _gldAllocateTexture(
 //---------------------------------------------------------------------------
 
 const struct gl_texture_format* gld_ChooseTextureFormat_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLint internalFormat,
 	GLenum srcFormat,
 	GLenum srcType)
@@ -1575,7 +1575,7 @@ const struct gl_texture_format* gld_ChooseTextureFormat_DX9(
 /*
 // Safer(?), slower version.
 void gld_TexImage2D_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLenum target,
 	GLint level,
 	GLint internalFormat,
@@ -1653,7 +1653,7 @@ void gld_TexImage2D_DX9(
 // Faster, more efficient version.
 // Copies subimage straight to dest texture
 void gld_TexImage2D_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLenum target,
 	GLint level,
 	GLint internalFormat,
@@ -1727,7 +1727,7 @@ void gld_TexImage2D_DX9(
 
 //---------------------------------------------------------------------------
 
-void gld_TexImage1D_DX9(GLcontext *ctx, GLenum target, GLint level,
+void gld_TexImage1D_DX9(struct gl_context *ctx, GLenum target, GLint level,
                        GLint internalFormat,
                        GLint width, GLint border,
                        GLenum format, GLenum type, const GLvoid *pixels,
@@ -1742,7 +1742,7 @@ void gld_TexImage1D_DX9(GLcontext *ctx, GLenum target, GLint level,
 //---------------------------------------------------------------------------
 
 /*
-void gld_TexSubImage2D( GLcontext *ctx, GLenum target, GLint level,
+void gld_TexSubImage2D( struct gl_context *ctx, GLenum target, GLint level,
                           GLint xoffset, GLint yoffset,
                           GLsizei width, GLsizei height,
                           GLenum format, GLenum type,
@@ -1818,7 +1818,7 @@ void gld_TexSubImage2D( GLcontext *ctx, GLenum target, GLint level,
 
 // Faster, more efficient version.
 // Copies subimage straight to dest texture
-void gld_TexSubImage2D_DX9( GLcontext *ctx, GLenum target, GLint level,
+void gld_TexSubImage2D_DX9( struct gl_context *ctx, GLenum target, GLint level,
                           GLint xoffset, GLint yoffset,
                           GLsizei width, GLsizei height,
                           GLenum format, GLenum type,
@@ -1879,7 +1879,7 @@ void gld_TexSubImage2D_DX9( GLcontext *ctx, GLenum target, GLint level,
 
 //---------------------------------------------------------------------------
 
-void gld_TexSubImage1D_DX9( GLcontext *ctx, GLenum target, GLint level,
+void gld_TexSubImage1D_DX9( struct gl_context *ctx, GLenum target, GLint level,
                           GLint xoffset, GLsizei width,
                           GLenum format, GLenum type,
                           const GLvoid *pixels,
@@ -1893,7 +1893,7 @@ void gld_TexSubImage1D_DX9( GLcontext *ctx, GLenum target, GLint level,
 //---------------------------------------------------------------------------
 
 void gld_DeleteTexture_DX9(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	struct gl_texture_object *tObj)
 {
 	GLD_context *gld = (GLD_context*)(ctx->DriverCtx);
@@ -1945,7 +1945,7 @@ __inline void _gldSetAlphaOps(
 //---------------------------------------------------------------------------
 
 void gldUpdateTextureUnit(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint unit,
 	BOOL bPassThrough)
 {
@@ -2050,7 +2050,7 @@ void gldUpdateTextureUnit(
 //---------------------------------------------------------------------------
 
 void gld_NEW_TEXTURE_DX9(
-	GLcontext *ctx)
+	struct gl_context *ctx)
 {
 	// TODO: Support for three (ATI Radeon) or more (nVidia GeForce3) texture units
 
diff --git a/src/mesa/drivers/windows/gldirect/dx9/gld_vb_d3d_render_dx9.c b/src/mesa/drivers/windows/gldirect/dx9/gld_vb_d3d_render_dx9.c
index 91a68b3f2d9..5f818d9f960 100644
--- a/src/mesa/drivers/windows/gldirect/dx9/gld_vb_d3d_render_dx9.c
+++ b/src/mesa/drivers/windows/gldirect/dx9/gld_vb_d3d_render_dx9.c
@@ -61,7 +61,7 @@
 //---------------------------------------------------------------------------
 
 __inline void _gldSetVertexShaderConstants(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLD_driver_dx9 *gld)
 {
 	D3DXMATRIX mat, matView, matProj;
@@ -116,7 +116,7 @@ __inline void _gldSetVertexShaderConstants(
 //---------------------------------------------------------------------------
 
 static GLboolean gld_d3d_render_stage_run(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	struct tnl_pipeline_stage *stage)
 {
 	GLD_context				*gldCtx	= GLD_GET_CONTEXT(ctx);
@@ -237,7 +237,7 @@ static GLboolean gld_d3d_render_stage_run(
 //---------------------------------------------------------------------------
 
 static void gld_d3d_render_stage_check(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	struct tnl_pipeline_stage *stage)
 {
 	GLD_context				*gldCtx	= GLD_GET_CONTEXT(ctx);
diff --git a/src/mesa/drivers/windows/gldirect/dx9/gld_vb_mesa_render_dx9.c b/src/mesa/drivers/windows/gldirect/dx9/gld_vb_mesa_render_dx9.c
index 64acab2d2a8..b5e005b25b0 100644
--- a/src/mesa/drivers/windows/gldirect/dx9/gld_vb_mesa_render_dx9.c
+++ b/src/mesa/drivers/windows/gldirect/dx9/gld_vb_mesa_render_dx9.c
@@ -162,7 +162,7 @@ do {							\
 
 /* TODO: do this for all primitives, verts and elts:
  */
-static void clip_elt_triangles( GLcontext *ctx,
+static void clip_elt_triangles( struct gl_context *ctx,
 				GLuint start,
 				GLuint count,
 				GLuint flags )
@@ -250,7 +250,7 @@ static void clip_elt_triangles( GLcontext *ctx,
 /*              Helper functions for drivers                  */
 /**********************************************************************/
 /*
-void _tnl_RenderClippedPolygon( GLcontext *ctx, const GLuint *elts, GLuint n )
+void _tnl_RenderClippedPolygon( struct gl_context *ctx, const GLuint *elts, GLuint n )
 {
    TNLcontext *tnl = TNL_CONTEXT(ctx);
    struct vertex_buffer *VB = &tnl->vb;
@@ -261,7 +261,7 @@ void _tnl_RenderClippedPolygon( GLcontext *ctx, const GLuint *elts, GLuint n )
    VB->Elts = tmp;
 }
 
-void _tnl_RenderClippedLine( GLcontext *ctx, GLuint ii, GLuint jj )
+void _tnl_RenderClippedLine( struct gl_context *ctx, GLuint ii, GLuint jj )
 {
    TNLcontext *tnl = TNL_CONTEXT(ctx);
    tnl->Driver.Render.Line( ctx, ii, jj );
@@ -301,7 +301,7 @@ tnl_quad_func _gldSetupQuad[4] = {
 //---------------------------------------------------------------------------
 
 static GLboolean _gld_mesa_render_stage_run(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	struct tnl_pipeline_stage *stage)
 {
 	GLD_context				*gldCtx	= GLD_GET_CONTEXT(ctx);
diff --git a/src/mesa/drivers/windows/gldirect/dx9/gld_wgl_dx9.c b/src/mesa/drivers/windows/gldirect/dx9/gld_wgl_dx9.c
index a03b865bb44..6cf46fb7a81 100644
--- a/src/mesa/drivers/windows/gldirect/dx9/gld_wgl_dx9.c
+++ b/src/mesa/drivers/windows/gldirect/dx9/gld_wgl_dx9.c
@@ -54,8 +54,8 @@ extern int nContextError;
 
 #define DDLOG_CRITICAL_OR_WARN	DDLOG_CRITICAL
 
-extern void _gld_mesa_warning(GLcontext *, char *);
-extern void _gld_mesa_fatal(GLcontext *, char *);
+extern void _gld_mesa_warning(struct gl_context *, char *);
+extern void _gld_mesa_fatal(struct gl_context *, char *);
 
 //---------------------------------------------------------------------------
 
@@ -246,7 +246,7 @@ void _gldDestroyPrimitiveBuffer(
 //---------------------------------------------------------------------------
 
 HRESULT _gldCreatePrimitiveBuffer(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLD_driver_dx9 *lpCtx,
 	GLD_pb_dx9 *gldVB)
 {
diff --git a/src/mesa/drivers/windows/gldirect/gld_driver.c b/src/mesa/drivers/windows/gldirect/gld_driver.c
index f7c575614b4..aa7bc27c99a 100644
--- a/src/mesa/drivers/windows/gldirect/gld_driver.c
+++ b/src/mesa/drivers/windows/gldirect/gld_driver.c
@@ -193,7 +193,7 @@ static BOOL	_GetDisplayMode_ERROR(
 //---------------------------------------------------------------------------
 
 const GLubyte* _gldGetStringGeneric(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLenum name)
 {
 	if (!ctx)
diff --git a/src/mesa/drivers/windows/gldirect/gld_driver.h b/src/mesa/drivers/windows/gldirect/gld_driver.h
index 01a46a8325f..7c393bc4c7e 100644
--- a/src/mesa/drivers/windows/gldirect/gld_driver.h
+++ b/src/mesa/drivers/windows/gldirect/gld_driver.h
@@ -83,7 +83,7 @@ typedef struct {
 extern GLD_driver _gldDriver;
 
 BOOL gldInitDriverPointers(DWORD dwDriver);
-const GLubyte* _gldGetStringGeneric(GLcontext *ctx, GLenum name);
+const GLubyte* _gldGetStringGeneric(struct gl_context *ctx, GLenum name);
 
 #endif // _USE_GLD3_WGL
 
diff --git a/src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c b/src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c
index b3c2026475d..7a26df8071e 100644
--- a/src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c
+++ b/src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c
@@ -610,7 +610,7 @@ BOOL wmFlush(PWMC pwc, HDC hDC)
 // Support Functions
 //---------------------------------------------------------------------------
 
-static void flush(GLcontext* ctx)
+static void flush(struct gl_context* ctx)
 {
 	GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
 	WMesaContext *Current = GLD_GET_WMESA_DRIVER(gldCtx);
@@ -634,10 +634,10 @@ static void flush(GLcontext* ctx)
 /*
  * Set the color used to clear the color buffer.
  */
-//static void clear_color( GLcontext* ctx, const GLchan color[4] )
+//static void clear_color( struct gl_context* ctx, const GLchan color[4] )
 // Changed for Mesa 5.x. KeithH
 static void clear_color(
-	GLcontext* ctx,
+	struct gl_context* ctx,
 	const GLfloat color[4])
 {
 	GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
@@ -664,7 +664,7 @@ static void clear_color(
  * Otherwise, we let swrast do it.
  */
 
-static clear(GLcontext* ctx, GLbitfield mask,
+static clear(struct gl_context* ctx, GLbitfield mask,
 	     GLboolean all, GLint x, GLint y, GLint width, GLint height)
 {
 	GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
@@ -787,7 +787,7 @@ static clear(GLcontext* ctx, GLbitfield mask,
 //---------------------------------------------------------------------------
 
 
-static void enable( GLcontext* ctx, GLenum pname, GLboolean enable )
+static void enable( struct gl_context* ctx, GLenum pname, GLboolean enable )
 {
 	GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
 	WMesaContext *Current = GLD_GET_WMESA_DRIVER(gldCtx);
@@ -814,7 +814,7 @@ static void enable( GLcontext* ctx, GLenum pname, GLboolean enable )
 
 //---------------------------------------------------------------------------
 
-static GLboolean set_draw_buffer( GLcontext* ctx, GLenum mode )
+static GLboolean set_draw_buffer( struct gl_context* ctx, GLenum mode )
 {
   /* TODO: this could be better */
   if (mode==GL_FRONT_LEFT || mode==GL_BACK_LEFT) {
@@ -828,7 +828,7 @@ static GLboolean set_draw_buffer( GLcontext* ctx, GLenum mode )
 //---------------------------------------------------------------------------
 
 
-static void set_read_buffer(GLcontext *ctx, struct gl_framebuffer *colorBuffer,
+static void set_read_buffer(struct gl_context *ctx, struct gl_framebuffer *colorBuffer,
                             GLenum buffer )
 {
   /* XXX todo */
@@ -840,7 +840,7 @@ static void set_read_buffer(GLcontext *ctx, struct gl_framebuffer *colorBuffer,
 
 
 /* Return characteristics of the output buffer. */
-//static void buffer_size( GLcontext* ctx, GLuint *width, GLuint *height )
+//static void buffer_size( struct gl_context* ctx, GLuint *width, GLuint *height )
 // Altered for Mesa 5.x. KeithH
 static void buffer_size(
 	struct gl_framebuffer *buffer,
@@ -888,28 +888,28 @@ static void buffer_size(
 
 /* Accelerated routines are not implemented in 4.0. See OSMesa for ideas. */
 
-static void fast_rgb_points( GLcontext* ctx, GLuint first, GLuint last )
+static void fast_rgb_points( struct gl_context* ctx, GLuint first, GLuint last )
 {
 }
 
 //---------------------------------------------------------------------------
 
 /* Return pointer to accelerated points function */
-extern tnl_points_func choose_points_function( GLcontext* ctx )
+extern tnl_points_func choose_points_function( struct gl_context* ctx )
 {
   return NULL;
 }
 
 //---------------------------------------------------------------------------
 
-static void fast_flat_rgb_line( GLcontext* ctx, GLuint v0, 
+static void fast_flat_rgb_line( struct gl_context* ctx, GLuint v0, 
 				GLuint v1, GLuint pv )
 {
 }
 
 //---------------------------------------------------------------------------
 
-static tnl_line_func choose_line_function( GLcontext* ctx )
+static tnl_line_func choose_line_function( struct gl_context* ctx )
 {
 }
 
@@ -920,7 +920,7 @@ static tnl_line_func choose_line_function( GLcontext* ctx )
 
 
 /* Write a horizontal span of 32-bit color-index pixels with a boolean mask. */
-static void write_ci32_span( const GLcontext* ctx,
+static void write_ci32_span( const struct gl_context* ctx,
                              GLuint n, GLint x, GLint y,
                              const GLuint index[],
                              const GLubyte mask[] )
@@ -939,7 +939,7 @@ static void write_ci32_span( const GLcontext* ctx,
 //---------------------------------------------------------------------------
 
 /* Write a horizontal span of 8-bit color-index pixels with a boolean mask. */
-static void write_ci8_span( const GLcontext* ctx,
+static void write_ci8_span( const struct gl_context* ctx,
                             GLuint n, GLint x, GLint y,
                             const GLubyte index[],
                             const GLubyte mask[] )
@@ -962,7 +962,7 @@ static void write_ci8_span( const GLcontext* ctx,
  * Write a horizontal span of pixels with a boolean mask.  The current
  * color index is used for all pixels.
  */
-static void write_mono_ci_span(const GLcontext* ctx,
+static void write_mono_ci_span(const struct gl_context* ctx,
                                GLuint n,GLint x,GLint y,
                                GLuint colorIndex, const GLubyte mask[])
 {
@@ -984,7 +984,7 @@ static void write_mono_ci_span(const GLcontext* ctx,
  */
 
 /* Write a horizontal span of RGBA color pixels with a boolean mask. */
-static void write_rgba_span( const GLcontext* ctx, GLuint n, GLint x, GLint y,
+static void write_rgba_span( const struct gl_context* ctx, GLuint n, GLint x, GLint y,
                              const GLubyte rgba[][4], const GLubyte mask[] )
 {
 	GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
@@ -1035,7 +1035,7 @@ static void write_rgba_span( const GLcontext* ctx, GLuint n, GLint x, GLint y,
 //---------------------------------------------------------------------------
 
 /* Write a horizontal span of RGB color pixels with a boolean mask. */
-static void write_rgb_span( const GLcontext* ctx,
+static void write_rgb_span( const struct gl_context* ctx,
                             GLuint n, GLint x, GLint y,
                             const GLubyte rgb[][3], const GLubyte mask[] )
 {
@@ -1090,7 +1090,7 @@ static void write_rgb_span( const GLcontext* ctx,
  * Write a horizontal span of pixels with a boolean mask.  The current color
  * is used for all pixels.
  */
-static void write_mono_rgba_span( const GLcontext* ctx,
+static void write_mono_rgba_span( const struct gl_context* ctx,
                                   GLuint n, GLint x, GLint y,
                                   const GLchan color[4], const GLubyte mask[])
 {
@@ -1123,7 +1123,7 @@ static void write_mono_rgba_span( const GLcontext* ctx,
 
 
 /* Write an array of 32-bit index pixels with a boolean mask. */
-static void write_ci32_pixels( const GLcontext* ctx,
+static void write_ci32_pixels( const struct gl_context* ctx,
                                GLuint n, const GLint x[], const GLint y[],
                                const GLuint index[], const GLubyte mask[] )
 {
@@ -1147,7 +1147,7 @@ static void write_ci32_pixels( const GLcontext* ctx,
  * Write an array of pixels with a boolean mask.  The current color
  * index is used for all pixels.
  */
-static void write_mono_ci_pixels( const GLcontext* ctx,
+static void write_mono_ci_pixels( const struct gl_context* ctx,
                                   GLuint n,
                                   const GLint x[], const GLint y[],
                                   GLuint colorIndex, const GLubyte mask[] )
@@ -1169,7 +1169,7 @@ static void write_mono_ci_pixels( const GLcontext* ctx,
 
 
 /* Write an array of RGBA pixels with a boolean mask. */
-static void write_rgba_pixels( const GLcontext* ctx,
+static void write_rgba_pixels( const struct gl_context* ctx,
                                GLuint n, const GLint x[], const GLint y[],
                                const GLubyte rgba[][4], const GLubyte mask[] )
 {
@@ -1194,7 +1194,7 @@ static void write_rgba_pixels( const GLcontext* ctx,
  * Write an array of pixels with a boolean mask.  The current color
  * is used for all pixels.
  */
-static void write_mono_rgba_pixels( const GLcontext* ctx,
+static void write_mono_rgba_pixels( const struct gl_context* ctx,
                                     GLuint n,
                                     const GLint x[], const GLint y[],
                                     const GLchan color[4],
@@ -1218,7 +1218,7 @@ static void write_mono_rgba_pixels( const GLcontext* ctx,
 /**********************************************************************/
 
 /* Read a horizontal span of color-index pixels. */
-static void read_ci32_span( const GLcontext* ctx, GLuint n, GLint x, GLint y,
+static void read_ci32_span( const struct gl_context* ctx, GLuint n, GLint x, GLint y,
                             GLuint index[])
 {
 	GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
@@ -1233,7 +1233,7 @@ static void read_ci32_span( const GLcontext* ctx, GLuint n, GLint x, GLint y,
 //---------------------------------------------------------------------------
 
 /* Read an array of color index pixels. */
-static void read_ci32_pixels( const GLcontext* ctx,
+static void read_ci32_pixels( const struct gl_context* ctx,
                               GLuint n, const GLint x[], const GLint y[],
                               GLuint indx[], const GLubyte mask[] )
 {
@@ -1251,7 +1251,7 @@ static void read_ci32_pixels( const GLcontext* ctx,
 //---------------------------------------------------------------------------
 
 /* Read a horizontal span of color pixels. */
-static void read_rgba_span( const GLcontext* ctx,
+static void read_rgba_span( const struct gl_context* ctx,
                             GLuint n, GLint x, GLint y,
                             GLubyte rgba[][4] )
 {
@@ -1275,7 +1275,7 @@ static void read_rgba_span( const GLcontext* ctx,
 //---------------------------------------------------------------------------
 
 /* Read an array of color pixels. */
-static void read_rgba_pixels( const GLcontext* ctx,
+static void read_rgba_pixels( const struct gl_context* ctx,
                               GLuint n, const GLint x[], const GLint y[],
                               GLubyte rgba[][4], const GLubyte mask[] )
 {
@@ -1301,7 +1301,7 @@ static void read_rgba_pixels( const GLcontext* ctx,
 //---------------------------------------------------------------------------
 
 static void wmesa_update_state(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint new_state)
 {
     _swrast_InvalidateState( ctx, new_state );
@@ -1313,7 +1313,7 @@ static void wmesa_update_state(
 //---------------------------------------------------------------------------
 
 static void wmesa_viewport(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLint x,
 	GLint y,
 	GLsizei w,
@@ -1325,7 +1325,7 @@ static void wmesa_viewport(
 //---------------------------------------------------------------------------
 
 static void wmesa_update_state_first_time(
-	GLcontext *ctx,
+	struct gl_context *ctx,
 	GLuint new_state)
 {
 	struct swrast_device_driver	*swdd = _swrast_GetDeviceDriverReference( ctx );
@@ -1570,7 +1570,7 @@ BOOL gldBuildPixelformatList_MesaSW(void)
 BOOL gldInitialiseMesa_MesaSW(
 	DGL_ctx *gld)
 {
-	GLcontext *ctx;
+	struct gl_context *ctx;
 
 	if (gld == NULL)
 		return FALSE;