diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9edd108e1b..5b33e37d36 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2002-10-20  Mark Kettenis  <kettenis@gnu.org>
 
+	* solib-sunos.c: Include "bcache.h" and "regcache.h".
+	* Makefile.in (solib-sunos.o): Add $(bcache_h) and $(regcache_h).
+
 	* configure.tgt (i[3456]86-*-openbsd*): Set gdb_target to obds.
 	* config/i386/obsd.mt: New file.
 	* i386bsd-nat.c (_initialize_i386bsd_nat): Introduce
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 416706a68f..c2bb7a2ad8 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -2129,7 +2129,8 @@ solib-legacy.o: solib-legacy.c $(defs_h) $(gdbcore_h) $(solib_svr4_h)
 solib-osf.o: solib-osf.c $(defs_h) $(gdb_string_h) $(bfd_h) $(symtab_h) \
 	$(symfile_h) $(objfiles_h) $(target_h) $(inferior_h) $(solist_h)
 solib-sunos.o: solib-sunos.c $(defs_h) $(gdb_string_h) $(symtab_h) $(bfd_h) \
-	$(symfile_h) $(objfiles_h) $(gdbcore_h) $(inferior_h) $(solist_h)
+	$(symfile_h) $(objfiles_h) $(gdbcore_h) $(inferior_h) $(solist_h) \
+	$(bcache_h) $(regcache_h)
 solib-svr4.o: solib-svr4.c $(defs_h) $(elf_external_h) $(elf_common_h) \
 	$(elf_mips_h) $(symtab_h) $(bfd_h) $(symfile_h) $(objfiles_h) \
 	$(gdbcore_h) $(target_h) $(inferior_h) $(solist_h) $(solib_svr4_h)
diff --git a/gdb/solib-sunos.c b/gdb/solib-sunos.c
index 6ffecb5a3a..ae115673c2 100644
--- a/gdb/solib-sunos.c
+++ b/gdb/solib-sunos.c
@@ -39,6 +39,8 @@
 #include "gdbcore.h"
 #include "inferior.h"
 #include "solist.h"
+#include "bcache.h"
+#include "regcache.h"
 
 /* Link map info to include in an allocated so_list entry */