--- rxvt-unicode/src/ptytty.C	2004/03/01 01:06:46	1.7
+++ rxvt-unicode/src/ptytty.C	2004/04/02 20:41:01	1.10
@@ -32,9 +32,9 @@
 #endif
 #endif
 
-#include <stdio.h>
+#include <cstdio>
 #ifdef HAVE_STDLIB_H
-# include <stdlib.h>
+# include <cstdlib>
 #endif
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
@@ -43,7 +43,7 @@
 # include <unistd.h>
 #endif
 #if defined(HAVE_STRING_H)
-# include <string.h>
+# include <cstring>
 #endif
 #ifdef HAVE_FCNTL_H
 # include <fcntl.h>
@@ -54,6 +54,9 @@
 #if defined(PTYS_ARE_PTMX) && !defined(__CYGWIN32__)
 # include <sys/stropts.h>      /* for I_PUSH */
 #endif
+#ifdef HAVE_ISASTREAM
+# include <stropts.h>
+#endif
 
 #ifdef DEBUG_TTY
 # define D_TTY(x)		fprintf x ; fputc('\n', stderr) ; fflush(stderr)