diff --git a/configure.ac b/configure.ac
index be1c9012..04140852 100644
--- a/configure.ac
+++ b/configure.ac
@@ -217,7 +217,7 @@ AC_MSG_RESULT($ISOC99_PRAGMA)
 ## Check for S_ISSOCK() and S_ISLNK() macros
 ##
 AC_MSG_CHECKING(for S_ISLNK() macro)
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+AC_LINK_IFELSE([AC_LANG_PROGRAM([
 #ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
@@ -226,7 +226,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
 [ AC_MSG_RESULT(no) ])
 
 AC_MSG_CHECKING([for S_ISSOCK() macro])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+AC_LINK_IFELSE([AC_LANG_PROGRAM([
 #ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
diff --git a/example/C++/Makefile.am b/example/C++/Makefile.am
index e81266bf..b22d7f31 100644
--- a/example/C++/Makefile.am
+++ b/example/C++/Makefile.am
@@ -1,6 +1,4 @@
-#   $Id: Makefile.am,v 1.13 2008/08/31 13:38:21 flameeyes Exp $
-#
-#   Copyright (C) 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
+#   Copyright (C) 2005, 2006, 2008, 2009 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
@@ -63,5 +61,9 @@ mmc2_SOURCES      = mmc2.cpp
 mmc2_DEPENDENCIES = $(LIBCDIO_DEPS)
 mmc2_LDADD        = $(LIBCDIO_LIBS)
 
+check_PROGRAMS      = $(noinst_PROGRAMS)
+
+TESTS               = $(check_PROGRAMS)
+
 # iso programs create file "copying"
 MOSTLYCLEANFILES = copying *.wav
diff --git a/example/C++/OO/Makefile.am b/example/C++/OO/Makefile.am
index ee3031bf..f03d78d6 100644
--- a/example/C++/OO/Makefile.am
+++ b/example/C++/OO/Makefile.am
@@ -1,6 +1,4 @@
-#   $Id: Makefile.am,v 1.13 2008/08/31 13:38:21 flameeyes Exp $
-#
-#   Copyright (C) 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
+#   Copyright (C) 2005, 2006, 2008, 2009 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
@@ -67,3 +65,6 @@ mmc2_LDADD          = $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS)
 tracks_SOURCES      = tracks.cpp
 tracks_LDADD        = $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS)
 
+check_PROGRAMS      = $(noinst_PROGRAMS)
+
+TESTS               = $(check_PROGRAMS)
diff --git a/example/C++/OO/cdtext.cpp b/example/C++/OO/cdtext.cpp
index cef97568..394404bf 100644
--- a/example/C++/OO/cdtext.cpp
+++ b/example/C++/OO/cdtext.cpp
@@ -1,7 +1,7 @@
 /*
   $Id: cdtext.cpp,v 1.4 2008/03/24 15:30:57 karl Exp $
 
-  Copyright (C) 2005, 2008 Rocky Bernstein <rocky@panix.com>
+  Copyright (C) 2005, 2008, 2009 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
@@ -22,6 +22,7 @@
    See also corresponding C program of a similar name.
  */
 
+#include <cdio++/cdio.hpp>
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -34,7 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <cdio++/cdio.hpp>
 
 /* Set up a CD-DA image to test on which is in the libcdio distribution. */
 #define CDDA_IMAGE_PATH  "../../../test/"
diff --git a/example/C++/OO/device.cpp b/example/C++/OO/device.cpp
index e4580ec5..fcb4b991 100644
--- a/example/C++/OO/device.cpp
+++ b/example/C++/OO/device.cpp
@@ -1,7 +1,7 @@
 /*
   $Id: device.cpp,v 1.4 2008/03/24 15:30:57 karl Exp $
 
-  Copyright (C) 2005, 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2005, 2008, 2009 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
@@ -21,9 +21,8 @@
    CD-ROM drive is. See also corresponding C program of a similar
    name. */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <cdio++/cdio.hpp>
+
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
 #endif
@@ -34,8 +33,6 @@
 #include <sys/types.h>
 #endif
 
-#include <cdio++/cdio.hpp>
-
 #define _(x) x
 
 /* Prints out drive capabilities */
diff --git a/example/C++/OO/drives.cpp b/example/C++/OO/drives.cpp
index 1f50e345..ac318cbb 100644
--- a/example/C++/OO/drives.cpp
+++ b/example/C++/OO/drives.cpp
@@ -1,7 +1,5 @@
 /*
-  $Id: drives.cpp,v 1.6 2008/03/24 15:30:57 karl Exp $
-
-  Copyright (C) 2003, 2004, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2003, 2004, 2006, 2008, 2009 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
@@ -19,9 +17,10 @@
 
 /* Simple program to show drivers installed and what the default 
    CD-ROM drive is and what CD drives are available. */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <cdio++/cdio.hpp>
+#include <cdio/cd_types.h>
+#include <cdio/logging.h>
+
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
 #endif
@@ -31,9 +30,6 @@
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#include <cdio++/cdio.hpp>
-#include <cdio/cd_types.h>
-#include <cdio/logging.h>
 
 static void 
 log_handler (cdio_log_level_t level, const char message[])
diff --git a/example/C++/OO/eject.cpp b/example/C++/OO/eject.cpp
index 668f25be..1b6030a4 100644
--- a/example/C++/OO/eject.cpp
+++ b/example/C++/OO/eject.cpp
@@ -24,10 +24,6 @@
 
    See also corresponding C program of a similar name. 
 */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <cdio++/cdio.hpp>
 
 #include <stdio.h>
diff --git a/example/C++/OO/iso4.cpp b/example/C++/OO/iso4.cpp
index dcfd64cb..4f01df11 100644
--- a/example/C++/OO/iso4.cpp
+++ b/example/C++/OO/iso4.cpp
@@ -1,7 +1,5 @@
 /*
-  $Id: iso4.cpp,v 1.2 2008/03/24 15:30:57 karl Exp $
-
-  Copyright (C) 2006, 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2006, 2008, 2009 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
@@ -34,9 +32,6 @@
 #define ISO9660_IMAGE_PATH "../../../"
 #define ISO9660_IMAGE ISO9660_IMAGE_PATH "test/isofs-m1.cue"
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
 #include <sys/types.h>
 #include <cdio++/iso9660.hpp>
 
diff --git a/example/C++/OO/isofile.cpp b/example/C++/OO/isofile.cpp
index 280c018b..1e034120 100644
--- a/example/C++/OO/isofile.cpp
+++ b/example/C++/OO/isofile.cpp
@@ -1,7 +1,5 @@
 /*
-  $Id: isofile.cpp,v 1.2 2008/03/24 15:30:57 karl Exp $
-
-  Copyright (C) 2006, 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2006, 2008, 2009 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
@@ -31,15 +29,10 @@
 
 #define LOCAL_FILENAME "copying"
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "portable.h"
-
 #include <sys/types.h>
 #include <cdio++/iso9660.hpp>
 
+#include "portable.h"
 #include <stdio.h>
 
 #ifdef HAVE_ERRNO_H
diff --git a/example/C++/OO/isofile2.cpp b/example/C++/OO/isofile2.cpp
index 38926ebb..311c6ca9 100644
--- a/example/C++/OO/isofile2.cpp
+++ b/example/C++/OO/isofile2.cpp
@@ -1,7 +1,5 @@
 /*
-  $Id: isofile2.cpp,v 1.2 2008/03/24 15:30:57 karl Exp $
-
-  Copyright (C) 2006, 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2006, 2008, 2009 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
@@ -37,14 +35,9 @@
 #define ISO9660_FILENAME "COPYING"
 #define LOCAL_FILENAME "copying"
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "portable.h"
-
 #include <cdio++/cdio.hpp>
 #include <cdio++/iso9660.hpp>
+#include "portable.h"
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/example/C++/OO/isolist.cpp b/example/C++/OO/isolist.cpp
index 0685bd2c..52eb68cc 100644
--- a/example/C++/OO/isolist.cpp
+++ b/example/C++/OO/isolist.cpp
@@ -34,9 +34,6 @@
 #define ISO9660_IMAGE_PATH "../../../"
 #define ISO9660_IMAGE ISO9660_IMAGE_PATH "test/copying.iso"
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
 #include <sys/types.h>
 #include <cdio++/iso9660.hpp>
 
diff --git a/example/C++/OO/mmc1.cpp b/example/C++/OO/mmc1.cpp
index 86872c47..97bf25b7 100644
--- a/example/C++/OO/mmc1.cpp
+++ b/example/C++/OO/mmc1.cpp
@@ -1,7 +1,5 @@
 /*
-  $Id: mmc1.cpp,v 1.2 2008/03/24 15:30:57 karl Exp $
-
-  Copyright (C) 2005, 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2005, 2008, 2009 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
@@ -22,9 +20,7 @@
    This basically the libdio mmc_get_hwinfo() routine.
    See also corresponding C and non OO C++ program.
 */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <cdio++/cdio.hpp>
 #include <stdio.h>
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -32,7 +28,6 @@
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
-#include <cdio++/cdio.hpp>
 
 /* Set how long to wait for MMC commands to complete */
 #define DEFAULT_TIMEOUT_MS 10000
diff --git a/example/C++/OO/mmc2.cpp b/example/C++/OO/mmc2.cpp
index 05999c7f..55aa1f3c 100644
--- a/example/C++/OO/mmc2.cpp
+++ b/example/C++/OO/mmc2.cpp
@@ -1,7 +1,5 @@
 /*
-  $Id: mmc2.cpp,v 1.2 2008/03/24 15:30:57 karl Exp $
-
-  Copyright (C) 2005, 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2005, 2008, 2009 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
diff --git a/example/C++/OO/tracks.cpp b/example/C++/OO/tracks.cpp
index 2acc142c..7dbb4ff9 100644
--- a/example/C++/OO/tracks.cpp
+++ b/example/C++/OO/tracks.cpp
@@ -1,7 +1,5 @@
 /*
-  $Id: tracks.cpp,v 1.2 2008/03/24 15:30:57 karl Exp $
-
-  Copyright (C) 2005, 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2005, 2008, 2009 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
@@ -19,14 +17,11 @@
 
 /* Simple program to list track numbers and logical sector numbers of
    a Compact Disc using libcdio. */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
 #include <stdio.h>
+#include <cdio++/cdio.hpp>
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#include <cdio++/cdio.hpp>
 int
 main(int argc, const char *argv[])
 {
diff --git a/example/C++/device.cpp b/example/C++/device.cpp
index 45c4f1bc..4ab5610b 100644
--- a/example/C++/device.cpp
+++ b/example/C++/device.cpp
@@ -1,7 +1,6 @@
 /*
-  $Id: device.cpp,v 1.3 2008/03/24 15:30:56 karl Exp $
-
-  Copyright (C) 2003, 2004, 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009
+  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
@@ -21,9 +20,7 @@
    CD-ROM drive is. See also corresponding C program of a similar
    name. */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <cdio/cdio.h>
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
 #endif
@@ -33,7 +30,6 @@
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#include <cdio/cdio.h>
 
 #define _(x) x
 
diff --git a/example/C++/eject.cpp b/example/C++/eject.cpp
index f719f064..f49e9376 100644
--- a/example/C++/eject.cpp
+++ b/example/C++/eject.cpp
@@ -1,7 +1,5 @@
 /*
-  $Id: eject.cpp,v 1.4 2008/03/24 15:30:56 karl Exp $
-
-  Copyright (C) 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2005, 2006, 2008, 209 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
@@ -22,16 +20,13 @@
    If a single argument is given, it is used as the CD-ROM device to 
    eject/close. Otherwise a CD-ROM drive will be scanned for.
 */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <cdio/cdio.h>
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
 #endif
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
-#include <cdio/cdio.h>
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
diff --git a/example/C++/isofile.cpp b/example/C++/isofile.cpp
index 86118ebc..f3be5fc6 100644
--- a/example/C++/isofile.cpp
+++ b/example/C++/isofile.cpp
@@ -1,6 +1,4 @@
 /*
-  $Id: isofile.cpp,v 1.2 2008/03/24 15:30:56 karl Exp $
-
   Copyright (C) 2004, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
   
   This program is free software: you can redistribute it and/or modify
@@ -31,16 +29,12 @@
 
 #define LOCAL_FILENAME "copying"
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "portable.h"
-
 #include <sys/types.h>
 #include <cdio/cdio.h>
 #include <cdio/iso9660.h>
 
+#include "portable.h"
+
 #include <stdio.h>
 
 #ifdef HAVE_ERRNO_H
diff --git a/example/C++/isofile2.cpp b/example/C++/isofile2.cpp
index 6166f4e0..8670f84e 100644
--- a/example/C++/isofile2.cpp
+++ b/example/C++/isofile2.cpp
@@ -1,7 +1,5 @@
 /*
-  $Id: isofile2.cpp,v 1.2 2008/03/24 15:30:56 karl Exp $
-
-  Copyright (C) 2004, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2004, 2006, 2008, 2009 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
@@ -31,16 +29,11 @@
 
 #define LOCAL_FILENAME "copying"
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "portable.h"
-
 #include <sys/types.h>
 #include <cdio/cdio.h>
 #include <cdio/iso9660.h>
 
+#include "portable.h"
 #include <stdio.h>
 
 #ifdef HAVE_ERRNO_H
diff --git a/example/C++/isolist.cpp b/example/C++/isolist.cpp
index 269ac3f6..0db05825 100644
--- a/example/C++/isolist.cpp
+++ b/example/C++/isolist.cpp
@@ -1,7 +1,5 @@
 /*
-  $Id: isolist.cpp,v 1.2 2008/03/24 15:30:56 karl Exp $
-
-  Copyright (C) 2004, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2004, 2006, 2008, 2009 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
diff --git a/example/C++/mmc1.cpp b/example/C++/mmc1.cpp
index ce54fb33..78b68047 100644
--- a/example/C++/mmc1.cpp
+++ b/example/C++/mmc1.cpp
@@ -1,7 +1,5 @@
 /*
-  $Id: mmc1.cpp,v 1.4 2008/03/24 15:30:56 karl Exp $
-
-  Copyright (C) 2004, 2005, 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2004, 2005, 2008, 2009 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
@@ -22,9 +20,6 @@
    This basically the libdio mmc_get_hwinfo() routine.
    See also corresponding C and OO C++ program.
 */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
 #include <stdio.h>
 #include <sys/types.h>
 #include <cdio/cdio.h>
diff --git a/example/C++/mmc2.cpp b/example/C++/mmc2.cpp
index 0105d278..a9190589 100644
--- a/example/C++/mmc2.cpp
+++ b/example/C++/mmc2.cpp
@@ -1,7 +1,5 @@
 /*
-  $Id: mmc2.cpp,v 1.3 2008/03/24 15:30:56 karl Exp $
-
-  Copyright (C) 2004, 2005, 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2004, 2005, 2008, 2009 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
@@ -19,9 +17,6 @@
 
 /* A program to using the MMC interface to list CD and drive features
    from the MMC GET_CONFIGURATION command . */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
 #include <stdio.h>
 #include <sys/types.h>
 #include <cdio/cdio.h>
diff --git a/example/C++/paranoia.cpp b/example/C++/paranoia.cpp
index 045de6cf..a75581f2 100644
--- a/example/C++/paranoia.cpp
+++ b/example/C++/paranoia.cpp
@@ -20,10 +20,6 @@
 /* Simple program to show using libcdio's version of the CD-DA paranoia. 
    library.  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <iostream>
 #include <cstdlib>
 #include <fstream>
diff --git a/example/C++/paranoia2.cpp b/example/C++/paranoia2.cpp
index 8ccb6f49..f3a2d096 100644
--- a/example/C++/paranoia2.cpp
+++ b/example/C++/paranoia2.cpp
@@ -1,7 +1,5 @@
 /*
-  $Id: paranoia2.cpp,v 1.2 2008/03/24 15:30:57 karl Exp $
-
-  Copyright (C) 2005, 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2005, 2008, 2009 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
@@ -23,10 +21,6 @@
    players this may be what will be done since, one may want to get
    CDDB/CD-Text info beforehand.  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <cdio/cdda.h>
 #include <cdio/cd_types.h>
 #include <stdio.h>
diff --git a/example/Makefile.am b/example/Makefile.am
index 4c6f86a7..d54b6bcf 100644
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -1,6 +1,5 @@
-#   $Id: Makefile.am,v 1.44 2008/08/31 13:38:21 flameeyes Exp $
-#
-#   Copyright (C) 2003, 2004, 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
+#   Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009
+#   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
@@ -92,6 +91,10 @@ udf1_LDADD        = $(LIBUDF_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
 udffile_DEPENDENCIES = $(LIBUDF_LIBS) $(LIBCDIO_DEPS)
 udffile_LDADD        = $(LIBUDF_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
 
+check_PROGRAMS      = cdtext device drives \
+                      mmc1 mmc2 mmc2a mmc3 $(paranoia_progs) sample4
+
+TESTS               = $(check_PROGRAMS)
 
 # iso programs create file "copying"
 MOSTLYCLEANFILES = copying *.wav
diff --git a/example/audio.c b/example/audio.c
index 1d13edfc..6fd5604a 100644
--- a/example/audio.c
+++ b/example/audio.c
@@ -1,7 +1,5 @@
 /*
-  $Id: audio.c,v 1.10 2008/06/19 15:44:10 flameeyes Exp $
-
-  Copyright (C) 2005, 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2005, 2008, 2009 Rocky Bernstein <rocky@gnu.org>
 
   Adapted from Gerd Knorr's player.c program  <kraxel@bytesex.org>
   Copyright (C) 1997, 1998 
@@ -24,9 +22,7 @@
    CDDA player program using curses display see cdda-player in this
    distribution.
 */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <cdio/cdio.h>
 
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
@@ -56,7 +52,6 @@
 #include <errno.h>
 #endif
 
-#include <cdio/cdio.h>
 #include <cdio/mmc.h>
 #include <cdio/util.h>
 #include <cdio/cd_types.h>
diff --git a/example/cdchange.c b/example/cdchange.c
index a961180d..380b8a62 100644
--- a/example/cdchange.c
+++ b/example/cdchange.c
@@ -1,7 +1,5 @@
 /*
-  $Id: cdchange.c,v 1.9 2008/06/25 08:01:53 rocky Exp $
-
-  Copyright (C) 2005, 2006, 2007, 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2005, 2006, 2007, 2008, 2009 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
@@ -17,10 +15,9 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <cdio/cdio.h>
+
 /* Test media changed */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
 #include <stdio.h>
 
 #ifdef HAVE_LIMITS_H
@@ -55,7 +52,6 @@ sleep(unsigned int ms)
 }
 #endif
 
-#include <cdio/cdio.h>
 int
 main(int argc, const char *argv[])
 {
diff --git a/example/cdio-eject.c b/example/cdio-eject.c
index 911424bc..5db25b55 100644
--- a/example/cdio-eject.c
+++ b/example/cdio-eject.c
@@ -1,7 +1,5 @@
 /*
-  $Id: cdio-eject.c,v 1.4 2008/03/24 15:30:55 karl Exp $
-
-  Copyright (C) 2007, 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2007, 2008, 2009 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
@@ -17,10 +15,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <cdio/cdio.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/example/cdtext.c b/example/cdtext.c
index 9a0b2fbf..9b96166f 100644
--- a/example/cdtext.c
+++ b/example/cdtext.c
@@ -1,7 +1,5 @@
 /*
-  $Id: cdtext.c,v 1.5 2008/03/24 15:30:55 karl Exp $
-
-  Copyright (C) 2004, 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2004, 2005, 2006, 2008, 2009 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
@@ -20,10 +18,7 @@
 /* Simple program to list CD-Text info of a Compact Disc using
    libcdio.  See also corresponding C++ programs of similar names. */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
+#include <cdio/cdio.h>
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
 #endif
@@ -31,7 +26,6 @@
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#include <cdio/cdio.h>
 #include <cdio/cdtext.h>
 
 
diff --git a/example/device.c b/example/device.c
index 09ce2d03..23b7a39f 100644
--- a/example/device.c
+++ b/example/device.c
@@ -1,7 +1,5 @@
 /*
-  $Id: device.c,v 1.3 2008/03/24 15:30:55 karl Exp $
-
-  Copyright (C) 2003, 2004, 2005, 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2003, 2004, 2005, 2008, 2009 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
@@ -20,9 +18,7 @@
 /* Simple program to show drivers installed and what the default
    CD-ROM drive is. See also corresponding C++ programs of similar
    names .*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <cdio/cdio.h>
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
 #endif
@@ -32,7 +28,6 @@
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#include <cdio/cdio.h>
 
 #define _(x) x
 
diff --git a/example/drives.c b/example/drives.c
index a0ceb19a..b06f30c9 100644
--- a/example/drives.c
+++ b/example/drives.c
@@ -1,7 +1,5 @@
 /*
-  $Id: drives.c,v 1.6 2008/03/24 15:30:55 karl Exp $
-
-  Copyright (C) 2003, 2004, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2003, 2004, 2006, 2008, 2009 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
@@ -19,9 +17,7 @@
 
 /* Simple program to show drivers installed and what the default 
    CD-ROM drive is and what CD drives are available. */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <cdio/cdio.h>
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
 #endif
@@ -31,7 +27,6 @@
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#include <cdio/cdio.h>
 #include <cdio/cd_types.h>
 #include <cdio/logging.h>
 
diff --git a/example/eject.c b/example/eject.c
index 1504bcf7..d239ef25 100644
--- a/example/eject.c
+++ b/example/eject.c
@@ -24,16 +24,13 @@
 
    See also corresponding C++ program of a similar name. 
 */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <cdio/cdio.h>
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
 #endif
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
-#include <cdio/cdio.h>
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
diff --git a/example/isofile.c b/example/isofile.c
index f95f27f5..d941d66f 100644
--- a/example/isofile.c
+++ b/example/isofile.c
@@ -1,7 +1,7 @@
 /*
   $Id: isofile.c,v 1.2 2008/03/24 15:30:55 karl Exp $
 
-  Copyright (C) 2004, 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2004, 2005, 2006, 2008, 2009 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
@@ -31,15 +31,10 @@
 
 #define LOCAL_FILENAME "copying"
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "portable.h"
-
 #include <sys/types.h>
 #include <cdio/cdio.h>
 #include <cdio/iso9660.h>
+#include "portable.h"
 
 #include <stdio.h>
 
diff --git a/example/isofile2.c b/example/isofile2.c
index 66237bfa..329263e9 100644
--- a/example/isofile2.c
+++ b/example/isofile2.c
@@ -1,7 +1,5 @@
 /*
-  $Id: isofile2.c,v 1.2 2008/03/24 15:30:55 karl Exp $
-
-  Copyright (C) 2003, 2004, 2005, 2006 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2003, 2004, 2005, 2006, 2009 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
@@ -37,15 +35,11 @@
 #define ISO9660_FILENAME "COPYING"
 #define LOCAL_FILENAME "copying"
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "portable.h"
-
 #include <cdio/cdio.h>
 #include <cdio/iso9660.h>
 
+#include "portable.h"
+
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
diff --git a/example/isofuzzy.c b/example/isofuzzy.c
index 71153d6f..7323d699 100644
--- a/example/isofuzzy.c
+++ b/example/isofuzzy.c
@@ -1,7 +1,5 @@
 /*
-  $Id: isofuzzy.c,v 1.3 2008/03/24 15:30:56 karl Exp $
-
-  Copyright (C) 2005, 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2005, 2008, 2009 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
@@ -28,16 +26,11 @@
 #define ISO9660_IMAGE_PATH "/tmp/"
 #define ISO9660_IMAGE ISO9660_IMAGE_PATH "vcd_demo.bin"
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "portable.h"
-
 #include <sys/types.h>
 #include <cdio/cdio.h>
 #include <cdio/iso9660.h>
 
+#include "portable.h"
 #include <stdio.h>
 
 #ifdef HAVE_ERRNO_H
diff --git a/example/paranoia.c b/example/paranoia.c
index b87267d4..94ba7bb4 100644
--- a/example/paranoia.c
+++ b/example/paranoia.c
@@ -20,10 +20,6 @@
 /* Simple program to show using libcdio's version of the CD-DA paranoia. 
    library. */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <cdio/paranoia.h>
 #include <cdio/cd_types.h>
 #include <stdio.h>
diff --git a/example/paranoia2.c b/example/paranoia2.c
index 947dccae..b7e2e9f9 100644
--- a/example/paranoia2.c
+++ b/example/paranoia2.c
@@ -1,7 +1,5 @@
 /*
-  $Id: paranoia2.c,v 1.8 2008/03/24 15:30:56 karl Exp $
-
-  Copyright (C) 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2005, 2006, 2008, 2009 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
@@ -24,10 +22,6 @@
    CDDB/CD-Text info beforehand.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <cdio/cdda.h>
 #include <cdio/cd_types.h>
 #include <stdio.h>
diff --git a/example/sample3.c b/example/sample3.c
index c157e8a0..84d3e8fd 100644
--- a/example/sample3.c
+++ b/example/sample3.c
@@ -21,9 +21,6 @@
    A somewhat simplified program to show the use of cdio_guess_cd_type().
    Figure out the kind of CD image we've got.
 */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
diff --git a/example/sample4.c b/example/sample4.c
index ba0bcfcc..8e0fc16e 100644
--- a/example/sample4.c
+++ b/example/sample4.c
@@ -1,7 +1,5 @@
 /*
-  $Id: sample4.c,v 1.8 2008/03/24 15:30:56 karl Exp $
-
-  Copyright (C) 2003, 2004 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2003, 2004, 2008, 2009 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
@@ -21,9 +19,6 @@
    A slightly improved sample3 program: we handle cdio logging and
    take an optional CD-location.
 */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
diff --git a/example/tracks.c b/example/tracks.c
index dc3d5381..8422735e 100644
--- a/example/tracks.c
+++ b/example/tracks.c
@@ -1,7 +1,6 @@
 /*
-  $Id: tracks.c,v 1.7 2008/03/24 15:30:56 karl Exp $
-
-  Copyright (C) 2003, 2004, 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009 
+  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
@@ -19,9 +18,6 @@
 
 /* Simple program to list track numbers and logical sector numbers of
    a Compact Disc using libcdio. */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
 #include <stdio.h>
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/example/udf1.c b/example/udf1.c
index c9f49c36..52f7077b 100644
--- a/example/udf1.c
+++ b/example/udf1.c
@@ -25,9 +25,6 @@
 #define UDF_IMAGE_PATH "../"
 #define UDF_IMAGE "/src2/cd-images/udf/UDF102ISO.iso"
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
 #include <sys/types.h>
 #include <cdio/cdio.h>
 #include <cdio/udf.h>
diff --git a/example/udf2.c b/example/udf2.c
index bf9df7a0..2cd5ef19 100644
--- a/example/udf2.c
+++ b/example/udf2.c
@@ -1,7 +1,5 @@
 /*
-  $Id: udf2.c,v 1.6 2008/03/24 15:30:56 karl Exp $
-
-  Copyright (C) 2005, 2006,2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2005, 2006, 2008, 2009 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
@@ -29,9 +27,6 @@
 #define UDF_IMAGE "/src2/cd-images/udf/test2.iso"
 #define UDF_FILENAME "/parse/cue.L"
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
 #include <sys/types.h>
 #include <cdio/cdio.h>
 #include <cdio/udf.h>
diff --git a/example/udffile.c b/example/udffile.c
index 42e823f7..e67fb002 100644
--- a/example/udffile.c
+++ b/example/udffile.c
@@ -1,7 +1,5 @@
 /*
-  $Id: udffile.c,v 1.3 2008/03/24 15:30:56 karl Exp $
-
-  Copyright (C) 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2005, 2006, 2008, 2009 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
@@ -30,9 +28,6 @@
 #define UDF_FILENAME "/COPYING"
 #define LOCAL_FILENAME "copying"
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
 #include <sys/types.h>
 #include <cdio/cdio.h>
 #include <cdio/udf.h>
diff --git a/include/cdio/cdio.h b/include/cdio/cdio.h
index 84e54b10..5d8755fd 100644
--- a/include/cdio/cdio.h
+++ b/include/cdio/cdio.h
@@ -1,7 +1,5 @@
 /* -*- c -*-
-    $Id: cdio.h,v 1.82 2008/03/25 15:59:08 karl Exp $
-
-    Copyright (C) 2003, 2004, 2005, 2008 Rocky Bernstein <rocky@gnu.org>
+    Copyright (C) 2003, 2004, 2005, 2008, 2009 Rocky Bernstein <rocky@gnu.org>
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
 
     This program is free software: you can redistribute it and/or modify
@@ -34,7 +32,7 @@
 #define CDIO_API_VERSION 5
 
 #include <cdio/version.h>
-
+#include <cdio/types.h>
 #ifdef  HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -42,7 +40,6 @@
 #include <unistd.h>
 #endif
 
-#include <cdio/types.h>
 #include <cdio/sector.h>
 
 #ifdef __cplusplus