diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 28999c7..59dab46 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 ae07cc2..e42fa90 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 abd9c48..1d0b681 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 683ed2b..a211ee0 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 b415267..06ff476 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 0f0a97e..f7aa5a4 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 44920dd..7912aab 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 1617392..cb9a6b5 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 ecd99f6..6b13166 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 be32309..edbc9ad 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 c7581a8..ef65e31 100644
--- a/gdb/f-valprint.c
+++ b/gdb/f-valprint.c
@@ -33,8 +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);
 static void f77_create_arrayprint_offset_tbl (struct type *,
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 54bed2c..0dfd4b0 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 32abf6d..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 688ac9a..2153769 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 6a8ed55..c092a34 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 "i386-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 b6aba04..02bd99a 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 c18267f..fea721b 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 0898442..627d8a0 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -62,7 +62,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 12f0146..fa5b340 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 59717ca..f42cb33 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 b880ff2..f2be743 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 7903210..5510fdf 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 22f6089..9519cbe 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 316b254..5e0acb6 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 21f2a20..5a398ef 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 120e147..2d76dd5 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 9db83c7..e2f4272 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 05b8fb9..8dbb510 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 19ac30f..0b72bd4 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 357e9f2..9fd02d6 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 03dc8c0..9f6b268 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 1b09680..9661c00 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 3deef20..a4ce552 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 84714b5..4c807ed 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 8bf6031..83e9211 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 65890e1..12b8426 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 fc2b84d..a65389b 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 3d8620a..944b805 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..760a072 100644
--- a/gdb/valarith.c
+++ b/gdb/valarith.c
@@ -28,8 +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 e1decf0..66a50f1 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 077d234..212b6e7 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 1c4bae9..f61c55b 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 73665e5..74dd960 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"
