Index: include-fixer/find-all-symbols/STLPostfixHeaderMap.cpp
===================================================================
--- include-fixer/find-all-symbols/STLPostfixHeaderMap.cpp
+++ include-fixer/find-all-symbols/STLPostfixHeaderMap.cpp
@@ -77,7 +77,6 @@
       {"include/xsavesintrin.h", "<immintrin.h>"},
       {"include/xtestintrin.h", "<immintrin.h>"},
       {"include/_G_config.h", "<cstdio>"},
-      {"include/alloca.h", "<cstdlib>"},
       {"include/asm-generic/errno-base.h", "<cerrno>"},
       {"include/asm-generic/errno.h", "<cerrno>"},
       {"include/assert.h", "<cassert>"},
@@ -269,22 +268,15 @@
       {"vector", "<vector>"},
       {"include/complex.h", "<complex.h>"},
       {"include/ctype.h", "<cctype>"},
-      {"include/endian.h", "<cctype>"},
       {"include/errno.h", "<cerrno>"},
-      {"include/features.h", "<cerrno>"},
       {"include/fenv.h", "<fenv.h>"},
       {"include/inttypes.h", "<cinttypes>"},
-      {"include/libintl.h", "<locale>"},
       {"include/libio.h", "<cstdio>"},
       {"include/limits.h", "<climits>"},
-      {"include/linux/limits.h", "<climits>"},
       {"include/locale.h", "<clocale>"},
       {"include/math.h", "<cmath>"},
-      {"include/pthread.h", "<memory>"},
-      {"include/sched.h", "<memory>"},
       {"include/setjmp.h", "<csetjmp>"},
       {"include/signal.h", "<csignal>"},
-      {"include/stdc-predef.h", "<cerrno>"},
       {"include/stdint.h", "<cstdint>"},
       {"include/stdio.h", "<cstdio>"},
       {"include/stdlib.h", "<cstdlib>"},
@@ -292,10 +284,7 @@
       {"include/time.h", "<ctime>"},
       {"include/wchar.h", "<cwchar>"},
       {"include/wctype.h", "<cwctype>"},
-      {"bits/byteswap-16.h", "<cctype>"},
-      {"bits/byteswap.h", "<cctype>"},
       {"bits/cmathcalls.h", "<complex.h>"},
-      {"bits/endian.h", "<cctype>"},
       {"bits/errno.h", "<cerrno>"},
       {"bits/fenv.h", "<fenv.h>"},
       {"bits/huge_val.h", "<cmath>"},
@@ -309,9 +298,6 @@
       {"bits/nan.h", "<cmath>"},
       {"bits/posix1_lim.h", "<climits>"},
       {"bits/posix2_lim.h", "<climits>"},
-      {"bits/pthreadtypes.h", "<csignal>"},
-      {"bits/sched.h", "<memory>"},
-      {"bits/select.h", "<cstdlib>"},
       {"bits/setjmp.h", "<csetjmp>"},
       {"bits/sigaction.h", "<csignal>"},
       {"bits/sigcontext.h", "<csignal>"},
@@ -319,24 +305,14 @@
       {"bits/signum.h", "<csignal>"},
       {"bits/sigset.h", "<csignal>"},
       {"bits/sigstack.h", "<csignal>"},
-      {"bits/sigthread.h", "<csignal>"},
       {"bits/stdio_lim.h", "<cstdio>"},
       {"bits/sys_errlist.h", "<cstdio>"},
       {"bits/time.h", "<ctime>"},
       {"bits/timex.h", "<ctime>"},
-      {"bits/types.h", "<cstdio>"},
       {"bits/typesizes.h", "<cstdio>"},
-      {"bits/waitflags.h", "<cstdlib>"},
-      {"bits/waitstatus.h", "<cstdlib>"},
       {"bits/wchar.h", "<cwchar>"},
       {"bits/wordsize.h", "<csetjmp>"},
       {"bits/xopen_lim.h", "<climits>"},
-      {"gnu/stubs-64.h", "<cerrno>"},
-      {"sys/cdefs.h", "<cerrno>"},
-      {"sys/select.h", "<cstdlib>"},
-      {"sys/sysmacros.h", "<cstdlib>"},
-      {"sys/types.h", "<cstdlib>"},
-      {"sys/ucontext.h", "<csignal>"},
       {"include/xlocale.h", "<cstring>"},
       {"bits/atomic_word.h", "<memory>"},
       {"bits/basic_file.h", "<fstream>"},
@@ -352,6 +328,244 @@
       {"bits/gthr.h", "<memory>"},
       {"bits/opt_random.h", "<random>"},
       {"bits/os_defines.h", "<iosfwd>"},
+      // GNU headers
+      {"include/aio.h", "<aio.h>"},
+      {"include/aliases.h", "<aliases.h>"},
+      {"include/alloca.h", "<alloca.h>"},
+      {"include/ar.h", "<ar.h>"},
+      {"include/argp.h", "<argp.h>"},
+      {"include/argz.h", "<argz.h>"},
+      {"include/arpa/nameser.h", "<resolv.h>"},
+      {"include/arpa/nameser_compat.h", "<resolv.h>"},
+      {"include/asm-generic/errno-base.h", "<asm-generic/errno-base.h>"},
+      {"include/asm-generic/errno.h", "<asm-generic/errno.h>"},
+      {"include/asm-generic/ioctl.h", "<asm-generic/ioctl.h>"},
+      {"include/asm-generic/ioctls.h", "<asm-generic/ioctls.h>"},
+      {"include/asm-generic/param.h", "<asm-generic/param.h>"},
+      {"include/asm-generic/socket.h", "<asm-generic/socket.h>"},
+      {"include/asm-generic/sockios.h", "<asm-generic/sockios.h>"},
+      {"include/autosprintf.h", "<autosprintf.h>"},
+      {"include/byteswap.h", "<byteswap.h>"},
+      {"include/clif.h", "<clif.h>"},
+      {"include/com_err.h", "<com_err.h>"},
+      {"include/cpio.h", "<cpio.h>"},
+      {"include/crypt.h", "<crypt.h>"},
+      {"include/curses.h", "<curses.h>"},
+      {"include/cursesapp.h", "<cursesapp.h>"},
+      {"include/cursesf.h", "<cursesf.h>"},
+      {"include/cursesm.h", "<cursesm.h>"},
+      {"include/cursesp.h", "<cursesp.h>"},
+      {"include/cursesw.h", "<cursesw.h>"},
+      {"include/cursslk.h", "<cursslk.h>"},
+      {"include/dialog.h", "<dialog.h>"},
+      {"include/dirent.h", "<dirent.h>"},
+      {"include/dlfcn.h", "<dlfcn.h>"},
+      {"include/dlg_colors.h", "<dlg_colors.h>"},
+      {"include/dlg_config.h", "<dlg_config.h>"},
+      {"include/dlg_keys.h", "<dlg_keys.h>"},
+      {"include/elf.h", "<elf.h>"},
+      {"include/endian.h", "<endian.h>"},
+      {"include/envz.h", "<envz.h>"},
+      {"include/err.h", "<err.h>"},
+      {"include/error.h", "<error.h>"},
+      {"include/et/com_err.h", "<et/comm_err.h>"},
+      {"include/eti.h", "<eti.h>"},
+      {"include/etip.h", "<etip.h>"},
+      {"include/execinfo.h", "<execinfo.h>"},
+      {"include/expat.h", "<expat.h>"},
+      {"include/expat_external.h", "<expat_external.h>"},
+      {"include/fcntl.h", "<fcntl.h>"},
+      {"include/features.h", "<features.h>"},
+      {"include/fenv.h", "<fenv.h>"},
+      {"include/fmtmsg.h", "<fmtmsg.h>"},
+      {"include/fnmatch.h", "<fnmatch.h>"},
+      {"include/form.h", "<form.h>"},
+      {"include/fstab.h", "<fstab.h>"},
+      {"include/fts.h", "<fts.h>"},
+      {"include/ftw.h", "<ftw.h>"},
+      {"include/gconv.h", "<gconv.h>"},
+      {"include/getopt.h", "<getopt.h>"},
+      {"include/gettext-po.h", "<gettext-po.h>"},
+      {"include/glob.h", "<glob.h>"},
+      {"include/gnu-versions.h", "<gnu-versions.h>"},
+      {"include/grp.h", "<grp.h>"},
+      {"include/gshadow.h", "<gshadow.h>"},
+      {"include/gssapi/gssapi.h", "<gssapi.h>"},
+      {"include/iconv.h", "<iconv.h>"},
+      {"include/ifaddrs.h", "<ifaddrs.h>"},
+      {"include/kdb.h", "<kdb.h>"},
+      {"include/krb5/krb5.h", "<krb5.h>"},
+      {"include/langinfo.h", "<langinfo.h>"},
+      {"include/libgen.h", "<libgen.h>"},
+      {"include/libintl.h", "<libintl.h>"},
+      {"include/libltdl/lt_dlloader.h", "<ltdl.h>"},
+      {"include/libltdl/lt_error.h", "<ltdl.h>"},
+      {"include/libltdl/lt_system.h", "<ltdl.h>"},
+      {"include/link.h", "<link.h>"},
+      {"include/linux/ioctl.h", "<linux/ioctl.h>"},
+      {"include/linux/limits.h", "<linux/limits.h>"},
+      {"include/linux/param.h", "<linux/param.h>"},
+      {"include/ltdl.h", "<ltdl.h>"},
+      {"include/malloc.h", "<malloc.h>"},
+      {"include/mcheck.h", "<mcheck.h>"},
+      {"include/memory.h", "<memory.h>"},
+      {"include/menu.h", "<menu.h>"},
+      {"include/mntent.h", "<mntent.h>"},
+      {"include/monetary.h", "<monetary.h>"},
+      {"include/mqueue.h", "<mqueue.h>"},
+      {"include/nc_tparm.h", "<nc_tparm.h>"},
+      {"include/ncurses.h", "<ncurses.h>"},
+      {"include/ncurses_dll.h", "<ncurses_dll.h>"},
+      {"include/netdb.h", "<netdb.h>"},
+      {"include/netinet/in.h", "<netinet/in.h>"},
+      {"include/nl_types.h", "<nl_types.h>"},
+      {"include/nss.h", "<nss.h>"},
+      {"include/obstack.h", "<obstack.h>"},
+      {"include/panel.h", "<panel.h>"},
+      {"include/paths.h", "<paths.h>"},
+      {"include/printf.h", "<printf.h>"},
+      {"include/profile.h", "<profile.h>"},
+      {"include/pthread.h", "<pthread.h>"},
+      {"include/pty.h", "<pty.h>"},
+      {"include/pwd.h", "<pwd.h>"},
+      {"include/re_comp.h", "<re_comp.h>"},
+      {"include/regex.h", "<regex.h>"},
+      {"include/regexp.h", "<regexp.h>"},
+      {"include/resolv.h", "<resolv.h>"},
+      {"include/rpc/netdb.h", "<netdb.h>"},
+      {"include/sched.h", "<sched.h>"},
+      {"include/search.h", "<search.h>"},
+      {"include/semaphore.h", "<semaphore.h>"},
+      {"include/sgtty.h", "<sgtty.h>"},
+      {"include/shadow.h", "<shadow.h>"},
+      {"include/spawn.h", "<spawn.h>"},
+      {"include/stab.h", "<stab.h>"},
+      {"include/stdc-predef.h", "<stdc-predef.h>"},
+      {"include/stdio_ext.h", "<stdio_ext.h>"},
+      {"include/strings.h", "<strings.h>"},
+      {"include/stropts.h", "<stropts.h>"},
+      {"include/sudo_plugin.h", "<sudo_plugin.h>"},
+      {"include/sysexits.h", "<sysexits.h>"},
+      {"include/tar.h", "<tar.h>"},
+      {"include/tcpd.h", "<tcpd.h>"},
+      {"include/term.h", "<term.h>"},
+      {"include/term_entry.h", "<term_entry.h>"},
+      {"include/termcap.h", "<termcap.h>"},
+      {"include/termios.h", "<termios.h>"},
+      {"include/thread_db.h", "<thread_db.h>"},
+      {"include/tic.h", "<tic.h>"},
+      {"include/ttyent.h", "<ttyent.h>"},
+      {"include/uchar.h", "<uchar.h>"},
+      {"include/ucontext.h", "<ucontext.h>"},
+      {"include/ulimit.h", "<ulimit.h>"},
+      {"include/unctrl.h", "<unctrl.h>"},
+      {"include/unistd.h", "<unistd.h>"},
+      {"include/utime.h", "<utime.h>"},
+      {"include/utmp.h", "<utmp.h>"},
+      {"include/utmpx.h", "<utmpx.h>"},
+      {"include/values.h", "<values.h>"},
+      {"include/wordexp.h", "<wordexp.h>"},
+      {"asm/unistd.h", "<asm/unistd.h>"},
+      {"asm/unistd_64.h", "<asm/unistd_64.h>"},
+      {"bits/auxv.h", "<sys/auxv.h>"},
+      {"bits/byteswap-16.h", "<byteswap.h>"},
+      {"bits/byteswap.h", "<byteswap.h>"},
+      {"bits/confname.h", "<unistd.h>"},
+      {"bits/dirent.h", "<dirent.h>"},
+      {"bits/dlfcn.h", "<dlfcn.h>"},
+      {"bits/elfclass.h", "<link.h>"},
+      {"bits/endian.h", "<endian.h>"},
+      {"bits/environments.h", "<unistd.h>"},
+      {"bits/fcntl-linux.h", "<fcntl.h>"},
+      {"bits/fcntl.h", "<fcntl.h>"},
+      {"bits/in.h", "<netinet/in.h>"},
+      {"bits/ioctl-types.h", "<sys/ioctl.h>"},
+      {"bits/ioctls.h", "<sys/ioctl.h>"},
+      {"bits/link.h", "<link.h>"},
+      {"bits/mqueue.h", "<mqueue.h>"},
+      {"bits/netdb.h", "<netdb.h>"},
+      {"bits/param.h", "<sys/param.h>"},
+      {"bits/poll.h", "<sys/poll.h>"},
+      {"bits/posix_opt.h", "<unistd.h>"},
+      {"bits/pthreadtypes.h", "<pthread.h>"},
+      {"bits/sched.h", "<sched.h>"},
+      {"bits/select.h", "<sys/select.h>"},
+      {"bits/semaphore.h", "<semaphore.h>"},
+      {"bits/sigthread.h", "<pthread.h>"},
+      {"bits/sockaddr.h", "<sys/socket.h>"},
+      {"bits/socket.h", "<sys/socket.h>"},
+      {"bits/socket_type.h", "<sys/socket.h>"},
+      {"bits/stab.def", "<stab.h>"},
+      {"bits/stat.h", "<sys/stat.h>"},
+      {"bits/stropts.h", "<stropts.h>"},
+      {"bits/syscall.h", "<sys/syscall.h>"},
+      {"bits/syslog-path.h", "<sys/syslog.h>"},
+      {"bits/termios.h", "<termios.h>"},
+      {"bits/types.h", "<sys/types.h>"},
+      {"bits/typesizes.h", "<sys/types.h>"},
+      {"bits/uio.h", "<sys/uio.h>"},
+      {"bits/ustat.h", "<sys/ustat.h>"},
+      {"bits/utmp.h", "<utmp.h>"},
+      {"bits/utmpx.h", "<utmpx.h>"},
+      {"bits/waitflags.h", "<sys/wait.h>"},
+      {"bits/waitstatus.h", "<sys/wait.h>"},
+      {"bits/xtitypes.h", "<stropts.h>"},
+      {"fpu_control.h", "<fpu_control.h>"},
+      {"gnu/option-groups.h", "<gnu/option-groups.h>"},
+      {"gnu/stubs-64.h", "<gnu/stubs-64.h>"},
+      {"sys/cdefs.h", "<sys/cdefs.h>"},
+      {"sys/ioctl.h", "<sys/ioctl.h>"},
+      {"sys/param.h", "<sys/param.h>"},
+      {"sys/poll.h", "<sys/poll.h>"},
+      {"sys/procfs.h", "<sys/procfs.h>"},
+      {"sys/select.h", "<sys/select.h>"},
+      {"sys/socket.h", "<sys/socket.h>"},
+      {"sys/stat.h", "<sys/stat.h>"},
+      {"sys/syscall.h", "<sys/syscall.h>"},
+      {"sys/syslog.h", "<sys/syslog.h>"},
+      {"sys/sysmacros.h", "<sys/sysmacros.h>"},
+      {"sys/time.h", "<sys/time.h>"},
+      {"sys/ttydefaults.h", "<sys/ttydefaults.h>"},
+      {"sys/types.h", "<sys/types.h>"},
+      {"sys/ucontext.h", "<sys/ucontext.h>"},
+      {"sys/uio.h", "<sys/uio.h>"},
+      {"sys/user.h", "<sys/user.h>"},
+      {"sys/ustat.h", "<sys/ustat.h>"},
+      {"sys/wait.h", "<sys/wait.h>"},
+      {"zconf.h", "<zconf.h>"},
+      {"include/xapian.h", "<xapian.h>"},
+      {"include/xapian/base.h", "<xapian.h>"},
+      {"include/xapian/compactor.h", "<xapian.h>"},
+      {"include/xapian/database.h", "<xapian.h>"},
+      {"include/xapian/dbfactory.h", "<xapian.h>"},
+      {"include/xapian/deprecated.h", "<xapian.h>"},
+      {"include/xapian/derefwrapper.h", "<xapian.h>"},
+      {"include/xapian/document.h", "<xapian.h>"},
+      {"include/xapian/enquire.h", "<xapian.h>"},
+      {"include/xapian/error.h", "<xapian.h>"},
+      {"include/xapian/errorhandler.h", "<xapian.h>"},
+      {"include/xapian/expanddecider.h", "<xapian.h>"},
+      {"include/xapian/keymaker.h", "<xapian.h>"},
+      {"include/xapian/matchspy.h", "<xapian.h>"},
+      {"include/xapian/positioniterator.h", "<xapian.h>"},
+      {"include/xapian/postingiterator.h", "<xapian.h>"},
+      {"include/xapian/postingsource.h", "<xapian.h>"},
+      {"include/xapian/query.h", "<xapian.h>"},
+      {"include/xapian/queryparser.h", "<xapian.h>"},
+      {"include/xapian/registry.h", "<xapian.h>"},
+      {"include/xapian/stem.h", "<xapian.h>"},
+      {"include/xapian/termgenerator.h", "<xapian.h>"},
+      {"include/xapian/termiterator.h", "<xapian.h>"},
+      {"include/xapian/types.h", "<xapian.h>"},
+      {"include/xapian/unicode.h", "<xapian.h>"},
+      {"include/xapian/valueiterator.h", "<xapian.h>"},
+      {"include/xapian/valuesetmatchdecider.h", "<xapian.h>"},
+      {"include/xapian/version.h", "<xapian.h>"},
+      {"include/xapian/visibility.h", "<xapian.h>"},
+      {"include/xapian/weight.h", "<xapian.h>"},
+      {"include/xlocale.h", "<xlocale.h>"},
+      {"include/zlib.h", "<zlib.h>"},
+
   };
   return &STLPostfixHeaderMap;
 }