--- rxvt-unicode/src/menubar.C	2004/04/08 20:31:45	1.16
+++ rxvt-unicode/src/menubar.C	2004/08/15 00:37:04	1.18
@@ -31,7 +31,6 @@
 #ifdef MENUBAR
 #include "version.h"
 #include "menubar.h"
-#include "menubar.intpro"	/* PROTOS for internal routines */
 
 #define Menu_PixelWidth(menu)					\
     (2 * SHADOW + Width2Pixel ((menu)->width + 3 * HSPACE))
@@ -2037,7 +2036,7 @@
       /* Create the graphics context */
       XGCValues       gcvalue;
 
-      gcvalue.foreground = (XDEPTH <= 2 ? PixColors[Color_fg]
+      gcvalue.foreground = (display->depth <= 2 ? PixColors[Color_fg]
                             : PixColors[Color_Black]);
       menubarGC = XCreateGC (display->display, menuBar.win,
                             GCForeground, &gcvalue);