From bbd252584fdeebb9cc18fd0fe7b8bcf999e27da4 Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@efficios.com>
Date: Tue, 28 Jan 2025 15:17:19 -0500
Subject: [PATCH] gdb: remove includes from dwarf2/mapped-index.h

They are unused, according to clangd.

Add some includes to other files, which were relying on transitive
includes.

Change-Id: I3bcb4be93b3a18bf44a4068f4067e567f83e1d4f
---
 gdb/dwarf2/cooked-index.c   | 1 +
 gdb/dwarf2/index-cache.c    | 1 +
 gdb/dwarf2/mapped-index.h   | 2 --
 gdb/dwarf2/read-gdb-index.c | 1 +
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gdb/dwarf2/cooked-index.c b/gdb/dwarf2/cooked-index.c
index 1b08ba4c52b..2d9f6e904ca 100644
--- a/gdb/dwarf2/cooked-index.c
+++ b/gdb/dwarf2/cooked-index.c
@@ -18,6 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "dwarf2/cooked-index.h"
+#include "dwarf2/index-common.h"
 #include "dwarf2/read.h"
 #include "dwarf2/stringify.h"
 #include "dwarf2/index-cache.h"
diff --git a/gdb/dwarf2/index-cache.c b/gdb/dwarf2/index-cache.c
index d34abf373f8..4e1aaa0d731 100644
--- a/gdb/dwarf2/index-cache.c
+++ b/gdb/dwarf2/index-cache.c
@@ -23,6 +23,7 @@
 #include "cli/cli-cmds.h"
 #include "cli/cli-decode.h"
 #include "command.h"
+#include "dwarf2/index-common.h"
 #include "gdbsupport/scoped_mmap.h"
 #include "gdbsupport/pathstuff.h"
 #include "dwarf2/index-write.h"
diff --git a/gdb/dwarf2/mapped-index.h b/gdb/dwarf2/mapped-index.h
index 199ee57a88b..8bc81b4c1ac 100644
--- a/gdb/dwarf2/mapped-index.h
+++ b/gdb/dwarf2/mapped-index.h
@@ -20,8 +20,6 @@
 #ifndef GDB_DWARF2_MAPPED_INDEX_H
 #define GDB_DWARF2_MAPPED_INDEX_H
 
-#include "dwarf2/index-common.h"
-#include "language.h"
 #include "quick-symbol.h"
 
 class cooked_index;
diff --git a/gdb/dwarf2/read-gdb-index.c b/gdb/dwarf2/read-gdb-index.c
index a9ae741cb81..6719fbf6a37 100644
--- a/gdb/dwarf2/read-gdb-index.c
+++ b/gdb/dwarf2/read-gdb-index.c
@@ -22,6 +22,7 @@
 #include "cli/cli-cmds.h"
 #include "cli/cli-style.h"
 #include "complaints.h"
+#include "dwarf2/index-common.h"
 #include "dwz.h"
 #include "event-top.h"
 #include "gdb/gdb-index.h"
-- 
2.39.5