diff --git a/src/egl/meson.build b/src/egl/meson.build
index 8ddde46d105..cee123e6a0c 100644
--- a/src/egl/meson.build
+++ b/src/egl/meson.build
@@ -86,6 +86,7 @@ if with_dri
   link_for_egl += libloader
   incs_for_egl += inc_loader
   incs_for_egl += inc_loader_x11
+  incs_for_egl += inc_loader_dri3
   incs_for_egl += inc_gallium
   incs_for_egl += inc_gallium_aux
   incs_for_egl += inc_mesa
diff --git a/src/glx/meson.build b/src/glx/meson.build
index 812521b5c3c..66e18ef59a4 100644
--- a/src/glx/meson.build
+++ b/src/glx/meson.build
@@ -115,7 +115,7 @@ endif
 libglx = static_library(
   'glx',
   [files_libglx, glx_generated],
-  include_directories : [inc_include, inc_src, inc_glapi, inc_loader, inc_loader_x11, inc_gallium],
+  include_directories : [inc_include, inc_src, inc_glapi, inc_loader, inc_loader_x11, inc_loader_dri3, inc_gallium],
   c_args : [
     '-DGL_LIB_NAME="lib@0@.so.@1@"'.format(gl_lib_name, gl_lib_version.split('.')[0]),
   ],
diff --git a/src/loader/meson.build b/src/loader/meson.build
index 0996763ee5a..41fc37d6c66 100644
--- a/src/loader/meson.build
+++ b/src/loader/meson.build
@@ -3,23 +3,6 @@
 
 inc_loader = include_directories('.')
 
-if with_platform_x11 and with_dri3
-  libloader_dri3_helper = static_library(
-    'loader_dri3_helper',
-    'loader_dri3_helper.c',
-    gnu_symbol_visibility : 'hidden',
-    include_directories : [inc_include, inc_src, inc_gallium],
-    dependencies : [
-      idep_mesautil,
-      dep_libdrm, dep_xcb_dri3, dep_xcb_present, dep_xcb_sync, dep_xshmfence,
-      dep_xcb_xfixes,
-    ],
-    build_by_default : false,
-  )
-else
-  libloader_dri3_helper = []
-endif
-
 if with_platform_wayland
   libloader_wayland_helper = static_library(
     'loader_wayland_helper',
diff --git a/src/loader/loader_dri3_helper.c b/src/loader_dri3/loader_dri3_helper.c
similarity index 100%
rename from src/loader/loader_dri3_helper.c
rename to src/loader_dri3/loader_dri3_helper.c
diff --git a/src/loader/loader_dri3_helper.h b/src/loader_dri3/loader_dri3_helper.h
similarity index 100%
rename from src/loader/loader_dri3_helper.h
rename to src/loader_dri3/loader_dri3_helper.h
diff --git a/src/loader_dri3/meson.build b/src/loader_dri3/meson.build
new file mode 100644
index 00000000000..45dee907160
--- /dev/null
+++ b/src/loader_dri3/meson.build
@@ -0,0 +1,21 @@
+# Copyright © 2017 Intel Corporation
+# SPDX-License-Identifier: MIT
+
+inc_loader_dri3 = include_directories('.')
+
+if with_platform_x11 and with_dri3
+  libloader_dri3_helper = static_library(
+    'loader_dri3_helper',
+    'loader_dri3_helper.c',
+    gnu_symbol_visibility : 'hidden',
+    include_directories : [inc_include, inc_src, inc_loader, inc_gallium],
+    dependencies : [
+      idep_mesautil,
+      dep_libdrm, dep_xcb_dri3, dep_xcb_present, dep_xcb_sync, dep_xshmfence,
+      dep_xcb_xfixes,
+    ],
+    build_by_default : false,
+  )
+else
+  libloader_dri3_helper = []
+endif
diff --git a/src/meson.build b/src/meson.build
index 23d32c41a04..89d614890ca 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -113,6 +113,11 @@ if with_gallium
   if with_tests and with_shared_glapi
     subdir('mesa/state_tracker/tests')
   endif
+  if with_dri
+    if with_gallium or with_gbm or with_platform_wayland
+      subdir('loader_dri3')
+    endif
+  endif
 endif
 if with_glx == 'dri'
   subdir('glx')