diff -uNr xc/extras/Mesa/include/GL/gl.h xc-new/extras/Mesa/include/GL/gl.h
--- xc/extras/Mesa/include/GL/gl.h	Fri Dec 10 10:30:08 2004
+++ xc-new/extras/Mesa/include/GL/gl.h	Fri May 13 16:56:12 2005
@@ -149,7 +149,7 @@
 typedef float		GLclampf;	/* single precision float in [0,1] */
 typedef double		GLdouble;	/* double precision float */
 typedef double		GLclampd;	/* double precision float in [0,1] */
-
+typedef char GLchar;
 
 
 /*
diff -uNr xc/extras/freetype2/builds/unix/detect.mk xc-new/extras/freetype2/builds/unix/detect.mk
--- xc/extras/freetype2/builds/unix/detect.mk	Mon Apr 26 11:40:03 2004
+++ xc-new/extras/freetype2/builds/unix/detect.mk	Fri May 13 16:56:07 2005
@@ -20,7 +20,8 @@
   #
   is_unix := $(strip $(wildcard /sbin/init) \
                      $(wildcard /usr/sbin/init) \
-                     $(wildcard /hurd/auth))
+                     $(wildcard /hurd/auth) \
+                     $(wildcard /sbin/launchd))
   ifneq ($(is_unix),)
 
     PLATFORM := unix
diff -uNr xc/extras/freetype2/include/freetype/freetype.h xc-new/extras/freetype2/include/freetype/freetype.h
--- xc/extras/freetype2/include/freetype/freetype.h	Mon Apr 26 11:40:13 2004
+++ xc-new/extras/freetype2/include/freetype/freetype.h	Fri May 13 16:56:07 2005
@@ -17,11 +17,7 @@
 
 
 #ifndef FT_FREETYPE_H
-#error "`ft2build.h' hasn't been included yet!"
-#error "Please always use macros to include FreeType header files."
-#error "Example:"
-#error "  #include <ft2build.h>"
-#error "  #include FT_FREETYPE_H"
+#include <ft2build.h>
 #endif
 
 
diff -uNr xc/extras/freetype2/src/base/ftapi.c xc-new/extras/freetype2/src/base/ftapi.c
--- xc/extras/freetype2/src/base/ftapi.c	Mon Feb 28 18:19:13 2005
+++ xc-new/extras/freetype2/src/base/ftapi.c	Fri May 13 16:56:07 2005
@@ -161,5 +161,17 @@
     FT_Stream_ExitFrame( stream );
   }
                    
+  FT_BASE_DEF( FT_Short )
+  FT_Get_Short( FT_Stream stream )
+  {
+    return FT_GET_SHORT();
+  }
+
+
+  FT_BASE_DEF( FT_Long )
+  FT_Get_Long( FT_Stream stream )
+  {
+    return FT_GET_LONG();
+  }
 
 /* END */
diff -uNr xc/extras/freetype2/src/truetype/ttinterp.c xc-new/extras/freetype2/src/truetype/ttinterp.c
--- xc/extras/freetype2/src/truetype/ttinterp.c	Mon Apr 26 11:40:59 2004
+++ xc-new/extras/freetype2/src/truetype/ttinterp.c	Fri May 13 16:56:07 2005
@@ -2474,7 +2474,7 @@
     W = Vx * Vx + Vy * Vy;
 
     /* Now, we want that Sqrt( W ) = 0x4000 */
-    /* Or 0x1000000 <= W < 0x1004000        */
+    /* Or 0x10000000 <= W < 0x10004000        */
 
     if ( Vx < 0 )
     {
@@ -2492,7 +2492,7 @@
     else
       S2 = FALSE;
 
-    while ( W < 0x1000000L )
+    while ( W < 0x10000000L )
     {
       /* We need to increase W by a minimal amount */
       if ( Vx < Vy )
@@ -2503,7 +2503,7 @@
       W = Vx * Vx + Vy * Vy;
     }
 
-    while ( W >= 0x1004000L )
+    while ( W >= 0x10004000L )
     {
       /* We need to decrease W by a minimal amount */
       if ( Vx < Vy )
diff -uNr xc/lib/GL/apple/dri_glx.c xc-new/lib/GL/apple/dri_glx.c
--- xc/lib/GL/apple/dri_glx.c	Fri Dec 10 12:47:24 2004
+++ xc-new/lib/GL/apple/dri_glx.c	Fri May 13 16:56:12 2005
@@ -51,7 +51,7 @@
 
 /* Apple OpenGL "driver" information. */
 static const char *__driDriverName = "apple";
-static const char __driConfigOptions[] = "";
+const char __driConfigOptions[] = "";
 static const int __driDriverMajor = 1;
 static const int __driDriverMinor = 0;
 static const int __driDriverPatch = 0;
diff -uNr xc/programs/Xserver/hw/darwin/darwinKeyboard.c xc-new/programs/Xserver/hw/darwin/darwinKeyboard.c
--- xc/programs/Xserver/hw/darwin/darwinKeyboard.c	Wed Mar 31 19:05:22 2004
+++ xc-new/programs/Xserver/hw/darwin/darwinKeyboard.c	Fri May 13 16:56:12 2005
@@ -64,7 +64,9 @@
 /* Define this to use Alt for Mode_switch. */
 #define ALT_IS_MODE_SWITCH 1
 
-#include <drivers/event_status_driver.h>
+#define __BEGIN_DECLS
+#define __END_DECLS
+#include <IOKit/hidsystem/event_status_driver.h>
 #include <IOKit/hidsystem/ev_keymap.h>
 #include <stdio.h>
 #include <stdlib.h>
diff -uNr xc/programs/Xserver/hw/darwin/quartz/applewmExt.h xc-new/programs/Xserver/hw/darwin/quartz/applewmExt.h
--- xc/programs/Xserver/hw/darwin/quartz/applewmExt.h	Mon Nov 17 17:20:35 2003
+++ xc-new/programs/Xserver/hw/darwin/quartz/applewmExt.h	Fri May 13 16:56:12 2005
@@ -59,8 +59,6 @@
     FrameDrawProc FrameDraw;
 } AppleWMProcsRec, *AppleWMProcsPtr;
 
-extern AppleWMProcsPtr appleWMProcs;
-
 void AppleWMExtensionInit(
     AppleWMProcsPtr procsPtr
 );