diff --git a/cde/config/cf/linux.cf b/cde/config/cf/linux.cf
index 9cd893363..f55779e14 100644
--- a/cde/config/cf/linux.cf
+++ b/cde/config/cf/linux.cf
@@ -34,17 +34,29 @@ XCOMM platform:  $TOG: linux.cf /main/47 1998/04/17 11:32:51 mgreess $
     LinuxYggdrasil  (12)
 */
 #endif
+
+#ifndef DefaultLinuxCLibMajorVersion
+# define DefaultLinuxCLibMajorVersion    6
+#endif
+#ifndef DefaultLinuxCLibMinorVersion
+# define DefaultLinuxCLibMinorVersion    0
+#endif
+#ifndef DefaultLinuxCLibTeenyVersion
+# define DefaultLinuxCLibTeenyVersion    0
+#endif
+
 #ifndef LinuxCLibMajorVersion
-# define LinuxCLibMajorVersion   DefaultLinuxCLibMajorVersion
+# define LinuxCLibMajorVersion           DefaultLinuxCLibMajorVersion
 #endif
 #ifndef LinuxCLibMinorVersion
-# define LinuxCLibMinorVersion   DefaultLinuxCLibMinorVersion
+# define LinuxCLibMinorVersion           DefaultLinuxCLibMinorVersion
 #endif
 #ifndef LinuxCLibTeenyVersion
-# define LinuxCLibTeenyVersion   DefaultLinuxCLibTeenyVersion
+# define LinuxCLibTeenyVersion           DefaultLinuxCLibTeenyVersion
 #endif
+
 #ifndef LinuxBinUtilsMajorVersion
-# define LinuxBinUtilsMajorVersion	DefaultLinuxBinUtilsMajorVersion
+# define LinuxBinUtilsMajorVersion	 DefaultLinuxBinUtilsMajorVersion
 #endif
 
 XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
diff --git a/cde/lib/csa/xtclient.c b/cde/lib/csa/xtclient.c
index b42b5efc0..aff5b03ae 100644
--- a/cde/lib/csa/xtclient.c
+++ b/cde/lib/csa/xtclient.c
@@ -69,11 +69,8 @@ _DtCm_register_xtcallback(XtAppContext appct)
 		return;
 
 	/* assuming only 1 bit is set */
-#if defined(linux)
-	bits = fdset.__fds_bits;
-#else
 	bits = fdset.fds_bits;
-#endif
+
 	for (i = 0; i < FD_SETSIZE; i += NFDBITS) {
 		fmask = *bits;
 		for (j = 0; fmask != 0; j++, fmask >>= 1) {
diff --git a/cde/programs/dtspcd/spcd_event.c b/cde/programs/dtspcd/spcd_event.c
index 2a30c7fcc..01fdf28b1 100644
--- a/cde/programs/dtspcd/spcd_event.c
+++ b/cde/programs/dtspcd/spcd_event.c
@@ -86,13 +86,8 @@ void SPCD_MainLoopUntil(Boolean *flag)
   int result;
   do {
     for (n=0; n<fd_vec_size; n++) {
-#if defined(linux)
-      input_mask.__fds_bits[n] = Sb_Input_Mask.__fds_bits[n];
-      except_mask.__fds_bits[n] = Sb_Except_Mask.__fds_bits[n];
-#else
       input_mask.fds_bits[n] = Sb_Input_Mask.fds_bits[n];
       except_mask.fds_bits[n] = Sb_Except_Mask.fds_bits[n];
-#endif
     }
     
     do result=select(SPCD_max_fd + 1, FD_SET_CAST(&input_mask),