From: Gary Benson <gbenson@redhat.com>
Date: Tue, 29 Jul 2014 13:47:21 +0000 (+0100)
Subject: Include gdb_assert.h in common-defs.h
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=dccbb60975cdbcd6a906a79d0c4308b040fdac1b;p=binutils-gdb.git

Include gdb_assert.h in common-defs.h

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

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

	* common/common-defs.h: Include gdb_assert.h.
	* aarch64-tdep.c: Do not include gdb_assert.h.
	* addrmap.c: Likewise.
	* aix-thread.c: Likewise.
	* alpha-linux-tdep.c: Likewise.
	* alpha-mdebug-tdep.c: Likewise.
	* alphanbsd-tdep.c: Likewise.
	* amd64-nat.c: Likewise.
	* amd64-tdep.c: Likewise.
	* amd64bsd-nat.c: Likewise.
	* amd64fbsd-nat.c: Likewise.
	* amd64fbsd-tdep.c: Likewise.
	* amd64nbsd-nat.c: Likewise.
	* amd64nbsd-tdep.c: Likewise.
	* amd64obsd-nat.c: Likewise.
	* amd64obsd-tdep.c: Likewise.
	* arch-utils.c: Likewise.
	* arm-tdep.c: Likewise.
	* armbsd-tdep.c: Likewise.
	* auxv.c: Likewise.
	* bcache.c: Likewise.
	* bfin-tdep.c: Likewise.
	* blockframe.c: Likewise.
	* breakpoint.c: Likewise.
	* bsd-kvm.c: Likewise.
	* bsd-uthread.c: Likewise.
	* buildsym.c: Likewise.
	* c-exp.y: Likewise.
	* c-lang.c: Likewise.
	* charset.c: Likewise.
	* cleanups.c: Likewise.
	* cli-out.c: Likewise.
	* cli/cli-decode.c: Likewise.
	* cli/cli-dump.c: Likewise.
	* cli/cli-logging.c: Likewise.
	* cli/cli-script.c: Likewise.
	* cli/cli-utils.c: Likewise.
	* coffread.c: Likewise.
	* common/common-utils.c: Likewise.
	* common/queue.h: Likewise.
	* common/signals.c: Likewise.
	* common/vec.h: Likewise.
	* complaints.c: Likewise.
	* completer.c: Likewise.
	* corelow.c: Likewise.
	* cp-abi.c: Likewise.
	* cp-name-parser.y: Likewise.
	* cp-namespace.c: Likewise.
	* cp-support.c: Likewise.
	* cris-tdep.c: Likewise.
	* dbxread.c: Likewise.
	* dictionary.c: Likewise.
	* doublest.c: Likewise.
	* dsrec.c: Likewise.
	* dummy-frame.c: Likewise.
	* dwarf2-frame-tailcall.c: Likewise.
	* dwarf2-frame.c: Likewise.
	* dwarf2expr.c: Likewise.
	* dwarf2loc.c: Likewise.
	* dwarf2read.c: Likewise.
	* eval.c: Likewise.
	* event-loop.c: Likewise.
	* exceptions.c: Likewise.
	* expprint.c: Likewise.
	* f-valprint.c: Likewise.
	* fbsd-nat.c: Likewise.
	* findvar.c: Likewise.
	* frame-unwind.c: Likewise.
	* frame.c: Likewise.
	* frv-tdep.c: Likewise.
	* gcore.c: Likewise.
	* gdb-dlfcn.c: Likewise.
	* gdb_bfd.c: Likewise.
	* gdbarch.c: Likewise.
	* gdbarch.sh: Likewise.
	* gdbtypes.c: Likewise.
	* gnu-nat.c: Likewise.
	* gnu-v3-abi.c: Likewise.
	* go-lang.c: Likewise.
	* guile/scm-exception.c: Likewise.
	* guile/scm-gsmob.c: Likewise.
	* guile/scm-lazy-string.c: Likewise.
	* guile/scm-math.c: Likewise.
	* guile/scm-pretty-print.c: Likewise.
	* guile/scm-safe-call.c: Likewise.
	* guile/scm-utils.c: Likewise.
	* guile/scm-value.c: Likewise.
	* h8300-tdep.c: Likewise.
	* hppa-hpux-nat.c: Likewise.
	* hppa-tdep.c: Likewise.
	* hppanbsd-tdep.c: Likewise.
	* hppaobsd-tdep.c: Likewise.
	* i386-darwin-nat.c: Likewise.
	* i386-darwin-tdep.c: Likewise.
	* i386-nto-tdep.c: Likewise.
	* i386-tdep.c: Likewise.
	* i386bsd-nat.c: Likewise.
	* i386fbsd-tdep.c: Likewise.
	* i386gnu-nat.c: Likewise.
	* i386nbsd-tdep.c: Likewise.
	* i386obsd-tdep.c: Likewise.
	* i387-tdep.c: Likewise.
	* ia64-libunwind-tdep.c: Likewise.
	* ia64-tdep.c: Likewise.
	* inf-ptrace.c: Likewise.
	* inf-ttrace.c: Likewise.
	* infcall.c: Likewise.
	* infcmd.c: Likewise.
	* infrun.c: Likewise.
	* inline-frame.c: Likewise.
	* interps.c: Likewise.
	* jv-lang.c: Likewise.
	* jv-typeprint.c: Likewise.
	* linux-fork.c: Likewise.
	* linux-nat.c: Likewise.
	* linux-thread-db.c: Likewise.
	* m32c-tdep.c: Likewise.
	* m32r-linux-nat.c: Likewise.
	* m32r-tdep.c: Likewise.
	* m68k-tdep.c: Likewise.
	* m68kbsd-nat.c: Likewise.
	* m68kbsd-tdep.c: Likewise.
	* m88k-tdep.c: Likewise.
	* machoread.c: Likewise.
	* macroexp.c: Likewise.
	* macrotab.c: Likewise.
	* maint.c: Likewise.
	* mdebugread.c: Likewise.
	* memory-map.c: Likewise.
	* mep-tdep.c: Likewise.
	* mi/mi-common.c: Likewise.
	* microblaze-tdep.c: Likewise.
	* mingw-hdep.c: Likewise.
	* mips-linux-nat.c: Likewise.
	* mips-linux-tdep.c: Likewise.
	* mips-tdep.c: Likewise.
	* mips64obsd-tdep.c: Likewise.
	* mipsnbsd-tdep.c: Likewise.
	* mn10300-linux-tdep.c: Likewise.
	* mn10300-tdep.c: Likewise.
	* moxie-tdep.c: Likewise.
	* mt-tdep.c: Likewise.
	* nat/linux-btrace.c: Likewise.
	* nat/linux-osdata.c: Likewise.
	* nat/linux-ptrace.c: Likewise.
	* nat/mips-linux-watch.c: Likewise.
	* nios2-linux-tdep.c: Likewise.
	* nios2-tdep.c: Likewise.
	* objc-lang.c: Likewise.
	* objfiles.c: Likewise.
	* obsd-nat.c: Likewise.
	* opencl-lang.c: Likewise.
	* osabi.c: Likewise.
	* parse.c: Likewise.
	* ppc-linux-nat.c: Likewise.
	* ppc-sysv-tdep.c: Likewise.
	* ppcfbsd-nat.c: Likewise.
	* ppcfbsd-tdep.c: Likewise.
	* ppcnbsd-nat.c: Likewise.
	* ppcnbsd-tdep.c: Likewise.
	* ppcobsd-nat.c: Likewise.
	* ppcobsd-tdep.c: Likewise.
	* printcmd.c: Likewise.
	* procfs.c: Likewise.
	* prologue-value.c: Likewise.
	* psymtab.c: Likewise.
	* python/py-lazy-string.c: Likewise.
	* python/py-value.c: Likewise.
	* regcache.c: Likewise.
	* reggroups.c: Likewise.
	* registry.c: Likewise.
	* remote-sim.c: Likewise.
	* remote.c: Likewise.
	* rs6000-aix-tdep.c: Likewise.
	* rs6000-tdep.c: Likewise.
	* s390-linux-tdep.c: Likewise.
	* score-tdep.c: Likewise.
	* ser-base.c: Likewise.
	* ser-mingw.c: Likewise.
	* sh-tdep.c: Likewise.
	* sh64-tdep.c: Likewise.
	* solib-darwin.c: Likewise.
	* solib-spu.c: Likewise.
	* solib-svr4.c: Likewise.
	* source.c: Likewise.
	* sparc-nat.c: Likewise.
	* sparc-sol2-tdep.c: Likewise.
	* sparc-tdep.c: Likewise.
	* sparc64-sol2-tdep.c: Likewise.
	* sparc64-tdep.c: Likewise.
	* sparc64fbsd-tdep.c: Likewise.
	* sparc64nbsd-tdep.c: Likewise.
	* sparc64obsd-tdep.c: Likewise.
	* sparcnbsd-tdep.c: Likewise.
	* sparcobsd-tdep.c: Likewise.
	* spu-multiarch.c: Likewise.
	* spu-tdep.c: Likewise.
	* stabsread.c: Likewise.
	* stack.c: Likewise.
	* symfile.c: Likewise.
	* symtab.c: Likewise.
	* target-descriptions.c: Likewise.
	* target-memory.c: Likewise.
	* target.c: Likewise.
	* tic6x-linux-tdep.c: Likewise.
	* tic6x-tdep.c: Likewise.
	* tilegx-linux-nat.c: Likewise.
	* tilegx-tdep.c: Likewise.
	* top.c: Likewise.
	* tramp-frame.c: Likewise.
	* tui/tui-out.c: Likewise.
	* tui/tui-winsource.c: Likewise.
	* ui-out.c: Likewise.
	* user-regs.c: Likewise.
	* utils.c: Likewise.
	* v850-tdep.c: Likewise.
	* valops.c: Likewise.
	* value.c: Likewise.
	* varobj.c: Likewise.
	* vax-nat.c: Likewise.
	* xml-syscall.c: Likewise.
	* xml-tdesc.c: Likewise.
	* xstormy16-tdep.c: Likewise.
	* xtensa-linux-nat.c: Likewise.
	* xtensa-tdep.c: Likewise.

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

	* server.h: Do not include gdb_assert.h.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d5068b2fad5..c256da9cf39 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,231 @@
+2014-08-07  Gary Benson  <gbenson@redhat.com>
+
+	* common/common-defs.h: Include gdb_assert.h.
+	* aarch64-tdep.c: Do not include gdb_assert.h.
+	* addrmap.c: Likewise.
+	* aix-thread.c: Likewise.
+	* alpha-linux-tdep.c: Likewise.
+	* alpha-mdebug-tdep.c: Likewise.
+	* alphanbsd-tdep.c: Likewise.
+	* amd64-nat.c: Likewise.
+	* amd64-tdep.c: Likewise.
+	* amd64bsd-nat.c: Likewise.
+	* amd64fbsd-nat.c: Likewise.
+	* amd64fbsd-tdep.c: Likewise.
+	* amd64nbsd-nat.c: Likewise.
+	* amd64nbsd-tdep.c: Likewise.
+	* amd64obsd-nat.c: Likewise.
+	* amd64obsd-tdep.c: Likewise.
+	* arch-utils.c: Likewise.
+	* arm-tdep.c: Likewise.
+	* armbsd-tdep.c: Likewise.
+	* auxv.c: Likewise.
+	* bcache.c: Likewise.
+	* bfin-tdep.c: Likewise.
+	* blockframe.c: Likewise.
+	* breakpoint.c: Likewise.
+	* bsd-kvm.c: Likewise.
+	* bsd-uthread.c: Likewise.
+	* buildsym.c: Likewise.
+	* c-exp.y: Likewise.
+	* c-lang.c: Likewise.
+	* charset.c: Likewise.
+	* cleanups.c: Likewise.
+	* cli-out.c: Likewise.
+	* cli/cli-decode.c: Likewise.
+	* cli/cli-dump.c: Likewise.
+	* cli/cli-logging.c: Likewise.
+	* cli/cli-script.c: Likewise.
+	* cli/cli-utils.c: Likewise.
+	* coffread.c: Likewise.
+	* common/common-utils.c: Likewise.
+	* common/queue.h: Likewise.
+	* common/signals.c: Likewise.
+	* common/vec.h: Likewise.
+	* complaints.c: Likewise.
+	* completer.c: Likewise.
+	* corelow.c: Likewise.
+	* cp-abi.c: Likewise.
+	* cp-name-parser.y: Likewise.
+	* cp-namespace.c: Likewise.
+	* cp-support.c: Likewise.
+	* cris-tdep.c: Likewise.
+	* dbxread.c: Likewise.
+	* dictionary.c: Likewise.
+	* doublest.c: Likewise.
+	* dsrec.c: Likewise.
+	* dummy-frame.c: Likewise.
+	* dwarf2-frame-tailcall.c: Likewise.
+	* dwarf2-frame.c: Likewise.
+	* dwarf2expr.c: Likewise.
+	* dwarf2loc.c: Likewise.
+	* dwarf2read.c: Likewise.
+	* eval.c: Likewise.
+	* event-loop.c: Likewise.
+	* exceptions.c: Likewise.
+	* expprint.c: Likewise.
+	* f-valprint.c: Likewise.
+	* fbsd-nat.c: Likewise.
+	* findvar.c: Likewise.
+	* frame-unwind.c: Likewise.
+	* frame.c: Likewise.
+	* frv-tdep.c: Likewise.
+	* gcore.c: Likewise.
+	* gdb-dlfcn.c: Likewise.
+	* gdb_bfd.c: Likewise.
+	* gdbarch.c: Likewise.
+	* gdbarch.sh: Likewise.
+	* gdbtypes.c: Likewise.
+	* gnu-nat.c: Likewise.
+	* gnu-v3-abi.c: Likewise.
+	* go-lang.c: Likewise.
+	* guile/scm-exception.c: Likewise.
+	* guile/scm-gsmob.c: Likewise.
+	* guile/scm-lazy-string.c: Likewise.
+	* guile/scm-math.c: Likewise.
+	* guile/scm-pretty-print.c: Likewise.
+	* guile/scm-safe-call.c: Likewise.
+	* guile/scm-utils.c: Likewise.
+	* guile/scm-value.c: Likewise.
+	* h8300-tdep.c: Likewise.
+	* hppa-hpux-nat.c: Likewise.
+	* hppa-tdep.c: Likewise.
+	* hppanbsd-tdep.c: Likewise.
+	* hppaobsd-tdep.c: Likewise.
+	* i386-darwin-nat.c: Likewise.
+	* i386-darwin-tdep.c: Likewise.
+	* i386-nto-tdep.c: Likewise.
+	* i386-tdep.c: Likewise.
+	* i386bsd-nat.c: Likewise.
+	* i386fbsd-tdep.c: Likewise.
+	* i386gnu-nat.c: Likewise.
+	* i386nbsd-tdep.c: Likewise.
+	* i386obsd-tdep.c: Likewise.
+	* i387-tdep.c: Likewise.
+	* ia64-libunwind-tdep.c: Likewise.
+	* ia64-tdep.c: Likewise.
+	* inf-ptrace.c: Likewise.
+	* inf-ttrace.c: Likewise.
+	* infcall.c: Likewise.
+	* infcmd.c: Likewise.
+	* infrun.c: Likewise.
+	* inline-frame.c: Likewise.
+	* interps.c: Likewise.
+	* jv-lang.c: Likewise.
+	* jv-typeprint.c: Likewise.
+	* linux-fork.c: Likewise.
+	* linux-nat.c: Likewise.
+	* linux-thread-db.c: Likewise.
+	* m32c-tdep.c: Likewise.
+	* m32r-linux-nat.c: Likewise.
+	* m32r-tdep.c: Likewise.
+	* m68k-tdep.c: Likewise.
+	* m68kbsd-nat.c: Likewise.
+	* m68kbsd-tdep.c: Likewise.
+	* m88k-tdep.c: Likewise.
+	* machoread.c: Likewise.
+	* macroexp.c: Likewise.
+	* macrotab.c: Likewise.
+	* maint.c: Likewise.
+	* mdebugread.c: Likewise.
+	* memory-map.c: Likewise.
+	* mep-tdep.c: Likewise.
+	* mi/mi-common.c: Likewise.
+	* microblaze-tdep.c: Likewise.
+	* mingw-hdep.c: Likewise.
+	* mips-linux-nat.c: Likewise.
+	* mips-linux-tdep.c: Likewise.
+	* mips-tdep.c: Likewise.
+	* mips64obsd-tdep.c: Likewise.
+	* mipsnbsd-tdep.c: Likewise.
+	* mn10300-linux-tdep.c: Likewise.
+	* mn10300-tdep.c: Likewise.
+	* moxie-tdep.c: Likewise.
+	* mt-tdep.c: Likewise.
+	* nat/linux-btrace.c: Likewise.
+	* nat/linux-osdata.c: Likewise.
+	* nat/linux-ptrace.c: Likewise.
+	* nat/mips-linux-watch.c: Likewise.
+	* nios2-linux-tdep.c: Likewise.
+	* nios2-tdep.c: Likewise.
+	* objc-lang.c: Likewise.
+	* objfiles.c: Likewise.
+	* obsd-nat.c: Likewise.
+	* opencl-lang.c: Likewise.
+	* osabi.c: Likewise.
+	* parse.c: Likewise.
+	* ppc-linux-nat.c: Likewise.
+	* ppc-sysv-tdep.c: Likewise.
+	* ppcfbsd-nat.c: Likewise.
+	* ppcfbsd-tdep.c: Likewise.
+	* ppcnbsd-nat.c: Likewise.
+	* ppcnbsd-tdep.c: Likewise.
+	* ppcobsd-nat.c: Likewise.
+	* ppcobsd-tdep.c: Likewise.
+	* printcmd.c: Likewise.
+	* procfs.c: Likewise.
+	* prologue-value.c: Likewise.
+	* psymtab.c: Likewise.
+	* python/py-lazy-string.c: Likewise.
+	* python/py-value.c: Likewise.
+	* regcache.c: Likewise.
+	* reggroups.c: Likewise.
+	* registry.c: Likewise.
+	* remote-sim.c: Likewise.
+	* remote.c: Likewise.
+	* rs6000-aix-tdep.c: Likewise.
+	* rs6000-tdep.c: Likewise.
+	* s390-linux-tdep.c: Likewise.
+	* score-tdep.c: Likewise.
+	* ser-base.c: Likewise.
+	* ser-mingw.c: Likewise.
+	* sh-tdep.c: Likewise.
+	* sh64-tdep.c: Likewise.
+	* solib-darwin.c: Likewise.
+	* solib-spu.c: Likewise.
+	* solib-svr4.c: Likewise.
+	* source.c: Likewise.
+	* sparc-nat.c: Likewise.
+	* sparc-sol2-tdep.c: Likewise.
+	* sparc-tdep.c: Likewise.
+	* sparc64-sol2-tdep.c: Likewise.
+	* sparc64-tdep.c: Likewise.
+	* sparc64fbsd-tdep.c: Likewise.
+	* sparc64nbsd-tdep.c: Likewise.
+	* sparc64obsd-tdep.c: Likewise.
+	* sparcnbsd-tdep.c: Likewise.
+	* sparcobsd-tdep.c: Likewise.
+	* spu-multiarch.c: Likewise.
+	* spu-tdep.c: Likewise.
+	* stabsread.c: Likewise.
+	* stack.c: Likewise.
+	* symfile.c: Likewise.
+	* symtab.c: Likewise.
+	* target-descriptions.c: Likewise.
+	* target-memory.c: Likewise.
+	* target.c: Likewise.
+	* tic6x-linux-tdep.c: Likewise.
+	* tic6x-tdep.c: Likewise.
+	* tilegx-linux-nat.c: Likewise.
+	* tilegx-tdep.c: Likewise.
+	* top.c: Likewise.
+	* tramp-frame.c: Likewise.
+	* tui/tui-out.c: Likewise.
+	* tui/tui-winsource.c: Likewise.
+	* ui-out.c: Likewise.
+	* user-regs.c: Likewise.
+	* utils.c: Likewise.
+	* v850-tdep.c: Likewise.
+	* valops.c: Likewise.
+	* value.c: Likewise.
+	* varobj.c: Likewise.
+	* vax-nat.c: Likewise.
+	* xml-syscall.c: Likewise.
+	* xml-tdesc.c: Likewise.
+	* xstormy16-tdep.c: Likewise.
+	* xtensa-linux-nat.c: Likewise.
+	* xtensa-tdep.c: Likewise.
+
 2014-08-07  Gary Benson  <gbenson@redhat.com>
 
 	* common/common-defs.h: Include common-utils.h.
diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c
index 4abe36eac76..445d7b9b2f7 100644
--- a/gdb/aarch64-tdep.c
+++ b/gdb/aarch64-tdep.c
@@ -49,7 +49,6 @@
 #include "elf-bfd.h"
 #include "elf/aarch64.h"
 
-#include "gdb_assert.h"
 #include "vec.h"
 
 #include "features/aarch64.c"
diff --git a/gdb/addrmap.c b/gdb/addrmap.c
index c942c7bd92a..a5db199a556 100644
--- a/gdb/addrmap.c
+++ b/gdb/addrmap.c
@@ -21,8 +21,6 @@
 #include "splay-tree.h"
 #include "gdb_obstack.h"
 #include "addrmap.h"
-#include "gdb_assert.h"
-
 
 
 /* The "abstract class".  */
diff --git a/gdb/aix-thread.c b/gdb/aix-thread.c
index 3865cba1c7e..1eb885bed87 100644
--- a/gdb/aix-thread.c
+++ b/gdb/aix-thread.c
@@ -40,7 +40,6 @@
      */
 
 #include "defs.h"
-#include "gdb_assert.h"
 #include "gdbthread.h"
 #include "target.h"
 #include "inferior.h"
diff --git a/gdb/alpha-linux-tdep.c b/gdb/alpha-linux-tdep.c
index 52f19d078cd..3d13a75d1cf 100644
--- a/gdb/alpha-linux-tdep.c
+++ b/gdb/alpha-linux-tdep.c
@@ -18,7 +18,6 @@
 
 #include "defs.h"
 #include "frame.h"
-#include "gdb_assert.h"
 #include <string.h>
 #include "osabi.h"
 #include "solib-svr4.h"
diff --git a/gdb/alpha-mdebug-tdep.c b/gdb/alpha-mdebug-tdep.c
index 8c29425ec49..4cf0eb93c8a 100644
--- a/gdb/alpha-mdebug-tdep.c
+++ b/gdb/alpha-mdebug-tdep.c
@@ -23,7 +23,6 @@
 #include "symtab.h"
 #include "gdbcore.h"
 #include "block.h"
-#include "gdb_assert.h"
 #include <string.h>
 #include "trad-frame.h"
 
diff --git a/gdb/alphanbsd-tdep.c b/gdb/alphanbsd-tdep.c
index 58d9f321367..8e237c0249f 100644
--- a/gdb/alphanbsd-tdep.c
+++ b/gdb/alphanbsd-tdep.c
@@ -27,7 +27,6 @@
 #include "regset.h"
 #include "value.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 
 #include "alpha-tdep.h"
diff --git a/gdb/amd64-nat.c b/gdb/amd64-nat.c
index 895f861fd9a..943f0ec8cc2 100644
--- a/gdb/amd64-nat.c
+++ b/gdb/amd64-nat.c
@@ -21,7 +21,6 @@
 #include "gdbarch.h"
 #include "regcache.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 
 #include "i386-tdep.h"
diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
index 45ed97b744c..173451f8e4e 100644
--- a/gdb/amd64-tdep.c
+++ b/gdb/amd64-tdep.c
@@ -37,7 +37,6 @@
 #include "regset.h"
 #include "symfile.h"
 #include "disasm.h"
-#include "gdb_assert.h"
 #include "exceptions.h"
 #include "amd64-tdep.h"
 #include "i387-tdep.h"
diff --git a/gdb/amd64bsd-nat.c b/gdb/amd64bsd-nat.c
index c373a5604b2..f994ec4e95f 100644
--- a/gdb/amd64bsd-nat.c
+++ b/gdb/amd64bsd-nat.c
@@ -24,7 +24,6 @@
 
 /* We include <signal.h> to make sure `struct fxsave64' is defined on
    NetBSD, since NetBSD's <machine/reg.h> needs it.  */
-#include "gdb_assert.h"
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/ptrace.h>
diff --git a/gdb/amd64fbsd-nat.c b/gdb/amd64fbsd-nat.c
index 3650bb59649..fd189ec8241 100644
--- a/gdb/amd64fbsd-nat.c
+++ b/gdb/amd64fbsd-nat.c
@@ -22,7 +22,6 @@
 #include "regcache.h"
 #include "target.h"
 
-#include "gdb_assert.h"
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/ptrace.h>
diff --git a/gdb/amd64fbsd-tdep.c b/gdb/amd64fbsd-tdep.c
index 627ebafc8d3..6ecf20bbee4 100644
--- a/gdb/amd64fbsd-tdep.c
+++ b/gdb/amd64fbsd-tdep.c
@@ -24,7 +24,6 @@
 #include "regcache.h"
 #include "osabi.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 
 #include "amd64-tdep.h"
diff --git a/gdb/amd64nbsd-nat.c b/gdb/amd64nbsd-nat.c
index a31ee1da0cd..8bce7ee6b7c 100644
--- a/gdb/amd64nbsd-nat.c
+++ b/gdb/amd64nbsd-nat.c
@@ -20,8 +20,6 @@
 #include "defs.h"
 #include "target.h"
 
-#include "gdb_assert.h"
-
 #include "nbsd-nat.h"
 #include "amd64-tdep.h"
 #include "amd64-nat.h"
diff --git a/gdb/amd64nbsd-tdep.c b/gdb/amd64nbsd-tdep.c
index ba67602e9a2..b48dcc8c99c 100644
--- a/gdb/amd64nbsd-tdep.c
+++ b/gdb/amd64nbsd-tdep.c
@@ -24,8 +24,6 @@
 #include "osabi.h"
 #include "symtab.h"
 
-#include "gdb_assert.h"
-
 #include "amd64-tdep.h"
 #include "nbsd-tdep.h"
 #include "solib-svr4.h"
diff --git a/gdb/amd64obsd-nat.c b/gdb/amd64obsd-nat.c
index 01253cbe172..6c43c629a88 100644
--- a/gdb/amd64obsd-nat.c
+++ b/gdb/amd64obsd-nat.c
@@ -22,8 +22,6 @@
 #include "regcache.h"
 #include "target.h"
 
-#include "gdb_assert.h"
-
 #include "amd64-tdep.h"
 #include "amd64-nat.h"
 #include "obsd-nat.h"
diff --git a/gdb/amd64obsd-tdep.c b/gdb/amd64obsd-tdep.c
index 5a5e209ac92..4cb981f2f92 100644
--- a/gdb/amd64obsd-tdep.c
+++ b/gdb/amd64obsd-tdep.c
@@ -29,7 +29,6 @@
 #include "target.h"
 #include "trad-frame.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 
 #include "obsd-tdep.h"
diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index d8da7439ca1..177203303a4 100644
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -26,7 +26,6 @@
 #include "infrun.h"
 #include <string.h>
 #include "regcache.h"
-#include "gdb_assert.h"
 #include "sim-regno.h"
 #include "gdbcore.h"
 #include "osabi.h"
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index cb0030c4b10..f9b91750f39 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -53,7 +53,6 @@
 #include "coff/internal.h"
 #include "elf/arm.h"
 
-#include "gdb_assert.h"
 #include "vec.h"
 
 #include "record.h"
diff --git a/gdb/armbsd-tdep.c b/gdb/armbsd-tdep.c
index 036db6c91ff..b0c952b0e0c 100644
--- a/gdb/armbsd-tdep.c
+++ b/gdb/armbsd-tdep.c
@@ -22,7 +22,6 @@
 #include "regcache.h"
 #include "regset.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 
 #include "arm-tdep.h"
diff --git a/gdb/auxv.c b/gdb/auxv.c
index 0f322e6d76e..8710d2f0a10 100644
--- a/gdb/auxv.c
+++ b/gdb/auxv.c
@@ -23,7 +23,6 @@
 #include "command.h"
 #include "inferior.h"
 #include "valprint.h"
-#include "gdb_assert.h"
 #include "gdbcore.h"
 #include "observer.h"
 #include "filestuff.h"
diff --git a/gdb/bcache.c b/gdb/bcache.c
index 44530bcf7e5..2adfcd48d5e 100644
--- a/gdb/bcache.c
+++ b/gdb/bcache.c
@@ -23,7 +23,6 @@
 #include "gdb_obstack.h"
 #include "bcache.h"
 #include <string.h>		/* For memcpy declaration */
-#include "gdb_assert.h"
 
 /* The type used to hold a single bcache string.  The user data is
    stored in d.data.  Since it can be any type, it needs to have the
diff --git a/gdb/bfin-tdep.c b/gdb/bfin-tdep.c
index 3fa81732c66..2e5dbde961f 100644
--- a/gdb/bfin-tdep.c
+++ b/gdb/bfin-tdep.c
@@ -30,7 +30,6 @@
 #include "frame-base.h"
 #include "trad-frame.h"
 #include "dis-asm.h"
-#include "gdb_assert.h"
 #include "sim-regno.h"
 #include "gdb/sim-bfin.h"
 #include "dwarf2-frame.h"
diff --git a/gdb/blockframe.c b/gdb/blockframe.c
index 856b9efa1a6..5de116e697a 100644
--- a/gdb/blockframe.c
+++ b/gdb/blockframe.c
@@ -29,7 +29,6 @@
 #include "inferior.h"
 #include "annotate.h"
 #include "regcache.h"
-#include "gdb_assert.h"
 #include "dummy-frame.h"
 #include "command.h"
 #include "gdbcmd.h"
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 8cd76605baf..0007273a525 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -48,7 +48,6 @@
 #include "gdb.h"
 #include "ui-out.h"
 #include "cli/cli-script.h"
-#include "gdb_assert.h"
 #include "block.h"
 #include "solib.h"
 #include "solist.h"
diff --git a/gdb/bsd-kvm.c b/gdb/bsd-kvm.c
index 67050358ecd..30434a9e11f 100644
--- a/gdb/bsd-kvm.c
+++ b/gdb/bsd-kvm.c
@@ -27,7 +27,6 @@
 #include "gdbcore.h"		/* for get_exec_file */
 #include "gdbthread.h"
 
-#include "gdb_assert.h"
 #include <fcntl.h>
 #include <kvm.h>
 #ifdef HAVE_NLIST_H
diff --git a/gdb/bsd-uthread.c b/gdb/bsd-uthread.c
index c73932a8a49..817a14b1aa6 100644
--- a/gdb/bsd-uthread.c
+++ b/gdb/bsd-uthread.c
@@ -29,7 +29,6 @@
 #include "symfile.h"
 #include "target.h"
 
-#include "gdb_assert.h"
 #include "gdb_obstack.h"
 
 #include "bsd-uthread.h"
diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index c49ed685c5f..8fc7b75c969 100644
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -30,7 +30,6 @@
 #include "symfile.h"
 #include "objfiles.h"
 #include "gdbtypes.h"
-#include "gdb_assert.h"
 #include "complaints.h"
 #include <string.h>
 #include "expression.h"		/* For "enum exp_opcode" used by...  */
diff --git a/gdb/c-exp.y b/gdb/c-exp.y
index 0708db39273..714e02ef918 100644
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -50,7 +50,6 @@
 #include "block.h"
 #include "cp-support.h"
 #include "dfp.h"
-#include "gdb_assert.h"
 #include "macroscope.h"
 #include "objc-lang.h"
 #include "typeprint.h"
diff --git a/gdb/c-lang.c b/gdb/c-lang.c
index 765a6b0c735..e647ff6f47a 100644
--- a/gdb/c-lang.c
+++ b/gdb/c-lang.c
@@ -27,7 +27,6 @@
 #include "c-lang.h"
 #include "valprint.h"
 #include "macroscope.h"
-#include "gdb_assert.h"
 #include "charset.h"
 #include <string.h>
 #include "demangle.h"
diff --git a/gdb/charset.c b/gdb/charset.c
index 9e39e21ef6d..0ce86cf32ca 100644
--- a/gdb/charset.c
+++ b/gdb/charset.c
@@ -20,7 +20,6 @@
 #include "defs.h"
 #include "charset.h"
 #include "gdbcmd.h"
-#include "gdb_assert.h"
 #include "gdb_obstack.h"
 #include "gdb_wait.h"
 #include "charset-list.h"
diff --git a/gdb/cleanups.c b/gdb/cleanups.c
index e5291ab82e5..ddf8e5bc1f2 100644
--- a/gdb/cleanups.c
+++ b/gdb/cleanups.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_assert.h"
 
 /* The cleanup list records things that have to be undone
    if an error happens (descriptors to be closed, memory to be freed, etc.)
diff --git a/gdb/cli-out.c b/gdb/cli-out.c
index eedbd2c24ff..54353851521 100644
--- a/gdb/cli-out.c
+++ b/gdb/cli-out.c
@@ -24,7 +24,6 @@
 #include "ui-out.h"
 #include "cli-out.h"
 #include <string.h>
-#include "gdb_assert.h"
 #include "vec.h"
 
 typedef struct cli_ui_out_data cli_out_data;
diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c
index 819aea80b47..43e1babe2d2 100644
--- a/gdb/cli/cli-decode.c
+++ b/gdb/cli/cli-decode.c
@@ -24,7 +24,6 @@
 #include "ui-out.h"
 #include "cli/cli-cmds.h"
 #include "cli/cli-decode.h"
-#include "gdb_assert.h"
 
 /* Prototypes for local functions.  */
 
diff --git a/gdb/cli/cli-dump.c b/gdb/cli/cli-dump.c
index 7929dc1fb49..b643be43d71 100644
--- a/gdb/cli/cli-dump.c
+++ b/gdb/cli/cli-dump.c
@@ -25,7 +25,6 @@
 #include "cli/cli-cmds.h"
 #include "value.h"
 #include "completer.h"
-#include "gdb_assert.h"
 #include <ctype.h>
 #include "target.h"
 #include "readline/readline.h"
diff --git a/gdb/cli/cli-logging.c b/gdb/cli/cli-logging.c
index aae003953b4..3b1447ae8e4 100644
--- a/gdb/cli/cli-logging.c
+++ b/gdb/cli/cli-logging.c
@@ -21,7 +21,6 @@
 #include "gdbcmd.h"
 #include "ui-out.h"
 #include "interps.h"
-#include "gdb_assert.h"
 
 #include <string.h>
 
diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c
index fbcc2dda701..d3ca9ece004 100644
--- a/gdb/cli/cli-script.c
+++ b/gdb/cli/cli-script.c
@@ -30,7 +30,6 @@
 #include "cli/cli-cmds.h"
 #include "cli/cli-decode.h"
 #include "cli/cli-script.h"
-#include "gdb_assert.h"
 
 #include "extension.h"
 #include "interps.h"
diff --git a/gdb/cli/cli-utils.c b/gdb/cli/cli-utils.c
index 819c94cf8ff..29ab085700a 100644
--- a/gdb/cli/cli-utils.c
+++ b/gdb/cli/cli-utils.c
@@ -21,7 +21,6 @@
 #include "cli/cli-utils.h"
 #include <string.h>
 #include "value.h"
-#include "gdb_assert.h"
 
 #include <ctype.h>
 
diff --git a/gdb/coffread.c b/gdb/coffread.c
index c650d61e4df..9cbe173a282 100644
--- a/gdb/coffread.c
+++ b/gdb/coffread.c
@@ -37,7 +37,6 @@
 #include "stabsread.h"
 #include "complaints.h"
 #include "target.h"
-#include "gdb_assert.h"
 #include "block.h"
 #include "dictionary.h"
 
diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h
index 6a031ecee4a..75a587adf33 100644
--- a/gdb/common/common-defs.h
+++ b/gdb/common/common-defs.h
@@ -38,5 +38,6 @@
 #include "gdb_locale.h"
 #include "ptid.h"
 #include "common-utils.h"
+#include "gdb_assert.h"
 
 #endif /* COMMON_DEFS_H */
diff --git a/gdb/common/common-utils.c b/gdb/common/common-utils.c
index ab05c9f3779..3fe9bf952c0 100644
--- a/gdb/common/common-utils.c
+++ b/gdb/common/common-utils.c
@@ -23,7 +23,6 @@
 #include "defs.h"
 #endif
 
-#include "gdb_assert.h"
 #include <string.h>
 
 /* The xmalloc() (libiberty.h) family of memory management routines.
diff --git a/gdb/common/queue.h b/gdb/common/queue.h
index 34e4db38666..7353b27240e 100644
--- a/gdb/common/queue.h
+++ b/gdb/common/queue.h
@@ -20,8 +20,6 @@
 #ifndef QUEUE_H
 #define QUEUE_H
 
-#include "gdb_assert.h"
-
 /* These macros implement functions and structs for a general queue.
    Macro 'DEFINE_QUEUE_P(TYPEDEF)' is to define the new queue type for
    TYPEDEF', and macro 'DECLARE_QUEUE_P' is to declare external queue
diff --git a/gdb/common/signals.c b/gdb/common/signals.c
index 3c9cd41c571..d9cacee90b6 100644
--- a/gdb/common/signals.c
+++ b/gdb/common/signals.c
@@ -29,7 +29,6 @@
 #endif
 
 #include "gdb_signals.h"
-#include "gdb_assert.h"
 
 struct gdbarch;
 
diff --git a/gdb/common/vec.h b/gdb/common/vec.h
index 2a39eff4e53..82d4b0d8729 100644
--- a/gdb/common/vec.h
+++ b/gdb/common/vec.h
@@ -21,7 +21,6 @@
 #define GDB_VEC_H
 
 #include <string.h>
-#include "gdb_assert.h"
 
 /* The macros here implement a set of templated vector types and
    associated interfaces.  These templates are implemented with
diff --git a/gdb/complaints.c b/gdb/complaints.c
index 92a3ef6bdef..704c6813098 100644
--- a/gdb/complaints.c
+++ b/gdb/complaints.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include "complaints.h"
-#include "gdb_assert.h"
 #include "command.h"
 #include "gdbcmd.h"
 
diff --git a/gdb/completer.c b/gdb/completer.c
index 64b146bd0f2..44920dd453d 100644
--- a/gdb/completer.c
+++ b/gdb/completer.c
@@ -22,7 +22,6 @@
 #include "expression.h"
 #include "filenames.h"		/* For DOSish file names.  */
 #include "language.h"
-#include "gdb_assert.h"
 #include "exceptions.h"
 #include "gdb_signals.h"
 
diff --git a/gdb/corelow.c b/gdb/corelow.c
index ad780edf99e..699fd2726b8 100644
--- a/gdb/corelow.c
+++ b/gdb/corelow.c
@@ -40,7 +40,6 @@
 #include "symfile.h"
 #include "exec.h"
 #include "readline/readline.h"
-#include "gdb_assert.h"
 #include "exceptions.h"
 #include "solib.h"
 #include "filenames.h"
diff --git a/gdb/cp-abi.c b/gdb/cp-abi.c
index 0bde1c539b9..c1a0d291a9f 100644
--- a/gdb/cp-abi.c
+++ b/gdb/cp-abi.c
@@ -24,7 +24,6 @@
 #include "exceptions.h"
 #include "gdbcmd.h"
 #include "ui-out.h"
-#include "gdb_assert.h"
 #include <string.h>
 
 static struct cp_abi_ops *find_cp_abi (const char *short_name);
diff --git a/gdb/cp-name-parser.y b/gdb/cp-name-parser.y
index 0caadfa85e0..a0b7f8becdb 100644
--- a/gdb/cp-name-parser.y
+++ b/gdb/cp-name-parser.y
@@ -37,7 +37,6 @@
 #include "safe-ctype.h"
 #include "demangle.h"
 #include "cp-support.h"
-#include "gdb_assert.h"
 
 /* Bison does not make it easy to create a parser without global
    state, unfortunately.  Here are all the global variables used
diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c
index cd573992291..c6e1102e0bd 100644
--- a/gdb/cp-namespace.c
+++ b/gdb/cp-namespace.c
@@ -23,7 +23,6 @@
 #include "gdb_obstack.h"
 #include "symtab.h"
 #include "symfile.h"
-#include "gdb_assert.h"
 #include "block.h"
 #include "objfiles.h"
 #include "gdbtypes.h"
diff --git a/gdb/cp-support.c b/gdb/cp-support.c
index 5464117e051..f1dfcfacd46 100644
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -22,7 +22,6 @@
 #include "cp-support.h"
 #include <string.h>
 #include "demangle.h"
-#include "gdb_assert.h"
 #include "gdbcmd.h"
 #include "dictionary.h"
 #include "objfiles.h"
diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c
index 6861e2ba65b..909a227d6c7 100644
--- a/gdb/cris-tdep.c
+++ b/gdb/cris-tdep.c
@@ -37,7 +37,6 @@
 #include "osabi.h"
 #include "arch-utils.h"
 #include "regcache.h"
-#include "gdb_assert.h"
 
 #include "objfiles.h"
 
diff --git a/gdb/dbxread.c b/gdb/dbxread.c
index 5171f50dd01..1807094494e 100644
--- a/gdb/dbxread.c
+++ b/gdb/dbxread.c
@@ -57,8 +57,6 @@
 #include "psympriv.h"
 #include "block.h"
 
-#include "gdb_assert.h"
-
 #include "aout/aout64.h"
 #include "aout/stab_gnu.h"	/* We always use GNU stabs, not
 				   native, now.  */
diff --git a/gdb/dictionary.c b/gdb/dictionary.c
index a24789abb4b..055c87e5cc7 100644
--- a/gdb/dictionary.c
+++ b/gdb/dictionary.c
@@ -25,7 +25,6 @@
 #include "gdb_obstack.h"
 #include "symtab.h"
 #include "buildsym.h"
-#include "gdb_assert.h"
 #include "dictionary.h"
 
 /* This file implements dictionaries, which are tables that associate
diff --git a/gdb/doublest.c b/gdb/doublest.c
index a6c11d83b49..bd4ca6eb024 100644
--- a/gdb/doublest.c
+++ b/gdb/doublest.c
@@ -26,7 +26,6 @@
 #include "defs.h"
 #include "doublest.h"
 #include "floatformat.h"
-#include "gdb_assert.h"
 #include <string.h>
 #include "gdbtypes.h"
 #include <math.h>		/* ldexp */
diff --git a/gdb/dsrec.c b/gdb/dsrec.c
index b782186fcc8..c9f86366c99 100644
--- a/gdb/dsrec.c
+++ b/gdb/dsrec.c
@@ -21,7 +21,6 @@
 #include "srec.h"
 #include <sys/time.h>
 #include <time.h>
-#include "gdb_assert.h"
 #include <string.h>
 #include "gdb_bfd.h"
 
diff --git a/gdb/dummy-frame.c b/gdb/dummy-frame.c
index 35d78e96216..d547a635d28 100644
--- a/gdb/dummy-frame.c
+++ b/gdb/dummy-frame.c
@@ -23,7 +23,6 @@
 #include "regcache.h"
 #include "frame.h"
 #include "inferior.h"
-#include "gdb_assert.h"
 #include "frame-unwind.h"
 #include "command.h"
 #include "gdbcmd.h"
diff --git a/gdb/dwarf2-frame-tailcall.c b/gdb/dwarf2-frame-tailcall.c
index dd69d94a2a1..bce4c60a667 100644
--- a/gdb/dwarf2-frame-tailcall.c
+++ b/gdb/dwarf2-frame-tailcall.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_assert.h"
 #include "frame.h"
 #include "dwarf2-frame-tailcall.h"
 #include "dwarf2loc.h"
diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c
index 3e3ba23d262..01e06702e4d 100644
--- a/gdb/dwarf2-frame.c
+++ b/gdb/dwarf2-frame.c
@@ -33,7 +33,6 @@
 #include "value.h"
 #include "record.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 
 #include "complaints.h"
diff --git a/gdb/dwarf2expr.c b/gdb/dwarf2expr.c
index 36c9f662976..1d39923cdcf 100644
--- a/gdb/dwarf2expr.c
+++ b/gdb/dwarf2expr.c
@@ -26,7 +26,6 @@
 #include "gdbcore.h"
 #include "dwarf2.h"
 #include "dwarf2expr.h"
-#include "gdb_assert.h"
 
 /* Local prototypes.  */
 
diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
index b1c7ee1a6dc..8f050b8ffbd 100644
--- a/gdb/dwarf2loc.c
+++ b/gdb/dwarf2loc.c
@@ -40,7 +40,6 @@
 #include "dwarf2-frame.h"
 
 #include <string.h>
-#include "gdb_assert.h"
 
 extern int dwarf2_always_disassemble;
 
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 837b1c1a9fc..d08f7887ccd 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -73,7 +73,6 @@
 
 #include <fcntl.h>
 #include <string.h>
-#include "gdb_assert.h"
 #include <sys/types.h>
 
 typedef struct symbol *symbolp;
diff --git a/gdb/eval.c b/gdb/eval.c
index 5e64e5431e8..b375850c4ac 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -40,9 +40,6 @@
 #include "valprint.h"
 #include "gdb_obstack.h"
 #include "objfiles.h"
-
-#include "gdb_assert.h"
-
 #include <ctype.h>
 
 /* This is defined in valops.c */
diff --git a/gdb/event-loop.c b/gdb/event-loop.c
index 5999c9734f6..221dfbc9755 100644
--- a/gdb/event-loop.c
+++ b/gdb/event-loop.c
@@ -35,7 +35,6 @@
 #include <errno.h>
 #include <sys/time.h>
 #include "exceptions.h"
-#include "gdb_assert.h"
 #include "gdb_select.h"
 #include "observer.h"
 
diff --git a/gdb/exceptions.c b/gdb/exceptions.c
index ddaf250973a..4efc8886bbd 100644
--- a/gdb/exceptions.c
+++ b/gdb/exceptions.c
@@ -24,7 +24,6 @@
 #include "inferior.h"
 #include "annotate.h"
 #include "ui-out.h"
-#include "gdb_assert.h"
 #include <string.h>
 #include "serial.h"
 #include "gdbthread.h"
diff --git a/gdb/expprint.c b/gdb/expprint.c
index 7f58e4e37f6..0f87033bdca 100644
--- a/gdb/expprint.c
+++ b/gdb/expprint.c
@@ -29,7 +29,6 @@
 #include <string.h>
 #include "block.h"
 #include "objfiles.h"
-#include "gdb_assert.h"
 #include "valprint.h"
 
 #include <ctype.h>
diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
index 408c8cc6220..728bdafe5b0 100644
--- a/gdb/f-valprint.c
+++ b/gdb/f-valprint.c
@@ -34,7 +34,6 @@
 #include "command.h"
 #include "block.h"
 #include "dictionary.h"
-#include "gdb_assert.h"
 #include "exceptions.h"
 
 extern void _initialize_f_valprint (void);
diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c
index 4e115b276f8..e4b34f66e78 100644
--- a/gdb/fbsd-nat.c
+++ b/gdb/fbsd-nat.c
@@ -24,7 +24,6 @@
 #include "regset.h"
 #include "gdbthread.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 #include <sys/types.h>
 #include <sys/procfs.h>
diff --git a/gdb/findvar.c b/gdb/findvar.c
index 9390c8a7b88..465c9cc638b 100644
--- a/gdb/findvar.c
+++ b/gdb/findvar.c
@@ -26,7 +26,6 @@
 #include "inferior.h"
 #include "target.h"
 #include <string.h>
-#include "gdb_assert.h"
 #include "floatformat.h"
 #include "symfile.h"		/* for overlay functions */
 #include "regcache.h"
diff --git a/gdb/frame-unwind.c b/gdb/frame-unwind.c
index fdfea6e5e4f..ebc01ff7d91 100644
--- a/gdb/frame-unwind.c
+++ b/gdb/frame-unwind.c
@@ -25,7 +25,6 @@
 #include "value.h"
 #include "regcache.h"
 #include "exceptions.h"
-#include "gdb_assert.h"
 #include "gdb_obstack.h"
 #include "target.h"
 
diff --git a/gdb/frame.c b/gdb/frame.c
index 8a2b8bf7e91..9d8c8b7b112 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -23,7 +23,6 @@
 #include "value.h"
 #include "inferior.h"	/* for inferior_ptid */
 #include "regcache.h"
-#include "gdb_assert.h"
 #include <string.h>
 #include "user-regs.h"
 #include "gdb_obstack.h"
diff --git a/gdb/frv-tdep.c b/gdb/frv-tdep.c
index bd4dbdb2c1b..349e58dabcf 100644
--- a/gdb/frv-tdep.c
+++ b/gdb/frv-tdep.c
@@ -28,7 +28,6 @@
 #include "frame-base.h"
 #include "trad-frame.h"
 #include "dis-asm.h"
-#include "gdb_assert.h"
 #include "sim-regno.h"
 #include "gdb/sim-frv.h"
 #include "opcodes/frv-desc.h"	/* for the H_SPR_... enums */
diff --git a/gdb/gcore.c b/gdb/gcore.c
index 13be346fae1..d2adfc880c5 100644
--- a/gdb/gcore.c
+++ b/gdb/gcore.c
@@ -29,7 +29,6 @@
 #include "completer.h"
 #include "gcore.h"
 #include "cli/cli-decode.h"
-#include "gdb_assert.h"
 #include <fcntl.h>
 #include "regcache.h"
 #include "regset.h"
diff --git a/gdb/gdb-dlfcn.c b/gdb/gdb-dlfcn.c
index a808959fc20..3e54f98117b 100644
--- a/gdb/gdb-dlfcn.c
+++ b/gdb/gdb-dlfcn.c
@@ -18,8 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_assert.h"
-
 #include "gdb-dlfcn.h"
 
 #ifdef HAVE_DLFCN_H
diff --git a/gdb/gdb_bfd.c b/gdb/gdb_bfd.c
index 4d4b0a53593..fdde3e7be42 100644
--- a/gdb/gdb_bfd.c
+++ b/gdb/gdb_bfd.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include "gdb_bfd.h"
-#include "gdb_assert.h"
 #include <string.h>
 #include "ui-out.h"
 #include "gdbcmd.h"
diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index fe499871b0f..74caa93d744 100644
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -42,7 +42,6 @@
 
 #include "floatformat.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 #include "reggroups.h"
 #include "osabi.h"
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index 13db4d4b06f..9eab8f0ee4a 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -1473,7 +1473,6 @@ cat <<EOF
 
 #include "floatformat.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 #include "reggroups.h"
 #include "osabi.h"
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index a43ddcd69cc..a46db2c56a4 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-07  Gary Benson  <gbenson@redhat.com>
+
+	* server.h: Do not include gdb_assert.h.
+
 2014-08-07  Gary Benson  <gbenson@redhat.com>
 
 	* server.h: Do not include common-utils.h.
diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h
index 5a3f335bc68..20521036d9f 100644
--- a/gdb/gdbserver/server.h
+++ b/gdb/gdbserver/server.h
@@ -134,8 +134,6 @@ extern int handle_target_event (int err, gdb_client_data client_data);
 #include "utils.h"
 #include "debug.h"
 
-#include "gdb_assert.h"
-
 /* Maximum number of bytes to read/write at once.  The value here
    is chosen to fill up a packet (the headers account for the 32).  */
 #define MAXBUFBYTES(N) (((N)-32)/2)
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 97d94f24a36..4d810ce7ee6 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -34,7 +34,6 @@
 #include "complaints.h"
 #include "gdbcmd.h"
 #include "cp-abi.h"
-#include "gdb_assert.h"
 #include "hashtab.h"
 #include "exceptions.h"
 #include "cp-support.h"
diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c
index a2de2f107cb..3eebba526d7 100644
--- a/gdb/gnu-nat.c
+++ b/gdb/gnu-nat.c
@@ -60,7 +60,6 @@
 #include "gdbcmd.h"
 #include "gdbcore.h"
 #include "gdbthread.h"
-#include "gdb_assert.h"
 #include "gdb_obstack.h"
 
 #include "gnu-nat.h"
diff --git a/gdb/gnu-v3-abi.c b/gdb/gnu-v3-abi.c
index e0be32843a5..5a812132f9f 100644
--- a/gdb/gnu-v3-abi.c
+++ b/gdb/gnu-v3-abi.c
@@ -29,7 +29,6 @@
 #include "exceptions.h"
 #include "typeprint.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 
 static struct cp_abi_ops gnu_v3_abi_ops;
diff --git a/gdb/go-lang.c b/gdb/go-lang.c
index 42535dfd02d..f1a2dbaf2d7 100644
--- a/gdb/go-lang.c
+++ b/gdb/go-lang.c
@@ -32,7 +32,6 @@
 */
 
 #include "defs.h"
-#include "gdb_assert.h"
 #include "gdb_obstack.h"
 #include <string.h>
 #include "block.h"
diff --git a/gdb/guile/scm-exception.c b/gdb/guile/scm-exception.c
index d1df55bb8ad..826e06c7bcc 100644
--- a/gdb/guile/scm-exception.c
+++ b/gdb/guile/scm-exception.c
@@ -30,7 +30,6 @@
 
 #include "defs.h"
 #include <signal.h>
-#include "gdb_assert.h"
 #include "guile-internal.h"
 
 /* The <gdb:exception> smob.
diff --git a/gdb/guile/scm-gsmob.c b/gdb/guile/scm-gsmob.c
index 156ca8cc817..b00d64138ab 100644
--- a/gdb/guile/scm-gsmob.c
+++ b/gdb/guile/scm-gsmob.c
@@ -43,7 +43,6 @@
 
 #include "defs.h"
 #include "hashtab.h"
-#include "gdb_assert.h"
 #include "objfiles.h"
 #include "guile-internal.h"
 
diff --git a/gdb/guile/scm-lazy-string.c b/gdb/guile/scm-lazy-string.c
index a34cb60d8a3..88d3004040b 100644
--- a/gdb/guile/scm-lazy-string.c
+++ b/gdb/guile/scm-lazy-string.c
@@ -26,7 +26,6 @@
 #include "exceptions.h"
 #include "valprint.h"
 #include "language.h"
-#include "gdb_assert.h"
 #include "guile-internal.h"
 
 /* The <gdb:lazy-string> smob.  */
diff --git a/gdb/guile/scm-math.c b/gdb/guile/scm-math.c
index 80e16736156..e05f99e43e2 100644
--- a/gdb/guile/scm-math.c
+++ b/gdb/guile/scm-math.c
@@ -27,7 +27,6 @@
 #include "doublest.h" /* Needed by dfp.h.  */
 #include "expression.h" /* Needed by dfp.h.  */
 #include "dfp.h"
-#include "gdb_assert.h"
 #include "symtab.h" /* Needed by language.h.  */
 #include "language.h"
 #include "valprint.h"
diff --git a/gdb/guile/scm-pretty-print.c b/gdb/guile/scm-pretty-print.c
index 79b9e64339a..5c94c7817e5 100644
--- a/gdb/guile/scm-pretty-print.c
+++ b/gdb/guile/scm-pretty-print.c
@@ -22,7 +22,6 @@
 
 #include "defs.h"
 #include "charset.h"
-#include "gdb_assert.h"
 #include "symtab.h" /* Needed by language.h.  */
 #include "language.h"
 #include "objfiles.h"
diff --git a/gdb/guile/scm-safe-call.c b/gdb/guile/scm-safe-call.c
index 2a69a4fa2a1..e07c6c04c7c 100644
--- a/gdb/guile/scm-safe-call.c
+++ b/gdb/guile/scm-safe-call.c
@@ -22,7 +22,6 @@
 
 #include "defs.h"
 #include "filenames.h"
-#include "gdb_assert.h"
 #include "guile-internal.h"
 
 /* Struct to marshall args to scscm_safe_call_body.  */
diff --git a/gdb/guile/scm-utils.c b/gdb/guile/scm-utils.c
index ada77a33d14..72da8678d38 100644
--- a/gdb/guile/scm-utils.c
+++ b/gdb/guile/scm-utils.c
@@ -22,7 +22,6 @@
 
 #include "defs.h"
 #include <stdint.h>
-#include "gdb_assert.h"
 #include "guile-internal.h"
 
 /* Define VARIABLES in the gdb module.  */
diff --git a/gdb/guile/scm-value.c b/gdb/guile/scm-value.c
index 211ef66d4b4..5d880596968 100644
--- a/gdb/guile/scm-value.c
+++ b/gdb/guile/scm-value.c
@@ -24,7 +24,6 @@
 #include "arch-utils.h"
 #include "charset.h"
 #include "cp-abi.h"
-#include "gdb_assert.h"
 #include "infcall.h"
 #include "symtab.h" /* Needed by language.h.  */
 #include "language.h"
diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c
index f847085257e..0f58553d955 100644
--- a/gdb/h8300-tdep.c
+++ b/gdb/h8300-tdep.c
@@ -28,7 +28,6 @@
 #include "regcache.h"
 #include "gdbcore.h"
 #include "objfiles.h"
-#include "gdb_assert.h"
 #include "dis-asm.h"
 #include "dwarf2-frame.h"
 #include "frame-base.h"
diff --git a/gdb/hppa-hpux-nat.c b/gdb/hppa-hpux-nat.c
index c38a8c037f4..65a2b85f589 100644
--- a/gdb/hppa-hpux-nat.c
+++ b/gdb/hppa-hpux-nat.c
@@ -22,7 +22,6 @@
 #include "regcache.h"
 #include "target.h"
 
-#include "gdb_assert.h"
 #include <sys/ptrace.h>
 #include <sys/utsname.h>
 #include <machine/save_state.h>
diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index a66cbef41b5..627f31a5e21 100644
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -26,7 +26,6 @@
 #include "regcache.h"
 #include "completer.h"
 #include "osabi.h"
-#include "gdb_assert.h"
 #include "arch-utils.h"
 /* For argument passing to the inferior.  */
 #include "symtab.h"
diff --git a/gdb/hppanbsd-tdep.c b/gdb/hppanbsd-tdep.c
index fdc97198cdc..657d4c2b74d 100644
--- a/gdb/hppanbsd-tdep.c
+++ b/gdb/hppanbsd-tdep.c
@@ -25,7 +25,6 @@
 #include "trad-frame.h"
 #include "tramp-frame.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 
 #include "hppa-tdep.h"
diff --git a/gdb/hppaobsd-tdep.c b/gdb/hppaobsd-tdep.c
index 8dc03a2d2fb..eece2d1752c 100644
--- a/gdb/hppaobsd-tdep.c
+++ b/gdb/hppaobsd-tdep.c
@@ -22,7 +22,6 @@
 #include "regcache.h"
 #include "regset.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 
 #include "hppa-tdep.h"
diff --git a/gdb/i386-darwin-nat.c b/gdb/i386-darwin-nat.c
index faf901e7341..f94c05366a8 100644
--- a/gdb/i386-darwin-nat.c
+++ b/gdb/i386-darwin-nat.c
@@ -27,7 +27,6 @@
 #include "objfiles.h"
 #include "gdbcmd.h"
 #include "regcache.h"
-#include "gdb_assert.h"
 #include "i386-tdep.h"
 #include "i387-tdep.h"
 #include "gdbarch.h"
diff --git a/gdb/i386-darwin-tdep.c b/gdb/i386-darwin-tdep.c
index f2c08d7380b..87f2aff3ffe 100644
--- a/gdb/i386-darwin-tdep.c
+++ b/gdb/i386-darwin-tdep.c
@@ -33,7 +33,6 @@
 #include "i386-tdep.h"
 #include "osabi.h"
 #include "ui-out.h"
-#include "gdb_assert.h"
 #include "i386-darwin-tdep.h"
 #include "solib.h"
 #include "solib-darwin.h"
diff --git a/gdb/i386-nto-tdep.c b/gdb/i386-nto-tdep.c
index d005914ce3f..57be47176ef 100644
--- a/gdb/i386-nto-tdep.c
+++ b/gdb/i386-nto-tdep.c
@@ -25,7 +25,6 @@
 #include "regcache.h"
 #include "target.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 
 #include "i386-tdep.h"
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index 5e3cc79808e..7544f06154a 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -45,7 +45,6 @@
 #include "disasm.h"
 #include "remote.h"
 #include "exceptions.h"
-#include "gdb_assert.h"
 #include <string.h>
 
 #include "i386-tdep.h"
diff --git a/gdb/i386bsd-nat.c b/gdb/i386bsd-nat.c
index 4bee1594977..ec7fd70213b 100644
--- a/gdb/i386bsd-nat.c
+++ b/gdb/i386bsd-nat.c
@@ -21,7 +21,6 @@
 #include "inferior.h"
 #include "regcache.h"
 
-#include "gdb_assert.h"
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/ptrace.h>
diff --git a/gdb/i386fbsd-tdep.c b/gdb/i386fbsd-tdep.c
index ed6df6bb78f..8942ad362e3 100644
--- a/gdb/i386fbsd-tdep.c
+++ b/gdb/i386fbsd-tdep.c
@@ -23,8 +23,6 @@
 #include "osabi.h"
 #include "regcache.h"
 
-#include "gdb_assert.h"
-
 #include "i386-tdep.h"
 #include "i387-tdep.h"
 #include "bsd-uthread.h"
diff --git a/gdb/i386gnu-nat.c b/gdb/i386gnu-nat.c
index 23a70b37c9d..fbd3344d4a1 100644
--- a/gdb/i386gnu-nat.c
+++ b/gdb/i386gnu-nat.c
@@ -22,7 +22,6 @@
 #include "floatformat.h"
 #include "regcache.h"
 
-#include "gdb_assert.h"
 #include <errno.h>
 #include <string.h>
 
diff --git a/gdb/i386nbsd-tdep.c b/gdb/i386nbsd-tdep.c
index 112f9f2dedb..4b024f5545a 100644
--- a/gdb/i386nbsd-tdep.c
+++ b/gdb/i386nbsd-tdep.c
@@ -28,7 +28,6 @@
 #include "trad-frame.h"
 #include "tramp-frame.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 
 #include "i386-tdep.h"
diff --git a/gdb/i386obsd-tdep.c b/gdb/i386obsd-tdep.c
index 8f76e436aac..acdfc7e54ad 100644
--- a/gdb/i386obsd-tdep.c
+++ b/gdb/i386obsd-tdep.c
@@ -30,7 +30,6 @@
 #include "target.h"
 #include "trad-frame.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 
 #include "obsd-tdep.h"
diff --git a/gdb/i387-tdep.c b/gdb/i387-tdep.c
index c58a000a27e..1613c2fa315 100644
--- a/gdb/i387-tdep.c
+++ b/gdb/i387-tdep.c
@@ -27,7 +27,6 @@
 #include "regcache.h"
 #include "value.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 
 #include "i386-tdep.h"
diff --git a/gdb/ia64-libunwind-tdep.c b/gdb/ia64-libunwind-tdep.c
index fe1fbdc2cf1..dec4547ce38 100644
--- a/gdb/ia64-libunwind-tdep.c
+++ b/gdb/ia64-libunwind-tdep.c
@@ -33,7 +33,6 @@
 
 #include <dlfcn.h>
 
-#include "gdb_assert.h"
 #include <string.h>
 
 #include "ia64-libunwind-tdep.h"
diff --git a/gdb/ia64-tdep.c b/gdb/ia64-tdep.c
index 08eb79d7df4..776a8beebcd 100644
--- a/gdb/ia64-tdep.c
+++ b/gdb/ia64-tdep.c
@@ -30,7 +30,6 @@
 #include "frame-unwind.h"
 #include "doublest.h"
 #include "value.h"
-#include "gdb_assert.h"
 #include "objfiles.h"
 #include "elf/common.h"		/* for DT_PLTGOT value */
 #include "elf-bfd.h"
diff --git a/gdb/inf-ptrace.c b/gdb/inf-ptrace.c
index e1d64f8cd7e..c334474d6af 100644
--- a/gdb/inf-ptrace.c
+++ b/gdb/inf-ptrace.c
@@ -25,7 +25,6 @@
 #include "gdbcore.h"
 #include "regcache.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 #include "gdb_ptrace.h"
 #include "gdb_wait.h"
diff --git a/gdb/inf-ttrace.c b/gdb/inf-ttrace.c
index a7c3481daf7..d5075f79dcf 100644
--- a/gdb/inf-ttrace.c
+++ b/gdb/inf-ttrace.c
@@ -30,7 +30,6 @@
 #include "terminal.h"
 #include "target.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 #include <sys/mman.h>
 #include <sys/ttrace.h>
diff --git a/gdb/infcall.c b/gdb/infcall.c
index 5c65bb5ac7c..c58295aa7e8 100644
--- a/gdb/infcall.c
+++ b/gdb/infcall.c
@@ -24,7 +24,6 @@
 #include "regcache.h"
 #include "inferior.h"
 #include "infrun.h"
-#include "gdb_assert.h"
 #include "block.h"
 #include "gdbcore.h"
 #include "language.h"
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index d84c591865e..f63bd992d34 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -43,7 +43,6 @@
 #include "block.h"
 #include "solib.h"
 #include <ctype.h>
-#include "gdb_assert.h"
 #include "observer.h"
 #include "target-descriptions.h"
 #include "user-regs.h"
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 33aa67410d1..0614de95373 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -46,7 +46,6 @@
 #include "main.h"
 #include "dictionary.h"
 #include "block.h"
-#include "gdb_assert.h"
 #include "mi/mi-common.h"
 #include "event-top.h"
 #include "record.h"
diff --git a/gdb/inline-frame.c b/gdb/inline-frame.c
index 50f492a36f7..cecb2afb8e9 100644
--- a/gdb/inline-frame.c
+++ b/gdb/inline-frame.c
@@ -28,8 +28,6 @@
 #include "vec.h"
 #include "frame.h"
 
-#include "gdb_assert.h"
-
 /* We need to save a few variables for every thread stopped at the
    virtual call site of an inlined function.  If there was always a
    "struct thread_info", we could hang it off that; in the mean time,
diff --git a/gdb/interps.c b/gdb/interps.c
index 713480b971c..f76fee468bd 100644
--- a/gdb/interps.c
+++ b/gdb/interps.c
@@ -37,7 +37,6 @@
 #include "interps.h"
 #include "completer.h"
 #include <string.h>
-#include "gdb_assert.h"
 #include "top.h"		/* For command_loop.  */
 #include "exceptions.h"
 #include "continuations.h"
diff --git a/gdb/jv-lang.c b/gdb/jv-lang.c
index 3e5f09698ec..5e6bae3993f 100644
--- a/gdb/jv-lang.c
+++ b/gdb/jv-lang.c
@@ -35,7 +35,6 @@
 #include "demangle.h"
 #include "dictionary.h"
 #include <ctype.h>
-#include "gdb_assert.h"
 #include "charset.h"
 #include "valprint.h"
 #include "cp-support.h"
diff --git a/gdb/jv-typeprint.c b/gdb/jv-typeprint.c
index df46debece3..972edf27af8 100644
--- a/gdb/jv-typeprint.c
+++ b/gdb/jv-typeprint.c
@@ -29,7 +29,6 @@
 #include "c-lang.h"
 #include "cp-abi.h"
 #include "cp-support.h"
-#include "gdb_assert.h"
 
 /* Local functions */
 
diff --git a/gdb/linux-fork.c b/gdb/linux-fork.c
index b9f8cfb5f13..c9995bf38d2 100644
--- a/gdb/linux-fork.c
+++ b/gdb/linux-fork.c
@@ -25,7 +25,6 @@
 #include "gdbcmd.h"
 #include "infcall.h"
 #include "objfiles.h"
-#include "gdb_assert.h"
 #include <string.h>
 #include "linux-fork.h"
 #include "linux-nat.h"
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index 5a791bc594d..39a6202e0ca 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -25,7 +25,6 @@
 #include "nat/linux-waitpid.h"
 #include <string.h>
 #include "gdb_wait.h"
-#include "gdb_assert.h"
 #ifdef HAVE_TKILL_SYSCALL
 #include <unistd.h>
 #include <sys/syscall.h>
diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c
index af8232adf47..8adcb407741 100644
--- a/gdb/linux-thread-db.c
+++ b/gdb/linux-thread-db.c
@@ -18,8 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-#include "gdb_assert.h"
 #include <dlfcn.h>
 #include "gdb_proc_service.h"
 #include "nat/gdb_thread_db.h"
diff --git a/gdb/m32c-tdep.c b/gdb/m32c-tdep.c
index 88f17a9bcc8..2374f365da5 100644
--- a/gdb/m32c-tdep.c
+++ b/gdb/m32c-tdep.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include <string.h>
-#include "gdb_assert.h"
 #include "elf-bfd.h"
 #include "elf/m32c.h"
 #include "gdb/sim-m32c.h"
diff --git a/gdb/m32r-linux-nat.c b/gdb/m32r-linux-nat.c
index d1efaaca62b..f38cd532495 100644
--- a/gdb/m32r-linux-nat.c
+++ b/gdb/m32r-linux-nat.c
@@ -24,7 +24,6 @@
 #include "linux-nat.h"
 #include "target.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 #include <sys/ptrace.h>
 #include <sys/user.h>
diff --git a/gdb/m32r-tdep.c b/gdb/m32r-tdep.c
index 838d3d9c9c2..6928c96ce5f 100644
--- a/gdb/m32r-tdep.c
+++ b/gdb/m32r-tdep.c
@@ -38,8 +38,6 @@
 #include "dis-asm.h"
 #include "objfiles.h"
 
-#include "gdb_assert.h"
-
 #include "m32r-tdep.h"
 
 /* Local functions */
diff --git a/gdb/m68k-tdep.c b/gdb/m68k-tdep.c
index 6b3f2b1f279..d3c6d0166fa 100644
--- a/gdb/m68k-tdep.c
+++ b/gdb/m68k-tdep.c
@@ -27,7 +27,6 @@
 #include "gdbcore.h"
 #include "value.h"
 #include <string.h>
-#include "gdb_assert.h"
 #include "inferior.h"
 #include "regcache.h"
 #include "arch-utils.h"
diff --git a/gdb/m68kbsd-nat.c b/gdb/m68kbsd-nat.c
index dbd0e15d0cb..6ef3b4b8092 100644
--- a/gdb/m68kbsd-nat.c
+++ b/gdb/m68kbsd-nat.c
@@ -22,7 +22,6 @@
 #include "inferior.h"
 #include "regcache.h"
 
-#include "gdb_assert.h"
 #include <sys/types.h>
 #include <sys/ptrace.h>
 #include <machine/reg.h>
diff --git a/gdb/m68kbsd-tdep.c b/gdb/m68kbsd-tdep.c
index d27beb8828c..f1f63e1528e 100644
--- a/gdb/m68kbsd-tdep.c
+++ b/gdb/m68kbsd-tdep.c
@@ -27,7 +27,6 @@
 #include "tramp-frame.h"
 #include "gdbtypes.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 
 #include "m68k-tdep.h"
diff --git a/gdb/m88k-tdep.c b/gdb/m88k-tdep.c
index 56384a71994..3ce292e5b34 100644
--- a/gdb/m88k-tdep.c
+++ b/gdb/m88k-tdep.c
@@ -31,7 +31,6 @@
 #include "trad-frame.h"
 #include "value.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 
 #include "m88k-tdep.h"
diff --git a/gdb/machoread.c b/gdb/machoread.c
index f5e4a1e4e32..96cc769f397 100644
--- a/gdb/machoread.c
+++ b/gdb/machoread.c
@@ -28,7 +28,6 @@
 #include "gdbcmd.h"
 #include "gdbcore.h"
 #include "mach-o.h"
-#include "gdb_assert.h"
 #include "aout/stab_gnu.h"
 #include "vec.h"
 #include "psympriv.h"
diff --git a/gdb/macroexp.c b/gdb/macroexp.c
index 30db47a629b..0faa07fe616 100644
--- a/gdb/macroexp.c
+++ b/gdb/macroexp.c
@@ -22,7 +22,6 @@
 #include "bcache.h"
 #include "macrotab.h"
 #include "macroexp.h"
-#include "gdb_assert.h"
 #include "c-lang.h"
 
 
diff --git a/gdb/macrotab.c b/gdb/macrotab.c
index 49f00b6c772..1e02b0a5df9 100644
--- a/gdb/macrotab.c
+++ b/gdb/macrotab.c
@@ -25,7 +25,6 @@
 #include "symfile.h"
 #include "objfiles.h"
 #include "macrotab.h"
-#include "gdb_assert.h"
 #include "bcache.h"
 #include "complaints.h"
 #include "macroexp.h"
diff --git a/gdb/maint.c b/gdb/maint.c
index d4d5810af22..7fd2d583977 100644
--- a/gdb/maint.c
+++ b/gdb/maint.c
@@ -38,7 +38,6 @@
 #include "symfile.h"
 #include "objfiles.h"
 #include "value.h"
-#include "gdb_assert.h"
 #include "top.h"
 #include "timeval-utils.h"
 #include "maint.h"
diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c
index 2e9608b1202..a6fbd6add7d 100644
--- a/gdb/mdebugread.c
+++ b/gdb/mdebugread.c
@@ -51,7 +51,6 @@
 #include "complaints.h"
 #include "demangle.h"
 #include "gdb-demangle.h"
-#include "gdb_assert.h"
 #include "block.h"
 #include "dictionary.h"
 #include "mdebugread.h"
diff --git a/gdb/memory-map.c b/gdb/memory-map.c
index 80cd22be645..522f16b7781 100644
--- a/gdb/memory-map.c
+++ b/gdb/memory-map.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include "memory-map.h"
-#include "gdb_assert.h"
 #include "exceptions.h"
 
 #include <string.h>
diff --git a/gdb/mep-tdep.c b/gdb/mep-tdep.c
index 28c826ec684..dd3cc5f3cbc 100644
--- a/gdb/mep-tdep.c
+++ b/gdb/mep-tdep.c
@@ -48,8 +48,6 @@
 #include "cgen/bitset.h"
 #include "infcall.h"
 
-#include "gdb_assert.h"
-
 /* Get the user's customized MeP coprocessor register names from
    libopcodes.  */
 #include "opcodes/mep-desc.h"
diff --git a/gdb/mi/mi-common.c b/gdb/mi/mi-common.c
index 91cd35fa199..2dcdf8ddc91 100644
--- a/gdb/mi/mi-common.c
+++ b/gdb/mi/mi-common.c
@@ -17,7 +17,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_assert.h"
 #include "mi-common.h"
 
 static const char * const async_reason_string_lookup[] =
diff --git a/gdb/microblaze-tdep.c b/gdb/microblaze-tdep.c
index 93e93dbe567..80c79f6bb3e 100644
--- a/gdb/microblaze-tdep.c
+++ b/gdb/microblaze-tdep.c
@@ -33,7 +33,6 @@
 #include "frame-unwind.h"
 #include "dwarf2-frame.h"
 #include "osabi.h"
-#include "gdb_assert.h"
 #include <string.h>
 #include "target-descriptions.h"
 #include "opcodes/microblaze-opcm.h"
diff --git a/gdb/mingw-hdep.c b/gdb/mingw-hdep.c
index 50dc372e9ef..c71814fe2b8 100644
--- a/gdb/mingw-hdep.c
+++ b/gdb/mingw-hdep.c
@@ -22,7 +22,6 @@
 #include "serial.h"
 #include "event-loop.h"
 
-#include "gdb_assert.h"
 #include "gdb_select.h"
 #include <string.h>
 #include "readline/readline.h"
diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c
index dbd7ae790c9..88faa1edf69 100644
--- a/gdb/mips-linux-nat.c
+++ b/gdb/mips-linux-nat.c
@@ -20,7 +20,6 @@
 #include "defs.h"
 #include "command.h"
 #include "gdbcmd.h"
-#include "gdb_assert.h"
 #include "inferior.h"
 #include "mips-tdep.h"
 #include "target.h"
diff --git a/gdb/mips-linux-tdep.c b/gdb/mips-linux-tdep.c
index a975db6957c..1e812717c4c 100644
--- a/gdb/mips-linux-tdep.c
+++ b/gdb/mips-linux-tdep.c
@@ -24,7 +24,6 @@
 #include "osabi.h"
 #include "mips-tdep.h"
 #include <string.h>
-#include "gdb_assert.h"
 #include "frame.h"
 #include "regcache.h"
 #include "trad-frame.h"
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 9a530a8055c..bbbf8a21c50 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -22,7 +22,6 @@
 
 #include "defs.h"
 #include <string.h>
-#include "gdb_assert.h"
 #include "frame.h"
 #include "inferior.h"
 #include "symtab.h"
diff --git a/gdb/mips64obsd-tdep.c b/gdb/mips64obsd-tdep.c
index 6d8b9eea31d..8a89af1d9e4 100644
--- a/gdb/mips64obsd-tdep.c
+++ b/gdb/mips64obsd-tdep.c
@@ -25,7 +25,6 @@
 #include "trad-frame.h"
 #include "tramp-frame.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 
 #include "obsd-tdep.h"
diff --git a/gdb/mipsnbsd-tdep.c b/gdb/mipsnbsd-tdep.c
index 31b8dca8ece..2b7a1d3ec8a 100644
--- a/gdb/mipsnbsd-tdep.c
+++ b/gdb/mipsnbsd-tdep.c
@@ -27,7 +27,6 @@
 #include "value.h"
 #include "osabi.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 
 #include "nbsd-tdep.h"
diff --git a/gdb/mn10300-linux-tdep.c b/gdb/mn10300-linux-tdep.c
index 1b72efaaf9b..cbaa0108cf8 100644
--- a/gdb/mn10300-linux-tdep.c
+++ b/gdb/mn10300-linux-tdep.c
@@ -22,7 +22,6 @@
 #include <string.h>
 #include "regcache.h"
 #include "mn10300-tdep.h"
-#include "gdb_assert.h"
 #include "bfd.h"
 #include "elf-bfd.h"
 #include "osabi.h"
diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c
index 10a82627a2f..bc21465a7de 100644
--- a/gdb/mn10300-tdep.c
+++ b/gdb/mn10300-tdep.c
@@ -23,7 +23,6 @@
 #include "gdbtypes.h"
 #include "regcache.h"
 #include <string.h>
-#include "gdb_assert.h"
 #include "gdbcore.h"	/* For write_memory_unsigned_integer.  */
 #include "value.h"
 #include "frame.h"
diff --git a/gdb/moxie-tdep.c b/gdb/moxie-tdep.c
index 793e7a475ce..6d3c1303f26 100644
--- a/gdb/moxie-tdep.c
+++ b/gdb/moxie-tdep.c
@@ -39,8 +39,6 @@
 #include "record.h"
 #include "record-full.h"
 
-#include "gdb_assert.h"
-
 #include "moxie-tdep.h"
 
 /* Local functions.  */
diff --git a/gdb/mt-tdep.c b/gdb/mt-tdep.c
index e3786e815ea..1904bf89f1b 100644
--- a/gdb/mt-tdep.c
+++ b/gdb/mt-tdep.c
@@ -35,7 +35,6 @@
 #include "inferior.h"
 #include "dwarf2-frame.h"
 #include "infcall.h"
-#include "gdb_assert.h"
 #include "language.h"
 #include "valprint.h"
 
diff --git a/gdb/nat/linux-btrace.c b/gdb/nat/linux-btrace.c
index 84de8a70a92..baf07e80831 100644
--- a/gdb/nat/linux-btrace.c
+++ b/gdb/nat/linux-btrace.c
@@ -26,7 +26,6 @@
 #endif
 
 #include "linux-btrace.h"
-#include "gdb_assert.h"
 #include "regcache.h"
 #include "gdbthread.h"
 #include "gdb_wait.h"
diff --git a/gdb/nat/linux-osdata.c b/gdb/nat/linux-osdata.c
index d9d1325ae1d..0ef7fa368c8 100644
--- a/gdb/nat/linux-osdata.c
+++ b/gdb/nat/linux-osdata.c
@@ -40,7 +40,6 @@
 
 #include "xml-utils.h"
 #include "buffer.h"
-#include "gdb_assert.h"
 #include <dirent.h>
 #include <sys/stat.h>
 #include "filestuff.h"
diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c
index 24b02b930cc..8abb8427196 100644
--- a/gdb/nat/linux-ptrace.c
+++ b/gdb/nat/linux-ptrace.c
@@ -27,7 +27,6 @@
 #include "linux-procfs.h"
 #include "linux-waitpid.h"
 #include "buffer.h"
-#include "gdb_assert.h"
 #include "gdb_wait.h"
 
 #include <stdint.h>
diff --git a/gdb/nat/mips-linux-watch.c b/gdb/nat/mips-linux-watch.c
index ebe55233ae2..ea6e02de378 100644
--- a/gdb/nat/mips-linux-watch.c
+++ b/gdb/nat/mips-linux-watch.c
@@ -22,7 +22,6 @@
 #endif
 #include <sys/ptrace.h>
 #include "mips-linux-watch.h"
-#include "gdb_assert.h"
 
 /* Assuming usable watch registers REGS, return the irw_mask of
    register N.  */
diff --git a/gdb/nios2-linux-tdep.c b/gdb/nios2-linux-tdep.c
index 84ab576205b..2041336f79e 100644
--- a/gdb/nios2-linux-tdep.c
+++ b/gdb/nios2-linux-tdep.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include "frame.h"
-#include "gdb_assert.h"
 #include <string.h>
 #include "osabi.h"
 #include "solib-svr4.h"
diff --git a/gdb/nios2-tdep.c b/gdb/nios2-tdep.c
index 7b1b640fe89..18a59137ded 100644
--- a/gdb/nios2-tdep.c
+++ b/gdb/nios2-tdep.c
@@ -38,7 +38,6 @@
 #include "symfile.h"
 #include "arch-utils.h"
 #include "floatformat.h"
-#include "gdb_assert.h"
 #include "infcall.h"
 #include "regset.h"
 #include "target-descriptions.h"
diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c
index 68f0d10058b..c6d344e4168 100644
--- a/gdb/objc-lang.c
+++ b/gdb/objc-lang.c
@@ -44,7 +44,6 @@
 #include "block.h"
 #include "infcall.h"
 #include "valprint.h"
-#include "gdb_assert.h"
 #include "cli/cli-utils.h"
 
 #include <ctype.h>
diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index 0a0b1cb6af1..7c6fca845e1 100644
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -33,7 +33,6 @@
 #include "expression.h"
 #include "parser-defs.h"
 
-#include "gdb_assert.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/gdb/obsd-nat.c b/gdb/obsd-nat.c
index f53e6164cf1..e4a98ae91e2 100644
--- a/gdb/obsd-nat.c
+++ b/gdb/obsd-nat.c
@@ -22,7 +22,6 @@
 #include "inferior.h"
 #include "target.h"
 
-#include "gdb_assert.h"
 #include <sys/types.h>
 #include <sys/ptrace.h>
 #include "gdb_wait.h"
diff --git a/gdb/opencl-lang.c b/gdb/opencl-lang.c
index 2dd76fac36e..96b562dded2 100644
--- a/gdb/opencl-lang.c
+++ b/gdb/opencl-lang.c
@@ -27,7 +27,6 @@
 #include "language.h"
 #include "varobj.h"
 #include "c-lang.h"
-#include "gdb_assert.h"
 
 extern void _initialize_opencl_language (void);
 
diff --git a/gdb/osabi.c b/gdb/osabi.c
index 5b69eebcea8..ae4290fcfa5 100644
--- a/gdb/osabi.c
+++ b/gdb/osabi.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 
 #include "osabi.h"
diff --git a/gdb/parse.c b/gdb/parse.c
index 47533bba89b..3aeeaadd080 100644
--- a/gdb/parse.c
+++ b/gdb/parse.c
@@ -46,7 +46,6 @@
 #include "symfile.h"		/* for overlay functions */
 #include "inferior.h"
 #include "doublest.h"
-#include "gdb_assert.h"
 #include "block.h"
 #include "source.h"
 #include "objfiles.h"
diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
index 6e8994e9852..3da625431f1 100644
--- a/gdb/ppc-linux-nat.c
+++ b/gdb/ppc-linux-nat.c
@@ -25,7 +25,6 @@
 #include "gdbthread.h"
 #include "gdbcore.h"
 #include "regcache.h"
-#include "gdb_assert.h"
 #include "target.h"
 #include "linux-nat.h"
 
diff --git a/gdb/ppc-sysv-tdep.c b/gdb/ppc-sysv-tdep.c
index 1a880a65754..c56164f866f 100644
--- a/gdb/ppc-sysv-tdep.c
+++ b/gdb/ppc-sysv-tdep.c
@@ -24,7 +24,6 @@
 #include "regcache.h"
 #include "value.h"
 #include <string.h>
-#include "gdb_assert.h"
 #include "ppc-tdep.h"
 #include "target.h"
 #include "objfiles.h"
diff --git a/gdb/ppcfbsd-nat.c b/gdb/ppcfbsd-nat.c
index aeb47aff126..1b27c6bffc7 100644
--- a/gdb/ppcfbsd-nat.c
+++ b/gdb/ppcfbsd-nat.c
@@ -22,7 +22,6 @@
 #include "inferior.h"
 #include "regcache.h"
 
-#include "gdb_assert.h"
 #include <sys/types.h>
 #include <sys/procfs.h>
 #include <sys/ptrace.h>
diff --git a/gdb/ppcfbsd-tdep.c b/gdb/ppcfbsd-tdep.c
index 28f5b7bf82b..21a3bbc9f83 100644
--- a/gdb/ppcfbsd-tdep.c
+++ b/gdb/ppcfbsd-tdep.c
@@ -30,7 +30,6 @@
 #include "target.h"
 #include "trad-frame.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 
 #include "ppc-tdep.h"
diff --git a/gdb/ppcnbsd-nat.c b/gdb/ppcnbsd-nat.c
index db3453821e5..5c5bb64363e 100644
--- a/gdb/ppcnbsd-nat.c
+++ b/gdb/ppcnbsd-nat.c
@@ -31,8 +31,6 @@
 #include "inferior.h"
 #include "regcache.h"
 
-#include "gdb_assert.h"
-
 #include "ppc-tdep.h"
 #include "ppcnbsd-tdep.h"
 #include "bsd-kvm.h"
diff --git a/gdb/ppcnbsd-tdep.c b/gdb/ppcnbsd-tdep.c
index 6fe84779cab..0043994b500 100644
--- a/gdb/ppcnbsd-tdep.c
+++ b/gdb/ppcnbsd-tdep.c
@@ -27,7 +27,6 @@
 #include "trad-frame.h"
 #include "tramp-frame.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 
 #include "ppc-tdep.h"
diff --git a/gdb/ppcobsd-nat.c b/gdb/ppcobsd-nat.c
index 9e3e85b78a1..0c82ecab566 100644
--- a/gdb/ppcobsd-nat.c
+++ b/gdb/ppcobsd-nat.c
@@ -22,7 +22,6 @@
 #include "inferior.h"
 #include "regcache.h"
 
-#include "gdb_assert.h"
 #include <sys/types.h>
 #include <sys/ptrace.h>
 #include <sys/signal.h>
diff --git a/gdb/ppcobsd-tdep.c b/gdb/ppcobsd-tdep.c
index 2cdf68713b8..b3a9677c020 100644
--- a/gdb/ppcobsd-tdep.c
+++ b/gdb/ppcobsd-tdep.c
@@ -28,7 +28,6 @@
 #include "symtab.h"
 #include "trad-frame.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 
 #include "ppc-tdep.h"
diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index b4fd894df03..3e8e6a879c5 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -37,7 +37,6 @@
 #include "objfiles.h"		/* ditto */
 #include "completer.h"		/* for completion functions */
 #include "ui-out.h"
-#include "gdb_assert.h"
 #include "block.h"
 #include "disasm.h"
 #include "dfp.h"
diff --git a/gdb/procfs.c b/gdb/procfs.c
index 5075dcda90c..40aaed502b3 100644
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -48,7 +48,6 @@
 #include <ctype.h>
 #include "gdb_bfd.h"
 #include <string.h>
-#include "gdb_assert.h"
 #include "inflow.h"
 #include "auxv.h"
 #include "procfs.h"
diff --git a/gdb/prologue-value.c b/gdb/prologue-value.c
index 56b32f4aa4b..f82e1a1fab0 100644
--- a/gdb/prologue-value.c
+++ b/gdb/prologue-value.c
@@ -18,7 +18,6 @@
 
 #include "defs.h"
 #include <string.h>
-#include "gdb_assert.h"
 #include "prologue-value.h"
 #include "regcache.h"
 
diff --git a/gdb/psymtab.c b/gdb/psymtab.c
index ba6a58a5b76..6c0c880a97a 100644
--- a/gdb/psymtab.c
+++ b/gdb/psymtab.c
@@ -21,7 +21,6 @@
 #include "symtab.h"
 #include "psympriv.h"
 #include "objfiles.h"
-#include "gdb_assert.h"
 #include "block.h"
 #include "filenames.h"
 #include "source.h"
diff --git a/gdb/python/py-lazy-string.c b/gdb/python/py-lazy-string.c
index ac9fc0c7641..0cec3870ff8 100644
--- a/gdb/python/py-lazy-string.c
+++ b/gdb/python/py-lazy-string.c
@@ -24,7 +24,6 @@
 #include "exceptions.h"
 #include "valprint.h"
 #include "language.h"
-#include "gdb_assert.h"
 
 typedef struct {
   PyObject_HEAD
diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c
index 8532da69da4..bdec38925a5 100644
--- a/gdb/python/py-value.c
+++ b/gdb/python/py-value.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_assert.h"
 #include "charset.h"
 #include "value.h"
 #include "exceptions.h"
diff --git a/gdb/regcache.c b/gdb/regcache.c
index 5ee90b08055..506067fefac 100644
--- a/gdb/regcache.c
+++ b/gdb/regcache.c
@@ -24,7 +24,6 @@
 #include "gdbcmd.h"
 #include "regcache.h"
 #include "reggroups.h"
-#include "gdb_assert.h"
 #include <string.h>
 #include "observer.h"
 #include "exceptions.h"
diff --git a/gdb/reggroups.c b/gdb/reggroups.c
index 41ec41a523f..66b5c7867be 100644
--- a/gdb/reggroups.c
+++ b/gdb/reggroups.c
@@ -23,7 +23,6 @@
 #include "arch-utils.h"
 #include "reggroups.h"
 #include "gdbtypes.h"
-#include "gdb_assert.h"
 #include "regcache.h"
 #include "command.h"
 #include "gdbcmd.h"		/* For maintenanceprintlist.  */
diff --git a/gdb/registry.c b/gdb/registry.c
index 2fd60335e88..378c369e306 100644
--- a/gdb/registry.c
+++ b/gdb/registry.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include "registry.h"
-#include "gdb_assert.h"
 #include <string.h>
 
 const struct registry_data *
diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index 52758fa50b1..0834b3ffa77 100644
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -37,7 +37,6 @@
 #include "gdb/remote-sim.h"
 #include "command.h"
 #include "regcache.h"
-#include "gdb_assert.h"
 #include "sim-regno.h"
 #include "arch-utils.h"
 #include "readline/readline.h"
diff --git a/gdb/remote.c b/gdb/remote.c
index fcddd1cc864..dbf67f2e95d 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -38,7 +38,6 @@
 #include "remote-notif.h"
 #include "regcache.h"
 #include "value.h"
-#include "gdb_assert.h"
 #include "observer.h"
 #include "solib.h"
 #include "cli/cli-decode.h"
diff --git a/gdb/rs6000-aix-tdep.c b/gdb/rs6000-aix-tdep.c
index 83e881e6bd6..3845df83f59 100644
--- a/gdb/rs6000-aix-tdep.c
+++ b/gdb/rs6000-aix-tdep.c
@@ -21,7 +21,6 @@
 
 #include "defs.h"
 #include <string.h>
-#include "gdb_assert.h"
 #include "osabi.h"
 #include "regcache.h"
 #include "regset.h"
diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index c4ce51c5430..41f80d57803 100644
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -55,7 +55,6 @@
 #include "ppc-tdep.h"
 #include "ppc-ravenscar-thread.h"
 
-#include "gdb_assert.h"
 #include "dis-asm.h"
 
 #include "trad-frame.h"
diff --git a/gdb/s390-linux-tdep.c b/gdb/s390-linux-tdep.c
index ea743b591f9..d10e47a03ff 100644
--- a/gdb/s390-linux-tdep.c
+++ b/gdb/s390-linux-tdep.c
@@ -39,7 +39,6 @@
 #include "reggroups.h"
 #include "regset.h"
 #include "value.h"
-#include "gdb_assert.h"
 #include "dis-asm.h"
 #include "solib-svr4.h"
 #include "prologue-value.h"
diff --git a/gdb/score-tdep.c b/gdb/score-tdep.c
index c224189d16b..977216dbe9f 100644
--- a/gdb/score-tdep.c
+++ b/gdb/score-tdep.c
@@ -22,7 +22,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_assert.h"
 #include "inferior.h"
 #include "symtab.h"
 #include "objfiles.h"
diff --git a/gdb/ser-base.c b/gdb/ser-base.c
index b8f7fd2bf5f..5f677a9abb9 100644
--- a/gdb/ser-base.c
+++ b/gdb/ser-base.c
@@ -24,7 +24,6 @@
 
 #include "gdb_select.h"
 #include <string.h>
-#include "gdb_assert.h"
 #include <sys/time.h>
 #ifdef USE_WIN32API
 #include <winsock2.h>
diff --git a/gdb/ser-mingw.c b/gdb/ser-mingw.c
index a6469ea8cfb..ab4de3ba1d4 100644
--- a/gdb/ser-mingw.c
+++ b/gdb/ser-mingw.c
@@ -29,7 +29,6 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#include "gdb_assert.h"
 #include <string.h>
 
 #include "command.h"
diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c
index 0c1fbed2dba..32905667b4f 100644
--- a/gdb/sh-tdep.c
+++ b/gdb/sh-tdep.c
@@ -33,7 +33,6 @@
 #include "dis-asm.h"
 #include "inferior.h"
 #include <string.h>
-#include "gdb_assert.h"
 #include "arch-utils.h"
 #include "floatformat.h"
 #include "regcache.h"
diff --git a/gdb/sh64-tdep.c b/gdb/sh64-tdep.c
index 9f115e0174d..b2dd3a4048c 100644
--- a/gdb/sh64-tdep.c
+++ b/gdb/sh64-tdep.c
@@ -33,7 +33,6 @@
 #include "dis-asm.h"
 #include "inferior.h"
 #include <string.h>
-#include "gdb_assert.h"
 #include "arch-utils.h"
 #include "regcache.h"
 #include "osabi.h"
diff --git a/gdb/solib-darwin.c b/gdb/solib-darwin.c
index 03b51d5b92c..8782c813e4f 100644
--- a/gdb/solib-darwin.c
+++ b/gdb/solib-darwin.c
@@ -30,8 +30,6 @@
 #include "gdbthread.h"
 #include "gdb_bfd.h"
 
-#include "gdb_assert.h"
-
 #include "solist.h"
 #include "solib.h"
 #include "solib-svr4.h"
diff --git a/gdb/solib-spu.c b/gdb/solib-spu.c
index 1c574b537b4..b657b7fecd9 100644
--- a/gdb/solib-spu.c
+++ b/gdb/solib-spu.c
@@ -22,7 +22,6 @@
 #include "solib-spu.h"
 #include "gdbcore.h"
 #include <string.h>
-#include "gdb_assert.h"
 #include <sys/stat.h>
 #include "arch-utils.h"
 #include "bfd.h"
diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
index 05f29a924d9..3deef209bce 100644
--- a/gdb/solib-svr4.c
+++ b/gdb/solib-svr4.c
@@ -35,8 +35,6 @@
 #include "gdbthread.h"
 #include "observer.h"
 
-#include "gdb_assert.h"
-
 #include "solist.h"
 #include "solib.h"
 #include "solib-svr4.h"
diff --git a/gdb/source.c b/gdb/source.c
index 14b1f71c855..5a44bb7a302 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -26,7 +26,6 @@
 #include "gdbcmd.h"
 #include "frame.h"
 #include "value.h"
-#include "gdb_assert.h"
 #include "filestuff.h"
 
 #include <sys/types.h>
diff --git a/gdb/sparc-nat.c b/gdb/sparc-nat.c
index 22e1e5f85da..e83e7d1f692 100644
--- a/gdb/sparc-nat.c
+++ b/gdb/sparc-nat.c
@@ -22,7 +22,6 @@
 #include "regcache.h"
 #include "target.h"
 
-#include "gdb_assert.h"
 #include <signal.h>
 #include <string.h>
 #include <sys/ptrace.h>
diff --git a/gdb/sparc-sol2-tdep.c b/gdb/sparc-sol2-tdep.c
index 4452c00c698..c23ce2b5338 100644
--- a/gdb/sparc-sol2-tdep.c
+++ b/gdb/sparc-sol2-tdep.c
@@ -28,7 +28,6 @@
 #include "target.h"
 #include "trad-frame.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 
 #include "sol2-tdep.h"
diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
index e7b30902a04..b075437d6f4 100644
--- a/gdb/sparc-tdep.c
+++ b/gdb/sparc-tdep.c
@@ -35,7 +35,6 @@
 #include "target.h"
 #include "value.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 
 #include "sparc-tdep.h"
diff --git a/gdb/sparc64-sol2-tdep.c b/gdb/sparc64-sol2-tdep.c
index 507838a5d43..23e943d0f94 100644
--- a/gdb/sparc64-sol2-tdep.c
+++ b/gdb/sparc64-sol2-tdep.c
@@ -26,8 +26,6 @@
 #include "osabi.h"
 #include "trad-frame.h"
 
-#include "gdb_assert.h"
-
 #include "sol2-tdep.h"
 #include "sparc64-tdep.h"
 #include "solib-svr4.h"
diff --git a/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c
index 40931d6062a..abb7350d65c 100644
--- a/gdb/sparc64-tdep.c
+++ b/gdb/sparc64-tdep.c
@@ -34,7 +34,6 @@
 #include "target.h"
 #include "value.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 
 #include "sparc64-tdep.h"
diff --git a/gdb/sparc64fbsd-tdep.c b/gdb/sparc64fbsd-tdep.c
index fde7815290f..453f2b43613 100644
--- a/gdb/sparc64fbsd-tdep.c
+++ b/gdb/sparc64fbsd-tdep.c
@@ -27,7 +27,6 @@
 #include "target.h"
 #include "trad-frame.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 
 #include "sparc64-tdep.h"
diff --git a/gdb/sparc64nbsd-tdep.c b/gdb/sparc64nbsd-tdep.c
index b67c7620981..0d2a4e0a3a1 100644
--- a/gdb/sparc64nbsd-tdep.c
+++ b/gdb/sparc64nbsd-tdep.c
@@ -30,7 +30,6 @@
 #include "solib-svr4.h"
 #include "trad-frame.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 
 #include "sparc64-tdep.h"
diff --git a/gdb/sparc64obsd-tdep.c b/gdb/sparc64obsd-tdep.c
index 8cc04f7530a..9151151f233 100644
--- a/gdb/sparc64obsd-tdep.c
+++ b/gdb/sparc64obsd-tdep.c
@@ -28,8 +28,6 @@
 #include "objfiles.h"
 #include "trad-frame.h"
 
-#include "gdb_assert.h"
-
 #include "obsd-tdep.h"
 #include "sparc64-tdep.h"
 #include "solib-svr4.h"
diff --git a/gdb/sparcnbsd-tdep.c b/gdb/sparcnbsd-tdep.c
index b2678422feb..7c4d6ee2481 100644
--- a/gdb/sparcnbsd-tdep.c
+++ b/gdb/sparcnbsd-tdep.c
@@ -30,7 +30,6 @@
 #include "symtab.h"
 #include "trad-frame.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 
 #include "sparc-tdep.h"
diff --git a/gdb/sparcobsd-tdep.c b/gdb/sparcobsd-tdep.c
index 10f91fe3688..89365c4a0d0 100644
--- a/gdb/sparcobsd-tdep.c
+++ b/gdb/sparcobsd-tdep.c
@@ -27,8 +27,6 @@
 #include "symtab.h"
 #include "trad-frame.h"
 
-#include "gdb_assert.h"
-
 #include "obsd-tdep.h"
 #include "sparc-tdep.h"
 #include "solib-svr4.h"
diff --git a/gdb/spu-multiarch.c b/gdb/spu-multiarch.c
index e3285d0235c..2bce90e2f75 100644
--- a/gdb/spu-multiarch.c
+++ b/gdb/spu-multiarch.c
@@ -22,7 +22,6 @@
 #include "gdbcore.h"
 #include "gdbcmd.h"
 #include <string.h>
-#include "gdb_assert.h"
 #include "arch-utils.h"
 #include "observer.h"
 #include "inferior.h"
diff --git a/gdb/spu-tdep.c b/gdb/spu-tdep.c
index 3980fe7c19c..6b46df1197e 100644
--- a/gdb/spu-tdep.c
+++ b/gdb/spu-tdep.c
@@ -25,7 +25,6 @@
 #include "gdbcmd.h"
 #include "gdbcore.h"
 #include <string.h>
-#include "gdb_assert.h"
 #include "frame.h"
 #include "frame-unwind.h"
 #include "frame-base.h"
diff --git a/gdb/stabsread.c b/gdb/stabsread.c
index 592350e0fea..9a25b0cb950 100644
--- a/gdb/stabsread.c
+++ b/gdb/stabsread.c
@@ -44,8 +44,6 @@
 #include "doublest.h"
 #include "cp-abi.h"
 #include "cp-support.h"
-#include "gdb_assert.h"
-
 #include <ctype.h>
 
 /* Ask stabsread.h to define the vars it normally declares `extern'.  */
diff --git a/gdb/stack.c b/gdb/stack.c
index 3ca4db03ad2..9243f69a817 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -49,7 +49,6 @@
 #include "cli/cli-utils.h"
 #include "objfiles.h"
 
-#include "gdb_assert.h"
 #include <ctype.h>
 #include <string.h>
 
diff --git a/gdb/symfile.c b/gdb/symfile.c
index 42707ac8216..921c3b8313d 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -45,7 +45,6 @@
 #include "bcache.h"
 #include "hashtab.h"
 #include "readline/readline.h"
-#include "gdb_assert.h"
 #include "block.h"
 #include "observer.h"
 #include "exec.h"
diff --git a/gdb/symtab.c b/gdb/symtab.c
index 09f31141647..e64d0df8864 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -56,7 +56,6 @@
 #include "cp-abi.h"
 #include "cp-support.h"
 #include "observer.h"
-#include "gdb_assert.h"
 #include "solist.h"
 #include "macrotab.h"
 #include "macroscope.h"
diff --git a/gdb/target-descriptions.c b/gdb/target-descriptions.c
index 6b3389a8dc7..45706477fe7 100644
--- a/gdb/target-descriptions.c
+++ b/gdb/target-descriptions.c
@@ -31,7 +31,6 @@
 #include "xml-tdesc.h"
 #include "osabi.h"
 
-#include "gdb_assert.h"
 #include "gdb_obstack.h"
 #include "hashtab.h"
 #include "inferior.h"
diff --git a/gdb/target-memory.c b/gdb/target-memory.c
index 583d337de36..c545909ac45 100644
--- a/gdb/target-memory.c
+++ b/gdb/target-memory.c
@@ -23,8 +23,6 @@
 #include "target.h"
 #include "memory-map.h"
 
-#include "gdb_assert.h"
-
 #include <sys/time.h>
 
 static int
diff --git a/gdb/target.c b/gdb/target.c
index 9b907fa75fc..16151c49826 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -34,7 +34,6 @@
 #include "dcache.h"
 #include <signal.h>
 #include "regcache.h"
-#include "gdb_assert.h"
 #include "gdbcore.h"
 #include "exceptions.h"
 #include "target-descriptions.h"
diff --git a/gdb/tic6x-linux-tdep.c b/gdb/tic6x-linux-tdep.c
index 1e1aa2242a4..0081769ea4e 100644
--- a/gdb/tic6x-linux-tdep.c
+++ b/gdb/tic6x-linux-tdep.c
@@ -24,7 +24,6 @@
 #include "tic6x-tdep.h"
 #include "trad-frame.h"
 #include "tramp-frame.h"
-#include "gdb_assert.h"
 #include "elf-bfd.h"
 #include "elf/tic6x.h"
 
diff --git a/gdb/tic6x-tdep.c b/gdb/tic6x-tdep.c
index 96fa83e2840..ae3138e003e 100644
--- a/gdb/tic6x-tdep.c
+++ b/gdb/tic6x-tdep.c
@@ -44,7 +44,6 @@
 #include "linux-tdep.h"
 #include "solib.h"
 #include "objfiles.h"
-#include "gdb_assert.h"
 #include "osabi.h"
 #include "tic6x-tdep.h"
 #include "language.h"
diff --git a/gdb/tilegx-linux-nat.c b/gdb/tilegx-linux-nat.c
index a00f386909d..80a5e579906 100644
--- a/gdb/tilegx-linux-nat.c
+++ b/gdb/tilegx-linux-nat.c
@@ -25,7 +25,6 @@
 
 #include <sys/ptrace.h>
 
-#include "gdb_assert.h"
 #include <string.h>
 
 #include <sys/procfs.h>
diff --git a/gdb/tilegx-tdep.c b/gdb/tilegx-tdep.c
index d2aae95fd5c..01742e8aa2c 100644
--- a/gdb/tilegx-tdep.c
+++ b/gdb/tilegx-tdep.c
@@ -31,7 +31,6 @@
 #include "dis-asm.h"
 #include "inferior.h"
 #include <string.h>
-#include "gdb_assert.h"
 #include "arch-utils.h"
 #include "floatformat.h"
 #include "regcache.h"
diff --git a/gdb/top.c b/gdb/top.c
index 19c88f9ffdd..319324f403d 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -42,7 +42,6 @@
 #include "version.h"
 #include "serial.h"
 #include "doublest.h"
-#include "gdb_assert.h"
 #include "main.h"
 #include "event-loop.h"
 #include "gdbthread.h"
diff --git a/gdb/tramp-frame.c b/gdb/tramp-frame.c
index daa804c5ce6..0fd6ddccc2f 100644
--- a/gdb/tramp-frame.c
+++ b/gdb/tramp-frame.c
@@ -26,7 +26,6 @@
 #include "target.h"
 #include "trad-frame.h"
 #include "frame-base.h"
-#include "gdb_assert.h"
 
 struct frame_data
 {
diff --git a/gdb/tui/tui-out.c b/gdb/tui/tui-out.c
index 44f76a26fed..ff782f6ca1a 100644
--- a/gdb/tui/tui-out.c
+++ b/gdb/tui/tui-out.c
@@ -25,7 +25,6 @@
 #include "cli-out.h"
 #include "tui.h"
 #include <string.h>
-#include "gdb_assert.h"
 
 struct tui_ui_out_data
   {
diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index c641e18a6ad..062520696e8 100644
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -40,7 +40,6 @@
 
 #include <string.h>
 #include "gdb_curses.h"
-#include "gdb_assert.h"
 
 /* Function to display the "main" routine.  */
 void
diff --git a/gdb/ui-out.c b/gdb/ui-out.c
index 63cbc6e6858..205af9c3ddd 100644
--- a/gdb/ui-out.c
+++ b/gdb/ui-out.c
@@ -25,7 +25,6 @@
 #include "expression.h"		/* For language.h */
 #include "language.h"
 #include "ui-out.h"
-#include "gdb_assert.h"
 
 /* table header structures */
 
diff --git a/gdb/user-regs.c b/gdb/user-regs.c
index db0cac8e691..f4ec54a3637 100644
--- a/gdb/user-regs.c
+++ b/gdb/user-regs.c
@@ -23,7 +23,6 @@
 #include "user-regs.h"
 #include "gdbtypes.h"
 #include <string.h>
-#include "gdb_assert.h"
 #include "frame.h"
 
 /* A table of user registers.
diff --git a/gdb/utils.c b/gdb/utils.c
index 23055ce0cc1..4cf9efa7425 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include "dyn-string.h"
-#include "gdb_assert.h"
 #include <ctype.h>
 #include <string.h>
 #include "gdb_wait.h"
diff --git a/gdb/v850-tdep.c b/gdb/v850-tdep.c
index 27740cabbd8..3e4447aab88 100644
--- a/gdb/v850-tdep.c
+++ b/gdb/v850-tdep.c
@@ -26,7 +26,6 @@
 #include "gdbtypes.h"
 #include "inferior.h"
 #include <string.h>
-#include "gdb_assert.h"
 #include "gdbcore.h"
 #include "arch-utils.h"
 #include "regcache.h"
diff --git a/gdb/valops.c b/gdb/valops.c
index 4164d6360a3..6cd66c71452 100644
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -38,7 +38,6 @@
 #include "tracepoint.h"
 #include <errno.h>
 #include <string.h>
-#include "gdb_assert.h"
 #include "observer.h"
 #include "objfiles.h"
 #include "exceptions.h"
diff --git a/gdb/value.c b/gdb/value.c
index 19e391cbffb..d22da1a1407 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -30,7 +30,6 @@
 #include "language.h"
 #include "demangle.h"
 #include "doublest.h"
-#include "gdb_assert.h"
 #include "regcache.h"
 #include "block.h"
 #include "dfp.h"
diff --git a/gdb/varobj.c b/gdb/varobj.c
index cf1b8a8800c..d3502341a22 100644
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -25,7 +25,6 @@
 #include "block.h"
 #include "valprint.h"
 
-#include "gdb_assert.h"
 #include <string.h>
 #include "gdb_regex.h"
 
diff --git a/gdb/vax-nat.c b/gdb/vax-nat.c
index 9d4caf59d3e..c39ae296a9c 100644
--- a/gdb/vax-nat.c
+++ b/gdb/vax-nat.c
@@ -20,7 +20,6 @@
 #include "defs.h"
 #include "inferior.h"
 
-#include "gdb_assert.h"
 #include <sys/types.h>
 #include <sys/dir.h>
 #include <sys/user.h>
diff --git a/gdb/xml-syscall.c b/gdb/xml-syscall.c
index 31d4ae63ef3..382446828ed 100644
--- a/gdb/xml-syscall.c
+++ b/gdb/xml-syscall.c
@@ -28,8 +28,6 @@
 
 #include "filenames.h"
 
-#include "gdb_assert.h"
-
 #ifndef HAVE_LIBEXPAT
 
 /* Dummy functions to indicate that there's no support for fetching
diff --git a/gdb/xml-tdesc.c b/gdb/xml-tdesc.c
index 9dcfee4e567..6e85ebd4f99 100644
--- a/gdb/xml-tdesc.c
+++ b/gdb/xml-tdesc.c
@@ -28,8 +28,6 @@
 
 #include "filenames.h"
 
-#include "gdb_assert.h"
-
 #if !defined(HAVE_LIBEXPAT)
 
 /* Parse DOCUMENT into a target description.  Or don't, since we don't have
diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c
index b2686cbf8f8..2f387399987 100644
--- a/gdb/xstormy16-tdep.c
+++ b/gdb/xstormy16-tdep.c
@@ -30,7 +30,6 @@
 #include "dis-asm.h"
 #include "inferior.h"
 #include <string.h>
-#include "gdb_assert.h"
 #include "arch-utils.h"
 #include "floatformat.h"
 #include "regcache.h"
diff --git a/gdb/xtensa-linux-nat.c b/gdb/xtensa-linux-nat.c
index 9340c62fe85..945f3795262 100644
--- a/gdb/xtensa-linux-nat.c
+++ b/gdb/xtensa-linux-nat.c
@@ -23,7 +23,6 @@
 #include "inferior.h"
 #include "gdbcore.h"
 #include "regcache.h"
-#include "gdb_assert.h"
 #include "target.h"
 #include "linux-nat.h"
 
diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
index 432a9de7557..24ec5f01cbb 100644
--- a/gdb/xtensa-tdep.c
+++ b/gdb/xtensa-tdep.c
@@ -47,7 +47,6 @@
 
 #include "command.h"
 #include "gdbcmd.h"
-#include "gdb_assert.h"
 
 #include "xtensa-isa.h"
 #include "xtensa-tdep.h"