--- src/stat.c.orig	Sun Dec  1 10:48:21 2002
+++ src/stat.c	Sun Jan 12 11:30:01 2003
@@ -43,6 +43,12 @@
 # endif
 #endif
 
+/* FreeBSD 5.0 need this for struct statfs */
+#if HAVE_SYS_MOUNT_H
+# include <sys/param.h>
+# include <sys/mount.h>
+#endif
+
 #include "system.h"
 
 #include "closeout.h"
--- src/test.c.orig	Mon Feb 10 10:19:09 2003
+++ src/test.c	Sun Feb 23 20:44:50 2003
@@ -139,7 +139,7 @@
 /* Do the same thing access(2) does, but use the effective uid and gid.  */
 
 static int
-eaccess (char const *file, int mode)
+my_eaccess (char const *file, int mode)
 {
   static int have_ids;
   static uid_t uid, euid;
@@ -172,7 +172,7 @@
   return result;
 }
 #else
-# define eaccess(F, M) euidaccess (F, M)
+# define my_eaccess(F, M) euidaccess (F, M)
 #endif
 
 /* Increment our position in the argument list.  Check that we're not
@@ -635,17 +635,17 @@
 
     case 'r':			/* file is readable? */
       unary_advance ();
-      value = -1 != eaccess (argv[pos - 1], R_OK);
+      value = -1 != my_eaccess (argv[pos - 1], R_OK);
       return (TRUE == value);
 
     case 'w':			/* File is writable? */
       unary_advance ();
-      value = -1 != eaccess (argv[pos - 1], W_OK);
+      value = -1 != my_eaccess (argv[pos - 1], W_OK);
       return (TRUE == value);
 
     case 'x':			/* File is executable? */
       unary_advance ();
-      value = -1 != eaccess (argv[pos - 1], X_OK);
+      value = -1 != my_eaccess (argv[pos - 1], X_OK);
       return (TRUE == value);
 
     case 'O':			/* File is owned by you? */
--- src/nice.c.orig	2003-08-10 19:43:35.000000000 +0200
+++ src/nice.c	2003-09-10 20:03:27.000000000 +0200
@@ -23,6 +23,7 @@
 #include <assert.h>
 
 #include <getopt.h>
+#include <sys/time.h>
 #include <sys/types.h>
 
 #include "system.h"