Index: gdb-8.2/gdb/regcache.h
===================================================================
--- gdb-8.2.orig/gdb/regcache.h
+++ gdb-8.2/gdb/regcache.h
@@ -21,6 +21,7 @@
 #define REGCACHE_H
 
 #include "common-regcache.h"
+#include "function-view.h"
 #include <forward_list>
 
 struct regcache;
@@ -32,7 +33,7 @@ extern struct regcache *get_current_regc
 extern struct regcache *get_thread_regcache (ptid_t ptid);
 
 /* Get the regcache of THREAD.  */
-extern struct regcache *get_thread_regcache (thread_info *thread);
+extern struct regcache *get_thread_regcache (struct thread_info *thread);
 
 extern struct regcache *get_thread_arch_regcache (ptid_t, struct gdbarch *);
 extern struct regcache *get_thread_arch_aspace_regcache (ptid_t,
@@ -436,7 +437,7 @@ extern void registers_changed_ptid (ptid
 
 /* Indicate that registers of THREAD may have changed, so invalidate
    the cache.  */
-extern void registers_changed_thread (thread_info *thread);
+extern void registers_changed_thread (struct thread_info *thread);
 
 /* An abstract base class for register dump.  */