diff --git a/lib/driver/aix.c b/lib/driver/aix.c
index 6eb1db51..49fe0896 100644
--- a/lib/driver/aix.c
+++ b/lib/driver/aix.c
@@ -1,7 +1,7 @@
 /*
-    $Id: aix.c,v 1.1 2005/03/05 09:26:52 rocky Exp $
+    $Id: aix.c,v 1.2 2006/03/17 19:06:51 rocky Exp $
 
-    Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
+    Copyright (C) 2004, 2005, 2006 Rocky Bernstein <rocky@panix.com>
 
     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
@@ -15,7 +15,8 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301 USA.
 */
 
 #ifdef HAVE_CONFIG_H
@@ -37,7 +38,7 @@
 
 #ifdef HAVE_AIX_CDROM
 
-static const char _rcsid[] = "$Id: aix.c,v 1.1 2005/03/05 09:26:52 rocky Exp $";
+static const char _rcsid[] = "$Id: aix.c,v 1.2 2006/03/17 19:06:51 rocky Exp $";
 
 #ifdef HAVE_GLOB_H
 #include <glob.h>
@@ -197,7 +198,7 @@ init_aix (_img_private_t *p_env)
 static driver_return_code_t
 run_mmc_cmd_aix( 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/solaris.c b/lib/driver/solaris.c
index d4f500b9..be6692d6 100644
--- a/lib/driver/solaris.c
+++ b/lib/driver/solaris.c
@@ -1,8 +1,9 @@
 /*
-    $Id: solaris.c,v 1.10 2005/04/23 01:16:19 rocky Exp $
+    $Id: solaris.c,v 1.11 2006/03/17 19:06:51 rocky Exp $
 
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
-    Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
+    Copyright (C) 2002, 2003, 2004, 2005, 2006
+    Rocky Bernstein <rocky@panix.com>
 
     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
@@ -38,7 +39,7 @@
 
 #ifdef HAVE_SOLARIS_CDROM
 
-static const char _rcsid[] = "$Id: solaris.c,v 1.10 2005/04/23 01:16:19 rocky Exp $";
+static const char _rcsid[] = "$Id: solaris.c,v 1.11 2006/03/17 19:06:51 rocky Exp $";
 
 #ifdef HAVE_GLOB_H
 #include <glob.h>
@@ -280,7 +281,7 @@ init_solaris (_img_private_t *p_env)
 static driver_return_code_t
 run_mmc_cmd_solaris( 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;