gnulib-tool now synthesizes the EXTRA_DIST line.

215 files changed, 1 insertions, 218 deletions

diff --git a/modules/acl b/modules/acl
index 90a7e77713..26a6f68a5e 100644
--- a/modules/acl
+++ b/modules/acl
@@ -14,7 +14,6 @@ configure.ac:
 AC_FUNC_ACL
 
 Makefile.am:
-EXTRA_DIST += acl.h acl.c
 
 Include:
 "acl.h"
diff --git a/modules/alloca-opt b/modules/alloca-opt
index 895741bbe1..d6318c94b9 100644
--- a/modules/alloca-opt
+++ b/modules/alloca-opt
@@ -14,7 +14,6 @@ gl_FUNC_ALLOCA
 
 Makefile.am:
 BUILT_SOURCES += $(ALLOCA_H)
-EXTRA_DIST += alloca_.h
 
 # We need the following in order to create <alloca.h> when the system
 # doesn't have one that works with the given compiler.
diff --git a/modules/allocsa b/modules/allocsa
index ef154693b1..cb767d1acd 100644
--- a/modules/allocsa
+++ b/modules/allocsa
@@ -18,7 +18,6 @@ gl_ALLOCSA
 
 Makefile.am:
 lib_SOURCES += allocsa.h allocsa.c
-EXTRA_DIST += allocsa.valgrind
 
 Include:
 #include "allocsa.h"
diff --git a/modules/arcfour b/modules/arcfour
index c3fbc0f7a7..a37ec0b7f7 100644
--- a/modules/arcfour
+++ b/modules/arcfour
@@ -13,7 +13,6 @@ configure.ac:
 gl_ARCFOUR
 
 Makefile.am:
-EXTRA_DIST += arcfour.h arcfour.c
 
 Include:
 "arcfour.h"
diff --git a/modules/arctwo b/modules/arctwo
index 977a1f71c8..558922278f 100644
--- a/modules/arctwo
+++ b/modules/arctwo
@@ -13,7 +13,6 @@ configure.ac:
 gl_ARCTWO
 
 Makefile.am:
-EXTRA_DIST += arctwo.h arctwo.c
 
 Include:
 "arctwo.h"
diff --git a/modules/argmatch b/modules/argmatch
index a3d2c7e56e..fade39096e 100644
--- a/modules/argmatch
+++ b/modules/argmatch
@@ -20,7 +20,6 @@ configure.ac:
 gl_ARGMATCH
 
 Makefile.am:
-EXTRA_DIST += argmatch.h argmatch.c
 
 Include:
 "argmatch.h"
diff --git a/modules/argz b/modules/argz
index 1e2c53e822..30b474f5fb 100644
--- a/modules/argz
+++ b/modules/argz
@@ -13,7 +13,6 @@ gl_FUNC_ARGZ
 
 Makefile.am:
 BUILT_SOURCES += $(ARGZ_H)
-EXTRA_DIST += argz_.h argz.c
 
 # We need the following in order to create <argz.h> when the system
 # doesn't have one that works with the given compiler.
diff --git a/modules/atexit b/modules/atexit
index 178e019abe..adce14dc38 100644
--- a/modules/atexit
+++ b/modules/atexit
@@ -11,7 +11,6 @@ configure.ac:
 gl_FUNC_ATEXIT
 
 Makefile.am:
-EXTRA_DIST += atexit.c
 
 Include:
 <stdlib.h>
diff --git a/modules/backupfile b/modules/backupfile
index a43020050b..bb140b5882 100644
--- a/modules/backupfile
+++ b/modules/backupfile
@@ -18,7 +18,6 @@ configure.ac:
 gl_BACKUPFILE
 
 Makefile.am:
-EXTRA_DIST += backupfile.h backupfile.c
 
 Include:
 "backupfile.h"
diff --git a/modules/byteswap b/modules/byteswap
index d76542d777..52659d2c96 100644
--- a/modules/byteswap
+++ b/modules/byteswap
@@ -12,7 +12,6 @@ gl_BYTESWAP
 
 Makefile.am:
 BUILT_SOURCES += $(BYTESWAP_H)
-EXTRA_DIST += byteswap_.h
 
 # We need the following in order to create <byteswap.h> when the system
 # doesn't have one.
diff --git a/modules/c-strtod b/modules/c-strtod
index 8019ac4227..f82a98863e 100644
--- a/modules/c-strtod
+++ b/modules/c-strtod
@@ -14,7 +14,6 @@ configure.ac:
 gl_C_STRTOD
 
 Makefile.am:
-EXTRA_DIST += c-strtod.h c-strtod.c
 
 Include:
 "c-strtod.h"
diff --git a/modules/c-strtold b/modules/c-strtold
index a4288373b7..d9d5a18ce1 100644
--- a/modules/c-strtold
+++ b/modules/c-strtold
@@ -15,7 +15,6 @@ configure.ac:
 gl_C_STRTOLD
 
 Makefile.am:
-EXTRA_DIST += c-strtod.h c-strtod.c c-strtold.c
 
 Include:
 "c-strtod.h"
diff --git a/modules/calloc b/modules/calloc
index 630ae928b6..2d3bfc2766 100644
--- a/modules/calloc
+++ b/modules/calloc
@@ -11,7 +11,6 @@ configure.ac:
 AC_FUNC_CALLOC
 
 Makefile.am:
-EXTRA_DIST += calloc.c
 
 Include:
 <stdlib.h>
diff --git a/modules/canon-host b/modules/canon-host
index 8266169b9d..581266501c 100644
--- a/modules/canon-host
+++ b/modules/canon-host
@@ -15,7 +15,6 @@ configure.ac:
 gl_CANON_HOST
 
 Makefile.am:
-EXTRA_DIST += canon-host.h canon-host.c
 
 Include:
 #include "canon-host.h"
diff --git a/modules/canonicalize b/modules/canonicalize
index e8c3966f33..3a10f4db09 100644
--- a/modules/canonicalize
+++ b/modules/canonicalize
@@ -19,7 +19,6 @@ configure.ac:
 AC_FUNC_CANONICALIZE_FILE_NAME
 
 Makefile.am:
-EXTRA_DIST += canonicalize.h canonicalize.c pathmax.h
 
 Include:
 "canonicalize.h"
diff --git a/modules/chdir-long b/modules/chdir-long
index 1f276ec9ae..420c93760d 100644
--- a/modules/chdir-long
+++ b/modules/chdir-long
@@ -17,7 +17,6 @@ configure.ac:
 gl_FUNC_CHDIR_LONG
 
 Makefile.am:
-EXTRA_DIST += chdir-long.h chdir-long.c
 
 Include:
 "chdir-long.h"
diff --git a/modules/chdir-safer b/modules/chdir-safer
index 94cd5b9590..0ae0a7add3 100644
--- a/modules/chdir-safer
+++ b/modules/chdir-safer
@@ -15,7 +15,6 @@ configure.ac:
 gl_CHDIR_SAFER
 
 Makefile.am:
-EXTRA_DIST += chdir-safer.h chdir-safer.c
 
 Include:
 "chdir-safer.h"
diff --git a/modules/check-version b/modules/check-version
index fc8cd2b201..bbde4f9e59 100644
--- a/modules/check-version
+++ b/modules/check-version
@@ -13,7 +13,6 @@ configure.ac:
 gl_CHECK_VERSION
 
 Makefile.am:
-EXTRA_DIST += check-version.h check-version.c
 
 Include:
 "check-version.h"
diff --git a/modules/chown b/modules/chown
index ba40cfd6e0..2a970076ee 100644
--- a/modules/chown
+++ b/modules/chown
@@ -13,7 +13,6 @@ configure.ac:
 gl_FUNC_CHOWN
 
 Makefile.am:
-EXTRA_DIST += chown.c fchown-stub.c
 
 Include:
 <unistd.h>
diff --git a/modules/cloexec b/modules/cloexec
index ea6632f531..60c04c584b 100644
--- a/modules/cloexec
+++ b/modules/cloexec
@@ -13,7 +13,6 @@ configure.ac:
 gl_CLOEXEC
 
 Makefile.am:
-EXTRA_DIST += cloexec.h cloexec.c
 
 Include:
 "cloexec.h"
diff --git a/modules/close-stream b/modules/close-stream
index fcec59fd73..75f96f8208 100644
--- a/modules/close-stream
+++ b/modules/close-stream
@@ -14,7 +14,6 @@ configure.ac:
 gl_CLOSE_STREAM
 
 Makefile.am:
-EXTRA_DIST += close-stream.h close-stream.c
 
 Include:
 "close-stream.h"
diff --git a/modules/closeout b/modules/closeout
index 2516bf46d3..4480c7f3ad 100644
--- a/modules/closeout
+++ b/modules/closeout
@@ -17,7 +17,6 @@ configure.ac:
 gl_CLOSEOUT
 
 Makefile.am:
-EXTRA_DIST += closeout.h closeout.c
 
 Include:
 "closeout.h"
diff --git a/modules/crc b/modules/crc
index a39c5174da..d2dccbb1ae 100644
--- a/modules/crc
+++ b/modules/crc
@@ -13,7 +13,6 @@ configure.ac:
 gl_CRC
 
 Makefile.am:
-EXTRA_DIST += crc.h crc.c
 
 Include:
 "crc.h"
diff --git a/modules/csharpexec b/modules/csharpexec
index d86d268711..61fcb673c9 100644
--- a/modules/csharpexec
+++ b/modules/csharpexec
@@ -27,7 +27,6 @@ AC_CONFIG_FILES([csharpexec.sh:build-aux/csharpexec.sh.in])
 Makefile.am:
 DEFS += -DEXEEXT=\"$(EXEEXT)\"
 lib_SOURCES += csharpexec.h csharpexec.c
-EXTRA_DIST += classpath.h classpath.c
 
 Include:
 "csharpexec.h"
diff --git a/modules/cycle-check b/modules/cycle-check
index 986ac3e436..fe0e416b01 100644
--- a/modules/cycle-check
+++ b/modules/cycle-check
@@ -16,7 +16,6 @@ configure.ac:
 gl_CYCLE_CHECK
 
 Makefile.am:
-EXTRA_DIST += cycle-check.h cycle-check.c
 
 Include:
 "cycle-check.h"
diff --git a/modules/des b/modules/des
index 2915871de5..107796c0fa 100644
--- a/modules/des
+++ b/modules/des
@@ -14,7 +14,6 @@ configure.ac:
 gl_DES
 
 Makefile.am:
-EXTRA_DIST += des.h des.c
 
 Include:
 "des.h"
diff --git a/modules/dev-ino b/modules/dev-ino
index 78f8dbd4b9..517a5a47fc 100644
--- a/modules/dev-ino
+++ b/modules/dev-ino
@@ -9,7 +9,6 @@ Depends-on:
 configure.ac:
 
 Makefile.am:
-EXTRA_DIST += dev-ino.h
 
 Include:
 "dev-ino.h"
diff --git a/modules/dirfd b/modules/dirfd
index 9ae285548c..82cfb7a985 100644
--- a/modules/dirfd
+++ b/modules/dirfd
@@ -12,7 +12,6 @@ configure.ac:
 gl_FUNC_DIRFD
 
 Makefile.am:
-EXTRA_DIST += dirfd.h dirfd.c
 
 Include:
 "dirfd.h"
diff --git a/modules/dirname b/modules/dirname
index 67507e8c29..1a8f15855e 100644
--- a/modules/dirname
+++ b/modules/dirname
@@ -19,7 +19,6 @@ configure.ac:
 gl_DIRNAME
 
 Makefile.am:
-EXTRA_DIST += dirname.h dirname.c basename.c stripslash.c
 
 Include:
 "dirname.h"
diff --git a/modules/dup2 b/modules/dup2
index 4e1bc1a7ec..db3a1f71c7 100644
--- a/modules/dup2
+++ b/modules/dup2
@@ -11,7 +11,6 @@ configure.ac:
 gl_FUNC_DUP2
 
 Makefile.am:
-EXTRA_DIST += dup2.c
 
 Include:
 <unistd.h>
diff --git a/modules/eealloc b/modules/eealloc
index 253b93dab8..d9e9de3131 100644
--- a/modules/eealloc
+++ b/modules/eealloc
@@ -11,7 +11,6 @@ configure.ac:
 gl_EEALLOC
 
 Makefile.am:
-EXTRA_DIST += eealloc.h
 
 Include:
 #include <eealloc.h>
diff --git a/modules/error b/modules/error
index 628cf7ccd1..4e999ca88e 100644
--- a/modules/error
+++ b/modules/error
@@ -12,7 +12,6 @@ configure.ac:
 gl_ERROR
 
 Makefile.am:
-EXTRA_DIST += error.h error.c
 
 Include:
 "error.h"
diff --git a/modules/euidaccess b/modules/euidaccess
index 3dbb39b81e..1aecdd6ec4 100644
--- a/modules/euidaccess
+++ b/modules/euidaccess
@@ -14,7 +14,6 @@ configure.ac:
 gl_FUNC_EUIDACCESS
 
 Makefile.am:
-EXTRA_DIST += euidaccess.h euidaccess.c
 
 Include:
 "euidaccess.h"
diff --git a/modules/exclude b/modules/exclude
index f52a1f683e..78efea5d7e 100644
--- a/modules/exclude
+++ b/modules/exclude
@@ -17,7 +17,6 @@ configure.ac:
 gl_EXCLUDE
 
 Makefile.am:
-EXTRA_DIST += exclude.h exclude.c
 
 Include:
 "exclude.h"
diff --git a/modules/exitfail b/modules/exitfail
index 6c5dda43fd..26f5a9236d 100644
--- a/modules/exitfail
+++ b/modules/exitfail
@@ -13,7 +13,6 @@ configure.ac:
 gl_EXITFAIL
 
 Makefile.am:
-EXTRA_DIST += exitfail.h exitfail.c
 
 Include:
 "exitfail.h"
diff --git a/modules/fcntl b/modules/fcntl
index 350ca5002a..e53a4e9c93 100644
--- a/modules/fcntl
+++ b/modules/fcntl
@@ -14,7 +14,6 @@ gl_FCNTL_H
 
 Makefile.am:
 BUILT_SOURCES += $(FCNTL_H)
-EXTRA_DIST += fcntl_.h
 
 # We need the following in order to create <fcntl.h> when the system
 # doesn't have one that works with the given compiler.
diff --git a/modules/fcntl-safer b/modules/fcntl-safer
index 097d6c85f2..942b6b7ae9 100644
--- a/modules/fcntl-safer
+++ b/modules/fcntl-safer
@@ -15,7 +15,6 @@ configure.ac:
 gl_FCNTL_SAFER
 
 Makefile.am:
-EXTRA_DIST += fcntl--.h creat-safer.c fcntl-safer.h open-safer.c
 
 Include:
 "fcntl-safer.h"
diff --git a/modules/file-type b/modules/file-type
index f0d3a02313..9dc1763de9 100644
--- a/modules/file-type
+++ b/modules/file-type
@@ -14,7 +14,6 @@ configure.ac:
 gl_FILE_TYPE
 
 Makefile.am:
-EXTRA_DIST += file-type.h file-type.c
 
 Include:
 "file-type.h"
diff --git a/modules/fileblocks b/modules/fileblocks
index 614e5c4baf..e919301e79 100644
--- a/modules/fileblocks
+++ b/modules/fileblocks
@@ -11,7 +11,6 @@ configure.ac:
 gl_FILEBLOCKS
 
 Makefile.am:
-EXTRA_DIST += fileblocks.c
 
 Include:
 
diff --git a/modules/filemode b/modules/filemode
index 1cd2080337..02cd1215b7 100644
--- a/modules/filemode
+++ b/modules/filemode
@@ -15,7 +15,6 @@ configure.ac:
 gl_FILEMODE
 
 Makefile.am:
-EXTRA_DIST += filemode.h filemode.c
 
 Include:
 "filemode.h"
diff --git a/modules/filenamecat b/modules/filenamecat
index 94eebbc619..fb1786b843 100644
--- a/modules/filenamecat
+++ b/modules/filenamecat
@@ -15,7 +15,6 @@ configure.ac:
 gl_FILE_NAME_CONCAT
 
 Makefile.am:
-EXTRA_DIST += filenamecat.h filenamecat.c
 
 Include:
 "filenamecat.h"
diff --git a/modules/fnmatch b/modules/fnmatch
index 59a43a8c81..b4d21b027f 100644
--- a/modules/fnmatch
+++ b/modules/fnmatch
@@ -17,7 +17,6 @@ configure.ac:
 
 Makefile.am:
 BUILT_SOURCES += $(FNMATCH_H)
-EXTRA_DIST += fnmatch_.h fnmatch.c fnmatch_loop.c
 
 # We need the following in order to create <fnmatch.h> when the system
 # doesn't have one that supports the required API.
diff --git a/modules/fopen-safer b/modules/fopen-safer
index b059a4378b..137332e92b 100644
--- a/modules/fopen-safer
+++ b/modules/fopen-safer
@@ -14,7 +14,6 @@ configure.ac:
 gl_FOPEN_SAFER
 
 Makefile.am:
-EXTRA_DIST += stdio--.h stdio-safer.h fopen-safer.c
 
 Include:
 "stdio-safer.h"
diff --git a/modules/fpending b/modules/fpending
index fad7668dba..abdcadaf46 100644
--- a/modules/fpending
+++ b/modules/fpending
@@ -12,7 +12,6 @@ configure.ac:
 gl_FUNC_FPENDING
 
 Makefile.am:
-EXTRA_DIST += __fpending.h __fpending.c
 
 Include:
 "__fpending.h"
diff --git a/modules/fprintftime b/modules/fprintftime
index 5967e4138b..4333a31374 100644
--- a/modules/fprintftime
+++ b/modules/fprintftime
@@ -13,7 +13,6 @@ configure.ac:
 gl_FPRINTFTIME
 
 Makefile.am:
-EXTRA_DIST += fprintftime.h fprintftime.c
 
 Include:
 "fprintftime.h"
diff --git a/modules/free b/modules/free
index 12e16fd8f0..94b6a3a5ed 100644
--- a/modules/free
+++ b/modules/free
@@ -11,7 +11,6 @@ configure.ac:
 gl_FUNC_FREE
 
 Makefile.am:
-EXTRA_DIST += free.c
 
 Include:
 <stdlib.h>
diff --git a/modules/fsusage b/modules/fsusage
index d417b9115f..ae8a458464 100644
--- a/modules/fsusage
+++ b/modules/fsusage
@@ -15,7 +15,6 @@ configure.ac:
 gl_FSUSAGE
 
 Makefile.am:
-EXTRA_DIST += fsusage.h fsusage.c
 
 Include:
 "fsusage.h"
diff --git a/modules/ftruncate b/modules/ftruncate
index 95de449c61..ae445f32b8 100644
--- a/modules/ftruncate
+++ b/modules/ftruncate
@@ -11,7 +11,6 @@ configure.ac:
 gl_FUNC_FTRUNCATE
 
 Makefile.am:
-EXTRA_DIST += ftruncate.c
 
 Include:
 <unistd.h>
diff --git a/modules/fts b/modules/fts
index 999dcf9efd..a7295c6353 100644
--- a/modules/fts
+++ b/modules/fts
@@ -23,7 +23,6 @@ configure.ac:
 gl_FUNC_FTS
 
 Makefile.am:
-EXTRA_DIST += fts_.h fts.c fts-cycle.c
 
 Include:
 "fts_.h"
diff --git a/modules/gc b/modules/gc
index 3a054cb62e..f989b21254 100644
--- a/modules/gc
+++ b/modules/gc
@@ -18,7 +18,6 @@ if test $gl_cond_libtool = false; then
 fi
 
 Makefile.am:
-EXTRA_DIST += gc.h gc-libgcrypt.c gc-gnulib.c
 if GL_COND_LIBTOOL
 lib_LDFLAGS += $(LTLIBGCRYPT)
 endif
diff --git a/modules/gc-arcfour b/modules/gc-arcfour
index 5479fdaf79..99d9e1419b 100644
--- a/modules/gc-arcfour
+++ b/modules/gc-arcfour
@@ -15,7 +15,6 @@ configure.ac:
 gl_GC_ARCFOUR
 
 Makefile.am:
-EXTRA_DIST += arcfour.h
 
 Include:
 "gc.h"
diff --git a/modules/gc-des b/modules/gc-des
index 8789e6622c..4f1f230565 100644
--- a/modules/gc-des
+++ b/modules/gc-des
@@ -15,7 +15,6 @@ configure.ac:
 gl_GC_DES
 
 Makefile.am:
-EXTRA_DIST += des.h
 
 Include:
 "gc.h"
diff --git a/modules/gc-hmac-md5 b/modules/gc-hmac-md5
index dd9165390d..40917361b5 100644
--- a/modules/gc-hmac-md5
+++ b/modules/gc-hmac-md5
@@ -21,7 +21,6 @@ configure.ac:
 gl_GC_HMAC_MD5
 
 Makefile.am:
-EXTRA_DIST += memxor.h hmac.h md5.h
 
 Include:
 "gc.h"
diff --git a/modules/gc-hmac-sha1 b/modules/gc-hmac-sha1
index d8a7676fe9..67b72ddf4a 100644
--- a/modules/gc-hmac-sha1
+++ b/modules/gc-hmac-sha1
@@ -21,7 +21,6 @@ configure.ac:
 gl_GC_HMAC_SHA1
 
 Makefile.am:
-EXTRA_DIST += memxor.h hmac.h sha1.h
 
 Include:
 "gc.h"
diff --git a/modules/gc-md4 b/modules/gc-md4
index d106fb2191..bb9fe6f83e 100644
--- a/modules/gc-md4
+++ b/modules/gc-md4
@@ -15,7 +15,6 @@ configure.ac:
 gl_GC_MD4
 
 Makefile.am:
-EXTRA_DIST += md4.h
 
 Include:
 "gc.h"
diff --git a/modules/gc-pbkdf2-sha1 b/modules/gc-pbkdf2-sha1
index 2ac227824f..431e054208 100644
--- a/modules/gc-pbkdf2-sha1
+++ b/modules/gc-pbkdf2-sha1
@@ -13,7 +13,6 @@ configure.ac:
 gl_GC_PBKDF2_SHA1
 
 Makefile.am:
-EXTRA_DIST += gc-pbkdf2-sha1.c
 
 Include:
 "gc.h"
diff --git a/modules/gc-sha1 b/modules/gc-sha1
index 88cbc571d0..18ba02e6c0 100644
--- a/modules/gc-sha1
+++ b/modules/gc-sha1
@@ -15,7 +15,6 @@ configure.ac:
 gl_GC_SHA1
 
 Makefile.am:
-EXTRA_DIST += sha1.h
 
 Include:
 "gc.h"
diff --git a/modules/getaddrinfo b/modules/getaddrinfo
index f7e110ab0c..ff0d16e898 100644
--- a/modules/getaddrinfo
+++ b/modules/getaddrinfo
@@ -20,7 +20,6 @@ configure.ac:
 gl_GETADDRINFO
 
 Makefile.am:
-EXTRA_DIST += getaddrinfo.h getaddrinfo.c gai_strerror.c
 
 Include:
 "getaddrinfo.h"
diff --git a/modules/getcwd b/modules/getcwd
index 483d1b15b6..35c6412577 100644
--- a/modules/getcwd
+++ b/modules/getcwd
@@ -18,7 +18,6 @@ configure.ac:
 gl_FUNC_GETCWD
 
 Makefile.am:
-EXTRA_DIST += getcwd.h getcwd.c
 
 Include:
 "getcwd.h"
diff --git a/modules/getdate b/modules/getdate
index d04dc19b50..ae5584e50a 100644
--- a/modules/getdate
+++ b/modules/getdate
@@ -24,7 +24,7 @@ Makefile.am:
 lib_SOURCES += getdate.y
 BUILT_SOURCES += getdate.c
 MAINTAINERCLEANFILES += getdate.c
-EXTRA_DIST += getdate.c getdate.h
+EXTRA_DIST += getdate.c
 
 Include:
 "getdate.h"
diff --git a/modules/getdelim b/modules/getdelim
index 257c7b2d56..a635ccb6d3 100644
--- a/modules/getdelim
+++ b/modules/getdelim
@@ -12,7 +12,6 @@ configure.ac:
 gl_FUNC_GETDELIM
 
 Makefile.am:
-EXTRA_DIST += getdelim.h getdelim.c
 
 Include:
 "getdelim.h"
diff --git a/modules/getdomainname b/modules/getdomainname
index 69e2a93359..b69a1f26df 100644
--- a/modules/getdomainname
+++ b/modules/getdomainname
@@ -12,7 +12,6 @@ configure.ac:
 gl_FUNC_GETDOMAINNAME
 
 Makefile.am:
-EXTRA_DIST += getdomainname.h getdomainname.c
 
 Include:
 "getdomainname.h"
diff --git a/modules/getgroups b/modules/getgroups
index 94e5d6d005..16604f8f35 100644
--- a/modules/getgroups
+++ b/modules/getgroups
@@ -12,7 +12,6 @@ configure.ac:
 gl_FUNC_GETGROUPS
 
 Makefile.am:
-EXTRA_DIST += getgroups.c
 
 Include:
 <unistd.h>
diff --git a/modules/gethostname b/modules/gethostname
index fc46612468..7c1380764d 100644
--- a/modules/gethostname
+++ b/modules/gethostname
@@ -11,7 +11,6 @@ configure.ac:
 gl_FUNC_GETHOSTNAME
 
 Makefile.am:
-EXTRA_DIST += gethostname.c
 
 Include:
 
diff --git a/modules/gethrxtime b/modules/gethrxtime
index 92b2bccd96..2eea8b4002 100644
--- a/modules/gethrxtime
+++ b/modules/gethrxtime
@@ -17,7 +17,6 @@ configure.ac:
 gl_GETHRXTIME
 
 Makefile.am:
-EXTRA_DIST += xtime.h gethrxtime.c gethrxtime.h
 
 Include:
 #include "xtime.h"
diff --git a/modules/getline b/modules/getline
index 96ea2cf96f..0f2f43f5fe 100644
--- a/modules/getline
+++ b/modules/getline
@@ -13,7 +13,6 @@ configure.ac:
 gl_FUNC_GETLINE
 
 Makefile.am:
-EXTRA_DIST += getline.h getline.c
 
 Include:
 "getline.h"
diff --git a/modules/getloadavg b/modules/getloadavg
index 467c434bd2..bf306e427b 100644
--- a/modules/getloadavg
+++ b/modules/getloadavg
@@ -17,7 +17,6 @@ configure.ac:
 gl_GETLOADAVG([$gl_source_base])
 
 Makefile.am:
-EXTRA_DIST += getloadavg.c
 
 Include:
 
diff --git a/modules/getlogin_r b/modules/getlogin_r
index dede548788..84792502bf 100644
--- a/modules/getlogin_r
+++ b/modules/getlogin_r
@@ -14,7 +14,6 @@ configure.ac:
 gl_GETLOGIN_R
 
 Makefile.am:
-EXTRA_DIST += getlogin_r.h getlogin_r.c
 
 Include:
 "getlogin_r.h"
diff --git a/modules/getndelim2 b/modules/getndelim2
index 6bd69b3d42..972ee1a4cd 100644
--- a/modules/getndelim2
+++ b/modules/getndelim2
@@ -15,7 +15,6 @@ configure.ac:
 gl_GETNDELIM2
 
 Makefile.am:
-EXTRA_DIST += getndelim2.h getndelim2.c
 
 Include:
 "getndelim2.h"
diff --git a/modules/getopt b/modules/getopt
index e0b67b69fa..fa01d90d1d 100644
--- a/modules/getopt
+++ b/modules/getopt
@@ -17,7 +17,6 @@ gl_GETOPT
 
 Makefile.am:
 BUILT_SOURCES += $(GETOPT_H)
-EXTRA_DIST += getopt_.h getopt.c getopt1.c getopt_int.h
 
 # We need the following in order to create <getopt.h> when the system
 # doesn't have one that works with the given compiler.
diff --git a/modules/getpagesize b/modules/getpagesize
index 757b9bf695..888bb14569 100644
--- a/modules/getpagesize
+++ b/modules/getpagesize
@@ -11,7 +11,6 @@ configure.ac:
 gl_GETPAGESIZE
 
 Makefile.am:
-EXTRA_DIST += getpagesize.h
 
 Include:
 "getpagesize.h"
diff --git a/modules/getpass b/modules/getpass
index 6e2aa8a3e4..52fc1a3ee5 100644
--- a/modules/getpass
+++ b/modules/getpass
@@ -14,7 +14,6 @@ configure.ac:
 gl_FUNC_GETPASS
 
 Makefile.am:
-EXTRA_DIST += getpass.h getpass.c
 
 Include:
 "getpass.h"
diff --git a/modules/getpass-gnu b/modules/getpass-gnu
index f8ef5f92a6..af493f925f 100644
--- a/modules/getpass-gnu
+++ b/modules/getpass-gnu
@@ -14,7 +14,6 @@ configure.ac:
 gl_FUNC_GETPASS_GNU
 
 Makefile.am:
-EXTRA_DIST += getpass.h getpass.c
 
 Include:
 "getpass.h"
diff --git a/modules/getsubopt b/modules/getsubopt
index 21f718fb28..0ecc321bb1 100644
--- a/modules/getsubopt
+++ b/modules/getsubopt
@@ -13,7 +13,6 @@ configure.ac:
 gl_FUNC_GETSUBOPT
 
 Makefile.am:
-EXTRA_DIST += getsubopt.h getsubopt.c
 
 Include:
 "getsubopt.h"
diff --git a/modules/gettime b/modules/gettime
index e6745fa40c..f787a78a3d 100644
--- a/modules/gettime
+++ b/modules/gettime
@@ -16,7 +16,6 @@ configure.ac:
 gl_GETTIME
 
 Makefile.am:
-EXTRA_DIST += gettime.c
 
 Include:
 #include "timespec.h"
diff --git a/modules/gettimeofday b/modules/gettimeofday
index 82018f981d..b4874baed6 100644
--- a/modules/gettimeofday
+++ b/modules/gettimeofday
@@ -11,7 +11,6 @@ configure.ac:
 AC_FUNC_GETTIMEOFDAY_CLOBBER
 
 Makefile.am:
-EXTRA_DIST += gettimeofday.c
 
 Include:
 <sys/time.h>
diff --git a/modules/getugroups b/modules/getugroups
index 3a7a05da52..930f0bd72d 100644
--- a/modules/getugroups
+++ b/modules/getugroups
@@ -11,7 +11,6 @@ configure.ac:
 gl_GETUGROUPS
 
 Makefile.am:
-EXTRA_DIST += getugroups.c
 
 Include:
 
diff --git a/modules/getusershell b/modules/getusershell
index 4baf102f4a..8b64506152 100644
--- a/modules/getusershell
+++ b/modules/getusershell
@@ -13,7 +13,6 @@ configure.ac:
 gl_FUNC_GETUSERSHELL
 
 Makefile.am:
-EXTRA_DIST += getusershell.c
 
 Include:
 
diff --git a/modules/glob b/modules/glob
index f9b5c920be..9fc83e7fbd 100644
--- a/modules/glob
+++ b/modules/glob
@@ -25,7 +25,6 @@ gl_GLOB
 
 Makefile.am:
 BUILT_SOURCES += $(GLOB_H)
-EXTRA_DIST += glob_.h glob-libc.h glob.c
 
 # 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 0abecaa5c2..6432a4fdc3 100644
--- a/modules/group-member
+++ b/modules/group-member
@@ -14,7 +14,6 @@ configure.ac:
 gl_FUNC_GROUP_MEMBER
 
 Makefile.am:
-EXTRA_DIST += group-member.h group-member.c
 
 Include:
 "group-member.h"
diff --git a/modules/hard-locale b/modules/hard-locale
index 1c6815c4dd..2f9810adf9 100644
--- a/modules/hard-locale
+++ b/modules/hard-locale
@@ -14,7 +14,6 @@ configure.ac:
 gl_HARD_LOCALE
 
 Makefile.am:
-EXTRA_DIST += hard-locale.h hard-locale.c
 
 Include:
 "hard-locale.h"
diff --git a/modules/hash b/modules/hash
index c86c000f6f..05ac4402f9 100644
--- a/modules/hash
+++ b/modules/hash
@@ -14,7 +14,6 @@ configure.ac:
 gl_HASH
 
 Makefile.am:
-EXTRA_DIST += hash.h hash.c
 
 Include:
 "hash.h"
diff --git a/modules/hmac-md5 b/modules/hmac-md5
index 04d3a5f8cd..acfce4b4bd 100644
--- a/modules/hmac-md5
+++ b/modules/hmac-md5
@@ -14,7 +14,6 @@ configure.ac:
 gl_HMAC_MD5
 
 Makefile.am:
-EXTRA_DIST += hmac.h hmac-md5.c
 
 Include:
 "hmac.h"
diff --git a/modules/hmac-sha1 b/modules/hmac-sha1
index e54ab60909..9b630c5aea 100644
--- a/modules/hmac-sha1
+++ b/modules/hmac-sha1
@@ -14,7 +14,6 @@ configure.ac:
 gl_HMAC_SHA1
 
 Makefile.am:
-EXTRA_DIST += hmac.h hmac-sha1.c
 
 Include:
 "hmac.h"
diff --git a/modules/human b/modules/human
index cdec70f5fe..092253ff53 100644
--- a/modules/human
+++ b/modules/human
@@ -20,7 +20,6 @@ configure.ac:
 gl_HUMAN
 
 Makefile.am:
-EXTRA_DIST += human.h human.c
 
 Include:
 "human.h"
diff --git a/modules/idcache b/modules/idcache
index eb4ca73578..05923d0205 100644
--- a/modules/idcache
+++ b/modules/idcache
@@ -12,7 +12,6 @@ configure.ac:
 gl_IDCACHE
 
 Makefile.am:
-EXTRA_DIST += idcache.c
 
 Include:
 
diff --git a/modules/imaxabs b/modules/imaxabs
index a9b5790ad9..1b0b50c8bc 100644
--- a/modules/imaxabs
+++ b/modules/imaxabs
@@ -12,7 +12,6 @@ configure.ac:
 gl_FUNC_IMAXABS
 
 Makefile.am:
-EXTRA_DIST += imaxabs.c
 
 Include:
 <inttypes.h>
diff --git a/modules/imaxdiv b/modules/imaxdiv
index 9adcd7ee97..621d1f305a 100644
--- a/modules/imaxdiv
+++ b/modules/imaxdiv
@@ -12,7 +12,6 @@ configure.ac:
 gl_FUNC_IMAXDIV
 
 Makefile.am:
-EXTRA_DIST += imaxdiv.c
 
 Include:
 <inttypes.h>
diff --git a/modules/inet_ntop b/modules/inet_ntop
index 9719ba435b..c41474aab4 100644
--- a/modules/inet_ntop
+++ b/modules/inet_ntop
@@ -16,7 +16,6 @@ configure.ac:
 gl_INET_NTOP
 
 Makefile.am:
-EXTRA_DIST += inet_ntop.h inet_ntop.c
 
 License:
 LGPL
diff --git a/modules/inet_pton b/modules/inet_pton
index cada499246..c9a4fac326 100644
--- a/modules/inet_pton
+++ b/modules/inet_pton
@@ -16,7 +16,6 @@ configure.ac:
 gl_INET_PTON
 
 Makefile.am:
-EXTRA_DIST += inet_pton.h inet_pton.c
 
 License:
 LGPL
diff --git a/modules/intprops b/modules/intprops
index 2f09c85eb9..5d279434ae 100644
--- a/modules/intprops
+++ b/modules/intprops
@@ -9,7 +9,6 @@ Depends-on:
 configure.ac:
 
 Makefile.am:
-EXTRA_DIST += intprops.h
 
 Include:
 "intprops.h"
diff --git a/modules/inttostr b/modules/inttostr
index 03db568a96..658afb0e19 100644
--- a/modules/inttostr
+++ b/modules/inttostr
@@ -17,7 +17,6 @@ configure.ac:
 gl_INTTOSTR
 
 Makefile.am:
-EXTRA_DIST += imaxtostr.c inttostr.c inttostr.h offtostr.c umaxtostr.c
 
 Include:
 "inttostr.h"
diff --git a/modules/inttypes b/modules/inttypes
index fe2b0a7519..805702e766 100644
--- a/modules/inttypes
+++ b/modules/inttypes
@@ -15,7 +15,6 @@ gl_INTTYPES_H
 
 Makefile.am:
 BUILT_SOURCES += $(INTTYPES_H)
-EXTRA_DIST += inttypes_.h
 
 # We need the following in order to create <inttypes.h> when the system
 # doesn't have one that works with the given compiler.
diff --git a/modules/isapipe b/modules/isapipe
index 9431a7a6ee..927255cf3a 100644
--- a/modules/isapipe
+++ b/modules/isapipe
@@ -15,7 +15,6 @@ configure.ac:
 gl_ISAPIPE
 
 Makefile.am:
-EXTRA_DIST += isapipe.h isapipe.c
 
 Include:
 "isapipe.h"
diff --git a/modules/javaversion b/modules/javaversion
index 5822e1dc8f..8011077dde 100644
--- a/modules/javaversion
+++ b/modules/javaversion
@@ -20,7 +20,6 @@ configure.ac:
 
 Makefile.am:
 lib_SOURCES += javaversion.h javaversion.c
-EXTRA_DIST += javaversion.java javaversion.class
 pkgdata_DATA += javaversion.class
 
 Include:
diff --git a/modules/lchmod b/modules/lchmod
index d3767087d6..78d7829e27 100644
--- a/modules/lchmod
+++ b/modules/lchmod
@@ -11,7 +11,6 @@ configure.ac:
 gl_FUNC_LCHMOD
 
 Makefile.am:
-EXTRA_DIST += lchmod.h
 
 Include:
 "lchown.h"
diff --git a/modules/lchown b/modules/lchown
index b90b660a72..81d488a2b9 100644
--- a/modules/lchown
+++ b/modules/lchown
@@ -14,7 +14,6 @@ configure.ac:
 gl_FUNC_LCHOWN
 
 Makefile.am:
-EXTRA_DIST += lchown.h lchown.c
 
 Include:
 "lchown.h"
diff --git a/modules/localcharset b/modules/localcharset
index 5967553302..22abeeb5b3 100644
--- a/modules/localcharset
+++ b/modules/localcharset
@@ -19,7 +19,6 @@ gl_LOCALCHARSET
 
 Makefile.am:
 lib_SOURCES += localcharset.h localcharset.c
-EXTRA_DIST += config.charset ref-add.sin ref-del.sin
 
 # We need the following in order to install a simple file in $(libdir)
 # which is shared with other installed packages. We use a list of referencing
diff --git a/modules/long-options b/modules/long-options
index c502001911..8b880817a2 100644
--- a/modules/long-options
+++ b/modules/long-options
@@ -13,7 +13,6 @@ configure.ac:
 gl_LONG_OPTIONS
 
 Makefile.am:
-EXTRA_DIST += long-options.h long-options.c
 
 Include:
 "long-options.h"
diff --git a/modules/lstat b/modules/lstat
index d60d230edf..6b72505c6c 100644
--- a/modules/lstat
+++ b/modules/lstat
@@ -13,7 +13,6 @@ configure.ac:
 gl_FUNC_LSTAT
 
 Makefile.am:
-EXTRA_DIST += lstat.h lstat.c
 
 Include:
 "lstat.h"
diff --git a/modules/malloc b/modules/malloc
index 1189aa44f6..4779af9b9a 100644
--- a/modules/malloc
+++ b/modules/malloc
@@ -10,7 +10,6 @@ configure.ac:
 AC_FUNC_MALLOC
 
 Makefile.am:
-EXTRA_DIST += malloc.c
 
 Include:
 <stdlib.h>
diff --git a/modules/mathl b/modules/mathl
index 3efb726f14..1d6fdd9e6d 100644
--- a/modules/mathl
+++ b/modules/mathl
@@ -28,8 +28,6 @@ gl_FUNC_LONG_DOUBLE_MATH
 
 Makefile.am:
 noinst_HEADERS += mathl.h trigl.h trigl.c sincosl.c
-EXTRA_DIST += floorl.c ceill.c sqrtl.c frexpl.c ldexpl.c asinl.c acosl.c atanl.c \
-              logl.c expl.c tanl.c sinl.c cosl.c
 
 Include:
 "mathl.h"
diff --git a/modules/mbchar b/modules/mbchar
index a40f9282cd..9b4b9414ed 100644
--- a/modules/mbchar
+++ b/modules/mbchar
@@ -14,7 +14,6 @@ configure.ac:
 gl_MBCHAR
 
 Makefile.am:
-EXTRA_DIST += mbchar.h mbchar.c
 
 Include:
 #if HAVE_WCHAR_H
diff --git a/modules/md2 b/modules/md2
index 7fbf6e1b05..f3fa344e01 100644
--- a/modules/md2
+++ b/modules/md2
@@ -13,7 +13,6 @@ configure.ac:
 gl_MD2
 
 Makefile.am:
-EXTRA_DIST += md2.h md2.c
 
 Include:
 "md2.h"
diff --git a/modules/md4 b/modules/md4
index 6c42f9b161..9ecfd616d6 100644
--- a/modules/md4
+++ b/modules/md4
@@ -13,7 +13,6 @@ configure.ac:
 gl_MD4
 
 Makefile.am:
-EXTRA_DIST += md4.h md4.c
 
 Include:
 "md4.h"
diff --git a/modules/md5 b/modules/md5
index 6a44784946..250c94f628 100644
--- a/modules/md5
+++ b/modules/md5
@@ -13,7 +13,6 @@ configure.ac:
 gl_MD5
 
 Makefile.am:
-EXTRA_DIST += md5.h md5.c
 
 Include:
 "md5.h"
diff --git a/modules/memcasecmp b/modules/memcasecmp
index c83e47b035..c3847913d1 100644
--- a/modules/memcasecmp
+++ b/modules/memcasecmp
@@ -12,7 +12,6 @@ configure.ac:
 gl_MEMCASECMP
 
 Makefile.am:
-EXTRA_DIST += memcasecmp.h memcasecmp.c
 
 Include:
 "memcasecmp.h"
diff --git a/modules/memchr b/modules/memchr
index 079c925864..3b18a1c5fa 100644
--- a/modules/memchr
+++ b/modules/memchr
@@ -11,7 +11,6 @@ configure.ac:
 gl_FUNC_MEMCHR
 
 Makefile.am:
-EXTRA_DIST += memchr.c
 
 Include:
 <string.h>
diff --git a/modules/memcmp b/modules/memcmp
index 6ca22b9902..fc85d852f4 100644
--- a/modules/memcmp
+++ b/modules/memcmp
@@ -11,7 +11,6 @@ configure.ac:
 gl_FUNC_MEMCMP
 
 Makefile.am:
-EXTRA_DIST += memcmp.c
 
 Include:
 <string.h>
diff --git a/modules/memcoll b/modules/memcoll
index dd2a392e4a..8792a7f6f0 100644
--- a/modules/memcoll
+++ b/modules/memcoll
@@ -12,7 +12,6 @@ configure.ac:
 gl_MEMCOLL
 
 Makefile.am:
-EXTRA_DIST += memcoll.h memcoll.c
 
 Include:
 "memcoll.h"
diff --git a/modules/memcpy b/modules/memcpy
index 4e15fbede9..d160dd2612 100644
--- a/modules/memcpy
+++ b/modules/memcpy
@@ -11,7 +11,6 @@ configure.ac:
 gl_FUNC_MEMCPY
 
 Makefile.am:
-EXTRA_DIST += memcpy.c
 
 Include:
 <string.h>
diff --git a/modules/memmem b/modules/memmem
index fc2fcc0981..a6b7b93ea4 100644
--- a/modules/memmem
+++ b/modules/memmem
@@ -12,7 +12,6 @@ configure.ac:
 gl_FUNC_MEMMEM
 
 Makefile.am:
-EXTRA_DIST += memmem.h memmem.c
 
 Include:
 "memmem.h"
diff --git a/modules/memmove b/modules/memmove
index 6859ba9f8f..6588c43130 100644
--- a/modules/memmove
+++ b/modules/memmove
@@ -11,7 +11,6 @@ configure.ac:
 gl_FUNC_MEMMOVE
 
 Makefile.am:
-EXTRA_DIST += memmove.c
 
 Include:
 <string.h>
diff --git a/modules/mempcpy b/modules/mempcpy
index b9214c6d91..da13ec831e 100644
--- a/modules/mempcpy
+++ b/modules/mempcpy
@@ -12,7 +12,6 @@ configure.ac:
 gl_FUNC_MEMPCPY
 
 Makefile.am:
-EXTRA_DIST += mempcpy.h mempcpy.c
 
 Include:
 "mempcpy.h"
diff --git a/modules/memrchr b/modules/memrchr
index 238a462e4d..618c389517 100644
--- a/modules/memrchr
+++ b/modules/memrchr
@@ -12,7 +12,6 @@ configure.ac:
 gl_FUNC_MEMRCHR
 
 Makefile.am:
-EXTRA_DIST += memrchr.h memrchr.c
 
 Include:
 "memrchr.h"
diff --git a/modules/memset b/modules/memset
index aadc47bd38..e9a86039c6 100644
--- a/modules/memset
+++ b/modules/memset
@@ -11,7 +11,6 @@ configure.ac:
 gl_FUNC_MEMSET
 
 Makefile.am:
-EXTRA_DIST += memset.c
 
 Include:
 <string.h>
diff --git a/modules/memxor b/modules/memxor
index 03b784b292..2fdcb3e4af 100644
--- a/modules/memxor
+++ b/modules/memxor
@@ -12,7 +12,6 @@ configure.ac:
 gl_MEMXOR
 
 Makefile.am:
-EXTRA_DIST += memxor.h memxor.c
 
 Include:
 "memxor.h"
diff --git a/modules/mkancesdirs b/modules/mkancesdirs
index 353b612764..22a6cc675d 100644
--- a/modules/mkancesdirs
+++ b/modules/mkancesdirs
@@ -16,7 +16,6 @@ configure.ac:
 gl_MKANCESDIRS
 
 Makefile.am:
-EXTRA_DIST += mkancesdirs.h mkancesdirs.c
 
 Include:
 "mkancesdirs.h"
diff --git a/modules/mkdir b/modules/mkdir
index 54bea3c90e..2871a4a808 100644
--- a/modules/mkdir
+++ b/modules/mkdir
@@ -13,7 +13,6 @@ configure.ac:
 gl_FUNC_MKDIR_TRAILING_SLASH
 
 Makefile.am:
-EXTRA_DIST += mkdir.c
 
 Include:
 <sys/stat.h>
diff --git a/modules/mkdir-p b/modules/mkdir-p
index 8a62a67701..f17ead01f4 100644
--- a/modules/mkdir-p
+++ b/modules/mkdir-p
@@ -24,7 +24,6 @@ configure.ac:
 gl_MKDIR_PARENTS
 
 Makefile.am:
-EXTRA_DIST += dirchownmod.c dirchownmod.h mkdir-p.c mkdir-p.h
 
 Include:
 "mkdir-p.h"
diff --git a/modules/mkdtemp b/modules/mkdtemp
index 9fe4851c9b..b9e32389c6 100644
--- a/modules/mkdtemp
+++ b/modules/mkdtemp
@@ -14,7 +14,6 @@ configure.ac:
 gt_FUNC_MKDTEMP
 
 Makefile.am:
-EXTRA_DIST += mkdtemp.h mkdtemp.c
 
 Include:
 "mkdtemp.h"
diff --git a/modules/mkstemp b/modules/mkstemp
index 301d8298bd..7d0173521d 100644
--- a/modules/mkstemp
+++ b/modules/mkstemp
@@ -17,7 +17,6 @@ configure.ac:
 gl_FUNC_MKSTEMP
 
 Makefile.am:
-EXTRA_DIST += mkstemp.h mkstemp.c tempname.c
 
 Include:
 "mkstemp.h"
diff --git a/modules/mktime b/modules/mktime
index d4c0f03906..39312756e3 100644
--- a/modules/mktime
+++ b/modules/mktime
@@ -12,7 +12,6 @@ configure.ac:
 gl_FUNC_MKTIME
 
 Makefile.am:
-EXTRA_DIST += mktime.c
 
 Include:
 <time.h>
diff --git a/modules/modechange b/modules/modechange
index 953963d4da..4c3397c015 100644
--- a/modules/modechange
+++ b/modules/modechange
@@ -15,7 +15,6 @@ configure.ac:
 gl_MODECHANGE
 
 Makefile.am:
-EXTRA_DIST += modechange.h modechange.c
 
 Include:
 "modechange.h"
diff --git a/modules/mountlist b/modules/mountlist
index 02c43fd4b1..ce5342cb05 100644
--- a/modules/mountlist
+++ b/modules/mountlist
@@ -16,7 +16,6 @@ configure.ac:
 gl_MOUNTLIST
 
 Makefile.am:
-EXTRA_DIST += mountlist.h mountlist.c
 
 Include:
 "mountlist.h"
diff --git a/modules/nanosleep b/modules/nanosleep
index e70b456328..917808c93c 100644
--- a/modules/nanosleep
+++ b/modules/nanosleep
@@ -15,7 +15,6 @@ configure.ac:
 gl_FUNC_NANOSLEEP
 
 Makefile.am:
-EXTRA_DIST += nanosleep.c
 
 Include:
 <time.h>
diff --git a/modules/obstack b/modules/obstack
index ee3bd996b5..af12846b95 100644
--- a/modules/obstack
+++ b/modules/obstack
@@ -16,7 +16,6 @@ AC_FUNC_OBSTACK
 dnl Note: AC_FUNC_OBSTACK does AC_LIBSOURCES([obstack.h, obstack.c]).
 
 Makefile.am:
-EXTRA_DIST += obstack.h obstack.c
 
 Include:
 "obstack.h"
diff --git a/modules/openat b/modules/openat
index cefa5f4bf0..c14e7310ee 100644
--- a/modules/openat
+++ b/modules/openat
@@ -27,8 +27,6 @@ configure.ac:
 gl_FUNC_OPENAT
 
 Makefile.am:
-EXTRA_DIST += at-func.c fchmodat.c mkdirat.c \
-              openat.c openat.h openat-die.c openat-priv.h openat-proc.c
 
 Include:
 "openat.h"
diff --git a/modules/pagealign_alloc b/modules/pagealign_alloc
index b83cce9c8e..78e6d708cb 100644
--- a/modules/pagealign_alloc
+++ b/modules/pagealign_alloc
@@ -19,7 +19,6 @@ configure.ac:
 gl_PAGEALIGN_ALLOC
 
 Makefile.am:
-EXTRA_DIST += pagealign_alloc.h pagealign_alloc.c
 
 Include:
 #include "pagealign_alloc.h"
diff --git a/modules/pathmax b/modules/pathmax
index 684bcf84c2..3ceadf68d4 100644
--- a/modules/pathmax
+++ b/modules/pathmax
@@ -11,7 +11,6 @@ configure.ac:
 gl_PATHMAX
 
 Makefile.am:
-EXTRA_DIST += pathmax.h
 
 Include:
 "pathmax.h"
diff --git a/modules/physmem b/modules/physmem
index 7b69c7c985..3cf13c0aed 100644
--- a/modules/physmem
+++ b/modules/physmem
@@ -12,7 +12,6 @@ configure.ac:
 gl_PHYSMEM
 
 Makefile.am:
-EXTRA_DIST += physmem.h physmem.c
 
 Include:
 "physmem.h"
diff --git a/modules/poll b/modules/poll
index 7779e2a2d1..e539460a46 100644
--- a/modules/poll
+++ b/modules/poll
@@ -13,7 +13,6 @@ gl_FUNC_POLL
 
 Makefile.am:
 BUILT_SOURCES += $(POLL_H)
-EXTRA_DIST += poll_.h poll.c
 
 # We need the following in order to create <poll.h> when the system
 # doesn't have one.
diff --git a/modules/posixtm b/modules/posixtm
index 0041490836..06af4c8385 100644
--- a/modules/posixtm
+++ b/modules/posixtm
@@ -14,7 +14,6 @@ configure.ac:
 gl_POSIXTM
 
 Makefile.am:
-EXTRA_DIST += posixtm.h posixtm.c
 
 Include:
 "posixtm.h"
diff --git a/modules/posixver b/modules/posixver
index 7f25e51cce..84891cd548 100644
--- a/modules/posixver
+++ b/modules/posixver
@@ -13,7 +13,6 @@ configure.ac:
 gl_POSIXVER
 
 Makefile.am:
-EXTRA_DIST += posixver.h posixver.c
 
 Include:
 "posixver.h"
diff --git a/modules/putenv b/modules/putenv
index 6617aae282..f6e30b5bad 100644
--- a/modules/putenv
+++ b/modules/putenv
@@ -11,7 +11,6 @@ configure.ac:
 gl_FUNC_PUTENV
 
 Makefile.am:
-EXTRA_DIST += putenv.c
 
 Include:
 
diff --git a/modules/quote b/modules/quote
index 06c4cc26fc..6e26f69156 100644
--- a/modules/quote
+++ b/modules/quote
@@ -13,7 +13,6 @@ configure.ac:
 gl_QUOTE
 
 Makefile.am:
-EXTRA_DIST += quote.h quote.c
 
 Include:
 "quote.h"
diff --git a/modules/quotearg b/modules/quotearg
index ca4cc1c813..bc0b32fb63 100644
--- a/modules/quotearg
+++ b/modules/quotearg
@@ -17,7 +17,6 @@ configure.ac:
 gl_QUOTEARG
 
 Makefile.am:
-EXTRA_DIST += quotearg.h quotearg.c
 
 Include:
 "quotearg.h"
diff --git a/modules/raise b/modules/raise
index f4e97553e1..a303e29306 100644
--- a/modules/raise
+++ b/modules/raise
@@ -10,7 +10,6 @@ configure.ac:
 AC_REPLACE_FUNCS(raise)
 
 Makefile.am:
-EXTRA_DIST += raise.c
 
 Include:
 
diff --git a/modules/read-file b/modules/read-file
index 490863ed4e..1b7263eb32 100644
--- a/modules/read-file
+++ b/modules/read-file
@@ -12,7 +12,6 @@ configure.ac:
 gl_FUNC_READ_FILE
 
 Makefile.am:
-EXTRA_DIST += read-file.h read-file.c
 
 Include:
 "read-file.h"
diff --git a/modules/readline b/modules/readline
index dc324016c1..24bbec92d8 100644
--- a/modules/readline
+++ b/modules/readline
@@ -14,7 +14,6 @@ configure.ac:
 gl_FUNC_READLINE
 
 Makefile.am:
-EXTRA_DIST += readline.h readline.c
 
 Include:
 "readline.h"
diff --git a/modules/readlink b/modules/readlink
index 1cc2bf33e9..e2920e9a76 100644
--- a/modules/readlink
+++ b/modules/readlink
@@ -11,7 +11,6 @@ configure.ac:
 gl_FUNC_READLINK
 
 Makefile.am:
-EXTRA_DIST += readlink.c
 
 Include:
 
diff --git a/modules/readtokens b/modules/readtokens
index 4b88146e2d..9453de9972 100644
--- a/modules/readtokens
+++ b/modules/readtokens
@@ -14,7 +14,6 @@ configure.ac:
 gl_READTOKENS
 
 Makefile.am:
-EXTRA_DIST += readtokens.h readtokens.c
 
 Include:
 "readtokens.h"
diff --git a/modules/readutmp b/modules/readutmp
index f3e274ef71..8c4f84747d 100644
--- a/modules/readutmp
+++ b/modules/readutmp
@@ -15,7 +15,6 @@ configure.ac:
 gl_READUTMP
 
 Makefile.am:
-EXTRA_DIST += readutmp.h readutmp.c
 
 Include:
 "readutmp.h"
diff --git a/modules/realloc b/modules/realloc
index 67813d4aac..5aa68be1b9 100644
--- a/modules/realloc
+++ b/modules/realloc
@@ -10,7 +10,6 @@ configure.ac:
 AC_FUNC_REALLOC
 
 Makefile.am:
-EXTRA_DIST += realloc.c
 
 Include:
 <stdlib.h>
diff --git a/modules/regex b/modules/regex
index ee0ab026e4..5ca9a7f2d8 100644
--- a/modules/regex
+++ b/modules/regex
@@ -24,7 +24,6 @@ configure.ac:
 gl_REGEX
 
 Makefile.am:
-EXTRA_DIST += regex.h regex.c regex_internal.c regex_internal.h regexec.c regcomp.c
 
 Include:
 "regex.h"
diff --git a/modules/rename b/modules/rename
index 3bbfef0fbf..9eaea933ab 100644
--- a/modules/rename
+++ b/modules/rename
@@ -13,7 +13,6 @@ configure.ac:
 gl_FUNC_RENAME
 
 Makefile.am:
-EXTRA_DIST += rename.c
 
 Include:
 <stdio.h>
diff --git a/modules/rename-dest-slash b/modules/rename-dest-slash
index 9ab8718f36..d45fe5bcf6 100644
--- a/modules/rename-dest-slash
+++ b/modules/rename-dest-slash
@@ -13,7 +13,6 @@ configure.ac:
 gl_FUNC_RENAME_TRAILING_DEST_SLASH
 
 Makefile.am:
-EXTRA_DIST += rename-dest-slash.c
 
 Include:
 <stdio.h>
diff --git a/modules/rijndael b/modules/rijndael
index d1f82e4a35..21579bfc03 100644
--- a/modules/rijndael
+++ b/modules/rijndael
@@ -15,7 +15,6 @@ configure.ac:
 gl_RIJNDAEL
 
 Makefile.am:
-EXTRA_DIST += rijndael-alg-fst.c rijndael-alg-fst.h rijndael-api-fst.c rijndael-api-fst.h
 
 Include:
 "rijndael-alg-fst.h"
diff --git a/modules/rmdir b/modules/rmdir
index 39767c26b6..a67be2b69a 100644
--- a/modules/rmdir
+++ b/modules/rmdir
@@ -12,7 +12,6 @@ configure.ac:
 gl_FUNC_RMDIR
 
 Makefile.am:
-EXTRA_DIST += rmdir.c
 
 Include:
 <unistd.h>
diff --git a/modules/rpmatch b/modules/rpmatch
index 6e6218534e..9462372677 100644
--- a/modules/rpmatch
+++ b/modules/rpmatch
@@ -13,7 +13,6 @@ configure.ac:
 gl_FUNC_RPMATCH
 
 Makefile.am:
-EXTRA_DIST += rpmatch.c
 
 Include:
 
diff --git a/modules/safe-read b/modules/safe-read
index 3306375217..a2b3afa29d 100644
--- a/modules/safe-read
+++ b/modules/safe-read
@@ -13,7 +13,6 @@ configure.ac:
 gl_SAFE_READ
 
 Makefile.am:
-EXTRA_DIST += safe-read.h safe-read.c
 
 Include:
 "safe-read.h"
diff --git a/modules/safe-write b/modules/safe-write
index d78dd539d2..09d2d1dbaf 100644
--- a/modules/safe-write
+++ b/modules/safe-write
@@ -13,7 +13,6 @@ configure.ac:
 gl_SAFE_WRITE
 
 Makefile.am:
-EXTRA_DIST += safe-write.h safe-write.c
 
 Include:
 "safe-write.h"
diff --git a/modules/same b/modules/same
index 68363b4a8e..a3616d0f08 100644
--- a/modules/same
+++ b/modules/same
@@ -18,7 +18,6 @@ configure.ac:
 gl_SAME
 
 Makefile.am:
-EXTRA_DIST += same.h same.c
 
 Include:
 "same.h"
diff --git a/modules/same-inode b/modules/same-inode
index e0cc9a7ef0..8301b3d138 100644
--- a/modules/same-inode
+++ b/modules/same-inode
@@ -9,7 +9,6 @@ Depends-on:
 configure.ac:
 
 Makefile.am:
-EXTRA_DIST += same-inode.h
 
 Include:
 "same-inode.h"
diff --git a/modules/save-cwd b/modules/save-cwd
index 9d555a49e1..18c43b9ef7 100644
--- a/modules/save-cwd
+++ b/modules/save-cwd
@@ -16,7 +16,6 @@ configure.ac:
 gl_SAVE_CWD
 
 Makefile.am:
-EXTRA_DIST += save-cwd.h save-cwd.c
 
 Include:
 "save-cwd.h"
diff --git a/modules/savedir b/modules/savedir
index 0b90fafcfc..e781af76b2 100644
--- a/modules/savedir
+++ b/modules/savedir
@@ -14,7 +14,6 @@ configure.ac:
 gl_SAVEDIR
 
 Makefile.am:
-EXTRA_DIST += savedir.h savedir.c
 
 Include:
 "savedir.h"
diff --git a/modules/setenv b/modules/setenv
index 2419acfbc4..7f2027d48d 100644
--- a/modules/setenv
+++ b/modules/setenv
@@ -17,7 +17,6 @@ configure.ac:
 gt_FUNC_SETENV
 
 Makefile.am:
-EXTRA_DIST += setenv.h setenv.c unsetenv.c
 
 Include:
 "setenv.h"
diff --git a/modules/settime b/modules/settime
index abdeb57b11..fe523820c7 100644
--- a/modules/settime
+++ b/modules/settime
@@ -14,7 +14,6 @@ configure.ac:
 gl_SETTIME
 
 Makefile.am:
-EXTRA_DIST += settime.c
 
 Include:
 
diff --git a/modules/sha1 b/modules/sha1
index b3734c8ab7..6e85b813ce 100644
--- a/modules/sha1
+++ b/modules/sha1
@@ -13,7 +13,6 @@ configure.ac:
 gl_SHA1
 
 Makefile.am:
-EXTRA_DIST += sha1.h sha1.c
 
 Include:
 "sha1.h"
diff --git a/modules/sig2str b/modules/sig2str
index b909569f60..89d00cc63e 100644
--- a/modules/sig2str
+++ b/modules/sig2str
@@ -13,7 +13,6 @@ configure.ac:
 gl_FUNC_SIG2STR
 
 Makefile.am:
-EXTRA_DIST += sig2str.h sig2str.c
 
 Include:
 "sig2str.h"
diff --git a/modules/snprintf b/modules/snprintf
index cec8bdfd13..df606b7d9b 100644
--- a/modules/snprintf
+++ b/modules/snprintf
@@ -13,7 +13,6 @@ configure.ac:
 gl_FUNC_SNPRINTF
 
 Makefile.am:
-EXTRA_DIST += snprintf.h snprintf.c
 
 Include:
 "snprintf.h"
diff --git a/modules/stat-macros b/modules/stat-macros
index 1ce7917ab8..5132c2537f 100644
--- a/modules/stat-macros
+++ b/modules/stat-macros
@@ -11,7 +11,6 @@ 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 0e11b14dfe..666f4ed047 100644
--- a/modules/stat-time
+++ b/modules/stat-time
@@ -12,7 +12,6 @@ configure.ac:
 gl_STAT_TIME
 
 Makefile.am:
-EXTRA_DIST += stat-time.h
 
 Include:
 "stat-time.h"
diff --git a/modules/stdbool b/modules/stdbool
index 00e63c82fd..b8da55106a 100644
--- a/modules/stdbool
+++ b/modules/stdbool
@@ -13,7 +13,6 @@ AM_STDBOOL_H
 
 Makefile.am:
 BUILT_SOURCES += $(STDBOOL_H)
-EXTRA_DIST += stdbool_.h
 
 # We need the following in order to create <stdbool.h> when the system
 # doesn't have one that works.
diff --git a/modules/stdint b/modules/stdint
index d7b95aa303..611a55a774 100644
--- a/modules/stdint
+++ b/modules/stdint
@@ -20,7 +20,6 @@ gl_STDINT_H
 
 Makefile.am:
 BUILT_SOURCES += $(STDINT_H)
-EXTRA_DIST += stdint_.h
 
 # We need the following in order to create <stdint.h> when the system
 # doesn't have one that works with the given compiler.
diff --git a/modules/stdlib-safer b/modules/stdlib-safer
index 1a3df620c6..8f7cb3f000 100644
--- a/modules/stdlib-safer
+++ b/modules/stdlib-safer
@@ -15,7 +15,6 @@ configure.ac:
 gl_STDLIB_SAFER
 
 Makefile.am:
-EXTRA_DIST += stdlib--.h stdlib-safer.h mkstemp-safer.c
 
 Include:
 "stdlib-safer.h"
diff --git a/modules/stpcpy b/modules/stpcpy
index 398a315959..13a74df1fd 100644
--- a/modules/stpcpy
+++ b/modules/stpcpy
@@ -12,7 +12,6 @@ configure.ac:
 gl_FUNC_STPCPY
 
 Makefile.am:
-EXTRA_DIST += stpcpy.h stpcpy.c
 
 Include:
 "stpcpy.h"
diff --git a/modules/stpncpy b/modules/stpncpy
index 65ea0a03df..78f72a4b56 100644
--- a/modules/stpncpy
+++ b/modules/stpncpy
@@ -12,7 +12,6 @@ configure.ac:
 gl_FUNC_STPNCPY
 
 Makefile.am:
-EXTRA_DIST += stpncpy.h stpncpy.c
 
 Include:
 "stpncpy.h"
diff --git a/modules/strcase b/modules/strcase
index 23dfac71f2..7d5c026c1d 100644
--- a/modules/strcase
+++ b/modules/strcase
@@ -15,7 +15,6 @@ configure.ac:
 gl_STRCASE
 
 Makefile.am:
-EXTRA_DIST += strcase.h strcasecmp.c strncasecmp.c
 
 Include:
 "strcase.h"
diff --git a/modules/strcasestr b/modules/strcasestr
index 1980d94bc9..016a26bfa2 100644
--- a/modules/strcasestr
+++ b/modules/strcasestr
@@ -14,7 +14,6 @@ configure.ac:
 gl_FUNC_STRCASESTR
 
 Makefile.am:
-EXTRA_DIST += strcasestr.h strcasestr.c
 
 Include:
 "strcasestr.h"
diff --git a/modules/strchrnul b/modules/strchrnul
index 4f451a5590..4cd8698260 100644
--- a/modules/strchrnul
+++ b/modules/strchrnul
@@ -12,7 +12,6 @@ configure.ac:
 gl_FUNC_STRCHRNUL
 
 Makefile.am:
-EXTRA_DIST += strchrnul.h strchrnul.c
 
 Include:
 "strchrnul.h"
diff --git a/modules/strcspn b/modules/strcspn
index c7dcaf9fb6..a80c8527a1 100644
--- a/modules/strcspn
+++ b/modules/strcspn
@@ -11,7 +11,6 @@ configure.ac:
 gl_FUNC_STRCSPN
 
 Makefile.am:
-EXTRA_DIST += strcspn.c
 
 Include:
 <string.h>
diff --git a/modules/strdup b/modules/strdup
index 360c32e111..a42129962a 100644
--- a/modules/strdup
+++ b/modules/strdup
@@ -12,7 +12,6 @@ configure.ac:
 gl_FUNC_STRDUP
 
 Makefile.am:
-EXTRA_DIST += strdup.h strdup.c
 
 Include:
 "strdup.h"
diff --git a/modules/strerror b/modules/strerror
index aab397bd9b..f86dd709ff 100644
--- a/modules/strerror
+++ b/modules/strerror
@@ -11,7 +11,6 @@ configure.ac:
 gl_FUNC_STRERROR
 
 Makefile.am:
-EXTRA_DIST += strerror.c
 
 Include:
 <string.h>
diff --git a/modules/strftime b/modules/strftime
index 7bcc00736f..5f7ad6777e 100644
--- a/modules/strftime
+++ b/modules/strftime
@@ -16,7 +16,6 @@ configure.ac:
 gl_FUNC_GNU_STRFTIME
 
 Makefile.am:
-EXTRA_DIST += strftime.h strftime.c
 
 Include:
 "strftime.h"
diff --git a/modules/strndup b/modules/strndup
index 1472c20413..6b434ec1a4 100644
--- a/modules/strndup
+++ b/modules/strndup
@@ -13,7 +13,6 @@ configure.ac:
 gl_FUNC_STRNDUP
 
 Makefile.am:
-EXTRA_DIST += strndup.h strndup.c
 
 Include:
 "strndup.h"
diff --git a/modules/strnlen b/modules/strnlen
index e8bcda4d77..74f4c1af41 100644
--- a/modules/strnlen
+++ b/modules/strnlen
@@ -13,7 +13,6 @@ configure.ac:
 gl_FUNC_STRNLEN
 
 Makefile.am:
-EXTRA_DIST += strnlen.h strnlen.c
 
 Include:
 "strnlen.h"
diff --git a/modules/strpbrk b/modules/strpbrk
index 3c6eec105d..bad245443c 100644
--- a/modules/strpbrk
+++ b/modules/strpbrk
@@ -12,7 +12,6 @@ configure.ac:
 gl_FUNC_STRPBRK
 
 Makefile.am:
-EXTRA_DIST += strpbrk.h strpbrk.c
 
 Include:
 "strpbrk.h"
diff --git a/modules/strsep b/modules/strsep
index 5699e318e7..4fd75a007b 100644
--- a/modules/strsep
+++ b/modules/strsep
@@ -13,7 +13,6 @@ configure.ac:
 gl_FUNC_STRSEP
 
 Makefile.am:
-EXTRA_DIST += strsep.h strsep.c
 
 Include:
 "strsep.h"
diff --git a/modules/strstr b/modules/strstr
index 73cee5f03f..5867872699 100644
--- a/modules/strstr
+++ b/modules/strstr
@@ -14,7 +14,6 @@ configure.ac:
 gl_FUNC_STRSTR
 
 Makefile.am:
-EXTRA_DIST += strstr.h strstr.c
 
 Include:
 "strstr.h"
diff --git a/modules/strtod b/modules/strtod
index d2761fd7bc..4098b13641 100644
--- a/modules/strtod
+++ b/modules/strtod
@@ -12,7 +12,6 @@ gl_FUNC_STRTOD
 
 Makefile.am:
 LIBS += $(POW_LIB)
-EXTRA_DIST += strtod.c
 
 Include:
 <stdlib.h>
diff --git a/modules/strtoimax b/modules/strtoimax
index 93baec612f..4e6da27f9b 100644
--- a/modules/strtoimax
+++ b/modules/strtoimax
@@ -16,7 +16,6 @@ configure.ac:
 gl_FUNC_STRTOIMAX
 
 Makefile.am:
-EXTRA_DIST += strtoimax.c
 
 Include:
 
diff --git a/modules/strtok_r b/modules/strtok_r
index 6cdf908ac6..508b79d326 100644
--- a/modules/strtok_r
+++ b/modules/strtok_r
@@ -12,7 +12,6 @@ configure.ac:
 gl_FUNC_STRTOK_R
 
 Makefile.am:
-EXTRA_DIST += strtok_r.h strtok_r.c
 
 Include:
 "strtok_r.h"
diff --git a/modules/strtol b/modules/strtol
index d90c28e7f4..ad17152aea 100644
--- a/modules/strtol
+++ b/modules/strtol
@@ -11,7 +11,6 @@ configure.ac:
 gl_FUNC_STRTOL
 
 Makefile.am:
-EXTRA_DIST += strtol.c
 
 Include:
 <stdlib.h>
diff --git a/modules/strtoll b/modules/strtoll
index a5906285df..a25ebfaee7 100644
--- a/modules/strtoll
+++ b/modules/strtoll
@@ -13,7 +13,6 @@ configure.ac:
 gl_FUNC_STRTOLL
 
 Makefile.am:
-EXTRA_DIST += strtoll.c
 
 Include:
 <stdlib.h>
diff --git a/modules/strtoul b/modules/strtoul
index e69ce0300d..8cb6d66c48 100644
--- a/modules/strtoul
+++ b/modules/strtoul
@@ -12,7 +12,6 @@ configure.ac:
 gl_FUNC_STRTOUL
 
 Makefile.am:
-EXTRA_DIST += strtoul.c
 
 Include:
 <stdlib.h>
diff --git a/modules/strtoull b/modules/strtoull
index 931e1b2689..9ff6f68125 100644
--- a/modules/strtoull
+++ b/modules/strtoull
@@ -13,7 +13,6 @@ configure.ac:
 gl_FUNC_STRTOULL
 
 Makefile.am:
-EXTRA_DIST += strtoull.c
 
 Include:
 <stdlib.h>
diff --git a/modules/strtoumax b/modules/strtoumax
index 0624c49e25..169f28f022 100644
--- a/modules/strtoumax
+++ b/modules/strtoumax
@@ -16,7 +16,6 @@ configure.ac:
 gl_FUNC_STRTOUMAX
 
 Makefile.am:
-EXTRA_DIST += strtoumax.c
 
 Include:
 
diff --git a/modules/strverscmp b/modules/strverscmp
index 1d33b476b9..c6acf5bea6 100644
--- a/modules/strverscmp
+++ b/modules/strverscmp
@@ -12,7 +12,6 @@ configure.ac:
 gl_FUNC_STRVERSCMP
 
 Makefile.am:
-EXTRA_DIST += strverscmp.h strverscmp.c
 
 Include:
 "strverscmp.h"
diff --git a/modules/sys_socket b/modules/sys_socket
index 7700769dbd..47d113cdf0 100644
--- a/modules/sys_socket
+++ b/modules/sys_socket
@@ -13,7 +13,6 @@ gl_HEADER_SYS_SOCKET
 
 Makefile.am:
 BUILT_SOURCES += $(SYS_SOCKET_H)
-EXTRA_DIST += socket_.h
 
 # We need the following in order to create <sys/socket.h> when the system
 # doesn't have one that works with the given compiler.
diff --git a/modules/sys_stat b/modules/sys_stat
index 4a50c13401..3b8839f91f 100644
--- a/modules/sys_stat
+++ b/modules/sys_stat
@@ -13,7 +13,6 @@ gl_HEADER_SYS_STAT_H
 
 Makefile.am:
 BUILT_SOURCES += $(SYS_STAT_H)
-EXTRA_DIST += stat_.h
 
 # We need the following in order to create <sys/stat.h> when the system
 # has one that is incomplete.
diff --git a/modules/sysexits b/modules/sysexits
index 4ddacab94d..c979b9ede8 100644
--- a/modules/sysexits
+++ b/modules/sysexits
@@ -12,7 +12,6 @@ gl_SYSEXITS
 
 Makefile.am:
 BUILT_SOURCES += $(SYSEXITS_H)
-EXTRA_DIST += sysexit_.h
 
 # We need the following in order to create <sysexits.h> when the system
 # doesn't have one that works with the given compiler.
diff --git a/modules/time_r b/modules/time_r
index 7fdd72538c..96df2f7815 100644
--- a/modules/time_r
+++ b/modules/time_r
@@ -13,7 +13,6 @@ configure.ac:
 gl_TIME_R
 
 Makefile.am:
-EXTRA_DIST += time_r.h time_r.c
 
 Include:
 "time_r.h"
diff --git a/modules/timegm b/modules/timegm
index 90218bfd5a..b73d59a0c3 100644
--- a/modules/timegm
+++ b/modules/timegm
@@ -14,7 +14,6 @@ configure.ac:
 gl_FUNC_TIMEGM
 
 Makefile.am:
-EXTRA_DIST += timegm.h timegm.c
 
 Include:
 "timegm.h"
diff --git a/modules/timespec b/modules/timespec
index b1bfd322a5..edd2dfc7b7 100644
--- a/modules/timespec
+++ b/modules/timespec
@@ -12,7 +12,6 @@ configure.ac:
 gl_TIMESPEC
 
 Makefile.am:
-EXTRA_DIST += timespec.h
 
 Include:
 "timespec.h"
diff --git a/modules/tmpfile-safer b/modules/tmpfile-safer
index 2d284a78de..c81906332f 100644
--- a/modules/tmpfile-safer
+++ b/modules/tmpfile-safer
@@ -15,7 +15,6 @@ configure.ac:
 gl_TMPFILE_SAFER
 
 Makefile.am:
-EXTRA_DIST += stdio--.h stdio-safer.h tmpfile-safer.c
 
 Include:
 "stdio-safer.h"
diff --git a/modules/trim b/modules/trim
index 019a041d80..27cdefc363 100644
--- a/modules/trim
+++ b/modules/trim
@@ -12,7 +12,6 @@ mbiter
 configure.ac:
 
 Makefile.am:
-EXTRA_DIST += trim.h
 
 Include:
 #include "trim.h"
diff --git a/modules/unistd-safer b/modules/unistd-safer
index 5f3ca27e27..4f167e4b24 100644
--- a/modules/unistd-safer
+++ b/modules/unistd-safer
@@ -15,7 +15,6 @@ configure.ac:
 gl_UNISTD_SAFER
 
 Makefile.am:
-EXTRA_DIST += unistd--.h dup-safer.c fd-safer.c pipe-safer.c unistd-safer.h 
 
 Include:
 "unistd-safer.h"
diff --git a/modules/unlinkdir b/modules/unlinkdir
index e074e66dec..e8c68a6f6b 100644
--- a/modules/unlinkdir
+++ b/modules/unlinkdir
@@ -13,7 +13,6 @@ configure.ac:
 gl_UNLINKDIR
 
 Makefile.am:
-EXTRA_DIST += unlinkdir.h unlinkdir.c
 
 Include:
 "unlinkdir.h"
diff --git a/modules/unlocked-io b/modules/unlocked-io
index 2e9df639fa..000fe32c19 100644
--- a/modules/unlocked-io
+++ b/modules/unlocked-io
@@ -12,7 +12,6 @@ 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 e45eb6c78e..71fbe33b9b 100644
--- a/modules/userspec
+++ b/modules/userspec
@@ -20,7 +20,6 @@ configure.ac:
 gl_USERSPEC
 
 Makefile.am:
-EXTRA_DIST += inttostr.h userspec.c userspec.h
 
 Include:
 "userspec.h"
diff --git a/modules/utime b/modules/utime
index da66c2b8f2..dc5dd59b66 100644
--- a/modules/utime
+++ b/modules/utime
@@ -16,7 +16,6 @@ configure.ac:
 gl_FUNC_UTIME
 
 Makefile.am:
-EXTRA_DIST += utime.c
 
 Include:
 #if HAVE_UTIME_H
diff --git a/modules/utimecmp b/modules/utimecmp
index d21dc6b84d..a042393d78 100644
--- a/modules/utimecmp
+++ b/modules/utimecmp
@@ -21,7 +21,6 @@ configure.ac:
 gl_UTIMECMP
 
 Makefile.am:
-EXTRA_DIST += utimecmp.h utimecmp.c
 
 Include:
 "utimecmp.h"
diff --git a/modules/utimens b/modules/utimens
index 616ca3bed9..6cc5e31223 100644
--- a/modules/utimens
+++ b/modules/utimens
@@ -15,7 +15,6 @@ configure.ac:
 gl_UTIMENS
 
 Makefile.am:
-EXTRA_DIST += utimens.h utimens.c
 
 Include:
 "utimens.h"
diff --git a/modules/vasnprintf b/modules/vasnprintf
index 8637d8b53c..8ec2b4100a 100644
--- a/modules/vasnprintf
+++ b/modules/vasnprintf
@@ -28,8 +28,6 @@ configure.ac:
 gl_FUNC_VASNPRINTF
 
 Makefile.am:
-EXTRA_DIST += printf-args.h printf-args.c printf-parse.h printf-parse.c \
-              vasnprintf.h vasnprintf.c asnprintf.c
 
 Include:
 "vasnprintf.h"
diff --git a/modules/vasprintf b/modules/vasprintf
index 5e88b1f439..e78d89a115 100644
--- a/modules/vasprintf
+++ b/modules/vasprintf
@@ -14,7 +14,6 @@ configure.ac:
 gl_FUNC_VASPRINTF
 
 Makefile.am:
-EXTRA_DIST += vasprintf.h vasprintf.c asprintf.c
 
 Include:
 "vasprintf.h"
diff --git a/modules/vsnprintf b/modules/vsnprintf
index 5abd99a6ae..81510cb6be 100644
--- a/modules/vsnprintf
+++ b/modules/vsnprintf
@@ -15,7 +15,6 @@ configure.ac:
 gl_FUNC_VSNPRINTF
 
 Makefile.am:
-EXTRA_DIST += vsnprintf.h vsnprintf.c
 
 Include:
 "vsnprintf.h"
diff --git a/modules/xalloc b/modules/xalloc
index 770a8d6b20..5fdc405ae3 100644
--- a/modules/xalloc
+++ b/modules/xalloc
@@ -13,7 +13,6 @@ configure.ac:
 gl_XALLOC
 
 Makefile.am:
-EXTRA_DIST += xalloc.h xmalloc.c
 
 Include:
 "xalloc.h"
diff --git a/modules/xgetcwd b/modules/xgetcwd
index 23dc5962d0..a3ae23f5be 100644
--- a/modules/xgetcwd
+++ b/modules/xgetcwd
@@ -15,7 +15,6 @@ configure.ac:
 gl_XGETCWD
 
 Makefile.am:
-EXTRA_DIST += xgetcwd.h xgetcwd.c
 
 Include:
 "xgetcwd.h"
diff --git a/modules/xnanosleep b/modules/xnanosleep
index 800b43e107..fa063cb76a 100644
--- a/modules/xnanosleep
+++ b/modules/xnanosleep
@@ -16,7 +16,6 @@ configure.ac:
 gl_XNANOSLEEP
 
 Makefile.am:
-EXTRA_DIST += xnanosleep.h xnanosleep.c
 
 Include:
 "xnanosleep.h"
diff --git a/modules/xreadlink b/modules/xreadlink
index fc7ef17eb3..efd279f242 100644
--- a/modules/xreadlink
+++ b/modules/xreadlink
@@ -15,7 +15,6 @@ configure.ac:
 gl_XREADLINK
 
 Makefile.am:
-EXTRA_DIST += xreadlink.h xreadlink.c
 
 Include:
 "xreadlink.h"
diff --git a/modules/xstrtod b/modules/xstrtod
index 9d9d8bee18..095616a754 100644
--- a/modules/xstrtod
+++ b/modules/xstrtod
@@ -13,7 +13,6 @@ configure.ac:
 gl_XSTRTOD
 
 Makefile.am:
-EXTRA_DIST += xstrtod.h xstrtod.c
 
 Include:
 "xstrtod.h"
diff --git a/modules/xstrtol b/modules/xstrtol
index 7029e205e2..fb7c783a6f 100644
--- a/modules/xstrtol
+++ b/modules/xstrtol
@@ -17,7 +17,6 @@ configure.ac:
 gl_XSTRTOL
 
 Makefile.am:
-EXTRA_DIST += xstrtol.h xstrtol.c xstrtoul.c
 
 Include:
 "xstrtol.h"
diff --git a/modules/xstrtold b/modules/xstrtold
index be07c2f5e7..a29769c8f1 100644
--- a/modules/xstrtold
+++ b/modules/xstrtold
@@ -14,7 +14,6 @@ configure.ac:
 gl_XSTRTOLD
 
 Makefile.am:
-EXTRA_DIST += xstrtod.h xstrtod.c xstrtold.c
 
 Include:
 "xstrtod.h"
diff --git a/modules/yesno b/modules/yesno
index 9462157eb8..2b9584579d 100644
--- a/modules/yesno
+++ b/modules/yesno
@@ -16,7 +16,6 @@ configure.ac:
 gl_YESNO
 
 Makefile.am:
-EXTRA_DIST += yesno.h yesno.c
 
 Include:
 "yesno.h"