Merge branch 'sunweaver-pr/drop-support-for-ancient-platforms' into 3.6.x

Attributes GH PR #289: https://github.com/ArcticaProject/nx-libs/pull/289

82 files changed, 94 insertions, 2040 deletions

diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf
index 8decfdc3c..32f3e321b 100644
--- a/nx-X11/config/cf/Imake.cf
+++ b/nx-X11/config/cf/Imake.cf
@@ -184,12 +184,6 @@
 #  undef __vax__
 #  define VaxArchitecture
 # endif
-# ifdef __hppa__
-#  ifndef HPArchitecture
-#   define HPArchitecture
-#  endif
-#  undef __hppa__
-# endif /* __hppa__ */
 #endif /* OpenBSD */
 
 /* Systems based on kernel of OpenBSD */
@@ -374,13 +368,6 @@
 # define SunArchitecture
 #endif /* sun */
 
-#ifdef hpux
-# define MacroIncludeFile <hp.cf>
-# define MacroFile hp.cf
-# undef hpux
-# define HPArchitecture
-#endif /* hpux */
-
 #ifdef __SCO__
 # define MacroIncludeFile <sco5.cf>
 # define MacroFile sco5.cf
@@ -517,24 +504,6 @@
 # define MacIIArchitecture
 #endif /* macII */
 
-#ifdef sgi
-# define MacroIncludeFile <sgi.cf>
-# define MacroFile sgi.cf
-# undef sgi
-# define SGIArchitecture
-# undef mips
-# undef __mips
-# define MipsArchitecture
-# ifdef _SVR4
-#  undef _SVR4
-#  define SVR4Architecture
-# endif
-# ifdef _SYSTYPE_SVR4
-#  undef _SYSTYPE_SVR4
-#  define SVR4Architecture
-# endif
-#endif /* sgi */
-
 #ifdef stellar
 # define MacroIncludeFile <stellar.cf>
 # define MacroFile stellar.cf
@@ -542,7 +511,7 @@
 # define StellarArchitecture
 #endif /* stellar */
 
-#if defined(ibm) || defined(_IBMR2) || defined(ibm032) || defined(aix)
+#if defined(ibm) || defined(_IBMR2) || defined(ibm032)
 # define MacroIncludeFile <ibm.cf>
 # define MacroFile ibm.cf
 # ifdef ibm
@@ -557,10 +526,6 @@
 #  undef ibm032
 #  define RtArchitecture
 # endif
-# ifdef aix
-#  undef aix
-#  define AIXArchitecture
-# endif
 # ifdef _IBMR2
 #  undef _IBMR2
 #  if (DefaultOSMajorVersion < 5)
@@ -609,7 +574,7 @@
 # endif
 #endif /* MOTOROLA */
 
-#if defined(SVR4) && !defined(DGUX)
+#if defined(SVR4)
 # ifdef i386
 #  define i386Architecture
 #  undef i386
@@ -702,15 +667,6 @@
 # endif /* ! SVR4 */
 #endif /* SYSV386 */
 
-#ifdef DGUX
-# define i386Architecture
-# define SVR4Architecture
-# define MacroIncludeFile <DGUX.cf>
-# define MacroFile DGUX.cf
-# undef DGUX
-# define DguxArchitecture
-#endif /* DGUX */
-
 #ifdef __convex__
 # define MacroIncludeFile <convex.cf>
 # define MacroFile convex.cf
@@ -720,22 +676,6 @@
 # define ConvexArchitecture
 #endif /* _convex_ */
 
-#ifdef __osf__
-# define MacroIncludeFile <osf1.cf>
-# define MacroFile osf1.cf
-# define OSF1Architecture
-# undef __osf__
-# ifdef __mips__
-#  undef __mips__
-#  define MipsArchitecture
-#  define MipselArchitecture
-# endif
-# ifdef __alpha
-#  undef __alpha
-#  define AlphaArchitecture
-# endif
-#endif /* __osf__ */
-
 #ifdef Oki
 # define MacroIncludeFile <Oki.cf>
 # define MacroFile Oki.cf
@@ -947,12 +887,6 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
 #  undef MIPSEL
 #  undef _MIPSEL
 # endif
-# ifdef __hppa__
-#  ifndef HPArchitecture
-#   define HPArchitecture
-#  endif
-#  undef __hppa__
-# endif /* __hppa__ */
 # ifdef __sh__
 #  ifndef SuperHArchitecture
 #   define SuperHArchitecture
@@ -1006,34 +940,6 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
 # endif
 #endif /* linux || __GLIBC__ */
 
-#if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc))
-# define MacroIncludeFile <lynx.cf>
-# define MacroFile lynx.cf
-# define LynxOSArchitecture
-# undef __Lynx__
-# undef Lynx
-# undef lynx
-# if defined(i386) || defined(__i386__) || defined(__x86__)
-#  define i386Architecture
-#  undef i386
-#  undef __i386__
-#  undef __x86__
-# endif
-# ifdef __powerpc__
-#  define PpcArchitecture
-#  undef __powerpc__
-# endif
-# if defined(sparc) || defined(__sparc__)
-#  define SparcArchitecture
-#  undef sparc
-#  undef __sparc__
-# endif
-/* for compatibility with 3.3.x */
-# ifdef PpcArchitecture
-#  define PowerPCArchitecture
-# endif
-#endif /* LynxOS AT/PPC/microSPARC */
-
 #ifdef __uxp__
 # define MacroIncludeFile <fujitsu.cf>
 # define MacroFile fujitsu.cf
@@ -1117,44 +1023,6 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
 #endif
 #endif
 
-#ifdef emxos2
-#define MacroIncludeFile <os2.cf>
-#define MacroFile os2.cf
-#define OS2Architecture
-#define i386Architecture
-#endif /* emxos2 */
-
-#if defined(__QNX__) && !defined(__QNXNTO__)
-#define MacroIncludeFile <QNX4.cf>
-#define MacroFile QNX4.cf
-#define QNX4Architecture
-#define i386Architecture
-#endif /* QNX4 */
-
-#ifdef __QNXNTO__
-#define MacroIncludeFile <nto.cf>
-#define MacroFile nto.cf
-#define NTOArchitecture
-# ifdef PPC
-#  define PPCArchitecture
-#  undef PPC
-# endif
-# ifdef MIPS
-#  define mipsArchitecture
-#  undef MIPS
-# endif
-# ifdef i386
-#  define i386Architecture
-#  undef i386
-# endif /* i386 */
-# ifdef __i386__
-#  ifndef i386Architecture
-#   define i386Architecture
-#  endif
-#  undef __i386__
-# endif /* __i386__ */
-#endif /* QNX/Neutrino */
-
 #ifdef SparcArchitecture
 # if defined(__sparc_v9) || defined(__arch64__)
 #  define Sparc64Architecture
diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
index 5c8effee5..93b659a0d 100644
--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
@@ -466,7 +466,7 @@ XCOMM the platform-specific parameters - edit site.def to change
 #define HasBasename		YES
 #endif
 #ifndef HasGetopt
-# if !defined(Win32Architecture) && !defined(OS2Architecture)
+# if !defined(Win32Architecture)
 #  define HasGetopt		YES
 # else
 #  define HasGetopt		NO
@@ -515,8 +515,6 @@ XCOMM the platform-specific parameters - edit site.def to change
 #define ByteOrder		X_BIG_ENDIAN
 #elif defined(PpcArchitecture) || defined(Ppc64Architecture)
 #define ByteOrder		X_BIG_ENDIAN
-#elif defined(HPArchitecture)
-#define ByteOrder		X_BIG_ENDIAN
 #elif defined(SuperHArchitecture)
 #define ByteOrder		X_LITTLE_ENDIAN
 #elif defined(SuperHebArchitecture)
@@ -1518,21 +1516,21 @@ TCLIBDIR = TclLibDir
 #define LibManSuffix	3		/* use just one tab or cpp will die */
 #endif
 #ifndef FileManSuffix
-#if SystemV || SystemV4 || defined(OSF1Architecture)
+#if SystemV || SystemV4
 #define FileManSuffix	4		/* use just one tab or cpp will die */
 #else
 #define FileManSuffix	5		/* use just one tab or cpp will die */
 #endif
 #endif
 #ifndef MiscManSuffix
-#if SystemV || SystemV4 || defined(OSF1Architecture)
+#if SystemV || SystemV4
 #define MiscManSuffix	5		/* use just one tab or cpp will die */
 #else
 #define MiscManSuffix	7		/* use just one tab or cpp will die */
 #endif
 #endif
 #ifndef DriverManSuffix
-#if SystemV || SystemV4 || defined(OSF1Architecture)
+#if SystemV || SystemV4
 #define DriverManSuffix	7		/* use just one tab or cpp will die */
 #else
 #define DriverManSuffix	4		/* use just one tab or cpp will die */
diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf
index c6ae58474..1a3f6bc5b 100644
--- a/nx-X11/config/cf/linux.cf
+++ b/nx-X11/config/cf/linux.cf
@@ -535,13 +535,6 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 #   define LdCmd		CcCmd -nostdlib -Wl,"-m alpha"
 #   define AsmDefines		-DUSE_GAS -U__ELF__
 #  endif /* AlphaArchitecture */
-#  ifdef HPArchitecture
-#   define CcCmd		gcc
-#   define CplusplusCmd		g++
-#   define AsCmd		CcCmd -c -x assembler
-#   define LdCmd		CcCmd -nostdlib
-#   define AsmDefines		-DUSE_GAS -U__ELF__
-#  endif /* HPArchitecture */
 #  ifdef i386Architecture
 #   define CcCmd		gcc -b i486-linuxaout
 #   define CplusplusCmd		g++ -b i486-linuxaout
@@ -580,13 +573,6 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 #   define AsmDefines		-D__ELF__
 #   define CplusplusCmd		c++ -b alpha-linux
 #  endif /* AlphaArchitecture */
-#  ifdef HPArchitecture
-#   define CcCmd		gcc
-#   define CplusplusCmd		g++
-#   define AsCmd		CcCmd -c -x assembler
-#   define LdCmd		CcCmd -nostdlib
-#   define AsmDefines		-D__ELF__
-#  endif /* HPArchitecture */
 #  ifdef i386Architecture
 #   define CcCmd		gcc -b i486-linux
 #   define AsCmd		CcCmd -c -x assembler
@@ -708,13 +694,6 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
 #endif /* Arm64Achitecture */
 
-#ifdef HPArchitecture
-# define OptimizedCDebugFlags	-O2  GccAliasingArgs
-# define LinuxMachineDefines	-D__hppa__
-# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
-# define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
-#endif
-
 #ifdef i386Architecture
 # ifndef OptimizedCDebugFlags
 #  define OptimizedCDebugFlags	DefaultGcc2i386Opt
diff --git a/nx-X11/config/cf/site.def b/nx-X11/config/cf/site.def
index f5e769278..da4c13793 100644
--- a/nx-X11/config/cf/site.def
+++ b/nx-X11/config/cf/site.def
@@ -46,7 +46,7 @@
  * the two following macros need to be defined directly (where "X11" is
  * really whatever the TopLevelProject macro is defined to be).
  */
-# if defined(AIXArchitecture) || defined(SVR4Architecture) || \
+# if defined(SVR4Architecture) || \
      defined(SCOArchitecture) || defined(Win32Architecture) || \
      defined(UXPArchitecture) || defined(SunArchitecture) || \
      defined(DynixPtxArchitecture) || defined(i386IscArchitecture)
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index fb0dbfd08..2b71b90ec 100644
--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -244,7 +244,7 @@ NX_VERSION_CURRENT_STRING  = nxVersionString
     defined(Sparc64Architecture) || defined(MipsArchitecture) || \
     defined(AlphaArchitecture) || defined(PpcArchitecture) || \
     defined(Mc68020Architecture) || defined(Arm32Architecture) || \
-    defined(HPArchitecture) || defined(SuperHArchitecture)
+    defined(SuperHArchitecture)
 # ifndef XorgServer
 #  define XorgServer		YES
 # endif
@@ -512,8 +512,8 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #ifndef BuildScanpci
 # if SystemV || SystemV4 || \
     (defined(LinuxArchitecture) && !defined(Mc68020Architecture)) || \
-    defined(i386BsdArchitecture) || defined(LynxOSArchitecture) || \
-    defined(OS2Architecture) || defined(GNUMachArchitecture) || \
+    defined(i386BsdArchitecture) || \
+    defined(GNUMachArchitecture) || \
     (defined(KFreeBSDArchitecture) && defined(i386Architecture))
 #   define BuildScanpci		YES
 # else
diff --git a/nx-X11/extras/Mesa/include/GL/glxext.h b/nx-X11/extras/Mesa/include/GL/glxext.h
index 589d1ef36..0f5321a6c 100644
--- a/nx-X11/extras/Mesa/include/GL/glxext.h
+++ b/nx-X11/extras/Mesa/include/GL/glxext.h
@@ -340,7 +340,7 @@ typedef long int int64_t;
 typedef long long int int64_t;   
 #endif /* __arch64__ */
 #endif /* __STDC__ */
-#elif defined(__UNIXOS2__) || defined(__SOL64__)
+#elif defined(__SOL64__)
 typedef long int int32_t;
 typedef long long int int64_t;
 #elif defined( __VMS )
diff --git a/nx-X11/extras/Mesa/src/mesa/main/imports.h b/nx-X11/extras/Mesa/src/mesa/main/imports.h
index 7c7a90a74..fd9c362ee 100644
--- a/nx-X11/extras/Mesa/src/mesa/main/imports.h
+++ b/nx-X11/extras/Mesa/src/mesa/main/imports.h
@@ -202,7 +202,6 @@ typedef union { GLfloat f; GLint i; } fi_type;
     defined(__s390x__) || defined(__powerpc__) || \
     defined(__amd64__) || \
     defined(ia64) || defined(__ia64__) || \
-    defined(__hppa__) || defined(hpux) || \
     defined(__mips) || defined(_MIPS_ARCH) || \
     defined(__arm__) || \
     defined(__sh__) || \
diff --git a/nx-X11/extras/Mesa/src/mesa/math/m_debug_clip.c b/nx-X11/extras/Mesa/src/mesa/math/m_debug_clip.c
index ae8108b88..da482a2dd 100644
--- a/nx-X11/extras/Mesa/src/mesa/math/m_debug_clip.c
+++ b/nx-X11/extras/Mesa/src/mesa/math/m_debug_clip.c
@@ -36,11 +36,6 @@
 #include "m_debug.h"
 #include "m_debug_util.h"
 
-#ifdef __UNIXOS2__
-/* The linker doesn't like empty files */
-static char dummy;
-#endif
-
 #ifdef DEBUG  /* This code only used for debugging */
 
 static clip_func *clip_tab[2] = {
diff --git a/nx-X11/extras/Mesa/src/mesa/math/m_debug_norm.c b/nx-X11/extras/Mesa/src/mesa/math/m_debug_norm.c
index e40399855..4eac6f6dc 100644
--- a/nx-X11/extras/Mesa/src/mesa/math/m_debug_norm.c
+++ b/nx-X11/extras/Mesa/src/mesa/math/m_debug_norm.c
@@ -38,11 +38,6 @@
 #include "m_debug_util.h"
 
 
-#ifdef __UNIXOS2__
-/* The linker doesn't like empty files */
-static char dummy;
-#endif
-
 #ifdef DEBUG  /* This code only used for debugging */
 
 
diff --git a/nx-X11/extras/Mesa/src/mesa/math/m_debug_xform.c b/nx-X11/extras/Mesa/src/mesa/math/m_debug_xform.c
index d8250f246..84e11fe34 100644
--- a/nx-X11/extras/Mesa/src/mesa/math/m_debug_xform.c
+++ b/nx-X11/extras/Mesa/src/mesa/math/m_debug_xform.c
@@ -37,11 +37,6 @@
 #include "m_debug.h"
 #include "m_debug_util.h"
 
-#ifdef __UNIXOS2__
-/* The linker doesn't like empty files */
-static char dummy;
-#endif
-
 #ifdef DEBUG  /* This code only used for debugging */
 
 
diff --git a/nx-X11/include/Xalloca.h b/nx-X11/include/Xalloca.h
index 1ec112619..ef1bf7b96 100644
--- a/nx-X11/include/Xalloca.h
+++ b/nx-X11/include/Xalloca.h
@@ -109,16 +109,12 @@ from The Open Group.
  * decide that you don't want to use alloca, you might want to fix it here.
  */
 /* alloca might be a macro taking one arg (hi, Sun!), so give it one. */
-#        ifndef __sgi			/* IRIX 5/6 has definition */
-#         ifndef __QNX__
 #          define __Xnullarg		/* as nothing */
 #          ifndef X_NOT_STDC_ENV
              extern void *alloca(__Xnullarg);
 #          else
              extern char *alloca(__Xnullarg);
 #          endif
-#         endif /* __QNX__ */
-#        endif /* __sgi */
 #        define ALLOCATE_LOCAL(size) alloca((int)(size))
 #      endif /* who does alloca */
 #    endif /* NCR */
diff --git a/nx-X11/include/Xarch.h b/nx-X11/include/Xarch.h
index 94a673d1f..222da2e1f 100644
--- a/nx-X11/include/Xarch.h
+++ b/nx-X11/include/Xarch.h
@@ -40,7 +40,7 @@
 #else
 
 #ifdef SVR4
-#if defined(NCR) || defined(Mips) || defined(__sgi)
+#if defined(NCR) || defined(Mips)
 #include <sys/endian.h>
 #else
 #if !defined(sun)
@@ -73,39 +73,13 @@
 #if !defined(BYTE_ORDER) && defined(__BYTE_ORDER)
 #define BYTE_ORDER __BYTE_ORDER
 #endif
-#elif defined(Lynx)
-#if 0
-/* LynxOS 2.4.0 has wrong defines in bsd/ip.h */
-#include <bsd/in.h>
-#include <bsd/in_systm.h>
-#include <bsd/ip.h>
-#endif
 #endif
 
 #ifndef BYTE_ORDER
 #define LITTLE_ENDIAN 1234
 #define BIG_ENDIAN    4321
 
-#if defined(__QNX__) && !defined(__QNXNTO__)
-#define BYTE_ORDER LITTLE_ENDIAN
-#endif
-
-#if defined(__QNXNTO__)
-#if defined(i386) || defined(__i386__) || defined(__x86__)
-#define BYTE_ORDER LITTLE_ENDIAN
-#else
-#define BYTE_ORDER BIG_ENDIAN
-#endif
-#endif
-
-#ifdef Lynx
-#if defined(i386) || defined(__i386__) || defined(__x86__)
-#define BYTE_ORDER LITTLE_ENDIAN
-#else
-#define BYTE_ORDER BIG_ENDIAN
-#endif
-#endif
-#if (defined(sun) && defined(SVR4)) && !defined(Lynx)
+#if (defined(sun) && defined(SVR4))
 #include <sys/isa_defs.h>
 #ifdef _LITTLE_ENDIAN
 #define BYTE_ORDER LITTLE_ENDIAN
diff --git a/nx-X11/include/Xmd.h b/nx-X11/include/Xmd.h
index 83d22a47f..50159edd3 100644
--- a/nx-X11/include/Xmd.h
+++ b/nx-X11/include/Xmd.h
@@ -58,10 +58,8 @@ SOFTWARE.
     defined(__ia64__) || defined(ia64) || \
     defined(__sparc64__) || \
     defined(__s390x__) || \
-    (defined(__hppa__) && defined(__LP64__)) || \
     defined(__amd64__) || defined(amd64) || \
-    defined(__powerpc64__) || \
-    (defined(sgi) && (_MIPS_SZLONG == 64))
+    defined(__powerpc64__)
 #define LONG64				/* 32/64-bit architecture */
 #endif
 
@@ -101,7 +99,7 @@ typedef long INT32;
 #endif
 typedef short INT16;
 
-#if defined(__STDC__) || defined(sgi) || defined(AIXV3)
+#if defined(__STDC__)
 typedef signed char    INT8;
 #else
 typedef char           INT8;
diff --git a/nx-X11/include/Xos.h b/nx-X11/include/Xos.h
index e79cec662..b664337c5 100644
--- a/nx-X11/include/Xos.h
+++ b/nx-X11/include/Xos.h
@@ -57,11 +57,9 @@ in this Software without prior written authorization from The Open Group.
 #endif
 #endif /* USG */
 
-#ifndef sgi
 #if defined(__SCO__) || defined(__UNIXWARE__)
 #include <stdint.h>
 #endif
-#endif
 
 #ifdef _SEQUENT_
 /*
@@ -219,14 +217,7 @@ struct timeval {
     (t)->tv_sec = _gtodtmp.time; \
     (t)->tv_usec = _gtodtmp.millitm * 1000; \
 }
-#elif defined(_SEQUENT_) || defined(Lynx)
-#include <time.h>
-#elif defined (__QNX__)
-typedef unsigned long fd_mask;
-/* Make sure we get 256 bit select masks */
-#define FD_SETSIZE 256
-#include <sys/select.h>
-#include <sys/time.h>
+#elif defined(_SEQUENT_)
 #include <time.h>
 #else
 #include <sys/time.h>
@@ -246,12 +237,6 @@ typedef unsigned long fd_mask;
 #endif
 #endif /* XPG4 else */
 
-#ifdef __UNIXOS2__
-typedef unsigned long fd_mask;
-#include <limits.h>
-#define MAX_PATH _POSIX_PATH_MAX
-#endif
-
 #ifdef __GNU__
 #define PATH_MAX 4096
 #define MAXPATHLEN 4096
@@ -269,9 +254,8 @@ typedef unsigned long fd_mask;
 #define NGROUPS 16
 #endif
 
-#if defined(ISC) || defined(__UNIXOS2__) || \
-    (defined(__linux__) && !defined(__GLIBC__)) || \
-    (defined(__QNX__) && !defined(UNIXCONN))
+#if defined(ISC) || \
+    (defined(__linux__) && !defined(__GLIBC__))
 /*
  *	Some OS's may not have this
  */
diff --git a/nx-X11/include/Xos_r.h b/nx-X11/include/Xos_r.h
index bafbefcb3..ee0a77bfa 100644
--- a/nx-X11/include/Xos_r.h
+++ b/nx-X11/include/Xos_r.h
@@ -37,9 +37,8 @@ in this Software without prior written authorization from The Open Group.
  *
  * If you are on a platform that defines XTHREADS but does not have
  * MT-safe system API (e.g. UnixWare) you must define _Xos_processLock
- * and _Xos_processUnlock macros before including this header.  If
- * you are on OSF/1 V3.2 and plan to use readdir(), you must also define
- * _Xos_isThreadsInitialized.  For convenience XOS_USE_XLIB_LOCKING or
+ * and _Xos_processUnlock macros before including this header.
+ * For convenience XOS_USE_XLIB_LOCKING or
  * XOS_USE_XT_LOCKING may be defined to obtain either Xlib-only or
  * Xt-based versions of these macros.  These macros won't result in
  * truly thread-safe calls, but they are better than nothing.  If you
@@ -197,14 +196,6 @@ extern void XtProcessUnlock(
 # undef _POSIX_THREAD_SAFE_FUNCTIONS
 #endif
 
-/*
- * LynxOS 3.1 defines _POSIX_THREAD_SAFE_FUNCTIONS but
- * getpwuid_r has different semantics than defined by POSIX
- */
-#if defined(Lynx) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
-# undef _POSIX_THREAD_SAFE_FUNCTIONS
-#endif
-
 
 /***** <pwd.h> wrappers *****/
 
@@ -328,24 +319,17 @@ static __inline__ void _Xpw_copyPasswd(_Xgetpwparams p)
   (p).pwp )
 
 #elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(__APPLE__) && !defined(__DARWIN__)
-/* SVR4 threads, AIX 4.2.0 and earlier and OSF/1 3.2 and earlier pthreads */
+/* SVR4 threads */
 # define X_NEEDS_PWPARAMS
 typedef struct {
   struct passwd pws;
   char pwbuf[X_LINE_MAX];
 } _Xgetpwparams;
-# if defined(_POSIX_REENTRANT_FUNCTIONS) || !defined(SVR4) || defined(Lynx)
-#  ifndef Lynx
-#   define _XGetpwuid(u,p) \
+# if defined(_POSIX_REENTRANT_FUNCTIONS) || !defined(SVR4)
+#  define _XGetpwuid(u,p) \
 ((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : &(p).pws)
-#   define _XGetpwnam(u,p) \
+#  define _XGetpwnam(u,p) \
 ((getpwnam_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : &(p).pws)
-#  else /* Lynx */
-#   define _XGetpwuid(u,p) \
-((getpwuid_r(&(p).pws,(u),(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : &(p).pws)
-#   define _XGetpwnam(u,p) \
-((getpwnam_r(&(p).pws,(u),(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : &(p).pws)
-#  endif
 # else /* SVR4 */
 #  define _XGetpwuid(u,p) \
 ((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == NULL) ? NULL : &(p).pws)
@@ -355,11 +339,6 @@ typedef struct {
 
 #else /* _POSIX_THREAD_SAFE_FUNCTIONS */
 /* Digital UNIX 4.0, but not (beta) T4.0-1 */
-# if defined(__osf__)
-/* OSF/1 V4.0 <pwd.h> doesn't declare the _P routines, breaking under C++. */
-extern int _Pgetpwuid_r(uid_t, struct passwd *, char *, size_t, struct passwd **);
-extern int _Pgetpwnam_r(const char *, struct passwd *, char *, size_t, struct passwd **);
-# endif
 # define X_NEEDS_PWPARAMS
 typedef struct {
   struct passwd pws;
@@ -480,13 +459,6 @@ typedef struct {
  * POSIX does not specify _r equivalents for <netdb.h> API, but some
  * vendors provide them anyway.  Use them only when explicitly asked.
  */
-# ifdef _POSIX_REENTRANT_FUNCTIONS
-#  ifndef _POSIX_THREAD_SAFE_FUNCTIONS
-#   if defined(AIXV3) || defined(AIXV4) || defined(__osf__)
-#    define X_POSIX_THREAD_SAFE_FUNCTIONS 1
-#   endif
-#  endif
-# endif
 # ifdef _POSIX_THREAD_SAFE_FUNCTIONS
 #  define X_POSIX_THREAD_SAFE_FUNCTIONS 1
 # endif
@@ -619,32 +591,11 @@ typedef struct {
 # endif
 } _Xreaddirparams;
 
-# if defined(_POSIX_THREAD_SAFE_FUNCTIONS) || defined(AIXV3) || \
-     defined(AIXV4) || defined(__APPLE__) || defined(__DARWIN__)
-/* AIX defines the draft POSIX symbol, but uses the final API. */
+# if defined(_POSIX_THREAD_SAFE_FUNCTIONS) || \
+     defined(__APPLE__) || defined(__DARWIN__)
 /* POSIX final API, returns (int)0 on success. */
-#  if defined(__osf__)
-/* OSF/1 V4.0 <dirent.h> doesn't declare _Preaddir_r, breaking under C++. */
-extern int _Preaddir_r(DIR *, struct dirent *, struct dirent **);
-#  endif
 #  define _XReaddir(d,p)						\
     (readdir_r((d), &((p).dir_entry), &((p).result)) ? NULL : (p).result)
-# elif defined(_POSIX_REENTRANT_FUNCTIONS) && defined(__osf__)
-/*
- * OSF/1 V3.2 readdir_r() will SEGV if the main program is not
- * explicitly linked with -lc_r.  The library REQUIREDLIBS don't help.
- * Assume that if threads have been initialized we're linked properly.
- */
-#  define _XReaddir(d,p)						\
- ( (_Xos_isThreadInitialized) ?						\
-   (readdir_r((d), &((p).dir_entry)) ? NULL : &((p).dir_entry)) :	\
-   ((_Xos_processLock),							\
-    (((p).result = readdir((d))) ?					\
-     (memcpy(&((p).dir_entry), (p).result, (p).result->d_reclen),	\
-      ((p).result = &(p).dir_entry), 0) :				\
-     0),								\
-    (_Xos_processUnlock),						\
-    (p).result) )
 # elif defined(_POSIX_REENTRANT_FUNCTIONS)
 /* POSIX draft API, returns (int)0 on success. */
 #  define _XReaddir(d,p)	\
@@ -942,28 +893,6 @@ typedef struct {
    (_Xos_processUnlock), \
    (p).result )
 
-#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && (defined(__osf__) || defined(hpV4))
-/* Returns (int)0 on success.  OSF/1 v3.2, HP/UX 10
- *
- * extern int asctime_r(const struct tm *timeptr, char *buffer, int buflen);
- * extern int ctime_r(const time_t *timer, char *buffer, int buflen);
- * extern int gmtime_r(const time_t *timer, struct tm *result);
- * extern int localtime_r(const time_t *timer, struct tm *result);
- */
-# ifdef TIMELEN
-typedef char _Xatimeparams[TIMELEN];
-typedef char _Xctimeparams[TIMELEN];
-# else
-typedef char _Xatimeparams[26];
-typedef char _Xctimeparams[26];
-# endif
-typedef struct tm _Xgtimeparams;
-typedef struct tm _Xltimeparams;
-# define _XAsctime(t,p)		(asctime_r((t),(p),sizeof((p))) ? NULL : (p))
-# define _XCtime(t,p)		(ctime_r((t),(p),sizeof((p))) ? NULL : (p))
-# define _XGmtime(t,p)		(gmtime_r((t),&(p)) ? NULL : &(p))
-# define _XLocaltime(t,p)	(localtime_r((t),&(p)) ? NULL : &(p))
-
 #elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(sun)
 /* Returns NULL on failure.  Solaris 2.5
  *
@@ -987,19 +916,13 @@ typedef struct tm _Xltimeparams;
 # define _XLocaltime(t,p)	localtime_r((t),&(p))
 
 #else /* defined(_POSIX_THREAD_SAFE_FUNCTIONS) */
-/* POSIX final API.  OSF/1 v4.0, AIX, etc.
+/* POSIX final API.  OSF/1 v4.0, etc.
  *
  * extern char *asctime_r(const struct tm *timeptr, char *buffer);
  * extern char *ctime_r(const time_t *timer, char *buffer);
  * extern struct tm *gmtime_r(const time_t *timer, struct tm *result);
  * extern struct tm *localtime_r(const time_t *timer, struct tm *result);
  */
-# if defined(__osf__)
-/* OSF/1 V4.0 <time.h> doesn't declare the _P routines, breaking under C++. */
-extern char *_Pasctime_r(const struct tm *, char *);
-extern char *_Pctime_r(const time_t *, char *);
-extern struct tm *_Plocaltime_r(const time_t *, struct tm *);
-# endif
 # ifdef TIMELEN
 typedef char _Xatimeparams[TIMELEN];
 typedef char _Xctimeparams[TIMELEN];
@@ -1094,7 +1017,7 @@ typedef struct {
    (_Xos_processUnlock), \
    (p).pgrp )
 
-#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && (defined(sun) || defined(__osf__))
+#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(sun)
 /* Non-POSIX API.  Solaris, DEC v3.2.
  *
  * extern struct group *getgrgid_r(gid_t, struct group *, char *, int);
@@ -1108,7 +1031,7 @@ typedef struct {
 #define _XGetgrnam(n,p)	getgrnam_r((n), &(p).grp, (p).buf, sizeof((p).buf))
 
 #elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS)
-/* Non-POSIX API.  HP/UX 10, AIX 4.
+/* Non-POSIX API.  HP/UX 10.
  *
  * extern int getgrgid_r(gid_t, struct group *, char *, int);
  * extern int getgrnam_r(const char *, struct group *, char *, int);
@@ -1128,11 +1051,6 @@ typedef struct {
  * int getgrgid_r(gid_t, struct group *, char *, size_t, struct group **);
  * int getgrnam_r(const char *, struct group *, char *, size_t, struct group **);
  */
-# if defined(__osf__)
-/* OSF/1 V4.0 <grp.h> doesn't declare the _P routines, breaking under C++. */
-extern int _Pgetgrgid_r(gid_t, struct group *, char *, size_t, struct group **);
-extern int _Pgetgrnam_r(const char *, struct group *, char *, size_t, struct group **);
-# endif
 typedef struct {
   struct group grp;
   char buf[X_LINE_MAX];	/* Should be sysconf(_SC_GETGR_R_SIZE_MAX)? */
diff --git a/nx-X11/include/Xosdefs.h b/nx-X11/include/Xosdefs.h
index 3b151199e..ae676f9ff 100644
--- a/nx-X11/include/Xosdefs.h
+++ b/nx-X11/include/Xosdefs.h
@@ -127,11 +127,6 @@ in this Software without prior written authorization from The Open Group.
 #define X_NOT_STDC_ENV
 #endif
 
-#ifdef __UNIXOS2__
-#define USGISH
-#define NULL_NOT_ZERO
-#endif
-
 #ifdef __DARWIN__
 #define NULL_NOT_ZERO
 #endif
diff --git a/nx-X11/include/Xpoll.h.in b/nx-X11/include/Xpoll.h.in
index 47a0341e2..db8c565d9 100644
--- a/nx-X11/include/Xpoll.h.in
+++ b/nx-X11/include/Xpoll.h.in
@@ -79,28 +79,14 @@ from The Open Group.
 /* Below is the monster branch from hell.  Basically, most systems will drop to
  * 'the branch below is the fallthrough for halfway modern systems', and include
  * <sys/select.h>, so we get the FD_* macros. */
-#if !defined(DGUX)
-# if (defined(SVR4) || defined(AIXV3)) && !defined(FD_SETSIZE)
-#  include <sys/select.h>
-#  ifdef luna
-#   include <sysent.h>
-#  endif
-# else /* not SVR4/AIXv3 */
-#  if defined(AIXV4) /* AIX 4.2 fubar-ed <sys/select.h>, so try really hard. */
-#   if !defined(NFDBITS)
-#    include <sys/select.h>
-#   endif
-#  else /* the branch below is the fallthrough for halfway modern systems */
-#   ifdef __QNX__  /* Make sure we get 256 bit select masks */
-#    define FD_SETSIZE 256
-#   endif
-#   include <sys/select.h>
-#  endif
+
+#if defined(SVR4) && !defined(FD_SETSIZE)
+# include <sys/select.h>
+# ifdef luna
+#  include <sysent.h>
 # endif
-#else /* DGUX  -- No sys/select in Intel DG/ux */
-# include <sys/time.h> 
-# include <sys/types.h>
-# include <unistd.h>
+#else /* not SVR4 */
+# include <sys/select.h>
 #endif
 
 #include <nx-X11/Xmd.h>
@@ -149,27 +135,11 @@ typedef struct fd_set {
 extern int _XSelect(int maxfds, fd_set *readfds, fd_set *writefds,
                         fd_set *exceptfds, struct timeval *timeout);
 
-#ifndef hpux /* and perhaps old BSD ??? */
-# define Select(n,r,w,e,t) _XSelect(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
-#else
-# ifndef _XPG4_EXTENDED /* HPUX 9.x and earlier */
-#  define Select(n,r,w,e,t) _XSelect(n,(int*)r,(int*)w,(int*)e,(struct timeval*)t)
-# else
-#  define Select(n,r,w,e,t) _XSelect(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
-# endif
-#endif
+#define Select(n,r,w,e,t) _XSelect(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
 
 #else /* #ifdef NX_TRANS_SOCKET */
 
-#ifndef hpux /* and perhaps old BSD ??? */
-# define Select(n,r,w,e,t) select(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
-#else
-# ifndef _XPG4_EXTENDED /* HPUX 9.x and earlier */
-#  define Select(n,r,w,e,t) select(n,(int*)r,(int*)w,(int*)e,(struct timeval*)t)
-# else
-#  define Select(n,r,w,e,t) select(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
-# endif
-#endif
+#define Select(n,r,w,e,t) select(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
 
 #endif /* #ifdef NX_TRANS_SOCKET */
 
diff --git a/nx-X11/include/Xthreads.h b/nx-X11/include/Xthreads.h
index 77267bea1..06649106d 100644
--- a/nx-X11/include/Xthreads.h
+++ b/nx-X11/include/Xthreads.h
@@ -56,7 +56,7 @@ typedef struct mutex xmutex_rec;
 #define xcondition_broadcast(cv) condition_broadcast(cv)
 #define xcondition_set_name(cv,str) condition_set_name(cv,str)
 #else /* !CTHREADS */
-#if defined(SVR4) && !defined(__sgi) && !defined(_SEQUENT_)
+#if defined(SVR4) && !defined(_SEQUENT_)
 #include <thread.h>
 #include <synch.h>
 typedef thread_t xthread_t;
diff --git a/nx-X11/lib/X11/AuGetBest.c b/nx-X11/lib/X11/AuGetBest.c
index fce9ddead..2518805cc 100644
--- a/nx-X11/lib/X11/AuGetBest.c
+++ b/nx-X11/lib/X11/AuGetBest.c
@@ -33,11 +33,6 @@ in this Software without prior written authorization from The Open Group.
 #ifdef XTHREADS
 #include <nx-X11/Xthreads.h>
 #endif
-#ifdef hpux
-#define X_INCLUDE_NETDB_H
-#define XOS_USE_NO_LOCKING
-#include <nx-X11/Xos_r.h>
-#endif
 
 static int
 binaryEqual (_Xconst char *a, _Xconst char *b, int len)
@@ -74,10 +69,6 @@ XauGetBestAuthByAddr (
     Xauth   *best;
     int	    best_type;
     int	    type;
-#ifdef hpux
-    char		*fully_qual_address;
-    unsigned short	fully_qual_address_length;
-#endif
 
     auth_name = XauFileName ();
     if (!auth_name)
@@ -88,26 +79,6 @@ XauGetBestAuthByAddr (
     if (!auth_file)
 	return 0;
 
-#ifdef hpux
-    if (family == FamilyLocal) {
-#ifdef XTHREADS_NEEDS_BYNAMEPARAMS
-	_Xgethostbynameparams hparams;
-#endif
-	struct hostent *hostp;
-
-	/* make sure we try fully-qualified hostname */
-	if ((hostp = _XGethostbyname(address,hparams)) != NULL) {
-	    fully_qual_address = hostp->h_name;
-	    fully_qual_address_length = strlen(fully_qual_address);
-	}
-	else
-	{
-	    fully_qual_address = NULL;
-	    fully_qual_address_length = 0;
-	}
-    }
-#endif /* hpux */
-
     best = 0;
     best_type = types_length;
     for (;;) {
@@ -131,12 +102,6 @@ XauGetBestAuthByAddr (
 	     (entry->family == family &&
 	     ((address_length == entry->address_length &&
 	     binaryEqual (entry->address, address, (int)address_length))
-#ifdef hpux
-	     || (family == FamilyLocal &&
-		fully_qual_address_length == entry->address_length &&
-	     	binaryEqual (entry->address, fully_qual_address,
-		    (int) fully_qual_address_length))
-#endif
 	    ))) &&
 	    (number_length == 0 || entry->number_length == 0 ||
 	     (number_length == entry->number_length &&
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/CrGlCur.c b/nx-X11/lib/X11/CrGlCur.c
index 460660f81..88133b7f4 100644
--- a/nx-X11/lib/X11/CrGlCur.c
+++ b/nx-X11/lib/X11/CrGlCur.c
@@ -31,28 +31,16 @@ in this Software without prior written authorization from The Open Group.
 
 #ifdef USE_DYNAMIC_XCURSOR
 
-#ifdef __UNIXOS2__
-#define RTLD_LAZY 1
-#define LIBXCURSOR "Xcursor.dll"
-#endif
 #include <stdio.h>
 #include <string.h>
-#if defined(hpux)
-#include <dl.h>
-#else
 #include <dlfcn.h>
-#endif
 #include "Cr.h"
 
 #ifdef __CYGWIN__
 #define LIBXCURSOR "cygXcursor-1.dll"
 #endif
 
-#if defined(hpux)
-typedef shl_t	XModuleType;
-#else
 typedef void *XModuleType;
-#endif
 
 #ifndef LIBXCURSOR
 #define LIBXCURSOR "libXcursor.so.1"
@@ -68,11 +56,7 @@ open_library (void)
     XModuleType	module;
     for (;;)
     {
-#if defined(hpux)
-	module = shl_load(library, BIND_DEFERRED, 0L);
-#else
 	module =  dlopen(library, RTLD_LAZY);
-#endif
 	if (module)
 	    return module;
 	dot = strrchr (library, '.');
@@ -88,28 +72,9 @@ fetch_symbol (XModuleType module, const char *under_symbol)
 {
     void *result = NULL;
     const char *symbol = under_symbol + 1;
-#if defined(hpux)
-    int getsyms_cnt, i;
-    struct shl_symbol *symbols;
-
-    getsyms_cnt = shl_getsymbols(module, TYPE_PROCEDURE,
-				 EXPORT_SYMBOLS, malloc, &symbols);
-
-    for(i=0; i<getsyms_cnt; i++) {
-        if(!strcmp(symbols[i].name, symbol)) {
-	    result = symbols[i].value;
-	    break;
-         }
-    }
-
-    if(getsyms_cnt > 0) {
-        free(symbols);
-    }
-#else
     result = dlsym (module, symbol);
     if (!result)
 	result = dlsym (module, under_symbol);
-#endif
     return result;
 }
 
diff --git a/nx-X11/lib/X11/GetDflt.c b/nx-X11/lib/X11/GetDflt.c
index f2098dff3..c2cc1da47 100644
--- a/nx-X11/lib/X11/GetDflt.c
+++ b/nx-X11/lib/X11/GetDflt.c
@@ -184,10 +184,6 @@ XGetDefault(
 #ifdef WIN32
 	char *progname2;
 #endif
-#ifdef __UNIXOS2__
-	char *progname2;
-	char *dotpos;
-#endif
 
 	/*
 	 * strip path off of program name (XXX - this is OS specific)
@@ -198,13 +194,6 @@ XGetDefault(
 	if (progname2 && (!progname || progname < progname2))
 	    progname = progname2;
 #endif
-#ifdef __UNIXOS2__  /* Very similar to WIN32 */
-	progname2 = strrchr (prog, '\\');
-	if (progname2 && (!progname || progname < progname2))
-	    progname = progname2;
-	dotpos = strrchr (prog, '.');
-	if (dotpos && (dotpos>progname2)) *dotpos='\0';
-#endif  /* We take out the .exe suffix  */
 
 	if (progname)
 	    progname++;
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/Imakefile b/nx-X11/lib/X11/Imakefile
index b3fc07adf..061f2e33e 100644
--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
@@ -806,7 +806,7 @@ SRCS3 = \
 	LockDis.c \
 	x11_trans.c \
 	xim_trans.c \
-	$(XKBSRCS) $(LCSRCS) $(MISCSRCS)
+	$(XKBSRCS) $(LCSRCS)
 
 OBJS3 = \
 	Lab.o \
@@ -889,7 +889,7 @@ OBJS3 = \
 	LockDis.o \
 	x11_trans.o \
 	xim_trans.o \
-	$(XKBOBJS) $(LCOBJS) $(MISCOBJS)
+	$(XKBOBJS) $(LCOBJS)
 
 SHAREDLCDEPSYMSRCS = XlcDL.c XlcSL.c
 
@@ -1036,14 +1036,6 @@ SHAREDLCOBJS = \
 	$(SHAREDLCDEPOBJS) \
 	$(SHAREDI18NSTATICOBJS) 
 
-#ifdef OS2Architecture
-MISCSRCS = os2Stubs.c
-#endif
-
-#ifdef OS2Architecture
-MISCOBJS = os2Stubs.o
-#endif
-
 OBJS = $(OBJS1) $(OBJS2) $(OBJS3)
 
 EXTRAUNSHAREDOBJS = $(STATICLCOBJS)
@@ -1086,10 +1078,6 @@ InstallNonExecFile(Xcms.txt,$(LIBDIR))
 InstallNonExecFile(XErrorDB,$(LIBDIR))
 InstallLintLibrary(X11,$(LINTLIBDIR))
 
-#ifdef QNX4Architecture
-LOCAL_LDFLAGS=-F
-#endif
-
 MAKEKEYS = ./makekeys
 KEYSYMDEFS =  $(XINCLUDESRC)/keysymdef.h $(XINCLUDESRC)/XF86keysym.h $(XINCLUDESRC)/Sunkeysym.h $(XINCLUDESRC)/DECkeysym.h $(XINCLUDESRC)/HPkeysym.h
 
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/RdBitF.c b/nx-X11/lib/X11/RdBitF.c
index c2316ae0c..319a0ee0b 100644
--- a/nx-X11/lib/X11/RdBitF.c
+++ b/nx-X11/lib/X11/RdBitF.c
@@ -129,9 +129,6 @@ XReadBitmapFileData (
     int hx = -1;			/* x hotspot */
     int hy = -1;			/* y hotspot */
 
-#ifdef __UNIXOS2__
-    filename = __XOS2RedirRoot(filename);
-#endif
     if (!(fstream = fopen(filename, "r")))
 	return BitmapOpenFailed;
 
diff --git a/nx-X11/lib/X11/SetLocale.c b/nx-X11/lib/X11/SetLocale.c
index f4d2aca21..3bbfd3ee6 100644
--- a/nx-X11/lib/X11/SetLocale.c
+++ b/nx-X11/lib/X11/SetLocale.c
@@ -99,33 +99,21 @@ _XlcMapOSLocaleName(
     char *osname,
     char *siname)
 {
-#if defined(hpux) || defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(__osf__) || defined(AIXV3) || defined(ultrix) || defined(WIN32) || defined(__UNIXOS2__) || defined(linux)
-# ifdef hpux
-#  ifndef _LastCategory
-   /* HPUX 9 and earlier */
-#   define SKIPCOUNT 2
-#   define STARTCHAR ':'
-#   define ENDCHAR ';'
-#  else
-   /* HPUX 10 */
-#   define ENDCHAR ' '
-#  endif
-# else
+
+/* FIXME: correct indentation levels after ancient platform clean-up */
+
+#if defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(ultrix) || defined(WIN32) || defined(linux)
 #  ifdef ultrix
 #   define SKIPCOUNT 2
 #   define STARTCHAR '\001'
 #   define ENDCHAR '\001'
 #  else
-#   if defined(WIN32) || defined(__UNIXOS2__)
+#   if defined(WIN32)
 #    define SKIPCOUNT 1
 #    define STARTCHAR '='
 #    define ENDCHAR ';'
 #    define WHITEFILL
 #   else
-#    if defined(__osf__) || (defined(AIXV3) && !defined(AIXV4))
-#     define STARTCHAR ' '
-#     define ENDCHAR ' '
-#    else
 #     if defined(linux)
 #      define STARTSTR "LC_CTYPE="
 #      define ENDCHAR ';'
@@ -135,10 +123,8 @@ _XlcMapOSLocaleName(
 #       define ENDCHAR '/'
 #      endif
 #     endif
-#    endif
 #   endif
 #  endif
-# endif
 
     char           *start;
     char           *end;
diff --git a/nx-X11/lib/X11/UIThrStubs.c b/nx-X11/lib/X11/UIThrStubs.c
index 8f4ea076b..0c913d41f 100644
--- a/nx-X11/lib/X11/UIThrStubs.c
+++ b/nx-X11/lib/X11/UIThrStubs.c
@@ -66,7 +66,7 @@ typedef cthread_t xthread_t;
 #pragma weak condition_signal = _Xthr_zero_stub_
 #pragma weak condition_broadcast = _Xthr_zero_stub_
 #else /* !CTHREADS */
-#if defined(SVR4) && !defined(__sgi)
+#if defined(SVR4)
 #include <thread.h>
 typedef thread_t xthread_t;
 #pragma weak thr_self = _Xthr_self_stub_
diff --git a/nx-X11/lib/X11/WMProps.c b/nx-X11/lib/X11/WMProps.c
index 249072936..e77f7ba56 100644
--- a/nx-X11/lib/X11/WMProps.c
+++ b/nx-X11/lib/X11/WMProps.c
@@ -122,14 +122,6 @@ void XSetWMProperties (
 		 * systems will have to change this.
 		 */
 		char *cp = strrchr (argv[0], '/');
-#ifdef __UNIXOS2__
-		char *os2_cp = strrchr (argv[0],'\\');
-		char *dot_cp = strrchr (argv[0],'.');
-		if (os2_cp && (os2_cp > cp)) {
-		    if(dot_cp && (dot_cp > os2_cp)) *dot_cp = '\0';
-		    cp=os2_cp;
-		}
-#endif
 		tmp.res_name = (cp ? cp + 1 : argv[0]);
 	    }
 	    tmp.res_class = classHints->res_class;
diff --git a/nx-X11/lib/X11/WrBitF.c b/nx-X11/lib/X11/WrBitF.c
index 0b27d5adf..47b47208f 100644
--- a/nx-X11/lib/X11/WrBitF.c
+++ b/nx-X11/lib/X11/WrBitF.c
@@ -105,9 +105,6 @@ XWriteBitmapFile(
   else
     name++;
 
-#ifdef __UNIXOS2__
-  filename = (char*)__XOS2RedirRoot(filename);
-#endif
   if (!(stream = fopen(filename, "w")))
     return(BitmapOpenFailed);
 
diff --git a/nx-X11/lib/X11/XKB.c b/nx-X11/lib/X11/XKB.c
index 7ecd39706..6df9c3ebc 100644
--- a/nx-X11/lib/X11/XKB.c
+++ b/nx-X11/lib/X11/XKB.c
@@ -373,11 +373,7 @@ XkbGetXlibControls(Display *dpy)
 unsigned int
 XkbXlibControlsImplemented(void)
 {
-#ifdef __sgi
-    return XkbLC_AllControls;
-#else
     return XkbLC_AllControls & ~XkbLC_AllComposeControls;
-#endif
 }
 
 Bool
diff --git a/nx-X11/lib/X11/XKBCvt.c b/nx-X11/lib/X11/XKBCvt.c
index f4df3fcfc..c42c3af1c 100644
--- a/nx-X11/lib/X11/XKBCvt.c
+++ b/nx-X11/lib/X11/XKBCvt.c
@@ -50,10 +50,6 @@ from The Open Group.
 #include <ctype.h>
 #include <nx-X11/Xos.h>
 
-#ifdef __sgi_not_xconsortium
-#define	XKB_EXTEND_LOOKUP_STRING
-#endif
-
 static int
 _XkbHandleSpecialSym(KeySym keysym, char *buffer, int nbytes, int *extra_rtrn)
 {
@@ -279,11 +275,7 @@ _XkbGetCharset(void)
     else {
         struct stat sbuf;
         FILE *file;
-#ifndef __UNIXOS2__
         char *cf = CHARSET_FILE;
-#else
-        char *cf = __XOS2RedirRoot(CHARSET_FILE);
-#endif
 
 #ifndef S_ISREG
 # define S_ISREG(mode)   (((mode) & S_IFMT) == S_IFREG)
diff --git a/nx-X11/lib/X11/Xaixlcint.h b/nx-X11/lib/X11/Xaixlcint.h
deleted file mode 100644
index 446ba2581..000000000
--- a/nx-X11/lib/X11/Xaixlcint.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *
- * Copyright IBM Corporation 1993
- *
- * All Rights Reserved
- *
- * License to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notice appear in all copies and that
- * both that copyright notice and this permission notice appear in
- * supporting documentation, and that the name of IBM not be
- * used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.
- *
- * IBM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS, AND
- * NONINFRINGEMENT OF THIRD PARTY RIGHTS, IN NO EVENT SHALL
- * IBM BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
-*/
-/************************************************************************/
-/*	Xaixlcint.h							*/
-/*----------------------------------------------------------------------*/
-/*	This file contains Xlcint.h extension for AIX.			*/
-/************************************************************************/
-#ifndef	_Xaixlcint_h
-#define	_Xaixlcint_h
-
-#include "Xlcint.h"
-#include <sys/lc_core.h>
-
-#define	_LC_LDX		11
-#define	_LC_LDX_R6	(_LC_LDX+1)
-#define	_LC_VERSION_R5	5
-#define	_LC_VERSION_R6	6
-
-typedef	struct	_LC_core_ldx_t	{
-    _LC_object_t	lc_object_header;
-    XLCd		(*default_loader)();
-    Bool		sticky;
-} _XlcCoreObjRec, *_XlcCoreObj;
-
-#if _LC_VERSION < 0x40000000
-#define __type_id type_id
-#define __magic magic
-#define __version version
-#endif
-
-#endif	/*_Xaixlcint_h*/
diff --git a/nx-X11/lib/X11/XlcDL.c b/nx-X11/lib/X11/XlcDL.c
index bc71900a0..032bcf51c 100644
--- a/nx-X11/lib/X11/XlcDL.c
+++ b/nx-X11/lib/X11/XlcDL.c
@@ -63,11 +63,7 @@ Sun Microsystems, Inc. or its licensors is granted.
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #else
-# if defined(hpux)
-#  define HAVE_DL_H
-# else
-#  define HAVE_DLFCN_H
-# endif
+# define HAVE_DLFCN_H
 #endif
 
 #include <stdio.h>
@@ -106,11 +102,7 @@ typedef struct {
   char *im_unregister;
   int dl_release;
   unsigned int refcount;
-#if defined(hpux)
-  shl_t dl_module;
-#else
   void *dl_module;
-#endif
 } XI18NObjectsListRec, *XI18NObjectsList;
 
 #define OBJECT_INIT_LEN 8
@@ -156,7 +148,6 @@ strdup_with_underscore(const char *symbol)
 	return result;
 }
 
-#ifndef hpux
 static void *
 try_both_dlsym (void *handle, char *name)
 {
@@ -174,7 +165,6 @@ try_both_dlsym (void *handle, char *name)
     }
     return ret;
 }
-#endif
 
 static void
 resolve_object(char *path, const char *lc_name)
@@ -301,11 +291,7 @@ open_object(
       path = __lc_path(object->dl_name, lc_dir);
       if (!path)
 	  return False;
-#if defined(hpux)
-      object->dl_module = shl_load(path, BIND_DEFERRED, 0L);
-#else
       object->dl_module = dlopen(path, RTLD_LAZY);
-#endif
       Xfree(path);
 
       if (!object->dl_module)
@@ -322,31 +308,11 @@ fetch_symbol(
      char *symbol)
 {
     void *result = NULL;
-#if defined(hpux)
-    int getsyms_cnt, i;
-    struct shl_symbol *symbols;
-#endif
 
     if (symbol == NULL)
     	return NULL;
 
-#if defined(hpux)
-    getsyms_cnt = shl_getsymbols(object->dl_module, TYPE_PROCEDURE,
-				 EXPORT_SYMBOLS, malloc, &symbols);
-
-    for(i=0; i<getsyms_cnt; i++) {
-        if(!strcmp(symbols[i].name, symbol)) {
-	    result = symbols[i].value;
-	    break;
-         }
-    }
-
-    if(getsyms_cnt > 0) {
-        free(symbols);
-    }
-#else
     result = try_both_dlsym(object->dl_module, symbol);
-#endif
 
     return result;
 }
@@ -357,11 +323,7 @@ close_object(XI18NObjectsList object)
   object->refcount--;
   if (object->refcount == 0)
     {
-#if defined(hpux)
-        shl_unload(object->dl_module);
-#else
         dlclose(object->dl_module);
-#endif
         object->dl_module = NULL;
     }
 }
@@ -466,10 +428,6 @@ _XDynamicRegisterIMInstantiateCallback(
   Bool ret_flag = False;
   int count;
   XI18NObjectsList objects_list = xi18n_objects_list;
-#if defined(hpux)
-  int getsyms_cnt, i;
-  struct shl_symbol *symbols;
-#endif
 
   lc_name = lcd->core->name;
 
@@ -514,10 +472,6 @@ _XDynamicUnRegisterIMInstantiateCallback(
   Bool ret_flag = False;
   int count;
   XI18NObjectsList objects_list = xi18n_objects_list;
-#if defined(hpux)
-  int getsyms_cnt, i;
-  struct shl_symbol *symbols;
-#endif
 
   lc_name = lcd->core->name;
   if (_XlcLocaleDirName(lc_dir, BUFSIZE, lc_name) == NULL) return False;
@@ -570,10 +524,6 @@ _XDynamicOpenOM(XLCd lcd, Display *display, XrmDatabase rdb,
   char *lc_name;
   dynamicIOpenProcp om_openOM = (dynamicIOpenProcp)NULL;
   XI18NObjectsList objects_list = xi18n_objects_list;
-#if defined(hpux)
-  int getsyms_cnt, i;
-  struct shl_symbol *symbols;
-#endif
 
   lc_name = lcd->core->name;
 
diff --git a/nx-X11/lib/X11/Xlib.h b/nx-X11/lib/X11/Xlib.h
index 1ac1ef181..b68a09f2b 100644
--- a/nx-X11/lib/X11/Xlib.h
+++ b/nx-X11/lib/X11/Xlib.h
@@ -51,13 +51,9 @@ in this Software without prior written authorization from The Open Group.
 #ifndef X_WCHAR
 #include <stddef.h>
 #else
-#ifdef __UNIXOS2__
-#include <stdlib.h>
-#else
 /* replace this with #include or typedef appropriate for your system */
 typedef unsigned long wchar_t;
 #endif
-#endif
 
 
 extern int
diff --git a/nx-X11/lib/X11/XlibInt.c b/nx-X11/lib/X11/XlibInt.c
index 42b928fd5..912c52989 100644
--- a/nx-X11/lib/X11/XlibInt.c
+++ b/nx-X11/lib/X11/XlibInt.c
@@ -169,14 +169,9 @@ extern int _X11TransSocketCongestionChange(XtransConnInfo, int *);
 #define ECHECK(err) (WSAGetLastError() == err)
 #define ESET(val) WSASetLastError(val)
 #else
-#ifdef __UNIXOS2__
-#define ECHECK(err) (errno == err)
-#define ESET(val)
-#else
 #define ECHECK(err) (errno == err)
 #define ESET(val) errno = val
 #endif
-#endif
 
 #if defined(LOCALCONN) || defined(LACHMAN)
 #ifdef EMSGSIZE
@@ -190,14 +185,6 @@ extern int _X11TransSocketCongestionChange(XtransConnInfo, int *);
 #endif
 #endif
 
-#ifdef __UNIXOS2__
-#if !USE_XCB
-#define select(n,r,w,x,t) os2ClientSelect(n,r,w,x,t)
-#endif /* !USE_XCB */
-#include <limits.h>
-#define MAX_PATH _POSIX_PATH_MAX
-#endif
-
 #if !USE_XCB
 
 #define STARTITERATE(tpvar,type,start,endcond) \
@@ -3904,7 +3891,7 @@ _XData32(
  *       and so, you may be better off using gethostname (if it exists).
  */
 
-#if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(SVR4)
+#if defined(_POSIX_SOURCE) || defined(SVR4)
 #define NEED_UTSNAME
 #include <sys/utsname.h>
 #else
@@ -4054,10 +4041,6 @@ static int AccessFile (path, pathbuf, len_pathbuf, pathret)
 
     /* try the places set in the environment */
     drive = getenv ("_XBASEDRIVE");
-#ifdef __UNIXOS2__
-    if (!drive)
-	drive = getenv ("X11ROOT");
-#endif
     if (!drive)
 	drive = "C:";
     len = strlen (drive) + strlen (path);
@@ -4070,7 +4053,6 @@ static int AccessFile (path, pathbuf, len_pathbuf, pathret)
 	return 1;
     }
 
-#ifndef __UNIXOS2__
     /* one last place to look */
     drive = getenv ("HOMEDRIVE");
     if (drive) {
@@ -4105,7 +4087,6 @@ static int AccessFile (path, pathbuf, len_pathbuf, pathret)
 	    }
 	}
     }
-#endif
     return 0;
 }
 
diff --git a/nx-X11/lib/X11/Xlibint.h b/nx-X11/lib/X11/Xlibint.h
index 932ed745e..b325182e3 100644
--- a/nx-X11/lib/X11/Xlibint.h
+++ b/nx-X11/lib/X11/Xlibint.h
@@ -248,9 +248,6 @@ typedef struct _XSQEvent
 #endif
 
 #include <nx-X11/Xproto.h>
-#ifdef __sgi
-#define _SGI_MP_SOURCE  /* turn this on to get MP safe errno */
-#endif
 #include <errno.h>
 #define _XBCOPYFUNC _Xbcopy
 #include <nx-X11/Xfuncs.h>
@@ -1249,12 +1246,6 @@ struct _XConnWatchInfo {	/* info from XAddConnectionWatch */
     struct _XConnWatchInfo *next;
 };
 
-#ifdef __UNIXOS2__
-extern char* __XOS2RedirRoot(
-    char*
-);
-#endif
-
 extern int _XTextHeight(
     XFontStruct*	/* font_struct */,
     _Xconst char*	/* string */,
diff --git a/nx-X11/lib/X11/Xrm.c b/nx-X11/lib/X11/Xrm.c
index 3b90346d8..e3587d021 100644
--- a/nx-X11/lib/X11/Xrm.c
+++ b/nx-X11/lib/X11/Xrm.c
@@ -305,7 +305,7 @@ typedef unsigned char XrmBits;
 static XrmBits const xrmtypes[256] = {
     EOS,0,0,0,0,0,0,0,
     0,SPACE,EOL,0,0,
-#if defined(WIN32) || defined(__UNIXOS2__)
+#if defined(WIN32)
                     EOL,	/* treat CR the same as LF, just in case */
 #else
                     0,
@@ -1575,10 +1575,6 @@ ReadInFile(_Xconst char *filename)
     register int fd, size;
     char * filebuf;
 
-#ifdef __UNIXOS2__
-    filename = __XOS2RedirRoot(filename);
-#endif
-
     /*
      * MS-Windows and OS/2 note: Default open mode includes O_TEXT
      */
@@ -1610,17 +1606,6 @@ ReadInFile(_Xconst char *filename)
     }
     size = read (fd, filebuf, size);
 
-#ifdef __UNIXOS2__
-    { /* kill CRLF */
-      int i,k;
-      for (i=k=0; i<size; i++)
-	if (filebuf[i] != 0x0d) {
-	   filebuf[k++] = filebuf[i];
-	}
-	filebuf[k] = 0;
-    }
-#endif
-
     if (size < 0) {
 	close (fd);
 	Xfree(filebuf);
diff --git a/nx-X11/lib/X11/cmsColNm.c b/nx-X11/lib/X11/cmsColNm.c
index e43a829f2..c6f1e0f31 100644
--- a/nx-X11/lib/X11/cmsColNm.c
+++ b/nx-X11/lib/X11/cmsColNm.c
@@ -730,9 +730,6 @@ LoadColornameDB(void)
     if ((pathname = getenv("XCMSDB")) == NULL) {
 	pathname = XCMSDB;
     }
-#ifdef __UNIXOS2__
-    pathname = __XOS2RedirRoot(pathname);
-#endif
 
     length = strlen(pathname);
     if ((length == 0) || (length >= (BUFSIZ - 5))){
diff --git a/nx-X11/lib/X11/lcDB.c b/nx-X11/lib/X11/lcDB.c
index 1111ec955..cc14bed72 100644
--- a/nx-X11/lib/X11/lcDB.c
+++ b/nx-X11/lib/X11/lcDB.c
@@ -344,15 +344,6 @@ read_line(
 
 	cur += len;
 	str[cur] = '\0';
-#ifdef __UNIXOS2__  /* Take out carriage returns under OS/2 */
-	if (cur>1) {
-	   if (str[cur-2] == '\r' && str[cur-1] == '\n') {
-	      str[cur-2] = '\n';
-	      str[cur-1] = '\0';
-	      cur--;
-	   }
-	}
-#endif
 	if (!quoted && cur > 1 && str[cur - 2] == SYM_BACKSLASH &&
 	    (str[cur - 1] == SYM_NEWLINE || str[cur-1] == SYM_CR)) {
 	    /* the line is ended backslash followed by newline.
@@ -1286,11 +1277,7 @@ _XlcCreateLocaleDataBase(
     if (name == NULL)
 	return (XPointer)NULL;
 
-#ifndef __UNIXOS2__
     name_q = XrmStringToQuark(name);
-#else
-    name_q = XrmStringToQuark((char*)__XOS2RedirRoot(name));
-#endif
     for (list = _db_list; list; list = list->next) {
 	if (name_q == list->name_q) {
 	    list->ref_count++;
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/lcFile.c b/nx-X11/lib/X11/lcFile.c
index eeb6ce312..cf03a90a7 100644
--- a/nx-X11/lib/X11/lcFile.c
+++ b/nx-X11/lib/X11/lcFile.c
@@ -36,9 +36,6 @@
 
 /************************************************************************/
 
-#ifdef __UNIXOS2__
-# define seteuid setuid
-#endif
 #define	iscomment(ch)	((ch) == '#' || (ch) == '\0')
 #if defined(WIN32)
 #define isreadable(f)	(_XAccessFile(f))
@@ -46,11 +43,7 @@
 #define isreadable(f)	((access((f), R_OK) != -1) ? 1 : 0)
 #endif
 
-#ifndef __UNIXOS2__
 #define LC_PATHDELIM ':'
-#else
-#define LC_PATHDELIM ';'
-#endif
 
 #define XLC_BUFSIZE 256
 
@@ -92,40 +85,7 @@ parse_line(
     return argc;
 }
 
-#ifdef __UNIXOS2__
-
-/* fg021216: entries in locale files are separated by colons while under
-   OS/2, path entries are separated by semicolon, so we need two functions */
-
-static int
-parse_line1(
-    char *line,
-    char **argv,
-    int argsize)
-{
-    int argc = 0;
-    char *p = line;
-
-    while (argc < argsize) {
-	while (isspace(*p)) {
-	    ++p;
-	}
-	if (*p == '\0') {
-	    break;
-	}
-	argv[argc++] = p;
-	while (*p != ';' && *p != '\n' && *p != '\0') {
-	    ++p;
-	}
-	if (*p == '\0') {
-	    break;
-	}
-	*p++ = '\0';
-    }
-
-    return argc;
-}
-#elif defined(WIN32)
+#if defined(WIN32)
 
 /* this is parse_line but skips drive letters at the beginning of the entry */
 static int
@@ -160,7 +120,7 @@ parse_line1(
     return argc;
 }
 
-#endif   /* __UNIXOS2__ */
+#endif   /* WIN32 */
 
 /* Splits a colon separated list of directories, and returns the constituent
    paths (without trailing slash). At most argsize constituents are stored
@@ -174,7 +134,7 @@ _XlcParsePath(
     char *p = path;
     int n, i;
 
-#if !defined(__UNIXOS2__) && !defined(WIN32)
+#if !defined(WIN32)
     n = parse_line(path, argv, argsize);
 #else
     n = parse_line1(path, argv, argsize);
@@ -265,11 +225,7 @@ xlocaledir(
 #endif /* NO_XLOCALEDIR */
 
     if (len < buf_len)
-#ifndef __UNIXOS2__
       strncpy(p, XLOCALEDIR, buf_len - len);
-#else
-      strncpy(p,__XOS2RedirRoot(XLOCALEDIR), buf_len - len);
-#endif
     buf[buf_len-1] = '\0';
 }
 
@@ -343,11 +299,7 @@ xlocalelibdir(
 #endif /* NO_XLOCALEDIR */
 
     if (len < buf_len)
-#ifndef __UNIXOS2__
       strncpy(p, XLOCALELIBDIR, buf_len - len);
-#else
-      strncpy(p,__XOS2RedirRoot(XLOCALELIBDIR), buf_len - len);
-#endif
     buf[buf_len-1] = '\0';
 }
 
@@ -374,17 +326,6 @@ resolve_name(
 	char *p = buf;
 	int n;
 	char *args[2], *from, *to;
-#ifdef __UNIXOS2__  /* Take out CR under OS/2 */
-	int len;
-
-	len = strlen(p);
-	if (len > 1) {
-	    if (*(p+len-2) == '\r' && *(p+len-1) == '\n') {
-		*(p+len-2) = '\n';
-		*(p+len-1) = '\0';
-	    }
-	}
-#endif
 	while (isspace(*p)) {
 	    ++p;
 	}
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
 
diff --git a/nx-X11/lib/X11/os2Stubs.c b/nx-X11/lib/X11/os2Stubs.c
deleted file mode 100644
index 5ffc4824c..000000000
--- a/nx-X11/lib/X11/os2Stubs.c
+++ /dev/null
@@ -1,428 +0,0 @@
-/*
- * (c) Copyright 1996 by Sebastien Marineau and Holger Veit
- *			<marineau@genie.uottawa.ca>
- *                      <Holger.Veit@gmd.de>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * HOLGER VEIT  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of Sebastien Marineau or Holger Veit
- * shall not be used in advertising or otherwise to promote the sale, use or other
- * dealings in this Software without prior written authorization from Holger Veit or
- * Sebastien Marineau.
- *
- */
-
-
-/* A few OS/2 functions needed in the X11 lib. Mainly, the file path redirection
- * functions and the "optimized" select() for the clients */
-
-#define I_NEED_OS2_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <nx-X11/Xpoll.h>
-#include <stdio.h>
-#include <sys/errno.h>
-#define INCL_DOSSEMAPHORES
-#define INCL_DOSNPIPES
-#define INCL_DOSMISC
-#define INCL_DOSMODULEMGR
-#undef BOOL
-#undef BYTE
-#include <os2.h>
-#include <sys/select.h>
-#include <sys/time.h>
-
-char *__XOS2RedirRoot(char *fname)
-{
-    /* This adds a further redirection by allowing the ProjectRoot
-     * to be prepended by the content of the envvar X11ROOT.
-     * This is for the purpose to move the whole X11 stuff to a different
-     * disk drive.
-     * The feature was added despite various environment variables
-     * because not all file opens respect them.
-     */
-    static char redirname[300]; /* enough for long filenames */
-    char *root;
-
-    /* if name does not start with /, assume it is not root-based */
-    if (fname==0 || !(fname[0]=='/' || fname[0]=='\\'))
-	return fname;
-
-    root = (char*)getenv("X11ROOT");
-    if (root==0 ||
-	(fname[1]==':' && isalpha(fname[0])) ||
-        (strlen(fname)+strlen(root)+2) > 300)
-	return fname;
-    sprintf(redirname,"%s%s",root,fname);
-    return redirname;
-}
-
-char *__XOS2RedirRoot1(char *format, char *arg1, char *arg2, char *arg3)
-{
-    /* this first constructs a name from a format and up to three
-     * components, then adds a path
-     */
-    char buf[300];
-    sprintf(buf,format,arg1,arg2,arg3);
-    return __XOS2RedirRoot(buf);
-}
-
-/* This below implements select() for the calls in this file. It has been */
-/* somewhat optimized for improved performance, but assumes a few */
-/* things so it cannot be used as a general select. If both pipes and     */
-/* sockets are present, this may call the emx select                          */
-
-
-HEV hPipeSem;
-HMODULE hmod_so32dll;
-static int (*os2_tcp_select)(int*,int,int,int,long);
-ULONG os2_get_sys_millis();
-extern int _files[];
-
-#define MAX_TCP 256
-/* These lifted from sys/emx.h. Change if that changes there! */
-#define F_SOCKET 0x10000000
-#define F_PIPE 0x20000000
-
-struct select_data
-{
-   fd_set read_copy;
-   fd_set write_copy;
-   BOOL have_read;
-   BOOL have_write;
-   int tcp_select_mask[MAX_TCP];
-   int tcp_emx_handles[MAX_TCP];
-   int tcp_select_copy[MAX_TCP];
-   int socket_nread;
-   int socket_nwrite;
-   int socket_ntotal;
-   int pipe_ntotal;
-   int pipe_have_write;
-   int max_fds;
-};
-
-int os2ClientSelect(int nfds, fd_set *readfds, fd_set *writefds,
-        fd_set *exceptfds, struct timeval *timeout)
-{
-static BOOL FirstTime=TRUE;
-static haveTCPIP=TRUE;
-ULONG timeout_ms;
-ULONG postCount, start_millis,now_millis;
-char faildata[16];
-struct select_data sd;
-BOOL any_ready;
-int np,ns, i,ready_handles,n;
-APIRET rc;
-
-sd.have_read=FALSE; sd.have_write=FALSE;
-sd.socket_nread=0; sd.socket_nwrite=0; sd.socket_ntotal=0;
-sd.max_fds=31; ready_handles=0; any_ready=FALSE;
-sd.pipe_ntotal=0; sd.pipe_have_write=FALSE;
-
-if(FirstTime){
-   /* First load the so32dll.dll module and get a pointer to the SELECT fn */
-
-   if((rc=DosLoadModule(faildata,sizeof(faildata),"SO32DLL",&hmod_so32dll))!=0){
-        fprintf(stderr, "Could not load module so32dll.dll, rc = %d. Error note %s\n",rc,faildata);
-        haveTCPIP=FALSE;
-        }
-   if((rc = DosQueryProcAddr(hmod_so32dll, 0, "SELECT", (PPFN)&os2_tcp_select))!=0){
-        fprintf(stderr, "Could not query address of SELECT, rc = %d.\n",rc);
-        haveTCPIP=FALSE;
-        }
-   /* Call these a first time to set the semaphore */
-    rc = DosCreateEventSem(NULL, &hPipeSem, DC_SEM_SHARED, FALSE);
-    if(rc) {
-             fprintf(stderr, "Could not create event semaphore, rc=%d\n",rc);
-             return(-1);
-             }
-    rc = DosResetEventSem(hPipeSem, &postCount);
-    FirstTime = FALSE;
-}
-
-/* Set up the time delay structs */
-
-    if(timeout!=NULL) {
-	timeout_ms=timeout->tv_sec*1000+timeout->tv_usec/1000;
-	}
-    else { timeout_ms=1000000; }  /* This should be large enough... */
-    if(timeout_ms>0) start_millis=os2_get_sys_millis();
-
-/* Copy the masks */
-    {FD_ZERO(&sd.read_copy);}
-    {FD_ZERO(&sd.write_copy);}
-    if(readfds!=NULL){ XFD_COPYSET(readfds,&sd.read_copy); sd.have_read=TRUE;}
-    if(writefds!=NULL) {XFD_COPYSET(writefds,&sd.write_copy);sd.have_write=TRUE;}
-
-/* And zero the original masks */
-    if(sd.have_read){ FD_ZERO(readfds);}
-    if(sd.have_write) {FD_ZERO(writefds);}
-    if(exceptfds != NULL) {FD_ZERO(exceptfds);}
-
-/* Now we parse the fd_sets passed to select and separate pipe/sockets */
-        n = os2_parse_select(&sd,nfds);
-        if(n == -1) {
-           errno = EBADF;
-           return (-1);
-           }
-
-/* Now we have three cases: either we have sockets, pipes, or both */
-/* We handle all three cases differently to optimize things */
-
-/* Case 1: only pipes! */
-        if((sd.pipe_ntotal >0) && (!sd.socket_ntotal)){
-            np = os2_check_pipes(&sd,readfds,writefds);
-            if(np > 0){
-               return (np);
-               }
-            else if (np == -1) { return(-1); }
-            while(!any_ready){
-                 rc = DosWaitEventSem(hPipeSem, timeout_ms);
-                 if(rc == 640)  {
-                     return(0);
-                     }
-                 if((rc != 0) && (rc != 95)) {errno= EBADF; return(-1);}
-                 np = os2_check_pipes(&sd,readfds,writefds);
-                 if (np > 0){
-                    return(np);
-                    }
-                 else if (np < 0){ return(-1); }
-                 }
-          }
-
-/* Case 2: only sockets. Just let the os/2 tcp select do the work */
-        if((sd.socket_ntotal > 0) && (!sd.pipe_ntotal)){
-                ns = os2_check_sockets(&sd, readfds, writefds, timeout_ms);
-                return (ns);
-                }
-
-/* Case 3: combination of both */
-        if((sd.socket_ntotal > 0) && (sd.pipe_ntotal)){
-           np = os2_check_pipes(&sd,readfds,writefds);
-              if(np > 0){
-                 any_ready=TRUE;
-                 ready_handles += np;
-                 }
-              else if (np == -1) { return(-1); }
-
-           ns = os2_check_sockets(&sd,readfds,writefds, 0);
-           if(ns>0){
-               ready_handles+=ns;
-               any_ready = TRUE;
-               }
-           else if (ns == -1) {return(-1);}
-
-           while (!any_ready && timeout_ms){
-
-                rc = DosWaitEventSem(hPipeSem, 10L);
-                if(rc == 0){
-                        np = os2_check_pipes(&sd,readfds,writefds);
-                        if(np > 0){
-                        ready_handles+=np;
-                        any_ready = TRUE;
-                        }
-                        else if (np == -1) {
-                                return(-1); }
-                      }
-
-                 ns = os2_check_sockets(&sd,readfds,writefds,exceptfds, 0);
-                 if(ns>0){
-                      ready_handles+=ns;
-                      any_ready = TRUE;
-                     }
-                 else if (ns == -1) {return(-1);}
-
-                  if (i%8 == 0) {
-                    now_millis = os2_get_sys_millis();
-                    if((now_millis-start_millis) > timeout_ms) timeout_ms = 0;
-                    }
-                   i++;
-                  }
-        }
-
-return(ready_handles);
-}
-
-
-ULONG os2_get_sys_millis()
-{
-   APIRET rc;
-   ULONG milli;
-
-   rc = DosQuerySysInfo(14, 14, &milli, sizeof(milli));
-   if(rc) {
-        fprintf(stderr,"Bad return code querying the millisecond counter! rc=%d\n",rc);
-        return(0);
-        }
-   return(milli);
-}
-
-int os2_parse_select(sd,nfds)
-struct select_data *sd;
-int nfds;
-{
-   int i;
-   APIRET rc;
-/* First we determine up to which descriptor we need to check.              */
-/* No need to check up to 256 if we don't have to (and usually we dont...)*/
-/* Note: stuff here is hardcoded for fd_sets which are int[8] as in EMX!!!    */
-
-  if(nfds > sd->max_fds){
-     for(i=0;i<((FD_SETSIZE+31)/32);i++){
-        if(sd->read_copy.fds_bits[i] ||
-            sd->write_copy.fds_bits[i])
-                        sd->max_fds=(i*32) +32;
-        }
-     }
-   else { sd->max_fds = nfds; }
-/* Check if result is greater than specified in select() call */
-  if(sd->max_fds > nfds) sd->max_fds = nfds;
-
-  if (sd->have_read)
-    {
-      for (i = 0; i < sd->max_fds; ++i) {
-        if (FD_ISSET (i, &sd->read_copy)){
-         if(_files[i] & F_SOCKET)
-           {
-            sd->tcp_select_mask[sd->socket_ntotal]=_getsockhandle(i);
-            sd->tcp_emx_handles[sd->socket_ntotal]=i;
-            sd->socket_ntotal++; sd->socket_nread++;
-           }
-         else if (_files[i] & F_PIPE)
-          {
-            sd -> pipe_ntotal++;
-            rc = DosSetNPipeSem((HPIPE)i, (HSEM) hPipeSem, i);
-            if(rc) { fprintf(stderr,"Error SETNPIPE rc = %d\n",rc); return -1;}
-          }
-        }
-      }
-    }
-
-  if (sd->have_write)
-    {
-      for (i = 0; i < sd->max_fds; ++i) {
-        if (FD_ISSET (i, &sd->write_copy)){
-         if(_files[i] & F_SOCKET)
-         {
-            sd->tcp_select_mask[sd->socket_ntotal]=_getsockhandle(i);
-            sd->tcp_emx_handles[sd->socket_ntotal]=i;
-            sd->socket_ntotal++; sd->socket_nwrite++;
-         }
-         else if (_files[i] & F_PIPE)
-          {
-            sd -> pipe_ntotal++;
-            rc = DosSetNPipeSem((HPIPE)i, (HSEM) hPipeSem, i);
-            if(rc) { fprintf(stderr,"Error SETNPIPE rc = %d\n",rc); return -1;}
-            sd -> pipe_have_write=TRUE;
-          }
-        }
-      }
-    }
-
-
-return(sd->socket_ntotal);
-}
-
-
-int os2_check_sockets(sd,readfds,writefds)
-struct select_data *sd;
-fd_set *readfds,*writefds;
-{
-   int e,i;
-   int j,n;
-        memcpy(sd->tcp_select_copy,sd->tcp_select_mask,
-                sd->socket_ntotal*sizeof(int));
-
-        e = os2_tcp_select(sd->tcp_select_copy,sd->socket_nread,
-                sd->socket_nwrite, 0, 0);
-
-        if(e == 0) return(e);
-/* We have something ready? */
-        if(e>0){
-            j = 0; n = 0;
-            for (i = 0; i < sd->socket_nread; ++i, ++j)
-                 if (sd->tcp_select_copy[j] != -1)
-                    {
-                    FD_SET (sd->tcp_emx_handles[j], readfds);
-                    n ++;
-                    }
-             for (i = 0; i < sd->socket_nwrite; ++i, ++j)
-                  if (sd->tcp_select_copy[j] != -1)
-                     {
-                     FD_SET (sd->tcp_emx_handles[j], writefds);
-                     n ++;
-                     }
-               errno = 0;
-
-               return n;
-              }
-        if(e<0){
-           /*Error -- TODO */
-           fprintf(stderr,"Error in server select! e=%d\n",e);
-           errno = EBADF;
-           return (-1);
-           }
- }
-
-/* Check to see if anything is ready on pipes */
-
-int os2_check_pipes(sd,readfds,writefds)
-struct select_data *sd;
-fd_set *readfds,*writefds;
-{
-int i,e;
-ULONG ulPostCount;
-PIPESEMSTATE pipeSemState[128];
-APIRET rc;
-        e = 0;
-        rc = DosResetEventSem(hPipeSem,&ulPostCount);
-        rc = DosQueryNPipeSemState((HSEM) hPipeSem, (PPIPESEMSTATE)&pipeSemState,
-                sizeof(pipeSemState));
-        if(rc) fprintf(stderr,"SELECT: rc from QueryNPipeSem: %d\n",rc);
-        i=0;
-        while (pipeSemState[i].fStatus != 0) {
-           /*fprintf(stderr,"SELECT: sem entry, stat=%d, flag=%d, key=%d,avail=%d\n",
-                pipeSemState[i].fStatus,pipeSemState[i].fFlag,pipeSemState[i].usKey,
-                pipeSemState[i].usAvail); */
-           if((pipeSemState[i].fStatus == 1) &&
-                    (FD_ISSET(pipeSemState[i].usKey,&sd->read_copy))){
-                FD_SET(pipeSemState[i].usKey,readfds);
-                e++;
-                }
-           else if((pipeSemState[i].fStatus == 2)  &&
-                    (FD_ISSET(pipeSemState[i].usKey,&sd->write_copy))){
-                FD_SET(pipeSemState[i].usKey,writefds);
-                e++;
-                }
-            else if( (pipeSemState[i].fStatus == 3) &&
-                ( (FD_ISSET(pipeSemState[i].usKey,&sd->read_copy)) ||
-                  (FD_ISSET(pipeSemState[i].usKey,&sd->write_copy)) )){
-                errno = EBADF;
-                return (-1);
-                }
-            i++;
-            } /* endwhile */
-        /*fprintf(stderr,"Done listing pipe sem entries, total %d entries, total ready entries %d\n",i,e);*/
-errno = 0;
-return(e);
-}
-
-
-
diff --git a/nx-X11/lib/xtrans/Xtrans.c b/nx-X11/lib/xtrans/Xtrans.c
index 637c419a2..328a970b1 100644
--- a/nx-X11/lib/xtrans/Xtrans.c
+++ b/nx-X11/lib/xtrans/Xtrans.c
@@ -669,7 +669,7 @@ TRANS(SetOption) (XtransConnInfo ciptr, int option, int arg)
 #else
 	    ret = fcntl (fd, F_SETFL, ret | O_NDELAY);
 #endif
-#endif /* AIXV3  || uniosu */
+#endif /* WIN32 */
 #endif /* FIOSNBIO */
 #endif /* O_NONBLOCK */
 	    break;
diff --git a/nx-X11/lib/xtrans/Xtranssock.c b/nx-X11/lib/xtrans/Xtranssock.c
index 1a76c406d..dff217e9d 100644
--- a/nx-X11/lib/xtrans/Xtranssock.c
+++ b/nx-X11/lib/xtrans/Xtranssock.c
@@ -136,7 +136,7 @@ from the copyright holders.
 #ifndef NO_TCP_H
 #if defined(linux) || defined(__GLIBC__)
 #include <sys/param.h>
-#endif /* osf */
+#endif /* linux || __GLIBC__ */
 #if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
 #include <sys/param.h>
 #include <machine/endian.h>
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index 8efbcf14a..fe70d007a 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -160,7 +160,7 @@ INSTPGMFLAGS =
 #if HasPam && HasPamMisc
         PAMLIBS = PamLibraries PamMiscLibraries
 #endif
-#if !(SystemV4 || defined(SGIArchitecture) || UseRgbTxt)
+#if !(SystemV4 || UseRgbTxt)
        DBMLIBS = DBMLibrary
 #endif
         SYSLIBS = $(ZLIB) MathLibrary $(DBMLIBS) $(USB) \
@@ -248,9 +248,7 @@ NXAGENTOBJS = hw/nxagent/miinitext.o     \
               hw/nxagent/NXmiexpose.o    \
               hw/nxagent/NXresource.o    \
               hw/nxagent/NXdamage.o
-#elif !defined(LynxOSArchitecture) && \
-      !defined(Win32Architecture) && \
-      !defined(QNX4Architecture)
+#elif !defined(Win32Architecture)
 NXAGENTOBJS = hw/nxagent/miinitext.o     \
               hw/nxagent/NXwindow.o      \
               hw/nxagent/NXevents.o      \
@@ -516,14 +514,14 @@ ServerTarget(NXWin,$(NXWINDIRS),$(NXWINOBJS), \
 
 MIEXTDIRS = $(SHADOWDIR) $(LAYERDIR) $(ROOTLESSDIR) $(MIDAMAGEDIR)
 IPLANDIRS = $(IPLAN2P2DIR) $(IPLAN2P4DIR) $(IPLAN2P8DIR)
-DDXDIRS = $(DECWSDDXDIR) $(SUNDDXDIR) $(LYNXDDXDIR) \
+DDXDIRS = $(DECWSDDXDIR) $(SUNDDXDIR) \
 	  $(HPDDXDIR) $(XFREE86DDXDIR) \
 	  $(NXAGENTDDXDIR) $(NXWINDDXDIR)
 SUBDIRS = $(STDDIRS) \
 	  $(IPLANDIRS) $(ILBMDIR) \
           $(DDXDIRS) $(FBSUBDIR) $(KDRIVEDIRS) $(MIEXTDIRS)
 
-#if  defined(ServerToInstall) && !defined(OS2Architecture)
+#if  defined(ServerToInstall)
 install::
 	-(cd $(DESTDIR)$(BINDIR); $(RM) X; $(LN) ServerToInstall X)
 #endif
diff --git a/nx-X11/programs/Xserver/Xext/security.c b/nx-X11/programs/Xserver/Xext/security.c
index 6883db5f8..3a638460e 100644
--- a/nx-X11/programs/Xserver/Xext/security.c
+++ b/nx-X11/programs/Xserver/Xext/security.c
@@ -1481,11 +1481,7 @@ SecurityFreePropertyAccessList(void)
     }
 } /* SecurityFreePropertyAccessList */
 
-#ifndef __UNIXOS2__
 #define SecurityIsWhitespace(c) ( (c == ' ') || (c == '\t') || (c == '\n') )
-#else
-#define SecurityIsWhitespace(c) ( (c == ' ') || (c == '\t') || (c == '\n') || (c == '\r') )
-#endif
 
 static char *
 SecuritySkipWhitespace(
@@ -1774,8 +1770,6 @@ SecurityLoadPropertyAccessList(void)
 
 #endif
 
-#ifndef __UNIXOS2__
-
 #ifdef NXAGENT_SERVER
 
     f = Fopen(_NXGetPolicyFilePath(SecurityPolicyFile), "r");
@@ -1786,20 +1780,6 @@ SecurityLoadPropertyAccessList(void)
 
 #endif
 
-#else
-
-#ifdef NXAGENT_SERVER
-
-    f = Fopen((char*)__XOS2RedirRoot( _NXGetPolicyFilePath(SecurityPolicyFile)), "r");
-
-#else
-
-    f = Fopen((char*)__XOS2RedirRoot(SecurityPolicyFile), "r");
-
-#endif
-
-#endif
- 
     if (!f)
     {
 #ifdef NXAGENT_SERVER
diff --git a/nx-X11/programs/Xserver/Xext/shm.c b/nx-X11/programs/Xserver/Xext/shm.c
index c70f52b6a..dc8bbf97b 100644
--- a/nx-X11/programs/Xserver/Xext/shm.c
+++ b/nx-X11/programs/Xserver/Xext/shm.c
@@ -34,13 +34,8 @@ in this Software without prior written authorization from The Open Group.
 #endif
 
 #include <sys/types.h>
-#ifndef Lynx
 #include <sys/ipc.h>
 #include <sys/shm.h>
-#else
-#include <ipc.h>
-#include <shm.h>
-#endif
 #include <unistd.h>
 #include <sys/stat.h>
 #include <nx-X11/X.h>
diff --git a/nx-X11/programs/Xserver/Xext/sync.c b/nx-X11/programs/Xserver/Xext/sync.c
index 4f24d5b54..e1580b3a3 100644
--- a/nx-X11/programs/Xserver/Xext/sync.c
+++ b/nx-X11/programs/Xserver/Xext/sync.c
@@ -71,7 +71,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #include "protocol-versions.h"
 
 #include <stdio.h>
-#if !defined(WIN32) && !defined(Lynx)
+#if !defined(WIN32)
 #include <sys/time.h>
 #endif
 
diff --git a/nx-X11/programs/Xserver/Xext/xvmc.c b/nx-X11/programs/Xserver/Xext/xvmc.c
index 710101d07..0a43baa22 100644
--- a/nx-X11/programs/Xserver/Xext/xvmc.c
+++ b/nx-X11/programs/Xserver/Xext/xvmc.c
@@ -22,14 +22,9 @@
 #include "xvmcext.h"
 
 #ifdef HAS_XVMCSHM
-#ifndef Lynx
 #include <sys/ipc.h>
 #include <sys/types.h>
 #include <sys/shm.h>
-#else
-#include <ipc.h>
-#include <shm.h>
-#endif /* Lynx */
 #endif /* HAS_XVMCSHM */
    
 
diff --git a/nx-X11/programs/Xserver/dix/devices.c b/nx-X11/programs/Xserver/dix/devices.c
index 69cdc82e1..ad1788277 100644
--- a/nx-X11/programs/Xserver/dix/devices.c
+++ b/nx-X11/programs/Xserver/dix/devices.c
@@ -662,13 +662,7 @@ InitPtrFeedbackClassDeviceStruct(DeviceIntPtr dev, PtrCtrlProcPtr controlProc)
     if (!feedc)
 	return FALSE;
     feedc->CtrlProc = controlProc;
-#ifdef sgi
-    feedc->ctrl.num = 1;
-    feedc->ctrl.den = 1;
-    feedc->ctrl.threshold = 1;
-#else
     feedc->ctrl = defaultPointerControl;
-#endif
     feedc->ctrl.id = 0;
     if ( (feedc->next = dev->ptrfeed) )
         feedc->ctrl.id = dev->ptrfeed->ctrl.id + 1;
diff --git a/nx-X11/programs/Xserver/dix/events.c b/nx-X11/programs/Xserver/dix/events.c
index 166d2e85e..abbde67d5 100644
--- a/nx-X11/programs/Xserver/dix/events.c
+++ b/nx-X11/programs/Xserver/dix/events.c
@@ -2986,12 +2986,7 @@ EventSelectForWindow(register WindowPtr pWin, register ClientPtr client, Mask ma
     if (wClient (pWin) == client)
     {
 	check = pWin->eventMask;
-#ifdef SGIMISC
-	pWin->eventMask =
-	    (mask & ~SGIMiscSpecialDestroyMask) | (pWin->eventMask & SGIMiscSpecialDestroyMask);
-#else
 	pWin->eventMask = mask;
-#endif
     }
     else
     {
@@ -3000,9 +2995,6 @@ EventSelectForWindow(register WindowPtr pWin, register ClientPtr client, Mask ma
 	    if (SameClient(others, client))
 	    {
 		check = others->mask;
-#ifdef SGIMISC
-		mask = (mask & ~SGIMiscSpecialDestroyMask) | (others->mask & SGIMiscSpecialDestroyMask);
-#endif
 		if (mask == 0)
 		{
 		    FreeResource(others->resource, RT_NONE);
diff --git a/nx-X11/programs/Xserver/fb/fb.h b/nx-X11/programs/Xserver/fb/fb.h
index 7c33562b4..58aa8561b 100644
--- a/nx-X11/programs/Xserver/fb/fb.h
+++ b/nx-X11/programs/Xserver/fb/fb.h
@@ -104,8 +104,7 @@ typedef unsigned __int64    FbBits;
       defined(__sparc64__) || defined(_LP64) || \
       defined(__s390x__) || \
       defined(amd64) || defined (__amd64__) || \
-      defined (__powerpc64__) || \
-      (defined(sgi) && (_MIPS_SZLONG == 64))
+      defined (__powerpc64__)
 typedef unsigned long	    FbBits;
 #  else
 typedef unsigned long long  FbBits;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index 4dbb003f2..46e01c737 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -587,12 +587,6 @@ int ddxProcessArgument(int argc, char *argv[], int i)
     if(++i < argc)
     {
 
-      #ifdef sgi
-
-      userdefinedfontpath = 1;
-
-      #endif
-
       #ifdef TEST
       fprintf(stderr, "ddxProcessArgument: User defined font path [%s].\n", argv[i]);
       #endif
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
index 7dbcce896..f849c3e5a 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile
+++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
@@ -6,11 +6,6 @@ NULL =
 SUBDIRS = compext \
           $(NULL)
 
-#ifdef OS2Architecture
-SRCS1 = os2Stub.c
-OBJS1 = os2Stub.o
-#endif
-
 SRCS =  \
 	NXwindow.c \
 	NXevents.c \
@@ -71,7 +66,6 @@ SRCS =  \
 	stubs.c \
 	xpstubs.c \
 	miinitext.c \
-	$(SRCS1) \
 	$(NULL)
 
 OBJS =  \
@@ -134,7 +128,6 @@ OBJS =  \
 	stubs.o \
 	xpstubs.o \
 	miinitext.o \
-	$(OBJS1) \
 	$(NULL)
 
 VFBINCLUDES =  \
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c
index c492378a0..218766e06 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Init.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c
@@ -536,11 +536,6 @@ void OsVendorEndRedirectErrorFFunction()
   nxagentEndRedirectToClientsLog();
 }
 
-/* this is just to get the server to link on AIX */
-#ifdef AIXV3
-int SelectWaitTime = 10000; /* usec */
-#endif
-
 ServerGrabInfoRec nxagentGrabServerInfo;
 
 static void nxagentGrabServerCallback(CallbackListPtr *callbacks, void *data,
diff --git a/nx-X11/programs/Xserver/hw/nxagent/os2Stub.c b/nx-X11/programs/Xserver/hw/nxagent/os2Stub.c
deleted file mode 100644
index 226140dc5..000000000
--- a/nx-X11/programs/Xserver/hw/nxagent/os2Stub.c
+++ /dev/null
@@ -1,410 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE which comes in the source       */
-/* distribution.                                                          */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-/*
- * (c) Copyright 1996 by Sebastien Marineau
- *			<marineau@genie.uottawa.ca>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a 
- * copy of this software and associated documentation files (the "Software"), 
- * to deal in the Software without restriction, including without limitation 
- * the rights to use, copy, modify, merge, publish, distribute, sublicense, 
- * and/or sell copies of the Software, and to permit persons to whom the 
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL 
- * HOLGER VEIT  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF 
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
- * SOFTWARE.
- * 
- * Except as contained in this notice, the name of Sebastien Marineau shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from Sebastien Marineau.
- *
- */
-
-/* This below implements select() for calls in nxagent. It has been         */
-/* somewhat optimized for improved performance, but assumes a few */
-/* things so it cannot be used as a general select.                             */
-
-#define I_NEED_OS2_H
-#include "Xpoll.h"
-#include <stdio.h>
-#include <sys/select.h>
-#include <sys/errno.h>
-#include <sys/time.h>
-#define INCL_DOSSEMAPHORES
-#define INCL_DOSNPIPES
-#define INCL_DOSMISC
-#define INCL_DOSMODULEMGR
-#undef BOOL
-#undef BYTE
-#include <os2.h>
-
-HEV hPipeSem;
-HMODULE hmod_so32dll;
-static int (*os2_tcp_select)(int*,int,int,int,long);
-ULONG os2_get_sys_millis();
-extern int _files[];
-
-#define MAX_TCP 256
-/* These lifted from sys/emx.h. Change if that changes there! */
-#define F_SOCKET 0x10000000
-#define F_PIPE 0x20000000
-
-struct select_data
-{
-   fd_set read_copy;
-   fd_set write_copy;
-   BOOL have_read;
-   BOOL have_write;
-   int tcp_select_mask[MAX_TCP];
-   int tcp_emx_handles[MAX_TCP];
-   int tcp_select_copy[MAX_TCP];
-   int socket_nread;
-   int socket_nwrite;
-   int socket_ntotal;
-   int pipe_ntotal;
-   int pipe_have_write;
-   int max_fds;
-};
-
-int os2PseudoSelect(int nfds, fd_set *readfds, fd_set *writefds,
-        fd_set *exceptfds, struct timeval *timeout)
-{
-static BOOL FirstTime=TRUE;
-static haveTCPIP=TRUE;
-ULONG timeout_ms;
-ULONG postCount, start_millis,now_millis;
-char faildata[16];
-struct select_data sd;
-BOOL any_ready;
-int np,ns, i,ready_handles,n;
-APIRET rc;
-
-sd.have_read=FALSE; sd.have_write=FALSE; 
-sd.socket_nread=0; sd.socket_nwrite=0; sd.socket_ntotal=0;
-sd.max_fds=31; ready_handles=0; any_ready=FALSE;
-sd.pipe_ntotal=0; sd.pipe_have_write=FALSE;
-
-if(FirstTime){
-   /* First load the so32dll.dll module and get a pointer to the SELECT function */
-
-   if((rc=DosLoadModule(faildata,sizeof(faildata),"SO32DLL",&hmod_so32dll))!=0){
-        fprintf(stderr, "Could not load module so32dll.dll, rc = %d. Error note %s\n",rc,faildata);
-        haveTCPIP=FALSE;
-        }
-   if((rc = DosQueryProcAddr(hmod_so32dll, 0, "SELECT", (PPFN)&os2_tcp_select))!=0){
-        fprintf(stderr, "Could not query address of SELECT, rc = %d.\n",rc);
-        haveTCPIP=FALSE;
-        }
-   /* Call these a first time to set the semaphore */
-    /* rc = DosCreateEventSem(NULL, &hPipeSem, DC_SEM_SHARED, FALSE);
-    if(rc) { 
-             fprintf(stderr, "Could not create event semaphore, rc=%d\n",rc);
-             return(-1);
-             }
-    rc = DosResetEventSem(hPipeSem, &postCount); */ /* Done in xtrans code for servers*/
-
-fprintf(stderr, "Client select() done first-time stuff, sem handle %d.\n",hPipeSem);
-
-   FirstTime = FALSE;
-}
-
-/* Set up the time delay structs */
-
-    if(timeout!=NULL) {
-	timeout_ms=timeout->tv_sec*1000+timeout->tv_usec/1000;
-	}
-    else { timeout_ms=1000000; }  /* This should be large enough... */
-    if(timeout_ms>0) start_millis=os2_get_sys_millis();
-
-/* Copy the masks */
-    {FD_ZERO(&sd.read_copy);}
-    {FD_ZERO(&sd.write_copy);}
-    if(readfds!=NULL){ XFD_COPYSET(readfds,&sd.read_copy); sd.have_read=TRUE;}
-    if(writefds!=NULL) {XFD_COPYSET(writefds,&sd.write_copy);sd.have_write=TRUE;}
-
-/* And zero the original masks */
-    if(sd.have_read){ FD_ZERO(readfds);}
-    if(sd.have_write) {FD_ZERO(writefds);}
-    if(exceptfds != NULL) {FD_ZERO(exceptfds);}
-
-/* Now we parse the fd_sets passed to select and separate pipe/sockets */
-        n = os2_parse_select(&sd,nfds);
-        if(n == -1) {
-           errno = EBADF;
-           return (-1);
-           }
-
-/* Now we have three cases: either we have sockets, pipes, or both */
-/* We handle all three cases differently to optimize things */
-
-/* Case 1: only pipes! */
-        if((sd.pipe_ntotal >0) && (!sd.socket_ntotal)){
-            np = os2_check_pipes(&sd,readfds,writefds);
-            if(np > 0){
-               return (np);
-               }
-            else if (np == -1) { return(-1); }
-            while(!any_ready){
-                 rc = DosWaitEventSem(hPipeSem, timeout_ms);
-                 /* if(rc) fprintf(stderr,"Sem-wait timeout, rc = %d\n",rc); */
-                 if(rc == 640)  {
-                     return(0);
-                     }
-                 if((rc != 0) && (rc != 95)) {errno= EBADF; return(-1);}
-                 np = os2_check_pipes(&sd,readfds,writefds);
-                 if (np > 0){
-                    return(np);
-                    }
-                 else if (np < 0){ return(-1); }
-                 }
-          }
-
-/* Case 2: only sockets. Just let the os/2 tcp select do the work */
-        if((sd.socket_ntotal > 0) && (!sd.pipe_ntotal)){
-                ns = os2_check_sockets(&sd, readfds, writefds, timeout_ms);
-                return (ns);
-                }
-
-/* Case 3: combination of both */
-        if((sd.socket_ntotal > 0) && (sd.pipe_ntotal)){
-           np = os2_check_pipes(&sd,readfds,writefds);
-              if(np > 0){
-                 any_ready=TRUE;
-                 ready_handles += np;
-                 }
-              else if (np == -1) { return(-1); }
-
-           ns = os2_check_sockets(&sd,readfds,writefds, 0);
-           if(ns>0){
-               ready_handles+=ns;
-               any_ready = TRUE;
-               }
-           else if (ns == -1) {return(-1);}
-
-           while (!any_ready && timeout_ms){
-
-                rc = DosWaitEventSem(hPipeSem, 10L);
-                if(rc == 0){
-                        np = os2_check_pipes(&sd,readfds,writefds);
-                        if(np > 0){
-                        ready_handles+=np;
-                        any_ready = TRUE;
-                        }
-                        else if (np == -1) { 
-                                return(-1); }
-                      }
-
-                 ns = os2_check_sockets(&sd,readfds,writefds,exceptfds, 0);
-                 if(ns>0){
-                      ready_handles+=ns;
-                      any_ready = TRUE;
-                     }
-                 else if (ns == -1) {return(-1);}
-
-                  if (i%8 == 0) { 
-                    now_millis = os2_get_sys_millis();
-                    if((now_millis-start_millis) > timeout_ms) timeout_ms = 0;
-                    }
-                   i++;
-                  }
-        }
-
-return(ready_handles);
-}
-
-
-ULONG os2_get_sys_millis()
-{
-   APIRET rc;
-   ULONG milli;
-
-   rc = DosQuerySysInfo(14, 14, &milli, sizeof(milli));
-   if(rc) {
-        fprintf(stderr,"Bad return code querying the millisecond counter! rc=%d\n",rc);
-        return(0);
-        }
-   return(milli);
-}
-
-int os2_parse_select(sd,nfds)
-struct select_data *sd;
-int nfds;
-{
-   int i;
-   APIRET rc;
-/* First we determine up to which descriptor we need to check.              */
-/* No need to check up to 256 if we don't have to (and usually we dont...)*/
-/* Note: stuff here is hardcoded for fd_sets which are int[8] as in EMX!    */
-
-  if(nfds > sd->max_fds){
-     for(i=0;i<((FD_SETSIZE+31)/32);i++){
-        if(sd->read_copy.fds_bits[i] ||
-            sd->write_copy.fds_bits[i])
-                        sd->max_fds=(i*32) +32;
-        }
-     }
-   else { sd->max_fds = nfds; }
-/* Check if result is greater than specified in select() call */
-  if(sd->max_fds > nfds) sd->max_fds = nfds;
-
-  if (sd->have_read)
-    {
-      for (i = 0; i < sd->max_fds; ++i) {
-        if (FD_ISSET (i, &sd->read_copy)){
-         if(_files[i] & F_SOCKET)
-           {
-            sd->tcp_select_mask[sd->socket_ntotal]=_getsockhandle(i);
-            sd->tcp_emx_handles[sd->socket_ntotal]=i;
-            sd->socket_ntotal++; sd->socket_nread++;
-           }
-         else if (_files[i] & F_PIPE)
-          {
-            sd -> pipe_ntotal++;
-            /* rc = DosSetNPipeSem((HPIPE)i, (HSEM) hPipeSem, i);
-            if(rc) { fprintf(stderr,"Error SETNPIPE rc = %d\n",rc); return -1;} */
-          }
-        }
-      }
-    }
-
-  if (sd->have_write)
-    {
-      for (i = 0; i < sd->max_fds; ++i) {
-        if (FD_ISSET (i, &sd->write_copy)){
-         if(_files[i] & F_SOCKET)
-         {
-            sd->tcp_select_mask[sd->socket_ntotal]=_getsockhandle(i);
-            sd->tcp_emx_handles[sd->socket_ntotal]=i;
-            sd->socket_ntotal++; sd->socket_nwrite++;
-         }
-         else if (_files[i] & F_PIPE)
-          {
-            sd -> pipe_ntotal++;
-            /* rc = DosSetNPipeSem((HPIPE)i, (HSEM) hPipeSem, i);
-            if(rc) { fprintf(stderr,"Error SETNPIPE rc = %d\n",rc); return -1;} */
-            sd -> pipe_have_write=TRUE;
-          }
-        }
-      }
-    }
-
-
-return(sd->socket_ntotal);
-}
-
-
-int os2_check_sockets(sd,readfds,writefds)
-struct select_data *sd;
-fd_set *readfds,*writefds;
-{
-   int e,i;
-   int j,n;
-        memcpy(sd->tcp_select_copy,sd->tcp_select_mask,
-                sd->socket_ntotal*sizeof(int));
- 
-        e = os2_tcp_select(sd->tcp_select_copy,sd->socket_nread,
-                sd->socket_nwrite, 0, 0);
-
-        if(e == 0) return(e);
-/* We have something ready? */
-        if(e>0){
-            j = 0; n = 0;
-            for (i = 0; i < sd->socket_nread; ++i, ++j)
-                 if (sd->tcp_select_copy[j] != -1)
-                    {
-                    FD_SET (sd->tcp_emx_handles[j], readfds);
-                    n ++;
-                    }
-             for (i = 0; i < sd->socket_nwrite; ++i, ++j)
-                  if (sd->tcp_select_copy[j] != -1)
-                     {
-                     FD_SET (sd->tcp_emx_handles[j], writefds);
-                     n ++;
-                     }
-               errno = 0;
-               
-               return n;
-              }
-        if(e<0){
-           /*Error -- TODO. EBADF is a good choice for now. */
-           fprintf(stderr,"Error in server select! e=%d\n",e);
-           errno = EBADF;
-           return (-1);
-           }
- }
-
-/* Check to see if anything is ready on pipes */
-
-int os2_check_pipes(sd,readfds,writefds)
-struct select_data *sd;
-fd_set *readfds,*writefds;
-{
-int i,e;
-ULONG ulPostCount;
-PIPESEMSTATE pipeSemState[128];
-APIRET rc;
-        e = 0;
-        rc = DosResetEventSem(hPipeSem,&ulPostCount);
-        rc = DosQueryNPipeSemState((HSEM) hPipeSem, (PPIPESEMSTATE)&pipeSemState, 
-                sizeof(pipeSemState));
-        if(rc) fprintf(stderr,"SELECT: rc from QueryNPipeSem: %d\n",rc);
-        i=0;
-        while (pipeSemState[i].fStatus != 0) {
-           /*fprintf(stderr,"SELECT: sem entry, stat=%d, flag=%d, key=%d,avail=%d\n",
-                pipeSemState[i].fStatus,pipeSemState[i].fFlag,pipeSemState[i].usKey,
-                pipeSemState[i].usAvail);  */
-           if((pipeSemState[i].fStatus == 1) &&
-                    (FD_ISSET(pipeSemState[i].usKey,&sd->read_copy))){
-                FD_SET(pipeSemState[i].usKey,readfds);
-                e++;
-                }
-           else if((pipeSemState[i].fStatus == 2)  &&
-                    (FD_ISSET(pipeSemState[i].usKey,&sd->write_copy))){
-                FD_SET(pipeSemState[i].usKey,writefds);
-                e++;
-                }
-            else if( (pipeSemState[i].fStatus == 3) &&
-                ( (FD_ISSET(pipeSemState[i].usKey,&sd->read_copy)) ||
-                  (FD_ISSET(pipeSemState[i].usKey,&sd->write_copy)) )){
-                errno = EBADF;
-                /* fprintf(stderr,"Pipe has closed down, fd=%d\n",pipeSemState[i].usKey); */
-                return (-1);
-                }
-            i++;
-            } /* endwhile */
-        /*fprintf(stderr,"Done listing pipe sem entries, total %d entries, total ready entries %d\n"i,e);*/
-errno = 0;
-return(e);
-}
-
diff --git a/nx-X11/programs/Xserver/include/os.h b/nx-X11/programs/Xserver/include/os.h
index 268513bfd..881abfccb 100644
--- a/nx-X11/programs/Xserver/include/os.h
+++ b/nx-X11/programs/Xserver/include/os.h
@@ -263,7 +263,7 @@ void OsBlockSignals (void);
 
 void OsReleaseSignals (void);
 
-#if !defined(WIN32) && !defined(__UNIXOS2__)
+#if !defined(WIN32)
 extern int System(char *);
 extern void * Popen(char *, char *);
 extern int Pclose(void *);
diff --git a/nx-X11/programs/Xserver/include/servermd.h b/nx-X11/programs/Xserver/include/servermd.h
index 27b5a8fb9..04cd97bb8 100644
--- a/nx-X11/programs/Xserver/include/servermd.h
+++ b/nx-X11/programs/Xserver/include/servermd.h
@@ -114,25 +114,12 @@ SOFTWARE.
 
 #endif /* __aarch64__ */
 
-#if defined (hpux) || defined __hppa__
-
-#define IMAGE_BYTE_ORDER	MSBFirst
-#define BITMAP_BIT_ORDER	MSBFirst
-#define GLYPHPADBYTES		4	/* to make fb work */
-
-#endif /* hpux || __hppa__ */
-
 #if defined(__powerpc__) || defined(__ppc__)
 
 #define IMAGE_BYTE_ORDER        MSBFirst
 #define BITMAP_BIT_ORDER        MSBFirst
 #define GLYPHPADBYTES           4
 
-/* XXX Should this be for Lynx only? */
-#ifdef Lynx
-#define BITMAP_SCANLINE_UNIT	8
-#endif
-
 #endif /* PowerPC */
 
 #if defined(__sh__)
@@ -172,15 +159,6 @@ SOFTWARE.
 
 #endif /* sun && !(i386 && SVR4) */
 
-
-#if defined(AIXV3)
-
-#define IMAGE_BYTE_ORDER        MSBFirst        /* Values for the RISC/6000 */
-#define BITMAP_BIT_ORDER        MSBFirst
-#define GLYPHPADBYTES           4
-
-#endif /* AIXV3 */
-
 #if defined(ibm032) || defined (ibm)
 
 #ifdef i386
@@ -214,7 +192,7 @@ SOFTWARE.
 
 #endif /* macII */
 
-#if (defined(mips) || defined(__mips)) && !defined(sgi)
+#if (defined(mips) || defined(__mips))
 
 #if defined(MIPSEL) || defined(__MIPSEL__)
 # define IMAGE_BYTE_ORDER	LSBFirst        /* Values for the PMAX only */
@@ -327,9 +305,6 @@ SOFTWARE.
 #if	(defined(SVR4) && defined(i386)) || \
 	defined(__alpha__) || defined(__alpha) || \
 	defined(__i386__) || defined(__i386) || \
-	defined(__UNIXOS2__) || \
-	defined(__OS2ELF__) || \
-	defined(__QNX__) || \
 	defined(__s390x__) || defined(__s390__)
   
 #ifndef IMAGE_BYTE_ORDER
@@ -369,14 +344,6 @@ SOFTWARE.
 
 #endif /* linux/m68k */
 
-#ifdef sgi
-
-#define IMAGE_BYTE_ORDER	MSBFirst
-#define BITMAP_BIT_ORDER	MSBFirst
-#define GLYPHPADBYTES		4
-
-#endif
-
 /* linux on the Compaq Itsy */
 #if defined(linux) && defined(__arm__)
 #define IMAGE_BYTE_ORDER	LSBFirst
diff --git a/nx-X11/programs/Xserver/mi/miarc.c b/nx-X11/programs/Xserver/mi/miarc.c
index c812673eb..ee493bc2c 100644
--- a/nx-X11/programs/Xserver/mi/miarc.c
+++ b/nx-X11/programs/Xserver/mi/miarc.c
@@ -51,7 +51,7 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#if defined(_XOPEN_SOURCE) || defined(__QNXNTO__) \
+#if defined(_XOPEN_SOURCE) \
 	|| (defined(sun) && defined(__SVR4))
 #include <math.h>
 #else
diff --git a/nx-X11/programs/Xserver/mi/micoord.h b/nx-X11/programs/Xserver/mi/micoord.h
index b3d725b73..3e45cfede 100644
--- a/nx-X11/programs/Xserver/mi/micoord.h
+++ b/nx-X11/programs/Xserver/mi/micoord.h
@@ -43,7 +43,7 @@
  * forcing as to use div instead of shift.  Let's be explicit.
  */
 
-#if defined(mips) || defined(sgi) || \
+#if defined(mips) || \
     defined(sparc) || defined(__sparc64__) || \
     defined(__alpha) || defined(__alpha__) || \
     defined(__i386__) || defined(i386) || \
diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c
index fc64937d7..6f6d67841 100644
--- a/nx-X11/programs/Xserver/mi/miinitext.c
+++ b/nx-X11/programs/Xserver/mi/miinitext.c
@@ -66,10 +66,6 @@ SOFTWARE.
 #include "extension.h"
 #include "micmap.h"
 
-#if defined(QNX4) /* sleaze for Watcom on QNX4 ... */
-#undef GLXEXT
-#endif
-
 extern Bool noTestExtensions;
 
 #ifdef BIGREQS
diff --git a/nx-X11/programs/Xserver/os/WaitFor.c b/nx-X11/programs/Xserver/os/WaitFor.c
index 2858637fa..899b1de0b 100644
--- a/nx-X11/programs/Xserver/os/WaitFor.c
+++ b/nx-X11/programs/Xserver/os/WaitFor.c
@@ -91,9 +91,6 @@ SOFTWARE.
 #include <nx-X11/X.h>
 #include "misc.h"
 
-#ifdef __UNIXOS2__
-#define select(n,r,w,x,t) os2PseudoSelect(n,r,w,x,t)
-#endif
 #include "osdep.h"
 #include <nx-X11/Xpoll.h>
 #include "dixstruct.h"
diff --git a/nx-X11/programs/Xserver/os/access.c b/nx-X11/programs/Xserver/os/access.c
index 5735fd556..d3a18efbe 100644
--- a/nx-X11/programs/Xserver/os/access.c
+++ b/nx-X11/programs/Xserver/os/access.c
@@ -76,11 +76,7 @@ SOFTWARE.
 #include <errno.h>
 #include <sys/types.h>
 #ifndef WIN32
-#ifndef Lynx
 #include <sys/socket.h>
-#else
-#include <socket.h>
-#endif
 #include <sys/ioctl.h>
 #include <ctype.h>
 
@@ -95,26 +91,6 @@ SOFTWARE.
 # endif
 #endif
 
-#if defined(DGUX)
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <ctype.h>
-#include <sys/utsname.h>
-#include <sys/stream.h>
-#include <sys/stropts.h>
-#include <sys/param.h>
-#include <sys/sockio.h>
-#endif
-
-
-#if defined(hpux) || defined(QNX4)
-# include <sys/utsname.h>
-# ifdef HAS_IFREQ
-#  include <net/if.h>
-# endif
-#else
 #if defined(SVR4) ||  (defined(SYSV) && defined(i386)) || defined(__GNU__)
 # include <sys/utsname.h>
 #endif
@@ -131,7 +107,6 @@ SOFTWARE.
 #else /*!__GNU__*/
 # include <net/if.h>
 #endif /*__GNU__ */
-#endif /* hpux */
 
 #ifdef SVR4
 #include <sys/sockio.h>
@@ -173,11 +148,7 @@ SOFTWARE.
 #endif /* WIN32 */
 
 #ifndef PATH_MAX
-#ifndef Lynx
 #include <sys/param.h>
-#else
-#include <param.h>
-#endif 
 #ifndef PATH_MAX
 #ifdef MAXPATHLEN
 #define PATH_MAX MAXPATHLEN
@@ -315,7 +286,7 @@ AccessUsingXdmcp (void)
 }
 
 
-#if ((defined(SVR4) && !defined(DGUX) && !defined(SCO325) && !defined(sun) && !defined(NCR)) || defined(ISC)) && !defined(__sgi) && defined(SIOCGIFCONF) && !defined(USE_SIOCGLIFCONF)
+#if ((defined(SVR4) && !defined(SCO325) && !defined(sun) && !defined(NCR)) || defined(ISC)) && defined(SIOCGIFCONF) && !defined(USE_SIOCGLIFCONF)
 
 /* Deal with different SIOCGIFCONF ioctl semantics on these OSs */
 
@@ -364,9 +335,9 @@ ifioctl (int fd, int cmd, char *arg)
 #endif
     return(ret);
 }
-#else /* Case DGUX, sun, SCO325 NCR and others  */
+#else /* Case sun, SCO325 NCR and others  */
 #define ifioctl ioctl
-#endif /* ((SVR4 && !DGUX !sun !SCO325 !NCR) || ISC) && SIOCGIFCONF */
+#endif /* ((SVR4 && !sun !SCO325 !NCR) || ISC) && SIOCGIFCONF */
 
 /*
  * DefineSelf (fd):
@@ -521,7 +492,7 @@ DefineSelf (int fd)
 
 #else /* WINTCP */
 
-#if !defined(SIOCGIFCONF) || (defined (hpux) && ! defined (HAS_IFREQ)) || defined(QNX4)
+#if !defined(SIOCGIFCONF)
 void
 DefineSelf (int fd)
 {
@@ -564,19 +535,11 @@ DefineSelf (int fd)
      * uname() lets me access to the whole string (it smashes release, you
      * see), whereas gethostname() kindly truncates it for me.
      */
-#ifndef QNX4
 #ifndef WIN32
     uname(&name);
 #else
     gethostname(name.nodename, sizeof(name.nodename));
 #endif
-#else
-    /* QNX4's uname returns node number in name.nodename, not the hostname
-       have to overwrite it */
-    char hname[1024];
-    gethostname(hname, 1024);
-    name.nodename = hname;
-#endif
 
     hp = _XGethostbyname(name.nodename, hparams);
     if (hp != NULL)
@@ -685,14 +648,9 @@ DefineLocalHost:
 		      p->ifr_addr.sa_len - sizeof (p->ifr_addr) : 0))
 #define ifraddr_size(a) (a.sa_len)
 #else
-#ifdef QNX4
-#define ifr_size(p) (p->ifr_addr.sa_len + IFNAMSIZ)
-#define ifraddr_size(a) (a.sa_len)
-#else
 #define ifr_size(p) (sizeof (ifr_type))
 #define ifraddr_size(a) (sizeof (a))
 #endif
-#endif
 
 #if defined(DEF_SELF_DEBUG) || (defined(IPv6) && defined(AF_INET6))
 #include <arpa/inet.h>
@@ -1055,7 +1013,7 @@ DefineSelf (int fd)
 	}
     }
 }
-#endif /* hpux && !HAS_IFREQ */
+#endif /* !SIOCGIFCONF */
 #endif /* WINTCP */
 
 #ifdef XDMCP
@@ -1139,9 +1097,6 @@ ResetHosts (char *display)
     if (fnamelen > sizeof(fname))
 	FatalError("Display name `%s' is too long\n", display);
     sprintf(fname, ETC_HOST_PREFIX "%s" ETC_HOST_SUFFIX, display);
-#ifdef __UNIXOS2__
-    strcpy(fname, (char*)__XOS2RedirRoot(fname));
-#endif /* __UNIXOS2__ */
 
     if ((fd = fopen (fname, "r")) != 0)
     {
@@ -1152,10 +1107,6 @@ ResetHosts (char *display)
 	    continue;
     	if ((ptr = strchr(ohostname, '\n')) != 0)
     	    *ptr = 0;
-#ifdef __UNIXOS2__
-    	if ((ptr = strchr(ohostname, '\r')) != 0)
-    	    *ptr = 0;
-#endif
         hostlen = strlen(ohostname) + 1;
         for (i = 0; i < hostlen; i++)
 	    lhostname[i] = tolower(ohostname[i]);
diff --git a/nx-X11/programs/Xserver/os/connection.c b/nx-X11/programs/Xserver/os/connection.c
index 9681ced38..458daab54 100644
--- a/nx-X11/programs/Xserver/os/connection.c
+++ b/nx-X11/programs/Xserver/os/connection.c
@@ -80,42 +80,14 @@ SOFTWARE.
 #include <stdlib.h>
 
 #ifndef WIN32
-#if defined(Lynx)
-#include <socket.h>
-#else
-#include <sys/socket.h>
-#endif
-
-#ifdef hpux
-#include <sys/utsname.h>
-#include <sys/ioctl.h>
-#endif
-
-#if defined(DGUX)
-#include <sys/ioctl.h>
-#include <sys/utsname.h>
 #include <sys/socket.h>
-#include <sys/uio.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <sys/param.h>
-#include <unistd.h>
-#endif
-
-
-#ifdef AIXV3
-#include <sys/ioctl.h>
-#endif
-
-#ifdef __UNIXOS2__
-#define select(n,r,w,x,t) os2PseudoSelect(n,r,w,x,t)
-extern __const__ int _nfiles;
-#endif
 
 #if defined(TCPCONN)
 # include <netinet/in.h>
 # include <arpa/inet.h>
-# if !defined(hpux)
+
+/* FIXME: correct indentation levels after ancient platform support clean-up */
+
 #  ifdef apollo
 #   ifndef NO_TCP_H
 #    include <netinet/tcp.h>
@@ -124,21 +96,12 @@ extern __const__ int _nfiles;
 #   ifdef CSRG_BASED
 #    include <sys/param.h>
 #   endif
-#    ifndef __UNIXOS2__
-#     include <netinet/tcp.h>
-#    endif
+#   include <netinet/tcp.h>
 #  endif
-# endif
 # include <arpa/inet.h>
 #endif
 
-#if !defined(__UNIXOS2__)
-#ifndef Lynx
 #include <sys/uio.h>
-#else
-#include <uio.h>
-#endif
-#endif
 #endif /* WIN32 */
 #include "misc.h"
 #include "osdep.h"
@@ -173,9 +136,6 @@ Bool AnyClientsWriteBlocked;	/* true if some client blocked on write */
 Bool RunFromSmartParent;	/* send SIGUSR1 to parent process */
 Bool PartialNetwork;		/* continue even if unable to bind all addrs */
 static Pid_t ParentProcess;
-#ifdef __UNIXOS2__
-Pid_t GetPPID(Pid_t pid);
-#endif
 
 static Bool debug_conns = FALSE;
 
@@ -314,8 +274,6 @@ InitConnectionLimits(void)
 
 #ifndef __CYGWIN__
 
-#ifndef __UNIXOS2__
-
 #if !defined(XNO_SYSCONF) && defined(_SC_OPEN_MAX)
     lastfdesc = sysconf(_SC_OPEN_MAX) - 1;
 #endif
@@ -330,10 +288,6 @@ InitConnectionLimits(void)
 	lastfdesc = _NFILE - 1;
 #endif
 
-#else /* __UNIXOS2__ */
-    lastfdesc = _nfiles - 1;
-#endif
-
 #endif /* __CYGWIN__ */
 
     /* This is the fallback */
@@ -449,15 +403,6 @@ CreateWellKnownSockets(void)
 	RunFromSmartParent = TRUE;
     OsSignal(SIGUSR1, handler);
     ParentProcess = getppid ();
-#ifdef __UNIXOS2__
-    /*
-     * fg030505: under OS/2, xinit is not the parent process but
-     * the "grant parent" process of the server because execvpe()
-     * presents us an additional process number;
-     * GetPPID(pid) is part of libemxfix
-     */
-    ParentProcess = GetPPID (ParentProcess);
-#endif /* __UNIXOS2__ */
     if (RunFromSmartParent) {
 	if (ParentProcess > 1) {
 	    kill (ParentProcess, SIGUSR1);
diff --git a/nx-X11/programs/Xserver/os/io.c b/nx-X11/programs/Xserver/os/io.c
index d184a981c..3771d40fb 100644
--- a/nx-X11/programs/Xserver/os/io.c
+++ b/nx-X11/programs/Xserver/os/io.c
@@ -70,12 +70,8 @@ SOFTWARE.
 #include <nx-X11/Xtrans/Xtrans.h>
 #include <nx-X11/Xmd.h>
 #include <errno.h>
-#if !defined(__UNIXOS2__) && !defined(WIN32)
-#ifndef Lynx
+#if !defined(WIN32)
 #include <sys/uio.h>
-#else
-#include <uio.h>
-#endif
 #endif
 #include <nx-X11/X.h>
 #include <nx-X11/Xproto.h>
@@ -92,7 +88,6 @@ CallbackListPtr       FlushCallback;
 /* check for both EAGAIN and EWOULDBLOCK, because some supposedly POSIX
  * systems are broken and return EWOULDBLOCK when they should return EAGAIN
  */
-#ifndef __UNIXOS2__
 #ifndef WIN32
 #if defined(EAGAIN) && defined(EWOULDBLOCK)
 #define ETEST(err) (err == EAGAIN || err == EWOULDBLOCK)
@@ -106,9 +101,6 @@ CallbackListPtr       FlushCallback;
 #else /* WIN32 The socket errorcodes differ from the normal errors*/
 #define ETEST(err) (err == EAGAIN || err == WSAEWOULDBLOCK)
 #endif
-#else /* __UNIXOS2__  Writing to full pipes may return ENOSPC */
-#define ETEST(err) (err == EAGAIN || err == EWOULDBLOCK || err == ENOSPC)
-#endif
 
 Bool CriticalOutputPending;
 int timesThisConnection = 0;
diff --git a/nx-X11/programs/Xserver/os/log.c b/nx-X11/programs/Xserver/os/log.c
index e964896d7..d82f545a0 100644
--- a/nx-X11/programs/Xserver/os/log.c
+++ b/nx-X11/programs/Xserver/os/log.c
@@ -214,9 +214,6 @@ LogInit(const char *fname, const char *backup)
 		sprintf(suffix, backup, display);
 		sprintf(oldLog, "%s%s", logFileName, suffix);
 		free(suffix);
-#ifdef __UNIXOS2__
-		remove(oldLog);
-#endif
 		if (rename(logFileName, oldLog) == -1) {
 		    FatalError("Cannot move old log file (\"%s\" to \"%s\"\n",
 			       logFileName, oldLog);
diff --git a/nx-X11/programs/Xserver/os/oscolor.c b/nx-X11/programs/Xserver/os/oscolor.c
index 32f8a4b23..88b243d65 100644
--- a/nx-X11/programs/Xserver/os/oscolor.c
+++ b/nx-X11/programs/Xserver/os/oscolor.c
@@ -397,7 +397,6 @@ OsInitColors(void)
 
   if (!was_here)
     {
-#ifndef __UNIXOS2__
 #ifdef NX_TRANS_SOCKET
       /*
        * Add the trailing '.txt' if a
@@ -418,12 +417,6 @@ OsInitColors(void)
       strcpy(path, rgbPath);
       strcat(path, ".txt");
 #endif
-#else
-      char *tmp = (char*)__XOS2RedirRoot(rgbPath);
-      path = (char*)ALLOCATE_LOCAL(strlen(tmp) +5);
-      strcpy(path, tmp);
-      strcat(path, ".txt");
-#endif
       if (!(rgb = fopen(path, "r")))
         {
 #ifdef NX_TRANS_SOCKET
@@ -438,11 +431,7 @@ OsInitColors(void)
       while(fgets(line, sizeof(line), rgb))
 	{
 	  lineno++;
-#ifndef __UNIXOS2__
 	  if (sscanf(line,"%d %d %d %[^\n]\n", &red, &green, &blue, name) == 4)
-#else
-	  if (sscanf(line,"%d %d %d %[^\n\r]\n", &red, &green, &blue, name) == 4)
-#endif
 	    {
 	      if (red >= 0   && red <= 0xff &&
 		  green >= 0 && green <= 0xff &&
diff --git a/nx-X11/programs/Xserver/os/osdep.h b/nx-X11/programs/Xserver/os/osdep.h
index 9ad267a36..f0e8b707b 100644
--- a/nx-X11/programs/Xserver/os/osdep.h
+++ b/nx-X11/programs/Xserver/os/osdep.h
@@ -61,7 +61,6 @@ SOFTWARE.
 
 #include <X11/Xdmcp.h>
 
-#ifndef sgi	    /* SGI defines OPEN_MAX in a useless way */
 #ifndef X_NOT_POSIX
 #ifdef _POSIX_SOURCE
 #include <limits.h>
@@ -77,11 +76,7 @@ SOFTWARE.
 #undef _POSIX_
 #endif
 #endif /* X_NOT_POSIX */
-#endif
 
-#ifdef __QNX__
-#define NOFILES_MAX 256
-#endif
 #ifndef OPEN_MAX
 #ifdef SVR4
 #define OPEN_MAX 256
@@ -91,7 +86,7 @@ SOFTWARE.
 #if defined(NOFILE) && !defined(NOFILES_MAX)
 #define OPEN_MAX NOFILE
 #else
-#if !defined(__UNIXOS2__) && !defined(WIN32)
+#if !defined(WIN32)
 #define OPEN_MAX NOFILES_MAX
 #else
 #define OPEN_MAX 256
@@ -117,7 +112,7 @@ SOFTWARE.
 /* MAXSELECT is the number of fds that select() can handle */
 #define MAXSELECT (sizeof(fd_set) * NBBY)
 
-#if !defined(hpux) && !defined(SVR4) && !defined(SYSV)
+#if !defined(SVR4) && !defined(SYSV)
 #define HAS_GETDTABLESIZE
 #endif
 
diff --git a/nx-X11/programs/Xserver/os/osinit.c b/nx-X11/programs/Xserver/os/osinit.c
index 5f097f89a..7aa961a56 100644
--- a/nx-X11/programs/Xserver/os/osinit.c
+++ b/nx-X11/programs/Xserver/os/osinit.c
@@ -67,11 +67,11 @@ SOFTWARE.
 #endif
 #endif
 
-#if defined(Lynx) || defined(__SCO__)
+#if defined(__SCO__)
 #include <sys/wait.h>
 #endif
 
-#if !defined(SYSV) && !defined(WIN32) && !defined(Lynx) && !defined(QNX4)
+#if !defined(SYSV) && !defined(WIN32)
 #include <sys/resource.h>
 #endif
 
@@ -133,7 +133,7 @@ OsInit(void)
 		dup2 (fileno (err), 2);
 		fclose (err);
 	    }
-#if defined(SYSV) || defined(SVR4) || defined(__UNIXOS2__) || defined(WIN32) || defined(__CYGWIN__)
+#if defined(SYSV) || defined(SVR4) || defined(WIN32) || defined(__CYGWIN__)
 	    {
 	    static char buf[BUFSIZ];
 	    setvbuf (stderr, buf, _IOLBF, BUFSIZ);
diff --git a/nx-X11/programs/Xserver/os/rpcauth.c b/nx-X11/programs/Xserver/os/rpcauth.c
index 2a6874f4a..678bedf6c 100644
--- a/nx-X11/programs/Xserver/os/rpcauth.c
+++ b/nx-X11/programs/Xserver/os/rpcauth.c
@@ -51,11 +51,6 @@ from The Open Group.
 extern bool_t xdr_opaque_auth(XDR *, struct opaque_auth *);
 #endif
 
-#if defined(DGUX)
-#include <time.h>
-#include <rpc/auth_des.h>
-#endif /* DGUX */
-
 #ifdef ultrix
 #include <time.h>
 #include <rpc/auth_des.h>
diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c
index 9584dadd3..5f7542a2d 100644
--- a/nx-X11/programs/Xserver/os/utils.c
+++ b/nx-X11/programs/Xserver/os/utils.c
@@ -113,7 +113,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef WIN32
 #include <sys/wait.h>
 #endif
-#if !defined(SYSV) && !defined(WIN32) && !defined(Lynx) && !defined(QNX4)
+#if !defined(SYSV) && !defined(WIN32)
 #include <sys/resource.h>
 #endif
 #include <time.h>
@@ -124,11 +124,6 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #include <grp.h>
 #include <pwd.h>
 
-#if defined(DGUX)
-#include <sys/resource.h>
-#include <netdb.h>
-#endif
-
 #include <stdlib.h>	/* for malloc() */
 
 #if defined(TCPCONN)
@@ -264,11 +259,6 @@ int auditTrailLevel = 1;
 
 Bool Must_have_memory = FALSE;
 
-#ifdef AIXV3
-int SyncOn  = 0;
-extern int SelectWaitTime;
-#endif
-
 #if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)
 #define HAS_SAVED_IDS_AND_SETEUID
 #endif
@@ -279,10 +269,6 @@ long Memory_fail = 0;
 #include <stdlib.h>  /* for random() */
 #endif
 
-#ifdef sgi
-int userdefinedfontpath = 0;
-#endif /* sgi */
-
 char *dev_tty_from_init = NULL;		/* since we need to parse it anyway */
 
 extern char dispatchExceptionAtReset;
@@ -318,28 +304,13 @@ OsSignal(sig, handler)
  * server at a time.  This keeps the servers from stomping on each other
  * if the user forgets to give them different display numbers.
  */
-#ifndef __UNIXOS2__
 #define LOCK_DIR "/tmp"
-#endif
 #define LOCK_TMP_PREFIX "/.tX"
 #define LOCK_PREFIX "/.X"
 #define LOCK_SUFFIX "-lock"
 
-#if defined(DGUX)
-#include <limits.h>
-#include <sys/param.h>
-#endif
-
-#ifdef __UNIXOS2__
-#define link rename
-#endif
-
 #ifndef PATH_MAX
-#ifndef Lynx
 #include <sys/param.h>
-#else
-#include <param.h>
-#endif
 #ifndef PATH_MAX
 #ifdef MAXPATHLEN
 #define PATH_MAX MAXPATHLEN
@@ -372,14 +343,7 @@ LockServer(void)
   /*
    * Path names
    */
-#ifndef __UNIXOS2__
   tmppath = LOCK_DIR;
-#else
-  /* OS/2 uses TMP directory, must also prepare for 8.3 names */
-  tmppath = getenv("TMP");
-  if (!tmppath)
-    FatalError("No TMP dir found\n");
-#endif
 
   sprintf(port, "%d", atoi(display));
   len = strlen(LOCK_PREFIX) > strlen(LOCK_TMP_PREFIX) ? strlen(LOCK_PREFIX) :
@@ -422,13 +386,11 @@ LockServer(void)
   if (write(lfd, pid_str, 11) != 11)
     FatalError("Could not write pid to lock file in %s\n", tmp);
 
-#ifndef __UNIXOS2__
 #ifndef USE_CHMOD
   (void) fchmod(lfd, 0444);
 #else
   (void) chmod(tmp, 0444);
 #endif
-#endif
   (void) close(lfd);
 
   /*
@@ -507,9 +469,6 @@ UnlockServer(void)
 
   if (!StillLocking){
 
-#ifdef __UNIXOS2__
-  (void) chmod(LockFile,S_IREAD|S_IWRITE);
-#endif /* __UNIXOS2__ */
   (void) unlink(LockFile);
   }
 }
@@ -593,7 +552,6 @@ AdjustWaitForDelay (void * waitTime, unsigned long newdelay)
 
 void UseMsg(void)
 {
-#if !defined(AIXrt) && !defined(AIX386)
     ErrorF("use: X [:<display>] [option]\n");
     ErrorF("-a #                   mouse acceleration (pixels)\n");
     ErrorF("-ac                    disable access control restrictions\n");
@@ -686,7 +644,6 @@ void UseMsg(void)
 #ifdef XDMCP
     XdmcpUseMsg();
 #endif
-#endif /* !AIXrt && ! AIX386 */
 #ifdef XKB
     XkbUseMsg();
 #endif
@@ -870,9 +827,6 @@ ProcessCommandLine(int argc, char *argv[])
 	{
 	    if(++i < argc)
 	    {
-#ifdef sgi
-		userdefinedfontpath = 1;
-#endif /* sgi */
 	        defaultFontPath = argv[i];
 	    }
 	    else
@@ -928,7 +882,7 @@ ProcessCommandLine(int argc, char *argv[])
 #ifdef SERVER_LOCK
 	else if ( strcmp ( argv[i], "-nolock") == 0)
 	{
-#if !defined(WIN32) && !defined(__UNIXOS2__) && !defined(__CYGWIN__)
+#if !defined(WIN32) && !defined(__CYGWIN__)
 	  if (getuid() != 0)
 	    ErrorF("Warning: the -nolock option can only be used by root\n");
 	  else
@@ -1084,19 +1038,6 @@ ProcessCommandLine(int argc, char *argv[])
 	    i = skip - 1;
 	}
 #endif
-#ifdef AIXV3
-        else if ( strcmp( argv[i], "-timeout") == 0)
-        {
-            if(++i < argc)
-                SelectWaitTime = atoi(argv[i]);
-            else
-                UseMsg();
-        }
-        else if ( strcmp( argv[i], "-sync") == 0)
-        {
-            SyncOn++;
-        }
-#endif
 #ifdef SMART_SCHEDULE
 	else if ( strcmp( argv[i], "-dumbSched") == 0)
 	{
@@ -1260,7 +1201,7 @@ ExpandCommandLine(int *pargc, char ***pargv)
 {
     int i;
 
-#if !defined(WIN32) && !defined(__UNIXOS2__) && !defined(__CYGWIN__)
+#if !defined(WIN32) && !defined(__CYGWIN__)
     if (getuid() != geteuid())
 	return;
 #endif
@@ -1609,7 +1550,7 @@ OsReleaseSignals (void)
 #endif
 }
 
-#if !defined(WIN32) && !defined(__UNIXOS2__)
+#if !defined(WIN32)
 /*
  * "safer" versions of system(3), popen(3) and pclose(3) which give up
  * all privs before running a command.
@@ -1964,7 +1905,7 @@ Fclose(void * iop)
 #endif
 }
 
-#endif /* !WIN32 && !__UNIXOS2__ */
+#endif /* !WIN32 */
 
 
 /*
@@ -2059,9 +2000,6 @@ CheckUserParameters(int argc, char **argv, char **envp)
     enum BadCode bad = NotBad;
     int i = 0, j;
     char *a, *e = NULL;
-#if defined(__QNX__) && !defined(__QNXNTO__)
-    char cmd_name[64];
-#endif
 
 #if CHECK_EUID
     if (geteuid() == 0 && getuid() != geteuid())
diff --git a/nx-X11/programs/Xserver/os/xdmcp.c b/nx-X11/programs/Xserver/os/xdmcp.c
index 5daf1cbbf..83e234b43 100644
--- a/nx-X11/programs/Xserver/os/xdmcp.c
+++ b/nx-X11/programs/Xserver/os/xdmcp.c
@@ -28,12 +28,8 @@
 #include <nx-X11/Xos.h>
 
 #if !defined(WIN32)
-#ifndef Lynx
 #include <sys/param.h>
 #include <sys/socket.h>
-#else
-#include <socket.h>
-#endif
 #include <netinet/in.h>
 #include <netdb.h>
 #endif
@@ -49,11 +45,6 @@
 #include "dixstruct.h"
 #include "opaque.h"
 
-#if defined(DGUX)
-#include <net/net_ioctl.h>
-#include <sys/ioctl.h>
-#endif
-
 
 #ifndef NX_TRANS_SOCKET
 
diff --git a/nx-X11/programs/Xserver/render/picture.h b/nx-X11/programs/Xserver/render/picture.h
index b09d9aac2..6f3f2d832 100644
--- a/nx-X11/programs/Xserver/render/picture.h
+++ b/nx-X11/programs/Xserver/render/picture.h
@@ -173,8 +173,7 @@ typedef __int64		xFixed_32_32;
       defined(ia64) || defined(__ia64__) || \
       defined(__sparc64__) || \
       defined(__s390x__) || \
-      defined(amd64) || defined (__amd64__) || \
-      (defined(sgi) && (_MIPS_SZLONG == 64))
+      defined(amd64) || defined (__amd64__)
 typedef long		xFixed_32_32;
 # else
 #  if defined(__GNUC__) && \
diff --git a/nx-X11/programs/Xserver/xkb/Imakefile b/nx-X11/programs/Xserver/xkb/Imakefile
index 07d715301..89e042212 100644
--- a/nx-X11/programs/Xserver/xkb/Imakefile
+++ b/nx-X11/programs/Xserver/xkb/Imakefile
@@ -1,10 +1,6 @@
 #define SGIHyperOpt
 #include <Server.tmpl>
 
-#ifdef SGIArchitecture
-EXTRA_ALLOC_DEFINES = -DFORCE_ALLOCA
-#endif
-
 #if BuildXInputExt
 XKBXI_SRCS = xkbPrOtherEv.c
 XKBXI_OBJS = xkbPrOtherEv.o
@@ -48,7 +44,7 @@ XF86INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC)
 	      `pkg-config --cflags-only-I pixman-1`
    LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln
 
-DEFINES = $(EXTRA_ALLOC_DEFINES) $(XKB_DDXDEFS) $(NX_DEFINES)
+DEFINES = $(XKB_DDXDEFS) $(NX_DEFINES)
 XKB_DEFINES = -DXKB_BASE_DIRECTORY=\"$(LIBDIR)/xkb\" $(XKB_DISABLE)
 
 NormalLibraryObjectRule()
diff --git a/nx-X11/programs/Xserver/xkb/ddxBeep.c b/nx-X11/programs/Xserver/xkb/ddxBeep.c
index e4427ba26..fa4af7456 100644
--- a/nx-X11/programs/Xserver/xkb/ddxBeep.c
+++ b/nx-X11/programs/Xserver/xkb/ddxBeep.c
@@ -38,12 +38,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <xkbsrv.h>
 #include <nx-X11/extensions/XI.h>
 
-#if (defined(__osf__) && defined(__alpha))
-#include <sys/sysinfo.h>
-#include <alpha/hal_sysinfo.h>
-#include <alpha/prom.h>
-#endif
-
 /*#define FALLING_TONE	1*/
 /*#define RISING_TONE	1*/
 #define FALLING_TONE	10
@@ -115,32 +109,9 @@ _XkbDDXBeepInitAtoms(void)
     stickyLock=		MAKE_ATOM(STICKY_LOCK);
     stickyUnlock= 	MAKE_ATOM(STICKY_UNLOCK);
     bounceReject= 	MAKE_ATOM(BOUNCE_REJECT);
-#if (defined(__osf__) && defined(__alpha))
-    /* [[[ WDW - Some bells do not allow for pitch changes.
-     * Maybe this could become part of the keymap? ]]]
-     */
-    {
-	char keyboard[8];
-
-	/* Find the class of keyboard being used.
-	 */
-	keyboard[0] = '\0';
-	if (-1 == getsysinfo(GSI_KEYBOARD, 
-			     keyboard, sizeof(keyboard), 
-			     0, NULL))
-	    keyboard[0] = '\0';
-
-	if ((strcmp(keyboard,"LK201") == 0) ||
-	    (strcmp(keyboard,"LK401") == 0) ||
-	    (strcmp(keyboard,"LK421") == 0) ||
-	    (strcmp(keyboard,"LK443") == 0))
-	    doesPitch = 0;
-    }
-#else
 #if defined(sun)
     doesPitch = 0;
 #endif
-#endif
     return;
 }
 
diff --git a/nx-X11/programs/Xserver/xkb/ddxConfig.c b/nx-X11/programs/Xserver/xkb/ddxConfig.c
index 1ecabd108..2fd5e7610 100644
--- a/nx-X11/programs/Xserver/xkb/ddxConfig.c
+++ b/nx-X11/programs/Xserver/xkb/ddxConfig.c
@@ -128,9 +128,6 @@ XkbConfigRtrnPtr	rtrn;
         sprintf(buf,"X%s-config%s%s",display,(dName[0]?".":""),dName);
     }
 #endif
-#ifdef __UNIXOS2__
-    strcpy(buf,(char*)__XOS2RedirRoot(buf));
-#endif
 #ifdef DEBUG
     ErrorF("Looking for keyboard configuration in %s...",buf);
 #endif
diff --git a/nx-X11/programs/Xserver/xkb/ddxLoad.c b/nx-X11/programs/Xserver/xkb/ddxLoad.c
index 53bae44df..4934d266c 100644
--- a/nx-X11/programs/Xserver/xkb/ddxLoad.c
+++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c
@@ -53,7 +53,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <nx-X11/extensions/XI.h>
 #include "xkb.h"
 
-#if defined(CSRG_BASED) || defined(linux) || defined(__sgi) || defined(AIXV3) || defined(__osf__) || defined(__GNU__)
+#if defined(CSRG_BASED) || defined(linux) || defined(__GNU__)
 #include <paths.h>
 #endif
 
@@ -82,7 +82,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define	POST_ERROR_MSG1 "\"Errors from xkbcomp are not fatal to the X server\""
 #define	POST_ERROR_MSG2 "\"End of messages from xkbcomp\""
 
-#if defined(__UNIXOS2__) || defined(WIN32)
+#if defined(WIN32)
 #define PATHSEPARATOR "\\"
 #else
 #define PATHSEPARATOR "/"
@@ -558,8 +558,6 @@ char 	*cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile;
 
 #endif
 
-#ifndef __UNIXOS2__
-
 #ifdef NXAGENT_SERVER
         char *xkbbasedir = _NXGetXkbBasePath(XkbBaseDirectory);
         char *xkbbindir = _NXGetXkbCompPath(XkbBinDirectory);
@@ -568,23 +566,6 @@ char 	*cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile;
         char *xkbbindir = XkbBinDirectory;
 #endif
 
-#else
-        /* relocate the basedir and replace the slashes with backslashes */
-#ifdef NXAGENT_SERVER
-        char *xkbbasedir = (char*)__XOS2RedirRoot(_NXGetXkbBasePath(XkbBaseDirectory));
-        char *xkbbindir = (char*)__XOS2RedirRoot(_NXGetXkbCompPath(XkbBinDirectory));
-#else
-        char *xkbbasedir = (char*)__XOS2RedirRoot(XkbBaseDirectory);
-        char *xkbbindir = (char*)__XOS2RedirRoot(XkbBinDirectory);
-#endif
-        int i;
-
-	for (i=0; i<strlen(xkbbasedir); i++) 
-            if (xkbbasedir[i]=='/') xkbbasedir[i]='\\';
-	for (i=0; i<strlen(xkbbindir); i++) 
-            if (xkbbindir[i]=='/') xkbbindir[i]='\\';
-#endif
-
 	cmd = Xprintf("\"%s" PATHSEPARATOR "xkbcomp\" -w %d \"-R%s\" -xkm %s%s -em1 %s -emp %s -eml %s keymap/%s \"%s%s.xkm\"",
 		xkbbindir,
 		((xkbDebugFlags<2)?1:((xkbDebugFlags>10)?10:(int)xkbDebugFlags)),
@@ -675,7 +656,6 @@ char tmpname[PATH_MAX];
            for xkbcomp. xkbcomp does not read from stdin. */
         char *xkmfile = tmpname;
 #endif
-#ifndef __UNIXOS2__
 #ifdef NXAGENT_SERVER
         char *xkbbasedir = _NXGetXkbBasePath(XkbBaseDirectory);
         char *xkbbindir = _NXGetXkbCompPath(XkbBinDirectory);
@@ -683,20 +663,6 @@ char tmpname[PATH_MAX];
         char *xkbbasedir = XkbBaseDirectory;
         char *xkbbindir = XkbBinDirectory;
 #endif
-#else
-        int i;
-#ifdef NXAGENT_SERVER
-        char *xkbbasedir = (char*)__XOS2RedirRoot(_NXGetXkbBasePath(XkbBaseDirectory));
-        char *xkbbindir = (char*)__XOS2RedirRoot(_NXGetXkbCompPath(XkbBinDirectory));
-#else
-        char *xkbbasedir = (char*)__XOS2RedirRoot(XkbBaseDirectory);
-        char *xkbbindir = (char*)__XOS2RedirRoot(XkbBinDirectory);
-#endif
-	for (i=0; i<strlen(xkbbasedir); i++) 
-            if (xkbbasedir[i]=='/') xkbbasedir[i]='\\';
-	for (i=0; i<strlen(xkbbindir); i++) 
-            if (xkbbindir[i]=='/') xkbbindir[i]='\\';
-#endif
         
 	buf = Xprintf(
 	   "\"%s" PATHSEPARATOR "xkbcomp\" -w %d \"-R%s\" -xkm \"%s\" -em1 %s -emp %s -eml %s \"%s%s.xkm\"",
diff --git a/nx-X11/programs/Xserver/xkb/xkbAccessX.c b/nx-X11/programs/Xserver/xkb/xkbAccessX.c
index 307673db7..4069ac209 100644
--- a/nx-X11/programs/Xserver/xkb/xkbAccessX.c
+++ b/nx-X11/programs/Xserver/xkb/xkbAccessX.c
@@ -30,15 +30,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <stdio.h>
 #include <math.h>
-#ifdef __QNX__
-#include <limits.h>
-#endif
 #include <nx-X11/X.h>
 #include <nx-X11/Xproto.h>
 #include <nx-X11/keysym.h>
 #include "inputstr.h"
 #include <xkbsrv.h>
-#if !defined(WIN32) && !defined(Lynx)
+#if !defined(WIN32)
 #include <sys/time.h>
 #endif
 
@@ -360,9 +357,7 @@ XkbControlsPtr	ctrls;
 	if (keybd->kbdfeed->ctrl.autoRepeat && 
 	    ((xkbi->slowKey != xkbi->mouseKey) || (!xkbi->mouseKeysAccel)) &&
 	     (ctrls->enabled_ctrls&XkbRepeatKeysMask)) {
-#ifndef AIXV3
 	    if (BitIsOn(keybd->kbdfeed->ctrl.autoRepeats,xkbi->slowKey))
-#endif
 	    {
 		xkbi->repeatKey = xkbi->slowKey;
 		xkbi->repeatKeyTimer= TimerSet(xkbi->repeatKeyTimer,
@@ -529,9 +524,7 @@ KeySym *	sym = XkbKeySymsPtr(xkbi->desc,key);
 	if ((keybd->kbdfeed->ctrl.autoRepeat) &&
 		((ctrls->enabled_ctrls&(XkbSlowKeysMask|XkbRepeatKeysMask))==
 							XkbRepeatKeysMask)) {
-#ifndef AIXV3
 	    if (BitIsOn(keybd->kbdfeed->ctrl.autoRepeats,key))
-#endif
 	    {
 #ifdef DEBUG
 		if (xkbDebugFlags&0x10)
diff --git a/nx-X11/programs/Xserver/xkb/xkbInit.c b/nx-X11/programs/Xserver/xkb/xkbInit.c
index 1d8283ffe..1f4bc34b4 100644
--- a/nx-X11/programs/Xserver/xkb/xkbInit.c
+++ b/nx-X11/programs/Xserver/xkb/xkbInit.c
@@ -54,14 +54,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #define	CREATE_ATOM(s)	MakeAtom(s,sizeof(s)-1,1)
 
-#ifdef sgi
-#define LED_CAPS	5
-#define	LED_NUM		6
-#define	LED_SCROLL	7
-#define	PHYS_LEDS	0x7f
-#define	LED_COMPOSE	8
-#else
-#if defined(ultrix) || defined(__osf__) || defined(__alpha) || defined(__alpha__)
+#if defined(ultrix) || defined(__alpha) || defined(__alpha__)
 #define	LED_COMPOSE	2
 #define LED_CAPS	3
 #define	LED_SCROLL	4
@@ -81,7 +74,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define	PHYS_LEDS	0x07
 #endif
 #endif
-#endif
 
 #define	MAX_TOC	16
 typedef struct	_SrvXkmInfo {
@@ -914,7 +906,7 @@ XkbProcessArguments(int argc,char *argv[],int i)
     }
     else if (strncmp(argv[i], "-xkbdir", 7) == 0) {
 	if(++i < argc) {
-#if !defined(WIN32) && !defined(__UNIXOS2__) && !defined(__CYGWIN__)
+#if !defined(WIN32) && !defined(__CYGWIN__)
 	    if (getuid() != geteuid()) {
 		LogMessage(X_WARNING, "-xkbdir is not available for setuid X servers\n");
 		return -1;
diff --git a/nx-X11/programs/Xserver/xkb/xkbUtils.c b/nx-X11/programs/Xserver/xkb/xkbUtils.c
index b6a845c18..f4b7db3c6 100644
--- a/nx-X11/programs/Xserver/xkb/xkbUtils.c
+++ b/nx-X11/programs/Xserver/xkb/xkbUtils.c
@@ -51,12 +51,8 @@ int	XkbDisableLockActions = 0;
 /***====================================================================***/
 
 #ifndef RETURN_SHOULD_REPEAT
-#if (defined(__osf__) && defined(__alpha))
-#define RETURN_SHOULD_REPEAT 1
-#else
 #define	RETURN_SHOULD_REPEAT 0
 #endif
-#endif
 
 /***====================================================================***/