diff --git a/config/user-libattr.m4 b/config/user-libattr.m4
deleted file mode 100644
index 3298fd4911..0000000000
--- a/config/user-libattr.m4
+++ /dev/null
@@ -1,12 +0,0 @@
-dnl #
-dnl # Check for libattr
-dnl #
-AC_DEFUN([ZFS_AC_CONFIG_USER_LIBATTR], [
-	LIBATTR=
-
-	AC_CHECK_HEADER([attr/xattr.h], [], [AC_MSG_FAILURE([
-	*** attr/xattr.h missing, libattr-devel package required])])
-
-	AC_SUBST([LIBATTR], ["-lattr"])
-	AC_DEFINE([HAVE_LIBATTR], 1, [Define if you have libattr])
-])
diff --git a/config/user.m4 b/config/user.m4
index 21ff7143a5..3d725195d8 100644
--- a/config/user.m4
+++ b/config/user.m4
@@ -11,7 +11,6 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [
 	ZFS_AC_CONFIG_USER_LIBUUID
 	ZFS_AC_CONFIG_USER_LIBTIRPC
 	ZFS_AC_CONFIG_USER_LIBBLKID
-	ZFS_AC_CONFIG_USER_LIBATTR
 	ZFS_AC_CONFIG_USER_LIBUDEV
 	ZFS_AC_CONFIG_USER_FRAME_LARGER_THAN
 	ZFS_AC_CONFIG_USER_RUNSTATEDIR
diff --git a/tests/zfs-tests/cmd/mktree/mktree.c b/tests/zfs-tests/cmd/mktree/mktree.c
index 3dc3dd8ec6..bf0ec5e0cc 100644
--- a/tests/zfs-tests/cmd/mktree/mktree.c
+++ b/tests/zfs-tests/cmd/mktree/mktree.c
@@ -30,7 +30,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/tests/zfs-tests/cmd/xattrtest/xattrtest.c b/tests/zfs-tests/cmd/xattrtest/xattrtest.c
index a93cce7f18..dd3f2a6c97 100644
--- a/tests/zfs-tests/cmd/xattrtest/xattrtest.c
+++ b/tests/zfs-tests/cmd/xattrtest/xattrtest.c
@@ -37,7 +37,7 @@
 #include <fcntl.h>
 #include <time.h>
 #include <unistd.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>