gdb: remove unused includes in utils.h

Remove some includes reported as unused by clangd.  Add some includes in
other files that were previously relying on the transitive include.

Change-Id: Ibdd0a998b04d21362a20d0ca8e5267e21e2e133e

diff --git a/gdb/aarch64-linux-tdep.c b/gdb/aarch64-linux-tdep.c
index ad55cf2caa3bf79b60ae235c31221e200f6cc853..a1296a8f0c7e4deaad93e3c26516d0640adce01c 100644 (file)
--- a/gdb/aarch64-linux-tdep.c
+++ b/gdb/aarch64-linux-tdep.c
@@ -19,6 +19,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
+#include "exceptions.h"
 #include "extract-store-integer.h"
 #include "gdbarch.h"
 #include "glibc-tdep.h"

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 0b430428fb473687fa2750ae3483fef435d4bd14..01978e083808923a7db2bb5a58908a3031c845f0 100644 (file)
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -20,6 +20,7 @@
 
 #include <ctype.h>
 #include "event-top.h"
+#include "exceptions.h"
 #include "extract-store-integer.h"
 #include "gdbsupport/gdb_regex.h"
 #include "frame.h"

diff --git a/gdb/break-catch-throw.c b/gdb/break-catch-throw.c
index 9a35ede1df67d58fdc99dc66f74f5a70478c4d09..b7e29a79dd8b13aed3206a6f48aa40de9d3c3e02 100644 (file)
--- a/gdb/break-catch-throw.c
+++ b/gdb/break-catch-throw.c
@@ -20,7 +20,7 @@
 #include "arch-utils.h"
 #include <ctype.h>
 #include "breakpoint.h"
-#include "cli/cli-cmds.h"
+#include "exceptions.h"
 #include "inferior.h"
 #include "annotate.h"
 #include "valprint.h"

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index fff9508f2d81d51c60fa7eb24a9f52f2e3310e53..a973518ac5f03b3e14eab8da3709317ecc9d4259 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -20,6 +20,7 @@
 #include "arch-utils.h"
 #include <ctype.h>
 #include "event-top.h"
+#include "exceptions.h"
 #include "hashtab.h"
 #include "symtab.h"
 #include "frame.h"

diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 5d49e395a84aa89ebf21de602fc4a00984d88a89..3af794cebaf2b7e781662180078b26d9dd94d535 100644 (file)
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -18,6 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "arch-utils.h"
+#include "exceptions.h"
 #include "readline/tilde.h"
 #include "completer.h"
 #include "target.h"

diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c
index a488c304fea33014d4c03418923492fc752b39f0..fa5d70e1e89a7ddd6a362351ae507a779524fcb8 100644 (file)
--- a/gdb/cli/cli-interp.c
+++ b/gdb/cli/cli-interp.c
@@ -18,6 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "cli-interp.h"
+#include "exceptions.h"
 #include "interps.h"
 #include "event-top.h"
 #include "ui-out.h"

diff --git a/gdb/complaints.h b/gdb/complaints.h
index 995c35e0ab07f3d9d735502d7c266fbd0996aefc..d672e0c365dd0638b11d9dde4ca71ec61c473dc2 100644 (file)
--- a/gdb/complaints.h
+++ b/gdb/complaints.h
@@ -17,10 +17,10 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-
 #if !defined (COMPLAINTS_H)
 #define COMPLAINTS_H
 
+#include "gdbsupport/scoped_restore.h"
 #include <unordered_set>
 
 /* Helper for complaint.  */

diff --git a/gdb/corelow.c b/gdb/corelow.c
index 462a05591c1da85d5d7387bff696df3610b4f14c..49da9be07ef99136e503aea01aaaa449666d366f 100644 (file)
--- a/gdb/corelow.c
+++ b/gdb/corelow.c
@@ -20,6 +20,7 @@
 #include "arch-utils.h"
 #include <signal.h>
 #include <fcntl.h>
+#include "exceptions.h"
 #include "frame.h"
 #include "inferior.h"
 #include "infrun.h"

diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c
index c70cd44bb7fb5a131b4b84256dc5efdfc2d1c421..2b68cf6a549f070928be57872e0a17ca76fe1756 100644 (file)
--- a/gdb/darwin-nat.c
+++ b/gdb/darwin-nat.c
@@ -68,6 +68,7 @@
 #include "gdbsupport/gdb_unlinker.h"
 #include "gdbsupport/pathstuff.h"
 #include "gdbsupport/scoped_fd.h"
+#include "gdbsupport/scoped_restore.h"
 #include "nat/fork-inferior.h"
 
 /* Quick overview.

diff --git a/gdb/disasm.h b/gdb/disasm.h
index 9282632b270f45c41fa0efd6a3ae255932dfda40..9d5450ce8b341003252526f29074e366d1497a66 100644 (file)
--- a/gdb/disasm.h
+++ b/gdb/disasm.h
@@ -21,6 +21,7 @@
 
 #include "dis-asm.h"
 #include "disasm-flags.h"
+#include "ui-out.h"
 
 struct gdbarch;
 struct ui_out;

diff --git a/gdb/dwarf2/cooked-index.c b/gdb/dwarf2/cooked-index.c
index 767f119e04fdcce7d98f1fe64341a3ec34e8ad14..c9e46af32aed1267c8b4506ea3f0953b5a60c0f7 100644 (file)
--- a/gdb/dwarf2/cooked-index.c
+++ b/gdb/dwarf2/cooked-index.c
@@ -25,6 +25,7 @@
 #include "c-lang.h"
 #include "ada-lang.h"
 #include "event-top.h"
+#include "exceptions.h"
 #include "split-name.h"
 #include "observable.h"
 #include "run-on-main-thread.h"

diff --git a/gdb/dwarf2/frame-tailcall.c b/gdb/dwarf2/frame-tailcall.c
index bcbe41f7933cc14e50dc3df7af488744fe8ae443..c48906822742fc25ccd7254b4ebc94f714c244c2 100644 (file)
--- a/gdb/dwarf2/frame-tailcall.c
+++ b/gdb/dwarf2/frame-tailcall.c
@@ -17,6 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#include "exceptions.h"
 #include "frame.h"
 #include "dwarf2/frame-tailcall.h"
 #include "dwarf2/loc.h"

diff --git a/gdb/dwarf2/index-write.c b/gdb/dwarf2/index-write.c
index aeb688b13ee5b7da2c0f556b2086bb2476887511..2a50e3b6c2de08b33d2b2e79721680379cd6e851 100644 (file)
--- a/gdb/dwarf2/index-write.c
+++ b/gdb/dwarf2/index-write.c
@@ -22,6 +22,7 @@
 
 #include "addrmap.h"
 #include "cli/cli-decode.h"
+#include "exceptions.h"
 #include "gdbsupport/byte-vector.h"
 #include "gdbsupport/filestuff.h"
 #include "gdbsupport/gdb_unlinker.h"

diff --git a/gdb/dwarf2/loc.c b/gdb/dwarf2/loc.c
index 9db5fc1492d1a3bbfd8346b101a996a601986aee..5fea6683575d46a1b02bdfe1069329146cdf0a65 100644 (file)
--- a/gdb/dwarf2/loc.c
+++ b/gdb/dwarf2/loc.c
@@ -20,6 +20,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "event-top.h"
+#include "exceptions.h"
 #include "ui-out.h"
 #include "value.h"
 #include "frame.h"

diff --git a/gdb/elf-none-tdep.c b/gdb/elf-none-tdep.c
index 00d46992b24842d4156504f9e07e6772a33cbcb0..1e43dc2410369fbb426b6c93ac6a24670add29db 100644 (file)
--- a/gdb/elf-none-tdep.c
+++ b/gdb/elf-none-tdep.c
@@ -19,6 +19,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "elf-none-tdep.h"
+#include "exceptions.h"
 #include "regset.h"
 #include "elf-bfd.h"
 #include "inferior.h"

diff --git a/gdb/event-top.c b/gdb/event-top.c
index 0425bcf9f994359680a32903c1d772b7dec8d379..b81970d11bb11c909de98b43b1bf5654db90bc2f 100644 (file)
--- a/gdb/event-top.c
+++ b/gdb/event-top.c
@@ -19,6 +19,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#include "exceptions.h"
 #include "gdbsupport/job-control.h"
 #include "run-on-main-thread.h"
 #include "top.h"

diff --git a/gdb/fbsd-tdep.c b/gdb/fbsd-tdep.c
index a80f604fa78077ca029c4e15fa13071ff1f9199e..77f46ced5917d47a2dcb04e8cf1471feb2a0af4d 100644 (file)
--- a/gdb/fbsd-tdep.c
+++ b/gdb/fbsd-tdep.c
@@ -18,6 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "auxv.h"
+#include "exceptions.h"
 #include "extract-store-integer.h"
 #include "gdbcore.h"
 #include "inferior.h"

diff --git a/gdb/inf-loop.c b/gdb/inf-loop.c
index 41e766095f0597c87ac5a6460e976edf12060ef0..ec0c059729e86b8a8bd381533a4c5afd1b4ee569 100644 (file)
--- a/gdb/inf-loop.c
+++ b/gdb/inf-loop.c
@@ -17,6 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#include "exceptions.h"
 #include "inferior.h"
 #include "infrun.h"
 #include "gdbsupport/event-loop.h"

diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 02f6f0b3683fe83ff506e57fb2d84cc1cbef6dcf..69db665da75f26e76b878929d0faa818e8966425 100644 (file)
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -18,6 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "arch-utils.h"
+#include "exceptions.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "frame.h"

diff --git a/gdb/infrun.c b/gdb/infrun.c
index 2b6c1207391b83d12b238e69096336519696d0ea..1f32a63ad541f6e393e8d655bdfab97feecd41c4 100644 (file)
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -22,6 +22,7 @@
 #include "displaced-stepping.h"
 #include "infrun.h"
 #include <ctype.h>
+#include "exceptions.h"
 #include "symtab.h"
 #include "frame.h"
 #include "inferior.h"

diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c
index 8e6ac87f5a1d787b7e52a7179652372e83a57eec..fe880b3fb6f49ca61ac2f2bf80e6106aa08ce2ea 100644 (file)
--- a/gdb/linux-tdep.c
+++ b/gdb/linux-tdep.c
@@ -17,6 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#include "exceptions.h"
 #include "gdbtypes.h"
 #include "linux-tdep.h"
 #include "auxv.h"

diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c
index 81a9c0d22a7e6a725235103b45754d60e7ca80ed..018bd689faac2809e1f87c54cec53786161d8c71 100644 (file)
--- a/gdb/linux-thread-db.c
+++ b/gdb/linux-thread-db.c
@@ -18,6 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <dlfcn.h>
+#include "exceptions.h"
 #include "gdb_proc_service.h"
 #include "nat/gdb_thread_db.h"
 #include "gdbsupport/gdb_vecs.h"

diff --git a/gdb/macrocmd.c b/gdb/macrocmd.c
index 19295faf21ecf61e18fb553179c90829d90e13a8..6cf3a0d8bf18558259407cfebff7a317818bb10f 100644 (file)
--- a/gdb/macrocmd.c
+++ b/gdb/macrocmd.c
@@ -26,6 +26,7 @@
 #include "command.h"
 #include "cli/cli-cmds.h"
 #include "linespec.h"
+#include "ui-out.h"
 
 \f
 /* The `macro' prefix command.  */

diff --git a/gdb/main.c b/gdb/main.c
index 571ade45fb147bdc297aee2a433151026f80b9e4..4dd68f3d97653fd263c1bbca284b0d9cf46990e5 100644 (file)
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -18,6 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "annotate.h"
+#include "exceptions.h"
 #include "top.h"
 #include "ui.h"
 #include "target.h"

diff --git a/gdb/mi/mi-cmd-break.c b/gdb/mi/mi-cmd-break.c
index 343a167e3d87b101a5da7924a51746ebc0cf0689..5c78acd64932c110d318fe31ce3f213925a93315 100644 (file)
--- a/gdb/mi/mi-cmd-break.c
+++ b/gdb/mi/mi-cmd-break.c
@@ -18,6 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "arch-utils.h"
+#include "exceptions.h"
 #include "mi-cmds.h"
 #include "ui-out.h"
 #include "mi-out.h"

diff --git a/gdb/mi/mi-cmds.h b/gdb/mi/mi-cmds.h
index 26faded3032ed7df685ff2c574d9260d579dc8c7..f2c6b1e9402681f149d98d9e46f5638aea23115c 100644 (file)
--- a/gdb/mi/mi-cmds.h
+++ b/gdb/mi/mi-cmds.h
@@ -24,6 +24,7 @@
 
 #include "gdbsupport/function-view.h"
 #include <optional>
+#include "gdbsupport/scoped_restore.h"
 #include "mi/mi-main.h"
 
 enum print_values {

diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index 168e6ed10b4e64b211b3550dd2bf9357c14f6095..ff4a0ff320261d47c54b437367886e046f5c60ff 100644 (file)
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -20,6 +20,7 @@
 
 #include "mi-interp.h"
 
+#include "exceptions.h"
 #include "interps.h"
 #include "event-top.h"
 #include "gdbsupport/event-loop.h"

diff --git a/gdb/mi/mi-out.h b/gdb/mi/mi-out.h
index a7afb156ed46074993f04c3af510d94d365e1865..a21a34fb8c7f5d4505018d9cf69979be2b83355d 100644 (file)
--- a/gdb/mi/mi-out.h
+++ b/gdb/mi/mi-out.h
@@ -20,6 +20,7 @@
 #ifndef MI_MI_OUT_H
 #define MI_MI_OUT_H
 
+#include "ui-out.h"
 #include <vector>
 
 struct ui_out;

diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c
index 61b444d4e17560bacf063b34719837bfaf6c19a7..3655445833af57b6d73581c7b684fe2f75c1fbe4 100644 (file)
--- a/gdb/objc-lang.c
+++ b/gdb/objc-lang.c
@@ -21,6 +21,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "event-top.h"
+#include "exceptions.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "expression.h"

diff --git a/gdb/record-full.c b/gdb/record-full.c
index c51aadfef3355a2df0f20c0320c7be22c5e3e097..eb62d186fa5eadec2e009e808407c40e6e28cc9c 100644 (file)
--- a/gdb/record-full.c
+++ b/gdb/record-full.c
@@ -17,6 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#include "exceptions.h"
 #include "extract-store-integer.h"
 #include "cli/cli-cmds.h"
 #include "regcache.h"

diff --git a/gdb/record-full.h b/gdb/record-full.h
index ef45b1c0d59b1792ec5a61f59b7689157169895c..e8eb041311bf1abe869979f1540683fed0bb5566 100644 (file)
--- a/gdb/record-full.h
+++ b/gdb/record-full.h
@@ -20,6 +20,8 @@
 #ifndef RECORD_FULL_H
 #define RECORD_FULL_H
 
+#include "gdbsupport/scoped_restore.h"
+
 extern bool record_full_memory_query;
 
 extern int record_full_arch_list_add_reg (struct regcache *regcache, int num);

diff --git a/gdb/remote.c b/gdb/remote.c
index 965427c96a0d496b560de13f4a682fae0a508e2f..d4886c9650ea43818f14f791352b0916ad19d29e 100644 (file)
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -21,6 +21,7 @@
 
 #include <ctype.h>
 #include <fcntl.h>
+#include "exceptions.h"
 #include "inferior.h"
 #include "infrun.h"
 #include "bfd.h"

diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
index 1d4a50568d7ba81aa453b476f918be10d924dbbb..5c8557e9377a3e9d5ca19e8ef455159b3bc53b52 100644 (file)
--- a/gdb/solib-svr4.c
+++ b/gdb/solib-svr4.c
@@ -22,6 +22,7 @@
 #include "elf/common.h"
 #include "elf/mips.h"
 
+#include "exceptions.h"
 #include "extract-store-integer.h"
 #include "symtab.h"
 #include "bfd.h"

diff --git a/gdb/solib.c b/gdb/solib.c
index db2ff5ce9a37fd3a641e63880e0e27d72a0fb85a..881f0d965027e18c7cbf7baf4ea0faac4096d6a8 100644 (file)
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -19,6 +19,7 @@
 
 
 #include <fcntl.h>
+#include "exceptions.h"
 #include "extract-store-integer.h"
 #include "symtab.h"
 #include "bfd.h"

diff --git a/gdb/stack.c b/gdb/stack.c
index c2323e1726d99939ed88d84ec975d4efac94aeea..b36193be2f39ebc5f0091d34aff81f45b46bacbd 100644 (file)
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -18,6 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "event-top.h"
+#include "exceptions.h"
 #include "extract-store-integer.h"
 #include "top.h"
 #include "value.h"

diff --git a/gdb/symfile-mem.c b/gdb/symfile-mem.c
index ec50ec4e33c6367d58d63bf66ba34dca027d3a18..42569f4fa6d1bf06fd0dd81f763985d4fc2a72be 100644 (file)
--- a/gdb/symfile-mem.c
+++ b/gdb/symfile-mem.c
@@ -41,6 +41,7 @@
    entry point.  */
 
 
+#include "exceptions.h"
 #include "symtab.h"
 #include "gdbcore.h"
 #include "objfiles.h"

diff --git a/gdb/symmisc.c b/gdb/symmisc.c
index f5f4865cb621b9b08c42c0462501343c6c02ef4b..2956ad92fcef22b7bdd3d188ed4a6b86d95a93c3 100644 (file)
--- a/gdb/symmisc.c
+++ b/gdb/symmisc.c
@@ -18,6 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "event-top.h"
+#include "exceptions.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "bfd.h"

diff --git a/gdb/top.c b/gdb/top.c
index 4da24343a0f8fed729a3dc086e5263071cf2bd39..6239c190627c5bcc279ceda86edcf44a8a79d794 100644 (file)
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -17,6 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#include "exceptions.h"
 #include "cli/cli-cmds.h"
 #include "cli/cli-script.h"
 #include "cli/cli-setshow.h"

diff --git a/gdb/tui/tui-io.c b/gdb/tui/tui-io.c
index 285c781c25d004afe39aabe26cf93fad6164dd69..09fba029496659da501b6945d0d35f33005f710c 100644 (file)
--- a/gdb/tui/tui-io.c
+++ b/gdb/tui/tui-io.c
@@ -19,6 +19,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#include "exceptions.h"
 #include "target.h"
 #include "gdbsupport/event-loop.h"
 #include "event-top.h"

diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
index 85b62321ca9f4e2a6c162a49ff225ab5cb5c2db0..45cc22a647480254cc83411eb5650a955b5e0bf6 100644 (file)
--- a/gdb/tui/tui-win.c
+++ b/gdb/tui/tui-win.c
@@ -34,6 +34,7 @@
 #include "source.h"
 #include "gdbsupport/event-loop.h"
 #include "async-event.h"
+#include "ui-out.h"
 #include "utils.h"
 
 #include "tui/tui.h"

diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c
index cb21d68e9b62cccdb1af3f8cdbd2f0599cd00b51..63b01ba55c849ccc49800c05c8366fa67e6b5882 100644 (file)
--- a/gdb/tui/tui.c
+++ b/gdb/tui/tui.c
@@ -21,6 +21,7 @@
 
 #include "event-top.h"
 #include "cli/cli-cmds.h"
+#include "exceptions.h"
 #include "tui/tui.h"
 #include "tui/tui-hooks.h"
 #include "tui/tui-command.h"

diff --git a/gdb/ui.h b/gdb/ui.h
index 95cf273473ad1576861b1c32598549ffaea9fdca..869714c607409a291a5cc050806b19c69e7ab48d 100644 (file)
--- a/gdb/ui.h
+++ b/gdb/ui.h
@@ -21,6 +21,7 @@
 #include "gdbsupport/event-loop.h"
 #include "gdbsupport/intrusive_list.h"
 #include "gdbsupport/next-iterator.h"
+#include "gdbsupport/scoped_restore.h"
 
 struct interp;
 

diff --git a/gdb/unittests/ui-file-selftests.c b/gdb/unittests/ui-file-selftests.c
index 7c55b80cdfedf184754336b28b45ce16a7923c97..589254f285cebe3d6bf0979e453e8648472a9903 100644 (file)
--- a/gdb/unittests/ui-file-selftests.c
+++ b/gdb/unittests/ui-file-selftests.c
@@ -17,6 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#include "gdbsupport/scoped_restore.h"
 #include "gdbsupport/selftest.h"
 #include "ui-file.h"
 

diff --git a/gdb/utils.h b/gdb/utils.h
index 66eec9621fd8018989e8bd3e01fc8abeb9028d7e..90c8012e73b59c0634cb48ca22254ccb3fbeb1fc 100644 (file)
--- a/gdb/utils.h
+++ b/gdb/utils.h
@@ -19,10 +19,6 @@
 #ifndef UTILS_H
 #define UTILS_H
 
-#include "exceptions.h"
-#include "gdbsupport/array-view.h"
-#include "gdbsupport/function-view.h"
-#include "gdbsupport/scoped_restore.h"
 #include <chrono>
 
 struct completion_match_for_lcd;

diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index e4feea15d1fa98dd31684a2c4d1d0f6f4a20d58c..37c1f46be35cace6a2ff11616ba38d48da2f68e4 100644 (file)
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -21,6 +21,7 @@
 
 /* Originally by Steve Chamberlain, sac@cygnus.com */
 
+#include "exceptions.h"
 #include "frame.h"
 #include "inferior.h"
 #include "infrun.h"