diff -uNr acl/configure.ac acl-patched/configure.ac
--- acl/configure.ac	2015-04-22 18:30:27.898017371 +0000
+++ acl-patched/configure.ac	2015-04-22 18:25:27.198100268 +0000
@@ -44,7 +44,6 @@
 LT_REVISION=$(echo "${PACKAGE_VERSION}" | tr -d .)
 AC_SUBST(LT_REVISION)
 
-AC_PACKAGE_NEED_ATTR_XATTR_H
 AC_PACKAGE_NEED_ATTR_ERROR_H
 AC_PACKAGE_NEED_GETXATTR_LIBATTR
 
diff -uNr acl/libacl/__acl_extended_file.c acl-patched/libacl/__acl_extended_file.c
--- acl/libacl/__acl_extended_file.c	2015-04-22 18:30:27.898017371 +0000
+++ acl-patched/libacl/__acl_extended_file.c	2015-04-22 18:30:01.518901607 +0000
@@ -20,13 +20,17 @@
 */
 
 #include <unistd.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
 #include "libacl.h"
 
 #include "byteorder.h"
 #include "acl_ea.h"
 #include "__acl_extended_file.h"
 
+#include <errno.h>
+#ifndef ENOATTR
+# define ENOATTR ENODATA
+#endif
 
 int
 __acl_extended_file(const char *path_p,
diff -uNr acl/libacl/acl_delete_def_file.c acl-patched/libacl/acl_delete_def_file.c
--- acl/libacl/acl_delete_def_file.c	2015-04-22 18:30:27.898017371 +0000
+++ acl-patched/libacl/acl_delete_def_file.c	2015-04-22 18:26:57.835060215 +0000
@@ -20,11 +20,16 @@
 */
 
 #include <sys/types.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
 #include "byteorder.h"
 #include "acl_ea.h"
 #include "config.h"
 
+#include <errno.h>
+
+#ifndef ENOATTR
+# define ENOATTR ENODATA
+#endif
 
 /* 23.4.8 */
 int
diff -uNr acl/libacl/acl_extended_fd.c acl-patched/libacl/acl_extended_fd.c
--- acl/libacl/acl_extended_fd.c	2015-04-22 18:30:27.898017371 +0000
+++ acl-patched/libacl/acl_extended_fd.c	2015-04-22 18:29:22.710202575 +0000
@@ -20,12 +20,16 @@
 */
 
 #include <unistd.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
 #include "libacl.h"
 
 #include "byteorder.h"
 #include "acl_ea.h"
 
+#include <errno.h>
+#ifndef ENOATTR
+# define ENOATTR ENODATA
+#endif
 
 int
 acl_extended_fd(int fd)
diff -uNr acl/libacl/acl_extended_file.c acl-patched/libacl/acl_extended_file.c
--- acl/libacl/acl_extended_file.c	2015-04-22 18:30:27.898017371 +0000
+++ acl-patched/libacl/acl_extended_file.c	2015-04-22 18:23:35.738506744 +0000
@@ -20,7 +20,7 @@
 */
 
 #include <unistd.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
 #include "libacl.h"
 
 #include "__acl_extended_file.h"
diff -uNr acl/libacl/acl_extended_file_nofollow.c acl-patched/libacl/acl_extended_file_nofollow.c
--- acl/libacl/acl_extended_file_nofollow.c	2015-04-22 18:30:27.898017371 +0000
+++ acl-patched/libacl/acl_extended_file_nofollow.c	2015-04-22 18:24:34.046550129 +0000
@@ -20,7 +20,7 @@
 */
 
 #include <unistd.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
 #include "libacl.h"
 
 #include "__acl_extended_file.h"
diff -uNr acl/libacl/acl_get_fd.c acl-patched/libacl/acl_get_fd.c
--- acl/libacl/acl_get_fd.c	2015-04-22 18:30:27.898017371 +0000
+++ acl-patched/libacl/acl_get_fd.c	2015-04-22 18:27:52.976544452 +0000
@@ -23,7 +23,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
 #include <acl/libacl.h>
 #include "libacl.h"
 #include "__acl_from_xattr.h"
@@ -31,6 +31,10 @@
 #include "byteorder.h"
 #include "acl_ea.h"
 
+#include <errno.h>
+#ifndef ENOATTR
+# define ENOATTR ENODATA
+#endif 
 
 /* 23.4.15 */
 acl_t
diff -uNr acl/libacl/acl_get_file.c acl-patched/libacl/acl_get_file.c
--- acl/libacl/acl_get_file.c	2015-04-22 18:30:27.898017371 +0000
+++ acl-patched/libacl/acl_get_file.c	2015-04-22 18:28:39.891638092 +0000
@@ -23,7 +23,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
 #include <acl/libacl.h>
 #include "libacl.h"
 #include "__acl_from_xattr.h"
@@ -31,6 +31,10 @@
 #include "byteorder.h"
 #include "acl_ea.h"
 
+#include <errno.h>
+#ifndef ENOATTR
+# define ENOATTR ENODATA
+#endif
 
 /* 23.4.16 */
 acl_t
diff -uNr acl/libacl/acl_set_fd.c acl-patched/libacl/acl_set_fd.c
--- acl/libacl/acl_set_fd.c	2015-04-22 18:30:27.898017371 +0000
+++ acl-patched/libacl/acl_set_fd.c	2015-04-22 18:24:34.046550129 +0000
@@ -20,7 +20,7 @@
 */
 
 #include <unistd.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
 #include "libacl.h"
 #include "__acl_to_xattr.h"
 
diff -uNr acl/libacl/acl_set_file.c acl-patched/libacl/acl_set_file.c
--- acl/libacl/acl_set_file.c	2015-04-22 18:30:27.898017371 +0000
+++ acl-patched/libacl/acl_set_file.c	2015-04-22 18:23:35.738506744 +0000
@@ -22,7 +22,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
 #include "libacl.h"
 #include "__acl_to_xattr.h"
 
diff -uNr acl/m4/package_attrdev.m4 acl-patched/m4/package_attrdev.m4
--- acl/m4/package_attrdev.m4	2015-04-22 18:30:27.898017371 +0000
+++ acl-patched/m4/package_attrdev.m4	2015-04-22 18:21:46.685500871 +0000
@@ -12,17 +12,6 @@
 dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AC_DEFUN([AC_PACKAGE_NEED_ATTR_XATTR_H],
-  [ AC_CHECK_HEADERS([attr/xattr.h])
-    if test "$ac_cv_header_attr_xattr_h" != "yes"; then
-        echo
-        echo 'FATAL ERROR: attr/xattr.h does not exist.'
-        echo 'Install the extended attributes (attr) development package.'
-        echo 'Alternatively, run "make install-dev" from the attr source.'
-        exit 1
-    fi
-  ])
-
 AC_DEFUN([AC_PACKAGE_NEED_ATTR_ERROR_H],
   [ AC_CHECK_HEADERS([attr/error_context.h])
     if test "$ac_cv_header_attr_error_context_h" != "yes"; then