--- rxvt-unicode/src/rxvtd.C	2006/01/22 00:36:59	1.26
+++ rxvt-unicode/src/rxvtd.C	2006/01/22 04:01:52	1.27
@@ -21,11 +21,6 @@
  *----------------------------------------------------------------------*/
 
 #include "../config.h"
-#include "rxvt.h"
-#include "rxvtdaemon.h"
-#include "fdpass.h"
-#include "iom.h"
-
 #include <cstdio>
 #include <cstdlib>
 #include <cstdarg>
@@ -40,7 +35,10 @@
 
 #include <cerrno>
 
-extern char **environ;
+#include "rxvt.h"
+#include "rxvtdaemon.h"
+#include "libptytty.h"
+#include "iom.h"
 
 struct server : rxvt_connection {
   log_callback log_cb;
@@ -122,7 +120,7 @@
 {
   send ("GETFD");
   send (remote_fd);
-  return rxvt_recv_fd (fd);
+  return ptytty::recv_fd (fd);
 }
 
 void server::log_msg (const char *msg)