2 files changed, 2 insertions, 7 deletions
diff --git a/xorg-server/Xext/shm.c b/xorg-server/Xext/shm.c
index c9d39b22e..227fe8c4f 100644
--- a/xorg-server/Xext/shm.c
+++ b/xorg-server/Xext/shm.c
@@ -57,6 +57,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xfuncproto.h>
 #include <sys/mman.h>
 #include "protocol-versions.h"
+#include "busfault.h"
 
 /* Needed for Solaris cross-zone shared memory extension */
 #ifdef HAVE_SHMCTL64
diff --git a/xorg-server/Xext/shmint.h b/xorg-server/Xext/shmint.h
index 21d6cc4ee..9dadea756 100644
--- a/xorg-server/Xext/shmint.h
+++ b/xorg-server/Xext/shmint.h
@@ -56,16 +56,10 @@ typedef struct _ShmFuncs {
     void (*PutImage) (XSHM_PUT_IMAGE_ARGS);
 } ShmFuncs, *ShmFuncsPtr;
 
-#include <protocol-versions.h>
-
-#if SERVER_SHM_MAJOR_VERSION == 1 && SERVER_SHM_MINOR_VERSION >= 2
+#if XTRANS_SEND_FDS
 #define SHM_FD_PASSING  1
 #endif
 
-#ifdef SHM_FD_PASSING
-#include "busfault.h"
-#endif
-
 typedef struct _ShmDesc {
     struct _ShmDesc *next;
     int shmid;