diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1adb81d2d1..f9194f57ef 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2003-06-17  Andrew Cagney  <cagney@redhat.com>
+
+	* trad-frame.h (struct frame_info): Add opaque declaration.
+	* remote-fileio.h (struct cmd_list_element): Add opaque
+	declaration.
+	* h8300-tdep.c (h8300s_register_name): Avoid C++ // style
+	comments.
+
 2003-06-17  Daniel Jacobowitz  <drow@mvista.com>
 
 	* remote.c (remote_prepare_to_store): Replace call to
diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c
index e74913e76e..24dca63fdb 100644
--- a/gdb/h8300-tdep.c
+++ b/gdb/h8300-tdep.c
@@ -895,7 +895,7 @@ h8300s_register_name (int regno)
   static char *register_names[] = {
     "er0", "er1", "er2", "er3", "er4", "er5", "er6",
     "sp", "", "pc", "cycles", "", "tick", "inst",
-    //"mach", "macl", 
+    /* "mach", "macl", */
     "ccr", "exr" /* pseudo registers */
   };
   if (regno < 0
diff --git a/gdb/remote-fileio.h b/gdb/remote-fileio.h
index da248ec5f0..68c6450e8e 100644
--- a/gdb/remote-fileio.h
+++ b/gdb/remote-fileio.h
@@ -24,6 +24,8 @@
 #ifndef REMOTE_FILEIO_H
 #define REMOTE_FILEIO_H
 
+struct cmd_list_element;
+
 /* Unified interface to remote fileio, called in remote.c from
    remote_wait () and remote_async_wait () */
 extern void remote_fileio_request (char *buf);
diff --git a/gdb/trad-frame.h b/gdb/trad-frame.h
index 4d753153b2..2b04c7e654 100644
--- a/gdb/trad-frame.h
+++ b/gdb/trad-frame.h
@@ -22,6 +22,8 @@
 #ifndef TRAD_FRAME_H
 #define TRAD_FRAME_H
 
+struct frame_info;
+
 /* A traditional saved regs table, indexed by REGNUM, encoding where
    the value of REGNUM for the previous frame can be found in this
    frame.