From fb8ea9d2ca2eafa83390d44d444d0193b32e19dc Mon Sep 17 00:00:00 2001
From: Tom Tromey <tom@tromey.com>
Date: Wed, 22 Mar 2023 20:47:36 -0600
Subject: [PATCH] Don't include cooked-index.h from dwarf2/read.h

dwarf2/read.h includes cooked-index.h, but it doesn't need to.  This
patch removes the inclusion from this header, and adds one to
index-write.c to make up for the absence.
---
 gdb/dwarf2/index-write.c | 1 +
 gdb/dwarf2/read.h        | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdb/dwarf2/index-write.c b/gdb/dwarf2/index-write.c
index 9c1f4013760..c9d6e633bf3 100644
--- a/gdb/dwarf2/index-write.c
+++ b/gdb/dwarf2/index-write.c
@@ -30,6 +30,7 @@
 #include "gdbsupport/scoped_fd.h"
 #include "complaints.h"
 #include "dwarf2/index-common.h"
+#include "dwarf2/cooked-index.h"
 #include "dwarf2.h"
 #include "dwarf2/read.h"
 #include "dwarf2/dwz.h"
diff --git a/gdb/dwarf2/read.h b/gdb/dwarf2/read.h
index 96f38a9bbcb..dc7abf23ba4 100644
--- a/gdb/dwarf2/read.h
+++ b/gdb/dwarf2/read.h
@@ -23,7 +23,6 @@
 #include <queue>
 #include <unordered_map>
 #include "dwarf2/comp-unit-head.h"
-#include "dwarf2/cooked-index.h"
 #include "dwarf2/file-and-dir.h"
 #include "dwarf2/index-cache.h"
 #include "dwarf2/mapped-index.h"
-- 
2.30.2