>From 8ec23af46656bb6429e58e2bd75bb4725c98611b Mon Sep 17 00:00:00 2001
From: Yury Usishchev <address@hidden>
Date: Mon, 15 Feb 2016 20:56:58 +0300
Subject: [PATCH 1/2] Cleanup internal headers usage

move acl/libacl.h and sys/acl.h includes to libacl/libacl.h,
include libacl.h to acl_valid.c
---
 libacl/__acl_to_any_text.c    | 1 -
 libacl/__acl_to_xattr.c       | 1 -
 libacl/__apply_mask_to_mode.c | 1 -
 libacl/acl_check.c            | 1 -
 libacl/acl_equiv_mode.c       | 1 -
 libacl/acl_error.c            | 1 -
 libacl/acl_from_mode.c        | 1 -
 libacl/acl_get_fd.c           | 1 -
 libacl/acl_get_file.c         | 1 -
 libacl/acl_to_any_text.c      | 1 -
 libacl/acl_to_text.c          | 1 -
 libacl/acl_valid.c            | 2 +-
 libacl/libacl.h               | 1 +
 13 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/libacl/__acl_to_any_text.c b/libacl/__acl_to_any_text.c
index c0cc03b..080e90e 100644
--- a/libacl/__acl_to_any_text.c
+++ b/libacl/__acl_to_any_text.c
@@ -25,7 +25,6 @@
 #include <string.h>
 #include <pwd.h>
 #include <grp.h>
-#include <acl/libacl.h>
 #include "libacl.h"
 #include "misc.h"
 
diff --git a/libacl/__acl_to_xattr.c b/libacl/__acl_to_xattr.c
index 6277f31..874e533 100644
--- a/libacl/__acl_to_xattr.c
+++ b/libacl/__acl_to_xattr.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 #include <errno.h>
-#include <sys/acl.h>
 #include "libacl.h"
 
 #include "byteorder.h"
diff --git a/libacl/__apply_mask_to_mode.c b/libacl/__apply_mask_to_mode.c
index 1fa8e96..0838c7e 100644
--- a/libacl/__apply_mask_to_mode.c
+++ b/libacl/__apply_mask_to_mode.c
@@ -22,7 +22,6 @@
 
 #include "config.h"
 #include <sys/stat.h>
-#include <acl/libacl.h>
 #include "libacl.h"
 
 #if defined(HAVE_ACL_ENTRIES) && \
diff --git a/libacl/acl_check.c b/libacl/acl_check.c
index 28159cb..913c789 100644
--- a/libacl/acl_check.c
+++ b/libacl/acl_check.c
@@ -22,7 +22,6 @@
 #include "config.h"
 #include <stdio.h>
 #include <errno.h>
-#include <acl/libacl.h>
 #include "libacl.h"
 
 
diff --git a/libacl/acl_equiv_mode.c b/libacl/acl_equiv_mode.c
index 990210a..0172639 100644
--- a/libacl/acl_equiv_mode.c
+++ b/libacl/acl_equiv_mode.c
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <acl/libacl.h>
 #include "libacl.h"
 
 
diff --git a/libacl/acl_error.c b/libacl/acl_error.c
index c06181e..7bd91ad 100644
--- a/libacl/acl_error.c
+++ b/libacl/acl_error.c
@@ -22,7 +22,6 @@
 #include "config.h"
 #include <stdio.h>
 #include <errno.h>
-#include <acl/libacl.h>
 #include "libacl.h"
 
 
diff --git a/libacl/acl_from_mode.c b/libacl/acl_from_mode.c
index 08c3045..b514057 100644
--- a/libacl/acl_from_mode.c
+++ b/libacl/acl_from_mode.c
@@ -24,7 +24,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <acl/libacl.h>
 #include "libacl.h"
 
 
diff --git a/libacl/acl_get_fd.c b/libacl/acl_get_fd.c
index 0356c1d..4b4b8a4 100644
--- a/libacl/acl_get_fd.c
+++ b/libacl/acl_get_fd.c
@@ -25,7 +25,6 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/xattr.h>
-#include <acl/libacl.h>
 #include "libacl.h"
 #include "__acl_from_xattr.h"
 
diff --git a/libacl/acl_get_file.c b/libacl/acl_get_file.c
index 7b59572..8e4b07d 100644
--- a/libacl/acl_get_file.c
+++ b/libacl/acl_get_file.c
@@ -25,7 +25,6 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/xattr.h>
-#include <acl/libacl.h>
 #include "libacl.h"
 #include "__acl_from_xattr.h"
 
diff --git a/libacl/acl_to_any_text.c b/libacl/acl_to_any_text.c
index 11f6c0f..0b5e044 100644
--- a/libacl/acl_to_any_text.c
+++ b/libacl/acl_to_any_text.c
@@ -25,7 +25,6 @@
 #include <string.h>
 #include <pwd.h>
 #include <grp.h>
-#include <acl/libacl.h>
 #include "libacl.h"
 
 char *
diff --git a/libacl/acl_to_text.c b/libacl/acl_to_text.c
index e42f1a7..84a8606 100644
--- a/libacl/acl_to_text.c
+++ b/libacl/acl_to_text.c
@@ -22,7 +22,6 @@
 #include "config.h"
 #include <stdio.h>
 #include <errno.h>
-#include <acl/libacl.h>
 #include "libacl.h"
 
 char *
diff --git a/libacl/acl_valid.c b/libacl/acl_valid.c
index d8a2ef2..fe18f5c 100644
--- a/libacl/acl_valid.c
+++ b/libacl/acl_valid.c
@@ -22,7 +22,7 @@
 #include "config.h"
 #include <errno.h>
 #include <stdio.h>
-#include <acl/libacl.h>
+#include "libacl.h"
 
 
 /* 23.4.28 */
diff --git a/libacl/libacl.h b/libacl/libacl.h
index 12e38a5..9e7d75f 100644
--- a/libacl/libacl.h
+++ b/libacl/libacl.h
@@ -18,6 +18,7 @@
 #include "config.h"
 #include <errno.h>
 #include <sys/acl.h>
+#include <acl/libacl.h>
 #include <errno.h>
 #include "libobj.h"
 
-- 
2.7.1