diff --git a/gdk/meson.build b/gdk/meson.build
index 973ead6bf4..0f8e4fd593 100644
--- a/gdk/meson.build
+++ b/gdk/meson.build
@@ -85,76 +85,6 @@ gdk_private_h_sources = files([
   'gdkseatdefaultprivate.h',
 ])
 
-gdk_x_sources = files([
-  'x11/MwmUtil.h',
-  'x11/gdkapplaunchcontext-x11.c',
-  'x11/gdkasync.c',
-  'x11/gdkasync.h',
-  'x11/gdkcursor-x11.c',
-  'x11/gdkdevice-core-x11.c',
-  'x11/gdkdevice-xi2.c',
-  'x11/gdkdevicemanager-core-x11.c',
-  'x11/gdkdevicemanager-x11.c',
-  'x11/gdkdevicemanager-xi2.c',
-  'x11/gdkdisplay-x11.c',
-  'x11/gdkdisplay-x11.h',
-  'x11/gdkdisplaymanager-x11.c',
-  'x11/gdkdnd-x11.c',
-  'x11/gdkeventsource.c',
-  'x11/gdkeventsource.h',
-  'x11/gdkeventtranslator.c',
-  'x11/gdkeventtranslator.h',
-  'x11/gdkgeometry-x11.c',
-  'x11/gdkglcontext-x11.c',
-  'x11/gdkglcontext-x11.h',
-  'x11/gdkkeys-x11.c',
-  'x11/gdkmain-x11.c',
-  'x11/gdkmonitor-x11.c',
-  'x11/gdkmonitor-x11.h',
-  'x11/gdkproperty-x11.c',
-  'x11/gdkscreen-x11.c',
-  'x11/gdkscreen-x11.h',
-  'x11/gdkselection-x11.c',
-  'x11/gdkvisual-x11.c',
-  'x11/gdkvulkancontext-x11.c',
-  'x11/gdkwindow-x11.c',
-  'x11/gdkwindow-x11.h',
-  'x11/gdkx.h',
-  'x11/gdkx11monitor.h',
-  'x11/gdkxftdefaults.c',
-  'x11/gdkxid.c',
-  'x11/xsettings-client.c',
-  'x11/xsettings-client.h',
-])
-
-gdk_x_private_sources = files([
-  'x11/gdkdevicemanagerprivate-core.h',
-  'x11/gdkprivate-x11.h',
-])
-
-gdk_x_public_headers = files([
-  'x11/gdkx-autocleanups.h',
-  'x11/gdkx11applaunchcontext.h',
-  'x11/gdkx11cursor.h',
-  'x11/gdkx11device-core.h',
-  'x11/gdkx11device-xi2.h',
-  'x11/gdkx11device.h',
-  'x11/gdkx11devicemanager-core.h',
-  'x11/gdkx11devicemanager-xi2.h',
-  'x11/gdkx11devicemanager.h',
-  'x11/gdkx11display.h',
-  'x11/gdkx11displaymanager.h',
-  'x11/gdkx11dnd.h',
-  'x11/gdkx11glcontext.h',
-  'x11/gdkx11keys.h',
-  'x11/gdkx11monitor.h',
-  'x11/gdkx11property.h',
-  'x11/gdkx11screen.h',
-  'x11/gdkx11selection.h',
-  'x11/gdkx11utils.h',
-  'x11/gdkx11visual.h',
-  'x11/gdkx11window.h',
-])
 
 gdk_wayland_sources = files([
   'wayland/gdkapplaunchcontext-wayland.c',
@@ -325,23 +255,9 @@ if wayland_enabled or broadway_enabled
 endif
 
 if x11_enabled
-  gdk_deps += [
-    xrender_dep,
-    xi_dep,
-    xext_dep,
-    x11_dep,
-    xcursor_dep,
-    xdamage_dep,
-    xfixes_dep,
-    xcomposite_dep,
-    xrandr_dep
-  ]
-  gdk_sources += [
-    gdk_x_sources,
-    gdk_x_private_sources
-  ]
-
-  # install_headers(gdk_x_public_headers, subdir: 'gtk-3.0/gdk/x11/')
+  subdir('x11')
+  gdk_deps += gdk_x11_deps
+  gdk_sources += gdk_x11_sources
 endif
 
 if wayland_enabled
diff --git a/gdk/x11/meson.build b/gdk/x11/meson.build
new file mode 100644
index 0000000000..73af5a3279
--- /dev/null
+++ b/gdk/x11/meson.build
@@ -0,0 +1,67 @@
+# Note: gdksettings.c gets included from xsettings-client.c, do not add here
+gdk_x11_sources = files([
+  'gdkapplaunchcontext-x11.c',
+  'gdkasync.c',
+  'gdkcursor-x11.c',
+  'gdkdevice-core-x11.c',
+  'gdkdevice-xi2.c',
+  'gdkdevicemanager-core-x11.c',
+  'gdkdevicemanager-x11.c',
+  'gdkdevicemanager-xi2.c',
+  'gdkdisplay-x11.c',
+  'gdkdnd-x11.c',
+  'gdkeventsource.c',
+  'gdkeventtranslator.c',
+  'gdkgeometry-x11.c',
+  'gdkglcontext-x11.c',
+  'gdkkeys-x11.c',
+  'gdkmain-x11.c',
+  'gdkmonitor-x11.c',
+  'gdkproperty-x11.c',
+  'gdkscreen-x11.c',
+  'gdkselection-x11.c',
+  'gdkvisual-x11.c',
+  'gdkvulkancontext-x11.c',
+  'gdkwindow-x11.c',
+  'gdkxftdefaults.c',
+  'gdkxid.c',
+  'xsettings-client.c',
+])
+
+gdk_x11_public_headers = files([
+  'gdkx-autocleanups.h',
+  'gdkx11applaunchcontext.h',
+  'gdkx11cursor.h',
+  'gdkx11device-core.h',
+  'gdkx11device-xi2.h',
+  'gdkx11device.h',
+  'gdkx11devicemanager-core.h',
+  'gdkx11devicemanager-xi2.h',
+  'gdkx11devicemanager.h',
+  'gdkx11display.h',
+  'gdkx11dnd.h',
+  'gdkx11glcontext.h',
+  'gdkx11keys.h',
+  'gdkx11monitor.h',
+  'gdkx11property.h',
+  'gdkx11screen.h',
+  'gdkx11selection.h',
+  'gdkx11utils.h',
+  'gdkx11visual.h',
+  'gdkx11window.h',
+])
+
+install_headers(gdk_x11_public_headers, subdir: 'gtk-4.0/gdk/x11/')
+install_headers('gdkx.h', subdir: 'gtk-4.0/gdk/')
+
+gdk_x11_deps = [
+  xrender_dep,
+  xi_dep,
+  xext_dep,
+  x11_dep,
+  xcursor_dep,
+  xdamage_dep,
+  xfixes_dep,
+  xcomposite_dep,
+  xrandr_dep,
+]