diff --git a/ChangeLog b/ChangeLog
index 09047f84..b7534e36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-11  Akim Demaille  <demaille@gostai.com>
+
+	doc: use C++ headers.
+	* doc/bison.texinfo (Calc++ Scanner): Prefer C++ headers to C
+	headers.
+
 2009-05-11  Akim Demaille  <demaille@gostai.com>
 
 	doc: token.prefix
diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index 176cc7ff..aa74c9ef 100644
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -8896,8 +8896,8 @@ parser's to get the set of defined tokens.
 @example
 %@{                                            /* -*- C++ -*- */
 # include <cstdlib>
-# include <errno.h>
-# include <limits.h>
+# include <cerrno>
+# include <climits>
 # include <string>
 # include "calc++-driver.hh"
 # include "calc++-parser.hh"