diff --git a/include/cdio/sector.h b/include/cdio/sector.h
index 846c1ab0..23de392a 100644
--- a/include/cdio/sector.h
+++ b/include/cdio/sector.h
@@ -1,5 +1,5 @@
 /*
-    $Id: sector.h,v 1.16 2004/07/10 02:17:57 rocky Exp $
+    $Id: sector.h,v 1.17 2004/07/12 03:34:14 rocky Exp $
 
     Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -83,9 +83,9 @@ typedef enum {
 
 /*! disc modes (5.29.2.8) */
 typedef enum {
-	CD_DA,				/* CD-DA */
-	CD_ROM,				/* CD-ROM mode 1 */
-	CD_ROM_XA			/* CD-ROM XA and CD-I */
+	CDIO_DISC_MODE_CD_DA,			/* CD-DA */
+	CDIO_DISC_MODE_CD_ROM,			/* CD-ROM mode 1 */
+	CDIO_DISC_MODE_CD_ROM_XA		/* CD-ROM XA and CD-I */
 } discmode_t;
 
 /*! track flags
diff --git a/lib/MSWindows/aspi32.c b/lib/MSWindows/aspi32.c
index 6c95f943..decfdbb9 100644
--- a/lib/MSWindows/aspi32.c
+++ b/lib/MSWindows/aspi32.c
@@ -1,5 +1,5 @@
 /*
-    $Id: aspi32.c,v 1.14 2004/07/08 06:30:01 rocky Exp $
+    $Id: aspi32.c,v 1.15 2004/07/12 03:34:14 rocky Exp $
 
     Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
 
@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: aspi32.c,v 1.14 2004/07/08 06:30:01 rocky Exp $";
+static const char _rcsid[] = "$Id: aspi32.c,v 1.15 2004/07/12 03:34:14 rocky Exp $";
 
 #include <cdio/cdio.h>
 #include <cdio/sector.h>
@@ -542,7 +542,7 @@ read_toc_aspi (_img_private_t *env)
   ssc.SRB_CDBLen      = 10;
   
   /* Operation code */
-  CDIO_MMC_SET_COMMAND(ssc.CDBByte, CDIO_MMC_CPCMD_READ_TOC);
+  CDIO_MMC_SET_COMMAND(ssc.CDBByte, CDIO_MMC_GPCMD_READ_TOC);
   
   /* Format */
   ssc.CDBByte[ 2 ] = READ_TOC_FORMAT_TOC;
diff --git a/lib/MSWindows/win32_ioctl.c b/lib/MSWindows/win32_ioctl.c
index fb75e9c9..7fc65b11 100644
--- a/lib/MSWindows/win32_ioctl.c
+++ b/lib/MSWindows/win32_ioctl.c
@@ -1,5 +1,5 @@
 /*
-    $Id: win32_ioctl.c,v 1.7 2004/07/10 01:21:20 rocky Exp $
+    $Id: win32_ioctl.c,v 1.8 2004/07/12 03:34:14 rocky Exp $
 
     Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
 
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: win32_ioctl.c,v 1.7 2004/07/10 01:21:20 rocky Exp $";
+static const char _rcsid[] = "$Id: win32_ioctl.c,v 1.8 2004/07/12 03:34:14 rocky Exp $";
 
 #include <cdio/cdio.h>
 #include <cdio/sector.h>
@@ -477,7 +477,7 @@ get_drive_cap_win32ioctl (const _img_private_t *env)
   sptwb.Spt.SenseInfoOffset    = 
     offsetof(SCSI_PASS_THROUGH_WITH_BUFFERS,SenseBuf);
 
-  CDIO_MMC_SET_COMMAND(sptwb.Spt.Cdb, CDIO_MMC_MODE_SENSE);
+  CDIO_MMC_SET_COMMAND(sptwb.Spt.Cdb, CDIO_MMC_GPCMD_MODE_SENSE);
   /*sptwb.Spt.Cdb[1]           = 0x08;  /+ doesn't return block descriptors */
   sptwb.Spt.Cdb[1]             = 0x0;
   sptwb.Spt.Cdb[2]             = CDIO_MMC_CAPABILITIES_PAGE;