--- configure.ac.orig	2010-05-10 17:21:44.000000000 +0000
+++ configure.ac	2010-05-10 17:26:48.000000000 +0000
@@ -48,8 +48,7 @@
 #endif
 ])
 AC_CHECK_HEADERS(
-	[scsi/scsi.h \
-	langinfo.h \
+	[langinfo.h \
 	locale.h \
 	sys/user.h \
 	rpcsvc/nfs_prot.h \

--- fdisk/fdisksunlabel.c.orig	2010-05-10 17:27:52.000000000 +0000
+++ fdisk/fdisksunlabel.c	2010-05-10 17:51:50.000000000 +0000
@@ -22,11 +22,6 @@
 #include "blkdev.h"
 
 #include <endian.h>
-#ifdef HAVE_SCSI_SCSI_H
-#define u_char	unsigned char
-#include <scsi/scsi.h>		/* SCSI_IOCTL_GET_IDLUN */
-#undef u_char
-#endif
 #ifdef HAVE_LINUX_MAJOR_H
 #include <linux/major.h>	/* FLOPPY_MAJOR */
 #endif