--- rxvt-unicode/src/rxvtlib.h.in	2007/05/01 09:34:07	1.75
+++ rxvt-unicode/src/rxvtlib.h.in	2007/12/11 17:42:04	1.81
@@ -4,19 +4,14 @@
 #include <cstdio>
 #include <cctype>
 #include <cerrno>
-@include_stdarg_h@
-@include_stdlib_h@
+#include <cstdarg>
+#include <cstdlib>
 @include_stdint_h@
 #include <sys/types.h>
-@include_unistd_h@
-@include_string_h@
-@include_fcntl_h@
-@include_util_h@
-@include_assert_h@
+#include <unistd.h>
+#include <cstring>
+#include <assert.h>
 @include_sys_ioctl_h@
-@include_sys_time_h@
-@include_time_h@
-@include_sys_select_h@
 @include_sys_strredir_h@
 
 #include <sys/wait.h>
@@ -47,11 +42,6 @@
 @rxvt_int32_typedef@
 @rxvt_uint32_typedef@
 
-/* whatever normal size corresponds to a integer pointer */
-@rxvt_intp_define@
-/* whatever normal size corresponds to a unsigned integer pointer */
-@rxvt_u_intp_define@
-
 struct rxvt_fontset;
 struct rxvt_color;
 struct rxvt_vars;               /* defined later on */
@@ -103,7 +93,7 @@
  *  |························= row_buf[2] etc.
  *  |
  *  +------------+···········= term_start + top_row
- *  | scrollback |                                      
+ *  | scrollback |
  *  | scrollback +---------+·= term_start + view_start
  *  | scrollback | display |
  *  | scrollback | display |
@@ -188,7 +178,7 @@
   unsigned int      screen;     /* screen being used                         */
   unsigned int      clicks;     /* number of clicks                          */
   selection_op_t    op;         /* current operation                         */
-  bool              rect;       /* rectangluar selection?                    */
+  bool              rect;       /* rectangular selection?                    */
   row_col_t         beg;        /* beginning of selection   <= mark          */
   row_col_t         mark;       /* point of initial click   <= end           */
   row_col_t         end;        /* one character past end point              */
@@ -206,11 +196,12 @@
 
 /* rxvt_vars.options */
 enum {
-# define def(name,idx) Opt_ ## name = 1UL << (idx), Opt_ ## name ## _idx = idx,
-# define nodef(name)   Opt_ ## name = 0, Opt_ ## name ## _idx = 0,
+# define def(name,idx) Opt_ ## name = idx,
+# define nodef(name)   Opt_ ## name = 0,
 # include "optinc.h"
 # undef nodef
 # undef def
+Opt_count
 };
 
 /* ------------------------------------------------------------------------- */
@@ -235,7 +226,7 @@
 
 struct rxvt_vars : TermWin_t {
   scrollBar_t     scrollBar;
-  uint32_t        options;
+  uint8_t         options[(Opt_count + 7) >> 3];
   XSizeHints      szHint;
   rxvt_color     *pix_colors;
   rxvt_color     *pix_colors_focused;