Index: gdb-8.2/gdb/btrace.c
===================================================================
--- gdb-8.2.orig/gdb/btrace.c
+++ gdb-8.2/gdb/btrace.c
@@ -3233,7 +3233,7 @@ maint_btrace_packet_history_cmd (const c
   struct btrace_thread_info *btinfo;
   unsigned int size, begin, end, from, to;
 
-  thread_info *tp = find_thread_ptid (inferior_ptid);
+  struct thread_info *tp = find_thread_ptid (inferior_ptid);
   if (tp == NULL)
     error (_("No thread."));
 
@@ -3340,7 +3340,7 @@ maint_btrace_clear_packet_history_cmd (c
   if (inferior_ptid == null_ptid)
     error (_("No thread."));
 
-  thread_info *tp = inferior_thread ();
+  struct thread_info *tp = inferior_thread ();
   btrace_thread_info *btinfo = &tp->btrace;
 
   /* Must clear the maint data before - it depends on BTINFO->DATA.  */
@@ -3359,7 +3359,7 @@ maint_btrace_clear_cmd (const char *args
   if (inferior_ptid == null_ptid)
     error (_("No thread."));
 
-  thread_info *tp = inferior_thread ();
+  struct thread_info *tp = inferior_thread ();
   btrace_clear (tp);
 }
 
@@ -3422,7 +3422,7 @@ maint_info_btrace_cmd (const char *args,
   if (inferior_ptid == null_ptid)
     error (_("No thread."));
 
-  thread_info *tp = inferior_thread ();
+  struct thread_info *tp = inferior_thread ();
 
   btinfo = &tp->btrace;