Remove spurious exceptions.h inclusions

defs.h includes utils.h, and utils.h includes exceptions.h.  All GDB
.c files include defs.h as their first line, so no file other than
utils.h needs to include exceptions.h.  This commit removes all such
inclusions.

gdb/ChangeLog:

	* ada-lang.c: Do not include exceptions.h.
	* ada-valprint.c: Likewise.
	* amd64-tdep.c: Likewise.
	* auto-load.c: Likewise.
	* block.c: Likewise.
	* break-catch-throw.c: Likewise.
	* breakpoint.c: Likewise.
	* btrace.c: Likewise.
	* c-lang.c: Likewise.
	* cli/cli-cmds.c: Likewise.
	* cli/cli-interp.c: Likewise.
	* cli/cli-script.c: Likewise.
	* completer.c: Likewise.
	* corefile.c: Likewise.
	* corelow.c: Likewise.
	* cp-abi.c: Likewise.
	* cp-support.c: Likewise.
	* cp-valprint.c: Likewise.
	* darwin-nat.c: Likewise.
	* dwarf2-frame-tailcall.c: Likewise.
	* dwarf2-frame.c: Likewise.
	* dwarf2loc.c: Likewise.
	* dwarf2read.c: Likewise.
	* eval.c: Likewise.
	* event-loop.c: Likewise.
	* event-top.c: Likewise.
	* f-valprint.c: Likewise.
	* frame-unwind.c: Likewise.
	* frame.c: Likewise.
	* gdbtypes.c: Likewise.
	* gnu-v2-abi.c: Likewise.
	* gnu-v3-abi.c: Likewise.
	* guile/scm-auto-load.c: Likewise.
	* guile/scm-breakpoint.c: Likewise.
	* guile/scm-cmd.c: Likewise.
	* guile/scm-frame.c: Likewise.
	* guile/scm-lazy-string.c: Likewise.
	* guile/scm-param.c: Likewise.
	* guile/scm-symbol.c: Likewise.
	* guile/scm-type.c: Likewise.
	* hppa-hpux-tdep.c: Likewise.
	* i386-tdep.c: Likewise.
	* inf-loop.c: Likewise.
	* infcall.c: Likewise.
	* infcmd.c: Likewise.
	* infrun.c: Likewise.
	* interps.c: Likewise.
	* interps.h: Likewise.
	* jit.c: Likewise.
	* linespec.c: Likewise.
	* linux-nat.c: Likewise.
	* linux-thread-db.c: Likewise.
	* m32r-rom.c: Likewise.
	* main.c: Likewise.
	* memory-map.c: Likewise.
	* mi/mi-cmd-break.c: Likewise.
	* mi/mi-cmd-stack.c: Likewise.
	* mi/mi-interp.c: Likewise.
	* mi/mi-main.c: Likewise.
	* monitor.c: Likewise.
	* nto-procfs.c: Likewise.
	* objc-lang.c: Likewise.
	* p-valprint.c: Likewise.
	* parse.c: Likewise.
	* ppc-linux-tdep.c: Likewise.
	* printcmd.c: Likewise.
	* probe.c: Likewise.
	* python/py-auto-load.c: Likewise.
	* python/py-breakpoint.c: Likewise.
	* python/py-cmd.c: Likewise.
	* python/py-finishbreakpoint.c: Likewise.
	* python/py-frame.c: Likewise.
	* python/py-framefilter.c: Likewise.
	* python/py-function.c: Likewise.
	* python/py-gdb-readline.c: Likewise.
	* python/py-inferior.c: Likewise.
	* python/py-infthread.c: Likewise.
	* python/py-lazy-string.c: Likewise.
	* python/py-linetable.c: Likewise.
	* python/py-param.c: Likewise.
	* python/py-prettyprint.c: Likewise.
	* python/py-symbol.c: Likewise.
	* python/py-type.c: Likewise.
	* python/py-value.c: Likewise.
	* python/python-internal.h: Likewise.
	* python/python.c: Likewise.
	* record-btrace.c: Likewise.
	* record-full.c: Likewise.
	* regcache.c: Likewise.
	* remote-fileio.c: Likewise.
	* remote-mips.c: Likewise.
	* remote.c: Likewise.
	* rs6000-aix-tdep.c: Likewise.
	* rs6000-nat.c: Likewise.
	* skip.c: Likewise.
	* solib-darwin.c: Likewise.
	* solib-dsbt.c: Likewise.
	* solib-frv.c: Likewise.
	* solib-ia64-hpux.c: Likewise.
	* solib-spu.c: Likewise.
	* solib-svr4.c: Likewise.
	* solib.c: Likewise.
	* spu-tdep.c: Likewise.
	* stack.c: Likewise.
	* stap-probe.c: Likewise.
	* symfile-mem.c: Likewise.
	* symmisc.c: Likewise.
	* target.c: Likewise.
	* thread.c: Likewise.
	* top.c: Likewise.
	* tracepoint.c: Likewise.
	* tui/tui-interp.c: Likewise.
	* typeprint.c: Likewise.
	* utils.c: Likewise.
	* valarith.c: Likewise.
	* valops.c: Likewise.
	* valprint.c: Likewise.
	* value.c: Likewise.
	* varobj.c: Likewise.
	* windows-nat.c: Likewise.
	* xml-support.c: Likewise.

122 files changed, 124 insertions, 126 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9131329..61ee15f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,127 @@
+2014-10-08  Gary Benson  <gbenson@redhat.com>
+
+	* ada-lang.c: Do not include exceptions.h.
+	* ada-valprint.c: Likewise.
+	* amd64-tdep.c: Likewise.
+	* auto-load.c: Likewise.
+	* block.c: Likewise.
+	* break-catch-throw.c: Likewise.
+	* breakpoint.c: Likewise.
+	* btrace.c: Likewise.
+	* c-lang.c: Likewise.
+	* cli/cli-cmds.c: Likewise.
+	* cli/cli-interp.c: Likewise.
+	* cli/cli-script.c: Likewise.
+	* completer.c: Likewise.
+	* corefile.c: Likewise.
+	* corelow.c: Likewise.
+	* cp-abi.c: Likewise.
+	* cp-support.c: Likewise.
+	* cp-valprint.c: Likewise.
+	* darwin-nat.c: Likewise.
+	* dwarf2-frame-tailcall.c: Likewise.
+	* dwarf2-frame.c: Likewise.
+	* dwarf2loc.c: Likewise.
+	* dwarf2read.c: Likewise.
+	* eval.c: Likewise.
+	* event-loop.c: Likewise.
+	* event-top.c: Likewise.
+	* f-valprint.c: Likewise.
+	* frame-unwind.c: Likewise.
+	* frame.c: Likewise.
+	* gdbtypes.c: Likewise.
+	* gnu-v2-abi.c: Likewise.
+	* gnu-v3-abi.c: Likewise.
+	* guile/scm-auto-load.c: Likewise.
+	* guile/scm-breakpoint.c: Likewise.
+	* guile/scm-cmd.c: Likewise.
+	* guile/scm-frame.c: Likewise.
+	* guile/scm-lazy-string.c: Likewise.
+	* guile/scm-param.c: Likewise.
+	* guile/scm-symbol.c: Likewise.
+	* guile/scm-type.c: Likewise.
+	* hppa-hpux-tdep.c: Likewise.
+	* i386-tdep.c: Likewise.
+	* inf-loop.c: Likewise.
+	* infcall.c: Likewise.
+	* infcmd.c: Likewise.
+	* infrun.c: Likewise.
+	* interps.c: Likewise.
+	* interps.h: Likewise.
+	* jit.c: Likewise.
+	* linespec.c: Likewise.
+	* linux-nat.c: Likewise.
+	* linux-thread-db.c: Likewise.
+	* m32r-rom.c: Likewise.
+	* main.c: Likewise.
+	* memory-map.c: Likewise.
+	* mi/mi-cmd-break.c: Likewise.
+	* mi/mi-cmd-stack.c: Likewise.
+	* mi/mi-interp.c: Likewise.
+	* mi/mi-main.c: Likewise.
+	* monitor.c: Likewise.
+	* nto-procfs.c: Likewise.
+	* objc-lang.c: Likewise.
+	* p-valprint.c: Likewise.
+	* parse.c: Likewise.
+	* ppc-linux-tdep.c: Likewise.
+	* printcmd.c: Likewise.
+	* probe.c: Likewise.
+	* python/py-auto-load.c: Likewise.
+	* python/py-breakpoint.c: Likewise.
+	* python/py-cmd.c: Likewise.
+	* python/py-finishbreakpoint.c: Likewise.
+	* python/py-frame.c: Likewise.
+	* python/py-framefilter.c: Likewise.
+	* python/py-function.c: Likewise.
+	* python/py-gdb-readline.c: Likewise.
+	* python/py-inferior.c: Likewise.
+	* python/py-infthread.c: Likewise.
+	* python/py-lazy-string.c: Likewise.
+	* python/py-linetable.c: Likewise.
+	* python/py-param.c: Likewise.
+	* python/py-prettyprint.c: Likewise.
+	* python/py-symbol.c: Likewise.
+	* python/py-type.c: Likewise.
+	* python/py-value.c: Likewise.
+	* python/python-internal.h: Likewise.
+	* python/python.c: Likewise.
+	* record-btrace.c: Likewise.
+	* record-full.c: Likewise.
+	* regcache.c: Likewise.
+	* remote-fileio.c: Likewise.
+	* remote-mips.c: Likewise.
+	* remote.c: Likewise.
+	* rs6000-aix-tdep.c: Likewise.
+	* rs6000-nat.c: Likewise.
+	* skip.c: Likewise.
+	* solib-darwin.c: Likewise.
+	* solib-dsbt.c: Likewise.
+	* solib-frv.c: Likewise.
+	* solib-ia64-hpux.c: Likewise.
+	* solib-spu.c: Likewise.
+	* solib-svr4.c: Likewise.
+	* solib.c: Likewise.
+	* spu-tdep.c: Likewise.
+	* stack.c: Likewise.
+	* stap-probe.c: Likewise.
+	* symfile-mem.c: Likewise.
+	* symmisc.c: Likewise.
+	* target.c: Likewise.
+	* thread.c: Likewise.
+	* top.c: Likewise.
+	* tracepoint.c: Likewise.
+	* tui/tui-interp.c: Likewise.
+	* typeprint.c: Likewise.
+	* utils.c: Likewise.
+	* valarith.c: Likewise.
+	* valops.c: Likewise.
+	* valprint.c: Likewise.
+	* value.c: Likewise.
+	* varobj.c: Likewise.
+	* windows-nat.c: Likewise.
+	* xml-support.c: Likewise.
+
 2014-10-05  Maciej W. Rozycki  <macro@codesourcery.com>
 
 	* mips-tdep.c (add_offset_16): Rewrite to implement what the
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index c7e50e2..36a2f24 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -45,7 +45,6 @@
 #include "block.h"
 #include "infcall.h"
 #include "dictionary.h"
-#include "exceptions.h"
 #include "annotate.h"
 #include "valprint.h"
 #include "source.h"
diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
index ade0a65..6f68fae 100644
--- a/gdb/ada-valprint.c
+++ b/gdb/ada-valprint.c
@@ -30,7 +30,6 @@
 #include "ada-lang.h"
 #include "c-lang.h"
 #include "infcall.h"
-#include "exceptions.h"
 #include "objfiles.h"
 
 static int print_field_values (struct type *, const gdb_byte *,
diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
index 7c8575a..ed41f88 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 "exceptions.h"
 #include "amd64-tdep.h"
 #include "i387-tdep.h"
 
diff --git a/gdb/auto-load.c b/gdb/auto-load.c
index 1112ef2..0f59739 100644
--- a/gdb/auto-load.c
+++ b/gdb/auto-load.c
@@ -26,7 +26,6 @@
 #include "command.h"
 #include "observer.h"
 #include "objfiles.h"
-#include "exceptions.h"
 #include "cli/cli-script.h"
 #include "gdbcmd.h"
 #include "cli/cli-cmds.h"
diff --git a/gdb/block.c b/gdb/block.c
index a4b9ef5..4a31ea9 100644
--- a/gdb/block.c
+++ b/gdb/block.c
@@ -25,7 +25,6 @@
 #include "cp-support.h"
 #include "addrmap.h"
 #include "gdbtypes.h"
-#include "exceptions.h"
 
 /* This is used by struct block to store namespace-related info for
    C++ files, namely using declarations and the current namespace in
diff --git a/gdb/break-catch-throw.c b/gdb/break-catch-throw.c
index 9831d96..df40771 100644
--- a/gdb/break-catch-throw.c
+++ b/gdb/break-catch-throw.c
@@ -29,7 +29,6 @@
 #include "completer.h"
 #include "gdb_obstack.h"
 #include "mi/mi-common.h"
-#include "exceptions.h"
 #include "linespec.h"
 #include "probe.h"
 #include "objfiles.h"
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index e2170b4..3044916 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -51,7 +51,6 @@
 #include "solib.h"
 #include "solist.h"
 #include "observer.h"
-#include "exceptions.h"
 #include "memattr.h"
 #include "ada-lang.h"
 #include "top.h"
diff --git a/gdb/btrace.c b/gdb/btrace.c
index b5c3c26..b8b5139 100644
--- a/gdb/btrace.c
+++ b/gdb/btrace.c
@@ -22,7 +22,6 @@
 #include "defs.h"
 #include "btrace.h"
 #include "gdbthread.h"
-#include "exceptions.h"
 #include "inferior.h"
 #include "target.h"
 #include "record.h"
diff --git a/gdb/c-lang.c b/gdb/c-lang.c
index 185b38e..1353eea 100644
--- a/gdb/c-lang.c
+++ b/gdb/c-lang.c
@@ -33,7 +33,6 @@
 #include "cp-support.h"
 #include "gdb_obstack.h"
 #include <ctype.h>
-#include "exceptions.h"
 #include "gdbcore.h"
 
 extern void _initialize_c_language (void);
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index b0f1bdf..a9f90b2 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "exceptions.h"
 #include "arch-utils.h"
 #include "dyn-string.h"
 #include "readline/readline.h"
diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c
index 9b2aaaa..94c023a 100644
--- a/gdb/cli/cli-interp.c
+++ b/gdb/cli/cli-interp.c
@@ -23,7 +23,6 @@
 #include "ui-out.h"
 #include "cli-out.h"
 #include "top.h"		/* for "execute_command" */
-#include "exceptions.h"
 #include "infrun.h"
 #include "observer.h"
 
diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c
index 37cb82a..f8ff58d 100644
--- a/gdb/cli/cli-script.c
+++ b/gdb/cli/cli-script.c
@@ -23,7 +23,6 @@
 #include <ctype.h>
 
 #include "ui-out.h"
-#include "exceptions.h"
 #include "top.h"
 #include "breakpoint.h"
 #include "cli/cli-cmds.h"
diff --git a/gdb/completer.c b/gdb/completer.c
index 67d7f45..a0f3fa3 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 "exceptions.h"
 #include "gdb_signals.h"
 
 #include "cli/cli-decode.h"
diff --git a/gdb/corefile.c b/gdb/corefile.c
index a0bb2aa..d86463f 100644
--- a/gdb/corefile.c
+++ b/gdb/corefile.c
@@ -30,7 +30,6 @@
 #include "dis-asm.h"
 #include <sys/stat.h>
 #include "completer.h"
-#include "exceptions.h"
 #include "observer.h"
 #include "cli/cli-utils.h"
 
diff --git a/gdb/corelow.c b/gdb/corelow.c
index 30d3367..dc22f2b 100644
--- a/gdb/corelow.c
+++ b/gdb/corelow.c
@@ -38,7 +38,6 @@
 #include "symfile.h"
 #include "exec.h"
 #include "readline/readline.h"
-#include "exceptions.h"
 #include "solib.h"
 #include "filenames.h"
 #include "progspace.h"
diff --git a/gdb/cp-abi.c b/gdb/cp-abi.c
index eede3e5..7055acb 100644
--- a/gdb/cp-abi.c
+++ b/gdb/cp-abi.c
@@ -21,7 +21,6 @@
 #include "value.h"
 #include "cp-abi.h"
 #include "command.h"
-#include "exceptions.h"
 #include "gdbcmd.h"
 #include "ui-out.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 14aaac8..b475491 100644
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -29,7 +29,6 @@
 #include "block.h"
 #include "complaints.h"
 #include "gdbtypes.h"
-#include "exceptions.h"
 #include "expression.h"
 #include "value.h"
 #include "cp-abi.h"
diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index 62de777..42010c2 100644
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -34,7 +34,6 @@
 #include "cp-support.h"
 #include "language.h"
 #include "extension.h"
-#include "exceptions.h"
 #include "typeprint.h"
 
 /* Controls printing of vtbl's.  */
diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c
index af4ec01..511f370 100644
--- a/gdb/darwin-nat.c
+++ b/gdb/darwin-nat.c
@@ -33,7 +33,6 @@
 #include "event-top.h"
 #include "inf-loop.h"
 #include <sys/stat.h>
-#include "exceptions.h"
 #include "inf-child.h"
 #include "value.h"
 #include "arch-utils.h"
diff --git a/gdb/dwarf2-frame-tailcall.c b/gdb/dwarf2-frame-tailcall.c
index bce4c60..7580c02 100644
--- a/gdb/dwarf2-frame-tailcall.c
+++ b/gdb/dwarf2-frame-tailcall.c
@@ -24,7 +24,6 @@
 #include "frame-unwind.h"
 #include "block.h"
 #include "hashtab.h"
-#include "exceptions.h"
 #include "gdbtypes.h"
 #include "regcache.h"
 #include "value.h"
diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c
index f2330d9..80e5903 100644
--- a/gdb/dwarf2-frame.c
+++ b/gdb/dwarf2-frame.c
@@ -37,7 +37,6 @@
 #include "dwarf2-frame.h"
 #include "ax.h"
 #include "dwarf2loc.h"
-#include "exceptions.h"
 #include "dwarf2-frame-tailcall.h"
 
 struct comp_unit;
diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
index e347e59..71adc89 100644
--- a/gdb/dwarf2loc.c
+++ b/gdb/dwarf2loc.c
@@ -30,7 +30,6 @@
 #include "ax-gdb.h"
 #include "regcache.h"
 #include "objfiles.h"
-#include "exceptions.h"
 #include "block.h"
 #include "gdbcmd.h"
 
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 9d0ee13..eccd11a 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -55,7 +55,6 @@
 #include "typeprint.h"
 #include "jv-lang.h"
 #include "psympriv.h"
-#include "exceptions.h"
 #include <sys/stat.h>
 #include "completer.h"
 #include "vec.h"
diff --git a/gdb/eval.c b/gdb/eval.c
index c379209..5906744 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -33,7 +33,6 @@
 #include "parser-defs.h"
 #include "cp-support.h"
 #include "ui-out.h"
-#include "exceptions.h"
 #include "regcache.h"
 #include "user-regs.h"
 #include "valprint.h"
diff --git a/gdb/event-loop.c b/gdb/event-loop.c
index e40187e..023310c 100644
--- a/gdb/event-loop.c
+++ b/gdb/event-loop.c
@@ -32,7 +32,6 @@
 
 #include <sys/types.h>
 #include <sys/time.h>
-#include "exceptions.h"
 #include "gdb_select.h"
 #include "observer.h"
 
diff --git a/gdb/event-top.c b/gdb/event-top.c
index 833f49d..3f9deec 100644
--- a/gdb/event-top.c
+++ b/gdb/event-top.c
@@ -29,7 +29,6 @@
 #include "event-top.h"
 #include "interps.h"
 #include <signal.h>
-#include "exceptions.h"
 #include "cli/cli-script.h"     /* for reset_command_nest_depth */
 #include "main.h"
 #include "gdbthread.h"
diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
index 9a43cf3..6c25455 100644
--- a/gdb/f-valprint.c
+++ b/gdb/f-valprint.c
@@ -33,7 +33,6 @@
 #include "command.h"
 #include "block.h"
 #include "dictionary.h"
-#include "exceptions.h"
 
 extern void _initialize_f_valprint (void);
 static void info_common_command (char *, int);
diff --git a/gdb/frame-unwind.c b/gdb/frame-unwind.c
index 1068b02..9fdecef 100644
--- a/gdb/frame-unwind.c
+++ b/gdb/frame-unwind.c
@@ -24,7 +24,6 @@
 #include "inline-frame.h"
 #include "value.h"
 #include "regcache.h"
-#include "exceptions.h"
 #include "gdb_obstack.h"
 #include "target.h"
 
diff --git a/gdb/frame.c b/gdb/frame.c
index 1f63819..5c4217c 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -36,7 +36,6 @@
 #include "gdbcmd.h"
 #include "observer.h"
 #include "objfiles.h"
-#include "exceptions.h"
 #include "gdbthread.h"
 #include "block.h"
 #include "inline-frame.h"
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 1326f85..ee33d77 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -34,7 +34,6 @@
 #include "gdbcmd.h"
 #include "cp-abi.h"
 #include "hashtab.h"
-#include "exceptions.h"
 #include "cp-support.h"
 #include "bcache.h"
 #include "dwarf2loc.h"
diff --git a/gdb/gnu-v2-abi.c b/gdb/gnu-v2-abi.c
index 5e55b67..2929b89 100644
--- a/gdb/gnu-v2-abi.c
+++ b/gdb/gnu-v2-abi.c
@@ -27,8 +27,6 @@
 #include "gdb-demangle.h"
 #include "cp-abi.h"
 #include "cp-support.h"
-#include "exceptions.h"
-
 #include <ctype.h>
 
 struct cp_abi_ops gnu_v2_abi_ops;
diff --git a/gdb/gnu-v3-abi.c b/gdb/gnu-v3-abi.c
index d5ed355..d02c8bc 100644
--- a/gdb/gnu-v3-abi.c
+++ b/gdb/gnu-v3-abi.c
@@ -26,7 +26,6 @@
 #include "objfiles.h"
 #include "valprint.h"
 #include "c-lang.h"
-#include "exceptions.h"
 #include "typeprint.h"
 
 static struct cp_abi_ops gnu_v3_abi_ops;
diff --git a/gdb/guile/scm-auto-load.c b/gdb/guile/scm-auto-load.c
index b67d8ff..562f583 100644
--- a/gdb/guile/scm-auto-load.c
+++ b/gdb/guile/scm-auto-load.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include "top.h"
-#include "exceptions.h"
 #include "gdbcmd.h"
 #include "objfiles.h"
 #include "cli/cli-cmds.h"
diff --git a/gdb/guile/scm-breakpoint.c b/gdb/guile/scm-breakpoint.c
index f4c0f0b..aed9f9a 100644
--- a/gdb/guile/scm-breakpoint.c
+++ b/gdb/guile/scm-breakpoint.c
@@ -22,7 +22,6 @@
 
 #include "defs.h"
 #include "value.h"
-#include "exceptions.h"
 #include "breakpoint.h"
 #include "gdbcmd.h"
 #include "gdbthread.h"
diff --git a/gdb/guile/scm-cmd.c b/gdb/guile/scm-cmd.c
index 2c4b2f8..c07800e 100644
--- a/gdb/guile/scm-cmd.c
+++ b/gdb/guile/scm-cmd.c
@@ -22,7 +22,6 @@
 
 #include "defs.h"
 #include <ctype.h>
-#include "exceptions.h"
 #include "charset.h"
 #include "gdbcmd.h"
 #include "cli/cli-decode.h"
diff --git a/gdb/guile/scm-frame.c b/gdb/guile/scm-frame.c
index 32abf6d3..c335385 100644
--- a/gdb/guile/scm-frame.c
+++ b/gdb/guile/scm-frame.c
@@ -23,7 +23,6 @@
 #include "defs.h"
 #include "block.h"
 #include "frame.h"
-#include "exceptions.h"
 #include "inferior.h"
 #include "objfiles.h"
 #include "symfile.h"
diff --git a/gdb/guile/scm-lazy-string.c b/gdb/guile/scm-lazy-string.c
index 88d3004..d833d71 100644
--- a/gdb/guile/scm-lazy-string.c
+++ b/gdb/guile/scm-lazy-string.c
@@ -23,7 +23,6 @@
 #include "defs.h"
 #include "charset.h"
 #include "value.h"
-#include "exceptions.h"
 #include "valprint.h"
 #include "language.h"
 #include "guile-internal.h"
diff --git a/gdb/guile/scm-param.c b/gdb/guile/scm-param.c
index f0f83cd..23bc869 100644
--- a/gdb/guile/scm-param.c
+++ b/gdb/guile/scm-param.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include "value.h"
-#include "exceptions.h"
 #include "charset.h"
 #include "gdbcmd.h"
 #include "cli/cli-decode.h"
diff --git a/gdb/guile/scm-symbol.c b/gdb/guile/scm-symbol.c
index cdc92ef..cb7abf3 100644
--- a/gdb/guile/scm-symbol.c
+++ b/gdb/guile/scm-symbol.c
@@ -22,7 +22,6 @@
 
 #include "defs.h"
 #include "block.h"
-#include "exceptions.h"
 #include "frame.h"
 #include "symtab.h"
 #include "objfiles.h"
diff --git a/gdb/guile/scm-type.c b/gdb/guile/scm-type.c
index 109e030..78b5863 100644
--- a/gdb/guile/scm-type.c
+++ b/gdb/guile/scm-type.c
@@ -23,7 +23,6 @@
 #include "defs.h"
 #include "arch-utils.h"
 #include "value.h"
-#include "exceptions.h"
 #include "gdbtypes.h"
 #include "objfiles.h"
 #include "language.h"
diff --git a/gdb/hppa-hpux-tdep.c b/gdb/hppa-hpux-tdep.c
index ee59811..6ec2af9 100644
--- a/gdb/hppa-hpux-tdep.c
+++ b/gdb/hppa-hpux-tdep.c
@@ -34,7 +34,6 @@
 #include "solib-pa64.h"
 #include "regset.h"
 #include "regcache.h"
-#include "exceptions.h"
 
 #define IS_32BIT_TARGET(_gdbarch) \
 	((gdbarch_tdep (_gdbarch))->bytes_per_address == 4)
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index f685a6a..8387c72 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -44,7 +44,6 @@
 #include "dis-asm.h"
 #include "disasm.h"
 #include "remote.h"
-#include "exceptions.h"
 #include "i386-tdep.h"
 #include "i387-tdep.h"
 #include "x86-xstate.h"
diff --git a/gdb/inf-loop.c b/gdb/inf-loop.c
index d4f9a35..2445209 100644
--- a/gdb/inf-loop.c
+++ b/gdb/inf-loop.c
@@ -25,7 +25,6 @@
 #include "event-top.h"
 #include "inf-loop.h"
 #include "remote.h"
-#include "exceptions.h"
 #include "language.h"
 #include "gdbthread.h"
 #include "continuations.h"
diff --git a/gdb/infcall.c b/gdb/infcall.c
index e60d1d4..bbac693 100644
--- a/gdb/infcall.c
+++ b/gdb/infcall.c
@@ -34,7 +34,6 @@
 #include "dummy-frame.h"
 #include "ada-lang.h"
 #include "gdbthread.h"
-#include "exceptions.h"
 #include "event-top.h"
 
 /* If we can't find a function's name from its address,
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 178bd73..0374533 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -45,7 +45,6 @@
 #include "observer.h"
 #include "target-descriptions.h"
 #include "user-regs.h"
-#include "exceptions.h"
 #include "cli/cli-decode.h"
 #include "gdbthread.h"
 #include "valprint.h"
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 8137eb3..7b43785 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -24,7 +24,6 @@
 #include "symtab.h"
 #include "frame.h"
 #include "inferior.h"
-#include "exceptions.h"
 #include "breakpoint.h"
 #include "gdb_wait.h"
 #include "gdbcore.h"
diff --git a/gdb/interps.c b/gdb/interps.c
index 48c421f..25ccadc 100644
--- a/gdb/interps.c
+++ b/gdb/interps.c
@@ -37,7 +37,6 @@
 #include "interps.h"
 #include "completer.h"
 #include "top.h"		/* For command_loop.  */
-#include "exceptions.h"
 #include "continuations.h"
 
 /* True if the current interpreter in is async mode.  See interps.h
diff --git a/gdb/interps.h b/gdb/interps.h
index 197fa55..dcf5915 100644
--- a/gdb/interps.h
+++ b/gdb/interps.h
@@ -22,8 +22,6 @@
 #ifndef INTERPS_H
 #define INTERPS_H
 
-#include "exceptions.h"
-
 struct ui_out;
 struct interp;
 
diff --git a/gdb/jit.c b/gdb/jit.c
index bc31c7a..c12a72f 100644
--- a/gdb/jit.c
+++ b/gdb/jit.c
@@ -38,7 +38,6 @@
 #include "target.h"
 #include "gdb-dlfcn.h"
 #include <sys/stat.h>
-#include "exceptions.h"
 #include "gdb_bfd.h"
 
 static const char *jit_reader_dir = NULL;
diff --git a/gdb/linespec.c b/gdb/linespec.c
index 8a2c8e3..5325702 100644
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -33,7 +33,6 @@
 #include "block.h"
 #include "objc-lang.h"
 #include "linespec.h"
-#include "exceptions.h"
 #include "language.h"
 #include "interps.h"
 #include "mi/mi-cmds.h"
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index 60f6a84..396c30c 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -61,7 +61,6 @@
 #include "symfile.h"
 #include "agent.h"
 #include "tracepoint.h"
-#include "exceptions.h"
 #include "buffer.h"
 #include "target-descriptions.h"
 #include "filestuff.h"
diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c
index 8adcb40..ff5f2cc 100644
--- a/gdb/linux-thread-db.c
+++ b/gdb/linux-thread-db.c
@@ -24,7 +24,6 @@
 #include "gdb_vecs.h"
 #include "bfd.h"
 #include "command.h"
-#include "exceptions.h"
 #include "gdbcmd.h"
 #include "gdbthread.h"
 #include "inferior.h"
diff --git a/gdb/m32r-rom.c b/gdb/m32r-rom.c
index e373f87..683a11e 100644
--- a/gdb/m32r-rom.c
+++ b/gdb/m32r-rom.c
@@ -25,7 +25,6 @@
 #include "defs.h"
 #include "gdbcore.h"
 #include "target.h"
-#include "exceptions.h"
 #include "monitor.h"
 #include "serial.h"
 #include "symtab.h"
diff --git a/gdb/main.c b/gdb/main.c
index 756dd4f..accd927 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -23,8 +23,6 @@
 #include "inferior.h"
 #include "symfile.h"
 #include "gdbcore.h"
-
-#include "exceptions.h"
 #include "getopt.h"
 
 #include <sys/types.h>
diff --git a/gdb/memory-map.c b/gdb/memory-map.c
index b897d8a..041281a 100644
--- a/gdb/memory-map.c
+++ b/gdb/memory-map.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include "memory-map.h"
-#include "exceptions.h"
 
 #if !defined(HAVE_LIBEXPAT)
 
diff --git a/gdb/mi/mi-cmd-break.c b/gdb/mi/mi-cmd-break.c
index ce6a093..332d9e2 100644
--- a/gdb/mi/mi-cmd-break.c
+++ b/gdb/mi/mi-cmd-break.c
@@ -25,7 +25,6 @@
 #include "breakpoint.h"
 #include "mi-getopt.h"
 #include "gdb.h"
-#include "exceptions.h"
 #include "observer.h"
 #include "mi-main.h"
 #include "mi-cmd-break.h"
diff --git a/gdb/mi/mi-cmd-stack.c b/gdb/mi/mi-cmd-stack.c
index 608dc4e..3ddc62c 100644
--- a/gdb/mi/mi-cmd-stack.c
+++ b/gdb/mi/mi-cmd-stack.c
@@ -29,7 +29,6 @@
 #include "dictionary.h"
 #include "language.h"
 #include "valprint.h"
-#include "exceptions.h"
 #include "utils.h"
 #include "mi-getopt.h"
 #include "extension.h"
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index 3827830..df2b558 100644
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -25,7 +25,6 @@
 #include "infrun.h"
 #include "ui-out.h"
 #include "top.h"
-#include "exceptions.h"
 #include "mi-main.h"
 #include "mi-cmds.h"
 #include "mi-out.h"
diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index 4d35ff0..6d40195 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -24,7 +24,6 @@
 #include "target.h"
 #include "inferior.h"
 #include "infrun.h"
-#include "exceptions.h"
 #include "top.h"
 #include "gdbthread.h"
 #include "mi-cmds.h"
diff --git a/gdb/monitor.c b/gdb/monitor.c
index f7e331b..d9e7b0a 100644
--- a/gdb/monitor.c
+++ b/gdb/monitor.c
@@ -40,7 +40,6 @@
 #include "defs.h"
 #include "gdbcore.h"
 #include "target.h"
-#include "exceptions.h"
 #include <signal.h>
 #include <ctype.h>
 #include <sys/types.h>
diff --git a/gdb/nto-procfs.c b/gdb/nto-procfs.c
index 7a96cc9..8a10d3d 100644
--- a/gdb/nto-procfs.c
+++ b/gdb/nto-procfs.c
@@ -30,8 +30,6 @@
 #include <sys/syspage.h>
 #include <dirent.h>
 #include <sys/netmgr.h>
-
-#include "exceptions.h"
 #include "gdbcore.h"
 #include "inferior.h"
 #include "target.h"
diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c
index d911d8f..8a3d21e 100644
--- a/gdb/objc-lang.c
+++ b/gdb/objc-lang.c
@@ -29,7 +29,6 @@
 #include "varobj.h"
 #include "c-lang.h"
 #include "objc-lang.h"
-#include "exceptions.h"
 #include "complaints.h"
 #include "value.h"
 #include "symfile.h"
diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c
index c796218..63f6222 100644
--- a/gdb/p-valprint.c
+++ b/gdb/p-valprint.c
@@ -37,7 +37,6 @@
 #include "p-lang.h"
 #include "cp-abi.h"
 #include "cp-support.h"
-#include "exceptions.h"
 #include "objfiles.h"
 
 
diff --git a/gdb/parse.c b/gdb/parse.c
index 420afc5..27947e7 100644
--- a/gdb/parse.c
+++ b/gdb/parse.c
@@ -48,7 +48,6 @@
 #include "block.h"
 #include "source.h"
 #include "objfiles.h"
-#include "exceptions.h"
 #include "user-regs.h"
 
 /* Standard set of definitions for printing, dumping, prefixifying,
diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c
index d232f7f..a997869 100644
--- a/gdb/ppc-linux-tdep.c
+++ b/gdb/ppc-linux-tdep.c
@@ -45,7 +45,6 @@
 #include "auxv.h"
 #include "elf/common.h"
 #include "elf/ppc64.h"
-#include "exceptions.h"
 #include "arch-utils.h"
 #include "spu-tdep.h"
 #include "xml-syscall.h"
diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index a65423d..df44ff4 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -39,7 +39,6 @@
 #include "block.h"
 #include "disasm.h"
 #include "dfp.h"
-#include "exceptions.h"
 #include "observer.h"
 #include "solist.h"
 #include "parser-defs.h"
diff --git a/gdb/probe.c b/gdb/probe.c
index 859e6e7..3b8882e 100644
--- a/gdb/probe.c
+++ b/gdb/probe.c
@@ -26,7 +26,6 @@
 #include "symtab.h"
 #include "progspace.h"
 #include "filenames.h"
-#include "exceptions.h"
 #include "linespec.h"
 #include "gdb_regex.h"
 #include "frame.h"
diff --git a/gdb/python/py-auto-load.c b/gdb/python/py-auto-load.c
index 24311ff..9b44416 100644
--- a/gdb/python/py-auto-load.c
+++ b/gdb/python/py-auto-load.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include "top.h"
-#include "exceptions.h"
 #include "gdbcmd.h"
 #include "objfiles.h"
 #include "python.h"
diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c
index 125c6fd..06e708d 100644
--- a/gdb/python/py-breakpoint.c
+++ b/gdb/python/py-breakpoint.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include "value.h"
-#include "exceptions.h"
 #include "python-internal.h"
 #include "python.h"
 #include "charset.h"
diff --git a/gdb/python/py-cmd.c b/gdb/python/py-cmd.c
index 45af66b..5fc656e 100644
--- a/gdb/python/py-cmd.c
+++ b/gdb/python/py-cmd.c
@@ -21,7 +21,6 @@
 #include "defs.h"
 #include "arch-utils.h"
 #include "value.h"
-#include "exceptions.h"
 #include "python-internal.h"
 #include "charset.h"
 #include "gdbcmd.h"
diff --git a/gdb/python/py-finishbreakpoint.c b/gdb/python/py-finishbreakpoint.c
index 712a9ee..4c66e84 100644
--- a/gdb/python/py-finishbreakpoint.c
+++ b/gdb/python/py-finishbreakpoint.c
@@ -20,7 +20,6 @@
 
 
 #include "defs.h"
-#include "exceptions.h"
 #include "python-internal.h"
 #include "breakpoint.h"
 #include "frame.h"
diff --git a/gdb/python/py-frame.c b/gdb/python/py-frame.c
index 859d115..bec84ed 100644
--- a/gdb/python/py-frame.c
+++ b/gdb/python/py-frame.c
@@ -21,7 +21,6 @@
 #include "charset.h"
 #include "block.h"
 #include "frame.h"
-#include "exceptions.h"
 #include "symtab.h"
 #include "stack.h"
 #include "value.h"
diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c
index d53282f..de48af5 100644
--- a/gdb/python/py-framefilter.c
+++ b/gdb/python/py-framefilter.c
@@ -21,7 +21,6 @@
 #include "objfiles.h"
 #include "symtab.h"
 #include "language.h"
-#include "exceptions.h"
 #include "arch-utils.h"
 #include "python.h"
 #include "ui-out.h"
diff --git a/gdb/python/py-function.c b/gdb/python/py-function.c
index 73d517d..38fe3d7 100644
--- a/gdb/python/py-function.c
+++ b/gdb/python/py-function.c
@@ -20,7 +20,6 @@
 
 #include "defs.h"
 #include "value.h"
-#include "exceptions.h"
 #include "python-internal.h"
 #include "charset.h"
 #include "gdbcmd.h"
diff --git a/gdb/python/py-gdb-readline.c b/gdb/python/py-gdb-readline.c
index b335df9..d98a196 100644
--- a/gdb/python/py-gdb-readline.c
+++ b/gdb/python/py-gdb-readline.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include "python-internal.h"
-#include "exceptions.h"
 #include "top.h"
 #include "cli/cli-utils.h"
 /* Readline function suitable for PyOS_ReadlineFunctionPointer, which
diff --git a/gdb/python/py-inferior.c b/gdb/python/py-inferior.c
index 9b8b8f5..181059a 100644
--- a/gdb/python/py-inferior.c
+++ b/gdb/python/py-inferior.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "exceptions.h"
 #include "gdbcore.h"
 #include "gdbthread.h"
 #include "inferior.h"
diff --git a/gdb/python/py-infthread.c b/gdb/python/py-infthread.c
index e03cbd9..1399322 100644
--- a/gdb/python/py-infthread.c
+++ b/gdb/python/py-infthread.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "exceptions.h"
 #include "gdbthread.h"
 #include "inferior.h"
 #include "python-internal.h"
diff --git a/gdb/python/py-lazy-string.c b/gdb/python/py-lazy-string.c
index 0cec387..d1de5f4 100644
--- a/gdb/python/py-lazy-string.c
+++ b/gdb/python/py-lazy-string.c
@@ -21,7 +21,6 @@
 #include "python-internal.h"
 #include "charset.h"
 #include "value.h"
-#include "exceptions.h"
 #include "valprint.h"
 #include "language.h"
 
diff --git a/gdb/python/py-linetable.c b/gdb/python/py-linetable.c
index 8b5362b..bb82c8c 100644
--- a/gdb/python/py-linetable.c
+++ b/gdb/python/py-linetable.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include "python-internal.h"
-#include "exceptions.h"
 
 typedef struct {
   PyObject_HEAD
diff --git a/gdb/python/py-param.c b/gdb/python/py-param.c
index 53d0083..fca1e44 100644
--- a/gdb/python/py-param.c
+++ b/gdb/python/py-param.c
@@ -20,7 +20,6 @@
 
 #include "defs.h"
 #include "value.h"
-#include "exceptions.h"
 #include "python-internal.h"
 #include "charset.h"
 #include "gdbcmd.h"
diff --git a/gdb/python/py-prettyprint.c b/gdb/python/py-prettyprint.c
index a7cd337..35579fb 100644
--- a/gdb/python/py-prettyprint.c
+++ b/gdb/python/py-prettyprint.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "exceptions.h"
 #include "objfiles.h"
 #include "symtab.h"
 #include "language.h"
diff --git a/gdb/python/py-symbol.c b/gdb/python/py-symbol.c
index 6900d58..5d71c50 100644
--- a/gdb/python/py-symbol.c
+++ b/gdb/python/py-symbol.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include "block.h"
-#include "exceptions.h"
 #include "frame.h"
 #include "symtab.h"
 #include "python-internal.h"
diff --git a/gdb/python/py-type.c b/gdb/python/py-type.c
index 26d0118..29a3500 100644
--- a/gdb/python/py-type.c
+++ b/gdb/python/py-type.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include "value.h"
-#include "exceptions.h"
 #include "python-internal.h"
 #include "charset.h"
 #include "gdbtypes.h"
diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c
index bdec389..4313170 100644
--- a/gdb/python/py-value.c
+++ b/gdb/python/py-value.c
@@ -20,7 +20,6 @@
 #include "defs.h"
 #include "charset.h"
 #include "value.h"
-#include "exceptions.h"
 #include "language.h"
 #include "dfp.h"
 #include "valprint.h"
diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h
index 6e7e600..c262a46 100644
--- a/gdb/python/python-internal.h
+++ b/gdb/python/python-internal.h
@@ -219,8 +219,6 @@ gdb_PyObject_HasAttrString (PyObject *obj,
 #include "command.h"
 #include "breakpoint.h"
 
-#include "exceptions.h"
-
 enum gdbpy_iter_kind { iter_keys, iter_values, iter_items };
 
 struct block;
diff --git a/gdb/python/python.c b/gdb/python/python.c
index 40c4ec9..af90bef 100644
--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -27,7 +27,6 @@
 #include "objfiles.h"
 #include "value.h"
 #include "language.h"
-#include "exceptions.h"
 #include "event-loop.h"
 #include "serial.h"
 #include "readline/tilde.h"
diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c
index 430c795..c611c7b 100644
--- a/gdb/record-btrace.c
+++ b/gdb/record-btrace.c
@@ -26,7 +26,6 @@
 #include "gdbcmd.h"
 #include "disasm.h"
 #include "observer.h"
-#include "exceptions.h"
 #include "cli/cli-utils.h"
 #include "source.h"
 #include "ui-out.h"
diff --git a/gdb/record-full.c b/gdb/record-full.c
index 119361f..abe505f 100644
--- a/gdb/record-full.c
+++ b/gdb/record-full.c
@@ -22,7 +22,6 @@
 #include "regcache.h"
 #include "gdbthread.h"
 #include "event-top.h"
-#include "exceptions.h"
 #include "completer.h"
 #include "arch-utils.h"
 #include "gdbcore.h"
diff --git a/gdb/regcache.c b/gdb/regcache.c
index 9b6c794..e6b6f89 100644
--- a/gdb/regcache.c
+++ b/gdb/regcache.c
@@ -25,7 +25,6 @@
 #include "regcache.h"
 #include "reggroups.h"
 #include "observer.h"
-#include "exceptions.h"
 #include "remote.h"
 #include "valprint.h"
 #include "regset.h"
diff --git a/gdb/remote-fileio.c b/gdb/remote-fileio.c
index 48e1e56..451c3b1 100644
--- a/gdb/remote-fileio.c
+++ b/gdb/remote-fileio.c
@@ -25,7 +25,6 @@
 #include "gdb/fileio.h"
 #include "gdb_wait.h"
 #include <sys/stat.h>
-#include "exceptions.h"
 #include "remote-fileio.h"
 #include "event-loop.h"
 #include "target.h"
diff --git a/gdb/remote-mips.c b/gdb/remote-mips.c
index 9e4039d..1ce6c17 100644
--- a/gdb/remote-mips.c
+++ b/gdb/remote-mips.c
@@ -29,7 +29,6 @@
 #include "gdbcore.h"
 #include "serial.h"
 #include "target.h"
-#include "exceptions.h"
 #include <sys/stat.h>
 #include "gdb_usleep.h"
 #include "regcache.h"
diff --git a/gdb/remote.c b/gdb/remote.c
index 3d55e41..1c8741d 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -26,7 +26,6 @@
 #include "infrun.h"
 #include "bfd.h"
 #include "symfile.h"
-#include "exceptions.h"
 #include "target.h"
 /*#include "terminal.h" */
 #include "gdbcmd.h"
diff --git a/gdb/rs6000-aix-tdep.c b/gdb/rs6000-aix-tdep.c
index 0cea0b2..372f1ea 100644
--- a/gdb/rs6000-aix-tdep.c
+++ b/gdb/rs6000-aix-tdep.c
@@ -33,7 +33,6 @@
 #include "rs6000-tdep.h"
 #include "ppc-tdep.h"
 #include "rs6000-aix-tdep.h"
-#include "exceptions.h"
 #include "xcoffread.h"
 #include "solib.h"
 #include "solib-aix.h"
diff --git a/gdb/rs6000-nat.c b/gdb/rs6000-nat.c
index 68fb5c9..e8b7bf0 100644
--- a/gdb/rs6000-nat.c
+++ b/gdb/rs6000-nat.c
@@ -25,7 +25,6 @@
 #include "objfiles.h"
 #include "libbfd.h"		/* For bfd_default_set_arch_mach (FIXME) */
 #include "bfd.h"
-#include "exceptions.h"
 #include "gdb-stabs.h"
 #include "regcache.h"
 #include "arch-utils.h"
diff --git a/gdb/skip.c b/gdb/skip.c
index 23f1e46..79d07bd 100644
--- a/gdb/skip.c
+++ b/gdb/skip.c
@@ -29,7 +29,6 @@
 #include "arch-utils.h"
 #include "linespec.h"
 #include "objfiles.h"
-#include "exceptions.h"
 #include "breakpoint.h" /* for get_sal_arch () */
 #include "source.h"
 #include "filenames.h"
diff --git a/gdb/solib-darwin.c b/gdb/solib-darwin.c
index 8782c81..4a25056 100644
--- a/gdb/solib-darwin.c
+++ b/gdb/solib-darwin.c
@@ -38,7 +38,6 @@
 #include "elf-bfd.h"
 #include "exec.h"
 #include "auxv.h"
-#include "exceptions.h"
 #include "mach-o.h"
 #include "mach-o/external.h"
 
diff --git a/gdb/solib-dsbt.c b/gdb/solib-dsbt.c
index 4655c92..8da6ea4 100644
--- a/gdb/solib-dsbt.c
+++ b/gdb/solib-dsbt.c
@@ -28,7 +28,6 @@
 #include "command.h"
 #include "gdbcmd.h"
 #include "elf-bfd.h"
-#include "exceptions.h"
 #include "gdb_bfd.h"
 
 #define GOT_MODULE_OFFSET 4
diff --git a/gdb/solib-frv.c b/gdb/solib-frv.c
index 8e66a87..fbd6970 100644
--- a/gdb/solib-frv.c
+++ b/gdb/solib-frv.c
@@ -29,7 +29,6 @@
 #include "command.h"
 #include "gdbcmd.h"
 #include "elf/frv.h"
-#include "exceptions.h"
 #include "gdb_bfd.h"
 
 /* Flag which indicates whether internal debug messages should be printed.  */
diff --git a/gdb/solib-ia64-hpux.c b/gdb/solib-ia64-hpux.c
index b53caa8..a718f14 100644
--- a/gdb/solib-ia64-hpux.c
+++ b/gdb/solib-ia64-hpux.c
@@ -30,7 +30,6 @@
 #include "symfile.h"
 #include "objfiles.h"
 #include "elf-bfd.h"
-#include "exceptions.h"
 
 /* Need to define the following macro in order to get the complete
    load_module_desc struct definition in dlfcn.h  Otherwise, it doesn't
diff --git a/gdb/solib-spu.c b/gdb/solib-spu.c
index 41e41b0..b497143 100644
--- a/gdb/solib-spu.c
+++ b/gdb/solib-spu.c
@@ -33,7 +33,6 @@
 #include "observer.h"
 #include "breakpoint.h"
 #include "gdbthread.h"
-#include "exceptions.h"
 #include "gdb_bfd.h"
 
 #include "spu-tdep.h"
diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
index 978564c..5c87019 100644
--- a/gdb/solib-svr4.c
+++ b/gdb/solib-svr4.c
@@ -43,7 +43,6 @@
 #include "elf-bfd.h"
 #include "exec.h"
 #include "auxv.h"
-#include "exceptions.h"
 #include "gdb_bfd.h"
 #include "probe.h"
 
diff --git a/gdb/solib.c b/gdb/solib.c
index 2f64105..41250a2 100644
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -25,7 +25,6 @@
 #include "bfd.h"
 #include "symfile.h"
 #include "objfiles.h"
-#include "exceptions.h"
 #include "gdbcore.h"
 #include "command.h"
 #include "target.h"
diff --git a/gdb/spu-tdep.c b/gdb/spu-tdep.c
index c9af4fd..032f5de 100644
--- a/gdb/spu-tdep.c
+++ b/gdb/spu-tdep.c
@@ -44,7 +44,6 @@
 #include "dwarf2.h"
 #include "dwarf2-frame.h"
 #include "ax.h"
-#include "exceptions.h"
 #include "spu-tdep.h"
 
 
diff --git a/gdb/stack.c b/gdb/stack.c
index c9a85ca..4b34e0b 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -36,7 +36,6 @@
 #include "block.h"
 #include "stack.h"
 #include "dictionary.h"
-#include "exceptions.h"
 #include "reggroups.h"
 #include "regcache.h"
 #include "solib.h"
diff --git a/gdb/stap-probe.c b/gdb/stap-probe.c
index 23202d7..a51bf8b 100644
--- a/gdb/stap-probe.c
+++ b/gdb/stap-probe.c
@@ -28,7 +28,6 @@
 #include "gdbcmd.h"
 #include "filenames.h"
 #include "value.h"
-#include "exceptions.h"
 #include "ax.h"
 #include "ax-gdb.h"
 #include "complaints.h"
diff --git a/gdb/symfile-mem.c b/gdb/symfile-mem.c
index ef48f7d..b6986b0 100644
--- a/gdb/symfile-mem.c
+++ b/gdb/symfile-mem.c
@@ -45,7 +45,6 @@
 #include "symtab.h"
 #include "gdbcore.h"
 #include "objfiles.h"
-#include "exceptions.h"
 #include "gdbcmd.h"
 #include "target.h"
 #include "value.h"
diff --git a/gdb/symmisc.c b/gdb/symmisc.c
index c2146a5..223a7d1 100644
--- a/gdb/symmisc.c
+++ b/gdb/symmisc.c
@@ -27,7 +27,6 @@
 #include "breakpoint.h"
 #include "command.h"
 #include "gdb_obstack.h"
-#include "exceptions.h"
 #include "language.h"
 #include "bcache.h"
 #include "block.h"
diff --git a/gdb/target.c b/gdb/target.c
index 4606d17..34db652 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -33,7 +33,6 @@
 #include <signal.h>
 #include "regcache.h"
 #include "gdbcore.h"
-#include "exceptions.h"
 #include "target-descriptions.h"
 #include "gdbthread.h"
 #include "solib.h"
diff --git a/gdb/thread.c b/gdb/thread.c
index ac1d8a1..25538d7 100644
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -27,7 +27,6 @@
 #include "value.h"
 #include "target.h"
 #include "gdbthread.h"
-#include "exceptions.h"
 #include "command.h"
 #include "gdbcmd.h"
 #include "regcache.h"
diff --git a/gdb/top.c b/gdb/top.c
index d6696cd..5a947d7 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -26,7 +26,6 @@
 #include "symtab.h"
 #include "inferior.h"
 #include "infrun.h"
-#include "exceptions.h"
 #include <signal.h>
 #include "target.h"
 #include "target-dcache.h"
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index f2f662e..51af2af 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -49,7 +49,6 @@
 #include "ax.h"
 #include "ax-gdb.h"
 #include "memrange.h"
-#include "exceptions.h"
 #include "cli/cli-utils.h"
 #include "probe.h"
 #include "ctf.h"
diff --git a/gdb/tui/tui-interp.c b/gdb/tui/tui-interp.c
index 147a424..24cb5a3 100644
--- a/gdb/tui/tui-interp.c
+++ b/gdb/tui/tui-interp.c
@@ -29,7 +29,6 @@
 #include "tui/tui-win.h"
 #include "tui/tui.h"
 #include "tui/tui-io.h"
-#include "exceptions.h"
 #include "infrun.h"
 #include "observer.h"
 
diff --git a/gdb/typeprint.c b/gdb/typeprint.c
index 4d3358f..f97901d 100644
--- a/gdb/typeprint.c
+++ b/gdb/typeprint.c
@@ -31,7 +31,6 @@
 #include "language.h"
 #include "cp-abi.h"
 #include "typeprint.h"
-#include "exceptions.h"
 #include "valprint.h"
 #include <ctype.h>
 #include "cli/cli-utils.h"
diff --git a/gdb/utils.c b/gdb/utils.c
index 4da9501..3915b58 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -22,7 +22,6 @@
 #include <ctype.h>
 #include "gdb_wait.h"
 #include "event-top.h"
-#include "exceptions.h"
 #include "gdbthread.h"
 #include "fnmatch.h"
 #include "gdb_bfd.h"
diff --git a/gdb/valarith.c b/gdb/valarith.c
index 44673a1..154629b 100644
--- a/gdb/valarith.c
+++ b/gdb/valarith.c
@@ -28,7 +28,6 @@
 #include "dfp.h"
 #include <math.h>
 #include "infcall.h"
-#include "exceptions.h"
 
 /* Define whether or not the C operator '/' truncates towards zero for
    differently signed operands (truncation direction is undefined in C).  */
diff --git a/gdb/valops.c b/gdb/valops.c
index f177907..7f3e4f5 100644
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -38,7 +38,6 @@
 #include "tracepoint.h"
 #include "observer.h"
 #include "objfiles.h"
-#include "exceptions.h"
 #include "extension.h"
 
 extern unsigned int overload_debug;
diff --git a/gdb/valprint.c b/gdb/valprint.c
index 8cb5c74..52f028e 100644
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -29,7 +29,6 @@
 #include "valprint.h"
 #include "floatformat.h"
 #include "doublest.h"
-#include "exceptions.h"
 #include "dfp.h"
 #include "extension.h"
 #include "ada-lang.h"
diff --git a/gdb/value.c b/gdb/value.c
index fdc8858d..ecfb154 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -35,7 +35,6 @@
 #include "objfiles.h"
 #include "valprint.h"
 #include "cli/cli-decode.h"
-#include "exceptions.h"
 #include "extension.h"
 #include <ctype.h>
 #include "tracepoint.h"
diff --git a/gdb/varobj.c b/gdb/varobj.c
index 45a19e1..80b7c9a 100644
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -16,7 +16,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "exceptions.h"
 #include "value.h"
 #include "expression.h"
 #include "frame.h"
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 6f24e9c..754a2d1 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -26,7 +26,6 @@
 #include "inferior.h"
 #include "infrun.h"
 #include "target.h"
-#include "exceptions.h"
 #include "gdbcore.h"
 #include "command.h"
 #include "completer.h"
diff --git a/gdb/xml-support.c b/gdb/xml-support.c
index 531ac10..1bf2005 100644
--- a/gdb/xml-support.c
+++ b/gdb/xml-support.c
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include "gdbcmd.h"
-#include "exceptions.h"
 #include "xml-support.h"
 #include "filestuff.h"
 #include "safe-ctype.h"