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;
--- ../xorg-server-1.1.99.903.old/hw/xfree86/vnc/Makefile.am	2007-01-16 20:52:51.000000000 +0000
+++ hw/xfree86/vnc/Makefile.am	2007-01-16 21:35:00.000000000 +0000
@@ -5,6 +5,7 @@
                    -I$(top_srcdir)/hw/xfree86/ramdac \
                    -I$(top_srcdir)/GL/glx \
                    -I$(top_srcdir)/GL/include \
+		   -I$(top_srcdir)/hw/dmx/vnc \
                    -I$(top_builddir)/GL/include \
 		   -I@MESA_SOURCE@/include \
                    -DHAVE_XORG_CONFIG_H \
@@ -20,6 +21,8 @@
 libvnc_la_LDFLAGS = -module -avoid-version
 libvnc_ladir = $(moduledir)/extensions
 libvnc_la_SOURCES = \
+	$(top_srcdir)/hw/dmx/vnc/vncauth.c \
+	$(top_srcdir)/hw/vnc/d3des.c \
 	auth.c \
 	cmap.c \
 	corre.c \