diff -x .deps -u -r xcliplist.orig/cliplistmod.c xcliplist/cliplistmod.c
--- xcliplist.orig/cliplistmod.c	2007-01-14 13:45:20.000000000 +0000
+++ xcliplist/cliplistmod.c	2007-01-14 13:46:44.000000000 +0000
@@ -1,5 +1,5 @@
 
-#include "xorg/xf86Module.h"
+#include "../hw/xfree86/common/xf86Module.h"
 
 extern Bool noTestExtensions;
 
--- hw/vnc/loginauth.c.orig	2007-01-13 18:00:45.106884000 +0100
+++ hw/vnc/loginauth.c	2007-01-13 18:08:04.104447000 +0100
@@ -37,6 +37,8 @@
 #include <sys/types.h>
 #include "rfb.h"
 
+char *crypt(const char *key, const char *salt);
+
 void rfbLoginAuthProcessClientMessage(rfbClientPtr cl)
 {
     int n1 = 0, n2 = 0;