--- a/lib-src/movemail.c	Mon Aug 13 11:18:12 2007 +0200
+++ b/lib-src/movemail.c	Mon Aug 13 11:19:21 2007 +0200
@@ -69,7 +69,7 @@
 #include <errno.h>
 #include "../src/sysfile.h"
 #include "../src/syswait.h"
-#ifndef WINDOWSNT
+#ifndef WIN32_NATIVE
 #include "../src/systime.h"
 #endif
 #include <stdlib.h>
@@ -87,10 +87,6 @@
 char * strerror (int errnum);
 #endif /* HAVE_STRERROR */
 
-#ifdef MSDOS
-#undef access
-#endif /* MSDOS */
-
 #ifndef DIRECTORY_SEP
 #define DIRECTORY_SEP '/'
 #endif
@@ -98,7 +94,7 @@
 #define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP)
 #endif
 
-#ifdef WINDOWSNT
+#ifdef WIN32_NATIVE
 #undef access
 #undef unlink
 #define fork() 0
@@ -110,7 +106,7 @@
    properly - make sure it does before you enable this! */
 #define DISABLE_DIRECT_ACCESS
 #include <io.h>
-#endif /* WINDOWSNT */
+#endif /* WIN32_NATIVE */
 
 #if defined (HAVE_UNISTD_H)
 #include <unistd.h>
@@ -343,7 +339,7 @@
       exit (retcode);
     }
 
-#ifndef WINDOWSNT
+#ifndef WIN32_NATIVE
   setuid (getuid ());
 #endif
 #endif /* MAIL_USE_POP */
@@ -709,7 +705,7 @@
 
 #ifdef MAIL_USE_POP
 
-#ifndef WINDOWSNT
+#ifndef WIN32_NATIVE
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
@@ -718,7 +714,7 @@
 #include <winsock.h>
 #endif
 #include <stdio.h>
-#include <pwd.h>
+#include "../src/syspwd.h"
 
 #define POP_ERROR 	(-1)
 #define POP_RETRIEVED (0)
@@ -774,7 +770,7 @@
       error ("Error in open: %s, %s", strerror (errno), outfile);
       return (1);
     }
-#if !defined(__CYGWIN32__) && !defined(WINDOWSNT)
+#if !defined(CYGWIN) && !defined(WIN32_NATIVE)
   fchown (mbfi, getuid (), (gid_t) -1);
 #endif