--- include/common.h.orig	Wed Dec 12 22:56:43 2001
+++ include/common.h	Mon Mar 18 17:55:11 2002
@@ -542,14 +542,10 @@
 #undef recvmsg
 #endif /* recvmsg */
 
-#define recvmsg(s, msg, flags)	recvmsgn(s, msg, flags)
-
 #ifdef sendmsg
 #define sendmsg_system sendmsg
 #undef sendmsg
 #endif /* sendmsg */
-
-#define sendmsg(s, msg, flags)	sendmsgn(s, msg, flags)
 
 #define PORTISRESERVED(port)	\
 	(ntohs((port)) != 0 && ntohs((port)) < IPPORT_RESERVED)
--- include/sockd.h.orig	Wed Dec 12 22:56:44 2001
+++ include/sockd.h	Fri Mar 15 19:41:56 2002
@@ -59,6 +59,9 @@
 #undef gethostbyaddr
 #define gethostbyaddr(addr, len, type)	cgethostbyaddr(addr, len, type)
 
+#define recvmsg(s, msg, flags)	recvmsgn(s, msg, flags)
+#define sendmsg(s, msg, flags)	sendmsgn(s, msg, flags)
+
 
 #define INIT(length)									\
 	const size_t start	= state->start;		\