diff -urN vnc_unixsrc.orig/Xvnc/include/Xpoll.h vnc_unixsrc/Xvnc/include/Xpoll.h
--- vnc_unixsrc.orig/Xvnc/include/Xpoll.h	2002-04-30 08:07:30.000000000 -0500
+++ vnc_unixsrc/Xvnc/include/Xpoll.h	2005-05-05 08:16:42.269634912 -0500
@@ -65,6 +65,8 @@
 #define NBBY	8		/* number of bits in a byte */
 #endif
 
+#define fds_bits __fds_bits
+
 #ifndef NFDBITS
 #define NFDBITS (sizeof(fd_mask) * NBBY)	/* bits per mask */
 #endif
diff -urN vnc_unixsrc.orig/Xvnc/lib/Xau/AuRead.c vnc_unixsrc/Xvnc/lib/Xau/AuRead.c
--- vnc_unixsrc.orig/Xvnc/lib/Xau/AuRead.c	2000-06-11 07:00:52.000000000 -0500
+++ vnc_unixsrc/Xvnc/lib/Xau/AuRead.c	2005-05-05 08:15:18.355391816 -0500
@@ -49,7 +49,7 @@
 FILE	*file;
 {
     unsigned short  len;
-    char	    *data, *malloc ();
+    char	    *data;
 
     if (read_short (&len, file) == 0)
 	return 0;
@@ -76,7 +76,6 @@
 {
     Xauth   local;
     Xauth   *ret;
-    char    *malloc ();
 
     if (read_short (&local.family, auth_file) == 0)
 	return 0;
diff -urN vnc_unixsrc.orig/Xvnc/lib/Xau/AuWrite.c vnc_unixsrc/Xvnc/lib/Xau/AuWrite.c
--- vnc_unixsrc.orig/Xvnc/lib/Xau/AuWrite.c	2000-06-11 07:00:52.000000000 -0500
+++ vnc_unixsrc/Xvnc/lib/Xau/AuWrite.c	2005-05-05 08:15:40.295056480 -0500
@@ -61,8 +61,6 @@
 FILE	*auth_file;
 Xauth	*auth;
 {
-    char    *malloc ();
-
     if (write_short (auth->family, auth_file) == 0)
 	return 0;
     if (write_counted_string (auth->address_length, auth->address, auth_file) == 0)
diff -urN vnc_unixsrc.orig/Xvnc/lib/Xdmcp/Alloc.c vnc_unixsrc/Xvnc/lib/Xdmcp/Alloc.c
--- vnc_unixsrc.orig/Xvnc/lib/Xdmcp/Alloc.c	2000-06-11 07:00:52.000000000 -0500
+++ vnc_unixsrc/Xvnc/lib/Xdmcp/Alloc.c	2005-05-05 08:15:58.108348448 -0500
@@ -31,8 +31,6 @@
 
 /* stubs for use when Xalloc, Xrealloc and Xfree are not defined */
 
-extern char	*malloc (), *realloc ();
-
 unsigned long *
 Xalloc (amount)
     unsigned	amount;