Index: zfsutils/usr/src/lib/libdiskmgt/common/controller.c
===================================================================
--- zfsutils.orig/usr/src/lib/libdiskmgt/common/controller.c
+++ zfsutils/usr/src/lib/libdiskmgt/common/controller.c
@@ -31,7 +31,13 @@
 #include <stdlib.h>
 #include <sys/sunddi.h>
 #include <sys/types.h>
-#include <sys/scsi/conf/autoconf.h>
+
+/* From illumos-gate/usr/src/uts/common/sys/scsi/conf/autoconf.h  */
+#define	SCSI_OPTIONS_FAST	0x100	/* Global FAST scsi support */
+#define	SCSI_OPTIONS_WIDE	0x200	/* Global WIDE scsi support */
+#define	SCSI_OPTIONS_FAST20	0x400	/* Global FAST20 scsi support */
+#define	SCSI_OPTIONS_FAST40	0x800	/* Global FAST40 scsi support */
+#define	SCSI_OPTIONS_FAST80	0x1000	/* Global FAST80 scsi support */
 
 #include "libdiskmgt.h"
 #include "disks_private.h"
Index: zfsutils/usr/src/lib/libdiskmgt/common/bus.c
===================================================================
--- zfsutils.orig/usr/src/lib/libdiskmgt/common/bus.c
+++ zfsutils/usr/src/lib/libdiskmgt/common/bus.c
@@ -31,7 +31,6 @@
 #include <stdlib.h>
 #include <sys/sunddi.h>
 #include <sys/types.h>
-#include <sys/scsi/conf/autoconf.h>
 
 #include "libdiskmgt.h"
 #include "disks_private.h"