Remove libcwrapper usage from xorg server modules. The libcwrapper is not used in nxagent.

 From c3d14036729fd186d4ec7ca1de603e1f2d174e2f Mon Sep 17 00:00:00 2001
 From: Eric Anholt <anholt@freebsd.org>
 Date: Fri, 10 Feb 2006 22:00:30 +0000
 Subject: Remove libcwrapper usage from xorg server modules. The libcwrapper is
   only of (marginal) use in the drivers, and that usage remains.

 Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

 Fixes ArcticaProject/nx-libs#246 (together with merge commit
 ecd335fa61551d0b86d3f075469a7743ab899d95).

42 files changed, 67 insertions, 220 deletions

diff --git a/nx-X11/programs/Xserver/GL/glx/glxcmds.c b/nx-X11/programs/Xserver/GL/glx/glxcmds.c
index 1145186e7..dd5e40ffe 100644
--- a/nx-X11/programs/Xserver/GL/glx/glxcmds.c
+++ b/nx-X11/programs/Xserver/GL/glx/glxcmds.c
@@ -38,6 +38,8 @@
 #include <dix-config.h>
 #endif
 
+#include <string.h>
+
 #include "glxserver.h"
 #include <GL/glxtokens.h>
 #include <unpack.h>
diff --git a/nx-X11/programs/Xserver/GL/glx/glximports.c b/nx-X11/programs/Xserver/GL/glx/glximports.c
index fa930cf5b..a5a5e37ae 100644
--- a/nx-X11/programs/Xserver/GL/glx/glximports.c
+++ b/nx-X11/programs/Xserver/GL/glx/glximports.c
@@ -37,6 +37,10 @@
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "glxserver.h"
 #include "glxcontext.h"
 #include "glximports.h"
diff --git a/nx-X11/programs/Xserver/GL/glx/glxscreens.c b/nx-X11/programs/Xserver/GL/glx/glxscreens.c
index 88833e154..6b274a64b 100644
--- a/nx-X11/programs/Xserver/GL/glx/glxscreens.c
+++ b/nx-X11/programs/Xserver/GL/glx/glxscreens.c
@@ -37,12 +37,8 @@
 #include <dix-config.h>
 #endif
 
-#ifdef IN_MODULE
-#include <xf86_ansic.h>
-#else
 #include <string.h>
 #include <signal.h>
-#endif
 
 #include <windowstr.h>
 
diff --git a/nx-X11/programs/Xserver/GL/glx/glxutil.c b/nx-X11/programs/Xserver/GL/glx/glxutil.c
index b8d4874aa..5d40bc832 100644
--- a/nx-X11/programs/Xserver/GL/glx/glxutil.c
+++ b/nx-X11/programs/Xserver/GL/glx/glxutil.c
@@ -38,6 +38,8 @@
 #include <dix-config.h>
 #endif
 
+#include <string.h>
+
 #include "glxserver.h"
 #include <GL/glxtokens.h>
 #include <unpack.h>
diff --git a/nx-X11/programs/Xserver/GL/glx/single2.c b/nx-X11/programs/Xserver/GL/glx/single2.c
index d6d689935..d36e57739 100644
--- a/nx-X11/programs/Xserver/GL/glx/single2.c
+++ b/nx-X11/programs/Xserver/GL/glx/single2.c
@@ -37,6 +37,10 @@
 #include <dix-config.h>
 #endif
 
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "glxserver.h"
 #include "glxutil.h"
 #include "glxext.h"
diff --git a/nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h b/nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h
index c4e9c01e9..f48ecb8bb 100644
--- a/nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h
+++ b/nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h
@@ -55,9 +55,6 @@
 
 #ifdef XFree86Server
 
-#ifdef XFree86LOADER
-#include "xf86_ansic.h"
-#endif
 #ifndef assert
 #define assert(a)
 #endif
@@ -111,4 +108,3 @@
 #define __glXAtoi(a)			atoi(a)
 
 #endif /* _glx_ansic_h_ */
-
diff --git a/nx-X11/programs/Xserver/GL/include/GL/xf86glx.h b/nx-X11/programs/Xserver/GL/include/GL/xf86glx.h
index 8a4472874..9e69fac65 100644
--- a/nx-X11/programs/Xserver/GL/include/GL/xf86glx.h
+++ b/nx-X11/programs/Xserver/GL/include/GL/xf86glx.h
@@ -36,7 +36,3 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #endif
 
 #include "miscstruct.h"
-
-#ifdef XFree86LOADER
-#include "xf86_ansic.h"
-#endif
diff --git a/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c b/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c
index 976818f07..d0d8eb239 100644
--- a/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c
+++ b/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c
@@ -35,6 +35,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include <gcstruct.h>
 #include "pixmapstr.h"
 #include "xf86glx_util.h"
diff --git a/nx-X11/programs/Xserver/Xext/saver.c b/nx-X11/programs/Xserver/Xext/saver.c
index 0cb71de42..3e4fd8a95 100644
--- a/nx-X11/programs/Xserver/Xext/saver.c
+++ b/nx-X11/programs/Xserver/Xext/saver.c
@@ -53,11 +53,7 @@ in this Software without prior written authorization from the X Consortium.
 #endif
 
 
-#ifdef IN_MODULE
-#include <xf86_ansic.h>
-#else
 #include <stdio.h>
-#endif
 
 #include "protocol-versions.h"
 
diff --git a/nx-X11/programs/Xserver/Xext/shape.c b/nx-X11/programs/Xserver/Xext/shape.c
index 50a6db119..de597dead 100644
--- a/nx-X11/programs/Xserver/Xext/shape.c
+++ b/nx-X11/programs/Xserver/Xext/shape.c
@@ -28,6 +28,8 @@ in this Software without prior written authorization from The Open Group.
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include <nx-X11/X.h>
 #include <nx-X11/Xproto.h>
 #include "misc.h"
@@ -43,9 +45,6 @@ in this Software without prior written authorization from The Open Group.
 #include "protocol-versions.h"
 #include "regionstr.h"
 #include "gcstruct.h"
-#ifdef EXTMODULE
-#include "xf86_ansic.h"
-#endif
 
 typedef	RegionPtr (*CreateDftPtr)(
 	WindowPtr /* pWin */
diff --git a/nx-X11/programs/Xserver/Xext/shm.c b/nx-X11/programs/Xserver/Xext/shm.c
index f27d70ffe..c70f52b6a 100644
--- a/nx-X11/programs/Xserver/Xext/shm.c
+++ b/nx-X11/programs/Xserver/Xext/shm.c
@@ -58,9 +58,7 @@ in this Software without prior written authorization from The Open Group.
 #define _XSHM_SERVER_
 #include <X11/extensions/shmstr.h>
 #include <nx-X11/Xfuncproto.h>
-#ifdef EXTMODULE
-#include "xf86_ansic.h"
-#endif
+
 #include "protocol-versions.h"
 
 #ifdef PANORAMIX
diff --git a/nx-X11/programs/Xserver/Xext/sync.c b/nx-X11/programs/Xserver/Xext/sync.c
index 0421cd9f9..4f24d5b54 100644
--- a/nx-X11/programs/Xserver/Xext/sync.c
+++ b/nx-X11/programs/Xserver/Xext/sync.c
@@ -54,6 +54,8 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include <string.h>
+
 #include <nx-X11/X.h>
 #include <nx-X11/Xproto.h>
 #include <nx-X11/Xmd.h>
@@ -68,14 +70,10 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <nx-X11/extensions/syncstr.h>
 #include "protocol-versions.h"
 
-#ifdef EXTMODULE
-#include "xf86_ansic.h"
-#else
 #include <stdio.h>
 #if !defined(WIN32) && !defined(Lynx)
 #include <sys/time.h>
 #endif
-#endif
 
 /*
  * Local Global Variables
diff --git a/nx-X11/programs/Xserver/Xext/xtest.c b/nx-X11/programs/Xserver/Xext/xtest.c
index c410a4955..d78efd39b 100644
--- a/nx-X11/programs/Xserver/Xext/xtest.c
+++ b/nx-X11/programs/Xserver/Xext/xtest.c
@@ -50,9 +50,6 @@ from The Open Group.
 #define EXTENSION_EVENT_BASE	64
 #include "extinit.h"		/* LookupDeviceIntRec */
 #endif /* XINPUT */
-#ifdef EXTMODULE
-#include "xf86_ansic.h"
-#endif
 
 #if 0
 static unsigned char XTestReqCode;
diff --git a/nx-X11/programs/Xserver/Xext/xvdisp.c b/nx-X11/programs/Xserver/Xext/xvdisp.c
index 88536b70e..34f4537f2 100644
--- a/nx-X11/programs/Xserver/Xext/xvdisp.c
+++ b/nx-X11/programs/Xserver/Xext/xvdisp.c
@@ -50,6 +50,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include <string.h>
+
 #include <nx-X11/X.h>
 #include <nx-X11/Xproto.h>
 #include "misc.h"
@@ -69,10 +71,6 @@ SOFTWARE.
 #include <X11/extensions/shmproto.h>
 #endif
 
-#ifdef EXTMODULE
-#include "xf86_ansic.h"
-#endif
-
 #include "xvdisp.h"
 
 #ifdef PANORAMIX
diff --git a/nx-X11/programs/Xserver/Xext/xvmain.c b/nx-X11/programs/Xserver/Xext/xvmain.c
index b233299af..3eea84c76 100644
--- a/nx-X11/programs/Xserver/Xext/xvmain.c
+++ b/nx-X11/programs/Xserver/Xext/xvmain.c
@@ -77,6 +77,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include <string.h>
+
 #include <nx-X11/X.h>
 #include <nx-X11/Xproto.h>
 #include "misc.h"
@@ -97,10 +99,6 @@ SOFTWARE.
 #include <nx-X11/extensions/Xvproto.h>
 #include "xvdix.h"
 
-#ifdef EXTMODULE
-#include "xf86_ansic.h"
-#endif
-
 #ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
diff --git a/nx-X11/programs/Xserver/Xext/xvmc.c b/nx-X11/programs/Xserver/Xext/xvmc.c
index 0d4849b85..710101d07 100644
--- a/nx-X11/programs/Xserver/Xext/xvmc.c
+++ b/nx-X11/programs/Xserver/Xext/xvmc.c
@@ -3,6 +3,8 @@
 #include <dix-config.h>
 #endif
 
+#include <string.h>
+
 #include <nx-X11/X.h>
 #include <nx-X11/Xproto.h>
 #include "misc.h"
diff --git a/nx-X11/programs/Xserver/dbe/dbe.c b/nx-X11/programs/Xserver/dbe/dbe.c
index 58301e158..d0487ba63 100644
--- a/nx-X11/programs/Xserver/dbe/dbe.c
+++ b/nx-X11/programs/Xserver/dbe/dbe.c
@@ -37,6 +37,8 @@
 #include <dix-config.h>
 #endif
 
+#include <string.h>
+
 #include <nx-X11/X.h>
 #include <nx-X11/Xproto.h>
 #include "scrnintstr.h"
@@ -47,10 +49,6 @@
 #include "dbestruct.h"
 #include "midbe.h"
 
-#ifdef XFree86LOADER
-#include "xf86_ansic.h"
-#endif
-
 #if !defined(UINT32_MAX)
 #define UINT32_MAX 0xffffffffU
 #endif
diff --git a/nx-X11/programs/Xserver/dbe/midbe.c b/nx-X11/programs/Xserver/dbe/midbe.c
index 867a11243..bc8dd242e 100644
--- a/nx-X11/programs/Xserver/dbe/midbe.c
+++ b/nx-X11/programs/Xserver/dbe/midbe.c
@@ -54,11 +54,7 @@
 #include "gcstruct.h"
 #include "inputstr.h"
 
-#ifndef IN_MODULE
 #include <stdio.h>
-#else
-#include "xf86_ansic.h"
-#endif
 
 /* DEFINES */
 
diff --git a/nx-X11/programs/Xserver/fb/fb24_32.c b/nx-X11/programs/Xserver/fb/fb24_32.c
index 5dc34d7f5..13af3acb2 100644
--- a/nx-X11/programs/Xserver/fb/fb24_32.c
+++ b/nx-X11/programs/Xserver/fb/fb24_32.c
@@ -27,11 +27,7 @@
 #include <dix-config.h>
 #endif
 
-#ifdef XFree86LOADER
-#include "xf86.h"
-#include "xf86_ansic.h"
-#endif
-
+#include <string.h>
 #include "fb.h"
 
 /* X apps don't like 24bpp images, this code exposes 32bpp images */
diff --git a/nx-X11/programs/Xserver/fb/fbarc.c b/nx-X11/programs/Xserver/fb/fbarc.c
index 0193d2b31..ae89e44d8 100644
--- a/nx-X11/programs/Xserver/fb/fbarc.c
+++ b/nx-X11/programs/Xserver/fb/fbarc.c
@@ -28,9 +28,7 @@
 
 #include "fb.h"
 #include "mizerarc.h"
-#ifdef IN_MODULE
-#include "xf86_ansic.h"
-#endif
+#include <limits.h>
 
 typedef void	(*FbArc) (FbBits    *dst, 
 			  FbStride  dstStride, 
@@ -99,7 +97,7 @@ fbPolyArc (DrawablePtr	pDrawable,
 		    box.x2 = x2;
 		    y2 = box.y1 + (int)parcs->height + 1;
 		    box.y2 = y2;
-		    if ( (x2 <= MAXSHORT) && (y2 <= MAXSHORT) &&
+		    if ( (x2 <= SHRT_MAX) && (y2 <= SHRT_MAX) &&
 			(RegionContainsRect(cclip, &box) == rgnIN) )
 			(*arc) (dst, dstStride, dstBpp, 
 				parcs, pDrawable->x + dstXoff, pDrawable->y + dstYoff, 
diff --git a/nx-X11/programs/Xserver/fb/fbcompose.c b/nx-X11/programs/Xserver/fb/fbcompose.c
index 07ae9490f..b0b256e47 100644
--- a/nx-X11/programs/Xserver/fb/fbcompose.c
+++ b/nx-X11/programs/Xserver/fb/fbcompose.c
@@ -33,10 +33,14 @@
 
 #ifdef RENDER
 
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include <assert.h>
+
 #include "picturestr.h"
 #include "mipict.h"
 #include "fbpict.h"
-#include <math.h>
 
 #define mod(a,b)	((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-a) % (b))
 
diff --git a/nx-X11/programs/Xserver/fb/fbcopy.c b/nx-X11/programs/Xserver/fb/fbcopy.c
index 39c75afc5..a0a67950b 100644
--- a/nx-X11/programs/Xserver/fb/fbcopy.c
+++ b/nx-X11/programs/Xserver/fb/fbcopy.c
@@ -26,10 +26,9 @@
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include "fb.h"
-#ifdef IN_MODULE
-#include "xf86_ansic.h"
-#endif
 
 void
 fbCopyNtoN (DrawablePtr	pSrcDrawable,
diff --git a/nx-X11/programs/Xserver/fb/fbgc.c b/nx-X11/programs/Xserver/fb/fbgc.c
index fd7636937..437bc5df3 100644
--- a/nx-X11/programs/Xserver/fb/fbgc.c
+++ b/nx-X11/programs/Xserver/fb/fbgc.c
@@ -26,10 +26,9 @@
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include "fb.h"
-#ifdef IN_MODULE
-#include "xf86_ansic.h"
-#endif
 
 const GCFuncs fbGCFuncs = {
     fbValidateGC,
diff --git a/nx-X11/programs/Xserver/fb/fbimage.c b/nx-X11/programs/Xserver/fb/fbimage.c
index c3b0fe3fb..9894faf02 100644
--- a/nx-X11/programs/Xserver/fb/fbimage.c
+++ b/nx-X11/programs/Xserver/fb/fbimage.c
@@ -26,12 +26,9 @@
 #include <dix-config.h>
 #endif
 
-#include "fb.h"
-#ifdef XFree86LOADER
-#include "xf86.h"
-#include "xf86_ansic.h"
-#endif
+#include <string.h>
 
+#include "fb.h"
 
 void
 fbPutImage (DrawablePtr	pDrawable,
diff --git a/nx-X11/programs/Xserver/fb/fboverlay.c b/nx-X11/programs/Xserver/fb/fboverlay.c
index ac0875016..71a7f30d2 100644
--- a/nx-X11/programs/Xserver/fb/fboverlay.c
+++ b/nx-X11/programs/Xserver/fb/fboverlay.c
@@ -23,11 +23,12 @@
  * Author:  Keith Packard, SuSE, Inc.
  */
 
-
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include "fb.h"
 #include "fboverlay.h"
 
diff --git a/nx-X11/programs/Xserver/fb/fbpict.c b/nx-X11/programs/Xserver/fb/fbpict.c
index 32b395808..c513b3621 100644
--- a/nx-X11/programs/Xserver/fb/fbpict.c
+++ b/nx-X11/programs/Xserver/fb/fbpict.c
@@ -27,6 +27,8 @@
 #include <dix-config.h>
 #endif
 
+#include <string.h>
+
 #include "fb.h"
 
 #ifdef RENDER
diff --git a/nx-X11/programs/Xserver/fb/fbpixmap.c b/nx-X11/programs/Xserver/fb/fbpixmap.c
index 599f3b44e..a2b98bc3c 100644
--- a/nx-X11/programs/Xserver/fb/fbpixmap.c
+++ b/nx-X11/programs/Xserver/fb/fbpixmap.c
@@ -26,10 +26,9 @@
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include "fb.h"
-#ifdef IN_MODULE
-#include "xf86_ansic.h"
-#endif
 
 PixmapPtr
 fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp)
diff --git a/nx-X11/programs/Xserver/fb/fbseg.c b/nx-X11/programs/Xserver/fb/fbseg.c
index 8c50829c5..db3240e1b 100644
--- a/nx-X11/programs/Xserver/fb/fbseg.c
+++ b/nx-X11/programs/Xserver/fb/fbseg.c
@@ -26,6 +26,8 @@
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include "fb.h"
 #include "miline.h"
 
diff --git a/nx-X11/programs/Xserver/fb/fbwindow.c b/nx-X11/programs/Xserver/fb/fbwindow.c
index aca49e5b1..c4e28de5b 100644
--- a/nx-X11/programs/Xserver/fb/fbwindow.c
+++ b/nx-X11/programs/Xserver/fb/fbwindow.c
@@ -26,10 +26,9 @@
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include "fb.h"
-#ifdef IN_MODULE
-#include "xf86_ansic.h"
-#endif
 
 Bool
 fbCreateWindow(WindowPtr pWin)
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
index ae0a9cf3a..7dbcce896 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile
+++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
@@ -233,7 +233,7 @@ NX_DEFINES = \
 
 DEFINES = \
 	-g $(OS_DEFINES) $(EXT_DEFINES) $(NX_DEFINES) \
-        -UXF86VIDMODE -UXFreeXDGA -UXF86MISC -UXF86DRI -UXFree86LOADER \
+        -UXF86VIDMODE -UXFreeXDGA -UXF86MISC -UXF86DRI \
         -DNXAGENT_SERVER \
         -DNXAGENT_CONSTRAINCURSOR \
         -DNXAGENT_FONTCACHE_SIZE=50 \
diff --git a/nx-X11/programs/Xserver/include/misc.h b/nx-X11/programs/Xserver/include/misc.h
index 3255e2201..27137cd50 100644
--- a/nx-X11/programs/Xserver/include/misc.h
+++ b/nx-X11/programs/Xserver/include/misc.h
@@ -96,11 +96,9 @@ extern unsigned long serverGeneration;
 
 #include <nx-X11/Xdefs.h>
 
-#ifndef IN_MODULE
 #ifndef NULL
 #include <stddef.h>
 #endif
-#endif
 
 #ifndef MAXSCREENS
 #define MAXSCREENS	16
@@ -128,9 +126,7 @@ typedef struct _CallbackList *CallbackListPtr; /* also in dix.h */
 typedef struct _xReq *xReqPtr;
 
 #include "os.h" 	/* for ALLOCATE_LOCAL and DEALLOCATE_LOCAL */
-#ifndef IN_MODULE
 #include <nx-X11/Xfuncs.h> /* for bcopy, bzero, and bcmp */
-#endif
 
 #define NullBox ((BoxPtr)0)
 #define MILLI_PER_MIN (1000 * 60)
@@ -158,12 +154,10 @@ typedef struct _xReq *xReqPtr;
 
 #define min(a, b) (((a) < (b)) ? (a) : (b))
 #define max(a, b) (((a) > (b)) ? (a) : (b))
-#ifndef IN_MODULE
 /* abs() is a function, not a macro; include the file declaring
  * it in case we haven't done that yet.
  */  
 #include <stdlib.h>
-#endif /* IN_MODULE */
 #ifndef Fabs
 #define Fabs(a) ((a) > 0.0 ? (a) : -(a))	/* floating absolute value */
 #endif
@@ -179,7 +173,6 @@ typedef struct _xReq *xReqPtr;
  */
 #define lowbit(x) ((x) & (~(x) + 1))
 
-#ifndef IN_MODULE
 /* XXX Not for modules */
 #include <limits.h>
 #if !defined(MAXSHORT) || !defined(MINSHORT) || \
@@ -204,8 +197,6 @@ typedef struct _xReq *xReqPtr;
 #include <ctype.h>
 #include <stdio.h>	/* for fopen, etc... */
 
-#endif
-
 /**
  * Calculate the number of bytes needed to hold bits.
  * @param bits The minimum number of bits needed.
diff --git a/nx-X11/programs/Xserver/include/os.h b/nx-X11/programs/Xserver/include/os.h
index 106132b23..268513bfd 100644
--- a/nx-X11/programs/Xserver/include/os.h
+++ b/nx-X11/programs/Xserver/include/os.h
@@ -53,11 +53,7 @@ SOFTWARE.
 #define ALLOCATE_LOCAL_FALLBACK(_size) malloc((unsigned long)(_size))
 #define DEALLOCATE_LOCAL_FALLBACK(_ptr) free((void *)(_ptr))
 #include <nx-X11/Xalloca.h>
-#ifndef IN_MODULE
 #include <stdarg.h>
-#else
-#include "xf86_ansic.h"
-#endif
 
 #define NullFID ((FID) 0)
 
@@ -86,12 +82,10 @@ typedef struct _NewClientRec *NewClientPtr;
 #define xnfstrdup(s) XNFstrdup(s)
 #endif
 
-#ifndef IN_MODULE
 #ifdef __SCO__
 #include <stdio.h>
 #endif
 #include <string.h>
-#endif
 
 /* have to put $(SIGNAL_DEFINES) in DEFINES in Imakefile to get this right */
 #ifdef SIGNALRETURNSINT
@@ -519,7 +513,7 @@ extern void ErrorF(const char *f, ...) _printf_attribute(1,2);
 extern void Error(char *str);
 extern void LogPrintMarkers(void);
 
-#if defined(NEED_SNPRINTF) && !defined(IN_MODULE)
+#if defined(NEED_SNPRINTF)
 extern int snprintf(char *str, size_t size, const char *format, ...)
 	_printf_attribute(3,4);
 extern int vsnprintf(char *str, size_t size, const char *format, va_list ap);
diff --git a/nx-X11/programs/Xserver/mi/Imakefile b/nx-X11/programs/Xserver/mi/Imakefile
index fda19aa59..1d50c9156 100644
--- a/nx-X11/programs/Xserver/mi/Imakefile
+++ b/nx-X11/programs/Xserver/mi/Imakefile
@@ -141,14 +141,12 @@ OBJS =  $(CBRT_OBJ)             \
  * in order to build the XInputExtension, since we
  * don't use the XF86 module loader.
  */
-
 EXT_DEFINES = ExtensionDefines \
-	-UXFree86LOADER
-
+              $(NULL)
 #else
-
-EXT_DEFINES = ExtensionDefines -UXINPUT \
-	-UXFree86LOADER
+EXT_DEFINES = ExtensionDefines \
+              -UXINPUT \
+              $(NULL)
 #endif
 
 #endif
diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c
index b48ed8a1c..fc64937d7 100644
--- a/nx-X11/programs/Xserver/mi/miinitext.c
+++ b/nx-X11/programs/Xserver/mi/miinitext.c
@@ -146,12 +146,8 @@ extern Bool noXIdleExtension;
 extern Bool noXvExtension;
 #endif
 
-#ifndef XFree86LOADER
 #define INITARGS void
 typedef void (*InitExtension)(void);
-#else /* XFree86Loader */
-#include "loaderProcs.h"
-#endif
 
 #ifdef MITSHM
 #define _XSHM_SERVER_
@@ -380,8 +376,6 @@ void EnableDisableExtensionError(char *name, Bool enable)
 	ErrorF("    %s\n", ext->name);
 }
 
-#ifndef XFree86LOADER
-
 /*ARGSUSED*/
 void
 InitExtensions(argc, argv)
@@ -496,101 +490,3 @@ InitVisualWrap()
 #endif
 }
 
-#else /* XFree86LOADER */
-/* List of built-in (statically linked) extensions */
-static ExtensionModule staticExtensions[] = {
-#ifdef XTESTEXT1
-    { XTestExtension1Init, "XTEST1", &noTestExtensions, NULL, NULL },
-#endif
-#ifdef MITSHM
-    { ShmExtensionInit, SHMNAME, &noMITShmExtension, NULL, NULL },
-#endif
-#ifdef XINPUT
-    { XInputExtensionInit, "XInputExtension", &noXInputExtension, NULL, NULL },
-#endif
-#ifdef XTEST
-    { XTestExtensionInit, XTestExtensionName, &noTestExtensions, NULL, NULL },
-#endif
-#ifdef XIDLE
-    { XIdleExtensionInit, "XIDLE", &noXIdleExtension, NULL, NULL },
-#endif
-#ifdef XKB
-    { XkbExtensionInit, XkbName, &noXkbExtension, NULL, NULL },
-#endif
-#ifdef XCSECURITY
-    { SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL, NULL },
-#endif
-#ifdef PANORAMIX
-    { PanoramiXExtensionInit, PANORAMIX_PROTOCOL_NAME, &noPanoramiXExtension, NULL, NULL },
-#endif
-#ifdef XFIXES
-    /* must be before Render to layer DisplayCursor correctly */
-    { XFixesExtensionInit, "XFIXES", &noXFixesExtension, NULL, NULL },
-#endif
-#ifdef XF86BIGFONT
-    { XFree86BigfontExtensionInit, XF86BIGFONTNAME, &noXFree86BigfontExtension, NULL, NULL },
-#endif
-#ifdef RENDER
-    { RenderExtensionInit, "RENDER", &noRenderExtension, NULL, NULL },
-#endif
-#ifdef RANDR
-    { RRExtensionInit, "RANDR", &noRRExtension, NULL, NULL },
-#endif
-#ifdef COMPOSITE
-    { CompositeExtensionInit, "COMPOSITE", &noCompositeExtension, NULL },
-#endif
-#ifdef DAMAGE
-    { DamageExtensionInit, "DAMAGE", &noDamageExtension, NULL },
-#endif
-    { NULL, NULL, NULL, NULL, NULL }
-};
-    
-/*ARGSUSED*/
-void
-InitExtensions(argc, argv)
-    int		argc;
-    char	*argv[];
-{
-    int i;
-    ExtensionModule *ext;
-    static Bool listInitialised = FALSE;
-
-    if (!listInitialised) {
-	/* Add built-in extensions to the list. */
-	for (i = 0; staticExtensions[i].name; i++)
-	    LoadExtension(&staticExtensions[i], TRUE);
-
-	/* Sort the extensions according the init dependencies. */
-	LoaderSortExtensions();
-	listInitialised = TRUE;
-    }
-
-    for (i = 0; ExtensionModuleList[i].name != NULL; i++) {
-	ext = &ExtensionModuleList[i];
-	if (ext->initFunc != NULL && 
-	    (ext->disablePtr == NULL || 
-	     (ext->disablePtr != NULL && !*ext->disablePtr))) {
-	    (ext->initFunc)();
-	}
-    }
-}
-
-static void (*__miHookInitVisualsFunction)(miInitVisualsProcPtr *);
-
-void
-InitVisualWrap()
-{
-    miResetInitVisuals();
-    if (__miHookInitVisualsFunction)
-	(*__miHookInitVisualsFunction)(&miInitVisualsProc);
-}
-
-void miHookInitVisuals(void (**old)(miInitVisualsProcPtr *),
-		       void (*new)(miInitVisualsProcPtr *))
-{
-    if (old)
-	*old = __miHookInitVisualsFunction;
-    __miHookInitVisualsFunction = new;
-}
-
-#endif /* XFree86LOADER */
diff --git a/nx-X11/programs/Xserver/miext/cw/cw.c b/nx-X11/programs/Xserver/miext/cw/cw.c
index 8aca3edf7..774f0d056 100644
--- a/nx-X11/programs/Xserver/miext/cw/cw.c
+++ b/nx-X11/programs/Xserver/miext/cw/cw.c
@@ -25,6 +25,8 @@
 #include <dix-config.h>
 #endif
 
+#include <string.h>
+
 #include "gcstruct.h"
 #include "windowstr.h"
 #include "cw.h"
diff --git a/nx-X11/programs/Xserver/miext/cw/cw_ops.c b/nx-X11/programs/Xserver/miext/cw/cw_ops.c
index e4c53b79f..826a0eeca 100644
--- a/nx-X11/programs/Xserver/miext/cw/cw_ops.c
+++ b/nx-X11/programs/Xserver/miext/cw/cw_ops.c
@@ -25,6 +25,8 @@
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include "gcstruct.h"
 #include "cw.h"
 
diff --git a/nx-X11/programs/Xserver/miext/cw/cw_render.c b/nx-X11/programs/Xserver/miext/cw/cw_render.c
index ac4230a03..504d7bda3 100644
--- a/nx-X11/programs/Xserver/miext/cw/cw_render.c
+++ b/nx-X11/programs/Xserver/miext/cw/cw_render.c
@@ -25,6 +25,8 @@
 #include <dix-config.h>
 #endif
 
+#include <string.h>
+
 #include "gcstruct.h"
 #include "windowstr.h"
 #include "cw.h"
diff --git a/nx-X11/programs/Xserver/miext/damage/damage.c b/nx-X11/programs/Xserver/miext/damage/damage.c
index 669f08ff5..a56b9877e 100644
--- a/nx-X11/programs/Xserver/miext/damage/damage.c
+++ b/nx-X11/programs/Xserver/miext/damage/damage.c
@@ -26,6 +26,8 @@
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include    <nx-X11/X.h>
 #include    "scrnintstr.h"
 #include    "windowstr.h"
diff --git a/nx-X11/programs/Xserver/os/osinit.c b/nx-X11/programs/Xserver/os/osinit.c
index f4b7abae0..5f097f89a 100644
--- a/nx-X11/programs/Xserver/os/osinit.c
+++ b/nx-X11/programs/Xserver/os/osinit.c
@@ -92,10 +92,6 @@ int limitNoFile = -1;
 
 Bool OsDelayInitColors = FALSE;
 
-#ifdef XFree86LOADER
-extern void xf86WrapperInit(void);
-#endif
-
 void
 OsInit(void)
 {
@@ -109,9 +105,6 @@ OsInit(void)
 #endif
 
     if (!been_here) {
-#ifdef XFree86LOADER
-	xf86WrapperInit();
-#endif
 #if !defined(__SCO__) && !defined(__CYGWIN__) && !defined(__UNIXWARE__)
 	fclose(stdin);
 	fclose(stdout);
diff --git a/nx-X11/programs/Xserver/record/record.c b/nx-X11/programs/Xserver/record/record.c
index 33bdf56ec..eb9212f40 100644
--- a/nx-X11/programs/Xserver/record/record.c
+++ b/nx-X11/programs/Xserver/record/record.c
@@ -42,12 +42,8 @@ and Jim Haggerty of Metheus.
 #include <nx-X11/extensions/recordstr.h>
 #include "set.h"
 
-#ifndef XFree86LOADER
 #include <stdio.h>
 #include <assert.h>
-#else
-#include "xf86_ansic.h"
-#endif
 
 #ifdef PANORAMIX
 #include "globals.h"
diff --git a/nx-X11/programs/Xserver/record/set.c b/nx-X11/programs/Xserver/record/set.c
index 07d911c8c..1ea3fea4a 100644
--- a/nx-X11/programs/Xserver/record/set.c
+++ b/nx-X11/programs/Xserver/record/set.c
@@ -53,12 +53,13 @@ from The Open Group.
 #include <dix-config.h>
 #endif
 
+#include <string.h>
+
 #ifndef TESTING
 #include "misc.h"
 #else
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 /* stuff that you normally get from the X Server's environment */
 
@@ -81,11 +82,6 @@ typedef unsigned short CARD16;
 
 #include "set.h"
 
-#ifdef XFree86LOADER
-#include "xf86_libc.h"
-#include "xf86_ansic.h"
-#endif
-
 static int
 maxMemberInInterval(pIntervals, nIntervals)
     RecordSetInterval *pIntervals;
diff --git a/nx-X11/programs/Xserver/render/render.c b/nx-X11/programs/Xserver/render/render.c
index 2eba16a4e..774dcc8ec 100644
--- a/nx-X11/programs/Xserver/render/render.c
+++ b/nx-X11/programs/Xserver/render/render.c
@@ -45,9 +45,6 @@
 #include "glyphstr.h"
 #include <nx-X11/Xfuncproto.h>
 #include "cursorstr.h"
-#ifdef EXTMODULE
-#include "xf86_ansic.h"
-#endif
 
 #include "protocol-versions.h"