diff --git a/include/xorg-config.h.meson.in b/hw/xfree86/xorg-config.h.meson.in
similarity index 100%
rename from include/xorg-config.h.meson.in
rename to hw/xfree86/xorg-config.h.meson.in
diff --git a/include/xorg-server.h.meson.in b/hw/xfree86/xorg-server.h.meson.in
similarity index 100%
rename from include/xorg-server.h.meson.in
rename to hw/xfree86/xorg-server.h.meson.in
diff --git a/include/meson.build b/include/meson.build
index 82f67eb118..110878dc9b 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -400,10 +400,6 @@ elif host_machine.system() == 'netbsd' or host_machine.system() == 'openbsd'
     endif
 endif
 
-configure_file(output : 'xorg-config.h',
-               input : 'xorg-config.h.meson.in',
-               configuration : xorg_data)
-
 xwin_data = configuration_data()
 xwin_data.set_quoted('DEFAULT_LOGDIR', log_dir)
 xwin_data.set('HAS_WINSOCK', host_machine.system() == 'windows' ? '1' : false,
diff --git a/meson.build b/meson.build
index f98a8cba89..69cef620b4 100644
--- a/meson.build
+++ b/meson.build
@@ -887,12 +887,16 @@ if build_docs or build_docs_devel
 endif
 
 # finally write config files. doing that very late, so other subdirs still
-# have a change to add config items
+# have a chance 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',
+               input : 'hw/xfree86/xorg-server.h.meson.in',
                configuration : conf_data,
                install: build_xorg,
                install_dir: xorgsdkdir)
+
+configure_file(output : 'xorg-config.h',
+               input : 'hw/xfree86/xorg-config.h.meson.in',
+               configuration : xorg_data)