libposix: Revert the unreviewed part of yesterday's big merge.

Back out yesterday's big merge from the libposix branch, except for the
openat-die.c change that was reviewed and approved by Paul Eggert.
Put the ChangeLog entry at the top, to reflect the order of changes in the
master branch.

61 files changed, 12 insertions, 253 deletions

diff --git a/.gitignore b/.gitignore
index 92cb9b57de..b95fb408d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,5 +6,3 @@
 allsnippets.tmp
 amsnippet.tmp
 testdir*
-*.diff
-*.patch
diff --git a/ChangeLog b/ChangeLog
index eb17b6deb8..039d1404ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,14 @@
 	* m4/setenv.m4 (gl_FUNC_UNSETENV): Also detect Haiku issue.
 	* doc/posix-functions/unsetenv.texi (unsetenv): Document it.
 
+2010-12-30  Bruce Korb  <bkorb@gnu.org>
+
+	libposix: avoid calling error() within libposix
+	* lib/openat-die.c: remove error module stuff when GNULIB_LIBPOSIX
+	is defined.
+
+2011-02-05  Eric Blake  <eblake@redhat.com>
+
 	strerror_r-posix: port to cygwin
 	* lib/strerror_r.c (strerror_r) [__CYGWIN__]: Add cygwin
 	implementation.
@@ -1914,13 +1922,6 @@
 	* doc/posix-functions/gmtime_r.texi: Document the HP-UX 11 problem.
 	* doc/posix-functions/localtime_r.texi: Likewise.
 
-2010-12-30  Bruce Korb  <bkorb@gnu.org>
-
-	libposix: avoid calling error() within libposix
-	* lib/openat-die.c: remove error module stuff when GNULIB_LIBPOSIX
-	is defined.
-	* lib/xalloc-die.c: Same thing.
-
 2010-12-29  Eric Blake  <eblake@redhat.com>
 
 	mountlist: tweak previous commit
@@ -3566,13 +3567,6 @@
 	* lib/ftoastr.h, lib/ftoastr.c, lib/dtoastr.c, lib/ldtoastr.c:
 	* modules/ftoastr: New files.
 
-2010-11-16  Bruce Korb  <bkorb@gnu.org>
-
-	libposix: Libposix module will be created on the fly
-	* modules/libposix: remove
-	* modules/*: Use pkginclude_HEADERS instead of plain "include".
-	* gnulib-tool: adjust here, too
-
 2010-11-15  Paul Eggert  <eggert@cs.ucla.edu>
 
 	bootstrap: port to Solaris sed
@@ -4152,74 +4146,6 @@
 	and use malloc rather than the stack for the same reason as
 	mentioned in the comment justifying the other allocation.
 
-2010-10-12  Gary V. Vaughan  <gary@gnu.org>
-
-	libposix: use git-version-gen for version numbering
-	* build-aux/git-version-gen: In order to work inside the
-	libposix subdirectory, also check the parent directory for .git
-	before assuming git describe will not work.
-
-	add _HEADERS primaries to Makefile.am snippets for installable headers
-	* modules/alloca-opt, modules/arg-nonnull, modules/argz,
-	modules/arpa_inet, modules/byteswap, modules/c++defs, modules/ctype,
-	modules/dirent, modules/errno, modules/fcntl-h, modules/float,
-	modules/fnmatch, modules/getopt-posix, modules/glob, modules/iconv-h,
-	modules/iconv_open, modules/inttypes, modules/langinfo,
-	modules/link-warning, modules/locale, modules/math, modules/netdb,
-	modules/netinet_in, modules/poll-h, modules/pthread, modules/pty,
-	modules/sched, modules/search, modules/selinux-h, modules/signal,
-	modules/spawn, modules/stdarg, modules/stdbool, modules/stddef,
-	modules/stdint, modules/stdio, modules/stdlib, modules/string,
-	modules/strings, modules/sys_file, modules/sys_ioctl,
-	modules/sys_select, modules/sys_socket, modules/sys_stat,
-	modules/sys_time, modules/sys_times, modules/sys_utsname,
-	modules/sys_wait, modules/sysexits, modules/termios, modules/time,
-	modules/unistd, modules/unitypes, modules/unused-parameter,
-	modules/warn-on-use, modules/wchar, modules/wctype (Makefile.am):
-	Add nodist_include_HEADERS, nobase_nodist_include_HEADERS and
-	EXTRA_HEADERS declarations for potentially installable header files.
-	* gnulib-tool: Initialize nodist_include_HEADERS,
-	nobase_nodist_include_HEADERS and EXTRA_HEADERS to prime for new
-	`.*_HEADERS +=' declarations.
-	(func_emit_lib_Makefile_am): Edit away new nodist_include_HEADERS,
-	nobase_nodist_include_HEADERS and EXTRA_HEADERS declarations by
-	default, reverting the Makefile.am snippets above to their original
-	condition prior to this change *unless* the gnulib library is being
-	installed.
-
-	New module `libposix'.
-	* modules/libposix: New module to facilitate an installable
-	library of posix modules.
-	(Makefile.am): Use lib_LTLIBRARIES to mark libposix.la as
-	installable.
-	(Depends-On): List all the modules found by `posix-modules',
-	except `strdup' which is spurious, and with the addition of
-	`alloca' to satisfy an otherwise undefined LTALLOCA definition;
-	and `progname' to provide a non-extern program_name symbol so that
-	compilation with `-no-undefined' symbols can work.
-
-	iconv_open: reduce not-trivial repetition of file-list
-	* modules/iconv_open (iconv_headers): New make macro to hold list of
-	iconv header files.
-	(BUILT_SOURCES, MAINTAINERCLEANFILES, EXTRA_DIST): Use it instead of
-	multiple hard-coded copies.
-
-	gnulib-tool: transform hard-coded libgnu.a to $libname.l?a
-	* gnulib-tool (func_emit_lib_Makefile_am): transform hard-coded
-	`libgnu.a' in Makefile.am snippets to be either `$libname.a' or
-	`$libname.la', depending on whether --libtool/--no-libtool options
-	were given.
-
-2010-10-12  Sam Steingold  <sds@gnu.org>
-	    Gary V. Vaughan  <gary@gnu.org>
-
-	gnulib-tool: transform include guards with `--macro-prefix'
-	* gnulib-tool (func_import): support multiple gllib directories:
-	headers are generated for each gllib differently, depending on which
-	features are actually used, so we need to be able to include all
-	these generated headers without fear that one will shadow another,
-	so we prepend the macro-prefix before the guard macros.
-
 2010-10-11  Bruno Haible  <bruno@clisp.org>
 
 	stdlib: Allow multiple gnulib generated replacements to coexist.
diff --git a/gnulib-tool b/gnulib-tool
index 0be26f5f3f..9375f97d44 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -2815,11 +2815,6 @@ func_emit_lib_Makefile_am ()
   echo
   uses_subdirs=
   {
-    if test false = "$libtool"; then
-      sed_transform_libgnu_a="s, libgnu\\.a, $libname.a,g"
-    else
-      sed_transform_libgnu_a="s, libgnu\\.a, $libname.la,g"
-    fi
     for module in $modules; do
       func_verify_nontests_module
       if test -n "$module"; then
@@ -2832,7 +2827,6 @@ func_emit_lib_Makefile_am ()
                 -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' \
                 -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \
                 -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' \
-		-e "$sed_transform_libgnu_a" \
                 -e "$sed_transform_check_PROGRAMS"
           if test "$module" = 'alloca'; then
             echo "${libname}_${libext}_LIBADD += @${perhapsLT}ALLOCA@"
@@ -2872,8 +2866,6 @@ func_emit_lib_Makefile_am ()
   echo
   if test -z "$makefile_name"; then
     echo "SUBDIRS ="
-    echo "nodist_pkginclude_HEADERS ="
-    echo "nobase_nodist_pkginclude_HEADERS ="
     echo "noinst_HEADERS ="
     echo "noinst_LIBRARIES ="
     echo "noinst_LTLIBRARIES ="
@@ -2883,7 +2875,6 @@ func_emit_lib_Makefile_am ()
       echo "pkgdata_DATA ="
     fi
     echo "EXTRA_DIST ="
-    echo "EXTRA_HEADERS ="
     echo "BUILT_SOURCES ="
     echo "SUFFIXES ="
   fi
@@ -2923,18 +2914,11 @@ func_emit_lib_Makefile_am ()
           && test -f "$sourcebase/Makefile.am" \
           && LC_ALL=C grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *+\{0,1\}= *$libname\\.$libext\$" "$sourcebase/Makefile.am" > /dev/null; \
         }; then
-    # Install associated header files, per module Makefile.am snippets.
-    sed_transform_HEADERS_primaries="$sed_noop"
     # One of the snippets or the user's Makefile.am already specifies an
     # installation location for the library. Don't confuse automake by saying
     # it should not be installed.
     :
   else
-    # Don't install header files when generated library is not installed.
-    sed_transform_HEADERS_primaries="\
-        /^\(nobase_\)\{0,1\}nodist_pkginclude_HEADERS *=.*$/d
-        /^EXTRA_HEADERS *=.*$/d
-    "
     # By default, the generated library should not be installed.
     echo "noinst_${perhapsLT}LIBRARIES += $libname.$libext"
   fi
@@ -2966,8 +2950,7 @@ func_emit_lib_Makefile_am ()
     echo
   fi
   cat "$tmp"/allsnippets \
-    | sed -e 's|\$(top_srcdir)/build-aux/|$(top_srcdir)/'"$auxdir"'/|g' \
-          -e "$sed_transform_HEADERS_primaries"
+    | sed -e 's|\$(top_srcdir)/build-aux/|$(top_srcdir)/'"$auxdir"'/|g'
   echo
   echo "mostlyclean-local: mostlyclean-generic"
   echo "	@for dir in '' \$(MOSTLYCLEANDIRS); do \\"
@@ -3181,8 +3164,6 @@ func_emit_tests_Makefile_am ()
   if ! $for_test; then
     echo "check_PROGRAMS ="
   fi
-  echo "nodist_pkginclude_HEADERS ="
-  echo "nobase_nodist_pkginclude_HEADERS ="
   echo "noinst_HEADERS ="
   echo "noinst_LIBRARIES ="
   if $use_libtests; then
@@ -3198,7 +3179,6 @@ func_emit_tests_Makefile_am ()
     echo "pkgdata_DATA ="
   fi
   echo "EXTRA_DIST ="
-  echo "EXTRA_HEADERS ="
   echo "BUILT_SOURCES ="
   echo "SUFFIXES ="
   echo "MOSTLYCLEANFILES = core *.stackdump"
@@ -3867,9 +3847,6 @@ s,^\(.................................................[^ ]*\) *,
       break
     fi
   done
-  test -n "${macro_prefix}" && sed_transform_lib_file=$sed_transform_lib_file"
-    s/_GL_\(.*\)_H/_${macro_prefix}_GL_\1_H/g
-  "
   sed_transform_main_lib_file="$sed_transform_lib_file"
   if test -n "$do_copyrights"; then
     if test -n "$lgpl"; then
@@ -3908,10 +3885,6 @@ s,^\(.................................................[^ ]*\) *,
       s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g
     '
   fi
-  test -n "${macro_prefix}" \
-    && sed_transform_build_aux_file=$sed_transform_build_aux_file"
-         s/_GL_\(.*\)_H/_${macro_prefix}_GL_\1_H/g
-       "
 
   # Determine script to apply to library files that go into $testsbase/.
   sed_transform_testsrelated_lib_file="$sed_transform_lib_file"
diff --git a/lib/xalloc-die.c b/lib/xalloc-die.c
index a714e43fc4..aba4a068d0 100644
--- a/lib/xalloc-die.c
+++ b/lib/xalloc-die.c
@@ -22,10 +22,7 @@
 
 #include <stdlib.h>
 
-#ifndef GNULIB_LIBPOSIX
 #include "error.h"
-#endif
-
 #include "exitfail.h"
 
 #include "gettext.h"
@@ -34,9 +31,7 @@
 void
 xalloc_die (void)
 {
-#ifndef GNULIB_LIBPOSIX
   error (exit_failure, 0, "%s", _("memory exhausted"));
-#endif
 
   /* The `noreturn' cannot be given to error, since it may return if
      its first argument is 0.  To help compilers understand the
diff --git a/modules/alloca-opt b/modules/alloca-opt
index 4ae08b0dd8..9ced93b293 100644
--- a/modules/alloca-opt
+++ b/modules/alloca-opt
@@ -13,9 +13,6 @@ configure.ac:
 gl_FUNC_ALLOCA
 
 Makefile.am:
-nodist_pkginclude_HEADERS += $(ALLOCA_H)
-EXTRA_HEADERS += alloca.h
-
 BUILT_SOURCES += $(ALLOCA_H)
 
 # We need the following in order to create <alloca.h> when the system
diff --git a/modules/arg-nonnull b/modules/arg-nonnull
index 37c5ea663d..d4e4d13663 100644
--- a/modules/arg-nonnull
+++ b/modules/arg-nonnull
@@ -12,8 +12,6 @@ Depends-on:
 configure.ac:
 
 Makefile.am:
-nodist_pkginclude_HEADERS += arg-nonnull.h
-
 # The BUILT_SOURCES created by this Makefile snippet are not used via #include
 # statements but through direct file reference. Therefore this snippet must be
 # present in all Makefile.am that need it. This is ensured by the applicability
diff --git a/modules/argz b/modules/argz
index 1a33f37d40..5f9c7499d1 100644
--- a/modules/argz
+++ b/modules/argz
@@ -18,9 +18,6 @@ configure.ac:
 gl_FUNC_ARGZ
 
 Makefile.am:
-nodist_pkginclude_HEADERS += $(ARGZ_H)
-EXTRA_HEADERS += argz.h
-
 BUILT_SOURCES += $(ARGZ_H)
 
 # We need the following in order to create <argz.h> when the system
diff --git a/modules/arpa_inet b/modules/arpa_inet
index 35c2167a57..34b988161c 100644
--- a/modules/arpa_inet
+++ b/modules/arpa_inet
@@ -17,8 +17,6 @@ gl_HEADER_ARPA_INET
 AC_PROG_MKDIR_P
 
 Makefile.am:
-nobase_nodist_pkginclude_HEADERS += arpa/inet.h
-
 BUILT_SOURCES += arpa/inet.h
 
 # We need the following in order to create <arpa/inet.h> when the system
diff --git a/modules/byteswap b/modules/byteswap
index d16af57f6a..6a3ce1525c 100644
--- a/modules/byteswap
+++ b/modules/byteswap
@@ -11,9 +11,6 @@ configure.ac:
 gl_BYTESWAP
 
 Makefile.am:
-nodist_pkginclude_HEADERS += $(BYTESWAP_H)
-EXTRA_HEADERS += byteswap.h
-
 BUILT_SOURCES += $(BYTESWAP_H)
 
 # We need the following in order to create <byteswap.h> when the system
diff --git a/modules/c++defs b/modules/c++defs
index 9cd5a8b9d6..186584f31e 100644
--- a/modules/c++defs
+++ b/modules/c++defs
@@ -12,8 +12,6 @@ Depends-on:
 configure.ac:
 
 Makefile.am:
-nodist_pkginclude_HEADERS += c++defs.h
-
 # The BUILT_SOURCES created by this Makefile snippet are not used via #include
 # statements but through direct file reference. Therefore this snippet must be
 # present in all Makefile.am that need it. This is ensured by the applicability
diff --git a/modules/ctype b/modules/ctype
index e37e622c64..f0ec9111b9 100644
--- a/modules/ctype
+++ b/modules/ctype
@@ -14,8 +14,6 @@ configure.ac:
 gl_CTYPE_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += ctype.h
-
 BUILT_SOURCES += ctype.h
 
 # We need the following in order to create <ctype.h> when the system
diff --git a/modules/dirent b/modules/dirent
index 094a84e2b6..3029d73afc 100644
--- a/modules/dirent
+++ b/modules/dirent
@@ -16,8 +16,6 @@ configure.ac:
 gl_DIRENT_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += dirent.h
-
 BUILT_SOURCES += dirent.h
 
 # We need the following in order to create <dirent.h> when the system
diff --git a/modules/errno b/modules/errno
index 221bebf0de..b730071ea7 100644
--- a/modules/errno
+++ b/modules/errno
@@ -12,9 +12,6 @@ configure.ac:
 gl_HEADER_ERRNO_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += $(ERRNO_H)
-EXTRA_HEADERS += errno.h
-
 BUILT_SOURCES += $(ERRNO_H)
 
 # We need the following in order to create <errno.h> when the system
diff --git a/modules/fcntl-h b/modules/fcntl-h
index 6a33fc7ac0..c275a4e041 100644
--- a/modules/fcntl-h
+++ b/modules/fcntl-h
@@ -18,8 +18,6 @@ configure.ac:
 gl_FCNTL_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += fcntl.h
-
 BUILT_SOURCES += fcntl.h
 
 # We need the following in order to create <fcntl.h> when the system
diff --git a/modules/float b/modules/float
index 004d2bf42a..c98853b704 100644
--- a/modules/float
+++ b/modules/float
@@ -12,9 +12,6 @@ configure.ac:
 gl_FLOAT_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += $(FLOAT_H)
-EXTRA_HEADERS += float.h
-
 BUILT_SOURCES += $(FLOAT_H)
 
 # We need the following in order to create <float.h> when the system
diff --git a/modules/fnmatch b/modules/fnmatch
index cff8bad5a0..6849b4d5e3 100644
--- a/modules/fnmatch
+++ b/modules/fnmatch
@@ -24,9 +24,6 @@ configure.ac:
 gl_FUNC_FNMATCH_POSIX
 
 Makefile.am:
-nodist_pkginclude_HEADERS += $(FNMATCH_H)
-EXTRA_HEADERS += fnmatch.h
-
 BUILT_SOURCES += $(FNMATCH_H)
 
 # We need the following in order to create <fnmatch.h> when the system
diff --git a/modules/getopt-posix b/modules/getopt-posix
index 93d7fccf10..39b10a40ad 100644
--- a/modules/getopt-posix
+++ b/modules/getopt-posix
@@ -19,9 +19,6 @@ configure.ac:
 gl_FUNC_GETOPT_POSIX
 
 Makefile.am:
-nodist_pkginclude_HEADERS += $(GETOPT_H)
-EXTRA_HEADERS += getopt.h
-
 BUILT_SOURCES += $(GETOPT_H)
 
 # We need the following in order to create <getopt.h> when the system
diff --git a/modules/glob b/modules/glob
index beaf476c11..0caaeefcd7 100644
--- a/modules/glob
+++ b/modules/glob
@@ -30,9 +30,6 @@ configure.ac:
 gl_GLOB
 
 Makefile.am:
-nodist_pkginclude_HEADERS += $(GLOB_H)
-EXTRA_HEADERS += glob.h
-
 BUILT_SOURCES += $(GLOB_H)
 
 # We need the following in order to create <glob.h> when the system
diff --git a/modules/iconv-h b/modules/iconv-h
index 1c35ecd3e0..df0e070861 100644
--- a/modules/iconv-h
+++ b/modules/iconv-h
@@ -15,9 +15,6 @@ configure.ac:
 gl_ICONV_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += $(ICONV_H)
-EXTRA_HEADERS += iconv.h
-
 BUILT_SOURCES += $(ICONV_H)
 
 # We need the following in order to create <iconv.h> when the system
diff --git a/modules/iconv_open b/modules/iconv_open
index 194440b046..7b8190fe74 100644
--- a/modules/iconv_open
+++ b/modules/iconv_open
@@ -21,9 +21,6 @@ configure.ac:
 gl_FUNC_ICONV_OPEN
 
 Makefile.am:
-iconv_headers = iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h
-nodist_pkginclude_HEADERS += $(iconv_headers)
-
 iconv_open-aix.h: iconv_open-aix.gperf
 	$(GPERF) -m 10 $(srcdir)/iconv_open-aix.gperf > $(srcdir)/iconv_open-aix.h-t
 	mv $(srcdir)/iconv_open-aix.h-t $(srcdir)/iconv_open-aix.h
@@ -39,10 +36,10 @@ iconv_open-osf.h: iconv_open-osf.gperf
 iconv_open-solaris.h: iconv_open-solaris.gperf
 	$(GPERF) -m 10 $(srcdir)/iconv_open-solaris.gperf > $(srcdir)/iconv_open-solaris.h-t
 	mv $(srcdir)/iconv_open-solaris.h-t $(srcdir)/iconv_open-solaris.h
-BUILT_SOURCES        += $(iconv_headers)
+BUILT_SOURCES        += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h
 MOSTLYCLEANFILES     += iconv_open-aix.h-t iconv_open-hpux.h-t iconv_open-irix.h-t iconv_open-osf.h-t iconv_open-solaris.h-t
-MAINTAINERCLEANFILES += $(iconv_headers)
-EXTRA_DIST           += $(iconv_headers)
+MAINTAINERCLEANFILES += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h
+EXTRA_DIST           += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h
 
 Include:
 <iconv.h>
diff --git a/modules/inttypes b/modules/inttypes
index 991fe4e1a3..674d83ebcb 100644
--- a/modules/inttypes
+++ b/modules/inttypes
@@ -17,8 +17,6 @@ configure.ac:
 gl_INTTYPES_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += inttypes.h
-
 BUILT_SOURCES += inttypes.h
 
 # We need the following in order to create <inttypes.h> when the system
diff --git a/modules/langinfo b/modules/langinfo
index e864c91a89..fd23db9f2a 100644
--- a/modules/langinfo
+++ b/modules/langinfo
@@ -15,8 +15,6 @@ configure.ac:
 gl_LANGINFO_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += langinfo.h
-
 BUILT_SOURCES += langinfo.h
 
 # We need the following in order to create an empty placeholder for
diff --git a/modules/link-warning b/modules/link-warning
index 9e57370c37..06f3675cb1 100644
--- a/modules/link-warning
+++ b/modules/link-warning
@@ -13,8 +13,6 @@ configure.ac:
 AC_REQUIRE([gl_FEATURES_H])
 
 Makefile.am:
-nodist_pkginclude_HEADERS += link-warning.h
-
 # The BUILT_SOURCES created by this Makefile snippet are not used via #include
 # statements but through direct file reference. Therefore this snippet must be
 # present in all Makefile.am that need it. This is ensured by the applicability
diff --git a/modules/locale b/modules/locale
index 298b924966..b80b513329 100644
--- a/modules/locale
+++ b/modules/locale
@@ -17,8 +17,6 @@ configure.ac:
 gl_LOCALE_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += locale.h
-
 BUILT_SOURCES += locale.h
 
 # We need the following in order to create <locale.h> when the system
diff --git a/modules/math b/modules/math
index ca01c79bf6..7ac78acf96 100644
--- a/modules/math
+++ b/modules/math
@@ -15,8 +15,6 @@ configure.ac:
 gl_MATH_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += math.h
-
 BUILT_SOURCES += math.h
 
 # We need the following in order to create <math.h> when the system
diff --git a/modules/netdb b/modules/netdb
index 49f58f15d3..ea7dc63c11 100644
--- a/modules/netdb
+++ b/modules/netdb
@@ -16,8 +16,6 @@ configure.ac:
 gl_HEADER_NETDB
 
 Makefile.am:
-nodist_pkginclude_HEADERS += netdb.h
-
 BUILT_SOURCES += netdb.h
 
 # We need the following in order to create <netdb.h> when the system
diff --git a/modules/netinet_in b/modules/netinet_in
index 28b80c8e27..06df756a81 100644
--- a/modules/netinet_in
+++ b/modules/netinet_in
@@ -14,9 +14,6 @@ gl_HEADER_NETINET_IN
 AC_PROG_MKDIR_P
 
 Makefile.am:
-nobase_nodist_pkginclude_HEADERS += $(NETINET_IN_H)
-EXTRA_HEADERS += netinet/in.h
-
 BUILT_SOURCES += $(NETINET_IN_H)
 
 # We need the following in order to create <netinet/in.h> when the system
diff --git a/modules/poll-h b/modules/poll-h
index 8fc15cdb1a..347fc607f0 100644
--- a/modules/poll-h
+++ b/modules/poll-h
@@ -15,8 +15,6 @@ configure.ac:
 gl_POLL_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += poll.h
-
 BUILT_SOURCES += poll.h
 
 # We need the following in order to create <poll.h> when the system
diff --git a/modules/pthread b/modules/pthread
index 7aaaffac40..e29016a447 100644
--- a/modules/pthread
+++ b/modules/pthread
@@ -13,9 +13,6 @@ configure.ac:
 gl_PTHREAD_CHECK
 
 Makefile.am:
-nodist_pkginclude_HEADERS += $(PTHREAD_H)
-EXTRA_HEADERS += pthread.h
-
 BUILT_SOURCES += $(PTHREAD_H)
 
 # We need the following in order to create <pthread.h> when the system
diff --git a/modules/pty b/modules/pty
index f490b344b8..93f280ca9f 100644
--- a/modules/pty
+++ b/modules/pty
@@ -14,8 +14,6 @@ configure.ac:
 gl_PTY_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += pty.h
-
 BUILT_SOURCES += pty.h
 
 # We need the following in order to create <pty.h> when the system
diff --git a/modules/sched b/modules/sched
index 128ec35eec..d126fc7616 100644
--- a/modules/sched
+++ b/modules/sched
@@ -12,9 +12,6 @@ configure.ac:
 gl_SCHED_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += $(SCHED_H)
-EXTRA_HEADERS += sched.h
-
 BUILT_SOURCES += $(SCHED_H)
 
 # We need the following in order to create a replacement for <sched.h> when
diff --git a/modules/search b/modules/search
index 3f7ecc060c..ceed3ffedb 100644
--- a/modules/search
+++ b/modules/search
@@ -15,8 +15,6 @@ configure.ac:
 gl_SEARCH_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += search.h
-
 BUILT_SOURCES += search.h
 
 # We need the following in order to create <search.h> when the system
diff --git a/modules/selinux-h b/modules/selinux-h
index 589729df3a..745ea4950d 100644
--- a/modules/selinux-h
+++ b/modules/selinux-h
@@ -18,8 +18,6 @@ gl_HEADERS_SELINUX_CONTEXT_H
 AC_REQUIRE([AC_C_INLINE])
 
 Makefile.am:
-nobase_nodist_pkginclude_HEADERS += selinux/selinux.h
-
 lib_SOURCES += se-context.in.h se-selinux.in.h
 
 BUILT_SOURCES += selinux/selinux.h
diff --git a/modules/signal b/modules/signal
index ed9b14737e..c9ff197bbe 100644
--- a/modules/signal
+++ b/modules/signal
@@ -15,8 +15,6 @@ configure.ac:
 gl_SIGNAL_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += signal.h
-
 BUILT_SOURCES += signal.h
 
 # We need the following in order to create <signal.h> when the system
diff --git a/modules/spawn b/modules/spawn
index eb0d4c13a6..61e5e073ed 100644
--- a/modules/spawn
+++ b/modules/spawn
@@ -16,8 +16,6 @@ configure.ac:
 gl_SPAWN_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += spawn.h
-
 BUILT_SOURCES += spawn.h
 
 # We need the following in order to create a replacement for <spawn.h> when
diff --git a/modules/stdarg b/modules/stdarg
index 105a54c52d..05a01db69b 100644
--- a/modules/stdarg
+++ b/modules/stdarg
@@ -19,9 +19,6 @@ configure.ac:
 gl_STDARG_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += $(STDARG_H)
-EXTRA_HEADERS += stdarg.h
-
 BUILT_SOURCES += $(STDARG_H)
 
 # We need the following in order to create <stdarg.h> when the system
diff --git a/modules/stdbool b/modules/stdbool
index 5c1fe3ce36..80fe2db8d5 100644
--- a/modules/stdbool
+++ b/modules/stdbool
@@ -12,9 +12,6 @@ configure.ac:
 AM_STDBOOL_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += $(STDBOOL_H)
-EXTRA_HEADERS += stdbool.h
-
 BUILT_SOURCES += $(STDBOOL_H)
 
 # We need the following in order to create <stdbool.h> when the system
diff --git a/modules/stddef b/modules/stddef
index 62e874a3cf..4836bc7a8f 100644
--- a/modules/stddef
+++ b/modules/stddef
@@ -13,9 +13,6 @@ configure.ac:
 gl_STDDEF_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += $(STDDEF_H)
-EXTRA_HEADERS += stddef.h
-
 BUILT_SOURCES += $(STDDEF_H)
 
 # We need the following in order to create <stddef.h> when the system
diff --git a/modules/stdint b/modules/stdint
index bbf208a5b3..9e5f7ad4eb 100644
--- a/modules/stdint
+++ b/modules/stdint
@@ -20,9 +20,6 @@ configure.ac:
 gl_STDINT_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += $(STDINT_H)
-EXTRA_HEADERS += stdint.h
-
 BUILT_SOURCES += $(STDINT_H)
 
 # We need the following in order to create <stdint.h> when the system
diff --git a/modules/stdio b/modules/stdio
index 4af57b8925..1a45909f22 100644
--- a/modules/stdio
+++ b/modules/stdio
@@ -19,8 +19,6 @@ configure.ac:
 gl_STDIO_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += stdio.h
-
 BUILT_SOURCES += stdio.h
 
 # We need the following in order to create <stdio.h> when the system
diff --git a/modules/stdlib b/modules/stdlib
index d86fb01c0c..273095ec45 100644
--- a/modules/stdlib
+++ b/modules/stdlib
@@ -18,8 +18,6 @@ configure.ac:
 gl_STDLIB_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += stdlib.h
-
 BUILT_SOURCES += stdlib.h
 
 # We need the following in order to create <stdlib.h> when the system
diff --git a/modules/string b/modules/string
index c109bca5c4..78ad32448b 100644
--- a/modules/string
+++ b/modules/string
@@ -17,8 +17,6 @@ configure.ac:
 gl_HEADER_STRING_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += string.h
-
 BUILT_SOURCES += string.h
 
 # We need the following in order to create <string.h> when the system
diff --git a/modules/strings b/modules/strings
index e5ef663942..9b7a48e0f2 100644
--- a/modules/strings
+++ b/modules/strings
@@ -14,8 +14,6 @@ configure.ac:
 gl_HEADER_STRINGS_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += strings.h
-
 BUILT_SOURCES += strings.h
 
 # We need the following in order to create <strings.h> when the system
diff --git a/modules/sys_file b/modules/sys_file
index 27d87ec9f4..1da1655b45 100644
--- a/modules/sys_file
+++ b/modules/sys_file
@@ -14,8 +14,6 @@ gl_HEADER_SYS_FILE_H
 AC_PROG_MKDIR_P
 
 Makefile.am:
-nobase_nodist_pkginclude_HEADERS += sys/file.h
-
 BUILT_SOURCES += sys/file.h
 
 # We need the following in order to create <sys/file.h> when the system
diff --git a/modules/sys_ioctl b/modules/sys_ioctl
index f5051be2e0..669f70b084 100644
--- a/modules/sys_ioctl
+++ b/modules/sys_ioctl
@@ -16,8 +16,6 @@ gl_SYS_IOCTL_H
 AC_PROG_MKDIR_P
 
 Makefile.am:
-nobase_nodist_pkginclude_HEADERS += sys/ioctl.h
-
 BUILT_SOURCES += sys/ioctl.h
 
 # We need the following in order to create <sys/ioctl.h> when the system
diff --git a/modules/sys_select b/modules/sys_select
index 9c24a6d639..3fbbd57f4d 100644
--- a/modules/sys_select
+++ b/modules/sys_select
@@ -17,8 +17,6 @@ gl_HEADER_SYS_SELECT
 AC_PROG_MKDIR_P
 
 Makefile.am:
-nobase_nodist_pkginclude_HEADERS += sys/select.h
-
 BUILT_SOURCES += sys/select.h
 
 # We need the following in order to create <sys/select.h> when the system
diff --git a/modules/sys_socket b/modules/sys_socket
index 66c3164487..775996fc94 100644
--- a/modules/sys_socket
+++ b/modules/sys_socket
@@ -20,8 +20,6 @@ gl_HEADER_SYS_SOCKET
 AC_PROG_MKDIR_P
 
 Makefile.am:
-nobase_nodist_pkginclude_HEADERS += sys/socket.h
-
 BUILT_SOURCES += sys/socket.h
 
 # We need the following in order to create <sys/socket.h> when the system
diff --git a/modules/sys_stat b/modules/sys_stat
index ba70116eac..40bcf6d6d2 100644
--- a/modules/sys_stat
+++ b/modules/sys_stat
@@ -18,8 +18,6 @@ gl_HEADER_SYS_STAT_H
 AC_PROG_MKDIR_P
 
 Makefile.am:
-nobase_nodist_pkginclude_HEADERS += sys/stat.h
-
 BUILT_SOURCES += sys/stat.h
 
 # We need the following in order to create <sys/stat.h> when the system
diff --git a/modules/sys_time b/modules/sys_time
index f4dfa19b90..92f2ebbf35 100644
--- a/modules/sys_time
+++ b/modules/sys_time
@@ -16,8 +16,6 @@ gl_HEADER_SYS_TIME_H
 AC_PROG_MKDIR_P
 
 Makefile.am:
-nobase_nodist_pkginclude_HEADERS += sys/time.h
-
 BUILT_SOURCES += sys/time.h
 
 # We need the following in order to create <sys/time.h> when the system
diff --git a/modules/sys_times b/modules/sys_times
index 2ce8e73e2f..7a543b420d 100644
--- a/modules/sys_times
+++ b/modules/sys_times
@@ -15,8 +15,6 @@ gl_SYS_TIMES_H
 AC_PROG_MKDIR_P
 
 Makefile.am:
-nobase_nodist_pkginclude_HEADERS += sys/times.h
-
 BUILT_SOURCES += sys/times.h
 
 # We need the following in order to create <sys/times.h> when the system
diff --git a/modules/sys_utsname b/modules/sys_utsname
index ff60b4ed5f..4dec661ec8 100644
--- a/modules/sys_utsname
+++ b/modules/sys_utsname
@@ -15,8 +15,6 @@ gl_SYS_UTSNAME_H
 AC_PROG_MKDIR_P
 
 Makefile.am:
-nobase_nodist_pkginclude_HEADERS += sys/utsname.h
-
 BUILT_SOURCES += sys/utsname.h
 
 # We need the following in order to create <sys/utsname.h> when the system
diff --git a/modules/sys_wait b/modules/sys_wait
index ad42623fe7..0299f9e2de 100644
--- a/modules/sys_wait
+++ b/modules/sys_wait
@@ -15,8 +15,6 @@ gl_SYS_WAIT_H
 AC_PROG_MKDIR_P
 
 Makefile.am:
-nobase_nodist_pkginclude_HEADERS += sys/wait.h
-
 BUILT_SOURCES += sys/wait.h
 
 # We need the following in order to create <sys/wait.h> when the system
diff --git a/modules/sysexits b/modules/sysexits
index 191ba60ca9..fc47260f98 100644
--- a/modules/sysexits
+++ b/modules/sysexits
@@ -12,9 +12,6 @@ configure.ac:
 gl_SYSEXITS
 
 Makefile.am:
-nodist_pkginclude_HEADERS += $(SYSEXITS_H)
-EXTRA_HEADERS += sysexits.h
-
 BUILT_SOURCES += $(SYSEXITS_H)
 
 # We need the following in order to create <sysexits.h> when the system
diff --git a/modules/termios b/modules/termios
index 6af1195a3d..09539f6118 100644
--- a/modules/termios
+++ b/modules/termios
@@ -14,8 +14,6 @@ configure.ac:
 gl_TERMIOS_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += termios.h
-
 BUILT_SOURCES += termios.h
 
 # We need the following in order to create <termios.h> when the system
diff --git a/modules/time b/modules/time
index 8cbe99dffd..ab5efe913f 100644
--- a/modules/time
+++ b/modules/time
@@ -17,8 +17,6 @@ configure.ac:
 gl_HEADER_TIME_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += time.h
-
 BUILT_SOURCES += time.h
 
 # We need the following in order to create <time.h> when the system
diff --git a/modules/unistd b/modules/unistd
index 3a68b9878a..df0870e7e0 100644
--- a/modules/unistd
+++ b/modules/unistd
@@ -16,8 +16,6 @@ configure.ac:
 gl_UNISTD_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += unistd.h
-
 BUILT_SOURCES += unistd.h
 
 # We need the following in order to create an empty placeholder for
diff --git a/modules/unitypes b/modules/unitypes
index ed061de8dc..7cd1a1906f 100644
--- a/modules/unitypes
+++ b/modules/unitypes
@@ -12,9 +12,6 @@ configure.ac:
 gl_LIBUNISTRING_LIBHEADER([0.9], [unitypes.h])
 
 Makefile.am:
-nodist_pkginclude_HEADERS += $(LIBUNISTRING_UNITYPES_H)
-EXTRA_HEADERS += unitypes.h
-
 BUILT_SOURCES += $(LIBUNISTRING_UNITYPES_H)
 
 unitypes.h: unitypes.in.h
diff --git a/modules/unused-parameter b/modules/unused-parameter
index 9a3d0d41cb..196aa78e7c 100644
--- a/modules/unused-parameter
+++ b/modules/unused-parameter
@@ -12,8 +12,6 @@ Depends-on:
 configure.ac:
 
 Makefile.am:
-nodist_pkginclude_HEADERS += unused-parameter.h
-
 # The BUILT_SOURCES created by this Makefile snippet are not used via #include
 # statements but through direct file reference. Therefore this snippet must be
 # present in all Makefile.am that need it. This is ensured by the applicability
diff --git a/modules/warn-on-use b/modules/warn-on-use
index 3cf3281b4b..f0ee83b866 100644
--- a/modules/warn-on-use
+++ b/modules/warn-on-use
@@ -13,8 +13,6 @@ Depends-on:
 configure.ac:
 
 Makefile.am:
-nodist_pkginclude_HEADERS += warn-on-use.h
-
 BUILT_SOURCES += warn-on-use.h
 # The warn-on-use.h that gets inserted into generated .h files is the same as
 # build-aux/warn-on-use.h, except that it has the copyright header cut off.
diff --git a/modules/wchar b/modules/wchar
index b3bf6eb5ec..a918ead7ee 100644
--- a/modules/wchar
+++ b/modules/wchar
@@ -17,8 +17,6 @@ configure.ac:
 gl_WCHAR_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += wchar.h
-
 BUILT_SOURCES += wchar.h
 
 # We need the following in order to create <wchar.h> when the system
diff --git a/modules/wctype b/modules/wctype
index e0568e0752..99dbe44a55 100644
--- a/modules/wctype
+++ b/modules/wctype
@@ -16,8 +16,6 @@ configure.ac:
 gl_WCTYPE_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += wctype.h
-
 BUILT_SOURCES += wctype.h
 
 # We need the following in order to create <wctype.h> when the system