--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -1051,7 +1051,7 @@ dri2_setup_extensions(_EGLDisplay *disp)
                                   extensions))
          return EGL_FALSE;
    }
-
+#ifdef HAVE_X11_PLATFORM
 #ifdef HAVE_DRI3_MODIFIERS
    dri2_dpy->multibuffers_available =
       (dri2_dpy->dri3_major_version > 1 ||
@@ -1061,11 +1061,14 @@ dri2_setup_extensions(_EGLDisplay *disp)
        (dri2_dpy->present_major_version == 1 &&
         dri2_dpy->present_minor_version >= 2)) &&
       (dri2_dpy->image && dri2_dpy->image->base.version >= 15);
+#endif
 #endif
    if (disp->Options.Zink && !disp->Options.ForceSoftware &&
+#ifdef HAVE_X11_PLATFORM
 #ifdef HAVE_DRI3_MODIFIERS
        dri2_dpy->dri3_major_version != -1 &&
        !dri2_dpy->multibuffers_available &&
+#endif
 #endif
        !debug_get_bool_option("LIBGL_KOPPER_DRI2", false))
       return EGL_FALSE;
@@ -1238,12 +1241,13 @@ dri2_display_create(void)
 
    dri2_dpy->fd_render_gpu = -1;
    dri2_dpy->fd_display_gpu = -1;
-
+#ifdef HAVE_X11_PLATFORM
 #ifdef HAVE_DRI3_MODIFIERS
    dri2_dpy->dri3_major_version = -1;
    dri2_dpy->dri3_minor_version = -1;
    dri2_dpy->present_major_version = -1;
    dri2_dpy->present_minor_version = -1;
+#endif
 #endif
 
    return dri2_dpy;