diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 9da7d708..ade6e9dd 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-19  Marcus Brinkmann  <marcus@g10code.de>
+
+	* engine.c: Include `string.h'.  Reported by Stéphane Corthésy.
+
+	* version.c (get_engine_info): Remove prototype.
+
 2001-12-19  Marcus Brinkmann  <marcus@g10code.de>
 
 	* engine-gpgsm.c (_gpgme_gpgsm_new): New variable CHILD_FDS.
diff --git a/gpgme/engine.c b/gpgme/engine.c
index 5e0117b5..de17617d 100644
--- a/gpgme/engine.c
+++ b/gpgme/engine.c
@@ -24,6 +24,7 @@
 #endif
 #include <time.h>
 #include <sys/types.h>
+#include <string.h>
 #include <assert.h>
 
 #include "gpgme.h"
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 7e7cea9b..78928213 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-19  Marcus Brinkmann  <marcus@g10code.de>
+
+	* gpg/t-decrypt-verify.c: Don't include `mcheck.h'.  Reported by
+	Stéphane Corthésy.
+
 2001-12-19  Marcus Brinkmann  <marcus@g10code.de>
 
 	* gpg/Makefile.am (EXTRA_DIST): Add missing line continuation.
diff --git a/tests/gpg/t-decrypt-verify.c b/tests/gpg/t-decrypt-verify.c
index c322f8d2..14a28a77 100644
--- a/tests/gpg/t-decrypt-verify.c
+++ b/tests/gpg/t-decrypt-verify.c
@@ -24,7 +24,6 @@
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
-#include <mcheck.h>
 
 #include <gpgme.h>