diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index d2707521..fb2ab2d0 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-22  Werner Koch  <wk@gnupg.org>
+
+	* engine-gpgsm.c: Include more headers so that NULL and mk_error
+	is defined even with an undefined GPGSM_PATH.
+
 2001-11-22  Marcus Brinkmann  <marcus@g10code.de>
 
 	* rungpg.c (gpg_inbound_handler, write_mem_data, write_cb_data,
diff --git a/gpgme/engine-gpgsm.c b/gpgme/engine-gpgsm.c
index 87a00393..a27b3545 100644
--- a/gpgme/engine-gpgsm.c
+++ b/gpgme/engine-gpgsm.c
@@ -28,17 +28,17 @@
 #define ENABLE_GPGSM 1
 #endif
 
-#ifdef ENABLE_GPGSM
-
 #include <sys/types.h>
 #include <assert.h>
 
+#ifdef ENABLE_GPGSM
 /* FIXME */
 #include "../assuan/assuan-defs.h"
 #undef xtrymalloc
 #undef xtrycalloc
 #undef xtryrealloc
 #undef xfree
+#endif /*ENABLE_GPGSM*/
 
 #include "gpgme.h"
 #include "util.h"
@@ -47,6 +47,8 @@
 #include "wait.h"
 #include "io.h"
 
+#ifdef ENABLE_GPGSM
+
 #include "engine-gpgsm.h"
 
 #include "assuan.h"