diff --git a/nx-X11/extras/Mesa_6.4.2/src/mesa/main/glheader.h b/nx-X11/extras/Mesa_6.4.2/src/mesa/main/glheader.h
index 90b3a81a4e..dad674a3da 100644
--- a/nx-X11/extras/Mesa_6.4.2/src/mesa/main/glheader.h
+++ b/nx-X11/extras/Mesa_6.4.2/src/mesa/main/glheader.h
@@ -62,7 +62,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#if defined(__linux__) && defined(__i386__)
+#if defined(__GLIBC__) && defined(__i386__)
 #include <fpu_control.h>
 #endif
 #endif
diff --git a/nx-X11/programs/Xserver/Xext/xf86bigfont.c b/nx-X11/programs/Xserver/Xext/xf86bigfont.c
index 352e402619..a31ffd02cf 100644
--- a/nx-X11/programs/Xserver/Xext/xf86bigfont.c
+++ b/nx-X11/programs/Xserver/Xext/xf86bigfont.c
@@ -46,6 +46,7 @@
    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>