--- rxvt-unicode/src/rxvtfont.C	2010/05/22 23:55:56	1.165
+++ rxvt-unicode/src/rxvtfont.C	2010/12/14 08:01:51	1.168
@@ -28,6 +28,10 @@
 
 #include <inttypes.h>
 
+#if XFT
+# include <fontconfig/fontconfig.h>
+#endif
+
 #define MAX_OVERLAP_ROMAN  (8 + 2)	// max. character width in 8ths of the base width
 #define MAX_OVERLAP_ITALIC (8 + 3)	// max. overlap for italic fonts
 
@@ -37,7 +41,7 @@
     : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN  + 7) >> 3	\
   ))
 
-const struct rxvt_fallback_font {
+static const struct rxvt_fallback_font {
   codeset cs;
   const char *name;
 } fallback_fonts[] = {
@@ -1405,7 +1409,7 @@
             {
               int src_x = x, src_y = y;
 
-              if (term->bgPixmap.is_parentOrigin ())
+              if (term->bgPixmap.flags & bgPixmap_t::isTransparent)
                 {
                   src_x += term->window_vt_x;
                   src_y += term->window_vt_y;