--- a/src/sysfile.h	Mon Aug 13 09:13:58 2007 +0200
+++ b/src/sysfile.h	Mon Aug 13 09:15:11 2007 +0200
@@ -21,7 +21,11 @@
 /* Synched up with: Not really in FSF. */
 
 #include <errno.h>
+
+#ifndef WINDOWSNT
 #include <sys/errno.h>          /* <errno.h> does not always imply this */
+#endif
+
 /* Load sys/types.h if not already loaded.
    In some systems loading it twice is suicidal.  */
 #ifndef makedev
@@ -49,13 +53,18 @@
 #endif
 
 #ifdef WINDOWSNT
-#define NOMINMAX
+#include <io.h>
+#endif
+
+#if 0
+#ifdef WINDOWSNT
 #include <windows.h>
 #include <stdlib.h>	/* for proper declaration of environ */
 #include <fcntl.h>
 #include "nt.h"
 #define _P_NOWAIT 1	/* from process.h */
 #endif
+#endif
 
 #ifdef MSDOS
 #include <dos.h>