--- rxvt-unicode/src/rxvtlib.h.in	2006/01/17 10:14:26	1.69
+++ rxvt-unicode/src/rxvtlib.h.in	2007/05/01 09:34:07	1.75
@@ -30,10 +30,12 @@
 // stdlib.h might provide it
 #endif
 
-#include "ptytty.h"
+using namespace std;
 
 extern "C" {
-#include <X11/Intrinsic.h>      /* Xlib, Xutil, Xresource, Xfuncproto */
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xresource.h>
 }
 
 /*
@@ -54,7 +56,6 @@
 struct rxvt_color;
 struct rxvt_vars;               /* defined later on */
 struct rxvt_term;
-struct rxvt_display;
 struct rxvt_im;
 struct rxvt_drawable;
 
@@ -205,8 +206,8 @@
 
 /* rxvt_vars.options */
 enum {
-# define def(name,idx) Opt_ ## name = 1UL << (idx),
-# define nodef(name)   Opt_ ## name = 0,
+# define def(name,idx) Opt_ ## name = 1UL << (idx), Opt_ ## name ## _idx = idx,
+# define nodef(name)   Opt_ ## name = 0, Opt_ ## name ## _idx = 0,
 # include "optinc.h"
 # undef nodef
 # undef def
@@ -236,7 +237,6 @@
   scrollBar_t     scrollBar;
   uint32_t        options;
   XSizeHints      szHint;
-  rxvt_display   *display;
   rxvt_color     *pix_colors;
   rxvt_color     *pix_colors_focused;
 #ifdef OFF_FOCUS_FADING
@@ -256,7 +256,6 @@
 };
 
 void rxvt_init ();
-bool rxvt_tainted ();
 
 #endif                          /* _RXVTLIB_H_ */