diff --git a/example/C++/paranoia.cpp b/example/C++/paranoia.cpp
index 803e11a4..8e022ce4 100644
--- a/example/C++/paranoia.cpp
+++ b/example/C++/paranoia.cpp
@@ -24,7 +24,7 @@
 # include "config.h"
 #endif
 
-#include <cdio/cdda.h>
+#include <cdio/paranoia.h>
 #include <cdio/cd_types.h>
 #include <stdio.h>
 
diff --git a/example/paranoia.c b/example/paranoia.c
index 803e11a4..8e022ce4 100644
--- a/example/paranoia.c
+++ b/example/paranoia.c
@@ -24,7 +24,7 @@
 # include "config.h"
 #endif
 
-#include <cdio/cdda.h>
+#include <cdio/paranoia.h>
 #include <cdio/cd_types.h>
 #include <stdio.h>
 
diff --git a/include/cdio/cdda.h b/include/cdio/cdda.h
index 00ab143d..22b93a7e 100644
--- a/include/cdio/cdda.h
+++ b/include/cdio/cdda.h
@@ -1,5 +1,5 @@
 /*
-  $Id: cdda.h,v 1.22 2005/08/27 14:25:58 rocky Exp $
+  $Id: cdda.h,v 1.23 2005/09/21 01:41:32 rocky Exp $
 
   Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
   Copyright (C) 2001 Xiph.org
@@ -30,12 +30,19 @@
 #define _CDDA_INTERFACE_H_
 
 #include <cdio/cdio.h>
-#include <cdio/paranoia.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
+/** cdrom_paranoia is an opaque structure which is used in all of the
+    library operations.
+ */
+typedef struct cdrom_paranoia_s cdrom_paranoia_t;
+typedef struct cdrom_drive_s   cdrom_drive_t;
+
+/** For compatibility. cdrom_drive_t is depricated, use cdrom_drive_t instead. */
+
 extern enum paranoia_cdda_enums {
   CDDA_MESSAGE_FORGETIT = 0,
   CDDA_MESSAGE_PRINTIT  = 1,
@@ -377,6 +384,8 @@ const char *strerror_tr[]={
 #define cdda_track_preemp       cdio_cddap_track_preemp
 #define cdda_disc_firstsector   cdio_cddap_disc_firstsector
 #define cdda_disc_lastsector    cdio_cddap_disc_lastsector
+#define cdrom_drive              cdrom_drive_t
+
 #endif /*DO_NOT_WANT_PARANOIA_COMPATIBILITY*/
 
 #ifdef __cplusplus
diff --git a/include/cdio/paranoia.h b/include/cdio/paranoia.h
index 5ce9a9cc..4eacf092 100644
--- a/include/cdio/paranoia.h
+++ b/include/cdio/paranoia.h
@@ -1,5 +1,5 @@
 /*
-  $Id: paranoia.h,v 1.8 2005/01/29 20:54:20 rocky Exp $
+  $Id: paranoia.h,v 1.9 2005/09/21 01:41:32 rocky Exp $
 
   Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
   Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -29,7 +29,7 @@
 #ifndef _CDIO_PARANOIA_H_
 #define _CDIO_PARANOIA_H_
 
-#include <cdio/cdio.h>
+#include <cdio/cdda.h>
 
 /*! Paranoia likes to work with 16-bit numbers rather than
     (possibly byte-swapped) bytes. So there are this many 
@@ -49,16 +49,6 @@
 #define PARANOIA_MODE_REPAIR      16
 #define PARANOIA_MODE_NEVERSKIP   32
 
-/** cdrom_paranoia is an opaque structure which is used in all of the
-    library operations.
- */
-typedef struct cdrom_paranoia_s cdrom_paranoia_t;
-typedef struct cdrom_drive_s   cdrom_drive_t;
-
-/** For compatibility. cdrom_drive_t is depricated, use cdrom_drive_t instead. */
-#define cdrom_drive cdrom_drive_t
-
-
 typedef enum  {
   PARANOIA_CB_READ,
   PARANOIA_CB_VERIFY,
diff --git a/test/testparanoia.c b/test/testparanoia.c
index 56da73fa..9d01e9ec 100644
--- a/test/testparanoia.c
+++ b/test/testparanoia.c
@@ -22,7 +22,7 @@
 # include "config.h"
 #endif
 
-#include <cdio/cdda.h>
+#include <cdio/paranoia.h>
 #include <cdio/cd_types.h>
 #include <stdio.h>