CVS Errors (in imlib, and basically all others) for me

[David Smock <smock9 richmond infi net>]

I submitted this before, but now I;m adding more info

I have the latest glib, gtk+, imlib, and all the other core packages off
CVS.  I'm running Redhat 6.0 and didnt install the glib/gtk+/gnome RPMS.
Glib and GTK+ compile fine, but when I try to compile imlib, i get the
following error:

gcc -DDJPEG_PROG=\"/usr/bin/djpeg\" -DCJPEG_PROG=\"/usr/bin/cjpeg\"
-DCONVERT_PATH=\"/usr/bin/X11\" -DNETPBM_PATH=\"/usr/bin\"
-DSYSTEM_IMRC=\"/opt/gnome/etc/imrc\" -DIMLIB_LIB=\"/opt/gnome/lib\" -I.
-I. -I.. -I./.. -I/opt/gnome/lib/gtk+/include -I/usr/X11R6/include
-I/opt/gnome/lib/glib/include -I/opt/gnome/include -I/usr/X11R6/include
-I/opt/gnome/lib/glib/include -I/opt/gnome/include
-I/opt/gnome/lib/gtk+/include -I/usr/X11R6/include
-I/opt/gnome/lib/glib/include -I/opt/gnome/include -I/opt/gnome/include
-I/opt/gnome/include -g -O2 -Wp,-MD,.deps/misc.pp -c  -fPIC -DPIC misc.c
-o .libs/misc.lo
misc.c: In function `gdk_imlib_set_color_map':
misc.c:82: structure has no member named `xwindow'
misc.c:92: structure has no member named `xwindow'
make[2]: *** [misc.lo] Error 1
make[2]: Leaving directory `/usr/src/cvs/gnome/imlib/gdk_imlib'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/usr/src/cvs/gnome/imlib'
make: *** [all-recursive-am] Error 2

I also get this error in some for relating to 'xwindow' when compiling
other GTK+ based apps.  I've checked through my /opt/gnome/include/gdk
directory, and found that gdkprivate.h sets up xwindow as 'Window
xwindow'.  

Anyone have any ideas?  

David Smock
smock9@infi.net