diff --git a/hw/xfree86/modes/meson.build b/hw/xfree86/modes/meson.build
index 8a40018cae..050ea0e38d 100644
--- a/hw/xfree86/modes/meson.build
+++ b/hw/xfree86/modes/meson.build
@@ -18,12 +18,3 @@ xorg_modes = static_library('xorg_modes',
     dependencies: [ common_dep, libxcvt_dep ],
     c_args: xorg_c_args,
 )
-
-install_data(
-    [
-        'xf86Crtc.h',
-        'xf86Modes.h',
-        'xf86RandR12.h',
-    ],
-    install_dir: xorgsdkdir,
-)
diff --git a/include/meson.build b/include/meson.build
index ad3f4b0d02..59691bd6af 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -525,6 +525,9 @@ if build_xorg
             'xvmcext.h',
             'xserver-properties.h',
             'xlibre_ptrtypes.h',
+            'xf86Crtc.h',
+            'xf86Modes.h',
+            'xf86RandR12.h',
         ],
         install_dir: xorgsdkdir,
     )
diff --git a/hw/xfree86/modes/xf86Crtc.h b/include/xf86Crtc.h
similarity index 100%
rename from hw/xfree86/modes/xf86Crtc.h
rename to include/xf86Crtc.h
diff --git a/hw/xfree86/modes/xf86Modes.h b/include/xf86Modes.h
similarity index 100%
rename from hw/xfree86/modes/xf86Modes.h
rename to include/xf86Modes.h
diff --git a/hw/xfree86/modes/xf86RandR12.h b/include/xf86RandR12.h
similarity index 100%
rename from hw/xfree86/modes/xf86RandR12.h
rename to include/xf86RandR12.h