diff --git a/capability.c b/capability.c
index af4dffe..bbd5544 100644
--- a/capability.c
+++ b/capability.c
@@ -2,53 +2,17 @@
 
 /* these constants are the same as in <linux/capability.h> */
 enum {
-	CAP_CHOWN,
-	CAP_DAC_OVERRIDE,
-	CAP_DAC_READ_SEARCH,
-	CAP_FOWNER,
-	CAP_FSETID,
-	CAP_KILL,
-	CAP_SETGID,
-	CAP_SETUID,
-	CAP_SETPCAP,
-	CAP_LINUX_IMMUTABLE,
-	CAP_NET_BIND_SERVICE,
-	CAP_NET_BROADCAST,
-	CAP_NET_ADMIN,
-	CAP_NET_RAW,
-	CAP_IPC_LOCK,
-	CAP_IPC_OWNER,
-	CAP_SYS_MODULE,
-	CAP_SYS_RAWIO,
-	CAP_SYS_CHROOT,
-	CAP_SYS_PTRACE,
-	CAP_SYS_PACCT,
-	CAP_SYS_ADMIN,
-	CAP_SYS_BOOT,
-	CAP_SYS_NICE,
-	CAP_SYS_RESOURCE,
-	CAP_SYS_TIME,
-	CAP_SYS_TTY_CONFIG,
-	CAP_MKNOD,
-	CAP_LEASE,
-	CAP_AUDIT_WRITE,
-	CAP_AUDIT_CONTROL,
-	CAP_SETFCAP
+#include "caps0.h"
 };
 
-#include "xlat/capabilities.h"
+#include "xlat/cap_mask0.h"
 
 /* these constants are CAP_TO_INDEX'ed constants from <linux/capability.h> */
 enum {
-	CAP_MAC_OVERRIDE,
-	CAP_MAC_ADMIN,
-	CAP_SYSLOG,
-	CAP_WAKE_ALARM,
-	CAP_BLOCK_SUSPEND,
-	CAP_AUDIT_READ
+#include "caps1.h"
 };
 
-#include "xlat/capabilities1.h"
+#include "xlat/cap_mask1.h"
 
 /* these constants are the same as in <linux/capability.h> */
 enum {
@@ -107,12 +71,12 @@
 print_cap_bits(const uint32_t lo, const uint32_t hi)
 {
 	if (lo || !hi)
-		printflags(capabilities, lo, "CAP_???");
+		printflags(cap_mask0, lo, "CAP_???");
 
 	if (hi) {
 		if (lo)
 			tprints("|");
-		printflags(capabilities1, hi, "CAP_???");
+		printflags(cap_mask1, hi, "CAP_???");
 	}
 }