diff --git a/qemu/tcg/optimize.c b/qemu/tcg/optimize.c
index 30684ee7..51db6047 100644
--- a/qemu/tcg/optimize.c
+++ b/qemu/tcg/optimize.c
@@ -37,12 +37,12 @@
         glue(glue(case INDEX_op_, x), _i64):    \
         glue(glue(case INDEX_op_, x), _vec)
 
-static inline struct tcg_temp_info *ts_info(TCGTemp *ts)
+static inline TempOptInfo *ts_info(TCGTemp *ts)
 {
     return ts->state_ptr;
 }
 
-static inline struct tcg_temp_info *arg_info(TCGArg arg)
+static inline TempOptInfo *arg_info(TCGArg arg)
 {
     return ts_info(arg_temp(arg));
 }
@@ -65,9 +65,9 @@ static inline bool ts_is_copy(TCGTemp *ts)
 /* Reset TEMP's state, possibly removing the temp for the list of copies.  */
 static void reset_ts(TCGTemp *ts)
 {
-    struct tcg_temp_info *ti = ts_info(ts);
-    struct tcg_temp_info *pi = ts_info(ti->prev_copy);
-    struct tcg_temp_info *ni = ts_info(ti->next_copy);
+    TempOptInfo *ti = ts_info(ts);
+    TempOptInfo *pi = ts_info(ti->prev_copy);
+    TempOptInfo *ni = ts_info(ti->next_copy);
 
     ni->prev_copy = ti->prev_copy;
     pi->next_copy = ti->next_copy;
@@ -92,12 +92,12 @@ static void reset_all_temps(TCGContext *s, int nb_temps)
 /* Initialize and activate a temporary.  */
 static void init_ts_info(TCGContext *s, TCGTemp *ts)
 {
-    struct tcg_temp_info *temps = s->temps2;
+    TempOptInfo *temps = s->temps2;
     TCGTempSet *temps_used = &s->temps2_used;
 
     size_t idx = temp_idx(s, ts);
     if (!test_bit(idx, temps_used->l)) {
-        struct tcg_temp_info *ti = &temps[idx];
+        TempOptInfo *ti = &temps[idx];
 
         ts->state_ptr = ti;
         ti->next_copy = ts;
@@ -173,7 +173,7 @@ static void tcg_opt_gen_movi(TCGContext *s, TCGOp *op, TCGArg dst, TCGArg val)
     const TCGOpDef *def;
     TCGOpcode new_op;
     tcg_target_ulong mask;
-    struct tcg_temp_info *di = arg_info(dst);
+    TempOptInfo *di = arg_info(dst);
 
     def = &s->tcg_op_defs[op->opc];
     if (def->flags & TCG_OPF_VECTOR) {
@@ -205,8 +205,8 @@ static void tcg_opt_gen_mov(TCGContext *s, TCGOp *op, TCGArg dst, TCGArg src)
     TCGTemp *dst_ts = arg_temp(dst);
     TCGTemp *src_ts = arg_temp(src);
     const TCGOpDef *def;
-    struct tcg_temp_info *di;
-    struct tcg_temp_info *si;
+    TempOptInfo *di;
+    TempOptInfo *si;
     tcg_target_ulong mask;
     TCGOpcode new_op;
 
@@ -240,7 +240,7 @@ static void tcg_opt_gen_mov(TCGContext *s, TCGOp *op, TCGArg dst, TCGArg src)
     di->mask = mask;
 
     if (src_ts->type == dst_ts->type) {
-        struct tcg_temp_info *ni = ts_info(si->next_copy);
+        TempOptInfo *ni = ts_info(si->next_copy);
 
         di->next_copy = si->next_copy;
         di->prev_copy = src_ts;
diff --git a/qemu/tcg/tcg.h b/qemu/tcg/tcg.h
index 973a0dfc..08319033 100644
--- a/qemu/tcg/tcg.h
+++ b/qemu/tcg/tcg.h
@@ -663,13 +663,13 @@ typedef struct TCGOpDef {
     TCGArgConstraint *args_ct;
 } TCGOpDef;
 
-struct tcg_temp_info {
+typedef struct TempOptInfo {
     bool is_const;
     TCGTemp *prev_copy;
     TCGTemp *next_copy;
     tcg_target_ulong val;
     tcg_target_ulong mask;
-};
+} TempOptInfo;
 
 struct TCGContext {
     uint8_t *pool_cur, *pool_end;
@@ -783,7 +783,7 @@ struct TCGContext {
     TCGOpDef *tcg_op_defs;
 
     /* qemu/tcg/optimize.c */
-    struct tcg_temp_info temps2[TCG_MAX_TEMPS];
+    TempOptInfo temps2[TCG_MAX_TEMPS];
     TCGTempSet temps2_used;
 
     /* qemu/target-m68k/translate.c */