diff --git a/Xext/shm.c b/Xext/shm.c
index 2b3e153a7..5c67a0a71 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -356,9 +356,7 @@ ProcShmAttach(ClientPtr client)
         shmdesc = calloc(1, sizeof(ShmDescRec));
         if (!shmdesc)
             return BadAlloc;
-#ifdef SHM_FD_PASSING
         shmdesc->is_fd = FALSE;
-#endif
         shmdesc->addr = shmat(stuff->shmid, 0,
                               stuff->readOnly ? SHM_RDONLY : 0);
         if ((shmdesc->addr == ((char *) -1)) || SHMSTAT(stuff->shmid, &buf)) {
@@ -400,13 +398,11 @@ ShmDetachSegment(void *value, /* must conform to DeleteType */
 
     if (--shmdesc->refcnt)
         return TRUE;
-#if SHM_FD_PASSING
     if (shmdesc->is_fd) {
         if (shmdesc->busfault)
             busfault_unregister(shmdesc->busfault);
         munmap(shmdesc->addr, shmdesc->size);
     } else
-#endif
         shmdt(shmdesc->addr);
     for (prev = &Shmsegs; *prev != shmdesc; prev = &(*prev)->next);
     *prev = shmdesc->next;
@@ -1126,8 +1122,6 @@ ShmCreatePixmap(ClientPtr client, xShmCreatePixmapReq *stuff)
     return BadAlloc;
 }
 
-#ifdef SHM_FD_PASSING
-
 static void
 ShmBusfaultNotify(void *context)
 {
@@ -1332,7 +1326,6 @@ ProcShmCreateSegment(ClientPtr client)
 
     return X_SEND_REPLY_SIMPLE(client, reply);
 }
-#endif /* SHM_FD_PASSING */
 
 static int
 ProcShmDispatch(ClientPtr client)
@@ -1352,12 +1345,10 @@ ProcShmDispatch(ClientPtr client)
         return ProcShmGetImage(client);
     case X_ShmCreatePixmap:
         return ProcShmCreatePixmap(client);
-#ifdef SHM_FD_PASSING
     case X_ShmAttachFd:
         return ProcShmAttachFd(client);
     case X_ShmCreateSegment:
         return ProcShmCreateSegment(client);
-#endif
     default:
         return BadRequest;
     }
diff --git a/Xext/shmint.h b/Xext/shmint.h
index d7fda390a..11b7ae281 100644
--- a/Xext/shmint.h
+++ b/Xext/shmint.h
@@ -56,15 +56,7 @@ typedef struct _ShmFuncs {
     void (*PutImage) (XSHM_PUT_IMAGE_ARGS);
 } ShmFuncs, *ShmFuncsPtr;
 
-#if XTRANS_SEND_FDS
-#define SHM_FD_PASSING  1
-#endif
-
-#ifdef SHM_FD_PASSING
 #define SHMDESC_IS_FD(shmdesc)  ((shmdesc)->is_fd)
-#else
-#define SHMDESC_IS_FD(shmdesc)  (0)
-#endif
 
 _X_EXPORT void ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs);
 _X_EXPORT void ShmRegisterFbFuncs(ScreenPtr pScreen);
diff --git a/include/protocol-versions.h b/include/protocol-versions.h
index 7c52473cc..83d38829a 100644
--- a/include/protocol-versions.h
+++ b/include/protocol-versions.h
@@ -104,11 +104,7 @@
 
 /* SHM */
 #define SERVER_SHM_MAJOR_VERSION		1
-#if XTRANS_SEND_FDS
 #define SERVER_SHM_MINOR_VERSION		2
-#else
-#define SERVER_SHM_MINOR_VERSION		1
-#endif
 
 /* Sync */
 #define SERVER_SYNC_MAJOR_VERSION		3