--- Xvnc/include/Xos.bak        2007-03-23 18:26:14 +0100
+++ Xvnc/include/Xos.h  2007-03-23 18:26:22 +0100
@@ -150,11 +150,6 @@
 #endif
 #endif /* X_NOT_POSIX else */

-#ifdef CSRG_BASED
-#include <stdlib.h>
-#include <unistd.h>
-#endif /* CSRG_BASED */
-
 /*
  * Get struct timeval
  */
 
--- Xvnc/config/imake/imakemdep.h~      2003-02-19 09:39:54 -0700
+++ Xvnc/config/imake/imakemdep.h       2007-06-27 09:54:44 -0600
@@ -253,7 +253,10 @@
 #ifdef _CRAY
 #define DEFAULT_CPP "/lib/pcpp"
 #endif
-#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
+#if defined(__FreeBSD__)
+#define DEFAULT_CPP "/usr/bin/cpp"
+#endif
+#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 #define DEFAULT_CPP "/usr/libexec/cpp"
 #endif
 #if defined(__sgi) && defined(__ANSI_CPP__)