diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index f0622bfe..17913d68 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-20  Marcus Brinkmann  <marcus@g10code.de>
+
+	* gpgme.h: Move include of gpg-error.h out of extern "C".
+
 2007-08-07  Werner Koch  <wk@g10code.com>
 
 	* gpgme.h (struct _gpgme_signature): Add member CHAIN_MODEL.
diff --git a/gpgme/gpgme.h b/gpgme/gpgme.h
index bd9cb885..0617f3b6 100644
--- a/gpgme/gpgme.h
+++ b/gpgme/gpgme.h
@@ -40,6 +40,8 @@
 # include <sys/types.h>
 #endif
 
+#include <gpg-error.h>
+
 #ifdef __cplusplus
 extern "C" {
 #if 0 /* just to make Emacs auto-indent happy */
@@ -47,7 +49,6 @@ extern "C" {
 #endif
 #endif /* __cplusplus */
 
-#include <gpg-error.h>
 
 
 /* Check for compiler features.  */