From: Tom Tromey <tromey@redhat.com>
Date: Wed, 6 Nov 2013 14:14:23 +0000 (-0700)
Subject: remove gdb_string.h
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0e9f083f4cb94a9dc861f38ba151aac06efce2b8;p=binutils-gdb.git

remove gdb_string.h

This removes gdb_string.h.  This patch is purely mechanical.  I
created it by running the two commands:

    git rm common/gdb_string.h
    perl -pi -e's/"gdb_string.h"/<string.h>/;'  *.[chyl] */*.[chyl]

2013-11-18  Tom Tromey  <tromey@redhat.com>

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6459de45955..26ea86ed59f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,302 @@
+2013-11-18  Tom Tromey  <tromey@redhat.com>
+
+	* common/gdb_string.h: Remove.
+	* aarch64-tdep.c: Use string.h, not gdb_string.h.
+	* ada-exp.y: Use string.h, not gdb_string.h.
+	* ada-lang.c: Use string.h, not gdb_string.h.
+	* ada-lex.l: Use string.h, not gdb_string.h.
+	* ada-typeprint.c: Use string.h, not gdb_string.h.
+	* ada-valprint.c: Use string.h, not gdb_string.h.
+	* aix-thread.c: Use string.h, not gdb_string.h.
+	* alpha-linux-tdep.c: Use string.h, not gdb_string.h.
+	* alpha-mdebug-tdep.c: Use string.h, not gdb_string.h.
+	* alpha-nat.c: Use string.h, not gdb_string.h.
+	* alpha-osf1-tdep.c: Use string.h, not gdb_string.h.
+	* alpha-tdep.c: Use string.h, not gdb_string.h.
+	* alphanbsd-tdep.c: Use string.h, not gdb_string.h.
+	* amd64-dicos-tdep.c: Use string.h, not gdb_string.h.
+	* amd64-linux-nat.c: Use string.h, not gdb_string.h.
+	* amd64-linux-tdep.c: Use string.h, not gdb_string.h.
+	* amd64-nat.c: Use string.h, not gdb_string.h.
+	* amd64-sol2-tdep.c: Use string.h, not gdb_string.h.
+	* amd64fbsd-tdep.c: Use string.h, not gdb_string.h.
+	* amd64obsd-tdep.c: Use string.h, not gdb_string.h.
+	* arch-utils.c: Use string.h, not gdb_string.h.
+	* arm-linux-nat.c: Use string.h, not gdb_string.h.
+	* arm-linux-tdep.c: Use string.h, not gdb_string.h.
+	* arm-tdep.c: Use string.h, not gdb_string.h.
+	* arm-wince-tdep.c: Use string.h, not gdb_string.h.
+	* armbsd-tdep.c: Use string.h, not gdb_string.h.
+	* armnbsd-nat.c: Use string.h, not gdb_string.h.
+	* armnbsd-tdep.c: Use string.h, not gdb_string.h.
+	* armobsd-tdep.c: Use string.h, not gdb_string.h.
+	* avr-tdep.c: Use string.h, not gdb_string.h.
+	* ax-gdb.c: Use string.h, not gdb_string.h.
+	* ax-general.c: Use string.h, not gdb_string.h.
+	* bcache.c: Use string.h, not gdb_string.h.
+	* bfin-tdep.c: Use string.h, not gdb_string.h.
+	* breakpoint.c: Use string.h, not gdb_string.h.
+	* build-id.c: Use string.h, not gdb_string.h.
+	* buildsym.c: Use string.h, not gdb_string.h.
+	* c-exp.y: Use string.h, not gdb_string.h.
+	* c-lang.c: Use string.h, not gdb_string.h.
+	* c-typeprint.c: Use string.h, not gdb_string.h.
+	* c-valprint.c: Use string.h, not gdb_string.h.
+	* charset.c: Use string.h, not gdb_string.h.
+	* cli-out.c: Use string.h, not gdb_string.h.
+	* cli/cli-cmds.c: Use string.h, not gdb_string.h.
+	* cli/cli-decode.c: Use string.h, not gdb_string.h.
+	* cli/cli-dump.c: Use string.h, not gdb_string.h.
+	* cli/cli-interp.c: Use string.h, not gdb_string.h.
+	* cli/cli-logging.c: Use string.h, not gdb_string.h.
+	* cli/cli-script.c: Use string.h, not gdb_string.h.
+	* cli/cli-setshow.c: Use string.h, not gdb_string.h.
+	* cli/cli-utils.c: Use string.h, not gdb_string.h.
+	* coffread.c: Use string.h, not gdb_string.h.
+	* common/common-utils.c: Use string.h, not gdb_string.h.
+	* common/filestuff.c: Use string.h, not gdb_string.h.
+	* common/linux-procfs.c: Use string.h, not gdb_string.h.
+	* common/linux-ptrace.c: Use string.h, not gdb_string.h.
+	* common/signals.c: Use string.h, not gdb_string.h.
+	* common/vec.h: Use string.h, not gdb_string.h.
+	* core-regset.c: Use string.h, not gdb_string.h.
+	* corefile.c: Use string.h, not gdb_string.h.
+	* corelow.c: Use string.h, not gdb_string.h.
+	* cp-abi.c: Use string.h, not gdb_string.h.
+	* cp-support.c: Use string.h, not gdb_string.h.
+	* cp-valprint.c: Use string.h, not gdb_string.h.
+	* cris-tdep.c: Use string.h, not gdb_string.h.
+	* d-lang.c: Use string.h, not gdb_string.h.
+	* dbxread.c: Use string.h, not gdb_string.h.
+	* dcache.c: Use string.h, not gdb_string.h.
+	* demangle.c: Use string.h, not gdb_string.h.
+	* dicos-tdep.c: Use string.h, not gdb_string.h.
+	* disasm.c: Use string.h, not gdb_string.h.
+	* doublest.c: Use string.h, not gdb_string.h.
+	* dsrec.c: Use string.h, not gdb_string.h.
+	* dummy-frame.c: Use string.h, not gdb_string.h.
+	* dwarf2-frame.c: Use string.h, not gdb_string.h.
+	* dwarf2loc.c: Use string.h, not gdb_string.h.
+	* dwarf2read.c: Use string.h, not gdb_string.h.
+	* elfread.c: Use string.h, not gdb_string.h.
+	* environ.c: Use string.h, not gdb_string.h.
+	* eval.c: Use string.h, not gdb_string.h.
+	* event-loop.c: Use string.h, not gdb_string.h.
+	* exceptions.c: Use string.h, not gdb_string.h.
+	* exec.c: Use string.h, not gdb_string.h.
+	* expprint.c: Use string.h, not gdb_string.h.
+	* f-exp.y: Use string.h, not gdb_string.h.
+	* f-lang.c: Use string.h, not gdb_string.h.
+	* f-typeprint.c: Use string.h, not gdb_string.h.
+	* f-valprint.c: Use string.h, not gdb_string.h.
+	* fbsd-nat.c: Use string.h, not gdb_string.h.
+	* findcmd.c: Use string.h, not gdb_string.h.
+	* findvar.c: Use string.h, not gdb_string.h.
+	* fork-child.c: Use string.h, not gdb_string.h.
+	* frame.c: Use string.h, not gdb_string.h.
+	* frv-linux-tdep.c: Use string.h, not gdb_string.h.
+	* frv-tdep.c: Use string.h, not gdb_string.h.
+	* gdb.c: Use string.h, not gdb_string.h.
+	* gdb_bfd.c: Use string.h, not gdb_string.h.
+	* gdbarch.c: Use string.h, not gdb_string.h.
+	* gdbtypes.c: Use string.h, not gdb_string.h.
+	* gnu-nat.c: Use string.h, not gdb_string.h.
+	* gnu-v2-abi.c: Use string.h, not gdb_string.h.
+	* gnu-v3-abi.c: Use string.h, not gdb_string.h.
+	* go-exp.y: Use string.h, not gdb_string.h.
+	* go-lang.c: Use string.h, not gdb_string.h.
+	* go32-nat.c: Use string.h, not gdb_string.h.
+	* hppa-hpux-tdep.c: Use string.h, not gdb_string.h.
+	* hppa-linux-nat.c: Use string.h, not gdb_string.h.
+	* hppanbsd-tdep.c: Use string.h, not gdb_string.h.
+	* hppaobsd-tdep.c: Use string.h, not gdb_string.h.
+	* i386-cygwin-tdep.c: Use string.h, not gdb_string.h.
+	* i386-dicos-tdep.c: Use string.h, not gdb_string.h.
+	* i386-linux-nat.c: Use string.h, not gdb_string.h.
+	* i386-linux-tdep.c: Use string.h, not gdb_string.h.
+	* i386-nto-tdep.c: Use string.h, not gdb_string.h.
+	* i386-sol2-tdep.c: Use string.h, not gdb_string.h.
+	* i386-tdep.c: Use string.h, not gdb_string.h.
+	* i386bsd-tdep.c: Use string.h, not gdb_string.h.
+	* i386gnu-nat.c: Use string.h, not gdb_string.h.
+	* i386nbsd-tdep.c: Use string.h, not gdb_string.h.
+	* i386obsd-tdep.c: Use string.h, not gdb_string.h.
+	* i387-tdep.c: Use string.h, not gdb_string.h.
+	* ia64-libunwind-tdep.c: Use string.h, not gdb_string.h.
+	* ia64-linux-nat.c: Use string.h, not gdb_string.h.
+	* inf-child.c: Use string.h, not gdb_string.h.
+	* inf-ptrace.c: Use string.h, not gdb_string.h.
+	* inf-ttrace.c: Use string.h, not gdb_string.h.
+	* infcall.c: Use string.h, not gdb_string.h.
+	* infcmd.c: Use string.h, not gdb_string.h.
+	* inflow.c: Use string.h, not gdb_string.h.
+	* infrun.c: Use string.h, not gdb_string.h.
+	* interps.c: Use string.h, not gdb_string.h.
+	* iq2000-tdep.c: Use string.h, not gdb_string.h.
+	* irix5-nat.c: Use string.h, not gdb_string.h.
+	* jv-exp.y: Use string.h, not gdb_string.h.
+	* jv-lang.c: Use string.h, not gdb_string.h.
+	* jv-typeprint.c: Use string.h, not gdb_string.h.
+	* jv-valprint.c: Use string.h, not gdb_string.h.
+	* language.c: Use string.h, not gdb_string.h.
+	* linux-fork.c: Use string.h, not gdb_string.h.
+	* linux-nat.c: Use string.h, not gdb_string.h.
+	* lm32-tdep.c: Use string.h, not gdb_string.h.
+	* m2-exp.y: Use string.h, not gdb_string.h.
+	* m2-typeprint.c: Use string.h, not gdb_string.h.
+	* m32c-tdep.c: Use string.h, not gdb_string.h.
+	* m32r-linux-nat.c: Use string.h, not gdb_string.h.
+	* m32r-linux-tdep.c: Use string.h, not gdb_string.h.
+	* m32r-rom.c: Use string.h, not gdb_string.h.
+	* m32r-tdep.c: Use string.h, not gdb_string.h.
+	* m68hc11-tdep.c: Use string.h, not gdb_string.h.
+	* m68k-tdep.c: Use string.h, not gdb_string.h.
+	* m68kbsd-tdep.c: Use string.h, not gdb_string.h.
+	* m68klinux-nat.c: Use string.h, not gdb_string.h.
+	* m68klinux-tdep.c: Use string.h, not gdb_string.h.
+	* m88k-tdep.c: Use string.h, not gdb_string.h.
+	* macrocmd.c: Use string.h, not gdb_string.h.
+	* main.c: Use string.h, not gdb_string.h.
+	* mdebugread.c: Use string.h, not gdb_string.h.
+	* mem-break.c: Use string.h, not gdb_string.h.
+	* memattr.c: Use string.h, not gdb_string.h.
+	* memory-map.c: Use string.h, not gdb_string.h.
+	* mep-tdep.c: Use string.h, not gdb_string.h.
+	* mi/mi-cmd-break.c: Use string.h, not gdb_string.h.
+	* mi/mi-cmd-disas.c: Use string.h, not gdb_string.h.
+	* mi/mi-cmd-env.c: Use string.h, not gdb_string.h.
+	* mi/mi-cmd-stack.c: Use string.h, not gdb_string.h.
+	* mi/mi-cmd-var.c: Use string.h, not gdb_string.h.
+	* mi/mi-cmds.c: Use string.h, not gdb_string.h.
+	* mi/mi-console.c: Use string.h, not gdb_string.h.
+	* mi/mi-getopt.c: Use string.h, not gdb_string.h.
+	* mi/mi-interp.c: Use string.h, not gdb_string.h.
+	* mi/mi-main.c: Use string.h, not gdb_string.h.
+	* mi/mi-parse.c: Use string.h, not gdb_string.h.
+	* microblaze-rom.c: Use string.h, not gdb_string.h.
+	* microblaze-tdep.c: Use string.h, not gdb_string.h.
+	* mingw-hdep.c: Use string.h, not gdb_string.h.
+	* minidebug.c: Use string.h, not gdb_string.h.
+	* minsyms.c: Use string.h, not gdb_string.h.
+	* mips-irix-tdep.c: Use string.h, not gdb_string.h.
+	* mips-linux-tdep.c: Use string.h, not gdb_string.h.
+	* mips-tdep.c: Use string.h, not gdb_string.h.
+	* mips64obsd-tdep.c: Use string.h, not gdb_string.h.
+	* mipsnbsd-tdep.c: Use string.h, not gdb_string.h.
+	* mipsread.c: Use string.h, not gdb_string.h.
+	* mn10300-linux-tdep.c: Use string.h, not gdb_string.h.
+	* mn10300-tdep.c: Use string.h, not gdb_string.h.
+	* monitor.c: Use string.h, not gdb_string.h.
+	* moxie-tdep.c: Use string.h, not gdb_string.h.
+	* mt-tdep.c: Use string.h, not gdb_string.h.
+	* nbsd-tdep.c: Use string.h, not gdb_string.h.
+	* nios2-linux-tdep.c: Use string.h, not gdb_string.h.
+	* nto-procfs.c: Use string.h, not gdb_string.h.
+	* nto-tdep.c: Use string.h, not gdb_string.h.
+	* objc-lang.c: Use string.h, not gdb_string.h.
+	* objfiles.c: Use string.h, not gdb_string.h.
+	* opencl-lang.c: Use string.h, not gdb_string.h.
+	* osabi.c: Use string.h, not gdb_string.h.
+	* osdata.c: Use string.h, not gdb_string.h.
+	* p-exp.y: Use string.h, not gdb_string.h.
+	* p-lang.c: Use string.h, not gdb_string.h.
+	* p-typeprint.c: Use string.h, not gdb_string.h.
+	* parse.c: Use string.h, not gdb_string.h.
+	* posix-hdep.c: Use string.h, not gdb_string.h.
+	* ppc-linux-nat.c: Use string.h, not gdb_string.h.
+	* ppc-sysv-tdep.c: Use string.h, not gdb_string.h.
+	* ppcfbsd-tdep.c: Use string.h, not gdb_string.h.
+	* ppcnbsd-tdep.c: Use string.h, not gdb_string.h.
+	* ppcobsd-tdep.c: Use string.h, not gdb_string.h.
+	* printcmd.c: Use string.h, not gdb_string.h.
+	* procfs.c: Use string.h, not gdb_string.h.
+	* prologue-value.c: Use string.h, not gdb_string.h.
+	* python/py-auto-load.c: Use string.h, not gdb_string.h.
+	* python/py-gdb-readline.c: Use string.h, not gdb_string.h.
+	* ravenscar-thread.c: Use string.h, not gdb_string.h.
+	* regcache.c: Use string.h, not gdb_string.h.
+	* registry.c: Use string.h, not gdb_string.h.
+	* remote-fileio.c: Use string.h, not gdb_string.h.
+	* remote-m32r-sdi.c: Use string.h, not gdb_string.h.
+	* remote-mips.c: Use string.h, not gdb_string.h.
+	* remote-sim.c: Use string.h, not gdb_string.h.
+	* remote.c: Use string.h, not gdb_string.h.
+	* reverse.c: Use string.h, not gdb_string.h.
+	* rs6000-aix-tdep.c: Use string.h, not gdb_string.h.
+	* ser-base.c: Use string.h, not gdb_string.h.
+	* ser-go32.c: Use string.h, not gdb_string.h.
+	* ser-mingw.c: Use string.h, not gdb_string.h.
+	* ser-pipe.c: Use string.h, not gdb_string.h.
+	* ser-tcp.c: Use string.h, not gdb_string.h.
+	* ser-unix.c: Use string.h, not gdb_string.h.
+	* serial.c: Use string.h, not gdb_string.h.
+	* sh-tdep.c: Use string.h, not gdb_string.h.
+	* sh64-tdep.c: Use string.h, not gdb_string.h.
+	* shnbsd-tdep.c: Use string.h, not gdb_string.h.
+	* skip.c: Use string.h, not gdb_string.h.
+	* sol-thread.c: Use string.h, not gdb_string.h.
+	* solib-dsbt.c: Use string.h, not gdb_string.h.
+	* solib-frv.c: Use string.h, not gdb_string.h.
+	* solib-osf.c: Use string.h, not gdb_string.h.
+	* solib-spu.c: Use string.h, not gdb_string.h.
+	* solib-target.c: Use string.h, not gdb_string.h.
+	* solib.c: Use string.h, not gdb_string.h.
+	* somread.c: Use string.h, not gdb_string.h.
+	* source.c: Use string.h, not gdb_string.h.
+	* sparc-nat.c: Use string.h, not gdb_string.h.
+	* sparc-sol2-tdep.c: Use string.h, not gdb_string.h.
+	* sparc-tdep.c: Use string.h, not gdb_string.h.
+	* sparc64-tdep.c: Use string.h, not gdb_string.h.
+	* sparc64fbsd-tdep.c: Use string.h, not gdb_string.h.
+	* sparc64nbsd-tdep.c: Use string.h, not gdb_string.h.
+	* sparcnbsd-tdep.c: Use string.h, not gdb_string.h.
+	* spu-linux-nat.c: Use string.h, not gdb_string.h.
+	* spu-multiarch.c: Use string.h, not gdb_string.h.
+	* spu-tdep.c: Use string.h, not gdb_string.h.
+	* stabsread.c: Use string.h, not gdb_string.h.
+	* stack.c: Use string.h, not gdb_string.h.
+	* std-regs.c: Use string.h, not gdb_string.h.
+	* symfile.c: Use string.h, not gdb_string.h.
+	* symmisc.c: Use string.h, not gdb_string.h.
+	* symtab.c: Use string.h, not gdb_string.h.
+	* target.c: Use string.h, not gdb_string.h.
+	* thread.c: Use string.h, not gdb_string.h.
+	* tilegx-linux-nat.c: Use string.h, not gdb_string.h.
+	* tilegx-tdep.c: Use string.h, not gdb_string.h.
+	* top.c: Use string.h, not gdb_string.h.
+	* tracepoint.c: Use string.h, not gdb_string.h.
+	* tui/tui-command.c: Use string.h, not gdb_string.h.
+	* tui/tui-data.c: Use string.h, not gdb_string.h.
+	* tui/tui-disasm.c: Use string.h, not gdb_string.h.
+	* tui/tui-file.c: Use string.h, not gdb_string.h.
+	* tui/tui-layout.c: Use string.h, not gdb_string.h.
+	* tui/tui-out.c: Use string.h, not gdb_string.h.
+	* tui/tui-regs.c: Use string.h, not gdb_string.h.
+	* tui/tui-source.c: Use string.h, not gdb_string.h.
+	* tui/tui-stack.c: Use string.h, not gdb_string.h.
+	* tui/tui-win.c: Use string.h, not gdb_string.h.
+	* tui/tui-windata.c: Use string.h, not gdb_string.h.
+	* tui/tui-winsource.c: Use string.h, not gdb_string.h.
+	* typeprint.c: Use string.h, not gdb_string.h.
+	* ui-file.c: Use string.h, not gdb_string.h.
+	* ui-out.c: Use string.h, not gdb_string.h.
+	* user-regs.c: Use string.h, not gdb_string.h.
+	* utils.c: Use string.h, not gdb_string.h.
+	* v850-tdep.c: Use string.h, not gdb_string.h.
+	* valarith.c: Use string.h, not gdb_string.h.
+	* valops.c: Use string.h, not gdb_string.h.
+	* valprint.c: Use string.h, not gdb_string.h.
+	* value.c: Use string.h, not gdb_string.h.
+	* varobj.c: Use string.h, not gdb_string.h.
+	* vax-tdep.c: Use string.h, not gdb_string.h.
+	* vaxnbsd-tdep.c: Use string.h, not gdb_string.h.
+	* vaxobsd-tdep.c: Use string.h, not gdb_string.h.
+	* windows-nat.c: Use string.h, not gdb_string.h.
+	* xcoffread.c: Use string.h, not gdb_string.h.
+	* xml-support.c: Use string.h, not gdb_string.h.
+	* xstormy16-tdep.c: Use string.h, not gdb_string.h.
+	* xtensa-linux-nat.c: Use string.h, not gdb_string.h.
+
 2013-11-18  Tom Tromey  <tromey@redhat.com>
 
 	* gnulib/update-gnulib.sh (IMPORTED_GNULIB_MODULES): Add strerror
diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c
index ea25cf610dc..04ff1c5eeee 100644
--- a/gdb/aarch64-tdep.c
+++ b/gdb/aarch64-tdep.c
@@ -24,7 +24,7 @@
 #include "inferior.h"
 #include "gdbcmd.h"
 #include "gdbcore.h"
-#include "gdb_string.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 5270461760b..0a0c1e795dd 100644
--- a/gdb/ada-exp.y
+++ b/gdb/ada-exp.y
@@ -36,7 +36,7 @@
 %{
 
 #include "defs.h"
-#include "gdb_string.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 4adda1cc4b5..28daa248415 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -20,7 +20,7 @@
 
 #include "defs.h"
 #include <stdio.h>
-#include "gdb_string.h"
+#include <string.h>
 #include <ctype.h>
 #include <stdarg.h>
 #include "demangle.h"
diff --git a/gdb/ada-lex.l b/gdb/ada-lex.l
index 2f9e1b39e45..3c30043323c 100644
--- a/gdb/ada-lex.l
+++ b/gdb/ada-lex.l
@@ -288,7 +288,7 @@ false		{ return FALSEKEYWORD; }
 %%
 
 #include <ctype.h>
-#include "gdb_string.h"
+#include <string.h>
 
 /* Initialize the lexer for processing new expression. */
 
diff --git a/gdb/ada-typeprint.c b/gdb/ada-typeprint.c
index 2f70555c11d..0c3d3140c07 100644
--- a/gdb/ada-typeprint.c
+++ b/gdb/ada-typeprint.c
@@ -34,7 +34,7 @@
 #include "ada-lang.h"
 
 #include <ctype.h>
-#include "gdb_string.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 4a04d2821f7..9f64e569a38 100644
--- a/gdb/ada-valprint.c
+++ b/gdb/ada-valprint.c
@@ -19,7 +19,7 @@
 
 #include "defs.h"
 #include <ctype.h>
-#include "gdb_string.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 373a09aabfd..df21a99f042 100644
--- a/gdb/aix-thread.c
+++ b/gdb/aix-thread.c
@@ -47,7 +47,7 @@
 #include "regcache.h"
 #include "gdbcmd.h"
 #include "ppc-tdep.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "observer.h"
 
 #include <procinfo.h>
diff --git a/gdb/alpha-linux-tdep.c b/gdb/alpha-linux-tdep.c
index 8cb087ee476..c270747921e 100644
--- a/gdb/alpha-linux-tdep.c
+++ b/gdb/alpha-linux-tdep.c
@@ -19,7 +19,7 @@
 #include "defs.h"
 #include "frame.h"
 #include "gdb_assert.h"
-#include "gdb_string.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 785aec0afd5..78d20e63722 100644
--- a/gdb/alpha-mdebug-tdep.c
+++ b/gdb/alpha-mdebug-tdep.c
@@ -24,7 +24,7 @@
 #include "gdbcore.h"
 #include "block.h"
 #include "gdb_assert.h"
-#include "gdb_string.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 2aa6bda46b0..98da17ec757 100644
--- a/gdb/alpha-nat.c
+++ b/gdb/alpha-nat.c
@@ -17,7 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.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 a4b084cc70c..8d7c9ab7348 100644
--- a/gdb/alpha-osf1-tdep.c
+++ b/gdb/alpha-osf1-tdep.c
@@ -21,7 +21,7 @@
 #include "gdbcore.h"
 #include "value.h"
 #include "osabi.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "objfiles.h"
 
 #include "alpha-tdep.h"
diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c
index a8b90b90771..ebaa1dd1f50 100644
--- a/gdb/alpha-tdep.c
+++ b/gdb/alpha-tdep.c
@@ -31,7 +31,7 @@
 #include "dis-asm.h"
 #include "symfile.h"
 #include "objfiles.h"
-#include "gdb_string.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 757bc46a8f4..b19c72c7f8d 100644
--- a/gdb/alphanbsd-tdep.c
+++ b/gdb/alphanbsd-tdep.c
@@ -28,7 +28,7 @@
 #include "value.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include "alpha-tdep.h"
 #include "alphabsd-tdep.h"
diff --git a/gdb/amd64-dicos-tdep.c b/gdb/amd64-dicos-tdep.c
index 6bc74031a15..df97152d018 100644
--- a/gdb/amd64-dicos-tdep.c
+++ b/gdb/amd64-dicos-tdep.c
@@ -19,7 +19,7 @@
 
 #include "defs.h"
 #include "osabi.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "amd64-tdep.h"
 #include "dicos-tdep.h"
 
diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c
index a61d2180a9c..dca3d0a0a00 100644
--- a/gdb/amd64-linux-nat.c
+++ b/gdb/amd64-linux-nat.c
@@ -29,7 +29,7 @@
 #include "btrace.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "elf/common.h"
 #include <sys/uio.h>
 #include <sys/ptrace.h>
diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c
index 4f6776216d2..73864ec07e1 100644
--- a/gdb/amd64-linux-tdep.c
+++ b/gdb/amd64-linux-tdep.c
@@ -33,7 +33,7 @@
 #include "linux-tdep.h"
 #include "i386-xstate.h"
 
-#include "gdb_string.h"
+#include <string.h>
 
 #include "amd64-tdep.h"
 #include "solib-svr4.h"
diff --git a/gdb/amd64-nat.c b/gdb/amd64-nat.c
index 2a9239a58b4..4f70d0d3a6c 100644
--- a/gdb/amd64-nat.c
+++ b/gdb/amd64-nat.c
@@ -22,7 +22,7 @@
 #include "regcache.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include "i386-tdep.h"
 #include "amd64-tdep.h"
diff --git a/gdb/amd64-sol2-tdep.c b/gdb/amd64-sol2-tdep.c
index a880334c91a..786119c81ee 100644
--- a/gdb/amd64-sol2-tdep.c
+++ b/gdb/amd64-sol2-tdep.c
@@ -26,7 +26,7 @@
 #include "osabi.h"
 #include "symtab.h"
 
-#include "gdb_string.h"
+#include <string.h>
 
 #include "sol2-tdep.h"
 #include "amd64-tdep.h"
diff --git a/gdb/amd64fbsd-tdep.c b/gdb/amd64fbsd-tdep.c
index 1b94fe17f69..9846d7f6f6a 100644
--- a/gdb/amd64fbsd-tdep.c
+++ b/gdb/amd64fbsd-tdep.c
@@ -25,7 +25,7 @@
 #include "osabi.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include "amd64-tdep.h"
 #include "bsd-uthread.h"
diff --git a/gdb/amd64obsd-tdep.c b/gdb/amd64obsd-tdep.c
index ae0ead139c4..c8e712db702 100644
--- a/gdb/amd64obsd-tdep.c
+++ b/gdb/amd64obsd-tdep.c
@@ -30,7 +30,7 @@
 #include "trad-frame.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include "amd64-tdep.h"
 #include "i387-tdep.h"
diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index 459fd882047..cb566ad2555 100644
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -23,7 +23,7 @@
 #include "buildsym.h"
 #include "gdbcmd.h"
 #include "inferior.h"		/* enum CALL_DUMMY_LOCATION et al.  */
-#include "gdb_string.h"
+#include <string.h>
 #include "regcache.h"
 #include "gdb_assert.h"
 #include "sim-regno.h"
diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c
index 96573d93134..c43a7e4a5e4 100644
--- a/gdb/arm-linux-nat.c
+++ b/gdb/arm-linux-nat.c
@@ -19,7 +19,7 @@
 #include "defs.h"
 #include "inferior.h"
 #include "gdbcore.h"
-#include "gdb_string.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 7546d34a1bb..9deed1084e4 100644
--- a/gdb/arm-linux-tdep.c
+++ b/gdb/arm-linux-tdep.c
@@ -50,7 +50,7 @@
 #include "user-regs.h"
 #include <ctype.h>
 #include "elf/common.h"
-#include "gdb_string.h"
+#include <string.h>
 
 extern int arm_apcs_32;
 
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 1ed21ead020..74e2f48237d 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -25,7 +25,7 @@
 #include "inferior.h"
 #include "gdbcmd.h"
 #include "gdbcore.h"
-#include "gdb_string.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 0e888e06bed..e63dc89d690 100644
--- a/gdb/arm-wince-tdep.c
+++ b/gdb/arm-wince-tdep.c
@@ -24,7 +24,7 @@
 #include "target.h"
 #include "frame.h"
 
-#include "gdb_string.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 a893a67f6eb..efac0dcaa07 100644
--- a/gdb/armbsd-tdep.c
+++ b/gdb/armbsd-tdep.c
@@ -23,7 +23,7 @@
 #include "regset.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include "arm-tdep.h"
 
diff --git a/gdb/armnbsd-nat.c b/gdb/armnbsd-nat.c
index 20d83786798..0779c144bd0 100644
--- a/gdb/armnbsd-nat.c
+++ b/gdb/armnbsd-nat.c
@@ -23,7 +23,7 @@
 #include "regcache.h"
 #include "target.h"
 
-#include "gdb_string.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 abb7637f131..4b03b1bfb4f 100644
--- a/gdb/armnbsd-tdep.c
+++ b/gdb/armnbsd-tdep.c
@@ -20,7 +20,7 @@
 #include "defs.h"
 #include "osabi.h"
 
-#include "gdb_string.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 384ef87e705..37f69cae78c 100644
--- a/gdb/armobsd-tdep.c
+++ b/gdb/armobsd-tdep.c
@@ -22,7 +22,7 @@
 #include "trad-frame.h"
 #include "tramp-frame.h"
 
-#include "gdb_string.h"
+#include <string.h>
 
 #include "obsd-tdep.h"
 #include "arm-tdep.h"
diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c
index fc4e0f062df..6d243c476e2 100644
--- a/gdb/avr-tdep.c
+++ b/gdb/avr-tdep.c
@@ -34,7 +34,7 @@
 #include "symfile.h"
 #include "arch-utils.h"
 #include "regcache.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "dis-asm.h"
 
 /* AVR Background:
diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c
index 4196655e61d..4f68128cd85 100644
--- a/gdb/ax-gdb.c
+++ b/gdb/ax-gdb.c
@@ -30,7 +30,7 @@
 #include "target.h"
 #include "ax.h"
 #include "ax-gdb.h"
-#include "gdb_string.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 78d7f7e5731..4489c207919 100644
--- a/gdb/ax-general.c
+++ b/gdb/ax-general.c
@@ -25,7 +25,7 @@
 #include "ax.h"
 
 #include "value.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include "user-regs.h"
 
diff --git a/gdb/bcache.c b/gdb/bcache.c
index 712142dac7f..6efccc776a2 100644
--- a/gdb/bcache.c
+++ b/gdb/bcache.c
@@ -22,7 +22,7 @@
 #include "defs.h"
 #include "gdb_obstack.h"
 #include "bcache.h"
-#include "gdb_string.h"		/* For memcpy declaration */
+#include <string.h>		/* For memcpy declaration */
 #include "gdb_assert.h"
 
 #include <stddef.h>
diff --git a/gdb/bfin-tdep.c b/gdb/bfin-tdep.c
index 22dad1b9e7e..5e77a7fe0d3 100644
--- a/gdb/bfin-tdep.c
+++ b/gdb/bfin-tdep.c
@@ -20,7 +20,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.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 260021ebab5..897b664e872 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -35,7 +35,7 @@
 #include "gdbthread.h"
 #include "target.h"
 #include "language.h"
-#include "gdb_string.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 330ed1802c9..30f51794d26 100644
--- a/gdb/build-id.c
+++ b/gdb/build-id.c
@@ -22,7 +22,7 @@
 #include "elf-bfd.h"
 #include "gdb_bfd.h"
 #include "build-id.h"
-#include "gdb_string.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 68a667a9256..0326e264aba 100644
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -32,7 +32,7 @@
 #include "gdbtypes.h"
 #include "gdb_assert.h"
 #include "complaints.h"
-#include "gdb_string.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 fecfd152f1d..5d4cd8198a8 100644
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -36,7 +36,7 @@
 %{
 
 #include "defs.h"
-#include "gdb_string.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 37b423a10ce..eecc76d6d10 100644
--- a/gdb/c-lang.c
+++ b/gdb/c-lang.c
@@ -29,7 +29,7 @@
 #include "macroscope.h"
 #include "gdb_assert.h"
 #include "charset.h"
-#include "gdb_string.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 bf4564f8a66..275733714fb 100644
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -31,7 +31,7 @@
 #include "typeprint.h"
 #include "cp-abi.h"
 #include "jv-lang.h"
-#include "gdb_string.h"
+#include <string.h>
 #include <errno.h>
 #include "cp-support.h"
 
diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c
index 3466df02d2d..5a21f55afb3 100644
--- a/gdb/c-valprint.c
+++ b/gdb/c-valprint.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "expression.h"
diff --git a/gdb/charset.c b/gdb/charset.c
index 5835fd40872..1f44e8fc1c8 100644
--- a/gdb/charset.c
+++ b/gdb/charset.c
@@ -30,7 +30,7 @@
 #include "gdb_vecs.h"
 
 #include <stddef.h>
-#include "gdb_string.h"
+#include <string.h>
 #include <ctype.h>
 
 #ifdef USE_WIN32API
diff --git a/gdb/cli-out.c b/gdb/cli-out.c
index 380352bd372..380b662e045 100644
--- a/gdb/cli-out.c
+++ b/gdb/cli-out.c
@@ -23,7 +23,7 @@
 #include "defs.h"
 #include "ui-out.h"
 #include "cli-out.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_assert.h"
 #include "vec.h"
 
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 0ef325d5fc1..85f171356c4 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -27,7 +27,7 @@
 #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 "gdb_string.h"
+#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 7e315c1e4af..fd406149c98 100644
--- a/gdb/cli/cli-decode.c
+++ b/gdb/cli/cli-decode.c
@@ -19,7 +19,7 @@
 #include "symtab.h"
 #include <ctype.h>
 #include "gdb_regex.h"
-#include "gdb_string.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 774aa7ed529..440c7305312 100644
--- a/gdb/cli/cli-dump.c
+++ b/gdb/cli/cli-dump.c
@@ -20,7 +20,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.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 ac3d9a88b2e..41de005aa6f 100644
--- a/gdb/cli/cli-interp.c
+++ b/gdb/cli/cli-interp.c
@@ -23,7 +23,7 @@
 #include "ui-out.h"
 #include "cli-out.h"
 #include "top.h"		/* for "execute_command" */
-#include "gdb_string.h"
+#include <string.h>
 #include "exceptions.h"
 
 struct ui_out *cli_uiout;
diff --git a/gdb/cli/cli-logging.c b/gdb/cli/cli-logging.c
index 57041799bbb..544af00a679 100644
--- a/gdb/cli/cli-logging.c
+++ b/gdb/cli/cli-logging.c
@@ -23,7 +23,7 @@
 #include "interps.h"
 #include "gdb_assert.h"
 
-#include "gdb_string.h"
+#include <string.h>
 
 /* These hold the pushed copies of the gdb output files.
    If NULL then nothing has yet been pushed.  */
diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c
index 6ea3243d31f..3e8ed7f0504 100644
--- a/gdb/cli/cli-script.c
+++ b/gdb/cli/cli-script.c
@@ -23,7 +23,7 @@
 #include <ctype.h>
 
 #include "ui-out.h"
-#include "gdb_string.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 45df6f6b876..9222091ac4e 100644
--- a/gdb/cli/cli-setshow.c
+++ b/gdb/cli/cli-setshow.c
@@ -19,7 +19,7 @@
 #include "readline/tilde.h"
 #include "value.h"
 #include <ctype.h>
-#include "gdb_string.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 316cf4fcc79..80df4abdcc3 100644
--- a/gdb/cli/cli-utils.c
+++ b/gdb/cli/cli-utils.c
@@ -19,7 +19,7 @@
 
 #include "defs.h"
 #include "cli/cli-utils.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "value.h"
 #include "gdb_assert.h"
 
diff --git a/gdb/coffread.c b/gdb/coffread.c
index 959e96ac83d..b49e30c4ff4 100644
--- a/gdb/coffread.c
+++ b/gdb/coffread.c
@@ -26,7 +26,7 @@
 #include "bfd.h"
 #include "gdb_obstack.h"
 
-#include "gdb_string.h"
+#include <string.h>
 #include <ctype.h>
 
 #include "coff/internal.h"	/* Internal format of COFF symbols in BFD */
diff --git a/gdb/common/common-utils.c b/gdb/common/common-utils.c
index 4204abf8212..4f2b78a6afc 100644
--- a/gdb/common/common-utils.c
+++ b/gdb/common/common-utils.c
@@ -24,7 +24,7 @@
 #endif
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/gdb/common/filestuff.c b/gdb/common/filestuff.c
index 4032f363280..ff6d54fc20c 100644
--- a/gdb/common/filestuff.c
+++ b/gdb/common/filestuff.c
@@ -20,7 +20,7 @@
 #include "server.h"
 #else
 #include "defs.h"
-#include "gdb_string.h"
+#include <string.h>
 #endif
 #include "filestuff.h"
 #include "gdb_vecs.h"
diff --git a/gdb/common/gdb_string.h b/gdb/common/gdb_string.h
deleted file mode 100644
index b7c52cf812a..00000000000
--- a/gdb/common/gdb_string.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Portable <string.h>
-
-   Copyright (C) 1995-2013 Free Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#if !defined(GDB_STRING_H)
-#define GDB_STRING_H
-
-#ifdef STDC_HEADERS
-#include <string.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h> /* strcasecmp etc..  */
-#endif
-#else
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
-#ifndef strchr
-extern char *strchr (const char *, int);	/* X3.159-1989  4.11.5.2 */
-#endif
-
-#ifndef strrchr
-extern char *strrchr (const char *, int);	/* X3.159-1989  4.11.5.5 */
-#endif
-
-#ifndef strtok
-extern char *strtok (char *, const char *);	/* X3.159-1989  4.11.5.8 */
-#endif
-
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#else
-extern void *memset ();
-extern void *memcpy ();
-extern void *memmove ();
-extern int memcmp ();
-#endif
-#endif /* STDC_HEADERS */
-
-#if !HAVE_DECL_STRERROR
-#ifndef strerror
-extern char *strerror (int);	/* X3.159-1989  4.11.6.2 */
-#endif
-#endif
-
-#if !HAVE_DECL_STRSTR
-#ifndef strstr
-extern char *strstr (const char *, const char *); /* X3.159-1989  4.11.5.7 */
-#endif
-#endif
-
-#endif /* !defined(GDB_STRING_H) */
diff --git a/gdb/common/linux-procfs.c b/gdb/common/linux-procfs.c
index 583ec98393d..ec0f6c72fa0 100644
--- a/gdb/common/linux-procfs.c
+++ b/gdb/common/linux-procfs.c
@@ -20,7 +20,7 @@
 #include "server.h"
 #else
 #include "defs.h"
-#include "gdb_string.h"
+#include <string.h>
 #endif
 
 #include "linux-procfs.h"
diff --git a/gdb/common/linux-ptrace.c b/gdb/common/linux-ptrace.c
index 9f11f2ffa0e..2b12a681214 100644
--- a/gdb/common/linux-ptrace.c
+++ b/gdb/common/linux-ptrace.c
@@ -20,7 +20,7 @@
 #include "server.h"
 #else
 #include "defs.h"
-#include "gdb_string.h"
+#include <string.h>
 #endif
 
 #include "linux-ptrace.h"
diff --git a/gdb/common/signals.c b/gdb/common/signals.c
index 1f3e3a4e0b8..299519505a1 100644
--- a/gdb/common/signals.c
+++ b/gdb/common/signals.c
@@ -21,7 +21,7 @@
 #include "server.h"
 #else
 #include "defs.h"
-#include "gdb_string.h"
+#include <string.h>
 #endif
 
 #ifdef HAVE_SIGNAL_H
diff --git a/gdb/common/vec.h b/gdb/common/vec.h
index 86564e716b3..b4988a70b60 100644
--- a/gdb/common/vec.h
+++ b/gdb/common/vec.h
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_assert.h"
 
 /* The macros here implement a set of templated vector types and
diff --git a/gdb/core-regset.c b/gdb/core-regset.c
index 20a3379b5dc..15a5f1f1f11 100644
--- a/gdb/core-regset.c
+++ b/gdb/core-regset.c
@@ -35,7 +35,7 @@
 
 #include <fcntl.h>
 #include <errno.h>
-#include "gdb_string.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 345df90799e..e82f9782c30 100644
--- a/gdb/corefile.c
+++ b/gdb/corefile.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.h"
+#include <string.h>
 #include <errno.h>
 #include <signal.h>
 #include <fcntl.h>
diff --git a/gdb/corelow.c b/gdb/corelow.c
index 78f8120220c..2869eeaaffa 100644
--- a/gdb/corelow.c
+++ b/gdb/corelow.c
@@ -19,7 +19,7 @@
 
 #include "defs.h"
 #include "arch-utils.h"
-#include "gdb_string.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 2540eca17aa..f1858898fa7 100644
--- a/gdb/cp-abi.c
+++ b/gdb/cp-abi.c
@@ -25,7 +25,7 @@
 #include "gdbcmd.h"
 #include "ui-out.h"
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 
 static struct cp_abi_ops *find_cp_abi (const char *short_name);
 
diff --git a/gdb/cp-support.c b/gdb/cp-support.c
index b91bcdcdf3f..6b85ecb2f87 100644
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -20,7 +20,7 @@
 
 #include "defs.h"
 #include "cp-support.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "demangle.h"
 #include "gdb_assert.h"
 #include "gdbcmd.h"
diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index 4b625d1c4ae..bcf54ff01ad 100644
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -27,7 +27,7 @@
 #include "gdbcmd.h"
 #include "demangle.h"
 #include "annotate.h"
-#include "gdb_string.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 8ba16770d09..b320c514d8e 100644
--- a/gdb/cris-tdep.c
+++ b/gdb/cris-tdep.c
@@ -43,7 +43,7 @@
 
 #include "solib.h"              /* Support for shared libraries.  */
 #include "solib-svr4.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "dis-asm.h"
 
 #include "cris-tdep.h"
diff --git a/gdb/d-lang.c b/gdb/d-lang.c
index 3dad91f1c52..35d92eacf6b 100644
--- a/gdb/d-lang.c
+++ b/gdb/d-lang.c
@@ -23,7 +23,7 @@
 #include "varobj.h"
 #include "d-lang.h"
 #include "c-lang.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "parser-defs.h"
 #include "gdb_obstack.h"
 
diff --git a/gdb/dbxread.c b/gdb/dbxread.c
index 00949acd11c..67deeec5d6a 100644
--- a/gdb/dbxread.c
+++ b/gdb/dbxread.c
@@ -31,7 +31,7 @@
    for real.  dbx_psymtab_to_symtab() is the function that does this */
 
 #include "defs.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #if defined(__CYGNUSCLIB__)
 #include <sys/types.h>
@@ -58,7 +58,7 @@
 #include "block.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include "aout/aout64.h"
 #include "aout/stab_gnu.h"	/* We always use GNU stabs, not
diff --git a/gdb/dcache.c b/gdb/dcache.c
index acb9de4aa03..bacd629ec0d 100644
--- a/gdb/dcache.c
+++ b/gdb/dcache.c
@@ -20,7 +20,7 @@
 #include "defs.h"
 #include "dcache.h"
 #include "gdbcmd.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdbcore.h"
 #include "target.h"
 #include "inferior.h"
diff --git a/gdb/demangle.c b/gdb/demangle.c
index 415d891b63d..2d4b0c51815 100644
--- a/gdb/demangle.c
+++ b/gdb/demangle.c
@@ -28,7 +28,7 @@
 #include "gdbcmd.h"
 #include "demangle.h"
 #include "gdb-demangle.h"
-#include "gdb_string.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
diff --git a/gdb/dicos-tdep.c b/gdb/dicos-tdep.c
index 6b3e0712f06..27469a5ebe3 100644
--- a/gdb/dicos-tdep.c
+++ b/gdb/dicos-tdep.c
@@ -19,7 +19,7 @@
 
 #include "defs.h"
 #include "osabi.h"
-#include "gdb_string.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 e643c2d9e30..16903952519 100644
--- a/gdb/disasm.c
+++ b/gdb/disasm.c
@@ -21,7 +21,7 @@
 #include "target.h"
 #include "value.h"
 #include "ui-out.h"
-#include "gdb_string.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 85890b1c728..a4889c976cd 100644
--- a/gdb/doublest.c
+++ b/gdb/doublest.c
@@ -27,7 +27,7 @@
 #include "doublest.h"
 #include "floatformat.h"
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdbtypes.h"
 #include <math.h>		/* ldexp */
 
diff --git a/gdb/dsrec.c b/gdb/dsrec.c
index bc47f849dcf..162fc6477c0 100644
--- a/gdb/dsrec.c
+++ b/gdb/dsrec.c
@@ -22,7 +22,7 @@
 #include <sys/time.h>
 #include <time.h>
 #include "gdb_assert.h"
-#include "gdb_string.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 390a6d86bd4..d24fcdab2cd 100644
--- a/gdb/dummy-frame.c
+++ b/gdb/dummy-frame.c
@@ -27,7 +27,7 @@
 #include "frame-unwind.h"
 #include "command.h"
 #include "gdbcmd.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "observer.h"
 #include "gdbthread.h"
 
diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c
index cd4f47cfa59..91d88024b91 100644
--- a/gdb/dwarf2-frame.c
+++ b/gdb/dwarf2-frame.c
@@ -33,7 +33,7 @@
 #include "value.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include "complaints.h"
 #include "dwarf2-frame.h"
diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
index 1664f6a5284..2d15546f596 100644
--- a/gdb/dwarf2loc.c
+++ b/gdb/dwarf2loc.c
@@ -39,7 +39,7 @@
 #include "dwarf2loc.h"
 #include "dwarf2-frame.h"
 
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_assert.h"
 
 extern int dwarf2_always_disassemble;
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index ee6c4c7f47e..5e8f94ed014 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -72,7 +72,7 @@
 #include "build-id.h"
 
 #include <fcntl.h>
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_assert.h"
 #include <sys/types.h>
 
diff --git a/gdb/elfread.c b/gdb/elfread.c
index 47602efb553..42ab18f92e2 100644
--- a/gdb/elfread.c
+++ b/gdb/elfread.c
@@ -21,7 +21,7 @@
 
 #include "defs.h"
 #include "bfd.h"
-#include "gdb_string.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 50653dafdc7..fb5d90cece6 100644
--- a/gdb/environ.c
+++ b/gdb/environ.c
@@ -20,7 +20,7 @@
 
 #include "defs.h"
 #include "environ.h"
-#include "gdb_string.h"
+#include <string.h>
 
 
 /* Return a new environment object.  */
diff --git a/gdb/eval.c b/gdb/eval.c
index e83bfdf8f17..9d81a92bcc5 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.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 f34f15345ee..a3c28756ff9 100644
--- a/gdb/event-loop.c
+++ b/gdb/event-loop.c
@@ -31,7 +31,7 @@
 #endif
 
 #include <sys/types.h>
-#include "gdb_string.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 c4c1e5716fb..2495fa56605 100644
--- a/gdb/exceptions.c
+++ b/gdb/exceptions.c
@@ -25,7 +25,7 @@
 #include "annotate.h"
 #include "ui-out.h"
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "serial.h"
 #include "gdbthread.h"
 
diff --git a/gdb/exec.c b/gdb/exec.c
index 187c412725d..afd32245de0 100644
--- a/gdb/exec.c
+++ b/gdb/exec.c
@@ -37,7 +37,7 @@
 
 #include <fcntl.h>
 #include "readline/readline.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include "gdbcore.h"
 
diff --git a/gdb/expprint.c b/gdb/expprint.c
index 6eb6f13385a..c385bf01d49 100644
--- a/gdb/expprint.c
+++ b/gdb/expprint.c
@@ -26,7 +26,7 @@
 #include "parser-defs.h"
 #include "user-regs.h"		/* For user_reg_map_regnum_to_name.  */
 #include "target.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "block.h"
 #include "objfiles.h"
 #include "gdb_assert.h"
diff --git a/gdb/f-exp.y b/gdb/f-exp.y
index 59c5e6c8d97..567cd005acb 100644
--- a/gdb/f-exp.y
+++ b/gdb/f-exp.y
@@ -42,7 +42,7 @@
 %{
 
 #include "defs.h"
-#include "gdb_string.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 36560cec8a9..a9f6bffd19a 100644
--- a/gdb/f-lang.c
+++ b/gdb/f-lang.c
@@ -21,7 +21,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.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 aa33231a5cf..f80d01675ac 100644
--- a/gdb/f-typeprint.c
+++ b/gdb/f-typeprint.c
@@ -31,7 +31,7 @@
 #include "target.h"
 #include "f-lang.h"
 
-#include "gdb_string.h"
+#include <string.h>
 #include <errno.h>
 
 #if 0				/* Currently unused.  */
diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
index d01d6ec7a4e..751f7fa05ef 100644
--- a/gdb/f-valprint.c
+++ b/gdb/f-valprint.c
@@ -21,7 +21,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.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 6a362dafa59..6b37a1750d6 100644
--- a/gdb/fbsd-nat.c
+++ b/gdb/fbsd-nat.c
@@ -25,7 +25,7 @@
 #include "gdbthread.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.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 a8cda9b9314..10c246b5ef4 100644
--- a/gdb/findcmd.c
+++ b/gdb/findcmd.c
@@ -20,7 +20,7 @@
 #include "defs.h"
 #include "arch-utils.h"
 #include <ctype.h>
-#include "gdb_string.h"
+#include <string.h>
 #include "gdbcmd.h"
 #include "value.h"
 #include "target.h"
diff --git a/gdb/findvar.c b/gdb/findvar.c
index c3550b43f8f..ec6afd61e34 100644
--- a/gdb/findvar.c
+++ b/gdb/findvar.c
@@ -25,7 +25,7 @@
 #include "gdbcore.h"
 #include "inferior.h"
 #include "target.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_assert.h"
 #include "floatformat.h"
 #include "symfile.h"		/* for overlay functions */
diff --git a/gdb/fork-child.c b/gdb/fork-child.c
index a1e49029e2c..61785fe97f7 100644
--- a/gdb/fork-child.c
+++ b/gdb/fork-child.c
@@ -20,7 +20,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "inferior.h"
 #include "terminal.h"
 #include "target.h"
diff --git a/gdb/frame.c b/gdb/frame.c
index 59e31db692c..63f20d5749a 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -24,7 +24,7 @@
 #include "inferior.h"	/* for inferior_ptid */
 #include "regcache.h"
 #include "gdb_assert.h"
-#include "gdb_string.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 eb6fcf9d671..366eb023b7e 100644
--- a/gdb/frv-linux-tdep.c
+++ b/gdb/frv-linux-tdep.c
@@ -30,7 +30,7 @@
 #include "trad-frame.h"
 #include "frame-unwind.h"
 #include "regset.h"
-#include "gdb_string.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 4b725c3488e..9819d42a361 100644
--- a/gdb/frv-tdep.c
+++ b/gdb/frv-tdep.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.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 9ca7579d3e3..d01dc4637fa 100644
--- a/gdb/gdb.c
+++ b/gdb/gdb.c
@@ -18,7 +18,7 @@
 
 #include "defs.h"
 #include "main.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "interps.h"
 
 int
diff --git a/gdb/gdb_bfd.c b/gdb/gdb_bfd.c
index 25cee5c630c..2beeb5dea3e 100644
--- a/gdb/gdb_bfd.c
+++ b/gdb/gdb_bfd.c
@@ -20,7 +20,7 @@
 #include "defs.h"
 #include "gdb_bfd.h"
 #include "gdb_assert.h"
-#include "gdb_string.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 1f3380ed58f..fb3595f9129 100644
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -43,7 +43,7 @@
 #include "floatformat.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "reggroups.h"
 #include "osabi.h"
 #include "gdb_obstack.h"
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 9069a1122e7..e18a0d249f8 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -20,7 +20,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.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 659aa672820..329d090b315 100644
--- a/gdb/gnu-nat.c
+++ b/gdb/gnu-nat.c
@@ -28,7 +28,7 @@
 #include <setjmp.h>
 #include <signal.h>
 #include <stdio.h>
-#include "gdb_string.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 e7f0166ef18..1babe46f152 100644
--- a/gdb/gnu-v2-abi.c
+++ b/gdb/gnu-v2-abi.c
@@ -20,7 +20,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.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 1821f180a55..e5b4fc80d5c 100644
--- a/gdb/gnu-v3-abi.c
+++ b/gdb/gnu-v3-abi.c
@@ -30,7 +30,7 @@
 #include "typeprint.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 
 static struct cp_abi_ops gnu_v3_abi_ops;
 
diff --git a/gdb/go-exp.y b/gdb/go-exp.y
index 01c382a1f4b..50b9cc217b4 100644
--- a/gdb/go-exp.y
+++ b/gdb/go-exp.y
@@ -52,7 +52,7 @@
 %{
 
 #include "defs.h"
-#include "gdb_string.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 4da1af4478b..4355e59d18c 100644
--- a/gdb/go-lang.c
+++ b/gdb/go-lang.c
@@ -34,7 +34,7 @@
 #include "defs.h"
 #include "gdb_assert.h"
 #include "gdb_obstack.h"
-#include "gdb_string.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 a92a34f46e0..c1172f6f0c5 100644
--- a/gdb/go32-nat.c
+++ b/gdb/go32-nat.c
@@ -99,7 +99,7 @@
 #include "i386-cpuid.h"
 #include "value.h"
 #include "regcache.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "top.h"
 #include "cli/cli-utils.h"
 
diff --git a/gdb/hppa-hpux-tdep.c b/gdb/hppa-hpux-tdep.c
index 88e59ba3e9c..c2ba1eedb0b 100644
--- a/gdb/hppa-hpux-tdep.c
+++ b/gdb/hppa-hpux-tdep.c
@@ -36,7 +36,7 @@
 #include "regcache.h"
 #include "exceptions.h"
 
-#include "gdb_string.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 4f5ca6909b2..f38df6ebd71 100644
--- a/gdb/hppa-linux-nat.c
+++ b/gdb/hppa-linux-nat.c
@@ -20,7 +20,7 @@
 #include "defs.h"
 #include "gdbcore.h"
 #include "regcache.h"
-#include "gdb_string.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 a8ac404d227..d1c84d77f2f 100644
--- a/gdb/hppanbsd-tdep.c
+++ b/gdb/hppanbsd-tdep.c
@@ -26,7 +26,7 @@
 #include "tramp-frame.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.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 5b895c4b155..398e503572a 100644
--- a/gdb/hppaobsd-tdep.c
+++ b/gdb/hppaobsd-tdep.c
@@ -23,7 +23,7 @@
 #include "regset.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.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 6533d1c2c03..7c39b7f7cc3 100644
--- a/gdb/i386-cygwin-tdep.c
+++ b/gdb/i386-cygwin-tdep.c
@@ -19,7 +19,7 @@
 
 #include "defs.h"
 #include "osabi.h"
-#include "gdb_string.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 ff3a51572a9..0f1dfc1b4ce 100644
--- a/gdb/i386-dicos-tdep.c
+++ b/gdb/i386-dicos-tdep.c
@@ -19,7 +19,7 @@
 
 #include "defs.h"
 #include "osabi.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "dicos-tdep.h"
 
 static void
diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c
index 52ecc38f30f..ba51d4c7735 100644
--- a/gdb/i386-linux-nat.c
+++ b/gdb/i386-linux-nat.c
@@ -29,7 +29,7 @@
 #include "btrace.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "elf/common.h"
 #include <sys/uio.h>
 #include <sys/ptrace.h>
diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c
index 7b69aab3a16..21aee96b488 100644
--- a/gdb/i386-linux-tdep.c
+++ b/gdb/i386-linux-tdep.c
@@ -27,7 +27,7 @@
 #include "osabi.h"
 #include "reggroups.h"
 #include "dwarf2-frame.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include "i386-tdep.h"
 #include "i386-linux-tdep.h"
diff --git a/gdb/i386-nto-tdep.c b/gdb/i386-nto-tdep.c
index e39e805e0a2..b314a495afc 100644
--- a/gdb/i386-nto-tdep.c
+++ b/gdb/i386-nto-tdep.c
@@ -26,7 +26,7 @@
 #include "target.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include "i386-tdep.h"
 #include "i387-tdep.h"
diff --git a/gdb/i386-sol2-tdep.c b/gdb/i386-sol2-tdep.c
index 37721384f44..134dca60660 100644
--- a/gdb/i386-sol2-tdep.c
+++ b/gdb/i386-sol2-tdep.c
@@ -21,7 +21,7 @@
 #include "value.h"
 #include "osabi.h"
 
-#include "gdb_string.h"
+#include <string.h>
 
 #include "sol2-tdep.h"
 #include "i386-tdep.h"
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index b159b4962b1..9529dcc7e93 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -45,7 +45,7 @@
 #include "remote.h"
 #include "exceptions.h"
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include "i386-tdep.h"
 #include "i387-tdep.h"
diff --git a/gdb/i386bsd-tdep.c b/gdb/i386bsd-tdep.c
index aa1039312cd..18e64019156 100644
--- a/gdb/i386bsd-tdep.c
+++ b/gdb/i386bsd-tdep.c
@@ -24,7 +24,7 @@
 #include "regcache.h"
 #include "osabi.h"
 
-#include "gdb_string.h"
+#include <string.h>
 
 #include "i386-tdep.h"
 
diff --git a/gdb/i386gnu-nat.c b/gdb/i386gnu-nat.c
index 2b93feeb1e0..50d892fc537 100644
--- a/gdb/i386gnu-nat.c
+++ b/gdb/i386gnu-nat.c
@@ -25,7 +25,7 @@
 #include "gdb_assert.h"
 #include <errno.h>
 #include <stdio.h>
-#include "gdb_string.h"
+#include <string.h>
 
 #include <mach.h>
 #include <mach_error.h>
diff --git a/gdb/i386nbsd-tdep.c b/gdb/i386nbsd-tdep.c
index 79a3809aa5d..5acc521eea1 100644
--- a/gdb/i386nbsd-tdep.c
+++ b/gdb/i386nbsd-tdep.c
@@ -29,7 +29,7 @@
 #include "tramp-frame.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include "i386-tdep.h"
 #include "i387-tdep.h"
diff --git a/gdb/i386obsd-tdep.c b/gdb/i386obsd-tdep.c
index 17007e83f36..d4f7f76505f 100644
--- a/gdb/i386obsd-tdep.c
+++ b/gdb/i386obsd-tdep.c
@@ -31,7 +31,7 @@
 #include "trad-frame.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include "i386-tdep.h"
 #include "i387-tdep.h"
diff --git a/gdb/i387-tdep.c b/gdb/i387-tdep.c
index 48a00c36198..fd44386a4d0 100644
--- a/gdb/i387-tdep.c
+++ b/gdb/i387-tdep.c
@@ -28,7 +28,7 @@
 #include "value.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include "i386-tdep.h"
 #include "i387-tdep.h"
diff --git a/gdb/ia64-libunwind-tdep.c b/gdb/ia64-libunwind-tdep.c
index 3693879fc5b..97116b46580 100644
--- a/gdb/ia64-libunwind-tdep.c
+++ b/gdb/ia64-libunwind-tdep.c
@@ -34,7 +34,7 @@
 #include <dlfcn.h>
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include "ia64-libunwind-tdep.h"
 
diff --git a/gdb/ia64-linux-nat.c b/gdb/ia64-linux-nat.c
index 9d2f75ca62e..edc1e23913a 100644
--- a/gdb/ia64-linux-nat.c
+++ b/gdb/ia64-linux-nat.c
@@ -19,7 +19,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.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 1878272bc0f..36fa81d4e3a 100644
--- a/gdb/inf-child.c
+++ b/gdb/inf-child.c
@@ -24,7 +24,7 @@
 #include "symtab.h"
 #include "target.h"
 #include "inferior.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_stat.h"
 #include "inf-child.h"
 #include "gdb/fileio.h"
diff --git a/gdb/inf-ptrace.c b/gdb/inf-ptrace.c
index 5e5e248352e..34e206bf71b 100644
--- a/gdb/inf-ptrace.c
+++ b/gdb/inf-ptrace.c
@@ -26,7 +26,7 @@
 #include "regcache.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.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 c715c7148f3..eb0adcb2298 100644
--- a/gdb/inf-ttrace.c
+++ b/gdb/inf-ttrace.c
@@ -31,7 +31,7 @@
 #include "target.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.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 19af04421dd..212997f064a 100644
--- a/gdb/infcall.c
+++ b/gdb/infcall.c
@@ -30,7 +30,7 @@
 #include "objfiles.h"
 #include "gdbcmd.h"
 #include "command.h"
-#include "gdb_string.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 d678e9f0802..19f720b4506 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -20,7 +20,7 @@
 #include "defs.h"
 #include "arch-utils.h"
 #include <signal.h>
-#include "gdb_string.h"
+#include <string.h>
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "frame.h"
diff --git a/gdb/inflow.c b/gdb/inflow.c
index ad73efeb0aa..062bf682947 100644
--- a/gdb/inflow.c
+++ b/gdb/inflow.c
@@ -26,7 +26,7 @@
 #include "gdbthread.h"
 #include "observer.h"
 
-#include "gdb_string.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 0b8dffe08a9..3b55583594d 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -19,7 +19,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.h"
+#include <string.h>
 #include <ctype.h>
 #include "symtab.h"
 #include "frame.h"
diff --git a/gdb/interps.c b/gdb/interps.c
index 7f1938511cd..5a0fde35942 100644
--- a/gdb/interps.c
+++ b/gdb/interps.c
@@ -36,7 +36,7 @@
 #include "event-top.h"
 #include "interps.h"
 #include "completer.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_assert.h"
 #include "top.h"		/* For command_loop.  */
 #include "exceptions.h"
diff --git a/gdb/iq2000-tdep.c b/gdb/iq2000-tdep.c
index d2619ff850d..60d7a30f4da 100644
--- a/gdb/iq2000-tdep.c
+++ b/gdb/iq2000-tdep.c
@@ -28,7 +28,7 @@
 #include "gdbtypes.h"
 #include "value.h"
 #include "dis-asm.h"
-#include "gdb_string.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 27da00db5f8..0d0fbf9d5e5 100644
--- a/gdb/irix5-nat.c
+++ b/gdb/irix5-nat.c
@@ -29,7 +29,7 @@
 #include "regcache.h"
 #include "procfs.h"
 
-#include "gdb_string.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 2c5154ea66c..2d93a3e299a 100644
--- a/gdb/jv-exp.y
+++ b/gdb/jv-exp.y
@@ -36,7 +36,7 @@
 %{
 
 #include "defs.h"
-#include "gdb_string.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 b154d4ac920..c9b6119111f 100644
--- a/gdb/jv-lang.c
+++ b/gdb/jv-lang.c
@@ -27,7 +27,7 @@
 #include "symtab.h"
 #include "symfile.h"
 #include "objfiles.h"
-#include "gdb_string.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 23b3f4e75e4..3f6d9da534a 100644
--- a/gdb/jv-typeprint.c
+++ b/gdb/jv-typeprint.c
@@ -24,7 +24,7 @@
 #include "demangle.h"
 #include "gdb-demangle.h"
 #include "jv-lang.h"
-#include "gdb_string.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 2c60cc088ae..f465ca09e35 100644
--- a/gdb/jv-valprint.c
+++ b/gdb/jv-valprint.c
@@ -29,7 +29,7 @@
 #include "jv-lang.h"
 #include "c-lang.h"
 #include "annotate.h"
-#include "gdb_string.h"
+#include <string.h>
 
 /* Local functions */
 
diff --git a/gdb/language.c b/gdb/language.c
index f1232a1c1a8..f1ea7799a1e 100644
--- a/gdb/language.c
+++ b/gdb/language.c
@@ -30,7 +30,7 @@
 
 #include "defs.h"
 #include <ctype.h>
-#include "gdb_string.h"
+#include <string.h>
 
 #include "symtab.h"
 #include "gdbtypes.h"
diff --git a/gdb/linux-fork.c b/gdb/linux-fork.c
index 754500f0a66..0f27d6823f4 100644
--- a/gdb/linux-fork.c
+++ b/gdb/linux-fork.c
@@ -25,7 +25,7 @@
 #include "infcall.h"
 #include "objfiles.h"
 #include "gdb_assert.h"
-#include "gdb_string.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 95064f74e73..bccd58318bf 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -22,7 +22,7 @@
 #include "target.h"
 #include "nat/linux-nat.h"
 #include "nat/linux-waitpid.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_wait.h"
 #include "gdb_assert.h"
 #ifdef HAVE_TKILL_SYSCALL
diff --git a/gdb/lm32-tdep.c b/gdb/lm32-tdep.c
index 11cf897cc97..54d80b9ab4a 100644
--- a/gdb/lm32-tdep.c
+++ b/gdb/lm32-tdep.c
@@ -37,7 +37,7 @@
 #include "reggroups.h"
 #include "opcodes/lm32-desc.h"
 
-#include "gdb_string.h"
+#include <string.h>
 
 /* Macros to extract fields from an instruction.  */
 #define LM32_OPCODE(insn)       ((insn >> 26) & 0x3f)
diff --git a/gdb/m2-exp.y b/gdb/m2-exp.y
index 0002e451ce1..9bdd8b7ae8a 100644
--- a/gdb/m2-exp.y
+++ b/gdb/m2-exp.y
@@ -38,7 +38,7 @@
 %{
 
 #include "defs.h"
-#include "gdb_string.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 653cb7762c1..bbdcebe3ab8 100644
--- a/gdb/m2-typeprint.c
+++ b/gdb/m2-typeprint.c
@@ -32,7 +32,7 @@
 #include "typeprint.h"
 #include "cp-abi.h"
 
-#include "gdb_string.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 1b0eba5483a..a84bf830c51 100644
--- a/gdb/m32c-tdep.c
+++ b/gdb/m32c-tdep.c
@@ -21,7 +21,7 @@
 
 #include <stdarg.h>
 
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_assert.h"
 #include "elf-bfd.h"
 #include "elf/m32c.h"
diff --git a/gdb/m32r-linux-nat.c b/gdb/m32r-linux-nat.c
index 70bd5283d0e..4a9246ac4b6 100644
--- a/gdb/m32r-linux-nat.c
+++ b/gdb/m32r-linux-nat.c
@@ -25,7 +25,7 @@
 #include "target.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.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 1994e92789c..b19d3f32899 100644
--- a/gdb/m32r-linux-tdep.c
+++ b/gdb/m32r-linux-tdep.c
@@ -27,7 +27,7 @@
 #include "reggroups.h"
 #include "regset.h"
 
-#include "gdb_string.h"
+#include <string.h>
 
 #include "glibc-tdep.h"
 #include "solib-svr4.h"
diff --git a/gdb/m32r-rom.c b/gdb/m32r-rom.c
index 5b27b606b98..4423d26d828 100644
--- a/gdb/m32r-rom.c
+++ b/gdb/m32r-rom.c
@@ -34,7 +34,7 @@
 #include "symfile.h"		/* for generic load */
 #include <sys/time.h>
 #include <time.h>		/* for time_t */
-#include "gdb_string.h"
+#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 d96ebed3f81..04ae73393db 100644
--- a/gdb/m32r-tdep.c
+++ b/gdb/m32r-tdep.c
@@ -25,7 +25,7 @@
 #include "gdbtypes.h"
 #include "gdbcmd.h"
 #include "gdbcore.h"
-#include "gdb_string.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 b3023ad5177..6cb4e3af5a4 100644
--- a/gdb/m68hc11-tdep.c
+++ b/gdb/m68hc11-tdep.c
@@ -30,7 +30,7 @@
 #include "gdbtypes.h"
 #include "gdbcmd.h"
 #include "gdbcore.h"
-#include "gdb_string.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 c0662e4a0fb..fb17fb96d43 100644
--- a/gdb/m68k-tdep.c
+++ b/gdb/m68k-tdep.c
@@ -26,7 +26,7 @@
 #include "symtab.h"
 #include "gdbcore.h"
 #include "value.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_assert.h"
 #include "inferior.h"
 #include "regcache.h"
diff --git a/gdb/m68kbsd-tdep.c b/gdb/m68kbsd-tdep.c
index 178aceec65e..bb1699d6dce 100644
--- a/gdb/m68kbsd-tdep.c
+++ b/gdb/m68kbsd-tdep.c
@@ -28,7 +28,7 @@
 #include "gdbtypes.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.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 5e928e6ca9e..59511e4aa89 100644
--- a/gdb/m68klinux-nat.c
+++ b/gdb/m68klinux-nat.c
@@ -22,7 +22,7 @@
 #include "inferior.h"
 #include "language.h"
 #include "gdbcore.h"
-#include "gdb_string.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 0382f6853ef..e647fe72227 100644
--- a/gdb/m68klinux-tdep.c
+++ b/gdb/m68klinux-tdep.c
@@ -23,7 +23,7 @@
 #include "floatformat.h"
 #include "frame.h"
 #include "target.h"
-#include "gdb_string.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 7d9e08b4878..d4ebf7a80ff 100644
--- a/gdb/m88k-tdep.c
+++ b/gdb/m88k-tdep.c
@@ -32,7 +32,7 @@
 #include "value.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include "m88k-tdep.h"
 
diff --git a/gdb/macrocmd.c b/gdb/macrocmd.c
index b48c3c92cbc..2a9c06e21d6 100644
--- a/gdb/macrocmd.c
+++ b/gdb/macrocmd.c
@@ -25,7 +25,7 @@
 #include "cli/cli-utils.h"
 #include "command.h"
 #include "gdbcmd.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "linespec.h"
 
 
diff --git a/gdb/main.c b/gdb/main.c
index 7ff9183c9c5..d5c9e39df7b 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -31,7 +31,7 @@
 #include "gdb_stat.h"
 #include <ctype.h>
 
-#include "gdb_string.h"
+#include <string.h>
 #include "event-loop.h"
 #include "ui-out.h"
 
diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c
index 0e6109af3cf..99a029ed904 100644
--- a/gdb/mdebugread.c
+++ b/gdb/mdebugread.c
@@ -56,7 +56,7 @@
 #include "dictionary.h"
 #include "mdebugread.h"
 #include "gdb_stat.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "psympriv.h"
 #include "source.h"
 
diff --git a/gdb/mem-break.c b/gdb/mem-break.c
index 74fd8dba8e1..f06c4ae7ada 100644
--- a/gdb/mem-break.c
+++ b/gdb/mem-break.c
@@ -24,7 +24,7 @@
 #include "breakpoint.h"
 #include "inferior.h"
 #include "target.h"
-#include "gdb_string.h"
+#include <string.h>
 
 
 /* Insert a breakpoint on targets that don't have any better
diff --git a/gdb/memattr.c b/gdb/memattr.c
index 5c2adaa0263..58b800fc7e6 100644
--- a/gdb/memattr.c
+++ b/gdb/memattr.c
@@ -25,7 +25,7 @@
 #include "value.h"
 #include "language.h"
 #include "vec.h"
-#include "gdb_string.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 b4e03228141..5e83c0a8fe1 100644
--- a/gdb/memory-map.c
+++ b/gdb/memory-map.c
@@ -22,7 +22,7 @@
 #include "gdb_assert.h"
 #include "exceptions.h"
 
-#include "gdb_string.h"
+#include <string.h>
 
 #if !defined(HAVE_LIBEXPAT)
 
diff --git a/gdb/mep-tdep.c b/gdb/mep-tdep.c
index fa58108524a..e266062ebb9 100644
--- a/gdb/mep-tdep.c
+++ b/gdb/mep-tdep.c
@@ -27,7 +27,7 @@
 #include "gdbtypes.h"
 #include "gdbcmd.h"
 #include "gdbcore.h"
-#include "gdb_string.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 ab39989fd2e..07902bbecb1 100644
--- a/gdb/mi/mi-cmd-break.c
+++ b/gdb/mi/mi-cmd-break.c
@@ -23,7 +23,7 @@
 #include "ui-out.h"
 #include "mi-out.h"
 #include "breakpoint.h"
-#include "gdb_string.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 1519f086cdf..9747ac63838 100644
--- a/gdb/mi/mi-cmd-disas.c
+++ b/gdb/mi/mi-cmd-disas.c
@@ -23,7 +23,7 @@
 #include "value.h"
 #include "mi-cmds.h"
 #include "mi-getopt.h"
-#include "gdb_string.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 e69062b1256..f1589e5be7d 100644
--- a/gdb/mi/mi-cmd-env.c
+++ b/gdb/mi/mi-cmd-env.c
@@ -31,7 +31,7 @@
 #include "ui-out.h"
 #include "top.h"
 
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_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 6101341020f..eb71366b384 100644
--- a/gdb/mi/mi-cmd-stack.c
+++ b/gdb/mi/mi-cmd-stack.c
@@ -27,7 +27,7 @@
 #include "block.h"
 #include "stack.h"
 #include "dictionary.h"
-#include "gdb_string.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 0a2ef5cfc1d..84cdc156276 100644
--- a/gdb/mi/mi-cmd-var.c
+++ b/gdb/mi/mi-cmd-var.c
@@ -27,7 +27,7 @@
 #include "language.h"
 #include "value.h"
 #include <ctype.h>
-#include "gdb_string.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 496a8aa9484..c536d8a64ef 100644
--- a/gdb/mi/mi-cmds.c
+++ b/gdb/mi/mi-cmds.c
@@ -21,7 +21,7 @@
 #include "defs.h"
 #include "top.h"
 #include "mi-cmds.h"
-#include "gdb_string.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 2c34ced52a6..cd47fb394a0 100644
--- a/gdb/mi/mi-console.c
+++ b/gdb/mi/mi-console.c
@@ -26,7 +26,7 @@
 
 #include "defs.h"
 #include "mi-console.h"
-#include "gdb_string.h"
+#include <string.h>
 
 static ui_file_fputs_ftype mi_console_file_fputs;
 static ui_file_flush_ftype mi_console_file_flush;
diff --git a/gdb/mi/mi-getopt.c b/gdb/mi/mi-getopt.c
index f2072495a96..3ecc73dc3e5 100644
--- a/gdb/mi/mi-getopt.c
+++ b/gdb/mi/mi-getopt.c
@@ -19,7 +19,7 @@
 
 #include "defs.h"
 #include "mi-getopt.h"
-#include "gdb_string.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,
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index 44ebd213792..b0073c3772d 100644
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.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 83d524a3af2..793204ddb36 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -23,7 +23,7 @@
 #include "arch-utils.h"
 #include "target.h"
 #include "inferior.h"
-#include "gdb_string.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 9994307d9f0..a2634f10e4c 100644
--- a/gdb/mi/mi-parse.c
+++ b/gdb/mi/mi-parse.c
@@ -25,7 +25,7 @@
 #include "charset.h"
 
 #include <ctype.h>
-#include "gdb_string.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 2ff434342cb..8fe78a02725 100644
--- a/gdb/microblaze-rom.c
+++ b/gdb/microblaze-rom.c
@@ -21,7 +21,7 @@
 #include "gdbcore.h"
 #include "target.h"
 #include "monitor.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "serial.h"
 #include "regcache.h"
 
diff --git a/gdb/microblaze-tdep.c b/gdb/microblaze-tdep.c
index dcf556fb63c..46f346864b3 100644
--- a/gdb/microblaze-tdep.c
+++ b/gdb/microblaze-tdep.c
@@ -36,7 +36,7 @@
 #include "osabi.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.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 efc9848d3a5..66ada41a09e 100644
--- a/gdb/mingw-hdep.c
+++ b/gdb/mingw-hdep.c
@@ -24,7 +24,7 @@
 
 #include "gdb_assert.h"
 #include "gdb_select.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "readline/readline.h"
 
 #include <windows.h>
diff --git a/gdb/minidebug.c b/gdb/minidebug.c
index 385566aeca1..29612340d86 100644
--- a/gdb/minidebug.c
+++ b/gdb/minidebug.c
@@ -19,7 +19,7 @@
 
 #include "defs.h"
 #include "gdb_bfd.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "symfile.h"
 #include "objfiles.h"
 #include "gdbcore.h"
diff --git a/gdb/minsyms.c b/gdb/minsyms.c
index 95dd6cf8317..904480349c9 100644
--- a/gdb/minsyms.c
+++ b/gdb/minsyms.c
@@ -38,7 +38,7 @@
 
 #include "defs.h"
 #include <ctype.h>
-#include "gdb_string.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 8624eacb588..ad1c8d3a632 100644
--- a/gdb/mips-irix-tdep.c
+++ b/gdb/mips-irix-tdep.c
@@ -20,7 +20,7 @@
 
 #include "defs.h"
 #include "osabi.h"
-#include "gdb_string.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 8d17839c6ef..37a37c195c4 100644
--- a/gdb/mips-linux-tdep.c
+++ b/gdb/mips-linux-tdep.c
@@ -23,7 +23,7 @@
 #include "solib-svr4.h"
 #include "osabi.h"
 #include "mips-tdep.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_assert.h"
 #include "frame.h"
 #include "regcache.h"
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index bcbdcc5519f..e3bb078e6c7 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -21,7 +21,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_assert.h"
 #include "frame.h"
 #include "inferior.h"
diff --git a/gdb/mips64obsd-tdep.c b/gdb/mips64obsd-tdep.c
index 75dc466f654..1373065d15d 100644
--- a/gdb/mips64obsd-tdep.c
+++ b/gdb/mips64obsd-tdep.c
@@ -26,7 +26,7 @@
 #include "tramp-frame.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include "mips-tdep.h"
 #include "solib-svr4.h"
diff --git a/gdb/mipsnbsd-tdep.c b/gdb/mipsnbsd-tdep.c
index e9f36fde5fc..bd92eb2f54c 100644
--- a/gdb/mipsnbsd-tdep.c
+++ b/gdb/mipsnbsd-tdep.c
@@ -28,7 +28,7 @@
 #include "osabi.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include "nbsd-tdep.h"
 #include "mipsnbsd-tdep.h"
diff --git a/gdb/mipsread.c b/gdb/mipsread.c
index fc4a268c313..d06d2f7c45d 100644
--- a/gdb/mipsread.c
+++ b/gdb/mipsread.c
@@ -24,7 +24,7 @@
    mdebugread.c.  */
 
 #include "defs.h"
-#include "gdb_string.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 881af2bfa19..aff85a87b14 100644
--- a/gdb/mn10300-linux-tdep.c
+++ b/gdb/mn10300-linux-tdep.c
@@ -19,7 +19,7 @@
 
 #include "defs.h"
 #include "gdbcore.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "regcache.h"
 #include "mn10300-tdep.h"
 #include "gdb_assert.h"
diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c
index 32aa5f5c5b3..ffc91238ad3 100644
--- a/gdb/mn10300-tdep.c
+++ b/gdb/mn10300-tdep.c
@@ -22,7 +22,7 @@
 #include "dis-asm.h"
 #include "gdbtypes.h"
 #include "regcache.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_assert.h"
 #include "gdbcore.h"	/* For write_memory_unsigned_integer.  */
 #include "value.h"
diff --git a/gdb/monitor.c b/gdb/monitor.c
index 0f5d8ca2d97..2d94d4234b4 100644
--- a/gdb/monitor.c
+++ b/gdb/monitor.c
@@ -43,7 +43,7 @@
 #include "exceptions.h"
 #include <signal.h>
 #include <ctype.h>
-#include "gdb_string.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 cb04786d0a1..201b50f78e5 100644
--- a/gdb/moxie-tdep.c
+++ b/gdb/moxie-tdep.c
@@ -25,7 +25,7 @@
 #include "gdbtypes.h"
 #include "gdbcmd.h"
 #include "gdbcore.h"
-#include "gdb_string.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 22e1cbc093f..c45d0ed8798 100644
--- a/gdb/mt-tdep.c
+++ b/gdb/mt-tdep.c
@@ -27,7 +27,7 @@
 #include "dis-asm.h"
 #include "arch-utils.h"
 #include "gdbtypes.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "regcache.h"
 #include "reggroups.h"
 #include "gdbcore.h"
diff --git a/gdb/nbsd-tdep.c b/gdb/nbsd-tdep.c
index 54cdda0dfa1..2f400fb6abd 100644
--- a/gdb/nbsd-tdep.c
+++ b/gdb/nbsd-tdep.c
@@ -20,7 +20,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.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 47b98cc866c..fe29e7a7266 100644
--- a/gdb/nios2-linux-tdep.c
+++ b/gdb/nios2-linux-tdep.c
@@ -20,7 +20,7 @@
 #include "defs.h"
 #include "frame.h"
 #include "gdb_assert.h"
-#include "gdb_string.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 a9b427688cd..424a91b9263 100644
--- a/gdb/nto-procfs.c
+++ b/gdb/nto-procfs.c
@@ -32,7 +32,7 @@
 #include <sys/netmgr.h>
 
 #include "exceptions.h"
-#include "gdb_string.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 5ec746d61a2..91f3928f556 100644
--- a/gdb/nto-tdep.c
+++ b/gdb/nto-tdep.c
@@ -21,7 +21,7 @@
 
 #include "defs.h"
 #include "gdb_stat.h"
-#include "gdb_string.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 5c7234035f9..90c589dc196 100644
--- a/gdb/objc-lang.c
+++ b/gdb/objc-lang.c
@@ -34,7 +34,7 @@
 #include "value.h"
 #include "symfile.h"
 #include "objfiles.h"
-#include "gdb_string.h"		/* for strchr */
+#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 70a927acb36..f669e30d2f9 100644
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -38,7 +38,7 @@
 #include "gdb_stat.h"
 #include <fcntl.h>
 #include "gdb_obstack.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "hashtab.h"
 
 #include "breakpoint.h"
diff --git a/gdb/opencl-lang.c b/gdb/opencl-lang.c
index 28a29294a43..37852544d3b 100644
--- a/gdb/opencl-lang.c
+++ b/gdb/opencl-lang.c
@@ -19,7 +19,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdbtypes.h"
 #include "symtab.h"
 #include "expression.h"
diff --git a/gdb/osabi.c b/gdb/osabi.c
index 249dac8b2e7..a170974d641 100644
--- a/gdb/osabi.c
+++ b/gdb/osabi.c
@@ -20,7 +20,7 @@
 #include "defs.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include "osabi.h"
 #include "arch-utils.h"
diff --git a/gdb/osdata.c b/gdb/osdata.c
index a19b21d2f50..9871fc34ef8 100644
--- a/gdb/osdata.c
+++ b/gdb/osdata.c
@@ -22,7 +22,7 @@
 #include "vec.h"
 #include "xml-support.h"
 #include "osdata.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "ui-out.h"
 #include "gdbcmd.h"
 
diff --git a/gdb/p-exp.y b/gdb/p-exp.y
index bb21e53afbf..0120e22afa4 100644
--- a/gdb/p-exp.y
+++ b/gdb/p-exp.y
@@ -44,7 +44,7 @@
 %{
 
 #include "defs.h"
-#include "gdb_string.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 bc5903006fb..e83320ff4d3 100644
--- a/gdb/p-lang.c
+++ b/gdb/p-lang.c
@@ -20,7 +20,7 @@
 /* This file is derived from c-lang.c */
 
 #include "defs.h"
-#include "gdb_string.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 30d40d788da..f26b9906534 100644
--- a/gdb/p-typeprint.c
+++ b/gdb/p-typeprint.c
@@ -31,7 +31,7 @@
 #include "p-lang.h"
 #include "typeprint.h"
 #include "gdb-demangle.h"
-#include "gdb_string.h"
+#include <string.h>
 #include <errno.h>
 #include <ctype.h>
 
diff --git a/gdb/parse.c b/gdb/parse.c
index 07c17651bbb..4b9ca5de05a 100644
--- a/gdb/parse.c
+++ b/gdb/parse.c
@@ -32,7 +32,7 @@
 #include "defs.h"
 #include <ctype.h>
 #include "arch-utils.h"
-#include "gdb_string.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 3280f1cac1c..b07148baab9 100644
--- a/gdb/posix-hdep.c
+++ b/gdb/posix-hdep.c
@@ -20,7 +20,7 @@
 #include "defs.h"
 #include "event-loop.h"
 
-#include "gdb_string.h"
+#include <string.h>
 
 #include "gdb_select.h"
 
diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
index 66e80629c46..d6820be99c5 100644
--- a/gdb/ppc-linux-nat.c
+++ b/gdb/ppc-linux-nat.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.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 0cddf6477c6..665128b4b33 100644
--- a/gdb/ppc-sysv-tdep.c
+++ b/gdb/ppc-sysv-tdep.c
@@ -23,7 +23,7 @@
 #include "inferior.h"
 #include "regcache.h"
 #include "value.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_assert.h"
 #include "ppc-tdep.h"
 #include "target.h"
diff --git a/gdb/ppcfbsd-tdep.c b/gdb/ppcfbsd-tdep.c
index f9e04341534..4804d9ae721 100644
--- a/gdb/ppcfbsd-tdep.c
+++ b/gdb/ppcfbsd-tdep.c
@@ -31,7 +31,7 @@
 #include "trad-frame.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include "ppc-tdep.h"
 #include "ppc64-tdep.h"
diff --git a/gdb/ppcnbsd-tdep.c b/gdb/ppcnbsd-tdep.c
index 64de0d57e9a..1f3b06ae167 100644
--- a/gdb/ppcnbsd-tdep.c
+++ b/gdb/ppcnbsd-tdep.c
@@ -28,7 +28,7 @@
 #include "tramp-frame.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include "ppc-tdep.h"
 #include "ppcnbsd-tdep.h"
diff --git a/gdb/ppcobsd-tdep.c b/gdb/ppcobsd-tdep.c
index a625a041482..8653222536c 100644
--- a/gdb/ppcobsd-tdep.c
+++ b/gdb/ppcobsd-tdep.c
@@ -29,7 +29,7 @@
 #include "trad-frame.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include "ppc-tdep.h"
 #include "ppcobsd-tdep.h"
diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 7354474ca64..001c0777a59 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "frame.h"
 #include "symtab.h"
 #include "gdbtypes.h"
diff --git a/gdb/procfs.c b/gdb/procfs.c
index 018a0d846b9..c0004f2d4a9 100644
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -46,7 +46,7 @@
 #include <signal.h>
 #include <ctype.h>
 #include "gdb_bfd.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_assert.h"
 #include "inflow.h"
 #include "auxv.h"
diff --git a/gdb/prologue-value.c b/gdb/prologue-value.c
index 6c686181f00..31e05d2cebf 100644
--- a/gdb/prologue-value.c
+++ b/gdb/prologue-value.c
@@ -17,7 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_assert.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 2802acf34cf..c54e436dc23 100644
--- a/gdb/python/py-auto-load.c
+++ b/gdb/python/py-auto-load.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.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 d6576a32ccc..aeb54894510 100644
--- a/gdb/python/py-gdb-readline.c
+++ b/gdb/python/py-gdb-readline.c
@@ -22,7 +22,7 @@
 #include "exceptions.h"
 #include "top.h"
 #include "cli/cli-utils.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include <stddef.h>
 
diff --git a/gdb/ravenscar-thread.c b/gdb/ravenscar-thread.c
index 26b81714410..9ef265d2922 100644
--- a/gdb/ravenscar-thread.c
+++ b/gdb/ravenscar-thread.c
@@ -26,7 +26,7 @@
 #include "command.h"
 #include "ravenscar-thread.h"
 #include "observer.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdbcmd.h"
 #include "top.h"
 #include "regcache.h"
diff --git a/gdb/regcache.c b/gdb/regcache.c
index 7ec75c80944..e847455f15c 100644
--- a/gdb/regcache.c
+++ b/gdb/regcache.c
@@ -25,7 +25,7 @@
 #include "regcache.h"
 #include "reggroups.h"
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdbcmd.h"		/* For maintenanceprintlist.  */
 #include "observer.h"
 #include "exceptions.h"
diff --git a/gdb/registry.c b/gdb/registry.c
index 8055300d445..b11656817e5 100644
--- a/gdb/registry.c
+++ b/gdb/registry.c
@@ -20,7 +20,7 @@
 #include "defs.h"
 #include "registry.h"
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 
 const struct registry_data *
 register_data_with_cleanup (struct registry_data_registry *registry,
diff --git a/gdb/remote-fileio.c b/gdb/remote-fileio.c
index 5b7ef1d1975..bf790686e73 100644
--- a/gdb/remote-fileio.c
+++ b/gdb/remote-fileio.c
@@ -20,7 +20,7 @@
 /* See the GDB User Guide for details of the GDB remote protocol.  */
 
 #include "defs.h"
-#include "gdb_string.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 4ffb72df0fc..e81b2de9f96 100644
--- a/gdb/remote-m32r-sdi.c
+++ b/gdb/remote-m32r-sdi.c
@@ -26,7 +26,7 @@
 #include "inferior.h"
 #include "target.h"
 #include "regcache.h"
-#include "gdb_string.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 f8e6caca09b..14c494f67d7 100644
--- a/gdb/remote-mips.c
+++ b/gdb/remote-mips.c
@@ -29,7 +29,7 @@
 #include "serial.h"
 #include "target.h"
 #include "exceptions.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_stat.h"
 #include "gdb_usleep.h"
 #include "regcache.h"
diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index 6bf18abd829..c0596b398b0 100644
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -23,7 +23,7 @@
 #include "defs.h"
 #include "inferior.h"
 #include "value.h"
-#include "gdb_string.h"
+#include <string.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include <signal.h>
diff --git a/gdb/remote.c b/gdb/remote.c
index f4667e368cd..bbd9061a317 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -20,7 +20,7 @@
 /* See the GDB User Guide for details of the GDB remote protocol.  */
 
 #include "defs.h"
-#include "gdb_string.h"
+#include <string.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include "inferior.h"
diff --git a/gdb/reverse.c b/gdb/reverse.c
index c0d7058ca93..ca51d894b72 100644
--- a/gdb/reverse.c
+++ b/gdb/reverse.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.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 62bc6eed9ad..328200770b4 100644
--- a/gdb/rs6000-aix-tdep.c
+++ b/gdb/rs6000-aix-tdep.c
@@ -20,7 +20,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_assert.h"
 #include "osabi.h"
 #include "regcache.h"
diff --git a/gdb/ser-base.c b/gdb/ser-base.c
index 52c57264931..d07dcf3e480 100644
--- a/gdb/ser-base.c
+++ b/gdb/ser-base.c
@@ -23,7 +23,7 @@
 #include "event-loop.h"
 
 #include "gdb_select.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_assert.h"
 #include <sys/time.h>
 #ifdef USE_WIN32API
diff --git a/gdb/ser-go32.c b/gdb/ser-go32.c
index 9b321df49ea..4268e2c150a 100644
--- a/gdb/ser-go32.c
+++ b/gdb/ser-go32.c
@@ -24,7 +24,7 @@
 #include "defs.h"
 #include "gdbcmd.h"
 #include "serial.h"
-#include "gdb_string.h"
+#include <string.h>
 
 
 /*
diff --git a/gdb/ser-mingw.c b/gdb/ser-mingw.c
index dc91b0c637c..0431ea95ecd 100644
--- a/gdb/ser-mingw.c
+++ b/gdb/ser-mingw.c
@@ -30,7 +30,7 @@
 #include <sys/types.h>
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include "command.h"
 
diff --git a/gdb/ser-pipe.c b/gdb/ser-pipe.c
index 1b30f781f80..b4ab672664e 100644
--- a/gdb/ser-pipe.c
+++ b/gdb/ser-pipe.c
@@ -29,7 +29,7 @@
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <fcntl.h>
-#include "gdb_string.h"
+#include <string.h>
 #include "filestuff.h"
 
 #include <signal.h>
diff --git a/gdb/ser-tcp.c b/gdb/ser-tcp.c
index f40bfce42bf..d8c1ed62881 100644
--- a/gdb/ser-tcp.c
+++ b/gdb/ser-tcp.c
@@ -53,7 +53,7 @@
 #endif
 
 #include <signal.h>
-#include "gdb_string.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 cd1d9a9177c..1f1372baad9 100644
--- a/gdb/ser-unix.c
+++ b/gdb/ser-unix.c
@@ -29,7 +29,7 @@
 #include <sys/time.h>
 
 #include "gdb_select.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdbcmd.h"
 #include "filestuff.h"
 
diff --git a/gdb/serial.c b/gdb/serial.c
index f2a9648dead..78e9085df2f 100644
--- a/gdb/serial.c
+++ b/gdb/serial.c
@@ -20,7 +20,7 @@
 #include "defs.h"
 #include <ctype.h>
 #include "serial.h"
-#include "gdb_string.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 e8f1917a711..ce096b7ad44 100644
--- a/gdb/sh-tdep.c
+++ b/gdb/sh-tdep.c
@@ -32,7 +32,7 @@
 #include "value.h"
 #include "dis-asm.h"
 #include "inferior.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_assert.h"
 #include "arch-utils.h"
 #include "floatformat.h"
diff --git a/gdb/sh64-tdep.c b/gdb/sh64-tdep.c
index 9425e9f1510..79dde80778d 100644
--- a/gdb/sh64-tdep.c
+++ b/gdb/sh64-tdep.c
@@ -32,7 +32,7 @@
 #include "value.h"
 #include "dis-asm.h"
 #include "inferior.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_assert.h"
 #include "arch-utils.h"
 #include "regcache.h"
diff --git a/gdb/shnbsd-tdep.c b/gdb/shnbsd-tdep.c
index a5f8099db4f..742798b2ad3 100644
--- a/gdb/shnbsd-tdep.c
+++ b/gdb/shnbsd-tdep.c
@@ -25,7 +25,7 @@
 #include "value.h"
 #include "osabi.h"
 
-#include "gdb_string.h"
+#include <string.h>
 
 #include "sh-tdep.h"
 #include "solib-svr4.h"
diff --git a/gdb/skip.c b/gdb/skip.c
index 0c002ff5687..73c5d35a54e 100644
--- a/gdb/skip.c
+++ b/gdb/skip.c
@@ -20,7 +20,7 @@
 #include "value.h"
 #include "valprint.h"
 #include "ui-out.h"
-#include "gdb_string.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 b20134c9d00..ec1245b3cc7 100644
--- a/gdb/sol-thread.c
+++ b/gdb/sol-thread.c
@@ -64,7 +64,7 @@
 #include "solib.h"
 #include "symfile.h"
 #include "observer.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "procfs.h"
 
 struct target_ops sol_thread_ops;
diff --git a/gdb/solib-dsbt.c b/gdb/solib-dsbt.c
index 4e2091b1f99..897a457e326 100644
--- a/gdb/solib-dsbt.c
+++ b/gdb/solib-dsbt.c
@@ -18,7 +18,7 @@
 
 
 #include "defs.h"
-#include "gdb_string.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 65c7e012dab..6d5222af5ac 100644
--- a/gdb/solib-frv.c
+++ b/gdb/solib-frv.c
@@ -18,7 +18,7 @@
 
 
 #include "defs.h"
-#include "gdb_string.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 d05c5c171bf..df0bf1bd828 100644
--- a/gdb/solib-osf.c
+++ b/gdb/solib-osf.c
@@ -44,7 +44,7 @@
 
 #include <sys/types.h>
 #include <signal.h>
-#include "gdb_string.h"
+#include <string.h>
 
 #include "bfd.h"
 #include "symtab.h"
diff --git a/gdb/solib-spu.c b/gdb/solib-spu.c
index 626cc8f7e72..590baba8377 100644
--- a/gdb/solib-spu.c
+++ b/gdb/solib-spu.c
@@ -21,7 +21,7 @@
 #include "defs.h"
 #include "solib-spu.h"
 #include "gdbcore.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_assert.h"
 #include "gdb_stat.h"
 #include "arch-utils.h"
diff --git a/gdb/solib-target.c b/gdb/solib-target.c
index 0b6b2d2ae8f..de4ad7eb7b6 100644
--- a/gdb/solib-target.c
+++ b/gdb/solib-target.c
@@ -26,7 +26,7 @@
 #include "vec.h"
 #include "solib-target.h"
 
-#include "gdb_string.h"
+#include <string.h>
 
 /* Private data for each loaded library.  */
 struct lm_info
diff --git a/gdb/solib.c b/gdb/solib.c
index 06e0b1662e7..1a9215a2605 100644
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -21,7 +21,7 @@
 
 #include <sys/types.h>
 #include <fcntl.h>
-#include "gdb_string.h"
+#include <string.h>
 #include "symtab.h"
 #include "bfd.h"
 #include "symfile.h"
diff --git a/gdb/somread.c b/gdb/somread.c
index c262196e0cc..51a9479aa4d 100644
--- a/gdb/somread.c
+++ b/gdb/somread.c
@@ -27,7 +27,7 @@
 #include "stabsread.h"
 #include "gdb-stabs.h"
 #include "complaints.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "demangle.h"
 #include "som.h"
 #include "libhppa.h"
diff --git a/gdb/source.c b/gdb/source.c
index 9fa99b4d3de..f89f534f221 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -30,7 +30,7 @@
 #include "filestuff.h"
 
 #include <sys/types.h>
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_stat.h"
 #include <fcntl.h>
 #include "gdbcore.h"
diff --git a/gdb/sparc-nat.c b/gdb/sparc-nat.c
index bb2b8a398d8..d90ef968bae 100644
--- a/gdb/sparc-nat.c
+++ b/gdb/sparc-nat.c
@@ -24,7 +24,7 @@
 
 #include "gdb_assert.h"
 #include <signal.h>
-#include "gdb_string.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 75af51e5f8f..ab0c0ace12d 100644
--- a/gdb/sparc-sol2-tdep.c
+++ b/gdb/sparc-sol2-tdep.c
@@ -29,7 +29,7 @@
 #include "trad-frame.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include "sol2-tdep.h"
 #include "sparc-tdep.h"
diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
index 1a200e0e49b..950ca8cd55c 100644
--- a/gdb/sparc-tdep.c
+++ b/gdb/sparc-tdep.c
@@ -36,7 +36,7 @@
 #include "value.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.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 f01848ea1ea..8bcf4184d69 100644
--- a/gdb/sparc64-tdep.c
+++ b/gdb/sparc64-tdep.c
@@ -35,7 +35,7 @@
 #include "value.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include "sparc64-tdep.h"
 
diff --git a/gdb/sparc64fbsd-tdep.c b/gdb/sparc64fbsd-tdep.c
index b642bfcc9c3..4e169b500bc 100644
--- a/gdb/sparc64fbsd-tdep.c
+++ b/gdb/sparc64fbsd-tdep.c
@@ -28,7 +28,7 @@
 #include "trad-frame.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.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 e9f0457abc2..7a3bd1af38e 100644
--- a/gdb/sparc64nbsd-tdep.c
+++ b/gdb/sparc64nbsd-tdep.c
@@ -31,7 +31,7 @@
 #include "trad-frame.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.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 7fff2100c02..eb1dff9c0f1 100644
--- a/gdb/sparcnbsd-tdep.c
+++ b/gdb/sparcnbsd-tdep.c
@@ -31,7 +31,7 @@
 #include "trad-frame.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.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 a4561172f81..22ed4833af0 100644
--- a/gdb/spu-linux-nat.c
+++ b/gdb/spu-linux-nat.c
@@ -20,7 +20,7 @@
 
 #include "defs.h"
 #include "gdbcore.h"
-#include "gdb_string.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 e93f1428728..f584a9ad58b 100644
--- a/gdb/spu-multiarch.c
+++ b/gdb/spu-multiarch.c
@@ -21,7 +21,7 @@
 #include "defs.h"
 #include "gdbcore.h"
 #include "gdbcmd.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_assert.h"
 #include "arch-utils.h"
 #include "observer.h"
diff --git a/gdb/spu-tdep.c b/gdb/spu-tdep.c
index 46f3e2c1803..fd54b1e217a 100644
--- a/gdb/spu-tdep.c
+++ b/gdb/spu-tdep.c
@@ -24,7 +24,7 @@
 #include "gdbtypes.h"
 #include "gdbcmd.h"
 #include "gdbcore.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_assert.h"
 #include "frame.h"
 #include "frame-unwind.h"
diff --git a/gdb/stabsread.c b/gdb/stabsread.c
index da95a7e7331..00467725996 100644
--- a/gdb/stabsread.c
+++ b/gdb/stabsread.c
@@ -24,7 +24,7 @@
    Avoid placing any object file format specific code in this file.  */
 
 #include "defs.h"
-#include "gdb_string.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 cd4ac7a24f6..9a12eb378b7 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -50,7 +50,7 @@
 
 #include "gdb_assert.h"
 #include <ctype.h>
-#include "gdb_string.h"
+#include <string.h>
 
 #include "symfile.h"
 #include "python/python.h"
diff --git a/gdb/std-regs.c b/gdb/std-regs.c
index c67e50e4d65..8a31af9ee3c 100644
--- a/gdb/std-regs.c
+++ b/gdb/std-regs.c
@@ -24,7 +24,7 @@
 #include "frame.h"
 #include "gdbtypes.h"
 #include "value.h"
-#include "gdb_string.h"
+#include <string.h>
 
 
 static struct value *
diff --git a/gdb/symfile.c b/gdb/symfile.c
index 61e3e44e713..0c8713a9021 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -61,7 +61,7 @@
 
 #include <sys/types.h>
 #include <fcntl.h>
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_stat.h"
 #include <ctype.h>
 #include <time.h>
diff --git a/gdb/symmisc.c b/gdb/symmisc.c
index b192184089f..f4c3fc51af0 100644
--- a/gdb/symmisc.c
+++ b/gdb/symmisc.c
@@ -38,7 +38,7 @@
 #include "gdbcmd.h"
 #include "source.h"
 
-#include "gdb_string.h"
+#include <string.h>
 #include "readline/readline.h"
 
 #include "psymtab.h"
diff --git a/gdb/symtab.c b/gdb/symtab.c
index 8eb4eb4251f..6bb0bbc372f 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -50,7 +50,7 @@
 
 #include <sys/types.h>
 #include <fcntl.h>
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_stat.h"
 #include <ctype.h>
 #include "cp-abi.h"
diff --git a/gdb/target.c b/gdb/target.c
index 86a5572a55b..52d1081548a 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -21,7 +21,7 @@
 
 #include "defs.h"
 #include <errno.h>
-#include "gdb_string.h"
+#include <string.h>
 #include "target.h"
 #include "gdbcmd.h"
 #include "symtab.h"
diff --git a/gdb/thread.c b/gdb/thread.c
index 64a57c55ce9..7d889af9083 100644
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -32,7 +32,7 @@
 #include "gdbcmd.h"
 #include "regcache.h"
 #include "gdb.h"
-#include "gdb_string.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 39c62ac1eee..fb2a314c5a8 100644
--- a/gdb/tilegx-linux-nat.c
+++ b/gdb/tilegx-linux-nat.c
@@ -26,7 +26,7 @@
 #include <sys/ptrace.h>
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include <sys/procfs.h>
 
diff --git a/gdb/tilegx-tdep.c b/gdb/tilegx-tdep.c
index a47605372e4..c115f499330 100644
--- a/gdb/tilegx-tdep.c
+++ b/gdb/tilegx-tdep.c
@@ -30,7 +30,7 @@
 #include "value.h"
 #include "dis-asm.h"
 #include "inferior.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_assert.h"
 #include "arch-utils.h"
 #include "floatformat.h"
diff --git a/gdb/top.c b/gdb/top.c
index 7d928e13be2..8b389c57934 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -60,7 +60,7 @@
 #include <sys/types.h>
 
 #include "event-top.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_stat.h"
 #include <ctype.h>
 #include "ui-out.h"
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index a7ccb50540c..c5bc76d72b0 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -27,7 +27,7 @@
 #include "value.h"
 #include "target.h"
 #include "language.h"
-#include "gdb_string.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 2f818162f5c..4e9ecb4a86c 100644
--- a/gdb/tui/tui-command.c
+++ b/gdb/tui/tui-command.c
@@ -28,7 +28,7 @@
 #include "tui/tui-command.h"
 
 #include "gdb_curses.h"
-#include "gdb_string.h"
+#include <string.h>
 
 
 /*****************************************
diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c
index f85676f13a3..9c1cbc450dd 100644
--- a/gdb/tui/tui-data.c
+++ b/gdb/tui/tui-data.c
@@ -25,7 +25,7 @@
 #include "tui/tui-data.h"
 #include "tui/tui-wingeneral.h"
 
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_curses.h"
 
 /****************************
diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c
index 7f0039568f8..25775748f29 100644
--- a/gdb/tui/tui-disasm.c
+++ b/gdb/tui/tui-disasm.c
@@ -27,7 +27,7 @@
 #include "value.h"
 #include "source.h"
 #include "disasm.h"
-#include "gdb_string.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 328f9271c40..6a0c6e2bdeb 100644
--- a/gdb/tui/tui-file.c
+++ b/gdb/tui/tui-file.c
@@ -23,7 +23,7 @@
 
 #include "tui.h"
 
-#include "gdb_string.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 ad99a25b3aa..022678e25f3 100644
--- a/gdb/tui/tui-layout.c
+++ b/gdb/tui/tui-layout.c
@@ -38,7 +38,7 @@
 #include "tui/tui-disasm.h"
 #include "tui/tui-layout.h"
 
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_curses.h"
 
 /*******************************
diff --git a/gdb/tui/tui-out.c b/gdb/tui/tui-out.c
index 14dc1de76c4..32cf6cbcefd 100644
--- a/gdb/tui/tui-out.c
+++ b/gdb/tui/tui-out.c
@@ -24,7 +24,7 @@
 #include "ui-out.h"
 #include "cli-out.h"
 #include "tui.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_assert.h"
 
 struct tui_ui_out_data
diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c
index 5ebf4c804cf..4c13140b15f 100644
--- a/gdb/tui/tui-regs.c
+++ b/gdb/tui/tui-regs.c
@@ -30,7 +30,7 @@
 #include "regcache.h"
 #include "inferior.h"
 #include "target.h"
-#include "gdb_string.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 e5993826dd6..a1b533e4e83 100644
--- a/gdb/tui/tui-source.c
+++ b/gdb/tui/tui-source.c
@@ -35,7 +35,7 @@
 #include "tui/tui-winsource.h"
 #include "tui/tui-source.h"
 
-#include "gdb_string.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 7adf89606dd..c1ea7ad2b00 100644
--- a/gdb/tui/tui-stack.c
+++ b/gdb/tui/tui-stack.c
@@ -28,7 +28,7 @@
 #include "target.h"
 #include "top.h"
 #include "gdb-demangle.h"
-#include "gdb_string.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 edabe83f4b4..78345122263 100644
--- a/gdb/tui/tui-win.c
+++ b/gdb/tui/tui-win.c
@@ -46,7 +46,7 @@
 
 #include "gdb_curses.h"
 
-#include "gdb_string.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 04ea2a8bd38..871b8573fd2 100644
--- a/gdb/tui/tui-windata.c
+++ b/gdb/tui/tui-windata.c
@@ -26,7 +26,7 @@
 #include "tui/tui-regs.h"
 #include "tui/tui-windata.h"
 
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_curses.h"
 
 
diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index ee6827ea047..ffa1ee6242b 100644
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -38,7 +38,7 @@
 #include "tui/tui-source.h"
 #include "tui/tui-disasm.h"
 
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_curses.h"
 #include "gdb_assert.h"
 
diff --git a/gdb/typeprint.c b/gdb/typeprint.c
index 4e70593fec6..c5e45bea74c 100644
--- a/gdb/typeprint.c
+++ b/gdb/typeprint.c
@@ -31,7 +31,7 @@
 #include "language.h"
 #include "cp-abi.h"
 #include "typeprint.h"
-#include "gdb_string.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 b9d3e5309f5..af6c22e4312 100644
--- a/gdb/ui-file.c
+++ b/gdb/ui-file.c
@@ -22,7 +22,7 @@
 #include "defs.h"
 #include "ui-file.h"
 #include "gdb_obstack.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_select.h"
 #include "filestuff.h"
 
diff --git a/gdb/ui-out.c b/gdb/ui-out.c
index 03b1240ace9..5c6b9d920f3 100644
--- a/gdb/ui-out.c
+++ b/gdb/ui-out.c
@@ -21,7 +21,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.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 43364299d1d..c4ea3da6fb7 100644
--- a/gdb/user-regs.c
+++ b/gdb/user-regs.c
@@ -22,7 +22,7 @@
 #include "defs.h"
 #include "user-regs.h"
 #include "gdbtypes.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_assert.h"
 #include "frame.h"
 
diff --git a/gdb/utils.c b/gdb/utils.c
index 198675827a2..10c73d3c76c 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -21,7 +21,7 @@
 #include "dyn-string.h"
 #include "gdb_assert.h"
 #include <ctype.h>
-#include "gdb_string.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 becb0512c6a..a07ab0fafd3 100644
--- a/gdb/v850-tdep.c
+++ b/gdb/v850-tdep.c
@@ -25,7 +25,7 @@
 #include "dwarf2-frame.h"
 #include "gdbtypes.h"
 #include "inferior.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_assert.h"
 #include "gdbcore.h"
 #include "arch-utils.h"
diff --git a/gdb/valarith.c b/gdb/valarith.c
index 18c14fc1f40..49c8bdc0ef0 100644
--- a/gdb/valarith.c
+++ b/gdb/valarith.c
@@ -24,7 +24,7 @@
 #include "expression.h"
 #include "target.h"
 #include "language.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "doublest.h"
 #include "dfp.h"
 #include <math.h>
diff --git a/gdb/valops.c b/gdb/valops.c
index 8bff6868100..4fc57ec32af 100644
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -37,7 +37,7 @@
 #include "dfp.h"
 #include "tracepoint.h"
 #include <errno.h>
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_assert.h"
 #include "cp-support.h"
 #include "observer.h"
diff --git a/gdb/valprint.c b/gdb/valprint.c
index 0ecea0c55fb..ea877f355f0 100644
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "value.h"
diff --git a/gdb/value.c b/gdb/value.c
index 1f562f52d4a..8c263ea03d2 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -19,7 +19,7 @@
 
 #include "defs.h"
 #include "arch-utils.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "value.h"
diff --git a/gdb/varobj.c b/gdb/varobj.c
index f15c9de7ce7..e2d5a869248 100644
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -26,7 +26,7 @@
 #include "valprint.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_regex.h"
 
 #include "varobj.h"
diff --git a/gdb/vax-tdep.c b/gdb/vax-tdep.c
index 10c33822cff..e766f0056da 100644
--- a/gdb/vax-tdep.c
+++ b/gdb/vax-tdep.c
@@ -32,7 +32,7 @@
 #include "trad-frame.h"
 #include "value.h"
 
-#include "gdb_string.h"
+#include <string.h>
 
 #include "vax-tdep.h"
 
diff --git a/gdb/vaxnbsd-tdep.c b/gdb/vaxnbsd-tdep.c
index 6c4947c5fd5..dba1808839e 100644
--- a/gdb/vaxnbsd-tdep.c
+++ b/gdb/vaxnbsd-tdep.c
@@ -24,7 +24,7 @@
 #include "vax-tdep.h"
 #include "solib-svr4.h"
 
-#include "gdb_string.h"
+#include <string.h>
 
 /* NetBSD ELF.  */
 
diff --git a/gdb/vaxobsd-tdep.c b/gdb/vaxobsd-tdep.c
index 244c105cf4b..51f3b32a6c6 100644
--- a/gdb/vaxobsd-tdep.c
+++ b/gdb/vaxobsd-tdep.c
@@ -27,7 +27,7 @@
 
 #include "vax-tdep.h"
 
-#include "gdb_string.h"
+#include <string.h>
 
 /* Signal trampolines.  */
 
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 193a6d756b7..e32c7013bfb 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -51,7 +51,7 @@
 #include "objfiles.h"
 #include "gdb_bfd.h"
 #include "gdb_obstack.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdbthread.h"
 #include "gdbcmd.h"
 #include <unistd.h>
diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
index 7f34ac92293..c741fb4560f 100644
--- a/gdb/xcoffread.c
+++ b/gdb/xcoffread.c
@@ -24,7 +24,7 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <ctype.h>
-#include "gdb_string.h"
+#include <string.h>
 
 #ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
diff --git a/gdb/xml-support.c b/gdb/xml-support.c
index 1682d8e33c3..f6748e50e0e 100644
--- a/gdb/xml-support.c
+++ b/gdb/xml-support.c
@@ -23,7 +23,7 @@
 #include "xml-support.h"
 #include "filestuff.h"
 
-#include "gdb_string.h"
+#include <string.h>
 #include "safe-ctype.h"
 
 /* Debugging flag.  */
diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c
index 99b0c5e0cc9..cb7d31eed01 100644
--- a/gdb/xstormy16-tdep.c
+++ b/gdb/xstormy16-tdep.c
@@ -29,7 +29,7 @@
 #include "value.h"
 #include "dis-asm.h"
 #include "inferior.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_assert.h"
 #include "arch-utils.h"
 #include "floatformat.h"
diff --git a/gdb/xtensa-linux-nat.c b/gdb/xtensa-linux-nat.c
index 3934165a743..ed60429a2b2 100644
--- a/gdb/xtensa-linux-nat.c
+++ b/gdb/xtensa-linux-nat.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "frame.h"
 #include "inferior.h"
 #include "gdbcore.h"