diff --git a/hw/xwin/meson.build b/hw/xwin/meson.build
index 1161c9dda..7c2ec792e 100644
--- a/hw/xwin/meson.build
+++ b/hw/xwin/meson.build
@@ -105,7 +105,7 @@ srcs_windows += [
 
 rsrc = windows.compile_resources(
      'XWin.rc',
-     include_directories: include_directories('../../include/'),
+     include_directories: include_directories('../../include/', '../..'),
      depend_files: ['XWin.exe.manifest', 'X.ico'],
 )
 srcs_windows += rsrc
diff --git a/include/meson.build b/include/meson.build
index aa8009388..74f925792 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -332,15 +332,6 @@ conf_data.set('XSERVER_LIBPCIACCESS', get_option('pciaccess') ? '1' : false)
 conf_data.set('XSERVER_PLATFORM_BUS', build_udev_kms ? '1' : false)
 conf_data.set('XSERVER_SCREEN_VRR', '1')
 
-configure_file(output : 'dix-config.h',
-               configuration : conf_data)
-
-configure_file(output : 'xorg-server.h',
-               input : 'xorg-server.h.meson.in',
-               configuration : conf_data,
-               install: build_xorg,
-               install_dir: xorgsdkdir)
-
 version_data = configuration_data()
 version_data.set('VENDOR_RELEASE', '@0@'.format(release))
 version_data.set_quoted('VENDOR_NAME', get_option('vendor_name'))
diff --git a/meson.build b/meson.build
index 9d6e09c19..44cd930c4 100644
--- a/meson.build
+++ b/meson.build
@@ -891,3 +891,14 @@ if build_docs or build_docs_devel
         configuration: docxmlconfig
     )
 endif
+
+# finally write config files. doing that very late, so other subdirs still
+# have a change to add config items
+configure_file(output : 'dix-config.h',
+               configuration : conf_data)
+
+configure_file(output : 'xorg-server.h',
+               input : 'include/xorg-server.h.meson.in',
+               configuration : conf_data,
+               install: build_xorg,
+               install_dir: xorgsdkdir)