diff --git a/include/cdio/audio.h b/include/cdio/audio.h
index 625316db..da5c76f6 100644
--- a/include/cdio/audio.h
+++ b/include/cdio/audio.h
@@ -1,7 +1,7 @@
 /* -*- c -*-
-    $Id: audio.h,v 1.10 2005/03/21 09:19:06 rocky Exp $
+    $Id: audio.h,v 1.11 2007/03/16 15:32:48 rocky Exp $
 
-    Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
+    Copyright (C) 2005, 2007 Rocky Bernstein <rocky@gnu.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -53,13 +53,13 @@ extern "C" {
   } cdio_audio_volume_t;
   
 
-  /* This struct is used by the CDROMPLAYTRKIND ioctl */
+  /*! This struct is used by the CDROMPLAYTRKIND ioctl */
   typedef struct cdio_track_index_s
   {
-    uint8_t	i_start_track;	/* start track */
-    uint8_t	i_start_index;	/* start index */
-    uint8_t	i_end_track;	/* end track */
-    uint8_t	i_end_index;	/* end index */
+    uint8_t	i_start_track;	/**< start track */
+    uint8_t	i_start_index;	/**< start index */
+    uint8_t	i_end_track;	/**< end track */
+    uint8_t	i_end_index;	/**< end index */
   } cdio_track_index_t;
 
   /*!
diff --git a/include/cdio/read.h b/include/cdio/read.h
index 0fd56d07..af9b6226 100644
--- a/include/cdio/read.h
+++ b/include/cdio/read.h
@@ -1,7 +1,7 @@
 /* -*- c -*-
-    $Id: read.h,v 1.12 2007/02/25 15:58:31 rocky Exp $
+    $Id: read.h,v 1.13 2007/03/16 15:32:48 rocky Exp $
 
-    Copyright (C) 2005, 2006 Rocky Bernstein <rocky@panix.com>
+    Copyright (C) 2005, 2006, 2007 Rocky Bernstein <rocky@gnu.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -43,7 +43,7 @@ extern "C" {
     CDIO_READ_MODE_M1F1,   /**< Mode 1 Form 1 */
     CDIO_READ_MODE_M1F2,   /**< Mode 1 Form 2 */
     CDIO_READ_MODE_M2F1,   /**< Mode 2 Form 1 */
-    CDIO_READ_MODE_M2F2,   /**< Mode 2 Form 2 */
+    CDIO_READ_MODE_M2F2    /**< Mode 2 Form 2 */
   } cdio_read_mode_t;
   
   /*!