Avoid the need for AC_LIBSOURCES in m4 macros.

* modules/acl (EXTRA_DIST): Add acl.h.
* modules/argmatch (Files): Add m4/argmatch.m4.
(configure.ac): Add gl_ARGMATCH.
(EXTRA_DIST): Renamed from lib_SOURCES, for
consistency with the other modules.  Remove argmatch.c.
* modules/backupfile (EXTRA_DIST): Add backupfile.h.
* modules/c-strtod (EXTRA_DIST): Add c-strtod.h.
* modules/c-strtold (EXTRA_DIST): Add c-strtod.c, c-strtod.h.
* modules/canonhost (EXTRA_DIST): Add c-canonhost.h.
* modules/canonicalize (EXTRA_DIST): Add canonicalize.h.
* modules/chdir-long (EXTRA_DIST): Add chdir-long.h.
* modules/chdir-safer (EXTRA_DIST): Add chdir-safer.h.
* modules/cloexec (EXTRA_DIST): Add cloexec.h.
* modules/close-stream (EXTRA_DIST): Add close-stream.h.
* modules/closeout (EXTRA_DIST): Add closeout.h.
* modules/cycle-check (EXTRA_DIST): Add cycle-check.h.
* modules/dev-ino (EXTRA_DIST): Add dev-ino.h.
* modules/dirfd (EXTRA_DIST): Add dirfd.h.
* modules/dirname (EXTRA_DIST): Renamed from lib_SOURCES.  Add
dirname.h; remove basename.c and stripslash.c.
* modules/exclude (EXTRA_DIST): Add exclude.h.
* modules/exitfail (EXTRA_DIST): Add exitfail.h.
* modules/fcntl-safer (EXTRA_DIST): Add fcntl-safer.h fcntl--.h.
* modules/file-type (EXTRA_DIST): Add file-type.h.
* modules/filemode (EXTRA_DIST): Add filemode.h.
* modules/filenamecat (EXTRA_DIST): Add filenamecat.h.
* modules/fopen-safer (EXTRA_DIST): Add stdio-safer.h stdio--.h.
* modules/fpending (EXTRA_DIST): Add __fpending.h.
* modules/fprintftime (EXTRA_DIST): Add fprintftime.h.
* modules/fsusage (EXTRA_DIST): Add fsusage.h.
* modules/fts (EXTRA_DIST): Add fts_.h fts-cycle.c.
* modules/getcwd (EXTRA_DIST): Add getcwd.h.
* modules/getdate (EXTRA_DIST): Add getdate.c.
* modules/gethrxtime (EXTRA_DIST): Add gethrxtime.h xtime.h.
* modules/getpagesize (EXTRA_DIST): Add getpagesize.h.
* modules/getpass (EXTRA_DIST): Add getpass.h.
* modules/glob (EXTRA_DIST): Add glob_.h glob-libc.h.
* modules/group-member (EXTRA_DIST): Add group-member.h.
* modules/hard-locale (EXTRA_DIST): Add hard-locale.h.
* modules/hash (EXTRA_DIST): Add hash.h.
* modules/human (EXTRA_DIST): Add human.h.
* modules/inttypes (EXTRA_DIST): Add inttypes.h.
* modules/lchmod (EXTRA_DIST): Add lchmod.h.
* modules/lchown (EXTRA_DIST): Add lchown.h.
* modules/long-options (EXTRA_DIST): Add long-options.h.
* modules/lstat (EXTRA_DIST): Add lstat.h.
* modules/md5 (EXTRA_DIST): Add memcasecmp.h.
* modules/memcoll (EXTRA_DIST): Add memcoll.h.
* modules/mempcpy (EXTRA_DIST): Add mempcpy.h.
* modules/memrchr (EXTRA_DIST): Add memrchr.h.
* modules/memxor (EXTRA_DIST): Add memxor.h.
* modules/mkancesdirs (EXTRA_DIST): Add mkancesdirs.h.
* modules/mkdir-p (EXTRA_DIST): Add modechange.h.
* modules/mountlist (EXTRA_DIST): Add mountlist.h.
* modules/openat (EXTRA_DIST): Add at-func.c openat.h openat-priv.h.
* modules/pathmax (EXTRA_DIST): Add pathmax.h.
* modules/physmem (EXTRA_DIST): Add physmem.h.
* modules/posixtm (EXTRA_DIST): Add posixtm.h.
* modules/posixver (EXTRA_DIST): Add posixver.h.
* modules/quote (EXTRA_DIST): Add quote.h.
* modules/quotearg (EXTRA_DIST): Add quotearg.h.
* modules/readtokens (EXTRA_DIST): Add readtokens.h.
* modules/readutmp (EXTRA_DIST): Add readutmp.h.
* modules/regex (EXTRA_DIST): Add regcomp.c regex.h regex_internal.c regex_internal.h regexec.c.
* modules/safe-read (EXTRA_DIST): Add safe-read.h.
* modules/safe-write (EXTRA_DIST): Add safe-write.h.
* modules/same (EXTRA_DIST): Add same.h.
* modules/same-inode (EXTRA_DIST): Add same-inode.h.
* modules/save-cwd (EXTRA_DIST): Add save-cwd.h.
* modules/savedir (EXTRA_DIST): Add savedir.h.
* modules/sha1 (EXTRA_DIST): Add sha1.h.
* modules/sig2str (EXTRA_DIST): Add sig2str.h.
* modules/stat-macros (EXTRA_DIST): Add stat-macros.h.
* modules/stat-time (EXTRA_DIST): Add stat-time.h.
* modules/stdlib-safer (EXTRA_DIST): Add stdlib-safer.h stdlib--.h.
* modules/strdup (EXTRA_DIST): Add strdup.h.
* modules/strftime (EXTRA_DIST): Add strftime.h.
* modules/strndup (EXTRA_DIST): Add strndup.h.
* modules/strnlen (EXTRA_DIST): Add strnlen.h.
* modules/strverscmp (EXTRA_DIST): Add strverscmp.h.
* modules/time_r (EXTRA_DIST): Add time_r.h.
* modules/timespec (EXTRA_DIST): Add timespec.h.
* modules/tmpfile-safer (EXTRA_DIST): Add stdio-safer.h stdio--.h.
* modules/unistd-safer (EXTRA_DIST): Add unistd-safer.h unistd--.h.
* modules/unlinkdir (EXTRA_DIST): Add unlinkdir.h.
* modules/unlocked-io (EXTRA_DIST): Add unlocked-io.h.
* modules/userspec (EXTRA_DIST): Add userspec.h.
* modules/utimecmp (EXTRA_DIST): Add utimecmp.h.
* modules/utimens (EXTRA_DIST): Add utimens.h.
* modules/xalloc (EXTRA_DIST): Add xalloc.h.
* modules/xgetcwd (EXTRA_DIST): Add xgetcwd.h.
* modules/xnanosleep (EXTRA_DIST): Add xnanosleep.h.
* modules/xreadlink (EXTRA_DIST): Add xreadlink.h.
* modules/xstrtod (EXTRA_DIST): Add xstrtod.h.
* modules/xstrtol (EXTRA_DIST): Add xstrtol.h.
* modules/xstrtold (EXTRA_DIST): Add xstrtod.c xstrtod.h.
* modules/yesno (EXTRA_DIST): Add yesno.h.
+
* m4/argmatch.m4: New file, from coreutils with AC_LIBSOURCES removed.
* m4/dev-ino.m4, same-inode.m4: Remove.
+
* m4/_inttypes_h.m4 (gl_INTTYPES_H):
* m4/acl.m4 (AC_FUNC_ACL):
* m4/backupfile.m4 (gl_BACKUPFILE):
* m4/c-strtod.m4 (gl_C99_STRTOLD):
* m4/canon-host.m4 (gl_CANON_HOST):
* m4/canonicalize.m4 (AC_FUNC_CANONICALIZE_FILE_NAME):
* m4/chdir-long.m4 (gl_FUNC_CHDIR_LONG):
* m4/chdir-safer.m4 (gl_CHDIR_SAFER):
* m4/cloexec.m4 (gl_CLOEXEC):
* m4/close-stream.m4 (gl_CLOSE_STREAM):
* m4/closeout.m4 (gl_CLOSEOUT):
* m4/dirfd.m4 (gl_FUNC_DIRFD):
* m4/dirname.m4 (gl_DIRNAME):
* m4/exclude.m4 (gl_EXCLUDE):
* m4/exitfail.m4 (gl_EXITFAIL):
* m4/fcntl-safer.m4 (gl_FCNTL_SAFER):
* m4/file-type.m4 (gl_FILE_TYPE):
* m4/filemode.m4 (gl_FILEMODE):
* m4/filenamecat.m4 (gl_FILE_NAME_CONCAT):
* m4/fpending.m4 (gl_FUNC_FPENDING):
* m4/fprintftime.m4 (gl_FPRINTFTIME):
* m4/fts.m4 (gl_FUNC_FTS):
* m4/getcwd.m4 (gl_FUNC_GETCWD_NULL):
* m4/getdate.m4 (gl_GETDATE):
* m4/gethrxtime.m4 (gl_GETHRXTIME):
* m4/getpagesize.m4 (gl_GETPAGESIZE):
* m4/getpass.m4 (gl_FUNC_GETPASS):
* m4/gettime.m4 (gl_GETTIME):
* m4/getugroups.m4 (gl_GETUGROUPS):
* m4/glob.m4 (gl_GLOB_SUBSTITUTE):
* m4/group-member.m4 (gl_FUNC_GROUP_MEMBER):
* m4/hard-locale.m4 (gl_HARD_LOCALE):
* m4/hash.m4 (gl_HASH):
* m4/idcache.m4 (gl_IDCACHE):
* m4/lchmod.m4 (gl_FUNC_LCHMOD):
* m4/lchown.m4 (gl_FUNC_LCHOWN):
* m4/long-options.m4 (gl_LONG_OPTIONS):
* m4/lstat.m4 (gl_FUNC_LSTAT):
* m4/md5.m4 (gl_MD5):
* m4/memcasecmp.m4 (gl_MEMCASECMP):
* m4/memcoll.m4 (gl_MEMCOLL):
* m4/mempcpy.m4 (gl_FUNC_MEMPCPY):
* m4/memrchr.m4 (gl_FUNC_MEMRCHR):
* m4/memxor.m4 (gl_MEMXOR):
* m4/mkancesdirs.m4 (gl_MKANCESDIRS):
* m4/mkdir-p.m4 (gl_MKDIR_PARENTS):
* m4/modechange.m4 (gl_MODECHANGE):
* m4/mountlist.m4 (gl_MOUNTLIST):
* m4/nanosleep.m4 (gl_FUNC_NANOSLEEP):
* m4/openat.m4 (gl_FUNC_OPENAT):
* m4/pathmax.m4 (gl_PATHMAX):
* m4/physmem.m4 (gl_PHYSMEM):
* m4/posixtm.m4 (gl_POSIXTM):
* m4/posixver.m4 (gl_POSIXVER):
* m4/quote.m4 (gl_QUOTE):
* m4/quotearg.m4 (gl_QUOTEARG):
* m4/readtokens.m4 (gl_READTOKENS):
* m4/readutmp.m4 (gl_READUTMP):
* m4/regex.m4 (gl_REGEX):
* m4/safe-read.m4 (gl_SAFE_READ):
* m4/safe-write.m4 (gl_SAFE_WRITE):
* m4/same.m4 (gl_SAME):
* m4/save-cwd.m4 (gl_SAVE_CWD):
* m4/savedir.m4 (gl_SAVEDIR):
* m4/settime.m4 (gl_SETTIME):
* m4/sha1.m4 (gl_SHA1):
* m4/sig2str.m4 (gl_FUNC_SIG2STR):
* m4/stat-macros.m4 (gl_STAT_MACROS):
* m4/stat-time.m4 (gl_STAT_TIME):
* m4/stdio-safer.m4 (gl_FOPEN_SAFER):
* m4/stdlib-safer.m4 (gl_STDLIB_SAFER):
* m4/strdup.m4 (gl_FUNC_STRDUP):
* m4/strftime.m4 (gl_FUNC_GNU_STRFTIME):
* m4/strndup.m4 (gl_FUNC_STRNDUP):
* m4/strnlen.m4 (gl_FUNC_STRNLEN):
* m4/strverscmp.m4 (gl_FUNC_STRVERSCMP):
* m4/time_r.m4 (gl_TIME_R):
* m4/timespec.m4 (gl_TIMESPEC):
* m4/unistd-safer.m4 (gl_UNISTD_SAFER):
* m4/unlinkdir.m4 (gl_UNLINKDIR):
* m4/unlocked-io.m4 (gl_FUNC_GLIBC_UNLOCKED_IO):
* m4/userspec.m4 (gl_USERSPEC):
* m4/utimecmp.m4 (gl_UTIMECMP):
* m4/utimens.m4 (gl_UTIMENS):
* m4/xalloc.m4 (gl_XALLOC):
* m4/xgetcwd.m4 (gl_XGETCWD):
* m4/xnanosleep.m4 (gl_XNANOSLEEP):
* m4/xreadlink.m4 (gl_XREADLINK):
* m4/xstrtod.m4 (gl_XSTRTOD):
* m2/yesno.m4 (gl_YESNO):
Don't use AC_LIBSOURCES; instead, rely on the files in ../modules/
to get the necessary .h files and whatnot.

95 files changed, 98 insertions, 11 deletions

diff --git a/modules/acl b/modules/acl
index 26a6f68a5e..2b02ba9613 100644
--- a/modules/acl
+++ b/modules/acl
@@ -14,6 +14,7 @@ configure.ac:
 AC_FUNC_ACL
 
 Makefile.am:
+EXTRA_DIST += acl.h
 
 Include:
 "acl.h"
diff --git a/modules/argmatch b/modules/argmatch
index f7d1feb2c0..ce3519ca26 100644
--- a/modules/argmatch
+++ b/modules/argmatch
@@ -4,6 +4,7 @@ Search for an exact or abbreviated match of a string in an array of strings.
 Files:
 lib/argmatch.h
 lib/argmatch.c
+m4/argmatch.m4
 
 Depends-on:
 gettext-h
@@ -16,9 +17,10 @@ verify
 stdbool
 
 configure.ac:
+gl_ARGMATCH
 
 Makefile.am:
-lib_SOURCES += argmatch.h argmatch.c
+EXTRA_DIST += argmatch.h
 
 Include:
 "argmatch.h"
diff --git a/modules/backupfile b/modules/backupfile
index bb140b5882..120756bb4c 100644
--- a/modules/backupfile
+++ b/modules/backupfile
@@ -18,6 +18,7 @@ configure.ac:
 gl_BACKUPFILE
 
 Makefile.am:
+EXTRA_DIST += backupfile.h
 
 Include:
 "backupfile.h"
diff --git a/modules/c-strtod b/modules/c-strtod
index f82a98863e..c63e7c66f3 100644
--- a/modules/c-strtod
+++ b/modules/c-strtod
@@ -14,6 +14,7 @@ configure.ac:
 gl_C_STRTOD
 
 Makefile.am:
+EXTRA_DIST += c-strtod.h
 
 Include:
 "c-strtod.h"
diff --git a/modules/c-strtold b/modules/c-strtold
index d9d5a18ce1..8eb2a9abe5 100644
--- a/modules/c-strtold
+++ b/modules/c-strtold
@@ -15,6 +15,7 @@ configure.ac:
 gl_C_STRTOLD
 
 Makefile.am:
+EXTRA_DIST += c-strtod.c c-strtod.h
 
 Include:
 "c-strtod.h"
diff --git a/modules/canon-host b/modules/canon-host
index 581266501c..6d554d8062 100644
--- a/modules/canon-host
+++ b/modules/canon-host
@@ -15,6 +15,7 @@ configure.ac:
 gl_CANON_HOST
 
 Makefile.am:
+EXTRA_DIST += canon-host.h
 
 Include:
 #include "canon-host.h"
diff --git a/modules/canonicalize b/modules/canonicalize
index 3a10f4db09..560579c247 100644
--- a/modules/canonicalize
+++ b/modules/canonicalize
@@ -19,6 +19,7 @@ configure.ac:
 AC_FUNC_CANONICALIZE_FILE_NAME
 
 Makefile.am:
+EXTRA_DIST += canonicalize.h
 
 Include:
 "canonicalize.h"
diff --git a/modules/chdir-long b/modules/chdir-long
index 1bff7fab0e..d8cdb87acc 100644
--- a/modules/chdir-long
+++ b/modules/chdir-long
@@ -16,6 +16,7 @@ configure.ac:
 gl_FUNC_CHDIR_LONG
 
 Makefile.am:
+EXTRA_DIST += chdir-long.h
 
 Include:
 "chdir-long.h"
diff --git a/modules/chdir-safer b/modules/chdir-safer
index ee6c6ae0f7..0d2f3d23b2 100644
--- a/modules/chdir-safer
+++ b/modules/chdir-safer
@@ -14,6 +14,7 @@ configure.ac:
 gl_CHDIR_SAFER
 
 Makefile.am:
+EXTRA_DIST += chdir-safer.h
 
 Include:
 "chdir-safer.h"
diff --git a/modules/cloexec b/modules/cloexec
index 60c04c584b..85b2e5ea4c 100644
--- a/modules/cloexec
+++ b/modules/cloexec
@@ -13,6 +13,7 @@ configure.ac:
 gl_CLOEXEC
 
 Makefile.am:
+EXTRA_DIST += cloexec.h
 
 Include:
 "cloexec.h"
diff --git a/modules/close-stream b/modules/close-stream
index 75f96f8208..96f5702a69 100644
--- a/modules/close-stream
+++ b/modules/close-stream
@@ -14,6 +14,7 @@ configure.ac:
 gl_CLOSE_STREAM
 
 Makefile.am:
+EXTRA_DIST += close-stream.h
 
 Include:
 "close-stream.h"
diff --git a/modules/closeout b/modules/closeout
index 22d935ac5c..c3ed2b70a8 100644
--- a/modules/closeout
+++ b/modules/closeout
@@ -17,6 +17,7 @@ configure.ac:
 gl_CLOSEOUT
 
 Makefile.am:
+EXTRA_DIST += closeout.h
 
 Include:
 "closeout.h"
diff --git a/modules/cycle-check b/modules/cycle-check
index 8421cc880f..055166413d 100644
--- a/modules/cycle-check
+++ b/modules/cycle-check
@@ -16,7 +16,7 @@ configure.ac:
 gl_CYCLE_CHECK
 
 Makefile.am:
-lib_SOURCES += cycle-check.h
+EXTRA_DIST += cycle-check.h
 
 Include:
 "cycle-check.h"
diff --git a/modules/dev-ino b/modules/dev-ino
index 1ba601d584..78f8dbd4b9 100644
--- a/modules/dev-ino
+++ b/modules/dev-ino
@@ -3,14 +3,13 @@ declare a simple (device, inode) struct
 
 Files:
 lib/dev-ino.h
-m4/dev-ino.m4
 
 Depends-on:
 
 configure.ac:
-gl_STRUCT_DEV_INO
 
 Makefile.am:
+EXTRA_DIST += dev-ino.h
 
 Include:
 "dev-ino.h"
diff --git a/modules/dirfd b/modules/dirfd
index 82cfb7a985..97e7d3b223 100644
--- a/modules/dirfd
+++ b/modules/dirfd
@@ -12,6 +12,7 @@ configure.ac:
 gl_FUNC_DIRFD
 
 Makefile.am:
+EXTRA_DIST += dirfd.h
 
 Include:
 "dirfd.h"
diff --git a/modules/dirname b/modules/dirname
index 8f16c4ea47..aeaa92a10f 100644
--- a/modules/dirname
+++ b/modules/dirname
@@ -19,7 +19,7 @@ configure.ac:
 gl_DIRNAME
 
 Makefile.am:
-lib_SOURCES += basename.c stripslash.c
+EXTRA_DIST += dirname.h
 
 Include:
 "dirname.h"
diff --git a/modules/exclude b/modules/exclude
index 78efea5d7e..9962a1d14e 100644
--- a/modules/exclude
+++ b/modules/exclude
@@ -17,6 +17,7 @@ configure.ac:
 gl_EXCLUDE
 
 Makefile.am:
+EXTRA_DIST += exclude.h
 
 Include:
 "exclude.h"
diff --git a/modules/exitfail b/modules/exitfail
index 26f5a9236d..9b54cfde88 100644
--- a/modules/exitfail
+++ b/modules/exitfail
@@ -13,6 +13,7 @@ configure.ac:
 gl_EXITFAIL
 
 Makefile.am:
+EXTRA_DIST += exitfail.h
 
 Include:
 "exitfail.h"
diff --git a/modules/fcntl-safer b/modules/fcntl-safer
index 942b6b7ae9..91dbf68ba0 100644
--- a/modules/fcntl-safer
+++ b/modules/fcntl-safer
@@ -15,6 +15,7 @@ configure.ac:
 gl_FCNTL_SAFER
 
 Makefile.am:
+EXTRA_DIST += fcntl-safer.h fcntl--.h
 
 Include:
 "fcntl-safer.h"
diff --git a/modules/file-type b/modules/file-type
index 9dc1763de9..adbd693143 100644
--- a/modules/file-type
+++ b/modules/file-type
@@ -14,6 +14,7 @@ configure.ac:
 gl_FILE_TYPE
 
 Makefile.am:
+EXTRA_DIST += file-type.h
 
 Include:
 "file-type.h"
diff --git a/modules/filemode b/modules/filemode
index 02cd1215b7..1abb5f7130 100644
--- a/modules/filemode
+++ b/modules/filemode
@@ -15,6 +15,7 @@ configure.ac:
 gl_FILEMODE
 
 Makefile.am:
+EXTRA_DIST += filemode.h
 
 Include:
 "filemode.h"
diff --git a/modules/filenamecat b/modules/filenamecat
index fb1786b843..dea9cc784a 100644
--- a/modules/filenamecat
+++ b/modules/filenamecat
@@ -15,6 +15,7 @@ configure.ac:
 gl_FILE_NAME_CONCAT
 
 Makefile.am:
+EXTRA_DIST += filenamecat.h
 
 Include:
 "filenamecat.h"
diff --git a/modules/fopen-safer b/modules/fopen-safer
index 137332e92b..68272247fa 100644
--- a/modules/fopen-safer
+++ b/modules/fopen-safer
@@ -14,6 +14,7 @@ configure.ac:
 gl_FOPEN_SAFER
 
 Makefile.am:
+EXTRA_DIST += stdio-safer.h stdio--.h
 
 Include:
 "stdio-safer.h"
diff --git a/modules/fpending b/modules/fpending
index abdcadaf46..eadf686e27 100644
--- a/modules/fpending
+++ b/modules/fpending
@@ -12,6 +12,7 @@ configure.ac:
 gl_FUNC_FPENDING
 
 Makefile.am:
+EXTRA_DIST += __fpending.h
 
 Include:
 "__fpending.h"
diff --git a/modules/fprintftime b/modules/fprintftime
index 4333a31374..0ae813ceaf 100644
--- a/modules/fprintftime
+++ b/modules/fprintftime
@@ -13,6 +13,7 @@ configure.ac:
 gl_FPRINTFTIME
 
 Makefile.am:
+EXTRA_DIST += fprintftime.h
 
 Include:
 "fprintftime.h"
diff --git a/modules/fsusage b/modules/fsusage
index 6e1eb53c52..0d0a1d2bdc 100644
--- a/modules/fsusage
+++ b/modules/fsusage
@@ -15,7 +15,7 @@ configure.ac:
 gl_FSUSAGE
 
 Makefile.am:
-lib_SOURCES += fsusage.h
+EXTRA_DIST += fsusage.h
 
 Include:
 "fsusage.h"
diff --git a/modules/fts b/modules/fts
index d6c95f8707..05a9ddea20 100644
--- a/modules/fts
+++ b/modules/fts
@@ -21,6 +21,7 @@ configure.ac:
 gl_FUNC_FTS
 
 Makefile.am:
+EXTRA_DIST += fts_.h fts-cycle.c
 
 Include:
 "fts_.h"
diff --git a/modules/getcwd b/modules/getcwd
index 35c6412577..ddb3e1ada6 100644
--- a/modules/getcwd
+++ b/modules/getcwd
@@ -18,6 +18,7 @@ configure.ac:
 gl_FUNC_GETCWD
 
 Makefile.am:
+EXTRA_DIST += getcwd.h
 
 Include:
 "getcwd.h"
diff --git a/modules/getdate b/modules/getdate
index e0f7c0f495..d04dc19b50 100644
--- a/modules/getdate
+++ b/modules/getdate
@@ -21,9 +21,10 @@ configure.ac:
 gl_GETDATE
 
 Makefile.am:
+lib_SOURCES += getdate.y
 BUILT_SOURCES += getdate.c
 MAINTAINERCLEANFILES += getdate.c
-EXTRA_DIST += getdate.c
+EXTRA_DIST += getdate.c getdate.h
 
 Include:
 "getdate.h"
diff --git a/modules/gethrxtime b/modules/gethrxtime
index 8c40d28f04..7fd4772679 100644
--- a/modules/gethrxtime
+++ b/modules/gethrxtime
@@ -17,6 +17,7 @@ configure.ac:
 gl_GETHRXTIME
 
 Makefile.am:
+EXTRA_DIST += gethrxtime.h xtime.h
 
 Include:
 #include "xtime.h"
diff --git a/modules/getpagesize b/modules/getpagesize
index 888bb14569..757b9bf695 100644
--- a/modules/getpagesize
+++ b/modules/getpagesize
@@ -11,6 +11,7 @@ configure.ac:
 gl_GETPAGESIZE
 
 Makefile.am:
+EXTRA_DIST += getpagesize.h
 
 Include:
 "getpagesize.h"
diff --git a/modules/getpass b/modules/getpass
index 52fc1a3ee5..d394a06949 100644
--- a/modules/getpass
+++ b/modules/getpass
@@ -14,6 +14,7 @@ configure.ac:
 gl_FUNC_GETPASS
 
 Makefile.am:
+EXTRA_DIST += getpass.h
 
 Include:
 "getpass.h"
diff --git a/modules/glob b/modules/glob
index 8db534f6e6..3dcfc6587c 100644
--- a/modules/glob
+++ b/modules/glob
@@ -25,6 +25,7 @@ gl_GLOB
 
 Makefile.am:
 BUILT_SOURCES += $(GLOB_H)
+EXTRA_DIST += glob_.h glob-libc.h
 
 # We need the following in order to create <glob.h> when the system
 # doesn't have one that works with the given compiler.
diff --git a/modules/group-member b/modules/group-member
index 6432a4fdc3..6ebfb27279 100644
--- a/modules/group-member
+++ b/modules/group-member
@@ -14,6 +14,7 @@ configure.ac:
 gl_FUNC_GROUP_MEMBER
 
 Makefile.am:
+EXTRA_DIST += group-member.h
 
 Include:
 "group-member.h"
diff --git a/modules/hard-locale b/modules/hard-locale
index 2f9810adf9..7e56a81366 100644
--- a/modules/hard-locale
+++ b/modules/hard-locale
@@ -14,6 +14,7 @@ configure.ac:
 gl_HARD_LOCALE
 
 Makefile.am:
+EXTRA_DIST += hard-locale.h
 
 Include:
 "hard-locale.h"
diff --git a/modules/hash b/modules/hash
index 05ac4402f9..a364134532 100644
--- a/modules/hash
+++ b/modules/hash
@@ -14,6 +14,7 @@ configure.ac:
 gl_HASH
 
 Makefile.am:
+EXTRA_DIST += hash.h
 
 Include:
 "hash.h"
diff --git a/modules/human b/modules/human
index c0aa62caee..24e1ac2fbe 100644
--- a/modules/human
+++ b/modules/human
@@ -20,7 +20,7 @@ configure.ac:
 gl_HUMAN
 
 Makefile.am:
-lib_SOURCES += human.h
+EXTRA_DIST += human.h
 
 Include:
 "human.h"
diff --git a/modules/inttypes b/modules/inttypes
index 73bd4dde4a..ccbb484dbc 100644
--- a/modules/inttypes
+++ b/modules/inttypes
@@ -15,6 +15,7 @@ configure.ac:
 gl_INTTYPES_H
 
 Makefile.am:
+EXTRA_DIST += inttypes.h
 
 Include:
 #include <inttypes.h>
diff --git a/modules/lchmod b/modules/lchmod
index 78d7829e27..d3767087d6 100644
--- a/modules/lchmod
+++ b/modules/lchmod
@@ -11,6 +11,7 @@ configure.ac:
 gl_FUNC_LCHMOD
 
 Makefile.am:
+EXTRA_DIST += lchmod.h
 
 Include:
 "lchown.h"
diff --git a/modules/lchown b/modules/lchown
index 81d488a2b9..af2991945c 100644
--- a/modules/lchown
+++ b/modules/lchown
@@ -14,6 +14,7 @@ configure.ac:
 gl_FUNC_LCHOWN
 
 Makefile.am:
+EXTRA_DIST += lchown.h
 
 Include:
 "lchown.h"
diff --git a/modules/long-options b/modules/long-options
index 8b880817a2..9d5d2e3619 100644
--- a/modules/long-options
+++ b/modules/long-options
@@ -13,6 +13,7 @@ configure.ac:
 gl_LONG_OPTIONS
 
 Makefile.am:
+EXTRA_DIST += long-options.h
 
 Include:
 "long-options.h"
diff --git a/modules/lstat b/modules/lstat
index 6b72505c6c..f97cd172fd 100644
--- a/modules/lstat
+++ b/modules/lstat
@@ -13,6 +13,7 @@ configure.ac:
 gl_FUNC_LSTAT
 
 Makefile.am:
+EXTRA_DIST += lstat.h
 
 Include:
 "lstat.h"
diff --git a/modules/md5 b/modules/md5
index 250c94f628..e66de724f5 100644
--- a/modules/md5
+++ b/modules/md5
@@ -13,6 +13,7 @@ configure.ac:
 gl_MD5
 
 Makefile.am:
+lib_SOURCES += md5.h
 
 Include:
 "md5.h"
diff --git a/modules/memcasecmp b/modules/memcasecmp
index c3847913d1..f36bbecb59 100644
--- a/modules/memcasecmp
+++ b/modules/memcasecmp
@@ -12,6 +12,7 @@ configure.ac:
 gl_MEMCASECMP
 
 Makefile.am:
+EXTRA_DIST += memcasecmp.h
 
 Include:
 "memcasecmp.h"
diff --git a/modules/memcoll b/modules/memcoll
index 8792a7f6f0..c591b49456 100644
--- a/modules/memcoll
+++ b/modules/memcoll
@@ -12,6 +12,7 @@ configure.ac:
 gl_MEMCOLL
 
 Makefile.am:
+EXTRA_DIST += memcoll.h
 
 Include:
 "memcoll.h"
diff --git a/modules/mempcpy b/modules/mempcpy
index da13ec831e..f21ac61c53 100644
--- a/modules/mempcpy
+++ b/modules/mempcpy
@@ -12,6 +12,7 @@ configure.ac:
 gl_FUNC_MEMPCPY
 
 Makefile.am:
+EXTRA_DIST += mempcpy.h
 
 Include:
 "mempcpy.h"
diff --git a/modules/memrchr b/modules/memrchr
index 618c389517..d5bfd2def7 100644
--- a/modules/memrchr
+++ b/modules/memrchr
@@ -12,6 +12,7 @@ configure.ac:
 gl_FUNC_MEMRCHR
 
 Makefile.am:
+EXTRA_DIST += memrchr.h
 
 Include:
 "memrchr.h"
diff --git a/modules/memxor b/modules/memxor
index 2fdcb3e4af..1b2d244315 100644
--- a/modules/memxor
+++ b/modules/memxor
@@ -12,6 +12,7 @@ configure.ac:
 gl_MEMXOR
 
 Makefile.am:
+EXTRA_DIST += memxor.h
 
 Include:
 "memxor.h"
diff --git a/modules/mkancesdirs b/modules/mkancesdirs
index 73d9b5dfdc..71a11a7cb8 100644
--- a/modules/mkancesdirs
+++ b/modules/mkancesdirs
@@ -14,6 +14,7 @@ configure.ac:
 gl_MKANCESDIRS
 
 Makefile.am:
+EXTRA_DIST += mkancesdirs.h
 
 Include:
 "mkancesdirs.h"
diff --git a/modules/mkdir-p b/modules/mkdir-p
index 1e7dabed67..2afc50d4d1 100644
--- a/modules/mkdir-p
+++ b/modules/mkdir-p
@@ -22,6 +22,7 @@ configure.ac:
 gl_MKDIR_PARENTS
 
 Makefile.am:
+lib+SOURCES += dirchownmod.h mkdir-p.h
 
 Include:
 "mkdir-p.h"
diff --git a/modules/modechange b/modules/modechange
index 4c3397c015..f66e844fbe 100644
--- a/modules/modechange
+++ b/modules/modechange
@@ -15,6 +15,7 @@ configure.ac:
 gl_MODECHANGE
 
 Makefile.am:
+EXTRA_DIST += modechange.h
 
 Include:
 "modechange.h"
diff --git a/modules/mountlist b/modules/mountlist
index ce5342cb05..1c2e278ab7 100644
--- a/modules/mountlist
+++ b/modules/mountlist
@@ -16,6 +16,7 @@ configure.ac:
 gl_MOUNTLIST
 
 Makefile.am:
+EXTRA_DIST += mountlist.h
 
 Include:
 "mountlist.h"
diff --git a/modules/openat b/modules/openat
index a6ab77f4c0..15105c89cd 100644
--- a/modules/openat
+++ b/modules/openat
@@ -23,6 +23,7 @@ configure.ac:
 gl_FUNC_OPENAT
 
 Makefile.am:
+EXTRA_DIST += at-func.c openat.h openat-priv.h
 
 Include:
 "openat.h"
diff --git a/modules/pathmax b/modules/pathmax
index 3ceadf68d4..684bcf84c2 100644
--- a/modules/pathmax
+++ b/modules/pathmax
@@ -11,6 +11,7 @@ configure.ac:
 gl_PATHMAX
 
 Makefile.am:
+EXTRA_DIST += pathmax.h
 
 Include:
 "pathmax.h"
diff --git a/modules/physmem b/modules/physmem
index 3cf13c0aed..cd481790d1 100644
--- a/modules/physmem
+++ b/modules/physmem
@@ -12,6 +12,7 @@ configure.ac:
 gl_PHYSMEM
 
 Makefile.am:
+EXTRA_DIST += physmem.h
 
 Include:
 "physmem.h"
diff --git a/modules/posixtm b/modules/posixtm
index 06af4c8385..bfd36a9ffa 100644
--- a/modules/posixtm
+++ b/modules/posixtm
@@ -14,6 +14,7 @@ configure.ac:
 gl_POSIXTM
 
 Makefile.am:
+EXTRA_DIST += posixtm.h
 
 Include:
 "posixtm.h"
diff --git a/modules/posixver b/modules/posixver
index 84891cd548..f5b3b02ccb 100644
--- a/modules/posixver
+++ b/modules/posixver
@@ -13,6 +13,7 @@ configure.ac:
 gl_POSIXVER
 
 Makefile.am:
+EXTRA_DIST += posixver.h
 
 Include:
 "posixver.h"
diff --git a/modules/quote b/modules/quote
index 6e26f69156..34e2377aab 100644
--- a/modules/quote
+++ b/modules/quote
@@ -13,6 +13,7 @@ configure.ac:
 gl_QUOTE
 
 Makefile.am:
+EXTRA_DIST += quote.h
 
 Include:
 "quote.h"
diff --git a/modules/quotearg b/modules/quotearg
index bc0b32fb63..e94cb6d8f3 100644
--- a/modules/quotearg
+++ b/modules/quotearg
@@ -17,6 +17,7 @@ configure.ac:
 gl_QUOTEARG
 
 Makefile.am:
+EXTRA_DIST += quotearg.h
 
 Include:
 "quotearg.h"
diff --git a/modules/readtokens b/modules/readtokens
index 9453de9972..e713dde375 100644
--- a/modules/readtokens
+++ b/modules/readtokens
@@ -14,6 +14,7 @@ configure.ac:
 gl_READTOKENS
 
 Makefile.am:
+EXTRA_DIST += readtokens.h
 
 Include:
 "readtokens.h"
diff --git a/modules/readutmp b/modules/readutmp
index 8c4f84747d..5e1edb9058 100644
--- a/modules/readutmp
+++ b/modules/readutmp
@@ -15,6 +15,7 @@ configure.ac:
 gl_READUTMP
 
 Makefile.am:
+EXTRA_DIST += readutmp.h
 
 Include:
 "readutmp.h"
diff --git a/modules/regex b/modules/regex
index 5ca9a7f2d8..35d350a54b 100644
--- a/modules/regex
+++ b/modules/regex
@@ -24,6 +24,7 @@ configure.ac:
 gl_REGEX
 
 Makefile.am:
+EXTRA_DIST += regcomp.c regex.h regex_internal.c regex_internal.h regexec.c
 
 Include:
 "regex.h"
diff --git a/modules/safe-read b/modules/safe-read
index a2b3afa29d..d1776f4c18 100644
--- a/modules/safe-read
+++ b/modules/safe-read
@@ -13,6 +13,7 @@ configure.ac:
 gl_SAFE_READ
 
 Makefile.am:
+EXTRA_DIST += safe-read.h
 
 Include:
 "safe-read.h"
diff --git a/modules/safe-write b/modules/safe-write
index 09d2d1dbaf..7113ccb605 100644
--- a/modules/safe-write
+++ b/modules/safe-write
@@ -13,6 +13,7 @@ configure.ac:
 gl_SAFE_WRITE
 
 Makefile.am:
+EXTRA_DIST += safe-write.h
 
 Include:
 "safe-write.h"
diff --git a/modules/same b/modules/same
index a3616d0f08..6d7846514a 100644
--- a/modules/same
+++ b/modules/same
@@ -18,6 +18,7 @@ configure.ac:
 gl_SAME
 
 Makefile.am:
+EXTRA_DIST += same.h
 
 Include:
 "same.h"
diff --git a/modules/same-inode b/modules/same-inode
index 0d349dddbb..e0cc9a7ef0 100644
--- a/modules/same-inode
+++ b/modules/same-inode
@@ -3,14 +3,13 @@ compare inodes
 
 Files:
 lib/same-inode.h
-m4/same-inode.m4
 
 Depends-on:
 
 configure.ac:
-gl_SAME_INODE
 
 Makefile.am:
+EXTRA_DIST += same-inode.h
 
 Include:
 "same-inode.h"
diff --git a/modules/save-cwd b/modules/save-cwd
index 18c43b9ef7..2a95738eb6 100644
--- a/modules/save-cwd
+++ b/modules/save-cwd
@@ -16,6 +16,7 @@ configure.ac:
 gl_SAVE_CWD
 
 Makefile.am:
+EXTRA_DIST += save-cwd.h
 
 Include:
 "save-cwd.h"
diff --git a/modules/savedir b/modules/savedir
index e781af76b2..00f1f767ae 100644
--- a/modules/savedir
+++ b/modules/savedir
@@ -14,6 +14,7 @@ configure.ac:
 gl_SAVEDIR
 
 Makefile.am:
+EXTRA_DIST += savedir.h
 
 Include:
 "savedir.h"
diff --git a/modules/sha1 b/modules/sha1
index 6e85b813ce..c1dbc7d939 100644
--- a/modules/sha1
+++ b/modules/sha1
@@ -13,6 +13,7 @@ configure.ac:
 gl_SHA1
 
 Makefile.am:
+EXTRA_DIST += sha1.h
 
 Include:
 "sha1.h"
diff --git a/modules/sig2str b/modules/sig2str
index 89d00cc63e..4ce76fdaab 100644
--- a/modules/sig2str
+++ b/modules/sig2str
@@ -13,6 +13,7 @@ configure.ac:
 gl_FUNC_SIG2STR
 
 Makefile.am:
+EXTRA_DIST += sig2str.h
 
 Include:
 "sig2str.h"
diff --git a/modules/stat-macros b/modules/stat-macros
index 5132c2537f..1ce7917ab8 100644
--- a/modules/stat-macros
+++ b/modules/stat-macros
@@ -11,6 +11,7 @@ configure.ac:
 gl_STAT_MACROS
 
 Makefile.am:
+EXTRA_DIST += stat-macros.h
 
 Include:
 "stat-macros.h"
diff --git a/modules/stat-time b/modules/stat-time
index 666f4ed047..0e11b14dfe 100644
--- a/modules/stat-time
+++ b/modules/stat-time
@@ -12,6 +12,7 @@ configure.ac:
 gl_STAT_TIME
 
 Makefile.am:
+EXTRA_DIST += stat-time.h
 
 Include:
 "stat-time.h"
diff --git a/modules/stdlib-safer b/modules/stdlib-safer
index 8f7cb3f000..cf4aef93b3 100644
--- a/modules/stdlib-safer
+++ b/modules/stdlib-safer
@@ -15,6 +15,7 @@ configure.ac:
 gl_STDLIB_SAFER
 
 Makefile.am:
+EXTRA_DIST += stdlib-safer.h stdlib--.h
 
 Include:
 "stdlib-safer.h"
diff --git a/modules/strdup b/modules/strdup
index a42129962a..2d3b8a647c 100644
--- a/modules/strdup
+++ b/modules/strdup
@@ -12,6 +12,7 @@ configure.ac:
 gl_FUNC_STRDUP
 
 Makefile.am:
+EXTRA_DIST += strdup.h
 
 Include:
 "strdup.h"
diff --git a/modules/strftime b/modules/strftime
index 5f7ad6777e..0f0745f3af 100644
--- a/modules/strftime
+++ b/modules/strftime
@@ -16,6 +16,7 @@ configure.ac:
 gl_FUNC_GNU_STRFTIME
 
 Makefile.am:
+EXTRA_DIST += strftime.h
 
 Include:
 "strftime.h"
diff --git a/modules/strndup b/modules/strndup
index 6b434ec1a4..3e55e6c90f 100644
--- a/modules/strndup
+++ b/modules/strndup
@@ -13,6 +13,7 @@ configure.ac:
 gl_FUNC_STRNDUP
 
 Makefile.am:
+EXTRA_DIST += strndup.h
 
 Include:
 "strndup.h"
diff --git a/modules/strnlen b/modules/strnlen
index 4306469fad..c091c36838 100644
--- a/modules/strnlen
+++ b/modules/strnlen
@@ -12,6 +12,7 @@ configure.ac:
 gl_FUNC_STRNLEN
 
 Makefile.am:
+EXTRA_DIST += strnlen.h
 
 Include:
 "strnlen.h"
diff --git a/modules/strverscmp b/modules/strverscmp
index c6acf5bea6..5bcdf2a721 100644
--- a/modules/strverscmp
+++ b/modules/strverscmp
@@ -12,6 +12,7 @@ configure.ac:
 gl_FUNC_STRVERSCMP
 
 Makefile.am:
+EXTRA_DIST += strverscmp.h
 
 Include:
 "strverscmp.h"
diff --git a/modules/time_r b/modules/time_r
index 96df2f7815..c486c1b8b1 100644
--- a/modules/time_r
+++ b/modules/time_r
@@ -13,6 +13,7 @@ configure.ac:
 gl_TIME_R
 
 Makefile.am:
+EXTRA_DIST += time_r.h
 
 Include:
 "time_r.h"
diff --git a/modules/timespec b/modules/timespec
index edd2dfc7b7..b1bfd322a5 100644
--- a/modules/timespec
+++ b/modules/timespec
@@ -12,6 +12,7 @@ configure.ac:
 gl_TIMESPEC
 
 Makefile.am:
+EXTRA_DIST += timespec.h
 
 Include:
 "timespec.h"
diff --git a/modules/tmpfile-safer b/modules/tmpfile-safer
index c81906332f..8fae0df4fe 100644
--- a/modules/tmpfile-safer
+++ b/modules/tmpfile-safer
@@ -15,6 +15,7 @@ configure.ac:
 gl_TMPFILE_SAFER
 
 Makefile.am:
+EXTRA_DIST += stdio-safer.h stdio--.h
 
 Include:
 "stdio-safer.h"
diff --git a/modules/unistd-safer b/modules/unistd-safer
index 4f167e4b24..17456a3f9e 100644
--- a/modules/unistd-safer
+++ b/modules/unistd-safer
@@ -15,6 +15,7 @@ configure.ac:
 gl_UNISTD_SAFER
 
 Makefile.am:
+EXTRA_DIST += unistd-safer.h unistd--.h
 
 Include:
 "unistd-safer.h"
diff --git a/modules/unlinkdir b/modules/unlinkdir
index e8c68a6f6b..93e6ac2636 100644
--- a/modules/unlinkdir
+++ b/modules/unlinkdir
@@ -13,6 +13,7 @@ configure.ac:
 gl_UNLINKDIR
 
 Makefile.am:
+EXTRA_DIST += unlinkdir.h
 
 Include:
 "unlinkdir.h"
diff --git a/modules/unlocked-io b/modules/unlocked-io
index 000fe32c19..2e9df639fa 100644
--- a/modules/unlocked-io
+++ b/modules/unlocked-io
@@ -12,6 +12,7 @@ configure.ac:
 gl_FUNC_GLIBC_UNLOCKED_IO
 
 Makefile.am:
+EXTRA_DIST += unlocked-io.h
 
 Include:
 "unlocked-io.h"
diff --git a/modules/userspec b/modules/userspec
index 71fbe33b9b..48fd65ff7b 100644
--- a/modules/userspec
+++ b/modules/userspec
@@ -20,6 +20,7 @@ configure.ac:
 gl_USERSPEC
 
 Makefile.am:
+EXTRA_DIST += userspec.h
 
 Include:
 "userspec.h"
diff --git a/modules/utimecmp b/modules/utimecmp
index a042393d78..031777a4ef 100644
--- a/modules/utimecmp
+++ b/modules/utimecmp
@@ -21,6 +21,7 @@ configure.ac:
 gl_UTIMECMP
 
 Makefile.am:
+EXTRA_DIST += utimecmp.h
 
 Include:
 "utimecmp.h"
diff --git a/modules/utimens b/modules/utimens
index 6cc5e31223..14074182f8 100644
--- a/modules/utimens
+++ b/modules/utimens
@@ -15,6 +15,7 @@ configure.ac:
 gl_UTIMENS
 
 Makefile.am:
+EXTRA_DIST += utimens.h
 
 Include:
 "utimens.h"
diff --git a/modules/xalloc b/modules/xalloc
index 5fdc405ae3..73fc901e4e 100644
--- a/modules/xalloc
+++ b/modules/xalloc
@@ -13,6 +13,7 @@ configure.ac:
 gl_XALLOC
 
 Makefile.am:
+EXTRA_DIST += xalloc.h
 
 Include:
 "xalloc.h"
diff --git a/modules/xgetcwd b/modules/xgetcwd
index a3ae23f5be..5da4d234b5 100644
--- a/modules/xgetcwd
+++ b/modules/xgetcwd
@@ -15,6 +15,7 @@ configure.ac:
 gl_XGETCWD
 
 Makefile.am:
+EXTRA_DIST += xgetcwd.h
 
 Include:
 "xgetcwd.h"
diff --git a/modules/xnanosleep b/modules/xnanosleep
index fa063cb76a..238f4e1894 100644
--- a/modules/xnanosleep
+++ b/modules/xnanosleep
@@ -16,6 +16,7 @@ configure.ac:
 gl_XNANOSLEEP
 
 Makefile.am:
+EXTRA_DIST += xnanosleep.h
 
 Include:
 "xnanosleep.h"
diff --git a/modules/xreadlink b/modules/xreadlink
index efd279f242..207ee8e7ac 100644
--- a/modules/xreadlink
+++ b/modules/xreadlink
@@ -15,6 +15,7 @@ configure.ac:
 gl_XREADLINK
 
 Makefile.am:
+EXTRA_DIST += xreadlink.h
 
 Include:
 "xreadlink.h"
diff --git a/modules/xstrtod b/modules/xstrtod
index 095616a754..103eecd58b 100644
--- a/modules/xstrtod
+++ b/modules/xstrtod
@@ -13,6 +13,7 @@ configure.ac:
 gl_XSTRTOD
 
 Makefile.am:
+EXTRA_DIST += xstrtod.h
 
 Include:
 "xstrtod.h"
diff --git a/modules/xstrtol b/modules/xstrtol
index 128d6bd26a..d4df30cfee 100644
--- a/modules/xstrtol
+++ b/modules/xstrtol
@@ -17,7 +17,7 @@ configure.ac:
 gl_XSTRTOL
 
 Makefile.am:
-lib_SOURCES += xstrtol.h
+EXTRA_DIST += xstrtol.h
 
 Include:
 "xstrtol.h"
diff --git a/modules/xstrtold b/modules/xstrtold
index a29769c8f1..4db717fa68 100644
--- a/modules/xstrtold
+++ b/modules/xstrtold
@@ -14,6 +14,7 @@ configure.ac:
 gl_XSTRTOLD
 
 Makefile.am:
+EXTRA_DIST += xstrtod.c xstrtod.h
 
 Include:
 "xstrtod.h"
diff --git a/modules/yesno b/modules/yesno
index 2b9584579d..b94f467314 100644
--- a/modules/yesno
+++ b/modules/yesno
@@ -16,6 +16,7 @@ configure.ac:
 gl_YESNO
 
 Makefile.am:
+EXTRA_DIST += yesno.h
 
 Include:
 "yesno.h"