diff --git a/Makefile.am b/Makefile.am
index 6d2f1d3e245d..cc6f6befbed7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -250,32 +250,16 @@ libarchive_la_SOURCES+= \
 endif
 
 if INC_LINUX_ACL
-libarchive_la_SOURCES+= \
-	libarchive/archive_acl_maps.h \
-	libarchive/archive_acl_maps_linux.c \
-	libarchive/archive_read_disk_acl_linux.c \
-	libarchive/archive_write_disk_acl_linux.c
+libarchive_la_SOURCES+= libarchive/archive_disk_acl_linux.c
 else
 if INC_SUNOS_ACL
-libarchive_la_SOURCES+= \
-	libarchive/archive_acl_maps.h \
-	libarchive/archive_acl_maps_sunos.c \
-	libarchive/archive_read_disk_acl_sunos.c \
-	libarchive/archive_write_disk_acl_sunos.c
+libarchive_la_SOURCES+= libarchive/archive_disk_acl_sunos.c
 else
 if INC_DARWIN_ACL
-libarchive_la_SOURCES+= \
-	libarchive/archive_acl_maps.h \
-	libarchive/archive_acl_maps_darwin.c \
-	libarchive/archive_read_disk_acl_darwin.c \
-	libarchive/archive_write_disk_acl_darwin.c
+libarchive_la_SOURCES+= libarchive/archive_disk_acl_darwin.c
 else
 if INC_FREEBSD_ACL
-libarchive_la_SOURCES+= \
-	libarchive/archive_acl_maps.h \
-	libarchive/archive_acl_maps_freebsd.c \
-	libarchive/archive_read_disk_acl_freebsd.c \
-	libarchive/archive_write_disk_acl_freebsd.c
+libarchive_la_SOURCES+= libarchive/archive_disk_acl_freebsd.c
 endif
 endif
 endif
diff --git a/libarchive/archive_disk_acl_darwin.c b/libarchive/archive_disk_acl_darwin.c
index 0d3bc4e9861f..48ad01651265 100644
--- a/libarchive/archive_disk_acl_darwin.c
+++ b/libarchive/archive_disk_acl_darwin.c
@@ -25,6 +25,8 @@
 
 #include "archive_platform.h"
 
+#if ARCHIVE_ACL_DARWIN
+
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
@@ -554,3 +556,4 @@ archive_write_disk_set_acls(struct archive *a, int fd, const char *name,
 	}
 	return (ret);
 }
+#endif	/* ARCHIVE_ACL_DARWIN */
diff --git a/libarchive/archive_disk_acl_freebsd.c b/libarchive/archive_disk_acl_freebsd.c
index eff9c22e94ab..07d08ff962f4 100644
--- a/libarchive/archive_disk_acl_freebsd.c
+++ b/libarchive/archive_disk_acl_freebsd.c
@@ -27,6 +27,8 @@
 
 #include "archive_platform.h"
 
+#if ARCHIVE_ACL_FREEBSD
+
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
@@ -695,3 +697,4 @@ archive_write_disk_set_acls(struct archive *a, int fd, const char *name,
 #endif
 	return (ret);
 }
+#endif	/* ARCHIVE_ACL_FREEBSD */
diff --git a/libarchive/archive_disk_acl_linux.c b/libarchive/archive_disk_acl_linux.c
index 6e9288d221f9..3928f3d6fafd 100644
--- a/libarchive/archive_disk_acl_linux.c
+++ b/libarchive/archive_disk_acl_linux.c
@@ -27,6 +27,8 @@
 
 #include "archive_platform.h"
 
+#if ARCHIVE_ACL_LIBACL || ARCHIVE_ACL_LIBRICHACL
+
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
@@ -738,3 +740,4 @@ archive_write_disk_set_acls(struct archive *a, int fd, const char *name,
 #endif	/* ARCHIVE_ACL_LIBACL */
 	return (ret);
 }
+#endif /* ARCHIVE_ACL_LIBACL || ARCHIVE_ACL_LIBRICHACL */
diff --git a/libarchive/archive_disk_acl_sunos.c b/libarchive/archive_disk_acl_sunos.c
index 7d806b016f90..bc84fd6782f3 100644
--- a/libarchive/archive_disk_acl_sunos.c
+++ b/libarchive/archive_disk_acl_sunos.c
@@ -25,6 +25,8 @@
 
 #include "archive_platform.h"
 
+#if ARCHIVE_ACL_SUNOS
+
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
@@ -816,3 +818,4 @@ archive_write_disk_set_acls(struct archive *a, int fd, const char *name,
 #endif
 	return (ret);
 }
+#endif	/* ARCHIVE_ACL_SUNOS */