diff --git a/configure.ac b/configure.ac
index 60d8a1fd..abb3b01b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ define(RELEASE_NUM, 69)
 define(CDIO_VERSION_STR, 0.$1cvs)
 
 AC_PREREQ(2.52)
-AC_REVISION([$Id: configure.ac,v 1.80 2004/05/31 15:21:48 thesin Exp $])dnl
+AC_REVISION([$Id: configure.ac,v 1.81 2004/06/02 04:52:55 thesin Exp $])dnl
 AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM))
 AC_CONFIG_SRCDIR(src/cd-info.c)
 AM_INIT_AUTOMAKE
@@ -222,7 +222,7 @@ AC_HAVE_HEADERS( errno.h fcntl.h \
 		 strings.h linux/version.h sys/cdio.h sys/stat.h \
 		 sys/types.h )
 
-LIBCDIO_CFLAGS='-I$(top_srcdir)/lib/ -I$(top_srcdir)/include/'
+LIBCDIO_CFLAGS='$(top_srcdir)/lib/ -I$(top_srcdir)/include/'
 LIBCDIO_LIBS='$(top_builddir)/lib/libcdio.la'
 LIBISO9660_LIBS='$(top_builddir)/lib/libiso9660.la'
 AC_SUBST(LIBCDIO_CFLAGS)
diff --git a/lib/_cdio_osx.c b/lib/_cdio_osx.c
index 628de802..20925007 100644
--- a/lib/_cdio_osx.c
+++ b/lib/_cdio_osx.c
@@ -1,5 +1,5 @@
 /*
-    $Id: _cdio_osx.c,v 1.28 2004/06/02 01:01:18 rocky Exp $
+    $Id: _cdio_osx.c,v 1.29 2004/06/02 04:52:55 thesin Exp $
 
     Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com> 
     from vcdimager code: 
@@ -33,7 +33,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: _cdio_osx.c,v 1.28 2004/06/02 01:01:18 rocky Exp $";
+static const char _rcsid[] = "$Id: _cdio_osx.c,v 1.29 2004/06/02 04:52:55 thesin Exp $";
 
 #include <cdio/sector.h>
 #include <cdio/util.h>
@@ -94,7 +94,7 @@ typedef struct {
 } _img_private_t;
 
 static void 
-_free_osx (void *env) {
+_free_osx (void *user_data) {
   _img_private_t *env = user_data;
   if (NULL == env) return;
   cdio_generic_free(env);
@@ -713,7 +713,7 @@ cdio_get_devices_osx(void)
 #ifndef HAVE_DARWIN_CDROM
   return NULL;
 #else
-  ioenvect_t   next_media;
+  io_object_t   next_media;
   mach_port_t   master_port;
   kern_return_t kern_result;
   io_iterator_t media_iterator;