--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-24  Simon Josefsson  <simon@josefsson.org>
+
+	* doc/gnulib.texi (Header files): Add note about C++ problems.
+	Explained by Bruno Haible <bruno@clisp.org>.
+
 2008-10-23  Bruno Haible  <bruno@clisp.org>
 
 	Define a dummy SA_NODEFER macro on Interix.

--- a/doc/gnulib.texi
+++ b/doc/gnulib.texi
@@ -199,6 +199,11 @@
 your header file as something available for C programs only, or for C
 and C++ programs alike.
 
+Note that putting a @code{#include} in an @code{extern "C" @{ ... @}}
+block yields a syntax error in C++ mode on some platforms.  For this
+reason, it is recommended to place the @code{#include} before the
+@code{extern "C"} block.
+
 @subheading Include ordering
 
 When writing a gnulib module, or even in general, a good way to order