--- rxvt-unicode/src/rxvtlib.h.in	2007/06/23 13:43:06	1.77
+++ rxvt-unicode/src/rxvtlib.h.in	2007/12/11 18:07:08	1.82
@@ -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>
@@ -38,20 +33,6 @@
 #include <X11/Xresource.h>
 }
 
-/*
- * If we haven't pulled in typedef's like  int16_t  then do them ourself
- * type of (normal and unsigned) basic sizes
- */
-@rxvt_int16_typedef@
-@rxvt_uint16_typedef@
-@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 +84,7 @@
  *  |························= row_buf[2] etc.
  *  |
  *  +------------+···········= term_start + top_row
- *  | scrollback |                                      
+ *  | scrollback |
  *  | scrollback +---------+·= term_start + view_start
  *  | scrollback | display |
  *  | scrollback | display |