--- a/src/sysdep.h	Mon Aug 13 11:18:12 2007 +0200
+++ b/src/sysdep.h	Mon Aug 13 11:19:21 2007 +0200
@@ -25,7 +25,7 @@
 
 #include <setjmp.h>
 
-#ifndef WINDOWSNT
+#ifndef WIN32_NATIVE
 extern char **environ;
 #endif
 
@@ -50,10 +50,7 @@
 
 /* Wait for subprocess with process id `pid' to terminate and
    make sure it will get eliminated (not remain forever as a zombie) */
-#ifdef WINDOWSNT
-#include <windows.h>
-void wait_for_termination (HANDLE pid);
-#else
+#ifndef WIN32_NATIVE
 void wait_for_termination (int pid);
 #endif
 
@@ -168,11 +165,6 @@
 const char *strerror (int);
 #endif
 
-#ifdef WINDOWSNT
-void mswindows_set_errno (unsigned long win32_error);
-void mswindows_set_last_errno (void);
-#endif
-
 int interruptible_open (const char *path, int oflag, int mode);
 
 #ifndef HAVE_H_ERRNO