diff --git a/lib/.gitignore b/lib/.gitignore
index 692d9bb..e2586b1 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -1,6 +1,4 @@
 Makefile.am
-alloca.in.h
-asnprintf.c
 btowc.c
 c-ctype.c
 c-ctype.h
@@ -8,18 +6,6 @@ c-strcase.h
 c-strcasecmp.c
 c-strncasecmp.c
 config.charset
-ctype.in.h
-dosname.h
-errno.in.h
-float+.h
-float.c
-float.in.h
-fprintf.c
-fpucw.h
-frexp.c
-frexpl.c
-fseterr.c
-fseterr.h
 getopt.c
 getopt.in.h
 getopt1.c
@@ -35,19 +21,9 @@ iconv_open-irix.gperf
 iconv_open-osf.gperf
 iconv_open-solaris.gperf
 iconv_open.c
-isnan.c
-isnand-nolibm.h
-isnand.c
-isnanf-nolibm.h
-isnanf.c
-isnanl-nolibm.h
-isnanl.c
-langinfo.in.h
 localcharset.c
 localcharset.h
 locale.in.h
-malloc.c
-math.in.h
 mbrtowc.c
 mbsinit.c
 mbsrtowcs-impl.h
@@ -57,41 +33,18 @@ mbtowc-impl.h
 mbtowc.c
 memchr.c
 memchr.valgrind
-printf-args.c
-printf-args.h
-printf-frexp.c
-printf-frexp.h
-printf-frexpl.c
-printf-frexpl.h
-printf-parse.c
-printf-parse.h
-printf.c
 ref-add.sin
 ref-del.sin
-sig-handler.h
-sigaction.c
-signal.in.h
-signbitd.c
-signbitf.c
-signbitl.c
-sigprocmask.c
-size_max.h
-snprintf.c
-stat.c
-stdarg.in.h
 stdbool.in.h
 stddef.in.h
 stdint.in.h
-stdio-impl.h
 stdio.in.h
 stdlib.in.h
 str-two-way.h
-strdup.c
 streq.h
 striconv.c
 striconv.h
 string.in.h
-strncat.c
 strnlen1.c
 strnlen1.h
 strstr.c
@@ -101,36 +54,22 @@ time.in.h
 unistd.in.h
 unistr.in.h
 unitypes.in.h
-uniwidth.in.h
-vasnprintf.c
-vasnprintf.h
 verify.h
-vfprintf.c
-vsnprintf.c
 wchar.in.h
 wcrtomb.c
 wcsdup-impl.h
 wcsdup.c
-wcsrtombs-impl.h
-wcsrtombs-state.c
-wcsrtombs.c
-wcswidth-impl.h
-wcswidth.c
 wctob.c
 wctomb-impl.h
 wctomb.c
 wctype.in.h
-wcwidth.c
 wmemcpy-impl.h
 wmemcpy.c
-xsize.h
 
-alloca.h
 arg-nonnull.h
 c++defs.h
 charset.alias
 configmake.h
-ctype.h
 getopt.h
 iconv.h
 iconv_open-aix.h
@@ -138,12 +77,9 @@ iconv_open-hpux.h
 iconv_open-irix.h
 iconv_open-osf.h
 iconv_open-solaris.h
-langinfo.h
 locale.h
-math.h
 ref-add.sed
 ref-del.sed
-signal.h
 stdio.h
 stdlib.h
 string.h
@@ -152,7 +88,6 @@ time.h
 unistd.h
 unistr.h
 unitypes.h
-uniwidth.h
 unused-parameter.h
 warn-on-use.h
 wchar.h
@@ -162,7 +97,3 @@ unistr/.dirstamp
 unistr/u8-mbtoucr.c
 unistr/u8-uctomb-aux.c
 unistr/u8-uctomb.c
-
-uniwidth/.dirstamp
-uniwidth/cjk.h
-uniwidth/width.c
diff --git a/m4/.gitignore b/m4/.gitignore
index 6cd5941..a26f228 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -1,23 +1,11 @@
 00gnulib.m4
-alloca.m4
-asm-underscore.m4
 assert.m4
 btowc.m4
 codeset.m4
 config-h.m4
 configmake.m4
-ctype.m4
-errno_h.m4
-exponentd.m4
-exponentf.m4
-exponentl.m4
 extensions.m4
 fcntl-o.m4
-float_h.m4
-fpieee.m4
-fprintf-posix.m4
-frexp.m4
-frexpl.m4
 getopt.m4
 gettext.m4
 gettimeofday.m4
@@ -36,16 +24,9 @@ intl.m4
 intldir.m4
 intlmacosx.m4
 intmax.m4
-intmax_t.m4
 inttypes-pri.m4
 inttypes_h.m4
-isnand.m4
-isnanf.m4
-isnanl.m4
-langinfo_h.m4
-largefile.m4
 lcmessage.m4
-ldexpl.m4
 lib-ld.m4
 lib-link.m4
 lib-prefix.m4
@@ -57,8 +38,6 @@ locale-zh.m4
 locale_h.m4
 lock.m4
 longlong.m4
-malloc.m4
-math_h.m4
 mbrtowc.m4
 mbsinit.m4
 mbsrtowcs.m4
@@ -70,30 +49,16 @@ multiarch.m4
 nls.m4
 nocrash.m4
 po.m4
-printf-frexp.m4
-printf-frexpl.m4
-printf-posix-rpl.m4
 printf-posix.m4
-printf.m4
 progtest.m4
-sigaction.m4
-signal_h.m4
-signalblocking.m4
-signbit.m4
 size_max.m4
-snprintf-posix.m4
-snprintf.m4
-stat.m4
-stdarg.m4
 stdbool.m4
 stddef_h.m4
 stdint.m4
 stdint_h.m4
 stdio_h.m4
 stdlib_h.m4
-strdup.m4
 string_h.m4
-strncat.m4
 strstr.m4
 sys_stat_h.m4
 sys_time_h.m4
@@ -101,22 +66,15 @@ threadlib.m4
 time_h.m4
 uintmax_t.m4
 unistd_h.m4
-vasnprintf.m4
-vfprintf-posix.m4
 visibility.m4
-vsnprintf-posix.m4
-vsnprintf.m4
 warn-on-use.m4
 wchar_h.m4
 wchar_t.m4
 wcrtomb.m4
 wcsdup.m4
-wcsrtombs.m4
-wcswidth.m4
 wctob.m4
 wctomb.m4
 wctype_h.m4
-wcwidth.m4
 wint_t.m4
 wmemcpy.m4
 xsize.m4
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index d6b55ea..00ce11e 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -15,7 +15,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl assert btowc config-h ctype fprintf-posix getopt-gnu gettext gettext-h gettimeofday langinfo locale mbrtowc mbsrtowcs printf-posix sigaction signal snprintf-posix stat stdarg stdbool stdio strdup-posix striconv string strncat strstr sys_stat sys_time unistd vfprintf-posix vsnprintf-posix wchar wcrtomb wcsdup wcsrtombs wcswidth wctob wctype-h wcwidth
+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl assert btowc config-h getopt-gnu gettext gettext-h gettimeofday locale mbrtowc mbsrtowcs stdbool stdio striconv string strstr sys_stat sys_time unistd wchar wcrtomb wcsdup wctob wctype-h
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
@@ -23,42 +23,26 @@ gl_MODULES([
   assert
   btowc
   config-h
-  ctype
-  fprintf-posix
   getopt-gnu
   gettext
   gettext-h
   gettimeofday
-  langinfo
   locale
   mbrtowc
   mbsrtowcs
-  printf-posix
-  sigaction
-  signal
-  snprintf-posix
-  stat
-  stdarg
   stdbool
   stdio
-  strdup-posix
   striconv
   string
-  strncat
   strstr
   sys_stat
   sys_time
   unistd
-  vfprintf-posix
-  vsnprintf-posix
   wchar
   wcrtomb
   wcsdup
-  wcsrtombs
-  wcswidth
   wctob
   wctype-h
-  wcwidth
 ])
 gl_AVOID([])
 gl_SOURCE_BASE([lib])