diff --git a/meson.build b/meson.build
index 2752bc04561..622406a7747 100644
--- a/meson.build
+++ b/meson.build
@@ -288,6 +288,8 @@ if freedreno_kmds.length() != 0 and freedreno_kmds != [ 'msm' ] and with_freedre
 endif
 
 with_vdrm = [
+  with_gallium_virgl,
+  with_virtio_vk,
   with_amdgpu_virtio,
   freedreno_kmds.contains('virtio'),
   with_gallium_asahi,
diff --git a/src/meson.build b/src/meson.build
index 8e03d47bce3..9053d5d3d8f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -70,8 +70,11 @@ endif
 if with_any_intel
   subdir('intel')
 endif
-if with_vdrm or with_gallium_virgl or with_virtio_vk
-  subdir('virtio')
+if with_virtio_vk
+  subdir('virtio/vulkan')
+endif
+if with_vdrm
+  subdir('virtio/vdrm')
 endif
 if with_gallium_radeonsi or with_amd_vk or with_gallium_r300 or with_gallium_r600
   subdir('amd')
diff --git a/src/virtio/meson.build b/src/virtio/meson.build
deleted file mode 100644
index d7a5deba2b1..00000000000
--- a/src/virtio/meson.build
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright © 2017 Intel Corporation
-# SPDX-License-Identifier: MIT
-
-inc_virtio_vdrm = include_directories('./vdrm')
-
-if with_virtio_vk
-  subdir('vulkan')
-endif
-subdir('vdrm')
diff --git a/src/virtio/vdrm/meson.build b/src/virtio/vdrm/meson.build
index 7ad572a8519..e3d4e9d5aba 100644
--- a/src/virtio/vdrm/meson.build
+++ b/src/virtio/vdrm/meson.build
@@ -1,6 +1,8 @@
 # Copyright 2023 Google LLC
 # SPDX-License-Identifier: MIT
 
+inc_virtio_vdrm = include_directories('.')
+
 libvdrm = static_library(
   'libvdrm',
   [