diff --git a/src/ChangeLog b/src/ChangeLog
index 19cda90a..2a547bea 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2010-11-15  Marcus Brinkmann  <mb@g10code.com>
 
+	* w32-ce.h (strcasecmp, strdup) [_MSC_VER]: Define.
+	* genkey.c, passphrase.c: Include util.h.
+
 	* w32-util.c (_gpgme_w32ce_get_debug_envvar): Fix return value.
 
 2010-11-15  Werner Koch  <wk@g10code.com>
diff --git a/src/genkey.c b/src/genkey.c
index a85e6278..6de3bb8b 100644
--- a/src/genkey.c
+++ b/src/genkey.c
@@ -30,6 +30,7 @@
 #include "debug.h"
 #include "context.h"
 #include "ops.h"
+#include "util.h"
 
 
 typedef struct
diff --git a/src/passphrase.c b/src/passphrase.c
index 71326845..c36b6ae4 100644
--- a/src/passphrase.c
+++ b/src/passphrase.c
@@ -31,6 +31,7 @@
 #include "gpgme.h"
 #include "context.h"
 #include "ops.h"
+#include "util.h"
 
 
 typedef struct
diff --git a/src/w32-ce.h b/src/w32-ce.h
index a74c6e17..36f1e9e5 100644
--- a/src/w32-ce.h
+++ b/src/w32-ce.h
@@ -26,6 +26,8 @@
 
 #ifdef _MSC_VER
 typedef int pid_t;
+#define strdup _strdup
+#define strcasecmp _stricmp
 #endif
 
 #include <winsock2.h>