diff --git a/dri3/dri3.h b/dri3/dri3.h
index 30433dc4f..02d3b03ee 100644
--- a/dri3/dri3.h
+++ b/dri3/dri3.h
@@ -66,9 +66,9 @@ typedef int (*dri3_fd_from_pixmap_proc) (ScreenPtr screen,
 typedef int (*dri3_fds_from_pixmap_proc) (ScreenPtr screen,
                                           PixmapPtr pixmap,
                                           int *fds,
-                                          CARD32 *strides,
-                                          CARD32 *offsets,
-                                          CARD64 *modifier);
+                                          uint32_t *strides,
+                                          uint32_t *offsets,
+                                          uint64_t *modifier);
 
 typedef int (*dri3_get_formats_proc) (ScreenPtr screen,
                                       CARD32 *num_formats,
diff --git a/dri3/dri3_priv.h b/dri3/dri3_priv.h
index 168b87cbb..b087a9529 100644
--- a/dri3/dri3_priv.h
+++ b/dri3/dri3_priv.h
@@ -90,8 +90,8 @@ dri3_fd_from_pixmap(PixmapPtr pixmap, CARD16 *stride, CARD32 *size);
 
 int
 dri3_fds_from_pixmap(PixmapPtr pixmap, int *fds,
-                     CARD32 *strides, CARD32 *offsets,
-                     CARD64 *modifier);
+                     uint32_t *strides, uint32_t *offsets,
+                     uint64_t *modifier);
 
 int
 dri3_get_supported_modifiers(ScreenPtr screen, DrawablePtr drawable,
diff --git a/dri3/dri3_screen.c b/dri3/dri3_screen.c
index a900f261d..b98259753 100644
--- a/dri3/dri3_screen.c
+++ b/dri3/dri3_screen.c
@@ -82,8 +82,8 @@ dri3_pixmap_from_fds(PixmapPtr *ppixmap, ScreenPtr screen,
 
 int
 dri3_fds_from_pixmap(PixmapPtr pixmap, int *fds,
-                     CARD32 *strides, CARD32 *offsets,
-                     CARD64 *modifier)
+                     uint32_t *strides, uint32_t *offsets,
+                     uint64_t *modifier)
 {
     ScreenPtr                   screen = pixmap->drawable.pScreen;
     dri3_screen_priv_ptr        ds = dri3_screen_priv(screen);
@@ -118,9 +118,9 @@ dri3_fd_from_pixmap(PixmapPtr pixmap, CARD16 *stride, CARD32 *size)
     ScreenPtr                   screen = pixmap->drawable.pScreen;
     dri3_screen_priv_ptr        ds = dri3_screen_priv(screen);
     const dri3_screen_info_rec  *info = ds->info;
-    CARD32                      strides[4];
-    CARD32                      offsets[4];
-    CARD64                      modifier;
+    uint32_t                    strides[4];
+    uint32_t                    offsets[4];
+    uint64_t                    modifier;
     int                         fds[4];
     int                         num_fds;