diff --git a/ChangeLog b/ChangeLog
index 2a6a9cb6..8f644c4a 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-01  Joel E. Denny  <jdenny@ces.clemson.edu>
 
 	Declare %code to be a permanent feature.
diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index 3886956e..c91a740a 100644
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -8575,8 +8575,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"