diff --git a/gdk/meson.build b/gdk/meson.build
index 6fc851c7fe..61cf0a377c 100644
--- a/gdk/meson.build
+++ b/gdk/meson.build
@@ -332,7 +332,8 @@ if x11_enabled
     xcursor_dep,
     xdamage_dep,
     xfixes_dep,
-    xcomposite_dep
+    xcomposite_dep,
+    xrandr_dep
   ]
   gdk_sources += [
     gdk_x_sources,
diff --git a/gtk/meson.build b/gtk/meson.build
index 366d0dc30b..0a655ebdd2 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -2,7 +2,7 @@ subdir('deprecated')
 subdir('a11y')
 subdir('inspector')
 
-gtk_sources = [
+gtk_sources = files([
   'gtkactionmuxer.c',
   'gtkactionobserver.c',
   'gtkactionobservable.c',
@@ -368,15 +368,14 @@ gtk_sources = [
   'gtkwindowgroup.c',
   'gtkwin32theme.c',
   'fallback-c89.c'
-]
+])
 
-gtk_private_type_headers = [
+gtk_private_type_headers = files([
   'gtkcsstypesprivate.h',
   'gtktexthandleprivate.h',
-]
+])
 
-gtk_private_h_sources = files([
-  gtk_private_type_headers,
+gtk_private_h_sources = gtk_private_type_headers + files([
   'gtkrecentchooserutils.h',
   'gtkrbtree.h',
 ])
@@ -605,7 +604,7 @@ gtk_public_h_sources = files([
   'gtkwindowgroup.h',
 ])
 
-gtk_deprecated_type_headers = ([
+gtk_deprecated_type_headers = files([
   'deprecated/gtkactivatable.h',
   'deprecated/gtkaction.h',
   'deprecated/gtkactiongroup.h',
@@ -648,7 +647,7 @@ gtk_deprecated_type_headers = ([
   'deprecated/gtkvpaned.h',
 ])
 
-gtk_unix_sources = [
+gtk_unix_sources = files([
   'gtkcustompaperunixdialog.c',
   'gtkpagesetupunixdialog.c',
   'gtkprinter.c',
@@ -660,7 +659,7 @@ gtk_unix_sources = [
   'gtkprintunixdialog.c',
   'gtkprintbackend.c',
   'gtksearchenginetracker.c',
-]
+])
 
 gtkresources = gnome.compile_resources(
   'gtkresources',
@@ -670,25 +669,27 @@ gtkresources = gnome.compile_resources(
   extra_args: '--manual-register'
 )
 
-gtk_x11_sources = [
+gtk_x11_sources = files([
   'gtkplug.c',
   'gtksocket.c',
   'gtkxembed.c',
   'deprecated/gtktrayicon-x11.c',
   'gtkapplication-x11.c',
   'gtkmountoperation-x11.c',
-]
+])
 
-gtk_wayland_sources = [
+gtk_wayland_sources = files([
   'gtkapplication-wayland.c'
-]
+])
 
-dnd_sources = [
+dnd_sources = files([
   'gtkclipboard.c',
   'gtkdnd.c'
-]
+])
 
-gtk_use_wayland_or_x11_c_sources = ['gtkapplication-dbus.c']
+gtk_use_wayland_or_x11_c_sources = files([
+  'gtkapplication-dbus.c'
+])
 
 gtk_dbus_src = gnome.gdbus_codegen('gtkdbusgenerated', 'gtkdbusinterfaces.xml',
                                    interface_prefix: 'org.Gtk.',
@@ -766,8 +767,7 @@ gtkversion = configure_file(
   configuration: cdata
 )
 
-gtk_sources = [
-  gtk_sources,
+gtk_sources += [
   gtk_dbus_src,
   gtk_unix_sources,
   gtk_deprecated_c_sources,
@@ -776,32 +776,28 @@ gtk_sources = [
   a11y_sources,
   gtkresources,
   gtkmarshal_c,
-  gtkmarshal_h,
   gtkprivatetypebuiltins_c,
-  gtkprivatetypebuiltins_h,
   gtktypebuiltins_c,
-  gtktypebuiltins_h,
 ]
 
 gtk_deps = [
-    gmodule_dep,
-    giounix_dep,
-    glib_dep,
-    atkbridge_dep,
-    pangocairo_dep,
-    pangoft_dep,
-    pango_dep,
-    cairogobj_dep,
-    cairo_dep,
-    fontconfig_dep,
-    pixbuf_dep,
-    atk_dep,
-    epoxy_dep,
-    mlib,
-    libgdk_dep
+  gmodule_dep,
+  giounix_dep,
+  glib_dep,
+  atkbridge_dep,
+  pangocairo_dep,
+  pangoft_dep,
+  pango_dep,
+  cairogobj_dep,
+  cairo_dep,
+  fontconfig_dep,
+  pixbuf_dep,
+  atk_dep,
+  epoxy_dep,
+  mlib,
 ]
 
-# if x11_enabled
+if x11_enabled
   gtk_sources += [
     gtk_x11_sources,
     gtk_use_wayland_or_x11_c_sources
@@ -810,7 +806,7 @@ gtk_deps = [
     xi_dep,
     x11_dep,
   ]
-# endif
+endif
 
 if wayland_enabled
   gtk_sources += [
diff --git a/meson.build b/meson.build
index c39acc8db3..2c8a1dd63d 100644
--- a/meson.build
+++ b/meson.build
@@ -137,6 +137,7 @@ cdata.set('HAVE_XKB', 1)
 cdata.set('HAVE_XDAMAGE', 1)
 cdata.set('HAVE_XCURSOR', 1)
 cdata.set('HAVE_XGENERICEVENTS', 1)
+cdata.set('HAVE_RANDR', 1)
 
 confinc = include_directories('.')
 gdkinc = include_directories('gdk')
@@ -170,6 +171,7 @@ wlclientdep    = dependency('wayland-client')
 wlprotocolsdep = dependency('wayland-protocols', version: '>= 1.7')
 wlcursordep    = dependency('wayland-cursor')
 wlegldep       = dependency('wayland-egl')
+xrandr_dep     = dependency('xrandr')
 
 if giounix_dep.found()
   cdata.set('HAVE_GIO_UNIX', 1)
@@ -183,6 +185,6 @@ configure_file(
 
 subdir('gdk')
 subdir('gtk')
-subdir('demos')
+# subdir('demos')
 # subdir('tests')
 # subdir('testsuite')