diff --git a/lib/Makefile.am b/lib/Makefile.am
index 2378ba41..49ee9314 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.31 2004/04/23 01:01:36 rocky Exp $
+#   $Id: Makefile.am,v 1.32 2004/04/23 02:18:07 rocky Exp $
 #
 #    Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
 #
@@ -69,7 +69,7 @@ libcdio_sources = \
 	ds.c \
 	ds.h \
 	image/bincue.c \
-	image/common.c \
+	image_common.h \
 	image/nrg.c \
 	logging.c \
 	MSWindows/aspi32.c \
diff --git a/lib/image/bincue.c b/lib/image/bincue.c
index 6f4319b3..724bc27d 100644
--- a/lib/image/bincue.c
+++ b/lib/image/bincue.c
@@ -1,5 +1,5 @@
 /*
-    $Id: bincue.c,v 1.10 2004/04/23 01:01:37 rocky Exp $
+    $Id: bincue.c,v 1.11 2004/04/23 02:18:07 rocky Exp $
 
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -24,7 +24,7 @@
    (*.cue).
 */
 
-static const char _rcsid[] = "$Id: bincue.c,v 1.10 2004/04/23 01:01:37 rocky Exp $";
+static const char _rcsid[] = "$Id: bincue.c,v 1.11 2004/04/23 02:18:07 rocky Exp $";
 
 #include "cdio_assert.h"
 #include "cdio_private.h"
@@ -104,7 +104,7 @@ typedef struct {
 static bool     _cdio_image_read_cue (_img_private_t *_obj);
 static uint32_t _cdio_stat_size (void *env);
 
-#include "image/common.c"
+#include "image_common.h"
 
 /*!
   Initialize image structures.
diff --git a/lib/image/nrg.c b/lib/image/nrg.c
index b4ec5004..54575d56 100644
--- a/lib/image/nrg.c
+++ b/lib/image/nrg.c
@@ -1,5 +1,5 @@
 /*
-    $Id: nrg.c,v 1.5 2004/04/23 01:01:37 rocky Exp $
+    $Id: nrg.c,v 1.6 2004/04/23 02:18:07 rocky Exp $
 
     Copyright (C) 2001, 2003 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -48,7 +48,7 @@
 #include "cdio_private.h"
 #include "_cdio_stdio.h"
 
-static const char _rcsid[] = "$Id: nrg.c,v 1.5 2004/04/23 01:01:37 rocky Exp $";
+static const char _rcsid[] = "$Id: nrg.c,v 1.6 2004/04/23 02:18:07 rocky Exp $";
 
 /* structures used */
 
@@ -177,7 +177,7 @@ typedef struct {
 static bool     _cdio_parse_nero_footer (_img_private_t *_obj);
 static uint32_t _cdio_stat_size (void *env);
 
-#include "image/common.c"
+#include "image_common.h"
 
 /* Updates internal track TOC, so we can later 
    simulate ioctl(CDROMREADTOCENTRY).
diff --git a/lib/image/common.c b/lib/image_common.h
similarity index 97%
rename from lib/image/common.c
rename to lib/image_common.h
index 5fdb32b2..bb1e1f8e 100644
--- a/lib/image/common.c
+++ b/lib/image_common.h
@@ -1,5 +1,5 @@
 /*
-    $Id: common.c,v 1.1 2004/04/23 01:01:37 rocky Exp $
+    $Id: image_common.h,v 1.1 2004/04/23 02:18:07 rocky Exp $
 
     Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
 
diff --git a/test/vcd_demo_vcdinfo.right b/test/vcd_demo_vcdinfo.right
index 38710887..73facb39 100644
--- a/test/vcd_demo_vcdinfo.right
+++ b/test/vcd_demo_vcdinfo.right
@@ -1,6 +1,7 @@
 This is free software; see the source for copying conditions.
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
+Disc-image file
 __________________________________
 CD-ROM Track List (1 - 3)
   #: MSF       LSN     Type  Green?