diff --git a/build-aux/.gitignore b/build-aux/.gitignore
index 9f9d26ad..0e20a8cf 100644
--- a/build-aux/.gitignore
+++ b/build-aux/.gitignore
@@ -1,4 +1,3 @@
-/ar-lib
 /compile
 /config.guess
 /config.rpath
@@ -6,10 +5,3 @@
 /depcomp
 /install-sh
 /missing
-
-/snippet/
-/snippet/_Noreturn.h
-/snippet/arg-nonnull.h
-/snippet/c++defs.h
-/snippet/unused-parameter.h
-/snippet/warn-on-use.h
diff --git a/lib/.gitignore b/lib/.gitignore
index 06657d58..dafa178f 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -1,14 +1,15 @@
-Makefile.am
+/Makefile.am
 
 /_Noreturn.h
+/arg-nonnull.h
 /attribute.h
 /btowc.c
+/c++defs.h
 /c-ctype.c
 /c-ctype.h
 /c-strcase.h
 /c-strcasecmp.c
 /c-strncasecmp.c
-/config.charset
 /crc.c
 /crc.h
 /free.c
@@ -42,8 +43,6 @@ Makefile.am
 /localcharset.c
 /localcharset.h
 /locale.in.h
-/localtime-buffer.c
-/localtime-buffer.h
 /mbrtowc-impl-utf8.h
 /mbrtowc-impl.h
 /mbrtowc.c
@@ -58,8 +57,6 @@ Makefile.am
 /memchr.c
 /memchr.valgrind
 /monetary.in.h
-/ref-add.sin
-/ref-del.sin
 /setlocale-lock.c
 /setlocale_null.c
 /setlocale_null.h
@@ -70,14 +67,12 @@ Makefile.am
 /stdio-write.c
 /stdio.in.h
 /stdlib.in.h
-/str-two-way.h
 /streq.h
 /striconv.c
 /striconv.h
 /string.in.h
 /strnlen1.c
 /strnlen1.h
-/strstr.c
 /sys_stat.in.h
 /sys_time.in.h
 /sys_types.in.h
@@ -87,6 +82,7 @@ Makefile.am
 /unistr.in.h
 /unitypes.in.h
 /verify.h
+/warn-on-use.h
 /wchar.in.h
 /wcrtomb.c
 /wcsdup-impl.h
@@ -97,23 +93,9 @@ Makefile.am
 /wctype-h.c
 /wctype.in.h
 /windows-initguard.h
-/windows-mutex.c
-/windows-mutex.h
-/windows-once.c
-/windows-once.h
-/windows-recmutex.c
-/windows-recmutex.h
-/windows-rwlock.c
-/windows-rwlock.h
 /wmemcpy-impl.h
 /wmemcpy.c
 
-/arg-nonnull.h
-/c++defs.h
-/charset.alias
-/configmake.h
-/getopt-cdefs.h
-/getopt.h
 /iconv.h
 /iconv_open-aix.h
 /iconv_open-hpux.h
@@ -125,20 +107,13 @@ Makefile.am
 /limits.h
 /locale.h
 /monetary.h
-/ref-add.sed
-/ref-del.sed
-/stddef.h
-/stdint.h
 /stdio.h
 /stdlib.h
 /string.h
+/sys/stat.h
+/sys/time.h
+/sys/types.h
 /time.h
 /unistd.h
-/unistr.h
-/unitypes.h
-/unused-parameter.h
-/warn-on-use.h
 /wchar.h
 /wctype.h
-
-/sys/
diff --git a/lib/glthread/.gitignore b/lib/glthread/.gitignore
deleted file mode 100644
index e0605e15..00000000
--- a/lib/glthread/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/lock.c
-/lock.h
-/threadlib.c
diff --git a/lib/unistr/.gitignore b/lib/unistr/.gitignore
index 3021bd59..a2d422f1 100644
--- a/lib/unistr/.gitignore
+++ b/lib/unistr/.gitignore
@@ -1,5 +1,3 @@
 /u8-mbtoucr.c
 /u8-uctomb-aux.c
 /u8-uctomb.c
-
-/.dirstamp
diff --git a/m4/.gitignore b/m4/.gitignore
index 38a91473..5178f421 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -1,40 +1,24 @@
 /00gnulib.m4
 /absolute-header.m4
-/asm-underscore.m4
 /assert.m4
 /btowc.m4
-/builtin-expect.m4
 /codeset.m4
 /config-h.m4
-/configmake.m4
 /extensions.m4
 /extern-inline.m4
-/fcntl-o.m4
 /free.m4
 /getopt.m4
-/gettext.m4
 /gettimeofday.m4
-/glibc2.m4
-/glibc21.m4
 /gnulib-common.m4
 /gnulib-comp.m4
 /gnulib-tool.m4
-/hard-locale.m4
 /host-cpu-c-abi.m4
 /iconv.m4
 /iconv_h.m4
 /iconv_open.m4
 /include_next.m4
 /inline.m4
-/intdiv0.m4
-/intl.m4
-/intldir.m4
-/intlmacosx.m4
-/intmax.m4
-/inttypes-pri.m4
 /inttypes.m4
-/inttypes_h.m4
-/lcmessage.m4
 /lib-ld.m4
 /lib-link.m4
 /lib-prefix.m4
@@ -45,9 +29,6 @@
 /locale-ja.m4
 /locale-zh.m4
 /locale_h.m4
-/localtime-buffer.m4
-/lock.m4
-/longlong.m4
 /mbrtowc.m4
 /mbsinit.m4
 /mbsrtowcs.m4
@@ -57,33 +38,24 @@
 /mmap-anon.m4
 /monetary_h.m4
 /multiarch.m4
-/nls.m4
 /nocrash.m4
 /off_t.m4
 /pid_t.m4
-/po.m4
-/printf-posix.m4
-/progtest.m4
-/pthread_rwlock_rdlock.m4
 /setlocale_null.m4
-/size_max.m4
 /ssize_t.m4
 /std-gnu11.m4
 /stdbool.m4
 /stddef_h.m4
 /stdint.m4
-/stdint_h.m4
 /stdio_h.m4
 /stdlib_h.m4
 /string_h.m4
-/strstr.m4
 /sys_socket_h.m4
 /sys_stat_h.m4
 /sys_time_h.m4
 /sys_types_h.m4
 /threadlib.m4
 /time_h.m4
-/uintmax_t.m4
 /unistd_h.m4
 /vararrays.m4
 /visibility.m4
@@ -97,5 +69,4 @@
 /wctype_h.m4
 /wint_t.m4
 /wmemcpy.m4
-/xsize.m4
 /zzgnulib.m4