diff --git a/include/cdio++/cdio.hpp b/include/cdio++/cdio.hpp
index 2daa8703..063f60e1 100644
--- a/include/cdio++/cdio.hpp
+++ b/include/cdio++/cdio.hpp
@@ -1,5 +1,5 @@
 /* -*- C++ -*-
-    $Id: cdio.hpp,v 1.5 2006/01/17 02:09:32 rocky Exp $
+    $Id: cdio.hpp,v 1.6 2006/01/25 06:36:07 rocky Exp $
 
     Copyright (C) 2005, 2006 Rocky Bernstein <rocky@panix.com>
 
@@ -36,13 +36,8 @@
 // makes sense.
 #include <cdio++/enum.hpp>
 
-class Cdio {
-
-public:
-
-  // Other member functions
+/* Things related to devices. No class or object is needed. */
 #include "devices.hpp"
-};
 
 /** A class relating to CD-Text. Use invalid track number 0 to specify
     CD-Text for the CD (as opposed to a specific track).
diff --git a/include/cdio++/devices.hpp b/include/cdio++/devices.hpp
index 1428ad73..6f210e4c 100644
--- a/include/cdio++/devices.hpp
+++ b/include/cdio++/devices.hpp
@@ -1,7 +1,7 @@
 /* -*- C++ -*-
-    $Id: devices.hpp,v 1.1 2005/11/10 11:11:16 rocky Exp $
+    $Id: devices.hpp,v 1.2 2006/01/25 06:36:07 rocky Exp $
 
-    Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
+    Copyright (C) 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
@@ -49,7 +49,7 @@ freeDeviceList (char * device_list[])
   NULL even though there may be a hardware CD-ROM.
 */
 char ** 
-getDevices(driver_id_t driver_id) 
+getDevices(driver_id_t driver_id=DRIVER_DEVICE) 
 {
   return cdio_get_devices(driver_id);
 }
@@ -86,7 +86,7 @@ getDevices (driver_id_t &driver_id)
 */
 char ** 
 getDevices(/*in*/ char *ppsz_search_devices[],
-	   cdio_fs_anal_t capabilities, bool b_any) 
+	   cdio_fs_anal_t capabilities, bool b_any=false) 
 {
   return cdio_get_devices_with_cap(ppsz_search_devices, capabilities, b_any);
 }
@@ -99,8 +99,8 @@ getDevices(/*in*/ char *ppsz_search_devices[],
 */
 char ** 
 getDevices(/*in*/ char* ppsz_search_devices[],
-	   cdio_fs_anal_t capabilities, bool b_any,
-	   /*out*/ driver_id_t &driver_id) 
+	   cdio_fs_anal_t capabilities, /*out*/ driver_id_t &driver_id,
+	   bool b_any=false) 
 {
   return cdio_get_devices_with_cap_ret(ppsz_search_devices, capabilities,
 				       b_any, &driver_id);