Merge "Fix strace build after upstream sync."
diff --git a/Android.mk b/Android.mk
index efefcc3..4f93ae2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -68,6 +68,7 @@
     futex.c \
     getcpu.c \
     getcwd.c \
+    getrandom.c \
     get_robust_list.c \
     hostname.c \
     inotify.c \
@@ -102,7 +103,9 @@
     resource.c \
     sched.c \
     scsi.c \
+    seccomp.c \
     signal.c \
+    sigreturn.c \
     sock.c \
     socketutils.c \
     sram_alloc.c \
@@ -164,6 +167,7 @@
     -DHAVE_INET_NTOP=1 \
     -DHAVE_LINUX_CAPABILITY_H=1 \
     -DHAVE_LINUX_FALLOC_H=1 \
+    -DHAVE_LINUX_FILTER_H=1 \
     -DHAVE_LINUX_FUTEX_H=1 \
     -DHAVE_LINUX_ICMP_H=1 \
     -DHAVE_LINUX_IF_PACKET_H=1 \
@@ -181,7 +185,9 @@
     -DHAVE_SIGACTION=1 \
     -DHAVE_SIG_ATOMIC_T=1 \
     -DHAVE_SIGINFO_T=1 \
+    -DHAVE_SIGINFO_T_SI_OVERRUN=1 \
     -DHAVE_SIGINFO_T_SI_SYSCALL=1 \
+    -DHAVE_SIGINFO_T_SI_TIMERID=1 \
     -UHAVE_STAT64 \
     -DHAVE_STATFS64=1 \
     -DHAVE_STDBOOL_H=1 \
@@ -192,6 +198,7 @@
     -DHAVE_STRUCT_SIGCONTEXT=1 \
     -DHAVE_STRUCT_SIGEVENT__SIGEV_UN__PAD=1 \
     -DHAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID=1 \
+    -DHAVE_STRUCT_STATFS64=1 \
     -DHAVE_STRUCT_STAT_ST_ACLCNT=0 \
     -DHAVE_STRUCT_STAT_ST_BLKSIZE=1 \
     -DHAVE_STRUCT_STAT_ST_BLOCKS=1 \
@@ -209,6 +216,7 @@
     -DHAVE_SYS_POLL_H=1 \
     -DHAVE_SYS_REG_H=1 \
     -DHAVE_SYS_VFS_H=1 \
+    -DHAVE_SYS_XATTR_H=1 \
     -DMAJOR_IN_SYSMACROS \
     -DPACKAGE_NAME='"strace"' \
     -DVERSION='"$(strace_version)"' \
@@ -247,15 +255,12 @@
     -Wno-unused-parameter \
     -Wno-sign-compare \
 
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/linux
-
-LOCAL_C_INCLUDES_arm := $(LOCAL_PATH)/linux/arm
-LOCAL_C_INCLUDES_arm64 := $(LOCAL_PATH)/linux/aarch64
-LOCAL_C_INCLUDES_mips := $(LOCAL_PATH)/linux/mips
-LOCAL_C_INCLUDES_mips64 := $(LOCAL_PATH)/linux/mips
-LOCAL_C_INCLUDES_x86 := $(LOCAL_PATH)/linux/i386
-LOCAL_C_INCLUDES_x86_64 := $(LOCAL_PATH)/linux/x86_64
+LOCAL_C_INCLUDES_arm := $(LOCAL_PATH)/linux/arm $(LOCAL_PATH)/linux
+LOCAL_C_INCLUDES_arm64 := $(LOCAL_PATH)/linux/aarch64 $(LOCAL_PATH)/linux
+LOCAL_C_INCLUDES_mips := $(LOCAL_PATH)/linux/mips $(LOCAL_PATH)/linux
+LOCAL_C_INCLUDES_mips64 := $(LOCAL_PATH)/linux/mips $(LOCAL_PATH)/linux
+LOCAL_C_INCLUDES_x86 := $(LOCAL_PATH)/linux/i386 $(LOCAL_PATH)/linux
+LOCAL_C_INCLUDES_x86_64 := $(LOCAL_PATH)/linux/x86_64 $(LOCAL_PATH)/linux
 
 LOCAL_MODULE := strace
 
@@ -270,6 +275,8 @@
 
 # -------------------------------------------------------------------------
 
+# TODO: this is currently broken; the checked in ioctlent*.h files are from the 4.10 release.
+
 .PHONY: update-ioctls
 update-ioctls:
 	# Build the generated .h files needed by ioctlsort from the current bionic uapi headers.
@@ -300,5 +307,3 @@
 endif
 
 # -------------------------------------------------------------------------
-
-include $(LOCAL_PATH)/test/Android.mk
diff --git a/build_static_example.sh b/build_static_example.sh
deleted file mode 100755
index 31ee264..0000000
--- a/build_static_example.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh -e
-
-BUILDFLAG=""
-
-#BUILDFLAG="--build=i686"
-#export CC="i686-gcc"
-# -mpreferred-stack-boundary=2 can be used to prevent gcc 4.2.x
-# from aligning stack to 16 bytes. (Which is gcc's way of supporting SSE).
-# For me it saves about 6k of text segment.
-# This may be unsafe if your libc expects 16 byte stack alignment
-# on function entry.
-
-export CC="x86_64-gcc"
-
-export CFLAGS="-Os\
- -fomit-frame-pointer\
- -static\
- -static-libgcc\
- -ffunction-sections -fdata-sections\
- -falign-functions=1 -falign-jumps=1 -falign-labels=1 -falign-loops=1\
- -fno-unwind-tables\
- -fno-asynchronous-unwind-tables\
- -Wl,--gc-sections\
- -Wl,-Map=strace.mapfile\
-"
-
-./bootstrap
-./configure $BUILDFLAG #--enable-maintainer-mode
-make CC="$CC" CFLAGS="$CFLAGS"
diff --git a/generate_xlat_in.sh b/generate_xlat_in.sh
deleted file mode 100755
index b5a633f..0000000
--- a/generate_xlat_in.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-convert() {
-	sed -n '/^\(static \)\?const struct xlat '"$n"'\[\] = {$/,/^};$/{
-		s/^[[:space:]]*XLAT(\([^)]\+\)).*/\1/p
-		s/^[[:space:]]*{[[:space:]]*(\?\(1<<[^),[:space:]]\+\).*/\1/p
-		s/.*not NULL-terminated.*/#unterminated/p
-		s/^\([[:space:]]*{.*\)/\1/p
-		s/^\t*\( *[/*].*\)/\1/p}' "$f" >> xlat/"$n".in
-	sed -i '/^\(static \)\?const struct xlat '"$n"'\[\] = {$/,/^};$/c #include "xlat/'"$n"'.h"' "$f"
-}
-
-for f; do
-	for n in $(sed -n 's/^\(static \)\?const struct xlat \([a-z0-9_]\+\)\[\] = {$/\2/p' "$f"); do
-		case "$n" in
-			cacheflush_flags|struct_user_offsets) # skip
-				;;
-			ioprio_class|ioprio_who|mtd_mode_options|personality_options|syslog_action_type|ubi_volume_props|ubi_volume_types)
-				echo '#unconditional' > xlat/"$n".in
-				convert
-				;;
-			*)
-				> xlat/"$n".in
-				convert
-				;;
-		esac
-	done
-done
diff --git a/linux/dummy_check.sh b/linux/dummy_check.sh
deleted file mode 100755
index bcce34c..0000000
--- a/linux/dummy_check.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-grep '^#define' dummy.h | cut -f2 | \
-while read func; do
-	grep -q -F -- "${func}(" syscall.h && echo "Defined as macro and as func: $func"
-done
diff --git a/linux/ioctlent.h b/linux/ioctlent.h
deleted file mode 100644
index c206ed9..0000000
--- a/linux/ioctlent.h
+++ /dev/null
@@ -1,1852 +0,0 @@
-	{"FIBMAP",	0x0001},
-	{"FIGETBSZ",	0x0002},
-	{"FDGETPRM",	0x0204},
-	{"FDGETMAXERRS",	0x020e},
-	{"FDGETDRVTYP",	0x020f},
-	{"FDGETDRVPRM",	0x0211},
-	{"FDGETDRVSTAT",	0x0212},
-	{"FDPOLLDRVSTAT",	0x0213},
-	{"FDGETFDCSTAT",	0x0215},
-	{"FDWERRORGET",	0x0217},
-	{"FDCLRPRM",	0x0241},
-	{"FDSETPRM",	0x0242},
-	{"FDDEFPRM",	0x0243},
-	{"FDMSGON",	0x0245},
-	{"FDMSGOFF",	0x0246},
-	{"FDFMTBEG",	0x0247},
-	{"FDFMTTRK",	0x0248},
-	{"FDFMTEND",	0x0249},
-	{"FDSETEMSGTRESH",	0x024a},
-	{"FDFLUSH",	0x024b},
-	{"FDSETMAXERRS",	0x024c},
-	{"FDRESET",	0x0254},
-	{"FDWERRORCLR",	0x0256},
-	{"FDRAWCMD",	0x0258},
-	{"FDTWADDLE",	0x0259},
-	{"FDEJECT",	0x025a},
-	{"FDSETDRVPRM",	0x0290},
-	{"HDIO_GETGEO",	0x0301},
-	{"HDIO_GET_UNMASKINTR",	0x0302},
-	{"HDIO_GET_MULTCOUNT",	0x0304},
-	{"HDIO_GET_QDMA",	0x0305},
-	{"HDIO_SET_XFER",	0x0306},
-	{"HDIO_OBSOLETE_IDENTITY",	0x0307},
-	{"HDIO_GET_KEEPSETTINGS",	0x0308},
-	{"HDIO_GET_32BIT",	0x0309},
-	{"HDIO_GET_NOWERR",	0x030a},
-	{"HDIO_GET_DMA",	0x030b},
-	{"HDIO_GET_NICE",	0x030c},
-	{"HDIO_GET_IDENTITY",	0x030d},
-	{"HDIO_GET_WCACHE",	0x030e},
-	{"HDIO_GET_ACOUSTIC",	0x030f},
-	{"HDIO_GET_ADDRESS",	0x0310},
-	{"HDIO_GET_BUSSTATE",	0x031a},
-	{"HDIO_TRISTATE_HWIF",	0x031b},
-	{"HDIO_DRIVE_RESET",	0x031c},
-	{"HDIO_DRIVE_TASKFILE",	0x031d},
-	{"HDIO_DRIVE_TASK",	0x031e},
-	{"HDIO_DRIVE_CMD",	0x031f},
-	{"HDIO_SET_MULTCOUNT",	0x0321},
-	{"HDIO_SET_UNMASKINTR",	0x0322},
-	{"HDIO_SET_KEEPSETTINGS",	0x0323},
-	{"HDIO_SET_32BIT",	0x0324},
-	{"HDIO_SET_NOWERR",	0x0325},
-	{"HDIO_SET_DMA",	0x0326},
-	{"HDIO_SET_PIO_MODE",	0x0327},
-	{"HDIO_SCAN_HWIF",	0x0328},
-	{"HDIO_SET_NICE",	0x0329},
-	{"HDIO_UNREGISTER_HWIF",	0x032a},
-	{"HDIO_SET_WCACHE",	0x032b},
-	{"HDIO_SET_ACOUSTIC",	0x032c},
-	{"HDIO_SET_BUSSTATE",	0x032d},
-	{"HDIO_SET_QDMA",	0x032e},
-	{"HDIO_SET_ADDRESS",	0x032f},
-	{"IOCTL_VM_SOCKETS_GET_LOCAL_CID",	0x07b9},
-	{"BLKROSET",	0x125d},
-	{"BLKROGET",	0x125e},
-	{"BLKRRPART",	0x125f},
-	{"BLKGETSIZE",	0x1260},
-	{"BLKFLSBUF",	0x1261},
-	{"BLKRASET",	0x1262},
-	{"BLKRAGET",	0x1263},
-	{"BLKFRASET",	0x1264},
-	{"BLKFRAGET",	0x1265},
-	{"BLKSECTSET",	0x1266},
-	{"BLKSECTGET",	0x1267},
-	{"BLKSSZGET",	0x1268},
-	{"BLKPG",	0x1269},
-	{"BLKBSZGET",	0x1270},
-	{"BLKBSZSET",	0x1271},
-	{"BLKGETSIZE64",	0x1272},
-	{"BLKTRACESETUP",	0x1273},
-	{"BLKTRACESTART",	0x1274},
-	{"BLKTRACESTOP",	0x1275},
-	{"BLKTRACETEARDOWN",	0x1276},
-	{"BLKDISCARD",	0x1277},
-	{"BLKIOMIN",	0x1278},
-	{"BLKIOOPT",	0x1279},
-	{"BLKALIGNOFF",	0x127a},
-	{"BLKPBSZGET",	0x127b},
-	{"BLKDISCARDZEROES",	0x127c},
-	{"BLKSECDISCARD",	0x127d},
-	{"BLKROTATIONAL",	0x127e},
-	{"BLKZEROOUT",	0x127f},
-	{"IB_USER_MAD_REGISTER_AGENT",	0x1b01},
-	{"IB_USER_MAD_UNREGISTER_AGENT",	0x1b02},
-	{"IB_USER_MAD_ENABLE_PKEY",	0x1b03},
-	{"FW_CDEV_IOC_GET_INFO",	0x2300},
-	{"FW_CDEV_IOC_SEND_REQUEST",	0x2301},
-	{"FW_CDEV_IOC_ALLOCATE",	0x2302},
-	{"FW_CDEV_IOC_DEALLOCATE",	0x2303},
-	{"FW_CDEV_IOC_SEND_RESPONSE",	0x2304},
-	{"FW_CDEV_IOC_INITIATE_BUS_RESET",	0x2305},
-	{"FW_CDEV_IOC_ADD_DESCRIPTOR",	0x2306},
-	{"FW_CDEV_IOC_REMOVE_DESCRIPTOR",	0x2307},
-	{"FW_CDEV_IOC_CREATE_ISO_CONTEXT",	0x2308},
-	{"FW_CDEV_IOC_QUEUE_ISO",	0x2309},
-	{"FW_CDEV_IOC_START_ISO",	0x230a},
-	{"FW_CDEV_IOC_STOP_ISO",	0x230b},
-	{"FW_CDEV_IOC_GET_CYCLE_TIMER",	0x230c},
-	{"FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE",	0x230d},
-	{"FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE",	0x230e},
-	{"FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE_ONCE",	0x230f},
-	{"FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE_ONCE",	0x2310},
-	{"FW_CDEV_IOC_GET_SPEED",	0x2311},
-	{"FW_CDEV_IOC_SEND_BROADCAST_REQUEST",	0x2312},
-	{"FW_CDEV_IOC_SEND_STREAM_PACKET",	0x2313},
-	{"FW_CDEV_IOC_GET_CYCLE_TIMER2",	0x2314},
-	{"FW_CDEV_IOC_SEND_PHY_PACKET",	0x2315},
-	{"FW_CDEV_IOC_RECEIVE_PHY_PACKETS",	0x2316},
-	{"FW_CDEV_IOC_SET_ISO_CHANNELS",	0x2317},
-	{"FW_CDEV_IOC_FLUSH_ISO",	0x2318},
-	{"PERF_EVENT_IOC_ENABLE",	0x2400},
-	{"PERF_EVENT_IOC_DISABLE",	0x2401},
-	{"PERF_EVENT_IOC_REFRESH",	0x2402},
-	{"PERF_EVENT_IOC_RESET",	0x2403},
-	{"PERF_EVENT_IOC_PERIOD",	0x2404},
-	{"PERF_EVENT_IOC_SET_OUTPUT",	0x2405},
-	{"PERF_EVENT_IOC_SET_FILTER",	0x2406},
-	{"PERF_EVENT_IOC_ID",	0x2407},
-	{"SNAPSHOT_FREEZE",	0x3301},
-	{"SNAPSHOT_UNFREEZE",	0x3302},
-	{"SNAPSHOT_ATOMIC_RESTORE",	0x3304},
-	{"SNAPSHOT_FREE",	0x3305},
-	{"SNAPSHOT_FREE_SWAP_PAGES",	0x3309},
-	{"SNAPSHOT_S2RAM",	0x330b},
-	{"SNAPSHOT_SET_SWAP_AREA",	0x330d},
-	{"SNAPSHOT_GET_IMAGE_SIZE",	0x330e},
-	{"SNAPSHOT_PLATFORM_SUPPORT",	0x330f},
-	{"SNAPSHOT_POWER_OFF",	0x3310},
-	{"SNAPSHOT_CREATE_IMAGE",	0x3311},
-	{"SNAPSHOT_PREF_IMAGE_SIZE",	0x3312},
-	{"SNAPSHOT_AVAIL_SWAP_SIZE",	0x3313},
-	{"SNAPSHOT_ALLOC_SWAP_PAGE",	0x3314},
-	{"VFIO_GET_API_VERSION",	0x3b64},
-	{"VFIO_CHECK_EXTENSION",	0x3b65},
-	{"VFIO_SET_IOMMU",	0x3b66},
-	{"VFIO_GROUP_GET_STATUS",	0x3b67},
-	{"VFIO_GROUP_SET_CONTAINER",	0x3b68},
-	{"VFIO_GROUP_UNSET_CONTAINER",	0x3b69},
-	{"VFIO_GROUP_GET_DEVICE_FD",	0x3b6a},
-	{"VFIO_DEVICE_GET_INFO",	0x3b6b},
-	{"VFIO_DEVICE_GET_REGION_INFO",	0x3b6c},
-	{"VFIO_DEVICE_GET_IRQ_INFO",	0x3b6d},
-	{"VFIO_DEVICE_SET_IRQS",	0x3b6e},
-	{"VFIO_DEVICE_RESET",	0x3b6f},
-	{"VFIO_DEVICE_GET_PCI_HOT_RESET_INFO",	0x3b70},
-	{"VFIO_IOMMU_GET_INFO",	0x3b70},
-	{"VFIO_IOMMU_SPAPR_TCE_GET_INFO",	0x3b70},
-	{"VFIO_DEVICE_PCI_HOT_RESET",	0x3b71},
-	{"VFIO_IOMMU_MAP_DMA",	0x3b71},
-	{"VFIO_IOMMU_UNMAP_DMA",	0x3b72},
-	{"VFIO_IOMMU_ENABLE",	0x3b73},
-	{"VFIO_IOMMU_DISABLE",	0x3b74},
-	{"PTP_CLOCK_GETCAPS",	0x3d01},
-	{"PTP_EXTTS_REQUEST",	0x3d02},
-	{"PTP_PEROUT_REQUEST",	0x3d03},
-	{"PTP_ENABLE_PPS",	0x3d04},
-	{"PTP_SYS_OFFSET",	0x3d05},
-	{"PTP_PIN_GETFUNC",	0x3d06},
-	{"PTP_PIN_SETFUNC",	0x3d07},
-	{"SYNC_IOC_WAIT",	0x3e00},
-	{"SYNC_IOC_MERGE",	0x3e01},
-	{"SYNC_IOC_FENCE_INFO",	0x3e02},
-	{"FBIO_RADEON_GET_MIRROR",	0x4003},
-	{"FBIO_RADEON_SET_MIRROR",	0x4004},
-	{"AGPIOC_INFO",	0x4100},
-	{"SNDRV_PCM_IOCTL_PVERSION",	0x4100},
-	{"AGPIOC_ACQUIRE",	0x4101},
-	{"APM_IOC_STANDBY",	0x4101},
-	{"SNDRV_PCM_IOCTL_INFO",	0x4101},
-	{"AGPIOC_RELEASE",	0x4102},
-	{"APM_IOC_SUSPEND",	0x4102},
-	{"SNDRV_PCM_IOCTL_TSTAMP",	0x4102},
-	{"AGPIOC_SETUP",	0x4103},
-	{"SNDRV_PCM_IOCTL_TTSTAMP",	0x4103},
-	{"AGPIOC_RESERVE",	0x4104},
-	{"AGPIOC_PROTECT",	0x4105},
-	{"AGPIOC_ALLOCATE",	0x4106},
-	{"AGPIOC_DEALLOCATE",	0x4107},
-	{"AGPIOC_BIND",	0x4108},
-	{"AGPIOC_UNBIND",	0x4109},
-	{"AGPIOC_CHIPSET_FLUSH",	0x410a},
-	{"SNDRV_PCM_IOCTL_HW_REFINE",	0x4110},
-	{"SNDRV_PCM_IOCTL_HW_PARAMS",	0x4111},
-	{"SNDRV_PCM_IOCTL_HW_FREE",	0x4112},
-	{"SNDRV_PCM_IOCTL_SW_PARAMS",	0x4113},
-	{"SNDRV_PCM_IOCTL_STATUS",	0x4120},
-	{"SNDRV_PCM_IOCTL_DELAY",	0x4121},
-	{"SNDRV_PCM_IOCTL_HWSYNC",	0x4122},
-	{"SNDRV_PCM_IOCTL_SYNC_PTR",	0x4123},
-	{"SNDRV_PCM_IOCTL_CHANNEL_INFO",	0x4132},
-	{"SNDRV_PCM_IOCTL_PREPARE",	0x4140},
-	{"SNDRV_PCM_IOCTL_RESET",	0x4141},
-	{"SNDRV_PCM_IOCTL_START",	0x4142},
-	{"SNDRV_PCM_IOCTL_DROP",	0x4143},
-	{"SNDRV_PCM_IOCTL_DRAIN",	0x4144},
-	{"SNDRV_PCM_IOCTL_PAUSE",	0x4145},
-	{"SNDRV_PCM_IOCTL_REWIND",	0x4146},
-	{"SNDRV_PCM_IOCTL_RESUME",	0x4147},
-	{"SNDRV_PCM_IOCTL_XRUN",	0x4148},
-	{"SNDRV_PCM_IOCTL_FORWARD",	0x4149},
-	{"SNDRV_PCM_IOCTL_WRITEI_FRAMES",	0x4150},
-	{"SNDRV_PCM_IOCTL_READI_FRAMES",	0x4151},
-	{"SNDRV_PCM_IOCTL_WRITEN_FRAMES",	0x4152},
-	{"SNDRV_PCM_IOCTL_READN_FRAMES",	0x4153},
-	{"SNDRV_PCM_IOCTL_LINK",	0x4160},
-	{"SNDRV_PCM_IOCTL_UNLINK",	0x4161},
-	{"PMU_IOC_SLEEP",	0x4200},
-	{"CCISS_GETPCIINFO",	0x4201},
-	{"PMU_IOC_GET_BACKLIGHT",	0x4201},
-	{"CCISS_GETINTINFO",	0x4202},
-	{"PMU_IOC_SET_BACKLIGHT",	0x4202},
-	{"CCISS_SETINTINFO",	0x4203},
-	{"PMU_IOC_GET_MODEL",	0x4203},
-	{"CCISS_GETNODENAME",	0x4204},
-	{"PMU_IOC_HAS_ADB",	0x4204},
-	{"CCISS_SETNODENAME",	0x4205},
-	{"PMU_IOC_CAN_SLEEP",	0x4205},
-	{"CCISS_GETHEARTBEAT",	0x4206},
-	{"PMU_IOC_GRAB_BACKLIGHT",	0x4206},
-	{"CCISS_GETBUSTYPES",	0x4207},
-	{"CCISS_GETFIRMVER",	0x4208},
-	{"CCISS_GETDRIVVER",	0x4209},
-	{"CCISS_REVALIDVOLS",	0x420a},
-	{"CCISS_PASSTHRU",	0x420b},
-	{"CCISS_DEREGDISK",	0x420c},
-	{"CCISS_REGNEWDISK",	0x420d},
-	{"CCISS_REGNEWD",	0x420e},
-	{"CCISS_RESCANDISK",	0x4210},
-	{"CCISS_GETLUNINFO",	0x4211},
-	{"CCISS_BIG_PASSTHRU",	0x4212},
-	{"SNDCTL_COPR_RESET",	0x4300},
-	{"SNDRV_COMPRESS_IOCTL_VERSION",	0x4300},
-	{"CAPI_REGISTER",	0x4301},
-	{"SNDCTL_COPR_LOAD",	0x4301},
-	{"SNDCTL_COPR_RDATA",	0x4302},
-	{"SNDCTL_COPR_RCODE",	0x4303},
-	{"SNDCTL_COPR_WDATA",	0x4304},
-	{"SNDCTL_COPR_WCODE",	0x4305},
-	{"CAPI_GET_MANUFACTURER",	0x4306},
-	{"SNDCTL_COPR_RUN",	0x4306},
-	{"CAPI_GET_VERSION",	0x4307},
-	{"SNDCTL_COPR_HALT",	0x4307},
-	{"CAPI_GET_SERIAL",	0x4308},
-	{"SNDCTL_COPR_SENDMSG",	0x4308},
-	{"CAPI_GET_PROFILE",	0x4309},
-	{"SNDCTL_COPR_RCVMSG",	0x4309},
-	{"SNDRV_COMPRESS_GET_CAPS",	0x4310},
-	{"SNDRV_COMPRESS_GET_CODEC_CAPS",	0x4311},
-	{"SNDRV_COMPRESS_SET_PARAMS",	0x4312},
-	{"SNDRV_COMPRESS_GET_PARAMS",	0x4313},
-	{"SNDRV_COMPRESS_SET_METADATA",	0x4314},
-	{"SNDRV_COMPRESS_GET_METADATA",	0x4315},
-	{"CAPI_MANUFACTURER_CMD",	0x4320},
-	{"SNDRV_COMPRESS_TSTAMP",	0x4320},
-	{"CAPI_GET_ERRCODE",	0x4321},
-	{"SNDRV_COMPRESS_AVAIL",	0x4321},
-	{"CAPI_INSTALLED",	0x4322},
-	{"CAPI_GET_FLAGS",	0x4323},
-	{"CAPI_SET_FLAGS",	0x4324},
-	{"CAPI_CLR_FLAGS",	0x4325},
-	{"CAPI_NCCI_OPENCOUNT",	0x4326},
-	{"CAPI_NCCI_GETUNIT",	0x4327},
-	{"SNDRV_COMPRESS_PAUSE",	0x4330},
-	{"SNDRV_COMPRESS_RESUME",	0x4331},
-	{"SNDRV_COMPRESS_START",	0x4332},
-	{"SNDRV_COMPRESS_STOP",	0x4333},
-	{"SNDRV_COMPRESS_DRAIN",	0x4334},
-	{"SNDRV_COMPRESS_NEXT_TRACK",	0x4335},
-	{"SNDRV_COMPRESS_PARTIAL_DRAIN",	0x4336},
-	{"ADF_SET_EVENT",	0x4400},
-	{"ADF_BLANK",	0x4401},
-	{"ADF_POST_CONFIG",	0x4402},
-	{"ADF_SET_MODE",	0x4403},
-	{"ADF_GET_DEVICE_DATA",	0x4404},
-	{"ADF_GET_INTERFACE_DATA",	0x4405},
-	{"ADF_GET_OVERLAY_ENGINE_DATA",	0x4406},
-	{"ADF_SIMPLE_POST_CONFIG",	0x4407},
-	{"ADF_SIMPLE_BUFFER_ALLOC",	0x4408},
-	{"ADF_ATTACH",	0x4409},
-	{"ADF_DETACH",	0x440a},
-	{"EVIOCGVERSION",	0x4501},
-	{"EVIOCGID",	0x4502},
-	{"EVIOCGREP",	0x4503},
-	{"EVIOCSREP",	0x4503},
-	{"EVIOCGKEYCODE",	0x4504},
-	{"EVIOCSKEYCODE",	0x4504},
-	{"EVIOCRMFF",	0x4581},
-	{"EVIOCGEFFECTS",	0x4584},
-	{"EVIOCGRAB",	0x4590},
-	{"EVIOCREVOKE",	0x4591},
-	{"EVIOCSCLOCKID",	0x45a0},
-	{"FBIOGET_VSCREENINFO",	0x4600},
-	{"FBIOPUT_VSCREENINFO",	0x4601},
-	{"FBIOGET_FSCREENINFO",	0x4602},
-	{"FBIOGETCMAP",	0x4604},
-	{"FBIOPUTCMAP",	0x4605},
-	{"FBIOPAN_DISPLAY",	0x4606},
-	{"FBIO_CURSOR",	0x4608},
-	{"FBIOGET_CON2FBMAP",	0x460f},
-	{"FBIOPUT_CON2FBMAP",	0x4610},
-	{"FBIOBLANK",	0x4611},
-	{"FBIOGET_VBLANK",	0x4612},
-	{"FBIO_ALLOC",	0x4613},
-	{"FBIO_FREE",	0x4614},
-	{"FBIOGET_GLYPH",	0x4615},
-	{"FBIOGET_HWCINFO",	0x4616},
-	{"FBIOPUT_MODEINFO",	0x4617},
-	{"FBIOGET_DISPINFO",	0x4618},
-	{"FBIO_WAITFORVSYNC",	0x4620},
-	{"FBIO_WAITEVENT",	0x4688},
-	{"FBIO_GETCONTROL2",	0x4689},
-	{"GIGASET_REDIR",	0x4700},
-	{"GIGASET_CONFIG",	0x4701},
-	{"GIGASET_BRKCHARS",	0x4702},
-	{"GIGASET_VERSION",	0x4703},
-	{"SNDRV_HWDEP_IOCTL_PVERSION",	0x4800},
-	{"HIDIOCGRDESCSIZE",	0x4801},
-	{"HIDIOCGVERSION",	0x4801},
-	{"IOCTL_MEI_CONNECT_CLIENT",	0x4801},
-	{"SNDRV_HWDEP_IOCTL_INFO",	0x4801},
-	{"HIDIOCAPPLICATION",	0x4802},
-	{"HIDIOCGRDESC",	0x4802},
-	{"SNDRV_HWDEP_IOCTL_DSP_STATUS",	0x4802},
-	{"HIDIOCGDEVINFO",	0x4803},
-	{"HIDIOCGRAWINFO",	0x4803},
-	{"SNDRV_HWDEP_IOCTL_DSP_LOAD",	0x4803},
-	{"HIDIOCGSTRING",	0x4804},
-	{"HIDIOCINITREPORT",	0x4805},
-	{"HIDIOCGREPORT",	0x4807},
-	{"HIDIOCSREPORT",	0x4808},
-	{"HIDIOCGREPORTINFO",	0x4809},
-	{"HIDIOCGFIELDINFO",	0x480a},
-	{"HIDIOCGUSAGE",	0x480b},
-	{"HIDIOCSUSAGE",	0x480c},
-	{"HIDIOCGUCODE",	0x480d},
-	{"HIDIOCGFLAG",	0x480e},
-	{"HIDIOCSFLAG",	0x480f},
-	{"HIDIOCGCOLLECTIONINDEX",	0x4810},
-	{"SNDRV_EMU10K1_IOCTL_INFO",	0x4810},
-	{"SNDRV_SB_CSP_IOCTL_INFO",	0x4810},
-	{"HIDIOCGCOLLECTIONINFO",	0x4811},
-	{"SNDRV_EMU10K1_IOCTL_CODE_POKE",	0x4811},
-	{"SNDRV_EMU10K1_IOCTL_CODE_PEEK",	0x4812},
-	{"SNDRV_SB_CSP_IOCTL_UNLOAD_CODE",	0x4812},
-	{"HIDIOCGUSAGES",	0x4813},
-	{"SNDRV_SB_CSP_IOCTL_START",	0x4813},
-	{"HIDIOCSUSAGES",	0x4814},
-	{"SNDRV_SB_CSP_IOCTL_STOP",	0x4814},
-	{"SNDRV_SB_CSP_IOCTL_PAUSE",	0x4815},
-	{"SNDRV_SB_CSP_IOCTL_RESTART",	0x4816},
-	{"SNDRV_DM_FM_IOCTL_INFO",	0x4820},
-	{"SNDRV_EMU10K1_IOCTL_TRAM_SETUP",	0x4820},
-	{"SNDRV_DM_FM_IOCTL_RESET",	0x4821},
-	{"SNDRV_EMU10K1_IOCTL_TRAM_POKE",	0x4821},
-	{"SNDRV_DM_FM_IOCTL_PLAY_NOTE",	0x4822},
-	{"SNDRV_EMU10K1_IOCTL_TRAM_PEEK",	0x4822},
-	{"SNDRV_DM_FM_IOCTL_SET_VOICE",	0x4823},
-	{"SNDRV_DM_FM_IOCTL_SET_PARAMS",	0x4824},
-	{"SNDRV_DM_FM_IOCTL_SET_MODE",	0x4825},
-	{"SNDRV_DM_FM_IOCTL_SET_CONNECTION",	0x4826},
-	{"SNDRV_EMU10K1_IOCTL_PCM_POKE",	0x4830},
-	{"SNDRV_EMU10K1_IOCTL_PCM_PEEK",	0x4831},
-	{"SNDRV_DM_FM_IOCTL_CLEAR_PATCHES",	0x4840},
-	{"SNDRV_EMU10K1_IOCTL_PVERSION",	0x4840},
-	{"SNDRV_HDSP_IOCTL_GET_PEAK_RMS",	0x4840},
-	{"SNDRV_HDSP_IOCTL_GET_CONFIG_INFO",	0x4841},
-	{"SNDRV_HDSPM_IOCTL_GET_CONFIG",	0x4841},
-	{"SNDRV_HDSP_IOCTL_UPLOAD_FIRMWARE",	0x4842},
-	{"SNDRV_HDSPM_IOCTL_GET_PEAK_RMS",	0x4842},
-	{"SNDRV_HDSP_IOCTL_GET_VERSION",	0x4843},
-	{"SNDRV_HDSP_IOCTL_GET_MIXER",	0x4844},
-	{"SNDRV_HDSPM_IOCTL_GET_MIXER",	0x4844},
-	{"SNDRV_HDSP_IOCTL_GET_9632_AEB",	0x4845},
-	{"SNDRV_HDSPM_IOCTL_GET_LTC",	0x4846},
-	{"SNDRV_HDSPM_IOCTL_GET_STATUS",	0x4847},
-	{"SNDRV_HDSPM_IOCTL_GET_VERSION",	0x4848},
-	{"SNDRV_EMU10K1_IOCTL_STOP",	0x4880},
-	{"SNDRV_EMUX_IOCTL_VERSION",	0x4880},
-	{"SNDRV_EMU10K1_IOCTL_CONTINUE",	0x4881},
-	{"SNDRV_EMUX_IOCTL_LOAD_PATCH",	0x4881},
-	{"SNDRV_EMU10K1_IOCTL_ZERO_TRAM_COUNTER",	0x4882},
-	{"SNDRV_EMUX_IOCTL_RESET_SAMPLES",	0x4882},
-	{"SNDRV_EMU10K1_IOCTL_SINGLE_STEP",	0x4883},
-	{"SNDRV_EMUX_IOCTL_REMOVE_LAST_SAMPLES",	0x4883},
-	{"SNDRV_EMU10K1_IOCTL_DBG_READ",	0x4884},
-	{"SNDRV_EMUX_IOCTL_MEM_AVAIL",	0x4884},
-	{"SNDRV_EMUX_IOCTL_MISC_MODE",	0x4884},
-	{"SNDRV_FIREWIRE_IOCTL_GET_INFO",	0x48f8},
-	{"SNDRV_FIREWIRE_IOCTL_LOCK",	0x48f9},
-	{"SNDRV_FIREWIRE_IOCTL_UNLOCK",	0x48fa},
-	{"ION_IOC_ALLOC",	0x4900},
-	{"IIOCNETAIF",	0x4901},
-	{"ION_IOC_FREE",	0x4901},
-	{"IIOCNETDIF",	0x4902},
-	{"ION_IOC_MAP",	0x4902},
-	{"IIOCNETSCF",	0x4903},
-	{"IIOCNETGCF",	0x4904},
-	{"ION_IOC_SHARE",	0x4904},
-	{"IIOCNETANM",	0x4905},
-	{"ION_IOC_IMPORT",	0x4905},
-	{"IIOCNETDNM",	0x4906},
-	{"ION_IOC_CUSTOM",	0x4906},
-	{"IIOCNETGNM",	0x4907},
-	{"ION_IOC_SYNC",	0x4907},
-	{"IIOCGETSET",	0x4908},
-	{"IIOCSETSET",	0x4909},
-	{"IIOCSETVER",	0x490a},
-	{"IIOCNETHUP",	0x490b},
-	{"IIOCSETGST",	0x490c},
-	{"IIOCSETBRJ",	0x490d},
-	{"IIOCSIGPRF",	0x490e},
-	{"IIOCGETPRF",	0x490f},
-	{"IIOCSETPRF",	0x4910},
-	{"IIOCGETMAP",	0x4911},
-	{"IIOCSETMAP",	0x4912},
-	{"IIOCNETASL",	0x4913},
-	{"IIOCNETDIL",	0x4914},
-	{"IIOCGETCPS",	0x4915},
-	{"IIOCGETDVR",	0x4916},
-	{"IIOCNETLCR",	0x4917},
-	{"IIOCNETDWRSET",	0x4918},
-	{"IIOCNETALN",	0x4920},
-	{"IIOCNETDLN",	0x4921},
-	{"IIOCNETGPN",	0x4922},
-	{"IIOCDBGVAR",	0x497f},
-	{"IIOCDRVCTL",	0x4980},
-	{"KIOCSOUND",	0x4b2f},
-	{"KDMKTONE",	0x4b30},
-	{"KDGETLED",	0x4b31},
-	{"KDSETLED",	0x4b32},
-	{"KDGKBTYPE",	0x4b33},
-	{"KDADDIO",	0x4b34},
-	{"KDDELIO",	0x4b35},
-	{"KDENABIO",	0x4b36},
-	{"KDDISABIO",	0x4b37},
-	{"KDSETMODE",	0x4b3a},
-	{"KDGETMODE",	0x4b3b},
-	{"KDMAPDISP",	0x4b3c},
-	{"KDUNMAPDISP",	0x4b3d},
-	{"GIO_SCRNMAP",	0x4b40},
-	{"PIO_SCRNMAP",	0x4b41},
-	{"KDGKBMODE",	0x4b44},
-	{"KDSKBMODE",	0x4b45},
-	{"KDGKBENT",	0x4b46},
-	{"KDSKBENT",	0x4b47},
-	{"KDGKBSENT",	0x4b48},
-	{"KDSKBSENT",	0x4b49},
-	{"KDGKBDIACR",	0x4b4a},
-	{"KDSKBDIACR",	0x4b4b},
-	{"KDGETKEYCODE",	0x4b4c},
-	{"KDSETKEYCODE",	0x4b4d},
-	{"KDSIGACCEPT",	0x4b4e},
-	{"KDKBDREP",	0x4b52},
-	{"GIO_FONT",	0x4b60},
-	{"PIO_FONT",	0x4b61},
-	{"KDGKBMETA",	0x4b62},
-	{"KDSKBMETA",	0x4b63},
-	{"KDGKBLED",	0x4b64},
-	{"KDSKBLED",	0x4b65},
-	{"GIO_UNIMAP",	0x4b66},
-	{"PIO_UNIMAP",	0x4b67},
-	{"PIO_UNIMAPCLR",	0x4b68},
-	{"GIO_UNISCRNMAP",	0x4b69},
-	{"PIO_UNISCRNMAP",	0x4b6a},
-	{"GIO_FONTX",	0x4b6b},
-	{"PIO_FONTX",	0x4b6c},
-	{"PIO_FONTRESET",	0x4b6d},
-	{"GIO_CMAP",	0x4b70},
-	{"PIO_CMAP",	0x4b71},
-	{"KDFONTOP",	0x4b72},
-	{"KDGKBDIACRUC",	0x4bfa},
-	{"KDSKBDIACRUC",	0x4bfb},
-	{"LOOP_SET_FD",	0x4c00},
-	{"LOOP_CLR_FD",	0x4c01},
-	{"LOOP_SET_STATUS",	0x4c02},
-	{"LOOP_GET_STATUS",	0x4c03},
-	{"LOOP_SET_STATUS64",	0x4c04},
-	{"LOOP_GET_STATUS64",	0x4c05},
-	{"LOOP_CHANGE_FD",	0x4c06},
-	{"LOOP_SET_CAPACITY",	0x4c07},
-	{"LOOP_CTL_ADD",	0x4c80},
-	{"LOOP_CTL_REMOVE",	0x4c81},
-	{"LOOP_CTL_GET_FREE",	0x4c82},
-	{"MEMGETINFO",	0x4d01},
-	{"MEMERASE",	0x4d02},
-	{"MEMWRITEOOB",	0x4d03},
-	{"MEMREADOOB",	0x4d04},
-	{"MEMLOCK",	0x4d05},
-	{"MEMUNLOCK",	0x4d06},
-	{"MEMGETREGIONCOUNT",	0x4d07},
-	{"MEMGETREGIONINFO",	0x4d08},
-	{"MEMGETOOBSEL",	0x4d0a},
-	{"MEMGETBADBLOCK",	0x4d0b},
-	{"MEMSETBADBLOCK",	0x4d0c},
-	{"OTPSELECT",	0x4d0d},
-	{"OTPGETREGIONCOUNT",	0x4d0e},
-	{"OTPGETREGIONINFO",	0x4d0f},
-	{"OTPLOCK",	0x4d10},
-	{"ECCGETLAYOUT",	0x4d11},
-	{"ECCGETSTATS",	0x4d12},
-	{"MTDFILEMODE",	0x4d13},
-	{"MEMERASE64",	0x4d14},
-	{"MEMWRITEOOB64",	0x4d15},
-	{"MEMREADOOB64",	0x4d16},
-	{"MEMISLOCKED",	0x4d17},
-	{"MEMWRITE",	0x4d18},
-	{"SOUND_MIXER_INFO",	0x4d65},
-	{"SOUND_OLD_MIXER_INFO",	0x4d65},
-	{"SOUND_MIXER_ACCESS",	0x4d66},
-	{"SOUND_MIXER_AGC",	0x4d67},
-	{"SOUND_MIXER_3DSE",	0x4d68},
-	{"SOUND_MIXER_PRIVATE1",	0x4d6f},
-	{"SOUND_MIXER_PRIVATE2",	0x4d70},
-	{"SOUND_MIXER_PRIVATE3",	0x4d71},
-	{"SOUND_MIXER_PRIVATE4",	0x4d72},
-	{"SOUND_MIXER_PRIVATE5",	0x4d73},
-	{"SOUND_MIXER_GETLEVELS",	0x4d74},
-	{"SOUND_MIXER_SETLEVELS",	0x4d75},
-	{"OSS_GETVERSION",	0x4d76},
-	{"NVME_IOCTL_ID",	0x4e40},
-	{"NVME_IOCTL_ADMIN_CMD",	0x4e41},
-	{"NVME_IOCTL_SUBMIT_IO",	0x4e42},
-	{"UBI_IOCVOLUP",	0x4f00},
-	{"UBI_IOCEBER",	0x4f01},
-	{"UBI_IOCEBCH",	0x4f02},
-	{"UBI_IOCEBMAP",	0x4f03},
-	{"UBI_IOCEBUNMAP",	0x4f04},
-	{"UBI_IOCEBISMAP",	0x4f05},
-	{"UBI_IOCSETVOLPROP",	0x4f06},
-	{"UBI_IOCVOLCRBLK",	0x4f07},
-	{"UBI_IOCVOLRMBLK",	0x4f08},
-	{"SNDCTL_DSP_RESET",	0x5000},
-	{"SNDCTL_DSP_SYNC",	0x5001},
-	{"SNDCTL_DSP_SPEED",	0x5002},
-	{"SOUND_PCM_READ_RATE",	0x5002},
-	{"SNDCTL_DSP_STEREO",	0x5003},
-	{"SNDCTL_DSP_GETBLKSIZE",	0x5004},
-	{"SNDCTL_DSP_SETFMT",	0x5005},
-	{"SOUND_PCM_READ_BITS",	0x5005},
-	{"SNDCTL_DSP_CHANNELS",	0x5006},
-	{"SOUND_PCM_READ_CHANNELS",	0x5006},
-	{"SOUND_PCM_READ_FILTER",	0x5007},
-	{"SOUND_PCM_WRITE_FILTER",	0x5007},
-	{"SNDCTL_DSP_POST",	0x5008},
-	{"SNDCTL_DSP_SUBDIVIDE",	0x5009},
-	{"SNDCTL_DSP_SETFRAGMENT",	0x500a},
-	{"SNDCTL_DSP_GETFMTS",	0x500b},
-	{"SNDCTL_DSP_GETOSPACE",	0x500c},
-	{"SNDCTL_DSP_GETISPACE",	0x500d},
-	{"SNDCTL_DSP_NONBLOCK",	0x500e},
-	{"SNDCTL_DSP_GETCAPS",	0x500f},
-	{"SNDCTL_DSP_GETTRIGGER",	0x5010},
-	{"SNDCTL_DSP_SETTRIGGER",	0x5010},
-	{"SNDCTL_DSP_GETIPTR",	0x5011},
-	{"SNDCTL_DSP_GETOPTR",	0x5012},
-	{"SNDCTL_DSP_MAPINBUF",	0x5013},
-	{"SNDCTL_DSP_MAPOUTBUF",	0x5014},
-	{"SNDCTL_DSP_SETSYNCRO",	0x5015},
-	{"SNDCTL_DSP_SETDUPLEX",	0x5016},
-	{"SNDCTL_DSP_GETODELAY",	0x5017},
-	{"SNDCTL_DSP_PROFILE",	0x5017},
-	{"SNDCTL_DSP_GETCHANNELMASK",	0x5040},
-	{"SNDCTL_DSP_BIND_CHANNEL",	0x5041},
-	{"SNDCTL_DSP_SETSPDIF",	0x5042},
-	{"SNDCTL_DSP_GETSPDIF",	0x5043},
-	{"SNDCTL_SEQ_RESET",	0x5100},
-	{"SNDCTL_SEQ_SYNC",	0x5101},
-	{"SNDCTL_SYNTH_INFO",	0x5102},
-	{"SNDCTL_SEQ_CTRLRATE",	0x5103},
-	{"SNDCTL_SEQ_GETOUTCOUNT",	0x5104},
-	{"SNDCTL_SEQ_GETINCOUNT",	0x5105},
-	{"SNDCTL_SEQ_PERCMODE",	0x5106},
-	{"SNDCTL_FM_LOAD_INSTR",	0x5107},
-	{"SNDCTL_SEQ_TESTMIDI",	0x5108},
-	{"SNDCTL_SEQ_RESETSAMPLES",	0x5109},
-	{"SNDCTL_SEQ_NRSYNTHS",	0x510a},
-	{"SNDCTL_SEQ_NRMIDIS",	0x510b},
-	{"SNDCTL_MIDI_INFO",	0x510c},
-	{"SNDCTL_SEQ_THRESHOLD",	0x510d},
-	{"SNDCTL_SYNTH_MEMAVL",	0x510e},
-	{"SNDCTL_FM_4OP_ENABLE",	0x510f},
-	{"SNDCTL_SEQ_PANIC",	0x5111},
-	{"SNDCTL_SEQ_OUTOFBAND",	0x5112},
-	{"SNDCTL_SEQ_GETTIME",	0x5113},
-	{"SNDCTL_SYNTH_ID",	0x5114},
-	{"SNDCTL_SYNTH_CONTROL",	0x5115},
-	{"SNDCTL_SYNTH_REMOVESAMPLE",	0x5116},
-	{"RNDGETENTCNT",	0x5200},
-	{"RFKILL_IOCTL_NOINPUT",	0x5201},
-	{"RNDADDTOENTCNT",	0x5201},
-	{"RNDGETPOOL",	0x5202},
-	{"RNDADDENTROPY",	0x5203},
-	{"RNDZAPENTCNT",	0x5204},
-	{"RNDCLEARPOOL",	0x5206},
-	{"SNDRV_SEQ_IOCTL_PVERSION",	0x5300},
-	{"CDROMPAUSE",	0x5301},
-	{"SNDRV_SEQ_IOCTL_CLIENT_ID",	0x5301},
-	{"CDROMRESUME",	0x5302},
-	{"SNDRV_SEQ_IOCTL_SYSTEM_INFO",	0x5302},
-	{"CDROMPLAYMSF",	0x5303},
-	{"SNDRV_SEQ_IOCTL_RUNNING_MODE",	0x5303},
-	{"CDROMPLAYTRKIND",	0x5304},
-	{"CDROMREADTOCHDR",	0x5305},
-	{"CDROMREADTOCENTRY",	0x5306},
-	{"CDROMSTOP",	0x5307},
-	{"CDROMSTART",	0x5308},
-	{"CDROMEJECT",	0x5309},
-	{"CDROMVOLCTRL",	0x530a},
-	{"CDROMSUBCHNL",	0x530b},
-	{"CDROMREADMODE2",	0x530c},
-	{"CDROMREADMODE1",	0x530d},
-	{"CDROMREADAUDIO",	0x530e},
-	{"CDROMEJECT_SW",	0x530f},
-	{"CDROMMULTISESSION",	0x5310},
-	{"SNDRV_SEQ_IOCTL_GET_CLIENT_INFO",	0x5310},
-	{"CDROM_GET_MCN",	0x5311},
-	{"SNDRV_SEQ_IOCTL_SET_CLIENT_INFO",	0x5311},
-	{"CDROMRESET",	0x5312},
-	{"CDROMVOLREAD",	0x5313},
-	{"CDROMREADRAW",	0x5314},
-	{"CDROMREADCOOKED",	0x5315},
-	{"CDROMSEEK",	0x5316},
-	{"CDROMPLAYBLK",	0x5317},
-	{"CDROMREADALL",	0x5318},
-	{"CDROMCLOSETRAY",	0x5319},
-	{"CDROMGETSPINDOWN",	0x531d},
-	{"CDROMSETSPINDOWN",	0x531e},
-	{"CDROM_SET_OPTIONS",	0x5320},
-	{"SNDRV_SEQ_IOCTL_CREATE_PORT",	0x5320},
-	{"CDROM_CLEAR_OPTIONS",	0x5321},
-	{"SNDRV_SEQ_IOCTL_DELETE_PORT",	0x5321},
-	{"CDROM_SELECT_SPEED",	0x5322},
-	{"SNDRV_SEQ_IOCTL_GET_PORT_INFO",	0x5322},
-	{"CDROM_SELECT_DISC",	0x5323},
-	{"SNDRV_SEQ_IOCTL_SET_PORT_INFO",	0x5323},
-	{"CDROM_MEDIA_CHANGED",	0x5325},
-	{"CDROM_DRIVE_STATUS",	0x5326},
-	{"CDROM_DISC_STATUS",	0x5327},
-	{"CDROM_CHANGER_NSLOTS",	0x5328},
-	{"CDROM_LOCKDOOR",	0x5329},
-	{"CDROM_DEBUG",	0x5330},
-	{"SNDRV_SEQ_IOCTL_SUBSCRIBE_PORT",	0x5330},
-	{"CDROM_GET_CAPABILITY",	0x5331},
-	{"SNDRV_SEQ_IOCTL_UNSUBSCRIBE_PORT",	0x5331},
-	{"SNDRV_SEQ_IOCTL_CREATE_QUEUE",	0x5332},
-	{"SNDRV_SEQ_IOCTL_DELETE_QUEUE",	0x5333},
-	{"SNDRV_SEQ_IOCTL_GET_QUEUE_INFO",	0x5334},
-	{"SNDRV_SEQ_IOCTL_SET_QUEUE_INFO",	0x5335},
-	{"SNDRV_SEQ_IOCTL_GET_NAMED_QUEUE",	0x5336},
-	{"SNDRV_SEQ_IOCTL_GET_QUEUE_STATUS",	0x5340},
-	{"SNDRV_SEQ_IOCTL_GET_QUEUE_TEMPO",	0x5341},
-	{"SNDRV_SEQ_IOCTL_SET_QUEUE_TEMPO",	0x5342},
-	{"SNDRV_SEQ_IOCTL_GET_QUEUE_OWNER",	0x5343},
-	{"SNDRV_SEQ_IOCTL_SET_QUEUE_OWNER",	0x5344},
-	{"SNDRV_SEQ_IOCTL_GET_QUEUE_TIMER",	0x5345},
-	{"SNDRV_SEQ_IOCTL_SET_QUEUE_TIMER",	0x5346},
-	{"SNDRV_SEQ_IOCTL_GET_QUEUE_CLIENT",	0x5349},
-	{"SNDRV_SEQ_IOCTL_SET_QUEUE_CLIENT",	0x534a},
-	{"SNDRV_SEQ_IOCTL_GET_CLIENT_POOL",	0x534b},
-	{"SNDRV_SEQ_IOCTL_SET_CLIENT_POOL",	0x534c},
-	{"SNDRV_SEQ_IOCTL_REMOVE_EVENTS",	0x534e},
-	{"SNDRV_SEQ_IOCTL_QUERY_SUBS",	0x534f},
-	{"SNDRV_SEQ_IOCTL_GET_SUBSCRIPTION",	0x5350},
-	{"SNDRV_SEQ_IOCTL_QUERY_NEXT_CLIENT",	0x5351},
-	{"SNDRV_SEQ_IOCTL_QUERY_NEXT_PORT",	0x5352},
-	{"CDROMAUDIOBUFSIZ",	0x5382},
-	{"DVD_READ_STRUCT",	0x5390},
-	{"DVD_WRITE_STRUCT",	0x5391},
-	{"DVD_AUTH",	0x5392},
-	{"CDROM_SEND_PACKET",	0x5393},
-	{"CDROM_NEXT_WRITABLE",	0x5394},
-	{"CDROM_LAST_WRITTEN",	0x5395},
-	{"SNDRV_TIMER_IOCTL_PVERSION",	0x5400},
-	{"SNDCTL_TMR_TIMEBASE",	0x5401},
-	{"SNDRV_TIMER_IOCTL_NEXT_DEVICE",	0x5401},
-	{"TCGETS",	0x5401},
-	{"SNDCTL_TMR_START",	0x5402},
-	{"SNDRV_TIMER_IOCTL_TREAD",	0x5402},
-	{"TCSETS",	0x5402},
-	{"SNDCTL_TMR_STOP",	0x5403},
-	{"SNDRV_TIMER_IOCTL_GINFO",	0x5403},
-	{"TCSETSW",	0x5403},
-	{"SNDCTL_TMR_CONTINUE",	0x5404},
-	{"SNDRV_TIMER_IOCTL_GPARAMS",	0x5404},
-	{"TCSETSF",	0x5404},
-	{"SNDCTL_TMR_TEMPO",	0x5405},
-	{"SNDRV_TIMER_IOCTL_GSTATUS",	0x5405},
-	{"TCGETA",	0x5405},
-	{"SNDCTL_TMR_SOURCE",	0x5406},
-	{"TCSETA",	0x5406},
-	{"SNDCTL_TMR_METRONOME",	0x5407},
-	{"TCSETAW",	0x5407},
-	{"SNDCTL_TMR_SELECT",	0x5408},
-	{"TCSETAF",	0x5408},
-	{"TCSBRK",	0x5409},
-	{"TCXONC",	0x540a},
-	{"TCFLSH",	0x540b},
-	{"TIOCEXCL",	0x540c},
-	{"TIOCNXCL",	0x540d},
-	{"TIOCSCTTY",	0x540e},
-	{"TIOCGPGRP",	0x540f},
-	{"SNDRV_TIMER_IOCTL_SELECT",	0x5410},
-	{"TIOCSPGRP",	0x5410},
-	{"SNDRV_TIMER_IOCTL_INFO",	0x5411},
-	{"TIOCOUTQ",	0x5411},
-	{"SNDRV_TIMER_IOCTL_PARAMS",	0x5412},
-	{"TIOCSTI",	0x5412},
-	{"TIOCGWINSZ",	0x5413},
-	{"SNDRV_TIMER_IOCTL_STATUS",	0x5414},
-	{"TIOCSWINSZ",	0x5414},
-	{"TIOCMGET",	0x5415},
-	{"TIOCMBIS",	0x5416},
-	{"TIOCMBIC",	0x5417},
-	{"TIOCMSET",	0x5418},
-	{"TIOCGSOFTCAR",	0x5419},
-	{"TIOCSSOFTCAR",	0x541a},
-	{"FIONREAD",	0x541b},
-	{"TIOCLINUX",	0x541c},
-	{"TIOCCONS",	0x541d},
-	{"TIOCGSERIAL",	0x541e},
-	{"TIOCSSERIAL",	0x541f},
-	{"TIOCPKT",	0x5420},
-	{"FIONBIO",	0x5421},
-	{"TIOCNOTTY",	0x5422},
-	{"TIOCSETD",	0x5423},
-	{"TIOCGETD",	0x5424},
-	{"TCSBRKP",	0x5425},
-	{"TIOCSBRK",	0x5427},
-	{"TIOCCBRK",	0x5428},
-	{"TIOCGSID",	0x5429},
-	{"TCGETS2",	0x542a},
-	{"TCSETS2",	0x542b},
-	{"TCSETSW2",	0x542c},
-	{"TCSETSF2",	0x542d},
-	{"TIOCGRS485",	0x542e},
-	{"TIOCSRS485",	0x542f},
-	{"TIOCGPTN",	0x5430},
-	{"TIOCSPTLCK",	0x5431},
-	{"TCGETX",	0x5432},
-	{"TIOCGDEV",	0x5432},
-	{"TCSETX",	0x5433},
-	{"TCSETXF",	0x5434},
-	{"TCSETXW",	0x5435},
-	{"TIOCSIG",	0x5436},
-	{"TIOCVHANGUP",	0x5437},
-	{"TIOCGPKT",	0x5438},
-	{"TIOCGPTLCK",	0x5439},
-	{"TIOCGEXCL",	0x5440},
-	{"FIONCLEX",	0x5450},
-	{"FIOCLEX",	0x5451},
-	{"FIOASYNC",	0x5452},
-	{"TIOCSERCONFIG",	0x5453},
-	{"TIOCSERGWILD",	0x5454},
-	{"TIOCSERSWILD",	0x5455},
-	{"TIOCGLCKTRMIOS",	0x5456},
-	{"TIOCSLCKTRMIOS",	0x5457},
-	{"TIOCSERGSTRUCT",	0x5458},
-	{"TIOCSERGETLSR",	0x5459},
-	{"TIOCSERGETMULTI",	0x545a},
-	{"TIOCSERSETMULTI",	0x545b},
-	{"TIOCMIWAIT",	0x545c},
-	{"TIOCGICOUNT",	0x545d},
-	{"FIOQSIZE",	0x5460},
-	{"SNDRV_TIMER_IOCTL_START",	0x54a0},
-	{"SNDRV_TIMER_IOCTL_STOP",	0x54a1},
-	{"SNDRV_TIMER_IOCTL_CONTINUE",	0x54a2},
-	{"SNDRV_TIMER_IOCTL_PAUSE",	0x54a3},
-	{"TUNSETNOCSUM",	0x54c8},
-	{"TUNSETDEBUG",	0x54c9},
-	{"TUNSETIFF",	0x54ca},
-	{"TUNSETPERSIST",	0x54cb},
-	{"TUNSETOWNER",	0x54cc},
-	{"TUNSETLINK",	0x54cd},
-	{"TUNSETGROUP",	0x54ce},
-	{"TUNGETFEATURES",	0x54cf},
-	{"TUNSETOFFLOAD",	0x54d0},
-	{"TUNSETTXFILTER",	0x54d1},
-	{"TUNGETIFF",	0x54d2},
-	{"TUNGETSNDBUF",	0x54d3},
-	{"TUNSETSNDBUF",	0x54d4},
-	{"TUNATTACHFILTER",	0x54d5},
-	{"TUNDETACHFILTER",	0x54d6},
-	{"TUNGETVNETHDRSZ",	0x54d7},
-	{"TUNSETVNETHDRSZ",	0x54d8},
-	{"TUNSETQUEUE",	0x54d9},
-	{"TUNSETIFINDEX",	0x54da},
-	{"TUNGETFILTER",	0x54db},
-	{"SNDRV_CTL_IOCTL_PVERSION",	0x5500},
-	{"USBDEVFS_CONTROL",	0x5500},
-	{"SNDRV_CTL_IOCTL_CARD_INFO",	0x5501},
-	{"UI_DEV_CREATE",	0x5501},
-	{"UI_DEV_DESTROY",	0x5502},
-	{"USBDEVFS_BULK",	0x5502},
-	{"USBDEVFS_RESETEP",	0x5503},
-	{"USBDEVFS_SETINTERFACE",	0x5504},
-	{"USBDEVFS_SETCONFIGURATION",	0x5505},
-	{"USBDEVFS_GETDRIVER",	0x5508},
-	{"USBDEVFS_SUBMITURB",	0x550a},
-	{"USBDEVFS_DISCARDURB",	0x550b},
-	{"USBDEVFS_REAPURB",	0x550c},
-	{"USBDEVFS_REAPURBNDELAY",	0x550d},
-	{"USBDEVFS_DISCSIGNAL",	0x550e},
-	{"USBDEVFS_CLAIMINTERFACE",	0x550f},
-	{"SNDRV_CTL_IOCTL_ELEM_LIST",	0x5510},
-	{"USBDEVFS_RELEASEINTERFACE",	0x5510},
-	{"SNDRV_CTL_IOCTL_ELEM_INFO",	0x5511},
-	{"USBDEVFS_CONNECTINFO",	0x5511},
-	{"SNDRV_CTL_IOCTL_ELEM_READ",	0x5512},
-	{"USBDEVFS_IOCTL",	0x5512},
-	{"SNDRV_CTL_IOCTL_ELEM_WRITE",	0x5513},
-	{"USBDEVFS_HUB_PORTINFO",	0x5513},
-	{"SNDRV_CTL_IOCTL_ELEM_LOCK",	0x5514},
-	{"USBDEVFS_RESET",	0x5514},
-	{"SNDRV_CTL_IOCTL_ELEM_UNLOCK",	0x5515},
-	{"USBDEVFS_CLEAR_HALT",	0x5515},
-	{"SNDRV_CTL_IOCTL_SUBSCRIBE_EVENTS",	0x5516},
-	{"USBDEVFS_DISCONNECT",	0x5516},
-	{"SNDRV_CTL_IOCTL_ELEM_ADD",	0x5517},
-	{"USBDEVFS_CONNECT",	0x5517},
-	{"SNDRV_CTL_IOCTL_ELEM_REPLACE",	0x5518},
-	{"USBDEVFS_CLAIM_PORT",	0x5518},
-	{"SNDRV_CTL_IOCTL_ELEM_REMOVE",	0x5519},
-	{"USBDEVFS_RELEASE_PORT",	0x5519},
-	{"SNDRV_CTL_IOCTL_TLV_READ",	0x551a},
-	{"USBDEVFS_GET_CAPABILITIES",	0x551a},
-	{"SNDRV_CTL_IOCTL_TLV_WRITE",	0x551b},
-	{"USBDEVFS_DISCONNECT_CLAIM",	0x551b},
-	{"SNDRV_CTL_IOCTL_TLV_COMMAND",	0x551c},
-	{"USBDEVFS_ALLOC_STREAMS",	0x551c},
-	{"USBDEVFS_FREE_STREAMS",	0x551d},
-	{"SNDRV_CTL_IOCTL_HWDEP_NEXT_DEVICE",	0x5520},
-	{"SNDRV_CTL_IOCTL_HWDEP_INFO",	0x5521},
-	{"SNDRV_CTL_IOCTL_PCM_NEXT_DEVICE",	0x5530},
-	{"SNDRV_CTL_IOCTL_PCM_INFO",	0x5531},
-	{"SNDRV_CTL_IOCTL_PCM_PREFER_SUBDEVICE",	0x5532},
-	{"SNDRV_CTL_IOCTL_RAWMIDI_NEXT_DEVICE",	0x5540},
-	{"SNDRV_CTL_IOCTL_RAWMIDI_INFO",	0x5541},
-	{"SNDRV_CTL_IOCTL_RAWMIDI_PREFER_SUBDEVICE",	0x5542},
-	{"UI_SET_EVBIT",	0x5564},
-	{"UI_SET_KEYBIT",	0x5565},
-	{"UI_SET_RELBIT",	0x5566},
-	{"UI_SET_ABSBIT",	0x5567},
-	{"UI_SET_MSCBIT",	0x5568},
-	{"UI_SET_LEDBIT",	0x5569},
-	{"UI_SET_SNDBIT",	0x556a},
-	{"UI_SET_FFBIT",	0x556b},
-	{"UI_SET_PHYS",	0x556c},
-	{"UI_SET_SWBIT",	0x556d},
-	{"UI_SET_PROPBIT",	0x556e},
-	{"UI_BEGIN_FF_UPLOAD",	0x55c8},
-	{"UI_END_FF_UPLOAD",	0x55c9},
-	{"UI_BEGIN_FF_ERASE",	0x55ca},
-	{"UI_END_FF_ERASE",	0x55cb},
-	{"SNDRV_CTL_IOCTL_POWER",	0x55d0},
-	{"SNDRV_CTL_IOCTL_POWER_STATE",	0x55d1},
-	{"VIDIOC_QUERYCAP",	0x5600},
-	{"VT_OPENQRY",	0x5600},
-	{"VIDIOC_RESERVED",	0x5601},
-	{"VT_GETMODE",	0x5601},
-	{"VIDIOC_ENUM_FMT",	0x5602},
-	{"VIDIOC_SUBDEV_ENUM_MBUS_CODE",	0x5602},
-	{"VT_SETMODE",	0x5602},
-	{"VT_GETSTATE",	0x5603},
-	{"VIDIOC_G_FMT",	0x5604},
-	{"VIDIOC_SUBDEV_G_FMT",	0x5604},
-	{"VT_SENDSIG",	0x5604},
-	{"VIDIOC_S_FMT",	0x5605},
-	{"VIDIOC_SUBDEV_S_FMT",	0x5605},
-	{"VT_RELDISP",	0x5605},
-	{"VT_ACTIVATE",	0x5606},
-	{"VT_WAITACTIVE",	0x5607},
-	{"VIDIOC_REQBUFS",	0x5608},
-	{"VT_DISALLOCATE",	0x5608},
-	{"VIDIOC_QUERYBUF",	0x5609},
-	{"VT_RESIZE",	0x5609},
-	{"VIDIOC_G_FBUF",	0x560a},
-	{"VT_RESIZEX",	0x560a},
-	{"VIDIOC_S_FBUF",	0x560b},
-	{"VT_LOCKSWITCH",	0x560b},
-	{"VT_UNLOCKSWITCH",	0x560c},
-	{"VT_GETHIFONTMASK",	0x560d},
-	{"VIDIOC_OVERLAY",	0x560e},
-	{"VT_WAITEVENT",	0x560e},
-	{"VIDIOC_QBUF",	0x560f},
-	{"VT_SETACTIVATE",	0x560f},
-	{"VIDIOC_EXPBUF",	0x5610},
-	{"VIDIOC_DQBUF",	0x5611},
-	{"VIDIOC_STREAMON",	0x5612},
-	{"VIDIOC_STREAMOFF",	0x5613},
-	{"VIDIOC_G_PARM",	0x5615},
-	{"VIDIOC_SUBDEV_G_FRAME_INTERVAL",	0x5615},
-	{"VIDIOC_S_PARM",	0x5616},
-	{"VIDIOC_SUBDEV_S_FRAME_INTERVAL",	0x5616},
-	{"VIDIOC_G_STD",	0x5617},
-	{"VIDIOC_S_STD",	0x5618},
-	{"VIDIOC_ENUMSTD",	0x5619},
-	{"VIDIOC_ENUMINPUT",	0x561a},
-	{"VIDIOC_G_CTRL",	0x561b},
-	{"VIDIOC_S_CTRL",	0x561c},
-	{"VIDIOC_G_TUNER",	0x561d},
-	{"VIDIOC_S_TUNER",	0x561e},
-	{"VIDIOC_G_AUDIO",	0x5621},
-	{"VIDIOC_S_AUDIO",	0x5622},
-	{"VIDIOC_QUERYCTRL",	0x5624},
-	{"VIDIOC_QUERYMENU",	0x5625},
-	{"VIDIOC_G_INPUT",	0x5626},
-	{"VIDIOC_S_INPUT",	0x5627},
-	{"VIDIOC_G_EDID",	0x5628},
-	{"VIDIOC_SUBDEV_G_EDID",	0x5628},
-	{"VIDIOC_S_EDID",	0x5629},
-	{"VIDIOC_SUBDEV_S_EDID",	0x5629},
-	{"VIDIOC_G_OUTPUT",	0x562e},
-	{"VIDIOC_S_OUTPUT",	0x562f},
-	{"VIDIOC_ENUMOUTPUT",	0x5630},
-	{"VIDIOC_G_AUDOUT",	0x5631},
-	{"VIDIOC_S_AUDOUT",	0x5632},
-	{"VIDIOC_G_MODULATOR",	0x5636},
-	{"VIDIOC_S_MODULATOR",	0x5637},
-	{"VIDIOC_G_FREQUENCY",	0x5638},
-	{"VIDIOC_S_FREQUENCY",	0x5639},
-	{"VIDIOC_CROPCAP",	0x563a},
-	{"VIDIOC_G_CROP",	0x563b},
-	{"VIDIOC_SUBDEV_G_CROP",	0x563b},
-	{"VIDIOC_S_CROP",	0x563c},
-	{"VIDIOC_SUBDEV_S_CROP",	0x563c},
-	{"VIDIOC_G_JPEGCOMP",	0x563d},
-	{"VIDIOC_SUBDEV_G_SELECTION",	0x563d},
-	{"VIDIOC_S_JPEGCOMP",	0x563e},
-	{"VIDIOC_SUBDEV_S_SELECTION",	0x563e},
-	{"VIDIOC_QUERYSTD",	0x563f},
-	{"VIDIOC_TRY_FMT",	0x5640},
-	{"VIDIOC_ENUMAUDIO",	0x5641},
-	{"VIDIOC_ENUMAUDOUT",	0x5642},
-	{"VIDIOC_G_PRIORITY",	0x5643},
-	{"VIDIOC_S_PRIORITY",	0x5644},
-	{"VIDIOC_G_SLICED_VBI_CAP",	0x5645},
-	{"VIDIOC_LOG_STATUS",	0x5646},
-	{"VIDIOC_G_EXT_CTRLS",	0x5647},
-	{"VIDIOC_S_EXT_CTRLS",	0x5648},
-	{"VIDIOC_TRY_EXT_CTRLS",	0x5649},
-	{"VIDIOC_ENUM_FRAMESIZES",	0x564a},
-	{"VIDIOC_SUBDEV_ENUM_FRAME_SIZE",	0x564a},
-	{"VIDIOC_ENUM_FRAMEINTERVALS",	0x564b},
-	{"VIDIOC_SUBDEV_ENUM_FRAME_INTERVAL",	0x564b},
-	{"VIDIOC_G_ENC_INDEX",	0x564c},
-	{"VIDIOC_ENCODER_CMD",	0x564d},
-	{"VIDIOC_TRY_ENCODER_CMD",	0x564e},
-	{"VIDIOC_DBG_S_REGISTER",	0x564f},
-	{"VIDIOC_DBG_G_REGISTER",	0x5650},
-	{"VIDIOC_S_HW_FREQ_SEEK",	0x5652},
-	{"VIDIOC_S_DV_TIMINGS",	0x5657},
-	{"VIDIOC_SUBDEV_S_DV_TIMINGS",	0x5657},
-	{"VIDIOC_G_DV_TIMINGS",	0x5658},
-	{"VIDIOC_SUBDEV_G_DV_TIMINGS",	0x5658},
-	{"VIDIOC_DQEVENT",	0x5659},
-	{"VIDIOC_SUBSCRIBE_EVENT",	0x565a},
-	{"VIDIOC_UNSUBSCRIBE_EVENT",	0x565b},
-	{"VIDIOC_CREATE_BUFS",	0x565c},
-	{"VIDIOC_PREPARE_BUF",	0x565d},
-	{"VIDIOC_G_SELECTION",	0x565e},
-	{"VIDIOC_S_SELECTION",	0x565f},
-	{"VIDIOC_DECODER_CMD",	0x5660},
-	{"VIDIOC_TRY_DECODER_CMD",	0x5661},
-	{"VIDIOC_ENUM_DV_TIMINGS",	0x5662},
-	{"VIDIOC_SUBDEV_ENUM_DV_TIMINGS",	0x5662},
-	{"VIDIOC_QUERY_DV_TIMINGS",	0x5663},
-	{"VIDIOC_SUBDEV_QUERY_DV_TIMINGS",	0x5663},
-	{"VIDIOC_DV_TIMINGS_CAP",	0x5664},
-	{"VIDIOC_SUBDEV_DV_TIMINGS_CAP",	0x5664},
-	{"VIDIOC_ENUM_FREQ_BANDS",	0x5665},
-	{"VIDIOC_DBG_G_CHIP_INFO",	0x5666},
-	{"IVTVFB_IOC_DMA_FRAME",	0x56c0},
-	{"IVTV_IOC_DMA_FRAME",	0x56c0},
-	{"IVTV_IOC_PASSTHROUGH_MODE",	0x56c1},
-	{"VIDIOC_OMAP3ISP_CCDC_CFG",	0x56c1},
-	{"VIDIOC_VSP1_LUT_CONFIG",	0x56c1},
-	{"VIDIOC_OMAP3ISP_PRV_CFG",	0x56c2},
-	{"VIDIOC_OMAP3ISP_AEWB_CFG",	0x56c3},
-	{"VIDIOC_OMAP3ISP_HIST_CFG",	0x56c4},
-	{"VIDIOC_OMAP3ISP_AF_CFG",	0x56c5},
-	{"VIDIOC_OMAP3ISP_STAT_REQ",	0x56c6},
-	{"VIDIOC_OMAP3ISP_STAT_EN",	0x56c7},
-	{"SNDRV_RAWMIDI_IOCTL_PVERSION",	0x5700},
-	{"SW_SYNC_IOC_CREATE_FENCE",	0x5700},
-	{"WDIOC_GETSUPPORT",	0x5700},
-	{"SNDRV_RAWMIDI_IOCTL_INFO",	0x5701},
-	{"SW_SYNC_IOC_INC",	0x5701},
-	{"WDIOC_GETSTATUS",	0x5701},
-	{"WDIOC_GETBOOTSTATUS",	0x5702},
-	{"WDIOC_GETTEMP",	0x5703},
-	{"WDIOC_SETOPTIONS",	0x5704},
-	{"WDIOC_KEEPALIVE",	0x5705},
-	{"WDIOC_SETTIMEOUT",	0x5706},
-	{"WDIOC_GETTIMEOUT",	0x5707},
-	{"WDIOC_SETPRETIMEOUT",	0x5708},
-	{"WDIOC_GETPRETIMEOUT",	0x5709},
-	{"WDIOC_GETTIMELEFT",	0x570a},
-	{"SNDRV_RAWMIDI_IOCTL_PARAMS",	0x5710},
-	{"SNDRV_RAWMIDI_IOCTL_STATUS",	0x5720},
-	{"SNDRV_RAWMIDI_IOCTL_DROP",	0x5730},
-	{"SNDRV_RAWMIDI_IOCTL_DRAIN",	0x5731},
-	{"PACKET_CTRL_CMD",	0x5801},
-	{"FIFREEZE",	0x5877},
-	{"FITHAW",	0x5878},
-	{"FITRIM",	0x5879},
-	{"ANDROID_ALARM_WAIT",	0x6101},
-	{"ANDROID_ALARM_SET_RTC",	0x6105},
-	{"SONET_GETSTAT",	0x6110},
-	{"SONET_GETSTATZ",	0x6111},
-	{"SONET_SETDIAG",	0x6112},
-	{"SONET_CLRDIAG",	0x6113},
-	{"SONET_GETDIAG",	0x6114},
-	{"SONET_SETFRAMING",	0x6115},
-	{"SONET_GETFRAMING",	0x6116},
-	{"SONET_GETFRSENSE",	0x6117},
-	{"IDT77105_GETSTAT",	0x6132},
-	{"IDT77105_GETSTATZ",	0x6133},
-	{"ATM_GETSTAT",	0x6150},
-	{"ATM_GETSTATZ",	0x6151},
-	{"ATM_GETLOOP",	0x6152},
-	{"ATM_SETLOOP",	0x6153},
-	{"ATM_QUERYLOOP",	0x6154},
-	{"ENI_MEMDUMP",	0x6160},
-	{"HE_GET_REG",	0x6160},
-	{"NS_GETPSTAT",	0x6161},
-	{"ZATM_GETPOOL",	0x6161},
-	{"NS_SETBUFLEV",	0x6162},
-	{"ZATM_GETPOOLZ",	0x6162},
-	{"NS_ADJBUFLEV",	0x6163},
-	{"ZATM_SETPOOL",	0x6163},
-	{"ENI_SETMULT",	0x6167},
-	{"SIOCSIFATMTCP",	0x6180},
-	{"ATM_GETLINKRATE",	0x6181},
-	{"ATM_GETNAMES",	0x6183},
-	{"ATM_GETTYPE",	0x6184},
-	{"ATM_GETESI",	0x6185},
-	{"ATM_GETADDR",	0x6186},
-	{"ATM_RSTADDR",	0x6187},
-	{"ATM_ADDADDR",	0x6188},
-	{"ATM_DELADDR",	0x6189},
-	{"ATM_GETCIRANGE",	0x618a},
-	{"ATM_SETCIRANGE",	0x618b},
-	{"ATM_SETESI",	0x618c},
-	{"ATM_SETESIF",	0x618d},
-	{"ATM_ADDLECSADDR",	0x618e},
-	{"ATMTCP_CREATE",	0x618e},
-	{"ATM_DELLECSADDR",	0x618f},
-	{"ATMTCP_REMOVE",	0x618f},
-	{"ATM_GETLECSADDR",	0x6190},
-	{"BR2684_SETFILT",	0x6190},
-	{"ATMLEC_CTRL",	0x61d0},
-	{"ATMLEC_DATA",	0x61d1},
-	{"ATMLEC_MCAST",	0x61d2},
-	{"ATMMPC_CTRL",	0x61d8},
-	{"ATMMPC_DATA",	0x61d9},
-	{"SIOCMKCLIP",	0x61e0},
-	{"ATMARPD_CTRL",	0x61e1},
-	{"ATMARP_MKIP",	0x61e2},
-	{"ATMARP_SETENTRY",	0x61e3},
-	{"ATMARP_ENCAP",	0x61e5},
-	{"ATMSIGD_CTRL",	0x61f0},
-	{"ATM_SETSC",	0x61f1},
-	{"ATM_SETBACKEND",	0x61f2},
-	{"ATM_NEWBACKENDIF",	0x61f3},
-	{"ATM_ADDPARTY",	0x61f4},
-	{"ATM_DROPPARTY",	0x61f5},
-	{"BINDER_WRITE_READ",	0x6201},
-	{"BINDER_SET_IDLE_TIMEOUT",	0x6203},
-	{"BINDER_SET_MAX_THREADS",	0x6205},
-	{"BINDER_SET_IDLE_PRIORITY",	0x6206},
-	{"BINDER_SET_CONTEXT_MGR",	0x6207},
-	{"BINDER_THREAD_EXIT",	0x6208},
-	{"BINDER_VERSION",	0x6209},
-	{"CM_IOCGSTATUS",	0x6300},
-	{"CHIOMOVE",	0x6301},
-	{"CM_IOCGATR",	0x6301},
-	{"CHIOEXCHANGE",	0x6302},
-	{"CM_IOCSPTS",	0x6302},
-	{"CHIOPOSITION",	0x6303},
-	{"CM_IOCSRDR",	0x6303},
-	{"CHIOGPICKER",	0x6304},
-	{"CM_IOCARDOFF",	0x6304},
-	{"CHIOSPICKER",	0x6305},
-	{"CHIOGPARAMS",	0x6306},
-	{"CHIOGSTATUS",	0x6308},
-	{"CIOC_KERNEL_VERSION",	0x630a},
-	{"CHIOGELEM",	0x6310},
-	{"CHIOINITELEM",	0x6311},
-	{"CHIOSVOLTAG",	0x6312},
-	{"CHIOGVPARAMS",	0x6313},
-	{"CM_IOSDBGLVL",	0x63fa},
-	{"FS_IOC32_GETFLAGS",	0x6601},
-	{"FS_IOC_GETFLAGS",	0x6601},
-	{"FS_IOC32_SETFLAGS",	0x6602},
-	{"FS_IOC_SETFLAGS",	0x6602},
-	{"FS_IOC_FIEMAP",	0x660b},
-	{"HPET_IE_ON",	0x6801},
-	{"HPET_IE_OFF",	0x6802},
-	{"HPET_INFO",	0x6803},
-	{"HPET_EPI",	0x6804},
-	{"HPET_DPI",	0x6805},
-	{"HPET_IRQFREQ",	0x6806},
-	{"I2OGETIOPS",	0x6900},
-	{"I2OHRTGET",	0x6901},
-	{"I2OLCTGET",	0x6902},
-	{"I2OPARMSET",	0x6903},
-	{"I2OPARMGET",	0x6904},
-	{"I2OSWDL",	0x6905},
-	{"I2OSWUL",	0x6906},
-	{"I2OSWDEL",	0x6907},
-	{"I2OVALIDATE",	0x6908},
-	{"I2OHTML",	0x6909},
-	{"I2OEVTREG",	0x690a},
-	{"I2OEVTGET",	0x690b},
-	{"IPMICTL_RECEIVE_MSG_TRUNC",	0x690b},
-	{"I2OPASSTHRU",	0x690c},
-	{"IPMICTL_RECEIVE_MSG",	0x690c},
-	{"IPMICTL_SEND_COMMAND",	0x690d},
-	{"IPMICTL_REGISTER_FOR_CMD",	0x690e},
-	{"IPMICTL_UNREGISTER_FOR_CMD",	0x690f},
-	{"IPMICTL_SET_GETS_EVENTS_CMD",	0x6910},
-	{"IPMICTL_SET_MY_ADDRESS_CMD",	0x6911},
-	{"IPMICTL_GET_MY_ADDRESS_CMD",	0x6912},
-	{"IPMICTL_SET_MY_LUN_CMD",	0x6913},
-	{"IPMICTL_GET_MY_LUN_CMD",	0x6914},
-	{"IPMICTL_SEND_COMMAND_SETTIME",	0x6915},
-	{"IPMICTL_SET_TIMING_PARMS_CMD",	0x6916},
-	{"IPMICTL_GET_TIMING_PARMS_CMD",	0x6917},
-	{"IPMICTL_SET_MY_CHANNEL_ADDRESS_CMD",	0x6918},
-	{"IPMICTL_GET_MY_CHANNEL_ADDRESS_CMD",	0x6919},
-	{"IPMICTL_SET_MY_CHANNEL_LUN_CMD",	0x691a},
-	{"IPMICTL_GET_MY_CHANNEL_LUN_CMD",	0x691b},
-	{"IPMICTL_REGISTER_FOR_CMD_CHANS",	0x691c},
-	{"IPMICTL_UNREGISTER_FOR_CMD_CHANS",	0x691d},
-	{"IPMICTL_GET_MAINTENANCE_MODE_CMD",	0x691e},
-	{"IPMICTL_SET_MAINTENANCE_MODE_CMD",	0x691f},
-	{"I8K_BIOS_VERSION",	0x6980},
-	{"I8K_MACHINE_ID",	0x6981},
-	{"I8K_POWER_STATUS",	0x6982},
-	{"I8K_FN_STATUS",	0x6983},
-	{"I8K_GET_TEMP",	0x6984},
-	{"I8K_GET_SPEED",	0x6985},
-	{"I8K_GET_FAN",	0x6986},
-	{"I8K_SET_FAN",	0x6987},
-	{"JSIOCGVERSION",	0x6a01},
-	{"JSIOCGAXES",	0x6a11},
-	{"JSIOCGBUTTONS",	0x6a12},
-	{"JSIOCSCORR",	0x6a21},
-	{"JSIOCGCORR",	0x6a22},
-	{"JSIOCSAXMAP",	0x6a31},
-	{"JSIOCGAXMAP",	0x6a32},
-	{"JSIOCSBTNMAP",	0x6a33},
-	{"JSIOCGBTNMAP",	0x6a34},
-	{"UDF_GETEASIZE",	0x6c40},
-	{"UDF_GETEABLOCK",	0x6c41},
-	{"UDF_GETVOLIDENT",	0x6c42},
-	{"UDF_RELOCATE_BLOCKS",	0x6c43},
-	{"MGSL_IOCSPARAMS",	0x6d00},
-	{"MMTIMER_GETOFFSET",	0x6d00},
-	{"SNDCTL_MIDI_PRETIME",	0x6d00},
-	{"MGSL_IOCGPARAMS",	0x6d01},
-	{"MMTIMER_GETRES",	0x6d01},
-	{"MTIOCTOP",	0x6d01},
-	{"SNDCTL_MIDI_MPUMODE",	0x6d01},
-	{"MGSL_IOCSTXIDLE",	0x6d02},
-	{"MMTIMER_GETFREQ",	0x6d02},
-	{"MTIOCGET",	0x6d02},
-	{"SNDCTL_MIDI_MPUCMD",	0x6d02},
-	{"MGSL_IOCGTXIDLE",	0x6d03},
-	{"MTIOCPOS",	0x6d03},
-	{"MGSL_IOCTXENABLE",	0x6d04},
-	{"MMTIMER_GETBITS",	0x6d04},
-	{"MGSL_IOCRXENABLE",	0x6d05},
-	{"MGSL_IOCTXABORT",	0x6d06},
-	{"MMTIMER_MMAPAVAIL",	0x6d06},
-	{"MGSL_IOCGSTATS",	0x6d07},
-	{"MGSL_IOCWAITEVENT",	0x6d08},
-	{"MGSL_IOCLOOPTXDONE",	0x6d09},
-	{"MMTIMER_GETCOUNTER",	0x6d09},
-	{"MGSL_IOCSIF",	0x6d0a},
-	{"MGSL_IOCGIF",	0x6d0b},
-	{"MGSL_IOCCLRMODCOUNT",	0x6d0f},
-	{"MGSL_IOCSGPIO",	0x6d10},
-	{"MGSL_IOCGGPIO",	0x6d11},
-	{"MGSL_IOCWAITGPIO",	0x6d12},
-	{"MGSL_IOCSXSYNC",	0x6d13},
-	{"MGSL_IOCGXSYNC",	0x6d14},
-	{"MGSL_IOCSXCTRL",	0x6d15},
-	{"MGSL_IOCGXCTRL",	0x6d16},
-	{"NCP_IOC_NCPREQUEST",	0x6e01},
-	{"NCP_IOC_GETMOUNTUID",	0x6e02},
-	{"NCP_IOC_CONN_LOGGED_IN",	0x6e03},
-	{"NCP_IOC_GET_FS_INFO",	0x6e04},
-	{"NCP_IOC_SIGN_INIT",	0x6e05},
-	{"NCP_IOC_SET_SIGN_WANTED",	0x6e06},
-	{"NCP_IOC_SIGN_WANTED",	0x6e06},
-	{"NCP_IOC_LOCKUNLOCK",	0x6e07},
-	{"NCP_IOC_GETROOT",	0x6e08},
-	{"NCP_IOC_SETROOT",	0x6e08},
-	{"NCP_IOC_GETOBJECTNAME",	0x6e09},
-	{"NCP_IOC_SETOBJECTNAME",	0x6e09},
-	{"NCP_IOC_GETPRIVATEDATA",	0x6e0a},
-	{"NCP_IOC_SETPRIVATEDATA",	0x6e0a},
-	{"NCP_IOC_GETCHARSETS",	0x6e0b},
-	{"NCP_IOC_SETCHARSETS",	0x6e0b},
-	{"NCP_IOC_GETDENTRYTTL",	0x6e0c},
-	{"NCP_IOC_SETDENTRYTTL",	0x6e0c},
-	{"MATROXFB_GET_OUTPUT_CONNECTION",	0x6ef8},
-	{"MATROXFB_SET_OUTPUT_CONNECTION",	0x6ef8},
-	{"SISFB_GET_INFO_OLD",	0x6ef8},
-	{"MATROXFB_GET_AVAILABLE_OUTPUTS",	0x6ef9},
-	{"SISFB_GET_VBRSTATUS_OLD",	0x6ef9},
-	{"MATROXFB_GET_OUTPUT_MODE",	0x6efa},
-	{"MATROXFB_SET_OUTPUT_MODE",	0x6efa},
-	{"SISFB_GET_AUTOMAXIMIZE_OLD",	0x6efa},
-	{"SISFB_SET_AUTOMAXIMIZE_OLD",	0x6efa},
-	{"MATROXFB_GET_ALL_OUTPUTS",	0x6efb},
-	{"UBI_IOCMKVOL",	0x6f00},
-	{"UBI_IOCRMVOL",	0x6f01},
-	{"UBI_IOCRSVOL",	0x6f02},
-	{"UBI_IOCRNVOL",	0x6f03},
-	{"UBI_IOCATT",	0x6f40},
-	{"UBI_IOCDET",	0x6f41},
-	{"PHN_GET_REG",	0x7000},
-	{"PHN_SET_REG",	0x7001},
-	{"RTC_AIE_ON",	0x7001},
-	{"PHN_GET_REGS",	0x7002},
-	{"RTC_AIE_OFF",	0x7002},
-	{"PHN_SET_REGS",	0x7003},
-	{"RTC_UIE_ON",	0x7003},
-	{"PHN_NOT_OH",	0x7004},
-	{"RTC_UIE_OFF",	0x7004},
-	{"PHN_GETREG",	0x7005},
-	{"RTC_PIE_ON",	0x7005},
-	{"PHN_SETREG",	0x7006},
-	{"RTC_PIE_OFF",	0x7006},
-	{"PHN_GETREGS",	0x7007},
-	{"RTC_ALM_SET",	0x7007},
-	{"PHN_SETREGS",	0x7008},
-	{"RTC_ALM_READ",	0x7008},
-	{"RTC_RD_TIME",	0x7009},
-	{"RTC_SET_TIME",	0x700a},
-	{"RTC_IRQP_READ",	0x700b},
-	{"RTC_IRQP_SET",	0x700c},
-	{"RTC_EPOCH_READ",	0x700d},
-	{"RTC_EPOCH_SET",	0x700e},
-	{"RTC_WIE_ON",	0x700f},
-	{"RTC_WKALM_SET",	0x700f},
-	{"RTC_WIE_OFF",	0x7010},
-	{"RTC_WKALM_RD",	0x7010},
-	{"RTC_PLL_GET",	0x7011},
-	{"RTC_PLL_SET",	0x7012},
-	{"RTC_VL_READ",	0x7013},
-	{"RTC_VL_CLR",	0x7014},
-	{"NVRAM_INIT",	0x7040},
-	{"NVRAM_SETCKS",	0x7041},
-	{"PPSETMODE",	0x7080},
-	{"PPRSTATUS",	0x7081},
-	{"PPRCONTROL",	0x7083},
-	{"PPWCONTROL",	0x7084},
-	{"PPRDATA",	0x7085},
-	{"PPWDATA",	0x7086},
-	{"PPCLAIM",	0x708b},
-	{"PPRELEASE",	0x708c},
-	{"PPYIELD",	0x708d},
-	{"PPFCONTROL",	0x708e},
-	{"PPEXCL",	0x708f},
-	{"PPDATADIR",	0x7090},
-	{"PPNEGOT",	0x7091},
-	{"PPWCTLONIRQ",	0x7092},
-	{"PPCLRIRQ",	0x7093},
-	{"PPSETPHASE",	0x7094},
-	{"PPGETTIME",	0x7095},
-	{"PPSETTIME",	0x7096},
-	{"PPGETMODES",	0x7097},
-	{"PPGETMODE",	0x7098},
-	{"PPGETPHASE",	0x7099},
-	{"PPGETFLAGS",	0x709a},
-	{"PPSETFLAGS",	0x709b},
-	{"PPS_GETPARAMS",	0x70a1},
-	{"PPS_SETPARAMS",	0x70a2},
-	{"PPS_GETCAP",	0x70a3},
-	{"PPS_FETCH",	0x70a4},
-	{"PPS_KC_BIND",	0x70a5},
-	{"SPIOCSTYPE",	0x7101},
-	{"PHONE_CAPABILITIES",	0x7180},
-	{"PHONE_CAPABILITIES_LIST",	0x7181},
-	{"PHONE_CAPABILITIES_CHECK",	0x7182},
-	{"PHONE_RING",	0x7183},
-	{"PHONE_HOOKSTATE",	0x7184},
-	{"PHONE_MAXRINGS",	0x7185},
-	{"PHONE_RING_CADENCE",	0x7186},
-	{"OLD_PHONE_RING_START",	0x7187},
-	{"PHONE_RING_START",	0x7187},
-	{"PHONE_RING_STOP",	0x7188},
-	{"PHONE_REC_CODEC",	0x7189},
-	{"PHONE_REC_START",	0x718a},
-	{"PHONE_REC_STOP",	0x718b},
-	{"PHONE_REC_DEPTH",	0x718c},
-	{"PHONE_FRAME",	0x718d},
-	{"PHONE_REC_VOLUME",	0x718e},
-	{"PHONE_REC_LEVEL",	0x718f},
-	{"PHONE_PLAY_CODEC",	0x7190},
-	{"PHONE_PLAY_START",	0x7191},
-	{"PHONE_PLAY_STOP",	0x7192},
-	{"PHONE_PLAY_DEPTH",	0x7193},
-	{"PHONE_PLAY_VOLUME",	0x7194},
-	{"PHONE_PLAY_LEVEL",	0x7195},
-	{"PHONE_DTMF_READY",	0x7196},
-	{"PHONE_GET_DTMF",	0x7197},
-	{"PHONE_GET_DTMF_ASCII",	0x7198},
-	{"PHONE_DTMF_OOB",	0x7199},
-	{"PHONE_EXCEPTION",	0x719a},
-	{"PHONE_PLAY_TONE",	0x719b},
-	{"PHONE_SET_TONE_ON_TIME",	0x719c},
-	{"PHONE_SET_TONE_OFF_TIME",	0x719d},
-	{"PHONE_GET_TONE_ON_TIME",	0x719e},
-	{"PHONE_GET_TONE_OFF_TIME",	0x719f},
-	{"PHONE_GET_TONE_STATE",	0x71a0},
-	{"PHONE_BUSY",	0x71a1},
-	{"PHONE_RINGBACK",	0x71a2},
-	{"PHONE_DIALTONE",	0x71a3},
-	{"PHONE_CPT_STOP",	0x71a4},
-	{"PHONE_PSTN_SET_STATE",	0x71a4},
-	{"PHONE_PSTN_GET_STATE",	0x71a5},
-	{"PHONE_WINK_DURATION",	0x71a6},
-	{"PHONE_QUERY_CODEC",	0x71a7},
-	{"PHONE_PSTN_LINETEST",	0x71a8},
-	{"PHONE_VAD",	0x71a9},
-	{"PHONE_WINK",	0x71aa},
-	{"IXJCTL_DSP_RESET",	0x71c0},
-	{"IXJCTL_CARDTYPE",	0x71c1},
-	{"IXJCTL_SERIAL",	0x71c2},
-	{"IXJCTL_DSP_TYPE",	0x71c3},
-	{"IXJCTL_DSP_VERSION",	0x71c4},
-	{"IXJCTL_DSP_IDLE",	0x71c5},
-	{"IXJCTL_TESTRAM",	0x71c6},
-	{"IXJCTL_SET_FILTER",	0x71c7},
-	{"IXJCTL_GET_FILTER_HIST",	0x71c8},
-	{"IXJCTL_INIT_TONE",	0x71c9},
-	{"IXJCTL_TONE_CADENCE",	0x71ca},
-	{"IXJCTL_AEC_START",	0x71cb},
-	{"IXJCTL_AEC_STOP",	0x71cc},
-	{"IXJCTL_AEC_GET_LEVEL",	0x71cd},
-	{"IXJCTL_SET_LED",	0x71ce},
-	{"IXJCTL_MIXER",	0x71cf},
-	{"IXJCTL_DAA_COEFF_SET",	0x71d0},
-	{"IXJCTL_PORT",	0x71d1},
-	{"IXJCTL_DAA_AGAIN",	0x71d2},
-	{"IXJCTL_PSTN_LINETEST",	0x71d3},
-	{"IXJCTL_CID",	0x71d4},
-	{"IXJCTL_POTS_PSTN",	0x71d5},
-	{"IXJCTL_FILTER_CADENCE",	0x71d6},
-	{"IXJCTL_PLAY_CID",	0x71d7},
-	{"IXJCTL_VMWI",	0x71d8},
-	{"IXJCTL_CIDCW",	0x71d9},
-	{"IXJCTL_VERSION",	0x71da},
-	{"PHONE_REC_VOLUME_LINEAR",	0x71db},
-	{"PHONE_PLAY_VOLUME_LINEAR",	0x71dc},
-	{"IXJCTL_SET_FILTER_RAW",	0x71dd},
-	{"IXJCTL_HZ",	0x71e0},
-	{"IXJCTL_RATE",	0x71e1},
-	{"IXJCTL_FRAMES_READ",	0x71e2},
-	{"IXJCTL_FRAMES_WRITTEN",	0x71e3},
-	{"IXJCTL_READ_WAIT",	0x71e4},
-	{"IXJCTL_WRITE_WAIT",	0x71e5},
-	{"IXJCTL_DRYBUFFER_READ",	0x71e6},
-	{"IXJCTL_DRYBUFFER_CLEAR",	0x71e7},
-	{"IXJCTL_DTMF_PRESCALE",	0x71e8},
-	{"IXJCTL_SIGCTL",	0x71e9},
-	{"IXJCTL_SC_RXG",	0x71ea},
-	{"IXJCTL_SC_TXG",	0x71eb},
-	{"IXJCTL_INTERCOM_START",	0x71fd},
-	{"IXJCTL_INTERCOM_STOP",	0x71fe},
-	{"VFAT_IOCTL_READDIR_BOTH",	0x7201},
-	{"VFAT_IOCTL_READDIR_SHORT",	0x7202},
-	{"FAT_IOCTL_GET_ATTRIBUTES",	0x7210},
-	{"FAT_IOCTL_SET_ATTRIBUTES",	0x7211},
-	{"FAT_IOCTL_GET_VOLUME_ID",	0x7213},
-	{"MIC_VIRTIO_ADD_DEVICE",	0x7301},
-	{"MIC_VIRTIO_COPY_DESC",	0x7302},
-	{"MIC_VIRTIO_CONFIG_CHANGE",	0x7305},
-	{"PPPIOCGL2TPSTATS",	0x7436},
-	{"PPPIOCGCHAN",	0x7437},
-	{"PPPIOCATTCHAN",	0x7438},
-	{"PPPIOCDISCONN",	0x7439},
-	{"PPPIOCCONNECT",	0x743a},
-	{"PPPIOCSMRRU",	0x743b},
-	{"PPPIOCDETACH",	0x743c},
-	{"PPPIOCATTACH",	0x743d},
-	{"PPPIOCNEWUNIT",	0x743e},
-	{"PPPIOCGIDLE",	0x743f},
-	{"PPPIOCSDEBUG",	0x7440},
-	{"PPPIOCGDEBUG",	0x7441},
-	{"PPPIOCSACTIVE",	0x7446},
-	{"PPPIOCSPASS",	0x7447},
-	{"PPPIOCSNPMODE",	0x744b},
-	{"PPPIOCGNPMODE",	0x744c},
-	{"PPPIOCSCOMPRESS",	0x744d},
-	{"PPPIOCXFERUNIT",	0x744e},
-	{"PPPIOCSXASYNCMAP",	0x744f},
-	{"PPPIOCGXASYNCMAP",	0x7450},
-	{"PPPIOCSMAXCID",	0x7451},
-	{"PPPIOCSMRU",	0x7452},
-	{"PPPIOCGMRU",	0x7453},
-	{"PPPIOCSRASYNCMAP",	0x7454},
-	{"PPPIOCGRASYNCMAP",	0x7455},
-	{"PPPIOCGUNIT",	0x7456},
-	{"PPPIOCSASYNCMAP",	0x7457},
-	{"PPPIOCGASYNCMAP",	0x7458},
-	{"PPPIOCSFLAGS",	0x7459},
-	{"PPPIOCGFLAGS",	0x745a},
-	{"PPPIOCGCALLINFO",	0x7480},
-	{"PPPIOCBUNDLE",	0x7481},
-	{"PPPIOCGMPFLAGS",	0x7482},
-	{"PPPIOCSMPFLAGS",	0x7483},
-	{"PPPIOCSMPMTU",	0x7484},
-	{"PPPIOCSMPMRU",	0x7485},
-	{"PPPIOCGCOMPRESSORS",	0x7486},
-	{"PPPIOCSCOMPRESSOR",	0x7487},
-	{"PPPIOCGIFNAME",	0x7488},
-	{"TOSH_SMM",	0x7490},
-	{"UVCIOC_CTRL_MAP",	0x7520},
-	{"UVCIOC_CTRL_QUERY",	0x7521},
-	{"SONYPI_IOCGBRT",	0x7600},
-	{"SONYPI_IOCSBRT",	0x7600},
-	{"FS_IOC32_GETVERSION",	0x7601},
-	{"FS_IOC_GETVERSION",	0x7601},
-	{"FS_IOC32_SETVERSION",	0x7602},
-	{"FS_IOC_SETVERSION",	0x7602},
-	{"SONYPI_IOCGBAT1CAP",	0x7602},
-	{"SONYPI_IOCGBAT1REM",	0x7603},
-	{"SONYPI_IOCGBAT2CAP",	0x7604},
-	{"SONYPI_IOCGBAT2REM",	0x7605},
-	{"SONYPI_IOCGBATFLAGS",	0x7607},
-	{"SONYPI_IOCGBLUE",	0x7608},
-	{"SONYPI_IOCSBLUE",	0x7609},
-	{"SONYPI_IOCGFAN",	0x760a},
-	{"SONYPI_IOCSFAN",	0x760b},
-	{"SONYPI_IOCGTEMP",	0x760c},
-	{"MEYEIOC_G_PARAMS",	0x76c0},
-	{"MEYEIOC_S_PARAMS",	0x76c1},
-	{"MEYEIOC_QBUF_CAPT",	0x76c2},
-	{"MEYEIOC_SYNC",	0x76c3},
-	{"MEYEIOC_STILLCAPT",	0x76c4},
-	{"MEYEIOC_STILLJCAPT",	0x76c5},
-	{"ASHMEM_SET_NAME",	0x7701},
-	{"ASHMEM_GET_NAME",	0x7702},
-	{"ASHMEM_SET_SIZE",	0x7703},
-	{"ASHMEM_GET_SIZE",	0x7704},
-	{"ASHMEM_SET_PROT_MASK",	0x7705},
-	{"ASHMEM_GET_PROT_MASK",	0x7706},
-	{"ASHMEM_PIN",	0x7707},
-	{"ASHMEM_UNPIN",	0x7708},
-	{"ASHMEM_GET_PIN_STATUS",	0x7709},
-	{"ASHMEM_PURGE_ALL_CACHES",	0x770a},
-	{"MEDIA_IOC_DEVICE_INFO",	0x7c00},
-	{"MEDIA_IOC_ENUM_ENTITIES",	0x7c01},
-	{"MEDIA_IOC_ENUM_LINKS",	0x7c02},
-	{"MEDIA_IOC_SETUP_LINK",	0x7c03},
-	{"FIOSETOWN",	0x8901},
-	{"SIOCSPGRP",	0x8902},
-	{"FIOGETOWN",	0x8903},
-	{"SIOCGPGRP",	0x8904},
-	{"SIOCATMARK",	0x8905},
-	{"SIOCGSTAMP",	0x8906},
-	{"SIOCGSTAMPNS",	0x8907},
-	{"SIOCADDRT",	0x890b},
-	{"SIOCDELRT",	0x890c},
-	{"SIOCRTMSG",	0x890d},
-	{"SIOCGIFNAME",	0x8910},
-	{"SIOCSIFLINK",	0x8911},
-	{"SIOCGIFCONF",	0x8912},
-	{"SIOCGIFFLAGS",	0x8913},
-	{"SIOCSIFFLAGS",	0x8914},
-	{"SIOCGIFADDR",	0x8915},
-	{"SIOCSIFADDR",	0x8916},
-	{"SIOCGIFDSTADDR",	0x8917},
-	{"SIOCSIFDSTADDR",	0x8918},
-	{"SIOCGIFBRDADDR",	0x8919},
-	{"SIOCSIFBRDADDR",	0x891a},
-	{"SIOCGIFNETMASK",	0x891b},
-	{"SIOCSIFNETMASK",	0x891c},
-	{"SIOCGIFMETRIC",	0x891d},
-	{"SIOCSIFMETRIC",	0x891e},
-	{"SIOCGIFMEM",	0x891f},
-	{"SIOCSIFMEM",	0x8920},
-	{"SIOCGIFMTU",	0x8921},
-	{"SIOCSIFMTU",	0x8922},
-	{"SIOCSIFNAME",	0x8923},
-	{"SIOCSIFHWADDR",	0x8924},
-	{"SIOCGIFENCAP",	0x8925},
-	{"SIOCSIFENCAP",	0x8926},
-	{"SIOCGIFHWADDR",	0x8927},
-	{"SIOCGIFSLAVE",	0x8929},
-	{"SIOCSIFSLAVE",	0x8930},
-	{"SIOCADDMULTI",	0x8931},
-	{"SIOCDELMULTI",	0x8932},
-	{"SIOCGIFINDEX",	0x8933},
-	{"SIOCSIFPFLAGS",	0x8934},
-	{"SIOCGIFPFLAGS",	0x8935},
-	{"SIOCDIFADDR",	0x8936},
-	{"SIOCSIFHWBROADCAST",	0x8937},
-	{"SIOCGIFCOUNT",	0x8938},
-	{"SIOCGIFBR",	0x8940},
-	{"SIOCSIFBR",	0x8941},
-	{"SIOCGIFTXQLEN",	0x8942},
-	{"SIOCSIFTXQLEN",	0x8943},
-	{"SIOCETHTOOL",	0x8946},
-	{"SIOCGMIIPHY",	0x8947},
-	{"SIOCGMIIREG",	0x8948},
-	{"SIOCSMIIREG",	0x8949},
-	{"SIOCWANDEV",	0x894a},
-	{"SIOCOUTQNSD",	0x894b},
-	{"SIOCDARP",	0x8953},
-	{"SIOCGARP",	0x8954},
-	{"SIOCSARP",	0x8955},
-	{"SIOCDRARP",	0x8960},
-	{"SIOCGRARP",	0x8961},
-	{"SIOCSRARP",	0x8962},
-	{"SIOCGIFMAP",	0x8970},
-	{"SIOCSIFMAP",	0x8971},
-	{"SIOCADDDLCI",	0x8980},
-	{"SIOCDELDLCI",	0x8981},
-	{"SIOCGIFVLAN",	0x8982},
-	{"SIOCSIFVLAN",	0x8983},
-	{"SIOCBONDENSLAVE",	0x8990},
-	{"SIOCBONDRELEASE",	0x8991},
-	{"SIOCBONDSETHWADDR",	0x8992},
-	{"SIOCBONDSLAVEINFOQUERY",	0x8993},
-	{"SIOCBONDINFOQUERY",	0x8994},
-	{"SIOCBONDCHANGEACTIVE",	0x8995},
-	{"SIOCBRADDBR",	0x89a0},
-	{"SIOCBRDELBR",	0x89a1},
-	{"SIOCBRADDIF",	0x89a2},
-	{"SIOCBRDELIF",	0x89a3},
-	{"SIOCSHWTSTAMP",	0x89b0},
-	{"SIOCGHWTSTAMP",	0x89b1},
-	{"OSIOCSNETADDR",	0x89e0},
-	{"SIOCPROTOPRIVATE",	0x89e0},
-	{"SIOCSNETADDR",	0x89e0},
-	{"OSIOCGNETADDR",	0x89e1},
-	{"SIOCGNETADDR",	0x89e1},
-	{"SIOCDEVPRIVATE",	0x89f0},
-	{"SIOCIWFIRST",	0x8b00},
-	{"SIOCSIWCOMMIT",	0x8b00},
-	{"SIOCGIWNAME",	0x8b01},
-	{"SIOCSIWNWID",	0x8b02},
-	{"SIOCGIWNWID",	0x8b03},
-	{"SIOCSIWFREQ",	0x8b04},
-	{"SIOCGIWFREQ",	0x8b05},
-	{"SIOCSIWMODE",	0x8b06},
-	{"SIOCGIWMODE",	0x8b07},
-	{"SIOCSIWSENS",	0x8b08},
-	{"SIOCGIWSENS",	0x8b09},
-	{"SIOCSIWRANGE",	0x8b0a},
-	{"SIOCGIWRANGE",	0x8b0b},
-	{"SIOCSIWPRIV",	0x8b0c},
-	{"SIOCGIWPRIV",	0x8b0d},
-	{"SIOCSIWSTATS",	0x8b0e},
-	{"SIOCGIWSTATS",	0x8b0f},
-	{"SIOCSIWSPY",	0x8b10},
-	{"SIOCGIWSPY",	0x8b11},
-	{"SIOCSIWTHRSPY",	0x8b12},
-	{"SIOCGIWTHRSPY",	0x8b13},
-	{"SIOCSIWAP",	0x8b14},
-	{"SIOCGIWAP",	0x8b15},
-	{"SIOCSIWMLME",	0x8b16},
-	{"SIOCGIWAPLIST",	0x8b17},
-	{"SIOCSIWSCAN",	0x8b18},
-	{"SIOCGIWSCAN",	0x8b19},
-	{"SIOCSIWESSID",	0x8b1a},
-	{"SIOCGIWESSID",	0x8b1b},
-	{"SIOCSIWNICKN",	0x8b1c},
-	{"SIOCGIWNICKN",	0x8b1d},
-	{"SIOCSIWRATE",	0x8b20},
-	{"SIOCGIWRATE",	0x8b21},
-	{"SIOCSIWRTS",	0x8b22},
-	{"SIOCGIWRTS",	0x8b23},
-	{"SIOCSIWFRAG",	0x8b24},
-	{"SIOCGIWFRAG",	0x8b25},
-	{"SIOCSIWTXPOW",	0x8b26},
-	{"SIOCGIWTXPOW",	0x8b27},
-	{"SIOCSIWRETRY",	0x8b28},
-	{"SIOCGIWRETRY",	0x8b29},
-	{"SIOCSIWENCODE",	0x8b2a},
-	{"SIOCGIWENCODE",	0x8b2b},
-	{"SIOCSIWPOWER",	0x8b2c},
-	{"SIOCGIWPOWER",	0x8b2d},
-	{"SIOCSIWGENIE",	0x8b30},
-	{"SIOCGIWGENIE",	0x8b31},
-	{"SIOCSIWAUTH",	0x8b32},
-	{"SIOCGIWAUTH",	0x8b33},
-	{"SIOCSIWENCODEEXT",	0x8b34},
-	{"SIOCGIWENCODEEXT",	0x8b35},
-	{"SIOCSIWPMKSA",	0x8b36},
-	{"SIOCIWFIRSTPRIV",	0x8be0},
-	{"SIOCIWLASTPRIV",	0x8bff},
-	{"AUTOFS_IOC_READY",	0x9360},
-	{"AUTOFS_IOC_FAIL",	0x9361},
-	{"AUTOFS_IOC_CATATONIC",	0x9362},
-	{"AUTOFS_IOC_PROTOVER",	0x9363},
-	{"AUTOFS_IOC_SETTIMEOUT",	0x9364},
-	{"AUTOFS_IOC_EXPIRE",	0x9365},
-	{"AUTOFS_IOC_EXPIRE_MULTI",	0x9366},
-	{"AUTOFS_IOC_PROTOSUBVER",	0x9367},
-	{"AUTOFS_IOC_ASKUMOUNT",	0x9370},
-	{"BTRFS_IOC_SNAP_CREATE",	0x9401},
-	{"BTRFS_IOC_DEFRAG",	0x9402},
-	{"BTRFS_IOC_RESIZE",	0x9403},
-	{"BTRFS_IOC_SCAN_DEV",	0x9404},
-	{"BTRFS_IOC_TRANS_START",	0x9406},
-	{"BTRFS_IOC_TRANS_END",	0x9407},
-	{"BTRFS_IOC_SYNC",	0x9408},
-	{"BTRFS_IOC_CLONE",	0x9409},
-	{"BTRFS_IOC_ADD_DEV",	0x940a},
-	{"BTRFS_IOC_RM_DEV",	0x940b},
-	{"BTRFS_IOC_BALANCE",	0x940c},
-	{"BTRFS_IOC_CLONE_RANGE",	0x940d},
-	{"BTRFS_IOC_SUBVOL_CREATE",	0x940e},
-	{"BTRFS_IOC_SNAP_DESTROY",	0x940f},
-	{"BTRFS_IOC_DEFRAG_RANGE",	0x9410},
-	{"BTRFS_IOC_TREE_SEARCH",	0x9411},
-	{"BTRFS_IOC_INO_LOOKUP",	0x9412},
-	{"BTRFS_IOC_DEFAULT_SUBVOL",	0x9413},
-	{"BTRFS_IOC_SPACE_INFO",	0x9414},
-	{"BTRFS_IOC_WAIT_SYNC",	0x9416},
-	{"BTRFS_IOC_SNAP_CREATE_V2",	0x9417},
-	{"BTRFS_IOC_START_SYNC",	0x9418},
-	{"BTRFS_IOC_SUBVOL_CREATE_V2",	0x9418},
-	{"BTRFS_IOC_SUBVOL_GETFLAGS",	0x9419},
-	{"BTRFS_IOC_SUBVOL_SETFLAGS",	0x941a},
-	{"BTRFS_IOC_SCRUB",	0x941b},
-	{"BTRFS_IOC_SCRUB_CANCEL",	0x941c},
-	{"BTRFS_IOC_SCRUB_PROGRESS",	0x941d},
-	{"BTRFS_IOC_DEV_INFO",	0x941e},
-	{"BTRFS_IOC_FS_INFO",	0x941f},
-	{"BTRFS_IOC_BALANCE_V2",	0x9420},
-	{"BTRFS_IOC_BALANCE_CTL",	0x9421},
-	{"BTRFS_IOC_BALANCE_PROGRESS",	0x9422},
-	{"BTRFS_IOC_INO_PATHS",	0x9423},
-	{"BTRFS_IOC_LOGICAL_INO",	0x9424},
-	{"BTRFS_IOC_SET_RECEIVED_SUBVOL",	0x9425},
-	{"BTRFS_IOC_SEND",	0x9426},
-	{"BTRFS_IOC_DEVICES_READY",	0x9427},
-	{"BTRFS_IOC_QUOTA_CTL",	0x9428},
-	{"BTRFS_IOC_QGROUP_ASSIGN",	0x9429},
-	{"BTRFS_IOC_QGROUP_CREATE",	0x942a},
-	{"BTRFS_IOC_QGROUP_LIMIT",	0x942b},
-	{"BTRFS_IOC_QUOTA_RESCAN",	0x942c},
-	{"BTRFS_IOC_QUOTA_RESCAN_STATUS",	0x942d},
-	{"BTRFS_IOC_QUOTA_RESCAN_WAIT",	0x942e},
-	{"BTRFS_IOC_GET_FSLABEL",	0x9431},
-	{"BTRFS_IOC_SET_FSLABEL",	0x9432},
-	{"BTRFS_IOC_GET_DEV_STATS",	0x9434},
-	{"BTRFS_IOC_DEV_REPLACE",	0x9435},
-	{"BTRFS_IOC_FILE_EXTENT_SAME",	0x9436},
-	{"BTRFS_IOC_GET_FEATURES",	0x9439},
-	{"BTRFS_IOC_GET_SUPPORTED_FEATURES",	0x9439},
-	{"BTRFS_IOC_SET_FEATURES",	0x9439},
-	{"NBD_SET_SOCK",	0xab00},
-	{"NBD_SET_BLKSIZE",	0xab01},
-	{"NBD_SET_SIZE",	0xab02},
-	{"NBD_DO_IT",	0xab03},
-	{"NBD_CLEAR_SOCK",	0xab04},
-	{"NBD_CLEAR_QUE",	0xab05},
-	{"NBD_PRINT_DEBUG",	0xab06},
-	{"NBD_SET_SIZE_BLOCKS",	0xab07},
-	{"NBD_DISCONNECT",	0xab08},
-	{"NBD_SET_TIMEOUT",	0xab09},
-	{"NBD_SET_FLAGS",	0xab0a},
-	{"RAW_SETBIND",	0xac00},
-	{"RAW_GETBIND",	0xac01},
-	{"KVM_GET_API_VERSION",	0xae00},
-	{"KVM_CREATE_VM",	0xae01},
-	{"KVM_GET_MSR_INDEX_LIST",	0xae02},
-	{"KVM_CHECK_EXTENSION",	0xae03},
-	{"KVM_GET_VCPU_MMAP_SIZE",	0xae04},
-	{"KVM_GET_SUPPORTED_CPUID",	0xae05},
-	{"KVM_S390_ENABLE_SIE",	0xae06},
-	{"KVM_GET_EMULATED_CPUID",	0xae09},
-	{"KVM_SET_MEMORY_REGION",	0xae40},
-	{"KVM_CREATE_VCPU",	0xae41},
-	{"KVM_GET_DIRTY_LOG",	0xae42},
-	{"KVM_SET_MEMORY_ALIAS",	0xae43},
-	{"KVM_SET_NR_MMU_PAGES",	0xae44},
-	{"KVM_GET_NR_MMU_PAGES",	0xae45},
-	{"KVM_SET_USER_MEMORY_REGION",	0xae46},
-	{"KVM_SET_TSS_ADDR",	0xae47},
-	{"KVM_SET_IDENTITY_MAP_ADDR",	0xae48},
-	{"KVM_S390_UCAS_MAP",	0xae50},
-	{"KVM_S390_UCAS_UNMAP",	0xae51},
-	{"KVM_S390_VCPU_FAULT",	0xae52},
-	{"KVM_CREATE_IRQCHIP",	0xae60},
-	{"KVM_IRQ_LINE",	0xae61},
-	{"KVM_GET_IRQCHIP",	0xae62},
-	{"KVM_SET_IRQCHIP",	0xae63},
-	{"KVM_CREATE_PIT",	0xae64},
-	{"KVM_GET_PIT",	0xae65},
-	{"KVM_SET_PIT",	0xae66},
-	{"KVM_IRQ_LINE_STATUS",	0xae67},
-	{"KVM_REGISTER_COALESCED_MMIO",	0xae67},
-	{"KVM_UNREGISTER_COALESCED_MMIO",	0xae68},
-	{"KVM_ASSIGN_PCI_DEVICE",	0xae69},
-	{"KVM_SET_GSI_ROUTING",	0xae6a},
-	{"KVM_ASSIGN_DEV_IRQ",	0xae70},
-	{"KVM_REINJECT_CONTROL",	0xae71},
-	{"KVM_DEASSIGN_PCI_DEVICE",	0xae72},
-	{"KVM_ASSIGN_SET_MSIX_NR",	0xae73},
-	{"KVM_ASSIGN_SET_MSIX_ENTRY",	0xae74},
-	{"KVM_DEASSIGN_DEV_IRQ",	0xae75},
-	{"KVM_IRQFD",	0xae76},
-	{"KVM_CREATE_PIT2",	0xae77},
-	{"KVM_SET_BOOT_CPU_ID",	0xae78},
-	{"KVM_IOEVENTFD",	0xae79},
-	{"KVM_XEN_HVM_CONFIG",	0xae7a},
-	{"KVM_SET_CLOCK",	0xae7b},
-	{"KVM_GET_CLOCK",	0xae7c},
-	{"KVM_RUN",	0xae80},
-	{"KVM_GET_REGS",	0xae81},
-	{"KVM_SET_REGS",	0xae82},
-	{"KVM_GET_SREGS",	0xae83},
-	{"KVM_SET_SREGS",	0xae84},
-	{"KVM_TRANSLATE",	0xae85},
-	{"KVM_INTERRUPT",	0xae86},
-	{"KVM_GET_MSRS",	0xae88},
-	{"KVM_SET_MSRS",	0xae89},
-	{"KVM_SET_CPUID",	0xae8a},
-	{"KVM_SET_SIGNAL_MASK",	0xae8b},
-	{"KVM_GET_FPU",	0xae8c},
-	{"KVM_SET_FPU",	0xae8d},
-	{"KVM_GET_LAPIC",	0xae8e},
-	{"KVM_SET_LAPIC",	0xae8f},
-	{"KVM_SET_CPUID2",	0xae90},
-	{"KVM_GET_CPUID2",	0xae91},
-	{"KVM_TPR_ACCESS_REPORTING",	0xae92},
-	{"KVM_SET_VAPIC_ADDR",	0xae93},
-	{"KVM_S390_INTERRUPT",	0xae94},
-	{"KVM_S390_STORE_STATUS",	0xae95},
-	{"KVM_S390_SET_INITIAL_PSW",	0xae96},
-	{"KVM_S390_INITIAL_RESET",	0xae97},
-	{"KVM_GET_MP_STATE",	0xae98},
-	{"KVM_SET_MP_STATE",	0xae99},
-	{"KVM_IA64_VCPU_GET_STACK",	0xae9a},
-	{"KVM_NMI",	0xae9a},
-	{"KVM_IA64_VCPU_SET_STACK",	0xae9b},
-	{"KVM_SET_GUEST_DEBUG",	0xae9b},
-	{"KVM_X86_SETUP_MCE",	0xae9c},
-	{"KVM_X86_GET_MCE_CAP_SUPPORTED",	0xae9d},
-	{"KVM_X86_SET_MCE",	0xae9e},
-	{"KVM_GET_PIT2",	0xae9f},
-	{"KVM_GET_VCPU_EVENTS",	0xae9f},
-	{"KVM_SET_PIT2",	0xaea0},
-	{"KVM_SET_VCPU_EVENTS",	0xaea0},
-	{"KVM_GET_DEBUGREGS",	0xaea1},
-	{"KVM_PPC_GET_PVINFO",	0xaea1},
-	{"KVM_SET_DEBUGREGS",	0xaea2},
-	{"KVM_SET_TSC_KHZ",	0xaea2},
-	{"KVM_ENABLE_CAP",	0xaea3},
-	{"KVM_GET_TSC_KHZ",	0xaea3},
-	{"KVM_ASSIGN_SET_INTX_MASK",	0xaea4},
-	{"KVM_GET_XSAVE",	0xaea4},
-	{"KVM_SET_XSAVE",	0xaea5},
-	{"KVM_SIGNAL_MSI",	0xaea5},
-	{"KVM_GET_XCRS",	0xaea6},
-	{"KVM_PPC_GET_SMMU_INFO",	0xaea6},
-	{"KVM_PPC_ALLOCATE_HTAB",	0xaea7},
-	{"KVM_SET_XCRS",	0xaea7},
-	{"KVM_CREATE_SPAPR_TCE",	0xaea8},
-	{"KVM_ALLOCATE_RMA",	0xaea9},
-	{"KVM_DIRTY_TLB",	0xaeaa},
-	{"KVM_PPC_GET_HTAB_FD",	0xaeaa},
-	{"KVM_ARM_SET_DEVICE_ADDR",	0xaeab},
-	{"KVM_GET_ONE_REG",	0xaeab},
-	{"KVM_PPC_RTAS_DEFINE_TOKEN",	0xaeac},
-	{"KVM_SET_ONE_REG",	0xaeac},
-	{"KVM_KVMCLOCK_CTRL",	0xaead},
-	{"KVM_ARM_VCPU_INIT",	0xaeae},
-	{"KVM_ARM_PREFERRED_TARGET",	0xaeaf},
-	{"KVM_GET_REG_LIST",	0xaeb0},
-	{"KVM_CREATE_DEVICE",	0xaee0},
-	{"KVM_SET_DEVICE_ATTR",	0xaee1},
-	{"KVM_GET_DEVICE_ATTR",	0xaee2},
-	{"KVM_HAS_DEVICE_ATTR",	0xaee3},
-	{"VHOST_GET_FEATURES",	0xaf00},
-	{"VHOST_SET_FEATURES",	0xaf00},
-	{"FSL_HV_IOCTL_PARTITION_RESTART",	0xaf01},
-	{"VHOST_SET_OWNER",	0xaf01},
-	{"FSL_HV_IOCTL_PARTITION_GET_STATUS",	0xaf02},
-	{"VHOST_RESET_OWNER",	0xaf02},
-	{"FSL_HV_IOCTL_PARTITION_START",	0xaf03},
-	{"VHOST_SET_MEM_TABLE",	0xaf03},
-	{"FSL_HV_IOCTL_PARTITION_STOP",	0xaf04},
-	{"VHOST_SET_LOG_BASE",	0xaf04},
-	{"FSL_HV_IOCTL_MEMCPY",	0xaf05},
-	{"FSL_HV_IOCTL_DOORBELL",	0xaf06},
-	{"FSL_HV_IOCTL_GETPROP",	0xaf07},
-	{"VHOST_SET_LOG_FD",	0xaf07},
-	{"FSL_HV_IOCTL_SETPROP",	0xaf08},
-	{"VHOST_SET_VRING_NUM",	0xaf10},
-	{"VHOST_SET_VRING_ADDR",	0xaf11},
-	{"VHOST_GET_VRING_BASE",	0xaf12},
-	{"VHOST_SET_VRING_BASE",	0xaf12},
-	{"VHOST_SET_VRING_KICK",	0xaf20},
-	{"VHOST_SET_VRING_CALL",	0xaf21},
-	{"VHOST_SET_VRING_ERR",	0xaf22},
-	{"VHOST_NET_SET_BACKEND",	0xaf30},
-	{"VHOST_SCSI_SET_ENDPOINT",	0xaf40},
-	{"VHOST_SCSI_CLEAR_ENDPOINT",	0xaf41},
-	{"VHOST_SCSI_GET_ABI_VERSION",	0xaf42},
-	{"VHOST_SCSI_SET_EVENTS_MISSED",	0xaf43},
-	{"VHOST_SCSI_GET_EVENTS_MISSED",	0xaf44},
-	{"PPPOEIOCSFWD",	0xb100},
-	{"PPPOEIOCDFWD",	0xb101},
-	{"REISERFS_IOC_UNPACK",	0xcd01},
-	{"SISFB_GET_INFO_SIZE",	0xf300},
-	{"SISFB_GET_INFO",	0xf301},
-	{"SISFB_GET_VBRSTATUS",	0xf302},
-	{"SISFB_GET_AUTOMAXIMIZE",	0xf303},
-	{"SISFB_SET_AUTOMAXIMIZE",	0xf303},
-	{"SISFB_GET_TVPOSOFFSET",	0xf304},
-	{"SISFB_SET_TVPOSOFFSET",	0xf304},
-	{"SISFB_COMMAND",	0xf305},
-	{"SISFB_SET_LOCK",	0xf306},
-	{"DM_VERSION",	0xfd00},
-	{"DM_REMOVE_ALL",	0xfd01},
-	{"DM_LIST_DEVICES",	0xfd02},
-	{"DM_DEV_CREATE",	0xfd03},
-	{"DM_DEV_REMOVE",	0xfd04},
-	{"DM_DEV_RENAME",	0xfd05},
-	{"DM_DEV_SUSPEND",	0xfd06},
-	{"DM_DEV_STATUS",	0xfd07},
-	{"DM_DEV_WAIT",	0xfd08},
-	{"DM_TABLE_LOAD",	0xfd09},
-	{"DM_TABLE_CLEAR",	0xfd0a},
-	{"DM_TABLE_DEPS",	0xfd0b},
-	{"DM_TABLE_STATUS",	0xfd0c},
-	{"DM_LIST_VERSIONS",	0xfd0d},
-	{"DM_TARGET_MSG",	0xfd0e},
-	{"DM_DEV_SET_GEOMETRY",	0xfd0f},
-	/* Generated by ioctlsort */
diff --git a/test/.gitignore b/test/.gitignore
deleted file mode 100644
index b69ccab..0000000
--- a/test/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-childthread
-clone
-fork
-leaderkill
-mtd
-seccomp
-sig
-sigkill_rain
-skodic
-threaded_execve
-ubi
-vfork
-wait_must_be_interruptible
diff --git a/test/Android.mk b/test/Android.mk
deleted file mode 100644
index b95060c..0000000
--- a/test/Android.mk
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# Copyright (C) 2014 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-define declare-strace-test-target
-  include $(CLEAR_VARS)
-  LOCAL_SRC_FILES := $(1)
-  LOCAL_MULTILIB := both
-  LOCAL_CFLAGS := -Wno-unused-parameter -Wno-error=return-type
-  LOCAL_MODULE := strace-$(basename $(1))-test
-  LOCAL_MODULE_STEM_32 := strace-$(basename $(1))32-test
-  LOCAL_MODULE_STEM_64 := strace-$(basename $(1))64-test
-  LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-  LOCAL_MODULE_TAGS := tests
-  LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-  include $(BUILD_EXECUTABLE)
-endef
-
-src_files := \
-    childthread.c \
-    clone.c \
-    fork.c \
-    leaderkill.c \
-    mmap_offset_decode.c \
-    mtd.c \
-    select.c \
-    sfd.c \
-    sig.c \
-    sigkill_rain.c \
-    sigreturn.c \
-    skodic.c \
-    threaded_execve.c \
-    ubi.c \
-    vfork.c \
-    wait_must_be_interruptible.c \
-
-$(foreach file, $(src_files), $(eval $(call declare-strace-test-target,$(file))))
-
-# Simple sanity tests meant to be run manually on device. Tests expect that
-# strace will report "exit with 0" at the end of the programs. Some tests
-# document what string should be expected in the output and for them additional
-# checks is made (*-expected output vars)).
-#
-# Failure should be inspected manually. Usually they require a special test
-# setup that can't be easily automated.
-#
-# adb sync is requreired before running "mm run-strace-tests".
-# logs are pulled automatically from the device to the root of the tree
-# (strace-log-*)
-
-childthread-expected-output := 'write(1, "OK\\n",'
-clone-expected-output := 'write(1, "original\\n",'
-fork-expected-output := 'write(1, "parent\\n",'
-leaderkill-expected-output := 'write(1, "OK\\n",'
-mmap_offset_decode-expected-output := ''
-mtd-expected-output := ''
-select-expected-output := ''
-sfd-expected-output := ''
-sig-expected-output := 'write(2, "qwerty\\n",'
-sigkill_rain-expected-output := ''
-sigreturn-expected-output := 'RT_1 RT_3 RT_31 RT_32'
-skodic-expected-output := ''
-threaded_execve-expected-output := ''
-ubi-expected-output := ''
-vfork-expected-output := 'write(1, "parent\\n",'
-wait_must_be_interruptible-expected-output := 'write(1, "Good: wait seems to be correctly"'
-
-run-strace-%-test: TEST_TMP_DIR := /data/local/tmp
-run-strace-%-test:
-	@printf >&2 "\n$*: RUNNING...\n" ; \
-	adb shell rm -f $(TEST_TMP_DIR)/strace-log-$* ; \
-	timeout -s 9 10 adb shell strace -v -f -o$(TEST_TMP_DIR)/strace-log-$* strace-$*-test > strace-log-$*-output ; \
-	adb pull $(TEST_TMP_DIR)/strace-log-$* 2> /dev/null ; \
-	adb pull $(TEST_TMP_DIR)/strace-log-$*-output 2> /dev/null ; \
-	if adb shell cat $(TEST_TMP_DIR)/strace-log-$* | grep "exited with 0" > /dev/null ; \
-	then \
-		if [ -n $($(shell echo $* | sed 's/[0-9]//g')-expected-output) ] ; then \
-			if adb shell cat $(TEST_TMP_DIR)/strace-log-$* | grep $($(shell echo $* | sed 's/[0-9]//g')-expected-output) > /dev/null ; \
-				then printf >&2 "$*: PASSED\n" ; \
-				else printf >&2 "$*: FAILED\n" ; \
-			fi ; \
-		else \
-			printf >&2 "$*: PASSED\n" ; \
-		fi ; \
-	else \
-		printf >&2 "$*: FAILED\n" ; \
-	fi
-
-adb-sync:
-	adb sync
-
-run-strace32-test: $(foreach file, $(src_files), run-strace-$(basename $(file))32-test)
-run-strace64-test: $(foreach file, $(src_files), run-strace-$(basename $(file))64-test)
-
-run-strace-tests: adb-sync run-strace32-test run-strace64-test
diff --git a/test/Makefile b/test/Makefile
deleted file mode 100644
index 56fcd4c..0000000
--- a/test/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-CFLAGS += -Wall
-
-PROGS = \
-    vfork fork sig skodic clone leaderkill childthread \
-    sigkill_rain wait_must_be_interruptible threaded_execve \
-    mtd ubi seccomp
-
-all: $(PROGS)
-
-leaderkill: LDFLAGS += -pthread
-
-childthread: LDFLAGS += -pthread
-
-clean distclean:
-	rm -f *.o core $(PROGS) *.gdb
-
-.PHONY: all clean distclean
diff --git a/test/README b/test/README
deleted file mode 100644
index 069bd0f..0000000
--- a/test/README
+++ /dev/null
@@ -1,20 +0,0 @@
-This directory contains some manual tests.
-For automated tests, see ../tests/.
-
-To run a test:
-* Run make
-* Run resulting executable(s) under strace
-* Check strace output and/or program's output and exitcode
-
-To add a new test:
-* Add its .c source to this dir
-* Add it to "all" and "clean" targets in Makefile
-* Add it to .gitignore file
-
-Please spend some time making your testcase understandable.
-For example, it may print an explanation how it should be used
-(which strace options to use, and what to look for in strace output).
-
-If possible, make it so that your testcase detects error/bug
-it is intended to test for, and prints error message and exits with 1
-if the bug is detected, instead of relying on user to peruse strace output.
diff --git a/test/childthread.c b/test/childthread.c
deleted file mode 100644
index c86b9cf..0000000
--- a/test/childthread.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Test exit of a child of a TCB_EXITING child where the toplevel process starts
- * waiting on it.  The middle one gets detached and strace must update the
- * toplevel process'es number of attached children to 0.
- *
- * gcc -o test/childthread test/childthread.c -Wall -ggdb2 -pthread;./strace -f ./test/childthread
- * It must print: write(1, "OK\n", ...
- */
-
-#include <pthread.h>
-#include <assert.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/wait.h>
-
-static void *start0(void *arg)
-{
-	pause();
-	/* NOTREACHED */
-	assert(0);
-}
-
-int main(int argc, char *argv[])
-{
-	pthread_t thread0;
-	pid_t child, got_pid;
-	int status;
-	int i;
-
-	child = fork();
-
-	switch (child) {
-	case -1:
-		assert(0);
-	case 0:
-		i = pthread_create(&thread0, NULL, start0, NULL);
-		assert(i == 0);
-		/* The thread must be initialized, it becomes thread-child of this
-		   process-child (child of a child of the toplevel process).  */
-		sleep(1);
-		/* Here the child TCB cannot be deallocated as there still exist
-		 * children (the thread child in START0).  */
-		exit(42);
-		/* NOTREACHED */
-		assert(0);
-	default:
-		/* We must not be waiting in WAITPID when the child double-exits.  */
-		sleep(2);
-		/* PID must be -1.  */
-		got_pid = waitpid(-1, &status, 0);
-		assert(got_pid == child);
-		assert(WIFEXITED(status));
-		assert(WEXITSTATUS(status) == 42);
-		puts("OK");
-		exit(0);
-	}
-
-	/* NOTREACHED */
-	assert(0);
-}
diff --git a/test/clone.c b/test/clone.c
deleted file mode 100644
index bdce8b1..0000000
--- a/test/clone.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* for CLONE_foo: */
-#define _GNU_SOURCE 1
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sched.h>
-#include <unistd.h>
-
-int child(void* arg)
-{
-	write(1, "clone\n", 6);
-	return 0;
-}
-
-int main(int argc, char *argv[])
-{
-	char stack[4096];
-	clone(child, stack+4000, CLONE_VM|CLONE_FS|CLONE_FILES, NULL);
-	write(1, "original\n", 9);
-	exit(0);
-}
diff --git a/test/fork.c b/test/fork.c
deleted file mode 100644
index 1425e2d..0000000
--- a/test/fork.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/wait.h>
-
-int main(int argc, char *argv[])
-{
-	if (fork() == 0) {
-		write(1, "child\n", 6);
-	} else {
-		wait(0);
-		write(1, "parent\n", 7);
-	}
-
-	exit(0);
-}
diff --git a/test/leaderkill.c b/test/leaderkill.c
deleted file mode 100644
index c24a9f0..0000000
--- a/test/leaderkill.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Test handle_group_exit() handling of a thread leader still alive with its
- * thread child calling exit_group() and proper passing of the process exit
- * code to the process parent of this whole thread group.
- *
- * gcc -o test/leaderkill test/leaderkill.c -Wall -ggdb2 -pthread;./test/leaderkill & pid=$!;sleep 1;strace -o x -q ./strace -f -p $pid
- * It must print: write(1, "OK\n", ...
- */
-
-#include <pthread.h>
-#include <assert.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/wait.h>
-
-static void *start0(void *arg)
-{
-	sleep(1);
-	exit(42);
-}
-
-static void *start1(void *arg)
-{
-	pause();
-	/* NOTREACHED */
-	assert(0);
-}
-
-int main(int argc, char *argv[])
-{
-	pthread_t thread0;
-	pthread_t thread1;
-	pid_t child, got_pid;
-	int status;
-	int i;
-
-	sleep(2);
-
-	child = fork();
-
-	switch (child) {
-	case -1:
-		abort();
-	case 0:
-		i = pthread_create(&thread0, NULL, start0, NULL);
-		assert(i == 0);
-		i = pthread_create(&thread1, NULL, start1, NULL);
-		assert(i == 0);
-		pause();
-		/* NOTREACHED */
-		assert(0);
-		break;
-	default:
-		got_pid = waitpid(child, &status, 0);
-		assert(got_pid == child);
-		assert(WIFEXITED(status));
-		assert(WEXITSTATUS(status) == 42);
-		puts("OK");
-		exit(0);
-	}
-
-	/* NOTREACHED */
-	abort();
-}
diff --git a/test/mmap_offset_decode.c b/test/mmap_offset_decode.c
deleted file mode 100644
index 34a708e..0000000
--- a/test/mmap_offset_decode.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Should strace show byte or page offsets in mmap syscalls
- * which take page offset parameters?
- *
- * At the time of writing, sys_mmap() converts page to byte offsets,
- * but only for SH64! But this routine is used on i386 too - by mmap2 syscall,
- * which uses page offsets too. As it stands now, SH64 and i386 are inconsistent.
- *
- * sys_old_mmap() is used for old mmap syscall, which uses byte offset -
- * should be ok.
- * sys_mmap64() is currently buggy (should print bogus offset, but I can't
- * test it right now. What arch/bitness invokes sys_mmap64?)
- *
- * This program is intended for testing what strace actually shows. Usage:
- * $ gcc test/mmap_offset_decode.c -o mmap_offset_decode -static
- * $ strace ./mmap_offset_decode
- *
- * As of today (2011-08), on i386 strace prints page offset.
- * Fixed 2013-02-19. Now all mmaps on all arches should show byte offsets.
- */
-#define _LARGEFILE_SOURCE
-#define _LARGEFILE64_SOURCE
-#define _FILE_OFFSET_BITS 64
-#include <sys/mman.h>
-#include <errno.h>
-int main()
-{
-	/* 0x1000 is meant to be page size multiplier */
-	mmap(0, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1,
-			0x7fff0000LL * 0x1000);
-	return errno != 0;
-}
diff --git a/test/mtd.c b/test/mtd.c
deleted file mode 100644
index b9fc695..0000000
--- a/test/mtd.c
+++ /dev/null
@@ -1,49 +0,0 @@
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <termios.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-#include <mtd/mtd-user.h>
-
-int main() {
-	int fd = open("/dev/null", 0);
-	struct mtd_info_user minfo;
-	struct erase_info_user einfo;
-	struct erase_info_user64 einfo64;
-	struct mtd_oob_buf mbuf;
-	struct mtd_oob_buf64 mbuf64;
-	struct region_info_user rinfo;
-	/* struct otp_info oinfo; */
-	struct mtd_ecc_stats estat;
-	struct mtd_write_req mreq;
-	struct nand_oobinfo ninfo;
-	struct nand_ecclayout_user nlay;
-	off_t f = 333;
-
-	memset(&einfo, 0, sizeof(einfo));
-	memset(&einfo64, 0xff, sizeof(einfo64));
-
-	ioctl(fd, MEMGETINFO, &minfo);
-
-	ioctl(fd, MEMERASE, &einfo);
-	ioctl(fd, MEMERASE64, &einfo64);
-
-	ioctl(fd, MEMGETBADBLOCK, &f);
-	int i = 0;
-	ioctl(fd, OTPSELECT, &i);
-	ioctl(fd, MEMSETBADBLOCK, &f);
-
-	ioctl(fd, MEMREADOOB, &mbuf);
-	ioctl(fd, MEMREADOOB64, &mbuf64);
-
-	ioctl(fd, MEMGETREGIONINFO, &rinfo);
-
-	ioctl(fd, ECCGETSTATS, &estat);
-	ioctl(fd, MEMWRITE, &mreq);
-
-	ioctl(fd, MEMGETOOBSEL, &ninfo);
-	ioctl(fd, ECCGETLAYOUT, &nlay);
-
-	return 0;
-}
diff --git a/test/procpollable.c b/test/procpollable.c
deleted file mode 100644
index 7bc5efa..0000000
--- a/test/procpollable.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <sys/procfs.h>
-#include <sys/stropts.h>
-#include <poll.h>
-
-int main(int argc, char *argv[])
-{
-	int pid;
-	char proc[32];
-	FILE *pfp;
-	struct pollfd pfd;
-
-	pid = fork();
-	if (pid == 0) {
-		pause();
-		exit(0);
-	}
-
-	sprintf(proc, "/proc/%d", pid);
-
-	pfp = fopen(proc, "r+");
-	if (pfp == NULL)
-		goto fail;
-
-	if (ioctl(fileno(pfp), PIOCSTOP, NULL) < 0)
-		goto fail;
-
-	pfd.fd = fileno(pfp);
-	pfd.events = POLLPRI;
-
-	if (poll(&pfd, 1, 0) < 0)
-		goto fail;
-
-	if (!(pfd.revents & POLLPRI))
-		goto fail;
-
-	kill(pid, SIGKILL);
-	exit(0);
-fail:
-	kill(pid, SIGKILL);
-	exit(1);
-}
diff --git a/test/seccomp.c b/test/seccomp.c
deleted file mode 100644
index b305d38..0000000
--- a/test/seccomp.c
+++ /dev/null
@@ -1,93 +0,0 @@
-#include <stddef.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/prctl.h>
-#include <sys/syscall.h>
-#include <linux/audit.h>
-#include <linux/filter.h>
-#include <linux/seccomp.h>
-
-#if defined __i386__
-# define SECCOMP_ARCH AUDIT_ARCH_I386
-#elif defined __x86_64__
-# define SECCOMP_ARCH AUDIT_ARCH_X86_64
-#elif defined __arm__
-# define SECCOMP_ARCH AUDIT_ARCH_ARM
-#elif defined __arm64__ || defined __aarch64__
-# define SECCOMP_ARCH AUDIT_ARCH_AARCH64
-#else
-# error unsupported architecture
-#endif
-
-#define SOCK_FILTER_KILL_PROCESS \
-		BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_KILL)
-
-#define SOCK_FILTER_DENY_SYSCALL(nr, err) \
-		BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, __NR_ ## nr, 0, 1), \
-		BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_ERRNO | (SECCOMP_RET_DATA & (err)))
-
-#define SOCK_FILTER_ALLOW_SYSCALL(nr) \
-		BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, __NR_ ## nr, 0, 1), \
-		BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_ALLOW)
-
-static const struct sock_filter filter[] = {
-	/* load architecture */
-	BPF_STMT(BPF_LD | BPF_W | BPF_ABS, (offsetof (struct seccomp_data, arch))),
-	/* jump forward 1 instruction if architecture matches */
-	BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, SECCOMP_ARCH, 1, 0),
-	/* kill process */
-	SOCK_FILTER_KILL_PROCESS,
-
-	/* load syscall number */
-	BPF_STMT(BPF_LD | BPF_W | BPF_ABS, offsetof(struct seccomp_data, nr)),
-
-	/* allow syscalls */
-	SOCK_FILTER_ALLOW_SYSCALL(close),
-	SOCK_FILTER_ALLOW_SYSCALL(exit),
-	SOCK_FILTER_ALLOW_SYSCALL(exit_group),
-
-	/* deny syscalls */
-	SOCK_FILTER_DENY_SYSCALL(sync, EBUSY),
-	SOCK_FILTER_DENY_SYSCALL(setsid, EACCES),
-	SOCK_FILTER_DENY_SYSCALL(getpid, EPERM),
-	SOCK_FILTER_DENY_SYSCALL(munlockall, SECCOMP_RET_DATA),
-
-	/* kill process */
-	SOCK_FILTER_KILL_PROCESS
-};
-
-static const struct sock_fprog prog = {
-	.len = sizeof(filter) / sizeof(filter[0]),
-	.filter = (struct sock_filter *) filter,
-};
-
-int
-main(void)
-{
-	int fds[2];
-
-	close(0);
-	close(1);
-	if (pipe(fds))
-		return 77;
-
-	if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0))
-		return 77;
-
-	if (prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, &prog))
-		return 77;
-
-	if (close(0) || close(1))
-		_exit(1);
-
-#define TEST_DENIED_SYSCALL(nr, err, fail) \
-	if (errno = 0, syscall(__NR_ ## nr, 0xbad, 0xf00d, 0xdead, 0xbeef, err, fail) != -1 || err != errno) \
-		close(-fail)
-
-	TEST_DENIED_SYSCALL(sync, EBUSY, 2);
-	TEST_DENIED_SYSCALL(setsid, EACCES, 3);
-	TEST_DENIED_SYSCALL(getpid, EPERM, 4);
-	TEST_DENIED_SYSCALL(munlockall, SECCOMP_RET_DATA, 5);
-
-	_exit(0);
-}
diff --git a/test/sfd.c b/test/sfd.c
deleted file mode 100644
index 34eec7d..0000000
--- a/test/sfd.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-int main(int argc, char *argv[])
-{
-	int pid = atoi(argv[1]);
-	int sfd;
-	char sname[32];
-	char buf[1024];
-	char *s;
-	int i;
-	int signal, blocked, ignore, caught;
-
-	sprintf(sname, "/proc/%d/stat", pid);
-
-	sfd = open(sname, O_RDONLY);
-	if (sfd == -1) {
-		perror(sname);
-		return 1;
-	}
-
-	i = read(sfd, buf, 1024);
-	buf[i] = '\0';
-
-	for (i = 0, s = buf; i < 30; i++) {
-		while (*++s != ' ') {
-			if (!*s)
-				break;
-		}
-	}
-
-	if (sscanf(s, "%d%d%d%d", &signal, &blocked, &ignore, &caught) != 4) {
-		fprintf(stderr, "/proc/pid/stat format error\n");
-		return 1;
-	}
-
-	printf("%8x %8x %8x %8x\n", signal, blocked, ignore, caught);
-
-	return 0;
-}
diff --git a/test/sig.c b/test/sig.c
deleted file mode 100644
index 1678b02..0000000
--- a/test/sig.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <stdlib.h>
-#include <signal.h>
-#include <unistd.h>
-
-void interrupt()
-{
-	write(2, "xyzzy\n", 6);
-}
-
-int main(int argc, char *argv[])
-{
-	char buf[1024];
-
-	signal(SIGINT, interrupt);
-	read(0, buf, 1024);
-	write(2, "qwerty\n", 7);
-
-	return 0;
-}
diff --git a/test/sigkill_rain.c b/test/sigkill_rain.c
deleted file mode 100644
index 59af55b..0000000
--- a/test/sigkill_rain.c
+++ /dev/null
@@ -1,84 +0,0 @@
-#include <stdlib.h>
-#include <stddef.h>
-#include <unistd.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <stdio.h>
-#include <sys/wait.h>
-
-static const struct sockaddr sa;
-
-int main(int argc, char *argv[])
-{
-	int loops;
-	int pid;
-	sigset_t set;
-
-	printf(
-"Please run me under 'strace -f -oLOG', and examine LOG file for incorrect\n"
-"decoding of interrupted syscalls: grep for 'sendto', '??" /* anti-trigraph gap */ "?', 'unavailable'.\n"
-"Pass number of iterations in argv[1] (default: 999).\n"
-	);
-	fflush(NULL);
-
-	sigemptyset(&set);
-	sigaddset(&set, SIGCHLD);
-	sigprocmask(SIG_BLOCK, &set, NULL);
-
-	loops = 999;
-	if (argv[1])
-		loops = atoi(argv[1]);
-
-	while (--loops >= 0) {
-		pid = fork();
-
-		if (pid < 0)
-			exit(1);
-
-		if (!pid) {
-			/* child */
-			int child = getpid();
-
-			loops = 99;
-			while (--loops) {
-				pid = fork();
-
-				if (pid < 0)
-					exit(1);
-
-				if (!pid) {
-					/* grandchild: kill child */
-					kill(child, SIGKILL);
-					exit(0);
-				}
-
-				/* Add various syscalls you want to test here.
-				 * strace will decode them and suddenly find
-				 * process disappearing.
-				 * But leave at least one case "empty", so that
-				 * "kill grandchild" happens quicker.
-				 * This produces cases when strace can't even
-				 * decode syscall number before process dies.
-				 */
-				switch (loops & 1) {
-				case 0:
-					break; /* intentionally empty */
-				case 1:
-					sendto(-1, "Hello cruel world", 17, 0, &sa, sizeof(sa));
-					break;
-				}
-
-				/* kill grandchild */
-				kill(pid, SIGKILL);
-			}
-
-			exit(0);
-		}
-
-		/* parent */
-		wait(NULL);
-	}
-
-	return 0;
-}
diff --git a/test/skodic.c b/test/skodic.c
deleted file mode 100644
index 4dcd955..0000000
--- a/test/skodic.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* This demonstrates races: kernel may actually open other file then
- * you read at strace output. Create /tmp/delme with 10K of zeros and
- * 666 mode, then run this under strace. If you see open successfull
- * open of /etc/shadow, you know you've seen a race.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-int main(int argc, char *argv[])
-{
-	char *c;
-	int fd;
-
-	fd = open("/tmp/delme", O_RDWR);
-	c = mmap(0, 4096, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
-	*c = 0;
-
-	if (fork()) {
-		while (1) {
-			strcpy(c, "/etc/passwd");
-			strcpy(c, "/etc/shadow");
-		}
-	} else {
-		while (1)
-			if ((fd = open(c, 0)) != -1)
-				close(fd);
-	}
-
-	return 0;
-}
diff --git a/test/threaded_execve.c b/test/threaded_execve.c
deleted file mode 100644
index 4c21688..0000000
--- a/test/threaded_execve.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Create NUM_THREADS threads which print "1" and sleep in pause().
- * Then create another thread which prints "2", and re-execs the program.
- * The leader then either sleeps in pause(), or exits if $LEADER_EXIT is set.
- * This triggers "execve'ed thread replaces thread leader" case.
- *
- * gcc -Wall -Os -o threaded_execve threaded_execve.c
- *
- * Try running it under strace like this:
- *
- * # Should not be confused by traced execve-ing thread
- * # replacing traced leader:
- * strace -oLOG -f ./threaded_execve
- *
- * # Same, but different output mode. Output after execve
- * # should go into leader's LOG.<pid> file, not into execve'ed
- * # thread's log file:
- * strace -oLOG -ff ./threaded_execve
- *
- * # Should not be confused by non-traced execve-ing thread
- * # replacing traced leader:
- * strace -oLOG ./threaded_execve
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- * In Linux 3.2, non-traced execve-ing thread does not
- * become traced after execve, even though it has pid == leader's pid
- * after execve. And yet, strace's waitpid doesn't return ECHILD.
- *
- * # Run for NUM seconds, not just one second.
- * # Watch top to check for memory leaks in strace:
- * strace -oLOG -f ./threaded_execve <NUM>
- *
- */
-#define NUM_THREADS 1
-
-#define _GNU_SOURCE 1
-#include <assert.h>
-#include <limits.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <stdio.h>
-#include <sched.h>
-#include <signal.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/syscall.h>
-
-/* Define clone2 for all arches */
-#ifdef __ia64__
-extern int __clone2(int (*fn) (void *), void *child_stack_base,
-		size_t stack_size, int flags, void *arg, ...);
-#define clone2 __clone2
-#elif defined(__metag__)
-#define clone2(func, stack_base, size, flags, arg...) \
-        clone(func, stack_base, flags, arg)
-#else
-#define clone2(func, stack_base, size, flags, arg...) \
-        clone(func, (stack_base) + (size), flags, arg)
-#endif
-/* Direct calls to syscalls, avoiding libc wrappers */
-#define syscall_tgkill(pid, tid, sig) syscall(__NR_tgkill, (pid), (tid), (sig))
-#define syscall_getpid() syscall(__NR_getpid)
-#define syscall_gettid() syscall(__NR_gettid)
-#define syscall_exit(v) syscall(__NR_exit, (v));
-
-static char my_name[PATH_MAX];
-static int leader_final_action;
-
-static int
-thread1(void *unused)
-{
-	write(1, "1", 1);
-	for(;;) pause();
-	return 0;
-}
-
-static int
-thread2(void *unused)
-{
-	char buf[64];
-	sprintf(buf, "%d", leader_final_action);
-	write(1, "2", 1);
-	usleep(20*1000);
-	/* This fails with ENOENT if leader has exited by now! :) */
-	execl("/proc/self/exe", "exe", "exe", buf, NULL);
-	/* So fall back to resolved name */
-	execl(my_name, "exe", "exe", buf, NULL);
-	for(;;) pause();
-	return 0;
-}
-
-static void
-thread_leader(void)
-{
-	/* malloc gives sufficiently aligned buffer.
-	 * long buf[] does not! (on ia64).
-	 */
-	int cnt = NUM_THREADS;
-	while (--cnt >= 0) {
-		/* As seen in pthread_create(): */
-		clone2(thread1, malloc(16 * 1024), 16 * 1024, 0
-			| CLONE_VM
-			| CLONE_FS
-			| CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD | CLONE_SYSVSEM
-			| 0        /* no signal to send on death */
-			, NULL);
-		usleep(20*1000);
-	}
-	clone2(thread2, malloc(16 * 1024), 16 * 1024, 0
-		| CLONE_VM
-		| CLONE_FS
-		| CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD | CLONE_SYSVSEM
-		| 0        /* no signal to send on death */
-		, NULL);
-
-	/* Various states leader can be while other thread execve's: */
-	switch (leader_final_action % 3) {
-		case 0: syscall_exit(42); /* leader is dead */
-		case 1: for(;;) pause(); /* leader is in syscall */
-		default: for(;;) continue; /* leader is in userspace */
-	}
-}
-
-int
-main(int argc, char **argv)
-{
-	if (readlink("/proc/self/exe", my_name, sizeof(my_name)-1) <= 0)
-		return 1;
-
-	setbuf(stdout, NULL);
-
-	if (argv[1] && strcmp(argv[1], "exe") == 0) {
-		leader_final_action = atoi(argv[2]) + 1;
-		thread_leader();
-	}
-
-	printf("%d: thread leader\n", getpid());
-
-	alarm(argv[1] ? atoi(argv[1]) : 1);
-	thread_leader();
-
-        return 0;
-}
diff --git a/test/ubi.c b/test/ubi.c
deleted file mode 100644
index 5062c83..0000000
--- a/test/ubi.c
+++ /dev/null
@@ -1,54 +0,0 @@
-#include <fcntl.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-#include <termios.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-#include <mtd/ubi-user.h>
-
-#define zero(x) memset(&x, 0, sizeof(x))
-
-int main() {
-	int fd = open("/dev/null", 0);
-	struct ubi_mkvol_req mkvol = {
-		.vol_id = 3,
-		.alignment = 124,
-		.bytes = 1125899906842624ULL,
-		.vol_type = 3,
-		.name_len = 7,
-		.name = "foobar",
-	};
-	struct ubi_rsvol_req rsvol = {
-		.bytes = 1125899906842624ULL,
-		.vol_id = -3,
-	};
-	struct ubi_rnvol_req rnvol = {
-		.count = 300,
-	};
-	struct ubi_attach_req attach;
-	struct ubi_map_req map;
-	struct ubi_set_vol_prop_req prop = {
-		.property = 1,
-		.value = 1125899906842624ULL,
-	};
-	uint64_t bytes = ((uint64_t)1 << 50) | 0x123;
-
-	ioctl(fd, UBI_IOCMKVOL, &mkvol);
-	ioctl(fd, UBI_IOCRSVOL, &rsvol);
-	ioctl(fd, UBI_IOCRNVOL, &rnvol);
-	ioctl(fd, UBI_IOCATT, &attach);
-	ioctl(fd, UBI_IOCVOLUP, &bytes);
-	ioctl(fd, UBI_IOCEBMAP, &map);
-	ioctl(fd, UBI_IOCSETVOLPROP, &prop);
-	zero(prop);
-	ioctl(fd, UBI_IOCSETVOLPROP, &prop);
-	ioctl(fd, UBI_IOCRMVOL, 1);
-	ioctl(fd, UBI_IOCDET, 2);
-	ioctl(fd, UBI_IOCEBER, 3);
-	ioctl(fd, UBI_IOCEBCH, 4);
-	ioctl(fd, UBI_IOCEBUNMAP, 5);
-	ioctl(fd, UBI_IOCEBISMAP, 6);
-
-	return 0;
-}
diff --git a/test/vfork.c b/test/vfork.c
deleted file mode 100644
index f49a473..0000000
--- a/test/vfork.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/wait.h>
-
-int main(int argc, char *argv[])
-{
-	if (vfork() == 0) {
-		write(1, "child\n", 6);
-	} else {
-		wait(0);
-		write(1, "parent\n", 7);
-	}
-
-	exit(0);
-}
diff --git a/test/wait_must_be_interruptible.c b/test/wait_must_be_interruptible.c
deleted file mode 100644
index 3fb3449..0000000
--- a/test/wait_must_be_interruptible.c
+++ /dev/null
@@ -1,84 +0,0 @@
-#include <unistd.h>
-#include <sys/types.h>
-#include <signal.h>
-#include <sys/wait.h>
-#include <stdio.h>
-#include <string.h>
-
-/* Expected order is:
- * Child signals parent
- * Parent got signal
- * Child will exit now
- *
- * The bug we test for: under strace -f, last two lines are swapped
- * because wait syscall is suspended by strace and thus can't be interrupted.
- */
-
-static const char msg1[] = "Child signals parent\n";
-static const char msg2[] = "Parent got signal\n";
-static const char msg3[] = "Child will exit now\n";
-
-static void handler(int s)
-{
-	write(1, msg2, sizeof(msg2)-1);
-}
-
-static void test()
-{
-	/* Note: in Linux, signal() installs handler with SA_RESTART flag,
-	 * therefore wait will be restarted.
-	 */
-	signal(SIGALRM, handler);
-
-	if (fork() == 0) {
-		/* child */
-		sleep(1);
-		write(1, msg1, sizeof(msg1)-1);
-		kill(getppid(), SIGALRM);
-		sleep(1);
-		write(1, msg3, sizeof(msg3)-1);
-		_exit(0);
-	}
-
-	/* parent */
-	wait(NULL);
-	_exit(0);
-}
-
-int main()
-{
-	char buf1[80];
-	char buf2[80];
-	char buf3[80];
-	int pipefd[2];
-
-	printf("Please run me under 'strace -f'\n");
-
-	pipe(pipefd);
-
-	if (fork() == 0) {
-		if (pipefd[1] != 1) {
-			dup2(pipefd[1], 1);
-			close(pipefd[1]);
-		}
-		test();
-	}
-
-	if (pipefd[0] != 0) {
-		dup2(pipefd[0], 0);
-		close(pipefd[0]);
-	}
-	fgets(buf1, 80, stdin);	printf("%s", buf1);
-	fgets(buf2, 80, stdin);	printf("%s", buf2);
-	fgets(buf3, 80, stdin);	printf("%s", buf3);
-
-	if (strcmp(buf1, msg1) != 0
-	 || strcmp(buf2, msg2) != 0
-	 || strcmp(buf3, msg3) != 0
-	) {
-		printf("ERROR! Expected order:\n%s%s%s", msg1, msg2, msg3);
-		return 1;
-	}
-	printf("Good: wait seems to be correctly interrupted by signals\n");
-	return 0;
-}
diff --git a/test/x32_lseek.c b/test/x32_lseek.c
deleted file mode 100644
index 6faa2fa..0000000
--- a/test/x32_lseek.c
+++ /dev/null
@@ -1,38 +0,0 @@
-// Test program which explores whether lseek syscall (not llseek!)
-// on x32 uses 64-bit offset argument.
-// IOW: does _kernel_ truncate it on entry?
-// The answer appears to be "no, full 64-bit offset is used".
-// strace must show it correctly too - tricky if strace itself is x32 one!
-//
-// Build: x86_64-gcc -static -Wall -ox32_lseek x32_lseek.c
-// Run:   $ strace ./x32_lseek 2>&1 | grep lseek | grep 1250999896321
-//        lseek(0, 1250999896321, SEEK_SET) = 1250999896321
-#define _GNU_SOURCE
-#include <sys/types.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <sys/syscall.h>
-// Ensure we are compiling to 64 bits
-struct bug { int t[sizeof(long) > 4 ? 1 : -1]; };
-int main(int argc, char **argv)
-{
-	long ofs = 0x12345678901;
-	errno = 0;
-	close(0);
-	if (open("/etc/passwd", O_RDONLY))
-		return 1;
-	long r = syscall(
-		(long) (__NR_lseek | 0x40000000), // make x32 call
-		(long) (0),
-		(long) (ofs),
-		(long) (SEEK_SET)
-	);
-	printf("pos:%ld(0x%lx) errno:%m\n", r, r);
-	if (!errno)
-		printf((r == ofs) ? "64-bit offset used\n" : "Kernel truncated offset\n");
-	return 0;
-}
diff --git a/test/x32_mmap.c b/test/x32_mmap.c
deleted file mode 100644
index cbef36d..0000000
--- a/test/x32_mmap.c
+++ /dev/null
@@ -1,49 +0,0 @@
-// Test program which explores whether mmap's ofs parameter
-// is 64-bit, and whether it needs to be shifted << PAGE_SHIFT.
-// Apparently it is 64-bit and isn't shifted.
-//
-// Build: x86_64-gcc -static -Wall -ox32_mmap x32_mmap.c
-// Typical output:
-// 7f9390696000-7f93906a6000 r--s 12345670000 08:06 2224545 /etc/passwd
-//                                ^^^^^^^^^^^
-#define _GNU_SOURCE
-#include <sys/types.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <sys/syscall.h>
-// Ensure we are compiling to 64 bits
-struct bug { int t[sizeof(long) > 4 ? 1 : -1]; };
-int main(int argc, char **argv)
-{
-	long ofs = 0x12345670000; // fails if not page-aligned
-	errno = 0;
-	close(0);
-	if (open("/etc/passwd", O_RDONLY))
-		return 1;
-	long r = syscall(
-		(long) (__NR_mmap | 0x40000000), // make x32 call
-		(long) (0),		// start
-		(long) (0x10000),	// len
-		(long) (PROT_READ),	// prot
-		(long) (MAP_SHARED),	// flags
-		(long) (0),		// fd
-		(long) (ofs)		// ofs
-	);
-	printf("ret:0x%lx errno:%m\n", r);
-
-	char buf[16*1024];
-	sprintf(buf, "/proc/%d/maps", getpid());
-	int fd = open(buf, O_RDONLY);
-	if (fd > 0) {
-		int sz = read(fd, buf, sizeof(buf));
-		if (sz > 0)
-			write(1, buf, sz);
-	}
-
-	return 0;
-}
diff --git a/xlat/Makemodule.am b/xlat/Makemodule.am
index d77dae8..5a0ce6e 100644
--- a/xlat/Makemodule.am
+++ b/xlat/Makemodule.am
@@ -1,5 +1,5 @@
-XLAT_INPUT_FILES = xlat/access_flags.in xlat/aclipc.in xlat/addrfams.in xlat/adjtimex_modes.in xlat/adjtimex_state.in xlat/adjtimex_status.in xlat/advise.in xlat/af_packet_types.in xlat/archvals.in xlat/at_flags.in xlat/atomic_ops.in xlat/baud_options.in xlat/blkpg_ops.in xlat/bootflags1.in xlat/bootflags2.in xlat/bootflags3.in xlat/bt_protocols.in xlat/cacheflush_scope.in xlat/capabilities1.in xlat/capabilities.in xlat/cap_version.in xlat/clockflags.in xlat/clocknames.in xlat/clone_flags.in xlat/cpuclocknames.in xlat/delete_module_flags.in xlat/direnttypes.in xlat/domains.in xlat/epollctls.in xlat/epollevents.in xlat/epollflags.in xlat/falloc_flags.in xlat/fan_classes.in xlat/fan_event_flags.in xlat/fan_init_flags.in xlat/fan_mark_flags.in xlat/fcntlcmds.in xlat/fdflags.in xlat/fileflags.in xlat/flockcmds.in xlat/fsmagic.in xlat/futexops.in xlat/futexwakecmps.in xlat/futexwakeops.in xlat/icmpfilterflags.in xlat/if_dqblk_valid.in xlat/if_dqinfo_valid.in xlat/iffflags.in xlat/inet_protocols.in xlat/inotify_flags.in xlat/inotify_init_flags.in xlat/ioprio_class.in xlat/ioprio_who.in xlat/ipc_msg_flags.in xlat/itimer_which.in xlat/kexec_arch_values.in xlat/kexec_flags.in xlat/keyctl_commands.in xlat/key_perms.in xlat/key_reqkeys.in xlat/key_spec.in xlat/lockfcmds.in xlat/loop_crypt_type_options.in xlat/loop_flags_options.in xlat/madvise_cmds.in xlat/mbindflags.in xlat/mctl_sync.in xlat/mempolicyflags.in xlat/mlockall_flags.in xlat/mmap_flags.in xlat/mmap_prot.in xlat/modem_flags.in xlat/modetypes.in xlat/modflags.in xlat/module_init_flags.in xlat/mount_flags.in xlat/move_pages_flags.in xlat/mremap_flags.in xlat/msgctl_flags.in xlat/msg_flags.in xlat/msgflags.in xlat/mtd_flags_options.in xlat/mtd_mode_options.in xlat/mtd_nandecc_options.in xlat/mtd_otp_options.in xlat/mtd_type_options.in xlat/netlink_protocols.in xlat/notifyflags.in xlat/nt_descriptor_types.in xlat/open_access_modes.in xlat/open_mode_flags.in xlat/openmodessol.in xlat/perf_event_open_flags.in xlat/personality_options.in xlat/pmsgflags.in xlat/policies.in xlat/pollflags.in xlat/prctl_options.in xlat/priorities.in xlat/ptp_flags_options.in xlat/ptrace_cmds.in xlat/ptrace_setoptions_flags.in xlat/qm_which.in xlat/quotacmds.in xlat/quota_formats.in xlat/quotatypes.in xlat/rename_flags.in xlat/resource_flags.in xlat/resources.in xlat/schedulers.in xlat/scmvals.in xlat/semctl_flags.in xlat/semop_flags.in xlat/sg_io_dxfer_direction.in xlat/shmctl_flags.in xlat/shm_flags.in xlat/shm_resource_flags.in xlat/shutdown_modes.in xlat/sigact_flags.in xlat/sigaltstack_flags.in xlat/sigbus_codes.in xlat/sigchld_codes.in xlat/sigemt_codes.in xlat/sigev_value.in xlat/sigfpe_codes.in xlat/sigill_codes.in xlat/siginfo_codes.in xlat/sigpoll_codes.in xlat/sigprocmaskcmds.in xlat/sigprof_codes.in xlat/sigsegv_codes.in xlat/sigsys_codes.in xlat/sigtrap_codes.in xlat/socketlayers.in xlat/sockipoptions.in xlat/sockipv6options.in xlat/sockipxoptions.in xlat/sockoptions.in xlat/sockpacketoptions.in xlat/sockrawoptions.in xlat/socksctpoptions.in xlat/socktcpoptions.in xlat/sock_type_flags.in xlat/socktypes.in xlat/splice_flags.in xlat/sram_alloc_flags.in xlat/swap_flags.in xlat/sync_file_range_flags.in xlat/sysctl_kern.in xlat/sysctl_net_core.in xlat/sysctl_net.in xlat/sysctl_net_ipv4_conf.in xlat/sysctl_net_ipv4.in xlat/sysctl_net_ipv4_route.in xlat/sysctl_net_ipv6.in xlat/sysctl_net_ipv6_route.in xlat/sysctl_net_unix.in xlat/sysctl_root.in xlat/sysctl_vm.in xlat/syslog_action_type.in xlat/sysmips_operations.in xlat/tcflsh_options.in xlat/tcxonc_options.in xlat/timerfdflags.in xlat/ubi_volume_props.in xlat/ubi_volume_types.in xlat/umount_flags.in xlat/usagewho.in xlat/v4l2_buf_flags.in xlat/v4l2_buf_types.in xlat/v4l2_capture_modes.in xlat/v4l2_colorspaces.in xlat/v4l2_control_classes.in xlat/v4l2_control_flags.in xlat/v4l2_control_ids.in xlat/v4l2_control_types.in xlat/v4l2_device_capabilities_flags.in xlat/v4l2_fields.in xlat/v4l2_format_description_flags.in xlat/v4l2_frameinterval_types.in xlat/v4l2_framesize_types.in xlat/v4l2_input_types.in xlat/v4l2_memories.in xlat/v4l2_streaming_capabilities.in xlat/wait4_options.in xlat/waitid_types.in xlat/whence_codes.in xlat/xattrflags.in xlat/xfs_dqblk_flags.in xlat/xfs_quota_flags.in 
-XLAT_HEADER_FILES = xlat/access_flags.h xlat/aclipc.h xlat/addrfams.h xlat/adjtimex_modes.h xlat/adjtimex_state.h xlat/adjtimex_status.h xlat/advise.h xlat/af_packet_types.h xlat/archvals.h xlat/at_flags.h xlat/atomic_ops.h xlat/baud_options.h xlat/blkpg_ops.h xlat/bootflags1.h xlat/bootflags2.h xlat/bootflags3.h xlat/bt_protocols.h xlat/cacheflush_scope.h xlat/capabilities1.h xlat/capabilities.h xlat/cap_version.h xlat/clockflags.h xlat/clocknames.h xlat/clone_flags.h xlat/cpuclocknames.h xlat/delete_module_flags.h xlat/direnttypes.h xlat/domains.h xlat/epollctls.h xlat/epollevents.h xlat/epollflags.h xlat/falloc_flags.h xlat/fan_classes.h xlat/fan_event_flags.h xlat/fan_init_flags.h xlat/fan_mark_flags.h xlat/fcntlcmds.h xlat/fdflags.h xlat/fileflags.h xlat/flockcmds.h xlat/fsmagic.h xlat/futexops.h xlat/futexwakecmps.h xlat/futexwakeops.h xlat/icmpfilterflags.h xlat/if_dqblk_valid.h xlat/if_dqinfo_valid.h xlat/iffflags.h xlat/inet_protocols.h xlat/inotify_flags.h xlat/inotify_init_flags.h xlat/ioprio_class.h xlat/ioprio_who.h xlat/ipc_msg_flags.h xlat/itimer_which.h xlat/kexec_arch_values.h xlat/kexec_flags.h xlat/keyctl_commands.h xlat/key_perms.h xlat/key_reqkeys.h xlat/key_spec.h xlat/lockfcmds.h xlat/loop_crypt_type_options.h xlat/loop_flags_options.h xlat/madvise_cmds.h xlat/mbindflags.h xlat/mctl_sync.h xlat/mempolicyflags.h xlat/mlockall_flags.h xlat/mmap_flags.h xlat/mmap_prot.h xlat/modem_flags.h xlat/modetypes.h xlat/modflags.h xlat/module_init_flags.h xlat/mount_flags.h xlat/move_pages_flags.h xlat/mremap_flags.h xlat/msgctl_flags.h xlat/msg_flags.h xlat/msgflags.h xlat/mtd_flags_options.h xlat/mtd_mode_options.h xlat/mtd_nandecc_options.h xlat/mtd_otp_options.h xlat/mtd_type_options.h xlat/netlink_protocols.h xlat/notifyflags.h xlat/nt_descriptor_types.h xlat/open_access_modes.h xlat/open_mode_flags.h xlat/openmodessol.h xlat/perf_event_open_flags.h xlat/personality_options.h xlat/pmsgflags.h xlat/policies.h xlat/pollflags.h xlat/prctl_options.h xlat/priorities.h xlat/ptp_flags_options.h xlat/ptrace_cmds.h xlat/ptrace_setoptions_flags.h xlat/qm_which.h xlat/quotacmds.h xlat/quota_formats.h xlat/quotatypes.h xlat/rename_flags.h xlat/resource_flags.h xlat/resources.h xlat/schedulers.h xlat/scmvals.h xlat/semctl_flags.h xlat/semop_flags.h xlat/sg_io_dxfer_direction.h xlat/shmctl_flags.h xlat/shm_flags.h xlat/shm_resource_flags.h xlat/shutdown_modes.h xlat/sigact_flags.h xlat/sigaltstack_flags.h xlat/sigbus_codes.h xlat/sigchld_codes.h xlat/sigemt_codes.h xlat/sigev_value.h xlat/sigfpe_codes.h xlat/sigill_codes.h xlat/siginfo_codes.h xlat/sigpoll_codes.h xlat/sigprocmaskcmds.h xlat/sigprof_codes.h xlat/sigsegv_codes.h xlat/sigsys_codes.h xlat/sigtrap_codes.h xlat/socketlayers.h xlat/sockipoptions.h xlat/sockipv6options.h xlat/sockipxoptions.h xlat/sockoptions.h xlat/sockpacketoptions.h xlat/sockrawoptions.h xlat/socksctpoptions.h xlat/socktcpoptions.h xlat/sock_type_flags.h xlat/socktypes.h xlat/splice_flags.h xlat/sram_alloc_flags.h xlat/swap_flags.h xlat/sync_file_range_flags.h xlat/sysctl_kern.h xlat/sysctl_net_core.h xlat/sysctl_net.h xlat/sysctl_net_ipv4_conf.h xlat/sysctl_net_ipv4.h xlat/sysctl_net_ipv4_route.h xlat/sysctl_net_ipv6.h xlat/sysctl_net_ipv6_route.h xlat/sysctl_net_unix.h xlat/sysctl_root.h xlat/sysctl_vm.h xlat/syslog_action_type.h xlat/sysmips_operations.h xlat/tcflsh_options.h xlat/tcxonc_options.h xlat/timerfdflags.h xlat/ubi_volume_props.h xlat/ubi_volume_types.h xlat/umount_flags.h xlat/usagewho.h xlat/v4l2_buf_flags.h xlat/v4l2_buf_types.h xlat/v4l2_capture_modes.h xlat/v4l2_colorspaces.h xlat/v4l2_control_classes.h xlat/v4l2_control_flags.h xlat/v4l2_control_ids.h xlat/v4l2_control_types.h xlat/v4l2_device_capabilities_flags.h xlat/v4l2_fields.h xlat/v4l2_format_description_flags.h xlat/v4l2_frameinterval_types.h xlat/v4l2_framesize_types.h xlat/v4l2_input_types.h xlat/v4l2_memories.h xlat/v4l2_streaming_capabilities.h xlat/wait4_options.h xlat/waitid_types.h xlat/whence_codes.h xlat/xattrflags.h xlat/xfs_dqblk_flags.h xlat/xfs_quota_flags.h 
+XLAT_INPUT_FILES = xlat/access_flags.in xlat/aclipc.in xlat/addrfams.in xlat/adjtimex_modes.in xlat/adjtimex_state.in xlat/adjtimex_status.in xlat/advise.in xlat/af_packet_types.in xlat/archvals.in xlat/at_flags.in xlat/atomic_ops.in xlat/baud_options.in xlat/blkpg_ops.in xlat/bootflags1.in xlat/bootflags2.in xlat/bootflags3.in xlat/bpf_class.in xlat/bpf_miscop.in xlat/bpf_mode.in xlat/bpf_op_alu.in xlat/bpf_op_jmp.in xlat/bpf_rval.in xlat/bpf_size.in xlat/bpf_src.in xlat/bsg_protocol.in xlat/bsg_subprotocol.in xlat/bt_protocols.in xlat/cacheflush_scope.in xlat/cap.in xlat/cap_mask0.in xlat/cap_mask1.in xlat/cap_version.in xlat/clockflags.in xlat/clocknames.in xlat/clone_flags.in xlat/cpuclocknames.in xlat/delete_module_flags.in xlat/direnttypes.in xlat/domains.in xlat/epollctls.in xlat/epollevents.in xlat/epollflags.in xlat/evdev_abs.in xlat/evdev_autorepeat.in xlat/evdev_ev.in xlat/evdev_ff_status.in xlat/evdev_ff_types.in xlat/evdev_keycode.in xlat/evdev_leds.in xlat/evdev_misc.in xlat/evdev_mtslots.in xlat/evdev_prop.in xlat/evdev_relative_axes.in xlat/evdev_snd.in xlat/evdev_switch.in xlat/evdev_sync.in xlat/falloc_flags.in xlat/fan_classes.in xlat/fan_event_flags.in xlat/fan_init_flags.in xlat/fan_mark_flags.in xlat/fcntlcmds.in xlat/fdflags.in xlat/flockcmds.in xlat/fsmagic.in xlat/futexops.in xlat/futexwakecmps.in xlat/futexwakeops.in xlat/getrandom_flags.in xlat/icmpfilterflags.in xlat/if_dqblk_valid.in xlat/if_dqinfo_valid.in xlat/iffflags.in xlat/inet_protocols.in xlat/inotify_flags.in xlat/inotify_init_flags.in xlat/ioctl_dirs.in xlat/ioprio_class.in xlat/ioprio_who.in xlat/ipc_msg_flags.in xlat/itimer_which.in xlat/kexec_arch_values.in xlat/kexec_load_flags.in xlat/keyctl_commands.in xlat/key_perms.in xlat/key_reqkeys.in xlat/key_spec.in xlat/lockfcmds.in xlat/loop_crypt_type_options.in xlat/loop_flags_options.in xlat/madvise_cmds.in xlat/mbindflags.in xlat/mctl_sync.in xlat/mempolicyflags.in xlat/mlockall_flags.in xlat/mmap_flags.in xlat/mmap_prot.in xlat/modem_flags.in xlat/modetypes.in xlat/modflags.in xlat/module_init_flags.in xlat/mount_flags.in xlat/move_pages_flags.in xlat/mremap_flags.in xlat/msgctl_flags.in xlat/msg_flags.in xlat/msgflags.in xlat/mtd_flags_options.in xlat/mtd_mode_options.in xlat/mtd_nandecc_options.in xlat/mtd_otp_options.in xlat/mtd_type_options.in xlat/netlink_protocols.in xlat/notifyflags.in xlat/nt_descriptor_types.in xlat/open_access_modes.in xlat/open_mode_flags.in xlat/openmodessol.in xlat/packet_mreq_type.in xlat/perf_event_open_flags.in xlat/personality_options.in xlat/pmsgflags.in xlat/policies.in xlat/pollflags.in xlat/prctl_options.in xlat/priorities.in xlat/pr_mce_kill.in xlat/pr_mce_kill_policy.in xlat/pr_set_mm.in xlat/pr_tsc.in xlat/pr_unalign_flags.in xlat/ptp_flags_options.in xlat/ptrace_cmds.in xlat/ptrace_events.in xlat/ptrace_setoptions_flags.in xlat/qm_which.in xlat/quotacmds.in xlat/quota_formats.in xlat/quotatypes.in xlat/rename_flags.in xlat/resource_flags.in xlat/resources.in xlat/schedulers.in xlat/scmvals.in xlat/secbits.in xlat/seccomp_filter_flags.in xlat/seccomp_mode.in xlat/seccomp_ops.in xlat/seccomp_ret_action.in xlat/semctl_flags.in xlat/semop_flags.in xlat/sg_io_dxfer_direction.in xlat/shmctl_flags.in xlat/shm_flags.in xlat/shm_resource_flags.in xlat/shutdown_modes.in xlat/sigact_flags.in xlat/sigaltstack_flags.in xlat/sigbus_codes.in xlat/sigchld_codes.in xlat/sigemt_codes.in xlat/sigev_value.in xlat/sigfpe_codes.in xlat/sigill_codes.in xlat/siginfo_codes.in xlat/sigpoll_codes.in xlat/sigprocmaskcmds.in xlat/sigprof_codes.in xlat/sigsegv_codes.in xlat/sigsys_codes.in xlat/sigtrap_codes.in xlat/socketlayers.in xlat/sockipoptions.in xlat/sockipv6options.in xlat/sockipxoptions.in xlat/sockoptions.in xlat/sockpacketoptions.in xlat/sockrawoptions.in xlat/socksctpoptions.in xlat/socktcpoptions.in xlat/sock_type_flags.in xlat/socktypes.in xlat/splice_flags.in xlat/sram_alloc_flags.in xlat/swap_flags.in xlat/sync_file_range_flags.in xlat/sysctl_kern.in xlat/sysctl_net_core.in xlat/sysctl_net.in xlat/sysctl_net_ipv4_conf.in xlat/sysctl_net_ipv4.in xlat/sysctl_net_ipv4_route.in xlat/sysctl_net_ipv6.in xlat/sysctl_net_ipv6_route.in xlat/sysctl_net_unix.in xlat/sysctl_root.in xlat/sysctl_vm.in xlat/syslog_action_type.in xlat/sysmips_operations.in xlat/tcflsh_options.in xlat/tcxonc_options.in xlat/timerfdflags.in xlat/ubi_volume_props.in xlat/ubi_volume_types.in xlat/umount_flags.in xlat/usagewho.in xlat/v4l2_buf_flags.in xlat/v4l2_buf_types.in xlat/v4l2_capture_modes.in xlat/v4l2_colorspaces.in xlat/v4l2_control_classes.in xlat/v4l2_control_flags.in xlat/v4l2_control_ids.in xlat/v4l2_control_types.in xlat/v4l2_device_capabilities_flags.in xlat/v4l2_fields.in xlat/v4l2_format_description_flags.in xlat/v4l2_frameinterval_types.in xlat/v4l2_framesize_types.in xlat/v4l2_input_types.in xlat/v4l2_memories.in xlat/v4l2_streaming_capabilities.in xlat/wait4_options.in xlat/waitid_types.in xlat/whence_codes.in xlat/xattrflags.in xlat/xfs_dqblk_flags.in xlat/xfs_quota_flags.in 
+XLAT_HEADER_FILES = xlat/access_flags.h xlat/aclipc.h xlat/addrfams.h xlat/adjtimex_modes.h xlat/adjtimex_state.h xlat/adjtimex_status.h xlat/advise.h xlat/af_packet_types.h xlat/archvals.h xlat/at_flags.h xlat/atomic_ops.h xlat/baud_options.h xlat/blkpg_ops.h xlat/bootflags1.h xlat/bootflags2.h xlat/bootflags3.h xlat/bpf_class.h xlat/bpf_miscop.h xlat/bpf_mode.h xlat/bpf_op_alu.h xlat/bpf_op_jmp.h xlat/bpf_rval.h xlat/bpf_size.h xlat/bpf_src.h xlat/bsg_protocol.h xlat/bsg_subprotocol.h xlat/bt_protocols.h xlat/cacheflush_scope.h xlat/cap.h xlat/cap_mask0.h xlat/cap_mask1.h xlat/cap_version.h xlat/clockflags.h xlat/clocknames.h xlat/clone_flags.h xlat/cpuclocknames.h xlat/delete_module_flags.h xlat/direnttypes.h xlat/domains.h xlat/epollctls.h xlat/epollevents.h xlat/epollflags.h xlat/evdev_abs.h xlat/evdev_autorepeat.h xlat/evdev_ev.h xlat/evdev_ff_status.h xlat/evdev_ff_types.h xlat/evdev_keycode.h xlat/evdev_leds.h xlat/evdev_misc.h xlat/evdev_mtslots.h xlat/evdev_prop.h xlat/evdev_relative_axes.h xlat/evdev_snd.h xlat/evdev_switch.h xlat/evdev_sync.h xlat/falloc_flags.h xlat/fan_classes.h xlat/fan_event_flags.h xlat/fan_init_flags.h xlat/fan_mark_flags.h xlat/fcntlcmds.h xlat/fdflags.h xlat/flockcmds.h xlat/fsmagic.h xlat/futexops.h xlat/futexwakecmps.h xlat/futexwakeops.h xlat/getrandom_flags.h xlat/icmpfilterflags.h xlat/if_dqblk_valid.h xlat/if_dqinfo_valid.h xlat/iffflags.h xlat/inet_protocols.h xlat/inotify_flags.h xlat/inotify_init_flags.h xlat/ioctl_dirs.h xlat/ioprio_class.h xlat/ioprio_who.h xlat/ipc_msg_flags.h xlat/itimer_which.h xlat/kexec_arch_values.h xlat/kexec_load_flags.h xlat/keyctl_commands.h xlat/key_perms.h xlat/key_reqkeys.h xlat/key_spec.h xlat/lockfcmds.h xlat/loop_crypt_type_options.h xlat/loop_flags_options.h xlat/madvise_cmds.h xlat/mbindflags.h xlat/mctl_sync.h xlat/mempolicyflags.h xlat/mlockall_flags.h xlat/mmap_flags.h xlat/mmap_prot.h xlat/modem_flags.h xlat/modetypes.h xlat/modflags.h xlat/module_init_flags.h xlat/mount_flags.h xlat/move_pages_flags.h xlat/mremap_flags.h xlat/msgctl_flags.h xlat/msg_flags.h xlat/msgflags.h xlat/mtd_flags_options.h xlat/mtd_mode_options.h xlat/mtd_nandecc_options.h xlat/mtd_otp_options.h xlat/mtd_type_options.h xlat/netlink_protocols.h xlat/notifyflags.h xlat/nt_descriptor_types.h xlat/open_access_modes.h xlat/open_mode_flags.h xlat/openmodessol.h xlat/packet_mreq_type.h xlat/perf_event_open_flags.h xlat/personality_options.h xlat/pmsgflags.h xlat/policies.h xlat/pollflags.h xlat/prctl_options.h xlat/priorities.h xlat/pr_mce_kill.h xlat/pr_mce_kill_policy.h xlat/pr_set_mm.h xlat/pr_tsc.h xlat/pr_unalign_flags.h xlat/ptp_flags_options.h xlat/ptrace_cmds.h xlat/ptrace_events.h xlat/ptrace_setoptions_flags.h xlat/qm_which.h xlat/quotacmds.h xlat/quota_formats.h xlat/quotatypes.h xlat/rename_flags.h xlat/resource_flags.h xlat/resources.h xlat/schedulers.h xlat/scmvals.h xlat/secbits.h xlat/seccomp_filter_flags.h xlat/seccomp_mode.h xlat/seccomp_ops.h xlat/seccomp_ret_action.h xlat/semctl_flags.h xlat/semop_flags.h xlat/sg_io_dxfer_direction.h xlat/shmctl_flags.h xlat/shm_flags.h xlat/shm_resource_flags.h xlat/shutdown_modes.h xlat/sigact_flags.h xlat/sigaltstack_flags.h xlat/sigbus_codes.h xlat/sigchld_codes.h xlat/sigemt_codes.h xlat/sigev_value.h xlat/sigfpe_codes.h xlat/sigill_codes.h xlat/siginfo_codes.h xlat/sigpoll_codes.h xlat/sigprocmaskcmds.h xlat/sigprof_codes.h xlat/sigsegv_codes.h xlat/sigsys_codes.h xlat/sigtrap_codes.h xlat/socketlayers.h xlat/sockipoptions.h xlat/sockipv6options.h xlat/sockipxoptions.h xlat/sockoptions.h xlat/sockpacketoptions.h xlat/sockrawoptions.h xlat/socksctpoptions.h xlat/socktcpoptions.h xlat/sock_type_flags.h xlat/socktypes.h xlat/splice_flags.h xlat/sram_alloc_flags.h xlat/swap_flags.h xlat/sync_file_range_flags.h xlat/sysctl_kern.h xlat/sysctl_net_core.h xlat/sysctl_net.h xlat/sysctl_net_ipv4_conf.h xlat/sysctl_net_ipv4.h xlat/sysctl_net_ipv4_route.h xlat/sysctl_net_ipv6.h xlat/sysctl_net_ipv6_route.h xlat/sysctl_net_unix.h xlat/sysctl_root.h xlat/sysctl_vm.h xlat/syslog_action_type.h xlat/sysmips_operations.h xlat/tcflsh_options.h xlat/tcxonc_options.h xlat/timerfdflags.h xlat/ubi_volume_props.h xlat/ubi_volume_types.h xlat/umount_flags.h xlat/usagewho.h xlat/v4l2_buf_flags.h xlat/v4l2_buf_types.h xlat/v4l2_capture_modes.h xlat/v4l2_colorspaces.h xlat/v4l2_control_classes.h xlat/v4l2_control_flags.h xlat/v4l2_control_ids.h xlat/v4l2_control_types.h xlat/v4l2_device_capabilities_flags.h xlat/v4l2_fields.h xlat/v4l2_format_description_flags.h xlat/v4l2_frameinterval_types.h xlat/v4l2_framesize_types.h xlat/v4l2_input_types.h xlat/v4l2_memories.h xlat/v4l2_streaming_capabilities.h xlat/wait4_options.h xlat/waitid_types.h xlat/whence_codes.h xlat/xattrflags.h xlat/xfs_dqblk_flags.h xlat/xfs_quota_flags.h 
 $(top_srcdir)/xlat/access_flags.h: $(top_srcdir)/xlat/access_flags.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/aclipc.h: $(top_srcdir)/xlat/aclipc.in $(top_srcdir)/xlat/gen.sh
@@ -32,13 +32,35 @@
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/bootflags3.h: $(top_srcdir)/xlat/bootflags3.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/bpf_class.h: $(top_srcdir)/xlat/bpf_class.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/bpf_miscop.h: $(top_srcdir)/xlat/bpf_miscop.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/bpf_mode.h: $(top_srcdir)/xlat/bpf_mode.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/bpf_op_alu.h: $(top_srcdir)/xlat/bpf_op_alu.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/bpf_op_jmp.h: $(top_srcdir)/xlat/bpf_op_jmp.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/bpf_rval.h: $(top_srcdir)/xlat/bpf_rval.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/bpf_size.h: $(top_srcdir)/xlat/bpf_size.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/bpf_src.h: $(top_srcdir)/xlat/bpf_src.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/bsg_protocol.h: $(top_srcdir)/xlat/bsg_protocol.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/bsg_subprotocol.h: $(top_srcdir)/xlat/bsg_subprotocol.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/bt_protocols.h: $(top_srcdir)/xlat/bt_protocols.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/cacheflush_scope.h: $(top_srcdir)/xlat/cacheflush_scope.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
-$(top_srcdir)/xlat/capabilities1.h: $(top_srcdir)/xlat/capabilities1.in $(top_srcdir)/xlat/gen.sh
+$(top_srcdir)/xlat/cap.h: $(top_srcdir)/xlat/cap.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
-$(top_srcdir)/xlat/capabilities.h: $(top_srcdir)/xlat/capabilities.in $(top_srcdir)/xlat/gen.sh
+$(top_srcdir)/xlat/cap_mask0.h: $(top_srcdir)/xlat/cap_mask0.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/cap_mask1.h: $(top_srcdir)/xlat/cap_mask1.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/cap_version.h: $(top_srcdir)/xlat/cap_version.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
@@ -62,6 +84,34 @@
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/epollflags.h: $(top_srcdir)/xlat/epollflags.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/evdev_abs.h: $(top_srcdir)/xlat/evdev_abs.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/evdev_autorepeat.h: $(top_srcdir)/xlat/evdev_autorepeat.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/evdev_ev.h: $(top_srcdir)/xlat/evdev_ev.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/evdev_ff_status.h: $(top_srcdir)/xlat/evdev_ff_status.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/evdev_ff_types.h: $(top_srcdir)/xlat/evdev_ff_types.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/evdev_keycode.h: $(top_srcdir)/xlat/evdev_keycode.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/evdev_leds.h: $(top_srcdir)/xlat/evdev_leds.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/evdev_misc.h: $(top_srcdir)/xlat/evdev_misc.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/evdev_mtslots.h: $(top_srcdir)/xlat/evdev_mtslots.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/evdev_prop.h: $(top_srcdir)/xlat/evdev_prop.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/evdev_relative_axes.h: $(top_srcdir)/xlat/evdev_relative_axes.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/evdev_snd.h: $(top_srcdir)/xlat/evdev_snd.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/evdev_switch.h: $(top_srcdir)/xlat/evdev_switch.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/evdev_sync.h: $(top_srcdir)/xlat/evdev_sync.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/falloc_flags.h: $(top_srcdir)/xlat/falloc_flags.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/fan_classes.h: $(top_srcdir)/xlat/fan_classes.in $(top_srcdir)/xlat/gen.sh
@@ -76,8 +126,6 @@
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/fdflags.h: $(top_srcdir)/xlat/fdflags.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
-$(top_srcdir)/xlat/fileflags.h: $(top_srcdir)/xlat/fileflags.in $(top_srcdir)/xlat/gen.sh
-	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/flockcmds.h: $(top_srcdir)/xlat/flockcmds.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/fsmagic.h: $(top_srcdir)/xlat/fsmagic.in $(top_srcdir)/xlat/gen.sh
@@ -88,6 +136,8 @@
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/futexwakeops.h: $(top_srcdir)/xlat/futexwakeops.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/getrandom_flags.h: $(top_srcdir)/xlat/getrandom_flags.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/icmpfilterflags.h: $(top_srcdir)/xlat/icmpfilterflags.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/if_dqblk_valid.h: $(top_srcdir)/xlat/if_dqblk_valid.in $(top_srcdir)/xlat/gen.sh
@@ -102,6 +152,8 @@
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/inotify_init_flags.h: $(top_srcdir)/xlat/inotify_init_flags.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/ioctl_dirs.h: $(top_srcdir)/xlat/ioctl_dirs.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/ioprio_class.h: $(top_srcdir)/xlat/ioprio_class.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/ioprio_who.h: $(top_srcdir)/xlat/ioprio_who.in $(top_srcdir)/xlat/gen.sh
@@ -112,7 +164,7 @@
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/kexec_arch_values.h: $(top_srcdir)/xlat/kexec_arch_values.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
-$(top_srcdir)/xlat/kexec_flags.h: $(top_srcdir)/xlat/kexec_flags.in $(top_srcdir)/xlat/gen.sh
+$(top_srcdir)/xlat/kexec_load_flags.h: $(top_srcdir)/xlat/kexec_load_flags.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/keyctl_commands.h: $(top_srcdir)/xlat/keyctl_commands.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
@@ -184,6 +236,8 @@
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/openmodessol.h: $(top_srcdir)/xlat/openmodessol.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/packet_mreq_type.h: $(top_srcdir)/xlat/packet_mreq_type.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/perf_event_open_flags.h: $(top_srcdir)/xlat/perf_event_open_flags.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/personality_options.h: $(top_srcdir)/xlat/personality_options.in $(top_srcdir)/xlat/gen.sh
@@ -198,10 +252,22 @@
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/priorities.h: $(top_srcdir)/xlat/priorities.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/pr_mce_kill.h: $(top_srcdir)/xlat/pr_mce_kill.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/pr_mce_kill_policy.h: $(top_srcdir)/xlat/pr_mce_kill_policy.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/pr_set_mm.h: $(top_srcdir)/xlat/pr_set_mm.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/pr_tsc.h: $(top_srcdir)/xlat/pr_tsc.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/pr_unalign_flags.h: $(top_srcdir)/xlat/pr_unalign_flags.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/ptp_flags_options.h: $(top_srcdir)/xlat/ptp_flags_options.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/ptrace_cmds.h: $(top_srcdir)/xlat/ptrace_cmds.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/ptrace_events.h: $(top_srcdir)/xlat/ptrace_events.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/ptrace_setoptions_flags.h: $(top_srcdir)/xlat/ptrace_setoptions_flags.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/qm_which.h: $(top_srcdir)/xlat/qm_which.in $(top_srcdir)/xlat/gen.sh
@@ -222,6 +288,16 @@
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/scmvals.h: $(top_srcdir)/xlat/scmvals.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/secbits.h: $(top_srcdir)/xlat/secbits.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/seccomp_filter_flags.h: $(top_srcdir)/xlat/seccomp_filter_flags.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/seccomp_mode.h: $(top_srcdir)/xlat/seccomp_mode.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/seccomp_ops.h: $(top_srcdir)/xlat/seccomp_ops.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/seccomp_ret_action.h: $(top_srcdir)/xlat/seccomp_ret_action.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/semctl_flags.h: $(top_srcdir)/xlat/semctl_flags.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/semop_flags.h: $(top_srcdir)/xlat/semop_flags.in $(top_srcdir)/xlat/gen.sh
diff --git a/xlat/access_flags.h b/xlat/access_flags.h
index afce1ef..a1c3544 100644
--- a/xlat/access_flags.h
+++ b/xlat/access_flags.h
@@ -2,22 +2,22 @@
 
 static const struct xlat access_flags[] = {
 #if defined(F_OK) || (defined(HAVE_DECL_F_OK) && HAVE_DECL_F_OK)
-	XLAT(F_OK),
+ XLAT(F_OK),
 #endif
 #if defined(R_OK) || (defined(HAVE_DECL_R_OK) && HAVE_DECL_R_OK)
-	XLAT(R_OK),
+ XLAT(R_OK),
 #endif
 #if defined(W_OK) || (defined(HAVE_DECL_W_OK) && HAVE_DECL_W_OK)
-	XLAT(W_OK),
+ XLAT(W_OK),
 #endif
 #if defined(X_OK) || (defined(HAVE_DECL_X_OK) && HAVE_DECL_X_OK)
-	XLAT(X_OK),
+ XLAT(X_OK),
 #endif
 #if defined(EFF_ONLY_OK) || (defined(HAVE_DECL_EFF_ONLY_OK) && HAVE_DECL_EFF_ONLY_OK)
-	XLAT(EFF_ONLY_OK),
+ XLAT(EFF_ONLY_OK),
 #endif
 #if defined(EX_OK) || (defined(HAVE_DECL_EX_OK) && HAVE_DECL_EX_OK)
-	XLAT(EX_OK),
+ XLAT(EX_OK),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/aclipc.h b/xlat/aclipc.h
index 82b7949..0f475c6 100644
--- a/xlat/aclipc.h
+++ b/xlat/aclipc.h
@@ -2,13 +2,13 @@
 
 static const struct xlat aclipc[] = {
 #if defined(IPC_SHM) || (defined(HAVE_DECL_IPC_SHM) && HAVE_DECL_IPC_SHM)
-	XLAT(IPC_SHM),
+ XLAT(IPC_SHM),
 #endif
 #if defined(IPC_SEM) || (defined(HAVE_DECL_IPC_SEM) && HAVE_DECL_IPC_SEM)
-	XLAT(IPC_SEM),
+ XLAT(IPC_SEM),
 #endif
 #if defined(IPC_MSG) || (defined(HAVE_DECL_IPC_MSG) && HAVE_DECL_IPC_MSG)
-	XLAT(IPC_MSG),
+ XLAT(IPC_MSG),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/addrfams.h b/xlat/addrfams.h
index c3489c5..7b1d7f2 100644
--- a/xlat/addrfams.h
+++ b/xlat/addrfams.h
@@ -2,127 +2,127 @@
 
 const struct xlat addrfams[] = {
 #if defined(AF_UNSPEC) || (defined(HAVE_DECL_AF_UNSPEC) && HAVE_DECL_AF_UNSPEC)
-	XLAT(AF_UNSPEC),
+ XLAT(AF_UNSPEC),
 #endif
 #if defined(AF_LOCAL) || (defined(HAVE_DECL_AF_LOCAL) && HAVE_DECL_AF_LOCAL)
-	XLAT(AF_LOCAL),
+ XLAT(AF_LOCAL),
 #endif
 #if defined(AF_UNIX) || (defined(HAVE_DECL_AF_UNIX) && HAVE_DECL_AF_UNIX)
-	XLAT(AF_UNIX),
+ XLAT(AF_UNIX),
 #endif
 #if defined(AF_INET) || (defined(HAVE_DECL_AF_INET) && HAVE_DECL_AF_INET)
-	XLAT(AF_INET),
+ XLAT(AF_INET),
 #endif
 #if defined(AF_AX25) || (defined(HAVE_DECL_AF_AX25) && HAVE_DECL_AF_AX25)
-	XLAT(AF_AX25),
+ XLAT(AF_AX25),
 #endif
 #if defined(AF_IPX) || (defined(HAVE_DECL_AF_IPX) && HAVE_DECL_AF_IPX)
-	XLAT(AF_IPX),
+ XLAT(AF_IPX),
 #endif
 #if defined(AF_APPLETALK) || (defined(HAVE_DECL_AF_APPLETALK) && HAVE_DECL_AF_APPLETALK)
-	XLAT(AF_APPLETALK),
+ XLAT(AF_APPLETALK),
 #endif
 #if defined(AF_NETROM) || (defined(HAVE_DECL_AF_NETROM) && HAVE_DECL_AF_NETROM)
-	XLAT(AF_NETROM),
+ XLAT(AF_NETROM),
 #endif
 #if defined(AF_BRIDGE) || (defined(HAVE_DECL_AF_BRIDGE) && HAVE_DECL_AF_BRIDGE)
-	XLAT(AF_BRIDGE),
+ XLAT(AF_BRIDGE),
 #endif
 #if defined(AF_ATMPVC) || (defined(HAVE_DECL_AF_ATMPVC) && HAVE_DECL_AF_ATMPVC)
-	XLAT(AF_ATMPVC),
+ XLAT(AF_ATMPVC),
 #endif
 #if defined(AF_X25) || (defined(HAVE_DECL_AF_X25) && HAVE_DECL_AF_X25)
-	XLAT(AF_X25),
+ XLAT(AF_X25),
 #endif
 #if defined(AF_INET6) || (defined(HAVE_DECL_AF_INET6) && HAVE_DECL_AF_INET6)
-	XLAT(AF_INET6),
+ XLAT(AF_INET6),
 #endif
 #if defined(AF_ROSE) || (defined(HAVE_DECL_AF_ROSE) && HAVE_DECL_AF_ROSE)
-	XLAT(AF_ROSE),
+ XLAT(AF_ROSE),
 #endif
 #if defined(AF_DECnet) || (defined(HAVE_DECL_AF_DECnet) && HAVE_DECL_AF_DECnet)
-	XLAT(AF_DECnet),
+ XLAT(AF_DECnet),
 #endif
 #if defined(AF_NETBEUI) || (defined(HAVE_DECL_AF_NETBEUI) && HAVE_DECL_AF_NETBEUI)
-	XLAT(AF_NETBEUI),
+ XLAT(AF_NETBEUI),
 #endif
 #if defined(AF_SECURITY) || (defined(HAVE_DECL_AF_SECURITY) && HAVE_DECL_AF_SECURITY)
-	XLAT(AF_SECURITY),
+ XLAT(AF_SECURITY),
 #endif
 #if defined(AF_KEY) || (defined(HAVE_DECL_AF_KEY) && HAVE_DECL_AF_KEY)
-	XLAT(AF_KEY),
+ XLAT(AF_KEY),
 #endif
 #if defined(AF_NETLINK) || (defined(HAVE_DECL_AF_NETLINK) && HAVE_DECL_AF_NETLINK)
-	XLAT(AF_NETLINK),
+ XLAT(AF_NETLINK),
 #endif
 #if defined(AF_ROUTE) || (defined(HAVE_DECL_AF_ROUTE) && HAVE_DECL_AF_ROUTE)
-	XLAT(AF_ROUTE),
+ XLAT(AF_ROUTE),
 #endif
 #if defined(AF_PACKET) || (defined(HAVE_DECL_AF_PACKET) && HAVE_DECL_AF_PACKET)
-	XLAT(AF_PACKET),
+ XLAT(AF_PACKET),
 #endif
 #if defined(AF_ASH) || (defined(HAVE_DECL_AF_ASH) && HAVE_DECL_AF_ASH)
-	XLAT(AF_ASH),
+ XLAT(AF_ASH),
 #endif
 #if defined(AF_ECONET) || (defined(HAVE_DECL_AF_ECONET) && HAVE_DECL_AF_ECONET)
-	XLAT(AF_ECONET),
+ XLAT(AF_ECONET),
 #endif
 #if defined(AF_ATMSVC) || (defined(HAVE_DECL_AF_ATMSVC) && HAVE_DECL_AF_ATMSVC)
-	XLAT(AF_ATMSVC),
+ XLAT(AF_ATMSVC),
 #endif
 #if defined(AF_RDS) || (defined(HAVE_DECL_AF_RDS) && HAVE_DECL_AF_RDS)
-	XLAT(AF_RDS),
+ XLAT(AF_RDS),
 #endif
 #if defined(AF_SNA) || (defined(HAVE_DECL_AF_SNA) && HAVE_DECL_AF_SNA)
-	XLAT(AF_SNA),
+ XLAT(AF_SNA),
 #endif
 #if defined(AF_IRDA) || (defined(HAVE_DECL_AF_IRDA) && HAVE_DECL_AF_IRDA)
-	XLAT(AF_IRDA),
+ XLAT(AF_IRDA),
 #endif
 #if defined(AF_PPPOX) || (defined(HAVE_DECL_AF_PPPOX) && HAVE_DECL_AF_PPPOX)
-	XLAT(AF_PPPOX),
+ XLAT(AF_PPPOX),
 #endif
 #if defined(AF_WANPIPE) || (defined(HAVE_DECL_AF_WANPIPE) && HAVE_DECL_AF_WANPIPE)
-	XLAT(AF_WANPIPE),
+ XLAT(AF_WANPIPE),
 #endif
 #if defined(AF_LLC) || (defined(HAVE_DECL_AF_LLC) && HAVE_DECL_AF_LLC)
-	XLAT(AF_LLC),
+ XLAT(AF_LLC),
 #endif
 #if defined(AF_CAN) || (defined(HAVE_DECL_AF_CAN) && HAVE_DECL_AF_CAN)
-	XLAT(AF_CAN),
+ XLAT(AF_CAN),
 #endif
 #if defined(AF_TIPC) || (defined(HAVE_DECL_AF_TIPC) && HAVE_DECL_AF_TIPC)
-	XLAT(AF_TIPC),
+ XLAT(AF_TIPC),
 #endif
 #if defined(AF_BLUETOOTH) || (defined(HAVE_DECL_AF_BLUETOOTH) && HAVE_DECL_AF_BLUETOOTH)
-	XLAT(AF_BLUETOOTH),
+ XLAT(AF_BLUETOOTH),
 #endif
 #if defined(AF_IUCV) || (defined(HAVE_DECL_AF_IUCV) && HAVE_DECL_AF_IUCV)
-	XLAT(AF_IUCV),
+ XLAT(AF_IUCV),
 #endif
 #if defined(AF_RXRPC) || (defined(HAVE_DECL_AF_RXRPC) && HAVE_DECL_AF_RXRPC)
-	XLAT(AF_RXRPC),
+ XLAT(AF_RXRPC),
 #endif
 #if defined(AF_ISDN) || (defined(HAVE_DECL_AF_ISDN) && HAVE_DECL_AF_ISDN)
-	XLAT(AF_ISDN),
+ XLAT(AF_ISDN),
 #endif
 #if defined(AF_PHONET) || (defined(HAVE_DECL_AF_PHONET) && HAVE_DECL_AF_PHONET)
-	XLAT(AF_PHONET),
+ XLAT(AF_PHONET),
 #endif
 #if defined(AF_IEEE802154) || (defined(HAVE_DECL_AF_IEEE802154) && HAVE_DECL_AF_IEEE802154)
-	XLAT(AF_IEEE802154),
+ XLAT(AF_IEEE802154),
 #endif
 #if defined(AF_CAIF) || (defined(HAVE_DECL_AF_CAIF) && HAVE_DECL_AF_CAIF)
-	XLAT(AF_CAIF),
+ XLAT(AF_CAIF),
 #endif
 #if defined(AF_ALG) || (defined(HAVE_DECL_AF_ALG) && HAVE_DECL_AF_ALG)
-	XLAT(AF_ALG),
+ XLAT(AF_ALG),
 #endif
 #if defined(AF_NFC) || (defined(HAVE_DECL_AF_NFC) && HAVE_DECL_AF_NFC)
-	XLAT(AF_NFC),
+ XLAT(AF_NFC),
 #endif
 #if defined(AF_VSOCK) || (defined(HAVE_DECL_AF_VSOCK) && HAVE_DECL_AF_VSOCK)
-	XLAT(AF_VSOCK),
+ XLAT(AF_VSOCK),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/adjtimex_modes.h b/xlat/adjtimex_modes.h
index 37461f8..08fa3a8 100644
--- a/xlat/adjtimex_modes.h
+++ b/xlat/adjtimex_modes.h
@@ -1,45 +1,45 @@
 /* Generated by ./xlat/gen.sh from ./xlat/adjtimex_modes.in; do not edit. */
 
 static const struct xlat adjtimex_modes[] = {
-	XLAT(0),
+ XLAT(0),
 #if defined(ADJ_OFFSET) || (defined(HAVE_DECL_ADJ_OFFSET) && HAVE_DECL_ADJ_OFFSET)
-	XLAT(ADJ_OFFSET),
+ XLAT(ADJ_OFFSET),
 #endif
 #if defined(ADJ_FREQUENCY) || (defined(HAVE_DECL_ADJ_FREQUENCY) && HAVE_DECL_ADJ_FREQUENCY)
-	XLAT(ADJ_FREQUENCY),
+ XLAT(ADJ_FREQUENCY),
 #endif
 #if defined(ADJ_MAXERROR) || (defined(HAVE_DECL_ADJ_MAXERROR) && HAVE_DECL_ADJ_MAXERROR)
-	XLAT(ADJ_MAXERROR),
+ XLAT(ADJ_MAXERROR),
 #endif
 #if defined(ADJ_ESTERROR) || (defined(HAVE_DECL_ADJ_ESTERROR) && HAVE_DECL_ADJ_ESTERROR)
-	XLAT(ADJ_ESTERROR),
+ XLAT(ADJ_ESTERROR),
 #endif
 #if defined(ADJ_STATUS) || (defined(HAVE_DECL_ADJ_STATUS) && HAVE_DECL_ADJ_STATUS)
-	XLAT(ADJ_STATUS),
+ XLAT(ADJ_STATUS),
 #endif
 #if defined(ADJ_TIMECONST) || (defined(HAVE_DECL_ADJ_TIMECONST) && HAVE_DECL_ADJ_TIMECONST)
-	XLAT(ADJ_TIMECONST),
+ XLAT(ADJ_TIMECONST),
 #endif
 #if defined(ADJ_TAI) || (defined(HAVE_DECL_ADJ_TAI) && HAVE_DECL_ADJ_TAI)
-	XLAT(ADJ_TAI),
+ XLAT(ADJ_TAI),
 #endif
 #if defined(ADJ_SETOFFSET) || (defined(HAVE_DECL_ADJ_SETOFFSET) && HAVE_DECL_ADJ_SETOFFSET)
-	XLAT(ADJ_SETOFFSET),
+ XLAT(ADJ_SETOFFSET),
 #endif
 #if defined(ADJ_MICRO) || (defined(HAVE_DECL_ADJ_MICRO) && HAVE_DECL_ADJ_MICRO)
-	XLAT(ADJ_MICRO),
+ XLAT(ADJ_MICRO),
 #endif
 #if defined(ADJ_NANO) || (defined(HAVE_DECL_ADJ_NANO) && HAVE_DECL_ADJ_NANO)
-	XLAT(ADJ_NANO),
+ XLAT(ADJ_NANO),
 #endif
 #if defined(ADJ_TICK) || (defined(HAVE_DECL_ADJ_TICK) && HAVE_DECL_ADJ_TICK)
-	XLAT(ADJ_TICK),
+ XLAT(ADJ_TICK),
 #endif
 #if defined(ADJ_OFFSET_SINGLESHOT) || (defined(HAVE_DECL_ADJ_OFFSET_SINGLESHOT) && HAVE_DECL_ADJ_OFFSET_SINGLESHOT)
-	XLAT(ADJ_OFFSET_SINGLESHOT),
+ XLAT(ADJ_OFFSET_SINGLESHOT),
 #endif
 #if defined(ADJ_OFFSET_SS_READ) || (defined(HAVE_DECL_ADJ_OFFSET_SS_READ) && HAVE_DECL_ADJ_OFFSET_SS_READ)
-	XLAT(ADJ_OFFSET_SS_READ),
+ XLAT(ADJ_OFFSET_SS_READ),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/adjtimex_state.h b/xlat/adjtimex_state.h
index ff31449..0af75af 100644
--- a/xlat/adjtimex_state.h
+++ b/xlat/adjtimex_state.h
@@ -2,22 +2,22 @@
 
 static const struct xlat adjtimex_state[] = {
 #if defined(TIME_OK) || (defined(HAVE_DECL_TIME_OK) && HAVE_DECL_TIME_OK)
-	XLAT(TIME_OK),
+ XLAT(TIME_OK),
 #endif
 #if defined(TIME_INS) || (defined(HAVE_DECL_TIME_INS) && HAVE_DECL_TIME_INS)
-	XLAT(TIME_INS),
+ XLAT(TIME_INS),
 #endif
 #if defined(TIME_DEL) || (defined(HAVE_DECL_TIME_DEL) && HAVE_DECL_TIME_DEL)
-	XLAT(TIME_DEL),
+ XLAT(TIME_DEL),
 #endif
 #if defined(TIME_OOP) || (defined(HAVE_DECL_TIME_OOP) && HAVE_DECL_TIME_OOP)
-	XLAT(TIME_OOP),
+ XLAT(TIME_OOP),
 #endif
 #if defined(TIME_WAIT) || (defined(HAVE_DECL_TIME_WAIT) && HAVE_DECL_TIME_WAIT)
-	XLAT(TIME_WAIT),
+ XLAT(TIME_WAIT),
 #endif
 #if defined(TIME_ERROR) || (defined(HAVE_DECL_TIME_ERROR) && HAVE_DECL_TIME_ERROR)
-	XLAT(TIME_ERROR),
+ XLAT(TIME_ERROR),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/adjtimex_status.h b/xlat/adjtimex_status.h
index f1a7c99..51b25ee 100644
--- a/xlat/adjtimex_status.h
+++ b/xlat/adjtimex_status.h
@@ -2,52 +2,52 @@
 
 static const struct xlat adjtimex_status[] = {
 #if defined(STA_PLL) || (defined(HAVE_DECL_STA_PLL) && HAVE_DECL_STA_PLL)
-	XLAT(STA_PLL),
+ XLAT(STA_PLL),
 #endif
 #if defined(STA_PPSFREQ) || (defined(HAVE_DECL_STA_PPSFREQ) && HAVE_DECL_STA_PPSFREQ)
-	XLAT(STA_PPSFREQ),
+ XLAT(STA_PPSFREQ),
 #endif
 #if defined(STA_PPSTIME) || (defined(HAVE_DECL_STA_PPSTIME) && HAVE_DECL_STA_PPSTIME)
-	XLAT(STA_PPSTIME),
+ XLAT(STA_PPSTIME),
 #endif
 #if defined(STA_FLL) || (defined(HAVE_DECL_STA_FLL) && HAVE_DECL_STA_FLL)
-	XLAT(STA_FLL),
+ XLAT(STA_FLL),
 #endif
 #if defined(STA_INS) || (defined(HAVE_DECL_STA_INS) && HAVE_DECL_STA_INS)
-	XLAT(STA_INS),
+ XLAT(STA_INS),
 #endif
 #if defined(STA_DEL) || (defined(HAVE_DECL_STA_DEL) && HAVE_DECL_STA_DEL)
-	XLAT(STA_DEL),
+ XLAT(STA_DEL),
 #endif
 #if defined(STA_UNSYNC) || (defined(HAVE_DECL_STA_UNSYNC) && HAVE_DECL_STA_UNSYNC)
-	XLAT(STA_UNSYNC),
+ XLAT(STA_UNSYNC),
 #endif
 #if defined(STA_FREQHOLD) || (defined(HAVE_DECL_STA_FREQHOLD) && HAVE_DECL_STA_FREQHOLD)
-	XLAT(STA_FREQHOLD),
+ XLAT(STA_FREQHOLD),
 #endif
 #if defined(STA_PPSSIGNAL) || (defined(HAVE_DECL_STA_PPSSIGNAL) && HAVE_DECL_STA_PPSSIGNAL)
-	XLAT(STA_PPSSIGNAL),
+ XLAT(STA_PPSSIGNAL),
 #endif
 #if defined(STA_PPSJITTER) || (defined(HAVE_DECL_STA_PPSJITTER) && HAVE_DECL_STA_PPSJITTER)
-	XLAT(STA_PPSJITTER),
+ XLAT(STA_PPSJITTER),
 #endif
 #if defined(STA_PPSWANDER) || (defined(HAVE_DECL_STA_PPSWANDER) && HAVE_DECL_STA_PPSWANDER)
-	XLAT(STA_PPSWANDER),
+ XLAT(STA_PPSWANDER),
 #endif
 #if defined(STA_PPSERROR) || (defined(HAVE_DECL_STA_PPSERROR) && HAVE_DECL_STA_PPSERROR)
-	XLAT(STA_PPSERROR),
+ XLAT(STA_PPSERROR),
 #endif
 #if defined(STA_CLOCKERR) || (defined(HAVE_DECL_STA_CLOCKERR) && HAVE_DECL_STA_CLOCKERR)
-	XLAT(STA_CLOCKERR),
+ XLAT(STA_CLOCKERR),
 #endif
 #if defined(STA_NANO) || (defined(HAVE_DECL_STA_NANO) && HAVE_DECL_STA_NANO)
-	XLAT(STA_NANO),
+ XLAT(STA_NANO),
 #endif
 #if defined(STA_MODE) || (defined(HAVE_DECL_STA_MODE) && HAVE_DECL_STA_MODE)
-	XLAT(STA_MODE),
+ XLAT(STA_MODE),
 #endif
 #if defined(STA_CLK) || (defined(HAVE_DECL_STA_CLK) && HAVE_DECL_STA_CLK)
-	XLAT(STA_CLK),
+ XLAT(STA_CLK),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/advise.h b/xlat/advise.h
index 58e9bd8..61da386 100644
--- a/xlat/advise.h
+++ b/xlat/advise.h
@@ -2,22 +2,22 @@
 
 static const struct xlat advise[] = {
 #if defined(POSIX_FADV_NORMAL) || (defined(HAVE_DECL_POSIX_FADV_NORMAL) && HAVE_DECL_POSIX_FADV_NORMAL)
-	XLAT(POSIX_FADV_NORMAL),
+ XLAT(POSIX_FADV_NORMAL),
 #endif
 #if defined(POSIX_FADV_RANDOM) || (defined(HAVE_DECL_POSIX_FADV_RANDOM) && HAVE_DECL_POSIX_FADV_RANDOM)
-	XLAT(POSIX_FADV_RANDOM),
+ XLAT(POSIX_FADV_RANDOM),
 #endif
 #if defined(POSIX_FADV_SEQUENTIAL) || (defined(HAVE_DECL_POSIX_FADV_SEQUENTIAL) && HAVE_DECL_POSIX_FADV_SEQUENTIAL)
-	XLAT(POSIX_FADV_SEQUENTIAL),
+ XLAT(POSIX_FADV_SEQUENTIAL),
 #endif
 #if defined(POSIX_FADV_WILLNEED) || (defined(HAVE_DECL_POSIX_FADV_WILLNEED) && HAVE_DECL_POSIX_FADV_WILLNEED)
-	XLAT(POSIX_FADV_WILLNEED),
+ XLAT(POSIX_FADV_WILLNEED),
 #endif
 #if defined(POSIX_FADV_DONTNEED) || (defined(HAVE_DECL_POSIX_FADV_DONTNEED) && HAVE_DECL_POSIX_FADV_DONTNEED)
-	XLAT(POSIX_FADV_DONTNEED),
+ XLAT(POSIX_FADV_DONTNEED),
 #endif
 #if defined(POSIX_FADV_NOREUSE) || (defined(HAVE_DECL_POSIX_FADV_NOREUSE) && HAVE_DECL_POSIX_FADV_NOREUSE)
-	XLAT(POSIX_FADV_NOREUSE),
+ XLAT(POSIX_FADV_NOREUSE),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/af_packet_types.h b/xlat/af_packet_types.h
index 64eeff2..2e30ad7 100644
--- a/xlat/af_packet_types.h
+++ b/xlat/af_packet_types.h
@@ -2,25 +2,25 @@
 
 static const struct xlat af_packet_types[] = {
 #if defined(PACKET_HOST) || (defined(HAVE_DECL_PACKET_HOST) && HAVE_DECL_PACKET_HOST)
-	XLAT(PACKET_HOST),
+ XLAT(PACKET_HOST),
 #endif
 #if defined(PACKET_BROADCAST) || (defined(HAVE_DECL_PACKET_BROADCAST) && HAVE_DECL_PACKET_BROADCAST)
-	XLAT(PACKET_BROADCAST),
+ XLAT(PACKET_BROADCAST),
 #endif
 #if defined(PACKET_MULTICAST) || (defined(HAVE_DECL_PACKET_MULTICAST) && HAVE_DECL_PACKET_MULTICAST)
-	XLAT(PACKET_MULTICAST),
+ XLAT(PACKET_MULTICAST),
 #endif
 #if defined(PACKET_OTHERHOST) || (defined(HAVE_DECL_PACKET_OTHERHOST) && HAVE_DECL_PACKET_OTHERHOST)
-	XLAT(PACKET_OTHERHOST),
+ XLAT(PACKET_OTHERHOST),
 #endif
 #if defined(PACKET_OUTGOING) || (defined(HAVE_DECL_PACKET_OUTGOING) && HAVE_DECL_PACKET_OUTGOING)
-	XLAT(PACKET_OUTGOING),
+ XLAT(PACKET_OUTGOING),
 #endif
 #if defined(PACKET_LOOPBACK) || (defined(HAVE_DECL_PACKET_LOOPBACK) && HAVE_DECL_PACKET_LOOPBACK)
-	XLAT(PACKET_LOOPBACK),
+ XLAT(PACKET_LOOPBACK),
 #endif
 #if defined(PACKET_FASTROUTE) || (defined(HAVE_DECL_PACKET_FASTROUTE) && HAVE_DECL_PACKET_FASTROUTE)
-	XLAT(PACKET_FASTROUTE),
+ XLAT(PACKET_FASTROUTE),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/archvals.h b/xlat/archvals.h
index 6e17eb8..9288fb9 100644
--- a/xlat/archvals.h
+++ b/xlat/archvals.h
@@ -2,16 +2,16 @@
 
 static const struct xlat archvals[] = {
 #if defined(ARCH_SET_GS) || (defined(HAVE_DECL_ARCH_SET_GS) && HAVE_DECL_ARCH_SET_GS)
-	XLAT(ARCH_SET_GS),
+ XLAT(ARCH_SET_GS),
 #endif
 #if defined(ARCH_SET_FS) || (defined(HAVE_DECL_ARCH_SET_FS) && HAVE_DECL_ARCH_SET_FS)
-	XLAT(ARCH_SET_FS),
+ XLAT(ARCH_SET_FS),
 #endif
 #if defined(ARCH_GET_FS) || (defined(HAVE_DECL_ARCH_GET_FS) && HAVE_DECL_ARCH_GET_FS)
-	XLAT(ARCH_GET_FS),
+ XLAT(ARCH_GET_FS),
 #endif
 #if defined(ARCH_GET_GS) || (defined(HAVE_DECL_ARCH_GET_GS) && HAVE_DECL_ARCH_GET_GS)
-	XLAT(ARCH_GET_GS),
+ XLAT(ARCH_GET_GS),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/at_flags.h b/xlat/at_flags.h
index 8eb443c..714fa86 100644
--- a/xlat/at_flags.h
+++ b/xlat/at_flags.h
@@ -2,19 +2,19 @@
 
 const struct xlat at_flags[] = {
 #if defined(AT_SYMLINK_NOFOLLOW) || (defined(HAVE_DECL_AT_SYMLINK_NOFOLLOW) && HAVE_DECL_AT_SYMLINK_NOFOLLOW)
-	XLAT(AT_SYMLINK_NOFOLLOW),
+ XLAT(AT_SYMLINK_NOFOLLOW),
 #endif
 #if defined(AT_REMOVEDIR) || (defined(HAVE_DECL_AT_REMOVEDIR) && HAVE_DECL_AT_REMOVEDIR)
-	XLAT(AT_REMOVEDIR),
+ XLAT(AT_REMOVEDIR),
 #endif
 #if defined(AT_SYMLINK_FOLLOW) || (defined(HAVE_DECL_AT_SYMLINK_FOLLOW) && HAVE_DECL_AT_SYMLINK_FOLLOW)
-	XLAT(AT_SYMLINK_FOLLOW),
+ XLAT(AT_SYMLINK_FOLLOW),
 #endif
 #if defined(AT_NO_AUTOMOUNT) || (defined(HAVE_DECL_AT_NO_AUTOMOUNT) && HAVE_DECL_AT_NO_AUTOMOUNT)
-	XLAT(AT_NO_AUTOMOUNT),
+ XLAT(AT_NO_AUTOMOUNT),
 #endif
 #if defined(AT_EMPTY_PATH) || (defined(HAVE_DECL_AT_EMPTY_PATH) && HAVE_DECL_AT_EMPTY_PATH)
-	XLAT(AT_EMPTY_PATH),
+ XLAT(AT_EMPTY_PATH),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/atomic_ops.h b/xlat/atomic_ops.h
index 83c3a60..8fa3f9a 100644
--- a/xlat/atomic_ops.h
+++ b/xlat/atomic_ops.h
@@ -10,5 +10,5 @@
 { OR1K_ATOMIC_OR,		"OR"		},
 { OR1K_ATOMIC_UMAX,		"UMAX"		},
 { OR1K_ATOMIC_UMIN,		"UMIN"		},
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/baud_options.h b/xlat/baud_options.h
index aff9b85..34962eb 100644
--- a/xlat/baud_options.h
+++ b/xlat/baud_options.h
@@ -2,103 +2,103 @@
 
 static const struct xlat baud_options[] = {
 #if defined(B0) || (defined(HAVE_DECL_B0) && HAVE_DECL_B0)
-	XLAT(B0),
+ XLAT(B0),
 #endif
 #if defined(B50) || (defined(HAVE_DECL_B50) && HAVE_DECL_B50)
-	XLAT(B50),
+ XLAT(B50),
 #endif
 #if defined(B75) || (defined(HAVE_DECL_B75) && HAVE_DECL_B75)
-	XLAT(B75),
+ XLAT(B75),
 #endif
 #if defined(B110) || (defined(HAVE_DECL_B110) && HAVE_DECL_B110)
-	XLAT(B110),
+ XLAT(B110),
 #endif
 #if defined(B134) || (defined(HAVE_DECL_B134) && HAVE_DECL_B134)
-	XLAT(B134),
+ XLAT(B134),
 #endif
 #if defined(B150) || (defined(HAVE_DECL_B150) && HAVE_DECL_B150)
-	XLAT(B150),
+ XLAT(B150),
 #endif
 #if defined(B200) || (defined(HAVE_DECL_B200) && HAVE_DECL_B200)
-	XLAT(B200),
+ XLAT(B200),
 #endif
 #if defined(B300) || (defined(HAVE_DECL_B300) && HAVE_DECL_B300)
-	XLAT(B300),
+ XLAT(B300),
 #endif
 #if defined(B600) || (defined(HAVE_DECL_B600) && HAVE_DECL_B600)
-	XLAT(B600),
+ XLAT(B600),
 #endif
 #if defined(B1200) || (defined(HAVE_DECL_B1200) && HAVE_DECL_B1200)
-	XLAT(B1200),
+ XLAT(B1200),
 #endif
 #if defined(B1800) || (defined(HAVE_DECL_B1800) && HAVE_DECL_B1800)
-	XLAT(B1800),
+ XLAT(B1800),
 #endif
 #if defined(B2400) || (defined(HAVE_DECL_B2400) && HAVE_DECL_B2400)
-	XLAT(B2400),
+ XLAT(B2400),
 #endif
 #if defined(B4800) || (defined(HAVE_DECL_B4800) && HAVE_DECL_B4800)
-	XLAT(B4800),
+ XLAT(B4800),
 #endif
 #if defined(B9600) || (defined(HAVE_DECL_B9600) && HAVE_DECL_B9600)
-	XLAT(B9600),
+ XLAT(B9600),
 #endif
 #if defined(B19200) || (defined(HAVE_DECL_B19200) && HAVE_DECL_B19200)
-	XLAT(B19200),
+ XLAT(B19200),
 #endif
 #if defined(B38400) || (defined(HAVE_DECL_B38400) && HAVE_DECL_B38400)
-	XLAT(B38400),
+ XLAT(B38400),
 #endif
 #if defined(B57600) || (defined(HAVE_DECL_B57600) && HAVE_DECL_B57600)
-	XLAT(B57600),
+ XLAT(B57600),
 #endif
 #if defined(B115200) || (defined(HAVE_DECL_B115200) && HAVE_DECL_B115200)
-	XLAT(B115200),
+ XLAT(B115200),
 #endif
 #if defined(B230400) || (defined(HAVE_DECL_B230400) && HAVE_DECL_B230400)
-	XLAT(B230400),
+ XLAT(B230400),
 #endif
 #if defined(B460800) || (defined(HAVE_DECL_B460800) && HAVE_DECL_B460800)
-	XLAT(B460800),
+ XLAT(B460800),
 #endif
 #if defined(B500000) || (defined(HAVE_DECL_B500000) && HAVE_DECL_B500000)
-	XLAT(B500000),
+ XLAT(B500000),
 #endif
 #if defined(B576000) || (defined(HAVE_DECL_B576000) && HAVE_DECL_B576000)
-	XLAT(B576000),
+ XLAT(B576000),
 #endif
 #if defined(B921600) || (defined(HAVE_DECL_B921600) && HAVE_DECL_B921600)
-	XLAT(B921600),
+ XLAT(B921600),
 #endif
 #if defined(B1000000) || (defined(HAVE_DECL_B1000000) && HAVE_DECL_B1000000)
-	XLAT(B1000000),
+ XLAT(B1000000),
 #endif
 #if defined(B1152000) || (defined(HAVE_DECL_B1152000) && HAVE_DECL_B1152000)
-	XLAT(B1152000),
+ XLAT(B1152000),
 #endif
 #if defined(B1500000) || (defined(HAVE_DECL_B1500000) && HAVE_DECL_B1500000)
-	XLAT(B1500000),
+ XLAT(B1500000),
 #endif
 #if defined(B2000000) || (defined(HAVE_DECL_B2000000) && HAVE_DECL_B2000000)
-	XLAT(B2000000),
+ XLAT(B2000000),
 #endif
 #if defined(B2500000) || (defined(HAVE_DECL_B2500000) && HAVE_DECL_B2500000)
-	XLAT(B2500000),
+ XLAT(B2500000),
 #endif
 #if defined(B3000000) || (defined(HAVE_DECL_B3000000) && HAVE_DECL_B3000000)
-	XLAT(B3000000),
+ XLAT(B3000000),
 #endif
 #if defined(B3500000) || (defined(HAVE_DECL_B3500000) && HAVE_DECL_B3500000)
-	XLAT(B3500000),
+ XLAT(B3500000),
 #endif
 #if defined(B4000000) || (defined(HAVE_DECL_B4000000) && HAVE_DECL_B4000000)
-	XLAT(B4000000),
+ XLAT(B4000000),
 #endif
 #if defined(EXTA) || (defined(HAVE_DECL_EXTA) && HAVE_DECL_EXTA)
-	XLAT(EXTA),
+ XLAT(EXTA),
 #endif
 #if defined(EXTB) || (defined(HAVE_DECL_EXTB) && HAVE_DECL_EXTB)
-	XLAT(EXTB),
+ XLAT(EXTB),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/blkpg_ops.h b/xlat/blkpg_ops.h
index cde1315..74adf19 100644
--- a/xlat/blkpg_ops.h
+++ b/xlat/blkpg_ops.h
@@ -2,10 +2,10 @@
 
 static const struct xlat blkpg_ops[] = {
 #if defined(BLKPG_ADD_PARTITION) || (defined(HAVE_DECL_BLKPG_ADD_PARTITION) && HAVE_DECL_BLKPG_ADD_PARTITION)
-	XLAT(BLKPG_ADD_PARTITION),
+ XLAT(BLKPG_ADD_PARTITION),
 #endif
 #if defined(BLKPG_DEL_PARTITION) || (defined(HAVE_DECL_BLKPG_DEL_PARTITION) && HAVE_DECL_BLKPG_DEL_PARTITION)
-	XLAT(BLKPG_DEL_PARTITION),
+ XLAT(BLKPG_DEL_PARTITION),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/bootflags1.h b/xlat/bootflags1.h
index 05a01b2..e5577ea 100644
--- a/xlat/bootflags1.h
+++ b/xlat/bootflags1.h
@@ -1,8 +1,9 @@
 /* Generated by ./xlat/gen.sh from ./xlat/bootflags1.in; do not edit. */
 
 static const struct xlat bootflags1[] = {
-#if defined(LINUX_REBOOT_MAGIC1) || (defined(HAVE_DECL_LINUX_REBOOT_MAGIC1) && HAVE_DECL_LINUX_REBOOT_MAGIC1)
-	XLAT(LINUX_REBOOT_MAGIC1),
+#if !(defined(LINUX_REBOOT_MAGIC1) || (defined(HAVE_DECL_LINUX_REBOOT_MAGIC1) && HAVE_DECL_LINUX_REBOOT_MAGIC1))
+# define LINUX_REBOOT_MAGIC1 0xfee1dead
 #endif
-	XLAT_END
+ XLAT(LINUX_REBOOT_MAGIC1),
+ XLAT_END
 };
diff --git a/xlat/bootflags2.h b/xlat/bootflags2.h
index f240510..28b7f83 100644
--- a/xlat/bootflags2.h
+++ b/xlat/bootflags2.h
@@ -1,17 +1,21 @@
 /* Generated by ./xlat/gen.sh from ./xlat/bootflags2.in; do not edit. */
 
 static const struct xlat bootflags2[] = {
-#if defined(LINUX_REBOOT_MAGIC2) || (defined(HAVE_DECL_LINUX_REBOOT_MAGIC2) && HAVE_DECL_LINUX_REBOOT_MAGIC2)
-	XLAT(LINUX_REBOOT_MAGIC2),
+#if !(defined(LINUX_REBOOT_MAGIC2) || (defined(HAVE_DECL_LINUX_REBOOT_MAGIC2) && HAVE_DECL_LINUX_REBOOT_MAGIC2))
+# define LINUX_REBOOT_MAGIC2 672274793
 #endif
-#if defined(LINUX_REBOOT_MAGIC2A) || (defined(HAVE_DECL_LINUX_REBOOT_MAGIC2A) && HAVE_DECL_LINUX_REBOOT_MAGIC2A)
-	XLAT(LINUX_REBOOT_MAGIC2A),
+ XLAT(LINUX_REBOOT_MAGIC2),
+#if !(defined(LINUX_REBOOT_MAGIC2A) || (defined(HAVE_DECL_LINUX_REBOOT_MAGIC2A) && HAVE_DECL_LINUX_REBOOT_MAGIC2A))
+# define LINUX_REBOOT_MAGIC2A 85072278
 #endif
-#if defined(LINUX_REBOOT_MAGIC2B) || (defined(HAVE_DECL_LINUX_REBOOT_MAGIC2B) && HAVE_DECL_LINUX_REBOOT_MAGIC2B)
-	XLAT(LINUX_REBOOT_MAGIC2B),
+ XLAT(LINUX_REBOOT_MAGIC2A),
+#if !(defined(LINUX_REBOOT_MAGIC2B) || (defined(HAVE_DECL_LINUX_REBOOT_MAGIC2B) && HAVE_DECL_LINUX_REBOOT_MAGIC2B))
+# define LINUX_REBOOT_MAGIC2B 369367448
 #endif
-#if defined(LINUX_REBOOT_MAGIC2C) || (defined(HAVE_DECL_LINUX_REBOOT_MAGIC2C) && HAVE_DECL_LINUX_REBOOT_MAGIC2C)
-	XLAT(LINUX_REBOOT_MAGIC2C),
+ XLAT(LINUX_REBOOT_MAGIC2B),
+#if !(defined(LINUX_REBOOT_MAGIC2C) || (defined(HAVE_DECL_LINUX_REBOOT_MAGIC2C) && HAVE_DECL_LINUX_REBOOT_MAGIC2C))
+# define LINUX_REBOOT_MAGIC2C 537993216
 #endif
-	XLAT_END
+ XLAT(LINUX_REBOOT_MAGIC2C),
+ XLAT_END
 };
diff --git a/xlat/bootflags3.h b/xlat/bootflags3.h
index 5f50120..79afe27 100644
--- a/xlat/bootflags3.h
+++ b/xlat/bootflags3.h
@@ -1,29 +1,37 @@
 /* Generated by ./xlat/gen.sh from ./xlat/bootflags3.in; do not edit. */
 
 static const struct xlat bootflags3[] = {
-#if defined(LINUX_REBOOT_CMD_RESTART) || (defined(HAVE_DECL_LINUX_REBOOT_CMD_RESTART) && HAVE_DECL_LINUX_REBOOT_CMD_RESTART)
-	XLAT(LINUX_REBOOT_CMD_RESTART),
+#if !(defined(LINUX_REBOOT_CMD_RESTART) || (defined(HAVE_DECL_LINUX_REBOOT_CMD_RESTART) && HAVE_DECL_LINUX_REBOOT_CMD_RESTART))
+# define LINUX_REBOOT_CMD_RESTART 0x01234567
 #endif
-#if defined(LINUX_REBOOT_CMD_HALT) || (defined(HAVE_DECL_LINUX_REBOOT_CMD_HALT) && HAVE_DECL_LINUX_REBOOT_CMD_HALT)
-	XLAT(LINUX_REBOOT_CMD_HALT),
+ XLAT(LINUX_REBOOT_CMD_RESTART),
+#if !(defined(LINUX_REBOOT_CMD_HALT) || (defined(HAVE_DECL_LINUX_REBOOT_CMD_HALT) && HAVE_DECL_LINUX_REBOOT_CMD_HALT))
+# define LINUX_REBOOT_CMD_HALT 0xCDEF0123
 #endif
-#if defined(LINUX_REBOOT_CMD_CAD_ON) || (defined(HAVE_DECL_LINUX_REBOOT_CMD_CAD_ON) && HAVE_DECL_LINUX_REBOOT_CMD_CAD_ON)
-	XLAT(LINUX_REBOOT_CMD_CAD_ON),
+ XLAT(LINUX_REBOOT_CMD_HALT),
+#if !(defined(LINUX_REBOOT_CMD_CAD_ON) || (defined(HAVE_DECL_LINUX_REBOOT_CMD_CAD_ON) && HAVE_DECL_LINUX_REBOOT_CMD_CAD_ON))
+# define LINUX_REBOOT_CMD_CAD_ON 0x89ABCDEF
 #endif
-#if defined(LINUX_REBOOT_CMD_CAD_OFF) || (defined(HAVE_DECL_LINUX_REBOOT_CMD_CAD_OFF) && HAVE_DECL_LINUX_REBOOT_CMD_CAD_OFF)
-	XLAT(LINUX_REBOOT_CMD_CAD_OFF),
+ XLAT(LINUX_REBOOT_CMD_CAD_ON),
+#if !(defined(LINUX_REBOOT_CMD_CAD_OFF) || (defined(HAVE_DECL_LINUX_REBOOT_CMD_CAD_OFF) && HAVE_DECL_LINUX_REBOOT_CMD_CAD_OFF))
+# define LINUX_REBOOT_CMD_CAD_OFF 0x00000000
 #endif
-#if defined(LINUX_REBOOT_CMD_POWER_OFF) || (defined(HAVE_DECL_LINUX_REBOOT_CMD_POWER_OFF) && HAVE_DECL_LINUX_REBOOT_CMD_POWER_OFF)
-	XLAT(LINUX_REBOOT_CMD_POWER_OFF),
+ XLAT(LINUX_REBOOT_CMD_CAD_OFF),
+#if !(defined(LINUX_REBOOT_CMD_POWER_OFF) || (defined(HAVE_DECL_LINUX_REBOOT_CMD_POWER_OFF) && HAVE_DECL_LINUX_REBOOT_CMD_POWER_OFF))
+# define LINUX_REBOOT_CMD_POWER_OFF 0x4321FEDC
 #endif
-#if defined(LINUX_REBOOT_CMD_RESTART2) || (defined(HAVE_DECL_LINUX_REBOOT_CMD_RESTART2) && HAVE_DECL_LINUX_REBOOT_CMD_RESTART2)
-	XLAT(LINUX_REBOOT_CMD_RESTART2),
+ XLAT(LINUX_REBOOT_CMD_POWER_OFF),
+#if !(defined(LINUX_REBOOT_CMD_RESTART2) || (defined(HAVE_DECL_LINUX_REBOOT_CMD_RESTART2) && HAVE_DECL_LINUX_REBOOT_CMD_RESTART2))
+# define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4
 #endif
-#if defined(LINUX_REBOOT_CMD_SW_SUSPEND) || (defined(HAVE_DECL_LINUX_REBOOT_CMD_SW_SUSPEND) && HAVE_DECL_LINUX_REBOOT_CMD_SW_SUSPEND)
-	XLAT(LINUX_REBOOT_CMD_SW_SUSPEND),
+ XLAT(LINUX_REBOOT_CMD_RESTART2),
+#if !(defined(LINUX_REBOOT_CMD_SW_SUSPEND) || (defined(HAVE_DECL_LINUX_REBOOT_CMD_SW_SUSPEND) && HAVE_DECL_LINUX_REBOOT_CMD_SW_SUSPEND))
+# define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2
 #endif
-#if defined(LINUX_REBOOT_CMD_KEXEC) || (defined(HAVE_DECL_LINUX_REBOOT_CMD_KEXEC) && HAVE_DECL_LINUX_REBOOT_CMD_KEXEC)
-	XLAT(LINUX_REBOOT_CMD_KEXEC),
+ XLAT(LINUX_REBOOT_CMD_SW_SUSPEND),
+#if !(defined(LINUX_REBOOT_CMD_KEXEC) || (defined(HAVE_DECL_LINUX_REBOOT_CMD_KEXEC) && HAVE_DECL_LINUX_REBOOT_CMD_KEXEC))
+# define LINUX_REBOOT_CMD_KEXEC 0x45584543
 #endif
-	XLAT_END
+ XLAT(LINUX_REBOOT_CMD_KEXEC),
+ XLAT_END
 };
diff --git a/xlat/bt_protocols.h b/xlat/bt_protocols.h
index 0ad983d..fe1b6d0 100644
--- a/xlat/bt_protocols.h
+++ b/xlat/bt_protocols.h
@@ -2,28 +2,28 @@
 
 static const struct xlat bt_protocols[] = {
 #if defined(BTPROTO_L2CAP) || (defined(HAVE_DECL_BTPROTO_L2CAP) && HAVE_DECL_BTPROTO_L2CAP)
-	XLAT(BTPROTO_L2CAP),
+ XLAT(BTPROTO_L2CAP),
 #endif
 #if defined(BTPROTO_HCI) || (defined(HAVE_DECL_BTPROTO_HCI) && HAVE_DECL_BTPROTO_HCI)
-	XLAT(BTPROTO_HCI),
+ XLAT(BTPROTO_HCI),
 #endif
 #if defined(BTPROTO_SCO) || (defined(HAVE_DECL_BTPROTO_SCO) && HAVE_DECL_BTPROTO_SCO)
-	XLAT(BTPROTO_SCO),
+ XLAT(BTPROTO_SCO),
 #endif
 #if defined(BTPROTO_RFCOMM) || (defined(HAVE_DECL_BTPROTO_RFCOMM) && HAVE_DECL_BTPROTO_RFCOMM)
-	XLAT(BTPROTO_RFCOMM),
+ XLAT(BTPROTO_RFCOMM),
 #endif
 #if defined(BTPROTO_BNEP) || (defined(HAVE_DECL_BTPROTO_BNEP) && HAVE_DECL_BTPROTO_BNEP)
-	XLAT(BTPROTO_BNEP),
+ XLAT(BTPROTO_BNEP),
 #endif
 #if defined(BTPROTO_CMTP) || (defined(HAVE_DECL_BTPROTO_CMTP) && HAVE_DECL_BTPROTO_CMTP)
-	XLAT(BTPROTO_CMTP),
+ XLAT(BTPROTO_CMTP),
 #endif
 #if defined(BTPROTO_HIDP) || (defined(HAVE_DECL_BTPROTO_HIDP) && HAVE_DECL_BTPROTO_HIDP)
-	XLAT(BTPROTO_HIDP),
+ XLAT(BTPROTO_HIDP),
 #endif
 #if defined(BTPROTO_AVDTP) || (defined(HAVE_DECL_BTPROTO_AVDTP) && HAVE_DECL_BTPROTO_AVDTP)
-	XLAT(BTPROTO_AVDTP),
+ XLAT(BTPROTO_AVDTP),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/cacheflush_scope.h b/xlat/cacheflush_scope.h
index 62459f5..142549a 100644
--- a/xlat/cacheflush_scope.h
+++ b/xlat/cacheflush_scope.h
@@ -2,13 +2,13 @@
 
 static const struct xlat cacheflush_scope[] = {
 #if defined(FLUSH_SCOPE_LINE) || (defined(HAVE_DECL_FLUSH_SCOPE_LINE) && HAVE_DECL_FLUSH_SCOPE_LINE)
-	XLAT(FLUSH_SCOPE_LINE),
+ XLAT(FLUSH_SCOPE_LINE),
 #endif
 #if defined(FLUSH_SCOPE_PAGE) || (defined(HAVE_DECL_FLUSH_SCOPE_PAGE) && HAVE_DECL_FLUSH_SCOPE_PAGE)
-	XLAT(FLUSH_SCOPE_PAGE),
+ XLAT(FLUSH_SCOPE_PAGE),
 #endif
 #if defined(FLUSH_SCOPE_ALL) || (defined(HAVE_DECL_FLUSH_SCOPE_ALL) && HAVE_DECL_FLUSH_SCOPE_ALL)
-	XLAT(FLUSH_SCOPE_ALL),
+ XLAT(FLUSH_SCOPE_ALL),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/cap_version.h b/xlat/cap_version.h
index 3f6e639..d1535f8 100644
--- a/xlat/cap_version.h
+++ b/xlat/cap_version.h
@@ -1,8 +1,8 @@
 /* Generated by ./xlat/gen.sh from ./xlat/cap_version.in; do not edit. */
 
 static const struct xlat cap_version[] = {
-	XLAT(_LINUX_CAPABILITY_VERSION_1),
-	XLAT(_LINUX_CAPABILITY_VERSION_2),
-	XLAT(_LINUX_CAPABILITY_VERSION_3),
-	XLAT_END
+ XLAT(_LINUX_CAPABILITY_VERSION_1),
+ XLAT(_LINUX_CAPABILITY_VERSION_2),
+ XLAT(_LINUX_CAPABILITY_VERSION_3),
+ XLAT_END
 };
diff --git a/xlat/clockflags.h b/xlat/clockflags.h
index 91dc44d..068ce4f 100644
--- a/xlat/clockflags.h
+++ b/xlat/clockflags.h
@@ -2,7 +2,7 @@
 
 static const struct xlat clockflags[] = {
 #if defined(TIMER_ABSTIME) || (defined(HAVE_DECL_TIMER_ABSTIME) && HAVE_DECL_TIMER_ABSTIME)
-	XLAT(TIMER_ABSTIME),
+ XLAT(TIMER_ABSTIME),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/clocknames.h b/xlat/clocknames.h
index 17ff470..04a0e9f 100644
--- a/xlat/clocknames.h
+++ b/xlat/clocknames.h
@@ -2,40 +2,40 @@
 
 static const struct xlat clocknames[] = {
 #if defined(CLOCK_REALTIME) || (defined(HAVE_DECL_CLOCK_REALTIME) && HAVE_DECL_CLOCK_REALTIME)
-	XLAT(CLOCK_REALTIME),
+ XLAT(CLOCK_REALTIME),
 #endif
 #if defined(CLOCK_MONOTONIC) || (defined(HAVE_DECL_CLOCK_MONOTONIC) && HAVE_DECL_CLOCK_MONOTONIC)
-	XLAT(CLOCK_MONOTONIC),
+ XLAT(CLOCK_MONOTONIC),
 #endif
 #if defined(CLOCK_PROCESS_CPUTIME_ID) || (defined(HAVE_DECL_CLOCK_PROCESS_CPUTIME_ID) && HAVE_DECL_CLOCK_PROCESS_CPUTIME_ID)
-	XLAT(CLOCK_PROCESS_CPUTIME_ID),
+ XLAT(CLOCK_PROCESS_CPUTIME_ID),
 #endif
 #if defined(CLOCK_THREAD_CPUTIME_ID) || (defined(HAVE_DECL_CLOCK_THREAD_CPUTIME_ID) && HAVE_DECL_CLOCK_THREAD_CPUTIME_ID)
-	XLAT(CLOCK_THREAD_CPUTIME_ID),
+ XLAT(CLOCK_THREAD_CPUTIME_ID),
 #endif
 #if defined(CLOCK_MONOTONIC_RAW) || (defined(HAVE_DECL_CLOCK_MONOTONIC_RAW) && HAVE_DECL_CLOCK_MONOTONIC_RAW)
-	XLAT(CLOCK_MONOTONIC_RAW),
+ XLAT(CLOCK_MONOTONIC_RAW),
 #endif
 #if defined(CLOCK_REALTIME_COARSE) || (defined(HAVE_DECL_CLOCK_REALTIME_COARSE) && HAVE_DECL_CLOCK_REALTIME_COARSE)
-	XLAT(CLOCK_REALTIME_COARSE),
+ XLAT(CLOCK_REALTIME_COARSE),
 #endif
 #if defined(CLOCK_MONOTONIC_COARSE) || (defined(HAVE_DECL_CLOCK_MONOTONIC_COARSE) && HAVE_DECL_CLOCK_MONOTONIC_COARSE)
-	XLAT(CLOCK_MONOTONIC_COARSE),
+ XLAT(CLOCK_MONOTONIC_COARSE),
 #endif
 #if defined(CLOCK_BOOTTIME) || (defined(HAVE_DECL_CLOCK_BOOTTIME) && HAVE_DECL_CLOCK_BOOTTIME)
-	XLAT(CLOCK_BOOTTIME),
+ XLAT(CLOCK_BOOTTIME),
 #endif
 #if defined(CLOCK_REALTIME_ALARM) || (defined(HAVE_DECL_CLOCK_REALTIME_ALARM) && HAVE_DECL_CLOCK_REALTIME_ALARM)
-	XLAT(CLOCK_REALTIME_ALARM),
+ XLAT(CLOCK_REALTIME_ALARM),
 #endif
 #if defined(CLOCK_BOOTTIME_ALARM) || (defined(HAVE_DECL_CLOCK_BOOTTIME_ALARM) && HAVE_DECL_CLOCK_BOOTTIME_ALARM)
-	XLAT(CLOCK_BOOTTIME_ALARM),
+ XLAT(CLOCK_BOOTTIME_ALARM),
 #endif
 #if defined(CLOCK_SGI_CYCLE) || (defined(HAVE_DECL_CLOCK_SGI_CYCLE) && HAVE_DECL_CLOCK_SGI_CYCLE)
-	XLAT(CLOCK_SGI_CYCLE),
+ XLAT(CLOCK_SGI_CYCLE),
 #endif
 #if defined(CLOCK_TAI) || (defined(HAVE_DECL_CLOCK_TAI) && HAVE_DECL_CLOCK_TAI)
-	XLAT(CLOCK_TAI),
+ XLAT(CLOCK_TAI),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/clone_flags.h b/xlat/clone_flags.h
index 4a1a8b8..51ee721 100644
--- a/xlat/clone_flags.h
+++ b/xlat/clone_flags.h
@@ -2,73 +2,73 @@
 
 static const struct xlat clone_flags[] = {
 #if defined(CLONE_VM) || (defined(HAVE_DECL_CLONE_VM) && HAVE_DECL_CLONE_VM)
-	XLAT(CLONE_VM),
+ XLAT(CLONE_VM),
 #endif
 #if defined(CLONE_FS) || (defined(HAVE_DECL_CLONE_FS) && HAVE_DECL_CLONE_FS)
-	XLAT(CLONE_FS),
+ XLAT(CLONE_FS),
 #endif
 #if defined(CLONE_FILES) || (defined(HAVE_DECL_CLONE_FILES) && HAVE_DECL_CLONE_FILES)
-	XLAT(CLONE_FILES),
+ XLAT(CLONE_FILES),
 #endif
 #if defined(CLONE_SIGHAND) || (defined(HAVE_DECL_CLONE_SIGHAND) && HAVE_DECL_CLONE_SIGHAND)
-	XLAT(CLONE_SIGHAND),
+ XLAT(CLONE_SIGHAND),
 #endif
 #if defined(CLONE_IDLETASK) || (defined(HAVE_DECL_CLONE_IDLETASK) && HAVE_DECL_CLONE_IDLETASK)
-	XLAT(CLONE_IDLETASK),
+ XLAT(CLONE_IDLETASK),
 #endif
 #if defined(CLONE_PTRACE) || (defined(HAVE_DECL_CLONE_PTRACE) && HAVE_DECL_CLONE_PTRACE)
-	XLAT(CLONE_PTRACE),
+ XLAT(CLONE_PTRACE),
 #endif
 #if defined(CLONE_VFORK) || (defined(HAVE_DECL_CLONE_VFORK) && HAVE_DECL_CLONE_VFORK)
-	XLAT(CLONE_VFORK),
+ XLAT(CLONE_VFORK),
 #endif
 #if defined(CLONE_PARENT) || (defined(HAVE_DECL_CLONE_PARENT) && HAVE_DECL_CLONE_PARENT)
-	XLAT(CLONE_PARENT),
+ XLAT(CLONE_PARENT),
 #endif
 #if defined(CLONE_THREAD) || (defined(HAVE_DECL_CLONE_THREAD) && HAVE_DECL_CLONE_THREAD)
-	XLAT(CLONE_THREAD),
+ XLAT(CLONE_THREAD),
 #endif
 #if defined(CLONE_NEWNS) || (defined(HAVE_DECL_CLONE_NEWNS) && HAVE_DECL_CLONE_NEWNS)
-	XLAT(CLONE_NEWNS),
+ XLAT(CLONE_NEWNS),
 #endif
 #if defined(CLONE_SYSVSEM) || (defined(HAVE_DECL_CLONE_SYSVSEM) && HAVE_DECL_CLONE_SYSVSEM)
-	XLAT(CLONE_SYSVSEM),
+ XLAT(CLONE_SYSVSEM),
 #endif
 #if defined(CLONE_SETTLS) || (defined(HAVE_DECL_CLONE_SETTLS) && HAVE_DECL_CLONE_SETTLS)
-	XLAT(CLONE_SETTLS),
+ XLAT(CLONE_SETTLS),
 #endif
 #if defined(CLONE_PARENT_SETTID) || (defined(HAVE_DECL_CLONE_PARENT_SETTID) && HAVE_DECL_CLONE_PARENT_SETTID)
-	XLAT(CLONE_PARENT_SETTID),
+ XLAT(CLONE_PARENT_SETTID),
 #endif
 #if defined(CLONE_CHILD_CLEARTID) || (defined(HAVE_DECL_CLONE_CHILD_CLEARTID) && HAVE_DECL_CLONE_CHILD_CLEARTID)
-	XLAT(CLONE_CHILD_CLEARTID),
+ XLAT(CLONE_CHILD_CLEARTID),
 #endif
 #if defined(CLONE_UNTRACED) || (defined(HAVE_DECL_CLONE_UNTRACED) && HAVE_DECL_CLONE_UNTRACED)
-	XLAT(CLONE_UNTRACED),
+ XLAT(CLONE_UNTRACED),
 #endif
 #if defined(CLONE_CHILD_SETTID) || (defined(HAVE_DECL_CLONE_CHILD_SETTID) && HAVE_DECL_CLONE_CHILD_SETTID)
-	XLAT(CLONE_CHILD_SETTID),
+ XLAT(CLONE_CHILD_SETTID),
 #endif
 #if defined(CLONE_STOPPED) || (defined(HAVE_DECL_CLONE_STOPPED) && HAVE_DECL_CLONE_STOPPED)
-	XLAT(CLONE_STOPPED),
+ XLAT(CLONE_STOPPED),
 #endif
 #if defined(CLONE_NEWUTS) || (defined(HAVE_DECL_CLONE_NEWUTS) && HAVE_DECL_CLONE_NEWUTS)
-	XLAT(CLONE_NEWUTS),
+ XLAT(CLONE_NEWUTS),
 #endif
 #if defined(CLONE_NEWIPC) || (defined(HAVE_DECL_CLONE_NEWIPC) && HAVE_DECL_CLONE_NEWIPC)
-	XLAT(CLONE_NEWIPC),
+ XLAT(CLONE_NEWIPC),
 #endif
 #if defined(CLONE_NEWUSER) || (defined(HAVE_DECL_CLONE_NEWUSER) && HAVE_DECL_CLONE_NEWUSER)
-	XLAT(CLONE_NEWUSER),
+ XLAT(CLONE_NEWUSER),
 #endif
 #if defined(CLONE_NEWPID) || (defined(HAVE_DECL_CLONE_NEWPID) && HAVE_DECL_CLONE_NEWPID)
-	XLAT(CLONE_NEWPID),
+ XLAT(CLONE_NEWPID),
 #endif
 #if defined(CLONE_NEWNET) || (defined(HAVE_DECL_CLONE_NEWNET) && HAVE_DECL_CLONE_NEWNET)
-	XLAT(CLONE_NEWNET),
+ XLAT(CLONE_NEWNET),
 #endif
 #if defined(CLONE_IO) || (defined(HAVE_DECL_CLONE_IO) && HAVE_DECL_CLONE_IO)
-	XLAT(CLONE_IO),
+ XLAT(CLONE_IO),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/cpuclocknames.h b/xlat/cpuclocknames.h
index c985758..83aa6c2 100644
--- a/xlat/cpuclocknames.h
+++ b/xlat/cpuclocknames.h
@@ -2,13 +2,13 @@
 
 static const struct xlat cpuclocknames[] = {
 #if defined(CPUCLOCK_PROF) || (defined(HAVE_DECL_CPUCLOCK_PROF) && HAVE_DECL_CPUCLOCK_PROF)
-	XLAT(CPUCLOCK_PROF),
+ XLAT(CPUCLOCK_PROF),
 #endif
 #if defined(CPUCLOCK_VIRT) || (defined(HAVE_DECL_CPUCLOCK_VIRT) && HAVE_DECL_CPUCLOCK_VIRT)
-	XLAT(CPUCLOCK_VIRT),
+ XLAT(CPUCLOCK_VIRT),
 #endif
 #if defined(CPUCLOCK_SCHED) || (defined(HAVE_DECL_CPUCLOCK_SCHED) && HAVE_DECL_CPUCLOCK_SCHED)
-	XLAT(CPUCLOCK_SCHED),
+ XLAT(CPUCLOCK_SCHED),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/delete_module_flags.h b/xlat/delete_module_flags.h
index 484cbcf..59bc02a 100644
--- a/xlat/delete_module_flags.h
+++ b/xlat/delete_module_flags.h
@@ -2,10 +2,10 @@
 
 static const struct xlat delete_module_flags[] = {
 #if defined(O_NONBLOCK) || (defined(HAVE_DECL_O_NONBLOCK) && HAVE_DECL_O_NONBLOCK)
-	XLAT(O_NONBLOCK),
+ XLAT(O_NONBLOCK),
 #endif
 #if defined(O_TRUNC) || (defined(HAVE_DECL_O_TRUNC) && HAVE_DECL_O_TRUNC)
-	XLAT(O_TRUNC),
+ XLAT(O_TRUNC),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/direnttypes.h b/xlat/direnttypes.h
index 1888810..b883b09 100644
--- a/xlat/direnttypes.h
+++ b/xlat/direnttypes.h
@@ -2,31 +2,31 @@
 
 static const struct xlat direnttypes[] = {
 #if defined(DT_UNKNOWN) || (defined(HAVE_DECL_DT_UNKNOWN) && HAVE_DECL_DT_UNKNOWN)
-	XLAT(DT_UNKNOWN),
+ XLAT(DT_UNKNOWN),
 #endif
 #if defined(DT_FIFO) || (defined(HAVE_DECL_DT_FIFO) && HAVE_DECL_DT_FIFO)
-	XLAT(DT_FIFO),
+ XLAT(DT_FIFO),
 #endif
 #if defined(DT_CHR) || (defined(HAVE_DECL_DT_CHR) && HAVE_DECL_DT_CHR)
-	XLAT(DT_CHR),
+ XLAT(DT_CHR),
 #endif
 #if defined(DT_DIR) || (defined(HAVE_DECL_DT_DIR) && HAVE_DECL_DT_DIR)
-	XLAT(DT_DIR),
+ XLAT(DT_DIR),
 #endif
 #if defined(DT_BLK) || (defined(HAVE_DECL_DT_BLK) && HAVE_DECL_DT_BLK)
-	XLAT(DT_BLK),
+ XLAT(DT_BLK),
 #endif
 #if defined(DT_REG) || (defined(HAVE_DECL_DT_REG) && HAVE_DECL_DT_REG)
-	XLAT(DT_REG),
+ XLAT(DT_REG),
 #endif
 #if defined(DT_LNK) || (defined(HAVE_DECL_DT_LNK) && HAVE_DECL_DT_LNK)
-	XLAT(DT_LNK),
+ XLAT(DT_LNK),
 #endif
 #if defined(DT_SOCK) || (defined(HAVE_DECL_DT_SOCK) && HAVE_DECL_DT_SOCK)
-	XLAT(DT_SOCK),
+ XLAT(DT_SOCK),
 #endif
 #if defined(DT_WHT) || (defined(HAVE_DECL_DT_WHT) && HAVE_DECL_DT_WHT)
-	XLAT(DT_WHT),
+ XLAT(DT_WHT),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/domains.h b/xlat/domains.h
index b0704f6..38d96fb 100644
--- a/xlat/domains.h
+++ b/xlat/domains.h
@@ -2,127 +2,127 @@
 
 static const struct xlat domains[] = {
 #if defined(PF_UNSPEC) || (defined(HAVE_DECL_PF_UNSPEC) && HAVE_DECL_PF_UNSPEC)
-	XLAT(PF_UNSPEC),
+ XLAT(PF_UNSPEC),
 #endif
 #if defined(PF_LOCAL) || (defined(HAVE_DECL_PF_LOCAL) && HAVE_DECL_PF_LOCAL)
-	XLAT(PF_LOCAL),
+ XLAT(PF_LOCAL),
 #endif
 #if defined(PF_UNIX) || (defined(HAVE_DECL_PF_UNIX) && HAVE_DECL_PF_UNIX)
-	XLAT(PF_UNIX),
+ XLAT(PF_UNIX),
 #endif
 #if defined(PF_INET) || (defined(HAVE_DECL_PF_INET) && HAVE_DECL_PF_INET)
-	XLAT(PF_INET),
+ XLAT(PF_INET),
 #endif
 #if defined(PF_AX25) || (defined(HAVE_DECL_PF_AX25) && HAVE_DECL_PF_AX25)
-	XLAT(PF_AX25),
+ XLAT(PF_AX25),
 #endif
 #if defined(PF_IPX) || (defined(HAVE_DECL_PF_IPX) && HAVE_DECL_PF_IPX)
-	XLAT(PF_IPX),
+ XLAT(PF_IPX),
 #endif
 #if defined(PF_APPLETALK) || (defined(HAVE_DECL_PF_APPLETALK) && HAVE_DECL_PF_APPLETALK)
-	XLAT(PF_APPLETALK),
+ XLAT(PF_APPLETALK),
 #endif
 #if defined(PF_NETROM) || (defined(HAVE_DECL_PF_NETROM) && HAVE_DECL_PF_NETROM)
-	XLAT(PF_NETROM),
+ XLAT(PF_NETROM),
 #endif
 #if defined(PF_BRIDGE) || (defined(HAVE_DECL_PF_BRIDGE) && HAVE_DECL_PF_BRIDGE)
-	XLAT(PF_BRIDGE),
+ XLAT(PF_BRIDGE),
 #endif
 #if defined(PF_ATMPVC) || (defined(HAVE_DECL_PF_ATMPVC) && HAVE_DECL_PF_ATMPVC)
-	XLAT(PF_ATMPVC),
+ XLAT(PF_ATMPVC),
 #endif
 #if defined(PF_X25) || (defined(HAVE_DECL_PF_X25) && HAVE_DECL_PF_X25)
-	XLAT(PF_X25),
+ XLAT(PF_X25),
 #endif
 #if defined(PF_INET6) || (defined(HAVE_DECL_PF_INET6) && HAVE_DECL_PF_INET6)
-	XLAT(PF_INET6),
+ XLAT(PF_INET6),
 #endif
 #if defined(PF_ROSE) || (defined(HAVE_DECL_PF_ROSE) && HAVE_DECL_PF_ROSE)
-	XLAT(PF_ROSE),
+ XLAT(PF_ROSE),
 #endif
 #if defined(PF_DECnet) || (defined(HAVE_DECL_PF_DECnet) && HAVE_DECL_PF_DECnet)
-	XLAT(PF_DECnet),
+ XLAT(PF_DECnet),
 #endif
 #if defined(PF_NETBEUI) || (defined(HAVE_DECL_PF_NETBEUI) && HAVE_DECL_PF_NETBEUI)
-	XLAT(PF_NETBEUI),
+ XLAT(PF_NETBEUI),
 #endif
 #if defined(PF_SECURITY) || (defined(HAVE_DECL_PF_SECURITY) && HAVE_DECL_PF_SECURITY)
-	XLAT(PF_SECURITY),
+ XLAT(PF_SECURITY),
 #endif
 #if defined(PF_KEY) || (defined(HAVE_DECL_PF_KEY) && HAVE_DECL_PF_KEY)
-	XLAT(PF_KEY),
+ XLAT(PF_KEY),
 #endif
 #if defined(PF_NETLINK) || (defined(HAVE_DECL_PF_NETLINK) && HAVE_DECL_PF_NETLINK)
-	XLAT(PF_NETLINK),
+ XLAT(PF_NETLINK),
 #endif
 #if defined(PF_ROUTE) || (defined(HAVE_DECL_PF_ROUTE) && HAVE_DECL_PF_ROUTE)
-	XLAT(PF_ROUTE),
+ XLAT(PF_ROUTE),
 #endif
 #if defined(PF_PACKET) || (defined(HAVE_DECL_PF_PACKET) && HAVE_DECL_PF_PACKET)
-	XLAT(PF_PACKET),
+ XLAT(PF_PACKET),
 #endif
 #if defined(PF_ASH) || (defined(HAVE_DECL_PF_ASH) && HAVE_DECL_PF_ASH)
-	XLAT(PF_ASH),
+ XLAT(PF_ASH),
 #endif
 #if defined(PF_ECONET) || (defined(HAVE_DECL_PF_ECONET) && HAVE_DECL_PF_ECONET)
-	XLAT(PF_ECONET),
+ XLAT(PF_ECONET),
 #endif
 #if defined(PF_ATMSVC) || (defined(HAVE_DECL_PF_ATMSVC) && HAVE_DECL_PF_ATMSVC)
-	XLAT(PF_ATMSVC),
+ XLAT(PF_ATMSVC),
 #endif
 #if defined(PF_RDS) || (defined(HAVE_DECL_PF_RDS) && HAVE_DECL_PF_RDS)
-	XLAT(PF_RDS),
+ XLAT(PF_RDS),
 #endif
 #if defined(PF_SNA) || (defined(HAVE_DECL_PF_SNA) && HAVE_DECL_PF_SNA)
-	XLAT(PF_SNA),
+ XLAT(PF_SNA),
 #endif
 #if defined(PF_IRDA) || (defined(HAVE_DECL_PF_IRDA) && HAVE_DECL_PF_IRDA)
-	XLAT(PF_IRDA),
+ XLAT(PF_IRDA),
 #endif
 #if defined(PF_PPPOX) || (defined(HAVE_DECL_PF_PPPOX) && HAVE_DECL_PF_PPPOX)
-	XLAT(PF_PPPOX),
+ XLAT(PF_PPPOX),
 #endif
 #if defined(PF_WANPIPE) || (defined(HAVE_DECL_PF_WANPIPE) && HAVE_DECL_PF_WANPIPE)
-	XLAT(PF_WANPIPE),
+ XLAT(PF_WANPIPE),
 #endif
 #if defined(PF_LLC) || (defined(HAVE_DECL_PF_LLC) && HAVE_DECL_PF_LLC)
-	XLAT(PF_LLC),
+ XLAT(PF_LLC),
 #endif
 #if defined(PF_CAN) || (defined(HAVE_DECL_PF_CAN) && HAVE_DECL_PF_CAN)
-	XLAT(PF_CAN),
+ XLAT(PF_CAN),
 #endif
 #if defined(PF_TIPC) || (defined(HAVE_DECL_PF_TIPC) && HAVE_DECL_PF_TIPC)
-	XLAT(PF_TIPC),
+ XLAT(PF_TIPC),
 #endif
 #if defined(PF_BLUETOOTH) || (defined(HAVE_DECL_PF_BLUETOOTH) && HAVE_DECL_PF_BLUETOOTH)
-	XLAT(PF_BLUETOOTH),
+ XLAT(PF_BLUETOOTH),
 #endif
 #if defined(PF_IUCV) || (defined(HAVE_DECL_PF_IUCV) && HAVE_DECL_PF_IUCV)
-	XLAT(PF_IUCV),
+ XLAT(PF_IUCV),
 #endif
 #if defined(PF_RXRPC) || (defined(HAVE_DECL_PF_RXRPC) && HAVE_DECL_PF_RXRPC)
-	XLAT(PF_RXRPC),
+ XLAT(PF_RXRPC),
 #endif
 #if defined(PF_ISDN) || (defined(HAVE_DECL_PF_ISDN) && HAVE_DECL_PF_ISDN)
-	XLAT(PF_ISDN),
+ XLAT(PF_ISDN),
 #endif
 #if defined(PF_PHONET) || (defined(HAVE_DECL_PF_PHONET) && HAVE_DECL_PF_PHONET)
-	XLAT(PF_PHONET),
+ XLAT(PF_PHONET),
 #endif
 #if defined(PF_IEEE802154) || (defined(HAVE_DECL_PF_IEEE802154) && HAVE_DECL_PF_IEEE802154)
-	XLAT(PF_IEEE802154),
+ XLAT(PF_IEEE802154),
 #endif
 #if defined(PF_CAIF) || (defined(HAVE_DECL_PF_CAIF) && HAVE_DECL_PF_CAIF)
-	XLAT(PF_CAIF),
+ XLAT(PF_CAIF),
 #endif
 #if defined(PF_ALG) || (defined(HAVE_DECL_PF_ALG) && HAVE_DECL_PF_ALG)
-	XLAT(PF_ALG),
+ XLAT(PF_ALG),
 #endif
 #if defined(PF_NFC) || (defined(HAVE_DECL_PF_NFC) && HAVE_DECL_PF_NFC)
-	XLAT(PF_NFC),
+ XLAT(PF_NFC),
 #endif
 #if defined(PF_VSOCK) || (defined(HAVE_DECL_PF_VSOCK) && HAVE_DECL_PF_VSOCK)
-	XLAT(PF_VSOCK),
+ XLAT(PF_VSOCK),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/epollctls.h b/xlat/epollctls.h
index e4ccff7..8664a40 100644
--- a/xlat/epollctls.h
+++ b/xlat/epollctls.h
@@ -2,13 +2,13 @@
 
 static const struct xlat epollctls[] = {
 #if defined(EPOLL_CTL_ADD) || (defined(HAVE_DECL_EPOLL_CTL_ADD) && HAVE_DECL_EPOLL_CTL_ADD)
-	XLAT(EPOLL_CTL_ADD),
+ XLAT(EPOLL_CTL_ADD),
 #endif
 #if defined(EPOLL_CTL_MOD) || (defined(HAVE_DECL_EPOLL_CTL_MOD) && HAVE_DECL_EPOLL_CTL_MOD)
-	XLAT(EPOLL_CTL_MOD),
+ XLAT(EPOLL_CTL_MOD),
 #endif
 #if defined(EPOLL_CTL_DEL) || (defined(HAVE_DECL_EPOLL_CTL_DEL) && HAVE_DECL_EPOLL_CTL_DEL)
-	XLAT(EPOLL_CTL_DEL),
+ XLAT(EPOLL_CTL_DEL),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/epollevents.h b/xlat/epollevents.h
index 899cbd9..8419c4c 100644
--- a/xlat/epollevents.h
+++ b/xlat/epollevents.h
@@ -2,43 +2,43 @@
 
 static const struct xlat epollevents[] = {
 #if defined(EPOLLIN) || (defined(HAVE_DECL_EPOLLIN) && HAVE_DECL_EPOLLIN)
-	XLAT(EPOLLIN),
+ XLAT(EPOLLIN),
 #endif
 #if defined(EPOLLPRI) || (defined(HAVE_DECL_EPOLLPRI) && HAVE_DECL_EPOLLPRI)
-	XLAT(EPOLLPRI),
+ XLAT(EPOLLPRI),
 #endif
 #if defined(EPOLLOUT) || (defined(HAVE_DECL_EPOLLOUT) && HAVE_DECL_EPOLLOUT)
-	XLAT(EPOLLOUT),
+ XLAT(EPOLLOUT),
 #endif
 #if defined(EPOLLRDNORM) || (defined(HAVE_DECL_EPOLLRDNORM) && HAVE_DECL_EPOLLRDNORM)
-	XLAT(EPOLLRDNORM),
+ XLAT(EPOLLRDNORM),
 #endif
 #if defined(EPOLLRDBAND) || (defined(HAVE_DECL_EPOLLRDBAND) && HAVE_DECL_EPOLLRDBAND)
-	XLAT(EPOLLRDBAND),
+ XLAT(EPOLLRDBAND),
 #endif
 #if defined(EPOLLWRNORM) || (defined(HAVE_DECL_EPOLLWRNORM) && HAVE_DECL_EPOLLWRNORM)
-	XLAT(EPOLLWRNORM),
+ XLAT(EPOLLWRNORM),
 #endif
 #if defined(EPOLLWRBAND) || (defined(HAVE_DECL_EPOLLWRBAND) && HAVE_DECL_EPOLLWRBAND)
-	XLAT(EPOLLWRBAND),
+ XLAT(EPOLLWRBAND),
 #endif
 #if defined(EPOLLMSG) || (defined(HAVE_DECL_EPOLLMSG) && HAVE_DECL_EPOLLMSG)
-	XLAT(EPOLLMSG),
+ XLAT(EPOLLMSG),
 #endif
 #if defined(EPOLLERR) || (defined(HAVE_DECL_EPOLLERR) && HAVE_DECL_EPOLLERR)
-	XLAT(EPOLLERR),
+ XLAT(EPOLLERR),
 #endif
 #if defined(EPOLLHUP) || (defined(HAVE_DECL_EPOLLHUP) && HAVE_DECL_EPOLLHUP)
-	XLAT(EPOLLHUP),
+ XLAT(EPOLLHUP),
 #endif
 #if defined(EPOLLRDHUP) || (defined(HAVE_DECL_EPOLLRDHUP) && HAVE_DECL_EPOLLRDHUP)
-	XLAT(EPOLLRDHUP),
+ XLAT(EPOLLRDHUP),
 #endif
 #if defined(EPOLLONESHOT) || (defined(HAVE_DECL_EPOLLONESHOT) && HAVE_DECL_EPOLLONESHOT)
-	XLAT(EPOLLONESHOT),
+ XLAT(EPOLLONESHOT),
 #endif
 #if defined(EPOLLET) || (defined(HAVE_DECL_EPOLLET) && HAVE_DECL_EPOLLET)
-	XLAT(EPOLLET),
+ XLAT(EPOLLET),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/epollflags.h b/xlat/epollflags.h
index eb20235..9c6784c 100644
--- a/xlat/epollflags.h
+++ b/xlat/epollflags.h
@@ -2,10 +2,10 @@
 
 static const struct xlat epollflags[] = {
 #if defined(EPOLL_CLOEXEC) || (defined(HAVE_DECL_EPOLL_CLOEXEC) && HAVE_DECL_EPOLL_CLOEXEC)
-	XLAT(EPOLL_CLOEXEC),
+ XLAT(EPOLL_CLOEXEC),
 #endif
 #if defined(EPOLL_NONBLOCK) || (defined(HAVE_DECL_EPOLL_NONBLOCK) && HAVE_DECL_EPOLL_NONBLOCK)
-	XLAT(EPOLL_NONBLOCK),
+ XLAT(EPOLL_NONBLOCK),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/falloc_flags.h b/xlat/falloc_flags.h
index 1409c66..9288bc8 100644
--- a/xlat/falloc_flags.h
+++ b/xlat/falloc_flags.h
@@ -2,19 +2,19 @@
 
 static const struct xlat falloc_flags[] = {
 #if defined(FALLOC_FL_KEEP_SIZE) || (defined(HAVE_DECL_FALLOC_FL_KEEP_SIZE) && HAVE_DECL_FALLOC_FL_KEEP_SIZE)
-	XLAT(FALLOC_FL_KEEP_SIZE),
+ XLAT(FALLOC_FL_KEEP_SIZE),
 #endif
 #if defined(FALLOC_FL_PUNCH_HOLE) || (defined(HAVE_DECL_FALLOC_FL_PUNCH_HOLE) && HAVE_DECL_FALLOC_FL_PUNCH_HOLE)
-	XLAT(FALLOC_FL_PUNCH_HOLE),
+ XLAT(FALLOC_FL_PUNCH_HOLE),
 #endif
 #if defined(FALLOC_FL_NO_HIDE_STALE) || (defined(HAVE_DECL_FALLOC_FL_NO_HIDE_STALE) && HAVE_DECL_FALLOC_FL_NO_HIDE_STALE)
-	XLAT(FALLOC_FL_NO_HIDE_STALE),
+ XLAT(FALLOC_FL_NO_HIDE_STALE),
 #endif
 #if defined(FALLOC_FL_COLLAPSE_RANGE) || (defined(HAVE_DECL_FALLOC_FL_COLLAPSE_RANGE) && HAVE_DECL_FALLOC_FL_COLLAPSE_RANGE)
-	XLAT(FALLOC_FL_COLLAPSE_RANGE),
+ XLAT(FALLOC_FL_COLLAPSE_RANGE),
 #endif
 #if defined(FALLOC_FL_ZERO_RANGE) || (defined(HAVE_DECL_FALLOC_FL_ZERO_RANGE) && HAVE_DECL_FALLOC_FL_ZERO_RANGE)
-	XLAT(FALLOC_FL_ZERO_RANGE),
+ XLAT(FALLOC_FL_ZERO_RANGE),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/fan_classes.h b/xlat/fan_classes.h
index d1dc17a..0a4d727 100644
--- a/xlat/fan_classes.h
+++ b/xlat/fan_classes.h
@@ -1,14 +1,17 @@
 /* Generated by ./xlat/gen.sh from ./xlat/fan_classes.in; do not edit. */
 
 static const struct xlat fan_classes[] = {
-#if defined(FAN_CLASS_NOTIF) || (defined(HAVE_DECL_FAN_CLASS_NOTIF) && HAVE_DECL_FAN_CLASS_NOTIF)
-	XLAT(FAN_CLASS_NOTIF),
+#if !(defined(FAN_CLASS_NOTIF) || (defined(HAVE_DECL_FAN_CLASS_NOTIF) && HAVE_DECL_FAN_CLASS_NOTIF))
+# define FAN_CLASS_NOTIF 0x00000000
 #endif
-#if defined(FAN_CLASS_CONTENT) || (defined(HAVE_DECL_FAN_CLASS_CONTENT) && HAVE_DECL_FAN_CLASS_CONTENT)
-	XLAT(FAN_CLASS_CONTENT),
+ XLAT(FAN_CLASS_NOTIF),
+#if !(defined(FAN_CLASS_CONTENT) || (defined(HAVE_DECL_FAN_CLASS_CONTENT) && HAVE_DECL_FAN_CLASS_CONTENT))
+# define FAN_CLASS_CONTENT 0x00000004
 #endif
-#if defined(FAN_CLASS_PRE_CONTENT) || (defined(HAVE_DECL_FAN_CLASS_PRE_CONTENT) && HAVE_DECL_FAN_CLASS_PRE_CONTENT)
-	XLAT(FAN_CLASS_PRE_CONTENT),
+ XLAT(FAN_CLASS_CONTENT),
+#if !(defined(FAN_CLASS_PRE_CONTENT) || (defined(HAVE_DECL_FAN_CLASS_PRE_CONTENT) && HAVE_DECL_FAN_CLASS_PRE_CONTENT))
+# define FAN_CLASS_PRE_CONTENT 0x00000008
 #endif
-	XLAT_END
+ XLAT(FAN_CLASS_PRE_CONTENT),
+ XLAT_END
 };
diff --git a/xlat/fan_event_flags.h b/xlat/fan_event_flags.h
index 22a1529..ad875e5 100644
--- a/xlat/fan_event_flags.h
+++ b/xlat/fan_event_flags.h
@@ -1,38 +1,45 @@
 /* Generated by ./xlat/gen.sh from ./xlat/fan_event_flags.in; do not edit. */
 
 static const struct xlat fan_event_flags[] = {
-#if defined(FAN_ACCESS) || (defined(HAVE_DECL_FAN_ACCESS) && HAVE_DECL_FAN_ACCESS)
-	XLAT(FAN_ACCESS),
+#if !(defined(FAN_ACCESS) || (defined(HAVE_DECL_FAN_ACCESS) && HAVE_DECL_FAN_ACCESS))
+# define FAN_ACCESS 0x00000001
 #endif
-#if defined(FAN_MODIFY) || (defined(HAVE_DECL_FAN_MODIFY) && HAVE_DECL_FAN_MODIFY)
-	XLAT(FAN_MODIFY),
+ XLAT(FAN_ACCESS),
+#if !(defined(FAN_MODIFY) || (defined(HAVE_DECL_FAN_MODIFY) && HAVE_DECL_FAN_MODIFY))
+# define FAN_MODIFY 0x00000002
 #endif
-#if defined(FAN_CLOSE) || (defined(HAVE_DECL_FAN_CLOSE) && HAVE_DECL_FAN_CLOSE)
-	XLAT(FAN_CLOSE),
+ XLAT(FAN_MODIFY),
+#if !(defined(FAN_CLOSE_WRITE) || (defined(HAVE_DECL_FAN_CLOSE_WRITE) && HAVE_DECL_FAN_CLOSE_WRITE))
+# define FAN_CLOSE_WRITE 0x00000008
 #endif
-#if defined(FAN_CLOSE_WRITE) || (defined(HAVE_DECL_FAN_CLOSE_WRITE) && HAVE_DECL_FAN_CLOSE_WRITE)
-	XLAT(FAN_CLOSE_WRITE),
+ XLAT(FAN_CLOSE_WRITE),
+#if !(defined(FAN_CLOSE_NOWRITE) || (defined(HAVE_DECL_FAN_CLOSE_NOWRITE) && HAVE_DECL_FAN_CLOSE_NOWRITE))
+# define FAN_CLOSE_NOWRITE 0x00000010
 #endif
-#if defined(FAN_CLOSE_NOWRITE) || (defined(HAVE_DECL_FAN_CLOSE_NOWRITE) && HAVE_DECL_FAN_CLOSE_NOWRITE)
-	XLAT(FAN_CLOSE_NOWRITE),
+ XLAT(FAN_CLOSE_NOWRITE),
+#if !(defined(FAN_OPEN) || (defined(HAVE_DECL_FAN_OPEN) && HAVE_DECL_FAN_OPEN))
+# define FAN_OPEN 0x00000020
 #endif
-#if defined(FAN_OPEN) || (defined(HAVE_DECL_FAN_OPEN) && HAVE_DECL_FAN_OPEN)
-	XLAT(FAN_OPEN),
+ XLAT(FAN_OPEN),
+#if !(defined(FAN_Q_OVERFLOW) || (defined(HAVE_DECL_FAN_Q_OVERFLOW) && HAVE_DECL_FAN_Q_OVERFLOW))
+# define FAN_Q_OVERFLOW 0x00004000
 #endif
-#if defined(FAN_Q_OVERFLOW) || (defined(HAVE_DECL_FAN_Q_OVERFLOW) && HAVE_DECL_FAN_Q_OVERFLOW)
-	XLAT(FAN_Q_OVERFLOW),
+ XLAT(FAN_Q_OVERFLOW),
+#if !(defined(FAN_OPEN_PERM) || (defined(HAVE_DECL_FAN_OPEN_PERM) && HAVE_DECL_FAN_OPEN_PERM))
+# define FAN_OPEN_PERM 0x00010000
 #endif
-#if defined(FAN_OPEN_PERM) || (defined(HAVE_DECL_FAN_OPEN_PERM) && HAVE_DECL_FAN_OPEN_PERM)
-	XLAT(FAN_OPEN_PERM),
+ XLAT(FAN_OPEN_PERM),
+#if !(defined(FAN_ACCESS_PERM) || (defined(HAVE_DECL_FAN_ACCESS_PERM) && HAVE_DECL_FAN_ACCESS_PERM))
+# define FAN_ACCESS_PERM 0x00020000
 #endif
-#if defined(FAN_ACCESS_PERM) || (defined(HAVE_DECL_FAN_ACCESS_PERM) && HAVE_DECL_FAN_ACCESS_PERM)
-	XLAT(FAN_ACCESS_PERM),
+ XLAT(FAN_ACCESS_PERM),
+#if !(defined(FAN_ONDIR) || (defined(HAVE_DECL_FAN_ONDIR) && HAVE_DECL_FAN_ONDIR))
+# define FAN_ONDIR 0x40000000
 #endif
-#if defined(FAN_ONDIR) || (defined(HAVE_DECL_FAN_ONDIR) && HAVE_DECL_FAN_ONDIR)
-	XLAT(FAN_ONDIR),
+ XLAT(FAN_ONDIR),
+#if !(defined(FAN_EVENT_ON_CHILD) || (defined(HAVE_DECL_FAN_EVENT_ON_CHILD) && HAVE_DECL_FAN_EVENT_ON_CHILD))
+# define FAN_EVENT_ON_CHILD 0x08000000
 #endif
-#if defined(FAN_EVENT_ON_CHILD) || (defined(HAVE_DECL_FAN_EVENT_ON_CHILD) && HAVE_DECL_FAN_EVENT_ON_CHILD)
-	XLAT(FAN_EVENT_ON_CHILD),
-#endif
-	XLAT_END
+ XLAT(FAN_EVENT_ON_CHILD),
+ XLAT_END
 };
diff --git a/xlat/fan_init_flags.h b/xlat/fan_init_flags.h
index b4873e5..9996ef8 100644
--- a/xlat/fan_init_flags.h
+++ b/xlat/fan_init_flags.h
@@ -1,17 +1,21 @@
 /* Generated by ./xlat/gen.sh from ./xlat/fan_init_flags.in; do not edit. */
 
 static const struct xlat fan_init_flags[] = {
-#if defined(FAN_CLOEXEC) || (defined(HAVE_DECL_FAN_CLOEXEC) && HAVE_DECL_FAN_CLOEXEC)
-	XLAT(FAN_CLOEXEC),
+#if !(defined(FAN_CLOEXEC) || (defined(HAVE_DECL_FAN_CLOEXEC) && HAVE_DECL_FAN_CLOEXEC))
+# define FAN_CLOEXEC 0x00000001
 #endif
-#if defined(FAN_NONBLOCK) || (defined(HAVE_DECL_FAN_NONBLOCK) && HAVE_DECL_FAN_NONBLOCK)
-	XLAT(FAN_NONBLOCK),
+ XLAT(FAN_CLOEXEC),
+#if !(defined(FAN_NONBLOCK) || (defined(HAVE_DECL_FAN_NONBLOCK) && HAVE_DECL_FAN_NONBLOCK))
+# define FAN_NONBLOCK 0x00000002
 #endif
-#if defined(FAN_UNLIMITED_QUEUE) || (defined(HAVE_DECL_FAN_UNLIMITED_QUEUE) && HAVE_DECL_FAN_UNLIMITED_QUEUE)
-	XLAT(FAN_UNLIMITED_QUEUE),
+ XLAT(FAN_NONBLOCK),
+#if !(defined(FAN_UNLIMITED_QUEUE) || (defined(HAVE_DECL_FAN_UNLIMITED_QUEUE) && HAVE_DECL_FAN_UNLIMITED_QUEUE))
+# define FAN_UNLIMITED_QUEUE 0x00000010
 #endif
-#if defined(FAN_UNLIMITED_MARKS) || (defined(HAVE_DECL_FAN_UNLIMITED_MARKS) && HAVE_DECL_FAN_UNLIMITED_MARKS)
-	XLAT(FAN_UNLIMITED_MARKS),
+ XLAT(FAN_UNLIMITED_QUEUE),
+#if !(defined(FAN_UNLIMITED_MARKS) || (defined(HAVE_DECL_FAN_UNLIMITED_MARKS) && HAVE_DECL_FAN_UNLIMITED_MARKS))
+# define FAN_UNLIMITED_MARKS 0x00000020
 #endif
-	XLAT_END
+ XLAT(FAN_UNLIMITED_MARKS),
+ XLAT_END
 };
diff --git a/xlat/fan_mark_flags.h b/xlat/fan_mark_flags.h
index 5ab20d8..efa936e 100644
--- a/xlat/fan_mark_flags.h
+++ b/xlat/fan_mark_flags.h
@@ -1,29 +1,37 @@
 /* Generated by ./xlat/gen.sh from ./xlat/fan_mark_flags.in; do not edit. */
 
 static const struct xlat fan_mark_flags[] = {
-#if defined(FAN_MARK_ADD) || (defined(HAVE_DECL_FAN_MARK_ADD) && HAVE_DECL_FAN_MARK_ADD)
-	XLAT(FAN_MARK_ADD),
+#if !(defined(FAN_MARK_ADD) || (defined(HAVE_DECL_FAN_MARK_ADD) && HAVE_DECL_FAN_MARK_ADD))
+# define FAN_MARK_ADD 0x00000001
 #endif
-#if defined(FAN_MARK_REMOVE) || (defined(HAVE_DECL_FAN_MARK_REMOVE) && HAVE_DECL_FAN_MARK_REMOVE)
-	XLAT(FAN_MARK_REMOVE),
+ XLAT(FAN_MARK_ADD),
+#if !(defined(FAN_MARK_REMOVE) || (defined(HAVE_DECL_FAN_MARK_REMOVE) && HAVE_DECL_FAN_MARK_REMOVE))
+# define FAN_MARK_REMOVE 0x00000002
 #endif
-#if defined(FAN_MARK_DONT_FOLLOW) || (defined(HAVE_DECL_FAN_MARK_DONT_FOLLOW) && HAVE_DECL_FAN_MARK_DONT_FOLLOW)
-	XLAT(FAN_MARK_DONT_FOLLOW),
+ XLAT(FAN_MARK_REMOVE),
+#if !(defined(FAN_MARK_DONT_FOLLOW) || (defined(HAVE_DECL_FAN_MARK_DONT_FOLLOW) && HAVE_DECL_FAN_MARK_DONT_FOLLOW))
+# define FAN_MARK_DONT_FOLLOW 0x00000004
 #endif
-#if defined(FAN_MARK_ONLYDIR) || (defined(HAVE_DECL_FAN_MARK_ONLYDIR) && HAVE_DECL_FAN_MARK_ONLYDIR)
-	XLAT(FAN_MARK_ONLYDIR),
+ XLAT(FAN_MARK_DONT_FOLLOW),
+#if !(defined(FAN_MARK_ONLYDIR) || (defined(HAVE_DECL_FAN_MARK_ONLYDIR) && HAVE_DECL_FAN_MARK_ONLYDIR))
+# define FAN_MARK_ONLYDIR 0x00000008
 #endif
-#if defined(FAN_MARK_MOUNT) || (defined(HAVE_DECL_FAN_MARK_MOUNT) && HAVE_DECL_FAN_MARK_MOUNT)
-	XLAT(FAN_MARK_MOUNT),
+ XLAT(FAN_MARK_ONLYDIR),
+#if !(defined(FAN_MARK_MOUNT) || (defined(HAVE_DECL_FAN_MARK_MOUNT) && HAVE_DECL_FAN_MARK_MOUNT))
+# define FAN_MARK_MOUNT 0x00000010
 #endif
-#if defined(FAN_MARK_IGNORED_MASK) || (defined(HAVE_DECL_FAN_MARK_IGNORED_MASK) && HAVE_DECL_FAN_MARK_IGNORED_MASK)
-	XLAT(FAN_MARK_IGNORED_MASK),
+ XLAT(FAN_MARK_MOUNT),
+#if !(defined(FAN_MARK_IGNORED_MASK) || (defined(HAVE_DECL_FAN_MARK_IGNORED_MASK) && HAVE_DECL_FAN_MARK_IGNORED_MASK))
+# define FAN_MARK_IGNORED_MASK 0x00000020
 #endif
-#if defined(FAN_MARK_IGNORED_SURV_MODIFY) || (defined(HAVE_DECL_FAN_MARK_IGNORED_SURV_MODIFY) && HAVE_DECL_FAN_MARK_IGNORED_SURV_MODIFY)
-	XLAT(FAN_MARK_IGNORED_SURV_MODIFY),
+ XLAT(FAN_MARK_IGNORED_MASK),
+#if !(defined(FAN_MARK_IGNORED_SURV_MODIFY) || (defined(HAVE_DECL_FAN_MARK_IGNORED_SURV_MODIFY) && HAVE_DECL_FAN_MARK_IGNORED_SURV_MODIFY))
+# define FAN_MARK_IGNORED_SURV_MODIFY 0x00000040
 #endif
-#if defined(FAN_MARK_FLUSH) || (defined(HAVE_DECL_FAN_MARK_FLUSH) && HAVE_DECL_FAN_MARK_FLUSH)
-	XLAT(FAN_MARK_FLUSH),
+ XLAT(FAN_MARK_IGNORED_SURV_MODIFY),
+#if !(defined(FAN_MARK_FLUSH) || (defined(HAVE_DECL_FAN_MARK_FLUSH) && HAVE_DECL_FAN_MARK_FLUSH))
+# define FAN_MARK_FLUSH 0x00000080
 #endif
-	XLAT_END
+ XLAT(FAN_MARK_FLUSH),
+ XLAT_END
 };
diff --git a/xlat/fcntlcmds.h b/xlat/fcntlcmds.h
index 5a170fd..455aa77 100644
--- a/xlat/fcntlcmds.h
+++ b/xlat/fcntlcmds.h
@@ -2,124 +2,124 @@
 
 static const struct xlat fcntlcmds[] = {
 #if defined(F_DUPFD) || (defined(HAVE_DECL_F_DUPFD) && HAVE_DECL_F_DUPFD)
-	XLAT(F_DUPFD),
+ XLAT(F_DUPFD),
 #endif
 #if defined(F_GETFD) || (defined(HAVE_DECL_F_GETFD) && HAVE_DECL_F_GETFD)
-	XLAT(F_GETFD),
+ XLAT(F_GETFD),
 #endif
 #if defined(F_SETFD) || (defined(HAVE_DECL_F_SETFD) && HAVE_DECL_F_SETFD)
-	XLAT(F_SETFD),
+ XLAT(F_SETFD),
 #endif
 #if defined(F_GETFL) || (defined(HAVE_DECL_F_GETFL) && HAVE_DECL_F_GETFL)
-	XLAT(F_GETFL),
+ XLAT(F_GETFL),
 #endif
 #if defined(F_SETFL) || (defined(HAVE_DECL_F_SETFL) && HAVE_DECL_F_SETFL)
-	XLAT(F_SETFL),
+ XLAT(F_SETFL),
 #endif
 #if defined(F_GETLK) || (defined(HAVE_DECL_F_GETLK) && HAVE_DECL_F_GETLK)
-	XLAT(F_GETLK),
+ XLAT(F_GETLK),
 #endif
 #if defined(F_SETLK) || (defined(HAVE_DECL_F_SETLK) && HAVE_DECL_F_SETLK)
-	XLAT(F_SETLK),
+ XLAT(F_SETLK),
 #endif
 #if defined(F_SETLKW) || (defined(HAVE_DECL_F_SETLKW) && HAVE_DECL_F_SETLKW)
-	XLAT(F_SETLKW),
+ XLAT(F_SETLKW),
 #endif
 #if defined(F_GETOWN) || (defined(HAVE_DECL_F_GETOWN) && HAVE_DECL_F_GETOWN)
-	XLAT(F_GETOWN),
+ XLAT(F_GETOWN),
 #endif
 #if defined(F_SETOWN) || (defined(HAVE_DECL_F_SETOWN) && HAVE_DECL_F_SETOWN)
-	XLAT(F_SETOWN),
+ XLAT(F_SETOWN),
 #endif
 #if defined(F_RSETLK) || (defined(HAVE_DECL_F_RSETLK) && HAVE_DECL_F_RSETLK)
-	XLAT(F_RSETLK),
+ XLAT(F_RSETLK),
 #endif
 #if defined(F_RSETLKW) || (defined(HAVE_DECL_F_RSETLKW) && HAVE_DECL_F_RSETLKW)
-	XLAT(F_RSETLKW),
+ XLAT(F_RSETLKW),
 #endif
 #if defined(F_RGETLK) || (defined(HAVE_DECL_F_RGETLK) && HAVE_DECL_F_RGETLK)
-	XLAT(F_RGETLK),
+ XLAT(F_RGETLK),
 #endif
 #if defined(F_CNVT) || (defined(HAVE_DECL_F_CNVT) && HAVE_DECL_F_CNVT)
-	XLAT(F_CNVT),
+ XLAT(F_CNVT),
 #endif
 #if defined(F_SETSIG) || (defined(HAVE_DECL_F_SETSIG) && HAVE_DECL_F_SETSIG)
-	XLAT(F_SETSIG),
+ XLAT(F_SETSIG),
 #endif
 #if defined(F_GETSIG) || (defined(HAVE_DECL_F_GETSIG) && HAVE_DECL_F_GETSIG)
-	XLAT(F_GETSIG),
+ XLAT(F_GETSIG),
 #endif
 #if defined(F_CHKFL) || (defined(HAVE_DECL_F_CHKFL) && HAVE_DECL_F_CHKFL)
-	XLAT(F_CHKFL),
+ XLAT(F_CHKFL),
 #endif
 #if defined(F_DUP2FD) || (defined(HAVE_DECL_F_DUP2FD) && HAVE_DECL_F_DUP2FD)
-	XLAT(F_DUP2FD),
+ XLAT(F_DUP2FD),
 #endif
 #if defined(F_ALLOCSP) || (defined(HAVE_DECL_F_ALLOCSP) && HAVE_DECL_F_ALLOCSP)
-	XLAT(F_ALLOCSP),
+ XLAT(F_ALLOCSP),
 #endif
 #if defined(F_ISSTREAM) || (defined(HAVE_DECL_F_ISSTREAM) && HAVE_DECL_F_ISSTREAM)
-	XLAT(F_ISSTREAM),
+ XLAT(F_ISSTREAM),
 #endif
 #if defined(F_PRIV) || (defined(HAVE_DECL_F_PRIV) && HAVE_DECL_F_PRIV)
-	XLAT(F_PRIV),
+ XLAT(F_PRIV),
 #endif
 #if defined(F_NPRIV) || (defined(HAVE_DECL_F_NPRIV) && HAVE_DECL_F_NPRIV)
-	XLAT(F_NPRIV),
+ XLAT(F_NPRIV),
 #endif
 #if defined(F_QUOTACL) || (defined(HAVE_DECL_F_QUOTACL) && HAVE_DECL_F_QUOTACL)
-	XLAT(F_QUOTACL),
+ XLAT(F_QUOTACL),
 #endif
 #if defined(F_BLOCKS) || (defined(HAVE_DECL_F_BLOCKS) && HAVE_DECL_F_BLOCKS)
-	XLAT(F_BLOCKS),
+ XLAT(F_BLOCKS),
 #endif
 #if defined(F_BLKSIZE) || (defined(HAVE_DECL_F_BLKSIZE) && HAVE_DECL_F_BLKSIZE)
-	XLAT(F_BLKSIZE),
+ XLAT(F_BLKSIZE),
 #endif
 #if defined(F_GETOWN) || (defined(HAVE_DECL_F_GETOWN) && HAVE_DECL_F_GETOWN)
-	XLAT(F_GETOWN),
+ XLAT(F_GETOWN),
 #endif
 #if defined(F_SETOWN) || (defined(HAVE_DECL_F_SETOWN) && HAVE_DECL_F_SETOWN)
-	XLAT(F_SETOWN),
+ XLAT(F_SETOWN),
 #endif
 #if defined(F_REVOKE) || (defined(HAVE_DECL_F_REVOKE) && HAVE_DECL_F_REVOKE)
-	XLAT(F_REVOKE),
+ XLAT(F_REVOKE),
 #endif
 #if defined(F_SETLK) || (defined(HAVE_DECL_F_SETLK) && HAVE_DECL_F_SETLK)
-	XLAT(F_SETLK),
+ XLAT(F_SETLK),
 #endif
 #if defined(F_SETLKW) || (defined(HAVE_DECL_F_SETLKW) && HAVE_DECL_F_SETLKW)
-	XLAT(F_SETLKW),
+ XLAT(F_SETLKW),
 #endif
 #if defined(F_GETLK) || (defined(HAVE_DECL_F_GETLK) && HAVE_DECL_F_GETLK)
-	XLAT(F_GETLK),
+ XLAT(F_GETLK),
 #endif
 #if defined(F_SETLK64) || (defined(HAVE_DECL_F_SETLK64) && HAVE_DECL_F_SETLK64)
-	XLAT(F_SETLK64),
+ XLAT(F_SETLK64),
 #endif
 #if defined(F_SETLKW64) || (defined(HAVE_DECL_F_SETLKW64) && HAVE_DECL_F_SETLKW64)
-	XLAT(F_SETLKW64),
+ XLAT(F_SETLKW64),
 #endif
 #if defined(F_GETLK64) || (defined(HAVE_DECL_F_GETLK64) && HAVE_DECL_F_GETLK64)
-	XLAT(F_GETLK64),
+ XLAT(F_GETLK64),
 #endif
 #if defined(F_SHARE) || (defined(HAVE_DECL_F_SHARE) && HAVE_DECL_F_SHARE)
-	XLAT(F_SHARE),
+ XLAT(F_SHARE),
 #endif
 #if defined(F_UNSHARE) || (defined(HAVE_DECL_F_UNSHARE) && HAVE_DECL_F_UNSHARE)
-	XLAT(F_UNSHARE),
+ XLAT(F_UNSHARE),
 #endif
 #if defined(F_SETLEASE) || (defined(HAVE_DECL_F_SETLEASE) && HAVE_DECL_F_SETLEASE)
-	XLAT(F_SETLEASE),
+ XLAT(F_SETLEASE),
 #endif
 #if defined(F_GETLEASE) || (defined(HAVE_DECL_F_GETLEASE) && HAVE_DECL_F_GETLEASE)
-	XLAT(F_GETLEASE),
+ XLAT(F_GETLEASE),
 #endif
 #if defined(F_NOTIFY) || (defined(HAVE_DECL_F_NOTIFY) && HAVE_DECL_F_NOTIFY)
-	XLAT(F_NOTIFY),
+ XLAT(F_NOTIFY),
 #endif
 #if defined(F_DUPFD_CLOEXEC) || (defined(HAVE_DECL_F_DUPFD_CLOEXEC) && HAVE_DECL_F_DUPFD_CLOEXEC)
-	XLAT(F_DUPFD_CLOEXEC),
+ XLAT(F_DUPFD_CLOEXEC),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/fdflags.h b/xlat/fdflags.h
index 085eb7d..cd44cb6 100644
--- a/xlat/fdflags.h
+++ b/xlat/fdflags.h
@@ -2,7 +2,7 @@
 
 static const struct xlat fdflags[] = {
 #if defined(FD_CLOEXEC) || (defined(HAVE_DECL_FD_CLOEXEC) && HAVE_DECL_FD_CLOEXEC)
-	XLAT(FD_CLOEXEC),
+ XLAT(FD_CLOEXEC),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/flockcmds.h b/xlat/flockcmds.h
index 1cdd912..ad8302a 100644
--- a/xlat/flockcmds.h
+++ b/xlat/flockcmds.h
@@ -2,16 +2,16 @@
 
 static const struct xlat flockcmds[] = {
 #if defined(LOCK_SH) || (defined(HAVE_DECL_LOCK_SH) && HAVE_DECL_LOCK_SH)
-	XLAT(LOCK_SH),
+ XLAT(LOCK_SH),
 #endif
 #if defined(LOCK_EX) || (defined(HAVE_DECL_LOCK_EX) && HAVE_DECL_LOCK_EX)
-	XLAT(LOCK_EX),
+ XLAT(LOCK_EX),
 #endif
 #if defined(LOCK_NB) || (defined(HAVE_DECL_LOCK_NB) && HAVE_DECL_LOCK_NB)
-	XLAT(LOCK_NB),
+ XLAT(LOCK_NB),
 #endif
 #if defined(LOCK_UN) || (defined(HAVE_DECL_LOCK_UN) && HAVE_DECL_LOCK_UN)
-	XLAT(LOCK_UN),
+ XLAT(LOCK_UN),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/fsmagic.h b/xlat/fsmagic.h
index 48aa95d..6a16baf 100644
--- a/xlat/fsmagic.h
+++ b/xlat/fsmagic.h
@@ -69,5 +69,5 @@
 { 0xf2f52010,	"F2FS_SUPER_MAGIC"	},
 { 0xf97cff8c,	"SELINUX_MAGIC"		},
 { 0xf995e849,	"HPFS_SUPER_MAGIC"	},
-  /* this array should remain not NULL-terminated */
+ /* this array should remain not NULL-terminated */
 };
diff --git a/xlat/futexops.h b/xlat/futexops.h
index f130bca..1272ee4 100644
--- a/xlat/futexops.h
+++ b/xlat/futexops.h
@@ -2,94 +2,94 @@
 
 static const struct xlat futexops[] = {
 #if defined(FUTEX_WAIT) || (defined(HAVE_DECL_FUTEX_WAIT) && HAVE_DECL_FUTEX_WAIT)
-	XLAT(FUTEX_WAIT),
+ XLAT(FUTEX_WAIT),
 #endif
 #if defined(FUTEX_WAKE) || (defined(HAVE_DECL_FUTEX_WAKE) && HAVE_DECL_FUTEX_WAKE)
-	XLAT(FUTEX_WAKE),
+ XLAT(FUTEX_WAKE),
 #endif
 #if defined(FUTEX_FD) || (defined(HAVE_DECL_FUTEX_FD) && HAVE_DECL_FUTEX_FD)
-	XLAT(FUTEX_FD),
+ XLAT(FUTEX_FD),
 #endif
 #if defined(FUTEX_REQUEUE) || (defined(HAVE_DECL_FUTEX_REQUEUE) && HAVE_DECL_FUTEX_REQUEUE)
-	XLAT(FUTEX_REQUEUE),
+ XLAT(FUTEX_REQUEUE),
 #endif
 #if defined(FUTEX_CMP_REQUEUE) || (defined(HAVE_DECL_FUTEX_CMP_REQUEUE) && HAVE_DECL_FUTEX_CMP_REQUEUE)
-	XLAT(FUTEX_CMP_REQUEUE),
+ XLAT(FUTEX_CMP_REQUEUE),
 #endif
 #if defined(FUTEX_WAKE_OP) || (defined(HAVE_DECL_FUTEX_WAKE_OP) && HAVE_DECL_FUTEX_WAKE_OP)
-	XLAT(FUTEX_WAKE_OP),
+ XLAT(FUTEX_WAKE_OP),
 #endif
 #if defined(FUTEX_LOCK_PI) || (defined(HAVE_DECL_FUTEX_LOCK_PI) && HAVE_DECL_FUTEX_LOCK_PI)
-	XLAT(FUTEX_LOCK_PI),
+ XLAT(FUTEX_LOCK_PI),
 #endif
 #if defined(FUTEX_UNLOCK_PI) || (defined(HAVE_DECL_FUTEX_UNLOCK_PI) && HAVE_DECL_FUTEX_UNLOCK_PI)
-	XLAT(FUTEX_UNLOCK_PI),
+ XLAT(FUTEX_UNLOCK_PI),
 #endif
 #if defined(FUTEX_TRYLOCK_PI) || (defined(HAVE_DECL_FUTEX_TRYLOCK_PI) && HAVE_DECL_FUTEX_TRYLOCK_PI)
-	XLAT(FUTEX_TRYLOCK_PI),
+ XLAT(FUTEX_TRYLOCK_PI),
 #endif
 #if defined(FUTEX_WAIT_BITSET) || (defined(HAVE_DECL_FUTEX_WAIT_BITSET) && HAVE_DECL_FUTEX_WAIT_BITSET)
-	XLAT(FUTEX_WAIT_BITSET),
+ XLAT(FUTEX_WAIT_BITSET),
 #endif
 #if defined(FUTEX_WAKE_BITSET) || (defined(HAVE_DECL_FUTEX_WAKE_BITSET) && HAVE_DECL_FUTEX_WAKE_BITSET)
-	XLAT(FUTEX_WAKE_BITSET),
+ XLAT(FUTEX_WAKE_BITSET),
 #endif
 #if defined(FUTEX_WAIT_REQUEUE_PI) || (defined(HAVE_DECL_FUTEX_WAIT_REQUEUE_PI) && HAVE_DECL_FUTEX_WAIT_REQUEUE_PI)
-	XLAT(FUTEX_WAIT_REQUEUE_PI),
+ XLAT(FUTEX_WAIT_REQUEUE_PI),
 #endif
 #if defined(FUTEX_CMP_REQUEUE_PI) || (defined(HAVE_DECL_FUTEX_CMP_REQUEUE_PI) && HAVE_DECL_FUTEX_CMP_REQUEUE_PI)
-	XLAT(FUTEX_CMP_REQUEUE_PI),
+ XLAT(FUTEX_CMP_REQUEUE_PI),
 #endif
 #if defined(FUTEX_WAIT_PRIVATE) || (defined(HAVE_DECL_FUTEX_WAIT_PRIVATE) && HAVE_DECL_FUTEX_WAIT_PRIVATE)
-	XLAT(FUTEX_WAIT_PRIVATE),
+ XLAT(FUTEX_WAIT_PRIVATE),
 #endif
 #if defined(FUTEX_WAKE_PRIVATE) || (defined(HAVE_DECL_FUTEX_WAKE_PRIVATE) && HAVE_DECL_FUTEX_WAKE_PRIVATE)
-	XLAT(FUTEX_WAKE_PRIVATE),
+ XLAT(FUTEX_WAKE_PRIVATE),
 #endif
 #if defined(FUTEX_FD) || (defined(HAVE_DECL_FUTEX_FD) && HAVE_DECL_FUTEX_FD)
-	XLAT(FUTEX_FD|FUTEX_PRIVATE_FLAG),
+ XLAT(FUTEX_FD|FUTEX_PRIVATE_FLAG),
 #endif
 #if defined(FUTEX_REQUEUE_PRIVATE) || (defined(HAVE_DECL_FUTEX_REQUEUE_PRIVATE) && HAVE_DECL_FUTEX_REQUEUE_PRIVATE)
-	XLAT(FUTEX_REQUEUE_PRIVATE),
+ XLAT(FUTEX_REQUEUE_PRIVATE),
 #endif
 #if defined(FUTEX_CMP_REQUEUE_PRIVATE) || (defined(HAVE_DECL_FUTEX_CMP_REQUEUE_PRIVATE) && HAVE_DECL_FUTEX_CMP_REQUEUE_PRIVATE)
-	XLAT(FUTEX_CMP_REQUEUE_PRIVATE),
+ XLAT(FUTEX_CMP_REQUEUE_PRIVATE),
 #endif
 #if defined(FUTEX_WAKE_OP_PRIVATE) || (defined(HAVE_DECL_FUTEX_WAKE_OP_PRIVATE) && HAVE_DECL_FUTEX_WAKE_OP_PRIVATE)
-	XLAT(FUTEX_WAKE_OP_PRIVATE),
+ XLAT(FUTEX_WAKE_OP_PRIVATE),
 #endif
 #if defined(FUTEX_LOCK_PI_PRIVATE) || (defined(HAVE_DECL_FUTEX_LOCK_PI_PRIVATE) && HAVE_DECL_FUTEX_LOCK_PI_PRIVATE)
-	XLAT(FUTEX_LOCK_PI_PRIVATE),
+ XLAT(FUTEX_LOCK_PI_PRIVATE),
 #endif
 #if defined(FUTEX_UNLOCK_PI_PRIVATE) || (defined(HAVE_DECL_FUTEX_UNLOCK_PI_PRIVATE) && HAVE_DECL_FUTEX_UNLOCK_PI_PRIVATE)
-	XLAT(FUTEX_UNLOCK_PI_PRIVATE),
+ XLAT(FUTEX_UNLOCK_PI_PRIVATE),
 #endif
 #if defined(FUTEX_TRYLOCK_PI_PRIVATE) || (defined(HAVE_DECL_FUTEX_TRYLOCK_PI_PRIVATE) && HAVE_DECL_FUTEX_TRYLOCK_PI_PRIVATE)
-	XLAT(FUTEX_TRYLOCK_PI_PRIVATE),
+ XLAT(FUTEX_TRYLOCK_PI_PRIVATE),
 #endif
 #if defined(FUTEX_WAIT_BITSET_PRIVATE) || (defined(HAVE_DECL_FUTEX_WAIT_BITSET_PRIVATE) && HAVE_DECL_FUTEX_WAIT_BITSET_PRIVATE)
-	XLAT(FUTEX_WAIT_BITSET_PRIVATE),
+ XLAT(FUTEX_WAIT_BITSET_PRIVATE),
 #endif
 #if defined(FUTEX_WAKE_BITSET_PRIVATE) || (defined(HAVE_DECL_FUTEX_WAKE_BITSET_PRIVATE) && HAVE_DECL_FUTEX_WAKE_BITSET_PRIVATE)
-	XLAT(FUTEX_WAKE_BITSET_PRIVATE),
+ XLAT(FUTEX_WAKE_BITSET_PRIVATE),
 #endif
 #if defined(FUTEX_WAIT_REQUEUE_PI_PRIVATE) || (defined(HAVE_DECL_FUTEX_WAIT_REQUEUE_PI_PRIVATE) && HAVE_DECL_FUTEX_WAIT_REQUEUE_PI_PRIVATE)
-	XLAT(FUTEX_WAIT_REQUEUE_PI_PRIVATE),
+ XLAT(FUTEX_WAIT_REQUEUE_PI_PRIVATE),
 #endif
 #if defined(FUTEX_CMP_REQUEUE_PI_PRIVATE) || (defined(HAVE_DECL_FUTEX_CMP_REQUEUE_PI_PRIVATE) && HAVE_DECL_FUTEX_CMP_REQUEUE_PI_PRIVATE)
-	XLAT(FUTEX_CMP_REQUEUE_PI_PRIVATE),
+ XLAT(FUTEX_CMP_REQUEUE_PI_PRIVATE),
 #endif
 #if defined(FUTEX_WAIT_BITSET) || (defined(HAVE_DECL_FUTEX_WAIT_BITSET) && HAVE_DECL_FUTEX_WAIT_BITSET)
-	XLAT(FUTEX_WAIT_BITSET|FUTEX_CLOCK_REALTIME),
+ XLAT(FUTEX_WAIT_BITSET|FUTEX_CLOCK_REALTIME),
 #endif
 #if defined(FUTEX_WAIT_BITSET_PRIVATE) || (defined(HAVE_DECL_FUTEX_WAIT_BITSET_PRIVATE) && HAVE_DECL_FUTEX_WAIT_BITSET_PRIVATE)
-	XLAT(FUTEX_WAIT_BITSET_PRIVATE|FUTEX_CLOCK_REALTIME),
+ XLAT(FUTEX_WAIT_BITSET_PRIVATE|FUTEX_CLOCK_REALTIME),
 #endif
 #if defined(FUTEX_WAIT_REQUEUE_PI) || (defined(HAVE_DECL_FUTEX_WAIT_REQUEUE_PI) && HAVE_DECL_FUTEX_WAIT_REQUEUE_PI)
-	XLAT(FUTEX_WAIT_REQUEUE_PI|FUTEX_CLOCK_REALTIME),
+ XLAT(FUTEX_WAIT_REQUEUE_PI|FUTEX_CLOCK_REALTIME),
 #endif
 #if defined(FUTEX_WAIT_REQUEUE_PI_PRIVATE) || (defined(HAVE_DECL_FUTEX_WAIT_REQUEUE_PI_PRIVATE) && HAVE_DECL_FUTEX_WAIT_REQUEUE_PI_PRIVATE)
-	XLAT(FUTEX_WAIT_REQUEUE_PI_PRIVATE|FUTEX_CLOCK_REALTIME),
+ XLAT(FUTEX_WAIT_REQUEUE_PI_PRIVATE|FUTEX_CLOCK_REALTIME),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/futexwakecmps.h b/xlat/futexwakecmps.h
index a99a6f5..5917d6a 100644
--- a/xlat/futexwakecmps.h
+++ b/xlat/futexwakecmps.h
@@ -2,22 +2,22 @@
 
 static const struct xlat futexwakecmps[] = {
 #if defined(FUTEX_OP_CMP_EQ) || (defined(HAVE_DECL_FUTEX_OP_CMP_EQ) && HAVE_DECL_FUTEX_OP_CMP_EQ)
-	XLAT(FUTEX_OP_CMP_EQ),
+ XLAT(FUTEX_OP_CMP_EQ),
 #endif
 #if defined(FUTEX_OP_CMP_NE) || (defined(HAVE_DECL_FUTEX_OP_CMP_NE) && HAVE_DECL_FUTEX_OP_CMP_NE)
-	XLAT(FUTEX_OP_CMP_NE),
+ XLAT(FUTEX_OP_CMP_NE),
 #endif
 #if defined(FUTEX_OP_CMP_LT) || (defined(HAVE_DECL_FUTEX_OP_CMP_LT) && HAVE_DECL_FUTEX_OP_CMP_LT)
-	XLAT(FUTEX_OP_CMP_LT),
+ XLAT(FUTEX_OP_CMP_LT),
 #endif
 #if defined(FUTEX_OP_CMP_LE) || (defined(HAVE_DECL_FUTEX_OP_CMP_LE) && HAVE_DECL_FUTEX_OP_CMP_LE)
-	XLAT(FUTEX_OP_CMP_LE),
+ XLAT(FUTEX_OP_CMP_LE),
 #endif
 #if defined(FUTEX_OP_CMP_GT) || (defined(HAVE_DECL_FUTEX_OP_CMP_GT) && HAVE_DECL_FUTEX_OP_CMP_GT)
-	XLAT(FUTEX_OP_CMP_GT),
+ XLAT(FUTEX_OP_CMP_GT),
 #endif
 #if defined(FUTEX_OP_CMP_GE) || (defined(HAVE_DECL_FUTEX_OP_CMP_GE) && HAVE_DECL_FUTEX_OP_CMP_GE)
-	XLAT(FUTEX_OP_CMP_GE),
+ XLAT(FUTEX_OP_CMP_GE),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/futexwakeops.h b/xlat/futexwakeops.h
index e0a0f40..20eccba 100644
--- a/xlat/futexwakeops.h
+++ b/xlat/futexwakeops.h
@@ -2,19 +2,19 @@
 
 static const struct xlat futexwakeops[] = {
 #if defined(FUTEX_OP_SET) || (defined(HAVE_DECL_FUTEX_OP_SET) && HAVE_DECL_FUTEX_OP_SET)
-	XLAT(FUTEX_OP_SET),
+ XLAT(FUTEX_OP_SET),
 #endif
 #if defined(FUTEX_OP_ADD) || (defined(HAVE_DECL_FUTEX_OP_ADD) && HAVE_DECL_FUTEX_OP_ADD)
-	XLAT(FUTEX_OP_ADD),
+ XLAT(FUTEX_OP_ADD),
 #endif
 #if defined(FUTEX_OP_OR) || (defined(HAVE_DECL_FUTEX_OP_OR) && HAVE_DECL_FUTEX_OP_OR)
-	XLAT(FUTEX_OP_OR),
+ XLAT(FUTEX_OP_OR),
 #endif
 #if defined(FUTEX_OP_ANDN) || (defined(HAVE_DECL_FUTEX_OP_ANDN) && HAVE_DECL_FUTEX_OP_ANDN)
-	XLAT(FUTEX_OP_ANDN),
+ XLAT(FUTEX_OP_ANDN),
 #endif
 #if defined(FUTEX_OP_XOR) || (defined(HAVE_DECL_FUTEX_OP_XOR) && HAVE_DECL_FUTEX_OP_XOR)
-	XLAT(FUTEX_OP_XOR),
+ XLAT(FUTEX_OP_XOR),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/icmpfilterflags.h b/xlat/icmpfilterflags.h
index 872438c..cd1f184 100644
--- a/xlat/icmpfilterflags.h
+++ b/xlat/icmpfilterflags.h
@@ -2,43 +2,43 @@
 
 static const struct xlat icmpfilterflags[] = {
 #if defined(ICMP_ECHOREPLY) || (defined(HAVE_DECL_ICMP_ECHOREPLY) && HAVE_DECL_ICMP_ECHOREPLY)
-	{ 1<<ICMP_ECHOREPLY, "ICMP_ECHOREPLY" },
+  { 1<<ICMP_ECHOREPLY, "ICMP_ECHOREPLY" },
 #endif
 #if defined(ICMP_DEST_UNREACH) || (defined(HAVE_DECL_ICMP_DEST_UNREACH) && HAVE_DECL_ICMP_DEST_UNREACH)
-	{ 1<<ICMP_DEST_UNREACH, "ICMP_DEST_UNREACH" },
+  { 1<<ICMP_DEST_UNREACH, "ICMP_DEST_UNREACH" },
 #endif
 #if defined(ICMP_SOURCE_QUENCH) || (defined(HAVE_DECL_ICMP_SOURCE_QUENCH) && HAVE_DECL_ICMP_SOURCE_QUENCH)
-	{ 1<<ICMP_SOURCE_QUENCH, "ICMP_SOURCE_QUENCH" },
+  { 1<<ICMP_SOURCE_QUENCH, "ICMP_SOURCE_QUENCH" },
 #endif
 #if defined(ICMP_REDIRECT) || (defined(HAVE_DECL_ICMP_REDIRECT) && HAVE_DECL_ICMP_REDIRECT)
-	{ 1<<ICMP_REDIRECT, "ICMP_REDIRECT" },
+  { 1<<ICMP_REDIRECT, "ICMP_REDIRECT" },
 #endif
 #if defined(ICMP_ECHO) || (defined(HAVE_DECL_ICMP_ECHO) && HAVE_DECL_ICMP_ECHO)
-	{ 1<<ICMP_ECHO, "ICMP_ECHO" },
+  { 1<<ICMP_ECHO, "ICMP_ECHO" },
 #endif
 #if defined(ICMP_TIME_EXCEEDED) || (defined(HAVE_DECL_ICMP_TIME_EXCEEDED) && HAVE_DECL_ICMP_TIME_EXCEEDED)
-	{ 1<<ICMP_TIME_EXCEEDED, "ICMP_TIME_EXCEEDED" },
+  { 1<<ICMP_TIME_EXCEEDED, "ICMP_TIME_EXCEEDED" },
 #endif
 #if defined(ICMP_PARAMETERPROB) || (defined(HAVE_DECL_ICMP_PARAMETERPROB) && HAVE_DECL_ICMP_PARAMETERPROB)
-	{ 1<<ICMP_PARAMETERPROB, "ICMP_PARAMETERPROB" },
+  { 1<<ICMP_PARAMETERPROB, "ICMP_PARAMETERPROB" },
 #endif
 #if defined(ICMP_TIMESTAMP) || (defined(HAVE_DECL_ICMP_TIMESTAMP) && HAVE_DECL_ICMP_TIMESTAMP)
-	{ 1<<ICMP_TIMESTAMP, "ICMP_TIMESTAMP" },
+  { 1<<ICMP_TIMESTAMP, "ICMP_TIMESTAMP" },
 #endif
 #if defined(ICMP_TIMESTAMPREPLY) || (defined(HAVE_DECL_ICMP_TIMESTAMPREPLY) && HAVE_DECL_ICMP_TIMESTAMPREPLY)
-	{ 1<<ICMP_TIMESTAMPREPLY, "ICMP_TIMESTAMPREPLY" },
+  { 1<<ICMP_TIMESTAMPREPLY, "ICMP_TIMESTAMPREPLY" },
 #endif
 #if defined(ICMP_INFO_REQUEST) || (defined(HAVE_DECL_ICMP_INFO_REQUEST) && HAVE_DECL_ICMP_INFO_REQUEST)
-	{ 1<<ICMP_INFO_REQUEST, "ICMP_INFO_REQUEST" },
+  { 1<<ICMP_INFO_REQUEST, "ICMP_INFO_REQUEST" },
 #endif
 #if defined(ICMP_INFO_REPLY) || (defined(HAVE_DECL_ICMP_INFO_REPLY) && HAVE_DECL_ICMP_INFO_REPLY)
-	{ 1<<ICMP_INFO_REPLY, "ICMP_INFO_REPLY" },
+  { 1<<ICMP_INFO_REPLY, "ICMP_INFO_REPLY" },
 #endif
 #if defined(ICMP_ADDRESS) || (defined(HAVE_DECL_ICMP_ADDRESS) && HAVE_DECL_ICMP_ADDRESS)
-	{ 1<<ICMP_ADDRESS, "ICMP_ADDRESS" },
+  { 1<<ICMP_ADDRESS, "ICMP_ADDRESS" },
 #endif
 #if defined(ICMP_ADDRESSREPLY) || (defined(HAVE_DECL_ICMP_ADDRESSREPLY) && HAVE_DECL_ICMP_ADDRESSREPLY)
-	{ 1<<ICMP_ADDRESSREPLY, "ICMP_ADDRESSREPLY" },
+  { 1<<ICMP_ADDRESSREPLY, "ICMP_ADDRESSREPLY" },
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/if_dqblk_valid.h b/xlat/if_dqblk_valid.h
index 2de9378..112251b 100644
--- a/xlat/if_dqblk_valid.h
+++ b/xlat/if_dqblk_valid.h
@@ -2,22 +2,22 @@
 
 static const struct xlat if_dqblk_valid[] = {
 #if defined(QIF_BLIMITS) || (defined(HAVE_DECL_QIF_BLIMITS) && HAVE_DECL_QIF_BLIMITS)
-	XLAT(QIF_BLIMITS),
+ XLAT(QIF_BLIMITS),
 #endif
 #if defined(QIF_SPACE) || (defined(HAVE_DECL_QIF_SPACE) && HAVE_DECL_QIF_SPACE)
-	XLAT(QIF_SPACE),
+ XLAT(QIF_SPACE),
 #endif
 #if defined(QIF_ILIMITS) || (defined(HAVE_DECL_QIF_ILIMITS) && HAVE_DECL_QIF_ILIMITS)
-	XLAT(QIF_ILIMITS),
+ XLAT(QIF_ILIMITS),
 #endif
 #if defined(QIF_INODES) || (defined(HAVE_DECL_QIF_INODES) && HAVE_DECL_QIF_INODES)
-	XLAT(QIF_INODES),
+ XLAT(QIF_INODES),
 #endif
 #if defined(QIF_BTIME) || (defined(HAVE_DECL_QIF_BTIME) && HAVE_DECL_QIF_BTIME)
-	XLAT(QIF_BTIME),
+ XLAT(QIF_BTIME),
 #endif
 #if defined(QIF_ITIME) || (defined(HAVE_DECL_QIF_ITIME) && HAVE_DECL_QIF_ITIME)
-	XLAT(QIF_ITIME),
+ XLAT(QIF_ITIME),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/if_dqinfo_valid.h b/xlat/if_dqinfo_valid.h
index d330267..982213f 100644
--- a/xlat/if_dqinfo_valid.h
+++ b/xlat/if_dqinfo_valid.h
@@ -2,13 +2,13 @@
 
 static const struct xlat if_dqinfo_valid[] = {
 #if defined(IIF_BGRACE) || (defined(HAVE_DECL_IIF_BGRACE) && HAVE_DECL_IIF_BGRACE)
-	XLAT(IIF_BGRACE),
+ XLAT(IIF_BGRACE),
 #endif
 #if defined(IIF_IGRACE) || (defined(HAVE_DECL_IIF_IGRACE) && HAVE_DECL_IIF_IGRACE)
-	XLAT(IIF_IGRACE),
+ XLAT(IIF_IGRACE),
 #endif
 #if defined(IIF_FLAGS) || (defined(HAVE_DECL_IIF_FLAGS) && HAVE_DECL_IIF_FLAGS)
-	XLAT(IIF_FLAGS),
+ XLAT(IIF_FLAGS),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/iffflags.h b/xlat/iffflags.h
index 0b9de3f..c37bc84 100644
--- a/xlat/iffflags.h
+++ b/xlat/iffflags.h
@@ -2,49 +2,49 @@
 
 static const struct xlat iffflags[] = {
 #if defined(IFF_UP) || (defined(HAVE_DECL_IFF_UP) && HAVE_DECL_IFF_UP)
-	XLAT(IFF_UP),
+ XLAT(IFF_UP),
 #endif
 #if defined(IFF_BROADCAST) || (defined(HAVE_DECL_IFF_BROADCAST) && HAVE_DECL_IFF_BROADCAST)
-	XLAT(IFF_BROADCAST),
+ XLAT(IFF_BROADCAST),
 #endif
 #if defined(IFF_DEBUG) || (defined(HAVE_DECL_IFF_DEBUG) && HAVE_DECL_IFF_DEBUG)
-	XLAT(IFF_DEBUG),
+ XLAT(IFF_DEBUG),
 #endif
 #if defined(IFF_LOOPBACK) || (defined(HAVE_DECL_IFF_LOOPBACK) && HAVE_DECL_IFF_LOOPBACK)
-	XLAT(IFF_LOOPBACK),
+ XLAT(IFF_LOOPBACK),
 #endif
 #if defined(IFF_POINTOPOINT) || (defined(HAVE_DECL_IFF_POINTOPOINT) && HAVE_DECL_IFF_POINTOPOINT)
-	XLAT(IFF_POINTOPOINT),
+ XLAT(IFF_POINTOPOINT),
 #endif
 #if defined(IFF_NOTRAILERS) || (defined(HAVE_DECL_IFF_NOTRAILERS) && HAVE_DECL_IFF_NOTRAILERS)
-	XLAT(IFF_NOTRAILERS),
+ XLAT(IFF_NOTRAILERS),
 #endif
 #if defined(IFF_RUNNING) || (defined(HAVE_DECL_IFF_RUNNING) && HAVE_DECL_IFF_RUNNING)
-	XLAT(IFF_RUNNING),
+ XLAT(IFF_RUNNING),
 #endif
 #if defined(IFF_NOARP) || (defined(HAVE_DECL_IFF_NOARP) && HAVE_DECL_IFF_NOARP)
-	XLAT(IFF_NOARP),
+ XLAT(IFF_NOARP),
 #endif
 #if defined(IFF_PROMISC) || (defined(HAVE_DECL_IFF_PROMISC) && HAVE_DECL_IFF_PROMISC)
-	XLAT(IFF_PROMISC),
+ XLAT(IFF_PROMISC),
 #endif
 #if defined(IFF_ALLMULTI) || (defined(HAVE_DECL_IFF_ALLMULTI) && HAVE_DECL_IFF_ALLMULTI)
-	XLAT(IFF_ALLMULTI),
+ XLAT(IFF_ALLMULTI),
 #endif
 #if defined(IFF_MASTER) || (defined(HAVE_DECL_IFF_MASTER) && HAVE_DECL_IFF_MASTER)
-	XLAT(IFF_MASTER),
+ XLAT(IFF_MASTER),
 #endif
 #if defined(IFF_SLAVE) || (defined(HAVE_DECL_IFF_SLAVE) && HAVE_DECL_IFF_SLAVE)
-	XLAT(IFF_SLAVE),
+ XLAT(IFF_SLAVE),
 #endif
 #if defined(IFF_MULTICAST) || (defined(HAVE_DECL_IFF_MULTICAST) && HAVE_DECL_IFF_MULTICAST)
-	XLAT(IFF_MULTICAST),
+ XLAT(IFF_MULTICAST),
 #endif
 #if defined(IFF_PORTSEL) || (defined(HAVE_DECL_IFF_PORTSEL) && HAVE_DECL_IFF_PORTSEL)
-	XLAT(IFF_PORTSEL),
+ XLAT(IFF_PORTSEL),
 #endif
 #if defined(IFF_AUTOMEDIA) || (defined(HAVE_DECL_IFF_AUTOMEDIA) && HAVE_DECL_IFF_AUTOMEDIA)
-	XLAT(IFF_AUTOMEDIA),
+ XLAT(IFF_AUTOMEDIA),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/inet_protocols.h b/xlat/inet_protocols.h
index 54ed5f7..5e969ff 100644
--- a/xlat/inet_protocols.h
+++ b/xlat/inet_protocols.h
@@ -2,100 +2,100 @@
 
 static const struct xlat inet_protocols[] = {
 #if defined(IPPROTO_IP) || (defined(HAVE_DECL_IPPROTO_IP) && HAVE_DECL_IPPROTO_IP)
-	XLAT(IPPROTO_IP),
+ XLAT(IPPROTO_IP),
 #endif
 #if defined(IPPROTO_ICMP) || (defined(HAVE_DECL_IPPROTO_ICMP) && HAVE_DECL_IPPROTO_ICMP)
-	XLAT(IPPROTO_ICMP),
+ XLAT(IPPROTO_ICMP),
 #endif
 #if defined(IPPROTO_TCP) || (defined(HAVE_DECL_IPPROTO_TCP) && HAVE_DECL_IPPROTO_TCP)
-	XLAT(IPPROTO_TCP),
+ XLAT(IPPROTO_TCP),
 #endif
 #if defined(IPPROTO_UDP) || (defined(HAVE_DECL_IPPROTO_UDP) && HAVE_DECL_IPPROTO_UDP)
-	XLAT(IPPROTO_UDP),
+ XLAT(IPPROTO_UDP),
 #endif
 #if defined(IPPROTO_IGMP) || (defined(HAVE_DECL_IPPROTO_IGMP) && HAVE_DECL_IPPROTO_IGMP)
-	XLAT(IPPROTO_IGMP),
+ XLAT(IPPROTO_IGMP),
 #endif
 #if defined(IPPROTO_GGP) || (defined(HAVE_DECL_IPPROTO_GGP) && HAVE_DECL_IPPROTO_GGP)
-	XLAT(IPPROTO_GGP),
+ XLAT(IPPROTO_GGP),
 #endif
 #if defined(IPPROTO_IPIP) || (defined(HAVE_DECL_IPPROTO_IPIP) && HAVE_DECL_IPPROTO_IPIP)
-	XLAT(IPPROTO_IPIP),
+ XLAT(IPPROTO_IPIP),
 #endif
 #if defined(IPPROTO_EGP) || (defined(HAVE_DECL_IPPROTO_EGP) && HAVE_DECL_IPPROTO_EGP)
-	XLAT(IPPROTO_EGP),
+ XLAT(IPPROTO_EGP),
 #endif
 #if defined(IPPROTO_PUP) || (defined(HAVE_DECL_IPPROTO_PUP) && HAVE_DECL_IPPROTO_PUP)
-	XLAT(IPPROTO_PUP),
+ XLAT(IPPROTO_PUP),
 #endif
 #if defined(IPPROTO_IDP) || (defined(HAVE_DECL_IPPROTO_IDP) && HAVE_DECL_IPPROTO_IDP)
-	XLAT(IPPROTO_IDP),
+ XLAT(IPPROTO_IDP),
 #endif
 #if defined(IPPROTO_TP) || (defined(HAVE_DECL_IPPROTO_TP) && HAVE_DECL_IPPROTO_TP)
-	XLAT(IPPROTO_TP),
+ XLAT(IPPROTO_TP),
 #endif
 #if defined(IPPROTO_DCCP) || (defined(HAVE_DECL_IPPROTO_DCCP) && HAVE_DECL_IPPROTO_DCCP)
-	XLAT(IPPROTO_DCCP),
+ XLAT(IPPROTO_DCCP),
 #endif
 #if defined(IPPROTO_IPV6) || (defined(HAVE_DECL_IPPROTO_IPV6) && HAVE_DECL_IPPROTO_IPV6)
-	XLAT(IPPROTO_IPV6),
+ XLAT(IPPROTO_IPV6),
 #endif
 #if defined(IPPROTO_ROUTING) || (defined(HAVE_DECL_IPPROTO_ROUTING) && HAVE_DECL_IPPROTO_ROUTING)
-	XLAT(IPPROTO_ROUTING),
+ XLAT(IPPROTO_ROUTING),
 #endif
 #if defined(IPPROTO_FRAGMENT) || (defined(HAVE_DECL_IPPROTO_FRAGMENT) && HAVE_DECL_IPPROTO_FRAGMENT)
-	XLAT(IPPROTO_FRAGMENT),
+ XLAT(IPPROTO_FRAGMENT),
 #endif
 #if defined(IPPROTO_RSVP) || (defined(HAVE_DECL_IPPROTO_RSVP) && HAVE_DECL_IPPROTO_RSVP)
-	XLAT(IPPROTO_RSVP),
+ XLAT(IPPROTO_RSVP),
 #endif
 #if defined(IPPROTO_GRE) || (defined(HAVE_DECL_IPPROTO_GRE) && HAVE_DECL_IPPROTO_GRE)
-	XLAT(IPPROTO_GRE),
+ XLAT(IPPROTO_GRE),
 #endif
 #if defined(IPPROTO_ESP) || (defined(HAVE_DECL_IPPROTO_ESP) && HAVE_DECL_IPPROTO_ESP)
-	XLAT(IPPROTO_ESP),
+ XLAT(IPPROTO_ESP),
 #endif
 #if defined(IPPROTO_AH) || (defined(HAVE_DECL_IPPROTO_AH) && HAVE_DECL_IPPROTO_AH)
-	XLAT(IPPROTO_AH),
+ XLAT(IPPROTO_AH),
 #endif
 #if defined(IPPROTO_ICMPV6) || (defined(HAVE_DECL_IPPROTO_ICMPV6) && HAVE_DECL_IPPROTO_ICMPV6)
-	XLAT(IPPROTO_ICMPV6),
+ XLAT(IPPROTO_ICMPV6),
 #endif
 #if defined(IPPROTO_NONE) || (defined(HAVE_DECL_IPPROTO_NONE) && HAVE_DECL_IPPROTO_NONE)
-	XLAT(IPPROTO_NONE),
+ XLAT(IPPROTO_NONE),
 #endif
 #if defined(IPPROTO_DSTOPTS) || (defined(HAVE_DECL_IPPROTO_DSTOPTS) && HAVE_DECL_IPPROTO_DSTOPTS)
-	XLAT(IPPROTO_DSTOPTS),
+ XLAT(IPPROTO_DSTOPTS),
 #endif
 #if defined(IPPROTO_HELLO) || (defined(HAVE_DECL_IPPROTO_HELLO) && HAVE_DECL_IPPROTO_HELLO)
-	XLAT(IPPROTO_HELLO),
+ XLAT(IPPROTO_HELLO),
 #endif
 #if defined(IPPROTO_ND) || (defined(HAVE_DECL_IPPROTO_ND) && HAVE_DECL_IPPROTO_ND)
-	XLAT(IPPROTO_ND),
+ XLAT(IPPROTO_ND),
 #endif
 #if defined(IPPROTO_MTP) || (defined(HAVE_DECL_IPPROTO_MTP) && HAVE_DECL_IPPROTO_MTP)
-	XLAT(IPPROTO_MTP),
+ XLAT(IPPROTO_MTP),
 #endif
 #if defined(IPPROTO_ENCAP) || (defined(HAVE_DECL_IPPROTO_ENCAP) && HAVE_DECL_IPPROTO_ENCAP)
-	XLAT(IPPROTO_ENCAP),
+ XLAT(IPPROTO_ENCAP),
 #endif
 #if defined(IPPROTO_PIM) || (defined(HAVE_DECL_IPPROTO_PIM) && HAVE_DECL_IPPROTO_PIM)
-	XLAT(IPPROTO_PIM),
+ XLAT(IPPROTO_PIM),
 #endif
 #if defined(IPPROTO_COMP) || (defined(HAVE_DECL_IPPROTO_COMP) && HAVE_DECL_IPPROTO_COMP)
-	XLAT(IPPROTO_COMP),
+ XLAT(IPPROTO_COMP),
 #endif
 #if defined(IPPROTO_SCTP) || (defined(HAVE_DECL_IPPROTO_SCTP) && HAVE_DECL_IPPROTO_SCTP)
-	XLAT(IPPROTO_SCTP),
+ XLAT(IPPROTO_SCTP),
 #endif
 #if defined(IPPROTO_UDPLITE) || (defined(HAVE_DECL_IPPROTO_UDPLITE) && HAVE_DECL_IPPROTO_UDPLITE)
-	XLAT(IPPROTO_UDPLITE),
+ XLAT(IPPROTO_UDPLITE),
 #endif
 #if defined(IPPROTO_RAW) || (defined(HAVE_DECL_IPPROTO_RAW) && HAVE_DECL_IPPROTO_RAW)
-	XLAT(IPPROTO_RAW),
+ XLAT(IPPROTO_RAW),
 #endif
 #if defined(IPPROTO_MAX) || (defined(HAVE_DECL_IPPROTO_MAX) && HAVE_DECL_IPPROTO_MAX)
-	XLAT(IPPROTO_MAX),
+ XLAT(IPPROTO_MAX),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/inotify_flags.h b/xlat/inotify_flags.h
index 847222d..27e4f64 100644
--- a/xlat/inotify_flags.h
+++ b/xlat/inotify_flags.h
@@ -1,74 +1,89 @@
 /* Generated by ./xlat/gen.sh from ./xlat/inotify_flags.in; do not edit. */
 
 static const struct xlat inotify_flags[] = {
-#if defined(IN_ACCESS) || (defined(HAVE_DECL_IN_ACCESS) && HAVE_DECL_IN_ACCESS)
-	XLAT(IN_ACCESS),
+#if !(defined(IN_ACCESS) || (defined(HAVE_DECL_IN_ACCESS) && HAVE_DECL_IN_ACCESS))
+# define IN_ACCESS 0x00000001
 #endif
-#if defined(IN_MODIFY) || (defined(HAVE_DECL_IN_MODIFY) && HAVE_DECL_IN_MODIFY)
-	XLAT(IN_MODIFY),
+ XLAT(IN_ACCESS),
+#if !(defined(IN_MODIFY) || (defined(HAVE_DECL_IN_MODIFY) && HAVE_DECL_IN_MODIFY))
+# define IN_MODIFY 0x00000002
 #endif
-#if defined(IN_ATTRIB) || (defined(HAVE_DECL_IN_ATTRIB) && HAVE_DECL_IN_ATTRIB)
-	XLAT(IN_ATTRIB),
+ XLAT(IN_MODIFY),
+#if !(defined(IN_ATTRIB) || (defined(HAVE_DECL_IN_ATTRIB) && HAVE_DECL_IN_ATTRIB))
+# define IN_ATTRIB 0x00000004
 #endif
-#if defined(IN_CLOSE) || (defined(HAVE_DECL_IN_CLOSE) && HAVE_DECL_IN_CLOSE)
-	XLAT(IN_CLOSE),
+ XLAT(IN_ATTRIB),
+#if !(defined(IN_CLOSE_WRITE) || (defined(HAVE_DECL_IN_CLOSE_WRITE) && HAVE_DECL_IN_CLOSE_WRITE))
+# define IN_CLOSE_WRITE 0x00000008
 #endif
-#if defined(IN_CLOSE_WRITE) || (defined(HAVE_DECL_IN_CLOSE_WRITE) && HAVE_DECL_IN_CLOSE_WRITE)
-	XLAT(IN_CLOSE_WRITE),
+ XLAT(IN_CLOSE_WRITE),
+#if !(defined(IN_CLOSE_NOWRITE) || (defined(HAVE_DECL_IN_CLOSE_NOWRITE) && HAVE_DECL_IN_CLOSE_NOWRITE))
+# define IN_CLOSE_NOWRITE 0x00000010
 #endif
-#if defined(IN_CLOSE_NOWRITE) || (defined(HAVE_DECL_IN_CLOSE_NOWRITE) && HAVE_DECL_IN_CLOSE_NOWRITE)
-	XLAT(IN_CLOSE_NOWRITE),
+ XLAT(IN_CLOSE_NOWRITE),
+#if !(defined(IN_OPEN) || (defined(HAVE_DECL_IN_OPEN) && HAVE_DECL_IN_OPEN))
+# define IN_OPEN 0x00000020
 #endif
-#if defined(IN_OPEN) || (defined(HAVE_DECL_IN_OPEN) && HAVE_DECL_IN_OPEN)
-	XLAT(IN_OPEN),
+ XLAT(IN_OPEN),
+#if !(defined(IN_MOVED_FROM) || (defined(HAVE_DECL_IN_MOVED_FROM) && HAVE_DECL_IN_MOVED_FROM))
+# define IN_MOVED_FROM 0x00000040
 #endif
-#if defined(IN_MOVE) || (defined(HAVE_DECL_IN_MOVE) && HAVE_DECL_IN_MOVE)
-	XLAT(IN_MOVE),
+ XLAT(IN_MOVED_FROM),
+#if !(defined(IN_MOVED_TO) || (defined(HAVE_DECL_IN_MOVED_TO) && HAVE_DECL_IN_MOVED_TO))
+# define IN_MOVED_TO 0x00000080
 #endif
-#if defined(IN_MOVED_FROM) || (defined(HAVE_DECL_IN_MOVED_FROM) && HAVE_DECL_IN_MOVED_FROM)
-	XLAT(IN_MOVED_FROM),
+ XLAT(IN_MOVED_TO),
+#if !(defined(IN_CREATE) || (defined(HAVE_DECL_IN_CREATE) && HAVE_DECL_IN_CREATE))
+# define IN_CREATE 0x00000100
 #endif
-#if defined(IN_MOVED_TO) || (defined(HAVE_DECL_IN_MOVED_TO) && HAVE_DECL_IN_MOVED_TO)
-	XLAT(IN_MOVED_TO),
+ XLAT(IN_CREATE),
+#if !(defined(IN_DELETE) || (defined(HAVE_DECL_IN_DELETE) && HAVE_DECL_IN_DELETE))
+# define IN_DELETE 0x00000200
 #endif
-#if defined(IN_CREATE) || (defined(HAVE_DECL_IN_CREATE) && HAVE_DECL_IN_CREATE)
-	XLAT(IN_CREATE),
+ XLAT(IN_DELETE),
+#if !(defined(IN_DELETE_SELF) || (defined(HAVE_DECL_IN_DELETE_SELF) && HAVE_DECL_IN_DELETE_SELF))
+# define IN_DELETE_SELF 0x00000400
 #endif
-#if defined(IN_DELETE) || (defined(HAVE_DECL_IN_DELETE) && HAVE_DECL_IN_DELETE)
-	XLAT(IN_DELETE),
+ XLAT(IN_DELETE_SELF),
+#if !(defined(IN_MOVE_SELF) || (defined(HAVE_DECL_IN_MOVE_SELF) && HAVE_DECL_IN_MOVE_SELF))
+# define IN_MOVE_SELF 0x00000800
 #endif
-#if defined(IN_DELETE_SELF) || (defined(HAVE_DECL_IN_DELETE_SELF) && HAVE_DECL_IN_DELETE_SELF)
-	XLAT(IN_DELETE_SELF),
+ XLAT(IN_MOVE_SELF),
+#if !(defined(IN_UNMOUNT) || (defined(HAVE_DECL_IN_UNMOUNT) && HAVE_DECL_IN_UNMOUNT))
+# define IN_UNMOUNT 0x00002000
 #endif
-#if defined(IN_MOVE_SELF) || (defined(HAVE_DECL_IN_MOVE_SELF) && HAVE_DECL_IN_MOVE_SELF)
-	XLAT(IN_MOVE_SELF),
+ XLAT(IN_UNMOUNT),
+#if !(defined(IN_Q_OVERFLOW) || (defined(HAVE_DECL_IN_Q_OVERFLOW) && HAVE_DECL_IN_Q_OVERFLOW))
+# define IN_Q_OVERFLOW 0x00004000
 #endif
-#if defined(IN_UNMOUNT) || (defined(HAVE_DECL_IN_UNMOUNT) && HAVE_DECL_IN_UNMOUNT)
-	XLAT(IN_UNMOUNT),
+ XLAT(IN_Q_OVERFLOW),
+#if !(defined(IN_IGNORED) || (defined(HAVE_DECL_IN_IGNORED) && HAVE_DECL_IN_IGNORED))
+# define IN_IGNORED 0x00008000
 #endif
-#if defined(IN_Q_OVERFLOW) || (defined(HAVE_DECL_IN_Q_OVERFLOW) && HAVE_DECL_IN_Q_OVERFLOW)
-	XLAT(IN_Q_OVERFLOW),
+ XLAT(IN_IGNORED),
+#if !(defined(IN_ONLYDIR) || (defined(HAVE_DECL_IN_ONLYDIR) && HAVE_DECL_IN_ONLYDIR))
+# define IN_ONLYDIR 0x01000000
 #endif
-#if defined(IN_IGNORED) || (defined(HAVE_DECL_IN_IGNORED) && HAVE_DECL_IN_IGNORED)
-	XLAT(IN_IGNORED),
+ XLAT(IN_ONLYDIR),
+#if !(defined(IN_DONT_FOLLOW) || (defined(HAVE_DECL_IN_DONT_FOLLOW) && HAVE_DECL_IN_DONT_FOLLOW))
+# define IN_DONT_FOLLOW 0x02000000
 #endif
-#if defined(IN_ONLYDIR) || (defined(HAVE_DECL_IN_ONLYDIR) && HAVE_DECL_IN_ONLYDIR)
-	XLAT(IN_ONLYDIR),
+ XLAT(IN_DONT_FOLLOW),
+#if !(defined(IN_EXCL_UNLINK) || (defined(HAVE_DECL_IN_EXCL_UNLINK) && HAVE_DECL_IN_EXCL_UNLINK))
+# define IN_EXCL_UNLINK 0x04000000
 #endif
-#if defined(IN_DONT_FOLLOW) || (defined(HAVE_DECL_IN_DONT_FOLLOW) && HAVE_DECL_IN_DONT_FOLLOW)
-	XLAT(IN_DONT_FOLLOW),
+ XLAT(IN_EXCL_UNLINK),
+#if !(defined(IN_MASK_ADD) || (defined(HAVE_DECL_IN_MASK_ADD) && HAVE_DECL_IN_MASK_ADD))
+# define IN_MASK_ADD 0x20000000
 #endif
-#if defined(IN_EXCL_UNLINK) || (defined(HAVE_DECL_IN_EXCL_UNLINK) && HAVE_DECL_IN_EXCL_UNLINK)
-	XLAT(IN_EXCL_UNLINK),
+ XLAT(IN_MASK_ADD),
+#if !(defined(IN_ISDIR) || (defined(HAVE_DECL_IN_ISDIR) && HAVE_DECL_IN_ISDIR))
+# define IN_ISDIR 0x40000000
 #endif
-#if defined(IN_MASK_ADD) || (defined(HAVE_DECL_IN_MASK_ADD) && HAVE_DECL_IN_MASK_ADD)
-	XLAT(IN_MASK_ADD),
+ XLAT(IN_ISDIR),
+#if !(defined(IN_ONESHOT) || (defined(HAVE_DECL_IN_ONESHOT) && HAVE_DECL_IN_ONESHOT))
+# define IN_ONESHOT 0x80000000
 #endif
-#if defined(IN_ISDIR) || (defined(HAVE_DECL_IN_ISDIR) && HAVE_DECL_IN_ISDIR)
-	XLAT(IN_ISDIR),
-#endif
-#if defined(IN_ONESHOT) || (defined(HAVE_DECL_IN_ONESHOT) && HAVE_DECL_IN_ONESHOT)
-	XLAT(IN_ONESHOT),
-#endif
-	XLAT_END
+ XLAT(IN_ONESHOT),
+ XLAT_END
 };
diff --git a/xlat/inotify_init_flags.h b/xlat/inotify_init_flags.h
index ce0e0af..26dafa7 100644
--- a/xlat/inotify_init_flags.h
+++ b/xlat/inotify_init_flags.h
@@ -2,10 +2,10 @@
 
 static const struct xlat inotify_init_flags[] = {
 #if defined(O_NONBLOCK) || (defined(HAVE_DECL_O_NONBLOCK) && HAVE_DECL_O_NONBLOCK)
-	XLAT(O_NONBLOCK),
+ XLAT(O_NONBLOCK),
 #endif
 #if defined(O_CLOEXEC) || (defined(HAVE_DECL_O_CLOEXEC) && HAVE_DECL_O_CLOEXEC)
-	XLAT(O_CLOEXEC),
+ XLAT(O_CLOEXEC),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/ioprio_class.h b/xlat/ioprio_class.h
index 5a4d8cc..c9073e8 100644
--- a/xlat/ioprio_class.h
+++ b/xlat/ioprio_class.h
@@ -1,9 +1,9 @@
 /* Generated by ./xlat/gen.sh from ./xlat/ioprio_class.in; do not edit. */
 
 static const struct xlat ioprio_class[] = {
-	XLAT(IOPRIO_CLASS_NONE),
-	XLAT(IOPRIO_CLASS_RT),
-	XLAT(IOPRIO_CLASS_BE),
-	XLAT(IOPRIO_CLASS_IDLE),
-	XLAT_END
+ XLAT(IOPRIO_CLASS_NONE),
+ XLAT(IOPRIO_CLASS_RT),
+ XLAT(IOPRIO_CLASS_BE),
+ XLAT(IOPRIO_CLASS_IDLE),
+ XLAT_END
 };
diff --git a/xlat/ioprio_who.h b/xlat/ioprio_who.h
index c23f591..7aa28c5 100644
--- a/xlat/ioprio_who.h
+++ b/xlat/ioprio_who.h
@@ -1,8 +1,8 @@
 /* Generated by ./xlat/gen.sh from ./xlat/ioprio_who.in; do not edit. */
 
 static const struct xlat ioprio_who[] = {
-	XLAT(IOPRIO_WHO_PROCESS),
-	XLAT(IOPRIO_WHO_PGRP),
-	XLAT(IOPRIO_WHO_USER),
-	XLAT_END
+ XLAT(IOPRIO_WHO_PROCESS),
+ XLAT(IOPRIO_WHO_PGRP),
+ XLAT(IOPRIO_WHO_USER),
+ XLAT_END
 };
diff --git a/xlat/ipc_msg_flags.h b/xlat/ipc_msg_flags.h
index b01671b..22490dd 100644
--- a/xlat/ipc_msg_flags.h
+++ b/xlat/ipc_msg_flags.h
@@ -2,13 +2,13 @@
 
 static const struct xlat ipc_msg_flags[] = {
 #if defined(MSG_NOERROR) || (defined(HAVE_DECL_MSG_NOERROR) && HAVE_DECL_MSG_NOERROR)
-	XLAT(MSG_NOERROR),
+ XLAT(MSG_NOERROR),
 #endif
 #if defined(MSG_EXCEPT) || (defined(HAVE_DECL_MSG_EXCEPT) && HAVE_DECL_MSG_EXCEPT)
-	XLAT(MSG_EXCEPT),
+ XLAT(MSG_EXCEPT),
 #endif
 #if defined(IPC_NOWAIT) || (defined(HAVE_DECL_IPC_NOWAIT) && HAVE_DECL_IPC_NOWAIT)
-	XLAT(IPC_NOWAIT),
+ XLAT(IPC_NOWAIT),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/itimer_which.h b/xlat/itimer_which.h
index 8b001eb..abee625 100644
--- a/xlat/itimer_which.h
+++ b/xlat/itimer_which.h
@@ -2,13 +2,13 @@
 
 static const struct xlat itimer_which[] = {
 #if defined(ITIMER_REAL) || (defined(HAVE_DECL_ITIMER_REAL) && HAVE_DECL_ITIMER_REAL)
-	XLAT(ITIMER_REAL),
+ XLAT(ITIMER_REAL),
 #endif
 #if defined(ITIMER_VIRTUAL) || (defined(HAVE_DECL_ITIMER_VIRTUAL) && HAVE_DECL_ITIMER_VIRTUAL)
-	XLAT(ITIMER_VIRTUAL),
+ XLAT(ITIMER_VIRTUAL),
 #endif
 #if defined(ITIMER_PROF) || (defined(HAVE_DECL_ITIMER_PROF) && HAVE_DECL_ITIMER_PROF)
-	XLAT(ITIMER_PROF),
+ XLAT(ITIMER_PROF),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/kexec_arch_values.h b/xlat/kexec_arch_values.h
index c702768..c795a95 100644
--- a/xlat/kexec_arch_values.h
+++ b/xlat/kexec_arch_values.h
@@ -1,38 +1,53 @@
 /* Generated by ./xlat/gen.sh from ./xlat/kexec_arch_values.in; do not edit. */
 
 static const struct xlat kexec_arch_values[] = {
-#if defined(KEXEC_ARCH_DEFAULT) || (defined(HAVE_DECL_KEXEC_ARCH_DEFAULT) && HAVE_DECL_KEXEC_ARCH_DEFAULT)
-	XLAT(KEXEC_ARCH_DEFAULT),
+#if !(defined(KEXEC_ARCH_DEFAULT) || (defined(HAVE_DECL_KEXEC_ARCH_DEFAULT) && HAVE_DECL_KEXEC_ARCH_DEFAULT))
+# define KEXEC_ARCH_DEFAULT ( 0 << 16)
 #endif
-#if defined(KEXEC_ARCH_386) || (defined(HAVE_DECL_KEXEC_ARCH_386) && HAVE_DECL_KEXEC_ARCH_386)
-	XLAT(KEXEC_ARCH_386),
+ XLAT(KEXEC_ARCH_DEFAULT),
+#if !(defined(KEXEC_ARCH_386) || (defined(HAVE_DECL_KEXEC_ARCH_386) && HAVE_DECL_KEXEC_ARCH_386))
+# define KEXEC_ARCH_386 ( 3 << 16)
 #endif
-#if defined(KEXEC_ARCH_X86_64) || (defined(HAVE_DECL_KEXEC_ARCH_X86_64) && HAVE_DECL_KEXEC_ARCH_X86_64)
-	XLAT(KEXEC_ARCH_X86_64),
+ XLAT(KEXEC_ARCH_386),
+#if !(defined(KEXEC_ARCH_68K) || (defined(HAVE_DECL_KEXEC_ARCH_68K) && HAVE_DECL_KEXEC_ARCH_68K))
+# define KEXEC_ARCH_68K ( 4 << 16)
 #endif
-#if defined(KEXEC_ARCH_PPC) || (defined(HAVE_DECL_KEXEC_ARCH_PPC) && HAVE_DECL_KEXEC_ARCH_PPC)
-	XLAT(KEXEC_ARCH_PPC),
+ XLAT(KEXEC_ARCH_68K),
+#if !(defined(KEXEC_ARCH_X86_64) || (defined(HAVE_DECL_KEXEC_ARCH_X86_64) && HAVE_DECL_KEXEC_ARCH_X86_64))
+# define KEXEC_ARCH_X86_64 (62 << 16)
 #endif
-#if defined(KEXEC_ARCH_PPC64) || (defined(HAVE_DECL_KEXEC_ARCH_PPC64) && HAVE_DECL_KEXEC_ARCH_PPC64)
-	XLAT(KEXEC_ARCH_PPC64),
+ XLAT(KEXEC_ARCH_X86_64),
+#if !(defined(KEXEC_ARCH_PPC) || (defined(HAVE_DECL_KEXEC_ARCH_PPC) && HAVE_DECL_KEXEC_ARCH_PPC))
+# define KEXEC_ARCH_PPC (20 << 16)
 #endif
-#if defined(KEXEC_ARCH_IA_64) || (defined(HAVE_DECL_KEXEC_ARCH_IA_64) && HAVE_DECL_KEXEC_ARCH_IA_64)
-	XLAT(KEXEC_ARCH_IA_64),
+ XLAT(KEXEC_ARCH_PPC),
+#if !(defined(KEXEC_ARCH_PPC64) || (defined(HAVE_DECL_KEXEC_ARCH_PPC64) && HAVE_DECL_KEXEC_ARCH_PPC64))
+# define KEXEC_ARCH_PPC64 (21 << 16)
 #endif
-#if defined(KEXEC_ARCH_ARM) || (defined(HAVE_DECL_KEXEC_ARCH_ARM) && HAVE_DECL_KEXEC_ARCH_ARM)
-	XLAT(KEXEC_ARCH_ARM),
+ XLAT(KEXEC_ARCH_PPC64),
+#if !(defined(KEXEC_ARCH_IA_64) || (defined(HAVE_DECL_KEXEC_ARCH_IA_64) && HAVE_DECL_KEXEC_ARCH_IA_64))
+# define KEXEC_ARCH_IA_64 (50 << 16)
 #endif
-#if defined(KEXEC_ARCH_S390) || (defined(HAVE_DECL_KEXEC_ARCH_S390) && HAVE_DECL_KEXEC_ARCH_S390)
-	XLAT(KEXEC_ARCH_S390),
+ XLAT(KEXEC_ARCH_IA_64),
+#if !(defined(KEXEC_ARCH_ARM) || (defined(HAVE_DECL_KEXEC_ARCH_ARM) && HAVE_DECL_KEXEC_ARCH_ARM))
+# define KEXEC_ARCH_ARM (40 << 16)
 #endif
-#if defined(KEXEC_ARCH_SH) || (defined(HAVE_DECL_KEXEC_ARCH_SH) && HAVE_DECL_KEXEC_ARCH_SH)
-	XLAT(KEXEC_ARCH_SH),
+ XLAT(KEXEC_ARCH_ARM),
+#if !(defined(KEXEC_ARCH_S390) || (defined(HAVE_DECL_KEXEC_ARCH_S390) && HAVE_DECL_KEXEC_ARCH_S390))
+# define KEXEC_ARCH_S390 (22 << 16)
 #endif
-#if defined(KEXEC_ARCH_MIPS_LE) || (defined(HAVE_DECL_KEXEC_ARCH_MIPS_LE) && HAVE_DECL_KEXEC_ARCH_MIPS_LE)
-	XLAT(KEXEC_ARCH_MIPS_LE),
+ XLAT(KEXEC_ARCH_S390),
+#if !(defined(KEXEC_ARCH_SH) || (defined(HAVE_DECL_KEXEC_ARCH_SH) && HAVE_DECL_KEXEC_ARCH_SH))
+# define KEXEC_ARCH_SH (42 << 16)
 #endif
-#if defined(KEXEC_ARCH_MIPS) || (defined(HAVE_DECL_KEXEC_ARCH_MIPS) && HAVE_DECL_KEXEC_ARCH_MIPS)
-	XLAT(KEXEC_ARCH_MIPS),
+ XLAT(KEXEC_ARCH_SH),
+#if !(defined(KEXEC_ARCH_MIPS_LE) || (defined(HAVE_DECL_KEXEC_ARCH_MIPS_LE) && HAVE_DECL_KEXEC_ARCH_MIPS_LE))
+# define KEXEC_ARCH_MIPS_LE (10 << 16)
 #endif
-	XLAT_END
+ XLAT(KEXEC_ARCH_MIPS_LE),
+#if !(defined(KEXEC_ARCH_MIPS) || (defined(HAVE_DECL_KEXEC_ARCH_MIPS) && HAVE_DECL_KEXEC_ARCH_MIPS))
+# define KEXEC_ARCH_MIPS ( 8 << 16)
+#endif
+ XLAT(KEXEC_ARCH_MIPS),
+ XLAT_END
 };
diff --git a/xlat/key_perms.h b/xlat/key_perms.h
index 5cba3a0..37af118 100644
--- a/xlat/key_perms.h
+++ b/xlat/key_perms.h
@@ -1,89 +1,117 @@
 /* Generated by ./xlat/gen.sh from ./xlat/key_perms.in; do not edit. */
 
 static const struct xlat key_perms[] = {
-#if defined(KEY_POS_VIEW) || (defined(HAVE_DECL_KEY_POS_VIEW) && HAVE_DECL_KEY_POS_VIEW)
-	XLAT(KEY_POS_VIEW),
+#if !(defined(KEY_POS_VIEW) || (defined(HAVE_DECL_KEY_POS_VIEW) && HAVE_DECL_KEY_POS_VIEW))
+# define KEY_POS_VIEW 0x01000000
 #endif
-#if defined(KEY_POS_READ) || (defined(HAVE_DECL_KEY_POS_READ) && HAVE_DECL_KEY_POS_READ)
-	XLAT(KEY_POS_READ),
+ XLAT(KEY_POS_VIEW),
+#if !(defined(KEY_POS_READ) || (defined(HAVE_DECL_KEY_POS_READ) && HAVE_DECL_KEY_POS_READ))
+# define KEY_POS_READ 0x02000000
 #endif
-#if defined(KEY_POS_WRITE) || (defined(HAVE_DECL_KEY_POS_WRITE) && HAVE_DECL_KEY_POS_WRITE)
-	XLAT(KEY_POS_WRITE),
+ XLAT(KEY_POS_READ),
+#if !(defined(KEY_POS_WRITE) || (defined(HAVE_DECL_KEY_POS_WRITE) && HAVE_DECL_KEY_POS_WRITE))
+# define KEY_POS_WRITE 0x04000000
 #endif
-#if defined(KEY_POS_SEARCH) || (defined(HAVE_DECL_KEY_POS_SEARCH) && HAVE_DECL_KEY_POS_SEARCH)
-	XLAT(KEY_POS_SEARCH),
+ XLAT(KEY_POS_WRITE),
+#if !(defined(KEY_POS_SEARCH) || (defined(HAVE_DECL_KEY_POS_SEARCH) && HAVE_DECL_KEY_POS_SEARCH))
+# define KEY_POS_SEARCH 0x08000000
 #endif
-#if defined(KEY_POS_LINK) || (defined(HAVE_DECL_KEY_POS_LINK) && HAVE_DECL_KEY_POS_LINK)
-	XLAT(KEY_POS_LINK),
+ XLAT(KEY_POS_SEARCH),
+#if !(defined(KEY_POS_LINK) || (defined(HAVE_DECL_KEY_POS_LINK) && HAVE_DECL_KEY_POS_LINK))
+# define KEY_POS_LINK 0x10000000
 #endif
-#if defined(KEY_POS_SETATTR) || (defined(HAVE_DECL_KEY_POS_SETATTR) && HAVE_DECL_KEY_POS_SETATTR)
-	XLAT(KEY_POS_SETATTR),
+ XLAT(KEY_POS_LINK),
+#if !(defined(KEY_POS_SETATTR) || (defined(HAVE_DECL_KEY_POS_SETATTR) && HAVE_DECL_KEY_POS_SETATTR))
+# define KEY_POS_SETATTR 0x20000000
 #endif
-#if defined(KEY_POS_ALL) || (defined(HAVE_DECL_KEY_POS_ALL) && HAVE_DECL_KEY_POS_ALL)
-	XLAT(KEY_POS_ALL),
+ XLAT(KEY_POS_SETATTR),
+#if !(defined(KEY_POS_ALL) || (defined(HAVE_DECL_KEY_POS_ALL) && HAVE_DECL_KEY_POS_ALL))
+# define KEY_POS_ALL 0x3f000000
 #endif
-#if defined(KEY_USR_VIEW) || (defined(HAVE_DECL_KEY_USR_VIEW) && HAVE_DECL_KEY_USR_VIEW)
-	XLAT(KEY_USR_VIEW),
+ XLAT(KEY_POS_ALL),
+#if !(defined(KEY_USR_VIEW) || (defined(HAVE_DECL_KEY_USR_VIEW) && HAVE_DECL_KEY_USR_VIEW))
+# define KEY_USR_VIEW 0x00010000
 #endif
-#if defined(KEY_USR_READ) || (defined(HAVE_DECL_KEY_USR_READ) && HAVE_DECL_KEY_USR_READ)
-	XLAT(KEY_USR_READ),
+ XLAT(KEY_USR_VIEW),
+#if !(defined(KEY_USR_READ) || (defined(HAVE_DECL_KEY_USR_READ) && HAVE_DECL_KEY_USR_READ))
+# define KEY_USR_READ 0x00020000
 #endif
-#if defined(KEY_USR_WRITE) || (defined(HAVE_DECL_KEY_USR_WRITE) && HAVE_DECL_KEY_USR_WRITE)
-	XLAT(KEY_USR_WRITE),
+ XLAT(KEY_USR_READ),
+#if !(defined(KEY_USR_WRITE) || (defined(HAVE_DECL_KEY_USR_WRITE) && HAVE_DECL_KEY_USR_WRITE))
+# define KEY_USR_WRITE 0x00040000
 #endif
-#if defined(KEY_USR_SEARCH) || (defined(HAVE_DECL_KEY_USR_SEARCH) && HAVE_DECL_KEY_USR_SEARCH)
-	XLAT(KEY_USR_SEARCH),
+ XLAT(KEY_USR_WRITE),
+#if !(defined(KEY_USR_SEARCH) || (defined(HAVE_DECL_KEY_USR_SEARCH) && HAVE_DECL_KEY_USR_SEARCH))
+# define KEY_USR_SEARCH 0x00080000
 #endif
-#if defined(KEY_USR_LINK) || (defined(HAVE_DECL_KEY_USR_LINK) && HAVE_DECL_KEY_USR_LINK)
-	XLAT(KEY_USR_LINK),
+ XLAT(KEY_USR_SEARCH),
+#if !(defined(KEY_USR_LINK) || (defined(HAVE_DECL_KEY_USR_LINK) && HAVE_DECL_KEY_USR_LINK))
+# define KEY_USR_LINK 0x00100000
 #endif
-#if defined(KEY_USR_SETATTR) || (defined(HAVE_DECL_KEY_USR_SETATTR) && HAVE_DECL_KEY_USR_SETATTR)
-	XLAT(KEY_USR_SETATTR),
+ XLAT(KEY_USR_LINK),
+#if !(defined(KEY_USR_SETATTR) || (defined(HAVE_DECL_KEY_USR_SETATTR) && HAVE_DECL_KEY_USR_SETATTR))
+# define KEY_USR_SETATTR 0x00200000
 #endif
-#if defined(KEY_USR_ALL) || (defined(HAVE_DECL_KEY_USR_ALL) && HAVE_DECL_KEY_USR_ALL)
-	XLAT(KEY_USR_ALL),
+ XLAT(KEY_USR_SETATTR),
+#if !(defined(KEY_USR_ALL) || (defined(HAVE_DECL_KEY_USR_ALL) && HAVE_DECL_KEY_USR_ALL))
+# define KEY_USR_ALL 0x003f0000
 #endif
-#if defined(KEY_GRP_VIEW) || (defined(HAVE_DECL_KEY_GRP_VIEW) && HAVE_DECL_KEY_GRP_VIEW)
-	XLAT(KEY_GRP_VIEW),
+ XLAT(KEY_USR_ALL),
+#if !(defined(KEY_GRP_VIEW) || (defined(HAVE_DECL_KEY_GRP_VIEW) && HAVE_DECL_KEY_GRP_VIEW))
+# define KEY_GRP_VIEW 0x00000100
 #endif
-#if defined(KEY_GRP_READ) || (defined(HAVE_DECL_KEY_GRP_READ) && HAVE_DECL_KEY_GRP_READ)
-	XLAT(KEY_GRP_READ),
+ XLAT(KEY_GRP_VIEW),
+#if !(defined(KEY_GRP_READ) || (defined(HAVE_DECL_KEY_GRP_READ) && HAVE_DECL_KEY_GRP_READ))
+# define KEY_GRP_READ 0x00000200
 #endif
-#if defined(KEY_GRP_WRITE) || (defined(HAVE_DECL_KEY_GRP_WRITE) && HAVE_DECL_KEY_GRP_WRITE)
-	XLAT(KEY_GRP_WRITE),
+ XLAT(KEY_GRP_READ),
+#if !(defined(KEY_GRP_WRITE) || (defined(HAVE_DECL_KEY_GRP_WRITE) && HAVE_DECL_KEY_GRP_WRITE))
+# define KEY_GRP_WRITE 0x00000400
 #endif
-#if defined(KEY_GRP_SEARCH) || (defined(HAVE_DECL_KEY_GRP_SEARCH) && HAVE_DECL_KEY_GRP_SEARCH)
-	XLAT(KEY_GRP_SEARCH),
+ XLAT(KEY_GRP_WRITE),
+#if !(defined(KEY_GRP_SEARCH) || (defined(HAVE_DECL_KEY_GRP_SEARCH) && HAVE_DECL_KEY_GRP_SEARCH))
+# define KEY_GRP_SEARCH 0x00000800
 #endif
-#if defined(KEY_GRP_LINK) || (defined(HAVE_DECL_KEY_GRP_LINK) && HAVE_DECL_KEY_GRP_LINK)
-	XLAT(KEY_GRP_LINK),
+ XLAT(KEY_GRP_SEARCH),
+#if !(defined(KEY_GRP_LINK) || (defined(HAVE_DECL_KEY_GRP_LINK) && HAVE_DECL_KEY_GRP_LINK))
+# define KEY_GRP_LINK 0x00001000
 #endif
-#if defined(KEY_GRP_SETATTR) || (defined(HAVE_DECL_KEY_GRP_SETATTR) && HAVE_DECL_KEY_GRP_SETATTR)
-	XLAT(KEY_GRP_SETATTR),
+ XLAT(KEY_GRP_LINK),
+#if !(defined(KEY_GRP_SETATTR) || (defined(HAVE_DECL_KEY_GRP_SETATTR) && HAVE_DECL_KEY_GRP_SETATTR))
+# define KEY_GRP_SETATTR 0x00002000
 #endif
-#if defined(KEY_GRP_ALL) || (defined(HAVE_DECL_KEY_GRP_ALL) && HAVE_DECL_KEY_GRP_ALL)
-	XLAT(KEY_GRP_ALL),
+ XLAT(KEY_GRP_SETATTR),
+#if !(defined(KEY_GRP_ALL) || (defined(HAVE_DECL_KEY_GRP_ALL) && HAVE_DECL_KEY_GRP_ALL))
+# define KEY_GRP_ALL 0x00003f00
 #endif
-#if defined(KEY_OTH_VIEW) || (defined(HAVE_DECL_KEY_OTH_VIEW) && HAVE_DECL_KEY_OTH_VIEW)
-	XLAT(KEY_OTH_VIEW),
+ XLAT(KEY_GRP_ALL),
+#if !(defined(KEY_OTH_VIEW) || (defined(HAVE_DECL_KEY_OTH_VIEW) && HAVE_DECL_KEY_OTH_VIEW))
+# define KEY_OTH_VIEW 0x00000001
 #endif
-#if defined(KEY_OTH_READ) || (defined(HAVE_DECL_KEY_OTH_READ) && HAVE_DECL_KEY_OTH_READ)
-	XLAT(KEY_OTH_READ),
+ XLAT(KEY_OTH_VIEW),
+#if !(defined(KEY_OTH_READ) || (defined(HAVE_DECL_KEY_OTH_READ) && HAVE_DECL_KEY_OTH_READ))
+# define KEY_OTH_READ 0x00000002
 #endif
-#if defined(KEY_OTH_WRITE) || (defined(HAVE_DECL_KEY_OTH_WRITE) && HAVE_DECL_KEY_OTH_WRITE)
-	XLAT(KEY_OTH_WRITE),
+ XLAT(KEY_OTH_READ),
+#if !(defined(KEY_OTH_WRITE) || (defined(HAVE_DECL_KEY_OTH_WRITE) && HAVE_DECL_KEY_OTH_WRITE))
+# define KEY_OTH_WRITE 0x00000004
 #endif
-#if defined(KEY_OTH_SEARCH) || (defined(HAVE_DECL_KEY_OTH_SEARCH) && HAVE_DECL_KEY_OTH_SEARCH)
-	XLAT(KEY_OTH_SEARCH),
+ XLAT(KEY_OTH_WRITE),
+#if !(defined(KEY_OTH_SEARCH) || (defined(HAVE_DECL_KEY_OTH_SEARCH) && HAVE_DECL_KEY_OTH_SEARCH))
+# define KEY_OTH_SEARCH 0x00000008
 #endif
-#if defined(KEY_OTH_LINK) || (defined(HAVE_DECL_KEY_OTH_LINK) && HAVE_DECL_KEY_OTH_LINK)
-	XLAT(KEY_OTH_LINK),
+ XLAT(KEY_OTH_SEARCH),
+#if !(defined(KEY_OTH_LINK) || (defined(HAVE_DECL_KEY_OTH_LINK) && HAVE_DECL_KEY_OTH_LINK))
+# define KEY_OTH_LINK 0x00000010
 #endif
-#if defined(KEY_OTH_SETATTR) || (defined(HAVE_DECL_KEY_OTH_SETATTR) && HAVE_DECL_KEY_OTH_SETATTR)
-	XLAT(KEY_OTH_SETATTR),
+ XLAT(KEY_OTH_LINK),
+#if !(defined(KEY_OTH_SETATTR) || (defined(HAVE_DECL_KEY_OTH_SETATTR) && HAVE_DECL_KEY_OTH_SETATTR))
+# define KEY_OTH_SETATTR 0x00000020
 #endif
-#if defined(KEY_OTH_ALL) || (defined(HAVE_DECL_KEY_OTH_ALL) && HAVE_DECL_KEY_OTH_ALL)
-	XLAT(KEY_OTH_ALL),
+ XLAT(KEY_OTH_SETATTR),
+#if !(defined(KEY_OTH_ALL) || (defined(HAVE_DECL_KEY_OTH_ALL) && HAVE_DECL_KEY_OTH_ALL))
+# define KEY_OTH_ALL 0x0000003f
 #endif
-	XLAT_END
+ XLAT(KEY_OTH_ALL),
+ XLAT_END
 };
diff --git a/xlat/key_reqkeys.h b/xlat/key_reqkeys.h
index fd4ac0a..2880c1f 100644
--- a/xlat/key_reqkeys.h
+++ b/xlat/key_reqkeys.h
@@ -1,32 +1,41 @@
 /* Generated by ./xlat/gen.sh from ./xlat/key_reqkeys.in; do not edit. */
 
 static const struct xlat key_reqkeys[] = {
-#if defined(KEY_REQKEY_DEFL_NO_CHANGE) || (defined(HAVE_DECL_KEY_REQKEY_DEFL_NO_CHANGE) && HAVE_DECL_KEY_REQKEY_DEFL_NO_CHANGE)
-	XLAT(KEY_REQKEY_DEFL_NO_CHANGE),
+#if !(defined(KEY_REQKEY_DEFL_NO_CHANGE) || (defined(HAVE_DECL_KEY_REQKEY_DEFL_NO_CHANGE) && HAVE_DECL_KEY_REQKEY_DEFL_NO_CHANGE))
+# define KEY_REQKEY_DEFL_NO_CHANGE -1
 #endif
-#if defined(KEY_REQKEY_DEFL_DEFAULT) || (defined(HAVE_DECL_KEY_REQKEY_DEFL_DEFAULT) && HAVE_DECL_KEY_REQKEY_DEFL_DEFAULT)
-	XLAT(KEY_REQKEY_DEFL_DEFAULT),
+ XLAT(KEY_REQKEY_DEFL_NO_CHANGE),
+#if !(defined(KEY_REQKEY_DEFL_DEFAULT) || (defined(HAVE_DECL_KEY_REQKEY_DEFL_DEFAULT) && HAVE_DECL_KEY_REQKEY_DEFL_DEFAULT))
+# define KEY_REQKEY_DEFL_DEFAULT 0
 #endif
-#if defined(KEY_REQKEY_DEFL_THREAD_KEYRING) || (defined(HAVE_DECL_KEY_REQKEY_DEFL_THREAD_KEYRING) && HAVE_DECL_KEY_REQKEY_DEFL_THREAD_KEYRING)
-	XLAT(KEY_REQKEY_DEFL_THREAD_KEYRING),
+ XLAT(KEY_REQKEY_DEFL_DEFAULT),
+#if !(defined(KEY_REQKEY_DEFL_THREAD_KEYRING) || (defined(HAVE_DECL_KEY_REQKEY_DEFL_THREAD_KEYRING) && HAVE_DECL_KEY_REQKEY_DEFL_THREAD_KEYRING))
+# define KEY_REQKEY_DEFL_THREAD_KEYRING 1
 #endif
-#if defined(KEY_REQKEY_DEFL_PROCESS_KEYRING) || (defined(HAVE_DECL_KEY_REQKEY_DEFL_PROCESS_KEYRING) && HAVE_DECL_KEY_REQKEY_DEFL_PROCESS_KEYRING)
-	XLAT(KEY_REQKEY_DEFL_PROCESS_KEYRING),
+ XLAT(KEY_REQKEY_DEFL_THREAD_KEYRING),
+#if !(defined(KEY_REQKEY_DEFL_PROCESS_KEYRING) || (defined(HAVE_DECL_KEY_REQKEY_DEFL_PROCESS_KEYRING) && HAVE_DECL_KEY_REQKEY_DEFL_PROCESS_KEYRING))
+# define KEY_REQKEY_DEFL_PROCESS_KEYRING 2
 #endif
-#if defined(KEY_REQKEY_DEFL_SESSION_KEYRING) || (defined(HAVE_DECL_KEY_REQKEY_DEFL_SESSION_KEYRING) && HAVE_DECL_KEY_REQKEY_DEFL_SESSION_KEYRING)
-	XLAT(KEY_REQKEY_DEFL_SESSION_KEYRING),
+ XLAT(KEY_REQKEY_DEFL_PROCESS_KEYRING),
+#if !(defined(KEY_REQKEY_DEFL_SESSION_KEYRING) || (defined(HAVE_DECL_KEY_REQKEY_DEFL_SESSION_KEYRING) && HAVE_DECL_KEY_REQKEY_DEFL_SESSION_KEYRING))
+# define KEY_REQKEY_DEFL_SESSION_KEYRING 3
 #endif
-#if defined(KEY_REQKEY_DEFL_USER_KEYRING) || (defined(HAVE_DECL_KEY_REQKEY_DEFL_USER_KEYRING) && HAVE_DECL_KEY_REQKEY_DEFL_USER_KEYRING)
-	XLAT(KEY_REQKEY_DEFL_USER_KEYRING),
+ XLAT(KEY_REQKEY_DEFL_SESSION_KEYRING),
+#if !(defined(KEY_REQKEY_DEFL_USER_KEYRING) || (defined(HAVE_DECL_KEY_REQKEY_DEFL_USER_KEYRING) && HAVE_DECL_KEY_REQKEY_DEFL_USER_KEYRING))
+# define KEY_REQKEY_DEFL_USER_KEYRING 4
 #endif
-#if defined(KEY_REQKEY_DEFL_USER_SESSION_KEYRING) || (defined(HAVE_DECL_KEY_REQKEY_DEFL_USER_SESSION_KEYRING) && HAVE_DECL_KEY_REQKEY_DEFL_USER_SESSION_KEYRING)
-	XLAT(KEY_REQKEY_DEFL_USER_SESSION_KEYRING),
+ XLAT(KEY_REQKEY_DEFL_USER_KEYRING),
+#if !(defined(KEY_REQKEY_DEFL_USER_SESSION_KEYRING) || (defined(HAVE_DECL_KEY_REQKEY_DEFL_USER_SESSION_KEYRING) && HAVE_DECL_KEY_REQKEY_DEFL_USER_SESSION_KEYRING))
+# define KEY_REQKEY_DEFL_USER_SESSION_KEYRING 5
 #endif
-#if defined(KEY_REQKEY_DEFL_GROUP_KEYRING) || (defined(HAVE_DECL_KEY_REQKEY_DEFL_GROUP_KEYRING) && HAVE_DECL_KEY_REQKEY_DEFL_GROUP_KEYRING)
-	XLAT(KEY_REQKEY_DEFL_GROUP_KEYRING),
+ XLAT(KEY_REQKEY_DEFL_USER_SESSION_KEYRING),
+#if !(defined(KEY_REQKEY_DEFL_GROUP_KEYRING) || (defined(HAVE_DECL_KEY_REQKEY_DEFL_GROUP_KEYRING) && HAVE_DECL_KEY_REQKEY_DEFL_GROUP_KEYRING))
+# define KEY_REQKEY_DEFL_GROUP_KEYRING 6
 #endif
-#if defined(KEY_REQKEY_DEFL_REQUESTOR_KEYRING) || (defined(HAVE_DECL_KEY_REQKEY_DEFL_REQUESTOR_KEYRING) && HAVE_DECL_KEY_REQKEY_DEFL_REQUESTOR_KEYRING)
-	XLAT(KEY_REQKEY_DEFL_REQUESTOR_KEYRING),
+ XLAT(KEY_REQKEY_DEFL_GROUP_KEYRING),
+#if !(defined(KEY_REQKEY_DEFL_REQUESTOR_KEYRING) || (defined(HAVE_DECL_KEY_REQKEY_DEFL_REQUESTOR_KEYRING) && HAVE_DECL_KEY_REQKEY_DEFL_REQUESTOR_KEYRING))
+# define KEY_REQKEY_DEFL_REQUESTOR_KEYRING 7
 #endif
-	XLAT_END
+ XLAT(KEY_REQKEY_DEFL_REQUESTOR_KEYRING),
+ XLAT_END
 };
diff --git a/xlat/key_spec.h b/xlat/key_spec.h
index 71c6fc1..ca5c5d9 100644
--- a/xlat/key_spec.h
+++ b/xlat/key_spec.h
@@ -1,29 +1,37 @@
 /* Generated by ./xlat/gen.sh from ./xlat/key_spec.in; do not edit. */
 
 static const struct xlat key_spec[] = {
-#if defined(KEY_SPEC_THREAD_KEYRING) || (defined(HAVE_DECL_KEY_SPEC_THREAD_KEYRING) && HAVE_DECL_KEY_SPEC_THREAD_KEYRING)
-	XLAT(KEY_SPEC_THREAD_KEYRING),
+#if !(defined(KEY_SPEC_THREAD_KEYRING) || (defined(HAVE_DECL_KEY_SPEC_THREAD_KEYRING) && HAVE_DECL_KEY_SPEC_THREAD_KEYRING))
+# define KEY_SPEC_THREAD_KEYRING -1
 #endif
-#if defined(KEY_SPEC_PROCESS_KEYRING) || (defined(HAVE_DECL_KEY_SPEC_PROCESS_KEYRING) && HAVE_DECL_KEY_SPEC_PROCESS_KEYRING)
-	XLAT(KEY_SPEC_PROCESS_KEYRING),
+ XLAT(KEY_SPEC_THREAD_KEYRING),
+#if !(defined(KEY_SPEC_PROCESS_KEYRING) || (defined(HAVE_DECL_KEY_SPEC_PROCESS_KEYRING) && HAVE_DECL_KEY_SPEC_PROCESS_KEYRING))
+# define KEY_SPEC_PROCESS_KEYRING -2
 #endif
-#if defined(KEY_SPEC_SESSION_KEYRING) || (defined(HAVE_DECL_KEY_SPEC_SESSION_KEYRING) && HAVE_DECL_KEY_SPEC_SESSION_KEYRING)
-	XLAT(KEY_SPEC_SESSION_KEYRING),
+ XLAT(KEY_SPEC_PROCESS_KEYRING),
+#if !(defined(KEY_SPEC_SESSION_KEYRING) || (defined(HAVE_DECL_KEY_SPEC_SESSION_KEYRING) && HAVE_DECL_KEY_SPEC_SESSION_KEYRING))
+# define KEY_SPEC_SESSION_KEYRING -3
 #endif
-#if defined(KEY_SPEC_USER_KEYRING) || (defined(HAVE_DECL_KEY_SPEC_USER_KEYRING) && HAVE_DECL_KEY_SPEC_USER_KEYRING)
-	XLAT(KEY_SPEC_USER_KEYRING),
+ XLAT(KEY_SPEC_SESSION_KEYRING),
+#if !(defined(KEY_SPEC_USER_KEYRING) || (defined(HAVE_DECL_KEY_SPEC_USER_KEYRING) && HAVE_DECL_KEY_SPEC_USER_KEYRING))
+# define KEY_SPEC_USER_KEYRING -4
 #endif
-#if defined(KEY_SPEC_USER_SESSION_KEYRING) || (defined(HAVE_DECL_KEY_SPEC_USER_SESSION_KEYRING) && HAVE_DECL_KEY_SPEC_USER_SESSION_KEYRING)
-	XLAT(KEY_SPEC_USER_SESSION_KEYRING),
+ XLAT(KEY_SPEC_USER_KEYRING),
+#if !(defined(KEY_SPEC_USER_SESSION_KEYRING) || (defined(HAVE_DECL_KEY_SPEC_USER_SESSION_KEYRING) && HAVE_DECL_KEY_SPEC_USER_SESSION_KEYRING))
+# define KEY_SPEC_USER_SESSION_KEYRING -5
 #endif
-#if defined(KEY_SPEC_GROUP_KEYRING) || (defined(HAVE_DECL_KEY_SPEC_GROUP_KEYRING) && HAVE_DECL_KEY_SPEC_GROUP_KEYRING)
-	XLAT(KEY_SPEC_GROUP_KEYRING),
+ XLAT(KEY_SPEC_USER_SESSION_KEYRING),
+#if !(defined(KEY_SPEC_GROUP_KEYRING) || (defined(HAVE_DECL_KEY_SPEC_GROUP_KEYRING) && HAVE_DECL_KEY_SPEC_GROUP_KEYRING))
+# define KEY_SPEC_GROUP_KEYRING -6
 #endif
-#if defined(KEY_SPEC_REQKEY_AUTH_KEY) || (defined(HAVE_DECL_KEY_SPEC_REQKEY_AUTH_KEY) && HAVE_DECL_KEY_SPEC_REQKEY_AUTH_KEY)
-	XLAT(KEY_SPEC_REQKEY_AUTH_KEY),
+ XLAT(KEY_SPEC_GROUP_KEYRING),
+#if !(defined(KEY_SPEC_REQKEY_AUTH_KEY) || (defined(HAVE_DECL_KEY_SPEC_REQKEY_AUTH_KEY) && HAVE_DECL_KEY_SPEC_REQKEY_AUTH_KEY))
+# define KEY_SPEC_REQKEY_AUTH_KEY -7
 #endif
-#if defined(KEY_SPEC_REQUESTOR_KEYRING) || (defined(HAVE_DECL_KEY_SPEC_REQUESTOR_KEYRING) && HAVE_DECL_KEY_SPEC_REQUESTOR_KEYRING)
-	XLAT(KEY_SPEC_REQUESTOR_KEYRING),
+ XLAT(KEY_SPEC_REQKEY_AUTH_KEY),
+#if !(defined(KEY_SPEC_REQUESTOR_KEYRING) || (defined(HAVE_DECL_KEY_SPEC_REQUESTOR_KEYRING) && HAVE_DECL_KEY_SPEC_REQUESTOR_KEYRING))
+# define KEY_SPEC_REQUESTOR_KEYRING -8
 #endif
-	XLAT_END
+ XLAT(KEY_SPEC_REQUESTOR_KEYRING),
+ XLAT_END
 };
diff --git a/xlat/keyctl_commands.h b/xlat/keyctl_commands.h
index 6fc7246..80b7234 100644
--- a/xlat/keyctl_commands.h
+++ b/xlat/keyctl_commands.h
@@ -1,74 +1,97 @@
 /* Generated by ./xlat/gen.sh from ./xlat/keyctl_commands.in; do not edit. */
 
 static const struct xlat keyctl_commands[] = {
-#if defined(KEYCTL_GET_KEYRING_ID) || (defined(HAVE_DECL_KEYCTL_GET_KEYRING_ID) && HAVE_DECL_KEYCTL_GET_KEYRING_ID)
-	XLAT(KEYCTL_GET_KEYRING_ID),
+#if !(defined(KEYCTL_GET_KEYRING_ID) || (defined(HAVE_DECL_KEYCTL_GET_KEYRING_ID) && HAVE_DECL_KEYCTL_GET_KEYRING_ID))
+# define KEYCTL_GET_KEYRING_ID 0
 #endif
-#if defined(KEYCTL_JOIN_SESSION_KEYRING) || (defined(HAVE_DECL_KEYCTL_JOIN_SESSION_KEYRING) && HAVE_DECL_KEYCTL_JOIN_SESSION_KEYRING)
-	XLAT(KEYCTL_JOIN_SESSION_KEYRING),
+ XLAT(KEYCTL_GET_KEYRING_ID),
+#if !(defined(KEYCTL_JOIN_SESSION_KEYRING) || (defined(HAVE_DECL_KEYCTL_JOIN_SESSION_KEYRING) && HAVE_DECL_KEYCTL_JOIN_SESSION_KEYRING))
+# define KEYCTL_JOIN_SESSION_KEYRING 1
 #endif
-#if defined(KEYCTL_UPDATE) || (defined(HAVE_DECL_KEYCTL_UPDATE) && HAVE_DECL_KEYCTL_UPDATE)
-	XLAT(KEYCTL_UPDATE),
+ XLAT(KEYCTL_JOIN_SESSION_KEYRING),
+#if !(defined(KEYCTL_UPDATE) || (defined(HAVE_DECL_KEYCTL_UPDATE) && HAVE_DECL_KEYCTL_UPDATE))
+# define KEYCTL_UPDATE 2
 #endif
-#if defined(KEYCTL_REVOKE) || (defined(HAVE_DECL_KEYCTL_REVOKE) && HAVE_DECL_KEYCTL_REVOKE)
-	XLAT(KEYCTL_REVOKE),
+ XLAT(KEYCTL_UPDATE),
+#if !(defined(KEYCTL_REVOKE) || (defined(HAVE_DECL_KEYCTL_REVOKE) && HAVE_DECL_KEYCTL_REVOKE))
+# define KEYCTL_REVOKE 3
 #endif
-#if defined(KEYCTL_CHOWN) || (defined(HAVE_DECL_KEYCTL_CHOWN) && HAVE_DECL_KEYCTL_CHOWN)
-	XLAT(KEYCTL_CHOWN),
+ XLAT(KEYCTL_REVOKE),
+#if !(defined(KEYCTL_CHOWN) || (defined(HAVE_DECL_KEYCTL_CHOWN) && HAVE_DECL_KEYCTL_CHOWN))
+# define KEYCTL_CHOWN 4
 #endif
-#if defined(KEYCTL_SETPERM) || (defined(HAVE_DECL_KEYCTL_SETPERM) && HAVE_DECL_KEYCTL_SETPERM)
-	XLAT(KEYCTL_SETPERM),
+ XLAT(KEYCTL_CHOWN),
+#if !(defined(KEYCTL_SETPERM) || (defined(HAVE_DECL_KEYCTL_SETPERM) && HAVE_DECL_KEYCTL_SETPERM))
+# define KEYCTL_SETPERM 5
 #endif
-#if defined(KEYCTL_DESCRIBE) || (defined(HAVE_DECL_KEYCTL_DESCRIBE) && HAVE_DECL_KEYCTL_DESCRIBE)
-	XLAT(KEYCTL_DESCRIBE),
+ XLAT(KEYCTL_SETPERM),
+#if !(defined(KEYCTL_DESCRIBE) || (defined(HAVE_DECL_KEYCTL_DESCRIBE) && HAVE_DECL_KEYCTL_DESCRIBE))
+# define KEYCTL_DESCRIBE 6
 #endif
-#if defined(KEYCTL_CLEAR) || (defined(HAVE_DECL_KEYCTL_CLEAR) && HAVE_DECL_KEYCTL_CLEAR)
-	XLAT(KEYCTL_CLEAR),
+ XLAT(KEYCTL_DESCRIBE),
+#if !(defined(KEYCTL_CLEAR) || (defined(HAVE_DECL_KEYCTL_CLEAR) && HAVE_DECL_KEYCTL_CLEAR))
+# define KEYCTL_CLEAR 7
 #endif
-#if defined(KEYCTL_LINK) || (defined(HAVE_DECL_KEYCTL_LINK) && HAVE_DECL_KEYCTL_LINK)
-	XLAT(KEYCTL_LINK),
+ XLAT(KEYCTL_CLEAR),
+#if !(defined(KEYCTL_LINK) || (defined(HAVE_DECL_KEYCTL_LINK) && HAVE_DECL_KEYCTL_LINK))
+# define KEYCTL_LINK 8
 #endif
-#if defined(KEYCTL_UNLINK) || (defined(HAVE_DECL_KEYCTL_UNLINK) && HAVE_DECL_KEYCTL_UNLINK)
-	XLAT(KEYCTL_UNLINK),
+ XLAT(KEYCTL_LINK),
+#if !(defined(KEYCTL_UNLINK) || (defined(HAVE_DECL_KEYCTL_UNLINK) && HAVE_DECL_KEYCTL_UNLINK))
+# define KEYCTL_UNLINK 9
 #endif
-#if defined(KEYCTL_SEARCH) || (defined(HAVE_DECL_KEYCTL_SEARCH) && HAVE_DECL_KEYCTL_SEARCH)
-	XLAT(KEYCTL_SEARCH),
+ XLAT(KEYCTL_UNLINK),
+#if !(defined(KEYCTL_SEARCH) || (defined(HAVE_DECL_KEYCTL_SEARCH) && HAVE_DECL_KEYCTL_SEARCH))
+# define KEYCTL_SEARCH 10
 #endif
-#if defined(KEYCTL_READ) || (defined(HAVE_DECL_KEYCTL_READ) && HAVE_DECL_KEYCTL_READ)
-	XLAT(KEYCTL_READ),
+ XLAT(KEYCTL_SEARCH),
+#if !(defined(KEYCTL_READ) || (defined(HAVE_DECL_KEYCTL_READ) && HAVE_DECL_KEYCTL_READ))
+# define KEYCTL_READ 11
 #endif
-#if defined(KEYCTL_INSTANTIATE) || (defined(HAVE_DECL_KEYCTL_INSTANTIATE) && HAVE_DECL_KEYCTL_INSTANTIATE)
-	XLAT(KEYCTL_INSTANTIATE),
+ XLAT(KEYCTL_READ),
+#if !(defined(KEYCTL_INSTANTIATE) || (defined(HAVE_DECL_KEYCTL_INSTANTIATE) && HAVE_DECL_KEYCTL_INSTANTIATE))
+# define KEYCTL_INSTANTIATE 12
 #endif
-#if defined(KEYCTL_NEGATE) || (defined(HAVE_DECL_KEYCTL_NEGATE) && HAVE_DECL_KEYCTL_NEGATE)
-	XLAT(KEYCTL_NEGATE),
+ XLAT(KEYCTL_INSTANTIATE),
+#if !(defined(KEYCTL_NEGATE) || (defined(HAVE_DECL_KEYCTL_NEGATE) && HAVE_DECL_KEYCTL_NEGATE))
+# define KEYCTL_NEGATE 13
 #endif
-#if defined(KEYCTL_SET_REQKEY_KEYRING) || (defined(HAVE_DECL_KEYCTL_SET_REQKEY_KEYRING) && HAVE_DECL_KEYCTL_SET_REQKEY_KEYRING)
-	XLAT(KEYCTL_SET_REQKEY_KEYRING),
+ XLAT(KEYCTL_NEGATE),
+#if !(defined(KEYCTL_SET_REQKEY_KEYRING) || (defined(HAVE_DECL_KEYCTL_SET_REQKEY_KEYRING) && HAVE_DECL_KEYCTL_SET_REQKEY_KEYRING))
+# define KEYCTL_SET_REQKEY_KEYRING 14
 #endif
-#if defined(KEYCTL_SET_TIMEOUT) || (defined(HAVE_DECL_KEYCTL_SET_TIMEOUT) && HAVE_DECL_KEYCTL_SET_TIMEOUT)
-	XLAT(KEYCTL_SET_TIMEOUT),
+ XLAT(KEYCTL_SET_REQKEY_KEYRING),
+#if !(defined(KEYCTL_SET_TIMEOUT) || (defined(HAVE_DECL_KEYCTL_SET_TIMEOUT) && HAVE_DECL_KEYCTL_SET_TIMEOUT))
+# define KEYCTL_SET_TIMEOUT 15
 #endif
-#if defined(KEYCTL_ASSUME_AUTHORITY) || (defined(HAVE_DECL_KEYCTL_ASSUME_AUTHORITY) && HAVE_DECL_KEYCTL_ASSUME_AUTHORITY)
-	XLAT(KEYCTL_ASSUME_AUTHORITY),
+ XLAT(KEYCTL_SET_TIMEOUT),
+#if !(defined(KEYCTL_ASSUME_AUTHORITY) || (defined(HAVE_DECL_KEYCTL_ASSUME_AUTHORITY) && HAVE_DECL_KEYCTL_ASSUME_AUTHORITY))
+# define KEYCTL_ASSUME_AUTHORITY 16
 #endif
-#if defined(KEYCTL_GET_SECURITY) || (defined(HAVE_DECL_KEYCTL_GET_SECURITY) && HAVE_DECL_KEYCTL_GET_SECURITY)
-	XLAT(KEYCTL_GET_SECURITY),
+ XLAT(KEYCTL_ASSUME_AUTHORITY),
+#if !(defined(KEYCTL_GET_SECURITY) || (defined(HAVE_DECL_KEYCTL_GET_SECURITY) && HAVE_DECL_KEYCTL_GET_SECURITY))
+# define KEYCTL_GET_SECURITY 17
 #endif
-#if defined(KEYCTL_SESSION_TO_PARENT) || (defined(HAVE_DECL_KEYCTL_SESSION_TO_PARENT) && HAVE_DECL_KEYCTL_SESSION_TO_PARENT)
-	XLAT(KEYCTL_SESSION_TO_PARENT),
+ XLAT(KEYCTL_GET_SECURITY),
+#if !(defined(KEYCTL_SESSION_TO_PARENT) || (defined(HAVE_DECL_KEYCTL_SESSION_TO_PARENT) && HAVE_DECL_KEYCTL_SESSION_TO_PARENT))
+# define KEYCTL_SESSION_TO_PARENT 18
 #endif
-#if defined(KEYCTL_REJECT) || (defined(HAVE_DECL_KEYCTL_REJECT) && HAVE_DECL_KEYCTL_REJECT)
-	XLAT(KEYCTL_REJECT),
+ XLAT(KEYCTL_SESSION_TO_PARENT),
+#if !(defined(KEYCTL_REJECT) || (defined(HAVE_DECL_KEYCTL_REJECT) && HAVE_DECL_KEYCTL_REJECT))
+# define KEYCTL_REJECT 19
 #endif
-#if defined(KEYCTL_INSTANTIATE_IOV) || (defined(HAVE_DECL_KEYCTL_INSTANTIATE_IOV) && HAVE_DECL_KEYCTL_INSTANTIATE_IOV)
-	XLAT(KEYCTL_INSTANTIATE_IOV),
+ XLAT(KEYCTL_REJECT),
+#if !(defined(KEYCTL_INSTANTIATE_IOV) || (defined(HAVE_DECL_KEYCTL_INSTANTIATE_IOV) && HAVE_DECL_KEYCTL_INSTANTIATE_IOV))
+# define KEYCTL_INSTANTIATE_IOV 20
 #endif
-#if defined(KEYCTL_INVALIDATE) || (defined(HAVE_DECL_KEYCTL_INVALIDATE) && HAVE_DECL_KEYCTL_INVALIDATE)
-	XLAT(KEYCTL_INVALIDATE),
+ XLAT(KEYCTL_INSTANTIATE_IOV),
+#if !(defined(KEYCTL_INVALIDATE) || (defined(HAVE_DECL_KEYCTL_INVALIDATE) && HAVE_DECL_KEYCTL_INVALIDATE))
+# define KEYCTL_INVALIDATE 21
 #endif
-#if defined(KEYCTL_GET_PERSISTENT) || (defined(HAVE_DECL_KEYCTL_GET_PERSISTENT) && HAVE_DECL_KEYCTL_GET_PERSISTENT)
-	XLAT(KEYCTL_GET_PERSISTENT),
+ XLAT(KEYCTL_INVALIDATE),
+#if !(defined(KEYCTL_GET_PERSISTENT) || (defined(HAVE_DECL_KEYCTL_GET_PERSISTENT) && HAVE_DECL_KEYCTL_GET_PERSISTENT))
+# define KEYCTL_GET_PERSISTENT 22
 #endif
-	XLAT_END
+ XLAT(KEYCTL_GET_PERSISTENT),
+ XLAT_END
 };
diff --git a/xlat/lockfcmds.h b/xlat/lockfcmds.h
index ea50d5f..04f2ccc 100644
--- a/xlat/lockfcmds.h
+++ b/xlat/lockfcmds.h
@@ -2,19 +2,19 @@
 
 static const struct xlat lockfcmds[] = {
 #if defined(F_RDLCK) || (defined(HAVE_DECL_F_RDLCK) && HAVE_DECL_F_RDLCK)
-	XLAT(F_RDLCK),
+ XLAT(F_RDLCK),
 #endif
 #if defined(F_WRLCK) || (defined(HAVE_DECL_F_WRLCK) && HAVE_DECL_F_WRLCK)
-	XLAT(F_WRLCK),
+ XLAT(F_WRLCK),
 #endif
 #if defined(F_UNLCK) || (defined(HAVE_DECL_F_UNLCK) && HAVE_DECL_F_UNLCK)
-	XLAT(F_UNLCK),
+ XLAT(F_UNLCK),
 #endif
 #if defined(F_EXLCK) || (defined(HAVE_DECL_F_EXLCK) && HAVE_DECL_F_EXLCK)
-	XLAT(F_EXLCK),
+ XLAT(F_EXLCK),
 #endif
 #if defined(F_SHLCK) || (defined(HAVE_DECL_F_SHLCK) && HAVE_DECL_F_SHLCK)
-	XLAT(F_SHLCK),
+ XLAT(F_SHLCK),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/loop_crypt_type_options.h b/xlat/loop_crypt_type_options.h
index 3b1c287..1d3d72e 100644
--- a/xlat/loop_crypt_type_options.h
+++ b/xlat/loop_crypt_type_options.h
@@ -2,34 +2,34 @@
 
 static const struct xlat loop_crypt_type_options[] = {
 #if defined(LO_CRYPT_NONE) || (defined(HAVE_DECL_LO_CRYPT_NONE) && HAVE_DECL_LO_CRYPT_NONE)
-	XLAT(LO_CRYPT_NONE),
+ XLAT(LO_CRYPT_NONE),
 #endif
 #if defined(LO_CRYPT_XOR) || (defined(HAVE_DECL_LO_CRYPT_XOR) && HAVE_DECL_LO_CRYPT_XOR)
-	XLAT(LO_CRYPT_XOR),
+ XLAT(LO_CRYPT_XOR),
 #endif
 #if defined(LO_CRYPT_DES) || (defined(HAVE_DECL_LO_CRYPT_DES) && HAVE_DECL_LO_CRYPT_DES)
-	XLAT(LO_CRYPT_DES),
+ XLAT(LO_CRYPT_DES),
 #endif
 #if defined(LO_CRYPT_FISH2) || (defined(HAVE_DECL_LO_CRYPT_FISH2) && HAVE_DECL_LO_CRYPT_FISH2)
-	XLAT(LO_CRYPT_FISH2),
+ XLAT(LO_CRYPT_FISH2),
 #endif
 #if defined(LO_CRYPT_BLOW) || (defined(HAVE_DECL_LO_CRYPT_BLOW) && HAVE_DECL_LO_CRYPT_BLOW)
-	XLAT(LO_CRYPT_BLOW),
+ XLAT(LO_CRYPT_BLOW),
 #endif
 #if defined(LO_CRYPT_CAST128) || (defined(HAVE_DECL_LO_CRYPT_CAST128) && HAVE_DECL_LO_CRYPT_CAST128)
-	XLAT(LO_CRYPT_CAST128),
+ XLAT(LO_CRYPT_CAST128),
 #endif
 #if defined(LO_CRYPT_IDEA) || (defined(HAVE_DECL_LO_CRYPT_IDEA) && HAVE_DECL_LO_CRYPT_IDEA)
-	XLAT(LO_CRYPT_IDEA),
+ XLAT(LO_CRYPT_IDEA),
 #endif
 #if defined(LO_CRYPT_DUMMY) || (defined(HAVE_DECL_LO_CRYPT_DUMMY) && HAVE_DECL_LO_CRYPT_DUMMY)
-	XLAT(LO_CRYPT_DUMMY),
+ XLAT(LO_CRYPT_DUMMY),
 #endif
 #if defined(LO_CRYPT_SKIPJACK) || (defined(HAVE_DECL_LO_CRYPT_SKIPJACK) && HAVE_DECL_LO_CRYPT_SKIPJACK)
-	XLAT(LO_CRYPT_SKIPJACK),
+ XLAT(LO_CRYPT_SKIPJACK),
 #endif
 #if defined(LO_CRYPT_CRYPTOAPI) || (defined(HAVE_DECL_LO_CRYPT_CRYPTOAPI) && HAVE_DECL_LO_CRYPT_CRYPTOAPI)
-	XLAT(LO_CRYPT_CRYPTOAPI),
+ XLAT(LO_CRYPT_CRYPTOAPI),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/loop_flags_options.h b/xlat/loop_flags_options.h
index 1333714..5d66ea2 100644
--- a/xlat/loop_flags_options.h
+++ b/xlat/loop_flags_options.h
@@ -2,13 +2,13 @@
 
 static const struct xlat loop_flags_options[] = {
 #if defined(LO_FLAGS_READ_ONLY) || (defined(HAVE_DECL_LO_FLAGS_READ_ONLY) && HAVE_DECL_LO_FLAGS_READ_ONLY)
-	XLAT(LO_FLAGS_READ_ONLY),
+ XLAT(LO_FLAGS_READ_ONLY),
 #endif
 #if defined(LO_FLAGS_AUTOCLEAR) || (defined(HAVE_DECL_LO_FLAGS_AUTOCLEAR) && HAVE_DECL_LO_FLAGS_AUTOCLEAR)
-	XLAT(LO_FLAGS_AUTOCLEAR),
+ XLAT(LO_FLAGS_AUTOCLEAR),
 #endif
 #if defined(LO_FLAGS_PARTSCAN) || (defined(HAVE_DECL_LO_FLAGS_PARTSCAN) && HAVE_DECL_LO_FLAGS_PARTSCAN)
-	XLAT(LO_FLAGS_PARTSCAN),
+ XLAT(LO_FLAGS_PARTSCAN),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/madvise_cmds.h b/xlat/madvise_cmds.h
index 1ff9641..fbb8eb2 100644
--- a/xlat/madvise_cmds.h
+++ b/xlat/madvise_cmds.h
@@ -2,52 +2,52 @@
 
 static const struct xlat madvise_cmds[] = {
 #if defined(MADV_NORMAL) || (defined(HAVE_DECL_MADV_NORMAL) && HAVE_DECL_MADV_NORMAL)
-	XLAT(MADV_NORMAL),
+ XLAT(MADV_NORMAL),
 #endif
 #if defined(MADV_RANDOM) || (defined(HAVE_DECL_MADV_RANDOM) && HAVE_DECL_MADV_RANDOM)
-	XLAT(MADV_RANDOM),
+ XLAT(MADV_RANDOM),
 #endif
 #if defined(MADV_SEQUENTIAL) || (defined(HAVE_DECL_MADV_SEQUENTIAL) && HAVE_DECL_MADV_SEQUENTIAL)
-	XLAT(MADV_SEQUENTIAL),
+ XLAT(MADV_SEQUENTIAL),
 #endif
 #if defined(MADV_WILLNEED) || (defined(HAVE_DECL_MADV_WILLNEED) && HAVE_DECL_MADV_WILLNEED)
-	XLAT(MADV_WILLNEED),
+ XLAT(MADV_WILLNEED),
 #endif
 #if defined(MADV_DONTNEED) || (defined(HAVE_DECL_MADV_DONTNEED) && HAVE_DECL_MADV_DONTNEED)
-	XLAT(MADV_DONTNEED),
+ XLAT(MADV_DONTNEED),
 #endif
 #if defined(MADV_REMOVE) || (defined(HAVE_DECL_MADV_REMOVE) && HAVE_DECL_MADV_REMOVE)
-	XLAT(MADV_REMOVE),
+ XLAT(MADV_REMOVE),
 #endif
 #if defined(MADV_DONTFORK) || (defined(HAVE_DECL_MADV_DONTFORK) && HAVE_DECL_MADV_DONTFORK)
-	XLAT(MADV_DONTFORK),
+ XLAT(MADV_DONTFORK),
 #endif
 #if defined(MADV_DOFORK) || (defined(HAVE_DECL_MADV_DOFORK) && HAVE_DECL_MADV_DOFORK)
-	XLAT(MADV_DOFORK),
+ XLAT(MADV_DOFORK),
 #endif
 #if defined(MADV_HWPOISON) || (defined(HAVE_DECL_MADV_HWPOISON) && HAVE_DECL_MADV_HWPOISON)
-	XLAT(MADV_HWPOISON),
+ XLAT(MADV_HWPOISON),
 #endif
 #if defined(MADV_SOFT_OFFLINE) || (defined(HAVE_DECL_MADV_SOFT_OFFLINE) && HAVE_DECL_MADV_SOFT_OFFLINE)
-	XLAT(MADV_SOFT_OFFLINE),
+ XLAT(MADV_SOFT_OFFLINE),
 #endif
 #if defined(MADV_MERGEABLE) || (defined(HAVE_DECL_MADV_MERGEABLE) && HAVE_DECL_MADV_MERGEABLE)
-	XLAT(MADV_MERGEABLE),
+ XLAT(MADV_MERGEABLE),
 #endif
 #if defined(MADV_UNMERGEABLE) || (defined(HAVE_DECL_MADV_UNMERGEABLE) && HAVE_DECL_MADV_UNMERGEABLE)
-	XLAT(MADV_UNMERGEABLE),
+ XLAT(MADV_UNMERGEABLE),
 #endif
 #if defined(MADV_HUGEPAGE) || (defined(HAVE_DECL_MADV_HUGEPAGE) && HAVE_DECL_MADV_HUGEPAGE)
-	XLAT(MADV_HUGEPAGE),
+ XLAT(MADV_HUGEPAGE),
 #endif
 #if defined(MADV_NOHUGEPAGE) || (defined(HAVE_DECL_MADV_NOHUGEPAGE) && HAVE_DECL_MADV_NOHUGEPAGE)
-	XLAT(MADV_NOHUGEPAGE),
+ XLAT(MADV_NOHUGEPAGE),
 #endif
 #if defined(MADV_DONTDUMP) || (defined(HAVE_DECL_MADV_DONTDUMP) && HAVE_DECL_MADV_DONTDUMP)
-	XLAT(MADV_DONTDUMP),
+ XLAT(MADV_DONTDUMP),
 #endif
 #if defined(MADV_DODUMP) || (defined(HAVE_DECL_MADV_DODUMP) && HAVE_DECL_MADV_DODUMP)
-	XLAT(MADV_DODUMP),
+ XLAT(MADV_DODUMP),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/mbindflags.h b/xlat/mbindflags.h
index b789068..ad47048 100644
--- a/xlat/mbindflags.h
+++ b/xlat/mbindflags.h
@@ -2,13 +2,13 @@
 
 static const struct xlat mbindflags[] = {
 #if defined(MPOL_MF_STRICT) || (defined(HAVE_DECL_MPOL_MF_STRICT) && HAVE_DECL_MPOL_MF_STRICT)
-	XLAT(MPOL_MF_STRICT),
+ XLAT(MPOL_MF_STRICT),
 #endif
 #if defined(MPOL_MF_MOVE) || (defined(HAVE_DECL_MPOL_MF_MOVE) && HAVE_DECL_MPOL_MF_MOVE)
-	XLAT(MPOL_MF_MOVE),
+ XLAT(MPOL_MF_MOVE),
 #endif
 #if defined(MPOL_MF_MOVE_ALL) || (defined(HAVE_DECL_MPOL_MF_MOVE_ALL) && HAVE_DECL_MPOL_MF_MOVE_ALL)
-	XLAT(MPOL_MF_MOVE_ALL),
+ XLAT(MPOL_MF_MOVE_ALL),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/mctl_sync.h b/xlat/mctl_sync.h
index bae678e..ac5ba6d 100644
--- a/xlat/mctl_sync.h
+++ b/xlat/mctl_sync.h
@@ -2,13 +2,13 @@
 
 static const struct xlat mctl_sync[] = {
 #if defined(MS_SYNC) || (defined(HAVE_DECL_MS_SYNC) && HAVE_DECL_MS_SYNC)
-	XLAT(MS_SYNC),
+ XLAT(MS_SYNC),
 #endif
 #if defined(MS_ASYNC) || (defined(HAVE_DECL_MS_ASYNC) && HAVE_DECL_MS_ASYNC)
-	XLAT(MS_ASYNC),
+ XLAT(MS_ASYNC),
 #endif
 #if defined(MS_INVALIDATE) || (defined(HAVE_DECL_MS_INVALIDATE) && HAVE_DECL_MS_INVALIDATE)
-	XLAT(MS_INVALIDATE),
+ XLAT(MS_INVALIDATE),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/mempolicyflags.h b/xlat/mempolicyflags.h
index c88f326..fec9b30 100644
--- a/xlat/mempolicyflags.h
+++ b/xlat/mempolicyflags.h
@@ -2,10 +2,10 @@
 
 static const struct xlat mempolicyflags[] = {
 #if defined(MPOL_F_NODE) || (defined(HAVE_DECL_MPOL_F_NODE) && HAVE_DECL_MPOL_F_NODE)
-	XLAT(MPOL_F_NODE),
+ XLAT(MPOL_F_NODE),
 #endif
 #if defined(MPOL_F_ADDR) || (defined(HAVE_DECL_MPOL_F_ADDR) && HAVE_DECL_MPOL_F_ADDR)
-	XLAT(MPOL_F_ADDR),
+ XLAT(MPOL_F_ADDR),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/mlockall_flags.h b/xlat/mlockall_flags.h
index 8cf80bb..12bb506 100644
--- a/xlat/mlockall_flags.h
+++ b/xlat/mlockall_flags.h
@@ -2,10 +2,10 @@
 
 static const struct xlat mlockall_flags[] = {
 #if defined(MCL_CURRENT) || (defined(HAVE_DECL_MCL_CURRENT) && HAVE_DECL_MCL_CURRENT)
-	XLAT(MCL_CURRENT),
+ XLAT(MCL_CURRENT),
 #endif
 #if defined(MCL_FUTURE) || (defined(HAVE_DECL_MCL_FUTURE) && HAVE_DECL_MCL_FUTURE)
-	XLAT(MCL_FUTURE),
+ XLAT(MCL_FUTURE),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/mmap_flags.h b/xlat/mmap_flags.h
index 91029f8..3b9c3d8 100644
--- a/xlat/mmap_flags.h
+++ b/xlat/mmap_flags.h
@@ -2,31 +2,31 @@
 
 static const struct xlat mmap_flags[] = {
 #if defined(MAP_SHARED) || (defined(HAVE_DECL_MAP_SHARED) && HAVE_DECL_MAP_SHARED)
-	XLAT(MAP_SHARED),
+ XLAT(MAP_SHARED),
 #endif
 #if defined(MAP_PRIVATE) || (defined(HAVE_DECL_MAP_PRIVATE) && HAVE_DECL_MAP_PRIVATE)
-	XLAT(MAP_PRIVATE),
+ XLAT(MAP_PRIVATE),
 #endif
 #if defined(MAP_FIXED) || (defined(HAVE_DECL_MAP_FIXED) && HAVE_DECL_MAP_FIXED)
-	XLAT(MAP_FIXED),
+ XLAT(MAP_FIXED),
 #endif
 #if defined(MAP_ANONYMOUS) || (defined(HAVE_DECL_MAP_ANONYMOUS) && HAVE_DECL_MAP_ANONYMOUS)
-	XLAT(MAP_ANONYMOUS),
+ XLAT(MAP_ANONYMOUS),
 #endif
 #if defined(MAP_32BIT) || (defined(HAVE_DECL_MAP_32BIT) && HAVE_DECL_MAP_32BIT)
-	XLAT(MAP_32BIT),
+ XLAT(MAP_32BIT),
 #endif
 #if defined(MAP_RENAME) || (defined(HAVE_DECL_MAP_RENAME) && HAVE_DECL_MAP_RENAME)
-	XLAT(MAP_RENAME),
+ XLAT(MAP_RENAME),
 #endif
 #if defined(MAP_NORESERVE) || (defined(HAVE_DECL_MAP_NORESERVE) && HAVE_DECL_MAP_NORESERVE)
-	XLAT(MAP_NORESERVE),
+ XLAT(MAP_NORESERVE),
 #endif
 #if defined(MAP_POPULATE) || (defined(HAVE_DECL_MAP_POPULATE) && HAVE_DECL_MAP_POPULATE)
-	XLAT(MAP_POPULATE),
+ XLAT(MAP_POPULATE),
 #endif
 #if defined(MAP_NONBLOCK) || (defined(HAVE_DECL_MAP_NONBLOCK) && HAVE_DECL_MAP_NONBLOCK)
-	XLAT(MAP_NONBLOCK),
+ XLAT(MAP_NONBLOCK),
 #endif
 /*
 * XXX - this was introduced in SunOS 4.x to distinguish between
@@ -56,51 +56,51 @@
 * and calls with it as "mmap()".
 */
 #if defined(_MAP_NEW) || (defined(HAVE_DECL__MAP_NEW) && HAVE_DECL__MAP_NEW)
-	XLAT(_MAP_NEW),
+ XLAT(_MAP_NEW),
 #endif
 #if defined(MAP_GROWSDOWN) || (defined(HAVE_DECL_MAP_GROWSDOWN) && HAVE_DECL_MAP_GROWSDOWN)
-	XLAT(MAP_GROWSDOWN),
+ XLAT(MAP_GROWSDOWN),
 #endif
 #if defined(MAP_DENYWRITE) || (defined(HAVE_DECL_MAP_DENYWRITE) && HAVE_DECL_MAP_DENYWRITE)
-	XLAT(MAP_DENYWRITE),
+ XLAT(MAP_DENYWRITE),
 #endif
 #if defined(MAP_EXECUTABLE) || (defined(HAVE_DECL_MAP_EXECUTABLE) && HAVE_DECL_MAP_EXECUTABLE)
-	XLAT(MAP_EXECUTABLE),
+ XLAT(MAP_EXECUTABLE),
 #endif
 #if defined(MAP_INHERIT) || (defined(HAVE_DECL_MAP_INHERIT) && HAVE_DECL_MAP_INHERIT)
-	XLAT(MAP_INHERIT),
+ XLAT(MAP_INHERIT),
 #endif
 #if defined(MAP_FILE) || (defined(HAVE_DECL_MAP_FILE) && HAVE_DECL_MAP_FILE)
-	XLAT(MAP_FILE),
+ XLAT(MAP_FILE),
 #endif
 #if defined(MAP_LOCKED) || (defined(HAVE_DECL_MAP_LOCKED) && HAVE_DECL_MAP_LOCKED)
-	XLAT(MAP_LOCKED),
+ XLAT(MAP_LOCKED),
 #endif
 /* FreeBSD ones */
 #if defined(MAP_ANON) && (!defined(MAP_ANONYMOUS) || MAP_ANON != MAP_ANONYMOUS)
 #if defined(MAP_ANON) || (defined(HAVE_DECL_MAP_ANON) && HAVE_DECL_MAP_ANON)
-	XLAT(MAP_ANON),
+ XLAT(MAP_ANON),
 #endif
 #endif
 #if defined(MAP_HASSEMAPHORE) || (defined(HAVE_DECL_MAP_HASSEMAPHORE) && HAVE_DECL_MAP_HASSEMAPHORE)
-	XLAT(MAP_HASSEMAPHORE),
+ XLAT(MAP_HASSEMAPHORE),
 #endif
 #if defined(MAP_STACK) || (defined(HAVE_DECL_MAP_STACK) && HAVE_DECL_MAP_STACK)
-	XLAT(MAP_STACK),
+ XLAT(MAP_STACK),
 #endif
 #if defined(MAP_HUGETLB) || (defined(HAVE_DECL_MAP_HUGETLB) && HAVE_DECL_MAP_HUGETLB)
-	XLAT(MAP_HUGETLB),
+ XLAT(MAP_HUGETLB),
 #endif
 #if defined MAP_UNINITIALIZED && MAP_UNINITIALIZED > 0
 #if defined(MAP_UNINITIALIZED) || (defined(HAVE_DECL_MAP_UNINITIALIZED) && HAVE_DECL_MAP_UNINITIALIZED)
-	XLAT(MAP_UNINITIALIZED),
+ XLAT(MAP_UNINITIALIZED),
 #endif
 #endif
 #if defined(MAP_NOSYNC) || (defined(HAVE_DECL_MAP_NOSYNC) && HAVE_DECL_MAP_NOSYNC)
-	XLAT(MAP_NOSYNC),
+ XLAT(MAP_NOSYNC),
 #endif
 #if defined(MAP_NOCORE) || (defined(HAVE_DECL_MAP_NOCORE) && HAVE_DECL_MAP_NOCORE)
-	XLAT(MAP_NOCORE),
+ XLAT(MAP_NOCORE),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/mmap_prot.h b/xlat/mmap_prot.h
index 8b18690..9751412 100644
--- a/xlat/mmap_prot.h
+++ b/xlat/mmap_prot.h
@@ -2,28 +2,28 @@
 
 static const struct xlat mmap_prot[] = {
 #if defined(PROT_NONE) || (defined(HAVE_DECL_PROT_NONE) && HAVE_DECL_PROT_NONE)
-	XLAT(PROT_NONE),
+ XLAT(PROT_NONE),
 #endif
 #if defined(PROT_READ) || (defined(HAVE_DECL_PROT_READ) && HAVE_DECL_PROT_READ)
-	XLAT(PROT_READ),
+ XLAT(PROT_READ),
 #endif
 #if defined(PROT_WRITE) || (defined(HAVE_DECL_PROT_WRITE) && HAVE_DECL_PROT_WRITE)
-	XLAT(PROT_WRITE),
+ XLAT(PROT_WRITE),
 #endif
 #if defined(PROT_EXEC) || (defined(HAVE_DECL_PROT_EXEC) && HAVE_DECL_PROT_EXEC)
-	XLAT(PROT_EXEC),
+ XLAT(PROT_EXEC),
 #endif
 #if defined(PROT_SEM) || (defined(HAVE_DECL_PROT_SEM) && HAVE_DECL_PROT_SEM)
-	XLAT(PROT_SEM),
+ XLAT(PROT_SEM),
 #endif
 #if defined(PROT_GROWSDOWN) || (defined(HAVE_DECL_PROT_GROWSDOWN) && HAVE_DECL_PROT_GROWSDOWN)
-	XLAT(PROT_GROWSDOWN),
+ XLAT(PROT_GROWSDOWN),
 #endif
 #if defined(PROT_GROWSUP) || (defined(HAVE_DECL_PROT_GROWSUP) && HAVE_DECL_PROT_GROWSUP)
-	XLAT(PROT_GROWSUP),
+ XLAT(PROT_GROWSUP),
 #endif
 #if defined(PROT_SAO) || (defined(HAVE_DECL_PROT_SAO) && HAVE_DECL_PROT_SAO)
-	XLAT(PROT_SAO),
+ XLAT(PROT_SAO),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/modem_flags.h b/xlat/modem_flags.h
index 8678eb9..1726028 100644
--- a/xlat/modem_flags.h
+++ b/xlat/modem_flags.h
@@ -2,37 +2,37 @@
 
 static const struct xlat modem_flags[] = {
 #if defined(TIOCM_LE) || (defined(HAVE_DECL_TIOCM_LE) && HAVE_DECL_TIOCM_LE)
-	XLAT(TIOCM_LE),
+ XLAT(TIOCM_LE),
 #endif
 #if defined(TIOCM_DTR) || (defined(HAVE_DECL_TIOCM_DTR) && HAVE_DECL_TIOCM_DTR)
-	XLAT(TIOCM_DTR),
+ XLAT(TIOCM_DTR),
 #endif
 #if defined(TIOCM_RTS) || (defined(HAVE_DECL_TIOCM_RTS) && HAVE_DECL_TIOCM_RTS)
-	XLAT(TIOCM_RTS),
+ XLAT(TIOCM_RTS),
 #endif
 #if defined(TIOCM_ST) || (defined(HAVE_DECL_TIOCM_ST) && HAVE_DECL_TIOCM_ST)
-	XLAT(TIOCM_ST),
+ XLAT(TIOCM_ST),
 #endif
 #if defined(TIOCM_SR) || (defined(HAVE_DECL_TIOCM_SR) && HAVE_DECL_TIOCM_SR)
-	XLAT(TIOCM_SR),
+ XLAT(TIOCM_SR),
 #endif
 #if defined(TIOCM_CTS) || (defined(HAVE_DECL_TIOCM_CTS) && HAVE_DECL_TIOCM_CTS)
-	XLAT(TIOCM_CTS),
+ XLAT(TIOCM_CTS),
 #endif
 #if defined(TIOCM_CAR) || (defined(HAVE_DECL_TIOCM_CAR) && HAVE_DECL_TIOCM_CAR)
-	XLAT(TIOCM_CAR),
+ XLAT(TIOCM_CAR),
 #endif
 #if defined(TIOCM_CD) || (defined(HAVE_DECL_TIOCM_CD) && HAVE_DECL_TIOCM_CD)
-	XLAT(TIOCM_CD),
+ XLAT(TIOCM_CD),
 #endif
 #if defined(TIOCM_RNG) || (defined(HAVE_DECL_TIOCM_RNG) && HAVE_DECL_TIOCM_RNG)
-	XLAT(TIOCM_RNG),
+ XLAT(TIOCM_RNG),
 #endif
 #if defined(TIOCM_RI) || (defined(HAVE_DECL_TIOCM_RI) && HAVE_DECL_TIOCM_RI)
-	XLAT(TIOCM_RI),
+ XLAT(TIOCM_RI),
 #endif
 #if defined(TIOCM_DSR) || (defined(HAVE_DECL_TIOCM_DSR) && HAVE_DECL_TIOCM_DSR)
-	XLAT(TIOCM_DSR),
+ XLAT(TIOCM_DSR),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/modetypes.h b/xlat/modetypes.h
index 1438b02..e0fe383 100644
--- a/xlat/modetypes.h
+++ b/xlat/modetypes.h
@@ -2,25 +2,25 @@
 
 static const struct xlat modetypes[] = {
 #if defined(S_IFREG) || (defined(HAVE_DECL_S_IFREG) && HAVE_DECL_S_IFREG)
-	XLAT(S_IFREG),
+ XLAT(S_IFREG),
 #endif
 #if defined(S_IFSOCK) || (defined(HAVE_DECL_S_IFSOCK) && HAVE_DECL_S_IFSOCK)
-	XLAT(S_IFSOCK),
+ XLAT(S_IFSOCK),
 #endif
 #if defined(S_IFIFO) || (defined(HAVE_DECL_S_IFIFO) && HAVE_DECL_S_IFIFO)
-	XLAT(S_IFIFO),
+ XLAT(S_IFIFO),
 #endif
 #if defined(S_IFLNK) || (defined(HAVE_DECL_S_IFLNK) && HAVE_DECL_S_IFLNK)
-	XLAT(S_IFLNK),
+ XLAT(S_IFLNK),
 #endif
 #if defined(S_IFDIR) || (defined(HAVE_DECL_S_IFDIR) && HAVE_DECL_S_IFDIR)
-	XLAT(S_IFDIR),
+ XLAT(S_IFDIR),
 #endif
 #if defined(S_IFBLK) || (defined(HAVE_DECL_S_IFBLK) && HAVE_DECL_S_IFBLK)
-	XLAT(S_IFBLK),
+ XLAT(S_IFBLK),
 #endif
 #if defined(S_IFCHR) || (defined(HAVE_DECL_S_IFCHR) && HAVE_DECL_S_IFCHR)
-	XLAT(S_IFCHR),
+ XLAT(S_IFCHR),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/modflags.h b/xlat/modflags.h
index 664e9c1..a277eb5 100644
--- a/xlat/modflags.h
+++ b/xlat/modflags.h
@@ -2,25 +2,25 @@
 
 static const struct xlat modflags[] = {
 #if defined(MOD_UNINITIALIZED) || (defined(HAVE_DECL_MOD_UNINITIALIZED) && HAVE_DECL_MOD_UNINITIALIZED)
-	XLAT(MOD_UNINITIALIZED),
+ XLAT(MOD_UNINITIALIZED),
 #endif
 #if defined(MOD_RUNNING) || (defined(HAVE_DECL_MOD_RUNNING) && HAVE_DECL_MOD_RUNNING)
-	XLAT(MOD_RUNNING),
+ XLAT(MOD_RUNNING),
 #endif
 #if defined(MOD_DELETED) || (defined(HAVE_DECL_MOD_DELETED) && HAVE_DECL_MOD_DELETED)
-	XLAT(MOD_DELETED),
+ XLAT(MOD_DELETED),
 #endif
 #if defined(MOD_AUTOCLEAN) || (defined(HAVE_DECL_MOD_AUTOCLEAN) && HAVE_DECL_MOD_AUTOCLEAN)
-	XLAT(MOD_AUTOCLEAN),
+ XLAT(MOD_AUTOCLEAN),
 #endif
 #if defined(MOD_VISITED) || (defined(HAVE_DECL_MOD_VISITED) && HAVE_DECL_MOD_VISITED)
-	XLAT(MOD_VISITED),
+ XLAT(MOD_VISITED),
 #endif
 #if defined(MOD_USED_ONCE) || (defined(HAVE_DECL_MOD_USED_ONCE) && HAVE_DECL_MOD_USED_ONCE)
-	XLAT(MOD_USED_ONCE),
+ XLAT(MOD_USED_ONCE),
 #endif
 #if defined(MOD_JUST_FREED) || (defined(HAVE_DECL_MOD_JUST_FREED) && HAVE_DECL_MOD_JUST_FREED)
-	XLAT(MOD_JUST_FREED),
+ XLAT(MOD_JUST_FREED),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/module_init_flags.h b/xlat/module_init_flags.h
index 00ae3d6..1b9f260 100644
--- a/xlat/module_init_flags.h
+++ b/xlat/module_init_flags.h
@@ -2,10 +2,10 @@
 
 static const struct xlat module_init_flags[] = {
 #if defined(MODULE_INIT_IGNORE_MODVERSIONS) || (defined(HAVE_DECL_MODULE_INIT_IGNORE_MODVERSIONS) && HAVE_DECL_MODULE_INIT_IGNORE_MODVERSIONS)
-	XLAT(MODULE_INIT_IGNORE_MODVERSIONS),
+ XLAT(MODULE_INIT_IGNORE_MODVERSIONS),
 #endif
 #if defined(MODULE_INIT_IGNORE_VERMAGIC) || (defined(HAVE_DECL_MODULE_INIT_IGNORE_VERMAGIC) && HAVE_DECL_MODULE_INIT_IGNORE_VERMAGIC)
-	XLAT(MODULE_INIT_IGNORE_VERMAGIC),
+ XLAT(MODULE_INIT_IGNORE_VERMAGIC),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/mount_flags.h b/xlat/mount_flags.h
index cbd8e76..ec37708 100644
--- a/xlat/mount_flags.h
+++ b/xlat/mount_flags.h
@@ -2,85 +2,85 @@
 
 static const struct xlat mount_flags[] = {
 #if defined(MS_MGC_VAL) || (defined(HAVE_DECL_MS_MGC_VAL) && HAVE_DECL_MS_MGC_VAL)
-	XLAT(MS_MGC_VAL),
+ XLAT(MS_MGC_VAL),
 #endif
 #if defined(MS_RDONLY) || (defined(HAVE_DECL_MS_RDONLY) && HAVE_DECL_MS_RDONLY)
-	XLAT(MS_RDONLY),
+ XLAT(MS_RDONLY),
 #endif
 #if defined(MS_NOSUID) || (defined(HAVE_DECL_MS_NOSUID) && HAVE_DECL_MS_NOSUID)
-	XLAT(MS_NOSUID),
+ XLAT(MS_NOSUID),
 #endif
 #if defined(MS_NODEV) || (defined(HAVE_DECL_MS_NODEV) && HAVE_DECL_MS_NODEV)
-	XLAT(MS_NODEV),
+ XLAT(MS_NODEV),
 #endif
 #if defined(MS_NOEXEC) || (defined(HAVE_DECL_MS_NOEXEC) && HAVE_DECL_MS_NOEXEC)
-	XLAT(MS_NOEXEC),
+ XLAT(MS_NOEXEC),
 #endif
 #if defined(MS_SYNCHRONOUS) || (defined(HAVE_DECL_MS_SYNCHRONOUS) && HAVE_DECL_MS_SYNCHRONOUS)
-	XLAT(MS_SYNCHRONOUS),
+ XLAT(MS_SYNCHRONOUS),
 #endif
 #if defined(MS_REMOUNT) || (defined(HAVE_DECL_MS_REMOUNT) && HAVE_DECL_MS_REMOUNT)
-	XLAT(MS_REMOUNT),
+ XLAT(MS_REMOUNT),
 #endif
 #if defined(MS_RELATIME) || (defined(HAVE_DECL_MS_RELATIME) && HAVE_DECL_MS_RELATIME)
-	XLAT(MS_RELATIME),
+ XLAT(MS_RELATIME),
 #endif
 #if defined(MS_KERNMOUNT) || (defined(HAVE_DECL_MS_KERNMOUNT) && HAVE_DECL_MS_KERNMOUNT)
-	XLAT(MS_KERNMOUNT),
+ XLAT(MS_KERNMOUNT),
 #endif
 #if defined(MS_I_VERSION) || (defined(HAVE_DECL_MS_I_VERSION) && HAVE_DECL_MS_I_VERSION)
-	XLAT(MS_I_VERSION),
+ XLAT(MS_I_VERSION),
 #endif
 #if defined(MS_STRICTATIME) || (defined(HAVE_DECL_MS_STRICTATIME) && HAVE_DECL_MS_STRICTATIME)
-	XLAT(MS_STRICTATIME),
+ XLAT(MS_STRICTATIME),
 #endif
 #if defined(MS_NOSEC) || (defined(HAVE_DECL_MS_NOSEC) && HAVE_DECL_MS_NOSEC)
-	XLAT(MS_NOSEC),
+ XLAT(MS_NOSEC),
 #endif
 #if defined(MS_BORN) || (defined(HAVE_DECL_MS_BORN) && HAVE_DECL_MS_BORN)
-	XLAT(MS_BORN),
+ XLAT(MS_BORN),
 #endif
 #if defined(MS_MANDLOCK) || (defined(HAVE_DECL_MS_MANDLOCK) && HAVE_DECL_MS_MANDLOCK)
-	XLAT(MS_MANDLOCK),
+ XLAT(MS_MANDLOCK),
 #endif
 #if defined(MS_NOATIME) || (defined(HAVE_DECL_MS_NOATIME) && HAVE_DECL_MS_NOATIME)
-	XLAT(MS_NOATIME),
+ XLAT(MS_NOATIME),
 #endif
 #if defined(MS_NODIRATIME) || (defined(HAVE_DECL_MS_NODIRATIME) && HAVE_DECL_MS_NODIRATIME)
-	XLAT(MS_NODIRATIME),
+ XLAT(MS_NODIRATIME),
 #endif
 #if defined(MS_BIND) || (defined(HAVE_DECL_MS_BIND) && HAVE_DECL_MS_BIND)
-	XLAT(MS_BIND),
+ XLAT(MS_BIND),
 #endif
 #if defined(MS_MOVE) || (defined(HAVE_DECL_MS_MOVE) && HAVE_DECL_MS_MOVE)
-	XLAT(MS_MOVE),
+ XLAT(MS_MOVE),
 #endif
 #if defined(MS_REC) || (defined(HAVE_DECL_MS_REC) && HAVE_DECL_MS_REC)
-	XLAT(MS_REC),
+ XLAT(MS_REC),
 #endif
 #if defined(MS_SILENT) || (defined(HAVE_DECL_MS_SILENT) && HAVE_DECL_MS_SILENT)
-	XLAT(MS_SILENT),
+ XLAT(MS_SILENT),
 #endif
 #if defined(MS_POSIXACL) || (defined(HAVE_DECL_MS_POSIXACL) && HAVE_DECL_MS_POSIXACL)
-	XLAT(MS_POSIXACL),
+ XLAT(MS_POSIXACL),
 #endif
 #if defined(MS_UNBINDABLE) || (defined(HAVE_DECL_MS_UNBINDABLE) && HAVE_DECL_MS_UNBINDABLE)
-	XLAT(MS_UNBINDABLE),
+ XLAT(MS_UNBINDABLE),
 #endif
 #if defined(MS_PRIVATE) || (defined(HAVE_DECL_MS_PRIVATE) && HAVE_DECL_MS_PRIVATE)
-	XLAT(MS_PRIVATE),
+ XLAT(MS_PRIVATE),
 #endif
 #if defined(MS_SLAVE) || (defined(HAVE_DECL_MS_SLAVE) && HAVE_DECL_MS_SLAVE)
-	XLAT(MS_SLAVE),
+ XLAT(MS_SLAVE),
 #endif
 #if defined(MS_SHARED) || (defined(HAVE_DECL_MS_SHARED) && HAVE_DECL_MS_SHARED)
-	XLAT(MS_SHARED),
+ XLAT(MS_SHARED),
 #endif
 #if defined(MS_ACTIVE) || (defined(HAVE_DECL_MS_ACTIVE) && HAVE_DECL_MS_ACTIVE)
-	XLAT(MS_ACTIVE),
+ XLAT(MS_ACTIVE),
 #endif
 #if defined(MS_NOUSER) || (defined(HAVE_DECL_MS_NOUSER) && HAVE_DECL_MS_NOUSER)
-	XLAT(MS_NOUSER),
+ XLAT(MS_NOUSER),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/move_pages_flags.h b/xlat/move_pages_flags.h
index cbdf3bc..4c8a0a2 100644
--- a/xlat/move_pages_flags.h
+++ b/xlat/move_pages_flags.h
@@ -2,10 +2,10 @@
 
 static const struct xlat move_pages_flags[] = {
 #if defined(MPOL_MF_MOVE) || (defined(HAVE_DECL_MPOL_MF_MOVE) && HAVE_DECL_MPOL_MF_MOVE)
-	XLAT(MPOL_MF_MOVE),
+ XLAT(MPOL_MF_MOVE),
 #endif
 #if defined(MPOL_MF_MOVE_ALL) || (defined(HAVE_DECL_MPOL_MF_MOVE_ALL) && HAVE_DECL_MPOL_MF_MOVE_ALL)
-	XLAT(MPOL_MF_MOVE_ALL),
+ XLAT(MPOL_MF_MOVE_ALL),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/mremap_flags.h b/xlat/mremap_flags.h
index 3dac3a5..0fec3bc 100644
--- a/xlat/mremap_flags.h
+++ b/xlat/mremap_flags.h
@@ -2,10 +2,10 @@
 
 static const struct xlat mremap_flags[] = {
 #if defined(MREMAP_MAYMOVE) || (defined(HAVE_DECL_MREMAP_MAYMOVE) && HAVE_DECL_MREMAP_MAYMOVE)
-	XLAT(MREMAP_MAYMOVE),
+ XLAT(MREMAP_MAYMOVE),
 #endif
 #if defined(MREMAP_FIXED) || (defined(HAVE_DECL_MREMAP_FIXED) && HAVE_DECL_MREMAP_FIXED)
-	XLAT(MREMAP_FIXED),
+ XLAT(MREMAP_FIXED),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/msg_flags.h b/xlat/msg_flags.h
index e842d2d..e3cde10 100644
--- a/xlat/msg_flags.h
+++ b/xlat/msg_flags.h
@@ -2,64 +2,64 @@
 
 static const struct xlat msg_flags[] = {
 #if defined(MSG_OOB) || (defined(HAVE_DECL_MSG_OOB) && HAVE_DECL_MSG_OOB)
-	XLAT(MSG_OOB),
+ XLAT(MSG_OOB),
 #endif
 #if defined(MSG_PEEK) || (defined(HAVE_DECL_MSG_PEEK) && HAVE_DECL_MSG_PEEK)
-	XLAT(MSG_PEEK),
+ XLAT(MSG_PEEK),
 #endif
 #if defined(MSG_DONTROUTE) || (defined(HAVE_DECL_MSG_DONTROUTE) && HAVE_DECL_MSG_DONTROUTE)
-	XLAT(MSG_DONTROUTE),
+ XLAT(MSG_DONTROUTE),
 #endif
 #if defined(MSG_CTRUNC) || (defined(HAVE_DECL_MSG_CTRUNC) && HAVE_DECL_MSG_CTRUNC)
-	XLAT(MSG_CTRUNC),
+ XLAT(MSG_CTRUNC),
 #endif
 #if defined(MSG_PROBE) || (defined(HAVE_DECL_MSG_PROBE) && HAVE_DECL_MSG_PROBE)
-	XLAT(MSG_PROBE),
+ XLAT(MSG_PROBE),
 #endif
 #if defined(MSG_TRUNC) || (defined(HAVE_DECL_MSG_TRUNC) && HAVE_DECL_MSG_TRUNC)
-	XLAT(MSG_TRUNC),
+ XLAT(MSG_TRUNC),
 #endif
 #if defined(MSG_DONTWAIT) || (defined(HAVE_DECL_MSG_DONTWAIT) && HAVE_DECL_MSG_DONTWAIT)
-	XLAT(MSG_DONTWAIT),
+ XLAT(MSG_DONTWAIT),
 #endif
 #if defined(MSG_EOR) || (defined(HAVE_DECL_MSG_EOR) && HAVE_DECL_MSG_EOR)
-	XLAT(MSG_EOR),
+ XLAT(MSG_EOR),
 #endif
 #if defined(MSG_WAITALL) || (defined(HAVE_DECL_MSG_WAITALL) && HAVE_DECL_MSG_WAITALL)
-	XLAT(MSG_WAITALL),
+ XLAT(MSG_WAITALL),
 #endif
 #if defined(MSG_FIN) || (defined(HAVE_DECL_MSG_FIN) && HAVE_DECL_MSG_FIN)
-	XLAT(MSG_FIN),
+ XLAT(MSG_FIN),
 #endif
 #if defined(MSG_SYN) || (defined(HAVE_DECL_MSG_SYN) && HAVE_DECL_MSG_SYN)
-	XLAT(MSG_SYN),
+ XLAT(MSG_SYN),
 #endif
 #if defined(MSG_CONFIRM) || (defined(HAVE_DECL_MSG_CONFIRM) && HAVE_DECL_MSG_CONFIRM)
-	XLAT(MSG_CONFIRM),
+ XLAT(MSG_CONFIRM),
 #endif
 #if defined(MSG_RST) || (defined(HAVE_DECL_MSG_RST) && HAVE_DECL_MSG_RST)
-	XLAT(MSG_RST),
+ XLAT(MSG_RST),
 #endif
 #if defined(MSG_ERRQUEUE) || (defined(HAVE_DECL_MSG_ERRQUEUE) && HAVE_DECL_MSG_ERRQUEUE)
-	XLAT(MSG_ERRQUEUE),
+ XLAT(MSG_ERRQUEUE),
 #endif
 #if defined(MSG_NOSIGNAL) || (defined(HAVE_DECL_MSG_NOSIGNAL) && HAVE_DECL_MSG_NOSIGNAL)
-	XLAT(MSG_NOSIGNAL),
+ XLAT(MSG_NOSIGNAL),
 #endif
 #if defined(MSG_MORE) || (defined(HAVE_DECL_MSG_MORE) && HAVE_DECL_MSG_MORE)
-	XLAT(MSG_MORE),
+ XLAT(MSG_MORE),
 #endif
 #if defined(MSG_WAITFORONE) || (defined(HAVE_DECL_MSG_WAITFORONE) && HAVE_DECL_MSG_WAITFORONE)
-	XLAT(MSG_WAITFORONE),
+ XLAT(MSG_WAITFORONE),
 #endif
 #if defined(MSG_EOF) || (defined(HAVE_DECL_MSG_EOF) && HAVE_DECL_MSG_EOF)
-	XLAT(MSG_EOF),
+ XLAT(MSG_EOF),
 #endif
 #if defined(MSG_FASTOPEN) || (defined(HAVE_DECL_MSG_FASTOPEN) && HAVE_DECL_MSG_FASTOPEN)
-	XLAT(MSG_FASTOPEN),
+ XLAT(MSG_FASTOPEN),
 #endif
 #if defined(MSG_CMSG_CLOEXEC) || (defined(HAVE_DECL_MSG_CMSG_CLOEXEC) && HAVE_DECL_MSG_CMSG_CLOEXEC)
-	XLAT(MSG_CMSG_CLOEXEC),
+ XLAT(MSG_CMSG_CLOEXEC),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/msgctl_flags.h b/xlat/msgctl_flags.h
index 72c8f7b..9ae62cd 100644
--- a/xlat/msgctl_flags.h
+++ b/xlat/msgctl_flags.h
@@ -2,22 +2,22 @@
 
 static const struct xlat msgctl_flags[] = {
 #if defined(IPC_RMID) || (defined(HAVE_DECL_IPC_RMID) && HAVE_DECL_IPC_RMID)
-	XLAT(IPC_RMID),
+ XLAT(IPC_RMID),
 #endif
 #if defined(IPC_SET) || (defined(HAVE_DECL_IPC_SET) && HAVE_DECL_IPC_SET)
-	XLAT(IPC_SET),
+ XLAT(IPC_SET),
 #endif
 #if defined(IPC_STAT) || (defined(HAVE_DECL_IPC_STAT) && HAVE_DECL_IPC_STAT)
-	XLAT(IPC_STAT),
+ XLAT(IPC_STAT),
 #endif
 #if defined(IPC_INFO) || (defined(HAVE_DECL_IPC_INFO) && HAVE_DECL_IPC_INFO)
-	XLAT(IPC_INFO),
+ XLAT(IPC_INFO),
 #endif
 #if defined(MSG_STAT) || (defined(HAVE_DECL_MSG_STAT) && HAVE_DECL_MSG_STAT)
-	XLAT(MSG_STAT),
+ XLAT(MSG_STAT),
 #endif
 #if defined(MSG_INFO) || (defined(HAVE_DECL_MSG_INFO) && HAVE_DECL_MSG_INFO)
-	XLAT(MSG_INFO),
+ XLAT(MSG_INFO),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/msgflags.h b/xlat/msgflags.h
index c96a35d..a42115a 100644
--- a/xlat/msgflags.h
+++ b/xlat/msgflags.h
@@ -2,7 +2,7 @@
 
 static const struct xlat msgflags[] = {
 #if defined(RS_HIPRI) || (defined(HAVE_DECL_RS_HIPRI) && HAVE_DECL_RS_HIPRI)
-	XLAT(RS_HIPRI),
+ XLAT(RS_HIPRI),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/mtd_flags_options.h b/xlat/mtd_flags_options.h
index da4c6a7..004760c 100644
--- a/xlat/mtd_flags_options.h
+++ b/xlat/mtd_flags_options.h
@@ -2,16 +2,16 @@
 
 static const struct xlat mtd_flags_options[] = {
 #if defined(MTD_WRITEABLE) || (defined(HAVE_DECL_MTD_WRITEABLE) && HAVE_DECL_MTD_WRITEABLE)
-	XLAT(MTD_WRITEABLE),
+ XLAT(MTD_WRITEABLE),
 #endif
 #if defined(MTD_BIT_WRITEABLE) || (defined(HAVE_DECL_MTD_BIT_WRITEABLE) && HAVE_DECL_MTD_BIT_WRITEABLE)
-	XLAT(MTD_BIT_WRITEABLE),
+ XLAT(MTD_BIT_WRITEABLE),
 #endif
 #if defined(MTD_NO_ERASE) || (defined(HAVE_DECL_MTD_NO_ERASE) && HAVE_DECL_MTD_NO_ERASE)
-	XLAT(MTD_NO_ERASE),
+ XLAT(MTD_NO_ERASE),
 #endif
 #if defined(MTD_POWERUP_LOCK) || (defined(HAVE_DECL_MTD_POWERUP_LOCK) && HAVE_DECL_MTD_POWERUP_LOCK)
-	XLAT(MTD_POWERUP_LOCK),
+ XLAT(MTD_POWERUP_LOCK),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/mtd_mode_options.h b/xlat/mtd_mode_options.h
index c80f035..70b8cfd 100644
--- a/xlat/mtd_mode_options.h
+++ b/xlat/mtd_mode_options.h
@@ -1,8 +1,8 @@
 /* Generated by ./xlat/gen.sh from ./xlat/mtd_mode_options.in; do not edit. */
 
 static const struct xlat mtd_mode_options[] = {
-	XLAT(MTD_OPS_PLACE_OOB),
-	XLAT(MTD_OPS_AUTO_OOB),
-	XLAT(MTD_OPS_RAW),
-	XLAT_END
+ XLAT(MTD_OPS_PLACE_OOB),
+ XLAT(MTD_OPS_AUTO_OOB),
+ XLAT(MTD_OPS_RAW),
+ XLAT_END
 };
diff --git a/xlat/mtd_nandecc_options.h b/xlat/mtd_nandecc_options.h
index 3464701..c4fa57d 100644
--- a/xlat/mtd_nandecc_options.h
+++ b/xlat/mtd_nandecc_options.h
@@ -2,19 +2,19 @@
 
 static const struct xlat mtd_nandecc_options[] = {
 #if defined(MTD_NANDECC_OFF) || (defined(HAVE_DECL_MTD_NANDECC_OFF) && HAVE_DECL_MTD_NANDECC_OFF)
-	XLAT(MTD_NANDECC_OFF),
+ XLAT(MTD_NANDECC_OFF),
 #endif
 #if defined(MTD_NANDECC_PLACE) || (defined(HAVE_DECL_MTD_NANDECC_PLACE) && HAVE_DECL_MTD_NANDECC_PLACE)
-	XLAT(MTD_NANDECC_PLACE),
+ XLAT(MTD_NANDECC_PLACE),
 #endif
 #if defined(MTD_NANDECC_AUTOPLACE) || (defined(HAVE_DECL_MTD_NANDECC_AUTOPLACE) && HAVE_DECL_MTD_NANDECC_AUTOPLACE)
-	XLAT(MTD_NANDECC_AUTOPLACE),
+ XLAT(MTD_NANDECC_AUTOPLACE),
 #endif
 #if defined(MTD_NANDECC_PLACEONLY) || (defined(HAVE_DECL_MTD_NANDECC_PLACEONLY) && HAVE_DECL_MTD_NANDECC_PLACEONLY)
-	XLAT(MTD_NANDECC_PLACEONLY),
+ XLAT(MTD_NANDECC_PLACEONLY),
 #endif
 #if defined(MTD_NANDECC_AUTOPL_USR) || (defined(HAVE_DECL_MTD_NANDECC_AUTOPL_USR) && HAVE_DECL_MTD_NANDECC_AUTOPL_USR)
-	XLAT(MTD_NANDECC_AUTOPL_USR),
+ XLAT(MTD_NANDECC_AUTOPL_USR),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/mtd_otp_options.h b/xlat/mtd_otp_options.h
index 6cbf743..25dd3e3 100644
--- a/xlat/mtd_otp_options.h
+++ b/xlat/mtd_otp_options.h
@@ -2,13 +2,13 @@
 
 static const struct xlat mtd_otp_options[] = {
 #if defined(MTD_OTP_OFF) || (defined(HAVE_DECL_MTD_OTP_OFF) && HAVE_DECL_MTD_OTP_OFF)
-	XLAT(MTD_OTP_OFF),
+ XLAT(MTD_OTP_OFF),
 #endif
 #if defined(MTD_OTP_FACTORY) || (defined(HAVE_DECL_MTD_OTP_FACTORY) && HAVE_DECL_MTD_OTP_FACTORY)
-	XLAT(MTD_OTP_FACTORY),
+ XLAT(MTD_OTP_FACTORY),
 #endif
 #if defined(MTD_OTP_USER) || (defined(HAVE_DECL_MTD_OTP_USER) && HAVE_DECL_MTD_OTP_USER)
-	XLAT(MTD_OTP_USER),
+ XLAT(MTD_OTP_USER),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/mtd_type_options.h b/xlat/mtd_type_options.h
index 404aca8..ec8c94c 100644
--- a/xlat/mtd_type_options.h
+++ b/xlat/mtd_type_options.h
@@ -2,28 +2,28 @@
 
 static const struct xlat mtd_type_options[] = {
 #if defined(MTD_ABSENT) || (defined(HAVE_DECL_MTD_ABSENT) && HAVE_DECL_MTD_ABSENT)
-	XLAT(MTD_ABSENT),
+ XLAT(MTD_ABSENT),
 #endif
 #if defined(MTD_RAM) || (defined(HAVE_DECL_MTD_RAM) && HAVE_DECL_MTD_RAM)
-	XLAT(MTD_RAM),
+ XLAT(MTD_RAM),
 #endif
 #if defined(MTD_ROM) || (defined(HAVE_DECL_MTD_ROM) && HAVE_DECL_MTD_ROM)
-	XLAT(MTD_ROM),
+ XLAT(MTD_ROM),
 #endif
 #if defined(MTD_NORFLASH) || (defined(HAVE_DECL_MTD_NORFLASH) && HAVE_DECL_MTD_NORFLASH)
-	XLAT(MTD_NORFLASH),
+ XLAT(MTD_NORFLASH),
 #endif
 #if defined(MTD_NANDFLASH) || (defined(HAVE_DECL_MTD_NANDFLASH) && HAVE_DECL_MTD_NANDFLASH)
-	XLAT(MTD_NANDFLASH),
+ XLAT(MTD_NANDFLASH),
 #endif
 #if defined(MTD_DATAFLASH) || (defined(HAVE_DECL_MTD_DATAFLASH) && HAVE_DECL_MTD_DATAFLASH)
-	XLAT(MTD_DATAFLASH),
+ XLAT(MTD_DATAFLASH),
 #endif
 #if defined(MTD_UBIVOLUME) || (defined(HAVE_DECL_MTD_UBIVOLUME) && HAVE_DECL_MTD_UBIVOLUME)
-	XLAT(MTD_UBIVOLUME),
+ XLAT(MTD_UBIVOLUME),
 #endif
 #if defined(MTD_MLCNANDFLASH) || (defined(HAVE_DECL_MTD_MLCNANDFLASH) && HAVE_DECL_MTD_MLCNANDFLASH)
-	XLAT(MTD_MLCNANDFLASH),
+ XLAT(MTD_MLCNANDFLASH),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/netlink_protocols.h b/xlat/netlink_protocols.h
index d5614f9..ef28f37 100644
--- a/xlat/netlink_protocols.h
+++ b/xlat/netlink_protocols.h
@@ -2,67 +2,67 @@
 
 static const struct xlat netlink_protocols[] = {
 #if defined(NETLINK_ROUTE) || (defined(HAVE_DECL_NETLINK_ROUTE) && HAVE_DECL_NETLINK_ROUTE)
-	XLAT(NETLINK_ROUTE),
+ XLAT(NETLINK_ROUTE),
 #endif
 #if defined(NETLINK_UNUSED) || (defined(HAVE_DECL_NETLINK_UNUSED) && HAVE_DECL_NETLINK_UNUSED)
-	XLAT(NETLINK_UNUSED),
+ XLAT(NETLINK_UNUSED),
 #endif
 #if defined(NETLINK_USERSOCK) || (defined(HAVE_DECL_NETLINK_USERSOCK) && HAVE_DECL_NETLINK_USERSOCK)
-	XLAT(NETLINK_USERSOCK),
+ XLAT(NETLINK_USERSOCK),
 #endif
 #if defined(NETLINK_FIREWALL) || (defined(HAVE_DECL_NETLINK_FIREWALL) && HAVE_DECL_NETLINK_FIREWALL)
-	XLAT(NETLINK_FIREWALL),
+ XLAT(NETLINK_FIREWALL),
 #endif
 #if defined(NETLINK_SOCK_DIAG) || (defined(HAVE_DECL_NETLINK_SOCK_DIAG) && HAVE_DECL_NETLINK_SOCK_DIAG)
-	XLAT(NETLINK_SOCK_DIAG),
+ XLAT(NETLINK_SOCK_DIAG),
 #endif
 #if defined(NETLINK_NFLOG) || (defined(HAVE_DECL_NETLINK_NFLOG) && HAVE_DECL_NETLINK_NFLOG)
-	XLAT(NETLINK_NFLOG),
+ XLAT(NETLINK_NFLOG),
 #endif
 #if defined(NETLINK_XFRM) || (defined(HAVE_DECL_NETLINK_XFRM) && HAVE_DECL_NETLINK_XFRM)
-	XLAT(NETLINK_XFRM),
+ XLAT(NETLINK_XFRM),
 #endif
 #if defined(NETLINK_SELINUX) || (defined(HAVE_DECL_NETLINK_SELINUX) && HAVE_DECL_NETLINK_SELINUX)
-	XLAT(NETLINK_SELINUX),
+ XLAT(NETLINK_SELINUX),
 #endif
 #if defined(NETLINK_ISCSI) || (defined(HAVE_DECL_NETLINK_ISCSI) && HAVE_DECL_NETLINK_ISCSI)
-	XLAT(NETLINK_ISCSI),
+ XLAT(NETLINK_ISCSI),
 #endif
 #if defined(NETLINK_AUDIT) || (defined(HAVE_DECL_NETLINK_AUDIT) && HAVE_DECL_NETLINK_AUDIT)
-	XLAT(NETLINK_AUDIT),
+ XLAT(NETLINK_AUDIT),
 #endif
 #if defined(NETLINK_FIB_LOOKUP) || (defined(HAVE_DECL_NETLINK_FIB_LOOKUP) && HAVE_DECL_NETLINK_FIB_LOOKUP)
-	XLAT(NETLINK_FIB_LOOKUP),
+ XLAT(NETLINK_FIB_LOOKUP),
 #endif
 #if defined(NETLINK_CONNECTOR) || (defined(HAVE_DECL_NETLINK_CONNECTOR) && HAVE_DECL_NETLINK_CONNECTOR)
-	XLAT(NETLINK_CONNECTOR),
+ XLAT(NETLINK_CONNECTOR),
 #endif
 #if defined(NETLINK_NETFILTER) || (defined(HAVE_DECL_NETLINK_NETFILTER) && HAVE_DECL_NETLINK_NETFILTER)
-	XLAT(NETLINK_NETFILTER),
+ XLAT(NETLINK_NETFILTER),
 #endif
 #if defined(NETLINK_IP6_FW) || (defined(HAVE_DECL_NETLINK_IP6_FW) && HAVE_DECL_NETLINK_IP6_FW)
-	XLAT(NETLINK_IP6_FW),
+ XLAT(NETLINK_IP6_FW),
 #endif
 #if defined(NETLINK_DNRTMSG) || (defined(HAVE_DECL_NETLINK_DNRTMSG) && HAVE_DECL_NETLINK_DNRTMSG)
-	XLAT(NETLINK_DNRTMSG),
+ XLAT(NETLINK_DNRTMSG),
 #endif
 #if defined(NETLINK_KOBJECT_UEVENT) || (defined(HAVE_DECL_NETLINK_KOBJECT_UEVENT) && HAVE_DECL_NETLINK_KOBJECT_UEVENT)
-	XLAT(NETLINK_KOBJECT_UEVENT),
+ XLAT(NETLINK_KOBJECT_UEVENT),
 #endif
 #if defined(NETLINK_GENERIC) || (defined(HAVE_DECL_NETLINK_GENERIC) && HAVE_DECL_NETLINK_GENERIC)
-	XLAT(NETLINK_GENERIC),
+ XLAT(NETLINK_GENERIC),
 #endif
 #if defined(NETLINK_SCSITRANSPORT) || (defined(HAVE_DECL_NETLINK_SCSITRANSPORT) && HAVE_DECL_NETLINK_SCSITRANSPORT)
-	XLAT(NETLINK_SCSITRANSPORT),
+ XLAT(NETLINK_SCSITRANSPORT),
 #endif
 #if defined(NETLINK_ECRYPTFS) || (defined(HAVE_DECL_NETLINK_ECRYPTFS) && HAVE_DECL_NETLINK_ECRYPTFS)
-	XLAT(NETLINK_ECRYPTFS),
+ XLAT(NETLINK_ECRYPTFS),
 #endif
 #if defined(NETLINK_RDMA) || (defined(HAVE_DECL_NETLINK_RDMA) && HAVE_DECL_NETLINK_RDMA)
-	XLAT(NETLINK_RDMA),
+ XLAT(NETLINK_RDMA),
 #endif
 #if defined(NETLINK_CRYPTO) || (defined(HAVE_DECL_NETLINK_CRYPTO) && HAVE_DECL_NETLINK_CRYPTO)
-	XLAT(NETLINK_CRYPTO),
+ XLAT(NETLINK_CRYPTO),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/notifyflags.h b/xlat/notifyflags.h
index fe02728..82a6e36 100644
--- a/xlat/notifyflags.h
+++ b/xlat/notifyflags.h
@@ -2,25 +2,25 @@
 
 static const struct xlat notifyflags[] = {
 #if defined(DN_ACCESS) || (defined(HAVE_DECL_DN_ACCESS) && HAVE_DECL_DN_ACCESS)
-	XLAT(DN_ACCESS),
+ XLAT(DN_ACCESS),
 #endif
 #if defined(DN_MODIFY) || (defined(HAVE_DECL_DN_MODIFY) && HAVE_DECL_DN_MODIFY)
-	XLAT(DN_MODIFY),
+ XLAT(DN_MODIFY),
 #endif
 #if defined(DN_CREATE) || (defined(HAVE_DECL_DN_CREATE) && HAVE_DECL_DN_CREATE)
-	XLAT(DN_CREATE),
+ XLAT(DN_CREATE),
 #endif
 #if defined(DN_DELETE) || (defined(HAVE_DECL_DN_DELETE) && HAVE_DECL_DN_DELETE)
-	XLAT(DN_DELETE),
+ XLAT(DN_DELETE),
 #endif
 #if defined(DN_RENAME) || (defined(HAVE_DECL_DN_RENAME) && HAVE_DECL_DN_RENAME)
-	XLAT(DN_RENAME),
+ XLAT(DN_RENAME),
 #endif
 #if defined(DN_ATTRIB) || (defined(HAVE_DECL_DN_ATTRIB) && HAVE_DECL_DN_ATTRIB)
-	XLAT(DN_ATTRIB),
+ XLAT(DN_ATTRIB),
 #endif
 #if defined(DN_MULTISHOT) || (defined(HAVE_DECL_DN_MULTISHOT) && HAVE_DECL_DN_MULTISHOT)
-	XLAT(DN_MULTISHOT),
+ XLAT(DN_MULTISHOT),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/nt_descriptor_types.h b/xlat/nt_descriptor_types.h
index a928b84..2a3a727 100644
--- a/xlat/nt_descriptor_types.h
+++ b/xlat/nt_descriptor_types.h
@@ -2,73 +2,73 @@
 
 static const struct xlat nt_descriptor_types[] = {
 #if defined(NT_PRSTATUS) || (defined(HAVE_DECL_NT_PRSTATUS) && HAVE_DECL_NT_PRSTATUS)
-	XLAT(NT_PRSTATUS),
+ XLAT(NT_PRSTATUS),
 #endif
 #if defined(NT_FPREGSET) || (defined(HAVE_DECL_NT_FPREGSET) && HAVE_DECL_NT_FPREGSET)
-	XLAT(NT_FPREGSET),
+ XLAT(NT_FPREGSET),
 #endif
 #if defined(NT_PRPSINFO) || (defined(HAVE_DECL_NT_PRPSINFO) && HAVE_DECL_NT_PRPSINFO)
-	XLAT(NT_PRPSINFO),
+ XLAT(NT_PRPSINFO),
 #endif
 #if defined(NT_PRXREG) || (defined(HAVE_DECL_NT_PRXREG) && HAVE_DECL_NT_PRXREG)
-	XLAT(NT_PRXREG),
+ XLAT(NT_PRXREG),
 #endif
 #if defined(NT_TASKSTRUCT) || (defined(HAVE_DECL_NT_TASKSTRUCT) && HAVE_DECL_NT_TASKSTRUCT)
-	XLAT(NT_TASKSTRUCT),
+ XLAT(NT_TASKSTRUCT),
 #endif
 #if defined(NT_PLATFORM) || (defined(HAVE_DECL_NT_PLATFORM) && HAVE_DECL_NT_PLATFORM)
-	XLAT(NT_PLATFORM),
+ XLAT(NT_PLATFORM),
 #endif
 #if defined(NT_AUXV) || (defined(HAVE_DECL_NT_AUXV) && HAVE_DECL_NT_AUXV)
-	XLAT(NT_AUXV),
+ XLAT(NT_AUXV),
 #endif
 #if defined(NT_GWINDOWS) || (defined(HAVE_DECL_NT_GWINDOWS) && HAVE_DECL_NT_GWINDOWS)
-	XLAT(NT_GWINDOWS),
+ XLAT(NT_GWINDOWS),
 #endif
 #if defined(NT_ASRS) || (defined(HAVE_DECL_NT_ASRS) && HAVE_DECL_NT_ASRS)
-	XLAT(NT_ASRS),
+ XLAT(NT_ASRS),
 #endif
 #if defined(NT_PSTATUS) || (defined(HAVE_DECL_NT_PSTATUS) && HAVE_DECL_NT_PSTATUS)
-	XLAT(NT_PSTATUS),
+ XLAT(NT_PSTATUS),
 #endif
 #if defined(NT_PSINFO) || (defined(HAVE_DECL_NT_PSINFO) && HAVE_DECL_NT_PSINFO)
-	XLAT(NT_PSINFO),
+ XLAT(NT_PSINFO),
 #endif
 #if defined(NT_PRCRED) || (defined(HAVE_DECL_NT_PRCRED) && HAVE_DECL_NT_PRCRED)
-	XLAT(NT_PRCRED),
+ XLAT(NT_PRCRED),
 #endif
 #if defined(NT_UTSNAME) || (defined(HAVE_DECL_NT_UTSNAME) && HAVE_DECL_NT_UTSNAME)
-	XLAT(NT_UTSNAME),
+ XLAT(NT_UTSNAME),
 #endif
 #if defined(NT_LWPSTATUS) || (defined(HAVE_DECL_NT_LWPSTATUS) && HAVE_DECL_NT_LWPSTATUS)
-	XLAT(NT_LWPSTATUS),
+ XLAT(NT_LWPSTATUS),
 #endif
 #if defined(NT_LWPSINFO) || (defined(HAVE_DECL_NT_LWPSINFO) && HAVE_DECL_NT_LWPSINFO)
-	XLAT(NT_LWPSINFO),
+ XLAT(NT_LWPSINFO),
 #endif
 #if defined(NT_PRFPXREG) || (defined(HAVE_DECL_NT_PRFPXREG) && HAVE_DECL_NT_PRFPXREG)
-	XLAT(NT_PRFPXREG),
+ XLAT(NT_PRFPXREG),
 #endif
 #if defined(NT_PRXFPREG) || (defined(HAVE_DECL_NT_PRXFPREG) && HAVE_DECL_NT_PRXFPREG)
-	XLAT(NT_PRXFPREG),
+ XLAT(NT_PRXFPREG),
 #endif
 #if defined(NT_PPC_VMX) || (defined(HAVE_DECL_NT_PPC_VMX) && HAVE_DECL_NT_PPC_VMX)
-	XLAT(NT_PPC_VMX),
+ XLAT(NT_PPC_VMX),
 #endif
 #if defined(NT_PPC_SPE) || (defined(HAVE_DECL_NT_PPC_SPE) && HAVE_DECL_NT_PPC_SPE)
-	XLAT(NT_PPC_SPE),
+ XLAT(NT_PPC_SPE),
 #endif
 #if defined(NT_PPC_VSX) || (defined(HAVE_DECL_NT_PPC_VSX) && HAVE_DECL_NT_PPC_VSX)
-	XLAT(NT_PPC_VSX),
+ XLAT(NT_PPC_VSX),
 #endif
 #if defined(NT_386_TLS) || (defined(HAVE_DECL_NT_386_TLS) && HAVE_DECL_NT_386_TLS)
-	XLAT(NT_386_TLS),
+ XLAT(NT_386_TLS),
 #endif
 #if defined(NT_386_IOPERM) || (defined(HAVE_DECL_NT_386_IOPERM) && HAVE_DECL_NT_386_IOPERM)
-	XLAT(NT_386_IOPERM),
+ XLAT(NT_386_IOPERM),
 #endif
 #if defined(NT_X86_XSTATE) || (defined(HAVE_DECL_NT_X86_XSTATE) && HAVE_DECL_NT_X86_XSTATE)
-	XLAT(NT_X86_XSTATE),
+ XLAT(NT_X86_XSTATE),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/open_access_modes.h b/xlat/open_access_modes.h
index 02deb2e..935559f 100644
--- a/xlat/open_access_modes.h
+++ b/xlat/open_access_modes.h
@@ -2,16 +2,16 @@
 
 const struct xlat open_access_modes[] = {
 #if defined(O_RDONLY) || (defined(HAVE_DECL_O_RDONLY) && HAVE_DECL_O_RDONLY)
-	XLAT(O_RDONLY),
+ XLAT(O_RDONLY),
 #endif
 #if defined(O_WRONLY) || (defined(HAVE_DECL_O_WRONLY) && HAVE_DECL_O_WRONLY)
-	XLAT(O_WRONLY),
+ XLAT(O_WRONLY),
 #endif
 #if defined(O_RDWR) || (defined(HAVE_DECL_O_RDWR) && HAVE_DECL_O_RDWR)
-	XLAT(O_RDWR),
+ XLAT(O_RDWR),
 #endif
 #if defined(O_ACCMODE) || (defined(HAVE_DECL_O_ACCMODE) && HAVE_DECL_O_ACCMODE)
-	XLAT(O_ACCMODE),
+ XLAT(O_ACCMODE),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/open_mode_flags.h b/xlat/open_mode_flags.h
index ef07b8c..67f198b 100644
--- a/xlat/open_mode_flags.h
+++ b/xlat/open_mode_flags.h
@@ -2,112 +2,112 @@
 
 const struct xlat open_mode_flags[] = {
 #if defined(O_CREAT) || (defined(HAVE_DECL_O_CREAT) && HAVE_DECL_O_CREAT)
-	XLAT(O_CREAT),
+ XLAT(O_CREAT),
 #endif
 #if defined(O_EXCL) || (defined(HAVE_DECL_O_EXCL) && HAVE_DECL_O_EXCL)
-	XLAT(O_EXCL),
+ XLAT(O_EXCL),
 #endif
 #if defined(O_NOCTTY) || (defined(HAVE_DECL_O_NOCTTY) && HAVE_DECL_O_NOCTTY)
-	XLAT(O_NOCTTY),
+ XLAT(O_NOCTTY),
 #endif
 #if defined(O_TRUNC) || (defined(HAVE_DECL_O_TRUNC) && HAVE_DECL_O_TRUNC)
-	XLAT(O_TRUNC),
+ XLAT(O_TRUNC),
 #endif
 #if defined(O_APPEND) || (defined(HAVE_DECL_O_APPEND) && HAVE_DECL_O_APPEND)
-	XLAT(O_APPEND),
+ XLAT(O_APPEND),
 #endif
 #if defined(O_NONBLOCK) || (defined(HAVE_DECL_O_NONBLOCK) && HAVE_DECL_O_NONBLOCK)
-	XLAT(O_NONBLOCK),
+ XLAT(O_NONBLOCK),
 #endif
 #if defined(O_SYNC) || (defined(HAVE_DECL_O_SYNC) && HAVE_DECL_O_SYNC)
-	XLAT(O_SYNC),
+ XLAT(O_SYNC),
 #endif
 #if defined(O_ASYNC) || (defined(HAVE_DECL_O_ASYNC) && HAVE_DECL_O_ASYNC)
-	XLAT(O_ASYNC),
+ XLAT(O_ASYNC),
 #endif
 #if defined(O_DSYNC) || (defined(HAVE_DECL_O_DSYNC) && HAVE_DECL_O_DSYNC)
-	XLAT(O_DSYNC),
+ XLAT(O_DSYNC),
 #endif
 #if defined(O_RSYNC) || (defined(HAVE_DECL_O_RSYNC) && HAVE_DECL_O_RSYNC)
-	XLAT(O_RSYNC),
+ XLAT(O_RSYNC),
 #endif
 #if defined(O_NDELAY) && (O_NDELAY != O_NONBLOCK)
 #if defined(O_NDELAY) || (defined(HAVE_DECL_O_NDELAY) && HAVE_DECL_O_NDELAY)
-	XLAT(O_NDELAY),
+ XLAT(O_NDELAY),
 #endif
 #endif
 #if defined(O_PRIV) || (defined(HAVE_DECL_O_PRIV) && HAVE_DECL_O_PRIV)
-	XLAT(O_PRIV),
+ XLAT(O_PRIV),
 #endif
 #if defined(O_DIRECT) || (defined(HAVE_DECL_O_DIRECT) && HAVE_DECL_O_DIRECT)
-	XLAT(O_DIRECT),
+ XLAT(O_DIRECT),
 #endif
 #if defined(O_LARGEFILE) || (defined(HAVE_DECL_O_LARGEFILE) && HAVE_DECL_O_LARGEFILE)
-	XLAT(O_LARGEFILE),
+ XLAT(O_LARGEFILE),
 #endif
 #if defined(O_DIRECTORY) || (defined(HAVE_DECL_O_DIRECTORY) && HAVE_DECL_O_DIRECTORY)
-	XLAT(O_DIRECTORY),
+ XLAT(O_DIRECTORY),
 #endif
 #if defined(O_NOFOLLOW) || (defined(HAVE_DECL_O_NOFOLLOW) && HAVE_DECL_O_NOFOLLOW)
-	XLAT(O_NOFOLLOW),
+ XLAT(O_NOFOLLOW),
 #endif
 #if defined(O_NOATIME) || (defined(HAVE_DECL_O_NOATIME) && HAVE_DECL_O_NOATIME)
-	XLAT(O_NOATIME),
+ XLAT(O_NOATIME),
 #endif
 #if defined(O_CLOEXEC) || (defined(HAVE_DECL_O_CLOEXEC) && HAVE_DECL_O_CLOEXEC)
-	XLAT(O_CLOEXEC),
+ XLAT(O_CLOEXEC),
 #endif
 #if defined(O_PATH) || (defined(HAVE_DECL_O_PATH) && HAVE_DECL_O_PATH)
-	XLAT(O_PATH),
+ XLAT(O_PATH),
 #endif
 #if defined(O_TMPFILE) && defined(O_DIRECTORY)
 /* The kernel & C libraries often inline O_DIRECTORY */
 { O_TMPFILE & ~O_DIRECTORY, "O_TMPFILE" },
 #endif
 #if defined(FNDELAY) || (defined(HAVE_DECL_FNDELAY) && HAVE_DECL_FNDELAY)
-	XLAT(FNDELAY),
+ XLAT(FNDELAY),
 #endif
 #if defined(FAPPEND) || (defined(HAVE_DECL_FAPPEND) && HAVE_DECL_FAPPEND)
-	XLAT(FAPPEND),
+ XLAT(FAPPEND),
 #endif
 #if defined(FMARK) || (defined(HAVE_DECL_FMARK) && HAVE_DECL_FMARK)
-	XLAT(FMARK),
+ XLAT(FMARK),
 #endif
 #if defined(FDEFER) || (defined(HAVE_DECL_FDEFER) && HAVE_DECL_FDEFER)
-	XLAT(FDEFER),
+ XLAT(FDEFER),
 #endif
 #if defined(FASYNC) || (defined(HAVE_DECL_FASYNC) && HAVE_DECL_FASYNC)
-	XLAT(FASYNC),
+ XLAT(FASYNC),
 #endif
 #if defined(FSHLOCK) || (defined(HAVE_DECL_FSHLOCK) && HAVE_DECL_FSHLOCK)
-	XLAT(FSHLOCK),
+ XLAT(FSHLOCK),
 #endif
 #if defined(FEXLOCK) || (defined(HAVE_DECL_FEXLOCK) && HAVE_DECL_FEXLOCK)
-	XLAT(FEXLOCK),
+ XLAT(FEXLOCK),
 #endif
 #if defined(FCREAT) || (defined(HAVE_DECL_FCREAT) && HAVE_DECL_FCREAT)
-	XLAT(FCREAT),
+ XLAT(FCREAT),
 #endif
 #if defined(FTRUNC) || (defined(HAVE_DECL_FTRUNC) && HAVE_DECL_FTRUNC)
-	XLAT(FTRUNC),
+ XLAT(FTRUNC),
 #endif
 #if defined(FEXCL) || (defined(HAVE_DECL_FEXCL) && HAVE_DECL_FEXCL)
-	XLAT(FEXCL),
+ XLAT(FEXCL),
 #endif
 #if defined(FNBIO) || (defined(HAVE_DECL_FNBIO) && HAVE_DECL_FNBIO)
-	XLAT(FNBIO),
+ XLAT(FNBIO),
 #endif
 #if defined(FSYNC) || (defined(HAVE_DECL_FSYNC) && HAVE_DECL_FSYNC)
-	XLAT(FSYNC),
+ XLAT(FSYNC),
 #endif
 #if defined(FNOCTTY) || (defined(HAVE_DECL_FNOCTTY) && HAVE_DECL_FNOCTTY)
-	XLAT(FNOCTTY),
+ XLAT(FNOCTTY),
 #endif
 #if defined(O_SHLOCK) || (defined(HAVE_DECL_O_SHLOCK) && HAVE_DECL_O_SHLOCK)
-	XLAT(O_SHLOCK),
+ XLAT(O_SHLOCK),
 #endif
 #if defined(O_EXLOCK) || (defined(HAVE_DECL_O_EXLOCK) && HAVE_DECL_O_EXLOCK)
-	XLAT(O_EXLOCK),
+ XLAT(O_EXLOCK),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/openmodessol.h b/xlat/openmodessol.h
index 929c6e1..510527d 100644
--- a/xlat/openmodessol.h
+++ b/xlat/openmodessol.h
@@ -15,5 +15,5 @@
 { 0x8000,	"O_RSYNC"	},
 { 4,		"O_NDELAY"	},
 { 0x1000,	"O_PRIV"	},
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/perf_event_open_flags.h b/xlat/perf_event_open_flags.h
index ee4114c..83fbe8b 100644
--- a/xlat/perf_event_open_flags.h
+++ b/xlat/perf_event_open_flags.h
@@ -2,13 +2,13 @@
 
 static const struct xlat perf_event_open_flags[] = {
 #if defined(PERF_FLAG_FD_NO_GROUP) || (defined(HAVE_DECL_PERF_FLAG_FD_NO_GROUP) && HAVE_DECL_PERF_FLAG_FD_NO_GROUP)
-	XLAT(PERF_FLAG_FD_NO_GROUP),
+ XLAT(PERF_FLAG_FD_NO_GROUP),
 #endif
 #if defined(PERF_FLAG_FD_OUTPUT) || (defined(HAVE_DECL_PERF_FLAG_FD_OUTPUT) && HAVE_DECL_PERF_FLAG_FD_OUTPUT)
-	XLAT(PERF_FLAG_FD_OUTPUT),
+ XLAT(PERF_FLAG_FD_OUTPUT),
 #endif
 #if defined(PERF_FLAG_PID_CGROUP) || (defined(HAVE_DECL_PERF_FLAG_PID_CGROUP) && HAVE_DECL_PERF_FLAG_PID_CGROUP)
-	XLAT(PERF_FLAG_PID_CGROUP),
+ XLAT(PERF_FLAG_PID_CGROUP),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/personality_options.h b/xlat/personality_options.h
index cd5379b..99301a9 100644
--- a/xlat/personality_options.h
+++ b/xlat/personality_options.h
@@ -1,27 +1,27 @@
 /* Generated by ./xlat/gen.sh from ./xlat/personality_options.in; do not edit. */
 
 static const struct xlat personality_options[] = {
-	XLAT(PER_LINUX),
-	XLAT(PER_LINUX_32BIT),
-	XLAT(PER_LINUX_FDPIC),
-	XLAT(PER_SVR4),
-	XLAT(PER_SVR3),
-	XLAT(PER_SCOSVR3),
-	XLAT(PER_OSR5),
-	XLAT(PER_WYSEV386),
-	XLAT(PER_ISCR4),
-	XLAT(PER_BSD),
-	XLAT(PER_SUNOS),
-	XLAT(PER_XENIX),
-	XLAT(PER_LINUX32),
-	XLAT(PER_LINUX32_3GB),
-	XLAT(PER_IRIX32),
-	XLAT(PER_IRIXN32),
-	XLAT(PER_IRIX64),
-	XLAT(PER_RISCOS),
-	XLAT(PER_SOLARIS),
-	XLAT(PER_UW7),
-	XLAT(PER_OSF4),
-	XLAT(PER_HPUX),
-	XLAT_END
+ XLAT(PER_LINUX),
+ XLAT(PER_LINUX_32BIT),
+ XLAT(PER_LINUX_FDPIC),
+ XLAT(PER_SVR4),
+ XLAT(PER_SVR3),
+ XLAT(PER_SCOSVR3),
+ XLAT(PER_OSR5),
+ XLAT(PER_WYSEV386),
+ XLAT(PER_ISCR4),
+ XLAT(PER_BSD),
+ XLAT(PER_SUNOS),
+ XLAT(PER_XENIX),
+ XLAT(PER_LINUX32),
+ XLAT(PER_LINUX32_3GB),
+ XLAT(PER_IRIX32),
+ XLAT(PER_IRIXN32),
+ XLAT(PER_IRIX64),
+ XLAT(PER_RISCOS),
+ XLAT(PER_SOLARIS),
+ XLAT(PER_UW7),
+ XLAT(PER_OSF4),
+ XLAT(PER_HPUX),
+ XLAT_END
 };
diff --git a/xlat/pmsgflags.h b/xlat/pmsgflags.h
index a10254e..b448eae 100644
--- a/xlat/pmsgflags.h
+++ b/xlat/pmsgflags.h
@@ -2,13 +2,13 @@
 
 static const struct xlat pmsgflags[] = {
 #if defined(MSG_HIPRI) || (defined(HAVE_DECL_MSG_HIPRI) && HAVE_DECL_MSG_HIPRI)
-	XLAT(MSG_HIPRI),
+ XLAT(MSG_HIPRI),
 #endif
 #if defined(MSG_ANY) || (defined(HAVE_DECL_MSG_ANY) && HAVE_DECL_MSG_ANY)
-	XLAT(MSG_ANY),
+ XLAT(MSG_ANY),
 #endif
 #if defined(MSG_BAND) || (defined(HAVE_DECL_MSG_BAND) && HAVE_DECL_MSG_BAND)
-	XLAT(MSG_BAND),
+ XLAT(MSG_BAND),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/policies.h b/xlat/policies.h
index d46eafd..c103799 100644
--- a/xlat/policies.h
+++ b/xlat/policies.h
@@ -2,16 +2,16 @@
 
 static const struct xlat policies[] = {
 #if defined(MPOL_DEFAULT) || (defined(HAVE_DECL_MPOL_DEFAULT) && HAVE_DECL_MPOL_DEFAULT)
-	XLAT(MPOL_DEFAULT),
+ XLAT(MPOL_DEFAULT),
 #endif
 #if defined(MPOL_PREFERRED) || (defined(HAVE_DECL_MPOL_PREFERRED) && HAVE_DECL_MPOL_PREFERRED)
-	XLAT(MPOL_PREFERRED),
+ XLAT(MPOL_PREFERRED),
 #endif
 #if defined(MPOL_BIND) || (defined(HAVE_DECL_MPOL_BIND) && HAVE_DECL_MPOL_BIND)
-	XLAT(MPOL_BIND),
+ XLAT(MPOL_BIND),
 #endif
 #if defined(MPOL_INTERLEAVE) || (defined(HAVE_DECL_MPOL_INTERLEAVE) && HAVE_DECL_MPOL_INTERLEAVE)
-	XLAT(MPOL_INTERLEAVE),
+ XLAT(MPOL_INTERLEAVE),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/pollflags.h b/xlat/pollflags.h
index cd1c128..fb9959a 100644
--- a/xlat/pollflags.h
+++ b/xlat/pollflags.h
@@ -2,34 +2,34 @@
 
 static const struct xlat pollflags[] = {
 #if defined(POLLIN) || (defined(HAVE_DECL_POLLIN) && HAVE_DECL_POLLIN)
-	XLAT(POLLIN),
+ XLAT(POLLIN),
 #endif
 #if defined(POLLPRI) || (defined(HAVE_DECL_POLLPRI) && HAVE_DECL_POLLPRI)
-	XLAT(POLLPRI),
+ XLAT(POLLPRI),
 #endif
 #if defined(POLLOUT) || (defined(HAVE_DECL_POLLOUT) && HAVE_DECL_POLLOUT)
-	XLAT(POLLOUT),
+ XLAT(POLLOUT),
 #endif
 #if defined(POLLRDNORM) || (defined(HAVE_DECL_POLLRDNORM) && HAVE_DECL_POLLRDNORM)
-	XLAT(POLLRDNORM),
+ XLAT(POLLRDNORM),
 #endif
 #if defined(POLLWRNORM) || (defined(HAVE_DECL_POLLWRNORM) && HAVE_DECL_POLLWRNORM)
-	XLAT(POLLWRNORM),
+ XLAT(POLLWRNORM),
 #endif
 #if defined(POLLRDBAND) || (defined(HAVE_DECL_POLLRDBAND) && HAVE_DECL_POLLRDBAND)
-	XLAT(POLLRDBAND),
+ XLAT(POLLRDBAND),
 #endif
 #if defined(POLLWRBAND) || (defined(HAVE_DECL_POLLWRBAND) && HAVE_DECL_POLLWRBAND)
-	XLAT(POLLWRBAND),
+ XLAT(POLLWRBAND),
 #endif
 #if defined(POLLERR) || (defined(HAVE_DECL_POLLERR) && HAVE_DECL_POLLERR)
-	XLAT(POLLERR),
+ XLAT(POLLERR),
 #endif
 #if defined(POLLHUP) || (defined(HAVE_DECL_POLLHUP) && HAVE_DECL_POLLHUP)
-	XLAT(POLLHUP),
+ XLAT(POLLHUP),
 #endif
 #if defined(POLLNVAL) || (defined(HAVE_DECL_POLLNVAL) && HAVE_DECL_POLLNVAL)
-	XLAT(POLLNVAL),
+ XLAT(POLLNVAL),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/prctl_options.h b/xlat/prctl_options.h
index 93a2356..a3fc8ee 100644
--- a/xlat/prctl_options.h
+++ b/xlat/prctl_options.h
@@ -1,185 +1,177 @@
 /* Generated by ./xlat/gen.sh from ./xlat/prctl_options.in; do not edit. */
 
 static const struct xlat prctl_options[] = {
-#if defined(PR_MAXPROCS) || (defined(HAVE_DECL_PR_MAXPROCS) && HAVE_DECL_PR_MAXPROCS)
-	XLAT(PR_MAXPROCS),
+#if !(defined(PR_SET_PDEATHSIG) || (defined(HAVE_DECL_PR_SET_PDEATHSIG) && HAVE_DECL_PR_SET_PDEATHSIG))
+# define PR_SET_PDEATHSIG 1
 #endif
-#if defined(PR_ISBLOCKED) || (defined(HAVE_DECL_PR_ISBLOCKED) && HAVE_DECL_PR_ISBLOCKED)
-	XLAT(PR_ISBLOCKED),
+ XLAT(PR_SET_PDEATHSIG),
+#if !(defined(PR_GET_PDEATHSIG) || (defined(HAVE_DECL_PR_GET_PDEATHSIG) && HAVE_DECL_PR_GET_PDEATHSIG))
+# define PR_GET_PDEATHSIG 2
 #endif
-#if defined(PR_SETSTACKSIZE) || (defined(HAVE_DECL_PR_SETSTACKSIZE) && HAVE_DECL_PR_SETSTACKSIZE)
-	XLAT(PR_SETSTACKSIZE),
+ XLAT(PR_GET_PDEATHSIG),
+#if !(defined(PR_GET_DUMPABLE) || (defined(HAVE_DECL_PR_GET_DUMPABLE) && HAVE_DECL_PR_GET_DUMPABLE))
+# define PR_GET_DUMPABLE 3
 #endif
-#if defined(PR_GETSTACKSIZE) || (defined(HAVE_DECL_PR_GETSTACKSIZE) && HAVE_DECL_PR_GETSTACKSIZE)
-	XLAT(PR_GETSTACKSIZE),
+ XLAT(PR_GET_DUMPABLE),
+#if !(defined(PR_SET_DUMPABLE) || (defined(HAVE_DECL_PR_SET_DUMPABLE) && HAVE_DECL_PR_SET_DUMPABLE))
+# define PR_SET_DUMPABLE 4
 #endif
-#if defined(PR_MAXPPROCS) || (defined(HAVE_DECL_PR_MAXPPROCS) && HAVE_DECL_PR_MAXPPROCS)
-	XLAT(PR_MAXPPROCS),
+ XLAT(PR_SET_DUMPABLE),
+#if !(defined(PR_GET_UNALIGN) || (defined(HAVE_DECL_PR_GET_UNALIGN) && HAVE_DECL_PR_GET_UNALIGN))
+# define PR_GET_UNALIGN 5
 #endif
-#if defined(PR_UNBLKONEXEC) || (defined(HAVE_DECL_PR_UNBLKONEXEC) && HAVE_DECL_PR_UNBLKONEXEC)
-	XLAT(PR_UNBLKONEXEC),
+ XLAT(PR_GET_UNALIGN),
+#if !(defined(PR_SET_UNALIGN) || (defined(HAVE_DECL_PR_SET_UNALIGN) && HAVE_DECL_PR_SET_UNALIGN))
+# define PR_SET_UNALIGN 6
 #endif
-#if defined(PR_ATOMICSIM) || (defined(HAVE_DECL_PR_ATOMICSIM) && HAVE_DECL_PR_ATOMICSIM)
-	XLAT(PR_ATOMICSIM),
+ XLAT(PR_SET_UNALIGN),
+#if !(defined(PR_GET_KEEPCAPS) || (defined(HAVE_DECL_PR_GET_KEEPCAPS) && HAVE_DECL_PR_GET_KEEPCAPS))
+# define PR_GET_KEEPCAPS 7
 #endif
-#if defined(PR_SETEXITSIG) || (defined(HAVE_DECL_PR_SETEXITSIG) && HAVE_DECL_PR_SETEXITSIG)
-	XLAT(PR_SETEXITSIG),
+ XLAT(PR_GET_KEEPCAPS),
+#if !(defined(PR_SET_KEEPCAPS) || (defined(HAVE_DECL_PR_SET_KEEPCAPS) && HAVE_DECL_PR_SET_KEEPCAPS))
+# define PR_SET_KEEPCAPS 8
 #endif
-#if defined(PR_RESIDENT) || (defined(HAVE_DECL_PR_RESIDENT) && HAVE_DECL_PR_RESIDENT)
-	XLAT(PR_RESIDENT),
+ XLAT(PR_SET_KEEPCAPS),
+#if !(defined(PR_GET_FPEMU) || (defined(HAVE_DECL_PR_GET_FPEMU) && HAVE_DECL_PR_GET_FPEMU))
+# define PR_GET_FPEMU 9
 #endif
-#if defined(PR_ATTACHADDR) || (defined(HAVE_DECL_PR_ATTACHADDR) && HAVE_DECL_PR_ATTACHADDR)
-	XLAT(PR_ATTACHADDR),
+ XLAT(PR_GET_FPEMU),
+#if !(defined(PR_SET_FPEMU) || (defined(HAVE_DECL_PR_SET_FPEMU) && HAVE_DECL_PR_SET_FPEMU))
+# define PR_SET_FPEMU 10
 #endif
-#if defined(PR_DETACHADDR) || (defined(HAVE_DECL_PR_DETACHADDR) && HAVE_DECL_PR_DETACHADDR)
-	XLAT(PR_DETACHADDR),
+ XLAT(PR_SET_FPEMU),
+#if !(defined(PR_GET_FPEXC) || (defined(HAVE_DECL_PR_GET_FPEXC) && HAVE_DECL_PR_GET_FPEXC))
+# define PR_GET_FPEXC 11
 #endif
-#if defined(PR_TERMCHILD) || (defined(HAVE_DECL_PR_TERMCHILD) && HAVE_DECL_PR_TERMCHILD)
-	XLAT(PR_TERMCHILD),
+ XLAT(PR_GET_FPEXC),
+#if !(defined(PR_SET_FPEXC) || (defined(HAVE_DECL_PR_SET_FPEXC) && HAVE_DECL_PR_SET_FPEXC))
+# define PR_SET_FPEXC 12
 #endif
-#if defined(PR_GETSHMASK) || (defined(HAVE_DECL_PR_GETSHMASK) && HAVE_DECL_PR_GETSHMASK)
-	XLAT(PR_GETSHMASK),
+ XLAT(PR_SET_FPEXC),
+#if !(defined(PR_GET_TIMING) || (defined(HAVE_DECL_PR_GET_TIMING) && HAVE_DECL_PR_GET_TIMING))
+# define PR_GET_TIMING 13
 #endif
-#if defined(PR_GETNSHARE) || (defined(HAVE_DECL_PR_GETNSHARE) && HAVE_DECL_PR_GETNSHARE)
-	XLAT(PR_GETNSHARE),
+ XLAT(PR_GET_TIMING),
+#if !(defined(PR_SET_TIMING) || (defined(HAVE_DECL_PR_SET_TIMING) && HAVE_DECL_PR_SET_TIMING))
+# define PR_SET_TIMING 14
 #endif
-#if defined(PR_COREPID) || (defined(HAVE_DECL_PR_COREPID) && HAVE_DECL_PR_COREPID)
-	XLAT(PR_COREPID),
+ XLAT(PR_SET_TIMING),
+#if !(defined(PR_SET_NAME) || (defined(HAVE_DECL_PR_SET_NAME) && HAVE_DECL_PR_SET_NAME))
+# define PR_SET_NAME 15
 #endif
-#if defined(PR_ATTACHADDRPERM) || (defined(HAVE_DECL_PR_ATTACHADDRPERM) && HAVE_DECL_PR_ATTACHADDRPERM)
-	XLAT(PR_ATTACHADDRPERM),
+ XLAT(PR_SET_NAME),
+#if !(defined(PR_GET_NAME) || (defined(HAVE_DECL_PR_GET_NAME) && HAVE_DECL_PR_GET_NAME))
+# define PR_GET_NAME 16
 #endif
-#if defined(PR_PTHREADEXIT) || (defined(HAVE_DECL_PR_PTHREADEXIT) && HAVE_DECL_PR_PTHREADEXIT)
-	XLAT(PR_PTHREADEXIT),
+ XLAT(PR_GET_NAME),
+#if !(defined(PR_GET_ENDIAN) || (defined(HAVE_DECL_PR_GET_ENDIAN) && HAVE_DECL_PR_GET_ENDIAN))
+# define PR_GET_ENDIAN 19
 #endif
-#if defined(PR_SET_PDEATHSIG) || (defined(HAVE_DECL_PR_SET_PDEATHSIG) && HAVE_DECL_PR_SET_PDEATHSIG)
-	XLAT(PR_SET_PDEATHSIG),
+ XLAT(PR_GET_ENDIAN),
+#if !(defined(PR_SET_ENDIAN) || (defined(HAVE_DECL_PR_SET_ENDIAN) && HAVE_DECL_PR_SET_ENDIAN))
+# define PR_SET_ENDIAN 20
 #endif
-#if defined(PR_GET_PDEATHSIG) || (defined(HAVE_DECL_PR_GET_PDEATHSIG) && HAVE_DECL_PR_GET_PDEATHSIG)
-	XLAT(PR_GET_PDEATHSIG),
+ XLAT(PR_SET_ENDIAN),
+#if !(defined(PR_GET_SECCOMP) || (defined(HAVE_DECL_PR_GET_SECCOMP) && HAVE_DECL_PR_GET_SECCOMP))
+# define PR_GET_SECCOMP 21
 #endif
-#if defined(PR_GET_DUMPABLE) || (defined(HAVE_DECL_PR_GET_DUMPABLE) && HAVE_DECL_PR_GET_DUMPABLE)
-	XLAT(PR_GET_DUMPABLE),
+ XLAT(PR_GET_SECCOMP),
+#if !(defined(PR_SET_SECCOMP) || (defined(HAVE_DECL_PR_SET_SECCOMP) && HAVE_DECL_PR_SET_SECCOMP))
+# define PR_SET_SECCOMP 22
 #endif
-#if defined(PR_SET_DUMPABLE) || (defined(HAVE_DECL_PR_SET_DUMPABLE) && HAVE_DECL_PR_SET_DUMPABLE)
-	XLAT(PR_SET_DUMPABLE),
+ XLAT(PR_SET_SECCOMP),
+#if !(defined(PR_CAPBSET_READ) || (defined(HAVE_DECL_PR_CAPBSET_READ) && HAVE_DECL_PR_CAPBSET_READ))
+# define PR_CAPBSET_READ 23
 #endif
-#if defined(PR_GET_UNALIGN) || (defined(HAVE_DECL_PR_GET_UNALIGN) && HAVE_DECL_PR_GET_UNALIGN)
-	XLAT(PR_GET_UNALIGN),
+ XLAT(PR_CAPBSET_READ),
+#if !(defined(PR_CAPBSET_DROP) || (defined(HAVE_DECL_PR_CAPBSET_DROP) && HAVE_DECL_PR_CAPBSET_DROP))
+# define PR_CAPBSET_DROP 24
 #endif
-#if defined(PR_SET_UNALIGN) || (defined(HAVE_DECL_PR_SET_UNALIGN) && HAVE_DECL_PR_SET_UNALIGN)
-	XLAT(PR_SET_UNALIGN),
+ XLAT(PR_CAPBSET_DROP),
+#if !(defined(PR_GET_TSC) || (defined(HAVE_DECL_PR_GET_TSC) && HAVE_DECL_PR_GET_TSC))
+# define PR_GET_TSC 25
 #endif
-#if defined(PR_GET_KEEPCAPS) || (defined(HAVE_DECL_PR_GET_KEEPCAPS) && HAVE_DECL_PR_GET_KEEPCAPS)
-	XLAT(PR_GET_KEEPCAPS),
+ XLAT(PR_GET_TSC),
+#if !(defined(PR_SET_TSC) || (defined(HAVE_DECL_PR_SET_TSC) && HAVE_DECL_PR_SET_TSC))
+# define PR_SET_TSC 26
 #endif
-#if defined(PR_SET_KEEPCAPS) || (defined(HAVE_DECL_PR_SET_KEEPCAPS) && HAVE_DECL_PR_SET_KEEPCAPS)
-	XLAT(PR_SET_KEEPCAPS),
+ XLAT(PR_SET_TSC),
+#if !(defined(PR_GET_SECUREBITS) || (defined(HAVE_DECL_PR_GET_SECUREBITS) && HAVE_DECL_PR_GET_SECUREBITS))
+# define PR_GET_SECUREBITS 27
 #endif
-#if defined(PR_GET_FPEMU) || (defined(HAVE_DECL_PR_GET_FPEMU) && HAVE_DECL_PR_GET_FPEMU)
-	XLAT(PR_GET_FPEMU),
+ XLAT(PR_GET_SECUREBITS),
+#if !(defined(PR_SET_SECUREBITS) || (defined(HAVE_DECL_PR_SET_SECUREBITS) && HAVE_DECL_PR_SET_SECUREBITS))
+# define PR_SET_SECUREBITS 28
 #endif
-#if defined(PR_SET_FPEMU) || (defined(HAVE_DECL_PR_SET_FPEMU) && HAVE_DECL_PR_SET_FPEMU)
-	XLAT(PR_SET_FPEMU),
+ XLAT(PR_SET_SECUREBITS),
+#if !(defined(PR_SET_TIMERSLACK) || (defined(HAVE_DECL_PR_SET_TIMERSLACK) && HAVE_DECL_PR_SET_TIMERSLACK))
+# define PR_SET_TIMERSLACK 29
 #endif
-#if defined(PR_GET_FPEXC) || (defined(HAVE_DECL_PR_GET_FPEXC) && HAVE_DECL_PR_GET_FPEXC)
-	XLAT(PR_GET_FPEXC),
+ XLAT(PR_SET_TIMERSLACK),
+#if !(defined(PR_GET_TIMERSLACK) || (defined(HAVE_DECL_PR_GET_TIMERSLACK) && HAVE_DECL_PR_GET_TIMERSLACK))
+# define PR_GET_TIMERSLACK 30
 #endif
-#if defined(PR_SET_FPEXC) || (defined(HAVE_DECL_PR_SET_FPEXC) && HAVE_DECL_PR_SET_FPEXC)
-	XLAT(PR_SET_FPEXC),
+ XLAT(PR_GET_TIMERSLACK),
+#if !(defined(PR_TASK_PERF_EVENTS_DISABLE) || (defined(HAVE_DECL_PR_TASK_PERF_EVENTS_DISABLE) && HAVE_DECL_PR_TASK_PERF_EVENTS_DISABLE))
+# define PR_TASK_PERF_EVENTS_DISABLE 31
 #endif
-#if defined(PR_GET_TIMING) || (defined(HAVE_DECL_PR_GET_TIMING) && HAVE_DECL_PR_GET_TIMING)
-	XLAT(PR_GET_TIMING),
+ XLAT(PR_TASK_PERF_EVENTS_DISABLE),
+#if !(defined(PR_TASK_PERF_EVENTS_ENABLE) || (defined(HAVE_DECL_PR_TASK_PERF_EVENTS_ENABLE) && HAVE_DECL_PR_TASK_PERF_EVENTS_ENABLE))
+# define PR_TASK_PERF_EVENTS_ENABLE 32
 #endif
-#if defined(PR_SET_TIMING) || (defined(HAVE_DECL_PR_SET_TIMING) && HAVE_DECL_PR_SET_TIMING)
-	XLAT(PR_SET_TIMING),
+ XLAT(PR_TASK_PERF_EVENTS_ENABLE),
+#if !(defined(PR_MCE_KILL) || (defined(HAVE_DECL_PR_MCE_KILL) && HAVE_DECL_PR_MCE_KILL))
+# define PR_MCE_KILL 33
 #endif
-#if defined(PR_SET_NAME) || (defined(HAVE_DECL_PR_SET_NAME) && HAVE_DECL_PR_SET_NAME)
-	XLAT(PR_SET_NAME),
+ XLAT(PR_MCE_KILL),
+#if !(defined(PR_MCE_KILL_GET) || (defined(HAVE_DECL_PR_MCE_KILL_GET) && HAVE_DECL_PR_MCE_KILL_GET))
+# define PR_MCE_KILL_GET 34
 #endif
-#if defined(PR_GET_NAME) || (defined(HAVE_DECL_PR_GET_NAME) && HAVE_DECL_PR_GET_NAME)
-	XLAT(PR_GET_NAME),
+ XLAT(PR_MCE_KILL_GET),
+#if !(defined(PR_SET_MM) || (defined(HAVE_DECL_PR_SET_MM) && HAVE_DECL_PR_SET_MM))
+# define PR_SET_MM 35
 #endif
-#if defined(PR_GET_ENDIAN) || (defined(HAVE_DECL_PR_GET_ENDIAN) && HAVE_DECL_PR_GET_ENDIAN)
-	XLAT(PR_GET_ENDIAN),
+ XLAT(PR_SET_MM),
+#if !(defined(PR_SET_PTRACER) || (defined(HAVE_DECL_PR_SET_PTRACER) && HAVE_DECL_PR_SET_PTRACER))
+# define PR_SET_PTRACER 0x59616d61
 #endif
-#if defined(PR_SET_ENDIAN) || (defined(HAVE_DECL_PR_SET_ENDIAN) && HAVE_DECL_PR_SET_ENDIAN)
-	XLAT(PR_SET_ENDIAN),
+ XLAT(PR_SET_PTRACER),
+#if !(defined(PR_SET_CHILD_SUBREAPER) || (defined(HAVE_DECL_PR_SET_CHILD_SUBREAPER) && HAVE_DECL_PR_SET_CHILD_SUBREAPER))
+# define PR_SET_CHILD_SUBREAPER 36
 #endif
-#if defined(PR_GET_SECCOMP) || (defined(HAVE_DECL_PR_GET_SECCOMP) && HAVE_DECL_PR_GET_SECCOMP)
-	XLAT(PR_GET_SECCOMP),
+ XLAT(PR_SET_CHILD_SUBREAPER),
+#if !(defined(PR_GET_CHILD_SUBREAPER) || (defined(HAVE_DECL_PR_GET_CHILD_SUBREAPER) && HAVE_DECL_PR_GET_CHILD_SUBREAPER))
+# define PR_GET_CHILD_SUBREAPER 37
 #endif
-#if defined(PR_SET_SECCOMP) || (defined(HAVE_DECL_PR_SET_SECCOMP) && HAVE_DECL_PR_SET_SECCOMP)
-	XLAT(PR_SET_SECCOMP),
+ XLAT(PR_GET_CHILD_SUBREAPER),
+#if !(defined(PR_SET_NO_NEW_PRIVS) || (defined(HAVE_DECL_PR_SET_NO_NEW_PRIVS) && HAVE_DECL_PR_SET_NO_NEW_PRIVS))
+# define PR_SET_NO_NEW_PRIVS 38
 #endif
-#if defined(PR_CAPBSET_READ) || (defined(HAVE_DECL_PR_CAPBSET_READ) && HAVE_DECL_PR_CAPBSET_READ)
-	XLAT(PR_CAPBSET_READ),
+ XLAT(PR_SET_NO_NEW_PRIVS),
+#if !(defined(PR_GET_NO_NEW_PRIVS) || (defined(HAVE_DECL_PR_GET_NO_NEW_PRIVS) && HAVE_DECL_PR_GET_NO_NEW_PRIVS))
+# define PR_GET_NO_NEW_PRIVS 39
 #endif
-#if defined(PR_CAPBSET_DROP) || (defined(HAVE_DECL_PR_CAPBSET_DROP) && HAVE_DECL_PR_CAPBSET_DROP)
-	XLAT(PR_CAPBSET_DROP),
+ XLAT(PR_GET_NO_NEW_PRIVS),
+#if !(defined(PR_GET_TID_ADDRESS) || (defined(HAVE_DECL_PR_GET_TID_ADDRESS) && HAVE_DECL_PR_GET_TID_ADDRESS))
+# define PR_GET_TID_ADDRESS 40
 #endif
-#if defined(PR_GET_TSC) || (defined(HAVE_DECL_PR_GET_TSC) && HAVE_DECL_PR_GET_TSC)
-	XLAT(PR_GET_TSC),
+ XLAT(PR_GET_TID_ADDRESS),
+#if !(defined(PR_SET_THP_DISABLE) || (defined(HAVE_DECL_PR_SET_THP_DISABLE) && HAVE_DECL_PR_SET_THP_DISABLE))
+# define PR_SET_THP_DISABLE 41
 #endif
-#if defined(PR_SET_TSC) || (defined(HAVE_DECL_PR_SET_TSC) && HAVE_DECL_PR_SET_TSC)
-	XLAT(PR_SET_TSC),
+ XLAT(PR_SET_THP_DISABLE),
+#if !(defined(PR_GET_THP_DISABLE) || (defined(HAVE_DECL_PR_GET_THP_DISABLE) && HAVE_DECL_PR_GET_THP_DISABLE))
+# define PR_GET_THP_DISABLE 42
 #endif
-#if defined(PR_GET_SECUREBITS) || (defined(HAVE_DECL_PR_GET_SECUREBITS) && HAVE_DECL_PR_GET_SECUREBITS)
-	XLAT(PR_GET_SECUREBITS),
+ XLAT(PR_GET_THP_DISABLE),
+#if !(defined(PR_MPX_ENABLE_MANAGEMENT) || (defined(HAVE_DECL_PR_MPX_ENABLE_MANAGEMENT) && HAVE_DECL_PR_MPX_ENABLE_MANAGEMENT))
+# define PR_MPX_ENABLE_MANAGEMENT 43
 #endif
-#if defined(PR_SET_SECUREBITS) || (defined(HAVE_DECL_PR_SET_SECUREBITS) && HAVE_DECL_PR_SET_SECUREBITS)
-	XLAT(PR_SET_SECUREBITS),
+ XLAT(PR_MPX_ENABLE_MANAGEMENT),
+#if !(defined(PR_MPX_DISABLE_MANAGEMENT) || (defined(HAVE_DECL_PR_MPX_DISABLE_MANAGEMENT) && HAVE_DECL_PR_MPX_DISABLE_MANAGEMENT))
+# define PR_MPX_DISABLE_MANAGEMENT 44
 #endif
-#if defined(PR_SET_TIMERSLACK) || (defined(HAVE_DECL_PR_SET_TIMERSLACK) && HAVE_DECL_PR_SET_TIMERSLACK)
-	XLAT(PR_SET_TIMERSLACK),
-#endif
-#if defined(PR_GET_TIMERSLACK) || (defined(HAVE_DECL_PR_GET_TIMERSLACK) && HAVE_DECL_PR_GET_TIMERSLACK)
-	XLAT(PR_GET_TIMERSLACK),
-#endif
-#if defined(PR_TASK_PERF_EVENTS_DISABLE) || (defined(HAVE_DECL_PR_TASK_PERF_EVENTS_DISABLE) && HAVE_DECL_PR_TASK_PERF_EVENTS_DISABLE)
-	XLAT(PR_TASK_PERF_EVENTS_DISABLE),
-#endif
-#if defined(PR_TASK_PERF_EVENTS_ENABLE) || (defined(HAVE_DECL_PR_TASK_PERF_EVENTS_ENABLE) && HAVE_DECL_PR_TASK_PERF_EVENTS_ENABLE)
-	XLAT(PR_TASK_PERF_EVENTS_ENABLE),
-#endif
-#if defined(PR_MCE_KILL) || (defined(HAVE_DECL_PR_MCE_KILL) && HAVE_DECL_PR_MCE_KILL)
-	XLAT(PR_MCE_KILL),
-#endif
-#if defined(PR_MCE_KILL_GET) || (defined(HAVE_DECL_PR_MCE_KILL_GET) && HAVE_DECL_PR_MCE_KILL_GET)
-	XLAT(PR_MCE_KILL_GET),
-#endif
-#if defined(PR_SET_MM) || (defined(HAVE_DECL_PR_SET_MM) && HAVE_DECL_PR_SET_MM)
-	XLAT(PR_SET_MM),
-#endif
-#if defined(PR_SET_PTRACER) || (defined(HAVE_DECL_PR_SET_PTRACER) && HAVE_DECL_PR_SET_PTRACER)
-	XLAT(PR_SET_PTRACER),
-#endif
-#if defined(PR_SET_CHILD_SUBREAPER) || (defined(HAVE_DECL_PR_SET_CHILD_SUBREAPER) && HAVE_DECL_PR_SET_CHILD_SUBREAPER)
-	XLAT(PR_SET_CHILD_SUBREAPER),
-#endif
-#if defined(PR_GET_CHILD_SUBREAPER) || (defined(HAVE_DECL_PR_GET_CHILD_SUBREAPER) && HAVE_DECL_PR_GET_CHILD_SUBREAPER)
-	XLAT(PR_GET_CHILD_SUBREAPER),
-#endif
-#if defined(PR_SET_NO_NEW_PRIVS) || (defined(HAVE_DECL_PR_SET_NO_NEW_PRIVS) && HAVE_DECL_PR_SET_NO_NEW_PRIVS)
-	XLAT(PR_SET_NO_NEW_PRIVS),
-#endif
-#if defined(PR_GET_NO_NEW_PRIVS) || (defined(HAVE_DECL_PR_GET_NO_NEW_PRIVS) && HAVE_DECL_PR_GET_NO_NEW_PRIVS)
-	XLAT(PR_GET_NO_NEW_PRIVS),
-#endif
-#if defined(PR_GET_TID_ADDRESS) || (defined(HAVE_DECL_PR_GET_TID_ADDRESS) && HAVE_DECL_PR_GET_TID_ADDRESS)
-	XLAT(PR_GET_TID_ADDRESS),
-#endif
-#if defined(PR_SET_THP_DISABLE) || (defined(HAVE_DECL_PR_SET_THP_DISABLE) && HAVE_DECL_PR_SET_THP_DISABLE)
-	XLAT(PR_SET_THP_DISABLE),
-#endif
-#if defined(PR_GET_THP_DISABLE) || (defined(HAVE_DECL_PR_GET_THP_DISABLE) && HAVE_DECL_PR_GET_THP_DISABLE)
-	XLAT(PR_GET_THP_DISABLE),
-#endif
-#if defined(PR_MPX_ENABLE_MANAGEMENT) || (defined(HAVE_DECL_PR_MPX_ENABLE_MANAGEMENT) && HAVE_DECL_PR_MPX_ENABLE_MANAGEMENT)
-	XLAT(PR_MPX_ENABLE_MANAGEMENT),
-#endif
-#if defined(PR_MPX_DISABLE_MANAGEMENT) || (defined(HAVE_DECL_PR_MPX_DISABLE_MANAGEMENT) && HAVE_DECL_PR_MPX_DISABLE_MANAGEMENT)
-	XLAT(PR_MPX_DISABLE_MANAGEMENT),
-#endif
-	XLAT_END
+ XLAT(PR_MPX_DISABLE_MANAGEMENT),
+ XLAT_END
 };
diff --git a/xlat/priorities.h b/xlat/priorities.h
index 6d54326..b74e529 100644
--- a/xlat/priorities.h
+++ b/xlat/priorities.h
@@ -2,13 +2,13 @@
 
 static const struct xlat priorities[] = {
 #if defined(PRIO_PROCESS) || (defined(HAVE_DECL_PRIO_PROCESS) && HAVE_DECL_PRIO_PROCESS)
-	XLAT(PRIO_PROCESS),
+ XLAT(PRIO_PROCESS),
 #endif
 #if defined(PRIO_PGRP) || (defined(HAVE_DECL_PRIO_PGRP) && HAVE_DECL_PRIO_PGRP)
-	XLAT(PRIO_PGRP),
+ XLAT(PRIO_PGRP),
 #endif
 #if defined(PRIO_USER) || (defined(HAVE_DECL_PRIO_USER) && HAVE_DECL_PRIO_USER)
-	XLAT(PRIO_USER),
+ XLAT(PRIO_USER),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/ptp_flags_options.h b/xlat/ptp_flags_options.h
index 87b3403..22ae5ce 100644
--- a/xlat/ptp_flags_options.h
+++ b/xlat/ptp_flags_options.h
@@ -2,13 +2,13 @@
 
 static const struct xlat ptp_flags_options[] = {
 #if defined(PTP_ENABLE_FEATURE) || (defined(HAVE_DECL_PTP_ENABLE_FEATURE) && HAVE_DECL_PTP_ENABLE_FEATURE)
-	XLAT(PTP_ENABLE_FEATURE),
+ XLAT(PTP_ENABLE_FEATURE),
 #endif
 #if defined(PTP_RISING_EDGE) || (defined(HAVE_DECL_PTP_RISING_EDGE) && HAVE_DECL_PTP_RISING_EDGE)
-	XLAT(PTP_RISING_EDGE),
+ XLAT(PTP_RISING_EDGE),
 #endif
 #if defined(PTP_FALLING_EDGE) || (defined(HAVE_DECL_PTP_FALLING_EDGE) && HAVE_DECL_PTP_FALLING_EDGE)
-	XLAT(PTP_FALLING_EDGE),
+ XLAT(PTP_FALLING_EDGE),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/ptrace_cmds.h b/xlat/ptrace_cmds.h
index 5154cf0..215f75e 100644
--- a/xlat/ptrace_cmds.h
+++ b/xlat/ptrace_cmds.h
@@ -2,106 +2,278 @@
 
 static const struct xlat ptrace_cmds[] = {
 #if defined(PTRACE_TRACEME) || (defined(HAVE_DECL_PTRACE_TRACEME) && HAVE_DECL_PTRACE_TRACEME)
-	XLAT(PTRACE_TRACEME),
+ XLAT(PTRACE_TRACEME),
 #endif
 #if defined(PTRACE_PEEKTEXT) || (defined(HAVE_DECL_PTRACE_PEEKTEXT) && HAVE_DECL_PTRACE_PEEKTEXT)
-	XLAT(PTRACE_PEEKTEXT),
+ XLAT(PTRACE_PEEKTEXT),
 #endif
 #if defined(PTRACE_PEEKDATA) || (defined(HAVE_DECL_PTRACE_PEEKDATA) && HAVE_DECL_PTRACE_PEEKDATA)
-	XLAT(PTRACE_PEEKDATA),
+ XLAT(PTRACE_PEEKDATA),
 #endif
 #if defined(PTRACE_PEEKUSER) || (defined(HAVE_DECL_PTRACE_PEEKUSER) && HAVE_DECL_PTRACE_PEEKUSER)
-	XLAT(PTRACE_PEEKUSER),
+ XLAT(PTRACE_PEEKUSER),
 #endif
 #if defined(PTRACE_POKETEXT) || (defined(HAVE_DECL_PTRACE_POKETEXT) && HAVE_DECL_PTRACE_POKETEXT)
-	XLAT(PTRACE_POKETEXT),
+ XLAT(PTRACE_POKETEXT),
 #endif
 #if defined(PTRACE_POKEDATA) || (defined(HAVE_DECL_PTRACE_POKEDATA) && HAVE_DECL_PTRACE_POKEDATA)
-	XLAT(PTRACE_POKEDATA),
+ XLAT(PTRACE_POKEDATA),
 #endif
 #if defined(PTRACE_POKEUSER) || (defined(HAVE_DECL_PTRACE_POKEUSER) && HAVE_DECL_PTRACE_POKEUSER)
-	XLAT(PTRACE_POKEUSER),
+ XLAT(PTRACE_POKEUSER),
 #endif
 #if defined(PTRACE_CONT) || (defined(HAVE_DECL_PTRACE_CONT) && HAVE_DECL_PTRACE_CONT)
-	XLAT(PTRACE_CONT),
+ XLAT(PTRACE_CONT),
 #endif
 #if defined(PTRACE_KILL) || (defined(HAVE_DECL_PTRACE_KILL) && HAVE_DECL_PTRACE_KILL)
-	XLAT(PTRACE_KILL),
+ XLAT(PTRACE_KILL),
 #endif
 #if defined(PTRACE_SINGLESTEP) || (defined(HAVE_DECL_PTRACE_SINGLESTEP) && HAVE_DECL_PTRACE_SINGLESTEP)
-	XLAT(PTRACE_SINGLESTEP),
+ XLAT(PTRACE_SINGLESTEP),
 #endif
 #if defined(PTRACE_ATTACH) || (defined(HAVE_DECL_PTRACE_ATTACH) && HAVE_DECL_PTRACE_ATTACH)
-	XLAT(PTRACE_ATTACH),
+ XLAT(PTRACE_ATTACH),
 #endif
 #if defined(PTRACE_DETACH) || (defined(HAVE_DECL_PTRACE_DETACH) && HAVE_DECL_PTRACE_DETACH)
-	XLAT(PTRACE_DETACH),
+ XLAT(PTRACE_DETACH),
 #endif
 #if defined(PTRACE_SYSCALL) || (defined(HAVE_DECL_PTRACE_SYSCALL) && HAVE_DECL_PTRACE_SYSCALL)
-	XLAT(PTRACE_SYSCALL),
+ XLAT(PTRACE_SYSCALL),
 #endif
 #if defined(PTRACE_GETREGS) || (defined(HAVE_DECL_PTRACE_GETREGS) && HAVE_DECL_PTRACE_GETREGS)
-	XLAT(PTRACE_GETREGS),
+ XLAT(PTRACE_GETREGS),
 #endif
 #if defined(PTRACE_SETREGS) || (defined(HAVE_DECL_PTRACE_SETREGS) && HAVE_DECL_PTRACE_SETREGS)
-	XLAT(PTRACE_SETREGS),
+ XLAT(PTRACE_SETREGS),
 #endif
 #if defined(PTRACE_GETFPREGS) || (defined(HAVE_DECL_PTRACE_GETFPREGS) && HAVE_DECL_PTRACE_GETFPREGS)
-	XLAT(PTRACE_GETFPREGS),
+ XLAT(PTRACE_GETFPREGS),
 #endif
 #if defined(PTRACE_SETFPREGS) || (defined(HAVE_DECL_PTRACE_SETFPREGS) && HAVE_DECL_PTRACE_SETFPREGS)
-	XLAT(PTRACE_SETFPREGS),
+ XLAT(PTRACE_SETFPREGS),
 #endif
 #if defined(PTRACE_GETFPXREGS) || (defined(HAVE_DECL_PTRACE_GETFPXREGS) && HAVE_DECL_PTRACE_GETFPXREGS)
-	XLAT(PTRACE_GETFPXREGS),
+ XLAT(PTRACE_GETFPXREGS),
 #endif
 #if defined(PTRACE_SETFPXREGS) || (defined(HAVE_DECL_PTRACE_SETFPXREGS) && HAVE_DECL_PTRACE_SETFPXREGS)
-	XLAT(PTRACE_SETFPXREGS),
+ XLAT(PTRACE_SETFPXREGS),
 #endif
 #if defined(PTRACE_GETVRREGS) || (defined(HAVE_DECL_PTRACE_GETVRREGS) && HAVE_DECL_PTRACE_GETVRREGS)
-	XLAT(PTRACE_GETVRREGS),
+ XLAT(PTRACE_GETVRREGS),
 #endif
 #if defined(PTRACE_SETVRREGS) || (defined(HAVE_DECL_PTRACE_SETVRREGS) && HAVE_DECL_PTRACE_SETVRREGS)
-	XLAT(PTRACE_SETVRREGS),
+ XLAT(PTRACE_SETVRREGS),
 #endif
 #if defined(PTRACE_SETOPTIONS) || (defined(HAVE_DECL_PTRACE_SETOPTIONS) && HAVE_DECL_PTRACE_SETOPTIONS)
-	XLAT(PTRACE_SETOPTIONS),
+ XLAT(PTRACE_SETOPTIONS),
 #endif
 #if defined(PTRACE_GETEVENTMSG) || (defined(HAVE_DECL_PTRACE_GETEVENTMSG) && HAVE_DECL_PTRACE_GETEVENTMSG)
-	XLAT(PTRACE_GETEVENTMSG),
+ XLAT(PTRACE_GETEVENTMSG),
 #endif
 #if defined(PTRACE_GETSIGINFO) || (defined(HAVE_DECL_PTRACE_GETSIGINFO) && HAVE_DECL_PTRACE_GETSIGINFO)
-	XLAT(PTRACE_GETSIGINFO),
+ XLAT(PTRACE_GETSIGINFO),
 #endif
 #if defined(PTRACE_SETSIGINFO) || (defined(HAVE_DECL_PTRACE_SETSIGINFO) && HAVE_DECL_PTRACE_SETSIGINFO)
-	XLAT(PTRACE_SETSIGINFO),
+ XLAT(PTRACE_SETSIGINFO),
 #endif
 #if defined(PTRACE_GETREGSET) || (defined(HAVE_DECL_PTRACE_GETREGSET) && HAVE_DECL_PTRACE_GETREGSET)
-	XLAT(PTRACE_GETREGSET),
+ XLAT(PTRACE_GETREGSET),
 #endif
 #if defined(PTRACE_SETREGSET) || (defined(HAVE_DECL_PTRACE_SETREGSET) && HAVE_DECL_PTRACE_SETREGSET)
-	XLAT(PTRACE_SETREGSET),
+ XLAT(PTRACE_SETREGSET),
 #endif
 #if defined(PTRACE_SET_SYSCALL) || (defined(HAVE_DECL_PTRACE_SET_SYSCALL) && HAVE_DECL_PTRACE_SET_SYSCALL)
-	XLAT(PTRACE_SET_SYSCALL),
+ XLAT(PTRACE_SET_SYSCALL),
 #endif
 #if defined(PTRACE_SEIZE) || (defined(HAVE_DECL_PTRACE_SEIZE) && HAVE_DECL_PTRACE_SEIZE)
-	XLAT(PTRACE_SEIZE),
+ XLAT(PTRACE_SEIZE),
 #endif
 #if defined(PTRACE_INTERRUPT) || (defined(HAVE_DECL_PTRACE_INTERRUPT) && HAVE_DECL_PTRACE_INTERRUPT)
-	XLAT(PTRACE_INTERRUPT),
+ XLAT(PTRACE_INTERRUPT),
 #endif
 #if defined(PTRACE_LISTEN) || (defined(HAVE_DECL_PTRACE_LISTEN) && HAVE_DECL_PTRACE_LISTEN)
-	XLAT(PTRACE_LISTEN),
+ XLAT(PTRACE_LISTEN),
 #endif
 #if defined(PTRACE_PEEKSIGINFO) || (defined(HAVE_DECL_PTRACE_PEEKSIGINFO) && HAVE_DECL_PTRACE_PEEKSIGINFO)
-	XLAT(PTRACE_PEEKSIGINFO),
+ XLAT(PTRACE_PEEKSIGINFO),
 #endif
 #if defined(PTRACE_GETSIGMASK) || (defined(HAVE_DECL_PTRACE_GETSIGMASK) && HAVE_DECL_PTRACE_GETSIGMASK)
-	XLAT(PTRACE_GETSIGMASK),
+ XLAT(PTRACE_GETSIGMASK),
 #endif
 #if defined(PTRACE_SETSIGMASK) || (defined(HAVE_DECL_PTRACE_SETSIGMASK) && HAVE_DECL_PTRACE_SETSIGMASK)
-	XLAT(PTRACE_SETSIGMASK),
+ XLAT(PTRACE_SETSIGMASK),
 #endif
-	XLAT_END
+/* arch-specific */
+#if defined(PTRACE_GET_THREAD_AREA) || (defined(HAVE_DECL_PTRACE_GET_THREAD_AREA) && HAVE_DECL_PTRACE_GET_THREAD_AREA)
+ XLAT(PTRACE_GET_THREAD_AREA),
+#endif
+#if defined(PTRACE_SET_THREAD_AREA) || (defined(HAVE_DECL_PTRACE_SET_THREAD_AREA) && HAVE_DECL_PTRACE_SET_THREAD_AREA)
+ XLAT(PTRACE_SET_THREAD_AREA),
+#endif
+#if defined(PTRACE_OLDSETOPTIONS) || (defined(HAVE_DECL_PTRACE_OLDSETOPTIONS) && HAVE_DECL_PTRACE_OLDSETOPTIONS)
+ XLAT(PTRACE_OLDSETOPTIONS),
+#endif
+#if defined(PTRACE_GETFDPIC) || (defined(HAVE_DECL_PTRACE_GETFDPIC) && HAVE_DECL_PTRACE_GETFDPIC)
+ XLAT(PTRACE_GETFDPIC),
+#endif
+#if defined(PTRACE_SINGLEBLOCK) || (defined(HAVE_DECL_PTRACE_SINGLEBLOCK) && HAVE_DECL_PTRACE_SINGLEBLOCK)
+ XLAT(PTRACE_SINGLEBLOCK),
+#endif
+/* arm */
+#if defined(PTRACE_GETWMMXREGS) || (defined(HAVE_DECL_PTRACE_GETWMMXREGS) && HAVE_DECL_PTRACE_GETWMMXREGS)
+ XLAT(PTRACE_GETWMMXREGS),
+#endif
+#if defined(PTRACE_SETWMMXREGS) || (defined(HAVE_DECL_PTRACE_SETWMMXREGS) && HAVE_DECL_PTRACE_SETWMMXREGS)
+ XLAT(PTRACE_SETWMMXREGS),
+#endif
+#if defined(PTRACE_GETCRUNCHREGS) || (defined(HAVE_DECL_PTRACE_GETCRUNCHREGS) && HAVE_DECL_PTRACE_GETCRUNCHREGS)
+ XLAT(PTRACE_GETCRUNCHREGS),
+#endif
+#if defined(PTRACE_SETCRUNCHREGS) || (defined(HAVE_DECL_PTRACE_SETCRUNCHREGS) && HAVE_DECL_PTRACE_SETCRUNCHREGS)
+ XLAT(PTRACE_SETCRUNCHREGS),
+#endif
+#if defined(PTRACE_GETVFPREGS) || (defined(HAVE_DECL_PTRACE_GETVFPREGS) && HAVE_DECL_PTRACE_GETVFPREGS)
+ XLAT(PTRACE_GETVFPREGS),
+#endif
+#if defined(PTRACE_SETVFPREGS) || (defined(HAVE_DECL_PTRACE_SETVFPREGS) && HAVE_DECL_PTRACE_SETVFPREGS)
+ XLAT(PTRACE_SETVFPREGS),
+#endif
+#if defined(PTRACE_GETHBPREGS) || (defined(HAVE_DECL_PTRACE_GETHBPREGS) && HAVE_DECL_PTRACE_GETHBPREGS)
+ XLAT(PTRACE_GETHBPREGS),
+#endif
+#if defined(PTRACE_SETHBPREGS) || (defined(HAVE_DECL_PTRACE_SETHBPREGS) && HAVE_DECL_PTRACE_SETHBPREGS)
+ XLAT(PTRACE_SETHBPREGS),
+#endif
+/* ia64 */
+#if defined(PTRACE_OLD_GETSIGINFO) || (defined(HAVE_DECL_PTRACE_OLD_GETSIGINFO) && HAVE_DECL_PTRACE_OLD_GETSIGINFO)
+ XLAT(PTRACE_OLD_GETSIGINFO),
+#endif
+#if defined(PTRACE_OLD_SETSIGINFO) || (defined(HAVE_DECL_PTRACE_OLD_SETSIGINFO) && HAVE_DECL_PTRACE_OLD_SETSIGINFO)
+ XLAT(PTRACE_OLD_SETSIGINFO),
+#endif
+/* mips */
+#if defined(PTRACE_PEEKTEXT_3264) || (defined(HAVE_DECL_PTRACE_PEEKTEXT_3264) && HAVE_DECL_PTRACE_PEEKTEXT_3264)
+ XLAT(PTRACE_PEEKTEXT_3264),
+#endif
+#if defined(PTRACE_PEEKDATA_3264) || (defined(HAVE_DECL_PTRACE_PEEKDATA_3264) && HAVE_DECL_PTRACE_PEEKDATA_3264)
+ XLAT(PTRACE_PEEKDATA_3264),
+#endif
+#if defined(PTRACE_POKETEXT_3264) || (defined(HAVE_DECL_PTRACE_POKETEXT_3264) && HAVE_DECL_PTRACE_POKETEXT_3264)
+ XLAT(PTRACE_POKETEXT_3264),
+#endif
+#if defined(PTRACE_POKEDATA_3264) || (defined(HAVE_DECL_PTRACE_POKEDATA_3264) && HAVE_DECL_PTRACE_POKEDATA_3264)
+ XLAT(PTRACE_POKEDATA_3264),
+#endif
+#if defined(PTRACE_GET_THREAD_AREA_3264) || (defined(HAVE_DECL_PTRACE_GET_THREAD_AREA_3264) && HAVE_DECL_PTRACE_GET_THREAD_AREA_3264)
+ XLAT(PTRACE_GET_THREAD_AREA_3264),
+#endif
+#if defined(PTRACE_GET_WATCH_REGS) || (defined(HAVE_DECL_PTRACE_GET_WATCH_REGS) && HAVE_DECL_PTRACE_GET_WATCH_REGS)
+ XLAT(PTRACE_GET_WATCH_REGS),
+#endif
+#if defined(PTRACE_SET_WATCH_REGS) || (defined(HAVE_DECL_PTRACE_SET_WATCH_REGS) && HAVE_DECL_PTRACE_SET_WATCH_REGS)
+ XLAT(PTRACE_SET_WATCH_REGS),
+#endif
+/* powerpc */
+#if defined(PTRACE_GETEVRREGS) || (defined(HAVE_DECL_PTRACE_GETEVRREGS) && HAVE_DECL_PTRACE_GETEVRREGS)
+ XLAT(PTRACE_GETEVRREGS),
+#endif
+#if defined(PTRACE_SETEVRREGS) || (defined(HAVE_DECL_PTRACE_SETEVRREGS) && HAVE_DECL_PTRACE_SETEVRREGS)
+ XLAT(PTRACE_SETEVRREGS),
+#endif
+#if defined(PTRACE_GETVSRREGS) || (defined(HAVE_DECL_PTRACE_GETVSRREGS) && HAVE_DECL_PTRACE_GETVSRREGS)
+ XLAT(PTRACE_GETVSRREGS),
+#endif
+#if defined(PTRACE_SETVSRREGS) || (defined(HAVE_DECL_PTRACE_SETVSRREGS) && HAVE_DECL_PTRACE_SETVSRREGS)
+ XLAT(PTRACE_SETVSRREGS),
+#endif
+#if defined(PTRACE_GET_DEBUGREG) || (defined(HAVE_DECL_PTRACE_GET_DEBUGREG) && HAVE_DECL_PTRACE_GET_DEBUGREG)
+ XLAT(PTRACE_GET_DEBUGREG),
+#endif
+#if defined(PTRACE_SET_DEBUGREG) || (defined(HAVE_DECL_PTRACE_SET_DEBUGREG) && HAVE_DECL_PTRACE_SET_DEBUGREG)
+ XLAT(PTRACE_SET_DEBUGREG),
+#endif
+/* s390 */
+#if defined(PTRACE_PEEKUSR_AREA) || (defined(HAVE_DECL_PTRACE_PEEKUSR_AREA) && HAVE_DECL_PTRACE_PEEKUSR_AREA)
+ XLAT(PTRACE_PEEKUSR_AREA),
+#endif
+#if defined(PTRACE_POKEUSR_AREA) || (defined(HAVE_DECL_PTRACE_POKEUSR_AREA) && HAVE_DECL_PTRACE_POKEUSR_AREA)
+ XLAT(PTRACE_POKEUSR_AREA),
+#endif
+#if defined(PTRACE_PEEKTEXT_AREA) || (defined(HAVE_DECL_PTRACE_PEEKTEXT_AREA) && HAVE_DECL_PTRACE_PEEKTEXT_AREA)
+ XLAT(PTRACE_PEEKTEXT_AREA),
+#endif
+#if defined(PTRACE_PEEKDATA_AREA) || (defined(HAVE_DECL_PTRACE_PEEKDATA_AREA) && HAVE_DECL_PTRACE_PEEKDATA_AREA)
+ XLAT(PTRACE_PEEKDATA_AREA),
+#endif
+#if defined(PTRACE_POKETEXT_AREA) || (defined(HAVE_DECL_PTRACE_POKETEXT_AREA) && HAVE_DECL_PTRACE_POKETEXT_AREA)
+ XLAT(PTRACE_POKETEXT_AREA),
+#endif
+#if defined(PTRACE_POKEDATA_AREA) || (defined(HAVE_DECL_PTRACE_POKEDATA_AREA) && HAVE_DECL_PTRACE_POKEDATA_AREA)
+ XLAT(PTRACE_POKEDATA_AREA),
+#endif
+#if defined(PTRACE_GET_LAST_BREAK) || (defined(HAVE_DECL_PTRACE_GET_LAST_BREAK) && HAVE_DECL_PTRACE_GET_LAST_BREAK)
+ XLAT(PTRACE_GET_LAST_BREAK),
+#endif
+#if defined(PTRACE_PEEK_SYSTEM_CALL) || (defined(HAVE_DECL_PTRACE_PEEK_SYSTEM_CALL) && HAVE_DECL_PTRACE_PEEK_SYSTEM_CALL)
+ XLAT(PTRACE_PEEK_SYSTEM_CALL),
+#endif
+#if defined(PTRACE_POKE_SYSTEM_CALL) || (defined(HAVE_DECL_PTRACE_POKE_SYSTEM_CALL) && HAVE_DECL_PTRACE_POKE_SYSTEM_CALL)
+ XLAT(PTRACE_POKE_SYSTEM_CALL),
+#endif
+#if defined(PTRACE_ENABLE_TE) || (defined(HAVE_DECL_PTRACE_ENABLE_TE) && HAVE_DECL_PTRACE_ENABLE_TE)
+ XLAT(PTRACE_ENABLE_TE),
+#endif
+#if defined(PTRACE_DISABLE_TE) || (defined(HAVE_DECL_PTRACE_DISABLE_TE) && HAVE_DECL_PTRACE_DISABLE_TE)
+ XLAT(PTRACE_DISABLE_TE),
+#endif
+#if defined(PTRACE_TE_ABORT_RAND) || (defined(HAVE_DECL_PTRACE_TE_ABORT_RAND) && HAVE_DECL_PTRACE_TE_ABORT_RAND)
+ XLAT(PTRACE_TE_ABORT_RAND),
+#endif
+/* sh */
+#if defined(PTRACE_GETDSPREGS) || (defined(HAVE_DECL_PTRACE_GETDSPREGS) && HAVE_DECL_PTRACE_GETDSPREGS)
+ XLAT(PTRACE_GETDSPREGS),
+#endif
+#if defined(PTRACE_SETDSPREGS) || (defined(HAVE_DECL_PTRACE_SETDSPREGS) && HAVE_DECL_PTRACE_SETDSPREGS)
+ XLAT(PTRACE_SETDSPREGS),
+#endif
+/* sparc */
+#if defined(PTRACE_SPARC_DETACH) || (defined(HAVE_DECL_PTRACE_SPARC_DETACH) && HAVE_DECL_PTRACE_SPARC_DETACH)
+ XLAT(PTRACE_SPARC_DETACH),
+#endif
+#if defined(PTRACE_READDATA) || (defined(HAVE_DECL_PTRACE_READDATA) && HAVE_DECL_PTRACE_READDATA)
+ XLAT(PTRACE_READDATA),
+#endif
+#if defined(PTRACE_WRITEDATA) || (defined(HAVE_DECL_PTRACE_WRITEDATA) && HAVE_DECL_PTRACE_WRITEDATA)
+ XLAT(PTRACE_WRITEDATA),
+#endif
+#if defined(PTRACE_READTEXT) || (defined(HAVE_DECL_PTRACE_READTEXT) && HAVE_DECL_PTRACE_READTEXT)
+ XLAT(PTRACE_READTEXT),
+#endif
+#if defined(PTRACE_WRITETEXT) || (defined(HAVE_DECL_PTRACE_WRITETEXT) && HAVE_DECL_PTRACE_WRITETEXT)
+ XLAT(PTRACE_WRITETEXT),
+#endif
+#if defined(PTRACE_GETFPAREGS) || (defined(HAVE_DECL_PTRACE_GETFPAREGS) && HAVE_DECL_PTRACE_GETFPAREGS)
+ XLAT(PTRACE_GETFPAREGS),
+#endif
+#if defined(PTRACE_SETFPAREGS) || (defined(HAVE_DECL_PTRACE_SETFPAREGS) && HAVE_DECL_PTRACE_SETFPAREGS)
+ XLAT(PTRACE_SETFPAREGS),
+#endif
+/* x86 */
+#if defined(PTRACE_ARCH_PRCTL) || (defined(HAVE_DECL_PTRACE_ARCH_PRCTL) && HAVE_DECL_PTRACE_ARCH_PRCTL)
+ XLAT(PTRACE_ARCH_PRCTL),
+#endif
+#if defined(PTRACE_SYSEMU) || (defined(HAVE_DECL_PTRACE_SYSEMU) && HAVE_DECL_PTRACE_SYSEMU)
+ XLAT(PTRACE_SYSEMU),
+#endif
+#if defined(PTRACE_SYSEMU_SINGLESTEP) || (defined(HAVE_DECL_PTRACE_SYSEMU_SINGLESTEP) && HAVE_DECL_PTRACE_SYSEMU_SINGLESTEP)
+ XLAT(PTRACE_SYSEMU_SINGLESTEP),
+#endif
+/* xtensa */
+#if defined(PTRACE_GETXTREGS) || (defined(HAVE_DECL_PTRACE_GETXTREGS) && HAVE_DECL_PTRACE_GETXTREGS)
+ XLAT(PTRACE_GETXTREGS),
+#endif
+#if defined(PTRACE_SETXTREGS) || (defined(HAVE_DECL_PTRACE_SETXTREGS) && HAVE_DECL_PTRACE_SETXTREGS)
+ XLAT(PTRACE_SETXTREGS),
+#endif
+ XLAT_END
 };
diff --git a/xlat/ptrace_setoptions_flags.h b/xlat/ptrace_setoptions_flags.h
index 9ea554e..38a3e74 100644
--- a/xlat/ptrace_setoptions_flags.h
+++ b/xlat/ptrace_setoptions_flags.h
@@ -2,31 +2,35 @@
 
 static const struct xlat ptrace_setoptions_flags[] = {
 #if defined(PTRACE_O_TRACESYSGOOD) || (defined(HAVE_DECL_PTRACE_O_TRACESYSGOOD) && HAVE_DECL_PTRACE_O_TRACESYSGOOD)
-	XLAT(PTRACE_O_TRACESYSGOOD),
+ XLAT(PTRACE_O_TRACESYSGOOD),
 #endif
 #if defined(PTRACE_O_TRACEFORK) || (defined(HAVE_DECL_PTRACE_O_TRACEFORK) && HAVE_DECL_PTRACE_O_TRACEFORK)
-	XLAT(PTRACE_O_TRACEFORK),
+ XLAT(PTRACE_O_TRACEFORK),
 #endif
 #if defined(PTRACE_O_TRACEVFORK) || (defined(HAVE_DECL_PTRACE_O_TRACEVFORK) && HAVE_DECL_PTRACE_O_TRACEVFORK)
-	XLAT(PTRACE_O_TRACEVFORK),
+ XLAT(PTRACE_O_TRACEVFORK),
 #endif
 #if defined(PTRACE_O_TRACECLONE) || (defined(HAVE_DECL_PTRACE_O_TRACECLONE) && HAVE_DECL_PTRACE_O_TRACECLONE)
-	XLAT(PTRACE_O_TRACECLONE),
+ XLAT(PTRACE_O_TRACECLONE),
 #endif
 #if defined(PTRACE_O_TRACEEXEC) || (defined(HAVE_DECL_PTRACE_O_TRACEEXEC) && HAVE_DECL_PTRACE_O_TRACEEXEC)
-	XLAT(PTRACE_O_TRACEEXEC),
+ XLAT(PTRACE_O_TRACEEXEC),
 #endif
 #if defined(PTRACE_O_TRACEVFORKDONE) || (defined(HAVE_DECL_PTRACE_O_TRACEVFORKDONE) && HAVE_DECL_PTRACE_O_TRACEVFORKDONE)
-	XLAT(PTRACE_O_TRACEVFORKDONE),
+ XLAT(PTRACE_O_TRACEVFORKDONE),
 #endif
 #if defined(PTRACE_O_TRACEEXIT) || (defined(HAVE_DECL_PTRACE_O_TRACEEXIT) && HAVE_DECL_PTRACE_O_TRACEEXIT)
-	XLAT(PTRACE_O_TRACEEXIT),
+ XLAT(PTRACE_O_TRACEEXIT),
 #endif
 #if defined(PTRACE_O_TRACESECCOMP) || (defined(HAVE_DECL_PTRACE_O_TRACESECCOMP) && HAVE_DECL_PTRACE_O_TRACESECCOMP)
-	XLAT(PTRACE_O_TRACESECCOMP),
+ XLAT(PTRACE_O_TRACESECCOMP),
 #endif
 #if defined(PTRACE_O_EXITKILL) || (defined(HAVE_DECL_PTRACE_O_EXITKILL) && HAVE_DECL_PTRACE_O_EXITKILL)
-	XLAT(PTRACE_O_EXITKILL),
+ XLAT(PTRACE_O_EXITKILL),
 #endif
-	XLAT_END
+/* tile */
+#if defined(PTRACE_O_TRACEMIGRATE) || (defined(HAVE_DECL_PTRACE_O_TRACEMIGRATE) && HAVE_DECL_PTRACE_O_TRACEMIGRATE)
+ XLAT(PTRACE_O_TRACEMIGRATE),
+#endif
+ XLAT_END
 };
diff --git a/xlat/qm_which.h b/xlat/qm_which.h
index 8de83b9..5012736 100644
--- a/xlat/qm_which.h
+++ b/xlat/qm_which.h
@@ -1,21 +1,21 @@
 /* Generated by ./xlat/gen.sh from ./xlat/qm_which.in; do not edit. */
 
 static const struct xlat qm_which[] = {
-	XLAT(0),
+ XLAT(0),
 #if defined(QM_MODULES) || (defined(HAVE_DECL_QM_MODULES) && HAVE_DECL_QM_MODULES)
-	XLAT(QM_MODULES),
+ XLAT(QM_MODULES),
 #endif
 #if defined(QM_DEPS) || (defined(HAVE_DECL_QM_DEPS) && HAVE_DECL_QM_DEPS)
-	XLAT(QM_DEPS),
+ XLAT(QM_DEPS),
 #endif
 #if defined(QM_REFS) || (defined(HAVE_DECL_QM_REFS) && HAVE_DECL_QM_REFS)
-	XLAT(QM_REFS),
+ XLAT(QM_REFS),
 #endif
 #if defined(QM_SYMBOLS) || (defined(HAVE_DECL_QM_SYMBOLS) && HAVE_DECL_QM_SYMBOLS)
-	XLAT(QM_SYMBOLS),
+ XLAT(QM_SYMBOLS),
 #endif
 #if defined(QM_INFO) || (defined(HAVE_DECL_QM_INFO) && HAVE_DECL_QM_INFO)
-	XLAT(QM_INFO),
+ XLAT(QM_INFO),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/quota_formats.h b/xlat/quota_formats.h
index 998dffc..f07b9cc 100644
--- a/xlat/quota_formats.h
+++ b/xlat/quota_formats.h
@@ -2,10 +2,10 @@
 
 static const struct xlat quota_formats[] = {
 #if defined(QFMT_VFS_OLD) || (defined(HAVE_DECL_QFMT_VFS_OLD) && HAVE_DECL_QFMT_VFS_OLD)
-	XLAT(QFMT_VFS_OLD),
+ XLAT(QFMT_VFS_OLD),
 #endif
 #if defined(QFMT_VFS_V0) || (defined(HAVE_DECL_QFMT_VFS_V0) && HAVE_DECL_QFMT_VFS_V0)
-	XLAT(QFMT_VFS_V0),
+ XLAT(QFMT_VFS_V0),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/quotacmds.h b/xlat/quotacmds.h
index 7511402..1341080 100644
--- a/xlat/quotacmds.h
+++ b/xlat/quotacmds.h
@@ -2,100 +2,100 @@
 
 static const struct xlat quotacmds[] = {
 #if defined(Q_V1_QUOTAON) || (defined(HAVE_DECL_Q_V1_QUOTAON) && HAVE_DECL_Q_V1_QUOTAON)
-	XLAT(Q_V1_QUOTAON),
+ XLAT(Q_V1_QUOTAON),
 #endif
 #if defined(Q_V1_QUOTAOFF) || (defined(HAVE_DECL_Q_V1_QUOTAOFF) && HAVE_DECL_Q_V1_QUOTAOFF)
-	XLAT(Q_V1_QUOTAOFF),
+ XLAT(Q_V1_QUOTAOFF),
 #endif
 #if defined(Q_V1_GETQUOTA) || (defined(HAVE_DECL_Q_V1_GETQUOTA) && HAVE_DECL_Q_V1_GETQUOTA)
-	XLAT(Q_V1_GETQUOTA),
+ XLAT(Q_V1_GETQUOTA),
 #endif
 #if defined(Q_V1_SETQUOTA) || (defined(HAVE_DECL_Q_V1_SETQUOTA) && HAVE_DECL_Q_V1_SETQUOTA)
-	XLAT(Q_V1_SETQUOTA),
+ XLAT(Q_V1_SETQUOTA),
 #endif
 #if defined(Q_V1_SETUSE) || (defined(HAVE_DECL_Q_V1_SETUSE) && HAVE_DECL_Q_V1_SETUSE)
-	XLAT(Q_V1_SETUSE),
+ XLAT(Q_V1_SETUSE),
 #endif
 #if defined(Q_V1_SYNC) || (defined(HAVE_DECL_Q_V1_SYNC) && HAVE_DECL_Q_V1_SYNC)
-	XLAT(Q_V1_SYNC),
+ XLAT(Q_V1_SYNC),
 #endif
 #if defined(Q_SETQLIM) || (defined(HAVE_DECL_Q_SETQLIM) && HAVE_DECL_Q_SETQLIM)
-	XLAT(Q_SETQLIM),
+ XLAT(Q_SETQLIM),
 #endif
 #if defined(Q_V1_GETSTATS) || (defined(HAVE_DECL_Q_V1_GETSTATS) && HAVE_DECL_Q_V1_GETSTATS)
-	XLAT(Q_V1_GETSTATS),
+ XLAT(Q_V1_GETSTATS),
 #endif
 #if defined(Q_V1_RSQUASH) || (defined(HAVE_DECL_Q_V1_RSQUASH) && HAVE_DECL_Q_V1_RSQUASH)
-	XLAT(Q_V1_RSQUASH),
+ XLAT(Q_V1_RSQUASH),
 #endif
 #if defined(Q_V2_GETQUOTA) || (defined(HAVE_DECL_Q_V2_GETQUOTA) && HAVE_DECL_Q_V2_GETQUOTA)
-	XLAT(Q_V2_GETQUOTA),
+ XLAT(Q_V2_GETQUOTA),
 #endif
 #if defined(Q_V2_SETQUOTA) || (defined(HAVE_DECL_Q_V2_SETQUOTA) && HAVE_DECL_Q_V2_SETQUOTA)
-	XLAT(Q_V2_SETQUOTA),
+ XLAT(Q_V2_SETQUOTA),
 #endif
 #if defined(Q_V2_SETUSE) || (defined(HAVE_DECL_Q_V2_SETUSE) && HAVE_DECL_Q_V2_SETUSE)
-	XLAT(Q_V2_SETUSE),
+ XLAT(Q_V2_SETUSE),
 #endif
 #if defined(Q_V2_GETINFO) || (defined(HAVE_DECL_Q_V2_GETINFO) && HAVE_DECL_Q_V2_GETINFO)
-	XLAT(Q_V2_GETINFO),
+ XLAT(Q_V2_GETINFO),
 #endif
 #if defined(Q_V2_SETINFO) || (defined(HAVE_DECL_Q_V2_SETINFO) && HAVE_DECL_Q_V2_SETINFO)
-	XLAT(Q_V2_SETINFO),
+ XLAT(Q_V2_SETINFO),
 #endif
 #if defined(Q_V2_SETGRACE) || (defined(HAVE_DECL_Q_V2_SETGRACE) && HAVE_DECL_Q_V2_SETGRACE)
-	XLAT(Q_V2_SETGRACE),
+ XLAT(Q_V2_SETGRACE),
 #endif
 #if defined(Q_V2_SETFLAGS) || (defined(HAVE_DECL_Q_V2_SETFLAGS) && HAVE_DECL_Q_V2_SETFLAGS)
-	XLAT(Q_V2_SETFLAGS),
+ XLAT(Q_V2_SETFLAGS),
 #endif
 #if defined(Q_V2_GETSTATS) || (defined(HAVE_DECL_Q_V2_GETSTATS) && HAVE_DECL_Q_V2_GETSTATS)
-	XLAT(Q_V2_GETSTATS),
+ XLAT(Q_V2_GETSTATS),
 #endif
 #if defined(Q_SYNC) || (defined(HAVE_DECL_Q_SYNC) && HAVE_DECL_Q_SYNC)
-	XLAT(Q_SYNC),
+ XLAT(Q_SYNC),
 #endif
 #if defined(Q_QUOTAON) || (defined(HAVE_DECL_Q_QUOTAON) && HAVE_DECL_Q_QUOTAON)
-	XLAT(Q_QUOTAON),
+ XLAT(Q_QUOTAON),
 #endif
 #if defined(Q_QUOTAOFF) || (defined(HAVE_DECL_Q_QUOTAOFF) && HAVE_DECL_Q_QUOTAOFF)
-	XLAT(Q_QUOTAOFF),
+ XLAT(Q_QUOTAOFF),
 #endif
 #if defined(Q_GETFMT) || (defined(HAVE_DECL_Q_GETFMT) && HAVE_DECL_Q_GETFMT)
-	XLAT(Q_GETFMT),
+ XLAT(Q_GETFMT),
 #endif
 #if defined(Q_GETINFO) || (defined(HAVE_DECL_Q_GETINFO) && HAVE_DECL_Q_GETINFO)
-	XLAT(Q_GETINFO),
+ XLAT(Q_GETINFO),
 #endif
 #if defined(Q_SETINFO) || (defined(HAVE_DECL_Q_SETINFO) && HAVE_DECL_Q_SETINFO)
-	XLAT(Q_SETINFO),
+ XLAT(Q_SETINFO),
 #endif
 #if defined(Q_GETQUOTA) || (defined(HAVE_DECL_Q_GETQUOTA) && HAVE_DECL_Q_GETQUOTA)
-	XLAT(Q_GETQUOTA),
+ XLAT(Q_GETQUOTA),
 #endif
 #if defined(Q_SETQUOTA) || (defined(HAVE_DECL_Q_SETQUOTA) && HAVE_DECL_Q_SETQUOTA)
-	XLAT(Q_SETQUOTA),
+ XLAT(Q_SETQUOTA),
 #endif
 #if defined(Q_XQUOTAON) || (defined(HAVE_DECL_Q_XQUOTAON) && HAVE_DECL_Q_XQUOTAON)
-	XLAT(Q_XQUOTAON),
+ XLAT(Q_XQUOTAON),
 #endif
 #if defined(Q_XQUOTAOFF) || (defined(HAVE_DECL_Q_XQUOTAOFF) && HAVE_DECL_Q_XQUOTAOFF)
-	XLAT(Q_XQUOTAOFF),
+ XLAT(Q_XQUOTAOFF),
 #endif
 #if defined(Q_XGETQUOTA) || (defined(HAVE_DECL_Q_XGETQUOTA) && HAVE_DECL_Q_XGETQUOTA)
-	XLAT(Q_XGETQUOTA),
+ XLAT(Q_XGETQUOTA),
 #endif
 #if defined(Q_XSETQLIM) || (defined(HAVE_DECL_Q_XSETQLIM) && HAVE_DECL_Q_XSETQLIM)
-	XLAT(Q_XSETQLIM),
+ XLAT(Q_XSETQLIM),
 #endif
 #if defined(Q_XGETQSTAT) || (defined(HAVE_DECL_Q_XGETQSTAT) && HAVE_DECL_Q_XGETQSTAT)
-	XLAT(Q_XGETQSTAT),
+ XLAT(Q_XGETQSTAT),
 #endif
 #if defined(Q_XQUOTARM) || (defined(HAVE_DECL_Q_XQUOTARM) && HAVE_DECL_Q_XQUOTARM)
-	XLAT(Q_XQUOTARM),
+ XLAT(Q_XQUOTARM),
 #endif
 #if defined(Q_XQUOTASYNC) || (defined(HAVE_DECL_Q_XQUOTASYNC) && HAVE_DECL_Q_XQUOTASYNC)
-	XLAT(Q_XQUOTASYNC),
+ XLAT(Q_XQUOTASYNC),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/quotatypes.h b/xlat/quotatypes.h
index be93ed6..b326f32 100644
--- a/xlat/quotatypes.h
+++ b/xlat/quotatypes.h
@@ -2,10 +2,10 @@
 
 static const struct xlat quotatypes[] = {
 #if defined(USRQUOTA) || (defined(HAVE_DECL_USRQUOTA) && HAVE_DECL_USRQUOTA)
-	XLAT(USRQUOTA),
+ XLAT(USRQUOTA),
 #endif
 #if defined(GRPQUOTA) || (defined(HAVE_DECL_GRPQUOTA) && HAVE_DECL_GRPQUOTA)
-	XLAT(GRPQUOTA),
+ XLAT(GRPQUOTA),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/rename_flags.h b/xlat/rename_flags.h
index cc23575..034faed 100644
--- a/xlat/rename_flags.h
+++ b/xlat/rename_flags.h
@@ -2,10 +2,10 @@
 
 static const struct xlat rename_flags[] = {
 #if defined(RENAME_NOREPLACE) || (defined(HAVE_DECL_RENAME_NOREPLACE) && HAVE_DECL_RENAME_NOREPLACE)
-	XLAT(RENAME_NOREPLACE),
+ XLAT(RENAME_NOREPLACE),
 #endif
 #if defined(RENAME_EXCHANGE) || (defined(HAVE_DECL_RENAME_EXCHANGE) && HAVE_DECL_RENAME_EXCHANGE)
-	XLAT(RENAME_EXCHANGE),
+ XLAT(RENAME_EXCHANGE),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/resource_flags.h b/xlat/resource_flags.h
index 1df440d..1431f89 100644
--- a/xlat/resource_flags.h
+++ b/xlat/resource_flags.h
@@ -2,13 +2,13 @@
 
 static const struct xlat resource_flags[] = {
 #if defined(IPC_CREAT) || (defined(HAVE_DECL_IPC_CREAT) && HAVE_DECL_IPC_CREAT)
-	XLAT(IPC_CREAT),
+ XLAT(IPC_CREAT),
 #endif
 #if defined(IPC_EXCL) || (defined(HAVE_DECL_IPC_EXCL) && HAVE_DECL_IPC_EXCL)
-	XLAT(IPC_EXCL),
+ XLAT(IPC_EXCL),
 #endif
 #if defined(IPC_NOWAIT) || (defined(HAVE_DECL_IPC_NOWAIT) && HAVE_DECL_IPC_NOWAIT)
-	XLAT(IPC_NOWAIT),
+ XLAT(IPC_NOWAIT),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/resources.h b/xlat/resources.h
index 95a5fdb..46e4d15 100644
--- a/xlat/resources.h
+++ b/xlat/resources.h
@@ -2,55 +2,55 @@
 
 static const struct xlat resources[] = {
 #if defined(RLIMIT_AS) || (defined(HAVE_DECL_RLIMIT_AS) && HAVE_DECL_RLIMIT_AS)
-	XLAT(RLIMIT_AS),
+ XLAT(RLIMIT_AS),
 #endif
 #if defined(RLIMIT_CORE) || (defined(HAVE_DECL_RLIMIT_CORE) && HAVE_DECL_RLIMIT_CORE)
-	XLAT(RLIMIT_CORE),
+ XLAT(RLIMIT_CORE),
 #endif
 #if defined(RLIMIT_CPU) || (defined(HAVE_DECL_RLIMIT_CPU) && HAVE_DECL_RLIMIT_CPU)
-	XLAT(RLIMIT_CPU),
+ XLAT(RLIMIT_CPU),
 #endif
 #if defined(RLIMIT_DATA) || (defined(HAVE_DECL_RLIMIT_DATA) && HAVE_DECL_RLIMIT_DATA)
-	XLAT(RLIMIT_DATA),
+ XLAT(RLIMIT_DATA),
 #endif
 #if defined(RLIMIT_FSIZE) || (defined(HAVE_DECL_RLIMIT_FSIZE) && HAVE_DECL_RLIMIT_FSIZE)
-	XLAT(RLIMIT_FSIZE),
+ XLAT(RLIMIT_FSIZE),
 #endif
 #if defined(RLIMIT_LOCKS) || (defined(HAVE_DECL_RLIMIT_LOCKS) && HAVE_DECL_RLIMIT_LOCKS)
-	XLAT(RLIMIT_LOCKS),
+ XLAT(RLIMIT_LOCKS),
 #endif
 #if defined(RLIMIT_MEMLOCK) || (defined(HAVE_DECL_RLIMIT_MEMLOCK) && HAVE_DECL_RLIMIT_MEMLOCK)
-	XLAT(RLIMIT_MEMLOCK),
+ XLAT(RLIMIT_MEMLOCK),
 #endif
 #if defined(RLIMIT_MSGQUEUE) || (defined(HAVE_DECL_RLIMIT_MSGQUEUE) && HAVE_DECL_RLIMIT_MSGQUEUE)
-	XLAT(RLIMIT_MSGQUEUE),
+ XLAT(RLIMIT_MSGQUEUE),
 #endif
 #if defined(RLIMIT_NICE) || (defined(HAVE_DECL_RLIMIT_NICE) && HAVE_DECL_RLIMIT_NICE)
-	XLAT(RLIMIT_NICE),
+ XLAT(RLIMIT_NICE),
 #endif
 #if defined(RLIMIT_NOFILE) || (defined(HAVE_DECL_RLIMIT_NOFILE) && HAVE_DECL_RLIMIT_NOFILE)
-	XLAT(RLIMIT_NOFILE),
+ XLAT(RLIMIT_NOFILE),
 #endif
 #if defined(RLIMIT_NPROC) || (defined(HAVE_DECL_RLIMIT_NPROC) && HAVE_DECL_RLIMIT_NPROC)
-	XLAT(RLIMIT_NPROC),
+ XLAT(RLIMIT_NPROC),
 #endif
 #if defined(RLIMIT_RSS) || (defined(HAVE_DECL_RLIMIT_RSS) && HAVE_DECL_RLIMIT_RSS)
-	XLAT(RLIMIT_RSS),
+ XLAT(RLIMIT_RSS),
 #endif
 #if defined(RLIMIT_RTPRIO) || (defined(HAVE_DECL_RLIMIT_RTPRIO) && HAVE_DECL_RLIMIT_RTPRIO)
-	XLAT(RLIMIT_RTPRIO),
+ XLAT(RLIMIT_RTPRIO),
 #endif
 #if defined(RLIMIT_RTTIME) || (defined(HAVE_DECL_RLIMIT_RTTIME) && HAVE_DECL_RLIMIT_RTTIME)
-	XLAT(RLIMIT_RTTIME),
+ XLAT(RLIMIT_RTTIME),
 #endif
 #if defined(RLIMIT_SIGPENDING) || (defined(HAVE_DECL_RLIMIT_SIGPENDING) && HAVE_DECL_RLIMIT_SIGPENDING)
-	XLAT(RLIMIT_SIGPENDING),
+ XLAT(RLIMIT_SIGPENDING),
 #endif
 #if defined(RLIMIT_STACK) || (defined(HAVE_DECL_RLIMIT_STACK) && HAVE_DECL_RLIMIT_STACK)
-	XLAT(RLIMIT_STACK),
+ XLAT(RLIMIT_STACK),
 #endif
 #if defined(RLIMIT_VMEM) || (defined(HAVE_DECL_RLIMIT_VMEM) && HAVE_DECL_RLIMIT_VMEM)
-	XLAT(RLIMIT_VMEM),
+ XLAT(RLIMIT_VMEM),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/schedulers.h b/xlat/schedulers.h
index 9048395..b1eb0ce 100644
--- a/xlat/schedulers.h
+++ b/xlat/schedulers.h
@@ -2,25 +2,25 @@
 
 static const struct xlat schedulers[] = {
 #if defined(SCHED_OTHER) || (defined(HAVE_DECL_SCHED_OTHER) && HAVE_DECL_SCHED_OTHER)
-	XLAT(SCHED_OTHER),
+ XLAT(SCHED_OTHER),
 #endif
 #if defined(SCHED_FIFO) || (defined(HAVE_DECL_SCHED_FIFO) && HAVE_DECL_SCHED_FIFO)
-	XLAT(SCHED_FIFO),
+ XLAT(SCHED_FIFO),
 #endif
 #if defined(SCHED_RR) || (defined(HAVE_DECL_SCHED_RR) && HAVE_DECL_SCHED_RR)
-	XLAT(SCHED_RR),
+ XLAT(SCHED_RR),
 #endif
 #if defined(SCHED_BATCH) || (defined(HAVE_DECL_SCHED_BATCH) && HAVE_DECL_SCHED_BATCH)
-	XLAT(SCHED_BATCH),
+ XLAT(SCHED_BATCH),
 #endif
 #if defined(SCHED_ISO) || (defined(HAVE_DECL_SCHED_ISO) && HAVE_DECL_SCHED_ISO)
-	XLAT(SCHED_ISO),
+ XLAT(SCHED_ISO),
 #endif
 #if defined(SCHED_IDLE) || (defined(HAVE_DECL_SCHED_IDLE) && HAVE_DECL_SCHED_IDLE)
-	XLAT(SCHED_IDLE),
+ XLAT(SCHED_IDLE),
 #endif
 #if defined(SCHED_DEADLINE) || (defined(HAVE_DECL_SCHED_DEADLINE) && HAVE_DECL_SCHED_DEADLINE)
-	XLAT(SCHED_DEADLINE),
+ XLAT(SCHED_DEADLINE),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/scmvals.h b/xlat/scmvals.h
index ba4629a..850473d 100644
--- a/xlat/scmvals.h
+++ b/xlat/scmvals.h
@@ -2,10 +2,13 @@
 
 static const struct xlat scmvals[] = {
 #if defined(SCM_RIGHTS) || (defined(HAVE_DECL_SCM_RIGHTS) && HAVE_DECL_SCM_RIGHTS)
-	XLAT(SCM_RIGHTS),
+ XLAT(SCM_RIGHTS),
 #endif
 #if defined(SCM_CREDENTIALS) || (defined(HAVE_DECL_SCM_CREDENTIALS) && HAVE_DECL_SCM_CREDENTIALS)
-	XLAT(SCM_CREDENTIALS),
+ XLAT(SCM_CREDENTIALS),
 #endif
-	XLAT_END
+#if defined(SCM_SECURITY) || (defined(HAVE_DECL_SCM_SECURITY) && HAVE_DECL_SCM_SECURITY)
+ XLAT(SCM_SECURITY),
+#endif
+ XLAT_END
 };
diff --git a/xlat/semctl_flags.h b/xlat/semctl_flags.h
index e902008..1a8dbcf 100644
--- a/xlat/semctl_flags.h
+++ b/xlat/semctl_flags.h
@@ -2,43 +2,43 @@
 
 static const struct xlat semctl_flags[] = {
 #if defined(IPC_RMID) || (defined(HAVE_DECL_IPC_RMID) && HAVE_DECL_IPC_RMID)
-	XLAT(IPC_RMID),
+ XLAT(IPC_RMID),
 #endif
 #if defined(IPC_SET) || (defined(HAVE_DECL_IPC_SET) && HAVE_DECL_IPC_SET)
-	XLAT(IPC_SET),
+ XLAT(IPC_SET),
 #endif
 #if defined(IPC_STAT) || (defined(HAVE_DECL_IPC_STAT) && HAVE_DECL_IPC_STAT)
-	XLAT(IPC_STAT),
+ XLAT(IPC_STAT),
 #endif
 #if defined(IPC_INFO) || (defined(HAVE_DECL_IPC_INFO) && HAVE_DECL_IPC_INFO)
-	XLAT(IPC_INFO),
+ XLAT(IPC_INFO),
 #endif
 #if defined(SEM_STAT) || (defined(HAVE_DECL_SEM_STAT) && HAVE_DECL_SEM_STAT)
-	XLAT(SEM_STAT),
+ XLAT(SEM_STAT),
 #endif
 #if defined(SEM_INFO) || (defined(HAVE_DECL_SEM_INFO) && HAVE_DECL_SEM_INFO)
-	XLAT(SEM_INFO),
+ XLAT(SEM_INFO),
 #endif
 #if defined(GETPID) || (defined(HAVE_DECL_GETPID) && HAVE_DECL_GETPID)
-	XLAT(GETPID),
+ XLAT(GETPID),
 #endif
 #if defined(GETVAL) || (defined(HAVE_DECL_GETVAL) && HAVE_DECL_GETVAL)
-	XLAT(GETVAL),
+ XLAT(GETVAL),
 #endif
 #if defined(GETALL) || (defined(HAVE_DECL_GETALL) && HAVE_DECL_GETALL)
-	XLAT(GETALL),
+ XLAT(GETALL),
 #endif
 #if defined(GETNCNT) || (defined(HAVE_DECL_GETNCNT) && HAVE_DECL_GETNCNT)
-	XLAT(GETNCNT),
+ XLAT(GETNCNT),
 #endif
 #if defined(GETZCNT) || (defined(HAVE_DECL_GETZCNT) && HAVE_DECL_GETZCNT)
-	XLAT(GETZCNT),
+ XLAT(GETZCNT),
 #endif
 #if defined(SETVAL) || (defined(HAVE_DECL_SETVAL) && HAVE_DECL_SETVAL)
-	XLAT(SETVAL),
+ XLAT(SETVAL),
 #endif
 #if defined(SETALL) || (defined(HAVE_DECL_SETALL) && HAVE_DECL_SETALL)
-	XLAT(SETALL),
+ XLAT(SETALL),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/semop_flags.h b/xlat/semop_flags.h
index d861340..ee2f64e 100644
--- a/xlat/semop_flags.h
+++ b/xlat/semop_flags.h
@@ -2,10 +2,10 @@
 
 static const struct xlat semop_flags[] = {
 #if defined(SEM_UNDO) || (defined(HAVE_DECL_SEM_UNDO) && HAVE_DECL_SEM_UNDO)
-	XLAT(SEM_UNDO),
+ XLAT(SEM_UNDO),
 #endif
 #if defined(IPC_NOWAIT) || (defined(HAVE_DECL_IPC_NOWAIT) && HAVE_DECL_IPC_NOWAIT)
-	XLAT(IPC_NOWAIT),
+ XLAT(IPC_NOWAIT),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sg_io_dxfer_direction.h b/xlat/sg_io_dxfer_direction.h
index eae2eac..d430469 100644
--- a/xlat/sg_io_dxfer_direction.h
+++ b/xlat/sg_io_dxfer_direction.h
@@ -2,16 +2,16 @@
 
 static const struct xlat sg_io_dxfer_direction[] = {
 #if defined(SG_DXFER_NONE) || (defined(HAVE_DECL_SG_DXFER_NONE) && HAVE_DECL_SG_DXFER_NONE)
-	XLAT(SG_DXFER_NONE),
+ XLAT(SG_DXFER_NONE),
 #endif
 #if defined(SG_DXFER_TO_DEV) || (defined(HAVE_DECL_SG_DXFER_TO_DEV) && HAVE_DECL_SG_DXFER_TO_DEV)
-	XLAT(SG_DXFER_TO_DEV),
+ XLAT(SG_DXFER_TO_DEV),
 #endif
 #if defined(SG_DXFER_FROM_DEV) || (defined(HAVE_DECL_SG_DXFER_FROM_DEV) && HAVE_DECL_SG_DXFER_FROM_DEV)
-	XLAT(SG_DXFER_FROM_DEV),
+ XLAT(SG_DXFER_FROM_DEV),
 #endif
 #if defined(SG_DXFER_TO_FROM_DEV) || (defined(HAVE_DECL_SG_DXFER_TO_FROM_DEV) && HAVE_DECL_SG_DXFER_TO_FROM_DEV)
-	XLAT(SG_DXFER_TO_FROM_DEV),
+ XLAT(SG_DXFER_TO_FROM_DEV),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/shm_flags.h b/xlat/shm_flags.h
index e484576..c5100f2 100644
--- a/xlat/shm_flags.h
+++ b/xlat/shm_flags.h
@@ -2,13 +2,13 @@
 
 static const struct xlat shm_flags[] = {
 #if defined(SHM_REMAP) || (defined(HAVE_DECL_SHM_REMAP) && HAVE_DECL_SHM_REMAP)
-	XLAT(SHM_REMAP),
+ XLAT(SHM_REMAP),
 #endif
 #if defined(SHM_RDONLY) || (defined(HAVE_DECL_SHM_RDONLY) && HAVE_DECL_SHM_RDONLY)
-	XLAT(SHM_RDONLY),
+ XLAT(SHM_RDONLY),
 #endif
 #if defined(SHM_RND) || (defined(HAVE_DECL_SHM_RND) && HAVE_DECL_SHM_RND)
-	XLAT(SHM_RND),
+ XLAT(SHM_RND),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/shm_resource_flags.h b/xlat/shm_resource_flags.h
index 6229774..059263e 100644
--- a/xlat/shm_resource_flags.h
+++ b/xlat/shm_resource_flags.h
@@ -2,13 +2,13 @@
 
 static const struct xlat shm_resource_flags[] = {
 #if defined(IPC_CREAT) || (defined(HAVE_DECL_IPC_CREAT) && HAVE_DECL_IPC_CREAT)
-	XLAT(IPC_CREAT),
+ XLAT(IPC_CREAT),
 #endif
 #if defined(IPC_EXCL) || (defined(HAVE_DECL_IPC_EXCL) && HAVE_DECL_IPC_EXCL)
-	XLAT(IPC_EXCL),
+ XLAT(IPC_EXCL),
 #endif
 #if defined(SHM_HUGETLB) || (defined(HAVE_DECL_SHM_HUGETLB) && HAVE_DECL_SHM_HUGETLB)
-	XLAT(SHM_HUGETLB),
+ XLAT(SHM_HUGETLB),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/shmctl_flags.h b/xlat/shmctl_flags.h
index a67c015..25773e3 100644
--- a/xlat/shmctl_flags.h
+++ b/xlat/shmctl_flags.h
@@ -2,28 +2,28 @@
 
 static const struct xlat shmctl_flags[] = {
 #if defined(IPC_RMID) || (defined(HAVE_DECL_IPC_RMID) && HAVE_DECL_IPC_RMID)
-	XLAT(IPC_RMID),
+ XLAT(IPC_RMID),
 #endif
 #if defined(IPC_SET) || (defined(HAVE_DECL_IPC_SET) && HAVE_DECL_IPC_SET)
-	XLAT(IPC_SET),
+ XLAT(IPC_SET),
 #endif
 #if defined(IPC_STAT) || (defined(HAVE_DECL_IPC_STAT) && HAVE_DECL_IPC_STAT)
-	XLAT(IPC_STAT),
+ XLAT(IPC_STAT),
 #endif
 #if defined(IPC_INFO) || (defined(HAVE_DECL_IPC_INFO) && HAVE_DECL_IPC_INFO)
-	XLAT(IPC_INFO),
+ XLAT(IPC_INFO),
 #endif
 #if defined(SHM_STAT) || (defined(HAVE_DECL_SHM_STAT) && HAVE_DECL_SHM_STAT)
-	XLAT(SHM_STAT),
+ XLAT(SHM_STAT),
 #endif
 #if defined(SHM_INFO) || (defined(HAVE_DECL_SHM_INFO) && HAVE_DECL_SHM_INFO)
-	XLAT(SHM_INFO),
+ XLAT(SHM_INFO),
 #endif
 #if defined(SHM_LOCK) || (defined(HAVE_DECL_SHM_LOCK) && HAVE_DECL_SHM_LOCK)
-	XLAT(SHM_LOCK),
+ XLAT(SHM_LOCK),
 #endif
 #if defined(SHM_UNLOCK) || (defined(HAVE_DECL_SHM_UNLOCK) && HAVE_DECL_SHM_UNLOCK)
-	XLAT(SHM_UNLOCK),
+ XLAT(SHM_UNLOCK),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/shutdown_modes.h b/xlat/shutdown_modes.h
index 6e3ab81..390ee5d 100644
--- a/xlat/shutdown_modes.h
+++ b/xlat/shutdown_modes.h
@@ -4,5 +4,5 @@
 { 0,	"SHUT_RD"	},
 { 1,	"SHUT_WR"	},
 { 2,	"SHUT_RDWR"	},
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sigact_flags.h b/xlat/sigact_flags.h
index 0ee2f2b..7837a40 100644
--- a/xlat/sigact_flags.h
+++ b/xlat/sigact_flags.h
@@ -2,56 +2,56 @@
 
 static const struct xlat sigact_flags[] = {
 #if defined(SA_RESTORER) || (defined(HAVE_DECL_SA_RESTORER) && HAVE_DECL_SA_RESTORER)
-	XLAT(SA_RESTORER),
+ XLAT(SA_RESTORER),
 #endif
 #if defined(SA_STACK) || (defined(HAVE_DECL_SA_STACK) && HAVE_DECL_SA_STACK)
-	XLAT(SA_STACK),
+ XLAT(SA_STACK),
 #endif
 #if defined(SA_RESTART) || (defined(HAVE_DECL_SA_RESTART) && HAVE_DECL_SA_RESTART)
-	XLAT(SA_RESTART),
+ XLAT(SA_RESTART),
 #endif
 #if defined(SA_INTERRUPT) || (defined(HAVE_DECL_SA_INTERRUPT) && HAVE_DECL_SA_INTERRUPT)
-	XLAT(SA_INTERRUPT),
+ XLAT(SA_INTERRUPT),
 #endif
 #if defined(SA_NODEFER) || (defined(HAVE_DECL_SA_NODEFER) && HAVE_DECL_SA_NODEFER)
-	XLAT(SA_NODEFER),
+ XLAT(SA_NODEFER),
 #endif
 #if defined SA_NOMASK && SA_NODEFER != SA_NOMASK
 #if defined(SA_NOMASK) || (defined(HAVE_DECL_SA_NOMASK) && HAVE_DECL_SA_NOMASK)
-	XLAT(SA_NOMASK),
+ XLAT(SA_NOMASK),
 #endif
 #endif
 #if defined(SA_RESETHAND) || (defined(HAVE_DECL_SA_RESETHAND) && HAVE_DECL_SA_RESETHAND)
-	XLAT(SA_RESETHAND),
+ XLAT(SA_RESETHAND),
 #endif
 #if defined SA_ONESHOT && SA_ONESHOT != SA_RESETHAND
 #if defined(SA_ONESHOT) || (defined(HAVE_DECL_SA_ONESHOT) && HAVE_DECL_SA_ONESHOT)
-	XLAT(SA_ONESHOT),
+ XLAT(SA_ONESHOT),
 #endif
 #endif
 #if defined(SA_SIGINFO) || (defined(HAVE_DECL_SA_SIGINFO) && HAVE_DECL_SA_SIGINFO)
-	XLAT(SA_SIGINFO),
+ XLAT(SA_SIGINFO),
 #endif
 #if defined(SA_RESETHAND) || (defined(HAVE_DECL_SA_RESETHAND) && HAVE_DECL_SA_RESETHAND)
-	XLAT(SA_RESETHAND),
+ XLAT(SA_RESETHAND),
 #endif
 #if defined(SA_ONSTACK) || (defined(HAVE_DECL_SA_ONSTACK) && HAVE_DECL_SA_ONSTACK)
-	XLAT(SA_ONSTACK),
+ XLAT(SA_ONSTACK),
 #endif
 #if defined(SA_NODEFER) || (defined(HAVE_DECL_SA_NODEFER) && HAVE_DECL_SA_NODEFER)
-	XLAT(SA_NODEFER),
+ XLAT(SA_NODEFER),
 #endif
 #if defined(SA_NOCLDSTOP) || (defined(HAVE_DECL_SA_NOCLDSTOP) && HAVE_DECL_SA_NOCLDSTOP)
-	XLAT(SA_NOCLDSTOP),
+ XLAT(SA_NOCLDSTOP),
 #endif
 #if defined(SA_NOCLDWAIT) || (defined(HAVE_DECL_SA_NOCLDWAIT) && HAVE_DECL_SA_NOCLDWAIT)
-	XLAT(SA_NOCLDWAIT),
+ XLAT(SA_NOCLDWAIT),
 #endif
 #if defined(_SA_BSDCALL) || (defined(HAVE_DECL__SA_BSDCALL) && HAVE_DECL__SA_BSDCALL)
-	XLAT(_SA_BSDCALL),
+ XLAT(_SA_BSDCALL),
 #endif
 #if defined(SA_NOPTRACE) || (defined(HAVE_DECL_SA_NOPTRACE) && HAVE_DECL_SA_NOPTRACE)
-	XLAT(SA_NOPTRACE),
+ XLAT(SA_NOPTRACE),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sigaltstack_flags.h b/xlat/sigaltstack_flags.h
index 8d719ed..b4cf1ba 100644
--- a/xlat/sigaltstack_flags.h
+++ b/xlat/sigaltstack_flags.h
@@ -2,10 +2,10 @@
 
 static const struct xlat sigaltstack_flags[] = {
 #if defined(SS_ONSTACK) || (defined(HAVE_DECL_SS_ONSTACK) && HAVE_DECL_SS_ONSTACK)
-	XLAT(SS_ONSTACK),
+ XLAT(SS_ONSTACK),
 #endif
 #if defined(SS_DISABLE) || (defined(HAVE_DECL_SS_DISABLE) && HAVE_DECL_SS_DISABLE)
-	XLAT(SS_DISABLE),
+ XLAT(SS_DISABLE),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sigbus_codes.h b/xlat/sigbus_codes.h
index 8ec67c0..0eed3ca 100644
--- a/xlat/sigbus_codes.h
+++ b/xlat/sigbus_codes.h
@@ -2,13 +2,13 @@
 
 static const struct xlat sigbus_codes[] = {
 #if defined(BUS_ADRALN) || (defined(HAVE_DECL_BUS_ADRALN) && HAVE_DECL_BUS_ADRALN)
-	XLAT(BUS_ADRALN),
+ XLAT(BUS_ADRALN),
 #endif
 #if defined(BUS_ADRERR) || (defined(HAVE_DECL_BUS_ADRERR) && HAVE_DECL_BUS_ADRERR)
-	XLAT(BUS_ADRERR),
+ XLAT(BUS_ADRERR),
 #endif
 #if defined(BUS_OBJERR) || (defined(HAVE_DECL_BUS_OBJERR) && HAVE_DECL_BUS_OBJERR)
-	XLAT(BUS_OBJERR),
+ XLAT(BUS_OBJERR),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sigchld_codes.h b/xlat/sigchld_codes.h
index 6604db3..8f02217 100644
--- a/xlat/sigchld_codes.h
+++ b/xlat/sigchld_codes.h
@@ -2,22 +2,22 @@
 
 static const struct xlat sigchld_codes[] = {
 #if defined(CLD_EXITED) || (defined(HAVE_DECL_CLD_EXITED) && HAVE_DECL_CLD_EXITED)
-	XLAT(CLD_EXITED),
+ XLAT(CLD_EXITED),
 #endif
 #if defined(CLD_KILLED) || (defined(HAVE_DECL_CLD_KILLED) && HAVE_DECL_CLD_KILLED)
-	XLAT(CLD_KILLED),
+ XLAT(CLD_KILLED),
 #endif
 #if defined(CLD_DUMPED) || (defined(HAVE_DECL_CLD_DUMPED) && HAVE_DECL_CLD_DUMPED)
-	XLAT(CLD_DUMPED),
+ XLAT(CLD_DUMPED),
 #endif
 #if defined(CLD_TRAPPED) || (defined(HAVE_DECL_CLD_TRAPPED) && HAVE_DECL_CLD_TRAPPED)
-	XLAT(CLD_TRAPPED),
+ XLAT(CLD_TRAPPED),
 #endif
 #if defined(CLD_STOPPED) || (defined(HAVE_DECL_CLD_STOPPED) && HAVE_DECL_CLD_STOPPED)
-	XLAT(CLD_STOPPED),
+ XLAT(CLD_STOPPED),
 #endif
 #if defined(CLD_CONTINUED) || (defined(HAVE_DECL_CLD_CONTINUED) && HAVE_DECL_CLD_CONTINUED)
-	XLAT(CLD_CONTINUED),
+ XLAT(CLD_CONTINUED),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sigemt_codes.h b/xlat/sigemt_codes.h
index ab87c40..dc46868 100644
--- a/xlat/sigemt_codes.h
+++ b/xlat/sigemt_codes.h
@@ -2,7 +2,7 @@
 
 static const struct xlat sigemt_codes[] = {
 #if defined(EMT_TAGOVF) || (defined(HAVE_DECL_EMT_TAGOVF) && HAVE_DECL_EMT_TAGOVF)
-	XLAT(EMT_TAGOVF),
+ XLAT(EMT_TAGOVF),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sigev_value.h b/xlat/sigev_value.h
index da73c05..04ed1b2 100644
--- a/xlat/sigev_value.h
+++ b/xlat/sigev_value.h
@@ -2,16 +2,16 @@
 
 static const struct xlat sigev_value[] = {
 #if defined(SIGEV_SIGNAL) || (defined(HAVE_DECL_SIGEV_SIGNAL) && HAVE_DECL_SIGEV_SIGNAL)
-	XLAT(SIGEV_SIGNAL),
+ XLAT(SIGEV_SIGNAL),
 #endif
 #if defined(SIGEV_NONE) || (defined(HAVE_DECL_SIGEV_NONE) && HAVE_DECL_SIGEV_NONE)
-	XLAT(SIGEV_NONE),
+ XLAT(SIGEV_NONE),
 #endif
 #if defined(SIGEV_THREAD) || (defined(HAVE_DECL_SIGEV_THREAD) && HAVE_DECL_SIGEV_THREAD)
-	XLAT(SIGEV_THREAD),
+ XLAT(SIGEV_THREAD),
 #endif
 #if defined(SIGEV_THREAD_ID) || (defined(HAVE_DECL_SIGEV_THREAD_ID) && HAVE_DECL_SIGEV_THREAD_ID)
-	XLAT(SIGEV_THREAD_ID),
+ XLAT(SIGEV_THREAD_ID),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sigfpe_codes.h b/xlat/sigfpe_codes.h
index d69a26c..3174e40 100644
--- a/xlat/sigfpe_codes.h
+++ b/xlat/sigfpe_codes.h
@@ -2,28 +2,28 @@
 
 static const struct xlat sigfpe_codes[] = {
 #if defined(FPE_INTDIV) || (defined(HAVE_DECL_FPE_INTDIV) && HAVE_DECL_FPE_INTDIV)
-	XLAT(FPE_INTDIV),
+ XLAT(FPE_INTDIV),
 #endif
 #if defined(FPE_INTOVF) || (defined(HAVE_DECL_FPE_INTOVF) && HAVE_DECL_FPE_INTOVF)
-	XLAT(FPE_INTOVF),
+ XLAT(FPE_INTOVF),
 #endif
 #if defined(FPE_FLTDIV) || (defined(HAVE_DECL_FPE_FLTDIV) && HAVE_DECL_FPE_FLTDIV)
-	XLAT(FPE_FLTDIV),
+ XLAT(FPE_FLTDIV),
 #endif
 #if defined(FPE_FLTOVF) || (defined(HAVE_DECL_FPE_FLTOVF) && HAVE_DECL_FPE_FLTOVF)
-	XLAT(FPE_FLTOVF),
+ XLAT(FPE_FLTOVF),
 #endif
 #if defined(FPE_FLTUND) || (defined(HAVE_DECL_FPE_FLTUND) && HAVE_DECL_FPE_FLTUND)
-	XLAT(FPE_FLTUND),
+ XLAT(FPE_FLTUND),
 #endif
 #if defined(FPE_FLTRES) || (defined(HAVE_DECL_FPE_FLTRES) && HAVE_DECL_FPE_FLTRES)
-	XLAT(FPE_FLTRES),
+ XLAT(FPE_FLTRES),
 #endif
 #if defined(FPE_FLTINV) || (defined(HAVE_DECL_FPE_FLTINV) && HAVE_DECL_FPE_FLTINV)
-	XLAT(FPE_FLTINV),
+ XLAT(FPE_FLTINV),
 #endif
 #if defined(FPE_FLTSUB) || (defined(HAVE_DECL_FPE_FLTSUB) && HAVE_DECL_FPE_FLTSUB)
-	XLAT(FPE_FLTSUB),
+ XLAT(FPE_FLTSUB),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sigill_codes.h b/xlat/sigill_codes.h
index ac6445a..d07b430 100644
--- a/xlat/sigill_codes.h
+++ b/xlat/sigill_codes.h
@@ -2,28 +2,28 @@
 
 static const struct xlat sigill_codes[] = {
 #if defined(ILL_ILLOPC) || (defined(HAVE_DECL_ILL_ILLOPC) && HAVE_DECL_ILL_ILLOPC)
-	XLAT(ILL_ILLOPC),
+ XLAT(ILL_ILLOPC),
 #endif
 #if defined(ILL_ILLOPN) || (defined(HAVE_DECL_ILL_ILLOPN) && HAVE_DECL_ILL_ILLOPN)
-	XLAT(ILL_ILLOPN),
+ XLAT(ILL_ILLOPN),
 #endif
 #if defined(ILL_ILLADR) || (defined(HAVE_DECL_ILL_ILLADR) && HAVE_DECL_ILL_ILLADR)
-	XLAT(ILL_ILLADR),
+ XLAT(ILL_ILLADR),
 #endif
 #if defined(ILL_ILLTRP) || (defined(HAVE_DECL_ILL_ILLTRP) && HAVE_DECL_ILL_ILLTRP)
-	XLAT(ILL_ILLTRP),
+ XLAT(ILL_ILLTRP),
 #endif
 #if defined(ILL_PRVOPC) || (defined(HAVE_DECL_ILL_PRVOPC) && HAVE_DECL_ILL_PRVOPC)
-	XLAT(ILL_PRVOPC),
+ XLAT(ILL_PRVOPC),
 #endif
 #if defined(ILL_PRVREG) || (defined(HAVE_DECL_ILL_PRVREG) && HAVE_DECL_ILL_PRVREG)
-	XLAT(ILL_PRVREG),
+ XLAT(ILL_PRVREG),
 #endif
 #if defined(ILL_COPROC) || (defined(HAVE_DECL_ILL_COPROC) && HAVE_DECL_ILL_COPROC)
-	XLAT(ILL_COPROC),
+ XLAT(ILL_COPROC),
 #endif
 #if defined(ILL_BADSTK) || (defined(HAVE_DECL_ILL_BADSTK) && HAVE_DECL_ILL_BADSTK)
-	XLAT(ILL_BADSTK),
+ XLAT(ILL_BADSTK),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/siginfo_codes.h b/xlat/siginfo_codes.h
index e9b4174..c0396e7 100644
--- a/xlat/siginfo_codes.h
+++ b/xlat/siginfo_codes.h
@@ -2,40 +2,40 @@
 
 static const struct xlat siginfo_codes[] = {
 #if defined(SI_KERNEL) || (defined(HAVE_DECL_SI_KERNEL) && HAVE_DECL_SI_KERNEL)
-	XLAT(SI_KERNEL),
+ XLAT(SI_KERNEL),
 #endif
 #if defined(SI_USER) || (defined(HAVE_DECL_SI_USER) && HAVE_DECL_SI_USER)
-	XLAT(SI_USER),
+ XLAT(SI_USER),
 #endif
 #if defined(SI_QUEUE) || (defined(HAVE_DECL_SI_QUEUE) && HAVE_DECL_SI_QUEUE)
-	XLAT(SI_QUEUE),
+ XLAT(SI_QUEUE),
 #endif
 #if defined(SI_TIMER) || (defined(HAVE_DECL_SI_TIMER) && HAVE_DECL_SI_TIMER)
-	XLAT(SI_TIMER),
+ XLAT(SI_TIMER),
 #endif
 #if defined(SI_MESGQ) || (defined(HAVE_DECL_SI_MESGQ) && HAVE_DECL_SI_MESGQ)
-	XLAT(SI_MESGQ),
+ XLAT(SI_MESGQ),
 #endif
 #if defined(SI_ASYNCIO) || (defined(HAVE_DECL_SI_ASYNCIO) && HAVE_DECL_SI_ASYNCIO)
-	XLAT(SI_ASYNCIO),
+ XLAT(SI_ASYNCIO),
 #endif
 #if defined(SI_SIGIO) || (defined(HAVE_DECL_SI_SIGIO) && HAVE_DECL_SI_SIGIO)
-	XLAT(SI_SIGIO),
+ XLAT(SI_SIGIO),
 #endif
 #if defined(SI_TKILL) || (defined(HAVE_DECL_SI_TKILL) && HAVE_DECL_SI_TKILL)
-	XLAT(SI_TKILL),
+ XLAT(SI_TKILL),
 #endif
 #if defined(SI_DETHREAD) || (defined(HAVE_DECL_SI_DETHREAD) && HAVE_DECL_SI_DETHREAD)
-	XLAT(SI_DETHREAD),
+ XLAT(SI_DETHREAD),
 #endif
 #if defined(SI_ASYNCNL) || (defined(HAVE_DECL_SI_ASYNCNL) && HAVE_DECL_SI_ASYNCNL)
-	XLAT(SI_ASYNCNL),
+ XLAT(SI_ASYNCNL),
 #endif
 #if defined(SI_NOINFO) || (defined(HAVE_DECL_SI_NOINFO) && HAVE_DECL_SI_NOINFO)
-	XLAT(SI_NOINFO),
+ XLAT(SI_NOINFO),
 #endif
 #if defined(SI_LWP) || (defined(HAVE_DECL_SI_LWP) && HAVE_DECL_SI_LWP)
-	XLAT(SI_LWP),
+ XLAT(SI_LWP),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sigpoll_codes.h b/xlat/sigpoll_codes.h
index c50a515..c05a165 100644
--- a/xlat/sigpoll_codes.h
+++ b/xlat/sigpoll_codes.h
@@ -2,22 +2,22 @@
 
 static const struct xlat sigpoll_codes[] = {
 #if defined(POLL_IN) || (defined(HAVE_DECL_POLL_IN) && HAVE_DECL_POLL_IN)
-	XLAT(POLL_IN),
+ XLAT(POLL_IN),
 #endif
 #if defined(POLL_OUT) || (defined(HAVE_DECL_POLL_OUT) && HAVE_DECL_POLL_OUT)
-	XLAT(POLL_OUT),
+ XLAT(POLL_OUT),
 #endif
 #if defined(POLL_MSG) || (defined(HAVE_DECL_POLL_MSG) && HAVE_DECL_POLL_MSG)
-	XLAT(POLL_MSG),
+ XLAT(POLL_MSG),
 #endif
 #if defined(POLL_ERR) || (defined(HAVE_DECL_POLL_ERR) && HAVE_DECL_POLL_ERR)
-	XLAT(POLL_ERR),
+ XLAT(POLL_ERR),
 #endif
 #if defined(POLL_PRI) || (defined(HAVE_DECL_POLL_PRI) && HAVE_DECL_POLL_PRI)
-	XLAT(POLL_PRI),
+ XLAT(POLL_PRI),
 #endif
 #if defined(POLL_HUP) || (defined(HAVE_DECL_POLL_HUP) && HAVE_DECL_POLL_HUP)
-	XLAT(POLL_HUP),
+ XLAT(POLL_HUP),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sigprocmaskcmds.h b/xlat/sigprocmaskcmds.h
index 18fc2f6..fc37e5b 100644
--- a/xlat/sigprocmaskcmds.h
+++ b/xlat/sigprocmaskcmds.h
@@ -2,16 +2,16 @@
 
 static const struct xlat sigprocmaskcmds[] = {
 #if defined(SIG_BLOCK) || (defined(HAVE_DECL_SIG_BLOCK) && HAVE_DECL_SIG_BLOCK)
-	XLAT(SIG_BLOCK),
+ XLAT(SIG_BLOCK),
 #endif
 #if defined(SIG_UNBLOCK) || (defined(HAVE_DECL_SIG_UNBLOCK) && HAVE_DECL_SIG_UNBLOCK)
-	XLAT(SIG_UNBLOCK),
+ XLAT(SIG_UNBLOCK),
 #endif
 #if defined(SIG_SETMASK) || (defined(HAVE_DECL_SIG_SETMASK) && HAVE_DECL_SIG_SETMASK)
-	XLAT(SIG_SETMASK),
+ XLAT(SIG_SETMASK),
 #endif
 #if defined(SIG_SETMASK32) || (defined(HAVE_DECL_SIG_SETMASK32) && HAVE_DECL_SIG_SETMASK32)
-	XLAT(SIG_SETMASK32),
+ XLAT(SIG_SETMASK32),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sigprof_codes.h b/xlat/sigprof_codes.h
index 02e98e7..3d08a24 100644
--- a/xlat/sigprof_codes.h
+++ b/xlat/sigprof_codes.h
@@ -2,7 +2,7 @@
 
 static const struct xlat sigprof_codes[] = {
 #if defined(PROF_SIG) || (defined(HAVE_DECL_PROF_SIG) && HAVE_DECL_PROF_SIG)
-	XLAT(PROF_SIG),
+ XLAT(PROF_SIG),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sigsegv_codes.h b/xlat/sigsegv_codes.h
index 3de5370..9659fb1 100644
--- a/xlat/sigsegv_codes.h
+++ b/xlat/sigsegv_codes.h
@@ -2,10 +2,10 @@
 
 static const struct xlat sigsegv_codes[] = {
 #if defined(SEGV_MAPERR) || (defined(HAVE_DECL_SEGV_MAPERR) && HAVE_DECL_SEGV_MAPERR)
-	XLAT(SEGV_MAPERR),
+ XLAT(SEGV_MAPERR),
 #endif
 #if defined(SEGV_ACCERR) || (defined(HAVE_DECL_SEGV_ACCERR) && HAVE_DECL_SEGV_ACCERR)
-	XLAT(SEGV_ACCERR),
+ XLAT(SEGV_ACCERR),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sigsys_codes.h b/xlat/sigsys_codes.h
index a7ef5e2..be0ef9f 100644
--- a/xlat/sigsys_codes.h
+++ b/xlat/sigsys_codes.h
@@ -2,7 +2,7 @@
 
 static const struct xlat sigsys_codes[] = {
 #if defined(SYS_SECCOMP) || (defined(HAVE_DECL_SYS_SECCOMP) && HAVE_DECL_SYS_SECCOMP)
-	XLAT(SYS_SECCOMP),
+ XLAT(SYS_SECCOMP),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sigtrap_codes.h b/xlat/sigtrap_codes.h
index c9101a2..9d7ea0f 100644
--- a/xlat/sigtrap_codes.h
+++ b/xlat/sigtrap_codes.h
@@ -2,10 +2,10 @@
 
 static const struct xlat sigtrap_codes[] = {
 #if defined(TRAP_BRKPT) || (defined(HAVE_DECL_TRAP_BRKPT) && HAVE_DECL_TRAP_BRKPT)
-	XLAT(TRAP_BRKPT),
+ XLAT(TRAP_BRKPT),
 #endif
 #if defined(TRAP_TRACE) || (defined(HAVE_DECL_TRAP_TRACE) && HAVE_DECL_TRAP_TRACE)
-	XLAT(TRAP_TRACE),
+ XLAT(TRAP_TRACE),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sock_type_flags.h b/xlat/sock_type_flags.h
index 45f193a..5f12933 100644
--- a/xlat/sock_type_flags.h
+++ b/xlat/sock_type_flags.h
@@ -2,10 +2,10 @@
 
 static const struct xlat sock_type_flags[] = {
 #if defined(SOCK_CLOEXEC) || (defined(HAVE_DECL_SOCK_CLOEXEC) && HAVE_DECL_SOCK_CLOEXEC)
-	XLAT(SOCK_CLOEXEC),
+ XLAT(SOCK_CLOEXEC),
 #endif
 #if defined(SOCK_NONBLOCK) || (defined(HAVE_DECL_SOCK_NONBLOCK) && HAVE_DECL_SOCK_NONBLOCK)
-	XLAT(SOCK_NONBLOCK),
+ XLAT(SOCK_NONBLOCK),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/socketlayers.h b/xlat/socketlayers.h
index 6abbb92..e614bcc 100644
--- a/xlat/socketlayers.h
+++ b/xlat/socketlayers.h
@@ -2,103 +2,106 @@
 
 static const struct xlat socketlayers[] = {
 #if defined(SOL_IP) || (defined(HAVE_DECL_SOL_IP) && HAVE_DECL_SOL_IP)
-	XLAT(SOL_IP),
-#endif
-#if defined(SOL_ICMP) || (defined(HAVE_DECL_SOL_ICMP) && HAVE_DECL_SOL_ICMP)
-	XLAT(SOL_ICMP),
-#endif
-#if defined(SOL_TCP) || (defined(HAVE_DECL_SOL_TCP) && HAVE_DECL_SOL_TCP)
-	XLAT(SOL_TCP),
-#endif
-#if defined(SOL_UDP) || (defined(HAVE_DECL_SOL_UDP) && HAVE_DECL_SOL_UDP)
-	XLAT(SOL_UDP),
-#endif
-#if defined(SOL_IPV6) || (defined(HAVE_DECL_SOL_IPV6) && HAVE_DECL_SOL_IPV6)
-	XLAT(SOL_IPV6),
-#endif
-#if defined(SOL_ICMPV6) || (defined(HAVE_DECL_SOL_ICMPV6) && HAVE_DECL_SOL_ICMPV6)
-	XLAT(SOL_ICMPV6),
-#endif
-#if defined(SOL_SCTP) || (defined(HAVE_DECL_SOL_SCTP) && HAVE_DECL_SOL_SCTP)
-	XLAT(SOL_SCTP),
-#endif
-#if defined(SOL_UDPLITE) || (defined(HAVE_DECL_SOL_UDPLITE) && HAVE_DECL_SOL_UDPLITE)
-	XLAT(SOL_UDPLITE),
-#endif
-#if defined(SOL_RAW) || (defined(HAVE_DECL_SOL_RAW) && HAVE_DECL_SOL_RAW)
-	XLAT(SOL_RAW),
-#endif
-#if defined(SOL_IPX) || (defined(HAVE_DECL_SOL_IPX) && HAVE_DECL_SOL_IPX)
-	XLAT(SOL_IPX),
-#endif
-#if defined(SOL_AX25) || (defined(HAVE_DECL_SOL_AX25) && HAVE_DECL_SOL_AX25)
-	XLAT(SOL_AX25),
-#endif
-#if defined(SOL_ATALK) || (defined(HAVE_DECL_SOL_ATALK) && HAVE_DECL_SOL_ATALK)
-	XLAT(SOL_ATALK),
-#endif
-#if defined(SOL_NETROM) || (defined(HAVE_DECL_SOL_NETROM) && HAVE_DECL_SOL_NETROM)
-	XLAT(SOL_NETROM),
-#endif
-#if defined(SOL_ROSE) || (defined(HAVE_DECL_SOL_ROSE) && HAVE_DECL_SOL_ROSE)
-	XLAT(SOL_ROSE),
-#endif
-#if defined(SOL_DECNET) || (defined(HAVE_DECL_SOL_DECNET) && HAVE_DECL_SOL_DECNET)
-	XLAT(SOL_DECNET),
-#endif
-#if defined(SOL_X25) || (defined(HAVE_DECL_SOL_X25) && HAVE_DECL_SOL_X25)
-	XLAT(SOL_X25),
-#endif
-#if defined(SOL_PACKET) || (defined(HAVE_DECL_SOL_PACKET) && HAVE_DECL_SOL_PACKET)
-	XLAT(SOL_PACKET),
-#endif
-#if defined(SOL_ATM) || (defined(HAVE_DECL_SOL_ATM) && HAVE_DECL_SOL_ATM)
-	XLAT(SOL_ATM),
-#endif
-#if defined(SOL_AAL) || (defined(HAVE_DECL_SOL_AAL) && HAVE_DECL_SOL_AAL)
-	XLAT(SOL_AAL),
-#endif
-#if defined(SOL_IRDA) || (defined(HAVE_DECL_SOL_IRDA) && HAVE_DECL_SOL_IRDA)
-	XLAT(SOL_IRDA),
-#endif
-#if defined(SOL_NETBEUI) || (defined(HAVE_DECL_SOL_NETBEUI) && HAVE_DECL_SOL_NETBEUI)
-	XLAT(SOL_NETBEUI),
-#endif
-#if defined(SOL_LLC) || (defined(HAVE_DECL_SOL_LLC) && HAVE_DECL_SOL_LLC)
-	XLAT(SOL_LLC),
-#endif
-#if defined(SOL_DCCP) || (defined(HAVE_DECL_SOL_DCCP) && HAVE_DECL_SOL_DCCP)
-	XLAT(SOL_DCCP),
-#endif
-#if defined(SOL_NETLINK) || (defined(HAVE_DECL_SOL_NETLINK) && HAVE_DECL_SOL_NETLINK)
-	XLAT(SOL_NETLINK),
-#endif
-#if defined(SOL_TIPC) || (defined(HAVE_DECL_SOL_TIPC) && HAVE_DECL_SOL_TIPC)
-	XLAT(SOL_TIPC),
-#endif
-#if defined(SOL_RXRPC) || (defined(HAVE_DECL_SOL_RXRPC) && HAVE_DECL_SOL_RXRPC)
-	XLAT(SOL_RXRPC),
-#endif
-#if defined(SOL_PPPOL2TP) || (defined(HAVE_DECL_SOL_PPPOL2TP) && HAVE_DECL_SOL_PPPOL2TP)
-	XLAT(SOL_PPPOL2TP),
-#endif
-#if defined(SOL_BLUETOOTH) || (defined(HAVE_DECL_SOL_BLUETOOTH) && HAVE_DECL_SOL_BLUETOOTH)
-	XLAT(SOL_BLUETOOTH),
-#endif
-#if defined(SOL_PNPIPE) || (defined(HAVE_DECL_SOL_PNPIPE) && HAVE_DECL_SOL_PNPIPE)
-	XLAT(SOL_PNPIPE),
-#endif
-#if defined(SOL_RDS) || (defined(HAVE_DECL_SOL_RDS) && HAVE_DECL_SOL_RDS)
-	XLAT(SOL_RDS),
-#endif
-#if defined(SOL_IUCV) || (defined(HAVE_DECL_SOL_IUCV) && HAVE_DECL_SOL_IUCV)
-	XLAT(SOL_IUCV),
-#endif
-#if defined(SOL_CAIF) || (defined(HAVE_DECL_SOL_CAIF) && HAVE_DECL_SOL_CAIF)
-	XLAT(SOL_CAIF),
+ XLAT(SOL_IP),
 #endif
 #if defined(SOL_SOCKET) || (defined(HAVE_DECL_SOL_SOCKET) && HAVE_DECL_SOL_SOCKET)
-	XLAT(SOL_SOCKET),
+ XLAT(SOL_SOCKET),
 #endif
-  /* this array should remain not NULL-terminated */
+#if defined(SOL_TCP) || (defined(HAVE_DECL_SOL_TCP) && HAVE_DECL_SOL_TCP)
+ XLAT(SOL_TCP),
+#endif
+#if defined(SOL_UDP) || (defined(HAVE_DECL_SOL_UDP) && HAVE_DECL_SOL_UDP)
+ XLAT(SOL_UDP),
+#endif
+#if defined(SOL_IPV6) || (defined(HAVE_DECL_SOL_IPV6) && HAVE_DECL_SOL_IPV6)
+ XLAT(SOL_IPV6),
+#endif
+#if defined(SOL_ICMPV6) || (defined(HAVE_DECL_SOL_ICMPV6) && HAVE_DECL_SOL_ICMPV6)
+ XLAT(SOL_ICMPV6),
+#endif
+#if defined(SOL_SCTP) || (defined(HAVE_DECL_SOL_SCTP) && HAVE_DECL_SOL_SCTP)
+ XLAT(SOL_SCTP),
+#endif
+#if defined(SOL_UDPLITE) || (defined(HAVE_DECL_SOL_UDPLITE) && HAVE_DECL_SOL_UDPLITE)
+ XLAT(SOL_UDPLITE),
+#endif
+#if defined(SOL_RAW) || (defined(HAVE_DECL_SOL_RAW) && HAVE_DECL_SOL_RAW)
+ XLAT(SOL_RAW),
+#endif
+#if defined(SOL_IPX) || (defined(HAVE_DECL_SOL_IPX) && HAVE_DECL_SOL_IPX)
+ XLAT(SOL_IPX),
+#endif
+#if defined(SOL_AX25) || (defined(HAVE_DECL_SOL_AX25) && HAVE_DECL_SOL_AX25)
+ XLAT(SOL_AX25),
+#endif
+#if defined(SOL_ATALK) || (defined(HAVE_DECL_SOL_ATALK) && HAVE_DECL_SOL_ATALK)
+ XLAT(SOL_ATALK),
+#endif
+#if defined(SOL_NETROM) || (defined(HAVE_DECL_SOL_NETROM) && HAVE_DECL_SOL_NETROM)
+ XLAT(SOL_NETROM),
+#endif
+#if defined(SOL_ROSE) || (defined(HAVE_DECL_SOL_ROSE) && HAVE_DECL_SOL_ROSE)
+ XLAT(SOL_ROSE),
+#endif
+#if defined(SOL_DECNET) || (defined(HAVE_DECL_SOL_DECNET) && HAVE_DECL_SOL_DECNET)
+ XLAT(SOL_DECNET),
+#endif
+#if defined(SOL_X25) || (defined(HAVE_DECL_SOL_X25) && HAVE_DECL_SOL_X25)
+ XLAT(SOL_X25),
+#endif
+#if defined(SOL_PACKET) || (defined(HAVE_DECL_SOL_PACKET) && HAVE_DECL_SOL_PACKET)
+ XLAT(SOL_PACKET),
+#endif
+#if defined(SOL_ATM) || (defined(HAVE_DECL_SOL_ATM) && HAVE_DECL_SOL_ATM)
+ XLAT(SOL_ATM),
+#endif
+#if defined(SOL_AAL) || (defined(HAVE_DECL_SOL_AAL) && HAVE_DECL_SOL_AAL)
+ XLAT(SOL_AAL),
+#endif
+#if defined(SOL_IRDA) || (defined(HAVE_DECL_SOL_IRDA) && HAVE_DECL_SOL_IRDA)
+ XLAT(SOL_IRDA),
+#endif
+#if defined(SOL_NETBEUI) || (defined(HAVE_DECL_SOL_NETBEUI) && HAVE_DECL_SOL_NETBEUI)
+ XLAT(SOL_NETBEUI),
+#endif
+#if defined(SOL_LLC) || (defined(HAVE_DECL_SOL_LLC) && HAVE_DECL_SOL_LLC)
+ XLAT(SOL_LLC),
+#endif
+#if defined(SOL_DCCP) || (defined(HAVE_DECL_SOL_DCCP) && HAVE_DECL_SOL_DCCP)
+ XLAT(SOL_DCCP),
+#endif
+#if defined(SOL_NETLINK) || (defined(HAVE_DECL_SOL_NETLINK) && HAVE_DECL_SOL_NETLINK)
+ XLAT(SOL_NETLINK),
+#endif
+#if defined(SOL_TIPC) || (defined(HAVE_DECL_SOL_TIPC) && HAVE_DECL_SOL_TIPC)
+ XLAT(SOL_TIPC),
+#endif
+#if defined(SOL_RXRPC) || (defined(HAVE_DECL_SOL_RXRPC) && HAVE_DECL_SOL_RXRPC)
+ XLAT(SOL_RXRPC),
+#endif
+#if defined(SOL_PPPOL2TP) || (defined(HAVE_DECL_SOL_PPPOL2TP) && HAVE_DECL_SOL_PPPOL2TP)
+ XLAT(SOL_PPPOL2TP),
+#endif
+#if defined(SOL_BLUETOOTH) || (defined(HAVE_DECL_SOL_BLUETOOTH) && HAVE_DECL_SOL_BLUETOOTH)
+ XLAT(SOL_BLUETOOTH),
+#endif
+#if defined(SOL_PNPIPE) || (defined(HAVE_DECL_SOL_PNPIPE) && HAVE_DECL_SOL_PNPIPE)
+ XLAT(SOL_PNPIPE),
+#endif
+#if defined(SOL_RDS) || (defined(HAVE_DECL_SOL_RDS) && HAVE_DECL_SOL_RDS)
+ XLAT(SOL_RDS),
+#endif
+#if defined(SOL_IUCV) || (defined(HAVE_DECL_SOL_IUCV) && HAVE_DECL_SOL_IUCV)
+ XLAT(SOL_IUCV),
+#endif
+#if defined(SOL_CAIF) || (defined(HAVE_DECL_SOL_CAIF) && HAVE_DECL_SOL_CAIF)
+ XLAT(SOL_CAIF),
+#endif
+#if defined(SOL_ALG) || (defined(HAVE_DECL_SOL_ALG) && HAVE_DECL_SOL_ALG)
+ XLAT(SOL_ALG),
+#endif
+#if defined(SOL_NFC) || (defined(HAVE_DECL_SOL_NFC) && HAVE_DECL_SOL_NFC)
+ XLAT(SOL_NFC),
+#endif
+ XLAT_END
 };
diff --git a/xlat/sockipoptions.h b/xlat/sockipoptions.h
index ca044e0..6956491 100644
--- a/xlat/sockipoptions.h
+++ b/xlat/sockipoptions.h
@@ -2,145 +2,145 @@
 
 static const struct xlat sockipoptions[] = {
 #if defined(IP_TOS) || (defined(HAVE_DECL_IP_TOS) && HAVE_DECL_IP_TOS)
-	XLAT(IP_TOS),
+ XLAT(IP_TOS),
 #endif
 #if defined(IP_TTL) || (defined(HAVE_DECL_IP_TTL) && HAVE_DECL_IP_TTL)
-	XLAT(IP_TTL),
+ XLAT(IP_TTL),
 #endif
 #if defined(IP_HDRINCL) || (defined(HAVE_DECL_IP_HDRINCL) && HAVE_DECL_IP_HDRINCL)
-	XLAT(IP_HDRINCL),
+ XLAT(IP_HDRINCL),
 #endif
 #if defined(IP_OPTIONS) || (defined(HAVE_DECL_IP_OPTIONS) && HAVE_DECL_IP_OPTIONS)
-	XLAT(IP_OPTIONS),
+ XLAT(IP_OPTIONS),
 #endif
 #if defined(IP_ROUTER_ALERT) || (defined(HAVE_DECL_IP_ROUTER_ALERT) && HAVE_DECL_IP_ROUTER_ALERT)
-	XLAT(IP_ROUTER_ALERT),
+ XLAT(IP_ROUTER_ALERT),
 #endif
 #if defined(IP_RECVOPTIONS) || (defined(HAVE_DECL_IP_RECVOPTIONS) && HAVE_DECL_IP_RECVOPTIONS)
-	XLAT(IP_RECVOPTIONS),
+ XLAT(IP_RECVOPTIONS),
 #endif
 #if defined(IP_RECVOPTS) || (defined(HAVE_DECL_IP_RECVOPTS) && HAVE_DECL_IP_RECVOPTS)
-	XLAT(IP_RECVOPTS),
+ XLAT(IP_RECVOPTS),
 #endif
 #if defined(IP_RECVRETOPTS) || (defined(HAVE_DECL_IP_RECVRETOPTS) && HAVE_DECL_IP_RECVRETOPTS)
-	XLAT(IP_RECVRETOPTS),
+ XLAT(IP_RECVRETOPTS),
 #endif
 #if defined(IP_RECVDSTADDR) || (defined(HAVE_DECL_IP_RECVDSTADDR) && HAVE_DECL_IP_RECVDSTADDR)
-	XLAT(IP_RECVDSTADDR),
+ XLAT(IP_RECVDSTADDR),
 #endif
 #if defined(IP_RETOPTS) || (defined(HAVE_DECL_IP_RETOPTS) && HAVE_DECL_IP_RETOPTS)
-	XLAT(IP_RETOPTS),
+ XLAT(IP_RETOPTS),
 #endif
 #if defined(IP_PKTINFO) || (defined(HAVE_DECL_IP_PKTINFO) && HAVE_DECL_IP_PKTINFO)
-	XLAT(IP_PKTINFO),
+ XLAT(IP_PKTINFO),
 #endif
 #if defined(IP_PKTOPTIONS) || (defined(HAVE_DECL_IP_PKTOPTIONS) && HAVE_DECL_IP_PKTOPTIONS)
-	XLAT(IP_PKTOPTIONS),
+ XLAT(IP_PKTOPTIONS),
 #endif
 #if defined(IP_MTU_DISCOVER) || (defined(HAVE_DECL_IP_MTU_DISCOVER) && HAVE_DECL_IP_MTU_DISCOVER)
-	XLAT(IP_MTU_DISCOVER),
+ XLAT(IP_MTU_DISCOVER),
 #endif
 #if defined(IP_RECVERR) || (defined(HAVE_DECL_IP_RECVERR) && HAVE_DECL_IP_RECVERR)
-	XLAT(IP_RECVERR),
+ XLAT(IP_RECVERR),
 #endif
 #if defined(IP_RECVTTL) || (defined(HAVE_DECL_IP_RECVTTL) && HAVE_DECL_IP_RECVTTL)
-	XLAT(IP_RECVTTL),
+ XLAT(IP_RECVTTL),
 #endif
 #if defined(IP_RECVTOS) || (defined(HAVE_DECL_IP_RECVTOS) && HAVE_DECL_IP_RECVTOS)
-	XLAT(IP_RECVTOS),
+ XLAT(IP_RECVTOS),
 #endif
 #if defined(IP_MTU) || (defined(HAVE_DECL_IP_MTU) && HAVE_DECL_IP_MTU)
-	XLAT(IP_MTU),
+ XLAT(IP_MTU),
 #endif
 #if defined(IP_MULTICAST_IF) || (defined(HAVE_DECL_IP_MULTICAST_IF) && HAVE_DECL_IP_MULTICAST_IF)
-	XLAT(IP_MULTICAST_IF),
+ XLAT(IP_MULTICAST_IF),
 #endif
 #if defined(IP_MULTICAST_TTL) || (defined(HAVE_DECL_IP_MULTICAST_TTL) && HAVE_DECL_IP_MULTICAST_TTL)
-	XLAT(IP_MULTICAST_TTL),
+ XLAT(IP_MULTICAST_TTL),
 #endif
 #if defined(IP_MULTICAST_LOOP) || (defined(HAVE_DECL_IP_MULTICAST_LOOP) && HAVE_DECL_IP_MULTICAST_LOOP)
-	XLAT(IP_MULTICAST_LOOP),
+ XLAT(IP_MULTICAST_LOOP),
 #endif
 #if defined(IP_ADD_MEMBERSHIP) || (defined(HAVE_DECL_IP_ADD_MEMBERSHIP) && HAVE_DECL_IP_ADD_MEMBERSHIP)
-	XLAT(IP_ADD_MEMBERSHIP),
+ XLAT(IP_ADD_MEMBERSHIP),
 #endif
 #if defined(IP_DROP_MEMBERSHIP) || (defined(HAVE_DECL_IP_DROP_MEMBERSHIP) && HAVE_DECL_IP_DROP_MEMBERSHIP)
-	XLAT(IP_DROP_MEMBERSHIP),
+ XLAT(IP_DROP_MEMBERSHIP),
 #endif
 #if defined(IP_BROADCAST_IF) || (defined(HAVE_DECL_IP_BROADCAST_IF) && HAVE_DECL_IP_BROADCAST_IF)
-	XLAT(IP_BROADCAST_IF),
+ XLAT(IP_BROADCAST_IF),
 #endif
 #if defined(IP_RECVIFINDEX) || (defined(HAVE_DECL_IP_RECVIFINDEX) && HAVE_DECL_IP_RECVIFINDEX)
-	XLAT(IP_RECVIFINDEX),
+ XLAT(IP_RECVIFINDEX),
 #endif
 #if defined(IP_MSFILTER) || (defined(HAVE_DECL_IP_MSFILTER) && HAVE_DECL_IP_MSFILTER)
-	XLAT(IP_MSFILTER),
+ XLAT(IP_MSFILTER),
 #endif
 #if defined(MCAST_MSFILTER) || (defined(HAVE_DECL_MCAST_MSFILTER) && HAVE_DECL_MCAST_MSFILTER)
-	XLAT(MCAST_MSFILTER),
+ XLAT(MCAST_MSFILTER),
 #endif
 #if defined(IP_FREEBIND) || (defined(HAVE_DECL_IP_FREEBIND) && HAVE_DECL_IP_FREEBIND)
-	XLAT(IP_FREEBIND),
+ XLAT(IP_FREEBIND),
 #endif
 #if defined(IP_IPSEC_POLICY) || (defined(HAVE_DECL_IP_IPSEC_POLICY) && HAVE_DECL_IP_IPSEC_POLICY)
-	XLAT(IP_IPSEC_POLICY),
+ XLAT(IP_IPSEC_POLICY),
 #endif
 #if defined(IP_XFRM_POLICY) || (defined(HAVE_DECL_IP_XFRM_POLICY) && HAVE_DECL_IP_XFRM_POLICY)
-	XLAT(IP_XFRM_POLICY),
+ XLAT(IP_XFRM_POLICY),
 #endif
 #if defined(IP_PASSSEC) || (defined(HAVE_DECL_IP_PASSSEC) && HAVE_DECL_IP_PASSSEC)
-	XLAT(IP_PASSSEC),
+ XLAT(IP_PASSSEC),
 #endif
 #if defined(IP_TRANSPARENT) || (defined(HAVE_DECL_IP_TRANSPARENT) && HAVE_DECL_IP_TRANSPARENT)
-	XLAT(IP_TRANSPARENT),
+ XLAT(IP_TRANSPARENT),
 #endif
 #if defined(IP_ORIGDSTADDR) || (defined(HAVE_DECL_IP_ORIGDSTADDR) && HAVE_DECL_IP_ORIGDSTADDR)
-	XLAT(IP_ORIGDSTADDR),
+ XLAT(IP_ORIGDSTADDR),
 #endif
 #if defined(IP_RECVORIGDSTADDR) || (defined(HAVE_DECL_IP_RECVORIGDSTADDR) && HAVE_DECL_IP_RECVORIGDSTADDR)
-	XLAT(IP_RECVORIGDSTADDR),
+ XLAT(IP_RECVORIGDSTADDR),
 #endif
 #if defined(IP_MINTTL) || (defined(HAVE_DECL_IP_MINTTL) && HAVE_DECL_IP_MINTTL)
-	XLAT(IP_MINTTL),
+ XLAT(IP_MINTTL),
 #endif
 #if defined(IP_NODEFRAG) || (defined(HAVE_DECL_IP_NODEFRAG) && HAVE_DECL_IP_NODEFRAG)
-	XLAT(IP_NODEFRAG),
+ XLAT(IP_NODEFRAG),
 #endif
 #if defined(IP_UNBLOCK_SOURCE) || (defined(HAVE_DECL_IP_UNBLOCK_SOURCE) && HAVE_DECL_IP_UNBLOCK_SOURCE)
-	XLAT(IP_UNBLOCK_SOURCE),
+ XLAT(IP_UNBLOCK_SOURCE),
 #endif
 #if defined(IP_BLOCK_SOURCE) || (defined(HAVE_DECL_IP_BLOCK_SOURCE) && HAVE_DECL_IP_BLOCK_SOURCE)
-	XLAT(IP_BLOCK_SOURCE),
+ XLAT(IP_BLOCK_SOURCE),
 #endif
 #if defined(IP_ADD_SOURCE_MEMBERSHIP) || (defined(HAVE_DECL_IP_ADD_SOURCE_MEMBERSHIP) && HAVE_DECL_IP_ADD_SOURCE_MEMBERSHIP)
-	XLAT(IP_ADD_SOURCE_MEMBERSHIP),
+ XLAT(IP_ADD_SOURCE_MEMBERSHIP),
 #endif
 #if defined(IP_DROP_SOURCE_MEMBERSHIP) || (defined(HAVE_DECL_IP_DROP_SOURCE_MEMBERSHIP) && HAVE_DECL_IP_DROP_SOURCE_MEMBERSHIP)
-	XLAT(IP_DROP_SOURCE_MEMBERSHIP),
+ XLAT(IP_DROP_SOURCE_MEMBERSHIP),
 #endif
 #if defined(MCAST_JOIN_GROUP) || (defined(HAVE_DECL_MCAST_JOIN_GROUP) && HAVE_DECL_MCAST_JOIN_GROUP)
-	XLAT(MCAST_JOIN_GROUP),
+ XLAT(MCAST_JOIN_GROUP),
 #endif
 #if defined(MCAST_BLOCK_SOURCE) || (defined(HAVE_DECL_MCAST_BLOCK_SOURCE) && HAVE_DECL_MCAST_BLOCK_SOURCE)
-	XLAT(MCAST_BLOCK_SOURCE),
+ XLAT(MCAST_BLOCK_SOURCE),
 #endif
 #if defined(MCAST_UNBLOCK_SOURCE) || (defined(HAVE_DECL_MCAST_UNBLOCK_SOURCE) && HAVE_DECL_MCAST_UNBLOCK_SOURCE)
-	XLAT(MCAST_UNBLOCK_SOURCE),
+ XLAT(MCAST_UNBLOCK_SOURCE),
 #endif
 #if defined(MCAST_LEAVE_GROUP) || (defined(HAVE_DECL_MCAST_LEAVE_GROUP) && HAVE_DECL_MCAST_LEAVE_GROUP)
-	XLAT(MCAST_LEAVE_GROUP),
+ XLAT(MCAST_LEAVE_GROUP),
 #endif
 #if defined(MCAST_JOIN_SOURCE_GROUP) || (defined(HAVE_DECL_MCAST_JOIN_SOURCE_GROUP) && HAVE_DECL_MCAST_JOIN_SOURCE_GROUP)
-	XLAT(MCAST_JOIN_SOURCE_GROUP),
+ XLAT(MCAST_JOIN_SOURCE_GROUP),
 #endif
 #if defined(MCAST_LEAVE_SOURCE_GROUP) || (defined(HAVE_DECL_MCAST_LEAVE_SOURCE_GROUP) && HAVE_DECL_MCAST_LEAVE_SOURCE_GROUP)
-	XLAT(MCAST_LEAVE_SOURCE_GROUP),
+ XLAT(MCAST_LEAVE_SOURCE_GROUP),
 #endif
 #if defined(IP_MULTICAST_ALL) || (defined(HAVE_DECL_IP_MULTICAST_ALL) && HAVE_DECL_IP_MULTICAST_ALL)
-	XLAT(IP_MULTICAST_ALL),
+ XLAT(IP_MULTICAST_ALL),
 #endif
 #if defined(IP_UNICAST_IF) || (defined(HAVE_DECL_IP_UNICAST_IF) && HAVE_DECL_IP_UNICAST_IF)
-	XLAT(IP_UNICAST_IF),
+ XLAT(IP_UNICAST_IF),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sockipv6options.h b/xlat/sockipv6options.h
index 40af8a9..c3930e8 100644
--- a/xlat/sockipv6options.h
+++ b/xlat/sockipv6options.h
@@ -2,67 +2,67 @@
 
 static const struct xlat sockipv6options[] = {
 #if defined(IPV6_ADDRFORM) || (defined(HAVE_DECL_IPV6_ADDRFORM) && HAVE_DECL_IPV6_ADDRFORM)
-	XLAT(IPV6_ADDRFORM),
+ XLAT(IPV6_ADDRFORM),
 #endif
 #if defined(MCAST_FILTER) || (defined(HAVE_DECL_MCAST_FILTER) && HAVE_DECL_MCAST_FILTER)
-	XLAT(MCAST_FILTER),
+ XLAT(MCAST_FILTER),
 #endif
 #if defined(IPV6_PKTOPTIONS) || (defined(HAVE_DECL_IPV6_PKTOPTIONS) && HAVE_DECL_IPV6_PKTOPTIONS)
-	XLAT(IPV6_PKTOPTIONS),
+ XLAT(IPV6_PKTOPTIONS),
 #endif
 #if defined(IPV6_MTU) || (defined(HAVE_DECL_IPV6_MTU) && HAVE_DECL_IPV6_MTU)
-	XLAT(IPV6_MTU),
+ XLAT(IPV6_MTU),
 #endif
 #if defined(IPV6_V6ONLY) || (defined(HAVE_DECL_IPV6_V6ONLY) && HAVE_DECL_IPV6_V6ONLY)
-	XLAT(IPV6_V6ONLY),
+ XLAT(IPV6_V6ONLY),
 #endif
 #if defined(IPV6_PKTINFO) || (defined(HAVE_DECL_IPV6_PKTINFO) && HAVE_DECL_IPV6_PKTINFO)
-	XLAT(IPV6_PKTINFO),
+ XLAT(IPV6_PKTINFO),
 #endif
 #if defined(IPV6_HOPLIMIT) || (defined(HAVE_DECL_IPV6_HOPLIMIT) && HAVE_DECL_IPV6_HOPLIMIT)
-	XLAT(IPV6_HOPLIMIT),
+ XLAT(IPV6_HOPLIMIT),
 #endif
 #if defined(IPV6_RTHDR) || (defined(HAVE_DECL_IPV6_RTHDR) && HAVE_DECL_IPV6_RTHDR)
-	XLAT(IPV6_RTHDR),
+ XLAT(IPV6_RTHDR),
 #endif
 #if defined(IPV6_HOPOPTS) || (defined(HAVE_DECL_IPV6_HOPOPTS) && HAVE_DECL_IPV6_HOPOPTS)
-	XLAT(IPV6_HOPOPTS),
+ XLAT(IPV6_HOPOPTS),
 #endif
 #if defined(IPV6_DSTOPTS) || (defined(HAVE_DECL_IPV6_DSTOPTS) && HAVE_DECL_IPV6_DSTOPTS)
-	XLAT(IPV6_DSTOPTS),
+ XLAT(IPV6_DSTOPTS),
 #endif
 #if defined(IPV6_FLOWINFO) || (defined(HAVE_DECL_IPV6_FLOWINFO) && HAVE_DECL_IPV6_FLOWINFO)
-	XLAT(IPV6_FLOWINFO),
+ XLAT(IPV6_FLOWINFO),
 #endif
 #if defined(IPV6_UNICAST_HOPS) || (defined(HAVE_DECL_IPV6_UNICAST_HOPS) && HAVE_DECL_IPV6_UNICAST_HOPS)
-	XLAT(IPV6_UNICAST_HOPS),
+ XLAT(IPV6_UNICAST_HOPS),
 #endif
 #if defined(IPV6_MULTICAST_HOPS) || (defined(HAVE_DECL_IPV6_MULTICAST_HOPS) && HAVE_DECL_IPV6_MULTICAST_HOPS)
-	XLAT(IPV6_MULTICAST_HOPS),
+ XLAT(IPV6_MULTICAST_HOPS),
 #endif
 #if defined(IPV6_MULTICAST_LOOP) || (defined(HAVE_DECL_IPV6_MULTICAST_LOOP) && HAVE_DECL_IPV6_MULTICAST_LOOP)
-	XLAT(IPV6_MULTICAST_LOOP),
+ XLAT(IPV6_MULTICAST_LOOP),
 #endif
 #if defined(IPV6_MULTICAST_IF) || (defined(HAVE_DECL_IPV6_MULTICAST_IF) && HAVE_DECL_IPV6_MULTICAST_IF)
-	XLAT(IPV6_MULTICAST_IF),
+ XLAT(IPV6_MULTICAST_IF),
 #endif
 #if defined(IPV6_MTU_DISCOVER) || (defined(HAVE_DECL_IPV6_MTU_DISCOVER) && HAVE_DECL_IPV6_MTU_DISCOVER)
-	XLAT(IPV6_MTU_DISCOVER),
+ XLAT(IPV6_MTU_DISCOVER),
 #endif
 #if defined(IPV6_RECVERR) || (defined(HAVE_DECL_IPV6_RECVERR) && HAVE_DECL_IPV6_RECVERR)
-	XLAT(IPV6_RECVERR),
+ XLAT(IPV6_RECVERR),
 #endif
 #if defined(IPV6_FLOWINFO_SEND) || (defined(HAVE_DECL_IPV6_FLOWINFO_SEND) && HAVE_DECL_IPV6_FLOWINFO_SEND)
-	XLAT(IPV6_FLOWINFO_SEND),
+ XLAT(IPV6_FLOWINFO_SEND),
 #endif
 #if defined(IPV6_ADD_MEMBERSHIP) || (defined(HAVE_DECL_IPV6_ADD_MEMBERSHIP) && HAVE_DECL_IPV6_ADD_MEMBERSHIP)
-	XLAT(IPV6_ADD_MEMBERSHIP),
+ XLAT(IPV6_ADD_MEMBERSHIP),
 #endif
 #if defined(IPV6_DROP_MEMBERSHIP) || (defined(HAVE_DECL_IPV6_DROP_MEMBERSHIP) && HAVE_DECL_IPV6_DROP_MEMBERSHIP)
-	XLAT(IPV6_DROP_MEMBERSHIP),
+ XLAT(IPV6_DROP_MEMBERSHIP),
 #endif
 #if defined(IPV6_ROUTER_ALERT) || (defined(HAVE_DECL_IPV6_ROUTER_ALERT) && HAVE_DECL_IPV6_ROUTER_ALERT)
-	XLAT(IPV6_ROUTER_ALERT),
+ XLAT(IPV6_ROUTER_ALERT),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sockipxoptions.h b/xlat/sockipxoptions.h
index 6c47170..1d98947 100644
--- a/xlat/sockipxoptions.h
+++ b/xlat/sockipxoptions.h
@@ -2,7 +2,7 @@
 
 static const struct xlat sockipxoptions[] = {
 #if defined(IPX_TYPE) || (defined(HAVE_DECL_IPX_TYPE) && HAVE_DECL_IPX_TYPE)
-	XLAT(IPX_TYPE),
+ XLAT(IPX_TYPE),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sockoptions.h b/xlat/sockoptions.h
index 2ac9d71..75eaea3 100644
--- a/xlat/sockoptions.h
+++ b/xlat/sockoptions.h
@@ -2,130 +2,157 @@
 
 static const struct xlat sockoptions[] = {
 #if defined(SO_ACCEPTCONN) || (defined(HAVE_DECL_SO_ACCEPTCONN) && HAVE_DECL_SO_ACCEPTCONN)
-	XLAT(SO_ACCEPTCONN),
+ XLAT(SO_ACCEPTCONN),
 #endif
 #if defined(SO_ALLRAW) || (defined(HAVE_DECL_SO_ALLRAW) && HAVE_DECL_SO_ALLRAW)
-	XLAT(SO_ALLRAW),
+ XLAT(SO_ALLRAW),
 #endif
 #if defined(SO_ATTACH_FILTER) || (defined(HAVE_DECL_SO_ATTACH_FILTER) && HAVE_DECL_SO_ATTACH_FILTER)
-	XLAT(SO_ATTACH_FILTER),
+ XLAT(SO_ATTACH_FILTER),
 #endif
 #if defined(SO_BINDTODEVICE) || (defined(HAVE_DECL_SO_BINDTODEVICE) && HAVE_DECL_SO_BINDTODEVICE)
-	XLAT(SO_BINDTODEVICE),
+ XLAT(SO_BINDTODEVICE),
 #endif
 #if defined(SO_BROADCAST) || (defined(HAVE_DECL_SO_BROADCAST) && HAVE_DECL_SO_BROADCAST)
-	XLAT(SO_BROADCAST),
+ XLAT(SO_BROADCAST),
 #endif
 #if defined(SO_BSDCOMPAT) || (defined(HAVE_DECL_SO_BSDCOMPAT) && HAVE_DECL_SO_BSDCOMPAT)
-	XLAT(SO_BSDCOMPAT),
+ XLAT(SO_BSDCOMPAT),
 #endif
 #if defined(SO_DEBUG) || (defined(HAVE_DECL_SO_DEBUG) && HAVE_DECL_SO_DEBUG)
-	XLAT(SO_DEBUG),
+ XLAT(SO_DEBUG),
 #endif
 #if defined(SO_DETACH_FILTER) || (defined(HAVE_DECL_SO_DETACH_FILTER) && HAVE_DECL_SO_DETACH_FILTER)
-	XLAT(SO_DETACH_FILTER),
+ XLAT(SO_DETACH_FILTER),
+#endif
+#if defined(SO_DOMAIN) || (defined(HAVE_DECL_SO_DOMAIN) && HAVE_DECL_SO_DOMAIN)
+ XLAT(SO_DOMAIN),
 #endif
 #if defined(SO_DONTROUTE) || (defined(HAVE_DECL_SO_DONTROUTE) && HAVE_DECL_SO_DONTROUTE)
-	XLAT(SO_DONTROUTE),
+ XLAT(SO_DONTROUTE),
 #endif
 #if defined(SO_ERROR) || (defined(HAVE_DECL_SO_ERROR) && HAVE_DECL_SO_ERROR)
-	XLAT(SO_ERROR),
+ XLAT(SO_ERROR),
 #endif
 #if defined(SO_ICS) || (defined(HAVE_DECL_SO_ICS) && HAVE_DECL_SO_ICS)
-	XLAT(SO_ICS),
+ XLAT(SO_ICS),
 #endif
 #if defined(SO_IMASOCKET) || (defined(HAVE_DECL_SO_IMASOCKET) && HAVE_DECL_SO_IMASOCKET)
-	XLAT(SO_IMASOCKET),
+ XLAT(SO_IMASOCKET),
 #endif
 #if defined(SO_KEEPALIVE) || (defined(HAVE_DECL_SO_KEEPALIVE) && HAVE_DECL_SO_KEEPALIVE)
-	XLAT(SO_KEEPALIVE),
+ XLAT(SO_KEEPALIVE),
 #endif
 #if defined(SO_LINGER) || (defined(HAVE_DECL_SO_LINGER) && HAVE_DECL_SO_LINGER)
-	XLAT(SO_LINGER),
+ XLAT(SO_LINGER),
 #endif
 #if defined(SO_LISTENING) || (defined(HAVE_DECL_SO_LISTENING) && HAVE_DECL_SO_LISTENING)
-	XLAT(SO_LISTENING),
+ XLAT(SO_LISTENING),
+#endif
+#if defined(SO_MARK) || (defined(HAVE_DECL_SO_MARK) && HAVE_DECL_SO_MARK)
+ XLAT(SO_MARK),
 #endif
 #if defined(SO_MGMT) || (defined(HAVE_DECL_SO_MGMT) && HAVE_DECL_SO_MGMT)
-	XLAT(SO_MGMT),
+ XLAT(SO_MGMT),
+#endif
+#if defined(SO_NOFCS) || (defined(HAVE_DECL_SO_NOFCS) && HAVE_DECL_SO_NOFCS)
+ XLAT(SO_NOFCS),
 #endif
 #if defined(SO_NO_CHECK) || (defined(HAVE_DECL_SO_NO_CHECK) && HAVE_DECL_SO_NO_CHECK)
-	XLAT(SO_NO_CHECK),
+ XLAT(SO_NO_CHECK),
 #endif
 #if defined(SO_OOBINLINE) || (defined(HAVE_DECL_SO_OOBINLINE) && HAVE_DECL_SO_OOBINLINE)
-	XLAT(SO_OOBINLINE),
+ XLAT(SO_OOBINLINE),
 #endif
 #if defined(SO_ORDREL) || (defined(HAVE_DECL_SO_ORDREL) && HAVE_DECL_SO_ORDREL)
-	XLAT(SO_ORDREL),
+ XLAT(SO_ORDREL),
 #endif
 #if defined(SO_PARALLELSVR) || (defined(HAVE_DECL_SO_PARALLELSVR) && HAVE_DECL_SO_PARALLELSVR)
-	XLAT(SO_PARALLELSVR),
+ XLAT(SO_PARALLELSVR),
 #endif
 #if defined(SO_PASSCRED) || (defined(HAVE_DECL_SO_PASSCRED) && HAVE_DECL_SO_PASSCRED)
-	XLAT(SO_PASSCRED),
+ XLAT(SO_PASSCRED),
+#endif
+#if defined(SO_PASSSEC) || (defined(HAVE_DECL_SO_PASSSEC) && HAVE_DECL_SO_PASSSEC)
+ XLAT(SO_PASSSEC),
 #endif
 #if defined(SO_PEERCRED) || (defined(HAVE_DECL_SO_PEERCRED) && HAVE_DECL_SO_PEERCRED)
-	XLAT(SO_PEERCRED),
+ XLAT(SO_PEERCRED),
 #endif
 #if defined(SO_PEERNAME) || (defined(HAVE_DECL_SO_PEERNAME) && HAVE_DECL_SO_PEERNAME)
-	XLAT(SO_PEERNAME),
+ XLAT(SO_PEERNAME),
 #endif
 #if defined(SO_PEERSEC) || (defined(HAVE_DECL_SO_PEERSEC) && HAVE_DECL_SO_PEERSEC)
-	XLAT(SO_PEERSEC),
+ XLAT(SO_PEERSEC),
 #endif
 #if defined(SO_PRIORITY) || (defined(HAVE_DECL_SO_PRIORITY) && HAVE_DECL_SO_PRIORITY)
-	XLAT(SO_PRIORITY),
+ XLAT(SO_PRIORITY),
+#endif
+#if defined(SO_PROTOCOL) || (defined(HAVE_DECL_SO_PROTOCOL) && HAVE_DECL_SO_PROTOCOL)
+ XLAT(SO_PROTOCOL),
 #endif
 #if defined(SO_PROTOTYPE) || (defined(HAVE_DECL_SO_PROTOTYPE) && HAVE_DECL_SO_PROTOTYPE)
-	XLAT(SO_PROTOTYPE),
+ XLAT(SO_PROTOTYPE),
 #endif
 #if defined(SO_RCVBUF) || (defined(HAVE_DECL_SO_RCVBUF) && HAVE_DECL_SO_RCVBUF)
-	XLAT(SO_RCVBUF),
+ XLAT(SO_RCVBUF),
+#endif
+#if defined(SO_RCVBUFFORCE) || (defined(HAVE_DECL_SO_RCVBUFFORCE) && HAVE_DECL_SO_RCVBUFFORCE)
+ XLAT(SO_RCVBUFFORCE),
 #endif
 #if defined(SO_RCVLOWAT) || (defined(HAVE_DECL_SO_RCVLOWAT) && HAVE_DECL_SO_RCVLOWAT)
-	XLAT(SO_RCVLOWAT),
+ XLAT(SO_RCVLOWAT),
 #endif
 #if defined(SO_RCVTIMEO) || (defined(HAVE_DECL_SO_RCVTIMEO) && HAVE_DECL_SO_RCVTIMEO)
-	XLAT(SO_RCVTIMEO),
+ XLAT(SO_RCVTIMEO),
 #endif
 #if defined(SO_RDWR) || (defined(HAVE_DECL_SO_RDWR) && HAVE_DECL_SO_RDWR)
-	XLAT(SO_RDWR),
+ XLAT(SO_RDWR),
 #endif
 #if defined(SO_REUSEADDR) || (defined(HAVE_DECL_SO_REUSEADDR) && HAVE_DECL_SO_REUSEADDR)
-	XLAT(SO_REUSEADDR),
+ XLAT(SO_REUSEADDR),
 #endif
 #if defined(SO_REUSEPORT) || (defined(HAVE_DECL_SO_REUSEPORT) && HAVE_DECL_SO_REUSEPORT)
-	XLAT(SO_REUSEPORT),
+ XLAT(SO_REUSEPORT),
 #endif
 #if defined(SO_SECURITY_AUTHENTICATION) || (defined(HAVE_DECL_SO_SECURITY_AUTHENTICATION) && HAVE_DECL_SO_SECURITY_AUTHENTICATION)
-	XLAT(SO_SECURITY_AUTHENTICATION),
+ XLAT(SO_SECURITY_AUTHENTICATION),
 #endif
 #if defined(SO_SECURITY_ENCRYPTION_NETWORK) || (defined(HAVE_DECL_SO_SECURITY_ENCRYPTION_NETWORK) && HAVE_DECL_SO_SECURITY_ENCRYPTION_NETWORK)
-	XLAT(SO_SECURITY_ENCRYPTION_NETWORK),
+ XLAT(SO_SECURITY_ENCRYPTION_NETWORK),
 #endif
 #if defined(SO_SECURITY_ENCRYPTION_TRANSPORT) || (defined(HAVE_DECL_SO_SECURITY_ENCRYPTION_TRANSPORT) && HAVE_DECL_SO_SECURITY_ENCRYPTION_TRANSPORT)
-	XLAT(SO_SECURITY_ENCRYPTION_TRANSPORT),
+ XLAT(SO_SECURITY_ENCRYPTION_TRANSPORT),
 #endif
 #if defined(SO_SEMA) || (defined(HAVE_DECL_SO_SEMA) && HAVE_DECL_SO_SEMA)
-	XLAT(SO_SEMA),
+ XLAT(SO_SEMA),
 #endif
 #if defined(SO_SNDBUF) || (defined(HAVE_DECL_SO_SNDBUF) && HAVE_DECL_SO_SNDBUF)
-	XLAT(SO_SNDBUF),
+ XLAT(SO_SNDBUF),
+#endif
+#if defined(SO_SNDBUFFORCE) || (defined(HAVE_DECL_SO_SNDBUFFORCE) && HAVE_DECL_SO_SNDBUFFORCE)
+ XLAT(SO_SNDBUFFORCE),
 #endif
 #if defined(SO_SNDLOWAT) || (defined(HAVE_DECL_SO_SNDLOWAT) && HAVE_DECL_SO_SNDLOWAT)
-	XLAT(SO_SNDLOWAT),
+ XLAT(SO_SNDLOWAT),
 #endif
 #if defined(SO_SNDTIMEO) || (defined(HAVE_DECL_SO_SNDTIMEO) && HAVE_DECL_SO_SNDTIMEO)
-	XLAT(SO_SNDTIMEO),
+ XLAT(SO_SNDTIMEO),
 #endif
 #if defined(SO_TIMESTAMP) || (defined(HAVE_DECL_SO_TIMESTAMP) && HAVE_DECL_SO_TIMESTAMP)
-	XLAT(SO_TIMESTAMP),
+ XLAT(SO_TIMESTAMP),
+#endif
+#if defined(SO_TIMESTAMPING) || (defined(HAVE_DECL_SO_TIMESTAMPING) && HAVE_DECL_SO_TIMESTAMPING)
+ XLAT(SO_TIMESTAMPING),
+#endif
+#if defined(SO_TIMESTAMPNS) || (defined(HAVE_DECL_SO_TIMESTAMPNS) && HAVE_DECL_SO_TIMESTAMPNS)
+ XLAT(SO_TIMESTAMPNS),
 #endif
 #if defined(SO_TYPE) || (defined(HAVE_DECL_SO_TYPE) && HAVE_DECL_SO_TYPE)
-	XLAT(SO_TYPE),
+ XLAT(SO_TYPE),
 #endif
 #if defined(SO_USELOOPBACK) || (defined(HAVE_DECL_SO_USELOOPBACK) && HAVE_DECL_SO_USELOOPBACK)
-	XLAT(SO_USELOOPBACK),
+ XLAT(SO_USELOOPBACK),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sockpacketoptions.h b/xlat/sockpacketoptions.h
index e7025eb..bb34018 100644
--- a/xlat/sockpacketoptions.h
+++ b/xlat/sockpacketoptions.h
@@ -2,43 +2,43 @@
 
 static const struct xlat sockpacketoptions[] = {
 #if defined(PACKET_ADD_MEMBERSHIP) || (defined(HAVE_DECL_PACKET_ADD_MEMBERSHIP) && HAVE_DECL_PACKET_ADD_MEMBERSHIP)
-	XLAT(PACKET_ADD_MEMBERSHIP),
+ XLAT(PACKET_ADD_MEMBERSHIP),
 #endif
 #if defined(PACKET_DROP_MEMBERSHIP) || (defined(HAVE_DECL_PACKET_DROP_MEMBERSHIP) && HAVE_DECL_PACKET_DROP_MEMBERSHIP)
-	XLAT(PACKET_DROP_MEMBERSHIP),
+ XLAT(PACKET_DROP_MEMBERSHIP),
 #endif
 #if defined(PACKET_RECV_OUTPUT) || (defined(HAVE_DECL_PACKET_RECV_OUTPUT) && HAVE_DECL_PACKET_RECV_OUTPUT)
-	XLAT(PACKET_RECV_OUTPUT),
+ XLAT(PACKET_RECV_OUTPUT),
 #endif
 #if defined(PACKET_RX_RING) || (defined(HAVE_DECL_PACKET_RX_RING) && HAVE_DECL_PACKET_RX_RING)
-	XLAT(PACKET_RX_RING),
+ XLAT(PACKET_RX_RING),
 #endif
 #if defined(PACKET_STATISTICS) || (defined(HAVE_DECL_PACKET_STATISTICS) && HAVE_DECL_PACKET_STATISTICS)
-	XLAT(PACKET_STATISTICS),
+ XLAT(PACKET_STATISTICS),
 #endif
 #if defined(PACKET_COPY_THRESH) || (defined(HAVE_DECL_PACKET_COPY_THRESH) && HAVE_DECL_PACKET_COPY_THRESH)
-	XLAT(PACKET_COPY_THRESH),
+ XLAT(PACKET_COPY_THRESH),
 #endif
 #if defined(PACKET_AUXDATA) || (defined(HAVE_DECL_PACKET_AUXDATA) && HAVE_DECL_PACKET_AUXDATA)
-	XLAT(PACKET_AUXDATA),
+ XLAT(PACKET_AUXDATA),
 #endif
 #if defined(PACKET_ORIGDEV) || (defined(HAVE_DECL_PACKET_ORIGDEV) && HAVE_DECL_PACKET_ORIGDEV)
-	XLAT(PACKET_ORIGDEV),
+ XLAT(PACKET_ORIGDEV),
 #endif
 #if defined(PACKET_VERSION) || (defined(HAVE_DECL_PACKET_VERSION) && HAVE_DECL_PACKET_VERSION)
-	XLAT(PACKET_VERSION),
+ XLAT(PACKET_VERSION),
 #endif
 #if defined(PACKET_HDRLEN) || (defined(HAVE_DECL_PACKET_HDRLEN) && HAVE_DECL_PACKET_HDRLEN)
-	XLAT(PACKET_HDRLEN),
+ XLAT(PACKET_HDRLEN),
 #endif
 #if defined(PACKET_RESERVE) || (defined(HAVE_DECL_PACKET_RESERVE) && HAVE_DECL_PACKET_RESERVE)
-	XLAT(PACKET_RESERVE),
+ XLAT(PACKET_RESERVE),
 #endif
 #if defined(PACKET_TX_RING) || (defined(HAVE_DECL_PACKET_TX_RING) && HAVE_DECL_PACKET_TX_RING)
-	XLAT(PACKET_TX_RING),
+ XLAT(PACKET_TX_RING),
 #endif
 #if defined(PACKET_LOSS) || (defined(HAVE_DECL_PACKET_LOSS) && HAVE_DECL_PACKET_LOSS)
-	XLAT(PACKET_LOSS),
+ XLAT(PACKET_LOSS),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sockrawoptions.h b/xlat/sockrawoptions.h
index 96ebded..d3bdfaa 100644
--- a/xlat/sockrawoptions.h
+++ b/xlat/sockrawoptions.h
@@ -2,7 +2,7 @@
 
 static const struct xlat sockrawoptions[] = {
 #if defined(ICMP_FILTER) || (defined(HAVE_DECL_ICMP_FILTER) && HAVE_DECL_ICMP_FILTER)
-	XLAT(ICMP_FILTER),
+ XLAT(ICMP_FILTER),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/socksctpoptions.h b/xlat/socksctpoptions.h
index 0b54030..4e6d8f8 100644
--- a/xlat/socksctpoptions.h
+++ b/xlat/socksctpoptions.h
@@ -2,122 +2,122 @@
 
 static const struct xlat socksctpoptions[] = {
 #if defined(SCTP_RTOINFO) || (defined(HAVE_DECL_SCTP_RTOINFO) && HAVE_DECL_SCTP_RTOINFO)
-	XLAT(SCTP_RTOINFO),
+ XLAT(SCTP_RTOINFO),
 #endif
 #if defined(SCTP_ASSOCINFO) || (defined(HAVE_DECL_SCTP_ASSOCINFO) && HAVE_DECL_SCTP_ASSOCINFO)
-	XLAT(SCTP_ASSOCINFO),
+ XLAT(SCTP_ASSOCINFO),
 #endif
 #if defined(SCTP_INITMSG) || (defined(HAVE_DECL_SCTP_INITMSG) && HAVE_DECL_SCTP_INITMSG)
-	XLAT(SCTP_INITMSG),
+ XLAT(SCTP_INITMSG),
 #endif
 #if defined(SCTP_NODELAY) || (defined(HAVE_DECL_SCTP_NODELAY) && HAVE_DECL_SCTP_NODELAY)
-	XLAT(SCTP_NODELAY),
+ XLAT(SCTP_NODELAY),
 #endif
 #if defined(SCTP_AUTOCLOSE) || (defined(HAVE_DECL_SCTP_AUTOCLOSE) && HAVE_DECL_SCTP_AUTOCLOSE)
-	XLAT(SCTP_AUTOCLOSE),
+ XLAT(SCTP_AUTOCLOSE),
 #endif
 #if defined(SCTP_SET_PEER_PRIMARY_ADDR) || (defined(HAVE_DECL_SCTP_SET_PEER_PRIMARY_ADDR) && HAVE_DECL_SCTP_SET_PEER_PRIMARY_ADDR)
-	XLAT(SCTP_SET_PEER_PRIMARY_ADDR),
+ XLAT(SCTP_SET_PEER_PRIMARY_ADDR),
 #endif
 #if defined(SCTP_PRIMARY_ADDR) || (defined(HAVE_DECL_SCTP_PRIMARY_ADDR) && HAVE_DECL_SCTP_PRIMARY_ADDR)
-	XLAT(SCTP_PRIMARY_ADDR),
+ XLAT(SCTP_PRIMARY_ADDR),
 #endif
 #if defined(SCTP_ADAPTATION_LAYER) || (defined(HAVE_DECL_SCTP_ADAPTATION_LAYER) && HAVE_DECL_SCTP_ADAPTATION_LAYER)
-	XLAT(SCTP_ADAPTATION_LAYER),
+ XLAT(SCTP_ADAPTATION_LAYER),
 #endif
 #if defined(SCTP_DISABLE_FRAGMENTS) || (defined(HAVE_DECL_SCTP_DISABLE_FRAGMENTS) && HAVE_DECL_SCTP_DISABLE_FRAGMENTS)
-	XLAT(SCTP_DISABLE_FRAGMENTS),
+ XLAT(SCTP_DISABLE_FRAGMENTS),
 #endif
 #if defined(SCTP_PEER_ADDR_PARAMS) || (defined(HAVE_DECL_SCTP_PEER_ADDR_PARAMS) && HAVE_DECL_SCTP_PEER_ADDR_PARAMS)
-	XLAT(SCTP_PEER_ADDR_PARAMS),
+ XLAT(SCTP_PEER_ADDR_PARAMS),
 #endif
 #if defined(SCTP_DEFAULT_SEND_PARAM) || (defined(HAVE_DECL_SCTP_DEFAULT_SEND_PARAM) && HAVE_DECL_SCTP_DEFAULT_SEND_PARAM)
-	XLAT(SCTP_DEFAULT_SEND_PARAM),
+ XLAT(SCTP_DEFAULT_SEND_PARAM),
 #endif
 #if defined(SCTP_EVENTS) || (defined(HAVE_DECL_SCTP_EVENTS) && HAVE_DECL_SCTP_EVENTS)
-	XLAT(SCTP_EVENTS),
+ XLAT(SCTP_EVENTS),
 #endif
 #if defined(SCTP_I_WANT_MAPPED_V4_ADDR) || (defined(HAVE_DECL_SCTP_I_WANT_MAPPED_V4_ADDR) && HAVE_DECL_SCTP_I_WANT_MAPPED_V4_ADDR)
-	XLAT(SCTP_I_WANT_MAPPED_V4_ADDR),
+ XLAT(SCTP_I_WANT_MAPPED_V4_ADDR),
 #endif
 #if defined(SCTP_MAXSEG) || (defined(HAVE_DECL_SCTP_MAXSEG) && HAVE_DECL_SCTP_MAXSEG)
-	XLAT(SCTP_MAXSEG),
+ XLAT(SCTP_MAXSEG),
 #endif
 #if defined(SCTP_STATUS) || (defined(HAVE_DECL_SCTP_STATUS) && HAVE_DECL_SCTP_STATUS)
-	XLAT(SCTP_STATUS),
+ XLAT(SCTP_STATUS),
 #endif
 #if defined(SCTP_GET_PEER_ADDR_INFO) || (defined(HAVE_DECL_SCTP_GET_PEER_ADDR_INFO) && HAVE_DECL_SCTP_GET_PEER_ADDR_INFO)
-	XLAT(SCTP_GET_PEER_ADDR_INFO),
+ XLAT(SCTP_GET_PEER_ADDR_INFO),
 #endif
 #if defined(SCTP_DELAYED_ACK) || (defined(HAVE_DECL_SCTP_DELAYED_ACK) && HAVE_DECL_SCTP_DELAYED_ACK)
-	XLAT(SCTP_DELAYED_ACK),
+ XLAT(SCTP_DELAYED_ACK),
 #endif
 #if defined(SCTP_CONTEXT) || (defined(HAVE_DECL_SCTP_CONTEXT) && HAVE_DECL_SCTP_CONTEXT)
-	XLAT(SCTP_CONTEXT),
+ XLAT(SCTP_CONTEXT),
 #endif
 #if defined(SCTP_FRAGMENT_INTERLEAVE) || (defined(HAVE_DECL_SCTP_FRAGMENT_INTERLEAVE) && HAVE_DECL_SCTP_FRAGMENT_INTERLEAVE)
-	XLAT(SCTP_FRAGMENT_INTERLEAVE),
+ XLAT(SCTP_FRAGMENT_INTERLEAVE),
 #endif
 #if defined(SCTP_PARTIAL_DELIVERY_POINT) || (defined(HAVE_DECL_SCTP_PARTIAL_DELIVERY_POINT) && HAVE_DECL_SCTP_PARTIAL_DELIVERY_POINT)
-	XLAT(SCTP_PARTIAL_DELIVERY_POINT),
+ XLAT(SCTP_PARTIAL_DELIVERY_POINT),
 #endif
 #if defined(SCTP_MAX_BURST) || (defined(HAVE_DECL_SCTP_MAX_BURST) && HAVE_DECL_SCTP_MAX_BURST)
-	XLAT(SCTP_MAX_BURST),
+ XLAT(SCTP_MAX_BURST),
 #endif
 #if defined(SCTP_AUTH_CHUNK) || (defined(HAVE_DECL_SCTP_AUTH_CHUNK) && HAVE_DECL_SCTP_AUTH_CHUNK)
-	XLAT(SCTP_AUTH_CHUNK),
+ XLAT(SCTP_AUTH_CHUNK),
 #endif
 #if defined(SCTP_HMAC_IDENT) || (defined(HAVE_DECL_SCTP_HMAC_IDENT) && HAVE_DECL_SCTP_HMAC_IDENT)
-	XLAT(SCTP_HMAC_IDENT),
+ XLAT(SCTP_HMAC_IDENT),
 #endif
 #if defined(SCTP_AUTH_KEY) || (defined(HAVE_DECL_SCTP_AUTH_KEY) && HAVE_DECL_SCTP_AUTH_KEY)
-	XLAT(SCTP_AUTH_KEY),
+ XLAT(SCTP_AUTH_KEY),
 #endif
 #if defined(SCTP_AUTH_ACTIVE_KEY) || (defined(HAVE_DECL_SCTP_AUTH_ACTIVE_KEY) && HAVE_DECL_SCTP_AUTH_ACTIVE_KEY)
-	XLAT(SCTP_AUTH_ACTIVE_KEY),
+ XLAT(SCTP_AUTH_ACTIVE_KEY),
 #endif
 #if defined(SCTP_AUTH_DELETE_KEY) || (defined(HAVE_DECL_SCTP_AUTH_DELETE_KEY) && HAVE_DECL_SCTP_AUTH_DELETE_KEY)
-	XLAT(SCTP_AUTH_DELETE_KEY),
+ XLAT(SCTP_AUTH_DELETE_KEY),
 #endif
 #if defined(SCTP_PEER_AUTH_CHUNKS) || (defined(HAVE_DECL_SCTP_PEER_AUTH_CHUNKS) && HAVE_DECL_SCTP_PEER_AUTH_CHUNKS)
-	XLAT(SCTP_PEER_AUTH_CHUNKS),
+ XLAT(SCTP_PEER_AUTH_CHUNKS),
 #endif
 #if defined(SCTP_LOCAL_AUTH_CHUNKS) || (defined(HAVE_DECL_SCTP_LOCAL_AUTH_CHUNKS) && HAVE_DECL_SCTP_LOCAL_AUTH_CHUNKS)
-	XLAT(SCTP_LOCAL_AUTH_CHUNKS),
+ XLAT(SCTP_LOCAL_AUTH_CHUNKS),
 #endif
 #if defined(SCTP_GET_ASSOC_NUMBER) || (defined(HAVE_DECL_SCTP_GET_ASSOC_NUMBER) && HAVE_DECL_SCTP_GET_ASSOC_NUMBER)
-	XLAT(SCTP_GET_ASSOC_NUMBER),
+ XLAT(SCTP_GET_ASSOC_NUMBER),
 #endif
 /* linux specific things */
 #if defined(SCTP_SOCKOPT_BINDX_ADD) || (defined(HAVE_DECL_SCTP_SOCKOPT_BINDX_ADD) && HAVE_DECL_SCTP_SOCKOPT_BINDX_ADD)
-	XLAT(SCTP_SOCKOPT_BINDX_ADD),
+ XLAT(SCTP_SOCKOPT_BINDX_ADD),
 #endif
 #if defined(SCTP_SOCKOPT_BINDX_REM) || (defined(HAVE_DECL_SCTP_SOCKOPT_BINDX_REM) && HAVE_DECL_SCTP_SOCKOPT_BINDX_REM)
-	XLAT(SCTP_SOCKOPT_BINDX_REM),
+ XLAT(SCTP_SOCKOPT_BINDX_REM),
 #endif
 #if defined(SCTP_SOCKOPT_PEELOFF) || (defined(HAVE_DECL_SCTP_SOCKOPT_PEELOFF) && HAVE_DECL_SCTP_SOCKOPT_PEELOFF)
-	XLAT(SCTP_SOCKOPT_PEELOFF),
+ XLAT(SCTP_SOCKOPT_PEELOFF),
 #endif
 #if defined(SCTP_GET_PEER_ADDRS_NUM_OLD) || (defined(HAVE_DECL_SCTP_GET_PEER_ADDRS_NUM_OLD) && HAVE_DECL_SCTP_GET_PEER_ADDRS_NUM_OLD)
-	XLAT(SCTP_GET_PEER_ADDRS_NUM_OLD),
+ XLAT(SCTP_GET_PEER_ADDRS_NUM_OLD),
 #endif
 #if defined(SCTP_GET_PEER_ADDRS_OLD) || (defined(HAVE_DECL_SCTP_GET_PEER_ADDRS_OLD) && HAVE_DECL_SCTP_GET_PEER_ADDRS_OLD)
-	XLAT(SCTP_GET_PEER_ADDRS_OLD),
+ XLAT(SCTP_GET_PEER_ADDRS_OLD),
 #endif
 #if defined(SCTP_GET_LOCAL_ADDRS_NUM_OLD) || (defined(HAVE_DECL_SCTP_GET_LOCAL_ADDRS_NUM_OLD) && HAVE_DECL_SCTP_GET_LOCAL_ADDRS_NUM_OLD)
-	XLAT(SCTP_GET_LOCAL_ADDRS_NUM_OLD),
+ XLAT(SCTP_GET_LOCAL_ADDRS_NUM_OLD),
 #endif
 #if defined(SCTP_GET_LOCAL_ADDRS_OLD) || (defined(HAVE_DECL_SCTP_GET_LOCAL_ADDRS_OLD) && HAVE_DECL_SCTP_GET_LOCAL_ADDRS_OLD)
-	XLAT(SCTP_GET_LOCAL_ADDRS_OLD),
+ XLAT(SCTP_GET_LOCAL_ADDRS_OLD),
 #endif
 #if defined(SCTP_SOCKOPT_CONNECTX_OLD) || (defined(HAVE_DECL_SCTP_SOCKOPT_CONNECTX_OLD) && HAVE_DECL_SCTP_SOCKOPT_CONNECTX_OLD)
-	XLAT(SCTP_SOCKOPT_CONNECTX_OLD),
+ XLAT(SCTP_SOCKOPT_CONNECTX_OLD),
 #endif
 #if defined(SCTP_GET_PEER_ADDRS) || (defined(HAVE_DECL_SCTP_GET_PEER_ADDRS) && HAVE_DECL_SCTP_GET_PEER_ADDRS)
-	XLAT(SCTP_GET_PEER_ADDRS),
+ XLAT(SCTP_GET_PEER_ADDRS),
 #endif
 #if defined(SCTP_GET_LOCAL_ADDRS) || (defined(HAVE_DECL_SCTP_GET_LOCAL_ADDRS) && HAVE_DECL_SCTP_GET_LOCAL_ADDRS)
-	XLAT(SCTP_GET_LOCAL_ADDRS),
+ XLAT(SCTP_GET_LOCAL_ADDRS),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/socktcpoptions.h b/xlat/socktcpoptions.h
index e6a3a28..42a2717 100644
--- a/xlat/socktcpoptions.h
+++ b/xlat/socktcpoptions.h
@@ -2,76 +2,76 @@
 
 static const struct xlat socktcpoptions[] = {
 #if defined(TCP_NODELAY) || (defined(HAVE_DECL_TCP_NODELAY) && HAVE_DECL_TCP_NODELAY)
-	XLAT(TCP_NODELAY),
+ XLAT(TCP_NODELAY),
 #endif
 #if defined(TCP_MAXSEG) || (defined(HAVE_DECL_TCP_MAXSEG) && HAVE_DECL_TCP_MAXSEG)
-	XLAT(TCP_MAXSEG),
+ XLAT(TCP_MAXSEG),
 #endif
 #if defined(TCP_CORK) || (defined(HAVE_DECL_TCP_CORK) && HAVE_DECL_TCP_CORK)
-	XLAT(TCP_CORK),
+ XLAT(TCP_CORK),
 #endif
 #if defined(TCP_KEEPIDLE) || (defined(HAVE_DECL_TCP_KEEPIDLE) && HAVE_DECL_TCP_KEEPIDLE)
-	XLAT(TCP_KEEPIDLE),
+ XLAT(TCP_KEEPIDLE),
 #endif
 #if defined(TCP_KEEPINTVL) || (defined(HAVE_DECL_TCP_KEEPINTVL) && HAVE_DECL_TCP_KEEPINTVL)
-	XLAT(TCP_KEEPINTVL),
+ XLAT(TCP_KEEPINTVL),
 #endif
 #if defined(TCP_KEEPCNT) || (defined(HAVE_DECL_TCP_KEEPCNT) && HAVE_DECL_TCP_KEEPCNT)
-	XLAT(TCP_KEEPCNT),
+ XLAT(TCP_KEEPCNT),
 #endif
 #if defined(TCP_SYNCNT) || (defined(HAVE_DECL_TCP_SYNCNT) && HAVE_DECL_TCP_SYNCNT)
-	XLAT(TCP_SYNCNT),
+ XLAT(TCP_SYNCNT),
 #endif
 #if defined(TCP_LINGER2) || (defined(HAVE_DECL_TCP_LINGER2) && HAVE_DECL_TCP_LINGER2)
-	XLAT(TCP_LINGER2),
+ XLAT(TCP_LINGER2),
 #endif
 #if defined(TCP_DEFER_ACCEPT) || (defined(HAVE_DECL_TCP_DEFER_ACCEPT) && HAVE_DECL_TCP_DEFER_ACCEPT)
-	XLAT(TCP_DEFER_ACCEPT),
+ XLAT(TCP_DEFER_ACCEPT),
 #endif
 #if defined(TCP_WINDOW_CLAMP) || (defined(HAVE_DECL_TCP_WINDOW_CLAMP) && HAVE_DECL_TCP_WINDOW_CLAMP)
-	XLAT(TCP_WINDOW_CLAMP),
+ XLAT(TCP_WINDOW_CLAMP),
 #endif
 #if defined(TCP_INFO) || (defined(HAVE_DECL_TCP_INFO) && HAVE_DECL_TCP_INFO)
-	XLAT(TCP_INFO),
+ XLAT(TCP_INFO),
 #endif
 #if defined(TCP_QUICKACK) || (defined(HAVE_DECL_TCP_QUICKACK) && HAVE_DECL_TCP_QUICKACK)
-	XLAT(TCP_QUICKACK),
+ XLAT(TCP_QUICKACK),
 #endif
 #if defined(TCP_CONGESTION) || (defined(HAVE_DECL_TCP_CONGESTION) && HAVE_DECL_TCP_CONGESTION)
-	XLAT(TCP_CONGESTION),
+ XLAT(TCP_CONGESTION),
 #endif
 #if defined(TCP_MD5SIG) || (defined(HAVE_DECL_TCP_MD5SIG) && HAVE_DECL_TCP_MD5SIG)
-	XLAT(TCP_MD5SIG),
+ XLAT(TCP_MD5SIG),
 #endif
 #if defined(TCP_COOKIE_TRANSACTIONS) || (defined(HAVE_DECL_TCP_COOKIE_TRANSACTIONS) && HAVE_DECL_TCP_COOKIE_TRANSACTIONS)
-	XLAT(TCP_COOKIE_TRANSACTIONS),
+ XLAT(TCP_COOKIE_TRANSACTIONS),
 #endif
 #if defined(TCP_THIN_LINEAR_TIMEOUTS) || (defined(HAVE_DECL_TCP_THIN_LINEAR_TIMEOUTS) && HAVE_DECL_TCP_THIN_LINEAR_TIMEOUTS)
-	XLAT(TCP_THIN_LINEAR_TIMEOUTS),
+ XLAT(TCP_THIN_LINEAR_TIMEOUTS),
 #endif
 #if defined(TCP_THIN_DUPACK) || (defined(HAVE_DECL_TCP_THIN_DUPACK) && HAVE_DECL_TCP_THIN_DUPACK)
-	XLAT(TCP_THIN_DUPACK),
+ XLAT(TCP_THIN_DUPACK),
 #endif
 #if defined(TCP_USER_TIMEOUT) || (defined(HAVE_DECL_TCP_USER_TIMEOUT) && HAVE_DECL_TCP_USER_TIMEOUT)
-	XLAT(TCP_USER_TIMEOUT),
+ XLAT(TCP_USER_TIMEOUT),
 #endif
 #if defined(TCP_REPAIR) || (defined(HAVE_DECL_TCP_REPAIR) && HAVE_DECL_TCP_REPAIR)
-	XLAT(TCP_REPAIR),
+ XLAT(TCP_REPAIR),
 #endif
 #if defined(TCP_REPAIR_QUEUE) || (defined(HAVE_DECL_TCP_REPAIR_QUEUE) && HAVE_DECL_TCP_REPAIR_QUEUE)
-	XLAT(TCP_REPAIR_QUEUE),
+ XLAT(TCP_REPAIR_QUEUE),
 #endif
 #if defined(TCP_QUEUE_SEQ) || (defined(HAVE_DECL_TCP_QUEUE_SEQ) && HAVE_DECL_TCP_QUEUE_SEQ)
-	XLAT(TCP_QUEUE_SEQ),
+ XLAT(TCP_QUEUE_SEQ),
 #endif
 #if defined(TCP_REPAIR_OPTIONS) || (defined(HAVE_DECL_TCP_REPAIR_OPTIONS) && HAVE_DECL_TCP_REPAIR_OPTIONS)
-	XLAT(TCP_REPAIR_OPTIONS),
+ XLAT(TCP_REPAIR_OPTIONS),
 #endif
 #if defined(TCP_FASTOPEN) || (defined(HAVE_DECL_TCP_FASTOPEN) && HAVE_DECL_TCP_FASTOPEN)
-	XLAT(TCP_FASTOPEN),
+ XLAT(TCP_FASTOPEN),
 #endif
 #if defined(TCP_TIMESTAMP) || (defined(HAVE_DECL_TCP_TIMESTAMP) && HAVE_DECL_TCP_TIMESTAMP)
-	XLAT(TCP_TIMESTAMP),
+ XLAT(TCP_TIMESTAMP),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/socktypes.h b/xlat/socktypes.h
index 6434759..20c6082 100644
--- a/xlat/socktypes.h
+++ b/xlat/socktypes.h
@@ -2,25 +2,25 @@
 
 static const struct xlat socktypes[] = {
 #if defined(SOCK_STREAM) || (defined(HAVE_DECL_SOCK_STREAM) && HAVE_DECL_SOCK_STREAM)
-	XLAT(SOCK_STREAM),
+ XLAT(SOCK_STREAM),
 #endif
 #if defined(SOCK_DGRAM) || (defined(HAVE_DECL_SOCK_DGRAM) && HAVE_DECL_SOCK_DGRAM)
-	XLAT(SOCK_DGRAM),
+ XLAT(SOCK_DGRAM),
 #endif
 #if defined(SOCK_RAW) || (defined(HAVE_DECL_SOCK_RAW) && HAVE_DECL_SOCK_RAW)
-	XLAT(SOCK_RAW),
+ XLAT(SOCK_RAW),
 #endif
 #if defined(SOCK_RDM) || (defined(HAVE_DECL_SOCK_RDM) && HAVE_DECL_SOCK_RDM)
-	XLAT(SOCK_RDM),
+ XLAT(SOCK_RDM),
 #endif
 #if defined(SOCK_SEQPACKET) || (defined(HAVE_DECL_SOCK_SEQPACKET) && HAVE_DECL_SOCK_SEQPACKET)
-	XLAT(SOCK_SEQPACKET),
+ XLAT(SOCK_SEQPACKET),
 #endif
 #if defined(SOCK_DCCP) || (defined(HAVE_DECL_SOCK_DCCP) && HAVE_DECL_SOCK_DCCP)
-	XLAT(SOCK_DCCP),
+ XLAT(SOCK_DCCP),
 #endif
 #if defined(SOCK_PACKET) || (defined(HAVE_DECL_SOCK_PACKET) && HAVE_DECL_SOCK_PACKET)
-	XLAT(SOCK_PACKET),
+ XLAT(SOCK_PACKET),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/splice_flags.h b/xlat/splice_flags.h
index 7ae6c84..11302d2 100644
--- a/xlat/splice_flags.h
+++ b/xlat/splice_flags.h
@@ -2,16 +2,16 @@
 
 static const struct xlat splice_flags[] = {
 #if defined(SPLICE_F_MOVE) || (defined(HAVE_DECL_SPLICE_F_MOVE) && HAVE_DECL_SPLICE_F_MOVE)
-	XLAT(SPLICE_F_MOVE),
+ XLAT(SPLICE_F_MOVE),
 #endif
 #if defined(SPLICE_F_NONBLOCK) || (defined(HAVE_DECL_SPLICE_F_NONBLOCK) && HAVE_DECL_SPLICE_F_NONBLOCK)
-	XLAT(SPLICE_F_NONBLOCK),
+ XLAT(SPLICE_F_NONBLOCK),
 #endif
 #if defined(SPLICE_F_MORE) || (defined(HAVE_DECL_SPLICE_F_MORE) && HAVE_DECL_SPLICE_F_MORE)
-	XLAT(SPLICE_F_MORE),
+ XLAT(SPLICE_F_MORE),
 #endif
 #if defined(SPLICE_F_GIFT) || (defined(HAVE_DECL_SPLICE_F_GIFT) && HAVE_DECL_SPLICE_F_GIFT)
-	XLAT(SPLICE_F_GIFT),
+ XLAT(SPLICE_F_GIFT),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sram_alloc_flags.h b/xlat/sram_alloc_flags.h
index 48dd0f1..e687073 100644
--- a/xlat/sram_alloc_flags.h
+++ b/xlat/sram_alloc_flags.h
@@ -2,19 +2,19 @@
 
 static const struct xlat sram_alloc_flags[] = {
 #if defined(L1_INST_SRAM) || (defined(HAVE_DECL_L1_INST_SRAM) && HAVE_DECL_L1_INST_SRAM)
-	XLAT(L1_INST_SRAM),
+ XLAT(L1_INST_SRAM),
 #endif
 #if defined(L1_DATA_A_SRAM) || (defined(HAVE_DECL_L1_DATA_A_SRAM) && HAVE_DECL_L1_DATA_A_SRAM)
-	XLAT(L1_DATA_A_SRAM),
+ XLAT(L1_DATA_A_SRAM),
 #endif
 #if defined(L1_DATA_B_SRAM) || (defined(HAVE_DECL_L1_DATA_B_SRAM) && HAVE_DECL_L1_DATA_B_SRAM)
-	XLAT(L1_DATA_B_SRAM),
+ XLAT(L1_DATA_B_SRAM),
 #endif
 #if defined(L1_DATA_SRAM) || (defined(HAVE_DECL_L1_DATA_SRAM) && HAVE_DECL_L1_DATA_SRAM)
-	XLAT(L1_DATA_SRAM),
+ XLAT(L1_DATA_SRAM),
 #endif
 #if defined(L2_SRAM) || (defined(HAVE_DECL_L2_SRAM) && HAVE_DECL_L2_SRAM)
-	XLAT(L2_SRAM),
+ XLAT(L2_SRAM),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/swap_flags.h b/xlat/swap_flags.h
index f019da8..e3cab9a 100644
--- a/xlat/swap_flags.h
+++ b/xlat/swap_flags.h
@@ -2,16 +2,16 @@
 
 static const struct xlat swap_flags[] = {
 #if defined(SWAP_FLAG_PREFER) || (defined(HAVE_DECL_SWAP_FLAG_PREFER) && HAVE_DECL_SWAP_FLAG_PREFER)
-	XLAT(SWAP_FLAG_PREFER),
+ XLAT(SWAP_FLAG_PREFER),
 #endif
 #if defined(SWAP_FLAG_DISCARD) || (defined(HAVE_DECL_SWAP_FLAG_DISCARD) && HAVE_DECL_SWAP_FLAG_DISCARD)
-	XLAT(SWAP_FLAG_DISCARD),
+ XLAT(SWAP_FLAG_DISCARD),
 #endif
 #if defined(SWAP_FLAG_DISCARD_ONCE) || (defined(HAVE_DECL_SWAP_FLAG_DISCARD_ONCE) && HAVE_DECL_SWAP_FLAG_DISCARD_ONCE)
-	XLAT(SWAP_FLAG_DISCARD_ONCE),
+ XLAT(SWAP_FLAG_DISCARD_ONCE),
 #endif
 #if defined(SWAP_FLAG_DISCARD_PAGES) || (defined(HAVE_DECL_SWAP_FLAG_DISCARD_PAGES) && HAVE_DECL_SWAP_FLAG_DISCARD_PAGES)
-	XLAT(SWAP_FLAG_DISCARD_PAGES),
+ XLAT(SWAP_FLAG_DISCARD_PAGES),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sync_file_range_flags.h b/xlat/sync_file_range_flags.h
index 53ee15c..a1ff2f8 100644
--- a/xlat/sync_file_range_flags.h
+++ b/xlat/sync_file_range_flags.h
@@ -2,13 +2,13 @@
 
 static const struct xlat sync_file_range_flags[] = {
 #if defined(SYNC_FILE_RANGE_WAIT_BEFORE) || (defined(HAVE_DECL_SYNC_FILE_RANGE_WAIT_BEFORE) && HAVE_DECL_SYNC_FILE_RANGE_WAIT_BEFORE)
-	XLAT(SYNC_FILE_RANGE_WAIT_BEFORE),
+ XLAT(SYNC_FILE_RANGE_WAIT_BEFORE),
 #endif
 #if defined(SYNC_FILE_RANGE_WRITE) || (defined(HAVE_DECL_SYNC_FILE_RANGE_WRITE) && HAVE_DECL_SYNC_FILE_RANGE_WRITE)
-	XLAT(SYNC_FILE_RANGE_WRITE),
+ XLAT(SYNC_FILE_RANGE_WRITE),
 #endif
 #if defined(SYNC_FILE_RANGE_WAIT_AFTER) || (defined(HAVE_DECL_SYNC_FILE_RANGE_WAIT_AFTER) && HAVE_DECL_SYNC_FILE_RANGE_WAIT_AFTER)
-	XLAT(SYNC_FILE_RANGE_WAIT_AFTER),
+ XLAT(SYNC_FILE_RANGE_WAIT_AFTER),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sysctl_kern.h b/xlat/sysctl_kern.h
index 562f3f0..87b4a80 100644
--- a/xlat/sysctl_kern.h
+++ b/xlat/sysctl_kern.h
@@ -2,202 +2,202 @@
 
 static const struct xlat sysctl_kern[] = {
 #if defined(KERN_OSTYPE) || (defined(HAVE_DECL_KERN_OSTYPE) && HAVE_DECL_KERN_OSTYPE)
-	XLAT(KERN_OSTYPE),
+ XLAT(KERN_OSTYPE),
 #endif
 #if defined(KERN_OSRELEASE) || (defined(HAVE_DECL_KERN_OSRELEASE) && HAVE_DECL_KERN_OSRELEASE)
-	XLAT(KERN_OSRELEASE),
+ XLAT(KERN_OSRELEASE),
 #endif
 #if defined(KERN_OSREV) || (defined(HAVE_DECL_KERN_OSREV) && HAVE_DECL_KERN_OSREV)
-	XLAT(KERN_OSREV),
+ XLAT(KERN_OSREV),
 #endif
 #if defined(KERN_VERSION) || (defined(HAVE_DECL_KERN_VERSION) && HAVE_DECL_KERN_VERSION)
-	XLAT(KERN_VERSION),
+ XLAT(KERN_VERSION),
 #endif
 #if defined(KERN_SECUREMASK) || (defined(HAVE_DECL_KERN_SECUREMASK) && HAVE_DECL_KERN_SECUREMASK)
-	XLAT(KERN_SECUREMASK),
+ XLAT(KERN_SECUREMASK),
 #endif
 #if defined(KERN_PROF) || (defined(HAVE_DECL_KERN_PROF) && HAVE_DECL_KERN_PROF)
-	XLAT(KERN_PROF),
+ XLAT(KERN_PROF),
 #endif
 #if defined(KERN_NODENAME) || (defined(HAVE_DECL_KERN_NODENAME) && HAVE_DECL_KERN_NODENAME)
-	XLAT(KERN_NODENAME),
+ XLAT(KERN_NODENAME),
 #endif
 #if defined(KERN_DOMAINNAME) || (defined(HAVE_DECL_KERN_DOMAINNAME) && HAVE_DECL_KERN_DOMAINNAME)
-	XLAT(KERN_DOMAINNAME),
+ XLAT(KERN_DOMAINNAME),
 #endif
 #if defined(KERN_PANIC) || (defined(HAVE_DECL_KERN_PANIC) && HAVE_DECL_KERN_PANIC)
-	XLAT(KERN_PANIC),
+ XLAT(KERN_PANIC),
 #endif
 #if defined(KERN_REALROOTDEV) || (defined(HAVE_DECL_KERN_REALROOTDEV) && HAVE_DECL_KERN_REALROOTDEV)
-	XLAT(KERN_REALROOTDEV),
+ XLAT(KERN_REALROOTDEV),
 #endif
 #if defined(KERN_SPARC_REBOOT) || (defined(HAVE_DECL_KERN_SPARC_REBOOT) && HAVE_DECL_KERN_SPARC_REBOOT)
-	XLAT(KERN_SPARC_REBOOT),
+ XLAT(KERN_SPARC_REBOOT),
 #endif
 #if defined(KERN_CTLALTDEL) || (defined(HAVE_DECL_KERN_CTLALTDEL) && HAVE_DECL_KERN_CTLALTDEL)
-	XLAT(KERN_CTLALTDEL),
+ XLAT(KERN_CTLALTDEL),
 #endif
 #if defined(KERN_PRINTK) || (defined(HAVE_DECL_KERN_PRINTK) && HAVE_DECL_KERN_PRINTK)
-	XLAT(KERN_PRINTK),
+ XLAT(KERN_PRINTK),
 #endif
 #if defined(KERN_NAMETRANS) || (defined(HAVE_DECL_KERN_NAMETRANS) && HAVE_DECL_KERN_NAMETRANS)
-	XLAT(KERN_NAMETRANS),
+ XLAT(KERN_NAMETRANS),
 #endif
 #if defined(KERN_PPC_HTABRECLAIM) || (defined(HAVE_DECL_KERN_PPC_HTABRECLAIM) && HAVE_DECL_KERN_PPC_HTABRECLAIM)
-	XLAT(KERN_PPC_HTABRECLAIM),
+ XLAT(KERN_PPC_HTABRECLAIM),
 #endif
 #if defined(KERN_PPC_ZEROPAGED) || (defined(HAVE_DECL_KERN_PPC_ZEROPAGED) && HAVE_DECL_KERN_PPC_ZEROPAGED)
-	XLAT(KERN_PPC_ZEROPAGED),
+ XLAT(KERN_PPC_ZEROPAGED),
 #endif
 #if defined(KERN_PPC_POWERSAVE_NAP) || (defined(HAVE_DECL_KERN_PPC_POWERSAVE_NAP) && HAVE_DECL_KERN_PPC_POWERSAVE_NAP)
-	XLAT(KERN_PPC_POWERSAVE_NAP),
+ XLAT(KERN_PPC_POWERSAVE_NAP),
 #endif
 #if defined(KERN_MODPROBE) || (defined(HAVE_DECL_KERN_MODPROBE) && HAVE_DECL_KERN_MODPROBE)
-	XLAT(KERN_MODPROBE),
+ XLAT(KERN_MODPROBE),
 #endif
 #if defined(KERN_SG_BIG_BUFF) || (defined(HAVE_DECL_KERN_SG_BIG_BUFF) && HAVE_DECL_KERN_SG_BIG_BUFF)
-	XLAT(KERN_SG_BIG_BUFF),
+ XLAT(KERN_SG_BIG_BUFF),
 #endif
 #if defined(KERN_ACCT) || (defined(HAVE_DECL_KERN_ACCT) && HAVE_DECL_KERN_ACCT)
-	XLAT(KERN_ACCT),
+ XLAT(KERN_ACCT),
 #endif
 #if defined(KERN_PPC_L2CR) || (defined(HAVE_DECL_KERN_PPC_L2CR) && HAVE_DECL_KERN_PPC_L2CR)
-	XLAT(KERN_PPC_L2CR),
+ XLAT(KERN_PPC_L2CR),
 #endif
 #if defined(KERN_RTSIGNR) || (defined(HAVE_DECL_KERN_RTSIGNR) && HAVE_DECL_KERN_RTSIGNR)
-	XLAT(KERN_RTSIGNR),
+ XLAT(KERN_RTSIGNR),
 #endif
 #if defined(KERN_RTSIGMAX) || (defined(HAVE_DECL_KERN_RTSIGMAX) && HAVE_DECL_KERN_RTSIGMAX)
-	XLAT(KERN_RTSIGMAX),
+ XLAT(KERN_RTSIGMAX),
 #endif
 #if defined(KERN_SHMMAX) || (defined(HAVE_DECL_KERN_SHMMAX) && HAVE_DECL_KERN_SHMMAX)
-	XLAT(KERN_SHMMAX),
+ XLAT(KERN_SHMMAX),
 #endif
 #if defined(KERN_MSGMAX) || (defined(HAVE_DECL_KERN_MSGMAX) && HAVE_DECL_KERN_MSGMAX)
-	XLAT(KERN_MSGMAX),
+ XLAT(KERN_MSGMAX),
 #endif
 #if defined(KERN_MSGMNB) || (defined(HAVE_DECL_KERN_MSGMNB) && HAVE_DECL_KERN_MSGMNB)
-	XLAT(KERN_MSGMNB),
+ XLAT(KERN_MSGMNB),
 #endif
 #if defined(KERN_MSGPOOL) || (defined(HAVE_DECL_KERN_MSGPOOL) && HAVE_DECL_KERN_MSGPOOL)
-	XLAT(KERN_MSGPOOL),
+ XLAT(KERN_MSGPOOL),
 #endif
 #if defined(KERN_SYSRQ) || (defined(HAVE_DECL_KERN_SYSRQ) && HAVE_DECL_KERN_SYSRQ)
-	XLAT(KERN_SYSRQ),
+ XLAT(KERN_SYSRQ),
 #endif
 #if defined(KERN_MAX_THREADS) || (defined(HAVE_DECL_KERN_MAX_THREADS) && HAVE_DECL_KERN_MAX_THREADS)
-	XLAT(KERN_MAX_THREADS),
+ XLAT(KERN_MAX_THREADS),
 #endif
 #if defined(KERN_RANDOM) || (defined(HAVE_DECL_KERN_RANDOM) && HAVE_DECL_KERN_RANDOM)
-	XLAT(KERN_RANDOM),
+ XLAT(KERN_RANDOM),
 #endif
 #if defined(KERN_SHMALL) || (defined(HAVE_DECL_KERN_SHMALL) && HAVE_DECL_KERN_SHMALL)
-	XLAT(KERN_SHMALL),
+ XLAT(KERN_SHMALL),
 #endif
 #if defined(KERN_MSGMNI) || (defined(HAVE_DECL_KERN_MSGMNI) && HAVE_DECL_KERN_MSGMNI)
-	XLAT(KERN_MSGMNI),
+ XLAT(KERN_MSGMNI),
 #endif
 #if defined(KERN_SEM) || (defined(HAVE_DECL_KERN_SEM) && HAVE_DECL_KERN_SEM)
-	XLAT(KERN_SEM),
+ XLAT(KERN_SEM),
 #endif
 #if defined(KERN_SPARC_STOP_A) || (defined(HAVE_DECL_KERN_SPARC_STOP_A) && HAVE_DECL_KERN_SPARC_STOP_A)
-	XLAT(KERN_SPARC_STOP_A),
+ XLAT(KERN_SPARC_STOP_A),
 #endif
 #if defined(KERN_SHMMNI) || (defined(HAVE_DECL_KERN_SHMMNI) && HAVE_DECL_KERN_SHMMNI)
-	XLAT(KERN_SHMMNI),
+ XLAT(KERN_SHMMNI),
 #endif
 #if defined(KERN_OVERFLOWUID) || (defined(HAVE_DECL_KERN_OVERFLOWUID) && HAVE_DECL_KERN_OVERFLOWUID)
-	XLAT(KERN_OVERFLOWUID),
+ XLAT(KERN_OVERFLOWUID),
 #endif
 #if defined(KERN_OVERFLOWGID) || (defined(HAVE_DECL_KERN_OVERFLOWGID) && HAVE_DECL_KERN_OVERFLOWGID)
-	XLAT(KERN_OVERFLOWGID),
+ XLAT(KERN_OVERFLOWGID),
 #endif
 #if defined(KERN_SHMPATH) || (defined(HAVE_DECL_KERN_SHMPATH) && HAVE_DECL_KERN_SHMPATH)
-	XLAT(KERN_SHMPATH),
+ XLAT(KERN_SHMPATH),
 #endif
 #if defined(KERN_HOTPLUG) || (defined(HAVE_DECL_KERN_HOTPLUG) && HAVE_DECL_KERN_HOTPLUG)
-	XLAT(KERN_HOTPLUG),
+ XLAT(KERN_HOTPLUG),
 #endif
 #if defined(KERN_IEEE_EMULATION_WARNINGS) || (defined(HAVE_DECL_KERN_IEEE_EMULATION_WARNINGS) && HAVE_DECL_KERN_IEEE_EMULATION_WARNINGS)
-	XLAT(KERN_IEEE_EMULATION_WARNINGS),
+ XLAT(KERN_IEEE_EMULATION_WARNINGS),
 #endif
 #if defined(KERN_S390_USER_DEBUG_LOGGING) || (defined(HAVE_DECL_KERN_S390_USER_DEBUG_LOGGING) && HAVE_DECL_KERN_S390_USER_DEBUG_LOGGING)
-	XLAT(KERN_S390_USER_DEBUG_LOGGING),
+ XLAT(KERN_S390_USER_DEBUG_LOGGING),
 #endif
 #if defined(KERN_CORE_USES_PID) || (defined(HAVE_DECL_KERN_CORE_USES_PID) && HAVE_DECL_KERN_CORE_USES_PID)
-	XLAT(KERN_CORE_USES_PID),
+ XLAT(KERN_CORE_USES_PID),
 #endif
 #if defined(KERN_TAINTED) || (defined(HAVE_DECL_KERN_TAINTED) && HAVE_DECL_KERN_TAINTED)
-	XLAT(KERN_TAINTED),
+ XLAT(KERN_TAINTED),
 #endif
 #if defined(KERN_CADPID) || (defined(HAVE_DECL_KERN_CADPID) && HAVE_DECL_KERN_CADPID)
-	XLAT(KERN_CADPID),
+ XLAT(KERN_CADPID),
 #endif
 #if defined(KERN_PIDMAX) || (defined(HAVE_DECL_KERN_PIDMAX) && HAVE_DECL_KERN_PIDMAX)
-	XLAT(KERN_PIDMAX),
+ XLAT(KERN_PIDMAX),
 #endif
 #if defined(KERN_CORE_PATTERN) || (defined(HAVE_DECL_KERN_CORE_PATTERN) && HAVE_DECL_KERN_CORE_PATTERN)
-	XLAT(KERN_CORE_PATTERN),
+ XLAT(KERN_CORE_PATTERN),
 #endif
 #if defined(KERN_PANIC_ON_OOPS) || (defined(HAVE_DECL_KERN_PANIC_ON_OOPS) && HAVE_DECL_KERN_PANIC_ON_OOPS)
-	XLAT(KERN_PANIC_ON_OOPS),
+ XLAT(KERN_PANIC_ON_OOPS),
 #endif
 #if defined(KERN_HPPA_PWRSW) || (defined(HAVE_DECL_KERN_HPPA_PWRSW) && HAVE_DECL_KERN_HPPA_PWRSW)
-	XLAT(KERN_HPPA_PWRSW),
+ XLAT(KERN_HPPA_PWRSW),
 #endif
 #if defined(KERN_HPPA_UNALIGNED) || (defined(HAVE_DECL_KERN_HPPA_UNALIGNED) && HAVE_DECL_KERN_HPPA_UNALIGNED)
-	XLAT(KERN_HPPA_UNALIGNED),
+ XLAT(KERN_HPPA_UNALIGNED),
 #endif
 #if defined(KERN_PRINTK_RATELIMIT) || (defined(HAVE_DECL_KERN_PRINTK_RATELIMIT) && HAVE_DECL_KERN_PRINTK_RATELIMIT)
-	XLAT(KERN_PRINTK_RATELIMIT),
+ XLAT(KERN_PRINTK_RATELIMIT),
 #endif
 #if defined(KERN_PRINTK_RATELIMIT_BURST) || (defined(HAVE_DECL_KERN_PRINTK_RATELIMIT_BURST) && HAVE_DECL_KERN_PRINTK_RATELIMIT_BURST)
-	XLAT(KERN_PRINTK_RATELIMIT_BURST),
+ XLAT(KERN_PRINTK_RATELIMIT_BURST),
 #endif
 #if defined(KERN_PTY) || (defined(HAVE_DECL_KERN_PTY) && HAVE_DECL_KERN_PTY)
-	XLAT(KERN_PTY),
+ XLAT(KERN_PTY),
 #endif
 #if defined(KERN_NGROUPS_MAX) || (defined(HAVE_DECL_KERN_NGROUPS_MAX) && HAVE_DECL_KERN_NGROUPS_MAX)
-	XLAT(KERN_NGROUPS_MAX),
+ XLAT(KERN_NGROUPS_MAX),
 #endif
 #if defined(KERN_SPARC_SCONS_PWROFF) || (defined(HAVE_DECL_KERN_SPARC_SCONS_PWROFF) && HAVE_DECL_KERN_SPARC_SCONS_PWROFF)
-	XLAT(KERN_SPARC_SCONS_PWROFF),
+ XLAT(KERN_SPARC_SCONS_PWROFF),
 #endif
 #if defined(KERN_HZ_TIMER) || (defined(HAVE_DECL_KERN_HZ_TIMER) && HAVE_DECL_KERN_HZ_TIMER)
-	XLAT(KERN_HZ_TIMER),
+ XLAT(KERN_HZ_TIMER),
 #endif
 #if defined(KERN_UNKNOWN_NMI_PANIC) || (defined(HAVE_DECL_KERN_UNKNOWN_NMI_PANIC) && HAVE_DECL_KERN_UNKNOWN_NMI_PANIC)
-	XLAT(KERN_UNKNOWN_NMI_PANIC),
+ XLAT(KERN_UNKNOWN_NMI_PANIC),
 #endif
 #if defined(KERN_BOOTLOADER_TYPE) || (defined(HAVE_DECL_KERN_BOOTLOADER_TYPE) && HAVE_DECL_KERN_BOOTLOADER_TYPE)
-	XLAT(KERN_BOOTLOADER_TYPE),
+ XLAT(KERN_BOOTLOADER_TYPE),
 #endif
 #if defined(KERN_RANDOMIZE) || (defined(HAVE_DECL_KERN_RANDOMIZE) && HAVE_DECL_KERN_RANDOMIZE)
-	XLAT(KERN_RANDOMIZE),
+ XLAT(KERN_RANDOMIZE),
 #endif
 #if defined(KERN_SETUID_DUMPABLE) || (defined(HAVE_DECL_KERN_SETUID_DUMPABLE) && HAVE_DECL_KERN_SETUID_DUMPABLE)
-	XLAT(KERN_SETUID_DUMPABLE),
+ XLAT(KERN_SETUID_DUMPABLE),
 #endif
 #if defined(KERN_SPIN_RETRY) || (defined(HAVE_DECL_KERN_SPIN_RETRY) && HAVE_DECL_KERN_SPIN_RETRY)
-	XLAT(KERN_SPIN_RETRY),
+ XLAT(KERN_SPIN_RETRY),
 #endif
 #if defined(KERN_ACPI_VIDEO_FLAGS) || (defined(HAVE_DECL_KERN_ACPI_VIDEO_FLAGS) && HAVE_DECL_KERN_ACPI_VIDEO_FLAGS)
-	XLAT(KERN_ACPI_VIDEO_FLAGS),
+ XLAT(KERN_ACPI_VIDEO_FLAGS),
 #endif
 #if defined(KERN_IA64_UNALIGNED) || (defined(HAVE_DECL_KERN_IA64_UNALIGNED) && HAVE_DECL_KERN_IA64_UNALIGNED)
-	XLAT(KERN_IA64_UNALIGNED),
+ XLAT(KERN_IA64_UNALIGNED),
 #endif
 #if defined(KERN_COMPAT_LOG) || (defined(HAVE_DECL_KERN_COMPAT_LOG) && HAVE_DECL_KERN_COMPAT_LOG)
-	XLAT(KERN_COMPAT_LOG),
+ XLAT(KERN_COMPAT_LOG),
 #endif
 #if defined(KERN_MAX_LOCK_DEPTH) || (defined(HAVE_DECL_KERN_MAX_LOCK_DEPTH) && HAVE_DECL_KERN_MAX_LOCK_DEPTH)
-	XLAT(KERN_MAX_LOCK_DEPTH),
+ XLAT(KERN_MAX_LOCK_DEPTH),
 #endif
 #if defined(KERN_NMI_WATCHDOG) || (defined(HAVE_DECL_KERN_NMI_WATCHDOG) && HAVE_DECL_KERN_NMI_WATCHDOG)
-	XLAT(KERN_NMI_WATCHDOG),
+ XLAT(KERN_NMI_WATCHDOG),
 #endif
 #if defined(KERN_PANIC_ON_NMI) || (defined(HAVE_DECL_KERN_PANIC_ON_NMI) && HAVE_DECL_KERN_PANIC_ON_NMI)
-	XLAT(KERN_PANIC_ON_NMI),
+ XLAT(KERN_PANIC_ON_NMI),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sysctl_net.h b/xlat/sysctl_net.h
index 675c4bd..f93d678 100644
--- a/xlat/sysctl_net.h
+++ b/xlat/sysctl_net.h
@@ -2,67 +2,67 @@
 
 static const struct xlat sysctl_net[] = {
 #if defined(NET_CORE) || (defined(HAVE_DECL_NET_CORE) && HAVE_DECL_NET_CORE)
-	XLAT(NET_CORE),
+ XLAT(NET_CORE),
 #endif
 #if defined(NET_ETHER) || (defined(HAVE_DECL_NET_ETHER) && HAVE_DECL_NET_ETHER)
-	XLAT(NET_ETHER),
+ XLAT(NET_ETHER),
 #endif
 #if defined(NET_802) || (defined(HAVE_DECL_NET_802) && HAVE_DECL_NET_802)
-	XLAT(NET_802),
+ XLAT(NET_802),
 #endif
 #if defined(NET_UNIX) || (defined(HAVE_DECL_NET_UNIX) && HAVE_DECL_NET_UNIX)
-	XLAT(NET_UNIX),
+ XLAT(NET_UNIX),
 #endif
 #if defined(NET_IPV4) || (defined(HAVE_DECL_NET_IPV4) && HAVE_DECL_NET_IPV4)
-	XLAT(NET_IPV4),
+ XLAT(NET_IPV4),
 #endif
 #if defined(NET_IPX) || (defined(HAVE_DECL_NET_IPX) && HAVE_DECL_NET_IPX)
-	XLAT(NET_IPX),
+ XLAT(NET_IPX),
 #endif
 #if defined(NET_ATALK) || (defined(HAVE_DECL_NET_ATALK) && HAVE_DECL_NET_ATALK)
-	XLAT(NET_ATALK),
+ XLAT(NET_ATALK),
 #endif
 #if defined(NET_NETROM) || (defined(HAVE_DECL_NET_NETROM) && HAVE_DECL_NET_NETROM)
-	XLAT(NET_NETROM),
+ XLAT(NET_NETROM),
 #endif
 #if defined(NET_AX25) || (defined(HAVE_DECL_NET_AX25) && HAVE_DECL_NET_AX25)
-	XLAT(NET_AX25),
+ XLAT(NET_AX25),
 #endif
 #if defined(NET_BRIDGE) || (defined(HAVE_DECL_NET_BRIDGE) && HAVE_DECL_NET_BRIDGE)
-	XLAT(NET_BRIDGE),
+ XLAT(NET_BRIDGE),
 #endif
 #if defined(NET_ROSE) || (defined(HAVE_DECL_NET_ROSE) && HAVE_DECL_NET_ROSE)
-	XLAT(NET_ROSE),
+ XLAT(NET_ROSE),
 #endif
 #if defined(NET_IPV6) || (defined(HAVE_DECL_NET_IPV6) && HAVE_DECL_NET_IPV6)
-	XLAT(NET_IPV6),
+ XLAT(NET_IPV6),
 #endif
 #if defined(NET_X25) || (defined(HAVE_DECL_NET_X25) && HAVE_DECL_NET_X25)
-	XLAT(NET_X25),
+ XLAT(NET_X25),
 #endif
 #if defined(NET_TR) || (defined(HAVE_DECL_NET_TR) && HAVE_DECL_NET_TR)
-	XLAT(NET_TR),
+ XLAT(NET_TR),
 #endif
 #if defined(NET_DECNET) || (defined(HAVE_DECL_NET_DECNET) && HAVE_DECL_NET_DECNET)
-	XLAT(NET_DECNET),
+ XLAT(NET_DECNET),
 #endif
 #if defined(NET_ECONET) || (defined(HAVE_DECL_NET_ECONET) && HAVE_DECL_NET_ECONET)
-	XLAT(NET_ECONET),
+ XLAT(NET_ECONET),
 #endif
 #if defined(NET_SCTP) || (defined(HAVE_DECL_NET_SCTP) && HAVE_DECL_NET_SCTP)
-	XLAT(NET_SCTP),
+ XLAT(NET_SCTP),
 #endif
 #if defined(NET_LLC) || (defined(HAVE_DECL_NET_LLC) && HAVE_DECL_NET_LLC)
-	XLAT(NET_LLC),
+ XLAT(NET_LLC),
 #endif
 #if defined(NET_NETFILTER) || (defined(HAVE_DECL_NET_NETFILTER) && HAVE_DECL_NET_NETFILTER)
-	XLAT(NET_NETFILTER),
+ XLAT(NET_NETFILTER),
 #endif
 #if defined(NET_DCCP) || (defined(HAVE_DECL_NET_DCCP) && HAVE_DECL_NET_DCCP)
-	XLAT(NET_DCCP),
+ XLAT(NET_DCCP),
 #endif
 #if defined(NET_IRDA) || (defined(HAVE_DECL_NET_IRDA) && HAVE_DECL_NET_IRDA)
-	XLAT(NET_IRDA),
+ XLAT(NET_IRDA),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sysctl_net_core.h b/xlat/sysctl_net_core.h
index 5a5d627..25e0f60 100644
--- a/xlat/sysctl_net_core.h
+++ b/xlat/sysctl_net_core.h
@@ -2,70 +2,70 @@
 
 static const struct xlat sysctl_net_core[] = {
 #if defined(NET_CORE_WMEM_MAX) || (defined(HAVE_DECL_NET_CORE_WMEM_MAX) && HAVE_DECL_NET_CORE_WMEM_MAX)
-	XLAT(NET_CORE_WMEM_MAX),
+ XLAT(NET_CORE_WMEM_MAX),
 #endif
 #if defined(NET_CORE_RMEM_MAX) || (defined(HAVE_DECL_NET_CORE_RMEM_MAX) && HAVE_DECL_NET_CORE_RMEM_MAX)
-	XLAT(NET_CORE_RMEM_MAX),
+ XLAT(NET_CORE_RMEM_MAX),
 #endif
 #if defined(NET_CORE_WMEM_DEFAULT) || (defined(HAVE_DECL_NET_CORE_WMEM_DEFAULT) && HAVE_DECL_NET_CORE_WMEM_DEFAULT)
-	XLAT(NET_CORE_WMEM_DEFAULT),
+ XLAT(NET_CORE_WMEM_DEFAULT),
 #endif
 #if defined(NET_CORE_RMEM_DEFAULT) || (defined(HAVE_DECL_NET_CORE_RMEM_DEFAULT) && HAVE_DECL_NET_CORE_RMEM_DEFAULT)
-	XLAT(NET_CORE_RMEM_DEFAULT),
+ XLAT(NET_CORE_RMEM_DEFAULT),
 #endif
 #if defined(NET_CORE_DESTROY_DELAY) || (defined(HAVE_DECL_NET_CORE_DESTROY_DELAY) && HAVE_DECL_NET_CORE_DESTROY_DELAY)
-	XLAT(NET_CORE_DESTROY_DELAY),
+ XLAT(NET_CORE_DESTROY_DELAY),
 #endif
 #if defined(NET_CORE_MAX_BACKLOG) || (defined(HAVE_DECL_NET_CORE_MAX_BACKLOG) && HAVE_DECL_NET_CORE_MAX_BACKLOG)
-	XLAT(NET_CORE_MAX_BACKLOG),
+ XLAT(NET_CORE_MAX_BACKLOG),
 #endif
 #if defined(NET_CORE_FASTROUTE) || (defined(HAVE_DECL_NET_CORE_FASTROUTE) && HAVE_DECL_NET_CORE_FASTROUTE)
-	XLAT(NET_CORE_FASTROUTE),
+ XLAT(NET_CORE_FASTROUTE),
 #endif
 #if defined(NET_CORE_MSG_COST) || (defined(HAVE_DECL_NET_CORE_MSG_COST) && HAVE_DECL_NET_CORE_MSG_COST)
-	XLAT(NET_CORE_MSG_COST),
+ XLAT(NET_CORE_MSG_COST),
 #endif
 #if defined(NET_CORE_MSG_BURST) || (defined(HAVE_DECL_NET_CORE_MSG_BURST) && HAVE_DECL_NET_CORE_MSG_BURST)
-	XLAT(NET_CORE_MSG_BURST),
+ XLAT(NET_CORE_MSG_BURST),
 #endif
 #if defined(NET_CORE_OPTMEM_MAX) || (defined(HAVE_DECL_NET_CORE_OPTMEM_MAX) && HAVE_DECL_NET_CORE_OPTMEM_MAX)
-	XLAT(NET_CORE_OPTMEM_MAX),
+ XLAT(NET_CORE_OPTMEM_MAX),
 #endif
 #if defined(NET_CORE_HOT_LIST_LENGTH) || (defined(HAVE_DECL_NET_CORE_HOT_LIST_LENGTH) && HAVE_DECL_NET_CORE_HOT_LIST_LENGTH)
-	XLAT(NET_CORE_HOT_LIST_LENGTH),
+ XLAT(NET_CORE_HOT_LIST_LENGTH),
 #endif
 #if defined(NET_CORE_DIVERT_VERSION) || (defined(HAVE_DECL_NET_CORE_DIVERT_VERSION) && HAVE_DECL_NET_CORE_DIVERT_VERSION)
-	XLAT(NET_CORE_DIVERT_VERSION),
+ XLAT(NET_CORE_DIVERT_VERSION),
 #endif
 #if defined(NET_CORE_NO_CONG_THRESH) || (defined(HAVE_DECL_NET_CORE_NO_CONG_THRESH) && HAVE_DECL_NET_CORE_NO_CONG_THRESH)
-	XLAT(NET_CORE_NO_CONG_THRESH),
+ XLAT(NET_CORE_NO_CONG_THRESH),
 #endif
 #if defined(NET_CORE_NO_CONG) || (defined(HAVE_DECL_NET_CORE_NO_CONG) && HAVE_DECL_NET_CORE_NO_CONG)
-	XLAT(NET_CORE_NO_CONG),
+ XLAT(NET_CORE_NO_CONG),
 #endif
 #if defined(NET_CORE_LO_CONG) || (defined(HAVE_DECL_NET_CORE_LO_CONG) && HAVE_DECL_NET_CORE_LO_CONG)
-	XLAT(NET_CORE_LO_CONG),
+ XLAT(NET_CORE_LO_CONG),
 #endif
 #if defined(NET_CORE_MOD_CONG) || (defined(HAVE_DECL_NET_CORE_MOD_CONG) && HAVE_DECL_NET_CORE_MOD_CONG)
-	XLAT(NET_CORE_MOD_CONG),
+ XLAT(NET_CORE_MOD_CONG),
 #endif
 #if defined(NET_CORE_DEV_WEIGHT) || (defined(HAVE_DECL_NET_CORE_DEV_WEIGHT) && HAVE_DECL_NET_CORE_DEV_WEIGHT)
-	XLAT(NET_CORE_DEV_WEIGHT),
+ XLAT(NET_CORE_DEV_WEIGHT),
 #endif
 #if defined(NET_CORE_SOMAXCONN) || (defined(HAVE_DECL_NET_CORE_SOMAXCONN) && HAVE_DECL_NET_CORE_SOMAXCONN)
-	XLAT(NET_CORE_SOMAXCONN),
+ XLAT(NET_CORE_SOMAXCONN),
 #endif
 #if defined(NET_CORE_BUDGET) || (defined(HAVE_DECL_NET_CORE_BUDGET) && HAVE_DECL_NET_CORE_BUDGET)
-	XLAT(NET_CORE_BUDGET),
+ XLAT(NET_CORE_BUDGET),
 #endif
 #if defined(NET_CORE_AEVENT_ETIME) || (defined(HAVE_DECL_NET_CORE_AEVENT_ETIME) && HAVE_DECL_NET_CORE_AEVENT_ETIME)
-	XLAT(NET_CORE_AEVENT_ETIME),
+ XLAT(NET_CORE_AEVENT_ETIME),
 #endif
 #if defined(NET_CORE_AEVENT_RSEQTH) || (defined(HAVE_DECL_NET_CORE_AEVENT_RSEQTH) && HAVE_DECL_NET_CORE_AEVENT_RSEQTH)
-	XLAT(NET_CORE_AEVENT_RSEQTH),
+ XLAT(NET_CORE_AEVENT_RSEQTH),
 #endif
 #if defined(NET_CORE_WARNINGS) || (defined(HAVE_DECL_NET_CORE_WARNINGS) && HAVE_DECL_NET_CORE_WARNINGS)
-	XLAT(NET_CORE_WARNINGS),
+ XLAT(NET_CORE_WARNINGS),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sysctl_net_ipv4.h b/xlat/sysctl_net_ipv4.h
index addd87b..8c68f63 100644
--- a/xlat/sysctl_net_ipv4.h
+++ b/xlat/sysctl_net_ipv4.h
@@ -2,280 +2,280 @@
 
 static const struct xlat sysctl_net_ipv4[] = {
 #if defined(NET_IPV4_FORWARD) || (defined(HAVE_DECL_NET_IPV4_FORWARD) && HAVE_DECL_NET_IPV4_FORWARD)
-	XLAT(NET_IPV4_FORWARD),
+ XLAT(NET_IPV4_FORWARD),
 #endif
 #if defined(NET_IPV4_DYNADDR) || (defined(HAVE_DECL_NET_IPV4_DYNADDR) && HAVE_DECL_NET_IPV4_DYNADDR)
-	XLAT(NET_IPV4_DYNADDR),
+ XLAT(NET_IPV4_DYNADDR),
 #endif
 #if defined(NET_IPV4_CONF) || (defined(HAVE_DECL_NET_IPV4_CONF) && HAVE_DECL_NET_IPV4_CONF)
-	XLAT(NET_IPV4_CONF),
+ XLAT(NET_IPV4_CONF),
 #endif
 #if defined(NET_IPV4_NEIGH) || (defined(HAVE_DECL_NET_IPV4_NEIGH) && HAVE_DECL_NET_IPV4_NEIGH)
-	XLAT(NET_IPV4_NEIGH),
+ XLAT(NET_IPV4_NEIGH),
 #endif
 #if defined(NET_IPV4_ROUTE) || (defined(HAVE_DECL_NET_IPV4_ROUTE) && HAVE_DECL_NET_IPV4_ROUTE)
-	XLAT(NET_IPV4_ROUTE),
+ XLAT(NET_IPV4_ROUTE),
 #endif
 #if defined(NET_IPV4_FIB_HASH) || (defined(HAVE_DECL_NET_IPV4_FIB_HASH) && HAVE_DECL_NET_IPV4_FIB_HASH)
-	XLAT(NET_IPV4_FIB_HASH),
+ XLAT(NET_IPV4_FIB_HASH),
 #endif
 #if defined(NET_IPV4_NETFILTER) || (defined(HAVE_DECL_NET_IPV4_NETFILTER) && HAVE_DECL_NET_IPV4_NETFILTER)
-	XLAT(NET_IPV4_NETFILTER),
+ XLAT(NET_IPV4_NETFILTER),
 #endif
 #if defined(NET_IPV4_TCP_TIMESTAMPS) || (defined(HAVE_DECL_NET_IPV4_TCP_TIMESTAMPS) && HAVE_DECL_NET_IPV4_TCP_TIMESTAMPS)
-	XLAT(NET_IPV4_TCP_TIMESTAMPS),
+ XLAT(NET_IPV4_TCP_TIMESTAMPS),
 #endif
 #if defined(NET_IPV4_TCP_WINDOW_SCALING) || (defined(HAVE_DECL_NET_IPV4_TCP_WINDOW_SCALING) && HAVE_DECL_NET_IPV4_TCP_WINDOW_SCALING)
-	XLAT(NET_IPV4_TCP_WINDOW_SCALING),
+ XLAT(NET_IPV4_TCP_WINDOW_SCALING),
 #endif
 #if defined(NET_IPV4_TCP_SACK) || (defined(HAVE_DECL_NET_IPV4_TCP_SACK) && HAVE_DECL_NET_IPV4_TCP_SACK)
-	XLAT(NET_IPV4_TCP_SACK),
+ XLAT(NET_IPV4_TCP_SACK),
 #endif
 #if defined(NET_IPV4_TCP_RETRANS_COLLAPSE) || (defined(HAVE_DECL_NET_IPV4_TCP_RETRANS_COLLAPSE) && HAVE_DECL_NET_IPV4_TCP_RETRANS_COLLAPSE)
-	XLAT(NET_IPV4_TCP_RETRANS_COLLAPSE),
+ XLAT(NET_IPV4_TCP_RETRANS_COLLAPSE),
 #endif
 #if defined(NET_IPV4_DEFAULT_TTL) || (defined(HAVE_DECL_NET_IPV4_DEFAULT_TTL) && HAVE_DECL_NET_IPV4_DEFAULT_TTL)
-	XLAT(NET_IPV4_DEFAULT_TTL),
+ XLAT(NET_IPV4_DEFAULT_TTL),
 #endif
 #if defined(NET_IPV4_AUTOCONFIG) || (defined(HAVE_DECL_NET_IPV4_AUTOCONFIG) && HAVE_DECL_NET_IPV4_AUTOCONFIG)
-	XLAT(NET_IPV4_AUTOCONFIG),
+ XLAT(NET_IPV4_AUTOCONFIG),
 #endif
 #if defined(NET_IPV4_NO_PMTU_DISC) || (defined(HAVE_DECL_NET_IPV4_NO_PMTU_DISC) && HAVE_DECL_NET_IPV4_NO_PMTU_DISC)
-	XLAT(NET_IPV4_NO_PMTU_DISC),
+ XLAT(NET_IPV4_NO_PMTU_DISC),
 #endif
 #if defined(NET_IPV4_TCP_SYN_RETRIES) || (defined(HAVE_DECL_NET_IPV4_TCP_SYN_RETRIES) && HAVE_DECL_NET_IPV4_TCP_SYN_RETRIES)
-	XLAT(NET_IPV4_TCP_SYN_RETRIES),
+ XLAT(NET_IPV4_TCP_SYN_RETRIES),
 #endif
 #if defined(NET_IPV4_IPFRAG_HIGH_THRESH) || (defined(HAVE_DECL_NET_IPV4_IPFRAG_HIGH_THRESH) && HAVE_DECL_NET_IPV4_IPFRAG_HIGH_THRESH)
-	XLAT(NET_IPV4_IPFRAG_HIGH_THRESH),
+ XLAT(NET_IPV4_IPFRAG_HIGH_THRESH),
 #endif
 #if defined(NET_IPV4_IPFRAG_LOW_THRESH) || (defined(HAVE_DECL_NET_IPV4_IPFRAG_LOW_THRESH) && HAVE_DECL_NET_IPV4_IPFRAG_LOW_THRESH)
-	XLAT(NET_IPV4_IPFRAG_LOW_THRESH),
+ XLAT(NET_IPV4_IPFRAG_LOW_THRESH),
 #endif
 #if defined(NET_IPV4_IPFRAG_TIME) || (defined(HAVE_DECL_NET_IPV4_IPFRAG_TIME) && HAVE_DECL_NET_IPV4_IPFRAG_TIME)
-	XLAT(NET_IPV4_IPFRAG_TIME),
+ XLAT(NET_IPV4_IPFRAG_TIME),
 #endif
 #if defined(NET_IPV4_TCP_MAX_KA_PROBES) || (defined(HAVE_DECL_NET_IPV4_TCP_MAX_KA_PROBES) && HAVE_DECL_NET_IPV4_TCP_MAX_KA_PROBES)
-	XLAT(NET_IPV4_TCP_MAX_KA_PROBES),
+ XLAT(NET_IPV4_TCP_MAX_KA_PROBES),
 #endif
 #if defined(NET_IPV4_TCP_KEEPALIVE_TIME) || (defined(HAVE_DECL_NET_IPV4_TCP_KEEPALIVE_TIME) && HAVE_DECL_NET_IPV4_TCP_KEEPALIVE_TIME)
-	XLAT(NET_IPV4_TCP_KEEPALIVE_TIME),
+ XLAT(NET_IPV4_TCP_KEEPALIVE_TIME),
 #endif
 #if defined(NET_IPV4_TCP_KEEPALIVE_PROBES) || (defined(HAVE_DECL_NET_IPV4_TCP_KEEPALIVE_PROBES) && HAVE_DECL_NET_IPV4_TCP_KEEPALIVE_PROBES)
-	XLAT(NET_IPV4_TCP_KEEPALIVE_PROBES),
+ XLAT(NET_IPV4_TCP_KEEPALIVE_PROBES),
 #endif
 #if defined(NET_IPV4_TCP_RETRIES1) || (defined(HAVE_DECL_NET_IPV4_TCP_RETRIES1) && HAVE_DECL_NET_IPV4_TCP_RETRIES1)
-	XLAT(NET_IPV4_TCP_RETRIES1),
+ XLAT(NET_IPV4_TCP_RETRIES1),
 #endif
 #if defined(NET_IPV4_TCP_RETRIES2) || (defined(HAVE_DECL_NET_IPV4_TCP_RETRIES2) && HAVE_DECL_NET_IPV4_TCP_RETRIES2)
-	XLAT(NET_IPV4_TCP_RETRIES2),
+ XLAT(NET_IPV4_TCP_RETRIES2),
 #endif
 #if defined(NET_IPV4_TCP_FIN_TIMEOUT) || (defined(HAVE_DECL_NET_IPV4_TCP_FIN_TIMEOUT) && HAVE_DECL_NET_IPV4_TCP_FIN_TIMEOUT)
-	XLAT(NET_IPV4_TCP_FIN_TIMEOUT),
+ XLAT(NET_IPV4_TCP_FIN_TIMEOUT),
 #endif
 #if defined(NET_IPV4_IP_MASQ_DEBUG) || (defined(HAVE_DECL_NET_IPV4_IP_MASQ_DEBUG) && HAVE_DECL_NET_IPV4_IP_MASQ_DEBUG)
-	XLAT(NET_IPV4_IP_MASQ_DEBUG),
+ XLAT(NET_IPV4_IP_MASQ_DEBUG),
 #endif
 #if defined(NET_TCP_SYNCOOKIES) || (defined(HAVE_DECL_NET_TCP_SYNCOOKIES) && HAVE_DECL_NET_TCP_SYNCOOKIES)
-	XLAT(NET_TCP_SYNCOOKIES),
+ XLAT(NET_TCP_SYNCOOKIES),
 #endif
 #if defined(NET_TCP_STDURG) || (defined(HAVE_DECL_NET_TCP_STDURG) && HAVE_DECL_NET_TCP_STDURG)
-	XLAT(NET_TCP_STDURG),
+ XLAT(NET_TCP_STDURG),
 #endif
 #if defined(NET_TCP_RFC1337) || (defined(HAVE_DECL_NET_TCP_RFC1337) && HAVE_DECL_NET_TCP_RFC1337)
-	XLAT(NET_TCP_RFC1337),
+ XLAT(NET_TCP_RFC1337),
 #endif
 #if defined(NET_TCP_SYN_TAILDROP) || (defined(HAVE_DECL_NET_TCP_SYN_TAILDROP) && HAVE_DECL_NET_TCP_SYN_TAILDROP)
-	XLAT(NET_TCP_SYN_TAILDROP),
+ XLAT(NET_TCP_SYN_TAILDROP),
 #endif
 #if defined(NET_TCP_MAX_SYN_BACKLOG) || (defined(HAVE_DECL_NET_TCP_MAX_SYN_BACKLOG) && HAVE_DECL_NET_TCP_MAX_SYN_BACKLOG)
-	XLAT(NET_TCP_MAX_SYN_BACKLOG),
+ XLAT(NET_TCP_MAX_SYN_BACKLOG),
 #endif
 #if defined(NET_IPV4_LOCAL_PORT_RANGE) || (defined(HAVE_DECL_NET_IPV4_LOCAL_PORT_RANGE) && HAVE_DECL_NET_IPV4_LOCAL_PORT_RANGE)
-	XLAT(NET_IPV4_LOCAL_PORT_RANGE),
+ XLAT(NET_IPV4_LOCAL_PORT_RANGE),
 #endif
 #if defined(NET_IPV4_ICMP_ECHO_IGNORE_ALL) || (defined(HAVE_DECL_NET_IPV4_ICMP_ECHO_IGNORE_ALL) && HAVE_DECL_NET_IPV4_ICMP_ECHO_IGNORE_ALL)
-	XLAT(NET_IPV4_ICMP_ECHO_IGNORE_ALL),
+ XLAT(NET_IPV4_ICMP_ECHO_IGNORE_ALL),
 #endif
 #if defined(NET_IPV4_ICMP_ECHO_IGNORE_BROADCASTS) || (defined(HAVE_DECL_NET_IPV4_ICMP_ECHO_IGNORE_BROADCASTS) && HAVE_DECL_NET_IPV4_ICMP_ECHO_IGNORE_BROADCASTS)
-	XLAT(NET_IPV4_ICMP_ECHO_IGNORE_BROADCASTS),
+ XLAT(NET_IPV4_ICMP_ECHO_IGNORE_BROADCASTS),
 #endif
 #if defined(NET_IPV4_ICMP_SOURCEQUENCH_RATE) || (defined(HAVE_DECL_NET_IPV4_ICMP_SOURCEQUENCH_RATE) && HAVE_DECL_NET_IPV4_ICMP_SOURCEQUENCH_RATE)
-	XLAT(NET_IPV4_ICMP_SOURCEQUENCH_RATE),
+ XLAT(NET_IPV4_ICMP_SOURCEQUENCH_RATE),
 #endif
 #if defined(NET_IPV4_ICMP_DESTUNREACH_RATE) || (defined(HAVE_DECL_NET_IPV4_ICMP_DESTUNREACH_RATE) && HAVE_DECL_NET_IPV4_ICMP_DESTUNREACH_RATE)
-	XLAT(NET_IPV4_ICMP_DESTUNREACH_RATE),
+ XLAT(NET_IPV4_ICMP_DESTUNREACH_RATE),
 #endif
 #if defined(NET_IPV4_ICMP_TIMEEXCEED_RATE) || (defined(HAVE_DECL_NET_IPV4_ICMP_TIMEEXCEED_RATE) && HAVE_DECL_NET_IPV4_ICMP_TIMEEXCEED_RATE)
-	XLAT(NET_IPV4_ICMP_TIMEEXCEED_RATE),
+ XLAT(NET_IPV4_ICMP_TIMEEXCEED_RATE),
 #endif
 #if defined(NET_IPV4_ICMP_PARAMPROB_RATE) || (defined(HAVE_DECL_NET_IPV4_ICMP_PARAMPROB_RATE) && HAVE_DECL_NET_IPV4_ICMP_PARAMPROB_RATE)
-	XLAT(NET_IPV4_ICMP_PARAMPROB_RATE),
+ XLAT(NET_IPV4_ICMP_PARAMPROB_RATE),
 #endif
 #if defined(NET_IPV4_ICMP_ECHOREPLY_RATE) || (defined(HAVE_DECL_NET_IPV4_ICMP_ECHOREPLY_RATE) && HAVE_DECL_NET_IPV4_ICMP_ECHOREPLY_RATE)
-	XLAT(NET_IPV4_ICMP_ECHOREPLY_RATE),
+ XLAT(NET_IPV4_ICMP_ECHOREPLY_RATE),
 #endif
 #if defined(NET_IPV4_ICMP_IGNORE_BOGUS_ERROR_RESPONSES) || (defined(HAVE_DECL_NET_IPV4_ICMP_IGNORE_BOGUS_ERROR_RESPONSES) && HAVE_DECL_NET_IPV4_ICMP_IGNORE_BOGUS_ERROR_RESPONSES)
-	XLAT(NET_IPV4_ICMP_IGNORE_BOGUS_ERROR_RESPONSES),
+ XLAT(NET_IPV4_ICMP_IGNORE_BOGUS_ERROR_RESPONSES),
 #endif
 #if defined(NET_IPV4_IGMP_MAX_MEMBERSHIPS) || (defined(HAVE_DECL_NET_IPV4_IGMP_MAX_MEMBERSHIPS) && HAVE_DECL_NET_IPV4_IGMP_MAX_MEMBERSHIPS)
-	XLAT(NET_IPV4_IGMP_MAX_MEMBERSHIPS),
+ XLAT(NET_IPV4_IGMP_MAX_MEMBERSHIPS),
 #endif
 #if defined(NET_TCP_TW_RECYCLE) || (defined(HAVE_DECL_NET_TCP_TW_RECYCLE) && HAVE_DECL_NET_TCP_TW_RECYCLE)
-	XLAT(NET_TCP_TW_RECYCLE),
+ XLAT(NET_TCP_TW_RECYCLE),
 #endif
 #if defined(NET_IPV4_ALWAYS_DEFRAG) || (defined(HAVE_DECL_NET_IPV4_ALWAYS_DEFRAG) && HAVE_DECL_NET_IPV4_ALWAYS_DEFRAG)
-	XLAT(NET_IPV4_ALWAYS_DEFRAG),
+ XLAT(NET_IPV4_ALWAYS_DEFRAG),
 #endif
 #if defined(NET_IPV4_TCP_KEEPALIVE_INTVL) || (defined(HAVE_DECL_NET_IPV4_TCP_KEEPALIVE_INTVL) && HAVE_DECL_NET_IPV4_TCP_KEEPALIVE_INTVL)
-	XLAT(NET_IPV4_TCP_KEEPALIVE_INTVL),
+ XLAT(NET_IPV4_TCP_KEEPALIVE_INTVL),
 #endif
 #if defined(NET_IPV4_INET_PEER_THRESHOLD) || (defined(HAVE_DECL_NET_IPV4_INET_PEER_THRESHOLD) && HAVE_DECL_NET_IPV4_INET_PEER_THRESHOLD)
-	XLAT(NET_IPV4_INET_PEER_THRESHOLD),
+ XLAT(NET_IPV4_INET_PEER_THRESHOLD),
 #endif
 #if defined(NET_IPV4_INET_PEER_MINTTL) || (defined(HAVE_DECL_NET_IPV4_INET_PEER_MINTTL) && HAVE_DECL_NET_IPV4_INET_PEER_MINTTL)
-	XLAT(NET_IPV4_INET_PEER_MINTTL),
+ XLAT(NET_IPV4_INET_PEER_MINTTL),
 #endif
 #if defined(NET_IPV4_INET_PEER_MAXTTL) || (defined(HAVE_DECL_NET_IPV4_INET_PEER_MAXTTL) && HAVE_DECL_NET_IPV4_INET_PEER_MAXTTL)
-	XLAT(NET_IPV4_INET_PEER_MAXTTL),
+ XLAT(NET_IPV4_INET_PEER_MAXTTL),
 #endif
 #if defined(NET_IPV4_INET_PEER_GC_MINTIME) || (defined(HAVE_DECL_NET_IPV4_INET_PEER_GC_MINTIME) && HAVE_DECL_NET_IPV4_INET_PEER_GC_MINTIME)
-	XLAT(NET_IPV4_INET_PEER_GC_MINTIME),
+ XLAT(NET_IPV4_INET_PEER_GC_MINTIME),
 #endif
 #if defined(NET_IPV4_INET_PEER_GC_MAXTIME) || (defined(HAVE_DECL_NET_IPV4_INET_PEER_GC_MAXTIME) && HAVE_DECL_NET_IPV4_INET_PEER_GC_MAXTIME)
-	XLAT(NET_IPV4_INET_PEER_GC_MAXTIME),
+ XLAT(NET_IPV4_INET_PEER_GC_MAXTIME),
 #endif
 #if defined(NET_TCP_ORPHAN_RETRIES) || (defined(HAVE_DECL_NET_TCP_ORPHAN_RETRIES) && HAVE_DECL_NET_TCP_ORPHAN_RETRIES)
-	XLAT(NET_TCP_ORPHAN_RETRIES),
+ XLAT(NET_TCP_ORPHAN_RETRIES),
 #endif
 #if defined(NET_TCP_ABORT_ON_OVERFLOW) || (defined(HAVE_DECL_NET_TCP_ABORT_ON_OVERFLOW) && HAVE_DECL_NET_TCP_ABORT_ON_OVERFLOW)
-	XLAT(NET_TCP_ABORT_ON_OVERFLOW),
+ XLAT(NET_TCP_ABORT_ON_OVERFLOW),
 #endif
 #if defined(NET_TCP_SYNACK_RETRIES) || (defined(HAVE_DECL_NET_TCP_SYNACK_RETRIES) && HAVE_DECL_NET_TCP_SYNACK_RETRIES)
-	XLAT(NET_TCP_SYNACK_RETRIES),
+ XLAT(NET_TCP_SYNACK_RETRIES),
 #endif
 #if defined(NET_TCP_MAX_ORPHANS) || (defined(HAVE_DECL_NET_TCP_MAX_ORPHANS) && HAVE_DECL_NET_TCP_MAX_ORPHANS)
-	XLAT(NET_TCP_MAX_ORPHANS),
+ XLAT(NET_TCP_MAX_ORPHANS),
 #endif
 #if defined(NET_TCP_MAX_TW_BUCKETS) || (defined(HAVE_DECL_NET_TCP_MAX_TW_BUCKETS) && HAVE_DECL_NET_TCP_MAX_TW_BUCKETS)
-	XLAT(NET_TCP_MAX_TW_BUCKETS),
+ XLAT(NET_TCP_MAX_TW_BUCKETS),
 #endif
 #if defined(NET_TCP_FACK) || (defined(HAVE_DECL_NET_TCP_FACK) && HAVE_DECL_NET_TCP_FACK)
-	XLAT(NET_TCP_FACK),
+ XLAT(NET_TCP_FACK),
 #endif
 #if defined(NET_TCP_REORDERING) || (defined(HAVE_DECL_NET_TCP_REORDERING) && HAVE_DECL_NET_TCP_REORDERING)
-	XLAT(NET_TCP_REORDERING),
+ XLAT(NET_TCP_REORDERING),
 #endif
 #if defined(NET_TCP_ECN) || (defined(HAVE_DECL_NET_TCP_ECN) && HAVE_DECL_NET_TCP_ECN)
-	XLAT(NET_TCP_ECN),
+ XLAT(NET_TCP_ECN),
 #endif
 #if defined(NET_TCP_DSACK) || (defined(HAVE_DECL_NET_TCP_DSACK) && HAVE_DECL_NET_TCP_DSACK)
-	XLAT(NET_TCP_DSACK),
+ XLAT(NET_TCP_DSACK),
 #endif
 #if defined(NET_TCP_MEM) || (defined(HAVE_DECL_NET_TCP_MEM) && HAVE_DECL_NET_TCP_MEM)
-	XLAT(NET_TCP_MEM),
+ XLAT(NET_TCP_MEM),
 #endif
 #if defined(NET_TCP_WMEM) || (defined(HAVE_DECL_NET_TCP_WMEM) && HAVE_DECL_NET_TCP_WMEM)
-	XLAT(NET_TCP_WMEM),
+ XLAT(NET_TCP_WMEM),
 #endif
 #if defined(NET_TCP_RMEM) || (defined(HAVE_DECL_NET_TCP_RMEM) && HAVE_DECL_NET_TCP_RMEM)
-	XLAT(NET_TCP_RMEM),
+ XLAT(NET_TCP_RMEM),
 #endif
 #if defined(NET_TCP_APP_WIN) || (defined(HAVE_DECL_NET_TCP_APP_WIN) && HAVE_DECL_NET_TCP_APP_WIN)
-	XLAT(NET_TCP_APP_WIN),
+ XLAT(NET_TCP_APP_WIN),
 #endif
 #if defined(NET_TCP_ADV_WIN_SCALE) || (defined(HAVE_DECL_NET_TCP_ADV_WIN_SCALE) && HAVE_DECL_NET_TCP_ADV_WIN_SCALE)
-	XLAT(NET_TCP_ADV_WIN_SCALE),
+ XLAT(NET_TCP_ADV_WIN_SCALE),
 #endif
 #if defined(NET_IPV4_NONLOCAL_BIND) || (defined(HAVE_DECL_NET_IPV4_NONLOCAL_BIND) && HAVE_DECL_NET_IPV4_NONLOCAL_BIND)
-	XLAT(NET_IPV4_NONLOCAL_BIND),
+ XLAT(NET_IPV4_NONLOCAL_BIND),
 #endif
 #if defined(NET_IPV4_ICMP_RATELIMIT) || (defined(HAVE_DECL_NET_IPV4_ICMP_RATELIMIT) && HAVE_DECL_NET_IPV4_ICMP_RATELIMIT)
-	XLAT(NET_IPV4_ICMP_RATELIMIT),
+ XLAT(NET_IPV4_ICMP_RATELIMIT),
 #endif
 #if defined(NET_IPV4_ICMP_RATEMASK) || (defined(HAVE_DECL_NET_IPV4_ICMP_RATEMASK) && HAVE_DECL_NET_IPV4_ICMP_RATEMASK)
-	XLAT(NET_IPV4_ICMP_RATEMASK),
+ XLAT(NET_IPV4_ICMP_RATEMASK),
 #endif
 #if defined(NET_TCP_TW_REUSE) || (defined(HAVE_DECL_NET_TCP_TW_REUSE) && HAVE_DECL_NET_TCP_TW_REUSE)
-	XLAT(NET_TCP_TW_REUSE),
+ XLAT(NET_TCP_TW_REUSE),
 #endif
 #if defined(NET_TCP_FRTO) || (defined(HAVE_DECL_NET_TCP_FRTO) && HAVE_DECL_NET_TCP_FRTO)
-	XLAT(NET_TCP_FRTO),
+ XLAT(NET_TCP_FRTO),
 #endif
 #if defined(NET_TCP_LOW_LATENCY) || (defined(HAVE_DECL_NET_TCP_LOW_LATENCY) && HAVE_DECL_NET_TCP_LOW_LATENCY)
-	XLAT(NET_TCP_LOW_LATENCY),
+ XLAT(NET_TCP_LOW_LATENCY),
 #endif
 #if defined(NET_IPV4_IPFRAG_SECRET_INTERVAL) || (defined(HAVE_DECL_NET_IPV4_IPFRAG_SECRET_INTERVAL) && HAVE_DECL_NET_IPV4_IPFRAG_SECRET_INTERVAL)
-	XLAT(NET_IPV4_IPFRAG_SECRET_INTERVAL),
+ XLAT(NET_IPV4_IPFRAG_SECRET_INTERVAL),
 #endif
 #if defined(NET_IPV4_IGMP_MAX_MSF) || (defined(HAVE_DECL_NET_IPV4_IGMP_MAX_MSF) && HAVE_DECL_NET_IPV4_IGMP_MAX_MSF)
-	XLAT(NET_IPV4_IGMP_MAX_MSF),
+ XLAT(NET_IPV4_IGMP_MAX_MSF),
 #endif
 #if defined(NET_TCP_NO_METRICS_SAVE) || (defined(HAVE_DECL_NET_TCP_NO_METRICS_SAVE) && HAVE_DECL_NET_TCP_NO_METRICS_SAVE)
-	XLAT(NET_TCP_NO_METRICS_SAVE),
+ XLAT(NET_TCP_NO_METRICS_SAVE),
 #endif
 #if defined(NET_TCP_DEFAULT_WIN_SCALE) || (defined(HAVE_DECL_NET_TCP_DEFAULT_WIN_SCALE) && HAVE_DECL_NET_TCP_DEFAULT_WIN_SCALE)
-	XLAT(NET_TCP_DEFAULT_WIN_SCALE),
+ XLAT(NET_TCP_DEFAULT_WIN_SCALE),
 #endif
 #if defined(NET_TCP_MODERATE_RCVBUF) || (defined(HAVE_DECL_NET_TCP_MODERATE_RCVBUF) && HAVE_DECL_NET_TCP_MODERATE_RCVBUF)
-	XLAT(NET_TCP_MODERATE_RCVBUF),
+ XLAT(NET_TCP_MODERATE_RCVBUF),
 #endif
 #if defined(NET_TCP_TSO_WIN_DIVISOR) || (defined(HAVE_DECL_NET_TCP_TSO_WIN_DIVISOR) && HAVE_DECL_NET_TCP_TSO_WIN_DIVISOR)
-	XLAT(NET_TCP_TSO_WIN_DIVISOR),
+ XLAT(NET_TCP_TSO_WIN_DIVISOR),
 #endif
 #if defined(NET_TCP_BIC_BETA) || (defined(HAVE_DECL_NET_TCP_BIC_BETA) && HAVE_DECL_NET_TCP_BIC_BETA)
-	XLAT(NET_TCP_BIC_BETA),
+ XLAT(NET_TCP_BIC_BETA),
 #endif
 #if defined(NET_IPV4_ICMP_ERRORS_USE_INBOUND_IFADDR) || (defined(HAVE_DECL_NET_IPV4_ICMP_ERRORS_USE_INBOUND_IFADDR) && HAVE_DECL_NET_IPV4_ICMP_ERRORS_USE_INBOUND_IFADDR)
-	XLAT(NET_IPV4_ICMP_ERRORS_USE_INBOUND_IFADDR),
+ XLAT(NET_IPV4_ICMP_ERRORS_USE_INBOUND_IFADDR),
 #endif
 #if defined(NET_TCP_CONG_CONTROL) || (defined(HAVE_DECL_NET_TCP_CONG_CONTROL) && HAVE_DECL_NET_TCP_CONG_CONTROL)
-	XLAT(NET_TCP_CONG_CONTROL),
+ XLAT(NET_TCP_CONG_CONTROL),
 #endif
 #if defined(NET_TCP_ABC) || (defined(HAVE_DECL_NET_TCP_ABC) && HAVE_DECL_NET_TCP_ABC)
-	XLAT(NET_TCP_ABC),
+ XLAT(NET_TCP_ABC),
 #endif
 #if defined(NET_IPV4_IPFRAG_MAX_DIST) || (defined(HAVE_DECL_NET_IPV4_IPFRAG_MAX_DIST) && HAVE_DECL_NET_IPV4_IPFRAG_MAX_DIST)
-	XLAT(NET_IPV4_IPFRAG_MAX_DIST),
+ XLAT(NET_IPV4_IPFRAG_MAX_DIST),
 #endif
 #if defined(NET_TCP_MTU_PROBING) || (defined(HAVE_DECL_NET_TCP_MTU_PROBING) && HAVE_DECL_NET_TCP_MTU_PROBING)
-	XLAT(NET_TCP_MTU_PROBING),
+ XLAT(NET_TCP_MTU_PROBING),
 #endif
 #if defined(NET_TCP_BASE_MSS) || (defined(HAVE_DECL_NET_TCP_BASE_MSS) && HAVE_DECL_NET_TCP_BASE_MSS)
-	XLAT(NET_TCP_BASE_MSS),
+ XLAT(NET_TCP_BASE_MSS),
 #endif
 #if defined(NET_IPV4_TCP_WORKAROUND_SIGNED_WINDOWS) || (defined(HAVE_DECL_NET_IPV4_TCP_WORKAROUND_SIGNED_WINDOWS) && HAVE_DECL_NET_IPV4_TCP_WORKAROUND_SIGNED_WINDOWS)
-	XLAT(NET_IPV4_TCP_WORKAROUND_SIGNED_WINDOWS),
+ XLAT(NET_IPV4_TCP_WORKAROUND_SIGNED_WINDOWS),
 #endif
 #if defined(NET_TCP_DMA_COPYBREAK) || (defined(HAVE_DECL_NET_TCP_DMA_COPYBREAK) && HAVE_DECL_NET_TCP_DMA_COPYBREAK)
-	XLAT(NET_TCP_DMA_COPYBREAK),
+ XLAT(NET_TCP_DMA_COPYBREAK),
 #endif
 #if defined(NET_TCP_SLOW_START_AFTER_IDLE) || (defined(HAVE_DECL_NET_TCP_SLOW_START_AFTER_IDLE) && HAVE_DECL_NET_TCP_SLOW_START_AFTER_IDLE)
-	XLAT(NET_TCP_SLOW_START_AFTER_IDLE),
+ XLAT(NET_TCP_SLOW_START_AFTER_IDLE),
 #endif
 #if defined(NET_CIPSOV4_CACHE_ENABLE) || (defined(HAVE_DECL_NET_CIPSOV4_CACHE_ENABLE) && HAVE_DECL_NET_CIPSOV4_CACHE_ENABLE)
-	XLAT(NET_CIPSOV4_CACHE_ENABLE),
+ XLAT(NET_CIPSOV4_CACHE_ENABLE),
 #endif
 #if defined(NET_CIPSOV4_CACHE_BUCKET_SIZE) || (defined(HAVE_DECL_NET_CIPSOV4_CACHE_BUCKET_SIZE) && HAVE_DECL_NET_CIPSOV4_CACHE_BUCKET_SIZE)
-	XLAT(NET_CIPSOV4_CACHE_BUCKET_SIZE),
+ XLAT(NET_CIPSOV4_CACHE_BUCKET_SIZE),
 #endif
 #if defined(NET_CIPSOV4_RBM_OPTFMT) || (defined(HAVE_DECL_NET_CIPSOV4_RBM_OPTFMT) && HAVE_DECL_NET_CIPSOV4_RBM_OPTFMT)
-	XLAT(NET_CIPSOV4_RBM_OPTFMT),
+ XLAT(NET_CIPSOV4_RBM_OPTFMT),
 #endif
 #if defined(NET_CIPSOV4_RBM_STRICTVALID) || (defined(HAVE_DECL_NET_CIPSOV4_RBM_STRICTVALID) && HAVE_DECL_NET_CIPSOV4_RBM_STRICTVALID)
-	XLAT(NET_CIPSOV4_RBM_STRICTVALID),
+ XLAT(NET_CIPSOV4_RBM_STRICTVALID),
 #endif
 #if defined(NET_TCP_AVAIL_CONG_CONTROL) || (defined(HAVE_DECL_NET_TCP_AVAIL_CONG_CONTROL) && HAVE_DECL_NET_TCP_AVAIL_CONG_CONTROL)
-	XLAT(NET_TCP_AVAIL_CONG_CONTROL),
+ XLAT(NET_TCP_AVAIL_CONG_CONTROL),
 #endif
 #if defined(NET_TCP_ALLOWED_CONG_CONTROL) || (defined(HAVE_DECL_NET_TCP_ALLOWED_CONG_CONTROL) && HAVE_DECL_NET_TCP_ALLOWED_CONG_CONTROL)
-	XLAT(NET_TCP_ALLOWED_CONG_CONTROL),
+ XLAT(NET_TCP_ALLOWED_CONG_CONTROL),
 #endif
 #if defined(NET_TCP_MAX_SSTHRESH) || (defined(HAVE_DECL_NET_TCP_MAX_SSTHRESH) && HAVE_DECL_NET_TCP_MAX_SSTHRESH)
-	XLAT(NET_TCP_MAX_SSTHRESH),
+ XLAT(NET_TCP_MAX_SSTHRESH),
 #endif
 #if defined(NET_TCP_FRTO_RESPONSE) || (defined(HAVE_DECL_NET_TCP_FRTO_RESPONSE) && HAVE_DECL_NET_TCP_FRTO_RESPONSE)
-	XLAT(NET_TCP_FRTO_RESPONSE),
+ XLAT(NET_TCP_FRTO_RESPONSE),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sysctl_net_ipv4_conf.h b/xlat/sysctl_net_ipv4_conf.h
index dde6230..47bff97 100644
--- a/xlat/sysctl_net_ipv4_conf.h
+++ b/xlat/sysctl_net_ipv4_conf.h
@@ -2,70 +2,70 @@
 
 static const struct xlat sysctl_net_ipv4_conf[] = {
 #if defined(NET_IPV4_CONF_FORWARDING) || (defined(HAVE_DECL_NET_IPV4_CONF_FORWARDING) && HAVE_DECL_NET_IPV4_CONF_FORWARDING)
-	XLAT(NET_IPV4_CONF_FORWARDING),
+ XLAT(NET_IPV4_CONF_FORWARDING),
 #endif
 #if defined(NET_IPV4_CONF_MC_FORWARDING) || (defined(HAVE_DECL_NET_IPV4_CONF_MC_FORWARDING) && HAVE_DECL_NET_IPV4_CONF_MC_FORWARDING)
-	XLAT(NET_IPV4_CONF_MC_FORWARDING),
+ XLAT(NET_IPV4_CONF_MC_FORWARDING),
 #endif
 #if defined(NET_IPV4_CONF_PROXY_ARP) || (defined(HAVE_DECL_NET_IPV4_CONF_PROXY_ARP) && HAVE_DECL_NET_IPV4_CONF_PROXY_ARP)
-	XLAT(NET_IPV4_CONF_PROXY_ARP),
+ XLAT(NET_IPV4_CONF_PROXY_ARP),
 #endif
 #if defined(NET_IPV4_CONF_ACCEPT_REDIRECTS) || (defined(HAVE_DECL_NET_IPV4_CONF_ACCEPT_REDIRECTS) && HAVE_DECL_NET_IPV4_CONF_ACCEPT_REDIRECTS)
-	XLAT(NET_IPV4_CONF_ACCEPT_REDIRECTS),
+ XLAT(NET_IPV4_CONF_ACCEPT_REDIRECTS),
 #endif
 #if defined(NET_IPV4_CONF_SECURE_REDIRECTS) || (defined(HAVE_DECL_NET_IPV4_CONF_SECURE_REDIRECTS) && HAVE_DECL_NET_IPV4_CONF_SECURE_REDIRECTS)
-	XLAT(NET_IPV4_CONF_SECURE_REDIRECTS),
+ XLAT(NET_IPV4_CONF_SECURE_REDIRECTS),
 #endif
 #if defined(NET_IPV4_CONF_SEND_REDIRECTS) || (defined(HAVE_DECL_NET_IPV4_CONF_SEND_REDIRECTS) && HAVE_DECL_NET_IPV4_CONF_SEND_REDIRECTS)
-	XLAT(NET_IPV4_CONF_SEND_REDIRECTS),
+ XLAT(NET_IPV4_CONF_SEND_REDIRECTS),
 #endif
 #if defined(NET_IPV4_CONF_SHARED_MEDIA) || (defined(HAVE_DECL_NET_IPV4_CONF_SHARED_MEDIA) && HAVE_DECL_NET_IPV4_CONF_SHARED_MEDIA)
-	XLAT(NET_IPV4_CONF_SHARED_MEDIA),
+ XLAT(NET_IPV4_CONF_SHARED_MEDIA),
 #endif
 #if defined(NET_IPV4_CONF_RP_FILTER) || (defined(HAVE_DECL_NET_IPV4_CONF_RP_FILTER) && HAVE_DECL_NET_IPV4_CONF_RP_FILTER)
-	XLAT(NET_IPV4_CONF_RP_FILTER),
+ XLAT(NET_IPV4_CONF_RP_FILTER),
 #endif
 #if defined(NET_IPV4_CONF_ACCEPT_SOURCE_ROUTE) || (defined(HAVE_DECL_NET_IPV4_CONF_ACCEPT_SOURCE_ROUTE) && HAVE_DECL_NET_IPV4_CONF_ACCEPT_SOURCE_ROUTE)
-	XLAT(NET_IPV4_CONF_ACCEPT_SOURCE_ROUTE),
+ XLAT(NET_IPV4_CONF_ACCEPT_SOURCE_ROUTE),
 #endif
 #if defined(NET_IPV4_CONF_BOOTP_RELAY) || (defined(HAVE_DECL_NET_IPV4_CONF_BOOTP_RELAY) && HAVE_DECL_NET_IPV4_CONF_BOOTP_RELAY)
-	XLAT(NET_IPV4_CONF_BOOTP_RELAY),
+ XLAT(NET_IPV4_CONF_BOOTP_RELAY),
 #endif
 #if defined(NET_IPV4_CONF_LOG_MARTIANS) || (defined(HAVE_DECL_NET_IPV4_CONF_LOG_MARTIANS) && HAVE_DECL_NET_IPV4_CONF_LOG_MARTIANS)
-	XLAT(NET_IPV4_CONF_LOG_MARTIANS),
+ XLAT(NET_IPV4_CONF_LOG_MARTIANS),
 #endif
 #if defined(NET_IPV4_CONF_TAG) || (defined(HAVE_DECL_NET_IPV4_CONF_TAG) && HAVE_DECL_NET_IPV4_CONF_TAG)
-	XLAT(NET_IPV4_CONF_TAG),
+ XLAT(NET_IPV4_CONF_TAG),
 #endif
 #if defined(NET_IPV4_CONF_ARPFILTER) || (defined(HAVE_DECL_NET_IPV4_CONF_ARPFILTER) && HAVE_DECL_NET_IPV4_CONF_ARPFILTER)
-	XLAT(NET_IPV4_CONF_ARPFILTER),
+ XLAT(NET_IPV4_CONF_ARPFILTER),
 #endif
 #if defined(NET_IPV4_CONF_MEDIUM_ID) || (defined(HAVE_DECL_NET_IPV4_CONF_MEDIUM_ID) && HAVE_DECL_NET_IPV4_CONF_MEDIUM_ID)
-	XLAT(NET_IPV4_CONF_MEDIUM_ID),
+ XLAT(NET_IPV4_CONF_MEDIUM_ID),
 #endif
 #if defined(NET_IPV4_CONF_NOXFRM) || (defined(HAVE_DECL_NET_IPV4_CONF_NOXFRM) && HAVE_DECL_NET_IPV4_CONF_NOXFRM)
-	XLAT(NET_IPV4_CONF_NOXFRM),
+ XLAT(NET_IPV4_CONF_NOXFRM),
 #endif
 #if defined(NET_IPV4_CONF_NOPOLICY) || (defined(HAVE_DECL_NET_IPV4_CONF_NOPOLICY) && HAVE_DECL_NET_IPV4_CONF_NOPOLICY)
-	XLAT(NET_IPV4_CONF_NOPOLICY),
+ XLAT(NET_IPV4_CONF_NOPOLICY),
 #endif
 #if defined(NET_IPV4_CONF_FORCE_IGMP_VERSION) || (defined(HAVE_DECL_NET_IPV4_CONF_FORCE_IGMP_VERSION) && HAVE_DECL_NET_IPV4_CONF_FORCE_IGMP_VERSION)
-	XLAT(NET_IPV4_CONF_FORCE_IGMP_VERSION),
+ XLAT(NET_IPV4_CONF_FORCE_IGMP_VERSION),
 #endif
 #if defined(NET_IPV4_CONF_ARP_ANNOUNCE) || (defined(HAVE_DECL_NET_IPV4_CONF_ARP_ANNOUNCE) && HAVE_DECL_NET_IPV4_CONF_ARP_ANNOUNCE)
-	XLAT(NET_IPV4_CONF_ARP_ANNOUNCE),
+ XLAT(NET_IPV4_CONF_ARP_ANNOUNCE),
 #endif
 #if defined(NET_IPV4_CONF_ARP_IGNORE) || (defined(HAVE_DECL_NET_IPV4_CONF_ARP_IGNORE) && HAVE_DECL_NET_IPV4_CONF_ARP_IGNORE)
-	XLAT(NET_IPV4_CONF_ARP_IGNORE),
+ XLAT(NET_IPV4_CONF_ARP_IGNORE),
 #endif
 #if defined(NET_IPV4_CONF_PROMOTE_SECONDARIES) || (defined(HAVE_DECL_NET_IPV4_CONF_PROMOTE_SECONDARIES) && HAVE_DECL_NET_IPV4_CONF_PROMOTE_SECONDARIES)
-	XLAT(NET_IPV4_CONF_PROMOTE_SECONDARIES),
+ XLAT(NET_IPV4_CONF_PROMOTE_SECONDARIES),
 #endif
 #if defined(NET_IPV4_CONF_ARP_ACCEPT) || (defined(HAVE_DECL_NET_IPV4_CONF_ARP_ACCEPT) && HAVE_DECL_NET_IPV4_CONF_ARP_ACCEPT)
-	XLAT(NET_IPV4_CONF_ARP_ACCEPT),
+ XLAT(NET_IPV4_CONF_ARP_ACCEPT),
 #endif
 #if defined(NET_IPV4_CONF_ARP_NOTIFY) || (defined(HAVE_DECL_NET_IPV4_CONF_ARP_NOTIFY) && HAVE_DECL_NET_IPV4_CONF_ARP_NOTIFY)
-	XLAT(NET_IPV4_CONF_ARP_NOTIFY),
+ XLAT(NET_IPV4_CONF_ARP_NOTIFY),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sysctl_net_ipv4_route.h b/xlat/sysctl_net_ipv4_route.h
index 63820d6..1fe2025 100644
--- a/xlat/sysctl_net_ipv4_route.h
+++ b/xlat/sysctl_net_ipv4_route.h
@@ -2,61 +2,61 @@
 
 static const struct xlat sysctl_net_ipv4_route[] = {
 #if defined(NET_IPV4_ROUTE_FLUSH) || (defined(HAVE_DECL_NET_IPV4_ROUTE_FLUSH) && HAVE_DECL_NET_IPV4_ROUTE_FLUSH)
-	XLAT(NET_IPV4_ROUTE_FLUSH),
+ XLAT(NET_IPV4_ROUTE_FLUSH),
 #endif
 #if defined(NET_IPV4_ROUTE_MIN_DELAY) || (defined(HAVE_DECL_NET_IPV4_ROUTE_MIN_DELAY) && HAVE_DECL_NET_IPV4_ROUTE_MIN_DELAY)
-	XLAT(NET_IPV4_ROUTE_MIN_DELAY),
+ XLAT(NET_IPV4_ROUTE_MIN_DELAY),
 #endif
 #if defined(NET_IPV4_ROUTE_MAX_DELAY) || (defined(HAVE_DECL_NET_IPV4_ROUTE_MAX_DELAY) && HAVE_DECL_NET_IPV4_ROUTE_MAX_DELAY)
-	XLAT(NET_IPV4_ROUTE_MAX_DELAY),
+ XLAT(NET_IPV4_ROUTE_MAX_DELAY),
 #endif
 #if defined(NET_IPV4_ROUTE_GC_THRESH) || (defined(HAVE_DECL_NET_IPV4_ROUTE_GC_THRESH) && HAVE_DECL_NET_IPV4_ROUTE_GC_THRESH)
-	XLAT(NET_IPV4_ROUTE_GC_THRESH),
+ XLAT(NET_IPV4_ROUTE_GC_THRESH),
 #endif
 #if defined(NET_IPV4_ROUTE_MAX_SIZE) || (defined(HAVE_DECL_NET_IPV4_ROUTE_MAX_SIZE) && HAVE_DECL_NET_IPV4_ROUTE_MAX_SIZE)
-	XLAT(NET_IPV4_ROUTE_MAX_SIZE),
+ XLAT(NET_IPV4_ROUTE_MAX_SIZE),
 #endif
 #if defined(NET_IPV4_ROUTE_GC_MIN_INTERVAL) || (defined(HAVE_DECL_NET_IPV4_ROUTE_GC_MIN_INTERVAL) && HAVE_DECL_NET_IPV4_ROUTE_GC_MIN_INTERVAL)
-	XLAT(NET_IPV4_ROUTE_GC_MIN_INTERVAL),
+ XLAT(NET_IPV4_ROUTE_GC_MIN_INTERVAL),
 #endif
 #if defined(NET_IPV4_ROUTE_GC_TIMEOUT) || (defined(HAVE_DECL_NET_IPV4_ROUTE_GC_TIMEOUT) && HAVE_DECL_NET_IPV4_ROUTE_GC_TIMEOUT)
-	XLAT(NET_IPV4_ROUTE_GC_TIMEOUT),
+ XLAT(NET_IPV4_ROUTE_GC_TIMEOUT),
 #endif
 #if defined(NET_IPV4_ROUTE_GC_INTERVAL) || (defined(HAVE_DECL_NET_IPV4_ROUTE_GC_INTERVAL) && HAVE_DECL_NET_IPV4_ROUTE_GC_INTERVAL)
-	XLAT(NET_IPV4_ROUTE_GC_INTERVAL),
+ XLAT(NET_IPV4_ROUTE_GC_INTERVAL),
 #endif
 #if defined(NET_IPV4_ROUTE_REDIRECT_LOAD) || (defined(HAVE_DECL_NET_IPV4_ROUTE_REDIRECT_LOAD) && HAVE_DECL_NET_IPV4_ROUTE_REDIRECT_LOAD)
-	XLAT(NET_IPV4_ROUTE_REDIRECT_LOAD),
+ XLAT(NET_IPV4_ROUTE_REDIRECT_LOAD),
 #endif
 #if defined(NET_IPV4_ROUTE_REDIRECT_NUMBER) || (defined(HAVE_DECL_NET_IPV4_ROUTE_REDIRECT_NUMBER) && HAVE_DECL_NET_IPV4_ROUTE_REDIRECT_NUMBER)
-	XLAT(NET_IPV4_ROUTE_REDIRECT_NUMBER),
+ XLAT(NET_IPV4_ROUTE_REDIRECT_NUMBER),
 #endif
 #if defined(NET_IPV4_ROUTE_REDIRECT_SILENCE) || (defined(HAVE_DECL_NET_IPV4_ROUTE_REDIRECT_SILENCE) && HAVE_DECL_NET_IPV4_ROUTE_REDIRECT_SILENCE)
-	XLAT(NET_IPV4_ROUTE_REDIRECT_SILENCE),
+ XLAT(NET_IPV4_ROUTE_REDIRECT_SILENCE),
 #endif
 #if defined(NET_IPV4_ROUTE_ERROR_COST) || (defined(HAVE_DECL_NET_IPV4_ROUTE_ERROR_COST) && HAVE_DECL_NET_IPV4_ROUTE_ERROR_COST)
-	XLAT(NET_IPV4_ROUTE_ERROR_COST),
+ XLAT(NET_IPV4_ROUTE_ERROR_COST),
 #endif
 #if defined(NET_IPV4_ROUTE_ERROR_BURST) || (defined(HAVE_DECL_NET_IPV4_ROUTE_ERROR_BURST) && HAVE_DECL_NET_IPV4_ROUTE_ERROR_BURST)
-	XLAT(NET_IPV4_ROUTE_ERROR_BURST),
+ XLAT(NET_IPV4_ROUTE_ERROR_BURST),
 #endif
 #if defined(NET_IPV4_ROUTE_GC_ELASTICITY) || (defined(HAVE_DECL_NET_IPV4_ROUTE_GC_ELASTICITY) && HAVE_DECL_NET_IPV4_ROUTE_GC_ELASTICITY)
-	XLAT(NET_IPV4_ROUTE_GC_ELASTICITY),
+ XLAT(NET_IPV4_ROUTE_GC_ELASTICITY),
 #endif
 #if defined(NET_IPV4_ROUTE_MTU_EXPIRES) || (defined(HAVE_DECL_NET_IPV4_ROUTE_MTU_EXPIRES) && HAVE_DECL_NET_IPV4_ROUTE_MTU_EXPIRES)
-	XLAT(NET_IPV4_ROUTE_MTU_EXPIRES),
+ XLAT(NET_IPV4_ROUTE_MTU_EXPIRES),
 #endif
 #if defined(NET_IPV4_ROUTE_MIN_PMTU) || (defined(HAVE_DECL_NET_IPV4_ROUTE_MIN_PMTU) && HAVE_DECL_NET_IPV4_ROUTE_MIN_PMTU)
-	XLAT(NET_IPV4_ROUTE_MIN_PMTU),
+ XLAT(NET_IPV4_ROUTE_MIN_PMTU),
 #endif
 #if defined(NET_IPV4_ROUTE_MIN_ADVMSS) || (defined(HAVE_DECL_NET_IPV4_ROUTE_MIN_ADVMSS) && HAVE_DECL_NET_IPV4_ROUTE_MIN_ADVMSS)
-	XLAT(NET_IPV4_ROUTE_MIN_ADVMSS),
+ XLAT(NET_IPV4_ROUTE_MIN_ADVMSS),
 #endif
 #if defined(NET_IPV4_ROUTE_SECRET_INTERVAL) || (defined(HAVE_DECL_NET_IPV4_ROUTE_SECRET_INTERVAL) && HAVE_DECL_NET_IPV4_ROUTE_SECRET_INTERVAL)
-	XLAT(NET_IPV4_ROUTE_SECRET_INTERVAL),
+ XLAT(NET_IPV4_ROUTE_SECRET_INTERVAL),
 #endif
 #if defined(NET_IPV4_ROUTE_GC_MIN_INTERVAL_MS) || (defined(HAVE_DECL_NET_IPV4_ROUTE_GC_MIN_INTERVAL_MS) && HAVE_DECL_NET_IPV4_ROUTE_GC_MIN_INTERVAL_MS)
-	XLAT(NET_IPV4_ROUTE_GC_MIN_INTERVAL_MS),
+ XLAT(NET_IPV4_ROUTE_GC_MIN_INTERVAL_MS),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sysctl_net_ipv6.h b/xlat/sysctl_net_ipv6.h
index 514e2dd..4d4c053 100644
--- a/xlat/sysctl_net_ipv6.h
+++ b/xlat/sysctl_net_ipv6.h
@@ -2,34 +2,34 @@
 
 static const struct xlat sysctl_net_ipv6[] = {
 #if defined(NET_IPV6_CONF) || (defined(HAVE_DECL_NET_IPV6_CONF) && HAVE_DECL_NET_IPV6_CONF)
-	XLAT(NET_IPV6_CONF),
+ XLAT(NET_IPV6_CONF),
 #endif
 #if defined(NET_IPV6_NEIGH) || (defined(HAVE_DECL_NET_IPV6_NEIGH) && HAVE_DECL_NET_IPV6_NEIGH)
-	XLAT(NET_IPV6_NEIGH),
+ XLAT(NET_IPV6_NEIGH),
 #endif
 #if defined(NET_IPV6_ROUTE) || (defined(HAVE_DECL_NET_IPV6_ROUTE) && HAVE_DECL_NET_IPV6_ROUTE)
-	XLAT(NET_IPV6_ROUTE),
+ XLAT(NET_IPV6_ROUTE),
 #endif
 #if defined(NET_IPV6_ICMP) || (defined(HAVE_DECL_NET_IPV6_ICMP) && HAVE_DECL_NET_IPV6_ICMP)
-	XLAT(NET_IPV6_ICMP),
+ XLAT(NET_IPV6_ICMP),
 #endif
 #if defined(NET_IPV6_BINDV6ONLY) || (defined(HAVE_DECL_NET_IPV6_BINDV6ONLY) && HAVE_DECL_NET_IPV6_BINDV6ONLY)
-	XLAT(NET_IPV6_BINDV6ONLY),
+ XLAT(NET_IPV6_BINDV6ONLY),
 #endif
 #if defined(NET_IPV6_IP6FRAG_HIGH_THRESH) || (defined(HAVE_DECL_NET_IPV6_IP6FRAG_HIGH_THRESH) && HAVE_DECL_NET_IPV6_IP6FRAG_HIGH_THRESH)
-	XLAT(NET_IPV6_IP6FRAG_HIGH_THRESH),
+ XLAT(NET_IPV6_IP6FRAG_HIGH_THRESH),
 #endif
 #if defined(NET_IPV6_IP6FRAG_LOW_THRESH) || (defined(HAVE_DECL_NET_IPV6_IP6FRAG_LOW_THRESH) && HAVE_DECL_NET_IPV6_IP6FRAG_LOW_THRESH)
-	XLAT(NET_IPV6_IP6FRAG_LOW_THRESH),
+ XLAT(NET_IPV6_IP6FRAG_LOW_THRESH),
 #endif
 #if defined(NET_IPV6_IP6FRAG_TIME) || (defined(HAVE_DECL_NET_IPV6_IP6FRAG_TIME) && HAVE_DECL_NET_IPV6_IP6FRAG_TIME)
-	XLAT(NET_IPV6_IP6FRAG_TIME),
+ XLAT(NET_IPV6_IP6FRAG_TIME),
 #endif
 #if defined(NET_IPV6_IP6FRAG_SECRET_INTERVAL) || (defined(HAVE_DECL_NET_IPV6_IP6FRAG_SECRET_INTERVAL) && HAVE_DECL_NET_IPV6_IP6FRAG_SECRET_INTERVAL)
-	XLAT(NET_IPV6_IP6FRAG_SECRET_INTERVAL),
+ XLAT(NET_IPV6_IP6FRAG_SECRET_INTERVAL),
 #endif
 #if defined(NET_IPV6_MLD_MAX_MSF) || (defined(HAVE_DECL_NET_IPV6_MLD_MAX_MSF) && HAVE_DECL_NET_IPV6_MLD_MAX_MSF)
-	XLAT(NET_IPV6_MLD_MAX_MSF),
+ XLAT(NET_IPV6_MLD_MAX_MSF),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sysctl_net_ipv6_route.h b/xlat/sysctl_net_ipv6_route.h
index 1f363a5..2f23c82 100644
--- a/xlat/sysctl_net_ipv6_route.h
+++ b/xlat/sysctl_net_ipv6_route.h
@@ -2,34 +2,34 @@
 
 static const struct xlat sysctl_net_ipv6_route[] = {
 #if defined(NET_IPV6_ROUTE_FLUSH) || (defined(HAVE_DECL_NET_IPV6_ROUTE_FLUSH) && HAVE_DECL_NET_IPV6_ROUTE_FLUSH)
-	XLAT(NET_IPV6_ROUTE_FLUSH),
+ XLAT(NET_IPV6_ROUTE_FLUSH),
 #endif
 #if defined(NET_IPV6_ROUTE_GC_THRESH) || (defined(HAVE_DECL_NET_IPV6_ROUTE_GC_THRESH) && HAVE_DECL_NET_IPV6_ROUTE_GC_THRESH)
-	XLAT(NET_IPV6_ROUTE_GC_THRESH),
+ XLAT(NET_IPV6_ROUTE_GC_THRESH),
 #endif
 #if defined(NET_IPV6_ROUTE_MAX_SIZE) || (defined(HAVE_DECL_NET_IPV6_ROUTE_MAX_SIZE) && HAVE_DECL_NET_IPV6_ROUTE_MAX_SIZE)
-	XLAT(NET_IPV6_ROUTE_MAX_SIZE),
+ XLAT(NET_IPV6_ROUTE_MAX_SIZE),
 #endif
 #if defined(NET_IPV6_ROUTE_GC_MIN_INTERVAL) || (defined(HAVE_DECL_NET_IPV6_ROUTE_GC_MIN_INTERVAL) && HAVE_DECL_NET_IPV6_ROUTE_GC_MIN_INTERVAL)
-	XLAT(NET_IPV6_ROUTE_GC_MIN_INTERVAL),
+ XLAT(NET_IPV6_ROUTE_GC_MIN_INTERVAL),
 #endif
 #if defined(NET_IPV6_ROUTE_GC_TIMEOUT) || (defined(HAVE_DECL_NET_IPV6_ROUTE_GC_TIMEOUT) && HAVE_DECL_NET_IPV6_ROUTE_GC_TIMEOUT)
-	XLAT(NET_IPV6_ROUTE_GC_TIMEOUT),
+ XLAT(NET_IPV6_ROUTE_GC_TIMEOUT),
 #endif
 #if defined(NET_IPV6_ROUTE_GC_INTERVAL) || (defined(HAVE_DECL_NET_IPV6_ROUTE_GC_INTERVAL) && HAVE_DECL_NET_IPV6_ROUTE_GC_INTERVAL)
-	XLAT(NET_IPV6_ROUTE_GC_INTERVAL),
+ XLAT(NET_IPV6_ROUTE_GC_INTERVAL),
 #endif
 #if defined(NET_IPV6_ROUTE_GC_ELASTICITY) || (defined(HAVE_DECL_NET_IPV6_ROUTE_GC_ELASTICITY) && HAVE_DECL_NET_IPV6_ROUTE_GC_ELASTICITY)
-	XLAT(NET_IPV6_ROUTE_GC_ELASTICITY),
+ XLAT(NET_IPV6_ROUTE_GC_ELASTICITY),
 #endif
 #if defined(NET_IPV6_ROUTE_MTU_EXPIRES) || (defined(HAVE_DECL_NET_IPV6_ROUTE_MTU_EXPIRES) && HAVE_DECL_NET_IPV6_ROUTE_MTU_EXPIRES)
-	XLAT(NET_IPV6_ROUTE_MTU_EXPIRES),
+ XLAT(NET_IPV6_ROUTE_MTU_EXPIRES),
 #endif
 #if defined(NET_IPV6_ROUTE_MIN_ADVMSS) || (defined(HAVE_DECL_NET_IPV6_ROUTE_MIN_ADVMSS) && HAVE_DECL_NET_IPV6_ROUTE_MIN_ADVMSS)
-	XLAT(NET_IPV6_ROUTE_MIN_ADVMSS),
+ XLAT(NET_IPV6_ROUTE_MIN_ADVMSS),
 #endif
 #if defined(NET_IPV6_ROUTE_GC_MIN_INTERVAL_MS) || (defined(HAVE_DECL_NET_IPV6_ROUTE_GC_MIN_INTERVAL_MS) && HAVE_DECL_NET_IPV6_ROUTE_GC_MIN_INTERVAL_MS)
-	XLAT(NET_IPV6_ROUTE_GC_MIN_INTERVAL_MS),
+ XLAT(NET_IPV6_ROUTE_GC_MIN_INTERVAL_MS),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sysctl_net_unix.h b/xlat/sysctl_net_unix.h
index cd660e7..3593591 100644
--- a/xlat/sysctl_net_unix.h
+++ b/xlat/sysctl_net_unix.h
@@ -2,13 +2,13 @@
 
 static const struct xlat sysctl_net_unix[] = {
 #if defined(NET_UNIX_DESTROY_DELAY) || (defined(HAVE_DECL_NET_UNIX_DESTROY_DELAY) && HAVE_DECL_NET_UNIX_DESTROY_DELAY)
-	XLAT(NET_UNIX_DESTROY_DELAY),
+ XLAT(NET_UNIX_DESTROY_DELAY),
 #endif
 #if defined(NET_UNIX_DELETE_DELAY) || (defined(HAVE_DECL_NET_UNIX_DELETE_DELAY) && HAVE_DECL_NET_UNIX_DELETE_DELAY)
-	XLAT(NET_UNIX_DELETE_DELAY),
+ XLAT(NET_UNIX_DELETE_DELAY),
 #endif
 #if defined(NET_UNIX_MAX_DGRAM_QLEN) || (defined(HAVE_DECL_NET_UNIX_MAX_DGRAM_QLEN) && HAVE_DECL_NET_UNIX_MAX_DGRAM_QLEN)
-	XLAT(NET_UNIX_MAX_DGRAM_QLEN),
+ XLAT(NET_UNIX_MAX_DGRAM_QLEN),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sysctl_root.h b/xlat/sysctl_root.h
index 71d90c3..1e281e8 100644
--- a/xlat/sysctl_root.h
+++ b/xlat/sysctl_root.h
@@ -2,49 +2,49 @@
 
 static const struct xlat sysctl_root[] = {
 #if defined(CTL_KERN) || (defined(HAVE_DECL_CTL_KERN) && HAVE_DECL_CTL_KERN)
-	XLAT(CTL_KERN),
+ XLAT(CTL_KERN),
 #endif
 #if defined(CTL_VM) || (defined(HAVE_DECL_CTL_VM) && HAVE_DECL_CTL_VM)
-	XLAT(CTL_VM),
+ XLAT(CTL_VM),
 #endif
 #if defined(CTL_NET) || (defined(HAVE_DECL_CTL_NET) && HAVE_DECL_CTL_NET)
-	XLAT(CTL_NET),
+ XLAT(CTL_NET),
 #endif
 #if defined(CTL_PROC) || (defined(HAVE_DECL_CTL_PROC) && HAVE_DECL_CTL_PROC)
-	XLAT(CTL_PROC),
+ XLAT(CTL_PROC),
 #endif
 #if defined(CTL_FS) || (defined(HAVE_DECL_CTL_FS) && HAVE_DECL_CTL_FS)
-	XLAT(CTL_FS),
+ XLAT(CTL_FS),
 #endif
 #if defined(CTL_DEBUG) || (defined(HAVE_DECL_CTL_DEBUG) && HAVE_DECL_CTL_DEBUG)
-	XLAT(CTL_DEBUG),
+ XLAT(CTL_DEBUG),
 #endif
 #if defined(CTL_DEV) || (defined(HAVE_DECL_CTL_DEV) && HAVE_DECL_CTL_DEV)
-	XLAT(CTL_DEV),
+ XLAT(CTL_DEV),
 #endif
 #if defined(CTL_BUS) || (defined(HAVE_DECL_CTL_BUS) && HAVE_DECL_CTL_BUS)
-	XLAT(CTL_BUS),
+ XLAT(CTL_BUS),
 #endif
 #if defined(CTL_ABI) || (defined(HAVE_DECL_CTL_ABI) && HAVE_DECL_CTL_ABI)
-	XLAT(CTL_ABI),
+ XLAT(CTL_ABI),
 #endif
 #if defined(CTL_CPU) || (defined(HAVE_DECL_CTL_CPU) && HAVE_DECL_CTL_CPU)
-	XLAT(CTL_CPU),
+ XLAT(CTL_CPU),
 #endif
 #if defined(CTL_ARLAN) || (defined(HAVE_DECL_CTL_ARLAN) && HAVE_DECL_CTL_ARLAN)
-	XLAT(CTL_ARLAN),
+ XLAT(CTL_ARLAN),
 #endif
 #if defined(CTL_S390DBF) || (defined(HAVE_DECL_CTL_S390DBF) && HAVE_DECL_CTL_S390DBF)
-	XLAT(CTL_S390DBF),
+ XLAT(CTL_S390DBF),
 #endif
 #if defined(CTL_SUNRPC) || (defined(HAVE_DECL_CTL_SUNRPC) && HAVE_DECL_CTL_SUNRPC)
-	XLAT(CTL_SUNRPC),
+ XLAT(CTL_SUNRPC),
 #endif
 #if defined(CTL_PM) || (defined(HAVE_DECL_CTL_PM) && HAVE_DECL_CTL_PM)
-	XLAT(CTL_PM),
+ XLAT(CTL_PM),
 #endif
 #if defined(CTL_FRV) || (defined(HAVE_DECL_CTL_FRV) && HAVE_DECL_CTL_FRV)
-	XLAT(CTL_FRV),
+ XLAT(CTL_FRV),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/sysctl_vm.h b/xlat/sysctl_vm.h
index e2926ae..7e7e62d 100644
--- a/xlat/sysctl_vm.h
+++ b/xlat/sysctl_vm.h
@@ -2,64 +2,64 @@
 
 static const struct xlat sysctl_vm[] = {
 #if defined(VM_OVERCOMMIT_MEMORY) || (defined(HAVE_DECL_VM_OVERCOMMIT_MEMORY) && HAVE_DECL_VM_OVERCOMMIT_MEMORY)
-	XLAT(VM_OVERCOMMIT_MEMORY),
+ XLAT(VM_OVERCOMMIT_MEMORY),
 #endif
 #if defined(VM_PAGE_CLUSTER) || (defined(HAVE_DECL_VM_PAGE_CLUSTER) && HAVE_DECL_VM_PAGE_CLUSTER)
-	XLAT(VM_PAGE_CLUSTER),
+ XLAT(VM_PAGE_CLUSTER),
 #endif
 #if defined(VM_DIRTY_BACKGROUND) || (defined(HAVE_DECL_VM_DIRTY_BACKGROUND) && HAVE_DECL_VM_DIRTY_BACKGROUND)
-	XLAT(VM_DIRTY_BACKGROUND),
+ XLAT(VM_DIRTY_BACKGROUND),
 #endif
 #if defined(VM_DIRTY_RATIO) || (defined(HAVE_DECL_VM_DIRTY_RATIO) && HAVE_DECL_VM_DIRTY_RATIO)
-	XLAT(VM_DIRTY_RATIO),
+ XLAT(VM_DIRTY_RATIO),
 #endif
 #if defined(VM_DIRTY_WB_CS) || (defined(HAVE_DECL_VM_DIRTY_WB_CS) && HAVE_DECL_VM_DIRTY_WB_CS)
-	XLAT(VM_DIRTY_WB_CS),
+ XLAT(VM_DIRTY_WB_CS),
 #endif
 #if defined(VM_DIRTY_EXPIRE_CS) || (defined(HAVE_DECL_VM_DIRTY_EXPIRE_CS) && HAVE_DECL_VM_DIRTY_EXPIRE_CS)
-	XLAT(VM_DIRTY_EXPIRE_CS),
+ XLAT(VM_DIRTY_EXPIRE_CS),
 #endif
 #if defined(VM_NR_PDFLUSH_THREADS) || (defined(HAVE_DECL_VM_NR_PDFLUSH_THREADS) && HAVE_DECL_VM_NR_PDFLUSH_THREADS)
-	XLAT(VM_NR_PDFLUSH_THREADS),
+ XLAT(VM_NR_PDFLUSH_THREADS),
 #endif
 #if defined(VM_OVERCOMMIT_RATIO) || (defined(HAVE_DECL_VM_OVERCOMMIT_RATIO) && HAVE_DECL_VM_OVERCOMMIT_RATIO)
-	XLAT(VM_OVERCOMMIT_RATIO),
+ XLAT(VM_OVERCOMMIT_RATIO),
 #endif
 #if defined(VM_PAGEBUF) || (defined(HAVE_DECL_VM_PAGEBUF) && HAVE_DECL_VM_PAGEBUF)
-	XLAT(VM_PAGEBUF),
+ XLAT(VM_PAGEBUF),
 #endif
 #if defined(VM_HUGETLB_PAGES) || (defined(HAVE_DECL_VM_HUGETLB_PAGES) && HAVE_DECL_VM_HUGETLB_PAGES)
-	XLAT(VM_HUGETLB_PAGES),
+ XLAT(VM_HUGETLB_PAGES),
 #endif
 #if defined(VM_SWAPPINESS) || (defined(HAVE_DECL_VM_SWAPPINESS) && HAVE_DECL_VM_SWAPPINESS)
-	XLAT(VM_SWAPPINESS),
+ XLAT(VM_SWAPPINESS),
 #endif
 #if defined(VM_LOWMEM_RESERVE_RATIO) || (defined(HAVE_DECL_VM_LOWMEM_RESERVE_RATIO) && HAVE_DECL_VM_LOWMEM_RESERVE_RATIO)
-	XLAT(VM_LOWMEM_RESERVE_RATIO),
+ XLAT(VM_LOWMEM_RESERVE_RATIO),
 #endif
 #if defined(VM_MIN_FREE_KBYTES) || (defined(HAVE_DECL_VM_MIN_FREE_KBYTES) && HAVE_DECL_VM_MIN_FREE_KBYTES)
-	XLAT(VM_MIN_FREE_KBYTES),
+ XLAT(VM_MIN_FREE_KBYTES),
 #endif
 #if defined(VM_MAX_MAP_COUNT) || (defined(HAVE_DECL_VM_MAX_MAP_COUNT) && HAVE_DECL_VM_MAX_MAP_COUNT)
-	XLAT(VM_MAX_MAP_COUNT),
+ XLAT(VM_MAX_MAP_COUNT),
 #endif
 #if defined(VM_LAPTOP_MODE) || (defined(HAVE_DECL_VM_LAPTOP_MODE) && HAVE_DECL_VM_LAPTOP_MODE)
-	XLAT(VM_LAPTOP_MODE),
+ XLAT(VM_LAPTOP_MODE),
 #endif
 #if defined(VM_BLOCK_DUMP) || (defined(HAVE_DECL_VM_BLOCK_DUMP) && HAVE_DECL_VM_BLOCK_DUMP)
-	XLAT(VM_BLOCK_DUMP),
+ XLAT(VM_BLOCK_DUMP),
 #endif
 #if defined(VM_HUGETLB_GROUP) || (defined(HAVE_DECL_VM_HUGETLB_GROUP) && HAVE_DECL_VM_HUGETLB_GROUP)
-	XLAT(VM_HUGETLB_GROUP),
+ XLAT(VM_HUGETLB_GROUP),
 #endif
 #if defined(VM_VFS_CACHE_PRESSURE) || (defined(HAVE_DECL_VM_VFS_CACHE_PRESSURE) && HAVE_DECL_VM_VFS_CACHE_PRESSURE)
-	XLAT(VM_VFS_CACHE_PRESSURE),
+ XLAT(VM_VFS_CACHE_PRESSURE),
 #endif
 #if defined(VM_LEGACY_VA_LAYOUT) || (defined(HAVE_DECL_VM_LEGACY_VA_LAYOUT) && HAVE_DECL_VM_LEGACY_VA_LAYOUT)
-	XLAT(VM_LEGACY_VA_LAYOUT),
+ XLAT(VM_LEGACY_VA_LAYOUT),
 #endif
 #if defined(VM_SWAP_TOKEN_TIMEOUT) || (defined(HAVE_DECL_VM_SWAP_TOKEN_TIMEOUT) && HAVE_DECL_VM_SWAP_TOKEN_TIMEOUT)
-	XLAT(VM_SWAP_TOKEN_TIMEOUT),
+ XLAT(VM_SWAP_TOKEN_TIMEOUT),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/syslog_action_type.h b/xlat/syslog_action_type.h
index 1083d35..7946337 100644
--- a/xlat/syslog_action_type.h
+++ b/xlat/syslog_action_type.h
@@ -1,16 +1,16 @@
 /* Generated by ./xlat/gen.sh from ./xlat/syslog_action_type.in; do not edit. */
 
 static const struct xlat syslog_action_type[] = {
-	XLAT(SYSLOG_ACTION_CLOSE),
-	XLAT(SYSLOG_ACTION_OPEN),
-	XLAT(SYSLOG_ACTION_READ),
-	XLAT(SYSLOG_ACTION_READ_ALL),
-	XLAT(SYSLOG_ACTION_READ_CLEAR),
-	XLAT(SYSLOG_ACTION_CLEAR),
-	XLAT(SYSLOG_ACTION_CONSOLE_OFF),
-	XLAT(SYSLOG_ACTION_CONSOLE_ON),
-	XLAT(SYSLOG_ACTION_CONSOLE_LEVEL),
-	XLAT(SYSLOG_ACTION_SIZE_UNREAD),
-	XLAT(SYSLOG_ACTION_SIZE_BUFFER),
-	XLAT_END
+ XLAT(SYSLOG_ACTION_CLOSE),
+ XLAT(SYSLOG_ACTION_OPEN),
+ XLAT(SYSLOG_ACTION_READ),
+ XLAT(SYSLOG_ACTION_READ_ALL),
+ XLAT(SYSLOG_ACTION_READ_CLEAR),
+ XLAT(SYSLOG_ACTION_CLEAR),
+ XLAT(SYSLOG_ACTION_CONSOLE_OFF),
+ XLAT(SYSLOG_ACTION_CONSOLE_ON),
+ XLAT(SYSLOG_ACTION_CONSOLE_LEVEL),
+ XLAT(SYSLOG_ACTION_SIZE_UNREAD),
+ XLAT(SYSLOG_ACTION_SIZE_BUFFER),
+ XLAT_END
 };
diff --git a/xlat/sysmips_operations.h b/xlat/sysmips_operations.h
index 6138107..7d71c47 100644
--- a/xlat/sysmips_operations.h
+++ b/xlat/sysmips_operations.h
@@ -2,19 +2,19 @@
 
 static const struct xlat sysmips_operations[] = {
 #if defined(SETNAME) || (defined(HAVE_DECL_SETNAME) && HAVE_DECL_SETNAME)
-	XLAT(SETNAME),
+ XLAT(SETNAME),
 #endif
 #if defined(FLUSH_CACHE) || (defined(HAVE_DECL_FLUSH_CACHE) && HAVE_DECL_FLUSH_CACHE)
-	XLAT(FLUSH_CACHE),
+ XLAT(FLUSH_CACHE),
 #endif
 #if defined(MIPS_FIXADE) || (defined(HAVE_DECL_MIPS_FIXADE) && HAVE_DECL_MIPS_FIXADE)
-	XLAT(MIPS_FIXADE),
+ XLAT(MIPS_FIXADE),
 #endif
 #if defined(MIPS_RDNVRAM) || (defined(HAVE_DECL_MIPS_RDNVRAM) && HAVE_DECL_MIPS_RDNVRAM)
-	XLAT(MIPS_RDNVRAM),
+ XLAT(MIPS_RDNVRAM),
 #endif
 #if defined(MIPS_ATOMIC_SET) || (defined(HAVE_DECL_MIPS_ATOMIC_SET) && HAVE_DECL_MIPS_ATOMIC_SET)
-	XLAT(MIPS_ATOMIC_SET),
+ XLAT(MIPS_ATOMIC_SET),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/tcflsh_options.h b/xlat/tcflsh_options.h
index 83f77bf..99ce86f 100644
--- a/xlat/tcflsh_options.h
+++ b/xlat/tcflsh_options.h
@@ -2,13 +2,13 @@
 
 static const struct xlat tcflsh_options[] = {
 #if defined(TCIFLUSH) || (defined(HAVE_DECL_TCIFLUSH) && HAVE_DECL_TCIFLUSH)
-	XLAT(TCIFLUSH),
+ XLAT(TCIFLUSH),
 #endif
 #if defined(TCOFLUSH) || (defined(HAVE_DECL_TCOFLUSH) && HAVE_DECL_TCOFLUSH)
-	XLAT(TCOFLUSH),
+ XLAT(TCOFLUSH),
 #endif
 #if defined(TCIOFLUSH) || (defined(HAVE_DECL_TCIOFLUSH) && HAVE_DECL_TCIOFLUSH)
-	XLAT(TCIOFLUSH),
+ XLAT(TCIOFLUSH),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/tcxonc_options.h b/xlat/tcxonc_options.h
index a84f0ef..ed243be 100644
--- a/xlat/tcxonc_options.h
+++ b/xlat/tcxonc_options.h
@@ -2,16 +2,16 @@
 
 static const struct xlat tcxonc_options[] = {
 #if defined(TCOOFF) || (defined(HAVE_DECL_TCOOFF) && HAVE_DECL_TCOOFF)
-	XLAT(TCOOFF),
+ XLAT(TCOOFF),
 #endif
 #if defined(TCOON) || (defined(HAVE_DECL_TCOON) && HAVE_DECL_TCOON)
-	XLAT(TCOON),
+ XLAT(TCOON),
 #endif
 #if defined(TCIOFF) || (defined(HAVE_DECL_TCIOFF) && HAVE_DECL_TCIOFF)
-	XLAT(TCIOFF),
+ XLAT(TCIOFF),
 #endif
 #if defined(TCION) || (defined(HAVE_DECL_TCION) && HAVE_DECL_TCION)
-	XLAT(TCION),
+ XLAT(TCION),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/timerfdflags.h b/xlat/timerfdflags.h
index 2cbf75d..57af36e 100644
--- a/xlat/timerfdflags.h
+++ b/xlat/timerfdflags.h
@@ -3,32 +3,23 @@
 static const struct xlat timerfdflags[] = {
 /* The Linux userspace headers didn't export these for a long time. */
 
-#ifndef TFD_TIMER_ABSTIME
+#if !(defined(TFD_TIMER_ABSTIME) || (defined(HAVE_DECL_TFD_TIMER_ABSTIME) && HAVE_DECL_TFD_TIMER_ABSTIME))
 # define TFD_TIMER_ABSTIME (1 << 0)
 #endif
-#if defined(TFD_TIMER_ABSTIME) || (defined(HAVE_DECL_TFD_TIMER_ABSTIME) && HAVE_DECL_TFD_TIMER_ABSTIME)
-	XLAT(TFD_TIMER_ABSTIME),
-#endif
-
-#ifndef TFD_TIMER_CANCEL_ON_SET
+ XLAT(TFD_TIMER_ABSTIME),
+#if !(defined(TFD_TIMER_CANCEL_ON_SET) || (defined(HAVE_DECL_TFD_TIMER_CANCEL_ON_SET) && HAVE_DECL_TFD_TIMER_CANCEL_ON_SET))
 # define TFD_TIMER_CANCEL_ON_SET (1 << 1)
 #endif
-#if defined(TFD_TIMER_CANCEL_ON_SET) || (defined(HAVE_DECL_TFD_TIMER_CANCEL_ON_SET) && HAVE_DECL_TFD_TIMER_CANCEL_ON_SET)
-	XLAT(TFD_TIMER_CANCEL_ON_SET),
-#endif
-
-#ifndef TFD_CLOEXEC
+ XLAT(TFD_TIMER_CANCEL_ON_SET),
+#ifdef O_CLOEXEC
+#if !(defined(TFD_CLOEXEC) || (defined(HAVE_DECL_TFD_CLOEXEC) && HAVE_DECL_TFD_CLOEXEC))
 # define TFD_CLOEXEC O_CLOEXEC
 #endif
-#if defined(TFD_CLOEXEC) || (defined(HAVE_DECL_TFD_CLOEXEC) && HAVE_DECL_TFD_CLOEXEC)
-	XLAT(TFD_CLOEXEC),
+ XLAT(TFD_CLOEXEC),
 #endif
-
-#ifndef TFD_NONBLOCK
+#if !(defined(TFD_NONBLOCK) || (defined(HAVE_DECL_TFD_NONBLOCK) && HAVE_DECL_TFD_NONBLOCK))
 # define TFD_NONBLOCK O_NONBLOCK
 #endif
-#if defined(TFD_NONBLOCK) || (defined(HAVE_DECL_TFD_NONBLOCK) && HAVE_DECL_TFD_NONBLOCK)
-	XLAT(TFD_NONBLOCK),
-#endif
-	XLAT_END
+ XLAT(TFD_NONBLOCK),
+ XLAT_END
 };
diff --git a/xlat/ubi_volume_props.h b/xlat/ubi_volume_props.h
index 7aa90c6..721eaa1 100644
--- a/xlat/ubi_volume_props.h
+++ b/xlat/ubi_volume_props.h
@@ -1,6 +1,6 @@
 /* Generated by ./xlat/gen.sh from ./xlat/ubi_volume_props.in; do not edit. */
 
 static const struct xlat ubi_volume_props[] = {
-	XLAT(UBI_VOL_PROP_DIRECT_WRITE),
-	XLAT_END
+ XLAT(UBI_VOL_PROP_DIRECT_WRITE),
+ XLAT_END
 };
diff --git a/xlat/ubi_volume_types.h b/xlat/ubi_volume_types.h
index 36a2f07..d6759ec 100644
--- a/xlat/ubi_volume_types.h
+++ b/xlat/ubi_volume_types.h
@@ -1,7 +1,7 @@
 /* Generated by ./xlat/gen.sh from ./xlat/ubi_volume_types.in; do not edit. */
 
 static const struct xlat ubi_volume_types[] = {
-	XLAT(UBI_DYNAMIC_VOLUME),
-	XLAT(UBI_STATIC_VOLUME),
-	XLAT_END
+ XLAT(UBI_DYNAMIC_VOLUME),
+ XLAT(UBI_STATIC_VOLUME),
+ XLAT_END
 };
diff --git a/xlat/umount_flags.h b/xlat/umount_flags.h
index 304c1a6..ad978fc 100644
--- a/xlat/umount_flags.h
+++ b/xlat/umount_flags.h
@@ -2,13 +2,13 @@
 
 static const struct xlat umount_flags[] = {
 #if defined(MNT_FORCE) || (defined(HAVE_DECL_MNT_FORCE) && HAVE_DECL_MNT_FORCE)
-	XLAT(MNT_FORCE),
+ XLAT(MNT_FORCE),
 #endif
 #if defined(MNT_DETACH) || (defined(HAVE_DECL_MNT_DETACH) && HAVE_DECL_MNT_DETACH)
-	XLAT(MNT_DETACH),
+ XLAT(MNT_DETACH),
 #endif
 #if defined(MNT_EXPIRE) || (defined(HAVE_DECL_MNT_EXPIRE) && HAVE_DECL_MNT_EXPIRE)
-	XLAT(MNT_EXPIRE),
+ XLAT(MNT_EXPIRE),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/usagewho.h b/xlat/usagewho.h
index 860e0a0..e82cefc 100644
--- a/xlat/usagewho.h
+++ b/xlat/usagewho.h
@@ -2,13 +2,13 @@
 
 static const struct xlat usagewho[] = {
 #if defined(RUSAGE_SELF) || (defined(HAVE_DECL_RUSAGE_SELF) && HAVE_DECL_RUSAGE_SELF)
-	XLAT(RUSAGE_SELF),
+ XLAT(RUSAGE_SELF),
 #endif
 #if defined(RUSAGE_CHILDREN) || (defined(HAVE_DECL_RUSAGE_CHILDREN) && HAVE_DECL_RUSAGE_CHILDREN)
-	XLAT(RUSAGE_CHILDREN),
+ XLAT(RUSAGE_CHILDREN),
 #endif
 #if defined(RUSAGE_BOTH) || (defined(HAVE_DECL_RUSAGE_BOTH) && HAVE_DECL_RUSAGE_BOTH)
-	XLAT(RUSAGE_BOTH),
+ XLAT(RUSAGE_BOTH),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/v4l2_buf_flags.h b/xlat/v4l2_buf_flags.h
index b535d56..b69aecd 100644
--- a/xlat/v4l2_buf_flags.h
+++ b/xlat/v4l2_buf_flags.h
@@ -2,28 +2,28 @@
 
 static const struct xlat v4l2_buf_flags[] = {
 #if defined(V4L2_BUF_FLAG_MAPPED) || (defined(HAVE_DECL_V4L2_BUF_FLAG_MAPPED) && HAVE_DECL_V4L2_BUF_FLAG_MAPPED)
-	XLAT(V4L2_BUF_FLAG_MAPPED),
+ XLAT(V4L2_BUF_FLAG_MAPPED),
 #endif
 #if defined(V4L2_BUF_FLAG_QUEUED) || (defined(HAVE_DECL_V4L2_BUF_FLAG_QUEUED) && HAVE_DECL_V4L2_BUF_FLAG_QUEUED)
-	XLAT(V4L2_BUF_FLAG_QUEUED),
+ XLAT(V4L2_BUF_FLAG_QUEUED),
 #endif
 #if defined(V4L2_BUF_FLAG_DONE) || (defined(HAVE_DECL_V4L2_BUF_FLAG_DONE) && HAVE_DECL_V4L2_BUF_FLAG_DONE)
-	XLAT(V4L2_BUF_FLAG_DONE),
+ XLAT(V4L2_BUF_FLAG_DONE),
 #endif
 #if defined(V4L2_BUF_FLAG_KEYFRAME) || (defined(HAVE_DECL_V4L2_BUF_FLAG_KEYFRAME) && HAVE_DECL_V4L2_BUF_FLAG_KEYFRAME)
-	XLAT(V4L2_BUF_FLAG_KEYFRAME),
+ XLAT(V4L2_BUF_FLAG_KEYFRAME),
 #endif
 #if defined(V4L2_BUF_FLAG_PFRAME) || (defined(HAVE_DECL_V4L2_BUF_FLAG_PFRAME) && HAVE_DECL_V4L2_BUF_FLAG_PFRAME)
-	XLAT(V4L2_BUF_FLAG_PFRAME),
+ XLAT(V4L2_BUF_FLAG_PFRAME),
 #endif
 #if defined(V4L2_BUF_FLAG_BFRAME) || (defined(HAVE_DECL_V4L2_BUF_FLAG_BFRAME) && HAVE_DECL_V4L2_BUF_FLAG_BFRAME)
-	XLAT(V4L2_BUF_FLAG_BFRAME),
+ XLAT(V4L2_BUF_FLAG_BFRAME),
 #endif
 #if defined(V4L2_BUF_FLAG_TIMECODE) || (defined(HAVE_DECL_V4L2_BUF_FLAG_TIMECODE) && HAVE_DECL_V4L2_BUF_FLAG_TIMECODE)
-	XLAT(V4L2_BUF_FLAG_TIMECODE),
+ XLAT(V4L2_BUF_FLAG_TIMECODE),
 #endif
 #if defined(V4L2_BUF_FLAG_INPUT) || (defined(HAVE_DECL_V4L2_BUF_FLAG_INPUT) && HAVE_DECL_V4L2_BUF_FLAG_INPUT)
-	XLAT(V4L2_BUF_FLAG_INPUT),
+ XLAT(V4L2_BUF_FLAG_INPUT),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/v4l2_buf_types.h b/xlat/v4l2_buf_types.h
index c6bec89..019d95d 100644
--- a/xlat/v4l2_buf_types.h
+++ b/xlat/v4l2_buf_types.h
@@ -2,34 +2,34 @@
 
 static const struct xlat v4l2_buf_types[] = {
 #if defined(V4L2_BUF_TYPE_VIDEO_CAPTURE) || (defined(HAVE_DECL_V4L2_BUF_TYPE_VIDEO_CAPTURE) && HAVE_DECL_V4L2_BUF_TYPE_VIDEO_CAPTURE)
-	XLAT(V4L2_BUF_TYPE_VIDEO_CAPTURE),
+ XLAT(V4L2_BUF_TYPE_VIDEO_CAPTURE),
 #endif
 #if defined(V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) || (defined(HAVE_DECL_V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) && HAVE_DECL_V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE)
-	XLAT(V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE),
+ XLAT(V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE),
 #endif
 #if defined(V4L2_BUF_TYPE_VIDEO_OUTPUT) || (defined(HAVE_DECL_V4L2_BUF_TYPE_VIDEO_OUTPUT) && HAVE_DECL_V4L2_BUF_TYPE_VIDEO_OUTPUT)
-	XLAT(V4L2_BUF_TYPE_VIDEO_OUTPUT),
+ XLAT(V4L2_BUF_TYPE_VIDEO_OUTPUT),
 #endif
 #if defined(V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) || (defined(HAVE_DECL_V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) && HAVE_DECL_V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
-	XLAT(V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE),
+ XLAT(V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE),
 #endif
 #if defined(V4L2_BUF_TYPE_VIDEO_OVERLAY) || (defined(HAVE_DECL_V4L2_BUF_TYPE_VIDEO_OVERLAY) && HAVE_DECL_V4L2_BUF_TYPE_VIDEO_OVERLAY)
-	XLAT(V4L2_BUF_TYPE_VIDEO_OVERLAY),
+ XLAT(V4L2_BUF_TYPE_VIDEO_OVERLAY),
 #endif
 #if defined(V4L2_BUF_TYPE_VBI_CAPTURE) || (defined(HAVE_DECL_V4L2_BUF_TYPE_VBI_CAPTURE) && HAVE_DECL_V4L2_BUF_TYPE_VBI_CAPTURE)
-	XLAT(V4L2_BUF_TYPE_VBI_CAPTURE),
+ XLAT(V4L2_BUF_TYPE_VBI_CAPTURE),
 #endif
 #if defined(V4L2_BUF_TYPE_VBI_OUTPUT) || (defined(HAVE_DECL_V4L2_BUF_TYPE_VBI_OUTPUT) && HAVE_DECL_V4L2_BUF_TYPE_VBI_OUTPUT)
-	XLAT(V4L2_BUF_TYPE_VBI_OUTPUT),
+ XLAT(V4L2_BUF_TYPE_VBI_OUTPUT),
 #endif
 #if defined(V4L2_BUF_TYPE_SLICED_VBI_CAPTURE) || (defined(HAVE_DECL_V4L2_BUF_TYPE_SLICED_VBI_CAPTURE) && HAVE_DECL_V4L2_BUF_TYPE_SLICED_VBI_CAPTURE)
-	XLAT(V4L2_BUF_TYPE_SLICED_VBI_CAPTURE),
+ XLAT(V4L2_BUF_TYPE_SLICED_VBI_CAPTURE),
 #endif
 #if defined(V4L2_BUF_TYPE_SLICED_VBI_OUTPUT) || (defined(HAVE_DECL_V4L2_BUF_TYPE_SLICED_VBI_OUTPUT) && HAVE_DECL_V4L2_BUF_TYPE_SLICED_VBI_OUTPUT)
-	XLAT(V4L2_BUF_TYPE_SLICED_VBI_OUTPUT),
+ XLAT(V4L2_BUF_TYPE_SLICED_VBI_OUTPUT),
 #endif
 #if defined(V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY) || (defined(HAVE_DECL_V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY) && HAVE_DECL_V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY)
-	XLAT(V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY),
+ XLAT(V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/v4l2_capture_modes.h b/xlat/v4l2_capture_modes.h
index 62e7d8e..d1cbec0 100644
--- a/xlat/v4l2_capture_modes.h
+++ b/xlat/v4l2_capture_modes.h
@@ -2,7 +2,7 @@
 
 static const struct xlat v4l2_capture_modes[] = {
 #if defined(V4L2_MODE_HIGHQUALITY) || (defined(HAVE_DECL_V4L2_MODE_HIGHQUALITY) && HAVE_DECL_V4L2_MODE_HIGHQUALITY)
-	XLAT(V4L2_MODE_HIGHQUALITY),
+ XLAT(V4L2_MODE_HIGHQUALITY),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/v4l2_colorspaces.h b/xlat/v4l2_colorspaces.h
index 7620811..d6d7cb7 100644
--- a/xlat/v4l2_colorspaces.h
+++ b/xlat/v4l2_colorspaces.h
@@ -2,28 +2,28 @@
 
 static const struct xlat v4l2_colorspaces[] = {
 #if defined(V4L2_COLORSPACE_SMPTE170M) || (defined(HAVE_DECL_V4L2_COLORSPACE_SMPTE170M) && HAVE_DECL_V4L2_COLORSPACE_SMPTE170M)
-	XLAT(V4L2_COLORSPACE_SMPTE170M),
+ XLAT(V4L2_COLORSPACE_SMPTE170M),
 #endif
 #if defined(V4L2_COLORSPACE_SMPTE240M) || (defined(HAVE_DECL_V4L2_COLORSPACE_SMPTE240M) && HAVE_DECL_V4L2_COLORSPACE_SMPTE240M)
-	XLAT(V4L2_COLORSPACE_SMPTE240M),
+ XLAT(V4L2_COLORSPACE_SMPTE240M),
 #endif
 #if defined(V4L2_COLORSPACE_REC709) || (defined(HAVE_DECL_V4L2_COLORSPACE_REC709) && HAVE_DECL_V4L2_COLORSPACE_REC709)
-	XLAT(V4L2_COLORSPACE_REC709),
+ XLAT(V4L2_COLORSPACE_REC709),
 #endif
 #if defined(V4L2_COLORSPACE_BT878) || (defined(HAVE_DECL_V4L2_COLORSPACE_BT878) && HAVE_DECL_V4L2_COLORSPACE_BT878)
-	XLAT(V4L2_COLORSPACE_BT878),
+ XLAT(V4L2_COLORSPACE_BT878),
 #endif
 #if defined(V4L2_COLORSPACE_470_SYSTEM_M) || (defined(HAVE_DECL_V4L2_COLORSPACE_470_SYSTEM_M) && HAVE_DECL_V4L2_COLORSPACE_470_SYSTEM_M)
-	XLAT(V4L2_COLORSPACE_470_SYSTEM_M),
+ XLAT(V4L2_COLORSPACE_470_SYSTEM_M),
 #endif
 #if defined(V4L2_COLORSPACE_470_SYSTEM_BG) || (defined(HAVE_DECL_V4L2_COLORSPACE_470_SYSTEM_BG) && HAVE_DECL_V4L2_COLORSPACE_470_SYSTEM_BG)
-	XLAT(V4L2_COLORSPACE_470_SYSTEM_BG),
+ XLAT(V4L2_COLORSPACE_470_SYSTEM_BG),
 #endif
 #if defined(V4L2_COLORSPACE_JPEG) || (defined(HAVE_DECL_V4L2_COLORSPACE_JPEG) && HAVE_DECL_V4L2_COLORSPACE_JPEG)
-	XLAT(V4L2_COLORSPACE_JPEG),
+ XLAT(V4L2_COLORSPACE_JPEG),
 #endif
 #if defined(V4L2_COLORSPACE_SRGB) || (defined(HAVE_DECL_V4L2_COLORSPACE_SRGB) && HAVE_DECL_V4L2_COLORSPACE_SRGB)
-	XLAT(V4L2_COLORSPACE_SRGB),
+ XLAT(V4L2_COLORSPACE_SRGB),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/v4l2_control_classes.h b/xlat/v4l2_control_classes.h
index 4be2a7c..05e67c9 100644
--- a/xlat/v4l2_control_classes.h
+++ b/xlat/v4l2_control_classes.h
@@ -2,31 +2,31 @@
 
 static const struct xlat v4l2_control_classes[] = {
 #if defined(V4L2_CTRL_CLASS_USER) || (defined(HAVE_DECL_V4L2_CTRL_CLASS_USER) && HAVE_DECL_V4L2_CTRL_CLASS_USER)
-	XLAT(V4L2_CTRL_CLASS_USER),
+ XLAT(V4L2_CTRL_CLASS_USER),
 #endif
 #if defined(V4L2_CTRL_CLASS_MPEG) || (defined(HAVE_DECL_V4L2_CTRL_CLASS_MPEG) && HAVE_DECL_V4L2_CTRL_CLASS_MPEG)
-	XLAT(V4L2_CTRL_CLASS_MPEG),
+ XLAT(V4L2_CTRL_CLASS_MPEG),
 #endif
 #if defined(V4L2_CTRL_CLASS_CAMERA) || (defined(HAVE_DECL_V4L2_CTRL_CLASS_CAMERA) && HAVE_DECL_V4L2_CTRL_CLASS_CAMERA)
-	XLAT(V4L2_CTRL_CLASS_CAMERA),
+ XLAT(V4L2_CTRL_CLASS_CAMERA),
 #endif
 #if defined(V4L2_CTRL_CLASS_FM_TX) || (defined(HAVE_DECL_V4L2_CTRL_CLASS_FM_TX) && HAVE_DECL_V4L2_CTRL_CLASS_FM_TX)
-	XLAT(V4L2_CTRL_CLASS_FM_TX),
+ XLAT(V4L2_CTRL_CLASS_FM_TX),
 #endif
 #if defined(V4L2_CTRL_CLASS_FLASH) || (defined(HAVE_DECL_V4L2_CTRL_CLASS_FLASH) && HAVE_DECL_V4L2_CTRL_CLASS_FLASH)
-	XLAT(V4L2_CTRL_CLASS_FLASH),
+ XLAT(V4L2_CTRL_CLASS_FLASH),
 #endif
 #if defined(V4L2_CTRL_CLASS_JPEG) || (defined(HAVE_DECL_V4L2_CTRL_CLASS_JPEG) && HAVE_DECL_V4L2_CTRL_CLASS_JPEG)
-	XLAT(V4L2_CTRL_CLASS_JPEG),
+ XLAT(V4L2_CTRL_CLASS_JPEG),
 #endif
 #if defined(V4L2_CTRL_CLASS_IMAGE_SOURCE) || (defined(HAVE_DECL_V4L2_CTRL_CLASS_IMAGE_SOURCE) && HAVE_DECL_V4L2_CTRL_CLASS_IMAGE_SOURCE)
-	XLAT(V4L2_CTRL_CLASS_IMAGE_SOURCE),
+ XLAT(V4L2_CTRL_CLASS_IMAGE_SOURCE),
 #endif
 #if defined(V4L2_CTRL_CLASS_IMAGE_PROC) || (defined(HAVE_DECL_V4L2_CTRL_CLASS_IMAGE_PROC) && HAVE_DECL_V4L2_CTRL_CLASS_IMAGE_PROC)
-	XLAT(V4L2_CTRL_CLASS_IMAGE_PROC),
+ XLAT(V4L2_CTRL_CLASS_IMAGE_PROC),
 #endif
 #if defined(V4L2_CTRL_CLASS_FM_RX) || (defined(HAVE_DECL_V4L2_CTRL_CLASS_FM_RX) && HAVE_DECL_V4L2_CTRL_CLASS_FM_RX)
-	XLAT(V4L2_CTRL_CLASS_FM_RX),
+ XLAT(V4L2_CTRL_CLASS_FM_RX),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/v4l2_control_flags.h b/xlat/v4l2_control_flags.h
index 7abd690..adf3922 100644
--- a/xlat/v4l2_control_flags.h
+++ b/xlat/v4l2_control_flags.h
@@ -2,28 +2,28 @@
 
 static const struct xlat v4l2_control_flags[] = {
 #if defined(V4L2_CTRL_FLAG_DISABLED) || (defined(HAVE_DECL_V4L2_CTRL_FLAG_DISABLED) && HAVE_DECL_V4L2_CTRL_FLAG_DISABLED)
-	XLAT(V4L2_CTRL_FLAG_DISABLED),
+ XLAT(V4L2_CTRL_FLAG_DISABLED),
 #endif
 #if defined(V4L2_CTRL_FLAG_GRABBED) || (defined(HAVE_DECL_V4L2_CTRL_FLAG_GRABBED) && HAVE_DECL_V4L2_CTRL_FLAG_GRABBED)
-	XLAT(V4L2_CTRL_FLAG_GRABBED),
+ XLAT(V4L2_CTRL_FLAG_GRABBED),
 #endif
 #if defined(V4L2_CTRL_FLAG_READ_ONLY) || (defined(HAVE_DECL_V4L2_CTRL_FLAG_READ_ONLY) && HAVE_DECL_V4L2_CTRL_FLAG_READ_ONLY)
-	XLAT(V4L2_CTRL_FLAG_READ_ONLY),
+ XLAT(V4L2_CTRL_FLAG_READ_ONLY),
 #endif
 #if defined(V4L2_CTRL_FLAG_UPDATE) || (defined(HAVE_DECL_V4L2_CTRL_FLAG_UPDATE) && HAVE_DECL_V4L2_CTRL_FLAG_UPDATE)
-	XLAT(V4L2_CTRL_FLAG_UPDATE),
+ XLAT(V4L2_CTRL_FLAG_UPDATE),
 #endif
 #if defined(V4L2_CTRL_FLAG_INACTIVE) || (defined(HAVE_DECL_V4L2_CTRL_FLAG_INACTIVE) && HAVE_DECL_V4L2_CTRL_FLAG_INACTIVE)
-	XLAT(V4L2_CTRL_FLAG_INACTIVE),
+ XLAT(V4L2_CTRL_FLAG_INACTIVE),
 #endif
 #if defined(V4L2_CTRL_FLAG_SLIDER) || (defined(HAVE_DECL_V4L2_CTRL_FLAG_SLIDER) && HAVE_DECL_V4L2_CTRL_FLAG_SLIDER)
-	XLAT(V4L2_CTRL_FLAG_SLIDER),
+ XLAT(V4L2_CTRL_FLAG_SLIDER),
 #endif
 #if defined(V4L2_CTRL_FLAG_WRITE_ONLY) || (defined(HAVE_DECL_V4L2_CTRL_FLAG_WRITE_ONLY) && HAVE_DECL_V4L2_CTRL_FLAG_WRITE_ONLY)
-	XLAT(V4L2_CTRL_FLAG_WRITE_ONLY),
+ XLAT(V4L2_CTRL_FLAG_WRITE_ONLY),
 #endif
 #if defined(V4L2_CTRL_FLAG_VOLATILE) || (defined(HAVE_DECL_V4L2_CTRL_FLAG_VOLATILE) && HAVE_DECL_V4L2_CTRL_FLAG_VOLATILE)
-	XLAT(V4L2_CTRL_FLAG_VOLATILE),
+ XLAT(V4L2_CTRL_FLAG_VOLATILE),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/v4l2_control_ids.h b/xlat/v4l2_control_ids.h
index 8adbfca..c5a7aae 100644
--- a/xlat/v4l2_control_ids.h
+++ b/xlat/v4l2_control_ids.h
@@ -1,232 +1,232 @@
 /* Generated by ./xlat/gen.sh from ./xlat/v4l2_control_ids.in; do not edit. */
 
 static const struct xlat v4l2_control_ids[] = {
-	XLAT(0),
+ XLAT(0),
 #if defined(V4L2_CID_BRIGHTNESS) || (defined(HAVE_DECL_V4L2_CID_BRIGHTNESS) && HAVE_DECL_V4L2_CID_BRIGHTNESS)
-	XLAT(V4L2_CID_BRIGHTNESS),
+ XLAT(V4L2_CID_BRIGHTNESS),
 #endif
 #if defined(V4L2_CID_CONTRAST) || (defined(HAVE_DECL_V4L2_CID_CONTRAST) && HAVE_DECL_V4L2_CID_CONTRAST)
-	XLAT(V4L2_CID_CONTRAST),
+ XLAT(V4L2_CID_CONTRAST),
 #endif
 #if defined(V4L2_CID_SATURATION) || (defined(HAVE_DECL_V4L2_CID_SATURATION) && HAVE_DECL_V4L2_CID_SATURATION)
-	XLAT(V4L2_CID_SATURATION),
+ XLAT(V4L2_CID_SATURATION),
 #endif
 #if defined(V4L2_CID_HUE) || (defined(HAVE_DECL_V4L2_CID_HUE) && HAVE_DECL_V4L2_CID_HUE)
-	XLAT(V4L2_CID_HUE),
+ XLAT(V4L2_CID_HUE),
 #endif
 #if defined(V4L2_CID_AUDIO_VOLUME) || (defined(HAVE_DECL_V4L2_CID_AUDIO_VOLUME) && HAVE_DECL_V4L2_CID_AUDIO_VOLUME)
-	XLAT(V4L2_CID_AUDIO_VOLUME),
+ XLAT(V4L2_CID_AUDIO_VOLUME),
 #endif
 #if defined(V4L2_CID_AUDIO_BALANCE) || (defined(HAVE_DECL_V4L2_CID_AUDIO_BALANCE) && HAVE_DECL_V4L2_CID_AUDIO_BALANCE)
-	XLAT(V4L2_CID_AUDIO_BALANCE),
+ XLAT(V4L2_CID_AUDIO_BALANCE),
 #endif
 #if defined(V4L2_CID_AUDIO_BASS) || (defined(HAVE_DECL_V4L2_CID_AUDIO_BASS) && HAVE_DECL_V4L2_CID_AUDIO_BASS)
-	XLAT(V4L2_CID_AUDIO_BASS),
+ XLAT(V4L2_CID_AUDIO_BASS),
 #endif
 #if defined(V4L2_CID_AUDIO_TREBLE) || (defined(HAVE_DECL_V4L2_CID_AUDIO_TREBLE) && HAVE_DECL_V4L2_CID_AUDIO_TREBLE)
-	XLAT(V4L2_CID_AUDIO_TREBLE),
+ XLAT(V4L2_CID_AUDIO_TREBLE),
 #endif
 #if defined(V4L2_CID_AUDIO_MUTE) || (defined(HAVE_DECL_V4L2_CID_AUDIO_MUTE) && HAVE_DECL_V4L2_CID_AUDIO_MUTE)
-	XLAT(V4L2_CID_AUDIO_MUTE),
+ XLAT(V4L2_CID_AUDIO_MUTE),
 #endif
 #if defined(V4L2_CID_AUDIO_LOUDNESS) || (defined(HAVE_DECL_V4L2_CID_AUDIO_LOUDNESS) && HAVE_DECL_V4L2_CID_AUDIO_LOUDNESS)
-	XLAT(V4L2_CID_AUDIO_LOUDNESS),
+ XLAT(V4L2_CID_AUDIO_LOUDNESS),
 #endif
 #if defined(V4L2_CID_BLACK_LEVEL) || (defined(HAVE_DECL_V4L2_CID_BLACK_LEVEL) && HAVE_DECL_V4L2_CID_BLACK_LEVEL)
-	XLAT(V4L2_CID_BLACK_LEVEL),
+ XLAT(V4L2_CID_BLACK_LEVEL),
 #endif
 #if defined(V4L2_CID_AUTO_WHITE_BALANCE) || (defined(HAVE_DECL_V4L2_CID_AUTO_WHITE_BALANCE) && HAVE_DECL_V4L2_CID_AUTO_WHITE_BALANCE)
-	XLAT(V4L2_CID_AUTO_WHITE_BALANCE),
+ XLAT(V4L2_CID_AUTO_WHITE_BALANCE),
 #endif
 #if defined(V4L2_CID_DO_WHITE_BALANCE) || (defined(HAVE_DECL_V4L2_CID_DO_WHITE_BALANCE) && HAVE_DECL_V4L2_CID_DO_WHITE_BALANCE)
-	XLAT(V4L2_CID_DO_WHITE_BALANCE),
+ XLAT(V4L2_CID_DO_WHITE_BALANCE),
 #endif
 #if defined(V4L2_CID_RED_BALANCE) || (defined(HAVE_DECL_V4L2_CID_RED_BALANCE) && HAVE_DECL_V4L2_CID_RED_BALANCE)
-	XLAT(V4L2_CID_RED_BALANCE),
+ XLAT(V4L2_CID_RED_BALANCE),
 #endif
 #if defined(V4L2_CID_BLUE_BALANCE) || (defined(HAVE_DECL_V4L2_CID_BLUE_BALANCE) && HAVE_DECL_V4L2_CID_BLUE_BALANCE)
-	XLAT(V4L2_CID_BLUE_BALANCE),
+ XLAT(V4L2_CID_BLUE_BALANCE),
 #endif
 #if defined(V4L2_CID_GAMMA) || (defined(HAVE_DECL_V4L2_CID_GAMMA) && HAVE_DECL_V4L2_CID_GAMMA)
-	XLAT(V4L2_CID_GAMMA),
+ XLAT(V4L2_CID_GAMMA),
 #endif
 #if defined(V4L2_CID_WHITENESS) || (defined(HAVE_DECL_V4L2_CID_WHITENESS) && HAVE_DECL_V4L2_CID_WHITENESS)
-	XLAT(V4L2_CID_WHITENESS),
+ XLAT(V4L2_CID_WHITENESS),
 #endif
 #if defined(V4L2_CID_EXPOSURE) || (defined(HAVE_DECL_V4L2_CID_EXPOSURE) && HAVE_DECL_V4L2_CID_EXPOSURE)
-	XLAT(V4L2_CID_EXPOSURE),
+ XLAT(V4L2_CID_EXPOSURE),
 #endif
 #if defined(V4L2_CID_AUTOGAIN) || (defined(HAVE_DECL_V4L2_CID_AUTOGAIN) && HAVE_DECL_V4L2_CID_AUTOGAIN)
-	XLAT(V4L2_CID_AUTOGAIN),
+ XLAT(V4L2_CID_AUTOGAIN),
 #endif
 #if defined(V4L2_CID_GAIN) || (defined(HAVE_DECL_V4L2_CID_GAIN) && HAVE_DECL_V4L2_CID_GAIN)
-	XLAT(V4L2_CID_GAIN),
+ XLAT(V4L2_CID_GAIN),
 #endif
 #if defined(V4L2_CID_HFLIP) || (defined(HAVE_DECL_V4L2_CID_HFLIP) && HAVE_DECL_V4L2_CID_HFLIP)
-	XLAT(V4L2_CID_HFLIP),
+ XLAT(V4L2_CID_HFLIP),
 #endif
 #if defined(V4L2_CID_VFLIP) || (defined(HAVE_DECL_V4L2_CID_VFLIP) && HAVE_DECL_V4L2_CID_VFLIP)
-	XLAT(V4L2_CID_VFLIP),
+ XLAT(V4L2_CID_VFLIP),
 #endif
 #if defined(V4L2_CID_HCENTER) || (defined(HAVE_DECL_V4L2_CID_HCENTER) && HAVE_DECL_V4L2_CID_HCENTER)
-	XLAT(V4L2_CID_HCENTER),
+ XLAT(V4L2_CID_HCENTER),
 #endif
 #if defined(V4L2_CID_VCENTER) || (defined(HAVE_DECL_V4L2_CID_VCENTER) && HAVE_DECL_V4L2_CID_VCENTER)
-	XLAT(V4L2_CID_VCENTER),
+ XLAT(V4L2_CID_VCENTER),
 #endif
 #if defined(V4L2_CID_POWER_LINE_FREQUENCY) || (defined(HAVE_DECL_V4L2_CID_POWER_LINE_FREQUENCY) && HAVE_DECL_V4L2_CID_POWER_LINE_FREQUENCY)
-	XLAT(V4L2_CID_POWER_LINE_FREQUENCY),
+ XLAT(V4L2_CID_POWER_LINE_FREQUENCY),
 #endif
 #if defined(V4L2_CID_HUE_AUTO) || (defined(HAVE_DECL_V4L2_CID_HUE_AUTO) && HAVE_DECL_V4L2_CID_HUE_AUTO)
-	XLAT(V4L2_CID_HUE_AUTO),
+ XLAT(V4L2_CID_HUE_AUTO),
 #endif
 #if defined(V4L2_CID_WHITE_BALANCE_TEMPERATURE) || (defined(HAVE_DECL_V4L2_CID_WHITE_BALANCE_TEMPERATURE) && HAVE_DECL_V4L2_CID_WHITE_BALANCE_TEMPERATURE)
-	XLAT(V4L2_CID_WHITE_BALANCE_TEMPERATURE),
+ XLAT(V4L2_CID_WHITE_BALANCE_TEMPERATURE),
 #endif
 #if defined(V4L2_CID_SHARPNESS) || (defined(HAVE_DECL_V4L2_CID_SHARPNESS) && HAVE_DECL_V4L2_CID_SHARPNESS)
-	XLAT(V4L2_CID_SHARPNESS),
+ XLAT(V4L2_CID_SHARPNESS),
 #endif
 #if defined(V4L2_CID_BACKLIGHT_COMPENSATION) || (defined(HAVE_DECL_V4L2_CID_BACKLIGHT_COMPENSATION) && HAVE_DECL_V4L2_CID_BACKLIGHT_COMPENSATION)
-	XLAT(V4L2_CID_BACKLIGHT_COMPENSATION),
+ XLAT(V4L2_CID_BACKLIGHT_COMPENSATION),
 #endif
 #if defined(V4L2_CID_CHROMA_AGC) || (defined(HAVE_DECL_V4L2_CID_CHROMA_AGC) && HAVE_DECL_V4L2_CID_CHROMA_AGC)
-	XLAT(V4L2_CID_CHROMA_AGC),
+ XLAT(V4L2_CID_CHROMA_AGC),
 #endif
 #if defined(V4L2_CID_CHROMA_GAIN) || (defined(HAVE_DECL_V4L2_CID_CHROMA_GAIN) && HAVE_DECL_V4L2_CID_CHROMA_GAIN)
-	XLAT(V4L2_CID_CHROMA_GAIN),
+ XLAT(V4L2_CID_CHROMA_GAIN),
 #endif
 #if defined(V4L2_CID_COLOR_KILLER) || (defined(HAVE_DECL_V4L2_CID_COLOR_KILLER) && HAVE_DECL_V4L2_CID_COLOR_KILLER)
-	XLAT(V4L2_CID_COLOR_KILLER),
+ XLAT(V4L2_CID_COLOR_KILLER),
 #endif
 #if defined(V4L2_CID_COLORFX) || (defined(HAVE_DECL_V4L2_CID_COLORFX) && HAVE_DECL_V4L2_CID_COLORFX)
-	XLAT(V4L2_CID_COLORFX),
+ XLAT(V4L2_CID_COLORFX),
 #endif
 #if defined(V4L2_CID_COLORFX_CBCR) || (defined(HAVE_DECL_V4L2_CID_COLORFX_CBCR) && HAVE_DECL_V4L2_CID_COLORFX_CBCR)
-	XLAT(V4L2_CID_COLORFX_CBCR),
+ XLAT(V4L2_CID_COLORFX_CBCR),
 #endif
 #if defined(V4L2_CID_AUTOBRIGHTNESS) || (defined(HAVE_DECL_V4L2_CID_AUTOBRIGHTNESS) && HAVE_DECL_V4L2_CID_AUTOBRIGHTNESS)
-	XLAT(V4L2_CID_AUTOBRIGHTNESS),
+ XLAT(V4L2_CID_AUTOBRIGHTNESS),
 #endif
 #if defined(V4L2_CID_BAND_STOP_FILTER) || (defined(HAVE_DECL_V4L2_CID_BAND_STOP_FILTER) && HAVE_DECL_V4L2_CID_BAND_STOP_FILTER)
-	XLAT(V4L2_CID_BAND_STOP_FILTER),
+ XLAT(V4L2_CID_BAND_STOP_FILTER),
 #endif
 #if defined(V4L2_CID_ROTATE) || (defined(HAVE_DECL_V4L2_CID_ROTATE) && HAVE_DECL_V4L2_CID_ROTATE)
-	XLAT(V4L2_CID_ROTATE),
+ XLAT(V4L2_CID_ROTATE),
 #endif
 #if defined(V4L2_CID_BG_COLOR) || (defined(HAVE_DECL_V4L2_CID_BG_COLOR) && HAVE_DECL_V4L2_CID_BG_COLOR)
-	XLAT(V4L2_CID_BG_COLOR),
+ XLAT(V4L2_CID_BG_COLOR),
 #endif
 #if defined(V4L2_CID_ILLUMINATORS_1) || (defined(HAVE_DECL_V4L2_CID_ILLUMINATORS_1) && HAVE_DECL_V4L2_CID_ILLUMINATORS_1)
-	XLAT(V4L2_CID_ILLUMINATORS_1),
+ XLAT(V4L2_CID_ILLUMINATORS_1),
 #endif
 #if defined(V4L2_CID_ILLUMINATORS_2) || (defined(HAVE_DECL_V4L2_CID_ILLUMINATORS_2) && HAVE_DECL_V4L2_CID_ILLUMINATORS_2)
-	XLAT(V4L2_CID_ILLUMINATORS_2),
+ XLAT(V4L2_CID_ILLUMINATORS_2),
 #endif
 #if defined(V4L2_CID_MIN_BUFFERS_FOR_CAPTURE) || (defined(HAVE_DECL_V4L2_CID_MIN_BUFFERS_FOR_CAPTURE) && HAVE_DECL_V4L2_CID_MIN_BUFFERS_FOR_CAPTURE)
-	XLAT(V4L2_CID_MIN_BUFFERS_FOR_CAPTURE),
+ XLAT(V4L2_CID_MIN_BUFFERS_FOR_CAPTURE),
 #endif
 #if defined(V4L2_CID_MIN_BUFFERS_FOR_OUTPUT) || (defined(HAVE_DECL_V4L2_CID_MIN_BUFFERS_FOR_OUTPUT) && HAVE_DECL_V4L2_CID_MIN_BUFFERS_FOR_OUTPUT)
-	XLAT(V4L2_CID_MIN_BUFFERS_FOR_OUTPUT),
+ XLAT(V4L2_CID_MIN_BUFFERS_FOR_OUTPUT),
 #endif
 #if defined(V4L2_CID_ALPHA_COMPONENT) || (defined(HAVE_DECL_V4L2_CID_ALPHA_COMPONENT) && HAVE_DECL_V4L2_CID_ALPHA_COMPONENT)
-	XLAT(V4L2_CID_ALPHA_COMPONENT),
+ XLAT(V4L2_CID_ALPHA_COMPONENT),
 #endif
 /*  Camera class control IDs */
 #if defined(V4L2_CID_EXPOSURE_AUTO) || (defined(HAVE_DECL_V4L2_CID_EXPOSURE_AUTO) && HAVE_DECL_V4L2_CID_EXPOSURE_AUTO)
-	XLAT(V4L2_CID_EXPOSURE_AUTO),
+ XLAT(V4L2_CID_EXPOSURE_AUTO),
 #endif
 #if defined(V4L2_CID_EXPOSURE_ABSOLUTE) || (defined(HAVE_DECL_V4L2_CID_EXPOSURE_ABSOLUTE) && HAVE_DECL_V4L2_CID_EXPOSURE_ABSOLUTE)
-	XLAT(V4L2_CID_EXPOSURE_ABSOLUTE),
+ XLAT(V4L2_CID_EXPOSURE_ABSOLUTE),
 #endif
 #if defined(V4L2_CID_EXPOSURE_AUTO_PRIORITY) || (defined(HAVE_DECL_V4L2_CID_EXPOSURE_AUTO_PRIORITY) && HAVE_DECL_V4L2_CID_EXPOSURE_AUTO_PRIORITY)
-	XLAT(V4L2_CID_EXPOSURE_AUTO_PRIORITY),
+ XLAT(V4L2_CID_EXPOSURE_AUTO_PRIORITY),
 #endif
 #if defined(V4L2_CID_PAN_RELATIVE) || (defined(HAVE_DECL_V4L2_CID_PAN_RELATIVE) && HAVE_DECL_V4L2_CID_PAN_RELATIVE)
-	XLAT(V4L2_CID_PAN_RELATIVE),
+ XLAT(V4L2_CID_PAN_RELATIVE),
 #endif
 #if defined(V4L2_CID_TILT_RELATIVE) || (defined(HAVE_DECL_V4L2_CID_TILT_RELATIVE) && HAVE_DECL_V4L2_CID_TILT_RELATIVE)
-	XLAT(V4L2_CID_TILT_RELATIVE),
+ XLAT(V4L2_CID_TILT_RELATIVE),
 #endif
 #if defined(V4L2_CID_PAN_RESET) || (defined(HAVE_DECL_V4L2_CID_PAN_RESET) && HAVE_DECL_V4L2_CID_PAN_RESET)
-	XLAT(V4L2_CID_PAN_RESET),
+ XLAT(V4L2_CID_PAN_RESET),
 #endif
 #if defined(V4L2_CID_TILT_RESET) || (defined(HAVE_DECL_V4L2_CID_TILT_RESET) && HAVE_DECL_V4L2_CID_TILT_RESET)
-	XLAT(V4L2_CID_TILT_RESET),
+ XLAT(V4L2_CID_TILT_RESET),
 #endif
 #if defined(V4L2_CID_PAN_ABSOLUTE) || (defined(HAVE_DECL_V4L2_CID_PAN_ABSOLUTE) && HAVE_DECL_V4L2_CID_PAN_ABSOLUTE)
-	XLAT(V4L2_CID_PAN_ABSOLUTE),
+ XLAT(V4L2_CID_PAN_ABSOLUTE),
 #endif
 #if defined(V4L2_CID_TILT_ABSOLUTE) || (defined(HAVE_DECL_V4L2_CID_TILT_ABSOLUTE) && HAVE_DECL_V4L2_CID_TILT_ABSOLUTE)
-	XLAT(V4L2_CID_TILT_ABSOLUTE),
+ XLAT(V4L2_CID_TILT_ABSOLUTE),
 #endif
 #if defined(V4L2_CID_FOCUS_ABSOLUTE) || (defined(HAVE_DECL_V4L2_CID_FOCUS_ABSOLUTE) && HAVE_DECL_V4L2_CID_FOCUS_ABSOLUTE)
-	XLAT(V4L2_CID_FOCUS_ABSOLUTE),
+ XLAT(V4L2_CID_FOCUS_ABSOLUTE),
 #endif
 #if defined(V4L2_CID_FOCUS_RELATIVE) || (defined(HAVE_DECL_V4L2_CID_FOCUS_RELATIVE) && HAVE_DECL_V4L2_CID_FOCUS_RELATIVE)
-	XLAT(V4L2_CID_FOCUS_RELATIVE),
+ XLAT(V4L2_CID_FOCUS_RELATIVE),
 #endif
 #if defined(V4L2_CID_FOCUS_AUTO) || (defined(HAVE_DECL_V4L2_CID_FOCUS_AUTO) && HAVE_DECL_V4L2_CID_FOCUS_AUTO)
-	XLAT(V4L2_CID_FOCUS_AUTO),
+ XLAT(V4L2_CID_FOCUS_AUTO),
 #endif
 #if defined(V4L2_CID_ZOOM_ABSOLUTE) || (defined(HAVE_DECL_V4L2_CID_ZOOM_ABSOLUTE) && HAVE_DECL_V4L2_CID_ZOOM_ABSOLUTE)
-	XLAT(V4L2_CID_ZOOM_ABSOLUTE),
+ XLAT(V4L2_CID_ZOOM_ABSOLUTE),
 #endif
 #if defined(V4L2_CID_ZOOM_RELATIVE) || (defined(HAVE_DECL_V4L2_CID_ZOOM_RELATIVE) && HAVE_DECL_V4L2_CID_ZOOM_RELATIVE)
-	XLAT(V4L2_CID_ZOOM_RELATIVE),
+ XLAT(V4L2_CID_ZOOM_RELATIVE),
 #endif
 #if defined(V4L2_CID_ZOOM_CONTINUOUS) || (defined(HAVE_DECL_V4L2_CID_ZOOM_CONTINUOUS) && HAVE_DECL_V4L2_CID_ZOOM_CONTINUOUS)
-	XLAT(V4L2_CID_ZOOM_CONTINUOUS),
+ XLAT(V4L2_CID_ZOOM_CONTINUOUS),
 #endif
 #if defined(V4L2_CID_PRIVACY) || (defined(HAVE_DECL_V4L2_CID_PRIVACY) && HAVE_DECL_V4L2_CID_PRIVACY)
-	XLAT(V4L2_CID_PRIVACY),
+ XLAT(V4L2_CID_PRIVACY),
 #endif
 #if defined(V4L2_CID_IRIS_ABSOLUTE) || (defined(HAVE_DECL_V4L2_CID_IRIS_ABSOLUTE) && HAVE_DECL_V4L2_CID_IRIS_ABSOLUTE)
-	XLAT(V4L2_CID_IRIS_ABSOLUTE),
+ XLAT(V4L2_CID_IRIS_ABSOLUTE),
 #endif
 #if defined(V4L2_CID_IRIS_RELATIVE) || (defined(HAVE_DECL_V4L2_CID_IRIS_RELATIVE) && HAVE_DECL_V4L2_CID_IRIS_RELATIVE)
-	XLAT(V4L2_CID_IRIS_RELATIVE),
+ XLAT(V4L2_CID_IRIS_RELATIVE),
 #endif
 #if defined(V4L2_CID_AUTO_EXPOSURE_BIAS) || (defined(HAVE_DECL_V4L2_CID_AUTO_EXPOSURE_BIAS) && HAVE_DECL_V4L2_CID_AUTO_EXPOSURE_BIAS)
-	XLAT(V4L2_CID_AUTO_EXPOSURE_BIAS),
+ XLAT(V4L2_CID_AUTO_EXPOSURE_BIAS),
 #endif
 #if defined(V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE) || (defined(HAVE_DECL_V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE) && HAVE_DECL_V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE)
-	XLAT(V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE),
+ XLAT(V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE),
 #endif
 #if defined(V4L2_CID_WIDE_DYNAMIC_RANGE) || (defined(HAVE_DECL_V4L2_CID_WIDE_DYNAMIC_RANGE) && HAVE_DECL_V4L2_CID_WIDE_DYNAMIC_RANGE)
-	XLAT(V4L2_CID_WIDE_DYNAMIC_RANGE),
+ XLAT(V4L2_CID_WIDE_DYNAMIC_RANGE),
 #endif
 #if defined(V4L2_CID_IMAGE_STABILIZATION) || (defined(HAVE_DECL_V4L2_CID_IMAGE_STABILIZATION) && HAVE_DECL_V4L2_CID_IMAGE_STABILIZATION)
-	XLAT(V4L2_CID_IMAGE_STABILIZATION),
+ XLAT(V4L2_CID_IMAGE_STABILIZATION),
 #endif
 #if defined(V4L2_CID_ISO_SENSITIVITY) || (defined(HAVE_DECL_V4L2_CID_ISO_SENSITIVITY) && HAVE_DECL_V4L2_CID_ISO_SENSITIVITY)
-	XLAT(V4L2_CID_ISO_SENSITIVITY),
+ XLAT(V4L2_CID_ISO_SENSITIVITY),
 #endif
 #if defined(V4L2_CID_ISO_SENSITIVITY_AUTO) || (defined(HAVE_DECL_V4L2_CID_ISO_SENSITIVITY_AUTO) && HAVE_DECL_V4L2_CID_ISO_SENSITIVITY_AUTO)
-	XLAT(V4L2_CID_ISO_SENSITIVITY_AUTO),
+ XLAT(V4L2_CID_ISO_SENSITIVITY_AUTO),
 #endif
 #if defined(V4L2_CID_EXPOSURE_METERING) || (defined(HAVE_DECL_V4L2_CID_EXPOSURE_METERING) && HAVE_DECL_V4L2_CID_EXPOSURE_METERING)
-	XLAT(V4L2_CID_EXPOSURE_METERING),
+ XLAT(V4L2_CID_EXPOSURE_METERING),
 #endif
 #if defined(V4L2_CID_SCENE_MODE) || (defined(HAVE_DECL_V4L2_CID_SCENE_MODE) && HAVE_DECL_V4L2_CID_SCENE_MODE)
-	XLAT(V4L2_CID_SCENE_MODE),
+ XLAT(V4L2_CID_SCENE_MODE),
 #endif
 #if defined(V4L2_CID_3A_LOCK) || (defined(HAVE_DECL_V4L2_CID_3A_LOCK) && HAVE_DECL_V4L2_CID_3A_LOCK)
-	XLAT(V4L2_CID_3A_LOCK),
+ XLAT(V4L2_CID_3A_LOCK),
 #endif
 #if defined(V4L2_CID_AUTO_FOCUS_START) || (defined(HAVE_DECL_V4L2_CID_AUTO_FOCUS_START) && HAVE_DECL_V4L2_CID_AUTO_FOCUS_START)
-	XLAT(V4L2_CID_AUTO_FOCUS_START),
+ XLAT(V4L2_CID_AUTO_FOCUS_START),
 #endif
 #if defined(V4L2_CID_AUTO_FOCUS_STOP) || (defined(HAVE_DECL_V4L2_CID_AUTO_FOCUS_STOP) && HAVE_DECL_V4L2_CID_AUTO_FOCUS_STOP)
-	XLAT(V4L2_CID_AUTO_FOCUS_STOP),
+ XLAT(V4L2_CID_AUTO_FOCUS_STOP),
 #endif
 #if defined(V4L2_CID_AUTO_FOCUS_STATUS) || (defined(HAVE_DECL_V4L2_CID_AUTO_FOCUS_STATUS) && HAVE_DECL_V4L2_CID_AUTO_FOCUS_STATUS)
-	XLAT(V4L2_CID_AUTO_FOCUS_STATUS),
+ XLAT(V4L2_CID_AUTO_FOCUS_STATUS),
 #endif
 #if defined(V4L2_CID_AUTO_FOCUS_RANGE) || (defined(HAVE_DECL_V4L2_CID_AUTO_FOCUS_RANGE) && HAVE_DECL_V4L2_CID_AUTO_FOCUS_RANGE)
-	XLAT(V4L2_CID_AUTO_FOCUS_RANGE),
+ XLAT(V4L2_CID_AUTO_FOCUS_RANGE),
 #endif
 #if defined(V4L2_CID_PRIVATE_BASE) || (defined(HAVE_DECL_V4L2_CID_PRIVATE_BASE) && HAVE_DECL_V4L2_CID_PRIVATE_BASE)
-	XLAT(V4L2_CID_PRIVATE_BASE),
+ XLAT(V4L2_CID_PRIVATE_BASE),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/v4l2_control_types.h b/xlat/v4l2_control_types.h
index 0a33849..16de05c 100644
--- a/xlat/v4l2_control_types.h
+++ b/xlat/v4l2_control_types.h
@@ -2,31 +2,31 @@
 
 static const struct xlat v4l2_control_types[] = {
 #if defined(V4L2_CTRL_TYPE_INTEGER) || (defined(HAVE_DECL_V4L2_CTRL_TYPE_INTEGER) && HAVE_DECL_V4L2_CTRL_TYPE_INTEGER)
-	XLAT(V4L2_CTRL_TYPE_INTEGER),
+ XLAT(V4L2_CTRL_TYPE_INTEGER),
 #endif
 #if defined(V4L2_CTRL_TYPE_BOOLEAN) || (defined(HAVE_DECL_V4L2_CTRL_TYPE_BOOLEAN) && HAVE_DECL_V4L2_CTRL_TYPE_BOOLEAN)
-	XLAT(V4L2_CTRL_TYPE_BOOLEAN),
+ XLAT(V4L2_CTRL_TYPE_BOOLEAN),
 #endif
 #if defined(V4L2_CTRL_TYPE_MENU) || (defined(HAVE_DECL_V4L2_CTRL_TYPE_MENU) && HAVE_DECL_V4L2_CTRL_TYPE_MENU)
-	XLAT(V4L2_CTRL_TYPE_MENU),
+ XLAT(V4L2_CTRL_TYPE_MENU),
 #endif
 #if defined(V4L2_CTRL_TYPE_INTEGER_MENU) || (defined(HAVE_DECL_V4L2_CTRL_TYPE_INTEGER_MENU) && HAVE_DECL_V4L2_CTRL_TYPE_INTEGER_MENU)
-	XLAT(V4L2_CTRL_TYPE_INTEGER_MENU),
+ XLAT(V4L2_CTRL_TYPE_INTEGER_MENU),
 #endif
 #if defined(V4L2_CTRL_TYPE_BITMASK) || (defined(HAVE_DECL_V4L2_CTRL_TYPE_BITMASK) && HAVE_DECL_V4L2_CTRL_TYPE_BITMASK)
-	XLAT(V4L2_CTRL_TYPE_BITMASK),
+ XLAT(V4L2_CTRL_TYPE_BITMASK),
 #endif
 #if defined(V4L2_CTRL_TYPE_BUTTON) || (defined(HAVE_DECL_V4L2_CTRL_TYPE_BUTTON) && HAVE_DECL_V4L2_CTRL_TYPE_BUTTON)
-	XLAT(V4L2_CTRL_TYPE_BUTTON),
+ XLAT(V4L2_CTRL_TYPE_BUTTON),
 #endif
 #if defined(V4L2_CTRL_TYPE_INTEGER64) || (defined(HAVE_DECL_V4L2_CTRL_TYPE_INTEGER64) && HAVE_DECL_V4L2_CTRL_TYPE_INTEGER64)
-	XLAT(V4L2_CTRL_TYPE_INTEGER64),
+ XLAT(V4L2_CTRL_TYPE_INTEGER64),
 #endif
 #if defined(V4L2_CTRL_TYPE_STRING) || (defined(HAVE_DECL_V4L2_CTRL_TYPE_STRING) && HAVE_DECL_V4L2_CTRL_TYPE_STRING)
-	XLAT(V4L2_CTRL_TYPE_STRING),
+ XLAT(V4L2_CTRL_TYPE_STRING),
 #endif
 #if defined(V4L2_CTRL_TYPE_CTRL_CLASS) || (defined(HAVE_DECL_V4L2_CTRL_TYPE_CTRL_CLASS) && HAVE_DECL_V4L2_CTRL_TYPE_CTRL_CLASS)
-	XLAT(V4L2_CTRL_TYPE_CTRL_CLASS),
+ XLAT(V4L2_CTRL_TYPE_CTRL_CLASS),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/v4l2_device_capabilities_flags.h b/xlat/v4l2_device_capabilities_flags.h
index 4465302..b97fa64 100644
--- a/xlat/v4l2_device_capabilities_flags.h
+++ b/xlat/v4l2_device_capabilities_flags.h
@@ -2,73 +2,73 @@
 
 static const struct xlat v4l2_device_capabilities_flags[] = {
 #if defined(V4L2_CAP_VIDEO_CAPTURE) || (defined(HAVE_DECL_V4L2_CAP_VIDEO_CAPTURE) && HAVE_DECL_V4L2_CAP_VIDEO_CAPTURE)
-	XLAT(V4L2_CAP_VIDEO_CAPTURE),
+ XLAT(V4L2_CAP_VIDEO_CAPTURE),
 #endif
 #if defined(V4L2_CAP_VIDEO_OUTPUT) || (defined(HAVE_DECL_V4L2_CAP_VIDEO_OUTPUT) && HAVE_DECL_V4L2_CAP_VIDEO_OUTPUT)
-	XLAT(V4L2_CAP_VIDEO_OUTPUT),
+ XLAT(V4L2_CAP_VIDEO_OUTPUT),
 #endif
 #if defined(V4L2_CAP_VIDEO_OVERLAY) || (defined(HAVE_DECL_V4L2_CAP_VIDEO_OVERLAY) && HAVE_DECL_V4L2_CAP_VIDEO_OVERLAY)
-	XLAT(V4L2_CAP_VIDEO_OVERLAY),
+ XLAT(V4L2_CAP_VIDEO_OVERLAY),
 #endif
 #if defined(V4L2_CAP_VBI_CAPTURE) || (defined(HAVE_DECL_V4L2_CAP_VBI_CAPTURE) && HAVE_DECL_V4L2_CAP_VBI_CAPTURE)
-	XLAT(V4L2_CAP_VBI_CAPTURE),
+ XLAT(V4L2_CAP_VBI_CAPTURE),
 #endif
 #if defined(V4L2_CAP_VBI_OUTPUT) || (defined(HAVE_DECL_V4L2_CAP_VBI_OUTPUT) && HAVE_DECL_V4L2_CAP_VBI_OUTPUT)
-	XLAT(V4L2_CAP_VBI_OUTPUT),
+ XLAT(V4L2_CAP_VBI_OUTPUT),
 #endif
 #if defined(V4L2_CAP_SLICED_VBI_CAPTURE) || (defined(HAVE_DECL_V4L2_CAP_SLICED_VBI_CAPTURE) && HAVE_DECL_V4L2_CAP_SLICED_VBI_CAPTURE)
-	XLAT(V4L2_CAP_SLICED_VBI_CAPTURE),
+ XLAT(V4L2_CAP_SLICED_VBI_CAPTURE),
 #endif
 #if defined(V4L2_CAP_SLICED_VBI_OUTPUT) || (defined(HAVE_DECL_V4L2_CAP_SLICED_VBI_OUTPUT) && HAVE_DECL_V4L2_CAP_SLICED_VBI_OUTPUT)
-	XLAT(V4L2_CAP_SLICED_VBI_OUTPUT),
+ XLAT(V4L2_CAP_SLICED_VBI_OUTPUT),
 #endif
 #if defined(V4L2_CAP_RDS_CAPTURE) || (defined(HAVE_DECL_V4L2_CAP_RDS_CAPTURE) && HAVE_DECL_V4L2_CAP_RDS_CAPTURE)
-	XLAT(V4L2_CAP_RDS_CAPTURE),
+ XLAT(V4L2_CAP_RDS_CAPTURE),
 #endif
 #if defined(V4L2_CAP_VIDEO_OUTPUT_OVERLAY) || (defined(HAVE_DECL_V4L2_CAP_VIDEO_OUTPUT_OVERLAY) && HAVE_DECL_V4L2_CAP_VIDEO_OUTPUT_OVERLAY)
-	XLAT(V4L2_CAP_VIDEO_OUTPUT_OVERLAY),
+ XLAT(V4L2_CAP_VIDEO_OUTPUT_OVERLAY),
 #endif
 #if defined(V4L2_CAP_HW_FREQ_SEEK) || (defined(HAVE_DECL_V4L2_CAP_HW_FREQ_SEEK) && HAVE_DECL_V4L2_CAP_HW_FREQ_SEEK)
-	XLAT(V4L2_CAP_HW_FREQ_SEEK),
+ XLAT(V4L2_CAP_HW_FREQ_SEEK),
 #endif
 #if defined(V4L2_CAP_RDS_OUTPUT) || (defined(HAVE_DECL_V4L2_CAP_RDS_OUTPUT) && HAVE_DECL_V4L2_CAP_RDS_OUTPUT)
-	XLAT(V4L2_CAP_RDS_OUTPUT),
+ XLAT(V4L2_CAP_RDS_OUTPUT),
 #endif
 #if defined(V4L2_CAP_VIDEO_CAPTURE_MPLANE) || (defined(HAVE_DECL_V4L2_CAP_VIDEO_CAPTURE_MPLANE) && HAVE_DECL_V4L2_CAP_VIDEO_CAPTURE_MPLANE)
-	XLAT(V4L2_CAP_VIDEO_CAPTURE_MPLANE),
+ XLAT(V4L2_CAP_VIDEO_CAPTURE_MPLANE),
 #endif
 #if defined(V4L2_CAP_VIDEO_OUTPUT_MPLANE) || (defined(HAVE_DECL_V4L2_CAP_VIDEO_OUTPUT_MPLANE) && HAVE_DECL_V4L2_CAP_VIDEO_OUTPUT_MPLANE)
-	XLAT(V4L2_CAP_VIDEO_OUTPUT_MPLANE),
+ XLAT(V4L2_CAP_VIDEO_OUTPUT_MPLANE),
 #endif
 #if defined(V4L2_CAP_VIDEO_M2M) || (defined(HAVE_DECL_V4L2_CAP_VIDEO_M2M) && HAVE_DECL_V4L2_CAP_VIDEO_M2M)
-	XLAT(V4L2_CAP_VIDEO_M2M),
+ XLAT(V4L2_CAP_VIDEO_M2M),
 #endif
 #if defined(V4L2_CAP_VIDEO_M2M_MPLANE) || (defined(HAVE_DECL_V4L2_CAP_VIDEO_M2M_MPLANE) && HAVE_DECL_V4L2_CAP_VIDEO_M2M_MPLANE)
-	XLAT(V4L2_CAP_VIDEO_M2M_MPLANE),
+ XLAT(V4L2_CAP_VIDEO_M2M_MPLANE),
 #endif
 #if defined(V4L2_CAP_TUNER) || (defined(HAVE_DECL_V4L2_CAP_TUNER) && HAVE_DECL_V4L2_CAP_TUNER)
-	XLAT(V4L2_CAP_TUNER),
+ XLAT(V4L2_CAP_TUNER),
 #endif
 #if defined(V4L2_CAP_AUDIO) || (defined(HAVE_DECL_V4L2_CAP_AUDIO) && HAVE_DECL_V4L2_CAP_AUDIO)
-	XLAT(V4L2_CAP_AUDIO),
+ XLAT(V4L2_CAP_AUDIO),
 #endif
 #if defined(V4L2_CAP_RADIO) || (defined(HAVE_DECL_V4L2_CAP_RADIO) && HAVE_DECL_V4L2_CAP_RADIO)
-	XLAT(V4L2_CAP_RADIO),
+ XLAT(V4L2_CAP_RADIO),
 #endif
 #if defined(V4L2_CAP_MODULATOR) || (defined(HAVE_DECL_V4L2_CAP_MODULATOR) && HAVE_DECL_V4L2_CAP_MODULATOR)
-	XLAT(V4L2_CAP_MODULATOR),
+ XLAT(V4L2_CAP_MODULATOR),
 #endif
 #if defined(V4L2_CAP_READWRITE) || (defined(HAVE_DECL_V4L2_CAP_READWRITE) && HAVE_DECL_V4L2_CAP_READWRITE)
-	XLAT(V4L2_CAP_READWRITE),
+ XLAT(V4L2_CAP_READWRITE),
 #endif
 #if defined(V4L2_CAP_ASYNCIO) || (defined(HAVE_DECL_V4L2_CAP_ASYNCIO) && HAVE_DECL_V4L2_CAP_ASYNCIO)
-	XLAT(V4L2_CAP_ASYNCIO),
+ XLAT(V4L2_CAP_ASYNCIO),
 #endif
 #if defined(V4L2_CAP_STREAMING) || (defined(HAVE_DECL_V4L2_CAP_STREAMING) && HAVE_DECL_V4L2_CAP_STREAMING)
-	XLAT(V4L2_CAP_STREAMING),
+ XLAT(V4L2_CAP_STREAMING),
 #endif
 #if defined(V4L2_CAP_DEVICE_CAPS) || (defined(HAVE_DECL_V4L2_CAP_DEVICE_CAPS) && HAVE_DECL_V4L2_CAP_DEVICE_CAPS)
-	XLAT(V4L2_CAP_DEVICE_CAPS),
+ XLAT(V4L2_CAP_DEVICE_CAPS),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/v4l2_fields.h b/xlat/v4l2_fields.h
index c285701..d0e0083 100644
--- a/xlat/v4l2_fields.h
+++ b/xlat/v4l2_fields.h
@@ -2,34 +2,34 @@
 
 static const struct xlat v4l2_fields[] = {
 #if defined(V4L2_FIELD_ANY) || (defined(HAVE_DECL_V4L2_FIELD_ANY) && HAVE_DECL_V4L2_FIELD_ANY)
-	XLAT(V4L2_FIELD_ANY),
+ XLAT(V4L2_FIELD_ANY),
 #endif
 #if defined(V4L2_FIELD_NONE) || (defined(HAVE_DECL_V4L2_FIELD_NONE) && HAVE_DECL_V4L2_FIELD_NONE)
-	XLAT(V4L2_FIELD_NONE),
+ XLAT(V4L2_FIELD_NONE),
 #endif
 #if defined(V4L2_FIELD_TOP) || (defined(HAVE_DECL_V4L2_FIELD_TOP) && HAVE_DECL_V4L2_FIELD_TOP)
-	XLAT(V4L2_FIELD_TOP),
+ XLAT(V4L2_FIELD_TOP),
 #endif
 #if defined(V4L2_FIELD_BOTTOM) || (defined(HAVE_DECL_V4L2_FIELD_BOTTOM) && HAVE_DECL_V4L2_FIELD_BOTTOM)
-	XLAT(V4L2_FIELD_BOTTOM),
+ XLAT(V4L2_FIELD_BOTTOM),
 #endif
 #if defined(V4L2_FIELD_INTERLACED) || (defined(HAVE_DECL_V4L2_FIELD_INTERLACED) && HAVE_DECL_V4L2_FIELD_INTERLACED)
-	XLAT(V4L2_FIELD_INTERLACED),
+ XLAT(V4L2_FIELD_INTERLACED),
 #endif
 #if defined(V4L2_FIELD_SEQ_TB) || (defined(HAVE_DECL_V4L2_FIELD_SEQ_TB) && HAVE_DECL_V4L2_FIELD_SEQ_TB)
-	XLAT(V4L2_FIELD_SEQ_TB),
+ XLAT(V4L2_FIELD_SEQ_TB),
 #endif
 #if defined(V4L2_FIELD_SEQ_BT) || (defined(HAVE_DECL_V4L2_FIELD_SEQ_BT) && HAVE_DECL_V4L2_FIELD_SEQ_BT)
-	XLAT(V4L2_FIELD_SEQ_BT),
+ XLAT(V4L2_FIELD_SEQ_BT),
 #endif
 #if defined(V4L2_FIELD_ALTERNATE) || (defined(HAVE_DECL_V4L2_FIELD_ALTERNATE) && HAVE_DECL_V4L2_FIELD_ALTERNATE)
-	XLAT(V4L2_FIELD_ALTERNATE),
+ XLAT(V4L2_FIELD_ALTERNATE),
 #endif
 #if defined(V4L2_FIELD_INTERLACED_TB) || (defined(HAVE_DECL_V4L2_FIELD_INTERLACED_TB) && HAVE_DECL_V4L2_FIELD_INTERLACED_TB)
-	XLAT(V4L2_FIELD_INTERLACED_TB),
+ XLAT(V4L2_FIELD_INTERLACED_TB),
 #endif
 #if defined(V4L2_FIELD_INTERLACED_BT) || (defined(HAVE_DECL_V4L2_FIELD_INTERLACED_BT) && HAVE_DECL_V4L2_FIELD_INTERLACED_BT)
-	XLAT(V4L2_FIELD_INTERLACED_BT),
+ XLAT(V4L2_FIELD_INTERLACED_BT),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/v4l2_format_description_flags.h b/xlat/v4l2_format_description_flags.h
index 885f99a..f2b57bb 100644
--- a/xlat/v4l2_format_description_flags.h
+++ b/xlat/v4l2_format_description_flags.h
@@ -2,10 +2,10 @@
 
 static const struct xlat v4l2_format_description_flags[] = {
 #if defined(V4L2_FMT_FLAG_COMPRESSED) || (defined(HAVE_DECL_V4L2_FMT_FLAG_COMPRESSED) && HAVE_DECL_V4L2_FMT_FLAG_COMPRESSED)
-	XLAT(V4L2_FMT_FLAG_COMPRESSED),
+ XLAT(V4L2_FMT_FLAG_COMPRESSED),
 #endif
 #if defined(V4L2_FMT_FLAG_EMULATED) || (defined(HAVE_DECL_V4L2_FMT_FLAG_EMULATED) && HAVE_DECL_V4L2_FMT_FLAG_EMULATED)
-	XLAT(V4L2_FMT_FLAG_EMULATED),
+ XLAT(V4L2_FMT_FLAG_EMULATED),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/v4l2_frameinterval_types.h b/xlat/v4l2_frameinterval_types.h
index c219a41..e13a6b6 100644
--- a/xlat/v4l2_frameinterval_types.h
+++ b/xlat/v4l2_frameinterval_types.h
@@ -2,13 +2,13 @@
 
 static const struct xlat v4l2_frameinterval_types[] = {
 #if defined(V4L2_FRMIVAL_TYPE_DISCRETE) || (defined(HAVE_DECL_V4L2_FRMIVAL_TYPE_DISCRETE) && HAVE_DECL_V4L2_FRMIVAL_TYPE_DISCRETE)
-	XLAT(V4L2_FRMIVAL_TYPE_DISCRETE),
+ XLAT(V4L2_FRMIVAL_TYPE_DISCRETE),
 #endif
 #if defined(V4L2_FRMIVAL_TYPE_CONTINUOUS) || (defined(HAVE_DECL_V4L2_FRMIVAL_TYPE_CONTINUOUS) && HAVE_DECL_V4L2_FRMIVAL_TYPE_CONTINUOUS)
-	XLAT(V4L2_FRMIVAL_TYPE_CONTINUOUS),
+ XLAT(V4L2_FRMIVAL_TYPE_CONTINUOUS),
 #endif
 #if defined(V4L2_FRMIVAL_TYPE_STEPWISE) || (defined(HAVE_DECL_V4L2_FRMIVAL_TYPE_STEPWISE) && HAVE_DECL_V4L2_FRMIVAL_TYPE_STEPWISE)
-	XLAT(V4L2_FRMIVAL_TYPE_STEPWISE),
+ XLAT(V4L2_FRMIVAL_TYPE_STEPWISE),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/v4l2_framesize_types.h b/xlat/v4l2_framesize_types.h
index 1120f6b..58f2991 100644
--- a/xlat/v4l2_framesize_types.h
+++ b/xlat/v4l2_framesize_types.h
@@ -2,13 +2,13 @@
 
 static const struct xlat v4l2_framesize_types[] = {
 #if defined(V4L2_FRMSIZE_TYPE_DISCRETE) || (defined(HAVE_DECL_V4L2_FRMSIZE_TYPE_DISCRETE) && HAVE_DECL_V4L2_FRMSIZE_TYPE_DISCRETE)
-	XLAT(V4L2_FRMSIZE_TYPE_DISCRETE),
+ XLAT(V4L2_FRMSIZE_TYPE_DISCRETE),
 #endif
 #if defined(V4L2_FRMSIZE_TYPE_CONTINUOUS) || (defined(HAVE_DECL_V4L2_FRMSIZE_TYPE_CONTINUOUS) && HAVE_DECL_V4L2_FRMSIZE_TYPE_CONTINUOUS)
-	XLAT(V4L2_FRMSIZE_TYPE_CONTINUOUS),
+ XLAT(V4L2_FRMSIZE_TYPE_CONTINUOUS),
 #endif
 #if defined(V4L2_FRMSIZE_TYPE_STEPWISE) || (defined(HAVE_DECL_V4L2_FRMSIZE_TYPE_STEPWISE) && HAVE_DECL_V4L2_FRMSIZE_TYPE_STEPWISE)
-	XLAT(V4L2_FRMSIZE_TYPE_STEPWISE),
+ XLAT(V4L2_FRMSIZE_TYPE_STEPWISE),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/v4l2_input_types.h b/xlat/v4l2_input_types.h
index e18fd73..17a04fa 100644
--- a/xlat/v4l2_input_types.h
+++ b/xlat/v4l2_input_types.h
@@ -2,10 +2,10 @@
 
 static const struct xlat v4l2_input_types[] = {
 #if defined(V4L2_INPUT_TYPE_TUNER) || (defined(HAVE_DECL_V4L2_INPUT_TYPE_TUNER) && HAVE_DECL_V4L2_INPUT_TYPE_TUNER)
-	XLAT(V4L2_INPUT_TYPE_TUNER),
+ XLAT(V4L2_INPUT_TYPE_TUNER),
 #endif
 #if defined(V4L2_INPUT_TYPE_CAMERA) || (defined(HAVE_DECL_V4L2_INPUT_TYPE_CAMERA) && HAVE_DECL_V4L2_INPUT_TYPE_CAMERA)
-	XLAT(V4L2_INPUT_TYPE_CAMERA),
+ XLAT(V4L2_INPUT_TYPE_CAMERA),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/v4l2_memories.h b/xlat/v4l2_memories.h
index 9f16dd2..ea69e9e 100644
--- a/xlat/v4l2_memories.h
+++ b/xlat/v4l2_memories.h
@@ -2,10 +2,10 @@
 
 static const struct xlat v4l2_memories[] = {
 #if defined(V4L2_MEMORY_MMAP) || (defined(HAVE_DECL_V4L2_MEMORY_MMAP) && HAVE_DECL_V4L2_MEMORY_MMAP)
-	XLAT(V4L2_MEMORY_MMAP),
+ XLAT(V4L2_MEMORY_MMAP),
 #endif
 #if defined(V4L2_MEMORY_USERPTR) || (defined(HAVE_DECL_V4L2_MEMORY_USERPTR) && HAVE_DECL_V4L2_MEMORY_USERPTR)
-	XLAT(V4L2_MEMORY_USERPTR),
+ XLAT(V4L2_MEMORY_USERPTR),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/v4l2_streaming_capabilities.h b/xlat/v4l2_streaming_capabilities.h
index 986bf44..3ca4e54 100644
--- a/xlat/v4l2_streaming_capabilities.h
+++ b/xlat/v4l2_streaming_capabilities.h
@@ -2,7 +2,7 @@
 
 static const struct xlat v4l2_streaming_capabilities[] = {
 #if defined(V4L2_CAP_TIMEPERFRAME) || (defined(HAVE_DECL_V4L2_CAP_TIMEPERFRAME) && HAVE_DECL_V4L2_CAP_TIMEPERFRAME)
-	XLAT(V4L2_CAP_TIMEPERFRAME),
+ XLAT(V4L2_CAP_TIMEPERFRAME),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/wait4_options.h b/xlat/wait4_options.h
index 86df119..5dae7e5 100644
--- a/xlat/wait4_options.h
+++ b/xlat/wait4_options.h
@@ -2,36 +2,36 @@
 
 static const struct xlat wait4_options[] = {
 #if defined(WNOHANG) || (defined(HAVE_DECL_WNOHANG) && HAVE_DECL_WNOHANG)
-	XLAT(WNOHANG),
+ XLAT(WNOHANG),
 #endif
 #ifndef WSTOPPED
 #if defined(WUNTRACED) || (defined(HAVE_DECL_WUNTRACED) && HAVE_DECL_WUNTRACED)
-	XLAT(WUNTRACED),
+ XLAT(WUNTRACED),
 #endif
 #endif
 #if defined(WEXITED) || (defined(HAVE_DECL_WEXITED) && HAVE_DECL_WEXITED)
-	XLAT(WEXITED),
+ XLAT(WEXITED),
 #endif
 #if defined(WTRAPPED) || (defined(HAVE_DECL_WTRAPPED) && HAVE_DECL_WTRAPPED)
-	XLAT(WTRAPPED),
+ XLAT(WTRAPPED),
 #endif
 #if defined(WSTOPPED) || (defined(HAVE_DECL_WSTOPPED) && HAVE_DECL_WSTOPPED)
-	XLAT(WSTOPPED),
+ XLAT(WSTOPPED),
 #endif
 #if defined(WCONTINUED) || (defined(HAVE_DECL_WCONTINUED) && HAVE_DECL_WCONTINUED)
-	XLAT(WCONTINUED),
+ XLAT(WCONTINUED),
 #endif
 #if defined(WNOWAIT) || (defined(HAVE_DECL_WNOWAIT) && HAVE_DECL_WNOWAIT)
-	XLAT(WNOWAIT),
+ XLAT(WNOWAIT),
 #endif
 #if defined(__WCLONE) || (defined(HAVE_DECL___WCLONE) && HAVE_DECL___WCLONE)
-	XLAT(__WCLONE),
+ XLAT(__WCLONE),
 #endif
 #if defined(__WALL) || (defined(HAVE_DECL___WALL) && HAVE_DECL___WALL)
-	XLAT(__WALL),
+ XLAT(__WALL),
 #endif
 #if defined(__WNOTHREAD) || (defined(HAVE_DECL___WNOTHREAD) && HAVE_DECL___WNOTHREAD)
-	XLAT(__WNOTHREAD),
+ XLAT(__WNOTHREAD),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/waitid_types.h b/xlat/waitid_types.h
index 333ecc2..7087a80 100644
--- a/xlat/waitid_types.h
+++ b/xlat/waitid_types.h
@@ -2,31 +2,31 @@
 
 static const struct xlat waitid_types[] = {
 #if defined(P_PID) || (defined(HAVE_DECL_P_PID) && HAVE_DECL_P_PID)
-	XLAT(P_PID),
+ XLAT(P_PID),
 #endif
 #if defined(P_PPID) || (defined(HAVE_DECL_P_PPID) && HAVE_DECL_P_PPID)
-	XLAT(P_PPID),
+ XLAT(P_PPID),
 #endif
 #if defined(P_PGID) || (defined(HAVE_DECL_P_PGID) && HAVE_DECL_P_PGID)
-	XLAT(P_PGID),
+ XLAT(P_PGID),
 #endif
 #if defined(P_SID) || (defined(HAVE_DECL_P_SID) && HAVE_DECL_P_SID)
-	XLAT(P_SID),
+ XLAT(P_SID),
 #endif
 #if defined(P_CID) || (defined(HAVE_DECL_P_CID) && HAVE_DECL_P_CID)
-	XLAT(P_CID),
+ XLAT(P_CID),
 #endif
 #if defined(P_UID) || (defined(HAVE_DECL_P_UID) && HAVE_DECL_P_UID)
-	XLAT(P_UID),
+ XLAT(P_UID),
 #endif
 #if defined(P_GID) || (defined(HAVE_DECL_P_GID) && HAVE_DECL_P_GID)
-	XLAT(P_GID),
+ XLAT(P_GID),
 #endif
 #if defined(P_ALL) || (defined(HAVE_DECL_P_ALL) && HAVE_DECL_P_ALL)
-	XLAT(P_ALL),
+ XLAT(P_ALL),
 #endif
 #if defined(P_LWPID) || (defined(HAVE_DECL_P_LWPID) && HAVE_DECL_P_LWPID)
-	XLAT(P_LWPID),
+ XLAT(P_LWPID),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/whence_codes.h b/xlat/whence_codes.h
index 2576b78..448aa72 100644
--- a/xlat/whence_codes.h
+++ b/xlat/whence_codes.h
@@ -2,19 +2,19 @@
 
 const struct xlat whence_codes[] = {
 #if defined(SEEK_SET) || (defined(HAVE_DECL_SEEK_SET) && HAVE_DECL_SEEK_SET)
-	XLAT(SEEK_SET),
+ XLAT(SEEK_SET),
 #endif
 #if defined(SEEK_CUR) || (defined(HAVE_DECL_SEEK_CUR) && HAVE_DECL_SEEK_CUR)
-	XLAT(SEEK_CUR),
+ XLAT(SEEK_CUR),
 #endif
 #if defined(SEEK_END) || (defined(HAVE_DECL_SEEK_END) && HAVE_DECL_SEEK_END)
-	XLAT(SEEK_END),
+ XLAT(SEEK_END),
 #endif
 #if defined(SEEK_DATA) || (defined(HAVE_DECL_SEEK_DATA) && HAVE_DECL_SEEK_DATA)
-	XLAT(SEEK_DATA),
+ XLAT(SEEK_DATA),
 #endif
 #if defined(SEEK_HOLE) || (defined(HAVE_DECL_SEEK_HOLE) && HAVE_DECL_SEEK_HOLE)
-	XLAT(SEEK_HOLE),
+ XLAT(SEEK_HOLE),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/xattrflags.h b/xlat/xattrflags.h
index 33622c4..a8c589e 100644
--- a/xlat/xattrflags.h
+++ b/xlat/xattrflags.h
@@ -2,10 +2,10 @@
 
 static const struct xlat xattrflags[] = {
 #if defined(XATTR_CREATE) || (defined(HAVE_DECL_XATTR_CREATE) && HAVE_DECL_XATTR_CREATE)
-	XLAT(XATTR_CREATE),
+ XLAT(XATTR_CREATE),
 #endif
 #if defined(XATTR_REPLACE) || (defined(HAVE_DECL_XATTR_REPLACE) && HAVE_DECL_XATTR_REPLACE)
-	XLAT(XATTR_REPLACE),
+ XLAT(XATTR_REPLACE),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/xfs_dqblk_flags.h b/xlat/xfs_dqblk_flags.h
index 049bb34..9cd4509 100644
--- a/xlat/xfs_dqblk_flags.h
+++ b/xlat/xfs_dqblk_flags.h
@@ -2,13 +2,13 @@
 
 static const struct xlat xfs_dqblk_flags[] = {
 #if defined(XFS_USER_QUOTA) || (defined(HAVE_DECL_XFS_USER_QUOTA) && HAVE_DECL_XFS_USER_QUOTA)
-	XLAT(XFS_USER_QUOTA),
+ XLAT(XFS_USER_QUOTA),
 #endif
 #if defined(XFS_PROJ_QUOTA) || (defined(HAVE_DECL_XFS_PROJ_QUOTA) && HAVE_DECL_XFS_PROJ_QUOTA)
-	XLAT(XFS_PROJ_QUOTA),
+ XLAT(XFS_PROJ_QUOTA),
 #endif
 #if defined(XFS_GROUP_QUOTA) || (defined(HAVE_DECL_XFS_GROUP_QUOTA) && HAVE_DECL_XFS_GROUP_QUOTA)
-	XLAT(XFS_GROUP_QUOTA),
+ XLAT(XFS_GROUP_QUOTA),
 #endif
-	XLAT_END
+ XLAT_END
 };
diff --git a/xlat/xfs_quota_flags.h b/xlat/xfs_quota_flags.h
index a43321d..e71e052 100644
--- a/xlat/xfs_quota_flags.h
+++ b/xlat/xfs_quota_flags.h
@@ -2,16 +2,16 @@
 
 static const struct xlat xfs_quota_flags[] = {
 #if defined(XFS_QUOTA_UDQ_ACCT) || (defined(HAVE_DECL_XFS_QUOTA_UDQ_ACCT) && HAVE_DECL_XFS_QUOTA_UDQ_ACCT)
-	XLAT(XFS_QUOTA_UDQ_ACCT),
+ XLAT(XFS_QUOTA_UDQ_ACCT),
 #endif
 #if defined(XFS_QUOTA_UDQ_ENFD) || (defined(HAVE_DECL_XFS_QUOTA_UDQ_ENFD) && HAVE_DECL_XFS_QUOTA_UDQ_ENFD)
-	XLAT(XFS_QUOTA_UDQ_ENFD),
+ XLAT(XFS_QUOTA_UDQ_ENFD),
 #endif
 #if defined(XFS_QUOTA_GDQ_ACCT) || (defined(HAVE_DECL_XFS_QUOTA_GDQ_ACCT) && HAVE_DECL_XFS_QUOTA_GDQ_ACCT)
-	XLAT(XFS_QUOTA_GDQ_ACCT),
+ XLAT(XFS_QUOTA_GDQ_ACCT),
 #endif
 #if defined(XFS_QUOTA_GDQ_ENFD) || (defined(HAVE_DECL_XFS_QUOTA_GDQ_ENFD) && HAVE_DECL_XFS_QUOTA_GDQ_ENFD)
-	XLAT(XFS_QUOTA_GDQ_ENFD),
+ XLAT(XFS_QUOTA_GDQ_ENFD),
 #endif
-	XLAT_END
+ XLAT_END
 };