diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 218fc1ddfd9..5514730ca48 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2016-11-26  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* mi/mi-out.c (ui_out_data): Rename to ...
+	(mi_ui_out_data): ... this.
+
 2016-11-26  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* ui-out.c (_initialize_ui_out): Remove.
diff --git a/gdb/mi/mi-out.c b/gdb/mi/mi-out.c
index 491caf52e4b..0f484260945 100644
--- a/gdb/mi/mi-out.c
+++ b/gdb/mi/mi-out.c
@@ -27,14 +27,14 @@
 typedef struct ui_file *ui_filep;
 DEF_VEC_P (ui_filep);
 
-struct ui_out_data
+struct mi_ui_out_data
   {
     int suppress_field_separator;
     int suppress_output;
     int mi_version;
     VEC (ui_filep) *streams;
   };
-typedef struct ui_out_data mi_out_data;
+typedef struct mi_ui_out_data mi_out_data;
 
 /* These are the MI output functions */