diff --git a/include/cdio/track.h b/include/cdio/track.h
index 535f2019..75332400 100644
--- a/include/cdio/track.h
+++ b/include/cdio/track.h
@@ -1,5 +1,5 @@
 /* -*- c -*-
-    $Id: track.h,v 1.10 2006/01/14 09:44:53 rocky Exp $
+    $Id: track.h,v 1.11 2006/01/23 20:30:28 rocky Exp $
 
     Copyright (C) 2005, 2006 Rocky Bernstein <rocky@panix.com>
 
@@ -24,24 +24,6 @@
 #ifndef __CDIO_TRACK_H__
 #define __CDIO_TRACK_H__
 
-/*! The leadout track is always 0xAA, regardless of # of tracks on
-    disc, or what value may be used internally. For example although
-    OS X uses a different value for the lead-out track internally than
-    given below, programmers should use CDIO_CDROM_LEADOUT_TRACK and
-    not worry about this.
- */
-#define	CDIO_CDROM_LEADOUT_TRACK 0xAA
-
-/*! Largest CD track number */
-#define CDIO_CD_MAX_TRACKS    99 
-/*! Smallest CD track number */
-#define CDIO_CD_MIN_TRACK_NO   1
-
-/*! 
-  Constant for invalid track number
-*/
-#define CDIO_INVALID_TRACK   0xFF
-  
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -76,20 +58,33 @@ extern "C" {
 			      */
   } track_flags_t;
     
+  /*! The leadout track is always 0xAA, regardless of # of tracks on
+    disc, or what value may be used internally. For example although
+    OS X uses a different value for the lead-out track internally than
+    given below, programmers should use CDIO_CDROM_LEADOUT_TRACK and
+    not worry about this.
+  */
+
   /*! An enumeration for some of the CDIO_CDROM_* \#defines below. This
     isn't really an enumeration one would really use in a program; it
     is to be helpful in debuggers where wants just to refer to the
     CDIO_CDROM_* names and get something.
   */
   extern enum cdio_track_enums {
-    CDIO_CDROM_LBA        = 0x01, /**< "logical block": first frame is #0 */
-    CDIO_CDROM_MSF        = 0x02, /**< "minute-second-frame": binary, not
-				     BCD here! */
-    CDIO_CDROM_DATA_TRACK = 0x04, 
-    CDIO_CDROM_CDI_TRACK  = 0x10,
-    CDIO_CDROM_XA_TRACK   = 0x20
+    CDIO_CDROM_LBA           = 0x01, /**< "logical block": first frame is #0 */
+    CDIO_CDROM_MSF           = 0x02, /**< "minute-second-frame": binary, not
+					BCD here! */
+    CDIO_CDROM_DATA_TRACK    = 0x04, 
+    CDIO_CDROM_CDI_TRACK     = 0x10,
+    CDIO_CDROM_XA_TRACK      = 0x20,
+    CDIO_CD_MAX_TRACKS       =   99, /**< Largest CD track number */
+    CDIO_CDROM_LEADOUT_TRACK = 0xAA, /**< Lead-out track number */
+    CDIO_INVALID_TRACK       = 0xFF, /**<  Constant for invalid track number */
+
    } cdio_track_enums;
   
+#define CDIO_CD_MIN_TRACK_NO  1 /**< Smallest CD track number */
+  
   /*! track modes (Table 350) 
     reference: MMC-3 draft revsion - 10g
   */
@@ -104,16 +99,6 @@ extern "C" {
     MODE2_RAW			/**< 2352 byte block length */
   } trackmode_t;
   
-  /*! CD-ROM address types (GNU/Linux e.g. cdrom_tocentry.cdte_format) */
-#define	CDIO_CDROM_LBA 0x01 /**< "logical block": first frame is #0 */
-#define	CDIO_CDROM_MSF 0x02 /**< "minute-second-frame": binary, not
-                               BCD here! */
-      
-  /*! CD-ROM track format types (GNU/Linux cdte_ctrl) */
-#define	CDIO_CDROM_DATA_TRACK	0x04
-#define	CDIO_CDROM_CDI_TRACK	0x10
-#define	CDIO_CDROM_XA_TRACK	0x20
-      
   /*! 
     Get CD-Text information for a CdIo_t object.
 
@@ -142,7 +127,7 @@ extern "C" {
   track_t cdio_get_last_track_num (const CdIo_t *p_cdio);
   
 
-  /*! Find the track which contans lsn.
+  /*! Find the track which contains lsn.
     CDIO_INVALID_TRACK is returned if the lsn outside of the CD or
     if there was some error.