diff --git a/src/fs_xattr.cpp b/src/fs_xattr.cpp
index 16f6f8f5..bbe2b297 100644
--- a/src/fs_xattr.cpp
+++ b/src/fs_xattr.cpp
@@ -22,11 +22,11 @@
   THE SOFTWARE.
 */
 
+#include <errno.h>
+#include <fcntl.h>
 #include <stdlib.h>
-#include <sys/types.h>
-#include <attr/xattr.h>
 #include <sys/stat.h>
-#include <fcntl.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include <string>
diff --git a/src/getxattr.cpp b/src/getxattr.cpp
index 2e511e76..e42baefb 100644
--- a/src/getxattr.cpp
+++ b/src/getxattr.cpp
@@ -29,10 +29,10 @@
 #include <set>
 #include <algorithm>
 
-#include <stdio.h>
 #include <errno.h>
-#include <sys/types.h>
+#include <stdio.h>
 #include <string.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include "config.hpp"
@@ -62,7 +62,7 @@ _lgetxattr(const string &path,
 
   return ((rv == -1) ? -errno : rv);
 #else
-  return -ENOSUP;
+  return -ENOTSUP;
 #endif
 }