5 files changed, 2 insertions, 14 deletions
diff --git a/nx-X11/lib/X11/ConnDis.c b/nx-X11/lib/X11/ConnDis.c
index 660b67645..dfc0227fe 100644
--- a/nx-X11/lib/X11/ConnDis.c
+++ b/nx-X11/lib/X11/ConnDis.c
@@ -67,12 +67,8 @@ in this Software without prior written authorization from The Open Group.
 #include <unistd.h>
 
 #if !defined(WIN32)
-#ifndef Lynx
 #include <sys/socket.h>
 #else
-#include <socket.h>
-#endif
-#else
 #include <nx-X11/Xwindows.h>
 #endif
 
diff --git a/nx-X11/lib/X11/ImUtil.c b/nx-X11/lib/X11/ImUtil.c
index b0d421680..79ba80ecc 100644
--- a/nx-X11/lib/X11/ImUtil.c
+++ b/nx-X11/lib/X11/ImUtil.c
@@ -238,10 +238,6 @@ static void _putbits(
  *
  */
 
-#if defined(Lynx) && defined(ROUNDUP)
-#undef ROUNDUP
-#endif
-
 #define ROUNDUP(nbytes, pad) ((((nbytes) + ((pad)-1)) / (pad)) * ((pad)>>3))
 
 #define XYNORMALIZE(bp, img) \
diff --git a/nx-X11/lib/X11/PutImage.c b/nx-X11/lib/X11/PutImage.c
index de085bcde..daf172cf0 100644
--- a/nx-X11/lib/X11/PutImage.c
+++ b/nx-X11/lib/X11/PutImage.c
@@ -39,10 +39,6 @@ in this Software without prior written authorization from The Open Group.
 #define RConst const
 #endif
 
-#if defined(Lynx) && defined(ROUNDUP)
-#undef ROUNDUP
-#endif
-
 /* assumes pad is a power of 2 */
 #define ROUNDUP(nbytes, pad) (((nbytes) + ((pad) - 1)) & ~(long)((pad) - 1))
 
diff --git a/nx-X11/lib/X11/lcDefConv.c b/nx-X11/lib/X11/lcDefConv.c
index 51ad2f8e7..2096d871b 100644
--- a/nx-X11/lib/X11/lcDefConv.c
+++ b/nx-X11/lib/X11/lcDefConv.c
@@ -44,7 +44,7 @@
 #define MB_LEN_MAX 6
 #endif
 
-#if !defined(Lynx_22) && !defined(X_LOCALE)
+#if !defined(X_LOCALE)
 #define STDCVT
 #endif
 
diff --git a/nx-X11/lib/X11/lcGenConv.c b/nx-X11/lib/X11/lcGenConv.c
index eede76807..799f49a30 100644
--- a/nx-X11/lib/X11/lcGenConv.c
+++ b/nx-X11/lib/X11/lcGenConv.c
@@ -53,7 +53,7 @@
 #include "XlcGeneric.h"
 #include <stdio.h>
 
-#if !defined(Lynx_22) && !defined(X_LOCALE)
+#if !defined(X_LOCALE)
 #define STDCVT
 #endif