diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
index 3a31f48a5ef..e1474b3543d 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -80,106 +80,106 @@ static const struct dri2_wl_visual {
    int opaque_wl_drm_format;
 } dri2_wl_visuals[] = {
    {
-      WL_DRM_FORMAT_ABGR16F,
+      DRM_FORMAT_ABGR16161616F,
       PIPE_FORMAT_R16G16B16A16_FLOAT,
       PIPE_FORMAT_NONE,
-      WL_DRM_FORMAT_XBGR16F,
+      DRM_FORMAT_XBGR16161616F,
    },
    {
-      WL_DRM_FORMAT_XBGR16F,
+      DRM_FORMAT_XBGR16161616F,
       PIPE_FORMAT_R16G16B16X16_FLOAT,
       PIPE_FORMAT_NONE,
-      WL_DRM_FORMAT_XBGR16F,
+      DRM_FORMAT_XBGR16161616F,
    },
    {
-      WL_DRM_FORMAT_XRGB2101010,
+      DRM_FORMAT_XRGB2101010,
       PIPE_FORMAT_B10G10R10X2_UNORM,
       PIPE_FORMAT_R10G10B10X2_UNORM,
-      WL_DRM_FORMAT_XRGB2101010,
+      DRM_FORMAT_XRGB2101010,
    },
    {
-      WL_DRM_FORMAT_ARGB2101010,
+      DRM_FORMAT_ARGB2101010,
       PIPE_FORMAT_B10G10R10A2_UNORM,
       PIPE_FORMAT_R10G10B10A2_UNORM,
-      WL_DRM_FORMAT_XRGB2101010,
+      DRM_FORMAT_XRGB2101010,
    },
    {
-      WL_DRM_FORMAT_XBGR2101010,
+      DRM_FORMAT_XBGR2101010,
       PIPE_FORMAT_R10G10B10X2_UNORM,
       PIPE_FORMAT_B10G10R10X2_UNORM,
-      WL_DRM_FORMAT_XBGR2101010,
+      DRM_FORMAT_XBGR2101010,
    },
    {
-      WL_DRM_FORMAT_ABGR2101010,
+      DRM_FORMAT_ABGR2101010,
       PIPE_FORMAT_R10G10B10A2_UNORM,
       PIPE_FORMAT_B10G10R10A2_UNORM,
-      WL_DRM_FORMAT_XBGR2101010,
+      DRM_FORMAT_XBGR2101010,
    },
    {
-      WL_DRM_FORMAT_XRGB8888,
+      DRM_FORMAT_XRGB8888,
       PIPE_FORMAT_BGRX8888_UNORM,
       PIPE_FORMAT_NONE,
-      WL_DRM_FORMAT_XRGB8888,
+      DRM_FORMAT_XRGB8888,
    },
    {
-      WL_DRM_FORMAT_ARGB8888,
+      DRM_FORMAT_ARGB8888,
       PIPE_FORMAT_BGRA8888_UNORM,
       PIPE_FORMAT_NONE,
-      WL_DRM_FORMAT_XRGB8888,
+      DRM_FORMAT_XRGB8888,
    },
    {
-      WL_DRM_FORMAT_RGB888,
+      DRM_FORMAT_RGB888,
       PIPE_FORMAT_B8G8R8_UNORM,
       PIPE_FORMAT_NONE,
-      WL_DRM_FORMAT_RGB888,
+      DRM_FORMAT_RGB888,
    },
    {
-      WL_DRM_FORMAT_ABGR8888,
+      DRM_FORMAT_ABGR8888,
       PIPE_FORMAT_RGBA8888_UNORM,
       PIPE_FORMAT_NONE,
-      WL_DRM_FORMAT_XBGR8888,
+      DRM_FORMAT_XBGR8888,
    },
    {
-      WL_DRM_FORMAT_XBGR8888,
+      DRM_FORMAT_XBGR8888,
       PIPE_FORMAT_RGBX8888_UNORM,
       PIPE_FORMAT_NONE,
-      WL_DRM_FORMAT_XBGR8888,
+      DRM_FORMAT_XBGR8888,
    },
    {
-      WL_DRM_FORMAT_BGR888,
+      DRM_FORMAT_BGR888,
       PIPE_FORMAT_R8G8B8_UNORM,
       PIPE_FORMAT_NONE,
-      WL_DRM_FORMAT_BGR888,
+      DRM_FORMAT_BGR888,
    },
    {
-      WL_DRM_FORMAT_RGB565,
+      DRM_FORMAT_RGB565,
       PIPE_FORMAT_B5G6R5_UNORM,
       PIPE_FORMAT_NONE,
-      WL_DRM_FORMAT_RGB565,
+      DRM_FORMAT_RGB565,
    },
    {
-      WL_DRM_FORMAT_ARGB1555,
+      DRM_FORMAT_ARGB1555,
       PIPE_FORMAT_B5G5R5A1_UNORM,
       PIPE_FORMAT_R5G5B5A1_UNORM,
-      WL_DRM_FORMAT_XRGB1555,
+      DRM_FORMAT_XRGB1555,
    },
    {
-      WL_DRM_FORMAT_XRGB1555,
+      DRM_FORMAT_XRGB1555,
       PIPE_FORMAT_B5G5R5X1_UNORM,
       PIPE_FORMAT_R5G5B5X1_UNORM,
-      WL_DRM_FORMAT_XRGB1555,
+      DRM_FORMAT_XRGB1555,
    },
    {
-      WL_DRM_FORMAT_ARGB4444,
+      DRM_FORMAT_ARGB4444,
       PIPE_FORMAT_B4G4R4A4_UNORM,
       PIPE_FORMAT_R4G4B4A4_UNORM,
-      WL_DRM_FORMAT_XRGB4444,
+      DRM_FORMAT_XRGB4444,
    },
    {
-      WL_DRM_FORMAT_XRGB4444,
+      DRM_FORMAT_XRGB4444,
       PIPE_FORMAT_B4G4R4X4_UNORM,
       PIPE_FORMAT_R4G4B4X4_UNORM,
-      WL_DRM_FORMAT_XRGB4444,
+      DRM_FORMAT_XRGB4444,
    },
 };
 
@@ -223,9 +223,9 @@ dri2_wl_shm_format_from_visual_idx(int idx)
 {
    uint32_t fourcc = dri2_wl_visuals[idx].wl_drm_format;
 
-   if (fourcc == WL_DRM_FORMAT_ARGB8888)
+   if (fourcc == DRM_FORMAT_ARGB8888)
       return WL_SHM_FORMAT_ARGB8888;
-   else if (fourcc == WL_DRM_FORMAT_XRGB8888)
+   else if (fourcc == DRM_FORMAT_XRGB8888)
       return WL_SHM_FORMAT_XRGB8888;
    else
       return fourcc;
@@ -237,9 +237,9 @@ dri2_wl_visual_idx_from_shm_format(uint32_t shm_format)
    uint32_t fourcc;
 
    if (shm_format == WL_SHM_FORMAT_ARGB8888)
-      fourcc = WL_DRM_FORMAT_ARGB8888;
+      fourcc = DRM_FORMAT_ARGB8888;
    else if (shm_format == WL_SHM_FORMAT_XRGB8888)
-      fourcc = WL_DRM_FORMAT_XRGB8888;
+      fourcc = DRM_FORMAT_XRGB8888;
    else
       fourcc = shm_format;