--- rxvt-unicode/src/command.C	2005/02/04 11:41:23	1.192
+++ rxvt-unicode/src/command.C	2005/02/17 12:06:21	1.195
@@ -54,7 +54,6 @@
 # include "keyboard.h"
 #endif
 
-#include <cwchar>
 #include <csignal>
 
 /*----------------------------------------------------------------------*/
@@ -279,9 +278,9 @@
    *
    * Always permit `shift' to override the current setting
    */
-  shft = (ev.state & ShiftMask);
-  ctrl = (ev.state & ControlMask);
-  meta = (ev.state & ModMetaMask);
+  shft = ev.state & ShiftMask;
+  ctrl = ev.state & ControlMask;
+  meta = ev.state & ModMetaMask;
 
   if (numlock_state || (ev.state & ModNumLockMask))
     {
@@ -3179,7 +3178,7 @@
         {
           case '>':
             if (ch == CSI_DA)	/* secondary device attributes */
-              tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
+              tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
             break;
           case '?':
             if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')