diff --git a/hw/xfree86/os-support/meson.build b/hw/xfree86/os-support/meson.build
index 18bcc8df6b..db2253165c 100644
--- a/hw/xfree86/os-support/meson.build
+++ b/hw/xfree86/os-support/meson.build
@@ -5,12 +5,6 @@ srcs_xorg_os_support = [
     'shared/vidmem.c',
 ]
 
-hdrs_xorg_os_support = [
-    'bus/xf86Pci.h',
-    'xf86_OSlib.h',
-    'xf86_OSproc.h'
-]
-
 os_dep = []
 os_c_args = []
 
@@ -18,7 +12,6 @@ if get_option('pciaccess')
     srcs_xorg_os_support += 'bus/Pci.c'
     if host_machine.cpu_family() in ['sparc', 'sparc64']
         srcs_xorg_os_support += 'bus/Sbus.c'
-        install_data('bus/xf86Sbus.h', install_dir: xorgsdkdir)
     endif
 endif
 
@@ -178,5 +171,3 @@ xorg_os_support = static_library('xorg_os_support',
     ],
     c_args: xorg_c_args + os_c_args,
 )
-
-install_data(hdrs_xorg_os_support, install_dir: xorgsdkdir)
diff --git a/include/meson.build b/include/meson.build
index 55e4d492ab..8ff4bbd0fe 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -519,6 +519,10 @@ if build_xorg
             'xf86Module.h',
             'xf86Xinput.h',
             'xf86sbusBus.h',
+            'xf86Sbus.h',
+            'xf86Pci.h',
+            'xf86_OSlib.h',
+            'xf86_OSproc.h',
             'xisb.h',
             'xkbsrv.h',
             'xkbstr.h',
@@ -547,4 +551,9 @@ if build_xorg
     if build_mitshm
         install_data(['shmint.h'], install_dir: xorgsdkdir)
     endif
+
+    if get_option('pciaccess') and host_machine.cpu_family() in ['sparc', 'sparc64']
+        install_data('xf86Sbus.h', install_dir: xorgsdkdir)
+    endif
+
 endif
diff --git a/hw/xfree86/os-support/bus/xf86Pci.h b/include/xf86Pci.h
similarity index 100%
rename from hw/xfree86/os-support/bus/xf86Pci.h
rename to include/xf86Pci.h
diff --git a/hw/xfree86/os-support/bus/xf86Sbus.h b/include/xf86Sbus.h
similarity index 100%
rename from hw/xfree86/os-support/bus/xf86Sbus.h
rename to include/xf86Sbus.h
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/include/xf86_OSlib.h
similarity index 100%
rename from hw/xfree86/os-support/xf86_OSlib.h
rename to include/xf86_OSlib.h
diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/include/xf86_OSproc.h
similarity index 100%
rename from hw/xfree86/os-support/xf86_OSproc.h
rename to include/xf86_OSproc.h