diff --git a/lib/cdda_interface/common_interface.h b/lib/cdda_interface/common_interface.h
index 5fcb97af..ff1b9759 100644
--- a/lib/cdda_interface/common_interface.h
+++ b/lib/cdda_interface/common_interface.h
@@ -1,5 +1,5 @@
 /*
-  $Id: common_interface.h,v 1.2 2004/12/19 01:43:38 rocky Exp $
+  $Id: common_interface.h,v 1.3 2005/01/06 03:38:58 rocky Exp $
 
   Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
   Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -22,8 +22,12 @@
 #ifndef _CDDA_COMMON_INTERFACE_H_
 #define _CDDA_COMMON_INTERFACE_H_
 
-#include "low_interface.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <cdio/types.h>
+#include "low_interface.h"
 
 /** Test for presence of a cdrom by pinging with the 'CDROMVOLREAD' ioctl() */
 extern int ioctl_ping_cdrom(int fd);
diff --git a/lib/cdda_interface/cooked_interface.c b/lib/cdda_interface/cooked_interface.c
index 9b3d2a4b..e4b0f0d3 100644
--- a/lib/cdda_interface/cooked_interface.c
+++ b/lib/cdda_interface/cooked_interface.c
@@ -1,5 +1,5 @@
 /*
-  $Id: cooked_interface.c,v 1.5 2005/01/06 03:09:11 rocky Exp $
+  $Id: cooked_interface.c,v 1.6 2005/01/06 03:38:58 rocky Exp $
 
   Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
   Original interface.c Copyright (C) 1994-1997 
@@ -27,8 +27,8 @@
  *
  ******************************************************************/
 
-#include "low_interface.h"
 #include "common_interface.h"
+#include "low_interface.h"
 #include "utils.h"
 
 static int 
diff --git a/lib/cdda_interface/interface.c b/lib/cdda_interface/interface.c
index 597cf01b..d4748675 100644
--- a/lib/cdda_interface/interface.c
+++ b/lib/cdda_interface/interface.c
@@ -1,7 +1,24 @@
+/*
+  $Id: interface.c,v 1.7 2005/01/06 03:38:58 rocky Exp $
+
+  Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
+  Copyright (C) 1998 Monty xiphmont@mit.edu
+  
+  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
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+  
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+  
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
 /******************************************************************
- * CopyPolicy: GNU Public License 2 applies
- * Copyright (C) 1998 Monty xiphmont@mit.edu
- * 
  * Top-level interface module for cdrom drive access.  SCSI, ATAPI, etc
  *    specific stuff are in other modules.  Note that SCSI does use
  *    specialized ioctls; these appear in common_interface.c where the
@@ -9,8 +26,8 @@
  *
  ******************************************************************/
 
-#include "low_interface.h"
 #include "common_interface.h"
+#include "low_interface.h"
 #include "utils.h"
 #include <cdio/bytesex.h>
 
diff --git a/lib/cdda_interface/scan_devices.c b/lib/cdda_interface/scan_devices.c
index 7ced64bb..ce542ffc 100644
--- a/lib/cdda_interface/scan_devices.c
+++ b/lib/cdda_interface/scan_devices.c
@@ -1,5 +1,5 @@
 /*
-  $Id: scan_devices.c,v 1.3 2005/01/05 04:16:11 rocky Exp $
+  $Id: scan_devices.c,v 1.4 2005/01/06 03:38:58 rocky Exp $
 
   Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
   Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -25,6 +25,7 @@
  * 
  ******************************************************************/
 
+#include "common_interface.h"
 #include <limits.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -34,7 +35,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include "low_interface.h"
-#include "common_interface.h"
 #include "utils.h"
 #include "cdio/scsi_mmc.h"
 
diff --git a/lib/cdda_interface/toc.c b/lib/cdda_interface/toc.c
index 5f18ae89..4eeb51f7 100644
--- a/lib/cdda_interface/toc.c
+++ b/lib/cdda_interface/toc.c
@@ -1,5 +1,5 @@
 /*
-  $Id: toc.c,v 1.2 2005/01/05 04:16:11 rocky Exp $
+  $Id: toc.c,v 1.3 2005/01/06 03:38:58 rocky Exp $
 
   Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
   Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -23,6 +23,10 @@
  * Table of contents convenience functions
  ******************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "low_interface.h"
 #include "utils.h"