diff --git a/Xext/meson.build b/Xext/meson.build
index 963b4ac91c..09e7d95b64 100644
--- a/Xext/meson.build
+++ b/Xext/meson.build
@@ -13,9 +13,6 @@ if build_dpms
     srcs_xext += 'dpms/dpms.c'
 endif
 
-if build_mitshm
-    srcs_xext += 'shm.c'
-endif
 
 if build_hashtable
     srcs_xext += 'hashtable.c'
@@ -70,3 +67,4 @@ endif
 subdir('randr')
 subdir('record')
 subdir('glx')
+subdir('shm')
diff --git a/Xext/shm/meson.build b/Xext/shm/meson.build
new file mode 100644
index 0000000000..4d90b65113
--- /dev/null
+++ b/Xext/shm/meson.build
@@ -0,0 +1,12 @@
+srcs_shm = [
+    'shm.c',
+]
+
+libxserver_shm = []
+if build_mitshm
+    libxserver_shm = static_library('xserver_shm',
+        srcs_shm,
+        include_directories: inc,
+        dependencies: common_dep,
+    )
+endif
diff --git a/Xext/shm.c b/Xext/shm/shm.c
similarity index 99%
rename from Xext/shm.c
rename to Xext/shm/shm.c
index 525ab4df79..15e40c3cde 100644
--- a/Xext/shm.c
+++ b/Xext/shm/shm.c
@@ -57,7 +57,7 @@ in this Software without prior written authorization from The Open Group.
 #include "os/osdep.h"
 #include "Xext/panoramiX/panoramiX.h"
 #include "Xext/panoramiX/panoramiXsrv.h"
-#include "Xext/shm_priv.h"
+#include "shm_priv.h"
 
 #include "misc.h"
 #include "os.h"
diff --git a/Xext/shm_priv.h b/Xext/shm/shm_priv.h
similarity index 100%
rename from Xext/shm_priv.h
rename to Xext/shm/shm_priv.h
diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c
index 935d7b1258..d2b0f42e05 100644
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -39,7 +39,7 @@ SOFTWARE.
 #include "include/xvmcext.h"
 #include "Xext/panoramiX/panoramiX.h"
 #include "Xext/panoramiX/panoramiXsrv.h"
-#include "Xext/shm_priv.h"
+#include "Xext/shm/shm_priv.h"
 #include "Xext/xvdix_priv.h"
 
 #include "misc.h"
diff --git a/meson.build b/meson.build
index 7548d859d0..b89fbfaa4d 100644
--- a/meson.build
+++ b/meson.build
@@ -819,7 +819,8 @@ if build_xserver
         libxserver_dri2,
         libxserver_dri3,
         libxserver_xinerama,
-        libxserver_xf86bigfont
+        libxserver_xf86bigfont,
+        libxserver_shm
     ]
 
     if build_xselinux