diff --git a/src/gfxstream/guest/GoldfishAddressSpace/meson.build b/src/gfxstream/guest/GoldfishAddressSpace/meson.build
index 27018a1118f..00cc7ccb7f0 100644
--- a/src/gfxstream/guest/GoldfishAddressSpace/meson.build
+++ b/src/gfxstream/guest/GoldfishAddressSpace/meson.build
@@ -21,5 +21,5 @@ lib_goldfish_address_space = static_library(
                          inc_aemu,
                          inc_src],
    link_with: [libplatform_virtgpu],
-   dependencies: drm_dep
+   dependencies: dep_libdrm
 )
diff --git a/src/gfxstream/guest/connection-manager/meson.build b/src/gfxstream/guest/connection-manager/meson.build
index ea2b7c69a03..9c094f18f35 100644
--- a/src/gfxstream/guest/connection-manager/meson.build
+++ b/src/gfxstream/guest/connection-manager/meson.build
@@ -19,5 +19,5 @@ libconnection_manager = static_library(
                          inc_platform_virtgpu, inc_src, inc_aemu],
    link_with: [lib_guest_iostream, lib_goldfish_address_space,
                libplatform_virtgpu],
-   dependencies: drm_dep
+   dependencies: dep_libdrm
 )
diff --git a/src/gfxstream/guest/meson.build b/src/gfxstream/guest/meson.build
index 7e2ce6ec8d0..9413b6a59aa 100644
--- a/src/gfxstream/guest/meson.build
+++ b/src/gfxstream/guest/meson.build
@@ -24,10 +24,6 @@ gfxstream_guest_args += '-DVK_GFXSTREAM_STRUCTURE_TYPE_EXT'
 # Dependencies  #
 #===============#
 
-dl_dep = cc.find_library('dl', required: false)
-drm_dep = dependency('libdrm')
-thread_dep = dependency('threads')
-
 with_kumquat = false
 virtgpu_kumquat_dep = dependency('virtgpu_kumquat_ffi', required: false)
 if virtgpu_kumquat_dep.found()
@@ -42,13 +38,6 @@ inc_include_mesa = include_directories('../../../include')
 inc_vulkan_headers = include_directories('../../../include/vulkan')
 inc_vulkan_enc = include_directories('vulkan_enc')
 
-#================#
-# Mesa compat    #
-#================#
-# dep_libdrm = drm_dep
-# dep_dl = dl_dep
-# dep_thread = thread_dep
-
 #================#
 # Subdirectories #
 #================#
diff --git a/src/gfxstream/guest/platform/linux/meson.build b/src/gfxstream/guest/platform/linux/meson.build
index 2f883cf339e..0da50ac25f8 100644
--- a/src/gfxstream/guest/platform/linux/meson.build
+++ b/src/gfxstream/guest/platform/linux/meson.build
@@ -13,5 +13,5 @@ libplatform_virtgpu_linux = static_library(
    files_libplatform_virtgpu_linux,
    cpp_args: gfxstream_guest_args,
    include_directories: [inc_platform_virtgpu, inc_src, inc_include],
-   dependencies: drm_dep,
+   dependencies: dep_libdrm,
 )
diff --git a/src/gfxstream/guest/vulkan/meson.build b/src/gfxstream/guest/vulkan/meson.build
index 77b926d3ea6..5c250f119d8 100644
--- a/src/gfxstream/guest/vulkan/meson.build
+++ b/src/gfxstream/guest/vulkan/meson.build
@@ -32,7 +32,7 @@ lib_vulkan_gfxstream = shared_library(
                libconnection_manager, libaemu],
    link_args: [vulkan_icd_link_args, ld_args_bsymbolic, ld_args_gc_sections],
    link_depends: vulkan_icd_link_depends,
-   dependencies: [dependency('libdrm'), idep_vulkan_wsi_headers,
+   dependencies: [dep_libdrm, idep_vulkan_wsi_headers,
                   idep_vulkan_lite_runtime, idep_vulkan_util_headers,
                   idep_vulkan_wsi, dep_valgrind],
    install: true,