Index: gdb-8.2/gdb/regcache.c
===================================================================
--- gdb-8.2.orig/gdb/regcache.c
+++ gdb-8.2/gdb/regcache.c
@@ -394,7 +394,7 @@ get_thread_regcache (ptid_t ptid)
 /* See regcache.h.  */
 
 struct regcache *
-get_thread_regcache (thread_info *thread)
+get_thread_regcache (struct thread_info *thread)
 {
   return get_thread_regcache (thread->ptid);
 }
@@ -478,7 +478,7 @@ registers_changed_ptid (ptid_t ptid)
 /* See regcache.h.  */
 
 void
-registers_changed_thread (thread_info *thread)
+registers_changed_thread (struct thread_info *thread)
 {
   registers_changed_ptid (thread->ptid);
 }
@@ -1575,7 +1575,7 @@ cooked_read_test (struct gdbarch *gdbarc
   address_space mock_aspace {};
   mock_inferior.gdbarch = gdbarch;
   mock_inferior.aspace = &mock_aspace;
-  thread_info mock_thread (&mock_inferior, mock_ptid);
+  struct thread_info mock_thread (&mock_inferior, mock_ptid);
 
   scoped_restore restore_thread_list
     = make_scoped_restore (&thread_list, &mock_thread);