diff --git a/cipher/ChangeLog b/cipher/ChangeLog
index fe46b7b4e..5dcf5592f 100644
--- a/cipher/ChangeLog
+++ b/cipher/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-28  David Shaw  <dshaw@jabberwocky.com>
+
+	* idea-stub.c, random.c; s/__MINGW32__/_WIN32/ to help building on
+	native Windows compilers.  Requested by Brian Gladman.  From
+	Werner on stable branch.
+
 2003-08-21  David Shaw  <dshaw@jabberwocky.com>
 
 	* random.c (getfnc_gather_random): Don't check NAME_OF_DEV_RANDOM
diff --git a/cipher/idea-stub.c b/cipher/idea-stub.c
index 05581ae90..5731aaa33 100644
--- a/cipher/idea-stub.c
+++ b/cipher/idea-stub.c
@@ -1,5 +1,5 @@
 /* idea-stub.c - Dummy module for the deprecated IDEA cipher.
- *	Copyright (C) 2002 Free Software Foundation, Inc.
+ *	Copyright (C) 2002, 2003 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -41,7 +41,7 @@
 #ifdef HAVE_DL_DLOPEN
 #include <dlfcn.h>
 #endif
-#ifdef __MINGW32__
+#ifdef _WIN32
 #include <windows.h>
 #endif
 #include "util.h"
@@ -52,7 +52,7 @@
 #endif
 
 
-#ifdef __MINGW32__
+#ifdef _WIN32
 #define HAVE_DL_DLOPEN
 #define USE_DYNAMIC_LINKING
 
@@ -101,7 +101,7 @@ dlsym ( void *handle, const char *name )
     }
   return h;
 }
-#endif /*__MINGW32__*/
+#endif /*_WIN32*/
 
 /* We do only support dlopen and the Windows emulation of it. */
 #ifndef HAVE_DL_DLOPEN
@@ -117,7 +117,7 @@ load_module (const char *name)
   void *handle;
   void *sym;
 
-#ifndef __MINGW32__
+#ifndef _WIN32
   /* Make sure we are not setuid. */
   if (getuid() != geteuid())
     log_bug("trying to load an extension while still setuid\n");
diff --git a/cipher/random.c b/cipher/random.c
index b0e2785b0..baee65c49 100644
--- a/cipher/random.c
+++ b/cipher/random.c
@@ -1,5 +1,6 @@
 /* random.c  -	random number generator
- * Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001, 2002,
+ *               2003 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -33,7 +34,9 @@
 #include <errno.h>
 #include <string.h>
 #include <time.h>
+#ifndef _WIN32
 #include <sys/time.h>
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -50,7 +53,7 @@
 #ifdef HAVE_GETRUSAGE
 #include <sys/resource.h>
 #endif
-#ifdef __MINGW32__
+#ifdef _WIN32
 #include <process.h>
 #endif
 #include "util.h"