diff --git a/src/ChangeLog b/src/ChangeLog
index 4f1ca96e..f9220bb8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-11  Marcus Brinkmann  <marcus@g10code.de>
+
+	* gpgme.h.in: Use _WIN32 instead of _MSC_VER.  Include time.h for
+	time_t.
+
 2010-05-07  Marcus Brinkmann  <marcus@g10code.de>
 
 	* engine-g13.c, gpgme.c, engine-gpgsm.c, engine-gpg.c,
diff --git a/src/gpgme.h.in b/src/gpgme.h.in
index 2c5ef108..eed9daa4 100644
--- a/src/gpgme.h.in
+++ b/src/gpgme.h.in
@@ -34,13 +34,15 @@
 /* Include stdio.h for the FILE type definition.  */
 #include <stdio.h>
 
-#ifdef _MSC_VER
+#ifdef _WIN32
   typedef long off_t;
   typedef long ssize_t;
 #else
 # include <sys/types.h>
 #endif
 
+#include <time.h>
+
 #include <gpg-error.h>
 
 #ifdef __cplusplus