--- rxvt-unicode/src/rsinc.h	2007/06/14 17:54:32	1.17
+++ rxvt-unicode/src/rsinc.h	2007/11/24 10:32:33	1.22
@@ -16,12 +16,13 @@
 #endif
   def (name)
   def (title)
-#ifdef XPM_BACKGROUND
+#ifdef BG_IMAGE_FROM_FILE
   def (path)
   def (backgroundPixmap)
 #endif
   def (loginShell)
   def (jumpScroll)
+  def (skipScroll)
 #ifdef HAVE_SCROLLBARS
   def (scrollBar)
   def (scrollBar_right)
@@ -59,8 +60,9 @@
   def (preeditType)
   def (inputMethod)
 #endif
-#ifdef TRANSPARENT
+#ifdef ENABLE_TRANSPARENCY
   def (transparent)
+  def (shade)
 #endif
 #if XFT
   def (depth)
@@ -75,9 +77,11 @@
   def (borderLess)
   def (lineSpace)
   def (cursorUnderline)
-  def (skipBuiltinGlyphs)
   def (urgentOnBell)
 #endif
+#ifdef BUILTIN_GLYPHS
+  def (skipBuiltinGlyphs)
+#endif
 #if CURSOR_BLINK
   def (cursorBlink)
 #endif
@@ -101,9 +105,6 @@
 #ifdef OFF_FOCUS_FADING
   def (fade)
 #endif
-#ifdef TINTING
-  def (shade)
-#endif
 #if ENABLE_PERL
   def (perl_eval)
   def (perl_ext_1)