diff --git a/include/cdio/Makefile.am b/include/cdio/Makefile.am
index 5e08196d..590672d6 100644
--- a/include/cdio/Makefile.am
+++ b/include/cdio/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.2 2003/04/19 09:13:06 rocky Exp $
+#   $Id: Makefile.am,v 1.3 2003/04/21 14:13:54 hvr Exp $
 #
 #    Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
 #
@@ -20,9 +20,11 @@
 # Things to make the install (public) libcdio headers
 ########################################################
 #
+
+# generated part should be put into version.h.in and included from cdio.h
 EXTRA_DIST = cdio.h.in
 
-pkgincludedir=$(includedir)/cdio
-
-pkginclude_HEADERS = cdio.h logging.h sector.h types.h util.h
+libcdioincludedir=$(includedir)/cdio
+libcdioinclude_HEADERS = cdio.h logging.h sector.h types.h util.h
 
+BUILT_SOURCES = cdio.h
diff --git a/include/cdio/logging.h b/include/cdio/logging.h
index 61fb4005..c606738b 100644
--- a/include/cdio/logging.h
+++ b/include/cdio/logging.h
@@ -1,5 +1,5 @@
 /*
-    $Id: logging.h,v 1.1 2003/04/19 08:29:14 rocky Exp $
+    $Id: logging.h,v 1.2 2003/04/21 14:13:54 hvr Exp $
 
     Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
 
@@ -21,7 +21,7 @@
 #ifndef __LOGGING_H__
 #define __LOGGING_H__
 
-#include "types.h"
+#include <cdio/types.h>
 
 typedef enum {
   CDIO_LOG_DEBUG = 1,
diff --git a/include/cdio/sector.h b/include/cdio/sector.h
index 17aa2d1d..54846b5e 100644
--- a/include/cdio/sector.h
+++ b/include/cdio/sector.h
@@ -1,5 +1,5 @@
 /*
-    $Id: sector.h,v 1.1 2003/04/19 08:29:14 rocky Exp $
+    $Id: sector.h,v 1.2 2003/04/21 14:13:54 hvr Exp $
 
     Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
@@ -29,7 +29,7 @@
     extern "C" {
 #endif
 
-#include "types.h"
+#include <cdio/types.h>
 
 #define CDIO_PREGAP_SECTORS 150
 #define CDIO_POSTGAP_SECTORS 150
diff --git a/tests/check_cue.sh b/tests/check_cue.sh
deleted file mode 100755
index aea8ef40..00000000
--- a/tests/check_cue.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-#$Id: check_cue.sh,v 1.9 2003/04/20 19:42:12 rocky Exp $
-if test -n "-lcddb" ; then
-  cddb_opt='--no-cddb'
-fi
-
-if test -z $srcdir ; then
-  srcdir=`pwd`
-fi
-
-. ${srcdir}/check_common_fn
-
-BASE=`basename $0 .sh`
-
-fname=cdda
-testnum=CD-DA
-test_cdinfo "--cue-file ${srcdir}/${fname}.cue $cddb_opt" \
-  ${fname}.dump ${srcdir}/${fname}.right
-RC=$?
-check_result $RC "cdinfo CUE test $testnum"
-
-fname=isofs-m1
-testnum='ISO 9660 mode1'
-if test -f  ${srcdir}/${fname}.bin ; then
-  test_cdinfo "--cue-file ${srcdir}/${fname}.cue" \
-    ${fname}.dump ${srcdir}/${fname}.right
-  RC=$?
-  check_result $RC "cdinfo CUE test $testnum"
-else 
-  echo "Don't see CUE file ${srcdir}/${fname}.bin. Test $testum skipped."
-fi
-
-fname=vcd_demo
-testnum='Video CD'
-if test -f ${srcdir}/${fname}.cue ; then
-  test_cdinfo "-c ${srcdir}/vcd_demo.cue" \
-      ${fname}.dump ${srcdir}/${fname}.right
-  RC=$?
-  check_result $RC "cdinfo CUE test $testnum"
-else 
-  echo "Don't see CUE file ${srcdir}/${fname}.cue. Test $testum skipped."
-fi
-
-fname=svcd_ogt_test_ntsc
-testnum='Super Video CD'
-if test -f ${srcdir}/${fname}.bin ; then
-  test_cdinfo "--cue-file ${srcdir}/${fname}.cue" \
-    ${fname}.dump ${srcdir}/${fname}.right
-  RC=$?
-  check_result $RC "cdinfo CUE test $testnum"
-else 
-  echo "Don't see CUE file ${srcdir}/${fname}.bin. Test $testnum skipped."
-fi
-
-exit $RC
-
-#;;; Local Variables: ***
-#;;; mode:shell-script ***
-#;;; eval: (sh-set-shell "bash") ***
-#;;; End: ***