diff --git a/ChangeLog b/ChangeLog
index cac83fd3..30d09f38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,12 @@
 	tests: check token numbers.
 	* tests/input.at (Numbered tokens): New.
 
+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-04  Akim Demaille  <demaille@gostai.com>
 
 	bison: catch bad symbol names.
@@ -23,7 +29,7 @@
 
 	identifiers: dashes are letters.
 	Dashes can now start identifiers (symbols and directives).
-	
+
 	* src/scan-gram.l ({letter}): Add dash.
 	({id}): Remove it.
 	* tests/input.at (Symbols): Adjust.
diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index 9b600785..1a66edc4 100644
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -8735,8 +8735,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"