diff -Naur include/config-win.h include.dur/config-win.h
--- include/config-win.h	Thu Jan 13 07:46:56 2005
+++ include.dur/config-win.h	Tue Mar  1 18:43:38 2005
@@ -99,20 +99,29 @@
 
 /* Type information */
 
+#if defined(__EMX__) || !defined(HAVE_UINT)
+#define HAVE_UINT
 typedef unsigned short	ushort;
 typedef unsigned int	uint;
+#endif
 typedef unsigned __int64 ulonglong;	/* Microsofts 64 bit types */
 typedef __int64 longlong;
+#ifndef HAVE_SIGSET_T
 typedef int sigset_t;
+#endif
 #define longlong_defined
 /* off_t should not be __int64 because of conflicts in header files;
    Use my_off_t or os_off_t instead */
+#ifndef HAVE_OFF_T
 typedef long off_t;
+#endif
 typedef __int64 os_off_t;
 #ifdef _WIN64
 typedef UINT_PTR rf_SetTimer;
 #else
+#ifndef HAVE_SIZE_T
 typedef unsigned int size_t;
+#endif
 typedef uint rf_SetTimer;
 #endif
 
diff -Naur include/my_global.h include.dur/my_global.h
--- include/my_global.h	Thu Jan 13 07:46:56 2005
+++ include.dur/my_global.h	Tue Mar  1 18:44:17 2005
@@ -386,6 +386,7 @@
 #endif
 
 #if defined(__EMX__) || !defined(HAVE_UINT)
+#define HAVE_UINT
 typedef unsigned int uint;
 typedef unsigned short ushort;
 #endif