diff -ur umsdos_progs.orig/include/ums_config.h umsdos_progs/include/ums_config.h
--- umsdos_progs.orig/include/ums_config.h	1999-06-26 05:53:54.000000000 -0400
+++ umsdos_progs/include/ums_config.h	2004-02-11 01:18:38.000000000 -0500
@@ -25,4 +25,4 @@
  *
  */
 #define MYUID 1
-#define MYGID 1
\ No newline at end of file
+#define MYGID 1
diff -ur umsdos_progs.orig/include/umsdos_fs2.h umsdos_progs/include/umsdos_fs2.h
--- umsdos_progs.orig/include/umsdos_fs2.h	1999-06-15 11:43:20.000000000 -0400
+++ umsdos_progs/include/umsdos_fs2.h	2004-02-11 00:34:36.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 statime;
 		unsigned long __unused1;
-		__kernel_time_t st_mtime;
+		__kernel_time_t stmtime;
 		unsigned long __unused2;
-		__kernel_time_t st_ctime;
+		__kernel_time_t stctime;
 		unsigned long __unused3;
 		unsigned long __unused4;
 		unsigned long __unused5;
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)
 {
diff -ur umsdos_progs.orig/util/umsdos_progs.h umsdos_progs/util/umsdos_progs.h
--- umsdos_progs.orig/util/umsdos_progs.h	2000-07-26 15:16:55.000000000 -0400
+++ umsdos_progs/util/umsdos_progs.h	2004-02-11 00:34:36.000000000 -0500
@@ -1,3 +1,63 @@
+/*
+ * Avoid glibc2 types in favor of kernel types.
+ 
+
+#define daddr_t         glibc_daddr_t
+#define dev_t           glibc_dev_t
+#define gid_t           glibc_gid_t
+#define ino_t           glibc_ino_t
+#define key_t           glibc_key_t
+#define mode_t          glibc_mode_t
+#define nlink_t         glibc_nlink_t
+#define off_t           glibc_off_t
+#define pid_t           glibc_pid_t
+#define uid_t           glibc_uid_t
+
+#include <time.h>
+#include <sys/types.h>
+
+#undef  glibc_daddr_t
+#undef  glibc_dev_t
+#undef  glibc_gid_t
+#undef  glibc_ino_t
+#undef  glibc_key_t
+#undef  glibc_mode_t
+#undef  glibc_nlink_t
+#undef  glibc_off_t
+#undef  glibc_pid_t
+#undef  glibc_uid_t
+
+#define clock_t         kernel_clock_t
+
+#include <linux/types.h>
+
+#undef  clock_t
+#undef  daddr_t
+#undef  dev_t
+#undef  gid_t
+#undef  ino_t
+#undef  key_t
+#undef  mode_t
+#undef  nlink_t
+#undef  off_t
+#undef  pid_t
+#undef  uid_t
+
+typedef __kernel_daddr_t        daddr_t;
+typedef __kernel_dev_t          dev_t;
+typedef __kernel_gid_t          gid_t;
+typedef __kernel_ino_t          ino_t;
+#ifdef __kernel_key_t
+typedef __kernel_key_t          key_t;
+#else
+typedef int                     key_t;
+#endif
+typedef __kernel_mode_t         mode_t;
+typedef __kernel_nlink_t        nlink_t;
+typedef __kernel_off_t          off_t;
+typedef __kernel_pid_t          pid_t;
+typedef __kernel_uid_t          uid_t;
+*/
 #ifndef UMSDOS_PROGS_H
 #define UMSDOS_PROGS_H
 
diff -ur umsdos_progs.orig/util/umsdosio.c umsdos_progs/util/umsdosio.c
--- umsdos_progs.orig/util/umsdosio.c	1999-12-23 06:35:48.000000000 -0500
+++ umsdos_progs/util/umsdosio.c	2004-02-11 00:34:36.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.statime;
+	fstat->st_ctime = data.stat.stctime;
+	fstat->st_mtime = data.stat.stmtime;
 	return ret;
 }