--- Libc/Libc-1725.40.4/include/sys/acl.h
+++ Libc/Libc-825.24/include/sys/acl.h
@@ -24,11 +24,7 @@
 #define _SYS_ACL_H
 
 #include <Availability.h>
-#include <_bounds.h>
 #include <sys/kauth.h>
-#include <sys/_types/_ssize_t.h>
-
-_LIBC_SINGLE_BY_DEFAULT()
 
 #define __DARWIN_ACL_READ_DATA			(1<<1)
 #define __DARWIN_ACL_LIST_DIRECTORY		__DARWIN_ACL_READ_DATA
@@ -47,7 +43,6 @@
 #define __DARWIN_ACL_READ_SECURITY		(1<<11)
 #define __DARWIN_ACL_WRITE_SECURITY		(1<<12)
 #define __DARWIN_ACL_CHANGE_OWNER		(1<<13)
-#define __DARWIN_ACL_SYNCHRONIZE		(1<<20)
 
 #define __DARWIN_ACL_EXTENDED_ALLOW		1
 #define __DARWIN_ACL_EXTENDED_DENY		2
@@ -87,7 +82,6 @@
 	ACL_READ_SECURITY	= __DARWIN_ACL_READ_SECURITY,
 	ACL_WRITE_SECURITY	= __DARWIN_ACL_WRITE_SECURITY,
 	ACL_CHANGE_OWNER	= __DARWIN_ACL_CHANGE_OWNER,
-	ACL_SYNCHRONIZE		= __DARWIN_ACL_SYNCHRONIZE,
 } acl_perm_t;
 
 /* 23.2.5 ACL entry tag type bits - nonstandard */
@@ -203,13 +197,13 @@
 extern int	acl_set_link_np(const char *path_p, acl_type_t type, acl_t acl);
 
 /* 23.1.6.4 ACL Format translation */
-extern ssize_t	acl_copy_ext(void *_LIBC_SIZE(size) buf_p, acl_t acl, ssize_t size);
-extern ssize_t	acl_copy_ext_native(void *_LIBC_SIZE(size) buf_p, acl_t acl, ssize_t size);
-extern acl_t	acl_copy_int(const void *_LIBC_UNSAFE_INDEXABLE buf_p);
-extern acl_t	acl_copy_int_native(const void *_LIBC_UNSAFE_INDEXABLE buf_p);
-extern acl_t	acl_from_text(const char *_LIBC_UNSAFE_INDEXABLE buf_p);
+extern ssize_t	acl_copy_ext(void *buf_p, acl_t acl, ssize_t size);
+extern ssize_t	acl_copy_ext_native(void *buf_p, acl_t acl, ssize_t size);
+extern acl_t	acl_copy_int(const void *buf_p);
+extern acl_t	acl_copy_int_native(const void *buf_p);
+extern acl_t	acl_from_text(const char *buf_p);
 extern ssize_t	acl_size(acl_t acl);
-extern char	*_LIBC_CSTR	acl_to_text(acl_t acl, ssize_t *len_p);
+extern char	*acl_to_text(acl_t acl, ssize_t *len_p);
 __END_DECLS
 
 #endif /* _SYS_ACL_H */