Remove libcwrapper usage from xorg server modules. The libcwrapper is only

    of (marginal) use in the drivers, and that usage remains.

100 files changed, 142 insertions, 185 deletions

diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
index d323f677b..39c8b8c59 100644
--- a/hw/xfree86/common/compiler.h
+++ b/hw/xfree86/common/compiler.h
@@ -52,10 +52,6 @@
 
 #ifndef _COMPILER_H
 
-# if !defined(_XF86_ANSIC_H) && defined(XFree86Module)
-#  error missing #include "xf86_ansic.h" before #include "compiler.h"
-# endif
-
 # define _COMPILER_H
 
 #if defined(__SUNPRO_C)
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index 010360cf3..5d9d61e8a 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -40,11 +40,7 @@
 #include "xf86str.h"
 #include "xf86Opt.h"
 #include <X11/Xfuncproto.h>
-#ifndef IN_MODULE
 #include <stdarg.h>
-#else
-#include "xf86_ansic.h"
-#endif
 #ifdef RANDR
 #include <X11/extensions/randr.h>
 #endif
diff --git a/hw/xfree86/ddc/ddcProperty.c b/hw/xfree86/ddc/ddcProperty.c
index c2b0f4aba..00e721053 100644
--- a/hw/xfree86/ddc/ddcProperty.c
+++ b/hw/xfree86/ddc/ddcProperty.c
@@ -9,9 +9,9 @@
 #include <xorg-config.h>
 #endif
 
+#include <string.h>
 #include "misc.h"
 #include "xf86.h"
-/* #include "xf86_ansic.h" */
 /* #include "xf86_OSproc.h" */
 #include <X11/Xatom.h>
 #include "property.h"
diff --git a/hw/xfree86/ddc/edid.c b/hw/xfree86/ddc/edid.c
index ef4848eef..6d3b18c13 100644
--- a/hw/xfree86/ddc/edid.c
+++ b/hw/xfree86/ddc/edid.c
@@ -13,10 +13,10 @@
 
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 #include "xf86DDC.h"
 #include "ddcPriv.h"
+#include <string.h>
 
 static int find_start(unsigned int *);
 static unsigned char * find_header(unsigned char *);
diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c
index 59dae6cf3..718cbf77a 100644
--- a/hw/xfree86/ddc/interpret_edid.c
+++ b/hw/xfree86/ddc/interpret_edid.c
@@ -10,10 +10,10 @@
 
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 #define _PARSE_EDID_
 #include "xf86DDC.h"
+#include <string.h>
 
 static void get_vendor_section(Uchar*, struct vendor *);
 static void get_version_section(Uchar*, struct edid_version *);
diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c
index 1cec91283..2b96488e8 100644
--- a/hw/xfree86/ddc/print_edid.c
+++ b/hw/xfree86/ddc/print_edid.c
@@ -10,7 +10,6 @@
 
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 #include "xf86DDC.h"
   
diff --git a/hw/xfree86/ddc/xf86DDC.c b/hw/xfree86/ddc/xf86DDC.c
index 36b214644..c5b070dc7 100644
--- a/hw/xfree86/ddc/xf86DDC.c
+++ b/hw/xfree86/ddc/xf86DDC.c
@@ -10,10 +10,10 @@
 
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 #include "xf86DDC.h"
 #include "ddcPriv.h"
+#include <string.h>
 
 #ifdef XFree86LOADER
 static const OptionInfoRec *DDCAvailableOptions(void *unused);
diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c
index 3c2044f78..f71ce6168 100644
--- a/hw/xfree86/dixmods/extmod/modinit.c
+++ b/hw/xfree86/dixmods/extmod/modinit.c
@@ -28,7 +28,6 @@
 #endif
 
 #ifdef XFree86LOADER
-#include "xf86_ansic.h"
 
 #include "xf86Module.h"
 #include "xf86Opt.h"
diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c
index a5cab0f11..3ea19b431 100644
--- a/hw/xfree86/dixmods/extmod/xf86dga2.c
+++ b/hw/xfree86/dixmods/extmod/xf86dga2.c
@@ -30,11 +30,7 @@
 #include "dgaproc.h"
 #include "xf86dgaext.h"
 
-#ifdef EXTMODULE
-#include "xf86_ansic.h"
-#else
 #include <string.h>
-#endif
 
 #include "modinit.h"
 
diff --git a/hw/xfree86/dixmods/extmod/xf86misc.c b/hw/xfree86/dixmods/extmod/xf86misc.c
index a5dc2e212..a35db1f2f 100644
--- a/hw/xfree86/dixmods/extmod/xf86misc.c
+++ b/hw/xfree86/dixmods/extmod/xf86misc.c
@@ -41,10 +41,6 @@
 #endif /* USL */
 #endif
 
-#ifdef EXTMODULE
-#include "xf86_ansic.h"
-#endif
-
 static int miscErrorBase;
 static int MiscGeneration = 0;
 static int MiscClientPrivateIndex;
diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c
index 50575cc05..2a3037c0e 100644
--- a/hw/xfree86/dixmods/extmod/xf86vmode.c
+++ b/hw/xfree86/dixmods/extmod/xf86vmode.c
@@ -29,7 +29,7 @@ or other dealings in this Software without prior written authorization
 from Kaleb S. KEITHLEY
 
 */
-/* $XdotOrg: xc/programs/Xserver/Xext/xf86vmode.c,v 1.4 2005/04/20 12:25:12 daniels Exp $ */
+/* $XdotOrg: xserver/xorg/hw/xfree86/dixmods/extmod/xf86vmode.c,v 1.8 2005/07/16 03:49:58 kem Exp $ */
 /* $Xorg: xf86vmode.c,v 1.3 2000/08/17 19:47:59 cpqbld Exp $ */
 /* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
 
@@ -52,10 +52,6 @@ from Kaleb S. KEITHLEY
 #include "xf86.h"
 #include "vidmodeproc.h"
 
-#ifdef EXTMODULE
-#include "xf86_ansic.h"
-#endif
-
 #define DEFAULT_XF86VIDMODE_VERBOSITY	3
 
 static int VidModeErrorBase;
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index fdfa57557..72139dea6 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -39,12 +39,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #endif
 
 #include "xf86.h"
-#ifdef XFree86LOADER
-#include "xf86_ansic.h"
-#else
 #include <sys/time.h>
 #include <unistd.h>
-#endif
 
 #define NEED_REPLIES
 #define NEED_EVENTS
diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c
index 273ccda1b..4b0e35459 100644
--- a/hw/xfree86/dri/xf86dri.c
+++ b/hw/xfree86/dri/xf86dri.c
@@ -39,10 +39,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <xorg-config.h>
 #endif
 
+#include <string.h>
+
 #include "xf86.h"
-#ifdef XFree86LOADER
-#include "xf86_ansic.h"
-#endif
 
 #define NEED_REPLIES
 #define NEED_EVENTS
diff --git a/hw/xfree86/exa/exa_migration.c b/hw/xfree86/exa/exa_migration.c
index 2acda24da..270ad7541 100644
--- a/hw/xfree86/exa/exa_migration.c
+++ b/hw/xfree86/exa/exa_migration.c
@@ -25,6 +25,9 @@
 #ifdef HAVE_CONFIG_H
 #include <xorg-config.h>
 #endif
+
+#include <string.h>
+
 #include "exa_priv.h"
 #include <X11/fonts/fontstruct.h>
 #include "dixfontstr.h"
diff --git a/hw/xfree86/exa/exa_offscreen.c b/hw/xfree86/exa/exa_offscreen.c
index b0b19f501..c3a2af642 100644
--- a/hw/xfree86/exa/exa_offscreen.c
+++ b/hw/xfree86/exa/exa_offscreen.c
@@ -22,6 +22,10 @@
 
 #include "exa_priv.h"
 
+#include <sys/limits.h>
+#include <assert.h>
+#include <stdlib.h>
+
 #if DEBUG_OFFSCREEN
 #define DBG_OFFSCREEN(a) ErrorF a
 #else
@@ -120,7 +124,7 @@ exaOffscreenAlloc (ScreenPtr pScreen, int size, int align,
 
 	/* prev points at the first object to boot */
 	best = NULL;
-	best_score = MAXINT;
+	best_score = INT_MAX;
 	for (begin = pExaScr->info->card.offScreenAreas; begin != NULL;
 	     begin = begin->next)
 	{
diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c
index 3e7b1f66a..25779ed87 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.c
+++ b/hw/xfree86/fbdevhw/fbdevhw.c
@@ -7,7 +7,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 
 /* pci stuff */
 #include "xf86PciInfo.h"
diff --git a/hw/xfree86/i2c/bt829.c b/hw/xfree86/i2c/bt829.c
index c9d144317..3963ecf47 100644
--- a/hw/xfree86/i2c/bt829.c
+++ b/hw/xfree86/i2c/bt829.c
@@ -4,6 +4,10 @@
 #include <xorg-config.h>
 #endif
 
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
 #include "xf86.h"
 #include "xf86i2c.h"
 #include "bt829.h"
diff --git a/hw/xfree86/i2c/fi1236.c b/hw/xfree86/i2c/fi1236.c
index 299f20060..22a019499 100644
--- a/hw/xfree86/i2c/fi1236.c
+++ b/hw/xfree86/i2c/fi1236.c
@@ -1,9 +1,14 @@
-/* $XdotOrg: $ */
+/* $XdotOrg: xserver/xorg/hw/xfree86/i2c/fi1236.c,v 1.8 2005/07/30 18:56:32 alanc Exp $ */
 
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
 
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
 #include "xf86.h"
 #include "xf86i2c.h"
 #include "fi1236.h"
diff --git a/hw/xfree86/i2c/msp3430.c b/hw/xfree86/i2c/msp3430.c
index 91019fc8f..42f100e7c 100644
--- a/hw/xfree86/i2c/msp3430.c
+++ b/hw/xfree86/i2c/msp3430.c
@@ -2,6 +2,9 @@
 #include <xorg-config.h>
 #endif
 
+#include <string.h>
+#include <unistd.h>
+
 #include "xf86.h"
 #include "xf86i2c.h"
 #include "msp3430.h"
diff --git a/hw/xfree86/i2c/xf86i2c.c b/hw/xfree86/i2c/xf86i2c.c
index d33ea97c1..9049fe4fd 100644
--- a/hw/xfree86/i2c/xf86i2c.c
+++ b/hw/xfree86/i2c/xf86i2c.c
@@ -12,13 +12,15 @@
 #include <xorg-config.h>
 #endif
 
-#if 1
+#include <sys/time.h>
+#include <string.h>
+
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include <X11/X.h>
+#include <X11/Xos.h>
 #include <X11/Xproto.h>
 #include "scrnintstr.h"
 #include "regionstr.h"
@@ -28,14 +30,6 @@
 #include "resource.h"
 #include "gcstruct.h"
 #include "dixstruct.h"
-#else
-typedef int Bool;
-typedef void *Pointer;
-#define NULL ((void *)0)
-#define X_DEFAULT 0
-#define TRUE  1
-#define FALSE 0
-#endif
 
 #include "xf86i2c.h"
 
@@ -76,20 +70,19 @@ I2CUDelay(I2CBusPtr b, int usec)
 static void
 I2CUDelay(I2CBusPtr b, int usec)
 {
-  long b_secs, b_usecs;
-  long a_secs, a_usecs;
+  struct timeval begin, cur;
   long d_secs, d_usecs;
   long diff;
 
   if (usec > 0) {
-    xf86getsecs(&b_secs, &b_usecs);
+    X_GETTIMEOFDAY(&begin);
     do {
       /* It would be nice to use {xf86}usleep, 
        * but usleep (1) takes >10000 usec !
        */
-      xf86getsecs(&a_secs, &a_usecs);
-      d_secs  = (a_secs - b_secs);
-      d_usecs = (a_usecs - b_usecs);
+      X_GETTIMEOFDAY(&cur);
+      d_secs  = (cur.tv_sec - begin.tv_sec);
+      d_usecs = (cur.tv_usec - begin.tv_usec);
       diff = d_secs*1000000 + d_usecs;
     } while (diff>=0 && diff< (usec + 1));
   }
diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
index e9ddd3334..a9ceebcb0 100644
--- a/hw/xfree86/int10/generic.c
+++ b/hw/xfree86/int10/generic.c
@@ -8,9 +8,11 @@
 #include <xorg-config.h>
 #endif
 
+#include <string.h>
+#include <unistd.h>
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "compiler.h"
 #define _INT10_PRIVATE
 #include "xf86int10.h"
diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c
index eae6b5378..1809e2d95 100644
--- a/hw/xfree86/int10/helper_exec.c
+++ b/hw/xfree86/int10/helper_exec.c
@@ -19,9 +19,11 @@
 #include <xorg-config.h>
 #endif
 
+#include <unistd.h>
+
+#include <X11/Xos.h>
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "compiler.h"
 #define _INT10_PRIVATE
 #include "int10Defines.h"
@@ -342,13 +344,14 @@ x_inw(CARD16 port)
     CARD16 val;
 
     if (port == 0x5c) {
+	struct timeval tv;
+
 	/*
 	 * Emulate a PC98's timer.  Typical resolution is 3.26 usec.
 	 * Approximate this by dividing by 3.
 	 */
-	long sec, usec;
-	(void)getsecs(&sec, &usec);
-	val = (CARD16)(usec / 3);
+	X_GETTIMEOFDAY(&tv);
+	val = (CARD16)(tv.tv_usec / 3);
     } else {
 	if (!pciCfg1inw(port, &val))
 	    val = inw(Int10Current->ioBase + port);
@@ -363,15 +366,15 @@ void
 x_outb(CARD16 port, CARD8 val)
 {
     if ((port == 0x43) && (val == 0)) {
+	struct timeval tv;
 	/*
 	 * Emulate a PC's timer 0.  Such timers typically have a resolution of
 	 * some .838 usec per tick, but this can only provide 1 usec per tick.
 	 * (Not that this matters much, given inherent emulation delays.)  Use
 	 * the bottom bit as a byte select.  See inb(0x40) above.
 	 */
-	long sec, usec;
-	(void) getsecs(&sec, &usec);
-	Int10Current->inb40time = (CARD16)(usec | 1);
+	X_GETTIMEOFDAY(&tv);
+	Int10Current->inb40time = (CARD16)(tv.tv_usec | 1);
 #ifdef PRINT_PORT
 	ErrorF(" outb(%#x, %2.2x)\n", port, val);
 #endif
diff --git a/hw/xfree86/int10/helper_mem.c b/hw/xfree86/int10/helper_mem.c
index 495a0e04d..65ffe3df5 100644
--- a/hw/xfree86/int10/helper_mem.c
+++ b/hw/xfree86/int10/helper_mem.c
@@ -8,9 +8,11 @@
 #include <xorg-config.h>
 #endif
 
+#include <string.h>
+#include <stdlib.h>
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "compiler.h"
 #include "xf86Pci.h"
 #define _INT10_PRIVATE
diff --git a/hw/xfree86/int10/pci.c b/hw/xfree86/int10/pci.c
index f35bd7233..520df1495 100644
--- a/hw/xfree86/int10/pci.c
+++ b/hw/xfree86/int10/pci.c
@@ -9,9 +9,10 @@
 #include <xorg-config.h>
 #endif
 
+#include <string.h>
+
 #include "xf86Pci.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #define _INT10_PRIVATE
 #include "xf86int10.h"
 
diff --git a/hw/xfree86/int10/x86emu.c b/hw/xfree86/int10/x86emu.c
index b9580a1de..b3320e5b9 100644
--- a/hw/xfree86/int10/x86emu.c
+++ b/hw/xfree86/int10/x86emu.c
@@ -3,10 +3,6 @@
 #include <xorg-config.h>
 #endif
 
-#ifdef NO_SYS_HEADERS
-# include "xf86_ansic.h"
-#endif
-
 #include "debug.c"
 #include "decode.c"
 #include "fpu.c"
diff --git a/hw/xfree86/int10/xf86int10.c b/hw/xfree86/int10/xf86int10.c
index 06cf40b8c..303cf8925 100644
--- a/hw/xfree86/int10/xf86int10.c
+++ b/hw/xfree86/int10/xf86int10.c
@@ -10,7 +10,6 @@
 #endif
 
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "compiler.h"
 #define _INT10_PRIVATE
 #include "xf86int10.h"
diff --git a/hw/xfree86/int10/xf86x86emu.c b/hw/xfree86/int10/xf86x86emu.c
index c15a5f9be..62a34e3aa 100644
--- a/hw/xfree86/int10/xf86x86emu.c
+++ b/hw/xfree86/int10/xf86x86emu.c
@@ -10,11 +10,9 @@
 
 #include <x86emu.h>
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "compiler.h"
 #include "xf86_OSproc.h"
 #include "xf86Pci.h"
-#include "xf86_libc.h"
 #define _INT10_PRIVATE
 #include "xf86int10.h"
 #include "int10Defines.h"
diff --git a/hw/xfree86/os-support/bsd/bsd_jstk.c b/hw/xfree86/os-support/bsd/bsd_jstk.c
index 00f457b88..bc99f2914 100644
--- a/hw/xfree86/os-support/bsd/bsd_jstk.c
+++ b/hw/xfree86/os-support/bsd/bsd_jstk.c
@@ -38,7 +38,6 @@
 
 #ifdef XFree86LOADER
 #include "misc.h"
-#include "xf86_libc.h"
 #endif
 #include "xf86.h"
 
diff --git a/hw/xfree86/os-support/bsd/bsd_kmod.c b/hw/xfree86/os-support/bsd/bsd_kmod.c
index ecaf78028..e3c4bb77c 100644
--- a/hw/xfree86/os-support/bsd/bsd_kmod.c
+++ b/hw/xfree86/os-support/bsd/bsd_kmod.c
@@ -11,7 +11,6 @@
 #include <sys/linker.h>
 
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 
 /*
  * Load a FreeBSD kernel module.
diff --git a/hw/xfree86/os-support/drm/xf86drm.c b/hw/xfree86/os-support/drm/xf86drm.c
index 0980e7884..a4663048b 100644
--- a/hw/xfree86/os-support/drm/xf86drm.c
+++ b/hw/xfree86/os-support/drm/xf86drm.c
@@ -40,39 +40,33 @@
 #ifdef XFree86Server
 # include "xf86.h"
 # include "xf86_OSproc.h"
-# include "drm.h"
-# include "xf86_ansic.h"
 # define _DRM_MALLOC xalloc
 # define _DRM_FREE   xfree
 # ifndef XFree86LOADER
 #  include <sys/mman.h>
 # endif
 #else
-# include <stdio.h>
-# include <stdlib.h>
-# include <unistd.h>
-# include <string.h>
-# include <ctype.h>
-# include <fcntl.h>
-# include <errno.h>
-# include <signal.h>
-# include <sys/types.h>
-# include <sys/stat.h>
-# define stat_t struct stat
-# include <sys/ioctl.h>
-# include <sys/mman.h>
-# include <sys/time.h>
-# include <stdarg.h>
-# ifdef DRM_USE_MALLOC
-#  define _DRM_MALLOC malloc
-#  define _DRM_FREE   free
-# else
-#  define _DRM_MALLOC malloc
-#  define _DRM_FREE   free
-# endif
-# include "drm.h"
+# define _DRM_MALLOC malloc
+# define _DRM_FREE   free
 #endif
 
+#include "drm.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <ctype.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#define stat_t struct stat
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <sys/time.h>
+#include <stdarg.h>
+
 /* No longer needed with CVS kernel modules on alpha 
 #if defined(__alpha__) && defined(__linux__)
 extern unsigned long _bus_base(void);
diff --git a/hw/xfree86/os-support/drm/xf86drmHash.c b/hw/xfree86/os-support/drm/xf86drmHash.c
index 4fbc88a12..a2567080a 100644
--- a/hw/xfree86/os-support/drm/xf86drmHash.c
+++ b/hw/xfree86/os-support/drm/xf86drmHash.c
@@ -76,18 +76,13 @@
 
 #define HASH_MAIN 0
 
-#if HASH_MAIN
-# include <stdio.h>
-# include <stdlib.h>
-#else
+#include <stdio.h>
+#include <stdlib.h>
+#if !HASH_MAIN
 # include "drm.h"
 # include "xf86drm.h"
 # ifdef XFree86LOADER
 #  include "xf86.h"
-#  include "xf86_ansic.h"
-# else
-#  include <stdio.h>
-#  include <stdlib.h>
 # endif
 #endif
 
diff --git a/hw/xfree86/os-support/drm/xf86drmRandom.c b/hw/xfree86/os-support/drm/xf86drmRandom.c
index 301aaf4c2..cc40dccad 100644
--- a/hw/xfree86/os-support/drm/xf86drmRandom.c
+++ b/hw/xfree86/os-support/drm/xf86drmRandom.c
@@ -79,18 +79,13 @@
 
 #define RANDOM_MAIN 0
 
-#if RANDOM_MAIN
-# include <stdio.h>
-# include <stdlib.h>
-#else
+#include <stdio.h>
+#include <stdlib.h>
+#if !RANDOM_MAIN
 # include "drm.h"
 # include "xf86drm.h"
 # ifdef XFree86LOADER
 #  include "xf86.h"
-#  include "xf86_ansic.h"
-# else
-#  include <stdio.h>
-#  include <stdlib.h>
 # endif
 #endif
 
diff --git a/hw/xfree86/os-support/drm/xf86drmSL.c b/hw/xfree86/os-support/drm/xf86drmSL.c
index 5f3c88d23..23283a950 100644
--- a/hw/xfree86/os-support/drm/xf86drmSL.c
+++ b/hw/xfree86/os-support/drm/xf86drmSL.c
@@ -55,7 +55,6 @@
 # include "xf86drm.h"
 # ifdef XFree86LOADER
 #  include "xf86.h"
-#  include "xf86_ansic.h"
 # else
 #  include <stdio.h>
 #  include <stdlib.h>
diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c
index b8e821cd1..69df3118e 100644
--- a/hw/xfree86/os-support/linux/int10/linux.c
+++ b/hw/xfree86/os-support/linux/int10/linux.c
@@ -9,7 +9,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "xf86Pci.h"
 #include "compiler.h"
 #define _INT10_PRIVATE
diff --git a/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c b/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c
index e99cde8da..05d40a37b 100644
--- a/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c
+++ b/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c
@@ -6,7 +6,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "xf86Pci.h"
 #include "compiler.h"
 #define _INT10_PRIVATE
diff --git a/hw/xfree86/os-support/linux/lnx_jstk.c b/hw/xfree86/os-support/linux/lnx_jstk.c
index dafdc0594..667586359 100644
--- a/hw/xfree86/os-support/linux/lnx_jstk.c
+++ b/hw/xfree86/os-support/linux/lnx_jstk.c
@@ -42,7 +42,6 @@ static const char rcs_id[] = "Id: lnx_jstk.c,v 1.1 1995/12/20 14:06:09 lepied Ex
 
 #ifdef XFree86LOADER
 #include "xf86.h"
-#include "xf86_ansic.h"
 #endif
 
 #if !defined(JSIOCGTIMELIMIT)
diff --git a/hw/xfree86/rac/xf86RAC.c b/hw/xfree86/rac/xf86RAC.c
index 243bcfbbc..05ea7ac7d 100644
--- a/hw/xfree86/rac/xf86RAC.c
+++ b/hw/xfree86/rac/xf86RAC.c
@@ -6,7 +6,6 @@
 
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include <X11/X.h>
diff --git a/hw/xfree86/ramdac/BT.c b/hw/xfree86/ramdac/BT.c
index 346b902dd..5c3139d91 100644
--- a/hw/xfree86/ramdac/BT.c
+++ b/hw/xfree86/ramdac/BT.c
@@ -31,7 +31,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 
 #define INIT_BT_RAMDAC_INFO
 #include "BTPriv.h"
diff --git a/hw/xfree86/ramdac/IBM.c b/hw/xfree86/ramdac/IBM.c
index bf9b729d8..42bff44a9 100644
--- a/hw/xfree86/ramdac/IBM.c
+++ b/hw/xfree86/ramdac/IBM.c
@@ -31,7 +31,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 
 #include "xf86Cursor.h"
 
diff --git a/hw/xfree86/ramdac/TI.c b/hw/xfree86/ramdac/TI.c
index e945dab10..390bc6b7b 100644
--- a/hw/xfree86/ramdac/TI.c
+++ b/hw/xfree86/ramdac/TI.c
@@ -32,7 +32,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 
 #include "xf86Cursor.h"
 
diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c
index 460914d5e..a930cdd8e 100644
--- a/hw/xfree86/ramdac/xf86Cursor.c
+++ b/hw/xfree86/ramdac/xf86Cursor.c
@@ -5,7 +5,6 @@
 #endif
 
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86CursorPriv.h"
 #include "colormapst.h"
 #include "cursorstr.h"
diff --git a/hw/xfree86/ramdac/xf86HWCurs.c b/hw/xfree86/ramdac/xf86HWCurs.c
index 83e6e4611..aef1c8bb1 100644
--- a/hw/xfree86/ramdac/xf86HWCurs.c
+++ b/hw/xfree86/ramdac/xf86HWCurs.c
@@ -4,9 +4,10 @@
 #include <xorg-config.h>
 #endif
 
+#include <string.h>
+
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include <X11/X.h>
diff --git a/hw/xfree86/ramdac/xf86RamDac.c b/hw/xfree86/ramdac/xf86RamDac.c
index 1182a3e39..e0314f6b7 100644
--- a/hw/xfree86/ramdac/xf86RamDac.c
+++ b/hw/xfree86/ramdac/xf86RamDac.c
@@ -31,7 +31,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 
 #include "xf86RamDacPriv.h"
 
diff --git a/hw/xfree86/ramdac/xf86RamDacCmap.c b/hw/xfree86/ramdac/xf86RamDacCmap.c
index 6a59b4bb7..04f50f166 100644
--- a/hw/xfree86/ramdac/xf86RamDacCmap.c
+++ b/hw/xfree86/ramdac/xf86RamDacCmap.c
@@ -36,7 +36,6 @@
 #include "micmap.h"
 
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "compiler.h"
 #include "colormapst.h"
 #include "xf86RamDacPriv.h"
diff --git a/hw/xfree86/scanpci/xf86ScanPci.c b/hw/xfree86/scanpci/xf86ScanPci.c
index 91455d412..d321a5b79 100644
--- a/hw/xfree86/scanpci/xf86ScanPci.c
+++ b/hw/xfree86/scanpci/xf86ScanPci.c
@@ -62,12 +62,8 @@
 #include "xf86Pci.h"
 #include "xf86_OSproc.h"
 
-#ifndef IN_MODULE
 #include <ctype.h>
 #include <stdlib.h>
-#else
-#include <xf86_ansic.h>
-#endif
 
 #ifndef PCIDATA
 #define VENDOR_INCLUDE_NONVIDEO
diff --git a/hw/xfree86/utils/xorgcfg/loader.h b/hw/xfree86/utils/xorgcfg/loader.h
index 8e4da34c3..92ca70485 100644
--- a/hw/xfree86/utils/xorgcfg/loader.h
+++ b/hw/xfree86/utils/xorgcfg/loader.h
@@ -55,7 +55,6 @@
 #include "loaderProcs.h"
 
 #include <sym.h>
-#include <xf86_ansic.h>
 
 void LoaderDefaultFunc(void);
 #endif
diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c
index b69a82b4e..521deb479 100644
--- a/hw/xfree86/vbe/vbe.c
+++ b/hw/xfree86/vbe/vbe.c
@@ -14,8 +14,9 @@
 #include <xorg-config.h>
 #endif
 
+#include <string.h>
+
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "vbe.h"
 #include <X11/Xarch.h>
 #define DPMS_SERVER
diff --git a/hw/xfree86/vbe/vbeModes.c b/hw/xfree86/vbe/vbeModes.c
index 678f8e120..436a8a8dd 100644
--- a/hw/xfree86/vbe/vbeModes.c
+++ b/hw/xfree86/vbe/vbeModes.c
@@ -34,8 +34,10 @@
 #include <xorg-config.h>
 #endif
 
+#include <stdio.h>
+#include <string.h>
+
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "vbe.h"
 #include "vbeModes.h"
 
diff --git a/hw/xfree86/vgahw/vgaCmap.c b/hw/xfree86/vgahw/vgaCmap.c
index 85f8bbdb8..d3f6d427d 100644
--- a/hw/xfree86/vgahw/vgaCmap.c
+++ b/hw/xfree86/vgahw/vgaCmap.c
@@ -37,7 +37,6 @@
 
 #include "xf86.h"
 #include "vgaHW.h"
-#include "xf86_ansic.h"
 
 #define _XF86DGA_SERVER_
 #include <X11/extensions/xf86dgastr.h>
diff --git a/hw/xfree86/vgahw/vgaHW.c b/hw/xfree86/vgahw/vgaHW.c
index 8b98190cb..6df7dee18 100644
--- a/hw/xfree86/vgahw/vgaHW.c
+++ b/hw/xfree86/vgahw/vgaHW.c
@@ -16,12 +16,15 @@
 #include <xorg-config.h>
 #endif
 
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
 #include <X11/X.h>
 #include "misc.h"
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "vgaHW.h"
 
 #include "compiler.h"
diff --git a/hw/xfree86/x86emu/decode.c b/hw/xfree86/x86emu/decode.c
index 25415d9fa..9339f4c7f 100644
--- a/hw/xfree86/x86emu/decode.c
+++ b/hw/xfree86/x86emu/decode.c
@@ -37,7 +37,7 @@
 *
 ****************************************************************************/
 
-
+#include <stdlib.h>
 #include "x86emu/x86emui.h"
 
 /*----------------------------- Implementation ----------------------------*/
diff --git a/hw/xfree86/x86emu/prim_ops.c b/hw/xfree86/x86emu/prim_ops.c
index 56ab8cc9a..461e09e3e 100644
--- a/hw/xfree86/x86emu/prim_ops.c
+++ b/hw/xfree86/x86emu/prim_ops.c
@@ -97,6 +97,8 @@
 *
 ****************************************************************************/
 
+#include <stdlib.h>
+
 #define	PRIM_OPS_NO_REDEFINE_ASM
 #include "x86emu/x86emui.h"
 
diff --git a/hw/xfree86/xaa/xaaBitBlt.c b/hw/xfree86/xaa/xaaBitBlt.c
index de0244848..3639ec787 100644
--- a/hw/xfree86/xaa/xaaBitBlt.c
+++ b/hw/xfree86/xaa/xaaBitBlt.c
@@ -13,7 +13,6 @@
 
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaBitmap.c b/hw/xfree86/xaa/xaaBitmap.c
index b3f00d696..940525927 100644
--- a/hw/xfree86/xaa/xaaBitmap.c
+++ b/hw/xfree86/xaa/xaaBitmap.c
@@ -9,8 +9,6 @@
 #include "xaalocal.h"
 #include "xaacexp.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
-
 
 
 /********** byte swapping ***************/
diff --git a/hw/xfree86/xaa/xaaCpyArea.c b/hw/xfree86/xaa/xaaCpyArea.c
index 8d5bbf9aa..2fe3ab1c3 100644
--- a/hw/xfree86/xaa/xaaCpyArea.c
+++ b/hw/xfree86/xaa/xaaCpyArea.c
@@ -6,7 +6,6 @@
 
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaCpyPlane.c b/hw/xfree86/xaa/xaaCpyPlane.c
index b60ba3f83..95a22adf5 100644
--- a/hw/xfree86/xaa/xaaCpyPlane.c
+++ b/hw/xfree86/xaa/xaaCpyPlane.c
@@ -14,9 +14,10 @@
 #include <xorg-config.h>
 #endif
 
+#include <string.h>
+
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 #include "servermd.h"
 
diff --git a/hw/xfree86/xaa/xaaCpyWin.c b/hw/xfree86/xaa/xaaCpyWin.c
index e50e88f91..198f8e95c 100644
--- a/hw/xfree86/xaa/xaaCpyWin.c
+++ b/hw/xfree86/xaa/xaaCpyWin.c
@@ -6,7 +6,6 @@
 
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaDashLine.c b/hw/xfree86/xaa/xaaDashLine.c
index 059804c70..22645ea1b 100644
--- a/hw/xfree86/xaa/xaaDashLine.c
+++ b/hw/xfree86/xaa/xaaDashLine.c
@@ -4,10 +4,11 @@
 #include <xorg-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include <X11/X.h>
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include "scrnintstr.h"
diff --git a/hw/xfree86/xaa/xaaFallback.c b/hw/xfree86/xaa/xaaFallback.c
index 2f8851c38..da7a38ea9 100644
--- a/hw/xfree86/xaa/xaaFallback.c
+++ b/hw/xfree86/xaa/xaaFallback.c
@@ -6,7 +6,6 @@
 
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaFillArc.c b/hw/xfree86/xaa/xaaFillArc.c
index 4c4f0d38d..6d4a5dccf 100644
--- a/hw/xfree86/xaa/xaaFillArc.c
+++ b/hw/xfree86/xaa/xaaFillArc.c
@@ -38,9 +38,10 @@
 #include <xorg-config.h>
 #endif
 
+#include <sys/limits.h>
+
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include <X11/X.h>
@@ -201,7 +202,7 @@ XAAPolyFillArcSolid(pDraw, pGC, narcs, parcs)
  	    box.x2 = x2;
  	    y2 = box.y1 + (int)arc->height + 1;
  	    box.y2 = y2;
- 	    if ( (x2 <= MAXSHORT) && (y2 <= MAXSHORT) &&
+ 	    if ( (x2 <= SHRT_MAX) && (y2 <= SHRT_MAX) &&
  		    (RECT_IN_REGION(pDraw->pScreen, cclip, &box) == rgnIN) )
 	    {
 		if ((arc->angle2 >= FULLCIRCLE) ||
diff --git a/hw/xfree86/xaa/xaaFillPoly.c b/hw/xfree86/xaa/xaaFillPoly.c
index 55177d319..26a2646e7 100644
--- a/hw/xfree86/xaa/xaaFillPoly.c
+++ b/hw/xfree86/xaa/xaaFillPoly.c
@@ -37,7 +37,6 @@
 
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaFillRect.c b/hw/xfree86/xaa/xaaFillRect.c
index bf6328272..1bd7bd14d 100644
--- a/hw/xfree86/xaa/xaaFillRect.c
+++ b/hw/xfree86/xaa/xaaFillRect.c
@@ -6,7 +6,6 @@
 
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaGC.c b/hw/xfree86/xaa/xaaGC.c
index 83df2a0e2..31f084e7e 100644
--- a/hw/xfree86/xaa/xaaGC.c
+++ b/hw/xfree86/xaa/xaaGC.c
@@ -4,9 +4,10 @@
 #include <xorg-config.h>
 #endif
 
+#include <string.h>
+
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaGCmisc.c b/hw/xfree86/xaa/xaaGCmisc.c
index 5c04e2266..5a6a0abce 100644
--- a/hw/xfree86/xaa/xaaGCmisc.c
+++ b/hw/xfree86/xaa/xaaGCmisc.c
@@ -6,7 +6,6 @@
 
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaImage.c b/hw/xfree86/xaa/xaaImage.c
index b87cc4eec..a0d7bfb7a 100644
--- a/hw/xfree86/xaa/xaaImage.c
+++ b/hw/xfree86/xaa/xaaImage.c
@@ -6,7 +6,6 @@
 
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 #include "servermd.h"
 
diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c
index 15132560d..f29a2eb3a 100644
--- a/hw/xfree86/xaa/xaaInit.c
+++ b/hw/xfree86/xaa/xaaInit.c
@@ -6,7 +6,6 @@
 
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c
index 8f4043537..861410b6d 100644
--- a/hw/xfree86/xaa/xaaInitAccel.c
+++ b/hw/xfree86/xaa/xaaInitAccel.c
@@ -4,9 +4,10 @@
 #include <xorg-config.h>
 #endif
 
+#include <string.h>
+
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaLine.c b/hw/xfree86/xaa/xaaLine.c
index 2314869cf..c6b78307a 100644
--- a/hw/xfree86/xaa/xaaLine.c
+++ b/hw/xfree86/xaa/xaaLine.c
@@ -4,10 +4,11 @@
 #include <xorg-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include <X11/X.h>
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include "scrnintstr.h"
diff --git a/hw/xfree86/xaa/xaaLineMisc.c b/hw/xfree86/xaa/xaaLineMisc.c
index 7f39229f8..7bb312971 100644
--- a/hw/xfree86/xaa/xaaLineMisc.c
+++ b/hw/xfree86/xaa/xaaLineMisc.c
@@ -6,7 +6,6 @@
 
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaNonTEGlyph.c b/hw/xfree86/xaa/xaaNonTEGlyph.c
index 75318e51c..881707396 100644
--- a/hw/xfree86/xaa/xaaNonTEGlyph.c
+++ b/hw/xfree86/xaa/xaaNonTEGlyph.c
@@ -9,7 +9,6 @@
 #include "xaalocal.h"
 #include "xaacexp.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 
 /* Not used anymore because the algorithm isn't correct. It doesn't
    handle overlapping characters properly */
diff --git a/hw/xfree86/xaa/xaaNonTEText.c b/hw/xfree86/xaa/xaaNonTEText.c
index 0d0d8cf11..8c62af477 100644
--- a/hw/xfree86/xaa/xaaNonTEText.c
+++ b/hw/xfree86/xaa/xaaNonTEText.c
@@ -22,9 +22,10 @@
 #include <xorg-config.h>
 #endif
 
+#include <string.h>
+
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaOffscreen.c b/hw/xfree86/xaa/xaaOffscreen.c
index d227579a9..d1c737c06 100644
--- a/hw/xfree86/xaa/xaaOffscreen.c
+++ b/hw/xfree86/xaa/xaaOffscreen.c
@@ -13,7 +13,6 @@
 
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaOverlay.c b/hw/xfree86/xaa/xaaOverlay.c
index 12d2a959b..53a0827e2 100644
--- a/hw/xfree86/xaa/xaaOverlay.c
+++ b/hw/xfree86/xaa/xaaOverlay.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.3 2005/04/20 12:25:39 daniels Exp $ */
+/* $XdotOrg: xserver/xorg/hw/xfree86/xaa/xaaOverlay.c,v 1.6 2005/07/03 08:53:49 daniels Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.14tsi Exp $ */
 
 #ifdef HAVE_XORG_CONFIG_H
@@ -7,7 +7,6 @@
 
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaOverlayDF.c b/hw/xfree86/xaa/xaaOverlayDF.c
index 0cfd46f50..883e94e6e 100644
--- a/hw/xfree86/xaa/xaaOverlayDF.c
+++ b/hw/xfree86/xaa/xaaOverlayDF.c
@@ -12,7 +12,6 @@
 
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaPCache.c b/hw/xfree86/xaa/xaaPCache.c
index a4fadb9aa..b8dd77465 100644
--- a/hw/xfree86/xaa/xaaPCache.c
+++ b/hw/xfree86/xaa/xaaPCache.c
@@ -4,9 +4,10 @@
 #include <xorg-config.h>
 #endif
 
+#include <string.h>
+
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaPaintWin.c b/hw/xfree86/xaa/xaaPaintWin.c
index 041ee1831..4a82b49c5 100644
--- a/hw/xfree86/xaa/xaaPaintWin.c
+++ b/hw/xfree86/xaa/xaaPaintWin.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.3 2005/04/20 12:25:39 daniels Exp $ */
+/* $XdotOrg: xserver/xorg/hw/xfree86/xaa/xaaPaintWin.c,v 1.6 2005/07/03 08:53:49 daniels Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.10 2001/10/28 03:34:04 tsi Exp $ */
 
 #ifdef HAVE_XORG_CONFIG_H
@@ -7,7 +7,6 @@
 
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaPict.c b/hw/xfree86/xaa/xaaPict.c
index 60cfe0843..847ccb2e0 100644
--- a/hw/xfree86/xaa/xaaPict.c
+++ b/hw/xfree86/xaa/xaaPict.c
@@ -26,9 +26,10 @@
 #include <xorg-config.h>
 #endif
 
+#include <string.h>
+
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaROP.c b/hw/xfree86/xaa/xaaROP.c
index 80e700153..f6aacb85e 100644
--- a/hw/xfree86/xaa/xaaROP.c
+++ b/hw/xfree86/xaa/xaaROP.c
@@ -7,7 +7,6 @@
 #include <X11/X.h>
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include "scrnintstr.h"
diff --git a/hw/xfree86/xaa/xaaRect.c b/hw/xfree86/xaa/xaaRect.c
index b176e51fd..1c56d80dc 100644
--- a/hw/xfree86/xaa/xaaRect.c
+++ b/hw/xfree86/xaa/xaaRect.c
@@ -6,7 +6,6 @@
 
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaSpans.c b/hw/xfree86/xaa/xaaSpans.c
index 315024ef3..150991d7b 100644
--- a/hw/xfree86/xaa/xaaSpans.c
+++ b/hw/xfree86/xaa/xaaSpans.c
@@ -6,7 +6,6 @@
 
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaStateChange.c b/hw/xfree86/xaa/xaaStateChange.c
index c0dd6da3e..86c12cc7e 100644
--- a/hw/xfree86/xaa/xaaStateChange.c
+++ b/hw/xfree86/xaa/xaaStateChange.c
@@ -6,7 +6,6 @@
 
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaStipple.c b/hw/xfree86/xaa/xaaStipple.c
index 02a2b32ce..7ea9a2dc2 100644
--- a/hw/xfree86/xaa/xaaStipple.c
+++ b/hw/xfree86/xaa/xaaStipple.c
@@ -8,7 +8,6 @@
 #include "xaalocal.h"
 #include "xaacexp.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 
 static CARD32* StipplePowerOfTwo(CARD32*, CARD32*, int, int, int);
 static CARD32* StipplePowerOfTwo_Inverted(CARD32*, CARD32*, int, int, int);
diff --git a/hw/xfree86/xaa/xaaTEGlyph.c b/hw/xfree86/xaa/xaaTEGlyph.c
index 187a9dc61..f755ed9a9 100644
--- a/hw/xfree86/xaa/xaaTEGlyph.c
+++ b/hw/xfree86/xaa/xaaTEGlyph.c
@@ -9,8 +9,6 @@
 #include "xaalocal.h"
 #include "xaacexp.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
-
 
 /* scanline function for TRIPLE_BITS_24BPP */
 static CARD32 *DrawTextScanline3(CARD32 *base, CARD32 *mem, int width);
diff --git a/hw/xfree86/xaa/xaaTEText.c b/hw/xfree86/xaa/xaaTEText.c
index 2c1e257cd..72e1858f6 100644
--- a/hw/xfree86/xaa/xaaTEText.c
+++ b/hw/xfree86/xaa/xaaTEText.c
@@ -24,7 +24,6 @@
 
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaWideLine.c b/hw/xfree86/xaa/xaaWideLine.c
index 481ff8cc3..fbec29e7d 100644
--- a/hw/xfree86/xaa/xaaWideLine.c
+++ b/hw/xfree86/xaa/xaaWideLine.c
@@ -1,5 +1,5 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaWideLine.c,v 1.10 2001/11/16 16:47:56 dawes Exp $ */
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaWideLine.c,v 1.4 2005/04/20 12:25:40 daniels Exp $ */
+/* $XdotOrg: xserver/xorg/hw/xfree86/xaa/xaaWideLine.c,v 1.7 2005/07/03 08:53:49 daniels Exp $ */
 /*
 
 XAAPolylinesWideSolid does not maintain a span list and subsequently does
@@ -18,20 +18,10 @@ Original mi code written by Keith Packard.
 #include <xorg-config.h>
 #endif
 
-#ifndef XFree86LOADER
-#if defined(_XOPEN_SOURCE) || defined(__QNXNTO__) \
-        || (defined(sun) && defined(__SVR4))
 #include <math.h>
-#else
-#define _XOPEN_SOURCE	/* to get prototype for hypot on some systems */
-#include <math.h>
-#undef _XOPEN_SOURCE
-#endif
-#endif
 
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include <X11/X.h>
diff --git a/hw/xfree86/xf4bpp/OScompiler.h b/hw/xfree86/xf4bpp/OScompiler.h
index cff5d9d3f..cc4266c3a 100644
--- a/hw/xfree86/xf4bpp/OScompiler.h
+++ b/hw/xfree86/xf4bpp/OScompiler.h
@@ -36,7 +36,6 @@
 #define ABS(x) (((x)>0)?(x):-(x))
 
 #include "misc.h"
-#include "xf86_ansic.h"
 #include "compiler.h"
 
 #ifdef lint
diff --git a/hw/xfree86/xf4bpp/mfbline.c b/hw/xfree86/xf4bpp/mfbline.c
index 6d85f68c1..5df58a7e4 100644
--- a/hw/xfree86/xf4bpp/mfbline.c
+++ b/hw/xfree86/xf4bpp/mfbline.c
@@ -53,6 +53,8 @@ SOFTWARE.
 #include <xorg-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include "xf4bpp.h"
 #include "OScompiler.h"
 #include "mfbmap.h"
diff --git a/hw/xfree86/xf4bpp/ppcClip.c b/hw/xfree86/xf4bpp/ppcClip.c
index fe690555f..9166bf256 100644
--- a/hw/xfree86/xf4bpp/ppcClip.c
+++ b/hw/xfree86/xf4bpp/ppcClip.c
@@ -74,6 +74,8 @@ SOFTWARE.
 #include <xorg-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include "xf4bpp.h"
 #include "mfbmap.h"
 #include "mfb.h"
diff --git a/hw/xfree86/xf4bpp/ppcCpArea.c b/hw/xfree86/xf4bpp/ppcCpArea.c
index 4673fe7ac..e33795c77 100644
--- a/hw/xfree86/xf4bpp/ppcCpArea.c
+++ b/hw/xfree86/xf4bpp/ppcCpArea.c
@@ -51,6 +51,8 @@ SOFTWARE.
 #include <xorg-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include "xf4bpp.h"
 #include "mfbmap.h"
 #define PSZ 8
diff --git a/hw/xfree86/xf4bpp/ppcGC.c b/hw/xfree86/xf4bpp/ppcGC.c
index 9877b4bba..6197fc6af 100644
--- a/hw/xfree86/xf4bpp/ppcGC.c
+++ b/hw/xfree86/xf4bpp/ppcGC.c
@@ -75,6 +75,8 @@ SOFTWARE.
 #include <xorg-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include "xf4bpp.h"
 #include "mfbmap.h"
 #include "mfb.h"
diff --git a/hw/xfree86/xf4bpp/ppcIO.c b/hw/xfree86/xf4bpp/ppcIO.c
index 67eadfbf0..20b08ce9a 100644
--- a/hw/xfree86/xf4bpp/ppcIO.c
+++ b/hw/xfree86/xf4bpp/ppcIO.c
@@ -54,6 +54,8 @@ SOFTWARE.
 #include <xorg-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include "xf4bpp.h"
 #include "mfbmap.h"
 #include "mfb.h"
diff --git a/hw/xfree86/xf4bpp/ppcImg.c b/hw/xfree86/xf4bpp/ppcImg.c
index 71fcf38b1..ab8774216 100644
--- a/hw/xfree86/xf4bpp/ppcImg.c
+++ b/hw/xfree86/xf4bpp/ppcImg.c
@@ -28,6 +28,8 @@
 #include <xorg-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include "xf4bpp.h"
 #include "OScompiler.h"
 #include "mi.h"
diff --git a/hw/xfree86/xf4bpp/ppcPixmap.c b/hw/xfree86/xf4bpp/ppcPixmap.c
index 011dc56ff..0ccefcbd6 100644
--- a/hw/xfree86/xf4bpp/ppcPixmap.c
+++ b/hw/xfree86/xf4bpp/ppcPixmap.c
@@ -75,6 +75,8 @@ SOFTWARE.
 #include <xorg-config.h>
 #endif
 
+#include <string.h>
+
 #include "xf4bpp.h"
 #include "servermd.h"
 #include "OScompiler.h"
diff --git a/hw/xfree86/xf4bpp/ppcSetSp.c b/hw/xfree86/xf4bpp/ppcSetSp.c
index 7d560988a..ffdc5d970 100644
--- a/hw/xfree86/xf4bpp/ppcSetSp.c
+++ b/hw/xfree86/xf4bpp/ppcSetSp.c
@@ -75,6 +75,8 @@ SOFTWARE.
 #include <xorg-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include "xf4bpp.h"
 #include "OScompiler.h"
 #include "mfbmap.h"
diff --git a/hw/xfree86/xf4bpp/ppcWindow.c b/hw/xfree86/xf4bpp/ppcWindow.c
index 4cf8ea3cb..a2e910b1c 100644
--- a/hw/xfree86/xf4bpp/ppcWindow.c
+++ b/hw/xfree86/xf4bpp/ppcWindow.c
@@ -74,6 +74,8 @@ SOFTWARE.
 #include <xorg-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include "xf4bpp.h"
 #include "mfbmap.h"
 #include "mfb.h"
diff --git a/hw/xfree86/xf8_32bpp/cfbcpyarea.c b/hw/xfree86/xf8_32bpp/cfbcpyarea.c
index 1a17220ab..6958861ec 100644
--- a/hw/xfree86/xf8_32bpp/cfbcpyarea.c
+++ b/hw/xfree86/xf8_32bpp/cfbcpyarea.c
@@ -4,6 +4,8 @@
 #include <xorg-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include <X11/X.h>
 #include <X11/Xmd.h>
 #include "servermd.h"
diff --git a/hw/xfree86/xf8_32bpp/cfbgcmisc.c b/hw/xfree86/xf8_32bpp/cfbgcmisc.c
index 356b6cc9f..3d1af095a 100644
--- a/hw/xfree86/xf8_32bpp/cfbgcmisc.c
+++ b/hw/xfree86/xf8_32bpp/cfbgcmisc.c
@@ -4,6 +4,8 @@
 #include <xorg-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include <X11/X.h>
 #include <X11/Xmd.h>
 #include <X11/Xproto.h>
diff --git a/hw/xfree86/xf8_32bpp/cfbimage.c b/hw/xfree86/xf8_32bpp/cfbimage.c
index 8b0ea4a78..8220636a1 100644
--- a/hw/xfree86/xf8_32bpp/cfbimage.c
+++ b/hw/xfree86/xf8_32bpp/cfbimage.c
@@ -4,6 +4,8 @@
 #include <xorg-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include <X11/X.h>
 #include "windowstr.h"
 #include "pixmapstr.h"
diff --git a/hw/xfree86/xf8_32bpp/cfbwindow.c b/hw/xfree86/xf8_32bpp/cfbwindow.c
index 78d721495..d2d4cfb6b 100644
--- a/hw/xfree86/xf8_32bpp/cfbwindow.c
+++ b/hw/xfree86/xf8_32bpp/cfbwindow.c
@@ -5,6 +5,8 @@
 #include <xorg-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include <X11/X.h>
 #include "scrnintstr.h"
 #include "windowstr.h"
diff --git a/hw/xfree86/xf8_32bpp/xf86overlay.c b/hw/xfree86/xf8_32bpp/xf86overlay.c
index 2766bf871..c02e9b5d4 100644
--- a/hw/xfree86/xf8_32bpp/xf86overlay.c
+++ b/hw/xfree86/xf8_32bpp/xf86overlay.c
@@ -12,7 +12,6 @@
 
 #include "misc.h"
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include <X11/X.h>