diff -uNr a/nx-X11/programs/Xserver/Xext/xf86bigfont.c b/nx-X11/programs/Xserver/Xext/xf86bigfont.c
--- a/nx-X11/programs/Xserver/Xext/xf86bigfont.c	2021-02-04 07:34:56.000000000 -0600
+++ b/nx-X11/programs/Xserver/Xext/xf86bigfont.c	2021-09-22 10:11:10.000000000 -0500
@@ -40,14 +40,7 @@
 
 #include <sys/types.h>
 #ifdef HAS_SHM
-#if defined(linux) && (!defined(__GNU_LIBRARY__) || __GNU_LIBRARY__ < 2)
-/* libc4 does not define __GNU_LIBRARY__, libc5 defines __GNU_LIBRARY__ as 1 */
-/* Linux libc4 and libc5 only (because glibc doesn't include kernel headers):
-   Linux 2.0.x and 2.2.x define SHMLBA as PAGE_SIZE, but forget to define
-   PAGE_SIZE. It is defined in <asm/page.h>. */
-#include <asm/page.h>
 #include <limits.h>
-#endif
 #ifdef SVR4
 #include <sys/sysmacros.h>
 #endif
--- a/nx-X11/extras/Mesa/src/mesa/main/glheader.h	2018-03-16 19:02:29.000000000 -0600
+++ b/nx-X11/extras/Mesa/src/mesa/main/glheader.h	2020-10-09 21:30:09.000000000 -0500
@@ -62,9 +62,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#if defined(__linux__) && defined(__i386__)
-#include <fpu_control.h>
-#endif
 #endif
 #include <float.h>
 #include <stdarg.h>