--- rxvt-unicode/src/rxvt.h	2003/12/18 13:33:03	1.18
+++ rxvt-unicode/src/rxvt.h	2004/01/17 01:20:01	1.21
@@ -1,9 +1,5 @@
-/*
- * $Id: rxvt.h,v 1.18 2003/12/18 13:33:03 pcg Exp $
- */
-
-#ifndef _RXVT_H_                /* include once only */
-#define _RXVT_H_
+#ifndef RXVT_H_                /* include once only */
+#define RXVT_H_
 
 #include "rxvtlib.h"
 
@@ -887,7 +883,7 @@
 #endif
   short           rvideo;
   int16_t         num_scr;    /* screen: number lines scrolled             */
-  uint16_t        prev_ncol,   /* screen: previous number of columns        */
+  unsigned int    prev_ncol,  /* screen: previous number of columns        */
                   prev_nrow;  /* screen: previous number of rows           */
 #ifdef RXVT_GRAPHICS
   uint16_t        gr_prev_start;
@@ -1081,7 +1077,6 @@
 /* command input buffering */
   unsigned char  *cmdbuf_ptr, *cmdbuf_endp;
   unsigned char   cmdbuf_base[BUFSIZ];
-  unsigned char   kbuf[KBUFSZ];
 
   rxvt_salloc *ralloc;
   rxvt_salloc *talloc;