diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0e5c0685cc2..feef6a41126 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-06-10  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* dwarf2read.c (process_cu_includes): Remove struct keyword.
+	* serial.c (serial_interface_lookup): Remove struct keyword.
+
 2018-06-10  Tom Tromey  <tom@tromey.com>
 
 	* procfs.c (procfs_target::xfer_partial): Use "beneath" as a
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 7f1857930b1..81e1cfb909f 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -10217,7 +10217,7 @@ compute_compunit_symtab_includes (struct dwarf2_per_cu_data *per_cu)
 static void
 process_cu_includes (struct dwarf2_per_objfile *dwarf2_per_objfile)
 {
-  for (struct dwarf2_per_cu_data *iter : dwarf2_per_objfile->just_read_cus)
+  for (dwarf2_per_cu_data *iter : dwarf2_per_objfile->just_read_cus)
     {
       if (! iter->is_debug_types)
 	compute_compunit_symtab_includes (iter);
diff --git a/gdb/serial.c b/gdb/serial.c
index 16308ab9c72..0239fc83371 100644
--- a/gdb/serial.c
+++ b/gdb/serial.c
@@ -143,7 +143,7 @@ serial_log_command (struct target_ops *self, const char *cmd)
 static const struct serial_ops *
 serial_interface_lookup (const char *name)
 {
-  for (const struct serial_ops *ops : serial_ops_list)
+  for (const serial_ops *ops : serial_ops_list)
     if (strcmp (name, ops->name) == 0)
       return ops;