diff --git a/include/cdio/cdio_unconfig.h b/include/cdio/cdio_unconfig.h
deleted file mode 100644
index 8f7d944c..00000000
--- a/include/cdio/cdio_unconfig.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/* You can include this to remove any C preprocessor symbols created in cdio_config.h.
-   For example, if your project has your own config.h which sets symbols do this:
-
-   // for cdio:
-   #include <cdio.h>
-   #include <cdio_unconfig.h>
-   // for your program
-   #include <config.h>
-*/
-#undef EMPTY_ARRAY_SIZE 
-#undef HAVE_BZERO
-#undef HAVE_CDDB
-#undef HAVE_CHDIR
-#undef HAVE_CURSES_H
-#undef HAVE_DAYLIGHT
-#undef HAVE_DLFCN_H
-#undef HAVE_DRAND48
-#undef HAVE_ERRNO_H
-#undef HAVE_FCNTL_H
-#undef HAVE_FTRUNCATE
-#undef HAVE_GETEUID
-#undef HAVE_GETGID
-#undef HAVE_GETOPT_H
-#undef HAVE_GETPWUID
-#undef HAVE_GETTIMEOFDAY
-#undef HAVE_GETUID
-#undef HAVE_GLOB_H
-#undef HAVE_GMTIME_R
-#undef HAVE_ICONV
-#undef HAVE_INTTYPES_H
-#undef HAVE_ISOC99_PRAGMA
-#undef HAVE_JOLIET
-#undef HAVE_KEYPAD
-#undef HAVE_LANGINFO_CODESET
-#undef HAVE_LIMITS_H
-#undef HAVE_LINUX_CDROM
-#undef HAVE_LINUX_CDROM_H
-#undef HAVE_LINUX_MAJOR_H
-#undef HAVE_LINUX_VERSION_H
-#undef HAVE_LOCALTIME_R
-#undef HAVE_LSTAT
-#undef HAVE_MEMCPY
-#undef HAVE_MEMORY_H
-#undef HAVE_MEMSET
-#undef HAVE_NCURSES_H
-#undef HAVE_PWD_H
-#undef HAVE_RAND
-#undef HAVE_READLINK
-#undef HAVE_REALPATH
-#undef HAVE_ROCK
-#undef HAVE_SETEGID
-#undef HAVE_SETENV
-#undef HAVE_SETEUID
-#undef HAVE_SLEEP
-#undef HAVE_SNPRINTF
-#undef HAVE_SOLARIS_CDROM
-#undef HAVE_STDARG_H
-#undef HAVE_STDBOOL_H
-#undef HAVE_STDINT_H
-#undef HAVE_STDIO_H
-#undef HAVE_STDLIB_H
-#undef HAVE_STRINGS_H
-#undef HAVE_STRING_H
-#undef HAVE_STRUCT_TIMESPEC
-#undef HAVE_SYS_CDIO_H
-#undef HAVE_SYS_PARAM_H
-#undef HAVE_SYS_STAT_H
-#undef HAVE_SYS_TIMEB_H
-#undef HAVE_SYS_TIME_H
-#undef HAVE_SYS_TYPES_H
-#undef HAVE_SYS_UTSNAME_H
-#undef HAVE_S_ISLNK
-#undef HAVE_S_ISSOCK
-#undef HAVE_TIMEGM
-#undef HAVE_TIMEZONE_VAR
-#undef HAVE_TM_GMTOFF
-#undef HAVE_TZNAME
-#undef HAVE_TZSET
-#undef HAVE_UNISTD_H
-#undef HAVE_UNSETENV
-#undef HAVE_USLEEP
-#undef HAVE_VCDINFO
-#undef HAVE_VSNPRINTF
-#undef HAVE_WIN32_CDROM
-#undef HAVE_WINDOWS_H
-#undef ICONV_CONST 
-#undef LIBCDIO_CONFIG_H
-#undef LIBCDIO_SOURCE_PATH
-#undef LT_OBJDIR
-#undef MINGW32
-#undef NEED_TIMEZONEVAR
-#undef NO_MINUS_C_MINUS_O
-#undef PACKAGE
-#undef PACKAGE_BUGREPORT
-#undef PACKAGE_NAME 
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_URL
-#undef PACKAGE_VERSION
-#undef STDC_HEADERS
-#undef _ALL_SOURCE
-#undef _GNU_SOURCE
-#undef _POSIX_PTHREAD_SEMANTICS
-#undef _TANDEM_SOURCE
-#undef __EXTENSIONS__
-#undef VERSION 
-#undef AC_APPLE_UNIVERSAL_BUILD
-#undef __BIG_ENDIAN__
-#undef WORDS_BIGENDIAN
-#undef _FILE_OFFSET_BITS
-#undef _LARGEFILE_SOURCE
-#undef _LARGE_FILES
-#undef _MINIX
-#undef _POSIX_1_SOURCE
-#undef _POSIX_SOURCE
-#undef const
diff --git a/test/cd-paranoia-log.right b/test/cd-paranoia-log.right
deleted file mode 100644
index 7ad43a9e..00000000
--- a/test/cd-paranoia-log.right
+++ /dev/null
@@ -1,3 +0,0 @@
-outputting to cdda.raw
- (== PROGRESS == [] == :^D * ==)   
-