diff --git a/examples/c++/glr/ast.hh b/examples/c++/glr/ast.hh
index b352efc9..efa92b42 100644
--- a/examples/c++/glr/ast.hh
+++ b/examples/c++/glr/ast.hh
@@ -1,3 +1,20 @@
+/*
+  Copyright (C) 2020 Free Software Foundation, Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #include <iostream>
 
 #if __cplusplus < 201103L
diff --git a/examples/c++/glr/c++-types.yy b/examples/c++/glr/c++-types.yy
index 1ed5ee09..53262c25 100644
--- a/examples/c++/glr/c++-types.yy
+++ b/examples/c++/glr/c++-types.yy
@@ -1,4 +1,22 @@
-/* Simplified -*- C++ -*- Type and Expression Grammar.  */
+/*                                                       -*- C++ -*-
+  Copyright (C) 2020 Free Software Foundation, Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/* Simplified C++ Type and Expression Grammar.
+   Written by Paul Hilfinger for Bison's test suite.  */
 
 %glr-parser
 %skeleton "glr2.cc"
diff --git a/examples/c++/glr/local.mk b/examples/c++/glr/local.mk
index ea53aed1..e275cadd 100644
--- a/examples/c++/glr/local.mk
+++ b/examples/c++/glr/local.mk
@@ -36,8 +36,9 @@ $(%C%_c___types_OBJECTS): $(cxx_types_sources_generated)
 
 if ENABLE_CXX
   check_PROGRAMS += %D%/c++-types
+  dist_%C%_c___types_SOURCES =			\
+    %D%/ast.hh
   nodist_%C%_c___types_SOURCES =		\
-    %D%/ast.hh                                  \
     %D%/c++-types.cc				\
     %D%/c++-types.hh
   # Don't use gnulib's system headers.
diff --git a/lib/.gitignore b/lib/.gitignore
index 877ef777..e32769c3 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -230,6 +230,8 @@
 /obstack.h
 /obstack_printf.c
 /open.c
+/os2-spawn.c
+/os2-spawn.h
 /pathmax.h
 /perror.c
 /pipe-safer.c