diff -duNr --exclude=*.rej --exclude=*.orig pine4.33.orig/imap/src/osdep/unix/mbox.c pine4.33/imap/src/osdep/unix/mbox.c
--- imap/src/osdep/unix/mbox.c	Thu Mar  1 14:44:43 2001
+++ imap/src/osdep/unix/mbox.c	Thu Mar  1 14:45:56 2001
@@ -25,7 +25,7 @@
 #include "mail.h"
 #include "osdep.h"
 #include <sys/stat.h>
-#include <sys/time.h>
+#include <utime.h>
 #include "mbox.h"
 #include "unix.h"
 #include "misc.h"
diff -duNr --exclude=*.rej --exclude=*.orig imap/src/osdep/unix/mbx.c imap/src/osdep/unix/mbx.c
--- imap/src/osdep/unix/mbx.c	Thu Mar  1 14:44:43 2001
+++ imap/src/osdep/unix/mbx.c	Thu Mar  1 14:45:56 2001
@@ -27,7 +27,7 @@
 #include "osdep.h"
 #include <pwd.h>
 #include <sys/stat.h>
-#include <sys/time.h>
+#include <utime.h>
 #include "mbx.h"
 #include "misc.h"
 #include "dummy.h"
diff -duNr --exclude=*.rej --exclude=*.orig imap/src/osdep/unix/mh.c imap/src/osdep/unix/mh.c
--- imap/src/osdep/unix/mh.c	Thu Mar  1 14:44:43 2001
+++ imap/src/osdep/unix/mh.c	Thu Mar  1 15:14:06 2001
@@ -21,12 +21,11 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
-extern int errno;		/* just in case */
 #include "mail.h"
 #include "osdep.h"
 #include <pwd.h>
 #include <sys/stat.h>
-#include <sys/time.h>
+#include <utime.h>
 #include "mh.h"
 #include "misc.h"
 #include "dummy.h"
diff -duNr --exclude=*.rej --exclude=*.orig imap/src/osdep/unix/mtx.c imap/src/osdep/unix/mtx.c
--- imap/src/osdep/unix/mtx.c	Thu Mar  1 14:44:43 2001
+++ imap/src/osdep/unix/mtx.c	Thu Mar  1 14:45:56 2001
@@ -27,7 +27,7 @@
 #include "osdep.h"
 #include <pwd.h>
 #include <sys/stat.h>
-#include <sys/time.h>
+#include <utime.h>
 #include "mtx.h"
 #include "misc.h"
 #include "dummy.h"
diff -duNr --exclude=*.rej --exclude=*.orig imap/src/osdep/unix/mx.c imap/src/osdep/unix/mx.c
--- imap/src/osdep/unix/mx.c	Thu Mar  1 14:44:43 2001
+++ imap/src/osdep/unix/mx.c	Thu Mar  1 15:11:07 2001
@@ -21,12 +21,11 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
-extern int errno;		/* just in case */
 #include "mail.h"
 #include "osdep.h"
 #include <pwd.h>
 #include <sys/stat.h>
-#include <sys/time.h>
+#include <utime.h>
 #include "mx.h"
 #include "misc.h"
 #include "dummy.h"
diff -duNr --exclude=*.rej --exclude=*.orig imap/src/osdep/unix/news.c imap/src/osdep/unix/news.c
--- imap/src/osdep/unix/news.c	Thu Mar  1 14:44:43 2001
+++ imap/src/osdep/unix/news.c	Thu Mar  1 15:10:26 2001
@@ -21,11 +21,10 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
-extern int errno;		/* just in case */
 #include "mail.h"
 #include "osdep.h"
 #include <sys/stat.h>
-#include <sys/time.h>
+#include <utime.h>
 #include "news.h"
 #include "misc.h"
 #include "newsrc.h"
diff -duNr --exclude=*.rej --exclude=*.orig imap/src/osdep/unix/phile.c imap/src/osdep/unix/phile.c
--- imap/src/osdep/unix/phile.c	Thu Mar  1 14:44:43 2001
+++ imap/src/osdep/unix/phile.c	Thu Mar  1 15:10:40 2001
@@ -21,13 +21,12 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
-extern int errno;		/* just in case */
 #include <signal.h>
 #include "mail.h"
 #include "osdep.h"
 #include <pwd.h>
 #include <sys/stat.h>
-#include <sys/time.h>
+#include <utime.h>
 #include "phile.h"
 #include "rfc822.h"
 #include "misc.h"
--- imap-2001a/src/osdep/unix/os_lnx.c.glibc-time	Wed Oct 25 03:41:08 2000
+++ imap-2001a/src/osdep/unix/os_lnx.c	Mon Dec  3 22:52:46 2001
@@ -22,7 +22,7 @@
 #include "mail.h"
 #include "osdep.h"
 #include <stdio.h>
-#include <sys/time.h>
+#include <utime.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -30,7 +30,6 @@
 #include <netdb.h>
 #include <ctype.h>
 #include <errno.h>
-extern int errno;		/* just in case */
 #include <pwd.h>
 #include "misc.h"
 
@@ -43,3 +42,4 @@
 #include "tcp_unix.c"
 #include "gr_waitp.c"
 #include "tz_sv4.c"
+#include "utime.c"
--- imap-2001a/src/osdep/unix/os_lnx.h.glibc-time	Wed Feb 21 01:45:54 2001
+++ imap-2001a/src/osdep/unix/os_lnx.h	Mon Dec  3 23:21:33 2001
@@ -24,6 +24,7 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <time.h>		/* for struct tm */
+#include <utime.h>		/* so that utime doesn't expand later */
 #include <fcntl.h>
 #include <syslog.h>
 #include <sys/file.h>
@@ -41,3 +42,6 @@
 #include "ftl.h"
 #include "nl.h"
 #include "tcp.h"
+
+#define utime portable_utime
+int portable_utime (char *file,time_t timep[2]);