diff --git a/lib/driver/_cdio_stdio.c b/lib/driver/_cdio_stdio.c
index c7a19e94..add3ea07 100644
--- a/lib/driver/_cdio_stdio.c
+++ b/lib/driver/_cdio_stdio.c
@@ -1,5 +1,5 @@
 /*
-    $Id: _cdio_stdio.c,v 1.4 2005/02/05 04:25:14 rocky Exp $
+    $Id: _cdio_stdio.c,v 1.5 2006/02/27 10:29:20 flameeyes Exp $
 
     Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -39,7 +39,7 @@
 #include "_cdio_stream.h"
 #include "_cdio_stdio.h"
 
-static const char _rcsid[] = "$Id: _cdio_stdio.c,v 1.4 2005/02/05 04:25:14 rocky Exp $";
+static const char _rcsid[] = "$Id: _cdio_stdio.c,v 1.5 2006/02/27 10:29:20 flameeyes Exp $";
 
 #define CDIO_STDIO_BUFSIZE (128*1024)
 
@@ -187,7 +187,7 @@ CdioDataSource_t *
 cdio_stdio_new(const char pathname[])
 {
   CdioDataSource_t *new_obj = NULL;
-  cdio_stream_io_functions funcs = { 0, };
+  cdio_stream_io_functions funcs = { NULL, NULL, NULL, NULL, NULL, NULL };
   _UserData *ud = NULL;
   struct stat statbuf;
   
diff --git a/lib/driver/cd_types.c b/lib/driver/cd_types.c
index 381f5b9d..7b1abe48 100644
--- a/lib/driver/cd_types.c
+++ b/lib/driver/cd_types.c
@@ -1,5 +1,5 @@
 /*
-    $Id: cd_types.c,v 1.5 2006/02/13 08:44:17 rocky Exp $
+    $Id: cd_types.c,v 1.6 2006/02/27 10:29:20 flameeyes Exp $
 
     Copyright (C) 2003, 2004, 2005, 2006 Rocky Bernstein
     <rocky@panix.com>
@@ -107,7 +107,7 @@ static signature_t sigs[] =
     {3,     7, "EL TORITO",  "BOOTABLE"}, 
     {4,     0, "VIDEO_CD",   "VIDEO CD"}, 
     {4,     0, "SUPERVCD",   "SVCD or Chaoji VCD"}, 
-    { 0 }
+    {0, 0, NULL, NULL }
   };
 
 
diff --git a/lib/driver/device.c b/lib/driver/device.c
index 32b2b85f..27d32fef 100644
--- a/lib/driver/device.c
+++ b/lib/driver/device.c
@@ -1,5 +1,5 @@
 /*
-    $Id: device.c,v 1.34 2006/02/18 19:36:07 rocky Exp $
+    $Id: device.c,v 1.35 2006/02/27 10:29:20 flameeyes Exp $
 
     Copyright (C) 2005, 2006 Rocky Bernstein <rocky@panix.com>
 
@@ -48,7 +48,7 @@
 /* The below array gives of the drivers that are currently available for 
    on a particular host. */
 
-CdIo_driver_t CdIo_driver[CDIO_MAX_DRIVER] = { {0} };
+CdIo_driver_t CdIo_driver[CDIO_MAX_DRIVER] = { {0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL} };
 
 /* The last valid entry of Cdio_driver. 
    -1 or (CDIO_DRIVER_UNINIT) means uninitialzed.