--- rxvt-unicode/src/fdpass.C	2006/01/24 11:35:17	1.10
+++ rxvt-unicode/src/fdpass.C	2006/09/11 08:48:37	1.13
@@ -25,15 +25,15 @@
 
 #include "../config.h"
 
-#include <cstddef> // needed by freebsd for NULL used in sys/uio.h
+#include <cstddef> // needed by broken bsds for NULL used in sys/uio.h
 
-#include <sys/uio.h>
 #include <sys/types.h>
+#include <sys/uio.h>
 #include <sys/socket.h>
 
 #include "libptytty.h"
 
-#ifndef CMSG_LEN // CMSG_SPACe && CMSG_LEN are rfc2292 extensions to unix
+#ifndef CMSG_LEN // CMSG_SPACE && CMSG_LEN are rfc2292 extensions to unix
 # define CMSG_LEN(len) (sizeof (cmsghdr) + len)
 #endif