diff --git a/include/cdio/util.h b/include/cdio/util.h
index e4d75e5b..c5093b2a 100644
--- a/include/cdio/util.h
+++ b/include/cdio/util.h
@@ -1,5 +1,5 @@
 /*
-    $Id: util.h,v 1.3 2004/10/31 06:07:26 rocky Exp $
+    $Id: util.h,v 1.4 2004/11/15 01:34:09 rocky Exp $
 
     Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
@@ -103,8 +103,16 @@ _cdio_strlenv(char **str_array);
 char **
 _cdio_strsplit(const char str[], char delim);
 
-uint8_t  to_bcd8(uint8_t n);
-uint8_t  from_bcd8(uint8_t p);
+uint8_t cdio_to_bcd8(uint8_t n);
+uint8_t cdio_from_bcd8(uint8_t p);
+static inline __attribute__((deprecated))
+uint8_t to_bcd8(uint8_t n) {
+  return cdio_to_bcd8(n);
+}
+static inline __attribute__((deprecated))
+uint8_t from_bcd8(uint8_t p) {
+  return cdio_from_bcd8(p);
+}
 
 #ifdef __cplusplus
 }
diff --git a/lib/Makefile.am b/lib/Makefile.am
index c56ff0cd..8b0766c5 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.58 2004/11/14 18:33:13 rocky Exp $
+#   $Id: Makefile.am,v 1.59 2004/11/15 01:34:09 rocky Exp $
 #
 #    Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
 #
@@ -180,7 +180,7 @@ libcdio.la.ver: $(libcdio_la_OBJECTS)
 	nm $(patsubst %.lo,%.o,$(libcdio_la_OBJECTS)) | sed -n -e 's/^.*[ 	][ABCDGIRSTW][ABCDGIRSTW]*[ 	][ 	]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | while read symbol; do if grep -q "^$${symbol}\$$" libcdio.sym; then :; else echo "    $${symbol};"; fi; done >> $@
 	echo '};' >> $@
 else 
-libcdio_la_LDFLAGS = $(libcdio_la_ldflags) -export-symbols libcdio.sym
+libcdio_la_LDFLAGS = $(libcdio_la_ldflags)
 endif 
 
 libiso9660_la_MAJOR := $(shell expr $(libiso9660_la_CURRENT) - $(libiso9660_la_AGE))
@@ -198,6 +198,6 @@ libiso9660.la.ver: $(libiso9660_la_OBJECTS)
 
 MOSTLYCLEANFILES = libcdio.la.ver libiso9660.la.ver
 else 
-libiso9660_la_LDFLAGS = $(libiso9660_la_ldflags) -export-symbols libiso9660.sym
+libiso9660_la_LDFLAGS = $(libiso9660_la_ldflags)
 libiso9660_la_DEPENDENCIES = $(libcdio9660_la_dependencies)
 endif
diff --git a/lib/libcdio.sym b/lib/libcdio.sym
index aabe0a28..4aaabca6 100644
--- a/lib/libcdio.sym
+++ b/lib/libcdio.sym
@@ -11,6 +11,7 @@ cdio_debug
 cdio_destroy
 cdio_driver_describe
 cdio_free_device_list
+cdio_from_bcd8
 cdio_get_arg
 cdio_get_cdtext
 cdio_get_default_device
@@ -64,11 +65,10 @@ cdio_stdio_destroy
 cdio_stdio_new
 cdio_stream_read
 cdio_stream_seek
+cdio_to_bcd8
 cdio_warn
 cdtext_field2str
 discmode2str
-from_bcd8
 scsi_mmc_get_hwinfo
 scsi_mmc_run_cmd
-to_bcd8
 track_format2str
diff --git a/lib/util.c b/lib/util.c
index e99ece7e..edf0f0bd 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -1,5 +1,5 @@
 /*
-    $Id: util.c,v 1.5 2004/09/03 23:20:11 rocky Exp $
+    $Id: util.c,v 1.6 2004/11/15 01:34:09 rocky Exp $
 
     Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -36,7 +36,7 @@
 #include <cdio/types.h>
 #include <cdio/util.h>
 
-static const char _rcsid[] = "$Id: util.c,v 1.5 2004/09/03 23:20:11 rocky Exp $";
+static const char _rcsid[] = "$Id: util.c,v 1.6 2004/11/15 01:34:09 rocky Exp $";
 
 size_t
 _cdio_strlenv(char **str_array)
@@ -174,7 +174,7 @@ _cdio_strdup_upper (const char str[])
 }
 
 uint8_t
-to_bcd8 (uint8_t n)
+cdio_to_bcd8 (uint8_t n)
 {
   /*cdio_assert (n < 100);*/
 
@@ -182,7 +182,7 @@ to_bcd8 (uint8_t n)
 }
 
 uint8_t
-from_bcd8(uint8_t p)
+cdio_from_bcd8(uint8_t p)
 {
   return (0xf & p)+(10*(p >> 4));
 }