From 6d3d12ebef6fa7dd6bc8c34fbc5e440ac8d0a8c6 Mon Sep 17 00:00:00 2001
From: Gary Benson <gbenson@redhat.com>
Date: Tue, 29 Jul 2014 15:06:51 +0100
Subject: [PATCH] Include string.h in common-defs.h

This commit includes string.h in common-defs.h and removes all other
inclusions.

gdb/
2014-08-07  Gary Benson  <gbenson@redhat.com>

	* common/common-defs.h: Include string.h.
	* aarch64-tdep.c: Do not include string.h.
	* ada-exp.y: Likewise.
	* ada-lang.c: Likewise.
	* ada-lex.l: Likewise.
	* ada-typeprint.c: Likewise.
	* ada-valprint.c: Likewise.
	* aix-thread.c: Likewise.
	* alpha-linux-tdep.c: Likewise.
	* alpha-mdebug-tdep.c: Likewise.
	* alpha-nat.c: Likewise.
	* alpha-osf1-tdep.c: Likewise.
	* alpha-tdep.c: Likewise.
	* alphanbsd-tdep.c: Likewise.
	* amd64-dicos-tdep.c: Likewise.
	* amd64-linux-tdep.c: Likewise.
	* amd64-nat.c: Likewise.
	* amd64-sol2-tdep.c: Likewise.
	* amd64fbsd-tdep.c: Likewise.
	* amd64obsd-tdep.c: Likewise.
	* arch-utils.c: Likewise.
	* arm-linux-nat.c: Likewise.
	* arm-linux-tdep.c: Likewise.
	* arm-tdep.c: Likewise.
	* arm-wince-tdep.c: Likewise.
	* armbsd-tdep.c: Likewise.
	* armnbsd-nat.c: Likewise.
	* armnbsd-tdep.c: Likewise.
	* armobsd-tdep.c: Likewise.
	* avr-tdep.c: Likewise.
	* ax-gdb.c: Likewise.
	* ax-general.c: Likewise.
	* bcache.c: Likewise.
	* bfin-tdep.c: Likewise.
	* breakpoint.c: Likewise.
	* build-id.c: Likewise.
	* buildsym.c: Likewise.
	* c-exp.y: Likewise.
	* c-lang.c: Likewise.
	* c-typeprint.c: Likewise.
	* c-valprint.c: Likewise.
	* charset.c: Likewise.
	* cli-out.c: Likewise.
	* cli/cli-cmds.c: Likewise.
	* cli/cli-decode.c: Likewise.
	* cli/cli-dump.c: Likewise.
	* cli/cli-interp.c: Likewise.
	* cli/cli-logging.c: Likewise.
	* cli/cli-script.c: Likewise.
	* cli/cli-setshow.c: Likewise.
	* cli/cli-utils.c: Likewise.
	* coffread.c: Likewise.
	* common/agent.c: Likewise.
	* common/buffer.c: Likewise.
	* common/buffer.h: Likewise.
	* common/common-utils.c: Likewise.
	* common/filestuff.c: Likewise.
	* common/filestuff.c: Likewise.
	* common/format.c: Likewise.
	* common/print-utils.c: Likewise.
	* common/rsp-low.c: Likewise.
	* common/signals.c: Likewise.
	* common/vec.h: Likewise.
	* common/xml-utils.c: Likewise.
	* core-regset.c: Likewise.
	* corefile.c: Likewise.
	* corelow.c: Likewise.
	* cp-abi.c: Likewise.
	* cp-name-parser.y: Likewise.
	* cp-support.c: Likewise.
	* cp-valprint.c: Likewise.
	* cris-tdep.c: Likewise.
	* d-exp.y: Likewise.
	* darwin-nat.c: Likewise.
	* dbxread.c: Likewise.
	* dcache.c: Likewise.
	* demangle.c: Likewise.
	* dicos-tdep.c: Likewise.
	* disasm.c: Likewise.
	* doublest.c: Likewise.
	* dsrec.c: Likewise.
	* dummy-frame.c: Likewise.
	* dwarf2-frame.c: Likewise.
	* dwarf2loc.c: Likewise.
	* dwarf2read.c: Likewise.
	* elfread.c: Likewise.
	* environ.c: Likewise.
	* eval.c: Likewise.
	* event-loop.c: Likewise.
	* exceptions.c: Likewise.
	* exec.c: Likewise.
	* expprint.c: Likewise.
	* f-exp.y: Likewise.
	* f-lang.c: Likewise.
	* f-typeprint.c: Likewise.
	* f-valprint.c: Likewise.
	* fbsd-nat.c: Likewise.
	* findcmd.c: Likewise.
	* findvar.c: Likewise.
	* fork-child.c: Likewise.
	* frame.c: Likewise.
	* frv-linux-tdep.c: Likewise.
	* frv-tdep.c: Likewise.
	* gdb.c: Likewise.
	* gdb_bfd.c: Likewise.
	* gdbarch.c: Likewise.
	* gdbarch.sh: Likewise.
	* gdbtypes.c: Likewise.
	* gnu-nat.c: Likewise.
	* gnu-v2-abi.c: Likewise.
	* gnu-v3-abi.c: Likewise.
	* go-exp.y: Likewise.
	* go-lang.c: Likewise.
	* go32-nat.c: Likewise.
	* guile/guile.c: Likewise.
	* guile/scm-auto-load.c: Likewise.
	* hppa-hpux-tdep.c: Likewise.
	* hppa-linux-nat.c: Likewise.
	* hppanbsd-tdep.c: Likewise.
	* hppaobsd-tdep.c: Likewise.
	* i386-cygwin-tdep.c: Likewise.
	* i386-dicos-tdep.c: Likewise.
	* i386-linux-tdep.c: Likewise.
	* i386-nto-tdep.c: Likewise.
	* i386-sol2-tdep.c: Likewise.
	* i386-tdep.c: Likewise.
	* i386bsd-tdep.c: Likewise.
	* i386gnu-nat.c: Likewise.
	* i386nbsd-tdep.c: Likewise.
	* i386obsd-tdep.c: Likewise.
	* i387-tdep.c: Likewise.
	* ia64-libunwind-tdep.c: Likewise.
	* ia64-linux-nat.c: Likewise.
	* inf-child.c: Likewise.
	* inf-ptrace.c: Likewise.
	* inf-ttrace.c: Likewise.
	* infcall.c: Likewise.
	* infcmd.c: Likewise.
	* inflow.c: Likewise.
	* infrun.c: Likewise.
	* interps.c: Likewise.
	* iq2000-tdep.c: Likewise.
	* irix5-nat.c: Likewise.
	* jv-exp.y: Likewise.
	* jv-lang.c: Likewise.
	* jv-typeprint.c: Likewise.
	* jv-valprint.c: Likewise.
	* language.c: Likewise.
	* linux-fork.c: Likewise.
	* linux-nat.c: Likewise.
	* lm32-tdep.c: Likewise.
	* m2-exp.y: Likewise.
	* m2-typeprint.c: Likewise.
	* m32c-tdep.c: Likewise.
	* m32r-linux-nat.c: Likewise.
	* m32r-linux-tdep.c: Likewise.
	* m32r-rom.c: Likewise.
	* m32r-tdep.c: Likewise.
	* m68hc11-tdep.c: Likewise.
	* m68k-tdep.c: Likewise.
	* m68kbsd-tdep.c: Likewise.
	* m68klinux-nat.c: Likewise.
	* m68klinux-tdep.c: Likewise.
	* m88k-tdep.c: Likewise.
	* machoread.c: Likewise.
	* macrocmd.c: Likewise.
	* main.c: Likewise.
	* mdebugread.c: Likewise.
	* mem-break.c: Likewise.
	* memattr.c: Likewise.
	* memory-map.c: Likewise.
	* mep-tdep.c: Likewise.
	* mi/mi-cmd-break.c: Likewise.
	* mi/mi-cmd-disas.c: Likewise.
	* mi/mi-cmd-env.c: Likewise.
	* mi/mi-cmd-stack.c: Likewise.
	* mi/mi-cmd-var.c: Likewise.
	* mi/mi-cmds.c: Likewise.
	* mi/mi-console.c: Likewise.
	* mi/mi-getopt.c: Likewise.
	* mi/mi-interp.c: Likewise.
	* mi/mi-main.c: Likewise.
	* mi/mi-parse.c: Likewise.
	* microblaze-rom.c: Likewise.
	* microblaze-tdep.c: Likewise.
	* mingw-hdep.c: Likewise.
	* minidebug.c: Likewise.
	* minsyms.c: Likewise.
	* mips-irix-tdep.c: Likewise.
	* mips-linux-tdep.c: Likewise.
	* mips-tdep.c: Likewise.
	* mips64obsd-tdep.c: Likewise.
	* mipsnbsd-tdep.c: Likewise.
	* mipsread.c: Likewise.
	* mn10300-linux-tdep.c: Likewise.
	* mn10300-tdep.c: Likewise.
	* monitor.c: Likewise.
	* moxie-tdep.c: Likewise.
	* mt-tdep.c: Likewise.
	* nat/linux-btrace.c: Likewise.
	* nat/linux-osdata.c: Likewise.
	* nat/linux-procfs.c: Likewise.
	* nat/linux-ptrace.c: Likewise.
	* nat/linux-waitpid.c: Likewise.
	* nbsd-tdep.c: Likewise.
	* nios2-linux-tdep.c: Likewise.
	* nto-procfs.c: Likewise.
	* nto-tdep.c: Likewise.
	* objc-lang.c: Likewise.
	* objfiles.c: Likewise.
	* opencl-lang.c: Likewise.
	* osabi.c: Likewise.
	* osdata.c: Likewise.
	* p-exp.y: Likewise.
	* p-lang.c: Likewise.
	* p-typeprint.c: Likewise.
	* parse.c: Likewise.
	* posix-hdep.c: Likewise.
	* ppc-linux-nat.c: Likewise.
	* ppc-sysv-tdep.c: Likewise.
	* ppcfbsd-tdep.c: Likewise.
	* ppcnbsd-tdep.c: Likewise.
	* ppcobsd-tdep.c: Likewise.
	* printcmd.c: Likewise.
	* procfs.c: Likewise.
	* prologue-value.c: Likewise.
	* python/py-auto-load.c: Likewise.
	* python/py-gdb-readline.c: Likewise.
	* ravenscar-thread.c: Likewise.
	* regcache.c: Likewise.
	* registry.c: Likewise.
	* remote-fileio.c: Likewise.
	* remote-m32r-sdi.c: Likewise.
	* remote-mips.c: Likewise.
	* remote-notif.c: Likewise.
	* remote-sim.c: Likewise.
	* remote.c: Likewise.
	* reverse.c: Likewise.
	* rs6000-aix-tdep.c: Likewise.
	* ser-base.c: Likewise.
	* ser-go32.c: Likewise.
	* ser-mingw.c: Likewise.
	* ser-pipe.c: Likewise.
	* ser-tcp.c: Likewise.
	* ser-unix.c: Likewise.
	* serial.c: Likewise.
	* sh-tdep.c: Likewise.
	* sh64-tdep.c: Likewise.
	* shnbsd-tdep.c: Likewise.
	* skip.c: Likewise.
	* sol-thread.c: Likewise.
	* solib-dsbt.c: Likewise.
	* solib-frv.c: Likewise.
	* solib-osf.c: Likewise.
	* solib-som.c: Likewise.
	* solib-spu.c: Likewise.
	* solib-target.c: Likewise.
	* solib.c: Likewise.
	* somread.c: Likewise.
	* source.c: Likewise.
	* sparc-nat.c: Likewise.
	* sparc-sol2-tdep.c: Likewise.
	* sparc-tdep.c: Likewise.
	* sparc64-tdep.c: Likewise.
	* sparc64fbsd-tdep.c: Likewise.
	* sparc64nbsd-tdep.c: Likewise.
	* sparcnbsd-tdep.c: Likewise.
	* spu-linux-nat.c: Likewise.
	* spu-multiarch.c: Likewise.
	* spu-tdep.c: Likewise.
	* stabsread.c: Likewise.
	* stack.c: Likewise.
	* std-regs.c: Likewise.
	* symfile.c: Likewise.
	* symmisc.c: Likewise.
	* symtab.c: Likewise.
	* target.c: Likewise.
	* thread.c: Likewise.
	* tilegx-linux-nat.c: Likewise.
	* tilegx-tdep.c: Likewise.
	* top.c: Likewise.
	* tracepoint.c: Likewise.
	* tui/tui-command.c: Likewise.
	* tui/tui-data.c: Likewise.
	* tui/tui-disasm.c: Likewise.
	* tui/tui-file.c: Likewise.
	* tui/tui-layout.c: Likewise.
	* tui/tui-out.c: Likewise.
	* tui/tui-regs.c: Likewise.
	* tui/tui-source.c: Likewise.
	* tui/tui-stack.c: Likewise.
	* tui/tui-win.c: Likewise.
	* tui/tui-windata.c: Likewise.
	* tui/tui-winsource.c: Likewise.
	* typeprint.c: Likewise.
	* ui-file.c: Likewise.
	* ui-out.c: Likewise.
	* user-regs.c: Likewise.
	* utils.c: Likewise.
	* v850-tdep.c: Likewise.
	* valarith.c: Likewise.
	* valops.c: Likewise.
	* valprint.c: Likewise.
	* value.c: Likewise.
	* varobj.c: Likewise.
	* vax-tdep.c: Likewise.
	* vaxnbsd-tdep.c: Likewise.
	* vaxobsd-tdep.c: Likewise.
	* windows-nat.c: Likewise.
	* xcoffread.c: Likewise.
	* xml-support.c: Likewise.
	* xstormy16-tdep.c: Likewise.
	* xtensa-linux-nat.c: Likewise.

gdb/gdbserver/
2014-08-07  Gary Benson  <gbenson@redhat.com>

	* server.h: Do not include string.h.
	* event-loop.c: Likewise.
	* linux-low.c: Likewise.
	* regcache.c: Likewise.
	* remote-utils.c: Likewise.
	* spu-low.c: Likewise.
	* utils.c: Likewise.
---
 gdb/ChangeLog                | 316 +++++++++++++++++++++++++++++++++++
 gdb/aarch64-tdep.c           |   1 -
 gdb/ada-exp.y                |   1 -
 gdb/ada-lang.c               |   1 -
 gdb/ada-lex.l                |   2 -
 gdb/ada-typeprint.c          |   1 -
 gdb/ada-valprint.c           |   1 -
 gdb/aix-thread.c             |   1 -
 gdb/alpha-linux-tdep.c       |   1 -
 gdb/alpha-mdebug-tdep.c      |   1 -
 gdb/alpha-nat.c              |   1 -
 gdb/alpha-osf1-tdep.c        |   1 -
 gdb/alpha-tdep.c             |   1 -
 gdb/alphanbsd-tdep.c         |   2 -
 gdb/amd64-dicos-tdep.c       |   1 -
 gdb/amd64-linux-tdep.c       |   2 -
 gdb/amd64-nat.c              |   2 -
 gdb/amd64-sol2-tdep.c        |   2 -
 gdb/amd64fbsd-tdep.c         |   2 -
 gdb/amd64obsd-tdep.c         |   2 -
 gdb/arch-utils.c             |   1 -
 gdb/arm-linux-nat.c          |   1 -
 gdb/arm-linux-tdep.c         |   2 -
 gdb/arm-tdep.c               |   1 -
 gdb/arm-wince-tdep.c         |   2 -
 gdb/armbsd-tdep.c            |   2 -
 gdb/armnbsd-nat.c            |   2 -
 gdb/armnbsd-tdep.c           |   2 -
 gdb/armobsd-tdep.c           |   2 -
 gdb/avr-tdep.c               |   1 -
 gdb/ax-gdb.c                 |   1 -
 gdb/ax-general.c             |   2 -
 gdb/bcache.c                 |   1 -
 gdb/bfin-tdep.c              |   1 -
 gdb/breakpoint.c             |   1 -
 gdb/build-id.c               |   1 -
 gdb/buildsym.c               |   1 -
 gdb/c-exp.y                  |   1 -
 gdb/c-lang.c                 |   1 -
 gdb/c-typeprint.c            |   1 -
 gdb/c-valprint.c             |   1 -
 gdb/charset.c                |   2 -
 gdb/cli-out.c                |   1 -
 gdb/cli/cli-cmds.c           |   1 -
 gdb/cli/cli-decode.c         |   1 -
 gdb/cli/cli-dump.c           |   1 -
 gdb/cli/cli-interp.c         |   1 -
 gdb/cli/cli-logging.c        |   2 -
 gdb/cli/cli-script.c         |   1 -
 gdb/cli/cli-setshow.c        |   1 -
 gdb/cli/cli-utils.c          |   1 -
 gdb/coffread.c               |   2 -
 gdb/common/agent.c           |   2 -
 gdb/common/buffer.c          |   2 -
 gdb/common/buffer.h          |   2 -
 gdb/common/common-defs.h     |   1 +
 gdb/common/common-utils.c    |   2 -
 gdb/common/filestuff.c       |   3 -
 gdb/common/format.c          |   2 -
 gdb/common/print-utils.c     |   2 -
 gdb/common/rsp-low.c         |   2 -
 gdb/common/signals.c         |   1 -
 gdb/common/vec.h             |   2 -
 gdb/common/xml-utils.c       |   2 -
 gdb/core-regset.c            |   1 -
 gdb/corefile.c               |   1 -
 gdb/corelow.c                |   1 -
 gdb/cp-abi.c                 |   2 -
 gdb/cp-name-parser.y         |   2 -
 gdb/cp-support.c             |   1 -
 gdb/cp-valprint.c            |   1 -
 gdb/cris-tdep.c              |   1 -
 gdb/d-exp.y                  |   1 -
 gdb/darwin-nat.c             |   1 -
 gdb/dbxread.c                |   2 -
 gdb/dcache.c                 |   1 -
 gdb/demangle.c               |   2 -
 gdb/dicos-tdep.c             |   1 -
 gdb/disasm.c                 |   1 -
 gdb/doublest.c               |   1 -
 gdb/dsrec.c                  |   1 -
 gdb/dummy-frame.c            |   1 -
 gdb/dwarf2-frame.c           |   2 -
 gdb/dwarf2loc.c              |   2 -
 gdb/dwarf2read.c             |   1 -
 gdb/elfread.c                |   1 -
 gdb/environ.c                |   1 -
 gdb/eval.c                   |   1 -
 gdb/event-loop.c             |   1 -
 gdb/exceptions.c             |   1 -
 gdb/exec.c                   |   2 -
 gdb/expprint.c               |   1 -
 gdb/f-exp.y                  |   1 -
 gdb/f-lang.c                 |   1 -
 gdb/f-typeprint.c            |   2 -
 gdb/f-valprint.c             |   1 -
 gdb/fbsd-nat.c               |   2 -
 gdb/findcmd.c                |   1 -
 gdb/findvar.c                |   1 -
 gdb/fork-child.c             |   1 -
 gdb/frame.c                  |   1 -
 gdb/frv-linux-tdep.c         |   1 -
 gdb/frv-tdep.c               |   1 -
 gdb/gdb.c                    |   1 -
 gdb/gdb_bfd.c                |   1 -
 gdb/gdbarch.c                |   2 -
 gdb/gdbarch.sh               |   2 -
 gdb/gdbserver/ChangeLog      |  10 ++
 gdb/gdbserver/event-loop.c   |   1 -
 gdb/gdbserver/linux-low.c    |   1 -
 gdb/gdbserver/regcache.c     |   2 -
 gdb/gdbserver/remote-utils.c |   2 -
 gdb/gdbserver/server.h       |   2 -
 gdb/gdbserver/spu-low.c      |   1 -
 gdb/gdbserver/utils.c        |   1 -
 gdb/gdbtypes.c               |   1 -
 gdb/gnu-nat.c                |   1 -
 gdb/gnu-v2-abi.c             |   1 -
 gdb/gnu-v3-abi.c             |   2 -
 gdb/go-exp.y                 |   1 -
 gdb/go-lang.c                |   1 -
 gdb/go32-nat.c               |   1 -
 gdb/guile/guile.c            |   1 -
 gdb/guile/scm-auto-load.c    |   1 -
 gdb/hppa-hpux-tdep.c         |   2 -
 gdb/hppa-linux-nat.c         |   1 -
 gdb/hppanbsd-tdep.c          |   2 -
 gdb/hppaobsd-tdep.c          |   2 -
 gdb/i386-cygwin-tdep.c       |   1 -
 gdb/i386-dicos-tdep.c        |   1 -
 gdb/i386-linux-tdep.c        |   2 -
 gdb/i386-nto-tdep.c          |   2 -
 gdb/i386-sol2-tdep.c         |   2 -
 gdb/i386-tdep.c              |   2 -
 gdb/i386bsd-tdep.c           |   2 -
 gdb/i386gnu-nat.c            |   2 -
 gdb/i386nbsd-tdep.c          |   2 -
 gdb/i386obsd-tdep.c          |   2 -
 gdb/i387-tdep.c              |   2 -
 gdb/ia64-libunwind-tdep.c    |   2 -
 gdb/ia64-linux-nat.c         |   1 -
 gdb/inf-child.c              |   1 -
 gdb/inf-ptrace.c             |   2 -
 gdb/inf-ttrace.c             |   2 -
 gdb/infcall.c                |   1 -
 gdb/infcmd.c                 |   1 -
 gdb/inflow.c                 |   2 -
 gdb/infrun.c                 |   1 -
 gdb/interps.c                |   1 -
 gdb/iq2000-tdep.c            |   1 -
 gdb/irix5-nat.c              |   2 -
 gdb/jv-exp.y                 |   1 -
 gdb/jv-lang.c                |   1 -
 gdb/jv-typeprint.c           |   1 -
 gdb/jv-valprint.c            |   2 -
 gdb/language.c               |   2 -
 gdb/linux-fork.c             |   1 -
 gdb/linux-nat.c              |   1 -
 gdb/lm32-tdep.c              |   2 -
 gdb/m2-exp.y                 |   1 -
 gdb/m2-typeprint.c           |   2 -
 gdb/m32c-tdep.c              |   1 -
 gdb/m32r-linux-nat.c         |   2 -
 gdb/m32r-linux-tdep.c        |   2 -
 gdb/m32r-rom.c               |   1 -
 gdb/m32r-tdep.c              |   1 -
 gdb/m68hc11-tdep.c           |   1 -
 gdb/m68k-tdep.c              |   1 -
 gdb/m68kbsd-tdep.c           |   2 -
 gdb/m68klinux-nat.c          |   1 -
 gdb/m68klinux-tdep.c         |   1 -
 gdb/m88k-tdep.c              |   2 -
 gdb/machoread.c              |   2 -
 gdb/macrocmd.c               |   1 -
 gdb/main.c                   |   2 -
 gdb/mdebugread.c             |   1 -
 gdb/mem-break.c              |   3 -
 gdb/memattr.c                |   1 -
 gdb/memory-map.c             |   2 -
 gdb/mep-tdep.c               |   1 -
 gdb/mi/mi-cmd-break.c        |   1 -
 gdb/mi/mi-cmd-disas.c        |   1 -
 gdb/mi/mi-cmd-env.c          |   2 -
 gdb/mi/mi-cmd-stack.c        |   1 -
 gdb/mi/mi-cmd-var.c          |   1 -
 gdb/mi/mi-cmds.c             |   1 -
 gdb/mi/mi-console.c          |   2 -
 gdb/mi/mi-getopt.c           |   2 -
 gdb/mi/mi-interp.c           |   1 -
 gdb/mi/mi-main.c             |   1 -
 gdb/mi/mi-parse.c            |   1 -
 gdb/microblaze-rom.c         |   1 -
 gdb/microblaze-tdep.c        |   1 -
 gdb/mingw-hdep.c             |   1 -
 gdb/minidebug.c              |   1 -
 gdb/minsyms.c                |   1 -
 gdb/mips-irix-tdep.c         |   1 -
 gdb/mips-linux-tdep.c        |   1 -
 gdb/mips-tdep.c              |   1 -
 gdb/mips64obsd-tdep.c        |   2 -
 gdb/mipsnbsd-tdep.c          |   2 -
 gdb/mipsread.c               |   1 -
 gdb/mn10300-linux-tdep.c     |   1 -
 gdb/mn10300-tdep.c           |   1 -
 gdb/monitor.c                |   1 -
 gdb/moxie-tdep.c             |   1 -
 gdb/mt-tdep.c                |   1 -
 gdb/nat/linux-btrace.c       |   1 -
 gdb/nat/linux-osdata.c       |   1 -
 gdb/nat/linux-procfs.c       |   1 -
 gdb/nat/linux-ptrace.c       |   1 -
 gdb/nat/linux-waitpid.c      |   2 -
 gdb/nbsd-tdep.c              |   1 -
 gdb/nios2-linux-tdep.c       |   1 -
 gdb/nto-procfs.c             |   1 -
 gdb/nto-tdep.c               |   1 -
 gdb/objc-lang.c              |   1 -
 gdb/objfiles.c               |   1 -
 gdb/opencl-lang.c            |   1 -
 gdb/osabi.c                  |   2 -
 gdb/osdata.c                 |   1 -
 gdb/p-exp.y                  |   1 -
 gdb/p-lang.c                 |   1 -
 gdb/p-typeprint.c            |   1 -
 gdb/parse.c                  |   1 -
 gdb/posix-hdep.c             |   2 -
 gdb/ppc-linux-nat.c          |   1 -
 gdb/ppc-sysv-tdep.c          |   1 -
 gdb/ppcfbsd-tdep.c           |   2 -
 gdb/ppcnbsd-tdep.c           |   2 -
 gdb/ppcobsd-tdep.c           |   2 -
 gdb/printcmd.c               |   1 -
 gdb/procfs.c                 |   1 -
 gdb/prologue-value.c         |   1 -
 gdb/python/py-auto-load.c    |   1 -
 gdb/python/py-gdb-readline.c |   2 -
 gdb/ravenscar-thread.c       |   1 -
 gdb/regcache.c               |   1 -
 gdb/registry.c               |   2 -
 gdb/remote-fileio.c          |   1 -
 gdb/remote-m32r-sdi.c        |   1 -
 gdb/remote-mips.c            |   1 -
 gdb/remote-notif.c           |   2 -
 gdb/remote-sim.c             |   1 -
 gdb/remote.c                 |   1 -
 gdb/reverse.c                |   1 -
 gdb/rs6000-aix-tdep.c        |   1 -
 gdb/ser-base.c               |   1 -
 gdb/ser-go32.c               |   3 -
 gdb/ser-mingw.c              |   2 -
 gdb/ser-pipe.c               |   1 -
 gdb/ser-tcp.c                |   1 -
 gdb/ser-unix.c               |   1 -
 gdb/serial.c                 |   1 -
 gdb/sh-tdep.c                |   1 -
 gdb/sh64-tdep.c              |   1 -
 gdb/shnbsd-tdep.c            |   2 -
 gdb/skip.c                   |   1 -
 gdb/sol-thread.c             |   1 -
 gdb/solib-dsbt.c             |   1 -
 gdb/solib-frv.c              |   1 -
 gdb/solib-osf.c              |   2 -
 gdb/solib-som.c              |   2 -
 gdb/solib-spu.c              |   1 -
 gdb/solib-target.c           |   2 -
 gdb/solib.c                  |   1 -
 gdb/somread.c                |   1 -
 gdb/source.c                 |   1 -
 gdb/sparc-nat.c              |   1 -
 gdb/sparc-sol2-tdep.c        |   2 -
 gdb/sparc-tdep.c             |   2 -
 gdb/sparc64-tdep.c           |   2 -
 gdb/sparc64fbsd-tdep.c       |   2 -
 gdb/sparc64nbsd-tdep.c       |   2 -
 gdb/sparcnbsd-tdep.c         |   2 -
 gdb/spu-linux-nat.c          |   1 -
 gdb/spu-multiarch.c          |   1 -
 gdb/spu-tdep.c               |   1 -
 gdb/stabsread.c              |   1 -
 gdb/stack.c                  |   2 -
 gdb/std-regs.c               |   3 -
 gdb/symfile.c                |   1 -
 gdb/symmisc.c                |   2 -
 gdb/symtab.c                 |   1 -
 gdb/target.c                 |   1 -
 gdb/thread.c                 |   1 -
 gdb/tilegx-linux-nat.c       |   2 -
 gdb/tilegx-tdep.c            |   1 -
 gdb/top.c                    |   1 -
 gdb/tracepoint.c             |   1 -
 gdb/tui/tui-command.c        |   3 -
 gdb/tui/tui-data.c           |   2 -
 gdb/tui/tui-disasm.c         |   1 -
 gdb/tui/tui-file.c           |   2 -
 gdb/tui/tui-layout.c         |   2 -
 gdb/tui/tui-out.c            |   2 -
 gdb/tui/tui-regs.c           |   1 -
 gdb/tui/tui-source.c         |   2 -
 gdb/tui/tui-stack.c          |   1 -
 gdb/tui/tui-win.c            |   2 -
 gdb/tui/tui-windata.c        |   2 -
 gdb/tui/tui-winsource.c      |   2 -
 gdb/typeprint.c              |   1 -
 gdb/ui-file.c                |   1 -
 gdb/ui-out.c                 |   1 -
 gdb/user-regs.c              |   1 -
 gdb/utils.c                  |   1 -
 gdb/v850-tdep.c              |   1 -
 gdb/valarith.c               |   1 -
 gdb/valops.c                 |   1 -
 gdb/valprint.c               |   1 -
 gdb/value.c                  |   1 -
 gdb/varobj.c                 |   2 -
 gdb/vax-tdep.c               |   2 -
 gdb/vaxnbsd-tdep.c           |   2 -
 gdb/vaxobsd-tdep.c           |   2 -
 gdb/windows-nat.c            |   1 -
 gdb/xcoffread.c              |   2 -
 gdb/xml-support.c            |   2 -
 gdb/xstormy16-tdep.c         |   1 -
 gdb/xtensa-linux-nat.c       |   1 -
 321 files changed, 327 insertions(+), 439 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c256da9cf39..8cb54b0ad21 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,319 @@
+2014-08-07  Gary Benson  <gbenson@redhat.com>
+
+	* common/common-defs.h: Include string.h.
+	* aarch64-tdep.c: Do not include string.h.
+	* ada-exp.y: Likewise.
+	* ada-lang.c: Likewise.
+	* ada-lex.l: Likewise.
+	* ada-typeprint.c: Likewise.
+	* ada-valprint.c: Likewise.
+	* aix-thread.c: Likewise.
+	* alpha-linux-tdep.c: Likewise.
+	* alpha-mdebug-tdep.c: Likewise.
+	* alpha-nat.c: Likewise.
+	* alpha-osf1-tdep.c: Likewise.
+	* alpha-tdep.c: Likewise.
+	* alphanbsd-tdep.c: Likewise.
+	* amd64-dicos-tdep.c: Likewise.
+	* amd64-linux-tdep.c: Likewise.
+	* amd64-nat.c: Likewise.
+	* amd64-sol2-tdep.c: Likewise.
+	* amd64fbsd-tdep.c: Likewise.
+	* amd64obsd-tdep.c: Likewise.
+	* arch-utils.c: Likewise.
+	* arm-linux-nat.c: Likewise.
+	* arm-linux-tdep.c: Likewise.
+	* arm-tdep.c: Likewise.
+	* arm-wince-tdep.c: Likewise.
+	* armbsd-tdep.c: Likewise.
+	* armnbsd-nat.c: Likewise.
+	* armnbsd-tdep.c: Likewise.
+	* armobsd-tdep.c: Likewise.
+	* avr-tdep.c: Likewise.
+	* ax-gdb.c: Likewise.
+	* ax-general.c: Likewise.
+	* bcache.c: Likewise.
+	* bfin-tdep.c: Likewise.
+	* breakpoint.c: Likewise.
+	* build-id.c: Likewise.
+	* buildsym.c: Likewise.
+	* c-exp.y: Likewise.
+	* c-lang.c: Likewise.
+	* c-typeprint.c: Likewise.
+	* c-valprint.c: Likewise.
+	* charset.c: Likewise.
+	* cli-out.c: Likewise.
+	* cli/cli-cmds.c: Likewise.
+	* cli/cli-decode.c: Likewise.
+	* cli/cli-dump.c: Likewise.
+	* cli/cli-interp.c: Likewise.
+	* cli/cli-logging.c: Likewise.
+	* cli/cli-script.c: Likewise.
+	* cli/cli-setshow.c: Likewise.
+	* cli/cli-utils.c: Likewise.
+	* coffread.c: Likewise.
+	* common/agent.c: Likewise.
+	* common/buffer.c: Likewise.
+	* common/buffer.h: Likewise.
+	* common/common-utils.c: Likewise.
+	* common/filestuff.c: Likewise.
+	* common/filestuff.c: Likewise.
+	* common/format.c: Likewise.
+	* common/print-utils.c: Likewise.
+	* common/rsp-low.c: Likewise.
+	* common/signals.c: Likewise.
+	* common/vec.h: Likewise.
+	* common/xml-utils.c: Likewise.
+	* core-regset.c: Likewise.
+	* corefile.c: Likewise.
+	* corelow.c: Likewise.
+	* cp-abi.c: Likewise.
+	* cp-name-parser.y: Likewise.
+	* cp-support.c: Likewise.
+	* cp-valprint.c: Likewise.
+	* cris-tdep.c: Likewise.
+	* d-exp.y: Likewise.
+	* darwin-nat.c: Likewise.
+	* dbxread.c: Likewise.
+	* dcache.c: Likewise.
+	* demangle.c: Likewise.
+	* dicos-tdep.c: Likewise.
+	* disasm.c: Likewise.
+	* doublest.c: Likewise.
+	* dsrec.c: Likewise.
+	* dummy-frame.c: Likewise.
+	* dwarf2-frame.c: Likewise.
+	* dwarf2loc.c: Likewise.
+	* dwarf2read.c: Likewise.
+	* elfread.c: Likewise.
+	* environ.c: Likewise.
+	* eval.c: Likewise.
+	* event-loop.c: Likewise.
+	* exceptions.c: Likewise.
+	* exec.c: Likewise.
+	* expprint.c: Likewise.
+	* f-exp.y: Likewise.
+	* f-lang.c: Likewise.
+	* f-typeprint.c: Likewise.
+	* f-valprint.c: Likewise.
+	* fbsd-nat.c: Likewise.
+	* findcmd.c: Likewise.
+	* findvar.c: Likewise.
+	* fork-child.c: Likewise.
+	* frame.c: Likewise.
+	* frv-linux-tdep.c: Likewise.
+	* frv-tdep.c: Likewise.
+	* gdb.c: Likewise.
+	* gdb_bfd.c: Likewise.
+	* gdbarch.c: Likewise.
+	* gdbarch.sh: Likewise.
+	* gdbtypes.c: Likewise.
+	* gnu-nat.c: Likewise.
+	* gnu-v2-abi.c: Likewise.
+	* gnu-v3-abi.c: Likewise.
+	* go-exp.y: Likewise.
+	* go-lang.c: Likewise.
+	* go32-nat.c: Likewise.
+	* guile/guile.c: Likewise.
+	* guile/scm-auto-load.c: Likewise.
+	* hppa-hpux-tdep.c: Likewise.
+	* hppa-linux-nat.c: Likewise.
+	* hppanbsd-tdep.c: Likewise.
+	* hppaobsd-tdep.c: Likewise.
+	* i386-cygwin-tdep.c: Likewise.
+	* i386-dicos-tdep.c: Likewise.
+	* i386-linux-tdep.c: Likewise.
+	* i386-nto-tdep.c: Likewise.
+	* i386-sol2-tdep.c: Likewise.
+	* i386-tdep.c: Likewise.
+	* i386bsd-tdep.c: Likewise.
+	* i386gnu-nat.c: Likewise.
+	* i386nbsd-tdep.c: Likewise.
+	* i386obsd-tdep.c: Likewise.
+	* i387-tdep.c: Likewise.
+	* ia64-libunwind-tdep.c: Likewise.
+	* ia64-linux-nat.c: Likewise.
+	* inf-child.c: Likewise.
+	* inf-ptrace.c: Likewise.
+	* inf-ttrace.c: Likewise.
+	* infcall.c: Likewise.
+	* infcmd.c: Likewise.
+	* inflow.c: Likewise.
+	* infrun.c: Likewise.
+	* interps.c: Likewise.
+	* iq2000-tdep.c: Likewise.
+	* irix5-nat.c: Likewise.
+	* jv-exp.y: Likewise.
+	* jv-lang.c: Likewise.
+	* jv-typeprint.c: Likewise.
+	* jv-valprint.c: Likewise.
+	* language.c: Likewise.
+	* linux-fork.c: Likewise.
+	* linux-nat.c: Likewise.
+	* lm32-tdep.c: Likewise.
+	* m2-exp.y: Likewise.
+	* m2-typeprint.c: Likewise.
+	* m32c-tdep.c: Likewise.
+	* m32r-linux-nat.c: Likewise.
+	* m32r-linux-tdep.c: Likewise.
+	* m32r-rom.c: Likewise.
+	* m32r-tdep.c: Likewise.
+	* m68hc11-tdep.c: Likewise.
+	* m68k-tdep.c: Likewise.
+	* m68kbsd-tdep.c: Likewise.
+	* m68klinux-nat.c: Likewise.
+	* m68klinux-tdep.c: Likewise.
+	* m88k-tdep.c: Likewise.
+	* machoread.c: Likewise.
+	* macrocmd.c: Likewise.
+	* main.c: Likewise.
+	* mdebugread.c: Likewise.
+	* mem-break.c: Likewise.
+	* memattr.c: Likewise.
+	* memory-map.c: Likewise.
+	* mep-tdep.c: Likewise.
+	* mi/mi-cmd-break.c: Likewise.
+	* mi/mi-cmd-disas.c: Likewise.
+	* mi/mi-cmd-env.c: Likewise.
+	* mi/mi-cmd-stack.c: Likewise.
+	* mi/mi-cmd-var.c: Likewise.
+	* mi/mi-cmds.c: Likewise.
+	* mi/mi-console.c: Likewise.
+	* mi/mi-getopt.c: Likewise.
+	* mi/mi-interp.c: Likewise.
+	* mi/mi-main.c: Likewise.
+	* mi/mi-parse.c: Likewise.
+	* microblaze-rom.c: Likewise.
+	* microblaze-tdep.c: Likewise.
+	* mingw-hdep.c: Likewise.
+	* minidebug.c: Likewise.
+	* minsyms.c: Likewise.
+	* mips-irix-tdep.c: Likewise.
+	* mips-linux-tdep.c: Likewise.
+	* mips-tdep.c: Likewise.
+	* mips64obsd-tdep.c: Likewise.
+	* mipsnbsd-tdep.c: Likewise.
+	* mipsread.c: Likewise.
+	* mn10300-linux-tdep.c: Likewise.
+	* mn10300-tdep.c: Likewise.
+	* monitor.c: Likewise.
+	* moxie-tdep.c: Likewise.
+	* mt-tdep.c: Likewise.
+	* nat/linux-btrace.c: Likewise.
+	* nat/linux-osdata.c: Likewise.
+	* nat/linux-procfs.c: Likewise.
+	* nat/linux-ptrace.c: Likewise.
+	* nat/linux-waitpid.c: Likewise.
+	* nbsd-tdep.c: Likewise.
+	* nios2-linux-tdep.c: Likewise.
+	* nto-procfs.c: Likewise.
+	* nto-tdep.c: Likewise.
+	* objc-lang.c: Likewise.
+	* objfiles.c: Likewise.
+	* opencl-lang.c: Likewise.
+	* osabi.c: Likewise.
+	* osdata.c: Likewise.
+	* p-exp.y: Likewise.
+	* p-lang.c: Likewise.
+	* p-typeprint.c: Likewise.
+	* parse.c: Likewise.
+	* posix-hdep.c: Likewise.
+	* ppc-linux-nat.c: Likewise.
+	* ppc-sysv-tdep.c: Likewise.
+	* ppcfbsd-tdep.c: Likewise.
+	* ppcnbsd-tdep.c: Likewise.
+	* ppcobsd-tdep.c: Likewise.
+	* printcmd.c: Likewise.
+	* procfs.c: Likewise.
+	* prologue-value.c: Likewise.
+	* python/py-auto-load.c: Likewise.
+	* python/py-gdb-readline.c: Likewise.
+	* ravenscar-thread.c: Likewise.
+	* regcache.c: Likewise.
+	* registry.c: Likewise.
+	* remote-fileio.c: Likewise.
+	* remote-m32r-sdi.c: Likewise.
+	* remote-mips.c: Likewise.
+	* remote-notif.c: Likewise.
+	* remote-sim.c: Likewise.
+	* remote.c: Likewise.
+	* reverse.c: Likewise.
+	* rs6000-aix-tdep.c: Likewise.
+	* ser-base.c: Likewise.
+	* ser-go32.c: Likewise.
+	* ser-mingw.c: Likewise.
+	* ser-pipe.c: Likewise.
+	* ser-tcp.c: Likewise.
+	* ser-unix.c: Likewise.
+	* serial.c: Likewise.
+	* sh-tdep.c: Likewise.
+	* sh64-tdep.c: Likewise.
+	* shnbsd-tdep.c: Likewise.
+	* skip.c: Likewise.
+	* sol-thread.c: Likewise.
+	* solib-dsbt.c: Likewise.
+	* solib-frv.c: Likewise.
+	* solib-osf.c: Likewise.
+	* solib-som.c: Likewise.
+	* solib-spu.c: Likewise.
+	* solib-target.c: Likewise.
+	* solib.c: Likewise.
+	* somread.c: Likewise.
+	* source.c: Likewise.
+	* sparc-nat.c: Likewise.
+	* sparc-sol2-tdep.c: Likewise.
+	* sparc-tdep.c: Likewise.
+	* sparc64-tdep.c: Likewise.
+	* sparc64fbsd-tdep.c: Likewise.
+	* sparc64nbsd-tdep.c: Likewise.
+	* sparcnbsd-tdep.c: Likewise.
+	* spu-linux-nat.c: Likewise.
+	* spu-multiarch.c: Likewise.
+	* spu-tdep.c: Likewise.
+	* stabsread.c: Likewise.
+	* stack.c: Likewise.
+	* std-regs.c: Likewise.
+	* symfile.c: Likewise.
+	* symmisc.c: Likewise.
+	* symtab.c: Likewise.
+	* target.c: Likewise.
+	* thread.c: Likewise.
+	* tilegx-linux-nat.c: Likewise.
+	* tilegx-tdep.c: Likewise.
+	* top.c: Likewise.
+	* tracepoint.c: Likewise.
+	* tui/tui-command.c: Likewise.
+	* tui/tui-data.c: Likewise.
+	* tui/tui-disasm.c: Likewise.
+	* tui/tui-file.c: Likewise.
+	* tui/tui-layout.c: Likewise.
+	* tui/tui-out.c: Likewise.
+	* tui/tui-regs.c: Likewise.
+	* tui/tui-source.c: Likewise.
+	* tui/tui-stack.c: Likewise.
+	* tui/tui-win.c: Likewise.
+	* tui/tui-windata.c: Likewise.
+	* tui/tui-winsource.c: Likewise.
+	* typeprint.c: Likewise.
+	* ui-file.c: Likewise.
+	* ui-out.c: Likewise.
+	* user-regs.c: Likewise.
+	* utils.c: Likewise.
+	* v850-tdep.c: Likewise.
+	* valarith.c: Likewise.
+	* valops.c: Likewise.
+	* valprint.c: Likewise.
+	* value.c: Likewise.
+	* varobj.c: Likewise.
+	* vax-tdep.c: Likewise.
+	* vaxnbsd-tdep.c: Likewise.
+	* vaxobsd-tdep.c: Likewise.
+	* windows-nat.c: Likewise.
+	* xcoffread.c: Likewise.
+	* xml-support.c: Likewise.
+	* xstormy16-tdep.c: Likewise.
+	* xtensa-linux-nat.c: Likewise.
+
 2014-08-07  Gary Benson  <gbenson@redhat.com>
 
 	* common/common-defs.h: Include gdb_assert.h.
diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c
index 445d7b9b2f7..1898f6b8d2b 100644
--- a/gdb/aarch64-tdep.c
+++ b/gdb/aarch64-tdep.c
@@ -24,7 +24,6 @@
 #include "inferior.h"
 #include "gdbcmd.h"
 #include "gdbcore.h"
-#include <string.h>
 #include "dis-asm.h"
 #include "regcache.h"
 #include "reggroups.h"
diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y
index 96188acb075..bb1a767ecff 100644
--- a/gdb/ada-exp.y
+++ b/gdb/ada-exp.y
@@ -36,7 +36,6 @@
 %{
 
 #include "defs.h"
-#include <string.h>
 #include <ctype.h>
 #include "expression.h"
 #include "value.h"
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 5297fd3f94c..32f1b39340c 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -19,7 +19,6 @@
 
 
 #include "defs.h"
-#include <string.h>
 #include <ctype.h>
 #include "demangle.h"
 #include "gdb_regex.h"
diff --git a/gdb/ada-lex.l b/gdb/ada-lex.l
index 96320738442..c50f5a83bdb 100644
--- a/gdb/ada-lex.l
+++ b/gdb/ada-lex.l
@@ -291,8 +291,6 @@ false		{ return FALSEKEYWORD; }
 %%
 
 #include <ctype.h>
-#include <string.h>
-
 /* Initialize the lexer for processing new expression. */
 
 static void
diff --git a/gdb/ada-typeprint.c b/gdb/ada-typeprint.c
index 09ff7444099..a43ced7cfb7 100644
--- a/gdb/ada-typeprint.c
+++ b/gdb/ada-typeprint.c
@@ -34,7 +34,6 @@
 #include "ada-lang.h"
 
 #include <ctype.h>
-#include <string.h>
 #include <errno.h>
 
 static int print_selected_record_field_types (struct type *, struct type *,
diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
index b7b3a9ccfb6..ed1eac4dbbd 100644
--- a/gdb/ada-valprint.c
+++ b/gdb/ada-valprint.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include <ctype.h>
-#include <string.h>
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "expression.h"
diff --git a/gdb/aix-thread.c b/gdb/aix-thread.c
index 1eb885bed87..0dbd9aecf43 100644
--- a/gdb/aix-thread.c
+++ b/gdb/aix-thread.c
@@ -46,7 +46,6 @@
 #include "regcache.h"
 #include "gdbcmd.h"
 #include "ppc-tdep.h"
-#include <string.h>
 #include "observer.h"
 #include "objfiles.h"
 
diff --git a/gdb/alpha-linux-tdep.c b/gdb/alpha-linux-tdep.c
index 3d13a75d1cf..a571fd96473 100644
--- a/gdb/alpha-linux-tdep.c
+++ b/gdb/alpha-linux-tdep.c
@@ -18,7 +18,6 @@
 
 #include "defs.h"
 #include "frame.h"
-#include <string.h>
 #include "osabi.h"
 #include "solib-svr4.h"
 #include "symtab.h"
diff --git a/gdb/alpha-mdebug-tdep.c b/gdb/alpha-mdebug-tdep.c
index 4cf0eb93c8a..2f0b30c1c08 100644
--- a/gdb/alpha-mdebug-tdep.c
+++ b/gdb/alpha-mdebug-tdep.c
@@ -23,7 +23,6 @@
 #include "symtab.h"
 #include "gdbcore.h"
 #include "block.h"
-#include <string.h>
 #include "trad-frame.h"
 
 #include "alpha-tdep.h"
diff --git a/gdb/alpha-nat.c b/gdb/alpha-nat.c
index 4739cac67c1..88ff62de017 100644
--- a/gdb/alpha-nat.c
+++ b/gdb/alpha-nat.c
@@ -17,7 +17,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include <string.h>
 #include "inferior.h"
 #include "gdbcore.h"
 #include "target.h"
diff --git a/gdb/alpha-osf1-tdep.c b/gdb/alpha-osf1-tdep.c
index 43bae959c6a..c88be62dd80 100644
--- a/gdb/alpha-osf1-tdep.c
+++ b/gdb/alpha-osf1-tdep.c
@@ -21,7 +21,6 @@
 #include "gdbcore.h"
 #include "value.h"
 #include "osabi.h"
-#include <string.h>
 #include "objfiles.h"
 
 #include "alpha-tdep.h"
diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c
index 159a7e92b6c..9e4a8d89f19 100644
--- a/gdb/alpha-tdep.c
+++ b/gdb/alpha-tdep.c
@@ -31,7 +31,6 @@
 #include "dis-asm.h"
 #include "symfile.h"
 #include "objfiles.h"
-#include <string.h>
 #include "linespec.h"
 #include "regcache.h"
 #include "reggroups.h"
diff --git a/gdb/alphanbsd-tdep.c b/gdb/alphanbsd-tdep.c
index 8e237c0249f..a4dd6e90345 100644
--- a/gdb/alphanbsd-tdep.c
+++ b/gdb/alphanbsd-tdep.c
@@ -27,8 +27,6 @@
 #include "regset.h"
 #include "value.h"
 
-#include <string.h>
-
 #include "alpha-tdep.h"
 #include "alphabsd-tdep.h"
 #include "nbsd-tdep.h"
diff --git a/gdb/amd64-dicos-tdep.c b/gdb/amd64-dicos-tdep.c
index 35d783c601f..4fc8da591be 100644
--- a/gdb/amd64-dicos-tdep.c
+++ b/gdb/amd64-dicos-tdep.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include "osabi.h"
-#include <string.h>
 #include "amd64-tdep.h"
 #include "dicos-tdep.h"
 
diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c
index 9699c12d5e7..97a2890ee20 100644
--- a/gdb/amd64-linux-tdep.c
+++ b/gdb/amd64-linux-tdep.c
@@ -33,8 +33,6 @@
 #include "linux-tdep.h"
 #include "i386-xstate.h"
 
-#include <string.h>
-
 #include "amd64-tdep.h"
 #include "solib-svr4.h"
 #include "xml-syscall.h"
diff --git a/gdb/amd64-nat.c b/gdb/amd64-nat.c
index 943f0ec8cc2..17552a6b81b 100644
--- a/gdb/amd64-nat.c
+++ b/gdb/amd64-nat.c
@@ -21,8 +21,6 @@
 #include "gdbarch.h"
 #include "regcache.h"
 
-#include <string.h>
-
 #include "i386-tdep.h"
 #include "amd64-tdep.h"
 #include "amd64-nat.h"
diff --git a/gdb/amd64-sol2-tdep.c b/gdb/amd64-sol2-tdep.c
index b76d5f3b078..beb2007f945 100644
--- a/gdb/amd64-sol2-tdep.c
+++ b/gdb/amd64-sol2-tdep.c
@@ -26,8 +26,6 @@
 #include "osabi.h"
 #include "symtab.h"
 
-#include <string.h>
-
 #include "sol2-tdep.h"
 #include "amd64-tdep.h"
 #include "solib-svr4.h"
diff --git a/gdb/amd64fbsd-tdep.c b/gdb/amd64fbsd-tdep.c
index 6ecf20bbee4..07b065ad725 100644
--- a/gdb/amd64fbsd-tdep.c
+++ b/gdb/amd64fbsd-tdep.c
@@ -24,8 +24,6 @@
 #include "regcache.h"
 #include "osabi.h"
 
-#include <string.h>
-
 #include "amd64-tdep.h"
 #include "bsd-uthread.h"
 #include "solib-svr4.h"
diff --git a/gdb/amd64obsd-tdep.c b/gdb/amd64obsd-tdep.c
index 4cb981f2f92..ef0c0c2f853 100644
--- a/gdb/amd64obsd-tdep.c
+++ b/gdb/amd64obsd-tdep.c
@@ -29,8 +29,6 @@
 #include "target.h"
 #include "trad-frame.h"
 
-#include <string.h>
-
 #include "obsd-tdep.h"
 #include "amd64-tdep.h"
 #include "i387-tdep.h"
diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index 177203303a4..5ae9fb35588 100644
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -24,7 +24,6 @@
 #include "gdbcmd.h"
 #include "inferior.h"		/* enum CALL_DUMMY_LOCATION et al.  */
 #include "infrun.h"
-#include <string.h>
 #include "regcache.h"
 #include "sim-regno.h"
 #include "gdbcore.h"
diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c
index 2d2afb2898d..96c67a87dd0 100644
--- a/gdb/arm-linux-nat.c
+++ b/gdb/arm-linux-nat.c
@@ -19,7 +19,6 @@
 #include "defs.h"
 #include "inferior.h"
 #include "gdbcore.h"
-#include <string.h>
 #include "regcache.h"
 #include "target.h"
 #include "linux-nat.h"
diff --git a/gdb/arm-linux-tdep.c b/gdb/arm-linux-tdep.c
index 4e17abddc70..3d524c9b9d3 100644
--- a/gdb/arm-linux-tdep.c
+++ b/gdb/arm-linux-tdep.c
@@ -54,8 +54,6 @@
 #include "user-regs.h"
 #include <ctype.h>
 #include "elf/common.h"
-#include <string.h>
-
 extern int arm_apcs_32;
 
 /* Under ARM GNU/Linux the traditional way of performing a breakpoint
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index f9b91750f39..b746eeee4d2 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -26,7 +26,6 @@
 #include "infrun.h"
 #include "gdbcmd.h"
 #include "gdbcore.h"
-#include <string.h>
 #include "dis-asm.h"		/* For register styles.  */
 #include "regcache.h"
 #include "reggroups.h"
diff --git a/gdb/arm-wince-tdep.c b/gdb/arm-wince-tdep.c
index a2a53726d5d..24f0e5b8935 100644
--- a/gdb/arm-wince-tdep.c
+++ b/gdb/arm-wince-tdep.c
@@ -24,8 +24,6 @@
 #include "target.h"
 #include "frame.h"
 
-#include <string.h>
-
 #include "arm-tdep.h"
 #include "windows-tdep.h"
 
diff --git a/gdb/armbsd-tdep.c b/gdb/armbsd-tdep.c
index b0c952b0e0c..62e82b8e6d8 100644
--- a/gdb/armbsd-tdep.c
+++ b/gdb/armbsd-tdep.c
@@ -22,8 +22,6 @@
 #include "regcache.h"
 #include "regset.h"
 
-#include <string.h>
-
 #include "arm-tdep.h"
 
 /* Core file support.  */
diff --git a/gdb/armnbsd-nat.c b/gdb/armnbsd-nat.c
index de3f94d24ac..d497b89a4cc 100644
--- a/gdb/armnbsd-nat.c
+++ b/gdb/armnbsd-nat.c
@@ -22,8 +22,6 @@
 #include "inferior.h"
 #include "regcache.h"
 #include "target.h"
-
-#include <string.h>
 #include <sys/types.h>
 #include <sys/ptrace.h>
 #include <machine/reg.h>
diff --git a/gdb/armnbsd-tdep.c b/gdb/armnbsd-tdep.c
index 91a9d0d32f4..5f16a022a0e 100644
--- a/gdb/armnbsd-tdep.c
+++ b/gdb/armnbsd-tdep.c
@@ -20,8 +20,6 @@
 #include "defs.h"
 #include "osabi.h"
 
-#include <string.h>
-
 #include "arm-tdep.h"
 #include "solib-svr4.h"
 
diff --git a/gdb/armobsd-tdep.c b/gdb/armobsd-tdep.c
index e4f5948405f..f4904a30930 100644
--- a/gdb/armobsd-tdep.c
+++ b/gdb/armobsd-tdep.c
@@ -22,8 +22,6 @@
 #include "trad-frame.h"
 #include "tramp-frame.h"
 
-#include <string.h>
-
 #include "obsd-tdep.h"
 #include "arm-tdep.h"
 #include "solib-svr4.h"
diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c
index 1f268f25639..d2b5f5f38b2 100644
--- a/gdb/avr-tdep.c
+++ b/gdb/avr-tdep.c
@@ -34,7 +34,6 @@
 #include "symfile.h"
 #include "arch-utils.h"
 #include "regcache.h"
-#include <string.h>
 #include "dis-asm.h"
 #include "objfiles.h"
 
diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c
index f359317f55c..a60603f7b65 100644
--- a/gdb/ax-gdb.c
+++ b/gdb/ax-gdb.c
@@ -30,7 +30,6 @@
 #include "target.h"
 #include "ax.h"
 #include "ax-gdb.h"
-#include <string.h>
 #include "block.h"
 #include "regcache.h"
 #include "user-regs.h"
diff --git a/gdb/ax-general.c b/gdb/ax-general.c
index 8378ad6fb0a..cdb14807605 100644
--- a/gdb/ax-general.c
+++ b/gdb/ax-general.c
@@ -25,8 +25,6 @@
 #include "ax.h"
 
 #include "value.h"
-#include <string.h>
-
 #include "user-regs.h"
 
 static void grow_expr (struct agent_expr *x, int n);
diff --git a/gdb/bcache.c b/gdb/bcache.c
index 2adfcd48d5e..ac14ba4d4fc 100644
--- a/gdb/bcache.c
+++ b/gdb/bcache.c
@@ -22,7 +22,6 @@
 #include "defs.h"
 #include "gdb_obstack.h"
 #include "bcache.h"
-#include <string.h>		/* For memcpy declaration */
 
 /* The type used to hold a single bcache string.  The user data is
    stored in d.data.  Since it can be any type, it needs to have the
diff --git a/gdb/bfin-tdep.c b/gdb/bfin-tdep.c
index 2e5dbde961f..4ea5be7adde 100644
--- a/gdb/bfin-tdep.c
+++ b/gdb/bfin-tdep.c
@@ -20,7 +20,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include <string.h>
 #include "inferior.h"
 #include "gdbcore.h"
 #include "arch-utils.h"
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 0007273a525..683ed2b9b63 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -36,7 +36,6 @@
 #include "gdbthread.h"
 #include "target.h"
 #include "language.h"
-#include <string.h>
 #include "gdb-demangle.h"
 #include "filenames.h"
 #include "annotate.h"
diff --git a/gdb/build-id.c b/gdb/build-id.c
index 491900b3e54..0f553cef298 100644
--- a/gdb/build-id.c
+++ b/gdb/build-id.c
@@ -22,7 +22,6 @@
 #include "elf-bfd.h"
 #include "gdb_bfd.h"
 #include "build-id.h"
-#include <string.h>
 #include "gdb_vecs.h"
 #include "symfile.h"
 #include "objfiles.h"
diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index 8fc7b75c969..2b00a1a1f7b 100644
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -31,7 +31,6 @@
 #include "objfiles.h"
 #include "gdbtypes.h"
 #include "complaints.h"
-#include <string.h>
 #include "expression.h"		/* For "enum exp_opcode" used by...  */
 #include "bcache.h"
 #include "filenames.h"		/* For DOSish file names.  */
diff --git a/gdb/c-exp.y b/gdb/c-exp.y
index 714e02ef918..56400cee93f 100644
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -36,7 +36,6 @@
 %{
 
 #include "defs.h"
-#include <string.h>
 #include <ctype.h>
 #include "expression.h"
 #include "value.h"
diff --git a/gdb/c-lang.c b/gdb/c-lang.c
index e647ff6f47a..185b38ed0c9 100644
--- a/gdb/c-lang.c
+++ b/gdb/c-lang.c
@@ -28,7 +28,6 @@
 #include "valprint.h"
 #include "macroscope.h"
 #include "charset.h"
-#include <string.h>
 #include "demangle.h"
 #include "cp-abi.h"
 #include "cp-support.h"
diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
index 305f92d5882..5239505b202 100644
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -31,7 +31,6 @@
 #include "typeprint.h"
 #include "cp-abi.h"
 #include "jv-lang.h"
-#include <string.h>
 #include <errno.h>
 #include "cp-support.h"
 
diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c
index f4694b07ca8..19c1cb13320 100644
--- a/gdb/c-valprint.c
+++ b/gdb/c-valprint.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include <string.h>
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "expression.h"
diff --git a/gdb/charset.c b/gdb/charset.c
index 0ce86cf32ca..bc7bd6593e4 100644
--- a/gdb/charset.c
+++ b/gdb/charset.c
@@ -27,8 +27,6 @@
 #include "environ.h"
 #include "arch-utils.h"
 #include "gdb_vecs.h"
-
-#include <string.h>
 #include <ctype.h>
 
 #ifdef USE_WIN32API
diff --git a/gdb/cli-out.c b/gdb/cli-out.c
index 54353851521..4961d8a2eb3 100644
--- a/gdb/cli-out.c
+++ b/gdb/cli-out.c
@@ -23,7 +23,6 @@
 #include "defs.h"
 #include "ui-out.h"
 #include "cli-out.h"
-#include <string.h>
 #include "vec.h"
 
 typedef struct cli_ui_out_data cli_out_data;
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 2e08a5c39d9..b415267d888 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -27,7 +27,6 @@
 #include "target.h"	/* For baud_rate, remote_debug and remote_timeout.  */
 #include "gdb_wait.h"	/* For shell escape implementation.  */
 #include "gdb_regex.h"	/* Used by apropos_command.  */
-#include <string.h>
 #include "gdb_vfork.h"
 #include "linespec.h"
 #include "expression.h"
diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c
index 43e1babe2d2..c409d9c3d1c 100644
--- a/gdb/cli/cli-decode.c
+++ b/gdb/cli/cli-decode.c
@@ -19,7 +19,6 @@
 #include "symtab.h"
 #include <ctype.h>
 #include "gdb_regex.h"
-#include <string.h>
 #include "completer.h"
 #include "ui-out.h"
 #include "cli/cli-cmds.h"
diff --git a/gdb/cli/cli-dump.c b/gdb/cli/cli-dump.c
index b643be43d71..c093cd489c4 100644
--- a/gdb/cli/cli-dump.c
+++ b/gdb/cli/cli-dump.c
@@ -20,7 +20,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include <string.h>
 #include "cli/cli-decode.h"
 #include "cli/cli-cmds.h"
 #include "value.h"
diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c
index dc09b24bb16..9b2aaaa669d 100644
--- a/gdb/cli/cli-interp.c
+++ b/gdb/cli/cli-interp.c
@@ -23,7 +23,6 @@
 #include "ui-out.h"
 #include "cli-out.h"
 #include "top.h"		/* for "execute_command" */
-#include <string.h>
 #include "exceptions.h"
 #include "infrun.h"
 #include "observer.h"
diff --git a/gdb/cli/cli-logging.c b/gdb/cli/cli-logging.c
index 3b1447ae8e4..ce82b77121e 100644
--- a/gdb/cli/cli-logging.c
+++ b/gdb/cli/cli-logging.c
@@ -22,8 +22,6 @@
 #include "ui-out.h"
 #include "interps.h"
 
-#include <string.h>
-
 /* These hold the pushed copies of the gdb output files.
    If NULL then nothing has yet been pushed.  */
 struct saved_output_files
diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c
index d3ca9ece004..0f0a97e1be1 100644
--- a/gdb/cli/cli-script.c
+++ b/gdb/cli/cli-script.c
@@ -23,7 +23,6 @@
 #include <ctype.h>
 
 #include "ui-out.h"
-#include <string.h>
 #include "exceptions.h"
 #include "top.h"
 #include "breakpoint.h"
diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c
index 0f936a443e0..a7d0728e2bf 100644
--- a/gdb/cli/cli-setshow.c
+++ b/gdb/cli/cli-setshow.c
@@ -19,7 +19,6 @@
 #include "readline/tilde.h"
 #include "value.h"
 #include <ctype.h>
-#include <string.h>
 #include "arch-utils.h"
 #include "observer.h"
 
diff --git a/gdb/cli/cli-utils.c b/gdb/cli/cli-utils.c
index 29ab085700a..15f789427e4 100644
--- a/gdb/cli/cli-utils.c
+++ b/gdb/cli/cli-utils.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include "cli/cli-utils.h"
-#include <string.h>
 #include "value.h"
 
 #include <ctype.h>
diff --git a/gdb/coffread.c b/gdb/coffread.c
index 9cbe173a282..ea494f5ce7e 100644
--- a/gdb/coffread.c
+++ b/gdb/coffread.c
@@ -25,8 +25,6 @@
 
 #include "bfd.h"
 #include "gdb_obstack.h"
-
-#include <string.h>
 #include <ctype.h>
 
 #include "coff/internal.h"	/* Internal format of COFF symbols in BFD */
diff --git a/gdb/common/agent.c b/gdb/common/agent.c
index 54f861aecbb..3f868badae7 100644
--- a/gdb/common/agent.c
+++ b/gdb/common/agent.c
@@ -25,8 +25,6 @@
 #include "infrun.h"
 #include "objfiles.h"
 #endif
-
-#include <string.h>
 #include <unistd.h>
 #include "agent.h"
 #include "filestuff.h"
diff --git a/gdb/common/buffer.c b/gdb/common/buffer.c
index c291b3290ce..4a213b33272 100644
--- a/gdb/common/buffer.c
+++ b/gdb/common/buffer.c
@@ -26,8 +26,6 @@
 #include "xml-utils.h"
 #include "buffer.h"
 #include "inttypes.h"
-
-#include <string.h>
 #include <stdint.h>
 
 void
diff --git a/gdb/common/buffer.h b/gdb/common/buffer.h
index 98da0d21fc0..1c748dd18a2 100644
--- a/gdb/common/buffer.h
+++ b/gdb/common/buffer.h
@@ -20,8 +20,6 @@
 #ifndef BUFFER_H
 #define BUFFER_H
 
-#include <string.h>
-
 struct buffer
 {
   char *buffer;
diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h
index 75a587adf33..7c678462f81 100644
--- a/gdb/common/common-defs.h
+++ b/gdb/common/common-defs.h
@@ -31,6 +31,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <string.h>
 #include "ansidecl.h"
 #include "libiberty.h"
 #include "pathmax.h"
diff --git a/gdb/common/common-utils.c b/gdb/common/common-utils.c
index 3fe9bf952c0..a905d1dfc05 100644
--- a/gdb/common/common-utils.c
+++ b/gdb/common/common-utils.c
@@ -23,8 +23,6 @@
 #include "defs.h"
 #endif
 
-#include <string.h>
-
 /* The xmalloc() (libiberty.h) family of memory management routines.
 
    These are like the ISO-C malloc() family except that they implement
diff --git a/gdb/common/filestuff.c b/gdb/common/filestuff.c
index 4544926464d..a31ecd78fea 100644
--- a/gdb/common/filestuff.c
+++ b/gdb/common/filestuff.c
@@ -20,12 +20,9 @@
 #include "server.h"
 #else
 #include "defs.h"
-#include <string.h>
 #endif
 #include "filestuff.h"
 #include "gdb_vecs.h"
-
-#include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/types.h>
diff --git a/gdb/common/format.c b/gdb/common/format.c
index bddfbc6c52d..247aaffd09b 100644
--- a/gdb/common/format.c
+++ b/gdb/common/format.c
@@ -23,8 +23,6 @@
 #include "defs.h"
 #endif
 
-#include <string.h>
-
 #include "format.h"
 
 struct format_piece *
diff --git a/gdb/common/print-utils.c b/gdb/common/print-utils.c
index 0e612a3f4f4..f5bef0a6104 100644
--- a/gdb/common/print-utils.c
+++ b/gdb/common/print-utils.c
@@ -24,8 +24,6 @@
 #endif
 
 #include "print-utils.h"
-
-#include <string.h>
 #include <stdint.h>
 
 /* Temporary storage using circular buffer.  */
diff --git a/gdb/common/rsp-low.c b/gdb/common/rsp-low.c
index b777716e059..02630054c82 100644
--- a/gdb/common/rsp-low.c
+++ b/gdb/common/rsp-low.c
@@ -23,8 +23,6 @@
 #include "defs.h"
 #endif
 
-#include <string.h>
-
 #include "rsp-low.h"
 
 /* See rsp-low.h.  */
diff --git a/gdb/common/signals.c b/gdb/common/signals.c
index d9cacee90b6..13d1e2c8c81 100644
--- a/gdb/common/signals.c
+++ b/gdb/common/signals.c
@@ -21,7 +21,6 @@
 #include "server.h"
 #else
 #include "defs.h"
-#include <string.h>
 #endif
 
 #ifdef HAVE_SIGNAL_H
diff --git a/gdb/common/vec.h b/gdb/common/vec.h
index 82d4b0d8729..c406c9c923e 100644
--- a/gdb/common/vec.h
+++ b/gdb/common/vec.h
@@ -20,8 +20,6 @@
 #if !defined (GDB_VEC_H)
 #define GDB_VEC_H
 
-#include <string.h>
-
 /* The macros here implement a set of templated vector types and
    associated interfaces.  These templates are implemented with
    macros, as we're not in C++ land.  The interface functions are
diff --git a/gdb/common/xml-utils.c b/gdb/common/xml-utils.c
index c6ceb69eee2..0f813907c10 100644
--- a/gdb/common/xml-utils.c
+++ b/gdb/common/xml-utils.c
@@ -25,8 +25,6 @@
 
 #include "xml-utils.h"
 
-#include <string.h>
-
 /* Return a malloc allocated string with special characters from TEXT
    replaced by entity references.  */
 
diff --git a/gdb/core-regset.c b/gdb/core-regset.c
index 21ea88917f7..6edc8c58c67 100644
--- a/gdb/core-regset.c
+++ b/gdb/core-regset.c
@@ -35,7 +35,6 @@
 
 #include <fcntl.h>
 #include <errno.h>
-#include <string.h>
 #include <time.h>
 #ifdef HAVE_SYS_PROCFS_H
 #include <sys/procfs.h>
diff --git a/gdb/corefile.c b/gdb/corefile.c
index 89d9e193056..983caa97d7f 100644
--- a/gdb/corefile.c
+++ b/gdb/corefile.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include <string.h>
 #include <errno.h>
 #include <signal.h>
 #include <fcntl.h>
diff --git a/gdb/corelow.c b/gdb/corelow.c
index 699fd2726b8..ee0f655c108 100644
--- a/gdb/corelow.c
+++ b/gdb/corelow.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include "arch-utils.h"
-#include <string.h>
 #include <errno.h>
 #include <signal.h>
 #include <fcntl.h>
diff --git a/gdb/cp-abi.c b/gdb/cp-abi.c
index c1a0d291a9f..eede3e52b49 100644
--- a/gdb/cp-abi.c
+++ b/gdb/cp-abi.c
@@ -24,8 +24,6 @@
 #include "exceptions.h"
 #include "gdbcmd.h"
 #include "ui-out.h"
-#include <string.h>
-
 static struct cp_abi_ops *find_cp_abi (const char *short_name);
 
 static struct cp_abi_ops current_cp_abi = { "", NULL };
diff --git a/gdb/cp-name-parser.y b/gdb/cp-name-parser.y
index a0b7f8becdb..3cceb592543 100644
--- a/gdb/cp-name-parser.y
+++ b/gdb/cp-name-parser.y
@@ -32,8 +32,6 @@
 #include "defs.h"
 
 #include <unistd.h>
-#include <string.h>
-
 #include "safe-ctype.h"
 #include "demangle.h"
 #include "cp-support.h"
diff --git a/gdb/cp-support.c b/gdb/cp-support.c
index f1dfcfacd46..20a4a073ead 100644
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -20,7 +20,6 @@
 
 #include "defs.h"
 #include "cp-support.h"
-#include <string.h>
 #include "demangle.h"
 #include "gdbcmd.h"
 #include "dictionary.h"
diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index 93b95b3030a..e38a2be305a 100644
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -27,7 +27,6 @@
 #include "gdbcmd.h"
 #include "demangle.h"
 #include "annotate.h"
-#include <string.h>
 #include "c-lang.h"
 #include "target.h"
 #include "cp-abi.h"
diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c
index 909a227d6c7..aeccb13a001 100644
--- a/gdb/cris-tdep.c
+++ b/gdb/cris-tdep.c
@@ -42,7 +42,6 @@
 
 #include "solib.h"              /* Support for shared libraries.  */
 #include "solib-svr4.h"
-#include <string.h>
 #include "dis-asm.h"
 
 #include "cris-tdep.h"
diff --git a/gdb/d-exp.y b/gdb/d-exp.y
index e0512ebf533..cae3419e9a6 100644
--- a/gdb/d-exp.y
+++ b/gdb/d-exp.y
@@ -39,7 +39,6 @@
 %{
 
 #include "defs.h"
-#include <string.h>
 #include <ctype.h>
 #include "expression.h"
 #include "value.h"
diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c
index 57142889ac2..af4ec01e63f 100644
--- a/gdb/darwin-nat.c
+++ b/gdb/darwin-nat.c
@@ -46,7 +46,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <signal.h>
-#include <string.h>
 #include <ctype.h>
 #include <sys/sysctl.h>
 #include <sys/proc.h>
diff --git a/gdb/dbxread.c b/gdb/dbxread.c
index 1807094494e..fd7910c86e0 100644
--- a/gdb/dbxread.c
+++ b/gdb/dbxread.c
@@ -31,8 +31,6 @@
    for real.  dbx_psymtab_to_symtab() is the function that does this */
 
 #include "defs.h"
-#include <string.h>
-
 #if defined(__CYGNUSCLIB__)
 #include <sys/types.h>
 #include <fcntl.h>
diff --git a/gdb/dcache.c b/gdb/dcache.c
index 6bf0e9140a4..ef1753124da 100644
--- a/gdb/dcache.c
+++ b/gdb/dcache.c
@@ -20,7 +20,6 @@
 #include "defs.h"
 #include "dcache.h"
 #include "gdbcmd.h"
-#include <string.h>
 #include "gdbcore.h"
 #include "target-dcache.h"
 #include "inferior.h"
diff --git a/gdb/demangle.c b/gdb/demangle.c
index c6421ee77d7..be46de97028 100644
--- a/gdb/demangle.c
+++ b/gdb/demangle.c
@@ -28,8 +28,6 @@
 #include "gdbcmd.h"
 #include "demangle.h"
 #include "gdb-demangle.h"
-#include <string.h>
-
 /* Select the default C++ demangling style to use.  The default is "auto",
    which allows gdb to attempt to pick an appropriate demangling style for
    the executable it has loaded.  It can be set to a specific style ("gnu",
diff --git a/gdb/dicos-tdep.c b/gdb/dicos-tdep.c
index f2964db059c..5276399aa0e 100644
--- a/gdb/dicos-tdep.c
+++ b/gdb/dicos-tdep.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include "osabi.h"
-#include <string.h>
 #include "solib.h"
 #include "solib-target.h"
 #include "inferior.h"
diff --git a/gdb/disasm.c b/gdb/disasm.c
index d94225b3119..6ff3793f2e7 100644
--- a/gdb/disasm.c
+++ b/gdb/disasm.c
@@ -21,7 +21,6 @@
 #include "target.h"
 #include "value.h"
 #include "ui-out.h"
-#include <string.h>
 #include "disasm.h"
 #include "gdbcore.h"
 #include "dis-asm.h"
diff --git a/gdb/doublest.c b/gdb/doublest.c
index bd4ca6eb024..ebcb82fed86 100644
--- a/gdb/doublest.c
+++ b/gdb/doublest.c
@@ -26,7 +26,6 @@
 #include "defs.h"
 #include "doublest.h"
 #include "floatformat.h"
-#include <string.h>
 #include "gdbtypes.h"
 #include <math.h>		/* ldexp */
 
diff --git a/gdb/dsrec.c b/gdb/dsrec.c
index c9f86366c99..224bd0e8d79 100644
--- a/gdb/dsrec.c
+++ b/gdb/dsrec.c
@@ -21,7 +21,6 @@
 #include "srec.h"
 #include <sys/time.h>
 #include <time.h>
-#include <string.h>
 #include "gdb_bfd.h"
 
 extern int remote_debug;
diff --git a/gdb/dummy-frame.c b/gdb/dummy-frame.c
index d547a635d28..a13601bddb9 100644
--- a/gdb/dummy-frame.c
+++ b/gdb/dummy-frame.c
@@ -26,7 +26,6 @@
 #include "frame-unwind.h"
 #include "command.h"
 #include "gdbcmd.h"
-#include <string.h>
 #include "observer.h"
 #include "gdbthread.h"
 
diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c
index 01e06702e4d..f2330d91e38 100644
--- a/gdb/dwarf2-frame.c
+++ b/gdb/dwarf2-frame.c
@@ -33,8 +33,6 @@
 #include "value.h"
 #include "record.h"
 
-#include <string.h>
-
 #include "complaints.h"
 #include "dwarf2-frame.h"
 #include "ax.h"
diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
index 8f050b8ffbd..1056e5daf75 100644
--- a/gdb/dwarf2loc.c
+++ b/gdb/dwarf2loc.c
@@ -39,8 +39,6 @@
 #include "dwarf2loc.h"
 #include "dwarf2-frame.h"
 
-#include <string.h>
-
 extern int dwarf2_always_disassemble;
 
 static void dwarf_expr_frame_base_1 (struct symbol *framefunc, CORE_ADDR pc,
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index d08f7887ccd..098f5a3963c 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -72,7 +72,6 @@
 #include "build-id.h"
 
 #include <fcntl.h>
-#include <string.h>
 #include <sys/types.h>
 
 typedef struct symbol *symbolp;
diff --git a/gdb/elfread.c b/gdb/elfread.c
index 085ff4729c2..9b8233cc829 100644
--- a/gdb/elfread.c
+++ b/gdb/elfread.c
@@ -21,7 +21,6 @@
 
 #include "defs.h"
 #include "bfd.h"
-#include <string.h>
 #include "elf-bfd.h"
 #include "elf/common.h"
 #include "elf/internal.h"
diff --git a/gdb/environ.c b/gdb/environ.c
index d661a01010c..7edb76e5c15 100644
--- a/gdb/environ.c
+++ b/gdb/environ.c
@@ -20,7 +20,6 @@
 
 #include "defs.h"
 #include "environ.h"
-#include <string.h>
 
 
 /* Return a new environment object.  */
diff --git a/gdb/eval.c b/gdb/eval.c
index b375850c4ac..de8e8ecb29b 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include <string.h>
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "value.h"
diff --git a/gdb/event-loop.c b/gdb/event-loop.c
index 221dfbc9755..cc2f83795e5 100644
--- a/gdb/event-loop.c
+++ b/gdb/event-loop.c
@@ -31,7 +31,6 @@
 #endif
 
 #include <sys/types.h>
-#include <string.h>
 #include <errno.h>
 #include <sys/time.h>
 #include "exceptions.h"
diff --git a/gdb/exceptions.c b/gdb/exceptions.c
index 4efc8886bbd..38e966c4ed0 100644
--- a/gdb/exceptions.c
+++ b/gdb/exceptions.c
@@ -24,7 +24,6 @@
 #include "inferior.h"
 #include "annotate.h"
 #include "ui-out.h"
-#include <string.h>
 #include "serial.h"
 #include "gdbthread.h"
 
diff --git a/gdb/exec.c b/gdb/exec.c
index e53a1497a0c..f32589b3847 100644
--- a/gdb/exec.c
+++ b/gdb/exec.c
@@ -38,8 +38,6 @@
 
 #include <fcntl.h>
 #include "readline/readline.h"
-#include <string.h>
-
 #include "gdbcore.h"
 
 #include <ctype.h>
diff --git a/gdb/expprint.c b/gdb/expprint.c
index 0f87033bdca..59fd4e32330 100644
--- a/gdb/expprint.c
+++ b/gdb/expprint.c
@@ -26,7 +26,6 @@
 #include "parser-defs.h"
 #include "user-regs.h"		/* For user_reg_map_regnum_to_name.  */
 #include "target.h"
-#include <string.h>
 #include "block.h"
 #include "objfiles.h"
 #include "valprint.h"
diff --git a/gdb/f-exp.y b/gdb/f-exp.y
index c70da179268..f229afa0f96 100644
--- a/gdb/f-exp.y
+++ b/gdb/f-exp.y
@@ -43,7 +43,6 @@
 %{
 
 #include "defs.h"
-#include <string.h>
 #include "expression.h"
 #include "value.h"
 #include "parser-defs.h"
diff --git a/gdb/f-lang.c b/gdb/f-lang.c
index bbfd89c45f2..52da04e0e8f 100644
--- a/gdb/f-lang.c
+++ b/gdb/f-lang.c
@@ -21,7 +21,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include <string.h>
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "expression.h"
diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c
index 8356aab7d6d..534019a4cea 100644
--- a/gdb/f-typeprint.c
+++ b/gdb/f-typeprint.c
@@ -30,8 +30,6 @@
 #include "gdbcore.h"
 #include "target.h"
 #include "f-lang.h"
-
-#include <string.h>
 #include <errno.h>
 
 #if 0				/* Currently unused.  */
diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
index 728bdafe5b0..c7581a8928a 100644
--- a/gdb/f-valprint.c
+++ b/gdb/f-valprint.c
@@ -21,7 +21,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include <string.h>
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "expression.h"
diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c
index e4b34f66e78..e9db30e6ce9 100644
--- a/gdb/fbsd-nat.c
+++ b/gdb/fbsd-nat.c
@@ -23,8 +23,6 @@
 #include "regcache.h"
 #include "regset.h"
 #include "gdbthread.h"
-
-#include <string.h>
 #include <sys/types.h>
 #include <sys/procfs.h>
 #include <sys/sysctl.h>
diff --git a/gdb/findcmd.c b/gdb/findcmd.c
index 9b1c0a6b2f2..3c7b9fb426b 100644
--- a/gdb/findcmd.c
+++ b/gdb/findcmd.c
@@ -20,7 +20,6 @@
 #include "defs.h"
 #include "arch-utils.h"
 #include <ctype.h>
-#include <string.h>
 #include "gdbcmd.h"
 #include "value.h"
 #include "target.h"
diff --git a/gdb/findvar.c b/gdb/findvar.c
index 465c9cc638b..41887def834 100644
--- a/gdb/findvar.c
+++ b/gdb/findvar.c
@@ -25,7 +25,6 @@
 #include "gdbcore.h"
 #include "inferior.h"
 #include "target.h"
-#include <string.h>
 #include "floatformat.h"
 #include "symfile.h"		/* for overlay functions */
 #include "regcache.h"
diff --git a/gdb/fork-child.c b/gdb/fork-child.c
index 6c42d2ed610..4c316b1736c 100644
--- a/gdb/fork-child.c
+++ b/gdb/fork-child.c
@@ -20,7 +20,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include <string.h>
 #include "inferior.h"
 #include "terminal.h"
 #include "target.h"
diff --git a/gdb/frame.c b/gdb/frame.c
index 9d8c8b7b112..1f63819a6d4 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -23,7 +23,6 @@
 #include "value.h"
 #include "inferior.h"	/* for inferior_ptid */
 #include "regcache.h"
-#include <string.h>
 #include "user-regs.h"
 #include "gdb_obstack.h"
 #include "dummy-frame.h"
diff --git a/gdb/frv-linux-tdep.c b/gdb/frv-linux-tdep.c
index fb163a8de52..02f6b21cdd9 100644
--- a/gdb/frv-linux-tdep.c
+++ b/gdb/frv-linux-tdep.c
@@ -30,7 +30,6 @@
 #include "trad-frame.h"
 #include "frame-unwind.h"
 #include "regset.h"
-#include <string.h>
 #include "linux-tdep.h"
 
 /* Define the size (in bytes) of an FR-V instruction.  */
diff --git a/gdb/frv-tdep.c b/gdb/frv-tdep.c
index 349e58dabcf..ce6ad580424 100644
--- a/gdb/frv-tdep.c
+++ b/gdb/frv-tdep.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include <string.h>
 #include "inferior.h"
 #include "gdbcore.h"
 #include "arch-utils.h"
diff --git a/gdb/gdb.c b/gdb/gdb.c
index 78cfb121b39..46df20bb23f 100644
--- a/gdb/gdb.c
+++ b/gdb/gdb.c
@@ -18,7 +18,6 @@
 
 #include "defs.h"
 #include "main.h"
-#include <string.h>
 #include "interps.h"
 
 int
diff --git a/gdb/gdb_bfd.c b/gdb/gdb_bfd.c
index fdde3e7be42..2f3e9bab8da 100644
--- a/gdb/gdb_bfd.c
+++ b/gdb/gdb_bfd.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include "gdb_bfd.h"
-#include <string.h>
 #include "ui-out.h"
 #include "gdbcmd.h"
 #include "hashtab.h"
diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index 74caa93d744..b0ee79d4436 100644
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -41,8 +41,6 @@
 #include "symcat.h"
 
 #include "floatformat.h"
-
-#include <string.h>
 #include "reggroups.h"
 #include "osabi.h"
 #include "gdb_obstack.h"
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index 9eab8f0ee4a..61d07816216 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -1472,8 +1472,6 @@ cat <<EOF
 #include "symcat.h"
 
 #include "floatformat.h"
-
-#include <string.h>
 #include "reggroups.h"
 #include "osabi.h"
 #include "gdb_obstack.h"
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index a46db2c56a4..34d8bf5f578 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,13 @@
+2014-08-07  Gary Benson  <gbenson@redhat.com>
+
+	* server.h: Do not include string.h.
+	* event-loop.c: Likewise.
+	* linux-low.c: Likewise.
+	* regcache.c: Likewise.
+	* remote-utils.c: Likewise.
+	* spu-low.c: Likewise.
+	* utils.c: Likewise.
+
 2014-08-07  Gary Benson  <gbenson@redhat.com>
 
 	* server.h: Do not include gdb_assert.h.
diff --git a/gdb/gdbserver/event-loop.c b/gdb/gdbserver/event-loop.c
index dc1eb4144ad..1513b59f552 100644
--- a/gdb/gdbserver/event-loop.c
+++ b/gdb/gdbserver/event-loop.c
@@ -22,7 +22,6 @@
 #include "queue.h"
 
 #include <sys/types.h>
-#include <string.h>
 #include <sys/time.h>
 
 #ifdef USE_WIN32API
diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
index d7583309411..9188db1a79d 100644
--- a/gdb/gdbserver/linux-low.c
+++ b/gdb/gdbserver/linux-low.c
@@ -30,7 +30,6 @@
 #include <signal.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
-#include <string.h>
 #include <unistd.h>
 #include <errno.h>
 #include <sys/syscall.h>
diff --git a/gdb/gdbserver/regcache.c b/gdb/gdbserver/regcache.c
index 86af39cb15a..916a47994a4 100644
--- a/gdb/gdbserver/regcache.c
+++ b/gdb/gdbserver/regcache.c
@@ -21,8 +21,6 @@
 #include "gdbthread.h"
 #include "tdesc.h"
 #include "rsp-low.h"
-#include <string.h>
-
 #ifndef IN_PROCESS_AGENT
 
 struct regcache *
diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c
index 96d6038a0f6..f3ae3934caf 100644
--- a/gdb/gdbserver/remote-utils.c
+++ b/gdb/gdbserver/remote-utils.c
@@ -23,8 +23,6 @@
 #include "tdesc.h"
 #include "dll.h"
 #include "rsp-low.h"
-
-#include <string.h>
 #if HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h
index 20521036d9f..1e2c3a1c774 100644
--- a/gdb/gdbserver/server.h
+++ b/gdb/gdbserver/server.h
@@ -32,8 +32,6 @@
 #endif
 #include <setjmp.h>
 
-#include <string.h>
-
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
diff --git a/gdb/gdbserver/spu-low.c b/gdb/gdbserver/spu-low.c
index ba2780bc2d4..cb1ac0dc70e 100644
--- a/gdb/gdbserver/spu-low.c
+++ b/gdb/gdbserver/spu-low.c
@@ -23,7 +23,6 @@
 #include "gdb_wait.h"
 #include <sys/ptrace.h>
 #include <fcntl.h>
-#include <string.h>
 #include <unistd.h>
 #include <errno.h>
 #include <sys/syscall.h>
diff --git a/gdb/gdbserver/utils.c b/gdb/gdbserver/utils.c
index a0febb1ce2d..ec37a9bc1c3 100644
--- a/gdb/gdbserver/utils.c
+++ b/gdb/gdbserver/utils.c
@@ -17,7 +17,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "server.h"
-#include <string.h>
 #if HAVE_ERRNO_H
 #include <errno.h>
 #endif
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 4d810ce7ee6..3694597f352 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -20,7 +20,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include <string.h>
 #include "bfd.h"
 #include "symtab.h"
 #include "symfile.h"
diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c
index 3eebba526d7..d6658c7cc97 100644
--- a/gdb/gnu-nat.c
+++ b/gdb/gnu-nat.c
@@ -27,7 +27,6 @@
 #include <limits.h>
 #include <setjmp.h>
 #include <signal.h>
-#include <string.h>
 #include <sys/ptrace.h>
 
 #include <mach.h>
diff --git a/gdb/gnu-v2-abi.c b/gdb/gnu-v2-abi.c
index 3ca01c367cf..5e55b6730cf 100644
--- a/gdb/gnu-v2-abi.c
+++ b/gdb/gnu-v2-abi.c
@@ -20,7 +20,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include <string.h>
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "value.h"
diff --git a/gdb/gnu-v3-abi.c b/gdb/gnu-v3-abi.c
index 5a812132f9f..d5ed3551fb2 100644
--- a/gdb/gnu-v3-abi.c
+++ b/gdb/gnu-v3-abi.c
@@ -29,8 +29,6 @@
 #include "exceptions.h"
 #include "typeprint.h"
 
-#include <string.h>
-
 static struct cp_abi_ops gnu_v3_abi_ops;
 
 /* A gdbarch key for std::type_info, in the event that it can't be
diff --git a/gdb/go-exp.y b/gdb/go-exp.y
index bab5ddedf2e..f9ffbf97dbb 100644
--- a/gdb/go-exp.y
+++ b/gdb/go-exp.y
@@ -52,7 +52,6 @@
 %{
 
 #include "defs.h"
-#include <string.h>
 #include <ctype.h>
 #include "expression.h"
 #include "value.h"
diff --git a/gdb/go-lang.c b/gdb/go-lang.c
index f1a2dbaf2d7..8cbc23442aa 100644
--- a/gdb/go-lang.c
+++ b/gdb/go-lang.c
@@ -33,7 +33,6 @@
 
 #include "defs.h"
 #include "gdb_obstack.h"
-#include <string.h>
 #include "block.h"
 #include "symtab.h"
 #include "language.h"
diff --git a/gdb/go32-nat.c b/gdb/go32-nat.c
index a8c54fa1870..75596a2356d 100644
--- a/gdb/go32-nat.c
+++ b/gdb/go32-nat.c
@@ -100,7 +100,6 @@
 #include "nat/i386-cpuid.h"
 #include "value.h"
 #include "regcache.h"
-#include <string.h>
 #include "top.h"
 #include "cli/cli-utils.h"
 #include "inf-child.h"
diff --git a/gdb/guile/guile.c b/gdb/guile/guile.c
index ff99cdfbebb..575bb6ce767 100644
--- a/gdb/guile/guile.c
+++ b/gdb/guile/guile.c
@@ -21,7 +21,6 @@
    conventions, et.al.  */
 
 #include "defs.h"
-#include <string.h>
 #include "breakpoint.h"
 #include "cli/cli-cmds.h"
 #include "cli/cli-script.h"
diff --git a/gdb/guile/scm-auto-load.c b/gdb/guile/scm-auto-load.c
index 5b9eb23fe89..b67d8ff5148 100644
--- a/gdb/guile/scm-auto-load.c
+++ b/gdb/guile/scm-auto-load.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include <string.h>
 #include "top.h"
 #include "exceptions.h"
 #include "gdbcmd.h"
diff --git a/gdb/hppa-hpux-tdep.c b/gdb/hppa-hpux-tdep.c
index 588f577a5b3..688ac9a8cd2 100644
--- a/gdb/hppa-hpux-tdep.c
+++ b/gdb/hppa-hpux-tdep.c
@@ -36,8 +36,6 @@
 #include "regcache.h"
 #include "exceptions.h"
 
-#include <string.h>
-
 #define IS_32BIT_TARGET(_gdbarch) \
 	((gdbarch_tdep (_gdbarch))->bytes_per_address == 4)
 
diff --git a/gdb/hppa-linux-nat.c b/gdb/hppa-linux-nat.c
index 58650d0eace..6d0de143ed5 100644
--- a/gdb/hppa-linux-nat.c
+++ b/gdb/hppa-linux-nat.c
@@ -20,7 +20,6 @@
 #include "defs.h"
 #include "gdbcore.h"
 #include "regcache.h"
-#include <string.h>
 #include "inferior.h"
 #include "target.h"
 #include "linux-nat.h"
diff --git a/gdb/hppanbsd-tdep.c b/gdb/hppanbsd-tdep.c
index 657d4c2b74d..b3f04c79473 100644
--- a/gdb/hppanbsd-tdep.c
+++ b/gdb/hppanbsd-tdep.c
@@ -25,8 +25,6 @@
 #include "trad-frame.h"
 #include "tramp-frame.h"
 
-#include <string.h>
-
 #include "hppa-tdep.h"
 #include "hppabsd-tdep.h"
 
diff --git a/gdb/hppaobsd-tdep.c b/gdb/hppaobsd-tdep.c
index eece2d1752c..c5213599198 100644
--- a/gdb/hppaobsd-tdep.c
+++ b/gdb/hppaobsd-tdep.c
@@ -22,8 +22,6 @@
 #include "regcache.h"
 #include "regset.h"
 
-#include <string.h>
-
 #include "hppa-tdep.h"
 #include "hppabsd-tdep.h"
 
diff --git a/gdb/i386-cygwin-tdep.c b/gdb/i386-cygwin-tdep.c
index a23f80e973b..47c7bde65a0 100644
--- a/gdb/i386-cygwin-tdep.c
+++ b/gdb/i386-cygwin-tdep.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include "osabi.h"
-#include <string.h>
 #include "i386-tdep.h"
 #include "windows-tdep.h"
 #include "regset.h"
diff --git a/gdb/i386-dicos-tdep.c b/gdb/i386-dicos-tdep.c
index 548093268b3..45a78896e4d 100644
--- a/gdb/i386-dicos-tdep.c
+++ b/gdb/i386-dicos-tdep.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include "osabi.h"
-#include <string.h>
 #include "dicos-tdep.h"
 
 static void
diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c
index 8ab8954183b..aa60d3a4039 100644
--- a/gdb/i386-linux-tdep.c
+++ b/gdb/i386-linux-tdep.c
@@ -27,8 +27,6 @@
 #include "osabi.h"
 #include "reggroups.h"
 #include "dwarf2-frame.h"
-#include <string.h>
-
 #include "i386-tdep.h"
 #include "i386-linux-tdep.h"
 #include "linux-tdep.h"
diff --git a/gdb/i386-nto-tdep.c b/gdb/i386-nto-tdep.c
index 57be47176ef..fcb578e3ecc 100644
--- a/gdb/i386-nto-tdep.c
+++ b/gdb/i386-nto-tdep.c
@@ -25,8 +25,6 @@
 #include "regcache.h"
 #include "target.h"
 
-#include <string.h>
-
 #include "i386-tdep.h"
 #include "i387-tdep.h"
 #include "nto-tdep.h"
diff --git a/gdb/i386-sol2-tdep.c b/gdb/i386-sol2-tdep.c
index 07957545453..fb4dc89fc9f 100644
--- a/gdb/i386-sol2-tdep.c
+++ b/gdb/i386-sol2-tdep.c
@@ -21,8 +21,6 @@
 #include "value.h"
 #include "osabi.h"
 
-#include <string.h>
-
 #include "sol2-tdep.h"
 #include "i386-tdep.h"
 #include "solib-svr4.h"
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index 7544f06154a..6a8ed55835e 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -45,8 +45,6 @@
 #include "disasm.h"
 #include "remote.h"
 #include "exceptions.h"
-#include <string.h>
-
 #include "i386-tdep.h"
 #include "i387-tdep.h"
 #include "i386-xstate.h"
diff --git a/gdb/i386bsd-tdep.c b/gdb/i386bsd-tdep.c
index fe40aae2d45..6266860254c 100644
--- a/gdb/i386bsd-tdep.c
+++ b/gdb/i386bsd-tdep.c
@@ -24,8 +24,6 @@
 #include "regcache.h"
 #include "osabi.h"
 
-#include <string.h>
-
 #include "i386-tdep.h"
 
 /* Support for signal handlers.  */
diff --git a/gdb/i386gnu-nat.c b/gdb/i386gnu-nat.c
index fbd3344d4a1..94d2a0a2640 100644
--- a/gdb/i386gnu-nat.c
+++ b/gdb/i386gnu-nat.c
@@ -23,8 +23,6 @@
 #include "regcache.h"
 
 #include <errno.h>
-#include <string.h>
-
 #include <mach.h>
 #include <mach_error.h>
 #include <mach/message.h>
diff --git a/gdb/i386nbsd-tdep.c b/gdb/i386nbsd-tdep.c
index 4b024f5545a..e0719f48d5b 100644
--- a/gdb/i386nbsd-tdep.c
+++ b/gdb/i386nbsd-tdep.c
@@ -28,8 +28,6 @@
 #include "trad-frame.h"
 #include "tramp-frame.h"
 
-#include <string.h>
-
 #include "i386-tdep.h"
 #include "i387-tdep.h"
 #include "nbsd-tdep.h"
diff --git a/gdb/i386obsd-tdep.c b/gdb/i386obsd-tdep.c
index acdfc7e54ad..2b7d48b0d17 100644
--- a/gdb/i386obsd-tdep.c
+++ b/gdb/i386obsd-tdep.c
@@ -30,8 +30,6 @@
 #include "target.h"
 #include "trad-frame.h"
 
-#include <string.h>
-
 #include "obsd-tdep.h"
 #include "i386-tdep.h"
 #include "i387-tdep.h"
diff --git a/gdb/i387-tdep.c b/gdb/i387-tdep.c
index 1613c2fa315..07bdba5ccf3 100644
--- a/gdb/i387-tdep.c
+++ b/gdb/i387-tdep.c
@@ -27,8 +27,6 @@
 #include "regcache.h"
 #include "value.h"
 
-#include <string.h>
-
 #include "i386-tdep.h"
 #include "i387-tdep.h"
 #include "i386-xstate.h"
diff --git a/gdb/ia64-libunwind-tdep.c b/gdb/ia64-libunwind-tdep.c
index dec4547ce38..bdef72fab67 100644
--- a/gdb/ia64-libunwind-tdep.c
+++ b/gdb/ia64-libunwind-tdep.c
@@ -33,8 +33,6 @@
 
 #include <dlfcn.h>
 
-#include <string.h>
-
 #include "ia64-libunwind-tdep.h"
 
 #include "complaints.h"
diff --git a/gdb/ia64-linux-nat.c b/gdb/ia64-linux-nat.c
index 3cfbd7642b6..961016b5def 100644
--- a/gdb/ia64-linux-nat.c
+++ b/gdb/ia64-linux-nat.c
@@ -19,7 +19,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include <string.h>
 #include "inferior.h"
 #include "target.h"
 #include "gdbcore.h"
diff --git a/gdb/inf-child.c b/gdb/inf-child.c
index 1b929729f11..6d95e5ecb89 100644
--- a/gdb/inf-child.c
+++ b/gdb/inf-child.c
@@ -28,7 +28,6 @@
 #include "symtab.h"
 #include "target.h"
 #include "inferior.h"
-#include <string.h>
 #include <sys/stat.h>
 #include "inf-child.h"
 #include "gdb/fileio.h"
diff --git a/gdb/inf-ptrace.c b/gdb/inf-ptrace.c
index c334474d6af..dd71b3abc37 100644
--- a/gdb/inf-ptrace.c
+++ b/gdb/inf-ptrace.c
@@ -24,8 +24,6 @@
 #include "terminal.h"
 #include "gdbcore.h"
 #include "regcache.h"
-
-#include <string.h>
 #include "gdb_ptrace.h"
 #include "gdb_wait.h"
 #include <signal.h>
diff --git a/gdb/inf-ttrace.c b/gdb/inf-ttrace.c
index d5075f79dcf..847beb3f675 100644
--- a/gdb/inf-ttrace.c
+++ b/gdb/inf-ttrace.c
@@ -29,8 +29,6 @@
 #include "inferior.h"
 #include "terminal.h"
 #include "target.h"
-
-#include <string.h>
 #include <sys/mman.h>
 #include <sys/ttrace.h>
 #include <signal.h>
diff --git a/gdb/infcall.c b/gdb/infcall.c
index c58295aa7e8..e60d1d476be 100644
--- a/gdb/infcall.c
+++ b/gdb/infcall.c
@@ -30,7 +30,6 @@
 #include "objfiles.h"
 #include "gdbcmd.h"
 #include "command.h"
-#include <string.h>
 #include "infcall.h"
 #include "dummy-frame.h"
 #include "ada-lang.h"
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index f63bd992d34..bc42cea074c 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -20,7 +20,6 @@
 #include "defs.h"
 #include "arch-utils.h"
 #include <signal.h>
-#include <string.h>
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "frame.h"
diff --git a/gdb/inflow.c b/gdb/inflow.c
index f13efeab88d..4b105d101f0 100644
--- a/gdb/inflow.c
+++ b/gdb/inflow.c
@@ -25,8 +25,6 @@
 #include "target.h"
 #include "gdbthread.h"
 #include "observer.h"
-
-#include <string.h>
 #include <signal.h>
 #include <fcntl.h>
 #include "gdb_select.h"
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 0614de95373..c18267f779d 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -20,7 +20,6 @@
 
 #include "defs.h"
 #include "infrun.h"
-#include <string.h>
 #include <ctype.h>
 #include "symtab.h"
 #include "frame.h"
diff --git a/gdb/interps.c b/gdb/interps.c
index f76fee468bd..48c421f9d75 100644
--- a/gdb/interps.c
+++ b/gdb/interps.c
@@ -36,7 +36,6 @@
 #include "event-top.h"
 #include "interps.h"
 #include "completer.h"
-#include <string.h>
 #include "top.h"		/* For command_loop.  */
 #include "exceptions.h"
 #include "continuations.h"
diff --git a/gdb/iq2000-tdep.c b/gdb/iq2000-tdep.c
index c6b3f3bee2d..52e652650f2 100644
--- a/gdb/iq2000-tdep.c
+++ b/gdb/iq2000-tdep.c
@@ -28,7 +28,6 @@
 #include "gdbtypes.h"
 #include "value.h"
 #include "dis-asm.h"
-#include <string.h>
 #include "arch-utils.h"
 #include "regcache.h"
 #include "osabi.h"
diff --git a/gdb/irix5-nat.c b/gdb/irix5-nat.c
index 71b88b95231..f72f18361cb 100644
--- a/gdb/irix5-nat.c
+++ b/gdb/irix5-nat.c
@@ -28,8 +28,6 @@
 #include "target.h"
 #include "regcache.h"
 #include "procfs.h"
-
-#include <string.h>
 #include <sys/time.h>
 #include <sys/procfs.h>
 #include <setjmp.h>		/* For JB_XXX.  */
diff --git a/gdb/jv-exp.y b/gdb/jv-exp.y
index 0894fad34b6..5ce17159929 100644
--- a/gdb/jv-exp.y
+++ b/gdb/jv-exp.y
@@ -36,7 +36,6 @@
 %{
 
 #include "defs.h"
-#include <string.h>
 #include <ctype.h>
 #include "expression.h"
 #include "value.h"
diff --git a/gdb/jv-lang.c b/gdb/jv-lang.c
index 5e6bae3993f..421e665b309 100644
--- a/gdb/jv-lang.c
+++ b/gdb/jv-lang.c
@@ -25,7 +25,6 @@
 #include "language.h"
 #include "symfile.h"
 #include "objfiles.h"
-#include <string.h>
 #include "value.h"
 #include "c-lang.h"
 #include "jv-lang.h"
diff --git a/gdb/jv-typeprint.c b/gdb/jv-typeprint.c
index 972edf27af8..24f62efa539 100644
--- a/gdb/jv-typeprint.c
+++ b/gdb/jv-typeprint.c
@@ -24,7 +24,6 @@
 #include "demangle.h"
 #include "gdb-demangle.h"
 #include "jv-lang.h"
-#include <string.h>
 #include "typeprint.h"
 #include "c-lang.h"
 #include "cp-abi.h"
diff --git a/gdb/jv-valprint.c b/gdb/jv-valprint.c
index a7bb4944f62..fd5904b384a 100644
--- a/gdb/jv-valprint.c
+++ b/gdb/jv-valprint.c
@@ -29,8 +29,6 @@
 #include "jv-lang.h"
 #include "c-lang.h"
 #include "annotate.h"
-#include <string.h>
-
 /* Local functions */
 
 void
diff --git a/gdb/language.c b/gdb/language.c
index 1b65d65c7e3..034086d15ca 100644
--- a/gdb/language.c
+++ b/gdb/language.c
@@ -30,8 +30,6 @@
 
 #include "defs.h"
 #include <ctype.h>
-#include <string.h>
-
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "value.h"
diff --git a/gdb/linux-fork.c b/gdb/linux-fork.c
index c9995bf38d2..835e6127833 100644
--- a/gdb/linux-fork.c
+++ b/gdb/linux-fork.c
@@ -25,7 +25,6 @@
 #include "gdbcmd.h"
 #include "infcall.h"
 #include "objfiles.h"
-#include <string.h>
 #include "linux-fork.h"
 #include "linux-nat.h"
 #include "gdbthread.h"
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index 39a6202e0ca..7189af1f927 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -23,7 +23,6 @@
 #include "target.h"
 #include "nat/linux-nat.h"
 #include "nat/linux-waitpid.h"
-#include <string.h>
 #include "gdb_wait.h"
 #ifdef HAVE_TKILL_SYSCALL
 #include <unistd.h>
diff --git a/gdb/lm32-tdep.c b/gdb/lm32-tdep.c
index bdd5477a9a9..908abce360a 100644
--- a/gdb/lm32-tdep.c
+++ b/gdb/lm32-tdep.c
@@ -37,8 +37,6 @@
 #include "reggroups.h"
 #include "opcodes/lm32-desc.h"
 
-#include <string.h>
-
 /* Macros to extract fields from an instruction.  */
 #define LM32_OPCODE(insn)       ((insn >> 26) & 0x3f)
 #define LM32_REG0(insn)         ((insn >> 21) & 0x1f)
diff --git a/gdb/m2-exp.y b/gdb/m2-exp.y
index e98abe2266c..4ea54be6c2d 100644
--- a/gdb/m2-exp.y
+++ b/gdb/m2-exp.y
@@ -38,7 +38,6 @@
 %{
 
 #include "defs.h"
-#include <string.h>
 #include "expression.h"
 #include "language.h"
 #include "value.h"
diff --git a/gdb/m2-typeprint.c b/gdb/m2-typeprint.c
index 3078dadc564..45bc0931219 100644
--- a/gdb/m2-typeprint.c
+++ b/gdb/m2-typeprint.c
@@ -31,8 +31,6 @@
 #include "c-lang.h"
 #include "typeprint.h"
 #include "cp-abi.h"
-
-#include <string.h>
 #include <errno.h>
 
 static void m2_print_bounds (struct type *type,
diff --git a/gdb/m32c-tdep.c b/gdb/m32c-tdep.c
index 2374f365da5..ab123c85630 100644
--- a/gdb/m32c-tdep.c
+++ b/gdb/m32c-tdep.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include <string.h>
 #include "elf-bfd.h"
 #include "elf/m32c.h"
 #include "gdb/sim-m32c.h"
diff --git a/gdb/m32r-linux-nat.c b/gdb/m32r-linux-nat.c
index f38cd532495..2049d6c1ddd 100644
--- a/gdb/m32r-linux-nat.c
+++ b/gdb/m32r-linux-nat.c
@@ -23,8 +23,6 @@
 #include "regcache.h"
 #include "linux-nat.h"
 #include "target.h"
-
-#include <string.h>
 #include <sys/ptrace.h>
 #include <sys/user.h>
 #include <sys/procfs.h>
diff --git a/gdb/m32r-linux-tdep.c b/gdb/m32r-linux-tdep.c
index bf1fffff80c..cf98f69d47c 100644
--- a/gdb/m32r-linux-tdep.c
+++ b/gdb/m32r-linux-tdep.c
@@ -27,8 +27,6 @@
 #include "reggroups.h"
 #include "regset.h"
 
-#include <string.h>
-
 #include "glibc-tdep.h"
 #include "solib-svr4.h"
 #include "symtab.h"
diff --git a/gdb/m32r-rom.c b/gdb/m32r-rom.c
index 6b20cd10ce7..e373f87446f 100644
--- a/gdb/m32r-rom.c
+++ b/gdb/m32r-rom.c
@@ -34,7 +34,6 @@
 #include "symfile.h"		/* for generic load */
 #include <sys/time.h>
 #include <time.h>		/* for time_t */
-#include <string.h>
 #include "objfiles.h"		/* for ALL_OBJFILES etc.  */
 #include "inferior.h"
 #include <ctype.h>
diff --git a/gdb/m32r-tdep.c b/gdb/m32r-tdep.c
index 6928c96ce5f..067ff99c746 100644
--- a/gdb/m32r-tdep.c
+++ b/gdb/m32r-tdep.c
@@ -25,7 +25,6 @@
 #include "gdbtypes.h"
 #include "gdbcmd.h"
 #include "gdbcore.h"
-#include <string.h>
 #include "value.h"
 #include "inferior.h"
 #include "symfile.h"
diff --git a/gdb/m68hc11-tdep.c b/gdb/m68hc11-tdep.c
index 9b7e1af2e3a..bf8ecc2534f 100644
--- a/gdb/m68hc11-tdep.c
+++ b/gdb/m68hc11-tdep.c
@@ -30,7 +30,6 @@
 #include "gdbtypes.h"
 #include "gdbcmd.h"
 #include "gdbcore.h"
-#include <string.h>
 #include "value.h"
 #include "inferior.h"
 #include "dis-asm.h"  
diff --git a/gdb/m68k-tdep.c b/gdb/m68k-tdep.c
index d3c6d0166fa..6bb7e335748 100644
--- a/gdb/m68k-tdep.c
+++ b/gdb/m68k-tdep.c
@@ -26,7 +26,6 @@
 #include "symtab.h"
 #include "gdbcore.h"
 #include "value.h"
-#include <string.h>
 #include "inferior.h"
 #include "regcache.h"
 #include "arch-utils.h"
diff --git a/gdb/m68kbsd-tdep.c b/gdb/m68kbsd-tdep.c
index f1f63e1528e..6ce12b8dd62 100644
--- a/gdb/m68kbsd-tdep.c
+++ b/gdb/m68kbsd-tdep.c
@@ -27,8 +27,6 @@
 #include "tramp-frame.h"
 #include "gdbtypes.h"
 
-#include <string.h>
-
 #include "m68k-tdep.h"
 #include "solib-svr4.h"
 
diff --git a/gdb/m68klinux-nat.c b/gdb/m68klinux-nat.c
index a512a719e2e..0c122af217e 100644
--- a/gdb/m68klinux-nat.c
+++ b/gdb/m68klinux-nat.c
@@ -22,7 +22,6 @@
 #include "inferior.h"
 #include "language.h"
 #include "gdbcore.h"
-#include <string.h>
 #include "regcache.h"
 #include "target.h"
 #include "linux-nat.h"
diff --git a/gdb/m68klinux-tdep.c b/gdb/m68klinux-tdep.c
index f6fed38f020..1aae1529c0c 100644
--- a/gdb/m68klinux-tdep.c
+++ b/gdb/m68klinux-tdep.c
@@ -23,7 +23,6 @@
 #include "floatformat.h"
 #include "frame.h"
 #include "target.h"
-#include <string.h>
 #include "gdbtypes.h"
 #include "osabi.h"
 #include "regcache.h"
diff --git a/gdb/m88k-tdep.c b/gdb/m88k-tdep.c
index 3ce292e5b34..7c8506b64c6 100644
--- a/gdb/m88k-tdep.c
+++ b/gdb/m88k-tdep.c
@@ -31,8 +31,6 @@
 #include "trad-frame.h"
 #include "value.h"
 
-#include <string.h>
-
 #include "m88k-tdep.h"
 
 /* Fetch the instruction at PC.  */
diff --git a/gdb/machoread.c b/gdb/machoread.c
index 96cc769f397..c244b25af35 100644
--- a/gdb/machoread.c
+++ b/gdb/machoread.c
@@ -34,8 +34,6 @@
 #include "complaints.h"
 #include "gdb_bfd.h"
 
-#include <string.h>
-
 /* If non-zero displays debugging message.  */
 static unsigned int mach_o_debug_level = 0;
 
diff --git a/gdb/macrocmd.c b/gdb/macrocmd.c
index 94a627f3cdf..265a2fee5ab 100644
--- a/gdb/macrocmd.c
+++ b/gdb/macrocmd.c
@@ -25,7 +25,6 @@
 #include "cli/cli-utils.h"
 #include "command.h"
 #include "gdbcmd.h"
-#include <string.h>
 #include "linespec.h"
 
 
diff --git a/gdb/main.c b/gdb/main.c
index 06b3c90ac98..ed2187afa1a 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -30,8 +30,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
-
-#include <string.h>
 #include "event-loop.h"
 #include "ui-out.h"
 
diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c
index a6fbd6add7d..eba52983f35 100644
--- a/gdb/mdebugread.c
+++ b/gdb/mdebugread.c
@@ -55,7 +55,6 @@
 #include "dictionary.h"
 #include "mdebugread.h"
 #include <sys/stat.h>
-#include <string.h>
 #include "psympriv.h"
 #include "source.h"
 
diff --git a/gdb/mem-break.c b/gdb/mem-break.c
index ad7296b9fe3..095b81f1370 100644
--- a/gdb/mem-break.c
+++ b/gdb/mem-break.c
@@ -24,9 +24,6 @@
 #include "breakpoint.h"
 #include "inferior.h"
 #include "target.h"
-#include <string.h>
-
-
 /* Insert a breakpoint on targets that don't have any better
    breakpoint support.  We read the contents of the target location
    and stash it, then overwrite it with a breakpoint instruction.
diff --git a/gdb/memattr.c b/gdb/memattr.c
index 261d34f41f7..25e455495ee 100644
--- a/gdb/memattr.c
+++ b/gdb/memattr.c
@@ -26,7 +26,6 @@
 #include "value.h"
 #include "language.h"
 #include "vec.h"
-#include <string.h>
 #include "breakpoint.h"
 #include "cli/cli-utils.h"
 
diff --git a/gdb/memory-map.c b/gdb/memory-map.c
index 522f16b7781..b897d8a0611 100644
--- a/gdb/memory-map.c
+++ b/gdb/memory-map.c
@@ -21,8 +21,6 @@
 #include "memory-map.h"
 #include "exceptions.h"
 
-#include <string.h>
-
 #if !defined(HAVE_LIBEXPAT)
 
 VEC(mem_region_s) *
diff --git a/gdb/mep-tdep.c b/gdb/mep-tdep.c
index dd3cc5f3cbc..b729a959ea9 100644
--- a/gdb/mep-tdep.c
+++ b/gdb/mep-tdep.c
@@ -27,7 +27,6 @@
 #include "gdbtypes.h"
 #include "gdbcmd.h"
 #include "gdbcore.h"
-#include <string.h>
 #include "value.h"
 #include "inferior.h"
 #include "dis-asm.h"
diff --git a/gdb/mi/mi-cmd-break.c b/gdb/mi/mi-cmd-break.c
index 29e3fb3fb5c..ce6a093a9e2 100644
--- a/gdb/mi/mi-cmd-break.c
+++ b/gdb/mi/mi-cmd-break.c
@@ -23,7 +23,6 @@
 #include "ui-out.h"
 #include "mi-out.h"
 #include "breakpoint.h"
-#include <string.h>
 #include "mi-getopt.h"
 #include "gdb.h"
 #include "exceptions.h"
diff --git a/gdb/mi/mi-cmd-disas.c b/gdb/mi/mi-cmd-disas.c
index 20b3b9fd40d..f56daa5a4e0 100644
--- a/gdb/mi/mi-cmd-disas.c
+++ b/gdb/mi/mi-cmd-disas.c
@@ -23,7 +23,6 @@
 #include "value.h"
 #include "mi-cmds.h"
 #include "mi-getopt.h"
-#include <string.h>
 #include "ui-out.h"
 #include "disasm.h"
 
diff --git a/gdb/mi/mi-cmd-env.c b/gdb/mi/mi-cmd-env.c
index 7ec47b37de4..8c9d170054e 100644
--- a/gdb/mi/mi-cmd-env.c
+++ b/gdb/mi/mi-cmd-env.c
@@ -30,8 +30,6 @@
 #include "command.h"
 #include "ui-out.h"
 #include "top.h"
-
-#include <string.h>
 #include <sys/stat.h>
 
 static void env_mod_path (char *dirname, char **which_path);
diff --git a/gdb/mi/mi-cmd-stack.c b/gdb/mi/mi-cmd-stack.c
index ac30fca5875..608dc4e183b 100644
--- a/gdb/mi/mi-cmd-stack.c
+++ b/gdb/mi/mi-cmd-stack.c
@@ -27,7 +27,6 @@
 #include "block.h"
 #include "stack.h"
 #include "dictionary.h"
-#include <string.h>
 #include "language.h"
 #include "valprint.h"
 #include "exceptions.h"
diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c
index 08a87bf72bc..f2ca326bedb 100644
--- a/gdb/mi/mi-cmd-var.c
+++ b/gdb/mi/mi-cmd-var.c
@@ -27,7 +27,6 @@
 #include "language.h"
 #include "value.h"
 #include <ctype.h>
-#include <string.h>
 #include "mi-getopt.h"
 #include "gdbthread.h"
 #include "mi-parse.h"
diff --git a/gdb/mi/mi-cmds.c b/gdb/mi/mi-cmds.c
index 68f97f66d54..ded36bf1f69 100644
--- a/gdb/mi/mi-cmds.c
+++ b/gdb/mi/mi-cmds.c
@@ -21,7 +21,6 @@
 #include "defs.h"
 #include "top.h"
 #include "mi-cmds.h"
-#include <string.h>
 #include "mi-main.h"
 
 extern void _initialize_mi_cmds (void);
diff --git a/gdb/mi/mi-console.c b/gdb/mi/mi-console.c
index 0880bd3792f..790660a5957 100644
--- a/gdb/mi/mi-console.c
+++ b/gdb/mi/mi-console.c
@@ -26,8 +26,6 @@
 
 #include "defs.h"
 #include "mi-console.h"
-#include <string.h>
-
 static ui_file_fputs_ftype mi_console_file_fputs;
 static ui_file_flush_ftype mi_console_file_flush;
 static ui_file_delete_ftype mi_console_file_delete;
diff --git a/gdb/mi/mi-getopt.c b/gdb/mi/mi-getopt.c
index 952214ecae0..74436330635 100644
--- a/gdb/mi/mi-getopt.c
+++ b/gdb/mi/mi-getopt.c
@@ -19,8 +19,6 @@
 
 #include "defs.h"
 #include "mi-getopt.h"
-#include <string.h>
-
 /* See comments about mi_getopt and mi_getopt_silent in mi-getopt.h.
    When there is an unknown option, if ERROR_ON_UNKNOWN is true,
    throw an error, otherwise return -1.  */
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index 1b994e7d261..38278300829 100644
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include <string.h>
 #include "interps.h"
 #include "event-top.h"
 #include "event-loop.h"
diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index 26389f1c7a6..59717caeaa8 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -24,7 +24,6 @@
 #include "target.h"
 #include "inferior.h"
 #include "infrun.h"
-#include <string.h>
 #include "exceptions.h"
 #include "top.h"
 #include "gdbthread.h"
diff --git a/gdb/mi/mi-parse.c b/gdb/mi/mi-parse.c
index 161a16a622c..91f0e8ebf02 100644
--- a/gdb/mi/mi-parse.c
+++ b/gdb/mi/mi-parse.c
@@ -25,7 +25,6 @@
 #include "charset.h"
 
 #include <ctype.h>
-#include <string.h>
 #include "cli/cli-utils.h"
 #include "language.h"
 
diff --git a/gdb/microblaze-rom.c b/gdb/microblaze-rom.c
index a64217d1120..19bf583c244 100644
--- a/gdb/microblaze-rom.c
+++ b/gdb/microblaze-rom.c
@@ -21,7 +21,6 @@
 #include "gdbcore.h"
 #include "target.h"
 #include "monitor.h"
-#include <string.h>
 #include "serial.h"
 #include "regcache.h"
 
diff --git a/gdb/microblaze-tdep.c b/gdb/microblaze-tdep.c
index 80c79f6bb3e..6a9f11fbcc2 100644
--- a/gdb/microblaze-tdep.c
+++ b/gdb/microblaze-tdep.c
@@ -33,7 +33,6 @@
 #include "frame-unwind.h"
 #include "dwarf2-frame.h"
 #include "osabi.h"
-#include <string.h>
 #include "target-descriptions.h"
 #include "opcodes/microblaze-opcm.h"
 #include "opcodes/microblaze-dis.h"
diff --git a/gdb/mingw-hdep.c b/gdb/mingw-hdep.c
index c71814fe2b8..7c6da6870e9 100644
--- a/gdb/mingw-hdep.c
+++ b/gdb/mingw-hdep.c
@@ -23,7 +23,6 @@
 #include "event-loop.h"
 
 #include "gdb_select.h"
-#include <string.h>
 #include "readline/readline.h"
 
 #include <windows.h>
diff --git a/gdb/minidebug.c b/gdb/minidebug.c
index a4907b2c028..8b1efbc3947 100644
--- a/gdb/minidebug.c
+++ b/gdb/minidebug.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include "gdb_bfd.h"
-#include <string.h>
 #include "symfile.h"
 #include "objfiles.h"
 #include "gdbcore.h"
diff --git a/gdb/minsyms.c b/gdb/minsyms.c
index 6f1fb35b71f..fd7fcd9fa56 100644
--- a/gdb/minsyms.c
+++ b/gdb/minsyms.c
@@ -38,7 +38,6 @@
 
 #include "defs.h"
 #include <ctype.h>
-#include <string.h>
 #include "symtab.h"
 #include "bfd.h"
 #include "filenames.h"
diff --git a/gdb/mips-irix-tdep.c b/gdb/mips-irix-tdep.c
index d11a4145d71..a017e3bbdf9 100644
--- a/gdb/mips-irix-tdep.c
+++ b/gdb/mips-irix-tdep.c
@@ -20,7 +20,6 @@
 
 #include "defs.h"
 #include "osabi.h"
-#include <string.h>
 #include "solib.h"
 #include "solib-irix.h"
 #include "elf-bfd.h"
diff --git a/gdb/mips-linux-tdep.c b/gdb/mips-linux-tdep.c
index 1e812717c4c..5639870ad0e 100644
--- a/gdb/mips-linux-tdep.c
+++ b/gdb/mips-linux-tdep.c
@@ -23,7 +23,6 @@
 #include "solib-svr4.h"
 #include "osabi.h"
 #include "mips-tdep.h"
-#include <string.h>
 #include "frame.h"
 #include "regcache.h"
 #include "trad-frame.h"
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index bbbf8a21c50..8165f94b4dd 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -21,7 +21,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include <string.h>
 #include "frame.h"
 #include "inferior.h"
 #include "symtab.h"
diff --git a/gdb/mips64obsd-tdep.c b/gdb/mips64obsd-tdep.c
index 8a89af1d9e4..e312e51ce08 100644
--- a/gdb/mips64obsd-tdep.c
+++ b/gdb/mips64obsd-tdep.c
@@ -25,8 +25,6 @@
 #include "trad-frame.h"
 #include "tramp-frame.h"
 
-#include <string.h>
-
 #include "obsd-tdep.h"
 #include "mips-tdep.h"
 #include "solib-svr4.h"
diff --git a/gdb/mipsnbsd-tdep.c b/gdb/mipsnbsd-tdep.c
index 2b7a1d3ec8a..f8aa2107662 100644
--- a/gdb/mipsnbsd-tdep.c
+++ b/gdb/mipsnbsd-tdep.c
@@ -27,8 +27,6 @@
 #include "value.h"
 #include "osabi.h"
 
-#include <string.h>
-
 #include "nbsd-tdep.h"
 #include "mipsnbsd-tdep.h"
 #include "mips-tdep.h"
diff --git a/gdb/mipsread.c b/gdb/mipsread.c
index 090a7e787d2..d73d34a995f 100644
--- a/gdb/mipsread.c
+++ b/gdb/mipsread.c
@@ -24,7 +24,6 @@
    mdebugread.c.  */
 
 #include "defs.h"
-#include <string.h>
 #include "bfd.h"
 #include "symtab.h"
 #include "objfiles.h"
diff --git a/gdb/mn10300-linux-tdep.c b/gdb/mn10300-linux-tdep.c
index cbaa0108cf8..023c61d0b3a 100644
--- a/gdb/mn10300-linux-tdep.c
+++ b/gdb/mn10300-linux-tdep.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include "gdbcore.h"
-#include <string.h>
 #include "regcache.h"
 #include "mn10300-tdep.h"
 #include "bfd.h"
diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c
index bc21465a7de..a6a0d9165c6 100644
--- a/gdb/mn10300-tdep.c
+++ b/gdb/mn10300-tdep.c
@@ -22,7 +22,6 @@
 #include "dis-asm.h"
 #include "gdbtypes.h"
 #include "regcache.h"
-#include <string.h>
 #include "gdbcore.h"	/* For write_memory_unsigned_integer.  */
 #include "value.h"
 #include "frame.h"
diff --git a/gdb/monitor.c b/gdb/monitor.c
index 94b85d3dad1..b880ff2ead9 100644
--- a/gdb/monitor.c
+++ b/gdb/monitor.c
@@ -43,7 +43,6 @@
 #include "exceptions.h"
 #include <signal.h>
 #include <ctype.h>
-#include <string.h>
 #include <sys/types.h>
 #include "command.h"
 #include "serial.h"
diff --git a/gdb/moxie-tdep.c b/gdb/moxie-tdep.c
index 6d3c1303f26..79269276eb8 100644
--- a/gdb/moxie-tdep.c
+++ b/gdb/moxie-tdep.c
@@ -25,7 +25,6 @@
 #include "gdbtypes.h"
 #include "gdbcmd.h"
 #include "gdbcore.h"
-#include <string.h>
 #include "value.h"
 #include "inferior.h"
 #include "symfile.h"
diff --git a/gdb/mt-tdep.c b/gdb/mt-tdep.c
index 1904bf89f1b..a16af9c8cc6 100644
--- a/gdb/mt-tdep.c
+++ b/gdb/mt-tdep.c
@@ -27,7 +27,6 @@
 #include "dis-asm.h"
 #include "arch-utils.h"
 #include "gdbtypes.h"
-#include <string.h>
 #include "regcache.h"
 #include "reggroups.h"
 #include "gdbcore.h"
diff --git a/gdb/nat/linux-btrace.c b/gdb/nat/linux-btrace.c
index baf07e80831..19e218ea711 100644
--- a/gdb/nat/linux-btrace.c
+++ b/gdb/nat/linux-btrace.c
@@ -38,7 +38,6 @@
 #if HAVE_LINUX_PERF_EVENT_H && defined(SYS_perf_event_open)
 
 #include <errno.h>
-#include <string.h>
 #include <stdint.h>
 #include <unistd.h>
 #include <sys/mman.h>
diff --git a/gdb/nat/linux-osdata.c b/gdb/nat/linux-osdata.c
index 0ef7fa368c8..887e518d316 100644
--- a/gdb/nat/linux-osdata.c
+++ b/gdb/nat/linux-osdata.c
@@ -28,7 +28,6 @@
 #include <sys/types.h>
 #include <sys/sysinfo.h>
 #include <ctype.h>
-#include <string.h>
 #include <utmp.h>
 #include <time.h>
 #include <unistd.h>
diff --git a/gdb/nat/linux-procfs.c b/gdb/nat/linux-procfs.c
index 1443a880a76..84fc890c7cc 100644
--- a/gdb/nat/linux-procfs.c
+++ b/gdb/nat/linux-procfs.c
@@ -20,7 +20,6 @@
 #include "server.h"
 #else
 #include "defs.h"
-#include <string.h>
 #endif
 
 #include "linux-procfs.h"
diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c
index 8abb8427196..b4db86249a6 100644
--- a/gdb/nat/linux-ptrace.c
+++ b/gdb/nat/linux-ptrace.c
@@ -20,7 +20,6 @@
 #include "server.h"
 #else
 #include "defs.h"
-#include <string.h>
 #endif
 
 #include "linux-ptrace.h"
diff --git a/gdb/nat/linux-waitpid.c b/gdb/nat/linux-waitpid.c
index 5159f03ded4..53847ac0518 100644
--- a/gdb/nat/linux-waitpid.c
+++ b/gdb/nat/linux-waitpid.c
@@ -28,8 +28,6 @@
 #include "linux-waitpid.h"
 #include "gdb_wait.h"
 
-#include <string.h>
-
 /* Print debugging output based on the format string FORMAT and
    its parameters.  */
 
diff --git a/gdb/nbsd-tdep.c b/gdb/nbsd-tdep.c
index b1540e951f3..93da2c694cd 100644
--- a/gdb/nbsd-tdep.c
+++ b/gdb/nbsd-tdep.c
@@ -20,7 +20,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include <string.h>
 #include "solib-svr4.h"
 #include "nbsd-tdep.h"
 
diff --git a/gdb/nios2-linux-tdep.c b/gdb/nios2-linux-tdep.c
index 2041336f79e..b2a3c3e20a3 100644
--- a/gdb/nios2-linux-tdep.c
+++ b/gdb/nios2-linux-tdep.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include "frame.h"
-#include <string.h>
 #include "osabi.h"
 #include "solib-svr4.h"
 #include "trad-frame.h"
diff --git a/gdb/nto-procfs.c b/gdb/nto-procfs.c
index ff8f2af85dd..7903210d12f 100644
--- a/gdb/nto-procfs.c
+++ b/gdb/nto-procfs.c
@@ -32,7 +32,6 @@
 #include <sys/netmgr.h>
 
 #include "exceptions.h"
-#include <string.h>
 #include "gdbcore.h"
 #include "inferior.h"
 #include "target.h"
diff --git a/gdb/nto-tdep.c b/gdb/nto-tdep.c
index 1d0f8a10c1a..fb97a36620e 100644
--- a/gdb/nto-tdep.c
+++ b/gdb/nto-tdep.c
@@ -21,7 +21,6 @@
 
 #include "defs.h"
 #include <sys/stat.h>
-#include <string.h>
 #include "nto-tdep.h"
 #include "top.h"
 #include "inferior.h"
diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c
index c6d344e4168..22f6089ac2c 100644
--- a/gdb/objc-lang.c
+++ b/gdb/objc-lang.c
@@ -34,7 +34,6 @@
 #include "value.h"
 #include "symfile.h"
 #include "objfiles.h"
-#include <string.h>		/* for strchr */
 #include "target.h"		/* for target_has_execution */
 #include "gdbcore.h"
 #include "gdbcmd.h"
diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index 7c6fca845e1..2a5c15fcceb 100644
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -37,7 +37,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include "gdb_obstack.h"
-#include <string.h>
 #include "hashtab.h"
 
 #include "breakpoint.h"
diff --git a/gdb/opencl-lang.c b/gdb/opencl-lang.c
index 96b562dded2..c9f047653f3 100644
--- a/gdb/opencl-lang.c
+++ b/gdb/opencl-lang.c
@@ -19,7 +19,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include <string.h>
 #include "gdbtypes.h"
 #include "symtab.h"
 #include "expression.h"
diff --git a/gdb/osabi.c b/gdb/osabi.c
index ae4290fcfa5..cdba812fbde 100644
--- a/gdb/osabi.c
+++ b/gdb/osabi.c
@@ -19,8 +19,6 @@
 
 #include "defs.h"
 
-#include <string.h>
-
 #include "osabi.h"
 #include "arch-utils.h"
 #include "gdbcmd.h"
diff --git a/gdb/osdata.c b/gdb/osdata.c
index fd00b4e8ea8..d8c06ffdf80 100644
--- a/gdb/osdata.c
+++ b/gdb/osdata.c
@@ -22,7 +22,6 @@
 #include "vec.h"
 #include "xml-support.h"
 #include "osdata.h"
-#include <string.h>
 #include "ui-out.h"
 #include "gdbcmd.h"
 
diff --git a/gdb/p-exp.y b/gdb/p-exp.y
index 5bb186481ba..0aa6f20e532 100644
--- a/gdb/p-exp.y
+++ b/gdb/p-exp.y
@@ -44,7 +44,6 @@
 %{
 
 #include "defs.h"
-#include <string.h>
 #include <ctype.h>
 #include "expression.h"
 #include "value.h"
diff --git a/gdb/p-lang.c b/gdb/p-lang.c
index 856beb3236e..98fcc3b9dde 100644
--- a/gdb/p-lang.c
+++ b/gdb/p-lang.c
@@ -20,7 +20,6 @@
 /* This file is derived from c-lang.c */
 
 #include "defs.h"
-#include <string.h>
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "expression.h"
diff --git a/gdb/p-typeprint.c b/gdb/p-typeprint.c
index 2fd0fecd770..6870cdf07fc 100644
--- a/gdb/p-typeprint.c
+++ b/gdb/p-typeprint.c
@@ -31,7 +31,6 @@
 #include "p-lang.h"
 #include "typeprint.h"
 #include "gdb-demangle.h"
-#include <string.h>
 #include <errno.h>
 #include <ctype.h>
 
diff --git a/gdb/parse.c b/gdb/parse.c
index 3aeeaadd080..420afc5bfaa 100644
--- a/gdb/parse.c
+++ b/gdb/parse.c
@@ -32,7 +32,6 @@
 #include "defs.h"
 #include <ctype.h>
 #include "arch-utils.h"
-#include <string.h>
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "frame.h"
diff --git a/gdb/posix-hdep.c b/gdb/posix-hdep.c
index 520943683a7..1a41e85800a 100644
--- a/gdb/posix-hdep.c
+++ b/gdb/posix-hdep.c
@@ -20,8 +20,6 @@
 #include "defs.h"
 #include "event-loop.h"
 
-#include <string.h>
-
 #include "gdb_select.h"
 
 /* The strerror() function can return NULL for errno values that are
diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
index 3da625431f1..0d0393615a1 100644
--- a/gdb/ppc-linux-nat.c
+++ b/gdb/ppc-linux-nat.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include <string.h>
 #include "observer.h"
 #include "frame.h"
 #include "inferior.h"
diff --git a/gdb/ppc-sysv-tdep.c b/gdb/ppc-sysv-tdep.c
index c56164f866f..bf2bcc51b14 100644
--- a/gdb/ppc-sysv-tdep.c
+++ b/gdb/ppc-sysv-tdep.c
@@ -23,7 +23,6 @@
 #include "inferior.h"
 #include "regcache.h"
 #include "value.h"
-#include <string.h>
 #include "ppc-tdep.h"
 #include "target.h"
 #include "objfiles.h"
diff --git a/gdb/ppcfbsd-tdep.c b/gdb/ppcfbsd-tdep.c
index 21a3bbc9f83..b78ccfcd2a5 100644
--- a/gdb/ppcfbsd-tdep.c
+++ b/gdb/ppcfbsd-tdep.c
@@ -30,8 +30,6 @@
 #include "target.h"
 #include "trad-frame.h"
 
-#include <string.h>
-
 #include "ppc-tdep.h"
 #include "ppc64-tdep.h"
 #include "ppcfbsd-tdep.h"
diff --git a/gdb/ppcnbsd-tdep.c b/gdb/ppcnbsd-tdep.c
index 0043994b500..a5c1e3df1e9 100644
--- a/gdb/ppcnbsd-tdep.c
+++ b/gdb/ppcnbsd-tdep.c
@@ -27,8 +27,6 @@
 #include "trad-frame.h"
 #include "tramp-frame.h"
 
-#include <string.h>
-
 #include "ppc-tdep.h"
 #include "ppcnbsd-tdep.h"
 #include "solib-svr4.h"
diff --git a/gdb/ppcobsd-tdep.c b/gdb/ppcobsd-tdep.c
index b3a9677c020..d745dd02ac0 100644
--- a/gdb/ppcobsd-tdep.c
+++ b/gdb/ppcobsd-tdep.c
@@ -28,8 +28,6 @@
 #include "symtab.h"
 #include "trad-frame.h"
 
-#include <string.h>
-
 #include "ppc-tdep.h"
 #include "ppcobsd-tdep.h"
 #include "solib-svr4.h"
diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 3e8e6a879c5..a65423dfe82 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include <string.h>
 #include "frame.h"
 #include "symtab.h"
 #include "gdbtypes.h"
diff --git a/gdb/procfs.c b/gdb/procfs.c
index 40aaed502b3..d93843ad6d7 100644
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -47,7 +47,6 @@
 #include <signal.h>
 #include <ctype.h>
 #include "gdb_bfd.h"
-#include <string.h>
 #include "inflow.h"
 #include "auxv.h"
 #include "procfs.h"
diff --git a/gdb/prologue-value.c b/gdb/prologue-value.c
index f82e1a1fab0..e3431ff3c70 100644
--- a/gdb/prologue-value.c
+++ b/gdb/prologue-value.c
@@ -17,7 +17,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include <string.h>
 #include "prologue-value.h"
 #include "regcache.h"
 
diff --git a/gdb/python/py-auto-load.c b/gdb/python/py-auto-load.c
index 66f731653ea..24311ff873f 100644
--- a/gdb/python/py-auto-load.c
+++ b/gdb/python/py-auto-load.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include <string.h>
 #include "top.h"
 #include "exceptions.h"
 #include "gdbcmd.h"
diff --git a/gdb/python/py-gdb-readline.c b/gdb/python/py-gdb-readline.c
index b778aa9f4d7..b335df918ec 100644
--- a/gdb/python/py-gdb-readline.c
+++ b/gdb/python/py-gdb-readline.c
@@ -22,8 +22,6 @@
 #include "exceptions.h"
 #include "top.h"
 #include "cli/cli-utils.h"
-#include <string.h>
-
 /* Readline function suitable for PyOS_ReadlineFunctionPointer, which
    is used for Python's interactive parser and raw_input.  In both
    cases, sys_stdin and sys_stdout are always stdin and stdout
diff --git a/gdb/ravenscar-thread.c b/gdb/ravenscar-thread.c
index c4a01a55abc..acee55e9d69 100644
--- a/gdb/ravenscar-thread.c
+++ b/gdb/ravenscar-thread.c
@@ -26,7 +26,6 @@
 #include "command.h"
 #include "ravenscar-thread.h"
 #include "observer.h"
-#include <string.h>
 #include "gdbcmd.h"
 #include "top.h"
 #include "regcache.h"
diff --git a/gdb/regcache.c b/gdb/regcache.c
index 506067fefac..f410dc28d12 100644
--- a/gdb/regcache.c
+++ b/gdb/regcache.c
@@ -24,7 +24,6 @@
 #include "gdbcmd.h"
 #include "regcache.h"
 #include "reggroups.h"
-#include <string.h>
 #include "observer.h"
 #include "exceptions.h"
 #include "remote.h"
diff --git a/gdb/registry.c b/gdb/registry.c
index 378c369e306..b324613c30e 100644
--- a/gdb/registry.c
+++ b/gdb/registry.c
@@ -19,8 +19,6 @@
 
 #include "defs.h"
 #include "registry.h"
-#include <string.h>
-
 const struct registry_data *
 register_data_with_cleanup (struct registry_data_registry *registry,
 			    registry_data_callback save,
diff --git a/gdb/remote-fileio.c b/gdb/remote-fileio.c
index e20d209ca1e..48e1e567249 100644
--- a/gdb/remote-fileio.c
+++ b/gdb/remote-fileio.c
@@ -20,7 +20,6 @@
 /* See the GDB User Guide for details of the GDB remote protocol.  */
 
 #include "defs.h"
-#include <string.h>
 #include "gdbcmd.h"
 #include "remote.h"
 #include "gdb/fileio.h"
diff --git a/gdb/remote-m32r-sdi.c b/gdb/remote-m32r-sdi.c
index e5b66a05564..5443fe0a223 100644
--- a/gdb/remote-m32r-sdi.c
+++ b/gdb/remote-m32r-sdi.c
@@ -27,7 +27,6 @@
 #include "infrun.h"
 #include "target.h"
 #include "regcache.h"
-#include <string.h>
 #include "gdbthread.h"
 #include <ctype.h>
 #include <signal.h>
diff --git a/gdb/remote-mips.c b/gdb/remote-mips.c
index 236f3cdab45..1f1650e22e7 100644
--- a/gdb/remote-mips.c
+++ b/gdb/remote-mips.c
@@ -30,7 +30,6 @@
 #include "serial.h"
 #include "target.h"
 #include "exceptions.h"
-#include <string.h>
 #include <sys/stat.h>
 #include "gdb_usleep.h"
 #include "regcache.h"
diff --git a/gdb/remote-notif.c b/gdb/remote-notif.c
index 650a0f8e92e..50891000996 100644
--- a/gdb/remote-notif.c
+++ b/gdb/remote-notif.c
@@ -41,8 +41,6 @@
 #include "infrun.h"
 #include "gdbcmd.h"
 
-#include <string.h>
-
 int notif_debug = 0;
 
 /* Supported clients of notifications.  */
diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index 0834b3ffa77..51b3c301224 100644
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -24,7 +24,6 @@
 #include "inferior.h"
 #include "infrun.h"
 #include "value.h"
-#include <string.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include <signal.h>
diff --git a/gdb/remote.c b/gdb/remote.c
index dbf67f2e95d..8decd08536a 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -20,7 +20,6 @@
 /* See the GDB User Guide for details of the GDB remote protocol.  */
 
 #include "defs.h"
-#include <string.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include "inferior.h"
diff --git a/gdb/reverse.c b/gdb/reverse.c
index defa8b63b98..541355f976e 100644
--- a/gdb/reverse.c
+++ b/gdb/reverse.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include <string.h>
 #include "target.h"
 #include "top.h"
 #include "cli/cli-cmds.h"
diff --git a/gdb/rs6000-aix-tdep.c b/gdb/rs6000-aix-tdep.c
index 3845df83f59..03dc8c0a881 100644
--- a/gdb/rs6000-aix-tdep.c
+++ b/gdb/rs6000-aix-tdep.c
@@ -20,7 +20,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include <string.h>
 #include "osabi.h"
 #include "regcache.h"
 #include "regset.h"
diff --git a/gdb/ser-base.c b/gdb/ser-base.c
index 5f677a9abb9..06efbc1c1af 100644
--- a/gdb/ser-base.c
+++ b/gdb/ser-base.c
@@ -23,7 +23,6 @@
 #include "event-loop.h"
 
 #include "gdb_select.h"
-#include <string.h>
 #include <sys/time.h>
 #ifdef USE_WIN32API
 #include <winsock2.h>
diff --git a/gdb/ser-go32.c b/gdb/ser-go32.c
index 75fb91e5139..3a3126e179a 100644
--- a/gdb/ser-go32.c
+++ b/gdb/ser-go32.c
@@ -24,9 +24,6 @@
 #include "defs.h"
 #include "gdbcmd.h"
 #include "serial.h"
-#include <string.h>
-
-
 /*
  * NS16550 UART registers
  */
diff --git a/gdb/ser-mingw.c b/gdb/ser-mingw.c
index ab4de3ba1d4..a81208c3bf1 100644
--- a/gdb/ser-mingw.c
+++ b/gdb/ser-mingw.c
@@ -29,8 +29,6 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#include <string.h>
-
 #include "command.h"
 
 void _initialize_ser_windows (void);
diff --git a/gdb/ser-pipe.c b/gdb/ser-pipe.c
index 9568a26c0ee..8c222875fea 100644
--- a/gdb/ser-pipe.c
+++ b/gdb/ser-pipe.c
@@ -29,7 +29,6 @@
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <fcntl.h>
-#include <string.h>
 #include "filestuff.h"
 
 #include <signal.h>
diff --git a/gdb/ser-tcp.c b/gdb/ser-tcp.c
index 56000013a0e..d6df4271de7 100644
--- a/gdb/ser-tcp.c
+++ b/gdb/ser-tcp.c
@@ -53,7 +53,6 @@
 #endif
 
 #include <signal.h>
-#include <string.h>
 #include "gdb_select.h"
 
 #ifndef HAVE_SOCKLEN_T
diff --git a/gdb/ser-unix.c b/gdb/ser-unix.c
index 7e06a72fd66..6389712f567 100644
--- a/gdb/ser-unix.c
+++ b/gdb/ser-unix.c
@@ -29,7 +29,6 @@
 #include <sys/time.h>
 
 #include "gdb_select.h"
-#include <string.h>
 #include "gdbcmd.h"
 #include "filestuff.h"
 
diff --git a/gdb/serial.c b/gdb/serial.c
index f7e0de5e6a8..791f12fcc46 100644
--- a/gdb/serial.c
+++ b/gdb/serial.c
@@ -20,7 +20,6 @@
 #include "defs.h"
 #include <ctype.h>
 #include "serial.h"
-#include <string.h>
 #include "gdbcmd.h"
 #include "cli/cli-utils.h"
 
diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c
index 32905667b4f..c8c36db0f56 100644
--- a/gdb/sh-tdep.c
+++ b/gdb/sh-tdep.c
@@ -32,7 +32,6 @@
 #include "value.h"
 #include "dis-asm.h"
 #include "inferior.h"
-#include <string.h>
 #include "arch-utils.h"
 #include "floatformat.h"
 #include "regcache.h"
diff --git a/gdb/sh64-tdep.c b/gdb/sh64-tdep.c
index b2dd3a4048c..5fe6d87db5b 100644
--- a/gdb/sh64-tdep.c
+++ b/gdb/sh64-tdep.c
@@ -32,7 +32,6 @@
 #include "value.h"
 #include "dis-asm.h"
 #include "inferior.h"
-#include <string.h>
 #include "arch-utils.h"
 #include "regcache.h"
 #include "osabi.h"
diff --git a/gdb/shnbsd-tdep.c b/gdb/shnbsd-tdep.c
index 203cd305d7b..2936661900a 100644
--- a/gdb/shnbsd-tdep.c
+++ b/gdb/shnbsd-tdep.c
@@ -25,8 +25,6 @@
 #include "value.h"
 #include "osabi.h"
 
-#include <string.h>
-
 #include "sh-tdep.h"
 #include "solib-svr4.h"
 
diff --git a/gdb/skip.c b/gdb/skip.c
index 64a0254ba37..23f1e46ca40 100644
--- a/gdb/skip.c
+++ b/gdb/skip.c
@@ -20,7 +20,6 @@
 #include "value.h"
 #include "valprint.h"
 #include "ui-out.h"
-#include <string.h>
 #include "symtab.h"
 #include "gdbcmd.h"
 #include "command.h"
diff --git a/gdb/sol-thread.c b/gdb/sol-thread.c
index 38ca2f6e111..88293c3430c 100644
--- a/gdb/sol-thread.c
+++ b/gdb/sol-thread.c
@@ -64,7 +64,6 @@
 #include "solib.h"
 #include "symfile.h"
 #include "observer.h"
-#include <string.h>
 #include "procfs.h"
 #include "symtab.h"
 #include "minsyms.h"
diff --git a/gdb/solib-dsbt.c b/gdb/solib-dsbt.c
index 0217a94ef29..4655c92526d 100644
--- a/gdb/solib-dsbt.c
+++ b/gdb/solib-dsbt.c
@@ -18,7 +18,6 @@
 
 
 #include "defs.h"
-#include <string.h>
 #include "inferior.h"
 #include "gdbcore.h"
 #include "solib.h"
diff --git a/gdb/solib-frv.c b/gdb/solib-frv.c
index 9724a3c7475..8e66a878c3d 100644
--- a/gdb/solib-frv.c
+++ b/gdb/solib-frv.c
@@ -18,7 +18,6 @@
 
 
 #include "defs.h"
-#include <string.h>
 #include "inferior.h"
 #include "gdbcore.h"
 #include "solib.h"
diff --git a/gdb/solib-osf.c b/gdb/solib-osf.c
index 404a56bd915..24915cb94af 100644
--- a/gdb/solib-osf.c
+++ b/gdb/solib-osf.c
@@ -44,8 +44,6 @@
 
 #include <sys/types.h>
 #include <signal.h>
-#include <string.h>
-
 #include "bfd.h"
 #include "symtab.h"
 #include "symfile.h"
diff --git a/gdb/solib-som.c b/gdb/solib-som.c
index cba50d1886f..83f206583b6 100644
--- a/gdb/solib-som.c
+++ b/gdb/solib-som.c
@@ -31,8 +31,6 @@
 #include "solib.h"
 #include "solib-som.h"
 
-#include <string.h>
-
 #undef SOLIB_SOM_DBG 
 
 /* These ought to be defined in some public interface, but aren't.  They
diff --git a/gdb/solib-spu.c b/gdb/solib-spu.c
index b657b7fecd9..41e41b08c14 100644
--- a/gdb/solib-spu.c
+++ b/gdb/solib-spu.c
@@ -21,7 +21,6 @@
 #include "defs.h"
 #include "solib-spu.h"
 #include "gdbcore.h"
-#include <string.h>
 #include <sys/stat.h>
 #include "arch-utils.h"
 #include "bfd.h"
diff --git a/gdb/solib-target.c b/gdb/solib-target.c
index bb34e4b7918..fe807ad530c 100644
--- a/gdb/solib-target.c
+++ b/gdb/solib-target.c
@@ -26,8 +26,6 @@
 #include "vec.h"
 #include "solib-target.h"
 
-#include <string.h>
-
 /* Private data for each loaded library.  */
 struct lm_info
 {
diff --git a/gdb/solib.c b/gdb/solib.c
index c8f141fba79..90ea45410b7 100644
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -21,7 +21,6 @@
 
 #include <sys/types.h>
 #include <fcntl.h>
-#include <string.h>
 #include "symtab.h"
 #include "bfd.h"
 #include "symfile.h"
diff --git a/gdb/somread.c b/gdb/somread.c
index 4a7837e5923..fcd02bdddfd 100644
--- a/gdb/somread.c
+++ b/gdb/somread.c
@@ -27,7 +27,6 @@
 #include "stabsread.h"
 #include "gdb-stabs.h"
 #include "complaints.h"
-#include <string.h>
 #include "demangle.h"
 #include "som.h"
 #include "libhppa.h"
diff --git a/gdb/source.c b/gdb/source.c
index 5a44bb7a302..19c25623758 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -29,7 +29,6 @@
 #include "filestuff.h"
 
 #include <sys/types.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include "gdbcore.h"
diff --git a/gdb/sparc-nat.c b/gdb/sparc-nat.c
index e83e7d1f692..7c0198d2909 100644
--- a/gdb/sparc-nat.c
+++ b/gdb/sparc-nat.c
@@ -23,7 +23,6 @@
 #include "target.h"
 
 #include <signal.h>
-#include <string.h>
 #include <sys/ptrace.h>
 #include "gdb_wait.h"
 #ifdef HAVE_MACHINE_REG_H
diff --git a/gdb/sparc-sol2-tdep.c b/gdb/sparc-sol2-tdep.c
index c23ce2b5338..7a7d3eb5da7 100644
--- a/gdb/sparc-sol2-tdep.c
+++ b/gdb/sparc-sol2-tdep.c
@@ -28,8 +28,6 @@
 #include "target.h"
 #include "trad-frame.h"
 
-#include <string.h>
-
 #include "sol2-tdep.h"
 #include "sparc-tdep.h"
 #include "solib-svr4.h"
diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
index b075437d6f4..bcd4f6e7464 100644
--- a/gdb/sparc-tdep.c
+++ b/gdb/sparc-tdep.c
@@ -35,8 +35,6 @@
 #include "target.h"
 #include "value.h"
 
-#include <string.h>
-
 #include "sparc-tdep.h"
 #include "sparc-ravenscar-thread.h"
 
diff --git a/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c
index abb7350d65c..a1966c5693f 100644
--- a/gdb/sparc64-tdep.c
+++ b/gdb/sparc64-tdep.c
@@ -34,8 +34,6 @@
 #include "target.h"
 #include "value.h"
 
-#include <string.h>
-
 #include "sparc64-tdep.h"
 
 /* This file implements the SPARC 64-bit ABI as defined by the
diff --git a/gdb/sparc64fbsd-tdep.c b/gdb/sparc64fbsd-tdep.c
index 453f2b43613..568db72f98c 100644
--- a/gdb/sparc64fbsd-tdep.c
+++ b/gdb/sparc64fbsd-tdep.c
@@ -27,8 +27,6 @@
 #include "target.h"
 #include "trad-frame.h"
 
-#include <string.h>
-
 #include "sparc64-tdep.h"
 #include "solib-svr4.h"
 
diff --git a/gdb/sparc64nbsd-tdep.c b/gdb/sparc64nbsd-tdep.c
index 0d2a4e0a3a1..f7adddb25a8 100644
--- a/gdb/sparc64nbsd-tdep.c
+++ b/gdb/sparc64nbsd-tdep.c
@@ -30,8 +30,6 @@
 #include "solib-svr4.h"
 #include "trad-frame.h"
 
-#include <string.h>
-
 #include "sparc64-tdep.h"
 #include "nbsd-tdep.h"
 
diff --git a/gdb/sparcnbsd-tdep.c b/gdb/sparcnbsd-tdep.c
index 7c4d6ee2481..4a61cee5704 100644
--- a/gdb/sparcnbsd-tdep.c
+++ b/gdb/sparcnbsd-tdep.c
@@ -30,8 +30,6 @@
 #include "symtab.h"
 #include "trad-frame.h"
 
-#include <string.h>
-
 #include "sparc-tdep.h"
 #include "nbsd-tdep.h"
 
diff --git a/gdb/spu-linux-nat.c b/gdb/spu-linux-nat.c
index 4841bbefbb1..3803e3dfffd 100644
--- a/gdb/spu-linux-nat.c
+++ b/gdb/spu-linux-nat.c
@@ -20,7 +20,6 @@
 
 #include "defs.h"
 #include "gdbcore.h"
-#include <string.h>
 #include "target.h"
 #include "inferior.h"
 #include "inf-child.h"
diff --git a/gdb/spu-multiarch.c b/gdb/spu-multiarch.c
index 2bce90e2f75..202bfa7df7a 100644
--- a/gdb/spu-multiarch.c
+++ b/gdb/spu-multiarch.c
@@ -21,7 +21,6 @@
 #include "defs.h"
 #include "gdbcore.h"
 #include "gdbcmd.h"
-#include <string.h>
 #include "arch-utils.h"
 #include "observer.h"
 #include "inferior.h"
diff --git a/gdb/spu-tdep.c b/gdb/spu-tdep.c
index 6b46df1197e..c9af4fd4c53 100644
--- a/gdb/spu-tdep.c
+++ b/gdb/spu-tdep.c
@@ -24,7 +24,6 @@
 #include "gdbtypes.h"
 #include "gdbcmd.h"
 #include "gdbcore.h"
-#include <string.h>
 #include "frame.h"
 #include "frame-unwind.h"
 #include "frame-base.h"
diff --git a/gdb/stabsread.c b/gdb/stabsread.c
index 9a25b0cb950..87eaed44b9b 100644
--- a/gdb/stabsread.c
+++ b/gdb/stabsread.c
@@ -24,7 +24,6 @@
    Avoid placing any object file format specific code in this file.  */
 
 #include "defs.h"
-#include <string.h>
 #include "bfd.h"
 #include "gdb_obstack.h"
 #include "symtab.h"
diff --git a/gdb/stack.c b/gdb/stack.c
index 9243f69a817..3fa50b44cd4 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -50,8 +50,6 @@
 #include "objfiles.h"
 
 #include <ctype.h>
-#include <string.h>
-
 #include "symfile.h"
 #include "extension.h"
 
diff --git a/gdb/std-regs.c b/gdb/std-regs.c
index a2bb39d0ab8..aa2ccca3f46 100644
--- a/gdb/std-regs.c
+++ b/gdb/std-regs.c
@@ -24,9 +24,6 @@
 #include "frame.h"
 #include "gdbtypes.h"
 #include "value.h"
-#include <string.h>
-
-
 static struct value *
 value_of_builtin_frame_fp_reg (struct frame_info *frame, const void *baton)
 {
diff --git a/gdb/symfile.c b/gdb/symfile.c
index 921c3b8313d..b16abe46fa4 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -59,7 +59,6 @@
 
 #include <sys/types.h>
 #include <fcntl.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <ctype.h>
 #include <time.h>
diff --git a/gdb/symmisc.c b/gdb/symmisc.c
index bcb7954dddc..c2146a5614b 100644
--- a/gdb/symmisc.c
+++ b/gdb/symmisc.c
@@ -37,8 +37,6 @@
 #include "typeprint.h"
 #include "gdbcmd.h"
 #include "source.h"
-
-#include <string.h>
 #include "readline/readline.h"
 
 #include "psymtab.h"
diff --git a/gdb/symtab.c b/gdb/symtab.c
index e64d0df8864..ab568923413 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -50,7 +50,6 @@
 
 #include <sys/types.h>
 #include <fcntl.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <ctype.h>
 #include "cp-abi.h"
diff --git a/gdb/target.c b/gdb/target.c
index 16151c49826..011eb4a72da 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -21,7 +21,6 @@
 
 #include "defs.h"
 #include <errno.h>
-#include <string.h>
 #include "target.h"
 #include "target-dcache.h"
 #include "gdbcmd.h"
diff --git a/gdb/thread.c b/gdb/thread.c
index e25d5639bd9..65890e1528b 100644
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -32,7 +32,6 @@
 #include "gdbcmd.h"
 #include "regcache.h"
 #include "gdb.h"
-#include <string.h>
 #include "btrace.h"
 
 #include <ctype.h>
diff --git a/gdb/tilegx-linux-nat.c b/gdb/tilegx-linux-nat.c
index 80a5e579906..1cd21b39edb 100644
--- a/gdb/tilegx-linux-nat.c
+++ b/gdb/tilegx-linux-nat.c
@@ -25,8 +25,6 @@
 
 #include <sys/ptrace.h>
 
-#include <string.h>
-
 #include <sys/procfs.h>
 
 /* Defines ps_err_e, struct ps_prochandle.  */
diff --git a/gdb/tilegx-tdep.c b/gdb/tilegx-tdep.c
index 01742e8aa2c..befab562366 100644
--- a/gdb/tilegx-tdep.c
+++ b/gdb/tilegx-tdep.c
@@ -30,7 +30,6 @@
 #include "value.h"
 #include "dis-asm.h"
 #include "inferior.h"
-#include <string.h>
 #include "arch-utils.h"
 #include "floatformat.h"
 #include "regcache.h"
diff --git a/gdb/top.c b/gdb/top.c
index 319324f403d..fc2b84d70bb 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -61,7 +61,6 @@
 #include <sys/types.h>
 
 #include "event-top.h"
-#include <string.h>
 #include <sys/stat.h>
 #include <ctype.h>
 #include "ui-out.h"
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index cdd395fe76b..f2f662ef845 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -28,7 +28,6 @@
 #include "target.h"
 #include "target-dcache.h"
 #include "language.h"
-#include <string.h>
 #include "inferior.h"
 #include "breakpoint.h"
 #include "tracepoint.h"
diff --git a/gdb/tui/tui-command.c b/gdb/tui/tui-command.c
index ae6bde45b72..8d0e1078d55 100644
--- a/gdb/tui/tui-command.c
+++ b/gdb/tui/tui-command.c
@@ -28,9 +28,6 @@
 #include "tui/tui-command.h"
 
 #include "gdb_curses.h"
-#include <string.h>
-
-
 /*****************************************
 ** STATIC LOCAL FUNCTIONS FORWARD DECLS    **
 ******************************************/
diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c
index 4deb006028b..7e51b3ea259 100644
--- a/gdb/tui/tui-data.c
+++ b/gdb/tui/tui-data.c
@@ -24,8 +24,6 @@
 #include "tui/tui.h"
 #include "tui/tui-data.h"
 #include "tui/tui-wingeneral.h"
-
-#include <string.h>
 #include "gdb_curses.h"
 
 /****************************
diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c
index 8c48d66158f..1c89a14cfd9 100644
--- a/gdb/tui/tui-disasm.c
+++ b/gdb/tui/tui-disasm.c
@@ -27,7 +27,6 @@
 #include "value.h"
 #include "source.h"
 #include "disasm.h"
-#include <string.h>
 #include "tui/tui.h"
 #include "tui/tui-data.h"
 #include "tui/tui-win.h"
diff --git a/gdb/tui/tui-file.c b/gdb/tui/tui-file.c
index 8e84fc53a1b..afbfdec4bf6 100644
--- a/gdb/tui/tui-file.c
+++ b/gdb/tui/tui-file.c
@@ -23,8 +23,6 @@
 
 #include "tui.h"
 
-#include <string.h>
-
 /* A ``struct ui_file'' that is compatible with all the legacy
    code.  */
 
diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c
index d037b5a40c9..a59576a5dfb 100644
--- a/gdb/tui/tui-layout.c
+++ b/gdb/tui/tui-layout.c
@@ -37,8 +37,6 @@
 #include "tui/tui-winsource.h"
 #include "tui/tui-disasm.h"
 #include "tui/tui-layout.h"
-
-#include <string.h>
 #include "gdb_curses.h"
 
 /*******************************
diff --git a/gdb/tui/tui-out.c b/gdb/tui/tui-out.c
index ff782f6ca1a..340806860ff 100644
--- a/gdb/tui/tui-out.c
+++ b/gdb/tui/tui-out.c
@@ -24,8 +24,6 @@
 #include "ui-out.h"
 #include "cli-out.h"
 #include "tui.h"
-#include <string.h>
-
 struct tui_ui_out_data
   {
     struct cli_ui_out_data base;
diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c
index 2c53e05aa40..c620a9cf270 100644
--- a/gdb/tui/tui-regs.c
+++ b/gdb/tui/tui-regs.c
@@ -30,7 +30,6 @@
 #include "regcache.h"
 #include "inferior.h"
 #include "target.h"
-#include <string.h>
 #include "tui/tui-layout.h"
 #include "tui/tui-win.h"
 #include "tui/tui-windata.h"
diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c
index cb40a574474..7aceaa8e989 100644
--- a/gdb/tui/tui-source.c
+++ b/gdb/tui/tui-source.c
@@ -34,8 +34,6 @@
 #include "tui/tui-stack.h"
 #include "tui/tui-winsource.h"
 #include "tui/tui-source.h"
-
-#include <string.h>
 #include "gdb_curses.h"
 
 /* Function to display source in the source window.  */
diff --git a/gdb/tui/tui-stack.c b/gdb/tui/tui-stack.c
index 481d46fe647..f90dff382ea 100644
--- a/gdb/tui/tui-stack.c
+++ b/gdb/tui/tui-stack.c
@@ -28,7 +28,6 @@
 #include "target.h"
 #include "top.h"
 #include "gdb-demangle.h"
-#include <string.h>
 #include "source.h"
 #include "tui/tui.h"
 #include "tui/tui-data.h"
diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
index a97704db496..9c7a23f8b49 100644
--- a/gdb/tui/tui-win.c
+++ b/gdb/tui/tui-win.c
@@ -45,8 +45,6 @@
 #include "tui/tui-win.h"
 
 #include "gdb_curses.h"
-
-#include <string.h>
 #include <ctype.h>
 #include "readline/readline.h"
 
diff --git a/gdb/tui/tui-windata.c b/gdb/tui/tui-windata.c
index 986806f7a24..f06aa321bb8 100644
--- a/gdb/tui/tui-windata.c
+++ b/gdb/tui/tui-windata.c
@@ -25,8 +25,6 @@
 #include "tui/tui-wingeneral.h"
 #include "tui/tui-regs.h"
 #include "tui/tui-windata.h"
-
-#include <string.h>
 #include "gdb_curses.h"
 
 
diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index 062520696e8..171b1712bed 100644
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -37,8 +37,6 @@
 #include "tui/tui-winsource.h"
 #include "tui/tui-source.h"
 #include "tui/tui-disasm.h"
-
-#include <string.h>
 #include "gdb_curses.h"
 
 /* Function to display the "main" routine.  */
diff --git a/gdb/typeprint.c b/gdb/typeprint.c
index 026f3a254e6..e0b7c44f508 100644
--- a/gdb/typeprint.c
+++ b/gdb/typeprint.c
@@ -31,7 +31,6 @@
 #include "language.h"
 #include "cp-abi.h"
 #include "typeprint.h"
-#include <string.h>
 #include "exceptions.h"
 #include "valprint.h"
 #include <errno.h>
diff --git a/gdb/ui-file.c b/gdb/ui-file.c
index e59d70ba0c8..767b55b78af 100644
--- a/gdb/ui-file.c
+++ b/gdb/ui-file.c
@@ -22,7 +22,6 @@
 #include "defs.h"
 #include "ui-file.h"
 #include "gdb_obstack.h"
-#include <string.h>
 #include "gdb_select.h"
 #include "filestuff.h"
 
diff --git a/gdb/ui-out.c b/gdb/ui-out.c
index 205af9c3ddd..26bd04f33f1 100644
--- a/gdb/ui-out.c
+++ b/gdb/ui-out.c
@@ -21,7 +21,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include <string.h>
 #include "expression.h"		/* For language.h */
 #include "language.h"
 #include "ui-out.h"
diff --git a/gdb/user-regs.c b/gdb/user-regs.c
index f4ec54a3637..35d64eccb16 100644
--- a/gdb/user-regs.c
+++ b/gdb/user-regs.c
@@ -22,7 +22,6 @@
 #include "defs.h"
 #include "user-regs.h"
 #include "gdbtypes.h"
-#include <string.h>
 #include "frame.h"
 
 /* A table of user registers.
diff --git a/gdb/utils.c b/gdb/utils.c
index 4cf9efa7425..34b842e9b2c 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -20,7 +20,6 @@
 #include "defs.h"
 #include "dyn-string.h"
 #include <ctype.h>
-#include <string.h>
 #include "gdb_wait.h"
 #include "event-top.h"
 #include "exceptions.h"
diff --git a/gdb/v850-tdep.c b/gdb/v850-tdep.c
index 3e4447aab88..ad1f49159b0 100644
--- a/gdb/v850-tdep.c
+++ b/gdb/v850-tdep.c
@@ -25,7 +25,6 @@
 #include "dwarf2-frame.h"
 #include "gdbtypes.h"
 #include "inferior.h"
-#include <string.h>
 #include "gdbcore.h"
 #include "arch-utils.h"
 #include "regcache.h"
diff --git a/gdb/valarith.c b/gdb/valarith.c
index 4da41cbe517..d60dedb2908 100644
--- a/gdb/valarith.c
+++ b/gdb/valarith.c
@@ -24,7 +24,6 @@
 #include "expression.h"
 #include "target.h"
 #include "language.h"
-#include <string.h>
 #include "doublest.h"
 #include "dfp.h"
 #include <math.h>
diff --git a/gdb/valops.c b/gdb/valops.c
index 6cd66c71452..5ef763d8ada 100644
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -37,7 +37,6 @@
 #include "dfp.h"
 #include "tracepoint.h"
 #include <errno.h>
-#include <string.h>
 #include "observer.h"
 #include "objfiles.h"
 #include "exceptions.h"
diff --git a/gdb/valprint.c b/gdb/valprint.c
index 8600b34741f..0ded6b74ac6 100644
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include <string.h>
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "value.h"
diff --git a/gdb/value.c b/gdb/value.c
index d22da1a1407..355194e33af 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include "arch-utils.h"
-#include <string.h>
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "value.h"
diff --git a/gdb/varobj.c b/gdb/varobj.c
index d3502341a22..1c4bae947bb 100644
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -24,8 +24,6 @@
 #include "gdbcmd.h"
 #include "block.h"
 #include "valprint.h"
-
-#include <string.h>
 #include "gdb_regex.h"
 
 #include "varobj.h"
diff --git a/gdb/vax-tdep.c b/gdb/vax-tdep.c
index 4780c9059c0..0f470029cc1 100644
--- a/gdb/vax-tdep.c
+++ b/gdb/vax-tdep.c
@@ -32,8 +32,6 @@
 #include "trad-frame.h"
 #include "value.h"
 
-#include <string.h>
-
 #include "vax-tdep.h"
 
 /* Return the name of register REGNUM.  */
diff --git a/gdb/vaxnbsd-tdep.c b/gdb/vaxnbsd-tdep.c
index 0e7cdfb7fba..ac4897041ec 100644
--- a/gdb/vaxnbsd-tdep.c
+++ b/gdb/vaxnbsd-tdep.c
@@ -24,8 +24,6 @@
 #include "vax-tdep.h"
 #include "solib-svr4.h"
 
-#include <string.h>
-
 /* NetBSD ELF.  */
 
 static void
diff --git a/gdb/vaxobsd-tdep.c b/gdb/vaxobsd-tdep.c
index 802016126ce..43c48321450 100644
--- a/gdb/vaxobsd-tdep.c
+++ b/gdb/vaxobsd-tdep.c
@@ -27,8 +27,6 @@
 
 #include "vax-tdep.h"
 
-#include <string.h>
-
 /* Signal trampolines.  */
 
 /* Since OpenBSD 3.2, the sigtramp routine is mapped at a random page
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 5dcd520fbab..73665e5dee9 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -50,7 +50,6 @@
 #include "objfiles.h"
 #include "gdb_bfd.h"
 #include "gdb_obstack.h"
-#include <string.h>
 #include "gdbthread.h"
 #include "gdbcmd.h"
 #include <unistd.h>
diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
index b986dbd6255..90cc32fd7dc 100644
--- a/gdb/xcoffread.c
+++ b/gdb/xcoffread.c
@@ -24,8 +24,6 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <ctype.h>
-#include <string.h>
-
 #ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
 #endif
diff --git a/gdb/xml-support.c b/gdb/xml-support.c
index 5062bc155f8..531ac101753 100644
--- a/gdb/xml-support.c
+++ b/gdb/xml-support.c
@@ -22,8 +22,6 @@
 #include "exceptions.h"
 #include "xml-support.h"
 #include "filestuff.h"
-
-#include <string.h>
 #include "safe-ctype.h"
 
 /* Debugging flag.  */
diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c
index 2f387399987..af3ff32f03f 100644
--- a/gdb/xstormy16-tdep.c
+++ b/gdb/xstormy16-tdep.c
@@ -29,7 +29,6 @@
 #include "value.h"
 #include "dis-asm.h"
 #include "inferior.h"
-#include <string.h>
 #include "arch-utils.h"
 #include "floatformat.h"
 #include "regcache.h"
diff --git a/gdb/xtensa-linux-nat.c b/gdb/xtensa-linux-nat.c
index 945f3795262..2d506f7fcac 100644
--- a/gdb/xtensa-linux-nat.c
+++ b/gdb/xtensa-linux-nat.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include <string.h>
 #include "frame.h"
 #include "inferior.h"
 #include "gdbcore.h"
-- 
2.30.2