diff --git a/lib/driver/bsdi.c b/lib/driver/bsdi.c
index aa516dea..21fb81fe 100644
--- a/lib/driver/bsdi.c
+++ b/lib/driver/bsdi.c
@@ -1,5 +1,5 @@
 /*
-    $Id: bsdi.c,v 1.13 2005/05/09 01:06:39 rocky Exp $
+    $Id: bsdi.c,v 1.14 2006/02/18 19:36:07 rocky Exp $
 
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: bsdi.c,v 1.13 2005/05/09 01:06:39 rocky Exp $";
+static const char _rcsid[] = "$Id: bsdi.c,v 1.14 2006/02/18 19:36:07 rocky Exp $";
 
 #include <cdio/logging.h>
 #include <cdio/sector.h>
@@ -105,7 +105,7 @@ static lsn_t  get_disc_last_lsn_bsdi (void *p_user_data);
 static driver_return_code_t
 run_mmc_cmd_bsdi(void *p_user_data, unsigned int i_timeout_ms,
 		 unsigned int i_cdb, const mmc_cdb_t *p_cdb, 
-		 scsi_mmc_direction_t e_direction, 
+		 cdio_mmc_direction_t e_direction, 
 		 unsigned int i_buf, /*in/out*/ void *p_buf )
 {
   const _img_private_t *p_env = p_user_data;
diff --git a/lib/driver/device.c b/lib/driver/device.c
index 5c465627..32b2b85f 100644
--- a/lib/driver/device.c
+++ b/lib/driver/device.c
@@ -1,5 +1,5 @@
 /*
-    $Id: device.c,v 1.33 2006/02/02 04:37:29 rocky Exp $
+    $Id: device.c,v 1.34 2006/02/18 19:36:07 rocky Exp $
 
     Copyright (C) 2005, 2006 Rocky Bernstein <rocky@panix.com>
 
@@ -729,7 +729,7 @@ cdio_get_hwinfo (const CdIo_t *p_cdio, cdio_hwinfo_t *hw_info)
     return p_cdio->op.get_hwinfo (p_cdio, hw_info);
   } else {
     /* Perhaps driver forgot to initialize.  We are no worse off Using
-       scsi_mmc than returning false here. */
+      mmc than returning false here. */
     return mmc_get_hwinfo(p_cdio, hw_info);
   }
 }
diff --git a/lib/driver/osx.c b/lib/driver/osx.c
index 18e4aac1..6df5335c 100644
--- a/lib/driver/osx.c
+++ b/lib/driver/osx.c
@@ -1,5 +1,5 @@
 /*
-    $Id: osx.c,v 1.5 2005/10/05 09:48:12 rocky Exp $
+    $Id: osx.c,v 1.6 2006/02/18 19:36:07 rocky Exp $
 
     Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> 
     from vcdimager code: 
@@ -34,7 +34,7 @@
 #include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: osx.c,v 1.5 2005/10/05 09:48:12 rocky Exp $";
+static const char _rcsid[] = "$Id: osx.c,v 1.6 2006/02/18 19:36:07 rocky Exp $";
 
 #include <cdio/logging.h>
 #include <cdio/sector.h>
@@ -350,7 +350,7 @@ static int
 run_mmc_cmd_osx( void *p_user_data, 
 		 unsigned int i_timeout_ms,
 		 unsigned int i_cdb, const mmc_cdb_t *p_cdb, 
-		 scsi_mmc_direction_t e_direction, 
+		 cdio_mmc_direction_t e_direction, 
 		 unsigned int i_buf, /*in/out*/ void *p_buf )
 {
   _img_private_t *p_env = p_user_data;
@@ -483,7 +483,7 @@ static int
 run_mmc_cmd_osx( const void *p_user_data, 
 		 unsigned int i_timeout_ms,
 		 unsigned int i_cdb, const mmc_cdb_t *p_cdb, 
-		 scsi_mmc_direction_t e_direction, 
+		 cdio_mmc_direction_t e_direction, 
 		 unsigned int i_buf, /*in/out*/ void *p_buf )
 {