diff --git a/os/Xtrans.c b/os/Xtrans.c
index 617084165..eb347516e 100644
--- a/os/Xtrans.c
+++ b/os/Xtrans.c
@@ -342,7 +342,7 @@ TRANS(ParseAddress) (const char *address,
 
     _port = mybuf;
 
-#if defined(FONT_t) || defined(FS_t)
+#if defined(FS_t)
     /*
      * Is there an optional catalogue list?
      */
diff --git a/os/Xtrans.h b/os/Xtrans.h
index 4f84a6d1b..b383fb231 100644
--- a/os/Xtrans.h
+++ b/os/Xtrans.h
@@ -97,13 +97,6 @@ static const char *__xtransname = "_FSTrans";
 #endif
 #endif /* FS_t */
 
-#ifdef FONT_t
-#define TRANS(func) _FontTrans##func
-#ifdef XTRANSDEBUG
-static const char *__xtransname = "_FontTrans";
-#endif
-#endif /* FONT_t */
-
 #if !defined(TRANS)
 #define TRANS(func) _XTrans##func
 #ifdef XTRANSDEBUG
diff --git a/os/Xtranslcl.c b/os/Xtranslcl.c
index e6ee5fc04..9defc902b 100644
--- a/os/Xtranslcl.c
+++ b/os/Xtranslcl.c
@@ -223,7 +223,7 @@ TRANS(FillAddrInfo)(XtransConnInfo ciptr,
 #if defined(XIM_t)
 #define NAMEDNODENAME "/tmp/.XIM-pipe/XIM"
 #endif
-#if defined(FS_t) || defined (FONT_t)
+#if defined(FS_t)
 #define NAMEDNODENAME	"/tmp/.font-pipe/fs"
 #endif
 
diff --git a/os/Xtranssock.c b/os/Xtranssock.c
index a89f67335..28857d137 100644
--- a/os/Xtranssock.c
+++ b/os/Xtranssock.c
@@ -238,10 +238,10 @@ is_numeric (const char *str)
 #define UNIX_PATH "/tmp/.XIM-unix/XIM"
 #define UNIX_DIR "/tmp/.XIM-unix"
 #endif /* XIM_t */
-#if defined(FS_t) || defined(FONT_t)
+#if defined(FS_t)
 #define UNIX_PATH "/tmp/.font-unix/fs"
 #define UNIX_DIR "/tmp/.font-unix"
-#endif /* FS_t || FONT_t */
+#endif /* FS_t */
 
 #endif /* UNIXCONN */
 
@@ -400,7 +400,7 @@ TRANS(SocketOpen) (int i, int type)
                        Sockettrans2devtab[i].protocol);
 
 #ifndef WIN32
-#if (defined(X11_t) && !defined(USE_POLL)) || defined(FS_t) || defined(FONT_t)
+#if (defined(X11_t) && !defined(USE_POLL)) || defined(FS_t)
     if (ciptr->fd >= sysconf(_SC_OPEN_MAX))
     {
 	prmsg (2, "SocketOpen: socket() returned out of range fd %d\n",