--- rxvt-unicode/src/rxvtlib.h.in	2006/01/29 20:51:28	1.73
+++ rxvt-unicode/src/rxvtlib.h.in	2007/05/01 09:34:07	1.75
@@ -30,6 +30,8 @@
 // stdlib.h might provide it
 #endif
 
+using namespace std;
+
 extern "C" {
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -204,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