diff --git a/src/gallium/frontends/dri/dri2.c b/src/gallium/frontends/dri/dri2.c
index a2585bf5e16..409b73ff0a5 100644
--- a/src/gallium/frontends/dri/dri2.c
+++ b/src/gallium/frontends/dri/dri2.c
@@ -2185,7 +2185,6 @@ static const __DRImutableRenderBufferDriverExtension driMutableRenderBufferExten
 static const __DRIextension *dri_screen_extensions_base[] = {
    &driTexBufferExtension.base,
    &dri2FlushExtension.base,
-   &dri2RendererQueryExtension.base,
    &dri2GalliumConfigQueryExtension.base,
    &dri2ThrottleExtension.base,
    &dri2FenceExtension.base,
diff --git a/src/gallium/frontends/dri/dri_query_renderer.c b/src/gallium/frontends/dri/dri_query_renderer.c
index 4b7743d0a31..aff04be8477 100644
--- a/src/gallium/frontends/dri/dri_query_renderer.c
+++ b/src/gallium/frontends/dri/dri_query_renderer.c
@@ -141,10 +141,3 @@ dri_query_renderer_string(__DRIscreen *_screen, int param,
       return -1;
    }
 }
-
-const __DRI2rendererQueryExtension dri2RendererQueryExtension = {
-    .base = { __DRI2_RENDERER_QUERY, 1 },
-
-    .queryInteger         = dri_query_renderer_integer,
-    .queryString          = dri_query_renderer_string
-};
diff --git a/src/gallium/frontends/dri/dri_query_renderer.h b/src/gallium/frontends/dri/dri_query_renderer.h
index 59b3ff8e5b3..eac5dcc491c 100644
--- a/src/gallium/frontends/dri/dri_query_renderer.h
+++ b/src/gallium/frontends/dri/dri_query_renderer.h
@@ -3,7 +3,4 @@
 
 #include "dri_util.h"
 
-extern const
-__DRI2rendererQueryExtension dri2RendererQueryExtension;
-
 #endif
diff --git a/src/gallium/frontends/dri/drisw.c b/src/gallium/frontends/dri/drisw.c
index eaf87ab7d78..6c365cba0be 100644
--- a/src/gallium/frontends/dri/drisw.c
+++ b/src/gallium/frontends/dri/drisw.c
@@ -524,7 +524,6 @@ static const __DRIrobustnessExtension dri2Robustness = {
 static const __DRIextension *drisw_screen_extensions[] = {
    &driSWImageExtension.base,
    &driTexBufferExtension.base,
-   &dri2RendererQueryExtension.base,
    &dri2ConfigQueryExtension.base,
    &dri2FenceExtension.base,
    &dri2FlushControlExtension.base,
@@ -534,7 +533,6 @@ static const __DRIextension *drisw_screen_extensions[] = {
 static const __DRIextension *drisw_robust_screen_extensions[] = {
    &driSWImageExtension.base,
    &driTexBufferExtension.base,
-   &dri2RendererQueryExtension.base,
    &dri2ConfigQueryExtension.base,
    &dri2FenceExtension.base,
    &dri2Robustness.base,
diff --git a/src/gallium/frontends/dri/kopper.c b/src/gallium/frontends/dri/kopper.c
index 96f80ad5e41..aa97f3c7437 100644
--- a/src/gallium/frontends/dri/kopper.c
+++ b/src/gallium/frontends/dri/kopper.c
@@ -87,7 +87,6 @@ const __DRIkopperExtension driKopperExtension;
 
 static const __DRIextension *drivk_screen_extensions[] = {
    &driTexBufferExtension.base,
-   &dri2RendererQueryExtension.base,
    &dri2ConfigQueryExtension.base,
    &dri2FenceExtension.base,
    &dri2Robustness.base,
@@ -100,7 +99,6 @@ static const __DRIextension *drivk_screen_extensions[] = {
 
 static const __DRIextension *drivk_sw_screen_extensions[] = {
    &driTexBufferExtension.base,
-   &dri2RendererQueryExtension.base,
    &dri2ConfigQueryExtension.base,
    &dri2FenceExtension.base,
    &dri2Robustness.base,
diff --git a/src/gallium/include/mesa_interface.h b/src/gallium/include/mesa_interface.h
index 0e4f5548041..e6ba08a979d 100644
--- a/src/gallium/include/mesa_interface.h
+++ b/src/gallium/include/mesa_interface.h
@@ -1785,9 +1785,6 @@ typedef struct __DRIconfigOptionsExtensionRec {
  * This allows the window system layer (either EGL or GLX) to query aspects of
  * hardware and driver support without creating a context.
  */
-#define __DRI2_RENDERER_QUERY "DRI_RENDERER_QUERY"
-#define __DRI2_RENDERER_QUERY_VERSION 1
-
 #define __DRI2_RENDERER_VENDOR_ID                             0x0000
 #define __DRI2_RENDERER_DEVICE_ID                             0x0001
 #define __DRI2_RENDERER_VERSION                               0x0002
@@ -1802,14 +1799,6 @@ typedef struct __DRIconfigOptionsExtensionRec {
 
 #define __DRI2_RENDERER_PREFER_BACK_BUFFER_REUSE              0x000f
 
-typedef struct __DRI2rendererQueryExtensionRec __DRI2rendererQueryExtension;
-struct __DRI2rendererQueryExtensionRec {
-   __DRIextension base;
-
-   int (*queryInteger)(__DRIscreen *screen, int attribute, unsigned int *val);
-   int (*queryString)(__DRIscreen *screen, int attribute, const char **val);
-};
-
 /**
  * Image Loader extension. Drivers use this to allocate color buffers
  */
diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build
index b68b734314d..49f639f9e12 100644
--- a/src/gallium/targets/dri/meson.build
+++ b/src/gallium/targets/dri/meson.build
@@ -38,6 +38,7 @@ libgallium_dri = shared_library(
     libgallium, libglapi, libpipe_loader_static, libws_null, libwsw, libswdri,
     libswkmsdri,
   ],
+  link_whole : [libdri],
   dependencies : [
     dep_selinux, dep_libdrm, dep_llvm, dep_thread, idep_xmlconfig, idep_mesautil,
     driver_swrast, driver_r300, driver_r600, driver_radeonsi, driver_nouveau,