diff --git a/include/cdio/device.h b/include/cdio/device.h
index 42d36ada..e81d2312 100644
--- a/include/cdio/device.h
+++ b/include/cdio/device.h
@@ -1,5 +1,5 @@
 /* -*- c -*-
-    $Id: device.h,v 1.38 2008/03/27 17:40:50 rocky Exp $
+    $Id: device.h,v 1.39 2008/03/28 01:28:50 rocky Exp $
 
     Copyright (C) 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
 
@@ -441,43 +441,6 @@ extern "C" {
   /*! True if CD-ROM understand ATAPI commands. */
   bool_3way_t cdio_have_atapi (CdIo_t *p_cdio);
 
-  /*! DEPRICATED: use cdio_have_driver().
-    True if AIX driver is available. */
-  bool cdio_have_aix    (void);
-
-  /*! DEPRICATED: use cdio_have_driver().
-    True if BSDI driver is available. */
-  bool cdio_have_bsdi    (void);
-
-  /*! DEPRICATED: use cdio_have_driver().
-    True if FreeBSD driver is available. */
-  bool cdio_have_freebsd (void);
-
-  /*! DEPRICATED: use cdio_have_driver().
-    True if GNU/Linux driver is available. */
-  bool cdio_have_linux   (void);
-
-  /*! DEPRICATED: use cdio_have_driver().
-    True if Sun Solaris driver is available. */
-  bool cdio_have_solaris (void);
-
-  /*! DEPRICATED: use cdio_have_driver().
-    True if Apple OSX driver is available. */
-  bool cdio_have_osx     (void);
-
-  /*! DEPRICATED: use cdio_have_driver().
-    True if Microsoft Windows driver is available. */
-  bool cdio_have_win32   (void);
-
-  /*! True if Nero driver is available. */
-  bool cdio_have_nrg     (void);
-
-  /*! True if BIN/CUE driver is available. */
-  bool cdio_have_bincue  (void);
-
-  /*! True if cdrdao CDRDAO driver is available. */
-  bool cdio_have_cdrdao  (void);
-
   /*! Like cdio_have_xxx but uses an enumeration instead. */
   bool cdio_have_driver (driver_id_t driver_id);
   
diff --git a/lib/driver/cdio_private.h b/lib/driver/cdio_private.h
index b2f877d2..42f28a32 100644
--- a/lib/driver/cdio_private.h
+++ b/lib/driver/cdio_private.h
@@ -1,7 +1,7 @@
 /*
-    $Id: cdio_private.h,v 1.35 2008/03/27 17:40:50 rocky Exp $
+    $Id: cdio_private.h,v 1.36 2008/03/28 01:28:50 rocky Exp $
 
-    Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
+    Copyright (C) 2003, 2004, 2005, 2008 Rocky Bernstein <rocky@gnu.org>
 
     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
@@ -504,6 +504,43 @@ extern "C" {
   CdIo_t * cdio_open_am_netbsd (const char *psz_source,
 				const char *psz_access_mode);
 
+  /*! DEPRICATED: use cdio_have_driver().
+    True if AIX driver is available. */
+  bool cdio_have_aix    (void);
+
+  /*! DEPRICATED: use cdio_have_driver().
+    True if BSDI driver is available. */
+  bool cdio_have_bsdi    (void);
+
+  /*! DEPRICATED: use cdio_have_driver().
+    True if FreeBSD driver is available. */
+  bool cdio_have_freebsd (void);
+
+  /*! DEPRICATED: use cdio_have_driver().
+    True if GNU/Linux driver is available. */
+  bool cdio_have_linux   (void);
+
+  /*! DEPRICATED: use cdio_have_driver().
+    True if Sun Solaris driver is available. */
+  bool cdio_have_solaris (void);
+
+  /*! DEPRICATED: use cdio_have_driver().
+    True if Apple OSX driver is available. */
+  bool cdio_have_osx     (void);
+
+  /*! DEPRICATED: use cdio_have_driver().
+    True if Microsoft Windows driver is available. */
+  bool cdio_have_win32   (void);
+
+  /*! True if Nero driver is available. */
+  bool cdio_have_nrg     (void);
+
+  /*! True if BIN/CUE driver is available. */
+  bool cdio_have_bincue  (void);
+
+  /*! True if cdrdao CDRDAO driver is available. */
+  bool cdio_have_cdrdao  (void);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/lib/driver/netbsd.c b/lib/driver/netbsd.c
index 188a2fe2..69a4bea3 100644
--- a/lib/driver/netbsd.c
+++ b/lib/driver/netbsd.c
@@ -1,5 +1,22 @@
 /* $NetBSD: _cdio_netbsd.c,v 1.4 2005/05/31 17:05:36 drochner Exp $ */
 
+/*  Copyright (C) 2008 Rocky Bernstein <rocky@gnu.org>
+
+    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
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/* Changes up to version 0.76 */
 /*
  * Copyright (c) 2003
  *      Matthias Drochner.  All rights reserved.
@@ -25,11 +42,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*
- * XXX This is for NetBSD but uses "freebsd" function names to plug
- * nicely into the existing libcdio.
- */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/test/Makefile.am b/test/Makefile.am
index 70b63b7f..c0758de9 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.65 2008/03/27 17:40:51 rocky Exp $
+#   $Id: Makefile.am,v 1.66 2008/03/28 01:28:50 rocky Exp $
 #
 #   Copyright (C) 2003, 2004, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
 #
@@ -88,7 +88,7 @@ check_DATA = vcd_demo.right vcd_demo_vcdinfo.right \
 
 EXTRA_DIST = $(check_SCRIPTS) $(check_DATA) \
 	check_common_fn check_cue.sh.in check_nrg.sh.in \
-	testbincue.c.in testnrg.c.in check_iso.sh.in p1.cue
+	testbincue.c.in testnrg.c.in check_iso.sh.in p1.bin p1.cue p1.nrg
 
 TESTS = $(check_PROGRAMS) $(check_SCRIPTS) 
 XFAIL_TESTS = testassert