--- rxvt-unicode/src/screen.C	2007/06/26 00:40:19	1.270
+++ rxvt-unicode/src/screen.C	2007/08/13 07:18:58	1.273
@@ -28,8 +28,6 @@
 #include "rxvt.h"               /* NECESSARY */
 #include "rxvtperl.h"           /* NECESSARY */
 
-#include <X11/Xmd.h>            /* get the typedef for CARD32 */
-
 #include <inttypes.h>
 
 #include "salloc.C" // HACK, should be a seperate compile!
@@ -163,6 +161,7 @@
   scr_overlay_off ();
 #endif
 
+  rvideo_mode = false;
   view_start = 0;
   num_scr = 0;
 
@@ -239,7 +238,6 @@
       selection.op = SELECTION_CLEAR;
       selection.screen = PRIMARY;
       selection.clicks = 0;
-      rvideo_state = rvideo_mode = false;
     }
   else
     {
@@ -1650,7 +1648,7 @@
       rvideo_state = on;
 
       ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
-#if XPM_BACKGROUND
+#ifdef HAVE_BG_PIXMAP
       if (bgPixmap.pixmap == None)
 #endif
 #if ENABLE_TRANSPARENCY
@@ -1916,7 +1914,6 @@
     }
   else
     XBell (dpy, 0);
-
 #endif
 }
 
@@ -2007,7 +2004,7 @@
   have_bg = 0;
   refresh_count = 0;
 
-#if XPM_BACKGROUND
+#ifdef HAVE_BG_PIXMAP
   have_bg |= bgPixmap.pixmap != None;
 #endif
 #if ENABLE_TRANSPARENCY
@@ -2487,7 +2484,7 @@
 #if ENABLE_TRANSPARENCY
       && !am_transparent
 #endif
-#if XPM_BACKGROUND
+#ifdef HAVE_BG_PIXMAP
       && !bgPixmap.pixmap
 #endif
       )