--- a/lwlib/xlwgcs.c	Wed Dec 09 09:50:36 2009 -0700
+++ b/lwlib/xlwgcs.c	Thu Dec 10 12:42:09 2009 -0700
@@ -113,7 +113,8 @@
 #include	<X11/Xlib.h>
 #include	<X11/IntrinsicP.h>
 #include	<X11/StringDefs.h>
-#include	"../src/xmu.h"
+#include	<X11/Xmu/Drawing.h>
+#include	<X11/Xmu/Misc.h>
 #include	"xlwgcs.h"
 
 	/* Color & GC allocation.
@@ -167,14 +168,6 @@
 
 
 
-#if	XtSpecificationRelease	< 5
-
-static	GC	XtAllocateGC(Widget, int, unsigned long, XGCValues *,
-			     unsigned long, unsigned long) ;
-
-#endif
-
-
 #if	NeedFunctionPrototypes
 static	Pixmap	getDitherPixmap(Widget, int contrast) ;
 #else
@@ -231,13 +224,7 @@
 
 GC
 AllocShadeGC(Widget w, Pixel fg, Pixel bg, Font font,
-	     int contrast,
-#ifdef HAVE_XMU
-	     Bool be_nice_to_cmap
-#else
-	     Bool UNUSED (be_nice_to_cmap)
-#endif
-	     )
+	     int contrast, Bool be_nice_to_cmap)
 {
 	XGCValues	values ;
 	unsigned long	vmask, dcmask ;
@@ -255,7 +242,6 @@
 	  dcmask = GCFont|GCSubwindowMode|GCDashOffset|
 		GCDashList|GCArcMode|GCGraphicsExposures ;
 	}
-#ifdef HAVE_XMU
 	if( be_nice_to_cmap || w->core.depth == 1)
 	{
 	  if( contrast <= 5 )
@@ -269,10 +255,7 @@
 	  }
 
 	  return XtAllocateGC(w, w->core.depth, vmask, &values, 0L, dcmask) ;
-	}
-	else
-#endif
-	{
+	} else {
 	  dcmask |= GCBackground ;
 	  values.foreground = AllocGreyPixel(w, fg, bg, contrast) ;
 	  return XtAllocateGC(w, w->core.depth, vmask, &values, 0L, dcmask) ;
@@ -324,13 +307,7 @@
 	/* return arm-shadow gc. */
 
 GC
-AllocArmGC(Widget w, int contrast,
-#ifdef HAVE_XMU
-	   Bool be_nice_to_cmap
-#else
-	   Bool UNUSED (be_nice_to_cmap)
-#endif
-	   )
+AllocArmGC(Widget w, int contrast, Bool be_nice_to_cmap)
 {
 	Screen		*scr = XtScreen (w);
 	XGCValues	values ;
@@ -338,7 +315,6 @@
 	/* Not clear exactly what we should do here.  Take a look at
 	 * Xaw3d to see what they do.
 	 */
-#ifdef HAVE_XMU
 	if( w->core.depth == 1 || be_nice_to_cmap )
 	{
 	  values.background = w->core.background_pixel ;
@@ -354,10 +330,7 @@
 	      &values, 0L,
 	      GCFont|GCSubwindowMode|GCGraphicsExposures|
 		  GCDashOffset|GCDashList|GCArcMode) ;
-	}
-	else
-#endif
-	  {
+	} else {
 	  values.foreground = AllocShadowPixel(w, 100-contrast) ;
 	  return XtAllocateGC(w, w->core.depth,
 	      GCForeground, &values,
@@ -523,18 +496,6 @@
 	}
 }
 
-#if XtSpecificationRelease < 5
-
-static	GC
-XtAllocateGC(Widget w, int UNUSED (depth), unsigned long mask,
-	     XGCValues *values, unsigned long UNUSED (dynamic),
-	     unsigned long UNUSED (dontcare))
-{
-	return XtGetGC(w, mask, values) ;
-}
-#endif
-
-
 static	unsigned char screen0[2] = {0,0} ;
 static	unsigned char screen25[2] = {0,0xaa} ;
 static	unsigned char screen75[2] = {0xaa,0xff} ;