3 files changed, 7 insertions, 7 deletions
diff --git a/src/glx/x11/XF86dri.c b/src/glx/x11/XF86dri.c
index b44ebaf3296..5b0bf14afe9 100644
--- a/src/glx/x11/XF86dri.c
+++ b/src/glx/x11/XF86dri.c
@@ -376,7 +376,7 @@ PUBLIC Bool XF86DRICreateContext(dpy, screen, visual, context, hHWContext)
 }
 
 PUBLIC GLboolean XF86DRIDestroyContext(Display *dpy, int screen, 
-    __DRIid context )
+    XID context )
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86DRIDestroyContextReq *req;
@@ -397,7 +397,7 @@ PUBLIC GLboolean XF86DRIDestroyContext(Display *dpy, int screen,
 }
 
 PUBLIC GLboolean XF86DRICreateDrawable(Display *dpy, int screen, 
-    __DRIid drawable, drm_drawable_t * hHWDrawable )
+    XID drawable, drm_drawable_t * hHWDrawable )
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86DRICreateDrawableReply rep;
@@ -431,7 +431,7 @@ static int noopErrorHandler(Display *dpy, XErrorEvent *xerr)
 }
 
 PUBLIC GLboolean XF86DRIDestroyDrawable(Display *dpy, int screen,
-    __DRIid drawable )
+    XID drawable )
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86DRIDestroyDrawableReq *req;
diff --git a/src/glx/x11/glxcmds.c b/src/glx/x11/glxcmds.c
index 75790c977ee..31316463811 100644
--- a/src/glx/x11/glxcmds.c
+++ b/src/glx/x11/glxcmds.c
@@ -82,7 +82,7 @@ static int windowExistsErrorHandler(Display *dpy, XErrorEvent *xerr)
  */
 static void GarbageCollectDRIDrawables(Display *dpy, __GLXscreenConfigs *sc)
 {
-    __DRIid draw;
+    XID draw;
     __GLXdrawable *pdraw;
     XWindowAttributes xwa;
     int (*oldXErrorHandler)(Display *, XErrorEvent *);
diff --git a/src/glx/x11/xf86dri.h b/src/glx/x11/xf86dri.h
index ddac7db266c..69a2d74fb27 100644
--- a/src/glx/x11/xf86dri.h
+++ b/src/glx/x11/xf86dri.h
@@ -95,13 +95,13 @@ Bool XF86DRICreateContextWithConfig( Display *dpy, int screen, int configID,
     XID *ptr_to_returned_context_id, drm_context_t *hHWContext );
 
 extern GLboolean XF86DRIDestroyContext( Display *dpy, int screen,
-    __DRIid context_id );
+    XID context_id );
 
 extern GLboolean XF86DRICreateDrawable( Display *dpy, int screen,
-    __DRIid drawable, drm_drawable_t *hHWDrawable );
+    XID drawable, drm_drawable_t *hHWDrawable );
 
 extern GLboolean XF86DRIDestroyDrawable( Display *dpy, int screen, 
-    __DRIid drawable);
+    XID drawable);
 
 Bool XF86DRIGetDrawableInfo( Display *dpy, int screen, Drawable drawable,
     unsigned int *index, unsigned int *stamp,