diff --git a/NEWS b/NEWS
index 090253d4..90b5d9d8 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,8 @@ GNU Bison NEWS
   Incorrect definitions of YY_, issued by yacc.c when no parser header is
   generated, are removed.
 
+  All the generated headers are self-contained.
+
 ** Header guards (yacc.c, glr.c, glr.cc)
 
   In order to avoid collisions, the header guards are now
@@ -1882,7 +1884,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  LocalWords:  namespaces strerror const autoconfiguration Dconst Autoconf's FDL
  LocalWords:  Automake TMPDIR LESSEQ ylwrap endif yydebug YYTOKEN YYLSP ival hh
  LocalWords:  extern YYTOKENTYPE TOKENTYPE yytokentype tokentype STYPE lval pdf
- LocalWords:  lang yyoutput dvi html ps POSIX lvalp llocp
+ LocalWords:  lang yyoutput dvi html ps POSIX lvalp llocp calc yyo fval
 
 Local Variables:
 mode: outline
diff --git a/data/location.cc b/data/location.cc
index b7383d65..0673f4c2 100644
--- a/data/location.cc
+++ b/data/location.cc
@@ -30,7 +30,7 @@ b4_copyright([Positions for Bison parsers in C++],
 ]b4_cpp_guard_open([b4_dir_prefix[]position.hh])[
 
 # include <algorithm> // std::max
-# include <iosfwd>
+# include <iostream>
 # include <string>
 
 ]b4_null_define[