diff -u -r -x .deps xorg-server-1.4.old/hw/xfree86/vnc/vncint.h xorg-server-1.4/hw/xfree86/vnc/vncint.h
--- xorg-server-1.4.old/hw/xfree86/vnc/vncint.h	2007-10-19 01:11:08.000000000 +0000
+++ xorg-server-1.4/hw/xfree86/vnc/vncint.h	2007-10-19 01:22:20.000000000 +0000
@@ -22,7 +22,7 @@
 #ifndef _VNC_H_
 #define _VNC_H_
 
-#include <xorg/xf86Cursor.h>
+#include <../ramdac/xf86Cursor.h>
 /*#include <xf86CursorPriv.h>*/
 
 extern int vncScreenPrivateIndex;
diff -u -r -x .deps xorg-server-1.4.old/xcliplist/cliplistmod.c xorg-server-1.4/xcliplist/cliplistmod.c
--- xorg-server-1.4.old/xcliplist/cliplistmod.c	2007-10-19 01:11:10.000000000 +0000
+++ xorg-server-1.4/xcliplist/cliplistmod.c	2007-10-19 01:13:04.000000000 +0000
@@ -1,5 +1,5 @@
 
-#include "xorg/xf86Module.h"
+#include "../hw/xfree86/common/xf86Module.h"
 
 extern Bool noTestExtensions;