diff --git a/config/Makefile.am b/config/Makefile.am
index 2d77282c19..b412e6bdc3 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST = zfs-build.m4 zfs-meta.m4 kernel.m4 user.m4 Rules.am
+EXTRA_DIST = *.m4 Rules.am
diff --git a/config/user.m4 b/config/user.m4
index 683fb3e343..719fd6a503 100644
--- a/config/user.m4
+++ b/config/user.m4
@@ -2,26 +2,6 @@ dnl #
 dnl # Default ZFS user configuration
 dnl #
 AC_DEFUN([ZFS_AC_CONFIG_USER], [
-	ZFS_AC_CONFIG_USER_IOCTL
 	ZFS_AC_CONFIG_USER_LIBEFI
-])
-
-AC_DEFINE(ZFS_AC_CONFIG_USER_IOCTL], [
-	AC_EGREP_HEADER(ioctl, unistd.h,
-		[AC_DEFINE([HAVE_IOCTL_IN_UNISTD_H], 1,
-		[Define to 1 if ioctl() is defined in <unistd.h> header])])
-
-	AC_EGREP_HEADER(ioctl, sys/ioctl.h,
-		[AC_DEFINE([HAVE_IOCTL_IN_SYS_IOCTL_H], 1,
-		[Define to 1 if ioctl() is defined in <sys/ioctl.h> header])])
-
-	AC_EGREP_HEADER(ioctl, stropts.h,
-		[AC_DEFINE([HAVE_IOCTL_IN_STROPTS_H], 1,
-		[Define to 1 if ioctl() is defined in <stropts.h> header])])
-])
-
-AC_DEFUN([ZFS_AC_CONFIG_USER_LIBEFI], [
-	AC_CHECK_LIB([efi], [efi_alloc_and_init],
-		[AC_DEFINE([HAVE_LIBEFI], 1,
-		[Define to 1 if 'libefi' library available])])
+	ZFS_AC_CONFIG_USER_IOCTL
 ])