diff -Nur cdrdao-1.1.8/scsilib/libscg/scsi-linux-sg.c cdrdao-1.1.8-kernel-2.6/scsilib/libscg/scsi-linux-sg.c
--- cdrdao-1.1.8/scsilib/libscg/scsi-linux-sg.c	2004-02-10 00:35:21.000000000 +0100
+++ cdrdao-1.1.8-kernel-2.6/scsilib/libscg/scsi-linux-sg.c	2004-05-28 00:29:25.898541024 +0200
@@ -66,6 +66,11 @@
 #if LINUX_VERSION_CODE >= 0x01031a /* <linux/scsi.h> introduced in 1.3.26 */
 #if LINUX_VERSION_CODE >= 0x020000 /* <scsi/scsi.h> introduced somewhere. */
 /* Need to fine tune the ifdef so we get the transition point right. */
+#if LINUX_VERSION_CODE >= 0x020500 /* 2.5.x breaks things again */
+#define __KERNEL__
+#include <asm/types.h>
+#undef __KERNEL__
+#endif
 #include <scsi/scsi.h>
 #else
 #include <linux/scsi.h>