diff --git a/Mk/Uses/gl.mk b/Mk/Uses/gl.mk
--- a/Mk/Uses/gl.mk
+++ b/Mk/Uses/gl.mk
@@ -13,6 +13,7 @@
 .if !defined(_INCLUDE_USES_GL_MK)
 _INCLUDE_USES_GL_MK=yes
 
+_GL_dri_BUILD_DEPENDS=		${LOCALBASE}/include/GL/internal/dri_interface.h:graphics/${DRI_DEFAULT}
 _GL_egl_LIB_DEPENDS=		libEGL.so:graphics/libglvnd
 _GL_gbm_LIB_DEPENDS=		libgbm.so:graphics/${GL_DEFAULT}
 _GL_gl_LIB_DEPENDS=		libGL.so:graphics/libglvnd
@@ -37,9 +38,11 @@
 .  endif
 
 .  for _component in ${USE_GL}
-.    if !defined(_GL_${_component}_LIB_DEPENDS)
+.    if ! (defined(_GL_${_component}_BUILD_DEPENDS) \
+	|| defined(_GL_${_component}_LIB_DEPENDS))
 IGNORE=		uses unknown GL component
 .    else
+BUILD_DEPENDS+=	${_GL_${_component}_BUILD_DEPENDS}
 USE_XORG+=	${_GL_${_component}_USE_XORG}
 LIB_DEPENDS+=	${_GL_${_component}_LIB_DEPENDS}
 .    endif
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -54,6 +54,11 @@
 .  endif
 # Possible values: mesa-libs, mesa-devel
 GL_DEFAULT?=		mesa-libs
+.  if ${GL_DEFAULT} == "mesa-devel"
+DRI_DEFAULT=		mesa-devel
+.  else
+DRI_DEFAULT=		mesa-dri
+.  endif
 # Possible values: 7, 8, 9, agpl
 GHOSTSCRIPT_DEFAULT?=	agpl
 # Possible values: 1.18, 1.19, 1.20-devel