diff --git a/lib/driver/MSWindows/aspi32.c b/lib/driver/MSWindows/aspi32.c
index 1323b99f..0f73e8af 100644
--- a/lib/driver/MSWindows/aspi32.c
+++ b/lib/driver/MSWindows/aspi32.c
@@ -1,5 +1,5 @@
 /*
-    $Id: aspi32.c,v 1.9 2005/08/28 22:40:19 rocky Exp $
+    $Id: aspi32.c,v 1.10 2006/03/17 03:10:53 rocky Exp $
 
     Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
 
@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: aspi32.c,v 1.9 2005/08/28 22:40:19 rocky Exp $";
+static const char _rcsid[] = "$Id: aspi32.c,v 1.10 2006/03/17 03:10:53 rocky Exp $";
 
 #include <cdio/cdio.h>
 #include <cdio/sector.h>
@@ -489,7 +489,7 @@ init_aspi (_img_private_t *env)
 int
 run_mmc_cmd_aspi( void *p_user_data, unsigned int i_timeout_ms,
 		  unsigned int i_cdb, const mmc_cdb_t * p_cdb,  
-		  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/MSWindows/aspi32.h b/lib/driver/MSWindows/aspi32.h
index ad12ed3e..1c20f47e 100644
--- a/lib/driver/MSWindows/aspi32.h
+++ b/lib/driver/MSWindows/aspi32.h
@@ -1,6 +1,6 @@
 /* Win32 aspi specific */
 /*
-    $Id: aspi32.h,v 1.4 2005/03/06 00:54:50 rocky Exp $
+    $Id: aspi32.h,v 1.5 2006/03/17 03:10:53 rocky Exp $
 
     Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
 
@@ -244,6 +244,6 @@ int run_mmc_cmd_aspi( void *p_user_data,
 		      unsigned int i_timeout,
 		      unsigned int i_cdb, 
 		      const mmc_cdb_t * p_cdb,
-		      mmc_direction_t e_direction, 
+		      cdio_mmc_direction_t e_direction, 
 		      unsigned int i_buf, /*in/out*/ void *p_buf );
 
diff --git a/lib/driver/MSWindows/win32.c b/lib/driver/MSWindows/win32.c
index cd3e121e..051fc282 100644
--- a/lib/driver/MSWindows/win32.c
+++ b/lib/driver/MSWindows/win32.c
@@ -1,5 +1,5 @@
 /*
-    $Id: win32.c,v 1.32 2005/10/28 12:43:30 rocky Exp $
+    $Id: win32.c,v 1.33 2006/03/17 03:10:53 rocky Exp $
 
     Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
 
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: win32.c,v 1.32 2005/10/28 12:43:30 rocky Exp $";
+static const char _rcsid[] = "$Id: win32.c,v 1.33 2006/03/17 03:10:53 rocky Exp $";
 
 #include <cdio/cdio.h>
 #include <cdio/sector.h>
@@ -274,7 +274,7 @@ is_cdrom_win32(const char drive_letter) {
 static int
 run_mmc_cmd_win32( void *p_user_data, unsigned int i_timeout_ms,
 		   unsigned int i_cdb, const mmc_cdb_t *p_cdb, 
-		   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;
diff --git a/lib/driver/MSWindows/win32.h b/lib/driver/MSWindows/win32.h
index 7e32d309..f81b37d0 100644
--- a/lib/driver/MSWindows/win32.h
+++ b/lib/driver/MSWindows/win32.h
@@ -1,5 +1,5 @@
 /*
-    $Id: win32.h,v 1.9 2005/06/11 18:59:47 rocky Exp $
+    $Id: win32.h,v 1.10 2006/03/17 03:10:53 rocky Exp $
 
     Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
 
@@ -173,7 +173,7 @@ int run_mmc_cmd_win32ioctl( void *p_user_data,
 			    unsigned int i_timeout,
 			    unsigned int i_cdb, 
 			    const mmc_cdb_t * p_cdb,
-			    mmc_direction_t e_direction, 
+			    cdio_mmc_direction_t e_direction, 
 			    unsigned int i_buf, /*in/out*/ void *p_buf );
 
 /*!
diff --git a/lib/driver/MSWindows/win32_ioctl.c b/lib/driver/MSWindows/win32_ioctl.c
index 777bf234..c9beb731 100644
--- a/lib/driver/MSWindows/win32_ioctl.c
+++ b/lib/driver/MSWindows/win32_ioctl.c
@@ -1,5 +1,5 @@
 /*
-    $Id: win32_ioctl.c,v 1.28 2005/06/11 18:59:47 rocky Exp $
+    $Id: win32_ioctl.c,v 1.29 2006/03/17 03:10:53 rocky Exp $
 
     Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
 
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: win32_ioctl.c,v 1.28 2005/06/11 18:59:47 rocky Exp $";
+static const char _rcsid[] = "$Id: win32_ioctl.c,v 1.29 2006/03/17 03:10:53 rocky Exp $";
 
 #ifdef HAVE_WIN32_CDROM
 
@@ -432,7 +432,7 @@ int
 run_mmc_cmd_win32ioctl( void *p_user_data, 
 			unsigned int i_timeout_ms,
 			unsigned int i_cdb, const mmc_cdb_t * p_cdb,
-			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;