diff --git a/.gitignore b/.gitignore
index ce778a1..b18d09d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,10 @@
 *.o
 *.a
 *.gmo
-.deps/
 Makefile
 Makefile.in
 TAGS
+.deps/
 
 /aclocal.m4
 /autom4te.cache
diff --git a/lib/.gitignore b/lib/.gitignore
index 1970414..1ec947c 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -1,107 +1,109 @@
 Makefile.am
-btowc.c
-c-ctype.c
-c-ctype.h
-c-strcase.h
-c-strcasecmp.c
-c-strncasecmp.c
-config.charset
-crc.c
-crc.h
-getopt.c
-getopt.in.h
-getopt1.c
-getopt_int.h
-gettext.h
-gettimeofday.c
-hard-locale.c
-hard-locale.h
-iconv.c
-iconv.in.h
-iconv_close.c
-iconv_open-aix.gperf
-iconv_open-hpux.gperf
-iconv_open-irix.gperf
-iconv_open-osf.gperf
-iconv_open-solaris.gperf
-iconv_open.c
-localcharset.c
-localcharset.h
-locale.in.h
-mbrtowc.c
-mbsinit.c
-mbsrtowcs-impl.h
-mbsrtowcs-state.c
-mbsrtowcs.c
-mbtowc-impl.h
-mbtowc.c
-memchr.c
-memchr.valgrind
-ref-add.sin
-ref-del.sin
-stdbool.in.h
-stddef.h
-stddef.in.h
-stdint.in.h
-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
-time.in.h
-unistd.c
-unistd.in.h
-unistr.in.h
-unitypes.in.h
-verify.h
-wchar.in.h
-wcrtomb.c
-wcsdup-impl.h
-wcsdup.c
-wctob.c
-wctomb-impl.h
-wctomb.c
-wctype-h.c
-wctype.in.h
-wmemcpy-impl.h
-wmemcpy.c
 
-arg-nonnull.h
-c++defs.h
-charset.alias
-configmake.h
-getopt.h
-iconv.h
-iconv_open-aix.h
-iconv_open-hpux.h
-iconv_open-irix.h
-iconv_open-osf.h
-iconv_open-solaris.h
-locale.h
-ref-add.sed
-ref-del.sed
-stdio.h
-stdlib.h
-string.h
-sys/
-time.h
-unistd.h
-unistr.h
-unitypes.h
-unused-parameter.h
-warn-on-use.h
-wchar.h
-wctype.h
+/btowc.c
+/c-ctype.c
+/c-ctype.h
+/c-strcase.h
+/c-strcasecmp.c
+/c-strncasecmp.c
+/config.charset
+/crc.c
+/crc.h
+/getopt.c
+/getopt.in.h
+/getopt1.c
+/getopt_int.h
+/gettext.h
+/gettimeofday.c
+/hard-locale.c
+/hard-locale.h
+/iconv.c
+/iconv.in.h
+/iconv_close.c
+/iconv_open-aix.gperf
+/iconv_open-hpux.gperf
+/iconv_open-irix.gperf
+/iconv_open-osf.gperf
+/iconv_open-solaris.gperf
+/iconv_open.c
+/localcharset.c
+/localcharset.h
+/locale.in.h
+/mbrtowc.c
+/mbsinit.c
+/mbsrtowcs-impl.h
+/mbsrtowcs-state.c
+/mbsrtowcs.c
+/mbtowc-impl.h
+/mbtowc.c
+/memchr.c
+/memchr.valgrind
+/ref-add.sin
+/ref-del.sin
+/stdbool.in.h
+/stddef.in.h
+/stdint.in.h
+/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
+/time.in.h
+/unistd.c
+/unistd.in.h
+/unistr.in.h
+/unitypes.in.h
+/verify.h
+/wchar.in.h
+/wcrtomb.c
+/wcsdup-impl.h
+/wcsdup.c
+/wctob.c
+/wctomb-impl.h
+/wctomb.c
+/wctype-h.c
+/wctype.in.h
+/wmemcpy-impl.h
+/wmemcpy.c
 
-unistr/.dirstamp
-unistr/u8-mbtoucr.c
-unistr/u8-uctomb-aux.c
-unistr/u8-uctomb.c
+/arg-nonnull.h
+/c++defs.h
+/charset.alias
+/configmake.h
+/getopt.h
+/iconv.h
+/iconv_open-aix.h
+/iconv_open-hpux.h
+/iconv_open-irix.h
+/iconv_open-osf.h
+/iconv_open-solaris.h
+/locale.h
+/ref-add.sed
+/ref-del.sed
+/stddef.h
+/stdio.h
+/stdlib.h
+/string.h
+/time.h
+/unistd.h
+/unistr.h
+/unitypes.h
+/unused-parameter.h
+/warn-on-use.h
+/wchar.h
+/wctype.h
+
+/sys/
+
+/unistr/.dirstamp
+/unistr/u8-mbtoucr.c
+/unistr/u8-uctomb-aux.c
+/unistr/u8-uctomb.c
diff --git a/m4/.gitignore b/m4/.gitignore
index fa95958..99b0141 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -1,87 +1,87 @@
-00gnulib.m4
-absolute-header.m4
-assert.m4
-btowc.m4
-codeset.m4
-config-h.m4
-configmake.m4
-extensions.m4
-extern-inline.m4
-fcntl-o.m4
-getopt.m4
-gettext.m4
-gettimeofday.m4
-glibc2.m4
-glibc21.m4
-gnulib-common.m4
-gnulib-comp.m4
-gnulib-tool.m4
-hard-locale.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_h.m4
-lcmessage.m4
-lib-ld.m4
-lib-link.m4
-lib-prefix.m4
-libunistring-base.m4
-localcharset.m4
-locale-fr.m4
-locale-ja.m4
-locale-zh.m4
-locale_h.m4
-lock.m4
-longlong.m4
-mbrtowc.m4
-mbsinit.m4
-mbsrtowcs.m4
-mbstate_t.m4
-mbtowc.m4
-memchr.m4
-mmap-anon.m4
-multiarch.m4
-nls.m4
-nocrash.m4
-off_t.m4
-po.m4
-printf-posix.m4
-progtest.m4
-size_max.m4
-ssize_t.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
-visibility.m4
-warn-on-use.m4
-wchar_h.m4
-wchar_t.m4
-wcrtomb.m4
-wcsdup.m4
-wctob.m4
-wctomb.m4
-wctype_h.m4
-wint_t.m4
-wmemcpy.m4
-xsize.m4
+/00gnulib.m4
+/absolute-header.m4
+/assert.m4
+/btowc.m4
+/codeset.m4
+/config-h.m4
+/configmake.m4
+/extensions.m4
+/extern-inline.m4
+/fcntl-o.m4
+/getopt.m4
+/gettext.m4
+/gettimeofday.m4
+/glibc2.m4
+/glibc21.m4
+/gnulib-common.m4
+/gnulib-comp.m4
+/gnulib-tool.m4
+/hard-locale.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_h.m4
+/lcmessage.m4
+/lib-ld.m4
+/lib-link.m4
+/lib-prefix.m4
+/libunistring-base.m4
+/localcharset.m4
+/locale-fr.m4
+/locale-ja.m4
+/locale-zh.m4
+/locale_h.m4
+/lock.m4
+/longlong.m4
+/mbrtowc.m4
+/mbsinit.m4
+/mbsrtowcs.m4
+/mbstate_t.m4
+/mbtowc.m4
+/memchr.m4
+/mmap-anon.m4
+/multiarch.m4
+/nls.m4
+/nocrash.m4
+/off_t.m4
+/po.m4
+/printf-posix.m4
+/progtest.m4
+/size_max.m4
+/ssize_t.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
+/visibility.m4
+/warn-on-use.m4
+/wchar_h.m4
+/wchar_t.m4
+/wcrtomb.m4
+/wcsdup.m4
+/wctob.m4
+/wctomb.m4
+/wctype_h.m4
+/wint_t.m4
+/wmemcpy.m4
+/xsize.m4