diff --git a/Xext/meson.build b/Xext/meson.build
index 7727e207e..0600fe98b 100644
--- a/Xext/meson.build
+++ b/Xext/meson.build
@@ -74,4 +74,6 @@ libxserver_xext_vidmode = static_library('libxserver_xext_vidmode',
     dependencies: common_dep,
 )
 
-install_data(hdrs_xext, install_dir: xorgsdkdir)
+if build_xorg
+    install_data(hdrs_xext, install_dir: xorgsdkdir)
+endif
diff --git a/composite/meson.build b/composite/meson.build
index 7547f0e7e..4f3303e20 100644
--- a/composite/meson.build
+++ b/composite/meson.build
@@ -16,4 +16,6 @@ libxserver_composite = static_library('libxserver_composite',
 	dependencies: common_dep,
 )
 
-install_data(hdrs_composite, install_dir: xorgsdkdir)
+if build_xorg
+    install_data(hdrs_composite, install_dir: xorgsdkdir)
+endif
diff --git a/dbe/meson.build b/dbe/meson.build
index 76a2d3f85..2aa595aa3 100644
--- a/dbe/meson.build
+++ b/dbe/meson.build
@@ -13,4 +13,6 @@ libxserver_dbe = static_library('libxserver_dbe',
 	dependencies: common_dep,
 )
 
-install_data(hdrs_dbe, install_dir: xorgsdkdir)
+if build_xorg
+    install_data(hdrs_dbe, install_dir: xorgsdkdir)
+endif
diff --git a/dri3/meson.build b/dri3/meson.build
index d446fdda7..91bd68d87 100644
--- a/dri3/meson.build
+++ b/dri3/meson.build
@@ -17,4 +17,6 @@ if build_dri3
         )
 endif
 
-install_data(hdrs_dri3, install_dir: xorgsdkdir)
+if build_xorg
+    install_data(hdrs_dri3, install_dir: xorgsdkdir)
+endif
diff --git a/fb/meson.build b/fb/meson.build
index 477ab047d..1d8d259a1 100644
--- a/fb/meson.build
+++ b/fb/meson.build
@@ -54,4 +54,6 @@ libxserver_wfb = static_library('libxserver_wfb',
 	build_by_default: false,
 )
 
-install_data(hdrs_fb, install_dir: xorgsdkdir)
+if build_xorg
+    install_data(hdrs_fb, install_dir: xorgsdkdir)
+endif
diff --git a/glx/meson.build b/glx/meson.build
index 292e7a59d..2ec00ce22 100644
--- a/glx/meson.build
+++ b/glx/meson.build
@@ -79,5 +79,7 @@ if build_glx
         ],
     )
 
-    install_data(hdrs_vnd, install_dir : xorgsdkdir)
+    if build_xorg
+        install_data(hdrs_vnd, install_dir : xorgsdkdir)
+    endif
 endif
diff --git a/include/meson.build b/include/meson.build
index 14f2be777..f764f1547 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -318,6 +318,7 @@ configure_file(output : 'dix-config.h',
 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()
diff --git a/meson.build b/meson.build
index 46b76b182..6cba5bb5d 100644
--- a/meson.build
+++ b/meson.build
@@ -819,7 +819,7 @@ if build_xorg
                                 get_option('libdir'),
                                 'pkgconfig'),
     )
-endif
 
-install_data('xorg-server.m4',
-             install_dir: join_paths(get_option('datadir'), 'aclocal'))
+    install_data('xorg-server.m4',
+                 install_dir: join_paths(get_option('datadir'), 'aclocal'))
+endif
diff --git a/mi/meson.build b/mi/meson.build
index 73b196ad0..9f97d149c 100644
--- a/mi/meson.build
+++ b/mi/meson.build
@@ -51,4 +51,6 @@ libxserver_mi = static_library('libxserver_mi',
     ],
 )
 
-install_data(hdrs_mi, install_dir: xorgsdkdir)
+if build_xorg
+    install_data(hdrs_mi, install_dir: xorgsdkdir)
+endif
diff --git a/miext/damage/meson.build b/miext/damage/meson.build
index 1f6032c68..c7ec10938 100644
--- a/miext/damage/meson.build
+++ b/miext/damage/meson.build
@@ -13,4 +13,6 @@ libxserver_miext_damage = static_library('libxserver_miext_damage',
 	dependencies: common_dep,
 )
 
-install_data(hdrs_miext_damage, install_dir: xorgsdkdir)
+if build_xorg
+    install_data(hdrs_miext_damage, install_dir: xorgsdkdir)
+endif
diff --git a/miext/shadow/meson.build b/miext/shadow/meson.build
index 7230df635..f91accd69 100644
--- a/miext/shadow/meson.build
+++ b/miext/shadow/meson.build
@@ -35,4 +35,6 @@ libxserver_miext_shadow = static_library('libxserver_miext_shadow',
     dependencies: common_dep,
 )
 
-install_data(hdrs_miext_shadow, install_dir: xorgsdkdir)
+if build_xorg
+    install_data(hdrs_miext_shadow, install_dir: xorgsdkdir)
+endif
diff --git a/miext/sync/meson.build b/miext/sync/meson.build
index 182a4aef4..0892fd807 100644
--- a/miext/sync/meson.build
+++ b/miext/sync/meson.build
@@ -23,4 +23,6 @@ libxserver_miext_sync = static_library('libxserver_miext_sync',
     ],
 )
 
-install_data(hdrs_miext_sync, install_dir: xorgsdkdir)
+if build_xorg
+    install_data(hdrs_miext_sync, install_dir: xorgsdkdir)
+endif
diff --git a/present/meson.build b/present/meson.build
index 026ccf90a..aa7ce86ff 100644
--- a/present/meson.build
+++ b/present/meson.build
@@ -26,4 +26,6 @@ libxserver_present = static_library('libxserver_present',
     ],
 )
 
-install_data(hdrs_present, install_dir: xorgsdkdir)
+if build_xorg
+    install_data(hdrs_present, install_dir: xorgsdkdir)
+endif
diff --git a/randr/meson.build b/randr/meson.build
index 7090dde60..9bd751bf2 100644
--- a/randr/meson.build
+++ b/randr/meson.build
@@ -31,4 +31,6 @@ libxserver_randr = static_library('libxserver_randr',
     dependencies: common_dep,
 )
 
-install_data(hdrs_randr, install_dir: xorgsdkdir)
+if build_xorg
+    install_data(hdrs_randr, install_dir: xorgsdkdir)
+endif
diff --git a/render/meson.build b/render/meson.build
index cbd64741c..b95b082b3 100644
--- a/render/meson.build
+++ b/render/meson.build
@@ -25,4 +25,6 @@ libxserver_render = static_library('libxserver_render',
     dependencies: common_dep,
 )
 
-install_data(hdrs_render, install_dir: xorgsdkdir)
+if build_xorg
+    install_data(hdrs_render, install_dir: xorgsdkdir)
+endif