diff --git a/gdb/defs.h b/gdb/defs.h
index 535ca671673..8ef36c16df9 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -82,8 +82,6 @@
 #define O_BINARY 0
 #endif
 
-#include "hashtab.h"
-
 /* * System root path, used to find libraries etc.  */
 extern std::string gdb_sysroot;
 
diff --git a/gdb/dwarf2/die.h b/gdb/dwarf2/die.h
index a749b95ee28..d4eab0838bf 100644
--- a/gdb/dwarf2/die.h
+++ b/gdb/dwarf2/die.h
@@ -22,6 +22,7 @@
 
 #include "complaints.h"
 #include "dwarf2/attribute.h"
+#include "hashtab.h"
 
 /* This data structure holds a complete die structure.  */
 struct die_info
diff --git a/gdb/dwarf2/index-common.h b/gdb/dwarf2/index-common.h
index 0a871a7e364..339012949cd 100644
--- a/gdb/dwarf2/index-common.h
+++ b/gdb/dwarf2/index-common.h
@@ -21,6 +21,7 @@
 #define DWARF_INDEX_COMMON_H
 
 #include "extract-store-integer.h"
+#include "hashtab.h"
 
 /* The suffix for an index file.  */
 #define INDEX4_SUFFIX ".gdb-index"
diff --git a/gdb/extension.h b/gdb/extension.h
index 5260bcbde00..9ba1299f95e 100644
--- a/gdb/extension.h
+++ b/gdb/extension.h
@@ -22,6 +22,7 @@
 
 #include "mi/mi-cmds.h"
 #include "gdbsupport/array-view.h"
+#include "hashtab.h"
 #include <optional>
 
 struct breakpoint;