--- rxvt-unicode/src/rxvtfont.h	2010/04/17 23:00:45	1.36
+++ rxvt-unicode/src/rxvtfont.h	2011/06/02 17:43:43	1.40
@@ -8,7 +8,6 @@
 
 #include <inttypes.h>
 
-#include "feature.h"
 #include "encoding.h"
 #include "rxvtutil.h"
 #include "rxvttoolkit.h"
@@ -58,9 +57,13 @@
                      int x, int y,
                      const text_t *text, int len,
                      int fg, int bg) = 0;
-};
 
-#define FONT_UNREF(f) do { (f)->clear (); delete (f); } while (0)
+  void unref ()
+  {
+    clear ();
+    delete this;
+  }
+};
 
 struct rxvt_fallback_font;
 
@@ -68,8 +71,15 @@
 {
   char *fontdesc;
 
-  enum { fontCount =  7 }; // must be power-of-two - 1, also has to match RS_fontMask in rxvt.h
-  enum { firstFont =  2 }; // index of first font in set
+  // must be power-of-two - 1, also has to match RS_fontMask in rxvt.h
+#if USE_256_COLORS
+  enum { fontCount =   7 }; // 4 extra colors bits, 4 fewer fontcount bits
+#else
+  enum { fontCount = 127 };
+#endif
+
+  // index of first font in set
+  enum { firstFont = 2 };
 
   rxvt_fontset (rxvt_term *term);
   ~rxvt_fontset ();