--- umsdos_progs/include/umsdos_fs2.h.orig	1999-06-15 11:43:20.000000000 -0400
+++ umsdos_progs/include/umsdos_fs2.h	2004-03-03 20:06:34.000000000 -0500
@@ -82,11 +82,11 @@
 		__kernel_off_t st_size;
 		unsigned long st_blksize;
 		unsigned long st_blocks;
-		__kernel_time_t st_atime;
+		__kernel_time_t _st_atime;
 		unsigned long __unused1;
-		__kernel_time_t st_mtime;
+		__kernel_time_t _st_mtime;
 		unsigned long __unused2;
-		__kernel_time_t st_ctime;
+		__kernel_time_t _st_ctime;
 		unsigned long __unused3;
 		unsigned long __unused4;
 		unsigned long __unused5;
--- umsdos_progs/util/umsdosio.c.orig	1999-12-23 06:35:48.000000000 -0500
+++ umsdos_progs/util/umsdosio.c	2004-03-03 20:05:42.000000000 -0500
@@ -258,9 +258,9 @@
 	fstat->st_ino  = data.stat.st_ino;
 	fstat->st_mode = data.stat.st_mode;
 	fstat->st_size = data.stat.st_size;
-	fstat->st_atime = data.stat.st_atime;
-	fstat->st_ctime = data.stat.st_ctime;
-	fstat->st_mtime = data.stat.st_mtime;
+	fstat->st_atime = data.stat._st_atime;
+	fstat->st_ctime = data.stat._st_ctime;
+	fstat->st_mtime = data.stat._st_mtime;
 	return ret;
 }
 
diff -ur umsdos_progs.orig/tests/gen/pipe.C umsdos_progs/tests/gen/pipe.C
--- umsdos_progs.orig/tests/gen/pipe.C	1999-05-29 16:07:20.000000000 -0400
+++ umsdos_progs/tests/gen/pipe.C	2004-02-11 00:35:29.000000000 -0500
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <sys/wait.h>
 #include "umsdos_test.h"
+#include <string.h>
 
 REGISTER (pipe_simple,"Basic test on named pipe");
 
diff -ur umsdos_progs.orig/tests/gen/sticky.C umsdos_progs/tests/gen/sticky.C
--- umsdos_progs.orig/tests/gen/sticky.C	1999-06-26 05:55:33.000000000 -0400
+++ umsdos_progs/tests/gen/sticky.C	2004-02-11 01:16:40.000000000 -0500
@@ -6,6 +6,7 @@
  *  UMSDOS sticky bit on directory: Test permissions
 */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/stat.h>
diff -ur umsdos_progs.orig/tests/gen/time.C umsdos_progs/tests/gen/time.C
--- umsdos_progs.orig/tests/gen/time.C	1999-05-29 16:07:21.000000000 -0400
+++ umsdos_progs/tests/gen/time.C	2004-02-11 01:20:03.000000000 -0500
@@ -15,6 +15,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include "umsdos_test.h"
+#include <string.h>
 
 static char *time_ctime (time_t tim, char *buf)
 {