[2/10] RFC: remove gdb_string.h

Tom Tromey
2012-11-15T19:33:29Z

This one removes gdb_string.h and pulls in various related gnulib
modules.

The bulk of this patch is just changing "gdb_string.h" to <string.h>.

I dropped the auto-generated bits from this patch, but not the #include
changes.

Tom

* gnulib/update-gnulib.sh (IMPORTED_GNULIB_MODULES): Add string,
strerror, and strstr.
* common/gdb_string.h: Remove.
* configure.ac: Don't check for string.h, memory.h, strings.h,
strerror, or strstr.
* config.in: Rebuild.
* configure: Rebuild.
* gnulib/aclocal.m4: Update.
* gnulib/configure: Update.
* gnulib/import/Makefile.am: Update.
* gnulib/import/Makefile.in: Update.
* gnulib/import/errno.in.h: Update.
* gnulib/import/intprops.h: Update.
* gnulib/import/m4/errno_h.m4: Update.
* gnulib/import/m4/gnulib-cache.m4: Update.
* gnulib/import/m4/gnulib-comp.m4: Update.
* gnulib/import/m4/strerror.m4: Update.
* gnulib/import/m4/strstr.m4: Update.
* gnulib/import/m4/sys_socket_h.m4: Update.
* gnulib/import/strerror-override.c: Update.
* gnulib/import/strerror-override.h: Update.
* gnulib/import/strerror.c: Update.
* gnulib/import/strstr.c: Update.

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

* configure.ac: Don't check for string.h, strerror, strstr.
* config.in: Rebuild.
* configure: Rebuild.
---
gdb/ada-exp.y | 2 +-
gdb/ada-lang.c | 2 +-
gdb/ada-lex.l | 2 +-
gdb/ada-typeprint.c | 2 +-
gdb/ada-valprint.c | 2 +-
gdb/aix-thread.c | 2 +-
gdb/alpha-linux-tdep.c | 2 +-
gdb/alpha-mdebug-tdep.c | 2 +-
gdb/alpha-nat.c | 2 +-
gdb/alpha-osf1-tdep.c | 2 +-
gdb/alpha-tdep.c | 2 +-
gdb/alphanbsd-tdep.c | 2 +-
gdb/amd64-dicos-tdep.c | 2 +-
gdb/amd64-linux-nat.c | 2 +-
gdb/amd64-linux-tdep.c | 2 +-
gdb/amd64-nat.c | 2 +-
gdb/amd64-sol2-tdep.c | 2 +-
gdb/amd64fbsd-tdep.c | 2 +-
gdb/amd64obsd-tdep.c | 2 +-
gdb/arch-utils.c | 2 +-
gdb/arm-linux-nat.c | 2 +-
gdb/arm-linux-tdep.c | 2 +-
gdb/arm-tdep.c | 2 +-
gdb/arm-wince-tdep.c | 2 +-
gdb/armbsd-tdep.c | 2 +-
gdb/armnbsd-nat.c | 2 +-
gdb/armnbsd-tdep.c | 2 +-
gdb/armobsd-tdep.c | 2 +-
gdb/avr-tdep.c | 2 +-
gdb/ax-gdb.c | 2 +-
gdb/ax-general.c | 2 +-
gdb/bcache.c | 2 +-
gdb/bfin-tdep.c | 2 +-
gdb/breakpoint.c | 2 +-
gdb/buildsym.c | 2 +-
gdb/c-exp.y | 2 +-
gdb/c-lang.c | 2 +-
gdb/c-typeprint.c | 2 +-
gdb/c-valprint.c | 2 +-
gdb/charset.c | 2 +-
gdb/cli-out.c | 2 +-
gdb/cli/cli-cmds.c | 2 +-
gdb/cli/cli-decode.c | 2 +-
gdb/cli/cli-dump.c | 2 +-
gdb/cli/cli-interp.c | 2 +-
gdb/cli/cli-logging.c | 2 +-
gdb/cli/cli-script.c | 2 +-
gdb/cli/cli-setshow.c | 2 +-
gdb/cli/cli-utils.c | 2 +-
gdb/coffread.c | 2 +-
gdb/common/gdb_string.h | 70 --
gdb/common/linux-procfs.c | 2 +-
gdb/common/linux-ptrace.c | 2 +-
gdb/common/signals.c | 2 +-
gdb/common/vec.h | 2 +-
gdb/config.in | 8 -
gdb/configure | 22 +-
gdb/configure.ac | 4 +-
gdb/core-regset.c | 2 +-
gdb/corefile.c | 2 +-
gdb/corelow.c | 2 +-
gdb/cp-abi.c | 2 +-
gdb/cp-support.c | 2 +-
gdb/cp-valprint.c | 2 +-
gdb/cris-tdep.c | 2 +-
gdb/d-lang.c | 2 +-
gdb/dbxread.c | 4 +-
gdb/dcache.c | 2 +-
gdb/demangle.c | 2 +-
gdb/dicos-tdep.c | 2 +-
gdb/disasm.c | 2 +-
gdb/doublest.c | 2 +-
gdb/dsrec.c | 2 +-
gdb/dummy-frame.c | 2 +-
gdb/dwarf2-frame.c | 2 +-
gdb/dwarf2loc.c | 2 +-
gdb/dwarf2read.c | 2 +-
gdb/elfread.c | 2 +-
gdb/environ.c | 2 +-
gdb/eval.c | 2 +-
gdb/event-loop.c | 2 +-
gdb/exceptions.c | 2 +-
gdb/exec.c | 2 +-
gdb/expprint.c | 2 +-
gdb/f-exp.y | 2 +-
gdb/f-lang.c | 2 +-
gdb/f-typeprint.c | 2 +-
gdb/f-valprint.c | 2 +-
gdb/fbsd-nat.c | 2 +-
gdb/findcmd.c | 2 +-
gdb/findvar.c | 2 +-
gdb/fork-child.c | 2 +-
gdb/frame.c | 2 +-
gdb/frv-linux-tdep.c | 2 +-
gdb/frv-tdep.c | 2 +-
gdb/gdb.c | 2 +-
gdb/gdb_bfd.c | 2 +-
gdb/gdbarch.c | 2 +-
gdb/gdbserver/config.in | 8 -
gdb/gdbserver/configure | 22 +-
gdb/gdbserver/configure.ac | 4 +-
gdb/gdbserver/gdbreplay.c | 2 -
gdb/gdbserver/server.h | 8 -
gdb/gdbtypes.c | 2 +-
gdb/gnu-nat.c | 2 +-
gdb/gnu-v2-abi.c | 2 +-
gdb/gnu-v3-abi.c | 2 +-
gdb/gnulib/aclocal.m4 | 4 +
gdb/gnulib/configure | 1795 ++++++++++++++++++++++++---------
gdb/gnulib/import/Makefile.am | 70 ++-
gdb/gnulib/import/Makefile.in | 75 ++-
gdb/gnulib/import/errno.in.h | 279 +++++
gdb/gnulib/import/intprops.h | 319 ++++++
gdb/gnulib/import/m4/errno_h.m4 | 137 +++
gdb/gnulib/import/m4/gnulib-cache.m4 | 5 +-
gdb/gnulib/import/m4/gnulib-comp.m4 | 38 +
gdb/gnulib/import/m4/strerror.m4 | 96 ++
gdb/gnulib/import/m4/strstr.m4 | 130 +++
gdb/gnulib/import/m4/sys_socket_h.m4 | 177 ++++
gdb/gnulib/import/strerror-override.c | 302 ++++++
gdb/gnulib/import/strerror-override.h | 56 +
gdb/gnulib/import/strerror.c | 70 ++
gdb/gnulib/import/strstr.c | 82 ++
gdb/gnulib/update-gnulib.sh | 2 +-
gdb/go-exp.y | 2 +-
gdb/go-lang.c | 2 +-
gdb/go32-nat.c | 2 +-
gdb/hppa-hpux-tdep.c | 2 +-
gdb/hppa-linux-nat.c | 2 +-
gdb/hppanbsd-tdep.c | 2 +-
gdb/hppaobsd-tdep.c | 2 +-
gdb/i386-cygwin-tdep.c | 2 +-
gdb/i386-dicos-tdep.c | 2 +-
gdb/i386-linux-nat.c | 2 +-
gdb/i386-linux-tdep.c | 2 +-
gdb/i386-nto-tdep.c | 2 +-
gdb/i386-sol2-tdep.c | 2 +-
gdb/i386-tdep.c | 2 +-
gdb/i386bsd-tdep.c | 2 +-
gdb/i386gnu-nat.c | 2 +-
gdb/i386nbsd-tdep.c | 2 +-
gdb/i386obsd-tdep.c | 2 +-
gdb/i387-tdep.c | 2 +-
gdb/ia64-libunwind-tdep.c | 2 +-
gdb/ia64-linux-nat.c | 2 +-
gdb/inf-child.c | 2 +-
gdb/inf-ptrace.c | 2 +-
gdb/inf-ttrace.c | 2 +-
gdb/infcall.c | 2 +-
gdb/infcmd.c | 2 +-
gdb/inflow.c | 2 +-
gdb/infrun.c | 2 +-
gdb/interps.c | 2 +-
gdb/iq2000-tdep.c | 2 +-
gdb/irix5-nat.c | 2 +-
gdb/jv-exp.y | 2 +-
gdb/jv-lang.c | 2 +-
gdb/jv-typeprint.c | 2 +-
gdb/jv-valprint.c | 2 +-
gdb/language.c | 2 +-
gdb/linux-fork.c | 2 +-
gdb/linux-nat.c | 2 +-
gdb/lm32-tdep.c | 2 +-
gdb/m2-exp.y | 2 +-
gdb/m2-typeprint.c | 2 +-
gdb/m32c-tdep.c | 3 -
gdb/m32r-linux-nat.c | 2 +-
gdb/m32r-linux-tdep.c | 2 +-
gdb/m32r-rom.c | 2 +-
gdb/m32r-tdep.c | 2 +-
gdb/m68hc11-tdep.c | 2 +-
gdb/m68k-tdep.c | 2 +-
gdb/m68kbsd-tdep.c | 2 +-
gdb/m68klinux-nat.c | 2 +-
gdb/m68klinux-tdep.c | 2 +-
gdb/m88k-tdep.c | 2 +-
gdb/macrocmd.c | 2 +-
gdb/main.c | 2 +-
gdb/mdebugread.c | 2 +-
gdb/mem-break.c | 2 +-
gdb/memattr.c | 2 +-
gdb/memory-map.c | 2 +-
gdb/mep-tdep.c | 2 +-
gdb/mi/mi-cmd-break.c | 2 +-
gdb/mi/mi-cmd-disas.c | 2 +-
gdb/mi/mi-cmd-env.c | 2 +-
gdb/mi/mi-cmd-stack.c | 2 +-
gdb/mi/mi-cmd-var.c | 2 +-
gdb/mi/mi-cmds.c | 2 +-
gdb/mi/mi-console.c | 2 +-
gdb/mi/mi-getopt.c | 2 +-
gdb/mi/mi-interp.c | 2 +-
gdb/mi/mi-main.c | 2 +-
gdb/mi/mi-parse.c | 2 +-
gdb/microblaze-rom.c | 2 +-
gdb/microblaze-tdep.c | 2 +-
gdb/mingw-hdep.c | 2 +-
gdb/minsyms.c | 2 +-
gdb/mips-irix-tdep.c | 2 +-
gdb/mips-linux-tdep.c | 2 +-
gdb/mips-tdep.c | 2 +-
gdb/mips64obsd-tdep.c | 2 +-
gdb/mipsnbsd-tdep.c | 2 +-
gdb/mipsread.c | 2 +-
gdb/mn10300-linux-tdep.c | 2 +-
gdb/mn10300-tdep.c | 2 +-
gdb/monitor.c | 2 +-
gdb/moxie-tdep.c | 2 +-
gdb/mt-tdep.c | 2 +-
gdb/nbsd-tdep.c | 2 +-
gdb/nto-procfs.c | 2 +-
gdb/nto-tdep.c | 2 +-
gdb/objc-lang.c | 2 +-
gdb/objfiles.c | 2 +-
gdb/opencl-lang.c | 2 +-
gdb/osabi.c | 2 +-
gdb/osdata.c | 2 +-
gdb/p-exp.y | 2 +-
gdb/p-lang.c | 2 +-
gdb/p-typeprint.c | 2 +-
gdb/parse.c | 2 +-
gdb/posix-hdep.c | 2 +-
gdb/ppc-linux-nat.c | 2 +-
gdb/ppc-sysv-tdep.c | 2 +-
gdb/ppcnbsd-tdep.c | 2 +-
gdb/ppcobsd-tdep.c | 2 +-
gdb/printcmd.c | 2 +-
gdb/procfs.c | 2 +-
gdb/prologue-value.c | 2 +-
gdb/python/py-auto-load.c | 2 +-
gdb/python/py-gdb-readline.c | 2 +-
gdb/ravenscar-thread.c | 2 +-
gdb/regcache.c | 2 +-
gdb/registry.c | 2 +-
gdb/remote-fileio.c | 2 +-
gdb/remote-m32r-sdi.c | 2 +-
gdb/remote-mips.c | 2 +-
gdb/remote-sim.c | 2 +-
gdb/remote.c | 2 +-
gdb/reverse.c | 2 +-
gdb/rs6000-aix-tdep.c | 2 +-
gdb/ser-base.c | 2 +-
gdb/ser-go32.c | 2 +-
gdb/ser-mingw.c | 2 +-
gdb/ser-pipe.c | 2 +-
gdb/ser-tcp.c | 2 +-
gdb/ser-unix.c | 2 +-
gdb/serial.c | 2 +-
gdb/sh-tdep.c | 2 +-
gdb/sh64-tdep.c | 2 +-
gdb/shnbsd-tdep.c | 2 +-
gdb/skip.c | 2 +-
gdb/sol-thread.c | 2 +-
gdb/solib-dsbt.c | 2 +-
gdb/solib-frv.c | 2 +-
gdb/solib-osf.c | 2 +-
gdb/solib-spu.c | 2 +-
gdb/solib-sunos.c | 2 +-
gdb/solib-target.c | 2 +-
gdb/solib.c | 2 +-
gdb/somread.c | 2 +-
gdb/source.c | 2 +-
gdb/sparc-nat.c | 2 +-
gdb/sparc-sol2-tdep.c | 2 +-
gdb/sparc-tdep.c | 2 +-
gdb/sparc64-tdep.c | 2 +-
gdb/sparc64fbsd-tdep.c | 2 +-
gdb/sparc64nbsd-tdep.c | 2 +-
gdb/sparcnbsd-tdep.c | 2 +-
gdb/spu-linux-nat.c | 2 +-
gdb/spu-multiarch.c | 2 +-
gdb/spu-tdep.c | 2 +-
gdb/stabsread.c | 2 +-
gdb/stack.c | 2 +-
gdb/std-regs.c | 2 +-
gdb/symfile.c | 2 +-
gdb/symmisc.c | 2 +-
gdb/symtab.c | 2 +-
gdb/target.c | 2 +-
gdb/thread.c | 2 +-
gdb/tilegx-linux-nat.c | 2 +-
gdb/tilegx-tdep.c | 2 +-
gdb/top.c | 2 +-
gdb/tracepoint.c | 2 +-
gdb/tui/tui-command.c | 2 +-
gdb/tui/tui-data.c | 2 +-
gdb/tui/tui-disasm.c | 2 +-
gdb/tui/tui-file.c | 2 +-
gdb/tui/tui-layout.c | 2 +-
gdb/tui/tui-out.c | 2 +-
gdb/tui/tui-regs.c | 2 +-
gdb/tui/tui-source.c | 2 +-
gdb/tui/tui-stack.c | 2 +-
gdb/tui/tui-win.c | 2 +-
gdb/tui/tui-windata.c | 2 +-
gdb/tui/tui-winsource.c | 2 +-
gdb/typeprint.c | 2 +-
gdb/ui-file.c | 2 +-
gdb/ui-out.c | 2 +-
gdb/user-regs.c | 2 +-
gdb/utils.c | 2 +-
gdb/v850-tdep.c | 2 +-
gdb/valarith.c | 2 +-
gdb/valops.c | 2 +-
gdb/valprint.c | 2 +-
gdb/value.c | 2 +-
gdb/varobj.c | 2 +-
gdb/vax-tdep.c | 2 +-
gdb/vaxnbsd-tdep.c | 2 +-
gdb/vaxobsd-tdep.c | 2 +-
gdb/windows-nat.c | 2 +-
gdb/xcoffread.c | 2 +-
gdb/xml-support.c | 2 +-
gdb/xstormy16-tdep.c | 2 +-
gdb/xtensa-linux-nat.c | 2 +-
315 files changed, 3461 insertions(+), 905 deletions(-)
delete mode 100644 gdb/common/gdb_string.h
create mode 100644 gdb/gnulib/import/errno.in.h
create mode 100644 gdb/gnulib/import/intprops.h
create mode 100644 gdb/gnulib/import/m4/errno_h.m4
create mode 100644 gdb/gnulib/import/m4/strerror.m4
create mode 100644 gdb/gnulib/import/m4/strstr.m4
create mode 100644 gdb/gnulib/import/m4/sys_socket_h.m4
create mode 100644 gdb/gnulib/import/strerror-override.c
create mode 100644 gdb/gnulib/import/strerror-override.h
create mode 100644 gdb/gnulib/import/strerror.c
create mode 100644 gdb/gnulib/import/strstr.c

diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y
index 1a80b0b..d1a838a 100644
--- a/gdb/ada-exp.y
+++ b/gdb/ada-exp.y
@@ -37,7 +37,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 e1dced5..49d5b6e 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -21,7 +21,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 714265e..8bd949f 100644
--- a/gdb/ada-lex.l
+++ b/gdb/ada-lex.l
@@ -289,7 +289,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 2e28b55..7843964 100644
--- a/gdb/ada-typeprint.c
+++ b/gdb/ada-typeprint.c
@@ -35,7 +35,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 ca30e42..9926340 100644
--- a/gdb/ada-valprint.c
+++ b/gdb/ada-valprint.c
@@ -20,7 +20,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 5da6c4e..30c747c 100644
--- a/gdb/aix-thread.c
+++ b/gdb/aix-thread.c
@@ -48,7 +48,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 aaca985..a375b8b 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 4b46a3c..629b9fb 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 900a586..90a68c1 100644
--- a/gdb/alpha-nat.c
+++ b/gdb/alpha-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 "inferior.h"
#include "gdbcore.h"
#include "target.h"
diff --git a/gdb/alpha-osf1-tdep.c b/gdb/alpha-osf1-tdep.c
index f3bddaa..0880126 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 e5b75d2..11820b0 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 bc17385..712cb15 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 a983bb2..d886fd9 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 f4a12db..1804444 100644
--- a/gdb/amd64-linux-nat.c
+++ b/gdb/amd64-linux-nat.c
@@ -27,7 +27,7 @@
#include "amd64-linux-tdep.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 d919216..d385fe1 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 d79b71b..130be25 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 dbc65d4..e925153 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 87b661c..4df2cf7 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 f2a8ed9..4cef8f0 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 5a47e37..a35baef 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 bf81c03..cdcd249 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 f4eaa5c..f743439 100644
--- a/gdb/arm-linux-tdep.c
+++ b/gdb/arm-linux-tdep.c
@@ -49,7 +49,7 @@
#include "user-regs.h"
#include <ctype.h>

-#include "gdb_string.h"
+#include <string.h>

/* This is defined in <elf.h> on ARM GNU/Linux systems. */
#define AT_HWCAP 16
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index a221fd6..c7a3d34 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -26,7 +26,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 5bc6473..654bf06 100644
--- a/gdb/arm-wince-tdep.c
+++ b/gdb/arm-wince-tdep.c
@@ -26,7 +26,7 @@
#include "solib-target.h"
#include "frame.h"

-#include "gdb_string.h"
+#include <string.h>

#include "arm-tdep.h"

diff --git a/gdb/armbsd-tdep.c b/gdb/armbsd-tdep.c
index 1b87ba6..3b6188f 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 a65a00d..0d6b43c 100644
--- a/gdb/armnbsd-nat.c
+++ b/gdb/armnbsd-nat.c
@@ -24,7 +24,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 19aa000..7a48a4d 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 fab4e42..97536bd 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 864d288..cb6e9ca 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 9cb8fe9..136272d 100644
--- a/gdb/ax-gdb.c
+++ b/gdb/ax-gdb.c
@@ -31,7 +31,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 6ea6f14..e8abea7 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 2a180af..29d1912 100644
--- a/gdb/bcache.c
+++ b/gdb/bcache.c
@@ -23,7 +23,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 4eb5763..f379bfe 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 ccf7ee1..2e8d70b 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/buildsym.c b/gdb/buildsym.c
index 8f2e732..a8f040a 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 11eaadb..846c10b 100644
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -37,7 +37,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 84830be..4d5b8e1 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 c6f8bb2..31aa7b5 100644
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -32,7 +32,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 dada9e2..4eca34a 100644
--- a/gdb/c-valprint.c
+++ b/gdb/c-valprint.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 "symtab.h"
#include "gdbtypes.h"
#include "expression.h"
diff --git a/gdb/charset.c b/gdb/charset.c
index 777d901..d032908 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 5404036..f3a93da 100644
--- a/gdb/cli-out.c
+++ b/gdb/cli-out.c
@@ -24,7 +24,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 b65262e..991ad00 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 6e0f0de..54843f1 100644
--- a/gdb/cli/cli-decode.c
+++ b/gdb/cli/cli-decode.c
@@ -20,7 +20,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"

diff --git a/gdb/cli/cli-dump.c b/gdb/cli/cli-dump.c
index c2d1397..ec50b82 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 70b6c28..bb936a9 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 6ff064a..6397da6 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 743c65f..b87d9c7 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 9d8cb2e..b75dd80 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 81a4acc..b21d666 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 0c7e6d9..43dbba6 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/gdb_string.h b/gdb/common/gdb_string.h
deleted file mode 100644
index aa037df..0000000
--- a/gdb/common/gdb_string.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Portable <string.h>
-
- Copyright (C) 1995, 1998-2001, 2004, 2007-2012 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 a5aa830..eda40e2 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 55ba766..22cc204 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 3ef9840..4ab863c 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 a99bcd6..048184f 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/configure.ac b/gdb/configure.ac
index 030fb06..ac0761e 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -1076,7 +1076,7 @@ AC_HEADER_STDC
# elf_hp.h is for HP/UX 64-bit shared library support.
AC_CHECK_HEADERS([nlist.h machine/reg.h poll.h sys/poll.h proc_service.h \
thread_db.h signal.h stddef.h \
- stdlib.h string.h memory.h strings.h sys/fault.h \
+ stdlib.h sys/fault.h \
sys/file.h sys/filio.h sys/ioctl.h sys/param.h \
sys/resource.h sys/procfs.h sys/ptrace.h ptrace.h \
sys/reg.h sys/debugreg.h sys/select.h sys/syscall.h \
@@ -1124,7 +1124,7 @@ AC_CHECK_HEADERS(term.h, [], [],
# Checks for declarations. #
# ------------------------- #

-AC_CHECK_DECLS([free, malloc, realloc, strerror, strstr, getopt,
+AC_CHECK_DECLS([free, malloc, realloc, getopt,
snprintf, vsnprintf])
AM_LC_MESSAGES

diff --git a/gdb/core-regset.c b/gdb/core-regset.c
index 2ebe911..d34cd1a 100644
--- a/gdb/core-regset.c
+++ b/gdb/core-regset.c
@@ -36,7 +36,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 78dbbc2..7115a2e 100644
--- a/gdb/corefile.c
+++ b/gdb/corefile.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 <errno.h>
#include <signal.h>
#include <fcntl.h>
diff --git a/gdb/corelow.c b/gdb/corelow.c
index 99611ba..b1be3d6 100644
--- a/gdb/corelow.c
+++ b/gdb/corelow.c
@@ -20,7 +20,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 16b5356..564e1e4 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 97524ed..b2ac090 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 4586da2..dfb4ca0 100644
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -28,7 +28,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 6739037..4e9d629 100644
--- a/gdb/cris-tdep.c
+++ b/gdb/cris-tdep.c
@@ -42,7 +42,7 @@

#include "solib.h" /* Support for shared libraries. */
#include "solib-svr4.h"
-#include "gdb_string.h"
+#include <string.h>
#include "dis-asm.h"

enum cris_num_regs
diff --git a/gdb/d-lang.c b/gdb/d-lang.c
index 7b2c322..31efe90 100644
--- a/gdb/d-lang.c
+++ b/gdb/d-lang.c
@@ -22,7 +22,7 @@
#include "language.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 2d47407..1dd6213 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>
@@ -57,7 +57,7 @@
#include "psympriv.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 ce9fe31..9c6b999 100644
--- a/gdb/dcache.c
+++ b/gdb/dcache.c
@@ -21,7 +21,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 fa6f4a6..8237343 100644
--- a/gdb/demangle.c
+++ b/gdb/demangle.c
@@ -29,7 +29,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 aac253b..3cee50a 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 25d87d7..1c6c608 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 0308dac..0afcd2d 100644
--- a/gdb/doublest.c
+++ b/gdb/doublest.c
@@ -28,7 +28,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 9ea23c0..4d6ea43 100644
--- a/gdb/dsrec.c
+++ b/gdb/dsrec.c
@@ -22,7 +22,7 @@
#include "srec.h"
#include <time.h>
#include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
#include "gdb_bfd.h"

extern void report_transfer_performance (unsigned long, time_t, time_t);
diff --git a/gdb/dummy-frame.c b/gdb/dummy-frame.c
index b8a8c86..bf589c4 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 dcfbeb7..2b485bc 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 cadcc17..bba08f0 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"

DEF_VEC_I(int);
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 078eb50..d5db4db 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -69,7 +69,7 @@
#include "f-lang.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 516cbd0..4db92f1 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 33426eb..bc89780 100644
--- a/gdb/environ.c
+++ b/gdb/environ.c
@@ -21,7 +21,7 @@

#include "defs.h"
#include "environ.h"
-#include "gdb_string.h"
+#include <string.h>
\f

/* Return a new environment object. */
diff --git a/gdb/eval.c b/gdb/eval.c
index f655957..5dbe03e 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 279335a..b9df80a 100644
--- a/gdb/event-loop.c
+++ b/gdb/event-loop.c
@@ -30,7 +30,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 b7cf9a2..198bcb6 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 615d5c0..8dec898 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 ddd3a77..46372b3 100644
--- a/gdb/expprint.c
+++ b/gdb/expprint.c
@@ -27,7 +27,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 33c7418..c2be68f 100644
--- a/gdb/f-exp.y
+++ b/gdb/f-exp.y
@@ -43,7 +43,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 0b3645f..0cd713b 100644
--- a/gdb/f-lang.c
+++ b/gdb/f-lang.c
@@ -22,7 +22,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 a9940cc..8a08343 100644
--- a/gdb/f-typeprint.c
+++ b/gdb/f-typeprint.c
@@ -32,7 +32,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 c3d2383..2f3a216 100644
--- a/gdb/f-valprint.c
+++ b/gdb/f-valprint.c
@@ -22,7 +22,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 254a01a..1bf88ed 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 116e0b0..055df98 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 d005145..8a7ab94 100644
--- a/gdb/findvar.c
+++ b/gdb/findvar.c
@@ -26,7 +26,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 b47019d..1e136de 100644
--- a/gdb/fork-child.c
+++ b/gdb/fork-child.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 "inferior.h"
#include "terminal.h"
#include "target.h"
diff --git a/gdb/frame.c b/gdb/frame.c
index bf034a8..53f802f 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -25,7 +25,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 dd41883..01fc183 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 28151f6..113e596 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 e1dcdc6..c201380 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 2bcc4b4..bb22ddf 100644
--- a/gdb/gdb_bfd.c
+++ b/gdb/gdb_bfd.c
@@ -21,7 +21,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 09576b1..fb99597 100644
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -44,7 +44,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/gdbserver/configure.ac b/gdb/gdbserver/configure.ac
index 46f5dc0..2d8a703 100644
--- a/gdb/gdbserver/configure.ac
+++ b/gdb/gdbserver/configure.ac
@@ -50,7 +50,7 @@ AC_CHECK_PROGS(MAKE, make)
# build it in the same directory, when building in the source dir.
ACX_CONFIGURE_DIR(["../gnulib"], ["build-gnulib-gdbserver"])

-AC_CHECK_HEADERS(sgtty.h termio.h termios.h sys/reg.h string.h dnl
+AC_CHECK_HEADERS(sgtty.h termio.h termios.h sys/reg.h dnl
proc_service.h sys/procfs.h thread_db.h linux/elf.h dnl
stdlib.h unistd.h dnl
errno.h fcntl.h signal.h sys/file.h malloc.h dnl
@@ -174,7 +174,7 @@ AC_TRY_LINK([
[AC_MSG_RESULT(no)])
fi

-AC_CHECK_DECLS([strerror, strstr, perror, vasprintf, vsnprintf])
+AC_CHECK_DECLS([perror, vasprintf, vsnprintf])

AC_CHECK_TYPES(socklen_t, [], [],
[#include <sys/types.h>
diff --git a/gdb/gdbserver/gdbreplay.c b/gdb/gdbserver/gdbreplay.c
index 5aaa98e..6034d93 100644
--- a/gdb/gdbserver/gdbreplay.c
+++ b/gdb/gdbserver/gdbreplay.c
@@ -38,9 +38,7 @@
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
-#ifdef HAVE_STRING_H
#include <string.h>
-#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h
index e93ad00..f0e9db2 100644
--- a/gdb/gdbserver/server.h
+++ b/gdb/gdbserver/server.h
@@ -38,9 +38,7 @@
#endif
#include <setjmp.h>

-#ifdef HAVE_STRING_H
#include <string.h>
-#endif

#ifdef HAVE_ALLOCA_H
#include <alloca.h>
@@ -51,12 +49,6 @@
#include <malloc.h>
#endif

-#if !HAVE_DECL_STRERROR
-#ifndef strerror
-extern char *strerror (int); /* X3.159-1989 4.11.6.2 */
-#endif
-#endif
-
#if !HAVE_DECL_PERROR
#ifndef perror
extern void perror (const char *);
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index d322004..ada0ed8 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 e6836d7..fb042b1 100644
--- a/gdb/gnu-nat.c
+++ b/gdb/gnu-nat.c
@@ -30,7 +30,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 e635e8f..1e16984 100644
--- a/gdb/gnu-v2-abi.c
+++ b/gdb/gnu-v2-abi.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 "value.h"
diff --git a/gdb/gnu-v3-abi.c b/gdb/gnu-v3-abi.c
index c025a7b..3627e6e 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/gnulib/update-gnulib.sh b/gdb/gnulib/update-gnulib.sh
index 0268057..de82463 100644
--- a/gdb/gnulib/update-gnulib.sh
+++ b/gdb/gnulib/update-gnulib.sh
@@ -29,7 +29,7 @@
# regenerate the various scripts and Makefiles are on the PATH.

# The list of gnulib modules we are importing in GDB.
-IMPORTED_GNULIB_MODULES="fnmatch-gnu inttypes memmem update-copyright"
+IMPORTED_GNULIB_MODULES="fnmatch-gnu inttypes memmem update-copyright string strerror strstr"

# The gnulib commit ID to use for the update.
GNULIB_COMMIT_SHA1="0dc43482065b697a7e64ac7cc7fba7c848924997"
diff --git a/gdb/go-exp.y b/gdb/go-exp.y
index c3171c3..436dedf 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 21f2427..3eaee63 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 ef1da91..bd8d25e 100644
--- a/gdb/go32-nat.c
+++ b/gdb/go32-nat.c
@@ -99,7 +99,7 @@
#include "i386-tdep.h"
#include "value.h"
#include "regcache.h"
-#include "gdb_string.h"
+#include <string.h>
#include "top.h"

#include <stdio.h> /* might be required for __DJGPP_MINOR__ */
diff --git a/gdb/hppa-hpux-tdep.c b/gdb/hppa-hpux-tdep.c
index f6dfef2..859611d 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 31eeda8..0e52841 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 6c9ba72..10af3b9 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 0b6572a..eb82e26 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 bb395e7..2c2207d 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 ca37673..e249705 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 5a65ef6..4e7dca2 100644
--- a/gdb/i386-linux-nat.c
+++ b/gdb/i386-linux-nat.c
@@ -27,7 +27,7 @@
#include "linux-nat.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 8475d7a..abe0c86 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 615297f..7464318 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 5273f52..2558276 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 f0056be..61facc7 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 a84b817..e854b55 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 f15cf0c..739a150 100644
--- a/gdb/i386gnu-nat.c
+++ b/gdb/i386gnu-nat.c
@@ -26,7 +26,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 2eb5553..4a87d85 100644
--- a/gdb/i386nbsd-tdep.c
+++ b/gdb/i386nbsd-tdep.c
@@ -30,7 +30,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 9005304..67fa33d 100644
--- a/gdb/i386obsd-tdep.c
+++ b/gdb/i386obsd-tdep.c
@@ -32,7 +32,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 97bd5f6..f8b7666 100644
--- a/gdb/i387-tdep.c
+++ b/gdb/i387-tdep.c
@@ -29,7 +29,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 e1c89c4..93be459 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 9b5fbf3..b3acb9e 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 ae2dd1e..cfccb86 100644
--- a/gdb/inf-child.c
+++ b/gdb/inf-child.c
@@ -25,7 +25,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 740798f..d645dab 100644
--- a/gdb/inf-ptrace.c
+++ b/gdb/inf-ptrace.c
@@ -27,7 +27,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 2b9e7f5..504bbae 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 2fa1daa..9e92af3 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 7a08e31..fb9a84c 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 de6ee56..e76fac4 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 4efc2af..7812123 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 698e26e..893a4ee 100644
--- a/gdb/interps.c
+++ b/gdb/interps.c
@@ -37,7 +37,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 6ecc671..33b26d4 100644
--- a/gdb/iq2000-tdep.c
+++ b/gdb/iq2000-tdep.c
@@ -29,7 +29,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 8745f22..c750406 100644
--- a/gdb/irix5-nat.c
+++ b/gdb/irix5-nat.c
@@ -30,7 +30,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 d0fca67..1795eca 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 6b865dc..f790cff 100644
--- a/gdb/jv-lang.c
+++ b/gdb/jv-lang.c
@@ -28,7 +28,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 f0d3448..80bfdbc 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 d1274dd..89e6547 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 5693419..281ec95 100644
--- a/gdb/language.c
+++ b/gdb/language.c
@@ -31,7 +31,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 028fcbc..b36bc2c 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 45f7e24..e39347d 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -20,7 +20,7 @@
#include "defs.h"
#include "inferior.h"
#include "target.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 725ce5b..6371686 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 19f9c24..1e706ea 100644
--- a/gdb/m2-exp.y
+++ b/gdb/m2-exp.y
@@ -39,7 +39,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 89be6cf..a5fd7fc 100644
--- a/gdb/m2-typeprint.c
+++ b/gdb/m2-typeprint.c
@@ -33,7 +33,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 b680fa0..16ee3af 100644
--- a/gdb/m32c-tdep.c
+++ b/gdb/m32c-tdep.c
@@ -20,10 +20,7 @@
#include "defs.h"

#include <stdarg.h>
-
-#if defined (HAVE_STRING_H)
#include <string.h>
-#endif

#include "gdb_assert.h"
#include "elf-bfd.h"
diff --git a/gdb/m32r-linux-nat.c b/gdb/m32r-linux-nat.c
index 5d1defe..93a01b0 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 dce1a88..c50cd7d 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 f74cfe3..cabafd4 100644
--- a/gdb/m32r-rom.c
+++ b/gdb/m32r-rom.c
@@ -35,7 +35,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 150b9de..a7b7b2f 100644
--- a/gdb/m32r-tdep.c
+++ b/gdb/m32r-tdep.c
@@ -26,7 +26,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 0b01387..6007d1b 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 0bad9ac..e474414 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 aec73d4..5477af3 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 3be7c14..eaf8e62 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 d6dc3ee..273935f 100644
--- a/gdb/m68klinux-tdep.c
+++ b/gdb/m68klinux-tdep.c
@@ -24,7 +24,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 c4c3266..bd7ed0b 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 a327cad..1a9f04b 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"

\f
diff --git a/gdb/main.c b/gdb/main.c
index 923a7fe..e795a9e 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 d1b9177..638903d 100644
--- a/gdb/mdebugread.c
+++ b/gdb/mdebugread.c
@@ -57,7 +57,7 @@
#include "dictionary.h"
#include "mdebugread.h"
#include "gdb_stat.h"
-#include "gdb_string.h"
+#include <string.h>
#include "psympriv.h"

#include "bfd.h"
diff --git a/gdb/mem-break.c b/gdb/mem-break.c
index bd34fb2..11814e2 100644
--- a/gdb/mem-break.c
+++ b/gdb/mem-break.c
@@ -29,7 +29,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 39c9b22..2364f9e 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 a2e2a19..adcc5aa 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 7d00445..c505a34 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 487d42d..b8f10cf 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 b6afb08..6f4f3cf 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 ebf4974..cb565de 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 fe3e0bf..71a9183 100644
--- a/gdb/mi/mi-cmd-stack.c
+++ b/gdb/mi/mi-cmd-stack.c
@@ -28,7 +28,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 dc47bc1..6db2319 100644
--- a/gdb/mi/mi-cmd-var.c
+++ b/gdb/mi/mi-cmd-var.c
@@ -27,7 +27,7 @@
#include "varobj.h"
#include "value.h"
#include <ctype.h>
-#include "gdb_string.h"
+#include <string.h>
#include "mi-getopt.h"
#include "gdbthread.h"

diff --git a/gdb/mi/mi-cmds.c b/gdb/mi/mi-cmds.c
index 572625f..16bc0b7 100644
--- a/gdb/mi/mi-cmds.c
+++ b/gdb/mi/mi-cmds.c
@@ -22,7 +22,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 b04e65c..95737e4 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 3a7c6a3..ea7d79d 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>

int
mi_getopt (const char *prefix,
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index 993f8b0..708aa5a 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 1b7d68a..01b6bb1 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 02700c4..b067cb2 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>

/* Like parse_escape, but leave the results as a host char, not a
target char. */
diff --git a/gdb/microblaze-rom.c b/gdb/microblaze-rom.c
index c713b21..52ab122 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 7427912..2d86f65 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 ed06c56..c19f1c7 100644
--- a/gdb/mingw-hdep.c
+++ b/gdb/mingw-hdep.c
@@ -23,7 +23,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/minsyms.c b/gdb/minsyms.c
index a3a376c..da95489 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 d7ff0f0..cc90408 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 023290f..430f162 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 8140f23..52863b9 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 5748e91..fe5a3ac 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 83b2f7e..28b5129 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 23ceece..27bc348 100644
--- a/gdb/mipsread.c
+++ b/gdb/mipsread.c
@@ -25,7 +25,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 f1d4733..f9bde50 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 e292613..4c9a084 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 850c273..95dbc09 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 f8a4528..01127e6 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 f45ebcf..5931028 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 b4e152d..2b3888d 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/nto-procfs.c b/gdb/nto-procfs.c
index cf33a02..5713fac 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 dff87bb..b8aab5e 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 e42a03c..c60a6c6 100644
--- a/gdb/objc-lang.c
+++ b/gdb/objc-lang.c
@@ -33,7 +33,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 a1db8c6..38710b7 100644
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -39,7 +39,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 b8fd9b7..49455ac 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 7f60984..418426e 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 8776022..099ab5b 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 5d344a4..17d9c66 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 114efbc..4dcd8bf 100644
--- a/gdb/p-lang.c
+++ b/gdb/p-lang.c
@@ -21,7 +21,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 9a2a0d8..0f422d4 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 afe1c18..a09ca4e 100644
--- a/gdb/parse.c
+++ b/gdb/parse.c
@@ -33,7 +33,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 793f1c6..0827230 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 ef94a48..d201aa8 100644
--- a/gdb/ppc-linux-nat.c
+++ b/gdb/ppc-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 "observer.h"
#include "frame.h"
#include "inferior.h"
diff --git a/gdb/ppc-sysv-tdep.c b/gdb/ppc-sysv-tdep.c
index a221b70..95590ef 100644
--- a/gdb/ppc-sysv-tdep.c
+++ b/gdb/ppc-sysv-tdep.c
@@ -24,7 +24,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/ppcnbsd-tdep.c b/gdb/ppcnbsd-tdep.c
index d18636f..2a86beb 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 878571a..6cb823d 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 7a669f1..c084b0a 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 82c7cd0..7249bec 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 e84a103..15d8760 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 91bb34d..75a6dd0 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 b5e0705..9ce74d2 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 0f9380b..5020e0a 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 449f682..221450a 100644
--- a/gdb/regcache.c
+++ b/gdb/regcache.c
@@ -26,7 +26,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 c01929b..aeb5659 100644
--- a/gdb/registry.c
+++ b/gdb/registry.c
@@ -21,7 +21,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 0e3d533..7653f38 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 f7addea..ce3bff4 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 ff5806e..689dfa7 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 e2738a8..ddb93e9 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 be77ad1..15f5ba4 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 07c7de4..83a876e 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 b4fc931..fc2d657 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 287e55d..06cdf2e 100644
--- a/gdb/ser-base.c
+++ b/gdb/ser-base.c
@@ -24,7 +24,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 73f69c5..1eb0381 100644
--- a/gdb/ser-go32.c
+++ b/gdb/ser-go32.c
@@ -25,7 +25,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 cf7c8b7..d22d24d 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 4f20cad..ce1f1a5 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 <signal.h>

diff --git a/gdb/ser-tcp.c b/gdb/ser-tcp.c
index d96a8e5..d5499a1 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 4aab7ca..463f1af 100644
--- a/gdb/ser-unix.c
+++ b/gdb/ser-unix.c
@@ -30,7 +30,7 @@
#include <sys/time.h>

#include "gdb_select.h"
-#include "gdb_string.h"
+#include <string.h>
#include "gdbcmd.h"

#ifdef HAVE_TERMIOS
diff --git a/gdb/serial.c b/gdb/serial.c
index 62d7fa9..60682d6 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"

extern void _initialize_serial (void);
diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c
index 8592ed4..d972a56 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 5d649df..c932fec 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 5512b10..ee61dba 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 5a3fae3..1f75d0b 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 b2c1806..fcc9ed3 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 9024be2..502b4d2 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 d259440..8ebf99a 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 e2bb38d..1d476db 100644
--- a/gdb/solib-osf.c
+++ b/gdb/solib-osf.c
@@ -45,7 +45,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 09a4047..5680fce 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-sunos.c b/gdb/solib-sunos.c
index b8b3806..f6013d4 100644
--- a/gdb/solib-sunos.c
+++ b/gdb/solib-sunos.c
@@ -22,7 +22,7 @@

#include <sys/types.h>
#include <signal.h>
-#include "gdb_string.h"
+#include <string.h>
#include <sys/param.h>
#include <fcntl.h>

diff --git a/gdb/solib-target.c b/gdb/solib-target.c
index 0f3f850..2570441 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 db3842a..a3cdc3a 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 19a15e2..0c00517 100644
--- a/gdb/somread.c
+++ b/gdb/somread.c
@@ -28,7 +28,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 7e14fc6..07d8872 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -29,7 +29,7 @@
#include "gdb_assert.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 cf36abd..e1d46e3 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 d2fc4d6..bc4a960 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 6da2297..4519c34 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"

diff --git a/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c
index 28c9ca4..503498e 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 f58e73b..77ae0ed 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 273fb26..44c8024 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 9afbbcf..60940fd 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 1db97ce..bbab38d 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 5ace7c5..54604ee 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 85baf3e..879af56 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 1c288ee..6c51838 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 b01c8f0..0287517 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -49,7 +49,7 @@

#include "gdb_assert.h"
#include <ctype.h>
-#include "gdb_string.h"
+#include <string.h>

#include "psymtab.h"
#include "symfile.h"
diff --git a/gdb/std-regs.c b/gdb/std-regs.c
index c5b97d6..8b3c57e 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 55af541..35d818d 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -59,7 +59,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 e9bdc24..d789311 100644
--- a/gdb/symmisc.c
+++ b/gdb/symmisc.c
@@ -37,7 +37,7 @@
#include "dictionary.h"
#include "typeprint.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 65542a7..9b366eb 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 5015e51..4df22d4 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 7e8eec5..70cc230 100644
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -33,7 +33,7 @@
#include "gdbcmd.h"
#include "regcache.h"
#include "gdb.h"
-#include "gdb_string.h"
+#include <string.h>

#include <ctype.h>
#include <sys/types.h>
diff --git a/gdb/tilegx-linux-nat.c b/gdb/tilegx-linux-nat.c
index 23acba5..e29c7a3 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 627a470..17f49ab 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 99fd5ff..22c2ac0 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -59,7 +59,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 912341a..57e001b 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 24aff98..4f9c672 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 1f74b3f..7fcf3ed 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 ff50841..2ee49de 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 9efba95..b90a623 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 209817f..5b588c8 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 87311d8..9ad3db9 100644
--- a/gdb/tui/tui-out.c
+++ b/gdb/tui/tui-out.c
@@ -25,7 +25,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 62c0fad..324d53d 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 030653c..5631921 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 262a6bf..bdc816c 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 "tui/tui.h"
#include "tui/tui-data.h"
#include "tui/tui-stack.h"
diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
index c12f036..463925e 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 08206f8..4bbdf39 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 53a45a2..a22ff0d 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 cf3ba38..265c5a7 100644
--- a/gdb/typeprint.c
+++ b/gdb/typeprint.c
@@ -32,7 +32,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 68089e6..af5dd11 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 <errno.h>
diff --git a/gdb/ui-out.c b/gdb/ui-out.c
index afd15f9..147b815 100644
--- a/gdb/ui-out.c
+++ b/gdb/ui-out.c
@@ -22,7 +22,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 2541aa7..e0fd25c 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 6026450..8e781fc 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 e374df8..2500770 100644
--- a/gdb/v850-tdep.c
+++ b/gdb/v850-tdep.c
@@ -26,7 +26,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 c457f4a..8ec86b0 100644
--- a/gdb/valarith.c
+++ b/gdb/valarith.c
@@ -25,7 +25,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 502fb0d..22d4602 100644
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -38,7 +38,7 @@
#include "user-regs.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 8fe1224..728847b 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 2a1e1f2..56fb14c 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 6699699..7eb604e 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 550b56b..6e4eb3c 100644
--- a/gdb/vax-tdep.c
+++ b/gdb/vax-tdep.c
@@ -33,7 +33,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 42712ec..324394a 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 55515f3..c0346a8 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 75831d8..24ef78c 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 <sys/param.h>
diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
index e4d0861..6629481 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>

#include <sys/param.h>
#ifdef HAVE_SYS_FILE_H
diff --git a/gdb/xml-support.c b/gdb/xml-support.c
index 884b716..a789f67 100644
--- a/gdb/xml-support.c
+++ b/gdb/xml-support.c
@@ -22,7 +22,7 @@
#include "exceptions.h"
#include "xml-support.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 d5e315c..3591a46 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 4c7f0ab..e287f18 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"
--
1.7.7.6