--- rxvt-unicode/src/rxvtd.C	2011/12/06 11:29:52	1.57
+++ rxvt-unicode/src/rxvtd.C	2012/01/19 13:33:43	1.59
@@ -21,10 +21,10 @@
  *----------------------------------------------------------------------*/
 
 #include "../config.h"
-#include <cstdio>
-#include <cstdlib>
-#include <cstdarg>
-#include <cstring>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
 
 #include <unistd.h>
 #include <fcntl.h>
@@ -41,7 +41,7 @@
 # include <sys/mman.h>
 #endif
 
-#include <cerrno>
+#include <errno.h>
 
 #include "rxvt.h"
 #include "rxvtdaemon.h"
@@ -223,7 +223,7 @@
 }
 
 int
-main (int argc, const char *const *argv)
+main (int argc, char *argv[])
 {
   ptytty::init ();