diff --git a/configure.ac b/configure.ac
index 5647a4e2..4c0726e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ define(RELEASE_NUM, 72)
 define(CDIO_VERSION_STR, 0.$1cvs)
 
 AC_PREREQ(2.52)
-AC_REVISION([$Id: configure.ac,v 1.124 2005/01/06 11:39:40 rocky Exp $])dnl
+AC_REVISION([$Id: configure.ac,v 1.125 2005/01/07 22:15:24 rocky Exp $])dnl
 AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM))
 AC_CONFIG_SRCDIR(src/cd-info.c)
 AM_INIT_AUTOMAKE
@@ -147,8 +147,6 @@ dnl headers
 AC_HEADER_STDC
 AC_CHECK_HEADERS(errno.h fcntl.h glob.h)
 AC_CHECK_HEADERS(stdarg.h stdbool.h stdio.h sys/cdio.h)
-AC_CHECK_HEADERS(linux/sbpcd.h, SBPCD_H="-DSBPCD_H='1' ")
-AC_CHECK_HEADERS(linux/ucdrom.h, UCDROM_H="-DUCDROM_H='1' ")
 
 AC_SUBST(SBPCD_H)
 AC_SUBST(UCDROM_H)
@@ -333,7 +331,7 @@ case $host_os in
        fi
      ;;
      linux*)
-        AC_CHECK_HEADERS(linux/version.h linux_major.h)
+        AC_CHECK_HEADERS(linux/version.h)
         AC_CHECK_HEADERS(linux/cdrom.h, [have_linux_cdrom_h="yes"])
 	if test "x$have_linux_cdrom_h" = "xyes" ; then
 	   AC_TRY_COMPILE(,[
diff --git a/lib/cdda_interface/low_interface.h b/lib/cdda_interface/low_interface.h
index 9ba7bdb4..1dd94bec 100644
--- a/lib/cdda_interface/low_interface.h
+++ b/lib/cdda_interface/low_interface.h
@@ -1,5 +1,5 @@
 /*
-  $Id: low_interface.h,v 1.4 2005/01/06 03:09:11 rocky Exp $
+  $Id: low_interface.h,v 1.5 2005/01/07 22:15:25 rocky Exp $
 
   Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
   Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -38,10 +38,6 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
-#ifdef HAVE_LINUX_MAJOR_H
-#include <linux/major.h>
-#endif
-
 #ifdef HAVE_LINUX_VERSION_H
 #include <linux/version.h>
 #endif
@@ -51,14 +47,6 @@
 
 /* some include file locations have changed with newer kernels */
 
-#ifdef SBPCD_H
-#include <linux/sbpcd.h>
-#endif
-
-#ifdef UCDROM_H
-#include <linux/ucdrom.h>
-#endif
-
 #ifndef CDROMAUDIOBUFSIZ      
 #define CDROMAUDIOBUFSIZ        0x5382 /* set the audio buffer size */
 #endif
diff --git a/src/cd-paranoia/cd-paranoia.c b/src/cd-paranoia/cd-paranoia.c
index ad5443d3..8c4532f3 100644
--- a/src/cd-paranoia/cd-paranoia.c
+++ b/src/cd-paranoia/cd-paranoia.c
@@ -706,11 +706,8 @@ static char *force_generic_device = NULL;
 static void 
 cleanup (void) 
 {
-  if (p)                    paranoia_free(p);
-  if (d)                    cdda_close(d);
-#if FIXME_FIGURE_THIS_OUT
-  free_and_null(span);
-#endif
+  if (p) paranoia_free(p);
+  if (d) cdda_close(d);
   free_and_null(force_cdrom_device);
   free_and_null(force_generic_device);
 }