diff --git a/Xext/meson.build b/Xext/meson.build
index 387219799b..0eeacf87b7 100644
--- a/Xext/meson.build
+++ b/Xext/meson.build
@@ -61,12 +61,6 @@ libxserver_xext = static_library('xserver_xext',
     dependencies: common_dep,
 )
 
-libxserver_xext_vidmode = static_library('xserver_xext_vidmode',
-    'vidmode.c',
-    include_directories: inc,
-    dependencies: common_dep,
-)
-
 if build_xorg
     install_data(hdrs_xext, install_dir: xorgsdkdir)
 endif
diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
index 5b1e51dbdc..e2925e6a2d 100644
--- a/hw/xfree86/meson.build
+++ b/hw/xfree86/meson.build
@@ -42,6 +42,7 @@ subdir('modes')
 subdir('os-support')
 subdir('parser')
 subdir('ramdac')
+subdir('xext')
 subdir('xkb')
 
 srcs_xorg = [
diff --git a/hw/xfree86/xext/meson.build b/hw/xfree86/xext/meson.build
new file mode 100644
index 0000000000..5749037655
--- /dev/null
+++ b/hw/xfree86/xext/meson.build
@@ -0,0 +1,5 @@
+libxserver_xext_vidmode = static_library('xserver_xext_vidmode',
+    'vidmode.c',
+    include_directories: inc,
+    dependencies: common_dep,
+)
diff --git a/Xext/vidmode.c b/hw/xfree86/xext/vidmode.c
similarity index 100%
rename from Xext/vidmode.c
rename to hw/xfree86/xext/vidmode.c