diff --git a/Makefile.am b/Makefile.am
index 0f00df16..4df3808f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-#   Copyright (C) 2003, 2004, 2006, 2008, 2011 
+#   Copyright (C) 2003, 2004, 2006, 2008, 2011, 2012
 #   Rocky Bernstein <rocky@gnu.org>
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -116,7 +116,6 @@ check_iso.sh: $(top_builddir)/config.status check_iso.sh.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 	chmod +x config_iso.sh
 
-# cvs2cl
 MAINTAINERCLEANFILES = ChangeLog *.rej *.orig
 
 if MAINTAINER_MODE
diff --git a/configure.ac b/configure.ac
index 8f26d324..d3e86fb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -648,7 +648,6 @@ AC_CONFIG_FILES([
        lib/udf/Makefile \
        libcdio.pc \
        libcdio++.pc \
-       libcdtext.pc \
        libiso9660.pc \
        libiso9660++.pc \
        libudf.pc \
diff --git a/example/Makefile.am b/example/Makefile.am
index 50d8a649..2782dfa4 100644
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -22,18 +22,35 @@ if ENABLE_CPP
 SUBDIRS =  C++
 endif
 
-if BUILD_EXAMPLES
-	audio cdchange cdio-eject cdtext device \
-	discid drives eject \
-	extract isofile isofile2 isofuzzy isolist isolsn \
-	mmc1 mmc2 mmc2a mmc3 \
-	sample3 sample4 tracks udf1 udffile
-endif
+noinst_PROGRAMS = \
+	audio \
+	cdchange \
+	cdio-eject \
+	cdtext \
+	device \
+	discid \
+	drives \
+	eject \
+	extract \
+	isofile \
+	isofile2 \
+	isofuzzy \
+	isolist \
+	isolsn \
+	mmc1 \
+	mmc2 \
+	mmc2a \
+	mmc3 \
+	sample3 \
+	sample4 \
+	tracks \
+	udf1 \
+	udffile
 
-# extract is used in tests so that has to be built regardless
-noinst_PROGRAMS = extract $(noinst_programs)
+check_PROGRAMS  = cdtext device drives \
+                   mmc1 mmc2 mmc2a mmc3 sample4
 
-INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS)
+INCLUDES = $(LIBCDIO_CFLAGS)
 
 audio_DEPENDENCIES    = $(LIBCDIO_DEPS)
 audio_LDADD           = $(LIBCDIO_LIBS) $(LTLIBICONV)
@@ -41,6 +58,9 @@ audio_LDADD           = $(LIBCDIO_LIBS) $(LTLIBICONV)
 cdchange_DEPENDENCIES = $(LIBCDIO_DEPS)
 cdchange_LDADD        = $(LIBCDIO_LIBS) $(LTLIBICONV)
 
+cdio_eject_DEPENDENCIES = $(LIBCDIO_DEPS)
+cdio_eject_LDADD        = $(LIBCDIO_LIBS) $(LTLIBICONV)
+
 cdtext_DEPENDENCIES   = $(LIBCDIO_DEPS)
 cdtext_LDADD          = $(LIBCDIO_LIBS) $(LTLIBICONV)
 
@@ -59,9 +79,6 @@ eject_LDADD           = $(LIBCDIO_LIBS) $(LTLIBICONV)
 extract_DEPENDENCIES  = $(LIBISO9660_LIBS) $(LIBUDF_LIBS) $(LIBCDIO_DEPS)
 extract_LDADD         = $(LIBISO9660_LIBS) $(LIBUDF_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
 
-cdio_eject_DEPENDENCIES = $(LIBCDIO_DEPS)
-cdio_eject_LDADD        = $(LIBCDIO_LIBS) $(LTLIBICONV)
-
 isofile_LDADD    = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
 isofile2_LDADD   = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
 isofuzzy_LDADD   = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
@@ -94,9 +111,6 @@ 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 sample4
-
 TESTS               = $(check_PROGRAMS)
 
 # iso programs create file "copying"
diff --git a/test/Makefile.am b/test/Makefile.am
index 5c6d267a..6a7eef1d 100755
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -31,7 +31,7 @@ hack = check_sizeof testassert testgetdevices testischar \
 EXTRA_PROGRAMS = testdefault 
 DATA_DIR       = @abs_top_srcdir@/test/data
 
-INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS) $(LIBISO9660_CFLAGS)
+INCLUDES = $(LIBCDIO_CFLAGS) $(LIBISO9660_CFLAGS)
 
 check_sizeof_LDADD    = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
 testassert_LDADD      = $(LIBCDIO_LIBS) $(LTLIBICONV)
diff --git a/test/driver/Makefile.am b/test/driver/Makefile.am
index f8f4f9e4..6f8b12c0 100644
--- a/test/driver/Makefile.am
+++ b/test/driver/Makefile.am
@@ -1,4 +1,4 @@
-#   Copyright (C) 2009, 2010 Rocky Bernstein <rocky@gnu.org>
+#   Copyright (C) 2009, 2010, 2012 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
@@ -13,7 +13,7 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS) $(LIBISO9660_CFLAGS)
+INCLUDES = $(LIBCDIO_CFLAGS) $(LIBISO9660_CFLAGS)
 DATA_DIR = $(abs_top_srcdir)/test/data
 
 abs_path_SOURCES   = abs_path.c