diff --git a/hw/xfree86/common/meson.build b/hw/xfree86/common/meson.build
index 161e005f75..2970799ea4 100644
--- a/hw/xfree86/common/meson.build
+++ b/hw/xfree86/common/meson.build
@@ -25,25 +25,6 @@ srcs_xorg_common = [
     '../../stubs/ddxBeforeReset.c',
 ]
 
-xorg_sdk_headers = [
-    'compiler.h',
-    'xf86.h',
-    'xf86Module.h',
-    'xf86Opt.h',
-    'xf86Priv.h',
-    'xf86Privstr.h',
-    'xf86cmap.h',
-    'xf86fbman.h',
-    'xf86str.h',
-    'xf86Xinput.h',
-    'xisb.h',
-    'xorgVersion.h',
-    'xf86sbusBus.h',
-    'xf86Optionstr.h',
-    'xf86platformBus.h',
-    'xaarop.h',
-]
-
 fallback_driver = get_option('fallback_input_driver')
 if fallback_driver == 'auto'
     if host_machine.system() == 'linux'
@@ -55,12 +36,10 @@ endif
 
 if build_dga
     srcs_xorg_common += 'xf86DGA.c'
-    xorg_sdk_headers += 'dgaproc.h'
 endif
 
 if build_xv
     srcs_xorg_common += ['xf86xv.c', 'xf86xvmc.c']
-    xorg_sdk_headers += ['xf86xv.h', 'xf86xvmc.h']
 endif
 
 if build_udev
@@ -97,5 +76,3 @@ xorg_common = static_library('xorg_common',
         '-DFALLBACK_INPUT_DRIVER="@0@"'.format(fallback_driver)
     ],
 )
-
-install_data(xorg_sdk_headers, install_dir: xorgsdkdir)
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index acb9066365..f770ba6acf 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -52,6 +52,7 @@
 #include "config/hotplug_priv.h"
 #include "dix/input_priv.h"
 #include "dix/screenint_priv.h"
+#include "include/xorgVersion.h"
 #include "mi/mi_priv.h"
 #include "os/cmdline.h"
 #include "os/ddx_priv.h"
@@ -75,7 +76,6 @@
 #include "xf86_os_support.h"
 #include "xf86_OSlib.h"
 #include "xf86cmap.h"
-#include "xorgVersion.h"
 #include "mipointer.h"
 #include "xf86Extensions.h"
 #include "xf86DDC.h"
diff --git a/hw/xfree86/common/xorgHelper.c b/hw/xfree86/common/xorgHelper.c
index 4041d795c1..949bd71571 100644
--- a/hw/xfree86/common/xorgHelper.c
+++ b/hw/xfree86/common/xorgHelper.c
@@ -1,6 +1,9 @@
 #include <xorg-config.h>
 
 #include <X11/X.h>
+
+#include "include/xorgVersion.h"
+
 #include "os.h"
 #include "servermd.h"
 #include "pixmapstr.h"
@@ -10,7 +13,6 @@
 #include "loaderProcs.h"
 #include "xf86.h"
 #include "xf86Priv.h"
-#include "xorgVersion.h"
 
 CARD32
 xorgGetVersion(void)
diff --git a/hw/xfree86/drivers/input/inputtest/xf86-input-inputtest.c b/hw/xfree86/drivers/input/inputtest/xf86-input-inputtest.c
index d9880f97de..440b6d0dd9 100644
--- a/hw/xfree86/drivers/input/inputtest/xf86-input-inputtest.c
+++ b/hw/xfree86/drivers/input/inputtest/xf86-input-inputtest.c
@@ -26,20 +26,22 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/un.h>
+#include <stdbool.h>
+
+#include <X11/Xatom.h>
+
+#include "include/xorgVersion.h"
+
 #include <exevents.h>
 #include <input.h>
 #include <xkbsrv.h>
 #include <xf86.h>
 #include <xf86Xinput_priv.h>
-#include "xorgVersion.h"
 #include <xserver-properties.h>
 #include <os.h>
-#include <X11/Xatom.h>
-
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/un.h>
-#include <stdbool.h>
 
 #include "xf86-input-inputtest-protocol.h"
 
diff --git a/hw/xfree86/drivers/video/modesetting/driver.c b/hw/xfree86/drivers/video/modesetting/driver.c
index 140dad968b..63d1a555b7 100644
--- a/hw/xfree86/drivers/video/modesetting/driver.c
+++ b/hw/xfree86/drivers/video/modesetting/driver.c
@@ -43,6 +43,7 @@
 
 #include "config/hotplug_priv.h"
 #include "dix/dix_priv.h"
+#include "include/xorgVersion.h"
 #include "mi/mi_priv.h"
 
 #include "xf86.h"
diff --git a/hw/xwin/winerror.c b/hw/xwin/winerror.c
index 85d3046f8f..6623a3ae96 100644
--- a/hw/xwin/winerror.c
+++ b/hw/xwin/winerror.c
@@ -33,7 +33,7 @@
 #include "os/log_priv.h"
 #include "os/osdep.h"
 
-#include <../xfree86/common/xorgVersion.h>
+#include "include/xorgVersion.h"
 #include "win.h"
 
 #include "dix/input_priv.h"
diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c
index 315e1019d0..0637aeb5c7 100644
--- a/hw/xwin/winprocarg.c
+++ b/hw/xwin/winprocarg.c
@@ -36,7 +36,7 @@ from The Open Group.
 #include "os/osdep.h"
 #include "os/ddx_priv.h"
 
-#include <../xfree86/common/xorgVersion.h>
+#include "include/xorgVersion.h"
 #include "win.h"
 #include "winconfig.h"
 #include "winmsg.h"
diff --git a/hw/xfree86/common/compiler.h b/include/compiler.h
similarity index 100%
rename from hw/xfree86/common/compiler.h
rename to include/compiler.h
diff --git a/hw/xfree86/common/dgaproc.h b/include/dgaproc.h
similarity index 100%
rename from hw/xfree86/common/dgaproc.h
rename to include/dgaproc.h
diff --git a/include/meson.build b/include/meson.build
index b613461083..5bb5eda9fb 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -418,6 +418,7 @@ if build_xorg
             'closure.h',
             'colormap.h',
             'colormapst.h',
+            'compiler.h',
             'compositeext.h',
             'cursor.h',
             'cursorstr.h',
@@ -480,12 +481,35 @@ if build_xorg
             'vndserver.h',
             'window.h',
             'windowstr.h',
+            'xaarop.h',
+            'xf86.h',
+            'xf86cmap.h',
+            'xf86fbman.h',
+            'xf86Opt.h',
+            'xf86Optionstr.h',
+            'xf86platformBus.h',
+            'xf86Priv.h',
+            'xf86Privstr.h',
+            'xf86str.h',
+            'xf86Module.h',
+            'xf86Xinput.h',
+            'xisb.h',
             'xkbsrv.h',
             'xkbstr.h',
             'xkbrules.h',
+            'xorgVersion.h',
             'Xprintf.h',
+            'xf86sbusBus.h',
             'xserver-properties.h',
         ],
         install_dir: xorgsdkdir,
     )
+
+    if build_dga
+        install_data(['dgaproc.h'], install_dir: xorgsdkdir)
+    endif
+
+    if build_xv
+        install_data(['xf86xv.h', 'xf86xvmc.h'], install_dir: xorgsdkdir)
+    endif
 endif
diff --git a/hw/xfree86/common/xaarop.h b/include/xaarop.h
similarity index 100%
rename from hw/xfree86/common/xaarop.h
rename to include/xaarop.h
diff --git a/hw/xfree86/common/xf86.h b/include/xf86.h
similarity index 100%
rename from hw/xfree86/common/xf86.h
rename to include/xf86.h
diff --git a/hw/xfree86/common/xf86Module.h b/include/xf86Module.h
similarity index 100%
rename from hw/xfree86/common/xf86Module.h
rename to include/xf86Module.h
diff --git a/hw/xfree86/common/xf86Opt.h b/include/xf86Opt.h
similarity index 100%
rename from hw/xfree86/common/xf86Opt.h
rename to include/xf86Opt.h
diff --git a/hw/xfree86/common/xf86Optionstr.h b/include/xf86Optionstr.h
similarity index 100%
rename from hw/xfree86/common/xf86Optionstr.h
rename to include/xf86Optionstr.h
diff --git a/hw/xfree86/common/xf86Priv.h b/include/xf86Priv.h
similarity index 100%
rename from hw/xfree86/common/xf86Priv.h
rename to include/xf86Priv.h
diff --git a/hw/xfree86/common/xf86Privstr.h b/include/xf86Privstr.h
similarity index 100%
rename from hw/xfree86/common/xf86Privstr.h
rename to include/xf86Privstr.h
diff --git a/hw/xfree86/common/xf86Xinput.h b/include/xf86Xinput.h
similarity index 100%
rename from hw/xfree86/common/xf86Xinput.h
rename to include/xf86Xinput.h
diff --git a/hw/xfree86/common/xf86cmap.h b/include/xf86cmap.h
similarity index 100%
rename from hw/xfree86/common/xf86cmap.h
rename to include/xf86cmap.h
diff --git a/hw/xfree86/common/xf86fbman.h b/include/xf86fbman.h
similarity index 100%
rename from hw/xfree86/common/xf86fbman.h
rename to include/xf86fbman.h
diff --git a/hw/xfree86/common/xf86platformBus.h b/include/xf86platformBus.h
similarity index 100%
rename from hw/xfree86/common/xf86platformBus.h
rename to include/xf86platformBus.h
diff --git a/hw/xfree86/common/xf86sbusBus.h b/include/xf86sbusBus.h
similarity index 100%
rename from hw/xfree86/common/xf86sbusBus.h
rename to include/xf86sbusBus.h
diff --git a/hw/xfree86/common/xf86str.h b/include/xf86str.h
similarity index 100%
rename from hw/xfree86/common/xf86str.h
rename to include/xf86str.h
diff --git a/hw/xfree86/common/xf86xv.h b/include/xf86xv.h
similarity index 100%
rename from hw/xfree86/common/xf86xv.h
rename to include/xf86xv.h
diff --git a/hw/xfree86/common/xf86xvmc.h b/include/xf86xvmc.h
similarity index 100%
rename from hw/xfree86/common/xf86xvmc.h
rename to include/xf86xvmc.h
diff --git a/hw/xfree86/common/xisb.h b/include/xisb.h
similarity index 100%
rename from hw/xfree86/common/xisb.h
rename to include/xisb.h
diff --git a/hw/xfree86/common/xorgVersion.h b/include/xorgVersion.h
similarity index 100%
rename from hw/xfree86/common/xorgVersion.h
rename to include/xorgVersion.h
diff --git a/meson.build b/meson.build
index ffeeaa3f32..0b26eef318 100644
--- a/meson.build
+++ b/meson.build
@@ -840,28 +840,28 @@ if build_xorg
     sdkconfig.set('abi_ansic',
         run_command(awk, '-F', '[(,)]',
                     '/^#define ABI_ANSIC.*SET/ { printf "%d.%d", $2, $3 }',
-                    files('hw/xfree86/common/xf86Module.h'),
+                    files('include/xf86Module.h'),
                     check: false
         ).stdout()
     )
     sdkconfig.set('abi_videodrv',
         run_command(awk, '-F', '[(,)]',
                     '/^#define ABI_VIDEODRV.*SET/ { printf "%d.%d", $2, $3 }',
-                    files('hw/xfree86/common/xf86Module.h'),
+                    files('include/xf86Module.h'),
                     check: false
         ).stdout()
     )
     sdkconfig.set('abi_xinput',
         run_command(awk, '-F', '[(,)]',
                     '/^#define ABI_XINPUT.*SET/ { printf "%d.%d", $2, $3 }',
-                    files('hw/xfree86/common/xf86Module.h'),
+                    files('include/xf86Module.h'),
                     check: false
         ).stdout()
     )
     sdkconfig.set('abi_extension',
         run_command(awk, '-F', '[(,)]',
                     '/^#define ABI_EXTENSION.*SET/ { printf "%d.%d", $2, $3 }',
-                    files('hw/xfree86/common/xf86Module.h'),
+                    files('include/xf86Module.h'),
                     check: false
         ).stdout()
     )