libposix: Add _HEADERS primaries to posix modules.

Modify gnulib-tool to strip them from generated Makefile.am-s where
they are not needed.  Also, replace M4 macro prefixes when requested.
Finally, omit calls to error() for libposix.

57 files changed, 136 insertions, 3 deletions

diff --git a/modules/alloca-opt b/modules/alloca-opt
index 9ced93b293..4ae08b0dd8 100644
--- a/modules/alloca-opt
+++ b/modules/alloca-opt
@@ -13,6 +13,9 @@ 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 d4e4d13663..37c5ea663d 100644
--- a/modules/arg-nonnull
+++ b/modules/arg-nonnull
@@ -12,6 +12,8 @@ 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 5f9c7499d1..1a33f37d40 100644
--- a/modules/argz
+++ b/modules/argz
@@ -18,6 +18,9 @@ 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 34b988161c..35c2167a57 100644
--- a/modules/arpa_inet
+++ b/modules/arpa_inet
@@ -17,6 +17,8 @@ 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 6a3ce1525c..d16af57f6a 100644
--- a/modules/byteswap
+++ b/modules/byteswap
@@ -11,6 +11,9 @@ 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 186584f31e..9cd5a8b9d6 100644
--- a/modules/c++defs
+++ b/modules/c++defs
@@ -12,6 +12,8 @@ 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 f0ec9111b9..e37e622c64 100644
--- a/modules/ctype
+++ b/modules/ctype
@@ -14,6 +14,8 @@ 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 3029d73afc..094a84e2b6 100644
--- a/modules/dirent
+++ b/modules/dirent
@@ -16,6 +16,8 @@ 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 b730071ea7..221bebf0de 100644
--- a/modules/errno
+++ b/modules/errno
@@ -12,6 +12,9 @@ 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 c275a4e041..6a33fc7ac0 100644
--- a/modules/fcntl-h
+++ b/modules/fcntl-h
@@ -18,6 +18,8 @@ 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 c98853b704..004d2bf42a 100644
--- a/modules/float
+++ b/modules/float
@@ -12,6 +12,9 @@ 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 6849b4d5e3..cff8bad5a0 100644
--- a/modules/fnmatch
+++ b/modules/fnmatch
@@ -24,6 +24,9 @@ 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 39b10a40ad..93d7fccf10 100644
--- a/modules/getopt-posix
+++ b/modules/getopt-posix
@@ -19,6 +19,9 @@ 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 0caaeefcd7..beaf476c11 100644
--- a/modules/glob
+++ b/modules/glob
@@ -30,6 +30,9 @@ 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 df0e070861..1c35ecd3e0 100644
--- a/modules/iconv-h
+++ b/modules/iconv-h
@@ -15,6 +15,9 @@ 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 7b8190fe74..194440b046 100644
--- a/modules/iconv_open
+++ b/modules/iconv_open
@@ -21,6 +21,9 @@ 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
@@ -36,10 +39,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_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h
+BUILT_SOURCES        += $(iconv_headers)
 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_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
+MAINTAINERCLEANFILES += $(iconv_headers)
+EXTRA_DIST           += $(iconv_headers)
 
 Include:
 <iconv.h>
diff --git a/modules/inttypes b/modules/inttypes
index 674d83ebcb..991fe4e1a3 100644
--- a/modules/inttypes
+++ b/modules/inttypes
@@ -17,6 +17,8 @@ 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 fd23db9f2a..e864c91a89 100644
--- a/modules/langinfo
+++ b/modules/langinfo
@@ -15,6 +15,8 @@ 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 06f3675cb1..9e57370c37 100644
--- a/modules/link-warning
+++ b/modules/link-warning
@@ -13,6 +13,8 @@ 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 b80b513329..298b924966 100644
--- a/modules/locale
+++ b/modules/locale
@@ -17,6 +17,8 @@ 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 7ac78acf96..ca01c79bf6 100644
--- a/modules/math
+++ b/modules/math
@@ -15,6 +15,8 @@ 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 ea7dc63c11..49f58f15d3 100644
--- a/modules/netdb
+++ b/modules/netdb
@@ -16,6 +16,8 @@ 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 06df756a81..28b80c8e27 100644
--- a/modules/netinet_in
+++ b/modules/netinet_in
@@ -14,6 +14,9 @@ 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 347fc607f0..8fc15cdb1a 100644
--- a/modules/poll-h
+++ b/modules/poll-h
@@ -15,6 +15,8 @@ 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 e29016a447..7aaaffac40 100644
--- a/modules/pthread
+++ b/modules/pthread
@@ -13,6 +13,9 @@ 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 93f280ca9f..f490b344b8 100644
--- a/modules/pty
+++ b/modules/pty
@@ -14,6 +14,8 @@ 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 d126fc7616..128ec35eec 100644
--- a/modules/sched
+++ b/modules/sched
@@ -12,6 +12,9 @@ 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 ceed3ffedb..3f7ecc060c 100644
--- a/modules/search
+++ b/modules/search
@@ -15,6 +15,8 @@ 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 745ea4950d..589729df3a 100644
--- a/modules/selinux-h
+++ b/modules/selinux-h
@@ -18,6 +18,8 @@ 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 c9ff197bbe..ed9b14737e 100644
--- a/modules/signal
+++ b/modules/signal
@@ -15,6 +15,8 @@ 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 61e5e073ed..eb0d4c13a6 100644
--- a/modules/spawn
+++ b/modules/spawn
@@ -16,6 +16,8 @@ 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 05a01db69b..105a54c52d 100644
--- a/modules/stdarg
+++ b/modules/stdarg
@@ -19,6 +19,9 @@ 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 80fe2db8d5..5c1fe3ce36 100644
--- a/modules/stdbool
+++ b/modules/stdbool
@@ -12,6 +12,9 @@ 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 4836bc7a8f..62e874a3cf 100644
--- a/modules/stddef
+++ b/modules/stddef
@@ -13,6 +13,9 @@ 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 9e5f7ad4eb..bbf208a5b3 100644
--- a/modules/stdint
+++ b/modules/stdint
@@ -20,6 +20,9 @@ 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 1a45909f22..4af57b8925 100644
--- a/modules/stdio
+++ b/modules/stdio
@@ -19,6 +19,8 @@ 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 273095ec45..d86fb01c0c 100644
--- a/modules/stdlib
+++ b/modules/stdlib
@@ -18,6 +18,8 @@ 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 78ad32448b..c109bca5c4 100644
--- a/modules/string
+++ b/modules/string
@@ -17,6 +17,8 @@ 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 9b7a48e0f2..e5ef663942 100644
--- a/modules/strings
+++ b/modules/strings
@@ -14,6 +14,8 @@ 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 1da1655b45..27d87ec9f4 100644
--- a/modules/sys_file
+++ b/modules/sys_file
@@ -14,6 +14,8 @@ 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 669f70b084..f5051be2e0 100644
--- a/modules/sys_ioctl
+++ b/modules/sys_ioctl
@@ -16,6 +16,8 @@ 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 3fbbd57f4d..9c24a6d639 100644
--- a/modules/sys_select
+++ b/modules/sys_select
@@ -17,6 +17,8 @@ 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 775996fc94..66c3164487 100644
--- a/modules/sys_socket
+++ b/modules/sys_socket
@@ -20,6 +20,8 @@ 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 40bcf6d6d2..ba70116eac 100644
--- a/modules/sys_stat
+++ b/modules/sys_stat
@@ -18,6 +18,8 @@ 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 92f2ebbf35..f4dfa19b90 100644
--- a/modules/sys_time
+++ b/modules/sys_time
@@ -16,6 +16,8 @@ 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 7a543b420d..2ce8e73e2f 100644
--- a/modules/sys_times
+++ b/modules/sys_times
@@ -15,6 +15,8 @@ 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 4dec661ec8..ff60b4ed5f 100644
--- a/modules/sys_utsname
+++ b/modules/sys_utsname
@@ -15,6 +15,8 @@ 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 0299f9e2de..ad42623fe7 100644
--- a/modules/sys_wait
+++ b/modules/sys_wait
@@ -15,6 +15,8 @@ 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 fc47260f98..191ba60ca9 100644
--- a/modules/sysexits
+++ b/modules/sysexits
@@ -12,6 +12,9 @@ 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 09539f6118..6af1195a3d 100644
--- a/modules/termios
+++ b/modules/termios
@@ -14,6 +14,8 @@ 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 ab5efe913f..8cbe99dffd 100644
--- a/modules/time
+++ b/modules/time
@@ -17,6 +17,8 @@ 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 df0870e7e0..3a68b9878a 100644
--- a/modules/unistd
+++ b/modules/unistd
@@ -16,6 +16,8 @@ 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 7cd1a1906f..ed061de8dc 100644
--- a/modules/unitypes
+++ b/modules/unitypes
@@ -12,6 +12,9 @@ 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 196aa78e7c..9a3d0d41cb 100644
--- a/modules/unused-parameter
+++ b/modules/unused-parameter
@@ -12,6 +12,8 @@ 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 f0ee83b866..3cf3281b4b 100644
--- a/modules/warn-on-use
+++ b/modules/warn-on-use
@@ -13,6 +13,8 @@ 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 a918ead7ee..b3bf6eb5ec 100644
--- a/modules/wchar
+++ b/modules/wchar
@@ -17,6 +17,8 @@ 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 99dbe44a55..e0568e0752 100644
--- a/modules/wctype
+++ b/modules/wctype
@@ -16,6 +16,8 @@ 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