diff -urN fbvncserver-0.9.4.old/fbvncserver.c fbvncserver-0.9.4/fbvncserver.c
--- fbvncserver-0.9.4.old/fbvncserver.c	2003-03-03 01:00:09.000000000 -0500
+++ fbvncserver-0.9.4/fbvncserver.c	2004-02-12 20:49:40.000000000 -0500
@@ -18,8 +18,8 @@
 #include <fcntl.h>
 #include <linux/fb.h>
 #include <signal.h>
-#include "rfb.h"
-#include "keysym.h"
+#include "rfb/rfb.h"
+#include "rfb/keysym.h"
 #include "keysym2scancode.h"
 #include "loadjpeg.h"
 #include "panelzones.h"
@@ -42,7 +42,7 @@
 /* Types */
 struct ClientData
 {
-  Bool oldButton;
+  rfbBool oldButton;
   int oldx,oldy;
 };
 
@@ -304,7 +304,7 @@
 
 
 /* Keyboard events handler */
-void keyevent(Bool down,KeySym key,rfbClientPtr cl)
+void keyevent(rfbBool down,rfbKeySym key,rfbClientPtr cl)
 {
   unsigned char *scancodes;
 
diff -urN fbvncserver-0.9.4.old/keysym2scancode.c fbvncserver-0.9.4/keysym2scancode.c
--- fbvncserver-0.9.4.old/keysym2scancode.c	2002-11-16 15:32:04.000000000 -0500
+++ fbvncserver-0.9.4/keysym2scancode.c	2004-02-12 20:50:33.000000000 -0500
@@ -7,8 +7,8 @@
 
    (c) Pierre-Philippe Coupard, 27/01/2002
 */
-#include "keysym.h"
-#include "rfb.h"
+#include "rfb/keysym.h"
+#include "rfb/rfb.h"
 #include "keysym2scancode.h"
 
 
@@ -290,7 +290,7 @@
 
 /* Turn a received keysym into a Zaurus keyboard scancode sequence. Each
    sequence is terminated by 0xff. Return NULL if no scancode could be found */
-unsigned char *keysym2scancodes(Bool down, KeySym key)
+unsigned char *keysym2scancodes(rfbBool down, rfbKeySym key)
 {
 #ifndef IPAQ
   static int control_down = 0;
diff -urN fbvncserver-0.9.4.old/keysym2scancode.h fbvncserver-0.9.4/keysym2scancode.h
--- fbvncserver-0.9.4.old/keysym2scancode.h	2002-09-05 22:20:10.000000000 -0400
+++ fbvncserver-0.9.4/keysym2scancode.h	2004-02-12 20:48:19.000000000 -0500
@@ -1 +1 @@
-unsigned char *keysym2scancodes(Bool down, KeySym key);
+unsigned char *keysym2scancodes(rfbBool down, rfbKeySym key);