diff --git a/meson.build b/meson.build
index a3724a16551..ae596676b84 100644
--- a/meson.build
+++ b/meson.build
@@ -1689,6 +1689,13 @@ if dep_libdrm.found()
   endif
 endif
 
+if with_dri
+  pre_args += '-DHAVE_PIPE_LOADER_DRI'
+endif
+if with_gallium_drisw_kms
+  pre_args += '-DHAVE_PIPE_LOADER_KMS'
+endif
+
 dep_libudev = dependency('libudev', required : false)
 if dep_libudev.found()
   pre_args += '-DHAVE_LIBUDEV'
diff --git a/src/gallium/auxiliary/pipe-loader/meson.build b/src/gallium/auxiliary/pipe-loader/meson.build
index 988947195ec..1c768e73b62 100644
--- a/src/gallium/auxiliary/pipe-loader/meson.build
+++ b/src/gallium/auxiliary/pipe-loader/meson.build
@@ -33,12 +33,6 @@ if dep_libdrm.found()
   files_pipe_loader += files('pipe_loader_drm.c')
   libpipe_loader_links += libloader
 endif
-if with_dri
-  libpipe_loader_defines += '-DHAVE_PIPE_LOADER_DRI'
-endif
-if with_gallium_drisw_kms
-  libpipe_loader_defines += '-DHAVE_PIPE_LOADER_KMS'
-endif
 
 libpipe_loader_static = static_library(
   'pipe_loader_static',
diff --git a/src/gallium/targets/pipe-loader/meson.build b/src/gallium/targets/pipe-loader/meson.build
index 291c4844906..59484ae8a65 100644
--- a/src/gallium/targets/pipe-loader/meson.build
+++ b/src/gallium/targets/pipe-loader/meson.build
@@ -67,7 +67,7 @@ pipe_loaders = [
   [with_gallium_freedreno, 'msm', driver_freedreno, []],
   [with_gallium_kmsro, 'kmsro', _kmsro_targets, []],
   [with_gallium_svga, 'vmwgfx', driver_svga, []],
-  [with_gallium_softpipe, 'swrast', driver_swrast, [libwsw, libws_null]],
+  [with_gallium_softpipe, 'swrast', driver_swrast, [libwsw, libws_null, libswdri, libswkmsdri]],
 ]
 
 foreach x : pipe_loaders