Merge "Regenerate generated strae files."
diff --git a/Android.mk b/Android.mk
index 6ceedcd..b84537f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -59,13 +59,21 @@
     count.c \
     desc.c \
     dirent.c \
+    dirent64.c \
+    epoll.c \
+    eventfd.c \
     execve.c \
     exit.c \
     fadvise.c \
     fallocate.c \
     fanotify.c \
     fchownat.c \
+    fcntl.c \
+    fetch_seccomp_fprog.c \
+    fetch_struct_flock.c \
     file.c \
+    file_handle.c \
+    flock.c \
     futex.c \
     getcpu.c \
     getcwd.c \
@@ -75,24 +83,41 @@
     inotify.c \
     io.c \
     ioctl.c \
+    ioperm.c \
+    iopl.c \
     ioprio.c \
-    ipc.c \
+    ipc_msg.c \
+    ipc_msgctl.c \
+    ipc_sem.c \
+    ipc_shm.c \
+    ipc_shmctl.c \
+    kcmp.c \
     kexec.c \
     keyctl.c \
     ldt.c \
     link.c \
+    lookup_dcookie.c \
     loop.c \
     lseek.c \
     mem.c \
+    membarrier.c \
     memfd_create.c \
     mknod.c \
     mount.c \
+    mq.c \
     mtd.c \
     net.c \
     open.c \
     pathtrace.c \
+    perf.c \
     personality.c \
+    poll.c \
     prctl.c \
+    print_mq_attr.c \
+    print_msgbuf.c \
+    print_sigevent.c \
+    print_time.c \
+    print_timex.c \
     printmode.c \
     printrusage.c \
     printsiginfo.c \
@@ -109,15 +134,16 @@
     sched.c \
     scsi.c \
     seccomp.c \
+    sendfile.c \
     sigaltstack.c \
     signal.c \
+    signalfd.c \
     sigreturn.c \
     sock.c \
     socketutils.c \
     sram_alloc.c \
     statfs.c \
     strace.c \
-    stream.c \
     swapon.c \
     sync_file_range.c \
     syscall.c \
@@ -127,12 +153,14 @@
     sysmips.c \
     term.c \
     time.c \
+    times.c \
     truncate.c \
     uid16.c \
     uid.c \
     umask.c \
     umount.c \
     uname.c \
+    userfaultfd.c \
     util.c \
     utime.c \
     utimes.c \
@@ -179,10 +207,13 @@
     -DHAVE_LINUX_ICMP_H=1 \
     -DHAVE_LINUX_IF_PACKET_H=1 \
     -DHAVE_LINUX_IN6_H=1 \
+    -DHAVE_LINUX_IPC_H=1 \
     -DHAVE_LINUX_MQUEUE=1 \
+    -DHAVE_LINUX_MSG_H=1 \
     -DHAVE_LINUX_NETLINK_H=1 \
     -DHAVE_LINUX_PERF_EVENT_H=1 \
     -DHAVE_LINUX_SEM_H=1 \
+    -DHAVE_LINUX_SHM_H=1 \
     -DHAVE_LITTLE_ENDIAN_LONG_LONG=1 \
     -DHAVE_LONG_LONG=1 \
     -DHAVE_NETINET_TCP_H=1 \
@@ -201,6 +232,7 @@
     -DHAVE_STATFS64=1 \
     -DHAVE_STDBOOL_H=1 \
     -DHAVE_STRERROR=1 \
+    -DHAVE_STRUCT_FLOCK=1 \
     -DHAVE_STRUCT_FLOCK64=1 \
     -DHAVE_STRUCT_MMSGHDR=1 \
     -DHAVE_STRUCT_MSGHDR_MSG_CONTROL=1 \
diff --git a/sen.h b/sen.h
index 4ceb47b..41cd739 100644
--- a/sen.h
+++ b/sen.h
@@ -61,6 +61,7 @@
 SEN_fchown16,
 SEN_fchownat,
 SEN_fcntl,
+SEN_fcntl64,
 SEN_fdatasync,
 SEN_fgetxattr,
 SEN_finit_module,
@@ -156,6 +157,7 @@
 SEN_lstat64,
 SEN_madvise,
 SEN_mbind,
+SEN_membarrier,
 SEN_memfd_create,
 SEN_migrate_pages,
 SEN_mincore,
@@ -164,6 +166,7 @@
 SEN_mknod,
 SEN_mknodat,
 SEN_mlock,
+SEN_mlock2,
 SEN_mlockall,
 SEN_mmap,
 SEN_mmap_4koff,
@@ -392,6 +395,7 @@
 SEN_unlinkat,
 SEN_unshare,
 SEN_uselib,
+SEN_userfaultfd,
 SEN_ustat,
 SEN_utime,
 SEN_utimensat,
diff --git a/sys_func.h b/sys_func.h
index a14164f..e32ff59 100644
--- a/sys_func.h
+++ b/sys_func.h
@@ -2,7 +2,6 @@
 extern SYS_FUNC(accept4);
 extern SYS_FUNC(access);
 extern SYS_FUNC(add_key);
-extern SYS_FUNC(adjtime);
 extern SYS_FUNC(adjtimex);
 extern SYS_FUNC(arch_prctl);
 extern SYS_FUNC(bind);
@@ -20,7 +19,6 @@
 extern SYS_FUNC(clock_settime);
 extern SYS_FUNC(clone);
 extern SYS_FUNC(close);
-extern SYS_FUNC(connect);
 extern SYS_FUNC(creat);
 extern SYS_FUNC(create_module);
 extern SYS_FUNC(delete_module);
@@ -49,6 +47,7 @@
 extern SYS_FUNC(fchown);
 extern SYS_FUNC(fchownat);
 extern SYS_FUNC(fcntl);
+extern SYS_FUNC(fcntl64);
 extern SYS_FUNC(fgetxattr);
 extern SYS_FUNC(finit_module);
 extern SYS_FUNC(flistxattr);
@@ -74,9 +73,7 @@
 extern SYS_FUNC(gethostname);
 extern SYS_FUNC(getitimer);
 extern SYS_FUNC(get_mempolicy);
-extern SYS_FUNC(getmsg);
 extern SYS_FUNC(getpagesize);
-extern SYS_FUNC(getpmsg);
 extern SYS_FUNC(getpriority);
 extern SYS_FUNC(getrandom);
 extern SYS_FUNC(getresuid);
@@ -97,11 +94,14 @@
 extern SYS_FUNC(ioctl);
 extern SYS_FUNC(io_destroy);
 extern SYS_FUNC(io_getevents);
+extern SYS_FUNC(ioperm);
+extern SYS_FUNC(iopl);
 extern SYS_FUNC(ioprio_get);
 extern SYS_FUNC(ioprio_set);
 extern SYS_FUNC(io_setup);
 extern SYS_FUNC(io_submit);
-extern SYS_FUNC(ipc);
+extern SYS_FUNC(kcmp);
+extern SYS_FUNC(kexec_file_load);
 extern SYS_FUNC(kexec_load);
 extern SYS_FUNC(keyctl);
 extern SYS_FUNC(kill);
@@ -110,14 +110,17 @@
 extern SYS_FUNC(listen);
 extern SYS_FUNC(listxattr);
 extern SYS_FUNC(llseek);
+extern SYS_FUNC(lookup_dcookie);
 extern SYS_FUNC(lseek);
 extern SYS_FUNC(madvise);
 extern SYS_FUNC(mbind);
+extern SYS_FUNC(membarrier);
 extern SYS_FUNC(memfd_create);
 extern SYS_FUNC(migrate_pages);
 extern SYS_FUNC(mincore);
 extern SYS_FUNC(mknod);
 extern SYS_FUNC(mknodat);
+extern SYS_FUNC(mlock2);
 extern SYS_FUNC(mlockall);
 extern SYS_FUNC(mmap);
 extern SYS_FUNC(mmap_4koff);
@@ -138,6 +141,7 @@
 extern SYS_FUNC(msgsnd);
 extern SYS_FUNC(msync);
 extern SYS_FUNC(munmap);
+extern SYS_FUNC(name_to_handle_at);
 extern SYS_FUNC(nanosleep);
 extern SYS_FUNC(newfstatat);
 extern SYS_FUNC(oldfstat);
@@ -147,6 +151,7 @@
 extern SYS_FUNC(oldstat);
 extern SYS_FUNC(open);
 extern SYS_FUNC(openat);
+extern SYS_FUNC(open_by_handle_at);
 extern SYS_FUNC(or1k_atomic);
 extern SYS_FUNC(osf_fstatfs);
 extern SYS_FUNC(osf_getitimer);
@@ -172,11 +177,8 @@
 extern SYS_FUNC(process_vm_writev);
 extern SYS_FUNC(pselect6);
 extern SYS_FUNC(ptrace);
-extern SYS_FUNC(putmsg);
-extern SYS_FUNC(putpmsg);
 extern SYS_FUNC(pwrite);
 extern SYS_FUNC(pwritev);
-extern SYS_FUNC(query_module);
 extern SYS_FUNC(quotactl);
 extern SYS_FUNC(read);
 extern SYS_FUNC(readahead);
@@ -256,7 +258,6 @@
 extern SYS_FUNC(sigsetmask);
 extern SYS_FUNC(sigsuspend);
 extern SYS_FUNC(socket);
-extern SYS_FUNC(socketcall);
 extern SYS_FUNC(socketpair);
 extern SYS_FUNC(splice);
 extern SYS_FUNC(sram_alloc);
@@ -292,6 +293,7 @@
 extern SYS_FUNC(uname);
 extern SYS_FUNC(unlinkat);
 extern SYS_FUNC(unshare);
+extern SYS_FUNC(userfaultfd);
 extern SYS_FUNC(utime);
 extern SYS_FUNC(utimensat);
 extern SYS_FUNC(utimes);
diff --git a/xlat/Makemodule.am b/xlat/Makemodule.am
index be193ec..652ecb4 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/bpf_class.in xlat/bpf_commands.in xlat/bpf_map_types.in xlat/bpf_map_update_elem_flags.in xlat/bpf_miscop.in xlat/bpf_mode.in xlat/bpf_op_alu.in xlat/bpf_op_jmp.in xlat/bpf_prog_types.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/memfd_create_flags.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/mtd_file_mode_options.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/sched_flags.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_commands.h xlat/bpf_map_types.h xlat/bpf_map_update_elem_flags.h xlat/bpf_miscop.h xlat/bpf_mode.h xlat/bpf_op_alu.h xlat/bpf_op_jmp.h xlat/bpf_prog_types.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/memfd_create_flags.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/mtd_file_mode_options.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/sched_flags.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 
+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/audit_arch.in xlat/baud_options.in xlat/blkpg_ops.in xlat/bootflags1.in xlat/bootflags2.in xlat/bootflags3.in xlat/bpf_class.in xlat/bpf_commands.in xlat/bpf_map_types.in xlat/bpf_map_update_elem_flags.in xlat/bpf_miscop.in xlat/bpf_mode.in xlat/bpf_op_alu.in xlat/bpf_op_jmp.in xlat/bpf_prog_types.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/dirent_types.in xlat/domains.in xlat/efd_flags.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/fcntl64cmds.in xlat/fcntlcmds.in xlat/fdflags.in xlat/flockcmds.in xlat/f_owner_types.in xlat/f_seals.in xlat/fsmagic.in xlat/futexops.in xlat/futexwakecmps.in xlat/futexwakeops.in xlat/getrandom_flags.in xlat/getsockipoptions.in xlat/getsockipv6options.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/ip_cmsg_types.in xlat/itimer_which.in xlat/kcmp_types.in xlat/kexec_arch_values.in xlat/kexec_file_load_flags.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/membarrier_cmds.in xlat/memfd_create_flags.in xlat/mempolicyflags.in xlat/mlockall_flags.in xlat/mlock_flags.in xlat/mmap_flags.in xlat/mmap_prot.in xlat/modem_flags.in xlat/modetypes.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/mtd_file_mode_options.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/policies.in xlat/pollflags.in xlat/pr_cap_ambient.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/quotacmds.in xlat/quota_formats.in xlat/quotatypes.in xlat/rename_flags.in xlat/resource_flags.in xlat/resources.in xlat/sched_flags.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/setsockipoptions.in xlat/setsockipv6options.in xlat/sfd_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/uffd_flags.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/audit_arch.h xlat/baud_options.h xlat/blkpg_ops.h xlat/bootflags1.h xlat/bootflags2.h xlat/bootflags3.h xlat/bpf_class.h xlat/bpf_commands.h xlat/bpf_map_types.h xlat/bpf_map_update_elem_flags.h xlat/bpf_miscop.h xlat/bpf_mode.h xlat/bpf_op_alu.h xlat/bpf_op_jmp.h xlat/bpf_prog_types.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/dirent_types.h xlat/domains.h xlat/efd_flags.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/fcntl64cmds.h xlat/fcntlcmds.h xlat/fdflags.h xlat/flockcmds.h xlat/f_owner_types.h xlat/f_seals.h xlat/fsmagic.h xlat/futexops.h xlat/futexwakecmps.h xlat/futexwakeops.h xlat/getrandom_flags.h xlat/getsockipoptions.h xlat/getsockipv6options.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/ip_cmsg_types.h xlat/itimer_which.h xlat/kcmp_types.h xlat/kexec_arch_values.h xlat/kexec_file_load_flags.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/membarrier_cmds.h xlat/memfd_create_flags.h xlat/mempolicyflags.h xlat/mlockall_flags.h xlat/mlock_flags.h xlat/mmap_flags.h xlat/mmap_prot.h xlat/modem_flags.h xlat/modetypes.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/mtd_file_mode_options.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/policies.h xlat/pollflags.h xlat/pr_cap_ambient.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/quotacmds.h xlat/quota_formats.h xlat/quotatypes.h xlat/rename_flags.h xlat/resource_flags.h xlat/resources.h xlat/sched_flags.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/setsockipoptions.h xlat/setsockipv6options.h xlat/sfd_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/uffd_flags.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
@@ -22,6 +22,8 @@
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/atomic_ops.h: $(top_srcdir)/xlat/atomic_ops.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/audit_arch.h: $(top_srcdir)/xlat/audit_arch.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/baud_options.h: $(top_srcdir)/xlat/baud_options.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/blkpg_ops.h: $(top_srcdir)/xlat/blkpg_ops.in $(top_srcdir)/xlat/gen.sh
@@ -82,10 +84,12 @@
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/delete_module_flags.h: $(top_srcdir)/xlat/delete_module_flags.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
-$(top_srcdir)/xlat/direnttypes.h: $(top_srcdir)/xlat/direnttypes.in $(top_srcdir)/xlat/gen.sh
+$(top_srcdir)/xlat/dirent_types.h: $(top_srcdir)/xlat/dirent_types.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/domains.h: $(top_srcdir)/xlat/domains.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/efd_flags.h: $(top_srcdir)/xlat/efd_flags.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/epollctls.h: $(top_srcdir)/xlat/epollctls.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/epollevents.h: $(top_srcdir)/xlat/epollevents.in $(top_srcdir)/xlat/gen.sh
@@ -130,12 +134,18 @@
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/fan_mark_flags.h: $(top_srcdir)/xlat/fan_mark_flags.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/fcntl64cmds.h: $(top_srcdir)/xlat/fcntl64cmds.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/fcntlcmds.h: $(top_srcdir)/xlat/fcntlcmds.in $(top_srcdir)/xlat/gen.sh
 	$(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/flockcmds.h: $(top_srcdir)/xlat/flockcmds.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/f_owner_types.h: $(top_srcdir)/xlat/f_owner_types.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/f_seals.h: $(top_srcdir)/xlat/f_seals.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
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/futexops.h: $(top_srcdir)/xlat/futexops.in $(top_srcdir)/xlat/gen.sh
@@ -146,6 +156,10 @@
 	$(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/getsockipoptions.h: $(top_srcdir)/xlat/getsockipoptions.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/getsockipv6options.h: $(top_srcdir)/xlat/getsockipv6options.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
@@ -168,10 +182,16 @@
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/ipc_msg_flags.h: $(top_srcdir)/xlat/ipc_msg_flags.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/ip_cmsg_types.h: $(top_srcdir)/xlat/ip_cmsg_types.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/itimer_which.h: $(top_srcdir)/xlat/itimer_which.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/kcmp_types.h: $(top_srcdir)/xlat/kcmp_types.in $(top_srcdir)/xlat/gen.sh
+	$(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_file_load_flags.h: $(top_srcdir)/xlat/kexec_file_load_flags.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(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
@@ -194,12 +214,16 @@
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/mctl_sync.h: $(top_srcdir)/xlat/mctl_sync.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/membarrier_cmds.h: $(top_srcdir)/xlat/membarrier_cmds.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/memfd_create_flags.h: $(top_srcdir)/xlat/memfd_create_flags.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/mempolicyflags.h: $(top_srcdir)/xlat/mempolicyflags.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/mlockall_flags.h: $(top_srcdir)/xlat/mlockall_flags.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/mlock_flags.h: $(top_srcdir)/xlat/mlock_flags.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/mmap_flags.h: $(top_srcdir)/xlat/mmap_flags.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/mmap_prot.h: $(top_srcdir)/xlat/mmap_prot.in $(top_srcdir)/xlat/gen.sh
@@ -208,8 +232,6 @@
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/modetypes.h: $(top_srcdir)/xlat/modetypes.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
-$(top_srcdir)/xlat/modflags.h: $(top_srcdir)/xlat/modflags.in $(top_srcdir)/xlat/gen.sh
-	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/module_init_flags.h: $(top_srcdir)/xlat/module_init_flags.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/mount_flags.h: $(top_srcdir)/xlat/mount_flags.in $(top_srcdir)/xlat/gen.sh
@@ -252,12 +274,12 @@
 	$(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
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
-$(top_srcdir)/xlat/pmsgflags.h: $(top_srcdir)/xlat/pmsgflags.in $(top_srcdir)/xlat/gen.sh
-	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/policies.h: $(top_srcdir)/xlat/policies.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/pollflags.h: $(top_srcdir)/xlat/pollflags.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/pr_cap_ambient.h: $(top_srcdir)/xlat/pr_cap_ambient.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/prctl_options.h: $(top_srcdir)/xlat/prctl_options.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/priorities.h: $(top_srcdir)/xlat/priorities.in $(top_srcdir)/xlat/gen.sh
@@ -280,8 +302,6 @@
 	$(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
-	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/quotacmds.h: $(top_srcdir)/xlat/quotacmds.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/quota_formats.h: $(top_srcdir)/xlat/quota_formats.in $(top_srcdir)/xlat/gen.sh
@@ -314,6 +334,12 @@
 	$(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
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/setsockipoptions.h: $(top_srcdir)/xlat/setsockipoptions.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/setsockipv6options.h: $(top_srcdir)/xlat/setsockipv6options.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/sfd_flags.h: $(top_srcdir)/xlat/sfd_flags.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/sg_io_dxfer_direction.h: $(top_srcdir)/xlat/sg_io_dxfer_direction.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/shmctl_flags.h: $(top_srcdir)/xlat/shmctl_flags.in $(top_srcdir)/xlat/gen.sh
@@ -420,6 +446,8 @@
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/ubi_volume_types.h: $(top_srcdir)/xlat/ubi_volume_types.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
+$(top_srcdir)/xlat/uffd_flags.h: $(top_srcdir)/xlat/uffd_flags.in $(top_srcdir)/xlat/gen.sh
+	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/umount_flags.h: $(top_srcdir)/xlat/umount_flags.in $(top_srcdir)/xlat/gen.sh
 	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@
 $(top_srcdir)/xlat/usagewho.h: $(top_srcdir)/xlat/usagewho.in $(top_srcdir)/xlat/gen.sh
diff --git a/xlat/access_flags.h b/xlat/access_flags.h
index a1c3544..a30f082 100644
--- a/xlat/access_flags.h
+++ b/xlat/access_flags.h
@@ -1,23 +1,32 @@
 /* Generated by ./xlat/gen.sh from ./xlat/access_flags.in; do not edit. */
 
-static const struct xlat access_flags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat access_flags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/aclipc.h b/xlat/aclipc.h
index 0f475c6..6dabb83 100644
--- a/xlat/aclipc.h
+++ b/xlat/aclipc.h
@@ -1,14 +1,23 @@
 /* Generated by ./xlat/gen.sh from ./xlat/aclipc.in; do not edit. */
 
-static const struct xlat aclipc[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat aclipc in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/addrfams.h b/xlat/addrfams.h
index 7b1d7f2..410cc69 100644
--- a/xlat/addrfams.h
+++ b/xlat/addrfams.h
@@ -1,128 +1,138 @@
 /* Generated by ./xlat/gen.sh from ./xlat/addrfams.in; do not edit. */
 
+#ifndef IN_MPERS
+
 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_IB) || (defined(HAVE_DECL_AF_IB) && HAVE_DECL_AF_IB)
+  XLAT(AF_IB),
+#endif
+#if defined(AF_MPLS) || (defined(HAVE_DECL_AF_MPLS) && HAVE_DECL_AF_MPLS)
+  XLAT(AF_MPLS),
 #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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/adjtimex_modes.h b/xlat/adjtimex_modes.h
index 08fa3a8..7415fe8 100644
--- a/xlat/adjtimex_modes.h
+++ b/xlat/adjtimex_modes.h
@@ -1,45 +1,56 @@
 /* Generated by ./xlat/gen.sh from ./xlat/adjtimex_modes.in; do not edit. */
 
-static const struct xlat adjtimex_modes[] = {
+#ifdef IN_MPERS
+
+extern const struct xlat adjtimex_modes[];
+
+#else
+
+# if !(defined HAVE_M32_MPERS || defined HAVE_MX32_MPERS)
+static
+# endif
+const struct xlat adjtimex_modes[] = {
  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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/adjtimex_state.h b/xlat/adjtimex_state.h
index 0af75af..888f1b6 100644
--- a/xlat/adjtimex_state.h
+++ b/xlat/adjtimex_state.h
@@ -1,23 +1,32 @@
 /* Generated by ./xlat/gen.sh from ./xlat/adjtimex_state.in; do not edit. */
 
-static const struct xlat adjtimex_state[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat adjtimex_state in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/adjtimex_status.h b/xlat/adjtimex_status.h
index 51b25ee..16e7811 100644
--- a/xlat/adjtimex_status.h
+++ b/xlat/adjtimex_status.h
@@ -1,53 +1,64 @@
 /* Generated by ./xlat/gen.sh from ./xlat/adjtimex_status.in; do not edit. */
 
-static const struct xlat adjtimex_status[] = {
+#ifdef IN_MPERS
+
+extern const struct xlat adjtimex_status[];
+
+#else
+
+# if !(defined HAVE_M32_MPERS || defined HAVE_MX32_MPERS)
+static
+# endif
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/advise.h b/xlat/advise.h
index 61da386..526219d 100644
--- a/xlat/advise.h
+++ b/xlat/advise.h
@@ -1,23 +1,32 @@
 /* Generated by ./xlat/gen.sh from ./xlat/advise.in; do not edit. */
 
-static const struct xlat advise[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat advise in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/af_packet_types.h b/xlat/af_packet_types.h
index 2e30ad7..72bb419 100644
--- a/xlat/af_packet_types.h
+++ b/xlat/af_packet_types.h
@@ -1,26 +1,35 @@
 /* Generated by ./xlat/gen.sh from ./xlat/af_packet_types.in; do not edit. */
 
-static const struct xlat af_packet_types[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat af_packet_types in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/archvals.h b/xlat/archvals.h
index 9288fb9..9ace509 100644
--- a/xlat/archvals.h
+++ b/xlat/archvals.h
@@ -1,17 +1,26 @@
 /* Generated by ./xlat/gen.sh from ./xlat/archvals.in; do not edit. */
 
-static const struct xlat archvals[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat archvals in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/at_flags.h b/xlat/at_flags.h
index e8a163e..5bebc0b 100644
--- a/xlat/at_flags.h
+++ b/xlat/at_flags.h
@@ -1,25 +1,29 @@
 /* Generated by ./xlat/gen.sh from ./xlat/at_flags.in; do not edit. */
-
-const struct xlat at_flags[] = {
 #if !(defined(AT_SYMLINK_NOFOLLOW) || (defined(HAVE_DECL_AT_SYMLINK_NOFOLLOW) && HAVE_DECL_AT_SYMLINK_NOFOLLOW))
 # define AT_SYMLINK_NOFOLLOW 0x100
 #endif
- XLAT(AT_SYMLINK_NOFOLLOW),
 #if !(defined(AT_REMOVEDIR) || (defined(HAVE_DECL_AT_REMOVEDIR) && HAVE_DECL_AT_REMOVEDIR))
 # define AT_REMOVEDIR 0x200
 #endif
- XLAT(AT_REMOVEDIR),
 #if !(defined(AT_SYMLINK_FOLLOW) || (defined(HAVE_DECL_AT_SYMLINK_FOLLOW) && HAVE_DECL_AT_SYMLINK_FOLLOW))
 # define AT_SYMLINK_FOLLOW 0x400
 #endif
- XLAT(AT_SYMLINK_FOLLOW),
 #if !(defined(AT_NO_AUTOMOUNT) || (defined(HAVE_DECL_AT_NO_AUTOMOUNT) && HAVE_DECL_AT_NO_AUTOMOUNT))
 # define AT_NO_AUTOMOUNT 0x800
 #endif
- XLAT(AT_NO_AUTOMOUNT),
 #if !(defined(AT_EMPTY_PATH) || (defined(HAVE_DECL_AT_EMPTY_PATH) && HAVE_DECL_AT_EMPTY_PATH))
 # define AT_EMPTY_PATH 0x1000
 #endif
+
+#ifndef IN_MPERS
+
+const struct xlat at_flags[] = {
+ XLAT(AT_SYMLINK_NOFOLLOW),
+ XLAT(AT_REMOVEDIR),
+ XLAT(AT_SYMLINK_FOLLOW),
+ XLAT(AT_NO_AUTOMOUNT),
  XLAT(AT_EMPTY_PATH),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/atomic_ops.h b/xlat/atomic_ops.h
index 8fa3f9a..224dfea 100644
--- a/xlat/atomic_ops.h
+++ b/xlat/atomic_ops.h
@@ -1,6 +1,13 @@
 /* Generated by ./xlat/gen.sh from ./xlat/atomic_ops.in; do not edit. */
 
-static const struct xlat atomic_ops[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat atomic_ops in mpers mode
+
+#else
+
+static
+const struct xlat atomic_ops[] = {
 { OR1K_ATOMIC_SWAP,		"SWAP"		},
 { OR1K_ATOMIC_CMPXCHG,		"CMPXCHG"	},
 { OR1K_ATOMIC_XCHG,		"XCHG"		},
@@ -12,3 +19,5 @@
 { OR1K_ATOMIC_UMIN,		"UMIN"		},
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/audit_arch.h b/xlat/audit_arch.h
new file mode 100644
index 0000000..16d3947
--- /dev/null
+++ b/xlat/audit_arch.h
@@ -0,0 +1,129 @@
+/* Generated by ./xlat/gen.sh from ./xlat/audit_arch.in; do not edit. */
+#ifdef EM_ARM
+#endif
+#ifdef EM_FRV
+#endif
+#ifdef EM_MICROBLAZE
+#endif
+#ifdef EM_OPENRISC
+#endif
+
+#ifdef IN_MPERS
+
+extern const struct xlat audit_arch[];
+
+#else
+
+# if !(defined HAVE_M32_MPERS || defined HAVE_MX32_MPERS)
+static
+# endif
+const struct xlat audit_arch[] = {
+/* linux used to have linux/elf-em.h out of sync with linux/audit.h */
+#if defined(AUDIT_ARCH_AARCH64) || (defined(HAVE_DECL_AUDIT_ARCH_AARCH64) && HAVE_DECL_AUDIT_ARCH_AARCH64)
+  XLAT(AUDIT_ARCH_AARCH64),
+#endif
+#if defined(AUDIT_ARCH_ALPHA) || (defined(HAVE_DECL_AUDIT_ARCH_ALPHA) && HAVE_DECL_AUDIT_ARCH_ALPHA)
+  XLAT(AUDIT_ARCH_ALPHA),
+#endif
+#ifdef EM_ARM
+#if defined(AUDIT_ARCH_ARM) || (defined(HAVE_DECL_AUDIT_ARCH_ARM) && HAVE_DECL_AUDIT_ARCH_ARM)
+  XLAT(AUDIT_ARCH_ARM),
+#endif
+#if defined(AUDIT_ARCH_ARMEB) || (defined(HAVE_DECL_AUDIT_ARCH_ARMEB) && HAVE_DECL_AUDIT_ARCH_ARMEB)
+  XLAT(AUDIT_ARCH_ARMEB),
+#endif
+#endif
+#if defined(AUDIT_ARCH_CRIS) || (defined(HAVE_DECL_AUDIT_ARCH_CRIS) && HAVE_DECL_AUDIT_ARCH_CRIS)
+  XLAT(AUDIT_ARCH_CRIS),
+#endif
+#ifdef EM_FRV
+#if defined(AUDIT_ARCH_FRV) || (defined(HAVE_DECL_AUDIT_ARCH_FRV) && HAVE_DECL_AUDIT_ARCH_FRV)
+  XLAT(AUDIT_ARCH_FRV),
+#endif
+#endif
+#if defined(AUDIT_ARCH_I386) || (defined(HAVE_DECL_AUDIT_ARCH_I386) && HAVE_DECL_AUDIT_ARCH_I386)
+  XLAT(AUDIT_ARCH_I386),
+#endif
+#if defined(AUDIT_ARCH_IA64) || (defined(HAVE_DECL_AUDIT_ARCH_IA64) && HAVE_DECL_AUDIT_ARCH_IA64)
+  XLAT(AUDIT_ARCH_IA64),
+#endif
+#if defined(AUDIT_ARCH_M32R) || (defined(HAVE_DECL_AUDIT_ARCH_M32R) && HAVE_DECL_AUDIT_ARCH_M32R)
+  XLAT(AUDIT_ARCH_M32R),
+#endif
+#if defined(AUDIT_ARCH_M68K) || (defined(HAVE_DECL_AUDIT_ARCH_M68K) && HAVE_DECL_AUDIT_ARCH_M68K)
+  XLAT(AUDIT_ARCH_M68K),
+#endif
+#ifdef EM_MICROBLAZE
+#if defined(AUDIT_ARCH_MICROBLAZE) || (defined(HAVE_DECL_AUDIT_ARCH_MICROBLAZE) && HAVE_DECL_AUDIT_ARCH_MICROBLAZE)
+  XLAT(AUDIT_ARCH_MICROBLAZE),
+#endif
+#endif
+#if defined(AUDIT_ARCH_MIPS) || (defined(HAVE_DECL_AUDIT_ARCH_MIPS) && HAVE_DECL_AUDIT_ARCH_MIPS)
+  XLAT(AUDIT_ARCH_MIPS),
+#endif
+#if defined(AUDIT_ARCH_MIPS64) || (defined(HAVE_DECL_AUDIT_ARCH_MIPS64) && HAVE_DECL_AUDIT_ARCH_MIPS64)
+  XLAT(AUDIT_ARCH_MIPS64),
+#endif
+#if defined(AUDIT_ARCH_MIPS64N32) || (defined(HAVE_DECL_AUDIT_ARCH_MIPS64N32) && HAVE_DECL_AUDIT_ARCH_MIPS64N32)
+  XLAT(AUDIT_ARCH_MIPS64N32),
+#endif
+#if defined(AUDIT_ARCH_MIPSEL) || (defined(HAVE_DECL_AUDIT_ARCH_MIPSEL) && HAVE_DECL_AUDIT_ARCH_MIPSEL)
+  XLAT(AUDIT_ARCH_MIPSEL),
+#endif
+#if defined(AUDIT_ARCH_MIPSEL64) || (defined(HAVE_DECL_AUDIT_ARCH_MIPSEL64) && HAVE_DECL_AUDIT_ARCH_MIPSEL64)
+  XLAT(AUDIT_ARCH_MIPSEL64),
+#endif
+#if defined(AUDIT_ARCH_MIPSEL64N32) || (defined(HAVE_DECL_AUDIT_ARCH_MIPSEL64N32) && HAVE_DECL_AUDIT_ARCH_MIPSEL64N32)
+  XLAT(AUDIT_ARCH_MIPSEL64N32),
+#endif
+#ifdef EM_OPENRISC
+#if defined(AUDIT_ARCH_OPENRISC) || (defined(HAVE_DECL_AUDIT_ARCH_OPENRISC) && HAVE_DECL_AUDIT_ARCH_OPENRISC)
+  XLAT(AUDIT_ARCH_OPENRISC),
+#endif
+#endif
+#if defined(AUDIT_ARCH_PARISC) || (defined(HAVE_DECL_AUDIT_ARCH_PARISC) && HAVE_DECL_AUDIT_ARCH_PARISC)
+  XLAT(AUDIT_ARCH_PARISC),
+#endif
+#if defined(AUDIT_ARCH_PARISC64) || (defined(HAVE_DECL_AUDIT_ARCH_PARISC64) && HAVE_DECL_AUDIT_ARCH_PARISC64)
+  XLAT(AUDIT_ARCH_PARISC64),
+#endif
+#if defined(AUDIT_ARCH_PPC) || (defined(HAVE_DECL_AUDIT_ARCH_PPC) && HAVE_DECL_AUDIT_ARCH_PPC)
+  XLAT(AUDIT_ARCH_PPC),
+#endif
+#if defined(AUDIT_ARCH_PPC64) || (defined(HAVE_DECL_AUDIT_ARCH_PPC64) && HAVE_DECL_AUDIT_ARCH_PPC64)
+  XLAT(AUDIT_ARCH_PPC64),
+#endif
+#if defined(AUDIT_ARCH_PPC64LE) || (defined(HAVE_DECL_AUDIT_ARCH_PPC64LE) && HAVE_DECL_AUDIT_ARCH_PPC64LE)
+  XLAT(AUDIT_ARCH_PPC64LE),
+#endif
+#if defined(AUDIT_ARCH_S390) || (defined(HAVE_DECL_AUDIT_ARCH_S390) && HAVE_DECL_AUDIT_ARCH_S390)
+  XLAT(AUDIT_ARCH_S390),
+#endif
+#if defined(AUDIT_ARCH_S390X) || (defined(HAVE_DECL_AUDIT_ARCH_S390X) && HAVE_DECL_AUDIT_ARCH_S390X)
+  XLAT(AUDIT_ARCH_S390X),
+#endif
+#if defined(AUDIT_ARCH_SH) || (defined(HAVE_DECL_AUDIT_ARCH_SH) && HAVE_DECL_AUDIT_ARCH_SH)
+  XLAT(AUDIT_ARCH_SH),
+#endif
+#if defined(AUDIT_ARCH_SH64) || (defined(HAVE_DECL_AUDIT_ARCH_SH64) && HAVE_DECL_AUDIT_ARCH_SH64)
+  XLAT(AUDIT_ARCH_SH64),
+#endif
+#if defined(AUDIT_ARCH_SHEL) || (defined(HAVE_DECL_AUDIT_ARCH_SHEL) && HAVE_DECL_AUDIT_ARCH_SHEL)
+  XLAT(AUDIT_ARCH_SHEL),
+#endif
+#if defined(AUDIT_ARCH_SHEL64) || (defined(HAVE_DECL_AUDIT_ARCH_SHEL64) && HAVE_DECL_AUDIT_ARCH_SHEL64)
+  XLAT(AUDIT_ARCH_SHEL64),
+#endif
+#if defined(AUDIT_ARCH_SPARC) || (defined(HAVE_DECL_AUDIT_ARCH_SPARC) && HAVE_DECL_AUDIT_ARCH_SPARC)
+  XLAT(AUDIT_ARCH_SPARC),
+#endif
+#if defined(AUDIT_ARCH_SPARC64) || (defined(HAVE_DECL_AUDIT_ARCH_SPARC64) && HAVE_DECL_AUDIT_ARCH_SPARC64)
+  XLAT(AUDIT_ARCH_SPARC64),
+#endif
+#if defined(AUDIT_ARCH_X86_64) || (defined(HAVE_DECL_AUDIT_ARCH_X86_64) && HAVE_DECL_AUDIT_ARCH_X86_64)
+  XLAT(AUDIT_ARCH_X86_64),
+#endif
+ XLAT_END
+};
+
+#endif /* !IN_MPERS */
diff --git a/xlat/baud_options.h b/xlat/baud_options.h
index 34962eb..0ea7336 100644
--- a/xlat/baud_options.h
+++ b/xlat/baud_options.h
@@ -1,104 +1,113 @@
 /* Generated by ./xlat/gen.sh from ./xlat/baud_options.in; do not edit. */
 
-static const struct xlat baud_options[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat baud_options in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/blkpg_ops.h b/xlat/blkpg_ops.h
index 8f3ad8e..0697fc0 100644
--- a/xlat/blkpg_ops.h
+++ b/xlat/blkpg_ops.h
@@ -1,17 +1,26 @@
 /* Generated by ./xlat/gen.sh from ./xlat/blkpg_ops.in; do not edit. */
-
-static const struct xlat blkpg_ops[] = {
 #if !(defined(BLKPG_ADD_PARTITION) || (defined(HAVE_DECL_BLKPG_ADD_PARTITION) && HAVE_DECL_BLKPG_ADD_PARTITION))
 # define BLKPG_ADD_PARTITION 1
 #endif
- XLAT(BLKPG_ADD_PARTITION),
 #if !(defined(BLKPG_DEL_PARTITION) || (defined(HAVE_DECL_BLKPG_DEL_PARTITION) && HAVE_DECL_BLKPG_DEL_PARTITION))
 # define BLKPG_DEL_PARTITION 2
 #endif
- XLAT(BLKPG_DEL_PARTITION),
 #if !(defined(BLKPG_RESIZE_PARTITION) || (defined(HAVE_DECL_BLKPG_RESIZE_PARTITION) && HAVE_DECL_BLKPG_RESIZE_PARTITION))
 # define BLKPG_RESIZE_PARTITION 3
 #endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat blkpg_ops in mpers mode
+
+#else
+
+static
+const struct xlat blkpg_ops[] = {
+ XLAT(BLKPG_ADD_PARTITION),
+ XLAT(BLKPG_DEL_PARTITION),
  XLAT(BLKPG_RESIZE_PARTITION),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/bootflags1.h b/xlat/bootflags1.h
index e5577ea..fb27140 100644
--- a/xlat/bootflags1.h
+++ b/xlat/bootflags1.h
@@ -1,9 +1,18 @@
 /* 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))
 # define LINUX_REBOOT_MAGIC1 0xfee1dead
 #endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat bootflags1 in mpers mode
+
+#else
+
+static
+const struct xlat bootflags1[] = {
  XLAT(LINUX_REBOOT_MAGIC1),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/bootflags2.h b/xlat/bootflags2.h
index 28b7f83..612aae1 100644
--- a/xlat/bootflags2.h
+++ b/xlat/bootflags2.h
@@ -1,21 +1,30 @@
 /* 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))
 # define LINUX_REBOOT_MAGIC2 672274793
 #endif
- 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
- 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
- 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
+
+#ifdef IN_MPERS
+
+# error static const struct xlat bootflags2 in mpers mode
+
+#else
+
+static
+const struct xlat bootflags2[] = {
+ XLAT(LINUX_REBOOT_MAGIC2),
+ XLAT(LINUX_REBOOT_MAGIC2A),
+ XLAT(LINUX_REBOOT_MAGIC2B),
  XLAT(LINUX_REBOOT_MAGIC2C),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/bootflags3.h b/xlat/bootflags3.h
index 79afe27..47ea9cf 100644
--- a/xlat/bootflags3.h
+++ b/xlat/bootflags3.h
@@ -1,37 +1,46 @@
 /* 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))
 # define LINUX_REBOOT_CMD_RESTART 0x01234567
 #endif
- 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
- 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
- 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
- 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
- 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
- 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
- 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
+
+#ifdef IN_MPERS
+
+# error static const struct xlat bootflags3 in mpers mode
+
+#else
+
+static
+const struct xlat bootflags3[] = {
+ XLAT(LINUX_REBOOT_CMD_RESTART),
+ XLAT(LINUX_REBOOT_CMD_HALT),
+ XLAT(LINUX_REBOOT_CMD_CAD_ON),
+ XLAT(LINUX_REBOOT_CMD_CAD_OFF),
+ XLAT(LINUX_REBOOT_CMD_POWER_OFF),
+ XLAT(LINUX_REBOOT_CMD_RESTART2),
+ XLAT(LINUX_REBOOT_CMD_SW_SUSPEND),
  XLAT(LINUX_REBOOT_CMD_KEXEC),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/bpf_class.h b/xlat/bpf_class.h
index ef312e9..bdabc9a 100644
--- a/xlat/bpf_class.h
+++ b/xlat/bpf_class.h
@@ -1,29 +1,38 @@
 /* Generated by ./xlat/gen.sh from ./xlat/bpf_class.in; do not edit. */
 
-static const struct xlat bpf_class[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat bpf_class in mpers mode
+
+#else
+
+static
+const struct xlat bpf_class[] = {
 #if defined(BPF_LD) || (defined(HAVE_DECL_BPF_LD) && HAVE_DECL_BPF_LD)
- XLAT(BPF_LD),
+  XLAT(BPF_LD),
 #endif
 #if defined(BPF_LDX) || (defined(HAVE_DECL_BPF_LDX) && HAVE_DECL_BPF_LDX)
- XLAT(BPF_LDX),
+  XLAT(BPF_LDX),
 #endif
 #if defined(BPF_ST) || (defined(HAVE_DECL_BPF_ST) && HAVE_DECL_BPF_ST)
- XLAT(BPF_ST),
+  XLAT(BPF_ST),
 #endif
 #if defined(BPF_STX) || (defined(HAVE_DECL_BPF_STX) && HAVE_DECL_BPF_STX)
- XLAT(BPF_STX),
+  XLAT(BPF_STX),
 #endif
 #if defined(BPF_ALU) || (defined(HAVE_DECL_BPF_ALU) && HAVE_DECL_BPF_ALU)
- XLAT(BPF_ALU),
+  XLAT(BPF_ALU),
 #endif
 #if defined(BPF_JMP) || (defined(HAVE_DECL_BPF_JMP) && HAVE_DECL_BPF_JMP)
- XLAT(BPF_JMP),
+  XLAT(BPF_JMP),
 #endif
 #if defined(BPF_RET) || (defined(HAVE_DECL_BPF_RET) && HAVE_DECL_BPF_RET)
- XLAT(BPF_RET),
+  XLAT(BPF_RET),
 #endif
 #if defined(BPF_MISC) || (defined(HAVE_DECL_BPF_MISC) && HAVE_DECL_BPF_MISC)
- XLAT(BPF_MISC),
+  XLAT(BPF_MISC),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/bpf_commands.h b/xlat/bpf_commands.h
index c9e72d8..56e9968 100644
--- a/xlat/bpf_commands.h
+++ b/xlat/bpf_commands.h
@@ -1,29 +1,38 @@
 /* Generated by ./xlat/gen.sh from ./xlat/bpf_commands.in; do not edit. */
-
-static const struct xlat bpf_commands[] = {
 #if !(defined(BPF_MAP_CREATE) || (defined(HAVE_DECL_BPF_MAP_CREATE) && HAVE_DECL_BPF_MAP_CREATE))
 # define BPF_MAP_CREATE 0
 #endif
- XLAT(BPF_MAP_CREATE),
 #if !(defined(BPF_MAP_LOOKUP_ELEM) || (defined(HAVE_DECL_BPF_MAP_LOOKUP_ELEM) && HAVE_DECL_BPF_MAP_LOOKUP_ELEM))
 # define BPF_MAP_LOOKUP_ELEM 1
 #endif
- XLAT(BPF_MAP_LOOKUP_ELEM),
 #if !(defined(BPF_MAP_UPDATE_ELEM) || (defined(HAVE_DECL_BPF_MAP_UPDATE_ELEM) && HAVE_DECL_BPF_MAP_UPDATE_ELEM))
 # define BPF_MAP_UPDATE_ELEM 2
 #endif
- XLAT(BPF_MAP_UPDATE_ELEM),
 #if !(defined(BPF_MAP_DELETE_ELEM) || (defined(HAVE_DECL_BPF_MAP_DELETE_ELEM) && HAVE_DECL_BPF_MAP_DELETE_ELEM))
 # define BPF_MAP_DELETE_ELEM 3
 #endif
- XLAT(BPF_MAP_DELETE_ELEM),
 #if !(defined(BPF_MAP_GET_NEXT_KEY) || (defined(HAVE_DECL_BPF_MAP_GET_NEXT_KEY) && HAVE_DECL_BPF_MAP_GET_NEXT_KEY))
 # define BPF_MAP_GET_NEXT_KEY 4
 #endif
- XLAT(BPF_MAP_GET_NEXT_KEY),
 #if !(defined(BPF_PROG_LOAD) || (defined(HAVE_DECL_BPF_PROG_LOAD) && HAVE_DECL_BPF_PROG_LOAD))
 # define BPF_PROG_LOAD 5
 #endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat bpf_commands in mpers mode
+
+#else
+
+static
+const struct xlat bpf_commands[] = {
+ XLAT(BPF_MAP_CREATE),
+ XLAT(BPF_MAP_LOOKUP_ELEM),
+ XLAT(BPF_MAP_UPDATE_ELEM),
+ XLAT(BPF_MAP_DELETE_ELEM),
+ XLAT(BPF_MAP_GET_NEXT_KEY),
  XLAT(BPF_PROG_LOAD),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/bpf_map_types.h b/xlat/bpf_map_types.h
index 118fbb3..8142ec1 100644
--- a/xlat/bpf_map_types.h
+++ b/xlat/bpf_map_types.h
@@ -1,21 +1,34 @@
 /* Generated by ./xlat/gen.sh from ./xlat/bpf_map_types.in; do not edit. */
-
-static const struct xlat bpf_map_types[] = {
 #if !(defined(BPF_MAP_TYPE_UNSPEC) || (defined(HAVE_DECL_BPF_MAP_TYPE_UNSPEC) && HAVE_DECL_BPF_MAP_TYPE_UNSPEC))
 # define BPF_MAP_TYPE_UNSPEC 0
 #endif
- XLAT(BPF_MAP_TYPE_UNSPEC),
 #if !(defined(BPF_MAP_TYPE_HASH) || (defined(HAVE_DECL_BPF_MAP_TYPE_HASH) && HAVE_DECL_BPF_MAP_TYPE_HASH))
 # define BPF_MAP_TYPE_HASH 1
 #endif
- XLAT(BPF_MAP_TYPE_HASH),
 #if !(defined(BPF_MAP_TYPE_ARRAY) || (defined(HAVE_DECL_BPF_MAP_TYPE_ARRAY) && HAVE_DECL_BPF_MAP_TYPE_ARRAY))
 # define BPF_MAP_TYPE_ARRAY 2
 #endif
- XLAT(BPF_MAP_TYPE_ARRAY),
 #if !(defined(BPF_MAP_TYPE_PROG_ARRAY) || (defined(HAVE_DECL_BPF_MAP_TYPE_PROG_ARRAY) && HAVE_DECL_BPF_MAP_TYPE_PROG_ARRAY))
 # define BPF_MAP_TYPE_PROG_ARRAY 3
 #endif
+#if !(defined(BPF_MAP_TYPE_PERF_EVENT_ARRAY) || (defined(HAVE_DECL_BPF_MAP_TYPE_PERF_EVENT_ARRAY) && HAVE_DECL_BPF_MAP_TYPE_PERF_EVENT_ARRAY))
+# define BPF_MAP_TYPE_PERF_EVENT_ARRAY 4
+#endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat bpf_map_types in mpers mode
+
+#else
+
+static
+const struct xlat bpf_map_types[] = {
+ XLAT(BPF_MAP_TYPE_UNSPEC),
+ XLAT(BPF_MAP_TYPE_HASH),
+ XLAT(BPF_MAP_TYPE_ARRAY),
  XLAT(BPF_MAP_TYPE_PROG_ARRAY),
+ XLAT(BPF_MAP_TYPE_PERF_EVENT_ARRAY),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/bpf_map_update_elem_flags.h b/xlat/bpf_map_update_elem_flags.h
index 8fb4253..038863e 100644
--- a/xlat/bpf_map_update_elem_flags.h
+++ b/xlat/bpf_map_update_elem_flags.h
@@ -1,17 +1,26 @@
 /* Generated by ./xlat/gen.sh from ./xlat/bpf_map_update_elem_flags.in; do not edit. */
-
-static const struct xlat bpf_map_update_elem_flags[] = {
 #if !(defined(BPF_ANY) || (defined(HAVE_DECL_BPF_ANY) && HAVE_DECL_BPF_ANY))
 # define BPF_ANY 0
 #endif
- XLAT(BPF_ANY),
 #if !(defined(BPF_NOEXIST) || (defined(HAVE_DECL_BPF_NOEXIST) && HAVE_DECL_BPF_NOEXIST))
 # define BPF_NOEXIST 1
 #endif
- XLAT(BPF_NOEXIST),
 #if !(defined(BPF_EXIST) || (defined(HAVE_DECL_BPF_EXIST) && HAVE_DECL_BPF_EXIST))
 # define BPF_EXIST 2
 #endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat bpf_map_update_elem_flags in mpers mode
+
+#else
+
+static
+const struct xlat bpf_map_update_elem_flags[] = {
+ XLAT(BPF_ANY),
+ XLAT(BPF_NOEXIST),
  XLAT(BPF_EXIST),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/bpf_miscop.h b/xlat/bpf_miscop.h
index e3fc050..bedf35b 100644
--- a/xlat/bpf_miscop.h
+++ b/xlat/bpf_miscop.h
@@ -1,11 +1,20 @@
 /* Generated by ./xlat/gen.sh from ./xlat/bpf_miscop.in; do not edit. */
 
-static const struct xlat bpf_miscop[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat bpf_miscop in mpers mode
+
+#else
+
+static
+const struct xlat bpf_miscop[] = {
 #if defined(BPF_TAX) || (defined(HAVE_DECL_BPF_TAX) && HAVE_DECL_BPF_TAX)
- XLAT(BPF_TAX),
+  XLAT(BPF_TAX),
 #endif
 #if defined(BPF_TXA) || (defined(HAVE_DECL_BPF_TXA) && HAVE_DECL_BPF_TXA)
- XLAT(BPF_TXA),
+  XLAT(BPF_TXA),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/bpf_mode.h b/xlat/bpf_mode.h
index f372dda..0e3c862 100644
--- a/xlat/bpf_mode.h
+++ b/xlat/bpf_mode.h
@@ -1,26 +1,35 @@
 /* Generated by ./xlat/gen.sh from ./xlat/bpf_mode.in; do not edit. */
 
-static const struct xlat bpf_mode[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat bpf_mode in mpers mode
+
+#else
+
+static
+const struct xlat bpf_mode[] = {
 #if defined(BPF_IMM) || (defined(HAVE_DECL_BPF_IMM) && HAVE_DECL_BPF_IMM)
- XLAT(BPF_IMM),
+  XLAT(BPF_IMM),
 #endif
 #if defined(BPF_ABS) || (defined(HAVE_DECL_BPF_ABS) && HAVE_DECL_BPF_ABS)
- XLAT(BPF_ABS),
+  XLAT(BPF_ABS),
 #endif
 #if defined(BPF_IND) || (defined(HAVE_DECL_BPF_IND) && HAVE_DECL_BPF_IND)
- XLAT(BPF_IND),
+  XLAT(BPF_IND),
 #endif
 #if defined(BPF_MEM) || (defined(HAVE_DECL_BPF_MEM) && HAVE_DECL_BPF_MEM)
- XLAT(BPF_MEM),
+  XLAT(BPF_MEM),
 #endif
 #if defined(BPF_LEN) || (defined(HAVE_DECL_BPF_LEN) && HAVE_DECL_BPF_LEN)
- XLAT(BPF_LEN),
+  XLAT(BPF_LEN),
 #endif
 #if defined(BPF_MSH) || (defined(HAVE_DECL_BPF_MSH) && HAVE_DECL_BPF_MSH)
- XLAT(BPF_MSH),
+  XLAT(BPF_MSH),
 #endif
 #if defined(BPF_XADD) || (defined(HAVE_DECL_BPF_XADD) && HAVE_DECL_BPF_XADD)
- XLAT(BPF_XADD),
+  XLAT(BPF_XADD),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/bpf_op_alu.h b/xlat/bpf_op_alu.h
index 86886be..d20a8c7 100644
--- a/xlat/bpf_op_alu.h
+++ b/xlat/bpf_op_alu.h
@@ -1,44 +1,53 @@
 /* Generated by ./xlat/gen.sh from ./xlat/bpf_op_alu.in; do not edit. */
 
-static const struct xlat bpf_op_alu[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat bpf_op_alu in mpers mode
+
+#else
+
+static
+const struct xlat bpf_op_alu[] = {
 #if defined(BPF_ADD) || (defined(HAVE_DECL_BPF_ADD) && HAVE_DECL_BPF_ADD)
- XLAT(BPF_ADD),
+  XLAT(BPF_ADD),
 #endif
 #if defined(BPF_SUB) || (defined(HAVE_DECL_BPF_SUB) && HAVE_DECL_BPF_SUB)
- XLAT(BPF_SUB),
+  XLAT(BPF_SUB),
 #endif
 #if defined(BPF_MUL) || (defined(HAVE_DECL_BPF_MUL) && HAVE_DECL_BPF_MUL)
- XLAT(BPF_MUL),
+  XLAT(BPF_MUL),
 #endif
 #if defined(BPF_DIV) || (defined(HAVE_DECL_BPF_DIV) && HAVE_DECL_BPF_DIV)
- XLAT(BPF_DIV),
+  XLAT(BPF_DIV),
 #endif
 #if defined(BPF_OR) || (defined(HAVE_DECL_BPF_OR) && HAVE_DECL_BPF_OR)
- XLAT(BPF_OR),
+  XLAT(BPF_OR),
 #endif
 #if defined(BPF_AND) || (defined(HAVE_DECL_BPF_AND) && HAVE_DECL_BPF_AND)
- XLAT(BPF_AND),
+  XLAT(BPF_AND),
 #endif
 #if defined(BPF_LSH) || (defined(HAVE_DECL_BPF_LSH) && HAVE_DECL_BPF_LSH)
- XLAT(BPF_LSH),
+  XLAT(BPF_LSH),
 #endif
 #if defined(BPF_RSH) || (defined(HAVE_DECL_BPF_RSH) && HAVE_DECL_BPF_RSH)
- XLAT(BPF_RSH),
+  XLAT(BPF_RSH),
 #endif
 #if defined(BPF_NEG) || (defined(HAVE_DECL_BPF_NEG) && HAVE_DECL_BPF_NEG)
- XLAT(BPF_NEG),
+  XLAT(BPF_NEG),
 #endif
 #if defined(BPF_MOD) || (defined(HAVE_DECL_BPF_MOD) && HAVE_DECL_BPF_MOD)
- XLAT(BPF_MOD),
+  XLAT(BPF_MOD),
 #endif
 #if defined(BPF_XOR) || (defined(HAVE_DECL_BPF_XOR) && HAVE_DECL_BPF_XOR)
- XLAT(BPF_XOR),
+  XLAT(BPF_XOR),
 #endif
 #if defined(BPF_MOV) || (defined(HAVE_DECL_BPF_MOV) && HAVE_DECL_BPF_MOV)
- XLAT(BPF_MOV),
+  XLAT(BPF_MOV),
 #endif
 #if defined(BPF_ARSH) || (defined(HAVE_DECL_BPF_ARSH) && HAVE_DECL_BPF_ARSH)
- XLAT(BPF_ARSH),
+  XLAT(BPF_ARSH),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/bpf_op_jmp.h b/xlat/bpf_op_jmp.h
index 5192742..d43b30e 100644
--- a/xlat/bpf_op_jmp.h
+++ b/xlat/bpf_op_jmp.h
@@ -1,35 +1,44 @@
 /* Generated by ./xlat/gen.sh from ./xlat/bpf_op_jmp.in; do not edit. */
 
-static const struct xlat bpf_op_jmp[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat bpf_op_jmp in mpers mode
+
+#else
+
+static
+const struct xlat bpf_op_jmp[] = {
 #if defined(BPF_JA) || (defined(HAVE_DECL_BPF_JA) && HAVE_DECL_BPF_JA)
- XLAT(BPF_JA),
+  XLAT(BPF_JA),
 #endif
 #if defined(BPF_JEQ) || (defined(HAVE_DECL_BPF_JEQ) && HAVE_DECL_BPF_JEQ)
- XLAT(BPF_JEQ),
+  XLAT(BPF_JEQ),
 #endif
 #if defined(BPF_JGT) || (defined(HAVE_DECL_BPF_JGT) && HAVE_DECL_BPF_JGT)
- XLAT(BPF_JGT),
+  XLAT(BPF_JGT),
 #endif
 #if defined(BPF_JGE) || (defined(HAVE_DECL_BPF_JGE) && HAVE_DECL_BPF_JGE)
- XLAT(BPF_JGE),
+  XLAT(BPF_JGE),
 #endif
 #if defined(BPF_JSET) || (defined(HAVE_DECL_BPF_JSET) && HAVE_DECL_BPF_JSET)
- XLAT(BPF_JSET),
+  XLAT(BPF_JSET),
 #endif
 #if defined(BPF_JNE) || (defined(HAVE_DECL_BPF_JNE) && HAVE_DECL_BPF_JNE)
- XLAT(BPF_JNE),
+  XLAT(BPF_JNE),
 #endif
 #if defined(BPF_JSGT) || (defined(HAVE_DECL_BPF_JSGT) && HAVE_DECL_BPF_JSGT)
- XLAT(BPF_JSGT),
+  XLAT(BPF_JSGT),
 #endif
 #if defined(BPF_JSGE) || (defined(HAVE_DECL_BPF_JSGE) && HAVE_DECL_BPF_JSGE)
- XLAT(BPF_JSGE),
+  XLAT(BPF_JSGE),
 #endif
 #if defined(BPF_CALL) || (defined(HAVE_DECL_BPF_CALL) && HAVE_DECL_BPF_CALL)
- XLAT(BPF_CALL),
+  XLAT(BPF_CALL),
 #endif
 #if defined(BPF_EXIT) || (defined(HAVE_DECL_BPF_EXIT) && HAVE_DECL_BPF_EXIT)
- XLAT(BPF_EXIT),
+  XLAT(BPF_EXIT),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/bpf_prog_types.h b/xlat/bpf_prog_types.h
index 17db2fb..edb21e2 100644
--- a/xlat/bpf_prog_types.h
+++ b/xlat/bpf_prog_types.h
@@ -1,25 +1,34 @@
 /* Generated by ./xlat/gen.sh from ./xlat/bpf_prog_types.in; do not edit. */
-
-static const struct xlat bpf_prog_types[] = {
 #if !(defined(BPF_PROG_TYPE_UNSPEC) || (defined(HAVE_DECL_BPF_PROG_TYPE_UNSPEC) && HAVE_DECL_BPF_PROG_TYPE_UNSPEC))
 # define BPF_PROG_TYPE_UNSPEC 0
 #endif
- XLAT(BPF_PROG_TYPE_UNSPEC),
 #if !(defined(BPF_PROG_TYPE_SOCKET_FILTER) || (defined(HAVE_DECL_BPF_PROG_TYPE_SOCKET_FILTER) && HAVE_DECL_BPF_PROG_TYPE_SOCKET_FILTER))
 # define BPF_PROG_TYPE_SOCKET_FILTER 1
 #endif
- XLAT(BPF_PROG_TYPE_SOCKET_FILTER),
 #if !(defined(BPF_PROG_TYPE_KPROBE) || (defined(HAVE_DECL_BPF_PROG_TYPE_KPROBE) && HAVE_DECL_BPF_PROG_TYPE_KPROBE))
 # define BPF_PROG_TYPE_KPROBE 2
 #endif
- XLAT(BPF_PROG_TYPE_KPROBE),
 #if !(defined(BPF_PROG_TYPE_SCHED_CLS) || (defined(HAVE_DECL_BPF_PROG_TYPE_SCHED_CLS) && HAVE_DECL_BPF_PROG_TYPE_SCHED_CLS))
 # define BPF_PROG_TYPE_SCHED_CLS 3
 #endif
- XLAT(BPF_PROG_TYPE_SCHED_CLS),
 #if !(defined(BPF_PROG_TYPE_SCHED_ACT) || (defined(HAVE_DECL_BPF_PROG_TYPE_SCHED_ACT) && HAVE_DECL_BPF_PROG_TYPE_SCHED_ACT))
 # define BPF_PROG_TYPE_SCHED_ACT 4
 #endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat bpf_prog_types in mpers mode
+
+#else
+
+static
+const struct xlat bpf_prog_types[] = {
+ XLAT(BPF_PROG_TYPE_UNSPEC),
+ XLAT(BPF_PROG_TYPE_SOCKET_FILTER),
+ XLAT(BPF_PROG_TYPE_KPROBE),
+ XLAT(BPF_PROG_TYPE_SCHED_CLS),
  XLAT(BPF_PROG_TYPE_SCHED_ACT),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/bpf_rval.h b/xlat/bpf_rval.h
index a7797e5..8f84f03 100644
--- a/xlat/bpf_rval.h
+++ b/xlat/bpf_rval.h
@@ -1,14 +1,23 @@
 /* Generated by ./xlat/gen.sh from ./xlat/bpf_rval.in; do not edit. */
 
-static const struct xlat bpf_rval[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat bpf_rval in mpers mode
+
+#else
+
+static
+const struct xlat bpf_rval[] = {
 #if defined(BPF_K) || (defined(HAVE_DECL_BPF_K) && HAVE_DECL_BPF_K)
- XLAT(BPF_K),
+  XLAT(BPF_K),
 #endif
 #if defined(BPF_X) || (defined(HAVE_DECL_BPF_X) && HAVE_DECL_BPF_X)
- XLAT(BPF_X),
+  XLAT(BPF_X),
 #endif
 #if defined(BPF_A) || (defined(HAVE_DECL_BPF_A) && HAVE_DECL_BPF_A)
- XLAT(BPF_A),
+  XLAT(BPF_A),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/bpf_size.h b/xlat/bpf_size.h
index f26607e..f07bc9c 100644
--- a/xlat/bpf_size.h
+++ b/xlat/bpf_size.h
@@ -1,17 +1,26 @@
 /* Generated by ./xlat/gen.sh from ./xlat/bpf_size.in; do not edit. */
 
-static const struct xlat bpf_size[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat bpf_size in mpers mode
+
+#else
+
+static
+const struct xlat bpf_size[] = {
 #if defined(BPF_W) || (defined(HAVE_DECL_BPF_W) && HAVE_DECL_BPF_W)
- XLAT(BPF_W),
+  XLAT(BPF_W),
 #endif
 #if defined(BPF_H) || (defined(HAVE_DECL_BPF_H) && HAVE_DECL_BPF_H)
- XLAT(BPF_H),
+  XLAT(BPF_H),
 #endif
 #if defined(BPF_B) || (defined(HAVE_DECL_BPF_B) && HAVE_DECL_BPF_B)
- XLAT(BPF_B),
+  XLAT(BPF_B),
 #endif
 #if defined(BPF_DW) || (defined(HAVE_DECL_BPF_DW) && HAVE_DECL_BPF_DW)
- XLAT(BPF_DW),
+  XLAT(BPF_DW),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/bpf_src.h b/xlat/bpf_src.h
index e0b9024..c063e75 100644
--- a/xlat/bpf_src.h
+++ b/xlat/bpf_src.h
@@ -1,11 +1,20 @@
 /* Generated by ./xlat/gen.sh from ./xlat/bpf_src.in; do not edit. */
 
-static const struct xlat bpf_src[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat bpf_src in mpers mode
+
+#else
+
+static
+const struct xlat bpf_src[] = {
 #if defined(BPF_K) || (defined(HAVE_DECL_BPF_K) && HAVE_DECL_BPF_K)
- XLAT(BPF_K),
+  XLAT(BPF_K),
 #endif
 #if defined(BPF_X) || (defined(HAVE_DECL_BPF_X) && HAVE_DECL_BPF_X)
- XLAT(BPF_X),
+  XLAT(BPF_X),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/bsg_protocol.h b/xlat/bsg_protocol.h
index 66df650..541085d 100644
--- a/xlat/bsg_protocol.h
+++ b/xlat/bsg_protocol.h
@@ -1,8 +1,17 @@
 /* Generated by ./xlat/gen.sh from ./xlat/bsg_protocol.in; do not edit. */
 
-static const struct xlat bsg_protocol[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat bsg_protocol in mpers mode
+
+#else
+
+static
+const struct xlat bsg_protocol[] = {
 #if defined(BSG_PROTOCOL_SCSI) || (defined(HAVE_DECL_BSG_PROTOCOL_SCSI) && HAVE_DECL_BSG_PROTOCOL_SCSI)
- XLAT(BSG_PROTOCOL_SCSI),
+  XLAT(BSG_PROTOCOL_SCSI),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/bsg_subprotocol.h b/xlat/bsg_subprotocol.h
index b2a13c4..8073213 100644
--- a/xlat/bsg_subprotocol.h
+++ b/xlat/bsg_subprotocol.h
@@ -1,14 +1,23 @@
 /* Generated by ./xlat/gen.sh from ./xlat/bsg_subprotocol.in; do not edit. */
 
-static const struct xlat bsg_subprotocol[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat bsg_subprotocol in mpers mode
+
+#else
+
+static
+const struct xlat bsg_subprotocol[] = {
 #if defined(BSG_SUB_PROTOCOL_SCSI_CMD) || (defined(HAVE_DECL_BSG_SUB_PROTOCOL_SCSI_CMD) && HAVE_DECL_BSG_SUB_PROTOCOL_SCSI_CMD)
- XLAT(BSG_SUB_PROTOCOL_SCSI_CMD),
+  XLAT(BSG_SUB_PROTOCOL_SCSI_CMD),
 #endif
 #if defined(BSG_SUB_PROTOCOL_SCSI_TMF) || (defined(HAVE_DECL_BSG_SUB_PROTOCOL_SCSI_TMF) && HAVE_DECL_BSG_SUB_PROTOCOL_SCSI_TMF)
- XLAT(BSG_SUB_PROTOCOL_SCSI_TMF),
+  XLAT(BSG_SUB_PROTOCOL_SCSI_TMF),
 #endif
 #if defined(BSG_SUB_PROTOCOL_SCSI_TRANSPORT) || (defined(HAVE_DECL_BSG_SUB_PROTOCOL_SCSI_TRANSPORT) && HAVE_DECL_BSG_SUB_PROTOCOL_SCSI_TRANSPORT)
- XLAT(BSG_SUB_PROTOCOL_SCSI_TRANSPORT),
+  XLAT(BSG_SUB_PROTOCOL_SCSI_TRANSPORT),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/bt_protocols.h b/xlat/bt_protocols.h
index fe1b6d0..7b0e164 100644
--- a/xlat/bt_protocols.h
+++ b/xlat/bt_protocols.h
@@ -1,29 +1,38 @@
 /* Generated by ./xlat/gen.sh from ./xlat/bt_protocols.in; do not edit. */
 
-static const struct xlat bt_protocols[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat bt_protocols in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/cacheflush_scope.h b/xlat/cacheflush_scope.h
index 142549a..4859774 100644
--- a/xlat/cacheflush_scope.h
+++ b/xlat/cacheflush_scope.h
@@ -1,14 +1,23 @@
 /* Generated by ./xlat/gen.sh from ./xlat/cacheflush_scope.in; do not edit. */
 
-static const struct xlat cacheflush_scope[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat cacheflush_scope in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/cap.h b/xlat/cap.h
index 52c869d..fb50990 100644
--- a/xlat/cap.h
+++ b/xlat/cap.h
@@ -1,6 +1,13 @@
 /* Generated by ./xlat/gen.sh from ./xlat/cap.in; do not edit. */
 
-static const struct xlat cap[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat cap in mpers mode
+
+#else
+
+static
+const struct xlat cap[] = {
  XLAT(CAP_CHOWN),
  XLAT(CAP_DAC_OVERRIDE),
  XLAT(CAP_DAC_READ_SEARCH),
@@ -41,3 +48,5 @@
  XLAT(CAP_AUDIT_READ),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/cap_mask0.h b/xlat/cap_mask0.h
index 9fe5214..eb9ed47 100644
--- a/xlat/cap_mask0.h
+++ b/xlat/cap_mask0.h
@@ -1,6 +1,13 @@
 /* Generated by ./xlat/gen.sh from ./xlat/cap_mask0.in; do not edit. */
 
-static const struct xlat cap_mask0[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat cap_mask0 in mpers mode
+
+#else
+
+static
+const struct xlat cap_mask0[] = {
  { 1<<CAP_CHOWN, "CAP_CHOWN" },
  { 1<<CAP_DAC_OVERRIDE, "CAP_DAC_OVERRIDE" },
  { 1<<CAP_DAC_READ_SEARCH, "CAP_DAC_READ_SEARCH" },
@@ -35,3 +42,5 @@
  { 1<<CAP_SETFCAP, "CAP_SETFCAP" },
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/cap_mask1.h b/xlat/cap_mask1.h
index bbd9daa..d35f9ad 100644
--- a/xlat/cap_mask1.h
+++ b/xlat/cap_mask1.h
@@ -1,6 +1,13 @@
 /* Generated by ./xlat/gen.sh from ./xlat/cap_mask1.in; do not edit. */
 
-static const struct xlat cap_mask1[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat cap_mask1 in mpers mode
+
+#else
+
+static
+const struct xlat cap_mask1[] = {
  { 1<<CAP_MAC_OVERRIDE, "CAP_MAC_OVERRIDE" },
  { 1<<CAP_MAC_ADMIN, "CAP_MAC_ADMIN" },
  { 1<<CAP_SYSLOG, "CAP_SYSLOG" },
@@ -9,3 +16,5 @@
  { 1<<CAP_AUDIT_READ, "CAP_AUDIT_READ" },
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/cap_version.h b/xlat/cap_version.h
index d1535f8..35c9189 100644
--- a/xlat/cap_version.h
+++ b/xlat/cap_version.h
@@ -1,8 +1,17 @@
 /* Generated by ./xlat/gen.sh from ./xlat/cap_version.in; do not edit. */
 
-static const struct xlat cap_version[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat cap_version in mpers mode
+
+#else
+
+static
+const struct xlat cap_version[] = {
  XLAT(_LINUX_CAPABILITY_VERSION_1),
  XLAT(_LINUX_CAPABILITY_VERSION_2),
  XLAT(_LINUX_CAPABILITY_VERSION_3),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/clockflags.h b/xlat/clockflags.h
index 068ce4f..d24419d 100644
--- a/xlat/clockflags.h
+++ b/xlat/clockflags.h
@@ -1,8 +1,17 @@
 /* Generated by ./xlat/gen.sh from ./xlat/clockflags.in; do not edit. */
 
-static const struct xlat clockflags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat clockflags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/clocknames.h b/xlat/clocknames.h
index 04a0e9f..29beb38 100644
--- a/xlat/clocknames.h
+++ b/xlat/clocknames.h
@@ -1,41 +1,50 @@
 /* Generated by ./xlat/gen.sh from ./xlat/clocknames.in; do not edit. */
 
-static const struct xlat clocknames[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat clocknames in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/clone_flags.h b/xlat/clone_flags.h
index f872eb9..ab056b9 100644
--- a/xlat/clone_flags.h
+++ b/xlat/clone_flags.h
@@ -1,97 +1,106 @@
 /* Generated by ./xlat/gen.sh from ./xlat/clone_flags.in; do not edit. */
-
-static const struct xlat clone_flags[] = {
 #if !(defined(CLONE_VM) || (defined(HAVE_DECL_CLONE_VM) && HAVE_DECL_CLONE_VM))
 # define CLONE_VM 0x00000100
 #endif
- XLAT(CLONE_VM),
 #if !(defined(CLONE_FS) || (defined(HAVE_DECL_CLONE_FS) && HAVE_DECL_CLONE_FS))
 # define CLONE_FS 0x00000200
 #endif
- XLAT(CLONE_FS),
 #if !(defined(CLONE_FILES) || (defined(HAVE_DECL_CLONE_FILES) && HAVE_DECL_CLONE_FILES))
 # define CLONE_FILES 0x00000400
 #endif
- XLAT(CLONE_FILES),
 #if !(defined(CLONE_SIGHAND) || (defined(HAVE_DECL_CLONE_SIGHAND) && HAVE_DECL_CLONE_SIGHAND))
 # define CLONE_SIGHAND 0x00000800
 #endif
- XLAT(CLONE_SIGHAND),
 #if !(defined(CLONE_IDLETASK) || (defined(HAVE_DECL_CLONE_IDLETASK) && HAVE_DECL_CLONE_IDLETASK))
 # define CLONE_IDLETASK 0x00001000
 #endif
- XLAT(CLONE_IDLETASK),
 #if !(defined(CLONE_PTRACE) || (defined(HAVE_DECL_CLONE_PTRACE) && HAVE_DECL_CLONE_PTRACE))
 # define CLONE_PTRACE 0x00002000
 #endif
- XLAT(CLONE_PTRACE),
 #if !(defined(CLONE_VFORK) || (defined(HAVE_DECL_CLONE_VFORK) && HAVE_DECL_CLONE_VFORK))
 # define CLONE_VFORK 0x00004000
 #endif
- XLAT(CLONE_VFORK),
 #if !(defined(CLONE_PARENT) || (defined(HAVE_DECL_CLONE_PARENT) && HAVE_DECL_CLONE_PARENT))
 # define CLONE_PARENT 0x00008000
 #endif
- XLAT(CLONE_PARENT),
 #if !(defined(CLONE_THREAD) || (defined(HAVE_DECL_CLONE_THREAD) && HAVE_DECL_CLONE_THREAD))
 # define CLONE_THREAD 0x00010000
 #endif
- XLAT(CLONE_THREAD),
 #if !(defined(CLONE_NEWNS) || (defined(HAVE_DECL_CLONE_NEWNS) && HAVE_DECL_CLONE_NEWNS))
 # define CLONE_NEWNS 0x00020000
 #endif
- XLAT(CLONE_NEWNS),
 #if !(defined(CLONE_SYSVSEM) || (defined(HAVE_DECL_CLONE_SYSVSEM) && HAVE_DECL_CLONE_SYSVSEM))
 # define CLONE_SYSVSEM 0x00040000
 #endif
- XLAT(CLONE_SYSVSEM),
 #if !(defined(CLONE_SETTLS) || (defined(HAVE_DECL_CLONE_SETTLS) && HAVE_DECL_CLONE_SETTLS))
 # define CLONE_SETTLS 0x00080000
 #endif
- XLAT(CLONE_SETTLS),
 #if !(defined(CLONE_PARENT_SETTID) || (defined(HAVE_DECL_CLONE_PARENT_SETTID) && HAVE_DECL_CLONE_PARENT_SETTID))
 # define CLONE_PARENT_SETTID 0x00100000
 #endif
- XLAT(CLONE_PARENT_SETTID),
 #if !(defined(CLONE_CHILD_CLEARTID) || (defined(HAVE_DECL_CLONE_CHILD_CLEARTID) && HAVE_DECL_CLONE_CHILD_CLEARTID))
 # define CLONE_CHILD_CLEARTID 0x00200000
 #endif
- XLAT(CLONE_CHILD_CLEARTID),
 #if !(defined(CLONE_UNTRACED) || (defined(HAVE_DECL_CLONE_UNTRACED) && HAVE_DECL_CLONE_UNTRACED))
 # define CLONE_UNTRACED 0x00800000
 #endif
- XLAT(CLONE_UNTRACED),
 #if !(defined(CLONE_CHILD_SETTID) || (defined(HAVE_DECL_CLONE_CHILD_SETTID) && HAVE_DECL_CLONE_CHILD_SETTID))
 # define CLONE_CHILD_SETTID 0x01000000
 #endif
- XLAT(CLONE_CHILD_SETTID),
 #if !(defined(CLONE_STOPPED) || (defined(HAVE_DECL_CLONE_STOPPED) && HAVE_DECL_CLONE_STOPPED))
 # define CLONE_STOPPED 0x02000000
 #endif
- XLAT(CLONE_STOPPED),
 #if !(defined(CLONE_NEWUTS) || (defined(HAVE_DECL_CLONE_NEWUTS) && HAVE_DECL_CLONE_NEWUTS))
 # define CLONE_NEWUTS 0x04000000
 #endif
- XLAT(CLONE_NEWUTS),
 #if !(defined(CLONE_NEWIPC) || (defined(HAVE_DECL_CLONE_NEWIPC) && HAVE_DECL_CLONE_NEWIPC))
 # define CLONE_NEWIPC 0x08000000
 #endif
- XLAT(CLONE_NEWIPC),
 #if !(defined(CLONE_NEWUSER) || (defined(HAVE_DECL_CLONE_NEWUSER) && HAVE_DECL_CLONE_NEWUSER))
 # define CLONE_NEWUSER 0x10000000
 #endif
- XLAT(CLONE_NEWUSER),
 #if !(defined(CLONE_NEWPID) || (defined(HAVE_DECL_CLONE_NEWPID) && HAVE_DECL_CLONE_NEWPID))
 # define CLONE_NEWPID 0x20000000
 #endif
- XLAT(CLONE_NEWPID),
 #if !(defined(CLONE_NEWNET) || (defined(HAVE_DECL_CLONE_NEWNET) && HAVE_DECL_CLONE_NEWNET))
 # define CLONE_NEWNET 0x40000000
 #endif
- XLAT(CLONE_NEWNET),
 #if !(defined(CLONE_IO) || (defined(HAVE_DECL_CLONE_IO) && HAVE_DECL_CLONE_IO))
 # define CLONE_IO 0x80000000
 #endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat clone_flags in mpers mode
+
+#else
+
+static
+const struct xlat clone_flags[] = {
+ XLAT(CLONE_VM),
+ XLAT(CLONE_FS),
+ XLAT(CLONE_FILES),
+ XLAT(CLONE_SIGHAND),
+ XLAT(CLONE_IDLETASK),
+ XLAT(CLONE_PTRACE),
+ XLAT(CLONE_VFORK),
+ XLAT(CLONE_PARENT),
+ XLAT(CLONE_THREAD),
+ XLAT(CLONE_NEWNS),
+ XLAT(CLONE_SYSVSEM),
+ XLAT(CLONE_SETTLS),
+ XLAT(CLONE_PARENT_SETTID),
+ XLAT(CLONE_CHILD_CLEARTID),
+ XLAT(CLONE_UNTRACED),
+ XLAT(CLONE_CHILD_SETTID),
+ XLAT(CLONE_STOPPED),
+ XLAT(CLONE_NEWUTS),
+ XLAT(CLONE_NEWIPC),
+ XLAT(CLONE_NEWUSER),
+ XLAT(CLONE_NEWPID),
+ XLAT(CLONE_NEWNET),
  XLAT(CLONE_IO),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/cpuclocknames.h b/xlat/cpuclocknames.h
index 83aa6c2..8975159 100644
--- a/xlat/cpuclocknames.h
+++ b/xlat/cpuclocknames.h
@@ -1,14 +1,23 @@
 /* Generated by ./xlat/gen.sh from ./xlat/cpuclocknames.in; do not edit. */
 
-static const struct xlat cpuclocknames[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat cpuclocknames in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/delete_module_flags.h b/xlat/delete_module_flags.h
index 59bc02a..279c45a 100644
--- a/xlat/delete_module_flags.h
+++ b/xlat/delete_module_flags.h
@@ -1,11 +1,20 @@
 /* Generated by ./xlat/gen.sh from ./xlat/delete_module_flags.in; do not edit. */
 
-static const struct xlat delete_module_flags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat delete_module_flags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/dirent_types.h b/xlat/dirent_types.h
new file mode 100644
index 0000000..42df495
--- /dev/null
+++ b/xlat/dirent_types.h
@@ -0,0 +1,36 @@
+/* Generated by ./xlat/gen.sh from ./xlat/dirent_types.in; do not edit. */
+
+#ifndef IN_MPERS
+
+const struct xlat dirent_types[] = {
+#if defined(DT_UNKNOWN) || (defined(HAVE_DECL_DT_UNKNOWN) && HAVE_DECL_DT_UNKNOWN)
+  XLAT(DT_UNKNOWN),
+#endif
+#if defined(DT_FIFO) || (defined(HAVE_DECL_DT_FIFO) && HAVE_DECL_DT_FIFO)
+  XLAT(DT_FIFO),
+#endif
+#if defined(DT_CHR) || (defined(HAVE_DECL_DT_CHR) && HAVE_DECL_DT_CHR)
+  XLAT(DT_CHR),
+#endif
+#if defined(DT_DIR) || (defined(HAVE_DECL_DT_DIR) && HAVE_DECL_DT_DIR)
+  XLAT(DT_DIR),
+#endif
+#if defined(DT_BLK) || (defined(HAVE_DECL_DT_BLK) && HAVE_DECL_DT_BLK)
+  XLAT(DT_BLK),
+#endif
+#if defined(DT_REG) || (defined(HAVE_DECL_DT_REG) && HAVE_DECL_DT_REG)
+  XLAT(DT_REG),
+#endif
+#if defined(DT_LNK) || (defined(HAVE_DECL_DT_LNK) && HAVE_DECL_DT_LNK)
+  XLAT(DT_LNK),
+#endif
+#if defined(DT_SOCK) || (defined(HAVE_DECL_DT_SOCK) && HAVE_DECL_DT_SOCK)
+  XLAT(DT_SOCK),
+#endif
+#if defined(DT_WHT) || (defined(HAVE_DECL_DT_WHT) && HAVE_DECL_DT_WHT)
+  XLAT(DT_WHT),
+#endif
+ XLAT_END
+};
+
+#endif /* !IN_MPERS */
diff --git a/xlat/domains.h b/xlat/domains.h
index 38d96fb..6b603f3 100644
--- a/xlat/domains.h
+++ b/xlat/domains.h
@@ -1,128 +1,143 @@
 /* Generated by ./xlat/gen.sh from ./xlat/domains.in; do not edit. */
 
-static const struct xlat domains[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat domains in mpers mode
+
+#else
+
+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_IB) || (defined(HAVE_DECL_PF_IB) && HAVE_DECL_PF_IB)
+  XLAT(PF_IB),
+#endif
+#if defined(PF_MPLS) || (defined(HAVE_DECL_PF_MPLS) && HAVE_DECL_PF_MPLS)
+  XLAT(PF_MPLS),
 #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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/efd_flags.h b/xlat/efd_flags.h
new file mode 100644
index 0000000..641f116
--- /dev/null
+++ b/xlat/efd_flags.h
@@ -0,0 +1,30 @@
+/* Generated by ./xlat/gen.sh from ./xlat/efd_flags.in; do not edit. */
+#if !(defined(EFD_SEMAPHORE) || (defined(HAVE_DECL_EFD_SEMAPHORE) && HAVE_DECL_EFD_SEMAPHORE))
+# define EFD_SEMAPHORE 1
+#endif
+#if defined EFD_CLOEXEC || defined O_CLOEXEC
+#if !(defined(EFD_CLOEXEC) || (defined(HAVE_DECL_EFD_CLOEXEC) && HAVE_DECL_EFD_CLOEXEC))
+# define EFD_CLOEXEC O_CLOEXEC
+#endif
+#endif
+#if !(defined(EFD_NONBLOCK) || (defined(HAVE_DECL_EFD_NONBLOCK) && HAVE_DECL_EFD_NONBLOCK))
+# define EFD_NONBLOCK O_NONBLOCK
+#endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat efd_flags in mpers mode
+
+#else
+
+static
+const struct xlat efd_flags[] = {
+ XLAT(EFD_SEMAPHORE),
+#if defined EFD_CLOEXEC || defined O_CLOEXEC
+ XLAT(EFD_CLOEXEC),
+#endif
+ XLAT(EFD_NONBLOCK),
+ XLAT_END
+};
+
+#endif /* !IN_MPERS */
diff --git a/xlat/epollctls.h b/xlat/epollctls.h
index 47877bd..6b06d8c 100644
--- a/xlat/epollctls.h
+++ b/xlat/epollctls.h
@@ -1,17 +1,26 @@
 /* Generated by ./xlat/gen.sh from ./xlat/epollctls.in; do not edit. */
-
-static const struct xlat epollctls[] = {
 #if !(defined(EPOLL_CTL_ADD) || (defined(HAVE_DECL_EPOLL_CTL_ADD) && HAVE_DECL_EPOLL_CTL_ADD))
 # define EPOLL_CTL_ADD 1
 #endif
- XLAT(EPOLL_CTL_ADD),
 #if !(defined(EPOLL_CTL_DEL) || (defined(HAVE_DECL_EPOLL_CTL_DEL) && HAVE_DECL_EPOLL_CTL_DEL))
 # define EPOLL_CTL_DEL 2
 #endif
- XLAT(EPOLL_CTL_DEL),
 #if !(defined(EPOLL_CTL_MOD) || (defined(HAVE_DECL_EPOLL_CTL_MOD) && HAVE_DECL_EPOLL_CTL_MOD))
 # define EPOLL_CTL_MOD 3
 #endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat epollctls in mpers mode
+
+#else
+
+static
+const struct xlat epollctls[] = {
+ XLAT(EPOLL_CTL_ADD),
+ XLAT(EPOLL_CTL_DEL),
  XLAT(EPOLL_CTL_MOD),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/epollevents.h b/xlat/epollevents.h
index 8419c4c..1eba7f6 100644
--- a/xlat/epollevents.h
+++ b/xlat/epollevents.h
@@ -1,44 +1,53 @@
 /* Generated by ./xlat/gen.sh from ./xlat/epollevents.in; do not edit. */
 
-static const struct xlat epollevents[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat epollevents in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/epollflags.h b/xlat/epollflags.h
index 9c6784c..cae4fe9 100644
--- a/xlat/epollflags.h
+++ b/xlat/epollflags.h
@@ -1,11 +1,22 @@
 /* Generated by ./xlat/gen.sh from ./xlat/epollflags.in; do not edit. */
-
-static const struct xlat epollflags[] = {
-#if defined(EPOLL_CLOEXEC) || (defined(HAVE_DECL_EPOLL_CLOEXEC) && HAVE_DECL_EPOLL_CLOEXEC)
- XLAT(EPOLL_CLOEXEC),
+#if defined EPOLL_CLOEXEC || defined O_CLOEXEC
+#if !(defined(EPOLL_CLOEXEC) || (defined(HAVE_DECL_EPOLL_CLOEXEC) && HAVE_DECL_EPOLL_CLOEXEC))
+# define EPOLL_CLOEXEC O_CLOEXEC
 #endif
-#if defined(EPOLL_NONBLOCK) || (defined(HAVE_DECL_EPOLL_NONBLOCK) && HAVE_DECL_EPOLL_NONBLOCK)
- XLAT(EPOLL_NONBLOCK),
+#endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat epollflags in mpers mode
+
+#else
+
+static
+const struct xlat epollflags[] = {
+#if defined EPOLL_CLOEXEC || defined O_CLOEXEC
+ XLAT(EPOLL_CLOEXEC),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/evdev_abs.h b/xlat/evdev_abs.h
index e45de64..50cfa6e 100644
--- a/xlat/evdev_abs.h
+++ b/xlat/evdev_abs.h
@@ -1,128 +1,137 @@
 /* Generated by ./xlat/gen.sh from ./xlat/evdev_abs.in; do not edit. */
 
-static const struct xlat evdev_abs[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat evdev_abs in mpers mode
+
+#else
+
+static
+const struct xlat evdev_abs[] = {
 #if defined(ABS_X) || (defined(HAVE_DECL_ABS_X) && HAVE_DECL_ABS_X)
- XLAT(ABS_X),
+  XLAT(ABS_X),
 #endif
 #if defined(ABS_Y) || (defined(HAVE_DECL_ABS_Y) && HAVE_DECL_ABS_Y)
- XLAT(ABS_Y),
+  XLAT(ABS_Y),
 #endif
 #if defined(ABS_Z) || (defined(HAVE_DECL_ABS_Z) && HAVE_DECL_ABS_Z)
- XLAT(ABS_Z),
+  XLAT(ABS_Z),
 #endif
 #if defined(ABS_RX) || (defined(HAVE_DECL_ABS_RX) && HAVE_DECL_ABS_RX)
- XLAT(ABS_RX),
+  XLAT(ABS_RX),
 #endif
 #if defined(ABS_RY) || (defined(HAVE_DECL_ABS_RY) && HAVE_DECL_ABS_RY)
- XLAT(ABS_RY),
+  XLAT(ABS_RY),
 #endif
 #if defined(ABS_RZ) || (defined(HAVE_DECL_ABS_RZ) && HAVE_DECL_ABS_RZ)
- XLAT(ABS_RZ),
+  XLAT(ABS_RZ),
 #endif
 #if defined(ABS_THROTTLE) || (defined(HAVE_DECL_ABS_THROTTLE) && HAVE_DECL_ABS_THROTTLE)
- XLAT(ABS_THROTTLE),
+  XLAT(ABS_THROTTLE),
 #endif
 #if defined(ABS_RUDDER) || (defined(HAVE_DECL_ABS_RUDDER) && HAVE_DECL_ABS_RUDDER)
- XLAT(ABS_RUDDER),
+  XLAT(ABS_RUDDER),
 #endif
 #if defined(ABS_WHEEL) || (defined(HAVE_DECL_ABS_WHEEL) && HAVE_DECL_ABS_WHEEL)
- XLAT(ABS_WHEEL),
+  XLAT(ABS_WHEEL),
 #endif
 #if defined(ABS_GAS) || (defined(HAVE_DECL_ABS_GAS) && HAVE_DECL_ABS_GAS)
- XLAT(ABS_GAS),
+  XLAT(ABS_GAS),
 #endif
 #if defined(ABS_BRAKE) || (defined(HAVE_DECL_ABS_BRAKE) && HAVE_DECL_ABS_BRAKE)
- XLAT(ABS_BRAKE),
+  XLAT(ABS_BRAKE),
 #endif
 #if defined(ABS_HAT0X) || (defined(HAVE_DECL_ABS_HAT0X) && HAVE_DECL_ABS_HAT0X)
- XLAT(ABS_HAT0X),
+  XLAT(ABS_HAT0X),
 #endif
 #if defined(ABS_HAT0Y) || (defined(HAVE_DECL_ABS_HAT0Y) && HAVE_DECL_ABS_HAT0Y)
- XLAT(ABS_HAT0Y),
+  XLAT(ABS_HAT0Y),
 #endif
 #if defined(ABS_HAT1X) || (defined(HAVE_DECL_ABS_HAT1X) && HAVE_DECL_ABS_HAT1X)
- XLAT(ABS_HAT1X),
+  XLAT(ABS_HAT1X),
 #endif
 #if defined(ABS_HAT1Y) || (defined(HAVE_DECL_ABS_HAT1Y) && HAVE_DECL_ABS_HAT1Y)
- XLAT(ABS_HAT1Y),
+  XLAT(ABS_HAT1Y),
 #endif
 #if defined(ABS_HAT2X) || (defined(HAVE_DECL_ABS_HAT2X) && HAVE_DECL_ABS_HAT2X)
- XLAT(ABS_HAT2X),
+  XLAT(ABS_HAT2X),
 #endif
 #if defined(ABS_HAT2Y) || (defined(HAVE_DECL_ABS_HAT2Y) && HAVE_DECL_ABS_HAT2Y)
- XLAT(ABS_HAT2Y),
+  XLAT(ABS_HAT2Y),
 #endif
 #if defined(ABS_HAT3X) || (defined(HAVE_DECL_ABS_HAT3X) && HAVE_DECL_ABS_HAT3X)
- XLAT(ABS_HAT3X),
+  XLAT(ABS_HAT3X),
 #endif
 #if defined(ABS_HAT3Y) || (defined(HAVE_DECL_ABS_HAT3Y) && HAVE_DECL_ABS_HAT3Y)
- XLAT(ABS_HAT3Y),
+  XLAT(ABS_HAT3Y),
 #endif
 #if defined(ABS_PRESSURE) || (defined(HAVE_DECL_ABS_PRESSURE) && HAVE_DECL_ABS_PRESSURE)
- XLAT(ABS_PRESSURE),
+  XLAT(ABS_PRESSURE),
 #endif
 #if defined(ABS_DISTANCE) || (defined(HAVE_DECL_ABS_DISTANCE) && HAVE_DECL_ABS_DISTANCE)
- XLAT(ABS_DISTANCE),
+  XLAT(ABS_DISTANCE),
 #endif
 #if defined(ABS_TILT_X) || (defined(HAVE_DECL_ABS_TILT_X) && HAVE_DECL_ABS_TILT_X)
- XLAT(ABS_TILT_X),
+  XLAT(ABS_TILT_X),
 #endif
 #if defined(ABS_TILT_Y) || (defined(HAVE_DECL_ABS_TILT_Y) && HAVE_DECL_ABS_TILT_Y)
- XLAT(ABS_TILT_Y),
+  XLAT(ABS_TILT_Y),
 #endif
 #if defined(ABS_TOOL_WIDTH) || (defined(HAVE_DECL_ABS_TOOL_WIDTH) && HAVE_DECL_ABS_TOOL_WIDTH)
- XLAT(ABS_TOOL_WIDTH),
+  XLAT(ABS_TOOL_WIDTH),
 #endif
 #if defined(ABS_VOLUME) || (defined(HAVE_DECL_ABS_VOLUME) && HAVE_DECL_ABS_VOLUME)
- XLAT(ABS_VOLUME),
+  XLAT(ABS_VOLUME),
 #endif
 #if defined(ABS_MISC) || (defined(HAVE_DECL_ABS_MISC) && HAVE_DECL_ABS_MISC)
- XLAT(ABS_MISC),
+  XLAT(ABS_MISC),
 #endif
 #if defined(ABS_MT_SLOT) || (defined(HAVE_DECL_ABS_MT_SLOT) && HAVE_DECL_ABS_MT_SLOT)
- XLAT(ABS_MT_SLOT),
+  XLAT(ABS_MT_SLOT),
 #endif
 #if defined(ABS_MT_TOUCH_MAJOR) || (defined(HAVE_DECL_ABS_MT_TOUCH_MAJOR) && HAVE_DECL_ABS_MT_TOUCH_MAJOR)
- XLAT(ABS_MT_TOUCH_MAJOR),
+  XLAT(ABS_MT_TOUCH_MAJOR),
 #endif
 #if defined(ABS_MT_TOUCH_MINOR) || (defined(HAVE_DECL_ABS_MT_TOUCH_MINOR) && HAVE_DECL_ABS_MT_TOUCH_MINOR)
- XLAT(ABS_MT_TOUCH_MINOR),
+  XLAT(ABS_MT_TOUCH_MINOR),
 #endif
 #if defined(ABS_MT_WIDTH_MAJOR) || (defined(HAVE_DECL_ABS_MT_WIDTH_MAJOR) && HAVE_DECL_ABS_MT_WIDTH_MAJOR)
- XLAT(ABS_MT_WIDTH_MAJOR),
+  XLAT(ABS_MT_WIDTH_MAJOR),
 #endif
 #if defined(ABS_MT_WIDTH_MINOR) || (defined(HAVE_DECL_ABS_MT_WIDTH_MINOR) && HAVE_DECL_ABS_MT_WIDTH_MINOR)
- XLAT(ABS_MT_WIDTH_MINOR),
+  XLAT(ABS_MT_WIDTH_MINOR),
 #endif
 #if defined(ABS_MT_ORIENTATION) || (defined(HAVE_DECL_ABS_MT_ORIENTATION) && HAVE_DECL_ABS_MT_ORIENTATION)
- XLAT(ABS_MT_ORIENTATION),
+  XLAT(ABS_MT_ORIENTATION),
 #endif
 #if defined(ABS_MT_POSITION_X) || (defined(HAVE_DECL_ABS_MT_POSITION_X) && HAVE_DECL_ABS_MT_POSITION_X)
- XLAT(ABS_MT_POSITION_X),
+  XLAT(ABS_MT_POSITION_X),
 #endif
 #if defined(ABS_MT_POSITION_Y) || (defined(HAVE_DECL_ABS_MT_POSITION_Y) && HAVE_DECL_ABS_MT_POSITION_Y)
- XLAT(ABS_MT_POSITION_Y),
+  XLAT(ABS_MT_POSITION_Y),
 #endif
 #if defined(ABS_MT_TOOL_TYPE) || (defined(HAVE_DECL_ABS_MT_TOOL_TYPE) && HAVE_DECL_ABS_MT_TOOL_TYPE)
- XLAT(ABS_MT_TOOL_TYPE),
+  XLAT(ABS_MT_TOOL_TYPE),
 #endif
 #if defined(ABS_MT_BLOB_ID) || (defined(HAVE_DECL_ABS_MT_BLOB_ID) && HAVE_DECL_ABS_MT_BLOB_ID)
- XLAT(ABS_MT_BLOB_ID),
+  XLAT(ABS_MT_BLOB_ID),
 #endif
 #if defined(ABS_MT_TRACKING_ID) || (defined(HAVE_DECL_ABS_MT_TRACKING_ID) && HAVE_DECL_ABS_MT_TRACKING_ID)
- XLAT(ABS_MT_TRACKING_ID),
+  XLAT(ABS_MT_TRACKING_ID),
 #endif
 #if defined(ABS_MT_PRESSURE) || (defined(HAVE_DECL_ABS_MT_PRESSURE) && HAVE_DECL_ABS_MT_PRESSURE)
- XLAT(ABS_MT_PRESSURE),
+  XLAT(ABS_MT_PRESSURE),
 #endif
 #if defined(ABS_MT_DISTANCE) || (defined(HAVE_DECL_ABS_MT_DISTANCE) && HAVE_DECL_ABS_MT_DISTANCE)
- XLAT(ABS_MT_DISTANCE),
+  XLAT(ABS_MT_DISTANCE),
 #endif
 #if defined(ABS_MT_TOOL_X) || (defined(HAVE_DECL_ABS_MT_TOOL_X) && HAVE_DECL_ABS_MT_TOOL_X)
- XLAT(ABS_MT_TOOL_X),
+  XLAT(ABS_MT_TOOL_X),
 #endif
 #if defined(ABS_MT_TOOL_Y) || (defined(HAVE_DECL_ABS_MT_TOOL_Y) && HAVE_DECL_ABS_MT_TOOL_Y)
- XLAT(ABS_MT_TOOL_Y),
+  XLAT(ABS_MT_TOOL_Y),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/evdev_autorepeat.h b/xlat/evdev_autorepeat.h
index c84d78e..d06a02b 100644
--- a/xlat/evdev_autorepeat.h
+++ b/xlat/evdev_autorepeat.h
@@ -1,11 +1,20 @@
 /* Generated by ./xlat/gen.sh from ./xlat/evdev_autorepeat.in; do not edit. */
 
-static const struct xlat evdev_autorepeat[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat evdev_autorepeat in mpers mode
+
+#else
+
+static
+const struct xlat evdev_autorepeat[] = {
 #if defined(REP_DELAY) || (defined(HAVE_DECL_REP_DELAY) && HAVE_DECL_REP_DELAY)
- XLAT(REP_DELAY),
+  XLAT(REP_DELAY),
 #endif
 #if defined(REP_PERIOD) || (defined(HAVE_DECL_REP_PERIOD) && HAVE_DECL_REP_PERIOD)
- XLAT(REP_PERIOD),
+  XLAT(REP_PERIOD),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/evdev_ev.h b/xlat/evdev_ev.h
index 9979930..1d49445 100644
--- a/xlat/evdev_ev.h
+++ b/xlat/evdev_ev.h
@@ -1,41 +1,50 @@
 /* Generated by ./xlat/gen.sh from ./xlat/evdev_ev.in; do not edit. */
 
-static const struct xlat evdev_ev[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat evdev_ev in mpers mode
+
+#else
+
+static
+const struct xlat evdev_ev[] = {
 #if defined(EV_SYN) || (defined(HAVE_DECL_EV_SYN) && HAVE_DECL_EV_SYN)
- XLAT(EV_SYN),
+  XLAT(EV_SYN),
 #endif
 #if defined(EV_KEY) || (defined(HAVE_DECL_EV_KEY) && HAVE_DECL_EV_KEY)
- XLAT(EV_KEY),
+  XLAT(EV_KEY),
 #endif
 #if defined(EV_REL) || (defined(HAVE_DECL_EV_REL) && HAVE_DECL_EV_REL)
- XLAT(EV_REL),
+  XLAT(EV_REL),
 #endif
 #if defined(EV_ABS) || (defined(HAVE_DECL_EV_ABS) && HAVE_DECL_EV_ABS)
- XLAT(EV_ABS),
+  XLAT(EV_ABS),
 #endif
 #if defined(EV_MSC) || (defined(HAVE_DECL_EV_MSC) && HAVE_DECL_EV_MSC)
- XLAT(EV_MSC),
+  XLAT(EV_MSC),
 #endif
 #if defined(EV_SW) || (defined(HAVE_DECL_EV_SW) && HAVE_DECL_EV_SW)
- XLAT(EV_SW),
+  XLAT(EV_SW),
 #endif
 #if defined(EV_LED) || (defined(HAVE_DECL_EV_LED) && HAVE_DECL_EV_LED)
- XLAT(EV_LED),
+  XLAT(EV_LED),
 #endif
 #if defined(EV_SND) || (defined(HAVE_DECL_EV_SND) && HAVE_DECL_EV_SND)
- XLAT(EV_SND),
+  XLAT(EV_SND),
 #endif
 #if defined(EV_REP) || (defined(HAVE_DECL_EV_REP) && HAVE_DECL_EV_REP)
- XLAT(EV_REP),
+  XLAT(EV_REP),
 #endif
 #if defined(EV_FF) || (defined(HAVE_DECL_EV_FF) && HAVE_DECL_EV_FF)
- XLAT(EV_FF),
+  XLAT(EV_FF),
 #endif
 #if defined(EV_PWR) || (defined(HAVE_DECL_EV_PWR) && HAVE_DECL_EV_PWR)
- XLAT(EV_PWR),
+  XLAT(EV_PWR),
 #endif
 #if defined(EV_FF_STATUS) || (defined(HAVE_DECL_EV_FF_STATUS) && HAVE_DECL_EV_FF_STATUS)
- XLAT(EV_FF_STATUS),
+  XLAT(EV_FF_STATUS),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/evdev_ff_status.h b/xlat/evdev_ff_status.h
index 89939ad..107bb1a 100644
--- a/xlat/evdev_ff_status.h
+++ b/xlat/evdev_ff_status.h
@@ -1,11 +1,20 @@
 /* Generated by ./xlat/gen.sh from ./xlat/evdev_ff_status.in; do not edit. */
 
-static const struct xlat evdev_ff_status[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat evdev_ff_status in mpers mode
+
+#else
+
+static
+const struct xlat evdev_ff_status[] = {
 #if defined(FF_STATUS_STOPPED) || (defined(HAVE_DECL_FF_STATUS_STOPPED) && HAVE_DECL_FF_STATUS_STOPPED)
- XLAT(FF_STATUS_STOPPED),
+  XLAT(FF_STATUS_STOPPED),
 #endif
 #if defined(FF_STATUS_PLAYING) || (defined(HAVE_DECL_FF_STATUS_PLAYING) && HAVE_DECL_FF_STATUS_PLAYING)
- XLAT(FF_STATUS_PLAYING),
+  XLAT(FF_STATUS_PLAYING),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/evdev_ff_types.h b/xlat/evdev_ff_types.h
index fd8f018..35dddc9 100644
--- a/xlat/evdev_ff_types.h
+++ b/xlat/evdev_ff_types.h
@@ -1,53 +1,62 @@
 /* Generated by ./xlat/gen.sh from ./xlat/evdev_ff_types.in; do not edit. */
 
-static const struct xlat evdev_ff_types[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat evdev_ff_types in mpers mode
+
+#else
+
+static
+const struct xlat evdev_ff_types[] = {
 #if defined(FF_RUMBLE) || (defined(HAVE_DECL_FF_RUMBLE) && HAVE_DECL_FF_RUMBLE)
- XLAT(FF_RUMBLE),
+  XLAT(FF_RUMBLE),
 #endif
 #if defined(FF_PERIODIC) || (defined(HAVE_DECL_FF_PERIODIC) && HAVE_DECL_FF_PERIODIC)
- XLAT(FF_PERIODIC),
+  XLAT(FF_PERIODIC),
 #endif
 #if defined(FF_CONSTANT) || (defined(HAVE_DECL_FF_CONSTANT) && HAVE_DECL_FF_CONSTANT)
- XLAT(FF_CONSTANT),
+  XLAT(FF_CONSTANT),
 #endif
 #if defined(FF_SPRING) || (defined(HAVE_DECL_FF_SPRING) && HAVE_DECL_FF_SPRING)
- XLAT(FF_SPRING),
+  XLAT(FF_SPRING),
 #endif
 #if defined(FF_FRICTION) || (defined(HAVE_DECL_FF_FRICTION) && HAVE_DECL_FF_FRICTION)
- XLAT(FF_FRICTION),
+  XLAT(FF_FRICTION),
 #endif
 #if defined(FF_DAMPER) || (defined(HAVE_DECL_FF_DAMPER) && HAVE_DECL_FF_DAMPER)
- XLAT(FF_DAMPER),
+  XLAT(FF_DAMPER),
 #endif
 #if defined(FF_INERTIA) || (defined(HAVE_DECL_FF_INERTIA) && HAVE_DECL_FF_INERTIA)
- XLAT(FF_INERTIA),
+  XLAT(FF_INERTIA),
 #endif
 #if defined(FF_RAMP) || (defined(HAVE_DECL_FF_RAMP) && HAVE_DECL_FF_RAMP)
- XLAT(FF_RAMP),
+  XLAT(FF_RAMP),
 #endif
 #if defined(FF_SQUARE) || (defined(HAVE_DECL_FF_SQUARE) && HAVE_DECL_FF_SQUARE)
- XLAT(FF_SQUARE),
+  XLAT(FF_SQUARE),
 #endif
 #if defined(FF_TRIANGLE) || (defined(HAVE_DECL_FF_TRIANGLE) && HAVE_DECL_FF_TRIANGLE)
- XLAT(FF_TRIANGLE),
+  XLAT(FF_TRIANGLE),
 #endif
 #if defined(FF_SINE) || (defined(HAVE_DECL_FF_SINE) && HAVE_DECL_FF_SINE)
- XLAT(FF_SINE),
+  XLAT(FF_SINE),
 #endif
 #if defined(FF_SAW_UP) || (defined(HAVE_DECL_FF_SAW_UP) && HAVE_DECL_FF_SAW_UP)
- XLAT(FF_SAW_UP),
+  XLAT(FF_SAW_UP),
 #endif
 #if defined(FF_SAW_DOWN) || (defined(HAVE_DECL_FF_SAW_DOWN) && HAVE_DECL_FF_SAW_DOWN)
- XLAT(FF_SAW_DOWN),
+  XLAT(FF_SAW_DOWN),
 #endif
 #if defined(FF_CUSTOM) || (defined(HAVE_DECL_FF_CUSTOM) && HAVE_DECL_FF_CUSTOM)
- XLAT(FF_CUSTOM),
+  XLAT(FF_CUSTOM),
 #endif
 #if defined(FF_GAIN) || (defined(HAVE_DECL_FF_GAIN) && HAVE_DECL_FF_GAIN)
- XLAT(FF_GAIN),
+  XLAT(FF_GAIN),
 #endif
 #if defined(FF_AUTOCENTER) || (defined(HAVE_DECL_FF_AUTOCENTER) && HAVE_DECL_FF_AUTOCENTER)
- XLAT(FF_AUTOCENTER),
+  XLAT(FF_AUTOCENTER),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/evdev_keycode.h b/xlat/evdev_keycode.h
index 66e9b63..a391b57 100644
--- a/xlat/evdev_keycode.h
+++ b/xlat/evdev_keycode.h
@@ -1,1641 +1,1665 @@
 /* Generated by ./xlat/gen.sh from ./xlat/evdev_keycode.in; do not edit. */
 
-static const struct xlat evdev_keycode[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat evdev_keycode in mpers mode
+
+#else
+
+static
+const struct xlat evdev_keycode[] = {
 #if defined(KEY_RESERVED) || (defined(HAVE_DECL_KEY_RESERVED) && HAVE_DECL_KEY_RESERVED)
- XLAT(KEY_RESERVED),
+  XLAT(KEY_RESERVED),
 #endif
 #if defined(KEY_ESC) || (defined(HAVE_DECL_KEY_ESC) && HAVE_DECL_KEY_ESC)
- XLAT(KEY_ESC),
+  XLAT(KEY_ESC),
 #endif
 #if defined(KEY_1) || (defined(HAVE_DECL_KEY_1) && HAVE_DECL_KEY_1)
- XLAT(KEY_1),
+  XLAT(KEY_1),
 #endif
 #if defined(KEY_2) || (defined(HAVE_DECL_KEY_2) && HAVE_DECL_KEY_2)
- XLAT(KEY_2),
+  XLAT(KEY_2),
 #endif
 #if defined(KEY_3) || (defined(HAVE_DECL_KEY_3) && HAVE_DECL_KEY_3)
- XLAT(KEY_3),
+  XLAT(KEY_3),
 #endif
 #if defined(KEY_4) || (defined(HAVE_DECL_KEY_4) && HAVE_DECL_KEY_4)
- XLAT(KEY_4),
+  XLAT(KEY_4),
 #endif
 #if defined(KEY_5) || (defined(HAVE_DECL_KEY_5) && HAVE_DECL_KEY_5)
- XLAT(KEY_5),
+  XLAT(KEY_5),
 #endif
 #if defined(KEY_6) || (defined(HAVE_DECL_KEY_6) && HAVE_DECL_KEY_6)
- XLAT(KEY_6),
+  XLAT(KEY_6),
 #endif
 #if defined(KEY_7) || (defined(HAVE_DECL_KEY_7) && HAVE_DECL_KEY_7)
- XLAT(KEY_7),
+  XLAT(KEY_7),
 #endif
 #if defined(KEY_8) || (defined(HAVE_DECL_KEY_8) && HAVE_DECL_KEY_8)
- XLAT(KEY_8),
+  XLAT(KEY_8),
 #endif
 #if defined(KEY_9) || (defined(HAVE_DECL_KEY_9) && HAVE_DECL_KEY_9)
- XLAT(KEY_9),
+  XLAT(KEY_9),
 #endif
 #if defined(KEY_0) || (defined(HAVE_DECL_KEY_0) && HAVE_DECL_KEY_0)
- XLAT(KEY_0),
+  XLAT(KEY_0),
 #endif
 #if defined(KEY_MINUS) || (defined(HAVE_DECL_KEY_MINUS) && HAVE_DECL_KEY_MINUS)
- XLAT(KEY_MINUS),
+  XLAT(KEY_MINUS),
 #endif
 #if defined(KEY_EQUAL) || (defined(HAVE_DECL_KEY_EQUAL) && HAVE_DECL_KEY_EQUAL)
- XLAT(KEY_EQUAL),
+  XLAT(KEY_EQUAL),
 #endif
 #if defined(KEY_BACKSPACE) || (defined(HAVE_DECL_KEY_BACKSPACE) && HAVE_DECL_KEY_BACKSPACE)
- XLAT(KEY_BACKSPACE),
+  XLAT(KEY_BACKSPACE),
 #endif
 #if defined(KEY_TAB) || (defined(HAVE_DECL_KEY_TAB) && HAVE_DECL_KEY_TAB)
- XLAT(KEY_TAB),
+  XLAT(KEY_TAB),
 #endif
 #if defined(KEY_Q) || (defined(HAVE_DECL_KEY_Q) && HAVE_DECL_KEY_Q)
- XLAT(KEY_Q),
+  XLAT(KEY_Q),
 #endif
 #if defined(KEY_W) || (defined(HAVE_DECL_KEY_W) && HAVE_DECL_KEY_W)
- XLAT(KEY_W),
+  XLAT(KEY_W),
 #endif
 #if defined(KEY_E) || (defined(HAVE_DECL_KEY_E) && HAVE_DECL_KEY_E)
- XLAT(KEY_E),
+  XLAT(KEY_E),
 #endif
 #if defined(KEY_R) || (defined(HAVE_DECL_KEY_R) && HAVE_DECL_KEY_R)
- XLAT(KEY_R),
+  XLAT(KEY_R),
 #endif
 #if defined(KEY_T) || (defined(HAVE_DECL_KEY_T) && HAVE_DECL_KEY_T)
- XLAT(KEY_T),
+  XLAT(KEY_T),
 #endif
 #if defined(KEY_Y) || (defined(HAVE_DECL_KEY_Y) && HAVE_DECL_KEY_Y)
- XLAT(KEY_Y),
+  XLAT(KEY_Y),
 #endif
 #if defined(KEY_U) || (defined(HAVE_DECL_KEY_U) && HAVE_DECL_KEY_U)
- XLAT(KEY_U),
+  XLAT(KEY_U),
 #endif
 #if defined(KEY_I) || (defined(HAVE_DECL_KEY_I) && HAVE_DECL_KEY_I)
- XLAT(KEY_I),
+  XLAT(KEY_I),
 #endif
 #if defined(KEY_O) || (defined(HAVE_DECL_KEY_O) && HAVE_DECL_KEY_O)
- XLAT(KEY_O),
+  XLAT(KEY_O),
 #endif
 #if defined(KEY_P) || (defined(HAVE_DECL_KEY_P) && HAVE_DECL_KEY_P)
- XLAT(KEY_P),
+  XLAT(KEY_P),
 #endif
 #if defined(KEY_LEFTBRACE) || (defined(HAVE_DECL_KEY_LEFTBRACE) && HAVE_DECL_KEY_LEFTBRACE)
- XLAT(KEY_LEFTBRACE),
+  XLAT(KEY_LEFTBRACE),
 #endif
 #if defined(KEY_RIGHTBRACE) || (defined(HAVE_DECL_KEY_RIGHTBRACE) && HAVE_DECL_KEY_RIGHTBRACE)
- XLAT(KEY_RIGHTBRACE),
+  XLAT(KEY_RIGHTBRACE),
 #endif
 #if defined(KEY_ENTER) || (defined(HAVE_DECL_KEY_ENTER) && HAVE_DECL_KEY_ENTER)
- XLAT(KEY_ENTER),
+  XLAT(KEY_ENTER),
 #endif
 #if defined(KEY_LEFTCTRL) || (defined(HAVE_DECL_KEY_LEFTCTRL) && HAVE_DECL_KEY_LEFTCTRL)
- XLAT(KEY_LEFTCTRL),
+  XLAT(KEY_LEFTCTRL),
 #endif
 #if defined(KEY_A) || (defined(HAVE_DECL_KEY_A) && HAVE_DECL_KEY_A)
- XLAT(KEY_A),
+  XLAT(KEY_A),
 #endif
 #if defined(KEY_S) || (defined(HAVE_DECL_KEY_S) && HAVE_DECL_KEY_S)
- XLAT(KEY_S),
+  XLAT(KEY_S),
 #endif
 #if defined(KEY_D) || (defined(HAVE_DECL_KEY_D) && HAVE_DECL_KEY_D)
- XLAT(KEY_D),
+  XLAT(KEY_D),
 #endif
 #if defined(KEY_F) || (defined(HAVE_DECL_KEY_F) && HAVE_DECL_KEY_F)
- XLAT(KEY_F),
+  XLAT(KEY_F),
 #endif
 #if defined(KEY_G) || (defined(HAVE_DECL_KEY_G) && HAVE_DECL_KEY_G)
- XLAT(KEY_G),
+  XLAT(KEY_G),
 #endif
 #if defined(KEY_H) || (defined(HAVE_DECL_KEY_H) && HAVE_DECL_KEY_H)
- XLAT(KEY_H),
+  XLAT(KEY_H),
 #endif
 #if defined(KEY_J) || (defined(HAVE_DECL_KEY_J) && HAVE_DECL_KEY_J)
- XLAT(KEY_J),
+  XLAT(KEY_J),
 #endif
 #if defined(KEY_K) || (defined(HAVE_DECL_KEY_K) && HAVE_DECL_KEY_K)
- XLAT(KEY_K),
+  XLAT(KEY_K),
 #endif
 #if defined(KEY_L) || (defined(HAVE_DECL_KEY_L) && HAVE_DECL_KEY_L)
- XLAT(KEY_L),
+  XLAT(KEY_L),
 #endif
 #if defined(KEY_SEMICOLON) || (defined(HAVE_DECL_KEY_SEMICOLON) && HAVE_DECL_KEY_SEMICOLON)
- XLAT(KEY_SEMICOLON),
+  XLAT(KEY_SEMICOLON),
 #endif
 #if defined(KEY_APOSTROPHE) || (defined(HAVE_DECL_KEY_APOSTROPHE) && HAVE_DECL_KEY_APOSTROPHE)
- XLAT(KEY_APOSTROPHE),
+  XLAT(KEY_APOSTROPHE),
 #endif
 #if defined(KEY_GRAVE) || (defined(HAVE_DECL_KEY_GRAVE) && HAVE_DECL_KEY_GRAVE)
- XLAT(KEY_GRAVE),
+  XLAT(KEY_GRAVE),
 #endif
 #if defined(KEY_LEFTSHIFT) || (defined(HAVE_DECL_KEY_LEFTSHIFT) && HAVE_DECL_KEY_LEFTSHIFT)
- XLAT(KEY_LEFTSHIFT),
+  XLAT(KEY_LEFTSHIFT),
 #endif
 #if defined(KEY_BACKSLASH) || (defined(HAVE_DECL_KEY_BACKSLASH) && HAVE_DECL_KEY_BACKSLASH)
- XLAT(KEY_BACKSLASH),
+  XLAT(KEY_BACKSLASH),
 #endif
 #if defined(KEY_Z) || (defined(HAVE_DECL_KEY_Z) && HAVE_DECL_KEY_Z)
- XLAT(KEY_Z),
+  XLAT(KEY_Z),
 #endif
 #if defined(KEY_X) || (defined(HAVE_DECL_KEY_X) && HAVE_DECL_KEY_X)
- XLAT(KEY_X),
+  XLAT(KEY_X),
 #endif
 #if defined(KEY_C) || (defined(HAVE_DECL_KEY_C) && HAVE_DECL_KEY_C)
- XLAT(KEY_C),
+  XLAT(KEY_C),
 #endif
 #if defined(KEY_V) || (defined(HAVE_DECL_KEY_V) && HAVE_DECL_KEY_V)
- XLAT(KEY_V),
+  XLAT(KEY_V),
 #endif
 #if defined(KEY_B) || (defined(HAVE_DECL_KEY_B) && HAVE_DECL_KEY_B)
- XLAT(KEY_B),
+  XLAT(KEY_B),
 #endif
 #if defined(KEY_N) || (defined(HAVE_DECL_KEY_N) && HAVE_DECL_KEY_N)
- XLAT(KEY_N),
+  XLAT(KEY_N),
 #endif
 #if defined(KEY_M) || (defined(HAVE_DECL_KEY_M) && HAVE_DECL_KEY_M)
- XLAT(KEY_M),
+  XLAT(KEY_M),
 #endif
 #if defined(KEY_COMMA) || (defined(HAVE_DECL_KEY_COMMA) && HAVE_DECL_KEY_COMMA)
- XLAT(KEY_COMMA),
+  XLAT(KEY_COMMA),
 #endif
 #if defined(KEY_DOT) || (defined(HAVE_DECL_KEY_DOT) && HAVE_DECL_KEY_DOT)
- XLAT(KEY_DOT),
+  XLAT(KEY_DOT),
 #endif
 #if defined(KEY_SLASH) || (defined(HAVE_DECL_KEY_SLASH) && HAVE_DECL_KEY_SLASH)
- XLAT(KEY_SLASH),
+  XLAT(KEY_SLASH),
 #endif
 #if defined(KEY_RIGHTSHIFT) || (defined(HAVE_DECL_KEY_RIGHTSHIFT) && HAVE_DECL_KEY_RIGHTSHIFT)
- XLAT(KEY_RIGHTSHIFT),
+  XLAT(KEY_RIGHTSHIFT),
 #endif
 #if defined(KEY_KPASTERISK) || (defined(HAVE_DECL_KEY_KPASTERISK) && HAVE_DECL_KEY_KPASTERISK)
- XLAT(KEY_KPASTERISK),
+  XLAT(KEY_KPASTERISK),
 #endif
 #if defined(KEY_LEFTALT) || (defined(HAVE_DECL_KEY_LEFTALT) && HAVE_DECL_KEY_LEFTALT)
- XLAT(KEY_LEFTALT),
+  XLAT(KEY_LEFTALT),
 #endif
 #if defined(KEY_SPACE) || (defined(HAVE_DECL_KEY_SPACE) && HAVE_DECL_KEY_SPACE)
- XLAT(KEY_SPACE),
+  XLAT(KEY_SPACE),
 #endif
 #if defined(KEY_CAPSLOCK) || (defined(HAVE_DECL_KEY_CAPSLOCK) && HAVE_DECL_KEY_CAPSLOCK)
- XLAT(KEY_CAPSLOCK),
+  XLAT(KEY_CAPSLOCK),
 #endif
 #if defined(KEY_F1) || (defined(HAVE_DECL_KEY_F1) && HAVE_DECL_KEY_F1)
- XLAT(KEY_F1),
+  XLAT(KEY_F1),
 #endif
 #if defined(KEY_F2) || (defined(HAVE_DECL_KEY_F2) && HAVE_DECL_KEY_F2)
- XLAT(KEY_F2),
+  XLAT(KEY_F2),
 #endif
 #if defined(KEY_F3) || (defined(HAVE_DECL_KEY_F3) && HAVE_DECL_KEY_F3)
- XLAT(KEY_F3),
+  XLAT(KEY_F3),
 #endif
 #if defined(KEY_F4) || (defined(HAVE_DECL_KEY_F4) && HAVE_DECL_KEY_F4)
- XLAT(KEY_F4),
+  XLAT(KEY_F4),
 #endif
 #if defined(KEY_F5) || (defined(HAVE_DECL_KEY_F5) && HAVE_DECL_KEY_F5)
- XLAT(KEY_F5),
+  XLAT(KEY_F5),
 #endif
 #if defined(KEY_F6) || (defined(HAVE_DECL_KEY_F6) && HAVE_DECL_KEY_F6)
- XLAT(KEY_F6),
+  XLAT(KEY_F6),
 #endif
 #if defined(KEY_F7) || (defined(HAVE_DECL_KEY_F7) && HAVE_DECL_KEY_F7)
- XLAT(KEY_F7),
+  XLAT(KEY_F7),
 #endif
 #if defined(KEY_F8) || (defined(HAVE_DECL_KEY_F8) && HAVE_DECL_KEY_F8)
- XLAT(KEY_F8),
+  XLAT(KEY_F8),
 #endif
 #if defined(KEY_F9) || (defined(HAVE_DECL_KEY_F9) && HAVE_DECL_KEY_F9)
- XLAT(KEY_F9),
+  XLAT(KEY_F9),
 #endif
 #if defined(KEY_F10) || (defined(HAVE_DECL_KEY_F10) && HAVE_DECL_KEY_F10)
- XLAT(KEY_F10),
+  XLAT(KEY_F10),
 #endif
 #if defined(KEY_NUMLOCK) || (defined(HAVE_DECL_KEY_NUMLOCK) && HAVE_DECL_KEY_NUMLOCK)
- XLAT(KEY_NUMLOCK),
+  XLAT(KEY_NUMLOCK),
 #endif
 #if defined(KEY_SCROLLLOCK) || (defined(HAVE_DECL_KEY_SCROLLLOCK) && HAVE_DECL_KEY_SCROLLLOCK)
- XLAT(KEY_SCROLLLOCK),
+  XLAT(KEY_SCROLLLOCK),
 #endif
 #if defined(KEY_KP7) || (defined(HAVE_DECL_KEY_KP7) && HAVE_DECL_KEY_KP7)
- XLAT(KEY_KP7),
+  XLAT(KEY_KP7),
 #endif
 #if defined(KEY_KP8) || (defined(HAVE_DECL_KEY_KP8) && HAVE_DECL_KEY_KP8)
- XLAT(KEY_KP8),
+  XLAT(KEY_KP8),
 #endif
 #if defined(KEY_KP9) || (defined(HAVE_DECL_KEY_KP9) && HAVE_DECL_KEY_KP9)
- XLAT(KEY_KP9),
+  XLAT(KEY_KP9),
 #endif
 #if defined(KEY_KPMINUS) || (defined(HAVE_DECL_KEY_KPMINUS) && HAVE_DECL_KEY_KPMINUS)
- XLAT(KEY_KPMINUS),
+  XLAT(KEY_KPMINUS),
 #endif
 #if defined(KEY_KP4) || (defined(HAVE_DECL_KEY_KP4) && HAVE_DECL_KEY_KP4)
- XLAT(KEY_KP4),
+  XLAT(KEY_KP4),
 #endif
 #if defined(KEY_KP5) || (defined(HAVE_DECL_KEY_KP5) && HAVE_DECL_KEY_KP5)
- XLAT(KEY_KP5),
+  XLAT(KEY_KP5),
 #endif
 #if defined(KEY_KP6) || (defined(HAVE_DECL_KEY_KP6) && HAVE_DECL_KEY_KP6)
- XLAT(KEY_KP6),
+  XLAT(KEY_KP6),
 #endif
 #if defined(KEY_KPPLUS) || (defined(HAVE_DECL_KEY_KPPLUS) && HAVE_DECL_KEY_KPPLUS)
- XLAT(KEY_KPPLUS),
+  XLAT(KEY_KPPLUS),
 #endif
 #if defined(KEY_KP1) || (defined(HAVE_DECL_KEY_KP1) && HAVE_DECL_KEY_KP1)
- XLAT(KEY_KP1),
+  XLAT(KEY_KP1),
 #endif
 #if defined(KEY_KP2) || (defined(HAVE_DECL_KEY_KP2) && HAVE_DECL_KEY_KP2)
- XLAT(KEY_KP2),
+  XLAT(KEY_KP2),
 #endif
 #if defined(KEY_KP3) || (defined(HAVE_DECL_KEY_KP3) && HAVE_DECL_KEY_KP3)
- XLAT(KEY_KP3),
+  XLAT(KEY_KP3),
 #endif
 #if defined(KEY_KP0) || (defined(HAVE_DECL_KEY_KP0) && HAVE_DECL_KEY_KP0)
- XLAT(KEY_KP0),
+  XLAT(KEY_KP0),
 #endif
 #if defined(KEY_KPDOT) || (defined(HAVE_DECL_KEY_KPDOT) && HAVE_DECL_KEY_KPDOT)
- XLAT(KEY_KPDOT),
+  XLAT(KEY_KPDOT),
 #endif
 
 #if defined(KEY_ZENKAKUHANKAKU) || (defined(HAVE_DECL_KEY_ZENKAKUHANKAKU) && HAVE_DECL_KEY_ZENKAKUHANKAKU)
- XLAT(KEY_ZENKAKUHANKAKU),
+  XLAT(KEY_ZENKAKUHANKAKU),
 #endif
 #if defined(KEY_102ND) || (defined(HAVE_DECL_KEY_102ND) && HAVE_DECL_KEY_102ND)
- XLAT(KEY_102ND),
+  XLAT(KEY_102ND),
 #endif
 #if defined(KEY_F11) || (defined(HAVE_DECL_KEY_F11) && HAVE_DECL_KEY_F11)
- XLAT(KEY_F11),
+  XLAT(KEY_F11),
 #endif
 #if defined(KEY_F12) || (defined(HAVE_DECL_KEY_F12) && HAVE_DECL_KEY_F12)
- XLAT(KEY_F12),
+  XLAT(KEY_F12),
 #endif
 #if defined(KEY_RO) || (defined(HAVE_DECL_KEY_RO) && HAVE_DECL_KEY_RO)
- XLAT(KEY_RO),
+  XLAT(KEY_RO),
 #endif
 #if defined(KEY_KATAKANA) || (defined(HAVE_DECL_KEY_KATAKANA) && HAVE_DECL_KEY_KATAKANA)
- XLAT(KEY_KATAKANA),
+  XLAT(KEY_KATAKANA),
 #endif
 #if defined(KEY_HIRAGANA) || (defined(HAVE_DECL_KEY_HIRAGANA) && HAVE_DECL_KEY_HIRAGANA)
- XLAT(KEY_HIRAGANA),
+  XLAT(KEY_HIRAGANA),
 #endif
 #if defined(KEY_HENKAN) || (defined(HAVE_DECL_KEY_HENKAN) && HAVE_DECL_KEY_HENKAN)
- XLAT(KEY_HENKAN),
+  XLAT(KEY_HENKAN),
 #endif
 #if defined(KEY_KATAKANAHIRAGANA) || (defined(HAVE_DECL_KEY_KATAKANAHIRAGANA) && HAVE_DECL_KEY_KATAKANAHIRAGANA)
- XLAT(KEY_KATAKANAHIRAGANA),
+  XLAT(KEY_KATAKANAHIRAGANA),
 #endif
 #if defined(KEY_MUHENKAN) || (defined(HAVE_DECL_KEY_MUHENKAN) && HAVE_DECL_KEY_MUHENKAN)
- XLAT(KEY_MUHENKAN),
+  XLAT(KEY_MUHENKAN),
 #endif
 #if defined(KEY_KPJPCOMMA) || (defined(HAVE_DECL_KEY_KPJPCOMMA) && HAVE_DECL_KEY_KPJPCOMMA)
- XLAT(KEY_KPJPCOMMA),
+  XLAT(KEY_KPJPCOMMA),
 #endif
 #if defined(KEY_KPENTER) || (defined(HAVE_DECL_KEY_KPENTER) && HAVE_DECL_KEY_KPENTER)
- XLAT(KEY_KPENTER),
+  XLAT(KEY_KPENTER),
 #endif
 #if defined(KEY_RIGHTCTRL) || (defined(HAVE_DECL_KEY_RIGHTCTRL) && HAVE_DECL_KEY_RIGHTCTRL)
- XLAT(KEY_RIGHTCTRL),
+  XLAT(KEY_RIGHTCTRL),
 #endif
 #if defined(KEY_KPSLASH) || (defined(HAVE_DECL_KEY_KPSLASH) && HAVE_DECL_KEY_KPSLASH)
- XLAT(KEY_KPSLASH),
+  XLAT(KEY_KPSLASH),
 #endif
 #if defined(KEY_SYSRQ) || (defined(HAVE_DECL_KEY_SYSRQ) && HAVE_DECL_KEY_SYSRQ)
- XLAT(KEY_SYSRQ),
+  XLAT(KEY_SYSRQ),
 #endif
 #if defined(KEY_RIGHTALT) || (defined(HAVE_DECL_KEY_RIGHTALT) && HAVE_DECL_KEY_RIGHTALT)
- XLAT(KEY_RIGHTALT),
+  XLAT(KEY_RIGHTALT),
 #endif
 #if defined(KEY_LINEFEED) || (defined(HAVE_DECL_KEY_LINEFEED) && HAVE_DECL_KEY_LINEFEED)
- XLAT(KEY_LINEFEED),
+  XLAT(KEY_LINEFEED),
 #endif
 #if defined(KEY_HOME) || (defined(HAVE_DECL_KEY_HOME) && HAVE_DECL_KEY_HOME)
- XLAT(KEY_HOME),
+  XLAT(KEY_HOME),
 #endif
 #if defined(KEY_UP) || (defined(HAVE_DECL_KEY_UP) && HAVE_DECL_KEY_UP)
- XLAT(KEY_UP),
+  XLAT(KEY_UP),
 #endif
 #if defined(KEY_PAGEUP) || (defined(HAVE_DECL_KEY_PAGEUP) && HAVE_DECL_KEY_PAGEUP)
- XLAT(KEY_PAGEUP),
+  XLAT(KEY_PAGEUP),
 #endif
 #if defined(KEY_LEFT) || (defined(HAVE_DECL_KEY_LEFT) && HAVE_DECL_KEY_LEFT)
- XLAT(KEY_LEFT),
+  XLAT(KEY_LEFT),
 #endif
 #if defined(KEY_RIGHT) || (defined(HAVE_DECL_KEY_RIGHT) && HAVE_DECL_KEY_RIGHT)
- XLAT(KEY_RIGHT),
+  XLAT(KEY_RIGHT),
 #endif
 #if defined(KEY_END) || (defined(HAVE_DECL_KEY_END) && HAVE_DECL_KEY_END)
- XLAT(KEY_END),
+  XLAT(KEY_END),
 #endif
 #if defined(KEY_DOWN) || (defined(HAVE_DECL_KEY_DOWN) && HAVE_DECL_KEY_DOWN)
- XLAT(KEY_DOWN),
+  XLAT(KEY_DOWN),
 #endif
 #if defined(KEY_PAGEDOWN) || (defined(HAVE_DECL_KEY_PAGEDOWN) && HAVE_DECL_KEY_PAGEDOWN)
- XLAT(KEY_PAGEDOWN),
+  XLAT(KEY_PAGEDOWN),
 #endif
 #if defined(KEY_INSERT) || (defined(HAVE_DECL_KEY_INSERT) && HAVE_DECL_KEY_INSERT)
- XLAT(KEY_INSERT),
+  XLAT(KEY_INSERT),
 #endif
 #if defined(KEY_DELETE) || (defined(HAVE_DECL_KEY_DELETE) && HAVE_DECL_KEY_DELETE)
- XLAT(KEY_DELETE),
+  XLAT(KEY_DELETE),
 #endif
 #if defined(KEY_MACRO) || (defined(HAVE_DECL_KEY_MACRO) && HAVE_DECL_KEY_MACRO)
- XLAT(KEY_MACRO),
+  XLAT(KEY_MACRO),
 #endif
 #if defined(KEY_MUTE) || (defined(HAVE_DECL_KEY_MUTE) && HAVE_DECL_KEY_MUTE)
- XLAT(KEY_MUTE),
+  XLAT(KEY_MUTE),
 #endif
 #if defined(KEY_VOLUMEDOWN) || (defined(HAVE_DECL_KEY_VOLUMEDOWN) && HAVE_DECL_KEY_VOLUMEDOWN)
- XLAT(KEY_VOLUMEDOWN),
+  XLAT(KEY_VOLUMEDOWN),
 #endif
 #if defined(KEY_VOLUMEUP) || (defined(HAVE_DECL_KEY_VOLUMEUP) && HAVE_DECL_KEY_VOLUMEUP)
- XLAT(KEY_VOLUMEUP),
+  XLAT(KEY_VOLUMEUP),
 #endif
 #if defined(KEY_POWER) || (defined(HAVE_DECL_KEY_POWER) && HAVE_DECL_KEY_POWER)
- XLAT(KEY_POWER),
+  XLAT(KEY_POWER),
 #endif
 #if defined(KEY_KPEQUAL) || (defined(HAVE_DECL_KEY_KPEQUAL) && HAVE_DECL_KEY_KPEQUAL)
- XLAT(KEY_KPEQUAL),
+  XLAT(KEY_KPEQUAL),
 #endif
 #if defined(KEY_KPPLUSMINUS) || (defined(HAVE_DECL_KEY_KPPLUSMINUS) && HAVE_DECL_KEY_KPPLUSMINUS)
- XLAT(KEY_KPPLUSMINUS),
+  XLAT(KEY_KPPLUSMINUS),
 #endif
 #if defined(KEY_PAUSE) || (defined(HAVE_DECL_KEY_PAUSE) && HAVE_DECL_KEY_PAUSE)
- XLAT(KEY_PAUSE),
+  XLAT(KEY_PAUSE),
 #endif
 #if defined(KEY_SCALE) || (defined(HAVE_DECL_KEY_SCALE) && HAVE_DECL_KEY_SCALE)
- XLAT(KEY_SCALE),
+  XLAT(KEY_SCALE),
 #endif
 
 #if defined(KEY_KPCOMMA) || (defined(HAVE_DECL_KEY_KPCOMMA) && HAVE_DECL_KEY_KPCOMMA)
- XLAT(KEY_KPCOMMA),
+  XLAT(KEY_KPCOMMA),
 #endif
 #if defined(KEY_HANGEUL) || (defined(HAVE_DECL_KEY_HANGEUL) && HAVE_DECL_KEY_HANGEUL)
- XLAT(KEY_HANGEUL),
+  XLAT(KEY_HANGEUL),
 #endif
 #if defined(KEY_HANGUEL) || (defined(HAVE_DECL_KEY_HANGUEL) && HAVE_DECL_KEY_HANGUEL)
- XLAT(KEY_HANGUEL),
+  XLAT(KEY_HANGUEL),
 #endif
 #if defined(KEY_HANJA) || (defined(HAVE_DECL_KEY_HANJA) && HAVE_DECL_KEY_HANJA)
- XLAT(KEY_HANJA),
+  XLAT(KEY_HANJA),
 #endif
 #if defined(KEY_YEN) || (defined(HAVE_DECL_KEY_YEN) && HAVE_DECL_KEY_YEN)
- XLAT(KEY_YEN),
+  XLAT(KEY_YEN),
 #endif
 #if defined(KEY_LEFTMETA) || (defined(HAVE_DECL_KEY_LEFTMETA) && HAVE_DECL_KEY_LEFTMETA)
- XLAT(KEY_LEFTMETA),
+  XLAT(KEY_LEFTMETA),
 #endif
 #if defined(KEY_RIGHTMETA) || (defined(HAVE_DECL_KEY_RIGHTMETA) && HAVE_DECL_KEY_RIGHTMETA)
- XLAT(KEY_RIGHTMETA),
+  XLAT(KEY_RIGHTMETA),
 #endif
 #if defined(KEY_COMPOSE) || (defined(HAVE_DECL_KEY_COMPOSE) && HAVE_DECL_KEY_COMPOSE)
- XLAT(KEY_COMPOSE),
+  XLAT(KEY_COMPOSE),
 #endif
 
 #if defined(KEY_STOP) || (defined(HAVE_DECL_KEY_STOP) && HAVE_DECL_KEY_STOP)
- XLAT(KEY_STOP),
+  XLAT(KEY_STOP),
 #endif
 #if defined(KEY_AGAIN) || (defined(HAVE_DECL_KEY_AGAIN) && HAVE_DECL_KEY_AGAIN)
- XLAT(KEY_AGAIN),
+  XLAT(KEY_AGAIN),
 #endif
 #if defined(KEY_PROPS) || (defined(HAVE_DECL_KEY_PROPS) && HAVE_DECL_KEY_PROPS)
- XLAT(KEY_PROPS),
+  XLAT(KEY_PROPS),
 #endif
 #if defined(KEY_UNDO) || (defined(HAVE_DECL_KEY_UNDO) && HAVE_DECL_KEY_UNDO)
- XLAT(KEY_UNDO),
+  XLAT(KEY_UNDO),
 #endif
 #if defined(KEY_FRONT) || (defined(HAVE_DECL_KEY_FRONT) && HAVE_DECL_KEY_FRONT)
- XLAT(KEY_FRONT),
+  XLAT(KEY_FRONT),
 #endif
 #if defined(KEY_COPY) || (defined(HAVE_DECL_KEY_COPY) && HAVE_DECL_KEY_COPY)
- XLAT(KEY_COPY),
+  XLAT(KEY_COPY),
 #endif
 #if defined(KEY_OPEN) || (defined(HAVE_DECL_KEY_OPEN) && HAVE_DECL_KEY_OPEN)
- XLAT(KEY_OPEN),
+  XLAT(KEY_OPEN),
 #endif
 #if defined(KEY_PASTE) || (defined(HAVE_DECL_KEY_PASTE) && HAVE_DECL_KEY_PASTE)
- XLAT(KEY_PASTE),
+  XLAT(KEY_PASTE),
 #endif
 #if defined(KEY_FIND) || (defined(HAVE_DECL_KEY_FIND) && HAVE_DECL_KEY_FIND)
- XLAT(KEY_FIND),
+  XLAT(KEY_FIND),
 #endif
 #if defined(KEY_CUT) || (defined(HAVE_DECL_KEY_CUT) && HAVE_DECL_KEY_CUT)
- XLAT(KEY_CUT),
+  XLAT(KEY_CUT),
 #endif
 #if defined(KEY_HELP) || (defined(HAVE_DECL_KEY_HELP) && HAVE_DECL_KEY_HELP)
- XLAT(KEY_HELP),
+  XLAT(KEY_HELP),
 #endif
 #if defined(KEY_MENU) || (defined(HAVE_DECL_KEY_MENU) && HAVE_DECL_KEY_MENU)
- XLAT(KEY_MENU),
+  XLAT(KEY_MENU),
 #endif
 #if defined(KEY_CALC) || (defined(HAVE_DECL_KEY_CALC) && HAVE_DECL_KEY_CALC)
- XLAT(KEY_CALC),
+  XLAT(KEY_CALC),
 #endif
 #if defined(KEY_SETUP) || (defined(HAVE_DECL_KEY_SETUP) && HAVE_DECL_KEY_SETUP)
- XLAT(KEY_SETUP),
+  XLAT(KEY_SETUP),
 #endif
 #if defined(KEY_SLEEP) || (defined(HAVE_DECL_KEY_SLEEP) && HAVE_DECL_KEY_SLEEP)
- XLAT(KEY_SLEEP),
+  XLAT(KEY_SLEEP),
 #endif
 #if defined(KEY_WAKEUP) || (defined(HAVE_DECL_KEY_WAKEUP) && HAVE_DECL_KEY_WAKEUP)
- XLAT(KEY_WAKEUP),
+  XLAT(KEY_WAKEUP),
 #endif
 #if defined(KEY_FILE) || (defined(HAVE_DECL_KEY_FILE) && HAVE_DECL_KEY_FILE)
- XLAT(KEY_FILE),
+  XLAT(KEY_FILE),
 #endif
 #if defined(KEY_SENDFILE) || (defined(HAVE_DECL_KEY_SENDFILE) && HAVE_DECL_KEY_SENDFILE)
- XLAT(KEY_SENDFILE),
+  XLAT(KEY_SENDFILE),
 #endif
 #if defined(KEY_DELETEFILE) || (defined(HAVE_DECL_KEY_DELETEFILE) && HAVE_DECL_KEY_DELETEFILE)
- XLAT(KEY_DELETEFILE),
+  XLAT(KEY_DELETEFILE),
 #endif
 #if defined(KEY_XFER) || (defined(HAVE_DECL_KEY_XFER) && HAVE_DECL_KEY_XFER)
- XLAT(KEY_XFER),
+  XLAT(KEY_XFER),
 #endif
 #if defined(KEY_PROG1) || (defined(HAVE_DECL_KEY_PROG1) && HAVE_DECL_KEY_PROG1)
- XLAT(KEY_PROG1),
+  XLAT(KEY_PROG1),
 #endif
 #if defined(KEY_PROG2) || (defined(HAVE_DECL_KEY_PROG2) && HAVE_DECL_KEY_PROG2)
- XLAT(KEY_PROG2),
+  XLAT(KEY_PROG2),
 #endif
 #if defined(KEY_WWW) || (defined(HAVE_DECL_KEY_WWW) && HAVE_DECL_KEY_WWW)
- XLAT(KEY_WWW),
+  XLAT(KEY_WWW),
 #endif
 #if defined(KEY_MSDOS) || (defined(HAVE_DECL_KEY_MSDOS) && HAVE_DECL_KEY_MSDOS)
- XLAT(KEY_MSDOS),
+  XLAT(KEY_MSDOS),
 #endif
 #if defined(KEY_COFFEE) || (defined(HAVE_DECL_KEY_COFFEE) && HAVE_DECL_KEY_COFFEE)
- XLAT(KEY_COFFEE),
+  XLAT(KEY_COFFEE),
+#endif
+#if defined(KEY_ROTATE_DISPLAY) || (defined(HAVE_DECL_KEY_ROTATE_DISPLAY) && HAVE_DECL_KEY_ROTATE_DISPLAY)
+  XLAT(KEY_ROTATE_DISPLAY),
 #endif
 #if defined(KEY_DIRECTION) || (defined(HAVE_DECL_KEY_DIRECTION) && HAVE_DECL_KEY_DIRECTION)
- XLAT(KEY_DIRECTION),
+  XLAT(KEY_DIRECTION),
 #endif
 #if defined(KEY_CYCLEWINDOWS) || (defined(HAVE_DECL_KEY_CYCLEWINDOWS) && HAVE_DECL_KEY_CYCLEWINDOWS)
- XLAT(KEY_CYCLEWINDOWS),
+  XLAT(KEY_CYCLEWINDOWS),
 #endif
 #if defined(KEY_MAIL) || (defined(HAVE_DECL_KEY_MAIL) && HAVE_DECL_KEY_MAIL)
- XLAT(KEY_MAIL),
+  XLAT(KEY_MAIL),
 #endif
 #if defined(KEY_BOOKMARKS) || (defined(HAVE_DECL_KEY_BOOKMARKS) && HAVE_DECL_KEY_BOOKMARKS)
- XLAT(KEY_BOOKMARKS),
+  XLAT(KEY_BOOKMARKS),
 #endif
 #if defined(KEY_COMPUTER) || (defined(HAVE_DECL_KEY_COMPUTER) && HAVE_DECL_KEY_COMPUTER)
- XLAT(KEY_COMPUTER),
+  XLAT(KEY_COMPUTER),
 #endif
 #if defined(KEY_BACK) || (defined(HAVE_DECL_KEY_BACK) && HAVE_DECL_KEY_BACK)
- XLAT(KEY_BACK),
+  XLAT(KEY_BACK),
 #endif
 #if defined(KEY_FORWARD) || (defined(HAVE_DECL_KEY_FORWARD) && HAVE_DECL_KEY_FORWARD)
- XLAT(KEY_FORWARD),
+  XLAT(KEY_FORWARD),
 #endif
 #if defined(KEY_CLOSECD) || (defined(HAVE_DECL_KEY_CLOSECD) && HAVE_DECL_KEY_CLOSECD)
- XLAT(KEY_CLOSECD),
+  XLAT(KEY_CLOSECD),
 #endif
 #if defined(KEY_EJECTCD) || (defined(HAVE_DECL_KEY_EJECTCD) && HAVE_DECL_KEY_EJECTCD)
- XLAT(KEY_EJECTCD),
+  XLAT(KEY_EJECTCD),
 #endif
 #if defined(KEY_EJECTCLOSECD) || (defined(HAVE_DECL_KEY_EJECTCLOSECD) && HAVE_DECL_KEY_EJECTCLOSECD)
- XLAT(KEY_EJECTCLOSECD),
+  XLAT(KEY_EJECTCLOSECD),
 #endif
 #if defined(KEY_NEXTSONG) || (defined(HAVE_DECL_KEY_NEXTSONG) && HAVE_DECL_KEY_NEXTSONG)
- XLAT(KEY_NEXTSONG),
+  XLAT(KEY_NEXTSONG),
 #endif
 #if defined(KEY_PLAYPAUSE) || (defined(HAVE_DECL_KEY_PLAYPAUSE) && HAVE_DECL_KEY_PLAYPAUSE)
- XLAT(KEY_PLAYPAUSE),
+  XLAT(KEY_PLAYPAUSE),
 #endif
 #if defined(KEY_PREVIOUSSONG) || (defined(HAVE_DECL_KEY_PREVIOUSSONG) && HAVE_DECL_KEY_PREVIOUSSONG)
- XLAT(KEY_PREVIOUSSONG),
+  XLAT(KEY_PREVIOUSSONG),
 #endif
 #if defined(KEY_STOPCD) || (defined(HAVE_DECL_KEY_STOPCD) && HAVE_DECL_KEY_STOPCD)
- XLAT(KEY_STOPCD),
+  XLAT(KEY_STOPCD),
 #endif
 #if defined(KEY_RECORD) || (defined(HAVE_DECL_KEY_RECORD) && HAVE_DECL_KEY_RECORD)
- XLAT(KEY_RECORD),
+  XLAT(KEY_RECORD),
 #endif
 #if defined(KEY_REWIND) || (defined(HAVE_DECL_KEY_REWIND) && HAVE_DECL_KEY_REWIND)
- XLAT(KEY_REWIND),
+  XLAT(KEY_REWIND),
 #endif
 #if defined(KEY_PHONE) || (defined(HAVE_DECL_KEY_PHONE) && HAVE_DECL_KEY_PHONE)
- XLAT(KEY_PHONE),
+  XLAT(KEY_PHONE),
 #endif
 #if defined(KEY_ISO) || (defined(HAVE_DECL_KEY_ISO) && HAVE_DECL_KEY_ISO)
- XLAT(KEY_ISO),
+  XLAT(KEY_ISO),
 #endif
 #if defined(KEY_CONFIG) || (defined(HAVE_DECL_KEY_CONFIG) && HAVE_DECL_KEY_CONFIG)
- XLAT(KEY_CONFIG),
+  XLAT(KEY_CONFIG),
 #endif
 #if defined(KEY_HOMEPAGE) || (defined(HAVE_DECL_KEY_HOMEPAGE) && HAVE_DECL_KEY_HOMEPAGE)
- XLAT(KEY_HOMEPAGE),
+  XLAT(KEY_HOMEPAGE),
 #endif
 #if defined(KEY_REFRESH) || (defined(HAVE_DECL_KEY_REFRESH) && HAVE_DECL_KEY_REFRESH)
- XLAT(KEY_REFRESH),
+  XLAT(KEY_REFRESH),
 #endif
 #if defined(KEY_EXIT) || (defined(HAVE_DECL_KEY_EXIT) && HAVE_DECL_KEY_EXIT)
- XLAT(KEY_EXIT),
+  XLAT(KEY_EXIT),
 #endif
 #if defined(KEY_MOVE) || (defined(HAVE_DECL_KEY_MOVE) && HAVE_DECL_KEY_MOVE)
- XLAT(KEY_MOVE),
+  XLAT(KEY_MOVE),
 #endif
 #if defined(KEY_EDIT) || (defined(HAVE_DECL_KEY_EDIT) && HAVE_DECL_KEY_EDIT)
- XLAT(KEY_EDIT),
+  XLAT(KEY_EDIT),
 #endif
 #if defined(KEY_SCROLLUP) || (defined(HAVE_DECL_KEY_SCROLLUP) && HAVE_DECL_KEY_SCROLLUP)
- XLAT(KEY_SCROLLUP),
+  XLAT(KEY_SCROLLUP),
 #endif
 #if defined(KEY_SCROLLDOWN) || (defined(HAVE_DECL_KEY_SCROLLDOWN) && HAVE_DECL_KEY_SCROLLDOWN)
- XLAT(KEY_SCROLLDOWN),
+  XLAT(KEY_SCROLLDOWN),
 #endif
 #if defined(KEY_KPLEFTPAREN) || (defined(HAVE_DECL_KEY_KPLEFTPAREN) && HAVE_DECL_KEY_KPLEFTPAREN)
- XLAT(KEY_KPLEFTPAREN),
+  XLAT(KEY_KPLEFTPAREN),
 #endif
 #if defined(KEY_KPRIGHTPAREN) || (defined(HAVE_DECL_KEY_KPRIGHTPAREN) && HAVE_DECL_KEY_KPRIGHTPAREN)
- XLAT(KEY_KPRIGHTPAREN),
+  XLAT(KEY_KPRIGHTPAREN),
 #endif
 #if defined(KEY_NEW) || (defined(HAVE_DECL_KEY_NEW) && HAVE_DECL_KEY_NEW)
- XLAT(KEY_NEW),
+  XLAT(KEY_NEW),
 #endif
 #if defined(KEY_REDO) || (defined(HAVE_DECL_KEY_REDO) && HAVE_DECL_KEY_REDO)
- XLAT(KEY_REDO),
+  XLAT(KEY_REDO),
 #endif
 
 #if defined(KEY_F13) || (defined(HAVE_DECL_KEY_F13) && HAVE_DECL_KEY_F13)
- XLAT(KEY_F13),
+  XLAT(KEY_F13),
 #endif
 #if defined(KEY_F14) || (defined(HAVE_DECL_KEY_F14) && HAVE_DECL_KEY_F14)
- XLAT(KEY_F14),
+  XLAT(KEY_F14),
 #endif
 #if defined(KEY_F15) || (defined(HAVE_DECL_KEY_F15) && HAVE_DECL_KEY_F15)
- XLAT(KEY_F15),
+  XLAT(KEY_F15),
 #endif
 #if defined(KEY_F16) || (defined(HAVE_DECL_KEY_F16) && HAVE_DECL_KEY_F16)
- XLAT(KEY_F16),
+  XLAT(KEY_F16),
 #endif
 #if defined(KEY_F17) || (defined(HAVE_DECL_KEY_F17) && HAVE_DECL_KEY_F17)
- XLAT(KEY_F17),
+  XLAT(KEY_F17),
 #endif
 #if defined(KEY_F18) || (defined(HAVE_DECL_KEY_F18) && HAVE_DECL_KEY_F18)
- XLAT(KEY_F18),
+  XLAT(KEY_F18),
 #endif
 #if defined(KEY_F19) || (defined(HAVE_DECL_KEY_F19) && HAVE_DECL_KEY_F19)
- XLAT(KEY_F19),
+  XLAT(KEY_F19),
 #endif
 #if defined(KEY_F20) || (defined(HAVE_DECL_KEY_F20) && HAVE_DECL_KEY_F20)
- XLAT(KEY_F20),
+  XLAT(KEY_F20),
 #endif
 #if defined(KEY_F21) || (defined(HAVE_DECL_KEY_F21) && HAVE_DECL_KEY_F21)
- XLAT(KEY_F21),
+  XLAT(KEY_F21),
 #endif
 #if defined(KEY_F22) || (defined(HAVE_DECL_KEY_F22) && HAVE_DECL_KEY_F22)
- XLAT(KEY_F22),
+  XLAT(KEY_F22),
 #endif
 #if defined(KEY_F23) || (defined(HAVE_DECL_KEY_F23) && HAVE_DECL_KEY_F23)
- XLAT(KEY_F23),
+  XLAT(KEY_F23),
 #endif
 #if defined(KEY_F24) || (defined(HAVE_DECL_KEY_F24) && HAVE_DECL_KEY_F24)
- XLAT(KEY_F24),
+  XLAT(KEY_F24),
 #endif
 
 #if defined(KEY_PLAYCD) || (defined(HAVE_DECL_KEY_PLAYCD) && HAVE_DECL_KEY_PLAYCD)
- XLAT(KEY_PLAYCD),
+  XLAT(KEY_PLAYCD),
 #endif
 #if defined(KEY_PAUSECD) || (defined(HAVE_DECL_KEY_PAUSECD) && HAVE_DECL_KEY_PAUSECD)
- XLAT(KEY_PAUSECD),
+  XLAT(KEY_PAUSECD),
 #endif
 #if defined(KEY_PROG3) || (defined(HAVE_DECL_KEY_PROG3) && HAVE_DECL_KEY_PROG3)
- XLAT(KEY_PROG3),
+  XLAT(KEY_PROG3),
 #endif
 #if defined(KEY_PROG4) || (defined(HAVE_DECL_KEY_PROG4) && HAVE_DECL_KEY_PROG4)
- XLAT(KEY_PROG4),
+  XLAT(KEY_PROG4),
 #endif
 #if defined(KEY_DASHBOARD) || (defined(HAVE_DECL_KEY_DASHBOARD) && HAVE_DECL_KEY_DASHBOARD)
- XLAT(KEY_DASHBOARD),
+  XLAT(KEY_DASHBOARD),
 #endif
 #if defined(KEY_SUSPEND) || (defined(HAVE_DECL_KEY_SUSPEND) && HAVE_DECL_KEY_SUSPEND)
- XLAT(KEY_SUSPEND),
+  XLAT(KEY_SUSPEND),
 #endif
 #if defined(KEY_CLOSE) || (defined(HAVE_DECL_KEY_CLOSE) && HAVE_DECL_KEY_CLOSE)
- XLAT(KEY_CLOSE),
+  XLAT(KEY_CLOSE),
 #endif
 #if defined(KEY_PLAY) || (defined(HAVE_DECL_KEY_PLAY) && HAVE_DECL_KEY_PLAY)
- XLAT(KEY_PLAY),
+  XLAT(KEY_PLAY),
 #endif
 #if defined(KEY_FASTFORWARD) || (defined(HAVE_DECL_KEY_FASTFORWARD) && HAVE_DECL_KEY_FASTFORWARD)
- XLAT(KEY_FASTFORWARD),
+  XLAT(KEY_FASTFORWARD),
 #endif
 #if defined(KEY_BASSBOOST) || (defined(HAVE_DECL_KEY_BASSBOOST) && HAVE_DECL_KEY_BASSBOOST)
- XLAT(KEY_BASSBOOST),
+  XLAT(KEY_BASSBOOST),
 #endif
 #if defined(KEY_PRINT) || (defined(HAVE_DECL_KEY_PRINT) && HAVE_DECL_KEY_PRINT)
- XLAT(KEY_PRINT),
+  XLAT(KEY_PRINT),
 #endif
 #if defined(KEY_HP) || (defined(HAVE_DECL_KEY_HP) && HAVE_DECL_KEY_HP)
- XLAT(KEY_HP),
+  XLAT(KEY_HP),
 #endif
 #if defined(KEY_CAMERA) || (defined(HAVE_DECL_KEY_CAMERA) && HAVE_DECL_KEY_CAMERA)
- XLAT(KEY_CAMERA),
+  XLAT(KEY_CAMERA),
 #endif
 #if defined(KEY_SOUND) || (defined(HAVE_DECL_KEY_SOUND) && HAVE_DECL_KEY_SOUND)
- XLAT(KEY_SOUND),
+  XLAT(KEY_SOUND),
 #endif
 #if defined(KEY_QUESTION) || (defined(HAVE_DECL_KEY_QUESTION) && HAVE_DECL_KEY_QUESTION)
- XLAT(KEY_QUESTION),
+  XLAT(KEY_QUESTION),
 #endif
 #if defined(KEY_EMAIL) || (defined(HAVE_DECL_KEY_EMAIL) && HAVE_DECL_KEY_EMAIL)
- XLAT(KEY_EMAIL),
+  XLAT(KEY_EMAIL),
 #endif
 #if defined(KEY_CHAT) || (defined(HAVE_DECL_KEY_CHAT) && HAVE_DECL_KEY_CHAT)
- XLAT(KEY_CHAT),
+  XLAT(KEY_CHAT),
 #endif
 #if defined(KEY_SEARCH) || (defined(HAVE_DECL_KEY_SEARCH) && HAVE_DECL_KEY_SEARCH)
- XLAT(KEY_SEARCH),
+  XLAT(KEY_SEARCH),
 #endif
 #if defined(KEY_CONNECT) || (defined(HAVE_DECL_KEY_CONNECT) && HAVE_DECL_KEY_CONNECT)
- XLAT(KEY_CONNECT),
+  XLAT(KEY_CONNECT),
 #endif
 #if defined(KEY_FINANCE) || (defined(HAVE_DECL_KEY_FINANCE) && HAVE_DECL_KEY_FINANCE)
- XLAT(KEY_FINANCE),
+  XLAT(KEY_FINANCE),
 #endif
 #if defined(KEY_SPORT) || (defined(HAVE_DECL_KEY_SPORT) && HAVE_DECL_KEY_SPORT)
- XLAT(KEY_SPORT),
+  XLAT(KEY_SPORT),
 #endif
 #if defined(KEY_SHOP) || (defined(HAVE_DECL_KEY_SHOP) && HAVE_DECL_KEY_SHOP)
- XLAT(KEY_SHOP),
+  XLAT(KEY_SHOP),
 #endif
 #if defined(KEY_ALTERASE) || (defined(HAVE_DECL_KEY_ALTERASE) && HAVE_DECL_KEY_ALTERASE)
- XLAT(KEY_ALTERASE),
+  XLAT(KEY_ALTERASE),
 #endif
 #if defined(KEY_CANCEL) || (defined(HAVE_DECL_KEY_CANCEL) && HAVE_DECL_KEY_CANCEL)
- XLAT(KEY_CANCEL),
+  XLAT(KEY_CANCEL),
 #endif
 #if defined(KEY_BRIGHTNESSDOWN) || (defined(HAVE_DECL_KEY_BRIGHTNESSDOWN) && HAVE_DECL_KEY_BRIGHTNESSDOWN)
- XLAT(KEY_BRIGHTNESSDOWN),
+  XLAT(KEY_BRIGHTNESSDOWN),
 #endif
 #if defined(KEY_BRIGHTNESSUP) || (defined(HAVE_DECL_KEY_BRIGHTNESSUP) && HAVE_DECL_KEY_BRIGHTNESSUP)
- XLAT(KEY_BRIGHTNESSUP),
+  XLAT(KEY_BRIGHTNESSUP),
 #endif
 #if defined(KEY_MEDIA) || (defined(HAVE_DECL_KEY_MEDIA) && HAVE_DECL_KEY_MEDIA)
- XLAT(KEY_MEDIA),
+  XLAT(KEY_MEDIA),
 #endif
 
 #if defined(KEY_SWITCHVIDEOMODE) || (defined(HAVE_DECL_KEY_SWITCHVIDEOMODE) && HAVE_DECL_KEY_SWITCHVIDEOMODE)
- XLAT(KEY_SWITCHVIDEOMODE),
+  XLAT(KEY_SWITCHVIDEOMODE),
 #endif
 
 #if defined(KEY_KBDILLUMTOGGLE) || (defined(HAVE_DECL_KEY_KBDILLUMTOGGLE) && HAVE_DECL_KEY_KBDILLUMTOGGLE)
- XLAT(KEY_KBDILLUMTOGGLE),
+  XLAT(KEY_KBDILLUMTOGGLE),
 #endif
 #if defined(KEY_KBDILLUMDOWN) || (defined(HAVE_DECL_KEY_KBDILLUMDOWN) && HAVE_DECL_KEY_KBDILLUMDOWN)
- XLAT(KEY_KBDILLUMDOWN),
+  XLAT(KEY_KBDILLUMDOWN),
 #endif
 #if defined(KEY_KBDILLUMUP) || (defined(HAVE_DECL_KEY_KBDILLUMUP) && HAVE_DECL_KEY_KBDILLUMUP)
- XLAT(KEY_KBDILLUMUP),
+  XLAT(KEY_KBDILLUMUP),
 #endif
 
 #if defined(KEY_SEND) || (defined(HAVE_DECL_KEY_SEND) && HAVE_DECL_KEY_SEND)
- XLAT(KEY_SEND),
+  XLAT(KEY_SEND),
 #endif
 #if defined(KEY_REPLY) || (defined(HAVE_DECL_KEY_REPLY) && HAVE_DECL_KEY_REPLY)
- XLAT(KEY_REPLY),
+  XLAT(KEY_REPLY),
 #endif
 #if defined(KEY_FORWARDMAIL) || (defined(HAVE_DECL_KEY_FORWARDMAIL) && HAVE_DECL_KEY_FORWARDMAIL)
- XLAT(KEY_FORWARDMAIL),
+  XLAT(KEY_FORWARDMAIL),
 #endif
 #if defined(KEY_SAVE) || (defined(HAVE_DECL_KEY_SAVE) && HAVE_DECL_KEY_SAVE)
- XLAT(KEY_SAVE),
+  XLAT(KEY_SAVE),
 #endif
 #if defined(KEY_DOCUMENTS) || (defined(HAVE_DECL_KEY_DOCUMENTS) && HAVE_DECL_KEY_DOCUMENTS)
- XLAT(KEY_DOCUMENTS),
+  XLAT(KEY_DOCUMENTS),
 #endif
 
 #if defined(KEY_BATTERY) || (defined(HAVE_DECL_KEY_BATTERY) && HAVE_DECL_KEY_BATTERY)
- XLAT(KEY_BATTERY),
+  XLAT(KEY_BATTERY),
 #endif
 
 #if defined(KEY_BLUETOOTH) || (defined(HAVE_DECL_KEY_BLUETOOTH) && HAVE_DECL_KEY_BLUETOOTH)
- XLAT(KEY_BLUETOOTH),
+  XLAT(KEY_BLUETOOTH),
 #endif
 #if defined(KEY_WLAN) || (defined(HAVE_DECL_KEY_WLAN) && HAVE_DECL_KEY_WLAN)
- XLAT(KEY_WLAN),
+  XLAT(KEY_WLAN),
 #endif
 #if defined(KEY_UWB) || (defined(HAVE_DECL_KEY_UWB) && HAVE_DECL_KEY_UWB)
- XLAT(KEY_UWB),
+  XLAT(KEY_UWB),
 #endif
 
 #if defined(KEY_UNKNOWN) || (defined(HAVE_DECL_KEY_UNKNOWN) && HAVE_DECL_KEY_UNKNOWN)
- XLAT(KEY_UNKNOWN),
+  XLAT(KEY_UNKNOWN),
 #endif
 
 #if defined(KEY_VIDEO_NEXT) || (defined(HAVE_DECL_KEY_VIDEO_NEXT) && HAVE_DECL_KEY_VIDEO_NEXT)
- XLAT(KEY_VIDEO_NEXT),
+  XLAT(KEY_VIDEO_NEXT),
 #endif
 #if defined(KEY_VIDEO_PREV) || (defined(HAVE_DECL_KEY_VIDEO_PREV) && HAVE_DECL_KEY_VIDEO_PREV)
- XLAT(KEY_VIDEO_PREV),
+  XLAT(KEY_VIDEO_PREV),
 #endif
 #if defined(KEY_BRIGHTNESS_CYCLE) || (defined(HAVE_DECL_KEY_BRIGHTNESS_CYCLE) && HAVE_DECL_KEY_BRIGHTNESS_CYCLE)
- XLAT(KEY_BRIGHTNESS_CYCLE),
+  XLAT(KEY_BRIGHTNESS_CYCLE),
 #endif
 #if defined(KEY_BRIGHTNESS_AUTO) || (defined(HAVE_DECL_KEY_BRIGHTNESS_AUTO) && HAVE_DECL_KEY_BRIGHTNESS_AUTO)
- XLAT(KEY_BRIGHTNESS_AUTO),
+  XLAT(KEY_BRIGHTNESS_AUTO),
 #endif
 #if defined(KEY_BRIGHTNESS_ZERO) || (defined(HAVE_DECL_KEY_BRIGHTNESS_ZERO) && HAVE_DECL_KEY_BRIGHTNESS_ZERO)
- XLAT(KEY_BRIGHTNESS_ZERO),
+  XLAT(KEY_BRIGHTNESS_ZERO),
 #endif
 #if defined(KEY_DISPLAY_OFF) || (defined(HAVE_DECL_KEY_DISPLAY_OFF) && HAVE_DECL_KEY_DISPLAY_OFF)
- XLAT(KEY_DISPLAY_OFF),
+  XLAT(KEY_DISPLAY_OFF),
 #endif
 
 #if defined(KEY_WWAN) || (defined(HAVE_DECL_KEY_WWAN) && HAVE_DECL_KEY_WWAN)
- XLAT(KEY_WWAN),
+  XLAT(KEY_WWAN),
 #endif
 #if defined(KEY_WIMAX) || (defined(HAVE_DECL_KEY_WIMAX) && HAVE_DECL_KEY_WIMAX)
- XLAT(KEY_WIMAX),
+  XLAT(KEY_WIMAX),
 #endif
 #if defined(KEY_RFKILL) || (defined(HAVE_DECL_KEY_RFKILL) && HAVE_DECL_KEY_RFKILL)
- XLAT(KEY_RFKILL),
+  XLAT(KEY_RFKILL),
 #endif
 
 #if defined(KEY_MICMUTE) || (defined(HAVE_DECL_KEY_MICMUTE) && HAVE_DECL_KEY_MICMUTE)
- XLAT(KEY_MICMUTE),
+  XLAT(KEY_MICMUTE),
 #endif
 
 #if defined(BTN_0) || (defined(HAVE_DECL_BTN_0) && HAVE_DECL_BTN_0)
- XLAT(BTN_0),
+  XLAT(BTN_0),
 #endif
 #if defined(BTN_1) || (defined(HAVE_DECL_BTN_1) && HAVE_DECL_BTN_1)
- XLAT(BTN_1),
+  XLAT(BTN_1),
 #endif
 #if defined(BTN_2) || (defined(HAVE_DECL_BTN_2) && HAVE_DECL_BTN_2)
- XLAT(BTN_2),
+  XLAT(BTN_2),
 #endif
 #if defined(BTN_3) || (defined(HAVE_DECL_BTN_3) && HAVE_DECL_BTN_3)
- XLAT(BTN_3),
+  XLAT(BTN_3),
 #endif
 #if defined(BTN_4) || (defined(HAVE_DECL_BTN_4) && HAVE_DECL_BTN_4)
- XLAT(BTN_4),
+  XLAT(BTN_4),
 #endif
 #if defined(BTN_5) || (defined(HAVE_DECL_BTN_5) && HAVE_DECL_BTN_5)
- XLAT(BTN_5),
+  XLAT(BTN_5),
 #endif
 #if defined(BTN_6) || (defined(HAVE_DECL_BTN_6) && HAVE_DECL_BTN_6)
- XLAT(BTN_6),
+  XLAT(BTN_6),
 #endif
 #if defined(BTN_7) || (defined(HAVE_DECL_BTN_7) && HAVE_DECL_BTN_7)
- XLAT(BTN_7),
+  XLAT(BTN_7),
 #endif
 #if defined(BTN_8) || (defined(HAVE_DECL_BTN_8) && HAVE_DECL_BTN_8)
- XLAT(BTN_8),
+  XLAT(BTN_8),
 #endif
 #if defined(BTN_9) || (defined(HAVE_DECL_BTN_9) && HAVE_DECL_BTN_9)
- XLAT(BTN_9),
+  XLAT(BTN_9),
 #endif
 
 #if defined(BTN_MOUSE) || (defined(HAVE_DECL_BTN_MOUSE) && HAVE_DECL_BTN_MOUSE)
- XLAT(BTN_MOUSE),
+  XLAT(BTN_MOUSE),
 #endif
 #if defined(BTN_LEFT) || (defined(HAVE_DECL_BTN_LEFT) && HAVE_DECL_BTN_LEFT)
- XLAT(BTN_LEFT),
+  XLAT(BTN_LEFT),
 #endif
 #if defined(BTN_RIGHT) || (defined(HAVE_DECL_BTN_RIGHT) && HAVE_DECL_BTN_RIGHT)
- XLAT(BTN_RIGHT),
+  XLAT(BTN_RIGHT),
 #endif
 #if defined(BTN_MIDDLE) || (defined(HAVE_DECL_BTN_MIDDLE) && HAVE_DECL_BTN_MIDDLE)
- XLAT(BTN_MIDDLE),
+  XLAT(BTN_MIDDLE),
 #endif
 #if defined(BTN_SIDE) || (defined(HAVE_DECL_BTN_SIDE) && HAVE_DECL_BTN_SIDE)
- XLAT(BTN_SIDE),
+  XLAT(BTN_SIDE),
 #endif
 #if defined(BTN_EXTRA) || (defined(HAVE_DECL_BTN_EXTRA) && HAVE_DECL_BTN_EXTRA)
- XLAT(BTN_EXTRA),
+  XLAT(BTN_EXTRA),
 #endif
 #if defined(BTN_FORWARD) || (defined(HAVE_DECL_BTN_FORWARD) && HAVE_DECL_BTN_FORWARD)
- XLAT(BTN_FORWARD),
+  XLAT(BTN_FORWARD),
 #endif
 #if defined(BTN_BACK) || (defined(HAVE_DECL_BTN_BACK) && HAVE_DECL_BTN_BACK)
- XLAT(BTN_BACK),
+  XLAT(BTN_BACK),
 #endif
 #if defined(BTN_TASK) || (defined(HAVE_DECL_BTN_TASK) && HAVE_DECL_BTN_TASK)
- XLAT(BTN_TASK),
+  XLAT(BTN_TASK),
 #endif
 
 #if defined(BTN_JOYSTICK) || (defined(HAVE_DECL_BTN_JOYSTICK) && HAVE_DECL_BTN_JOYSTICK)
- XLAT(BTN_JOYSTICK),
+  XLAT(BTN_JOYSTICK),
 #endif
 #if defined(BTN_TRIGGER) || (defined(HAVE_DECL_BTN_TRIGGER) && HAVE_DECL_BTN_TRIGGER)
- XLAT(BTN_TRIGGER),
+  XLAT(BTN_TRIGGER),
 #endif
 #if defined(BTN_THUMB) || (defined(HAVE_DECL_BTN_THUMB) && HAVE_DECL_BTN_THUMB)
- XLAT(BTN_THUMB),
+  XLAT(BTN_THUMB),
 #endif
 #if defined(BTN_THUMB2) || (defined(HAVE_DECL_BTN_THUMB2) && HAVE_DECL_BTN_THUMB2)
- XLAT(BTN_THUMB2),
+  XLAT(BTN_THUMB2),
 #endif
 #if defined(BTN_TOP) || (defined(HAVE_DECL_BTN_TOP) && HAVE_DECL_BTN_TOP)
- XLAT(BTN_TOP),
+  XLAT(BTN_TOP),
 #endif
 #if defined(BTN_TOP2) || (defined(HAVE_DECL_BTN_TOP2) && HAVE_DECL_BTN_TOP2)
- XLAT(BTN_TOP2),
+  XLAT(BTN_TOP2),
 #endif
 #if defined(BTN_PINKIE) || (defined(HAVE_DECL_BTN_PINKIE) && HAVE_DECL_BTN_PINKIE)
- XLAT(BTN_PINKIE),
+  XLAT(BTN_PINKIE),
 #endif
 #if defined(BTN_BASE) || (defined(HAVE_DECL_BTN_BASE) && HAVE_DECL_BTN_BASE)
- XLAT(BTN_BASE),
+  XLAT(BTN_BASE),
 #endif
 #if defined(BTN_BASE2) || (defined(HAVE_DECL_BTN_BASE2) && HAVE_DECL_BTN_BASE2)
- XLAT(BTN_BASE2),
+  XLAT(BTN_BASE2),
 #endif
 #if defined(BTN_BASE3) || (defined(HAVE_DECL_BTN_BASE3) && HAVE_DECL_BTN_BASE3)
- XLAT(BTN_BASE3),
+  XLAT(BTN_BASE3),
 #endif
 #if defined(BTN_BASE4) || (defined(HAVE_DECL_BTN_BASE4) && HAVE_DECL_BTN_BASE4)
- XLAT(BTN_BASE4),
+  XLAT(BTN_BASE4),
 #endif
 #if defined(BTN_BASE5) || (defined(HAVE_DECL_BTN_BASE5) && HAVE_DECL_BTN_BASE5)
- XLAT(BTN_BASE5),
+  XLAT(BTN_BASE5),
 #endif
 #if defined(BTN_BASE6) || (defined(HAVE_DECL_BTN_BASE6) && HAVE_DECL_BTN_BASE6)
- XLAT(BTN_BASE6),
+  XLAT(BTN_BASE6),
 #endif
 #if defined(BTN_DEAD) || (defined(HAVE_DECL_BTN_DEAD) && HAVE_DECL_BTN_DEAD)
- XLAT(BTN_DEAD),
+  XLAT(BTN_DEAD),
 #endif
 
 #if defined(BTN_GAMEPAD) || (defined(HAVE_DECL_BTN_GAMEPAD) && HAVE_DECL_BTN_GAMEPAD)
- XLAT(BTN_GAMEPAD),
+  XLAT(BTN_GAMEPAD),
 #endif
 #if defined(BTN_SOUTH) || (defined(HAVE_DECL_BTN_SOUTH) && HAVE_DECL_BTN_SOUTH)
- XLAT(BTN_SOUTH),
+  XLAT(BTN_SOUTH),
 #endif
 #if defined(BTN_A) || (defined(HAVE_DECL_BTN_A) && HAVE_DECL_BTN_A)
- XLAT(BTN_A),
+  XLAT(BTN_A),
 #endif
 #if defined(BTN_EAST) || (defined(HAVE_DECL_BTN_EAST) && HAVE_DECL_BTN_EAST)
- XLAT(BTN_EAST),
+  XLAT(BTN_EAST),
 #endif
 #if defined(BTN_B) || (defined(HAVE_DECL_BTN_B) && HAVE_DECL_BTN_B)
- XLAT(BTN_B),
+  XLAT(BTN_B),
 #endif
 #if defined(BTN_C) || (defined(HAVE_DECL_BTN_C) && HAVE_DECL_BTN_C)
- XLAT(BTN_C),
+  XLAT(BTN_C),
 #endif
 #if defined(BTN_NORTH) || (defined(HAVE_DECL_BTN_NORTH) && HAVE_DECL_BTN_NORTH)
- XLAT(BTN_NORTH),
+  XLAT(BTN_NORTH),
 #endif
 #if defined(BTN_X) || (defined(HAVE_DECL_BTN_X) && HAVE_DECL_BTN_X)
- XLAT(BTN_X),
+  XLAT(BTN_X),
 #endif
 #if defined(BTN_WEST) || (defined(HAVE_DECL_BTN_WEST) && HAVE_DECL_BTN_WEST)
- XLAT(BTN_WEST),
+  XLAT(BTN_WEST),
 #endif
 #if defined(BTN_Y) || (defined(HAVE_DECL_BTN_Y) && HAVE_DECL_BTN_Y)
- XLAT(BTN_Y),
+  XLAT(BTN_Y),
 #endif
 #if defined(BTN_Z) || (defined(HAVE_DECL_BTN_Z) && HAVE_DECL_BTN_Z)
- XLAT(BTN_Z),
+  XLAT(BTN_Z),
 #endif
 #if defined(BTN_TL) || (defined(HAVE_DECL_BTN_TL) && HAVE_DECL_BTN_TL)
- XLAT(BTN_TL),
+  XLAT(BTN_TL),
 #endif
 #if defined(BTN_TR) || (defined(HAVE_DECL_BTN_TR) && HAVE_DECL_BTN_TR)
- XLAT(BTN_TR),
+  XLAT(BTN_TR),
 #endif
 #if defined(BTN_TL2) || (defined(HAVE_DECL_BTN_TL2) && HAVE_DECL_BTN_TL2)
- XLAT(BTN_TL2),
+  XLAT(BTN_TL2),
 #endif
 #if defined(BTN_TR2) || (defined(HAVE_DECL_BTN_TR2) && HAVE_DECL_BTN_TR2)
- XLAT(BTN_TR2),
+  XLAT(BTN_TR2),
 #endif
 #if defined(BTN_SELECT) || (defined(HAVE_DECL_BTN_SELECT) && HAVE_DECL_BTN_SELECT)
- XLAT(BTN_SELECT),
+  XLAT(BTN_SELECT),
 #endif
 #if defined(BTN_START) || (defined(HAVE_DECL_BTN_START) && HAVE_DECL_BTN_START)
- XLAT(BTN_START),
+  XLAT(BTN_START),
 #endif
 #if defined(BTN_MODE) || (defined(HAVE_DECL_BTN_MODE) && HAVE_DECL_BTN_MODE)
- XLAT(BTN_MODE),
+  XLAT(BTN_MODE),
 #endif
 #if defined(BTN_THUMBL) || (defined(HAVE_DECL_BTN_THUMBL) && HAVE_DECL_BTN_THUMBL)
- XLAT(BTN_THUMBL),
+  XLAT(BTN_THUMBL),
 #endif
 #if defined(BTN_THUMBR) || (defined(HAVE_DECL_BTN_THUMBR) && HAVE_DECL_BTN_THUMBR)
- XLAT(BTN_THUMBR),
+  XLAT(BTN_THUMBR),
 #endif
 
 #if defined(BTN_DIGI) || (defined(HAVE_DECL_BTN_DIGI) && HAVE_DECL_BTN_DIGI)
- XLAT(BTN_DIGI),
+  XLAT(BTN_DIGI),
 #endif
 #if defined(BTN_TOOL_PEN) || (defined(HAVE_DECL_BTN_TOOL_PEN) && HAVE_DECL_BTN_TOOL_PEN)
- XLAT(BTN_TOOL_PEN),
+  XLAT(BTN_TOOL_PEN),
 #endif
 #if defined(BTN_TOOL_RUBBER) || (defined(HAVE_DECL_BTN_TOOL_RUBBER) && HAVE_DECL_BTN_TOOL_RUBBER)
- XLAT(BTN_TOOL_RUBBER),
+  XLAT(BTN_TOOL_RUBBER),
 #endif
 #if defined(BTN_TOOL_BRUSH) || (defined(HAVE_DECL_BTN_TOOL_BRUSH) && HAVE_DECL_BTN_TOOL_BRUSH)
- XLAT(BTN_TOOL_BRUSH),
+  XLAT(BTN_TOOL_BRUSH),
 #endif
 #if defined(BTN_TOOL_PENCIL) || (defined(HAVE_DECL_BTN_TOOL_PENCIL) && HAVE_DECL_BTN_TOOL_PENCIL)
- XLAT(BTN_TOOL_PENCIL),
+  XLAT(BTN_TOOL_PENCIL),
 #endif
 #if defined(BTN_TOOL_AIRBRUSH) || (defined(HAVE_DECL_BTN_TOOL_AIRBRUSH) && HAVE_DECL_BTN_TOOL_AIRBRUSH)
- XLAT(BTN_TOOL_AIRBRUSH),
+  XLAT(BTN_TOOL_AIRBRUSH),
 #endif
 #if defined(BTN_TOOL_FINGER) || (defined(HAVE_DECL_BTN_TOOL_FINGER) && HAVE_DECL_BTN_TOOL_FINGER)
- XLAT(BTN_TOOL_FINGER),
+  XLAT(BTN_TOOL_FINGER),
 #endif
 #if defined(BTN_TOOL_MOUSE) || (defined(HAVE_DECL_BTN_TOOL_MOUSE) && HAVE_DECL_BTN_TOOL_MOUSE)
- XLAT(BTN_TOOL_MOUSE),
+  XLAT(BTN_TOOL_MOUSE),
 #endif
 #if defined(BTN_TOOL_LENS) || (defined(HAVE_DECL_BTN_TOOL_LENS) && HAVE_DECL_BTN_TOOL_LENS)
- XLAT(BTN_TOOL_LENS),
+  XLAT(BTN_TOOL_LENS),
 #endif
 #if defined(BTN_TOOL_QUINTTAP) || (defined(HAVE_DECL_BTN_TOOL_QUINTTAP) && HAVE_DECL_BTN_TOOL_QUINTTAP)
- XLAT(BTN_TOOL_QUINTTAP),
+  XLAT(BTN_TOOL_QUINTTAP),
 #endif
 #if defined(BTN_TOUCH) || (defined(HAVE_DECL_BTN_TOUCH) && HAVE_DECL_BTN_TOUCH)
- XLAT(BTN_TOUCH),
+  XLAT(BTN_TOUCH),
 #endif
 #if defined(BTN_STYLUS) || (defined(HAVE_DECL_BTN_STYLUS) && HAVE_DECL_BTN_STYLUS)
- XLAT(BTN_STYLUS),
+  XLAT(BTN_STYLUS),
 #endif
 #if defined(BTN_STYLUS2) || (defined(HAVE_DECL_BTN_STYLUS2) && HAVE_DECL_BTN_STYLUS2)
- XLAT(BTN_STYLUS2),
+  XLAT(BTN_STYLUS2),
 #endif
 #if defined(BTN_TOOL_DOUBLETAP) || (defined(HAVE_DECL_BTN_TOOL_DOUBLETAP) && HAVE_DECL_BTN_TOOL_DOUBLETAP)
- XLAT(BTN_TOOL_DOUBLETAP),
+  XLAT(BTN_TOOL_DOUBLETAP),
 #endif
 #if defined(BTN_TOOL_TRIPLETAP) || (defined(HAVE_DECL_BTN_TOOL_TRIPLETAP) && HAVE_DECL_BTN_TOOL_TRIPLETAP)
- XLAT(BTN_TOOL_TRIPLETAP),
+  XLAT(BTN_TOOL_TRIPLETAP),
 #endif
 #if defined(BTN_TOOL_QUADTAP) || (defined(HAVE_DECL_BTN_TOOL_QUADTAP) && HAVE_DECL_BTN_TOOL_QUADTAP)
- XLAT(BTN_TOOL_QUADTAP),
+  XLAT(BTN_TOOL_QUADTAP),
 #endif
 
 #if defined(BTN_WHEEL) || (defined(HAVE_DECL_BTN_WHEEL) && HAVE_DECL_BTN_WHEEL)
- XLAT(BTN_WHEEL),
+  XLAT(BTN_WHEEL),
 #endif
 #if defined(BTN_GEAR_DOWN) || (defined(HAVE_DECL_BTN_GEAR_DOWN) && HAVE_DECL_BTN_GEAR_DOWN)
- XLAT(BTN_GEAR_DOWN),
+  XLAT(BTN_GEAR_DOWN),
 #endif
 #if defined(BTN_GEAR_UP) || (defined(HAVE_DECL_BTN_GEAR_UP) && HAVE_DECL_BTN_GEAR_UP)
- XLAT(BTN_GEAR_UP),
+  XLAT(BTN_GEAR_UP),
 #endif
 
 #if defined(KEY_OK) || (defined(HAVE_DECL_KEY_OK) && HAVE_DECL_KEY_OK)
- XLAT(KEY_OK),
+  XLAT(KEY_OK),
 #endif
 #if defined(KEY_SELECT) || (defined(HAVE_DECL_KEY_SELECT) && HAVE_DECL_KEY_SELECT)
- XLAT(KEY_SELECT),
+  XLAT(KEY_SELECT),
 #endif
 #if defined(KEY_GOTO) || (defined(HAVE_DECL_KEY_GOTO) && HAVE_DECL_KEY_GOTO)
- XLAT(KEY_GOTO),
+  XLAT(KEY_GOTO),
 #endif
 #if defined(KEY_CLEAR) || (defined(HAVE_DECL_KEY_CLEAR) && HAVE_DECL_KEY_CLEAR)
- XLAT(KEY_CLEAR),
+  XLAT(KEY_CLEAR),
 #endif
 #if defined(KEY_POWER2) || (defined(HAVE_DECL_KEY_POWER2) && HAVE_DECL_KEY_POWER2)
- XLAT(KEY_POWER2),
+  XLAT(KEY_POWER2),
 #endif
 #if defined(KEY_OPTION) || (defined(HAVE_DECL_KEY_OPTION) && HAVE_DECL_KEY_OPTION)
- XLAT(KEY_OPTION),
+  XLAT(KEY_OPTION),
 #endif
 #if defined(KEY_INFO) || (defined(HAVE_DECL_KEY_INFO) && HAVE_DECL_KEY_INFO)
- XLAT(KEY_INFO),
+  XLAT(KEY_INFO),
 #endif
 #if defined(KEY_TIME) || (defined(HAVE_DECL_KEY_TIME) && HAVE_DECL_KEY_TIME)
- XLAT(KEY_TIME),
+  XLAT(KEY_TIME),
 #endif
 #if defined(KEY_VENDOR) || (defined(HAVE_DECL_KEY_VENDOR) && HAVE_DECL_KEY_VENDOR)
- XLAT(KEY_VENDOR),
+  XLAT(KEY_VENDOR),
 #endif
 #if defined(KEY_ARCHIVE) || (defined(HAVE_DECL_KEY_ARCHIVE) && HAVE_DECL_KEY_ARCHIVE)
- XLAT(KEY_ARCHIVE),
+  XLAT(KEY_ARCHIVE),
 #endif
 #if defined(KEY_PROGRAM) || (defined(HAVE_DECL_KEY_PROGRAM) && HAVE_DECL_KEY_PROGRAM)
- XLAT(KEY_PROGRAM),
+  XLAT(KEY_PROGRAM),
 #endif
 #if defined(KEY_CHANNEL) || (defined(HAVE_DECL_KEY_CHANNEL) && HAVE_DECL_KEY_CHANNEL)
- XLAT(KEY_CHANNEL),
+  XLAT(KEY_CHANNEL),
 #endif
 #if defined(KEY_FAVORITES) || (defined(HAVE_DECL_KEY_FAVORITES) && HAVE_DECL_KEY_FAVORITES)
- XLAT(KEY_FAVORITES),
+  XLAT(KEY_FAVORITES),
 #endif
 #if defined(KEY_EPG) || (defined(HAVE_DECL_KEY_EPG) && HAVE_DECL_KEY_EPG)
- XLAT(KEY_EPG),
+  XLAT(KEY_EPG),
 #endif
 #if defined(KEY_PVR) || (defined(HAVE_DECL_KEY_PVR) && HAVE_DECL_KEY_PVR)
- XLAT(KEY_PVR),
+  XLAT(KEY_PVR),
 #endif
 #if defined(KEY_MHP) || (defined(HAVE_DECL_KEY_MHP) && HAVE_DECL_KEY_MHP)
- XLAT(KEY_MHP),
+  XLAT(KEY_MHP),
 #endif
 #if defined(KEY_LANGUAGE) || (defined(HAVE_DECL_KEY_LANGUAGE) && HAVE_DECL_KEY_LANGUAGE)
- XLAT(KEY_LANGUAGE),
+  XLAT(KEY_LANGUAGE),
 #endif
 #if defined(KEY_TITLE) || (defined(HAVE_DECL_KEY_TITLE) && HAVE_DECL_KEY_TITLE)
- XLAT(KEY_TITLE),
+  XLAT(KEY_TITLE),
 #endif
 #if defined(KEY_SUBTITLE) || (defined(HAVE_DECL_KEY_SUBTITLE) && HAVE_DECL_KEY_SUBTITLE)
- XLAT(KEY_SUBTITLE),
+  XLAT(KEY_SUBTITLE),
 #endif
 #if defined(KEY_ANGLE) || (defined(HAVE_DECL_KEY_ANGLE) && HAVE_DECL_KEY_ANGLE)
- XLAT(KEY_ANGLE),
+  XLAT(KEY_ANGLE),
 #endif
 #if defined(KEY_ZOOM) || (defined(HAVE_DECL_KEY_ZOOM) && HAVE_DECL_KEY_ZOOM)
- XLAT(KEY_ZOOM),
+  XLAT(KEY_ZOOM),
 #endif
 #if defined(KEY_MODE) || (defined(HAVE_DECL_KEY_MODE) && HAVE_DECL_KEY_MODE)
- XLAT(KEY_MODE),
+  XLAT(KEY_MODE),
 #endif
 #if defined(KEY_KEYBOARD) || (defined(HAVE_DECL_KEY_KEYBOARD) && HAVE_DECL_KEY_KEYBOARD)
- XLAT(KEY_KEYBOARD),
+  XLAT(KEY_KEYBOARD),
 #endif
 #if defined(KEY_SCREEN) || (defined(HAVE_DECL_KEY_SCREEN) && HAVE_DECL_KEY_SCREEN)
- XLAT(KEY_SCREEN),
+  XLAT(KEY_SCREEN),
 #endif
 #if defined(KEY_PC) || (defined(HAVE_DECL_KEY_PC) && HAVE_DECL_KEY_PC)
- XLAT(KEY_PC),
+  XLAT(KEY_PC),
 #endif
 #if defined(KEY_TV) || (defined(HAVE_DECL_KEY_TV) && HAVE_DECL_KEY_TV)
- XLAT(KEY_TV),
+  XLAT(KEY_TV),
 #endif
 #if defined(KEY_TV2) || (defined(HAVE_DECL_KEY_TV2) && HAVE_DECL_KEY_TV2)
- XLAT(KEY_TV2),
+  XLAT(KEY_TV2),
 #endif
 #if defined(KEY_VCR) || (defined(HAVE_DECL_KEY_VCR) && HAVE_DECL_KEY_VCR)
- XLAT(KEY_VCR),
+  XLAT(KEY_VCR),
 #endif
 #if defined(KEY_VCR2) || (defined(HAVE_DECL_KEY_VCR2) && HAVE_DECL_KEY_VCR2)
- XLAT(KEY_VCR2),
+  XLAT(KEY_VCR2),
 #endif
 #if defined(KEY_SAT) || (defined(HAVE_DECL_KEY_SAT) && HAVE_DECL_KEY_SAT)
- XLAT(KEY_SAT),
+  XLAT(KEY_SAT),
 #endif
 #if defined(KEY_SAT2) || (defined(HAVE_DECL_KEY_SAT2) && HAVE_DECL_KEY_SAT2)
- XLAT(KEY_SAT2),
+  XLAT(KEY_SAT2),
 #endif
 #if defined(KEY_CD) || (defined(HAVE_DECL_KEY_CD) && HAVE_DECL_KEY_CD)
- XLAT(KEY_CD),
+  XLAT(KEY_CD),
 #endif
 #if defined(KEY_TAPE) || (defined(HAVE_DECL_KEY_TAPE) && HAVE_DECL_KEY_TAPE)
- XLAT(KEY_TAPE),
+  XLAT(KEY_TAPE),
 #endif
 #if defined(KEY_RADIO) || (defined(HAVE_DECL_KEY_RADIO) && HAVE_DECL_KEY_RADIO)
- XLAT(KEY_RADIO),
+  XLAT(KEY_RADIO),
 #endif
 #if defined(KEY_TUNER) || (defined(HAVE_DECL_KEY_TUNER) && HAVE_DECL_KEY_TUNER)
- XLAT(KEY_TUNER),
+  XLAT(KEY_TUNER),
 #endif
 #if defined(KEY_PLAYER) || (defined(HAVE_DECL_KEY_PLAYER) && HAVE_DECL_KEY_PLAYER)
- XLAT(KEY_PLAYER),
+  XLAT(KEY_PLAYER),
 #endif
 #if defined(KEY_TEXT) || (defined(HAVE_DECL_KEY_TEXT) && HAVE_DECL_KEY_TEXT)
- XLAT(KEY_TEXT),
+  XLAT(KEY_TEXT),
 #endif
 #if defined(KEY_DVD) || (defined(HAVE_DECL_KEY_DVD) && HAVE_DECL_KEY_DVD)
- XLAT(KEY_DVD),
+  XLAT(KEY_DVD),
 #endif
 #if defined(KEY_AUX) || (defined(HAVE_DECL_KEY_AUX) && HAVE_DECL_KEY_AUX)
- XLAT(KEY_AUX),
+  XLAT(KEY_AUX),
 #endif
 #if defined(KEY_MP3) || (defined(HAVE_DECL_KEY_MP3) && HAVE_DECL_KEY_MP3)
- XLAT(KEY_MP3),
+  XLAT(KEY_MP3),
 #endif
 #if defined(KEY_AUDIO) || (defined(HAVE_DECL_KEY_AUDIO) && HAVE_DECL_KEY_AUDIO)
- XLAT(KEY_AUDIO),
+  XLAT(KEY_AUDIO),
 #endif
 #if defined(KEY_VIDEO) || (defined(HAVE_DECL_KEY_VIDEO) && HAVE_DECL_KEY_VIDEO)
- XLAT(KEY_VIDEO),
+  XLAT(KEY_VIDEO),
 #endif
 #if defined(KEY_DIRECTORY) || (defined(HAVE_DECL_KEY_DIRECTORY) && HAVE_DECL_KEY_DIRECTORY)
- XLAT(KEY_DIRECTORY),
+  XLAT(KEY_DIRECTORY),
 #endif
 #if defined(KEY_LIST) || (defined(HAVE_DECL_KEY_LIST) && HAVE_DECL_KEY_LIST)
- XLAT(KEY_LIST),
+  XLAT(KEY_LIST),
 #endif
 #if defined(KEY_MEMO) || (defined(HAVE_DECL_KEY_MEMO) && HAVE_DECL_KEY_MEMO)
- XLAT(KEY_MEMO),
+  XLAT(KEY_MEMO),
 #endif
 #if defined(KEY_CALENDAR) || (defined(HAVE_DECL_KEY_CALENDAR) && HAVE_DECL_KEY_CALENDAR)
- XLAT(KEY_CALENDAR),
+  XLAT(KEY_CALENDAR),
 #endif
 #if defined(KEY_RED) || (defined(HAVE_DECL_KEY_RED) && HAVE_DECL_KEY_RED)
- XLAT(KEY_RED),
+  XLAT(KEY_RED),
 #endif
 #if defined(KEY_GREEN) || (defined(HAVE_DECL_KEY_GREEN) && HAVE_DECL_KEY_GREEN)
- XLAT(KEY_GREEN),
+  XLAT(KEY_GREEN),
 #endif
 #if defined(KEY_YELLOW) || (defined(HAVE_DECL_KEY_YELLOW) && HAVE_DECL_KEY_YELLOW)
- XLAT(KEY_YELLOW),
+  XLAT(KEY_YELLOW),
 #endif
 #if defined(KEY_BLUE) || (defined(HAVE_DECL_KEY_BLUE) && HAVE_DECL_KEY_BLUE)
- XLAT(KEY_BLUE),
+  XLAT(KEY_BLUE),
 #endif
 #if defined(KEY_CHANNELUP) || (defined(HAVE_DECL_KEY_CHANNELUP) && HAVE_DECL_KEY_CHANNELUP)
- XLAT(KEY_CHANNELUP),
+  XLAT(KEY_CHANNELUP),
 #endif
 #if defined(KEY_CHANNELDOWN) || (defined(HAVE_DECL_KEY_CHANNELDOWN) && HAVE_DECL_KEY_CHANNELDOWN)
- XLAT(KEY_CHANNELDOWN),
+  XLAT(KEY_CHANNELDOWN),
 #endif
 #if defined(KEY_FIRST) || (defined(HAVE_DECL_KEY_FIRST) && HAVE_DECL_KEY_FIRST)
- XLAT(KEY_FIRST),
+  XLAT(KEY_FIRST),
 #endif
 #if defined(KEY_LAST) || (defined(HAVE_DECL_KEY_LAST) && HAVE_DECL_KEY_LAST)
- XLAT(KEY_LAST),
+  XLAT(KEY_LAST),
 #endif
 #if defined(KEY_AB) || (defined(HAVE_DECL_KEY_AB) && HAVE_DECL_KEY_AB)
- XLAT(KEY_AB),
+  XLAT(KEY_AB),
 #endif
 #if defined(KEY_NEXT) || (defined(HAVE_DECL_KEY_NEXT) && HAVE_DECL_KEY_NEXT)
- XLAT(KEY_NEXT),
+  XLAT(KEY_NEXT),
 #endif
 #if defined(KEY_RESTART) || (defined(HAVE_DECL_KEY_RESTART) && HAVE_DECL_KEY_RESTART)
- XLAT(KEY_RESTART),
+  XLAT(KEY_RESTART),
 #endif
 #if defined(KEY_SLOW) || (defined(HAVE_DECL_KEY_SLOW) && HAVE_DECL_KEY_SLOW)
- XLAT(KEY_SLOW),
+  XLAT(KEY_SLOW),
 #endif
 #if defined(KEY_SHUFFLE) || (defined(HAVE_DECL_KEY_SHUFFLE) && HAVE_DECL_KEY_SHUFFLE)
- XLAT(KEY_SHUFFLE),
+  XLAT(KEY_SHUFFLE),
 #endif
 #if defined(KEY_BREAK) || (defined(HAVE_DECL_KEY_BREAK) && HAVE_DECL_KEY_BREAK)
- XLAT(KEY_BREAK),
+  XLAT(KEY_BREAK),
 #endif
 #if defined(KEY_PREVIOUS) || (defined(HAVE_DECL_KEY_PREVIOUS) && HAVE_DECL_KEY_PREVIOUS)
- XLAT(KEY_PREVIOUS),
+  XLAT(KEY_PREVIOUS),
 #endif
 #if defined(KEY_DIGITS) || (defined(HAVE_DECL_KEY_DIGITS) && HAVE_DECL_KEY_DIGITS)
- XLAT(KEY_DIGITS),
+  XLAT(KEY_DIGITS),
 #endif
 #if defined(KEY_TEEN) || (defined(HAVE_DECL_KEY_TEEN) && HAVE_DECL_KEY_TEEN)
- XLAT(KEY_TEEN),
+  XLAT(KEY_TEEN),
 #endif
 #if defined(KEY_TWEN) || (defined(HAVE_DECL_KEY_TWEN) && HAVE_DECL_KEY_TWEN)
- XLAT(KEY_TWEN),
+  XLAT(KEY_TWEN),
 #endif
 #if defined(KEY_VIDEOPHONE) || (defined(HAVE_DECL_KEY_VIDEOPHONE) && HAVE_DECL_KEY_VIDEOPHONE)
- XLAT(KEY_VIDEOPHONE),
+  XLAT(KEY_VIDEOPHONE),
 #endif
 #if defined(KEY_GAMES) || (defined(HAVE_DECL_KEY_GAMES) && HAVE_DECL_KEY_GAMES)
- XLAT(KEY_GAMES),
+  XLAT(KEY_GAMES),
 #endif
 #if defined(KEY_ZOOMIN) || (defined(HAVE_DECL_KEY_ZOOMIN) && HAVE_DECL_KEY_ZOOMIN)
- XLAT(KEY_ZOOMIN),
+  XLAT(KEY_ZOOMIN),
 #endif
 #if defined(KEY_ZOOMOUT) || (defined(HAVE_DECL_KEY_ZOOMOUT) && HAVE_DECL_KEY_ZOOMOUT)
- XLAT(KEY_ZOOMOUT),
+  XLAT(KEY_ZOOMOUT),
 #endif
 #if defined(KEY_ZOOMRESET) || (defined(HAVE_DECL_KEY_ZOOMRESET) && HAVE_DECL_KEY_ZOOMRESET)
- XLAT(KEY_ZOOMRESET),
+  XLAT(KEY_ZOOMRESET),
 #endif
 #if defined(KEY_WORDPROCESSOR) || (defined(HAVE_DECL_KEY_WORDPROCESSOR) && HAVE_DECL_KEY_WORDPROCESSOR)
- XLAT(KEY_WORDPROCESSOR),
+  XLAT(KEY_WORDPROCESSOR),
 #endif
 #if defined(KEY_EDITOR) || (defined(HAVE_DECL_KEY_EDITOR) && HAVE_DECL_KEY_EDITOR)
- XLAT(KEY_EDITOR),
+  XLAT(KEY_EDITOR),
 #endif
 #if defined(KEY_SPREADSHEET) || (defined(HAVE_DECL_KEY_SPREADSHEET) && HAVE_DECL_KEY_SPREADSHEET)
- XLAT(KEY_SPREADSHEET),
+  XLAT(KEY_SPREADSHEET),
 #endif
 #if defined(KEY_GRAPHICSEDITOR) || (defined(HAVE_DECL_KEY_GRAPHICSEDITOR) && HAVE_DECL_KEY_GRAPHICSEDITOR)
- XLAT(KEY_GRAPHICSEDITOR),
+  XLAT(KEY_GRAPHICSEDITOR),
 #endif
 #if defined(KEY_PRESENTATION) || (defined(HAVE_DECL_KEY_PRESENTATION) && HAVE_DECL_KEY_PRESENTATION)
- XLAT(KEY_PRESENTATION),
+  XLAT(KEY_PRESENTATION),
 #endif
 #if defined(KEY_DATABASE) || (defined(HAVE_DECL_KEY_DATABASE) && HAVE_DECL_KEY_DATABASE)
- XLAT(KEY_DATABASE),
+  XLAT(KEY_DATABASE),
 #endif
 #if defined(KEY_NEWS) || (defined(HAVE_DECL_KEY_NEWS) && HAVE_DECL_KEY_NEWS)
- XLAT(KEY_NEWS),
+  XLAT(KEY_NEWS),
 #endif
 #if defined(KEY_VOICEMAIL) || (defined(HAVE_DECL_KEY_VOICEMAIL) && HAVE_DECL_KEY_VOICEMAIL)
- XLAT(KEY_VOICEMAIL),
+  XLAT(KEY_VOICEMAIL),
 #endif
 #if defined(KEY_ADDRESSBOOK) || (defined(HAVE_DECL_KEY_ADDRESSBOOK) && HAVE_DECL_KEY_ADDRESSBOOK)
- XLAT(KEY_ADDRESSBOOK),
+  XLAT(KEY_ADDRESSBOOK),
 #endif
 #if defined(KEY_MESSENGER) || (defined(HAVE_DECL_KEY_MESSENGER) && HAVE_DECL_KEY_MESSENGER)
- XLAT(KEY_MESSENGER),
+  XLAT(KEY_MESSENGER),
 #endif
 #if defined(KEY_DISPLAYTOGGLE) || (defined(HAVE_DECL_KEY_DISPLAYTOGGLE) && HAVE_DECL_KEY_DISPLAYTOGGLE)
- XLAT(KEY_DISPLAYTOGGLE),
+  XLAT(KEY_DISPLAYTOGGLE),
 #endif
 #if defined(KEY_BRIGHTNESS_TOGGLE) || (defined(HAVE_DECL_KEY_BRIGHTNESS_TOGGLE) && HAVE_DECL_KEY_BRIGHTNESS_TOGGLE)
- XLAT(KEY_BRIGHTNESS_TOGGLE),
+  XLAT(KEY_BRIGHTNESS_TOGGLE),
 #endif
 #if defined(KEY_SPELLCHECK) || (defined(HAVE_DECL_KEY_SPELLCHECK) && HAVE_DECL_KEY_SPELLCHECK)
- XLAT(KEY_SPELLCHECK),
+  XLAT(KEY_SPELLCHECK),
 #endif
 #if defined(KEY_LOGOFF) || (defined(HAVE_DECL_KEY_LOGOFF) && HAVE_DECL_KEY_LOGOFF)
- XLAT(KEY_LOGOFF),
+  XLAT(KEY_LOGOFF),
 #endif
 
 #if defined(KEY_DOLLAR) || (defined(HAVE_DECL_KEY_DOLLAR) && HAVE_DECL_KEY_DOLLAR)
- XLAT(KEY_DOLLAR),
+  XLAT(KEY_DOLLAR),
 #endif
 #if defined(KEY_EURO) || (defined(HAVE_DECL_KEY_EURO) && HAVE_DECL_KEY_EURO)
- XLAT(KEY_EURO),
+  XLAT(KEY_EURO),
 #endif
 
 #if defined(KEY_FRAMEBACK) || (defined(HAVE_DECL_KEY_FRAMEBACK) && HAVE_DECL_KEY_FRAMEBACK)
- XLAT(KEY_FRAMEBACK),
+  XLAT(KEY_FRAMEBACK),
 #endif
 #if defined(KEY_FRAMEFORWARD) || (defined(HAVE_DECL_KEY_FRAMEFORWARD) && HAVE_DECL_KEY_FRAMEFORWARD)
- XLAT(KEY_FRAMEFORWARD),
+  XLAT(KEY_FRAMEFORWARD),
 #endif
 #if defined(KEY_CONTEXT_MENU) || (defined(HAVE_DECL_KEY_CONTEXT_MENU) && HAVE_DECL_KEY_CONTEXT_MENU)
- XLAT(KEY_CONTEXT_MENU),
+  XLAT(KEY_CONTEXT_MENU),
 #endif
 #if defined(KEY_MEDIA_REPEAT) || (defined(HAVE_DECL_KEY_MEDIA_REPEAT) && HAVE_DECL_KEY_MEDIA_REPEAT)
- XLAT(KEY_MEDIA_REPEAT),
+  XLAT(KEY_MEDIA_REPEAT),
 #endif
 #if defined(KEY_10CHANNELSUP) || (defined(HAVE_DECL_KEY_10CHANNELSUP) && HAVE_DECL_KEY_10CHANNELSUP)
- XLAT(KEY_10CHANNELSUP),
+  XLAT(KEY_10CHANNELSUP),
 #endif
 #if defined(KEY_10CHANNELSDOWN) || (defined(HAVE_DECL_KEY_10CHANNELSDOWN) && HAVE_DECL_KEY_10CHANNELSDOWN)
- XLAT(KEY_10CHANNELSDOWN),
+  XLAT(KEY_10CHANNELSDOWN),
 #endif
 #if defined(KEY_IMAGES) || (defined(HAVE_DECL_KEY_IMAGES) && HAVE_DECL_KEY_IMAGES)
- XLAT(KEY_IMAGES),
+  XLAT(KEY_IMAGES),
 #endif
 
 #if defined(KEY_DEL_EOL) || (defined(HAVE_DECL_KEY_DEL_EOL) && HAVE_DECL_KEY_DEL_EOL)
- XLAT(KEY_DEL_EOL),
+  XLAT(KEY_DEL_EOL),
 #endif
 #if defined(KEY_DEL_EOS) || (defined(HAVE_DECL_KEY_DEL_EOS) && HAVE_DECL_KEY_DEL_EOS)
- XLAT(KEY_DEL_EOS),
+  XLAT(KEY_DEL_EOS),
 #endif
 #if defined(KEY_INS_LINE) || (defined(HAVE_DECL_KEY_INS_LINE) && HAVE_DECL_KEY_INS_LINE)
- XLAT(KEY_INS_LINE),
+  XLAT(KEY_INS_LINE),
 #endif
 #if defined(KEY_DEL_LINE) || (defined(HAVE_DECL_KEY_DEL_LINE) && HAVE_DECL_KEY_DEL_LINE)
- XLAT(KEY_DEL_LINE),
+  XLAT(KEY_DEL_LINE),
 #endif
 
 #if defined(KEY_FN) || (defined(HAVE_DECL_KEY_FN) && HAVE_DECL_KEY_FN)
- XLAT(KEY_FN),
+  XLAT(KEY_FN),
 #endif
 #if defined(KEY_FN_ESC) || (defined(HAVE_DECL_KEY_FN_ESC) && HAVE_DECL_KEY_FN_ESC)
- XLAT(KEY_FN_ESC),
+  XLAT(KEY_FN_ESC),
 #endif
 #if defined(KEY_FN_F1) || (defined(HAVE_DECL_KEY_FN_F1) && HAVE_DECL_KEY_FN_F1)
- XLAT(KEY_FN_F1),
+  XLAT(KEY_FN_F1),
 #endif
 #if defined(KEY_FN_F2) || (defined(HAVE_DECL_KEY_FN_F2) && HAVE_DECL_KEY_FN_F2)
- XLAT(KEY_FN_F2),
+  XLAT(KEY_FN_F2),
 #endif
 #if defined(KEY_FN_F3) || (defined(HAVE_DECL_KEY_FN_F3) && HAVE_DECL_KEY_FN_F3)
- XLAT(KEY_FN_F3),
+  XLAT(KEY_FN_F3),
 #endif
 #if defined(KEY_FN_F4) || (defined(HAVE_DECL_KEY_FN_F4) && HAVE_DECL_KEY_FN_F4)
- XLAT(KEY_FN_F4),
+  XLAT(KEY_FN_F4),
 #endif
 #if defined(KEY_FN_F5) || (defined(HAVE_DECL_KEY_FN_F5) && HAVE_DECL_KEY_FN_F5)
- XLAT(KEY_FN_F5),
+  XLAT(KEY_FN_F5),
 #endif
 #if defined(KEY_FN_F6) || (defined(HAVE_DECL_KEY_FN_F6) && HAVE_DECL_KEY_FN_F6)
- XLAT(KEY_FN_F6),
+  XLAT(KEY_FN_F6),
 #endif
 #if defined(KEY_FN_F7) || (defined(HAVE_DECL_KEY_FN_F7) && HAVE_DECL_KEY_FN_F7)
- XLAT(KEY_FN_F7),
+  XLAT(KEY_FN_F7),
 #endif
 #if defined(KEY_FN_F8) || (defined(HAVE_DECL_KEY_FN_F8) && HAVE_DECL_KEY_FN_F8)
- XLAT(KEY_FN_F8),
+  XLAT(KEY_FN_F8),
 #endif
 #if defined(KEY_FN_F9) || (defined(HAVE_DECL_KEY_FN_F9) && HAVE_DECL_KEY_FN_F9)
- XLAT(KEY_FN_F9),
+  XLAT(KEY_FN_F9),
 #endif
 #if defined(KEY_FN_F10) || (defined(HAVE_DECL_KEY_FN_F10) && HAVE_DECL_KEY_FN_F10)
- XLAT(KEY_FN_F10),
+  XLAT(KEY_FN_F10),
 #endif
 #if defined(KEY_FN_F11) || (defined(HAVE_DECL_KEY_FN_F11) && HAVE_DECL_KEY_FN_F11)
- XLAT(KEY_FN_F11),
+  XLAT(KEY_FN_F11),
 #endif
 #if defined(KEY_FN_F12) || (defined(HAVE_DECL_KEY_FN_F12) && HAVE_DECL_KEY_FN_F12)
- XLAT(KEY_FN_F12),
+  XLAT(KEY_FN_F12),
 #endif
 #if defined(KEY_FN_1) || (defined(HAVE_DECL_KEY_FN_1) && HAVE_DECL_KEY_FN_1)
- XLAT(KEY_FN_1),
+  XLAT(KEY_FN_1),
 #endif
 #if defined(KEY_FN_2) || (defined(HAVE_DECL_KEY_FN_2) && HAVE_DECL_KEY_FN_2)
- XLAT(KEY_FN_2),
+  XLAT(KEY_FN_2),
 #endif
 #if defined(KEY_FN_D) || (defined(HAVE_DECL_KEY_FN_D) && HAVE_DECL_KEY_FN_D)
- XLAT(KEY_FN_D),
+  XLAT(KEY_FN_D),
 #endif
 #if defined(KEY_FN_E) || (defined(HAVE_DECL_KEY_FN_E) && HAVE_DECL_KEY_FN_E)
- XLAT(KEY_FN_E),
+  XLAT(KEY_FN_E),
 #endif
 #if defined(KEY_FN_F) || (defined(HAVE_DECL_KEY_FN_F) && HAVE_DECL_KEY_FN_F)
- XLAT(KEY_FN_F),
+  XLAT(KEY_FN_F),
 #endif
 #if defined(KEY_FN_S) || (defined(HAVE_DECL_KEY_FN_S) && HAVE_DECL_KEY_FN_S)
- XLAT(KEY_FN_S),
+  XLAT(KEY_FN_S),
 #endif
 #if defined(KEY_FN_B) || (defined(HAVE_DECL_KEY_FN_B) && HAVE_DECL_KEY_FN_B)
- XLAT(KEY_FN_B),
+  XLAT(KEY_FN_B),
 #endif
 
 #if defined(KEY_BRL_DOT1) || (defined(HAVE_DECL_KEY_BRL_DOT1) && HAVE_DECL_KEY_BRL_DOT1)
- XLAT(KEY_BRL_DOT1),
+  XLAT(KEY_BRL_DOT1),
 #endif
 #if defined(KEY_BRL_DOT2) || (defined(HAVE_DECL_KEY_BRL_DOT2) && HAVE_DECL_KEY_BRL_DOT2)
- XLAT(KEY_BRL_DOT2),
+  XLAT(KEY_BRL_DOT2),
 #endif
 #if defined(KEY_BRL_DOT3) || (defined(HAVE_DECL_KEY_BRL_DOT3) && HAVE_DECL_KEY_BRL_DOT3)
- XLAT(KEY_BRL_DOT3),
+  XLAT(KEY_BRL_DOT3),
 #endif
 #if defined(KEY_BRL_DOT4) || (defined(HAVE_DECL_KEY_BRL_DOT4) && HAVE_DECL_KEY_BRL_DOT4)
- XLAT(KEY_BRL_DOT4),
+  XLAT(KEY_BRL_DOT4),
 #endif
 #if defined(KEY_BRL_DOT5) || (defined(HAVE_DECL_KEY_BRL_DOT5) && HAVE_DECL_KEY_BRL_DOT5)
- XLAT(KEY_BRL_DOT5),
+  XLAT(KEY_BRL_DOT5),
 #endif
 #if defined(KEY_BRL_DOT6) || (defined(HAVE_DECL_KEY_BRL_DOT6) && HAVE_DECL_KEY_BRL_DOT6)
- XLAT(KEY_BRL_DOT6),
+  XLAT(KEY_BRL_DOT6),
 #endif
 #if defined(KEY_BRL_DOT7) || (defined(HAVE_DECL_KEY_BRL_DOT7) && HAVE_DECL_KEY_BRL_DOT7)
- XLAT(KEY_BRL_DOT7),
+  XLAT(KEY_BRL_DOT7),
 #endif
 #if defined(KEY_BRL_DOT8) || (defined(HAVE_DECL_KEY_BRL_DOT8) && HAVE_DECL_KEY_BRL_DOT8)
- XLAT(KEY_BRL_DOT8),
+  XLAT(KEY_BRL_DOT8),
 #endif
 #if defined(KEY_BRL_DOT9) || (defined(HAVE_DECL_KEY_BRL_DOT9) && HAVE_DECL_KEY_BRL_DOT9)
- XLAT(KEY_BRL_DOT9),
+  XLAT(KEY_BRL_DOT9),
 #endif
 #if defined(KEY_BRL_DOT10) || (defined(HAVE_DECL_KEY_BRL_DOT10) && HAVE_DECL_KEY_BRL_DOT10)
- XLAT(KEY_BRL_DOT10),
+  XLAT(KEY_BRL_DOT10),
 #endif
 
 #if defined(KEY_NUMERIC_0) || (defined(HAVE_DECL_KEY_NUMERIC_0) && HAVE_DECL_KEY_NUMERIC_0)
- XLAT(KEY_NUMERIC_0),
+  XLAT(KEY_NUMERIC_0),
 #endif
 #if defined(KEY_NUMERIC_1) || (defined(HAVE_DECL_KEY_NUMERIC_1) && HAVE_DECL_KEY_NUMERIC_1)
- XLAT(KEY_NUMERIC_1),
+  XLAT(KEY_NUMERIC_1),
 #endif
 #if defined(KEY_NUMERIC_2) || (defined(HAVE_DECL_KEY_NUMERIC_2) && HAVE_DECL_KEY_NUMERIC_2)
- XLAT(KEY_NUMERIC_2),
+  XLAT(KEY_NUMERIC_2),
 #endif
 #if defined(KEY_NUMERIC_3) || (defined(HAVE_DECL_KEY_NUMERIC_3) && HAVE_DECL_KEY_NUMERIC_3)
- XLAT(KEY_NUMERIC_3),
+  XLAT(KEY_NUMERIC_3),
 #endif
 #if defined(KEY_NUMERIC_4) || (defined(HAVE_DECL_KEY_NUMERIC_4) && HAVE_DECL_KEY_NUMERIC_4)
- XLAT(KEY_NUMERIC_4),
+  XLAT(KEY_NUMERIC_4),
 #endif
 #if defined(KEY_NUMERIC_5) || (defined(HAVE_DECL_KEY_NUMERIC_5) && HAVE_DECL_KEY_NUMERIC_5)
- XLAT(KEY_NUMERIC_5),
+  XLAT(KEY_NUMERIC_5),
 #endif
 #if defined(KEY_NUMERIC_6) || (defined(HAVE_DECL_KEY_NUMERIC_6) && HAVE_DECL_KEY_NUMERIC_6)
- XLAT(KEY_NUMERIC_6),
+  XLAT(KEY_NUMERIC_6),
 #endif
 #if defined(KEY_NUMERIC_7) || (defined(HAVE_DECL_KEY_NUMERIC_7) && HAVE_DECL_KEY_NUMERIC_7)
- XLAT(KEY_NUMERIC_7),
+  XLAT(KEY_NUMERIC_7),
 #endif
 #if defined(KEY_NUMERIC_8) || (defined(HAVE_DECL_KEY_NUMERIC_8) && HAVE_DECL_KEY_NUMERIC_8)
- XLAT(KEY_NUMERIC_8),
+  XLAT(KEY_NUMERIC_8),
 #endif
 #if defined(KEY_NUMERIC_9) || (defined(HAVE_DECL_KEY_NUMERIC_9) && HAVE_DECL_KEY_NUMERIC_9)
- XLAT(KEY_NUMERIC_9),
+  XLAT(KEY_NUMERIC_9),
 #endif
 #if defined(KEY_NUMERIC_STAR) || (defined(HAVE_DECL_KEY_NUMERIC_STAR) && HAVE_DECL_KEY_NUMERIC_STAR)
- XLAT(KEY_NUMERIC_STAR),
+  XLAT(KEY_NUMERIC_STAR),
 #endif
 #if defined(KEY_NUMERIC_POUND) || (defined(HAVE_DECL_KEY_NUMERIC_POUND) && HAVE_DECL_KEY_NUMERIC_POUND)
- XLAT(KEY_NUMERIC_POUND),
+  XLAT(KEY_NUMERIC_POUND),
+#endif
+#if defined(KEY_NUMERIC_A) || (defined(HAVE_DECL_KEY_NUMERIC_A) && HAVE_DECL_KEY_NUMERIC_A)
+  XLAT(KEY_NUMERIC_A),
+#endif
+#if defined(KEY_NUMERIC_B) || (defined(HAVE_DECL_KEY_NUMERIC_B) && HAVE_DECL_KEY_NUMERIC_B)
+  XLAT(KEY_NUMERIC_B),
+#endif
+#if defined(KEY_NUMERIC_C) || (defined(HAVE_DECL_KEY_NUMERIC_C) && HAVE_DECL_KEY_NUMERIC_C)
+  XLAT(KEY_NUMERIC_C),
+#endif
+#if defined(KEY_NUMERIC_D) || (defined(HAVE_DECL_KEY_NUMERIC_D) && HAVE_DECL_KEY_NUMERIC_D)
+  XLAT(KEY_NUMERIC_D),
 #endif
 
 #if defined(KEY_CAMERA_FOCUS) || (defined(HAVE_DECL_KEY_CAMERA_FOCUS) && HAVE_DECL_KEY_CAMERA_FOCUS)
- XLAT(KEY_CAMERA_FOCUS),
+  XLAT(KEY_CAMERA_FOCUS),
 #endif
 #if defined(KEY_WPS_BUTTON) || (defined(HAVE_DECL_KEY_WPS_BUTTON) && HAVE_DECL_KEY_WPS_BUTTON)
- XLAT(KEY_WPS_BUTTON),
+  XLAT(KEY_WPS_BUTTON),
 #endif
 
 #if defined(KEY_TOUCHPAD_TOGGLE) || (defined(HAVE_DECL_KEY_TOUCHPAD_TOGGLE) && HAVE_DECL_KEY_TOUCHPAD_TOGGLE)
- XLAT(KEY_TOUCHPAD_TOGGLE),
+  XLAT(KEY_TOUCHPAD_TOGGLE),
 #endif
 #if defined(KEY_TOUCHPAD_ON) || (defined(HAVE_DECL_KEY_TOUCHPAD_ON) && HAVE_DECL_KEY_TOUCHPAD_ON)
- XLAT(KEY_TOUCHPAD_ON),
+  XLAT(KEY_TOUCHPAD_ON),
 #endif
 #if defined(KEY_TOUCHPAD_OFF) || (defined(HAVE_DECL_KEY_TOUCHPAD_OFF) && HAVE_DECL_KEY_TOUCHPAD_OFF)
- XLAT(KEY_TOUCHPAD_OFF),
+  XLAT(KEY_TOUCHPAD_OFF),
 #endif
 
 #if defined(KEY_CAMERA_ZOOMIN) || (defined(HAVE_DECL_KEY_CAMERA_ZOOMIN) && HAVE_DECL_KEY_CAMERA_ZOOMIN)
- XLAT(KEY_CAMERA_ZOOMIN),
+  XLAT(KEY_CAMERA_ZOOMIN),
 #endif
 #if defined(KEY_CAMERA_ZOOMOUT) || (defined(HAVE_DECL_KEY_CAMERA_ZOOMOUT) && HAVE_DECL_KEY_CAMERA_ZOOMOUT)
- XLAT(KEY_CAMERA_ZOOMOUT),
+  XLAT(KEY_CAMERA_ZOOMOUT),
 #endif
 #if defined(KEY_CAMERA_UP) || (defined(HAVE_DECL_KEY_CAMERA_UP) && HAVE_DECL_KEY_CAMERA_UP)
- XLAT(KEY_CAMERA_UP),
+  XLAT(KEY_CAMERA_UP),
 #endif
 #if defined(KEY_CAMERA_DOWN) || (defined(HAVE_DECL_KEY_CAMERA_DOWN) && HAVE_DECL_KEY_CAMERA_DOWN)
- XLAT(KEY_CAMERA_DOWN),
+  XLAT(KEY_CAMERA_DOWN),
 #endif
 #if defined(KEY_CAMERA_LEFT) || (defined(HAVE_DECL_KEY_CAMERA_LEFT) && HAVE_DECL_KEY_CAMERA_LEFT)
- XLAT(KEY_CAMERA_LEFT),
+  XLAT(KEY_CAMERA_LEFT),
 #endif
 #if defined(KEY_CAMERA_RIGHT) || (defined(HAVE_DECL_KEY_CAMERA_RIGHT) && HAVE_DECL_KEY_CAMERA_RIGHT)
- XLAT(KEY_CAMERA_RIGHT),
+  XLAT(KEY_CAMERA_RIGHT),
 #endif
 
 #if defined(KEY_ATTENDANT_ON) || (defined(HAVE_DECL_KEY_ATTENDANT_ON) && HAVE_DECL_KEY_ATTENDANT_ON)
- XLAT(KEY_ATTENDANT_ON),
+  XLAT(KEY_ATTENDANT_ON),
 #endif
 #if defined(KEY_ATTENDANT_OFF) || (defined(HAVE_DECL_KEY_ATTENDANT_OFF) && HAVE_DECL_KEY_ATTENDANT_OFF)
- XLAT(KEY_ATTENDANT_OFF),
+  XLAT(KEY_ATTENDANT_OFF),
 #endif
 #if defined(KEY_ATTENDANT_TOGGLE) || (defined(HAVE_DECL_KEY_ATTENDANT_TOGGLE) && HAVE_DECL_KEY_ATTENDANT_TOGGLE)
- XLAT(KEY_ATTENDANT_TOGGLE),
+  XLAT(KEY_ATTENDANT_TOGGLE),
 #endif
 #if defined(KEY_LIGHTS_TOGGLE) || (defined(HAVE_DECL_KEY_LIGHTS_TOGGLE) && HAVE_DECL_KEY_LIGHTS_TOGGLE)
- XLAT(KEY_LIGHTS_TOGGLE),
+  XLAT(KEY_LIGHTS_TOGGLE),
 #endif
 
 #if defined(BTN_DPAD_UP) || (defined(HAVE_DECL_BTN_DPAD_UP) && HAVE_DECL_BTN_DPAD_UP)
- XLAT(BTN_DPAD_UP),
+  XLAT(BTN_DPAD_UP),
 #endif
 #if defined(BTN_DPAD_DOWN) || (defined(HAVE_DECL_BTN_DPAD_DOWN) && HAVE_DECL_BTN_DPAD_DOWN)
- XLAT(BTN_DPAD_DOWN),
+  XLAT(BTN_DPAD_DOWN),
 #endif
 #if defined(BTN_DPAD_LEFT) || (defined(HAVE_DECL_BTN_DPAD_LEFT) && HAVE_DECL_BTN_DPAD_LEFT)
- XLAT(BTN_DPAD_LEFT),
+  XLAT(BTN_DPAD_LEFT),
 #endif
 #if defined(BTN_DPAD_RIGHT) || (defined(HAVE_DECL_BTN_DPAD_RIGHT) && HAVE_DECL_BTN_DPAD_RIGHT)
- XLAT(BTN_DPAD_RIGHT),
+  XLAT(BTN_DPAD_RIGHT),
 #endif
 
 #if defined(KEY_ALS_TOGGLE) || (defined(HAVE_DECL_KEY_ALS_TOGGLE) && HAVE_DECL_KEY_ALS_TOGGLE)
- XLAT(KEY_ALS_TOGGLE),
+  XLAT(KEY_ALS_TOGGLE),
 #endif
 
 #if defined(KEY_BUTTONCONFIG) || (defined(HAVE_DECL_KEY_BUTTONCONFIG) && HAVE_DECL_KEY_BUTTONCONFIG)
- XLAT(KEY_BUTTONCONFIG),
+  XLAT(KEY_BUTTONCONFIG),
 #endif
 #if defined(KEY_TASKMANAGER) || (defined(HAVE_DECL_KEY_TASKMANAGER) && HAVE_DECL_KEY_TASKMANAGER)
- XLAT(KEY_TASKMANAGER),
+  XLAT(KEY_TASKMANAGER),
 #endif
 #if defined(KEY_JOURNAL) || (defined(HAVE_DECL_KEY_JOURNAL) && HAVE_DECL_KEY_JOURNAL)
- XLAT(KEY_JOURNAL),
+  XLAT(KEY_JOURNAL),
 #endif
 #if defined(KEY_CONTROLPANEL) || (defined(HAVE_DECL_KEY_CONTROLPANEL) && HAVE_DECL_KEY_CONTROLPANEL)
- XLAT(KEY_CONTROLPANEL),
+  XLAT(KEY_CONTROLPANEL),
 #endif
 #if defined(KEY_APPSELECT) || (defined(HAVE_DECL_KEY_APPSELECT) && HAVE_DECL_KEY_APPSELECT)
- XLAT(KEY_APPSELECT),
+  XLAT(KEY_APPSELECT),
 #endif
 #if defined(KEY_SCREENSAVER) || (defined(HAVE_DECL_KEY_SCREENSAVER) && HAVE_DECL_KEY_SCREENSAVER)
- XLAT(KEY_SCREENSAVER),
+  XLAT(KEY_SCREENSAVER),
 #endif
 #if defined(KEY_VOICECOMMAND) || (defined(HAVE_DECL_KEY_VOICECOMMAND) && HAVE_DECL_KEY_VOICECOMMAND)
- XLAT(KEY_VOICECOMMAND),
+  XLAT(KEY_VOICECOMMAND),
 #endif
 
 #if defined(KEY_BRIGHTNESS_MIN) || (defined(HAVE_DECL_KEY_BRIGHTNESS_MIN) && HAVE_DECL_KEY_BRIGHTNESS_MIN)
- XLAT(KEY_BRIGHTNESS_MIN),
+  XLAT(KEY_BRIGHTNESS_MIN),
 #endif
 #if defined(KEY_BRIGHTNESS_MAX) || (defined(HAVE_DECL_KEY_BRIGHTNESS_MAX) && HAVE_DECL_KEY_BRIGHTNESS_MAX)
- XLAT(KEY_BRIGHTNESS_MAX),
+  XLAT(KEY_BRIGHTNESS_MAX),
 #endif
 
 #if defined(KEY_KBDINPUTASSIST_PREV) || (defined(HAVE_DECL_KEY_KBDINPUTASSIST_PREV) && HAVE_DECL_KEY_KBDINPUTASSIST_PREV)
- XLAT(KEY_KBDINPUTASSIST_PREV),
+  XLAT(KEY_KBDINPUTASSIST_PREV),
 #endif
 #if defined(KEY_KBDINPUTASSIST_NEXT) || (defined(HAVE_DECL_KEY_KBDINPUTASSIST_NEXT) && HAVE_DECL_KEY_KBDINPUTASSIST_NEXT)
- XLAT(KEY_KBDINPUTASSIST_NEXT),
+  XLAT(KEY_KBDINPUTASSIST_NEXT),
 #endif
 #if defined(KEY_KBDINPUTASSIST_PREVGROUP) || (defined(HAVE_DECL_KEY_KBDINPUTASSIST_PREVGROUP) && HAVE_DECL_KEY_KBDINPUTASSIST_PREVGROUP)
- XLAT(KEY_KBDINPUTASSIST_PREVGROUP),
+  XLAT(KEY_KBDINPUTASSIST_PREVGROUP),
 #endif
 #if defined(KEY_KBDINPUTASSIST_NEXTGROUP) || (defined(HAVE_DECL_KEY_KBDINPUTASSIST_NEXTGROUP) && HAVE_DECL_KEY_KBDINPUTASSIST_NEXTGROUP)
- XLAT(KEY_KBDINPUTASSIST_NEXTGROUP),
+  XLAT(KEY_KBDINPUTASSIST_NEXTGROUP),
 #endif
 #if defined(KEY_KBDINPUTASSIST_ACCEPT) || (defined(HAVE_DECL_KEY_KBDINPUTASSIST_ACCEPT) && HAVE_DECL_KEY_KBDINPUTASSIST_ACCEPT)
- XLAT(KEY_KBDINPUTASSIST_ACCEPT),
+  XLAT(KEY_KBDINPUTASSIST_ACCEPT),
 #endif
 #if defined(KEY_KBDINPUTASSIST_CANCEL) || (defined(HAVE_DECL_KEY_KBDINPUTASSIST_CANCEL) && HAVE_DECL_KEY_KBDINPUTASSIST_CANCEL)
- XLAT(KEY_KBDINPUTASSIST_CANCEL),
+  XLAT(KEY_KBDINPUTASSIST_CANCEL),
 #endif
 
 #if defined(BTN_TRIGGER_HAPPY) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY) && HAVE_DECL_BTN_TRIGGER_HAPPY)
- XLAT(BTN_TRIGGER_HAPPY),
+  XLAT(BTN_TRIGGER_HAPPY),
 #endif
 #if defined(BTN_TRIGGER_HAPPY1) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY1) && HAVE_DECL_BTN_TRIGGER_HAPPY1)
- XLAT(BTN_TRIGGER_HAPPY1),
+  XLAT(BTN_TRIGGER_HAPPY1),
 #endif
 #if defined(BTN_TRIGGER_HAPPY2) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY2) && HAVE_DECL_BTN_TRIGGER_HAPPY2)
- XLAT(BTN_TRIGGER_HAPPY2),
+  XLAT(BTN_TRIGGER_HAPPY2),
 #endif
 #if defined(BTN_TRIGGER_HAPPY3) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY3) && HAVE_DECL_BTN_TRIGGER_HAPPY3)
- XLAT(BTN_TRIGGER_HAPPY3),
+  XLAT(BTN_TRIGGER_HAPPY3),
 #endif
 #if defined(BTN_TRIGGER_HAPPY4) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY4) && HAVE_DECL_BTN_TRIGGER_HAPPY4)
- XLAT(BTN_TRIGGER_HAPPY4),
+  XLAT(BTN_TRIGGER_HAPPY4),
 #endif
 #if defined(BTN_TRIGGER_HAPPY5) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY5) && HAVE_DECL_BTN_TRIGGER_HAPPY5)
- XLAT(BTN_TRIGGER_HAPPY5),
+  XLAT(BTN_TRIGGER_HAPPY5),
 #endif
 #if defined(BTN_TRIGGER_HAPPY6) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY6) && HAVE_DECL_BTN_TRIGGER_HAPPY6)
- XLAT(BTN_TRIGGER_HAPPY6),
+  XLAT(BTN_TRIGGER_HAPPY6),
 #endif
 #if defined(BTN_TRIGGER_HAPPY7) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY7) && HAVE_DECL_BTN_TRIGGER_HAPPY7)
- XLAT(BTN_TRIGGER_HAPPY7),
+  XLAT(BTN_TRIGGER_HAPPY7),
 #endif
 #if defined(BTN_TRIGGER_HAPPY8) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY8) && HAVE_DECL_BTN_TRIGGER_HAPPY8)
- XLAT(BTN_TRIGGER_HAPPY8),
+  XLAT(BTN_TRIGGER_HAPPY8),
 #endif
 #if defined(BTN_TRIGGER_HAPPY9) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY9) && HAVE_DECL_BTN_TRIGGER_HAPPY9)
- XLAT(BTN_TRIGGER_HAPPY9),
+  XLAT(BTN_TRIGGER_HAPPY9),
 #endif
 #if defined(BTN_TRIGGER_HAPPY10) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY10) && HAVE_DECL_BTN_TRIGGER_HAPPY10)
- XLAT(BTN_TRIGGER_HAPPY10),
+  XLAT(BTN_TRIGGER_HAPPY10),
 #endif
 #if defined(BTN_TRIGGER_HAPPY11) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY11) && HAVE_DECL_BTN_TRIGGER_HAPPY11)
- XLAT(BTN_TRIGGER_HAPPY11),
+  XLAT(BTN_TRIGGER_HAPPY11),
 #endif
 #if defined(BTN_TRIGGER_HAPPY12) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY12) && HAVE_DECL_BTN_TRIGGER_HAPPY12)
- XLAT(BTN_TRIGGER_HAPPY12),
+  XLAT(BTN_TRIGGER_HAPPY12),
 #endif
 #if defined(BTN_TRIGGER_HAPPY13) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY13) && HAVE_DECL_BTN_TRIGGER_HAPPY13)
- XLAT(BTN_TRIGGER_HAPPY13),
+  XLAT(BTN_TRIGGER_HAPPY13),
 #endif
 #if defined(BTN_TRIGGER_HAPPY14) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY14) && HAVE_DECL_BTN_TRIGGER_HAPPY14)
- XLAT(BTN_TRIGGER_HAPPY14),
+  XLAT(BTN_TRIGGER_HAPPY14),
 #endif
 #if defined(BTN_TRIGGER_HAPPY15) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY15) && HAVE_DECL_BTN_TRIGGER_HAPPY15)
- XLAT(BTN_TRIGGER_HAPPY15),
+  XLAT(BTN_TRIGGER_HAPPY15),
 #endif
 #if defined(BTN_TRIGGER_HAPPY16) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY16) && HAVE_DECL_BTN_TRIGGER_HAPPY16)
- XLAT(BTN_TRIGGER_HAPPY16),
+  XLAT(BTN_TRIGGER_HAPPY16),
 #endif
 #if defined(BTN_TRIGGER_HAPPY17) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY17) && HAVE_DECL_BTN_TRIGGER_HAPPY17)
- XLAT(BTN_TRIGGER_HAPPY17),
+  XLAT(BTN_TRIGGER_HAPPY17),
 #endif
 #if defined(BTN_TRIGGER_HAPPY18) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY18) && HAVE_DECL_BTN_TRIGGER_HAPPY18)
- XLAT(BTN_TRIGGER_HAPPY18),
+  XLAT(BTN_TRIGGER_HAPPY18),
 #endif
 #if defined(BTN_TRIGGER_HAPPY19) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY19) && HAVE_DECL_BTN_TRIGGER_HAPPY19)
- XLAT(BTN_TRIGGER_HAPPY19),
+  XLAT(BTN_TRIGGER_HAPPY19),
 #endif
 #if defined(BTN_TRIGGER_HAPPY20) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY20) && HAVE_DECL_BTN_TRIGGER_HAPPY20)
- XLAT(BTN_TRIGGER_HAPPY20),
+  XLAT(BTN_TRIGGER_HAPPY20),
 #endif
 #if defined(BTN_TRIGGER_HAPPY21) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY21) && HAVE_DECL_BTN_TRIGGER_HAPPY21)
- XLAT(BTN_TRIGGER_HAPPY21),
+  XLAT(BTN_TRIGGER_HAPPY21),
 #endif
 #if defined(BTN_TRIGGER_HAPPY22) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY22) && HAVE_DECL_BTN_TRIGGER_HAPPY22)
- XLAT(BTN_TRIGGER_HAPPY22),
+  XLAT(BTN_TRIGGER_HAPPY22),
 #endif
 #if defined(BTN_TRIGGER_HAPPY23) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY23) && HAVE_DECL_BTN_TRIGGER_HAPPY23)
- XLAT(BTN_TRIGGER_HAPPY23),
+  XLAT(BTN_TRIGGER_HAPPY23),
 #endif
 #if defined(BTN_TRIGGER_HAPPY24) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY24) && HAVE_DECL_BTN_TRIGGER_HAPPY24)
- XLAT(BTN_TRIGGER_HAPPY24),
+  XLAT(BTN_TRIGGER_HAPPY24),
 #endif
 #if defined(BTN_TRIGGER_HAPPY25) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY25) && HAVE_DECL_BTN_TRIGGER_HAPPY25)
- XLAT(BTN_TRIGGER_HAPPY25),
+  XLAT(BTN_TRIGGER_HAPPY25),
 #endif
 #if defined(BTN_TRIGGER_HAPPY26) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY26) && HAVE_DECL_BTN_TRIGGER_HAPPY26)
- XLAT(BTN_TRIGGER_HAPPY26),
+  XLAT(BTN_TRIGGER_HAPPY26),
 #endif
 #if defined(BTN_TRIGGER_HAPPY27) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY27) && HAVE_DECL_BTN_TRIGGER_HAPPY27)
- XLAT(BTN_TRIGGER_HAPPY27),
+  XLAT(BTN_TRIGGER_HAPPY27),
 #endif
 #if defined(BTN_TRIGGER_HAPPY28) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY28) && HAVE_DECL_BTN_TRIGGER_HAPPY28)
- XLAT(BTN_TRIGGER_HAPPY28),
+  XLAT(BTN_TRIGGER_HAPPY28),
 #endif
 #if defined(BTN_TRIGGER_HAPPY29) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY29) && HAVE_DECL_BTN_TRIGGER_HAPPY29)
- XLAT(BTN_TRIGGER_HAPPY29),
+  XLAT(BTN_TRIGGER_HAPPY29),
 #endif
 #if defined(BTN_TRIGGER_HAPPY30) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY30) && HAVE_DECL_BTN_TRIGGER_HAPPY30)
- XLAT(BTN_TRIGGER_HAPPY30),
+  XLAT(BTN_TRIGGER_HAPPY30),
 #endif
 #if defined(BTN_TRIGGER_HAPPY31) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY31) && HAVE_DECL_BTN_TRIGGER_HAPPY31)
- XLAT(BTN_TRIGGER_HAPPY31),
+  XLAT(BTN_TRIGGER_HAPPY31),
 #endif
 #if defined(BTN_TRIGGER_HAPPY32) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY32) && HAVE_DECL_BTN_TRIGGER_HAPPY32)
- XLAT(BTN_TRIGGER_HAPPY32),
+  XLAT(BTN_TRIGGER_HAPPY32),
 #endif
 #if defined(BTN_TRIGGER_HAPPY33) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY33) && HAVE_DECL_BTN_TRIGGER_HAPPY33)
- XLAT(BTN_TRIGGER_HAPPY33),
+  XLAT(BTN_TRIGGER_HAPPY33),
 #endif
 #if defined(BTN_TRIGGER_HAPPY34) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY34) && HAVE_DECL_BTN_TRIGGER_HAPPY34)
- XLAT(BTN_TRIGGER_HAPPY34),
+  XLAT(BTN_TRIGGER_HAPPY34),
 #endif
 #if defined(BTN_TRIGGER_HAPPY35) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY35) && HAVE_DECL_BTN_TRIGGER_HAPPY35)
- XLAT(BTN_TRIGGER_HAPPY35),
+  XLAT(BTN_TRIGGER_HAPPY35),
 #endif
 #if defined(BTN_TRIGGER_HAPPY36) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY36) && HAVE_DECL_BTN_TRIGGER_HAPPY36)
- XLAT(BTN_TRIGGER_HAPPY36),
+  XLAT(BTN_TRIGGER_HAPPY36),
 #endif
 #if defined(BTN_TRIGGER_HAPPY37) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY37) && HAVE_DECL_BTN_TRIGGER_HAPPY37)
- XLAT(BTN_TRIGGER_HAPPY37),
+  XLAT(BTN_TRIGGER_HAPPY37),
 #endif
 #if defined(BTN_TRIGGER_HAPPY38) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY38) && HAVE_DECL_BTN_TRIGGER_HAPPY38)
- XLAT(BTN_TRIGGER_HAPPY38),
+  XLAT(BTN_TRIGGER_HAPPY38),
 #endif
 #if defined(BTN_TRIGGER_HAPPY39) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY39) && HAVE_DECL_BTN_TRIGGER_HAPPY39)
- XLAT(BTN_TRIGGER_HAPPY39),
+  XLAT(BTN_TRIGGER_HAPPY39),
 #endif
 #if defined(BTN_TRIGGER_HAPPY40) || (defined(HAVE_DECL_BTN_TRIGGER_HAPPY40) && HAVE_DECL_BTN_TRIGGER_HAPPY40)
- XLAT(BTN_TRIGGER_HAPPY40),
+  XLAT(BTN_TRIGGER_HAPPY40),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/evdev_leds.h b/xlat/evdev_leds.h
index 6c4621f..ca0de38 100644
--- a/xlat/evdev_leds.h
+++ b/xlat/evdev_leds.h
@@ -1,38 +1,47 @@
 /* Generated by ./xlat/gen.sh from ./xlat/evdev_leds.in; do not edit. */
 
-static const struct xlat evdev_leds[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat evdev_leds in mpers mode
+
+#else
+
+static
+const struct xlat evdev_leds[] = {
 #if defined(LED_NUML) || (defined(HAVE_DECL_LED_NUML) && HAVE_DECL_LED_NUML)
- XLAT(LED_NUML),
+  XLAT(LED_NUML),
 #endif
 #if defined(LED_CAPSL) || (defined(HAVE_DECL_LED_CAPSL) && HAVE_DECL_LED_CAPSL)
- XLAT(LED_CAPSL),
+  XLAT(LED_CAPSL),
 #endif
 #if defined(LED_SCROLLL) || (defined(HAVE_DECL_LED_SCROLLL) && HAVE_DECL_LED_SCROLLL)
- XLAT(LED_SCROLLL),
+  XLAT(LED_SCROLLL),
 #endif
 #if defined(LED_COMPOSE) || (defined(HAVE_DECL_LED_COMPOSE) && HAVE_DECL_LED_COMPOSE)
- XLAT(LED_COMPOSE),
+  XLAT(LED_COMPOSE),
 #endif
 #if defined(LED_KANA) || (defined(HAVE_DECL_LED_KANA) && HAVE_DECL_LED_KANA)
- XLAT(LED_KANA),
+  XLAT(LED_KANA),
 #endif
 #if defined(LED_SLEEP) || (defined(HAVE_DECL_LED_SLEEP) && HAVE_DECL_LED_SLEEP)
- XLAT(LED_SLEEP),
+  XLAT(LED_SLEEP),
 #endif
 #if defined(LED_SUSPEND) || (defined(HAVE_DECL_LED_SUSPEND) && HAVE_DECL_LED_SUSPEND)
- XLAT(LED_SUSPEND),
+  XLAT(LED_SUSPEND),
 #endif
 #if defined(LED_MUTE) || (defined(HAVE_DECL_LED_MUTE) && HAVE_DECL_LED_MUTE)
- XLAT(LED_MUTE),
+  XLAT(LED_MUTE),
 #endif
 #if defined(LED_MISC) || (defined(HAVE_DECL_LED_MISC) && HAVE_DECL_LED_MISC)
- XLAT(LED_MISC),
+  XLAT(LED_MISC),
 #endif
 #if defined(LED_MAIL) || (defined(HAVE_DECL_LED_MAIL) && HAVE_DECL_LED_MAIL)
- XLAT(LED_MAIL),
+  XLAT(LED_MAIL),
 #endif
 #if defined(LED_CHARGING) || (defined(HAVE_DECL_LED_CHARGING) && HAVE_DECL_LED_CHARGING)
- XLAT(LED_CHARGING),
+  XLAT(LED_CHARGING),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/evdev_misc.h b/xlat/evdev_misc.h
index a4fe71a..96f8afa 100644
--- a/xlat/evdev_misc.h
+++ b/xlat/evdev_misc.h
@@ -1,23 +1,32 @@
 /* Generated by ./xlat/gen.sh from ./xlat/evdev_misc.in; do not edit. */
 
-static const struct xlat evdev_misc[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat evdev_misc in mpers mode
+
+#else
+
+static
+const struct xlat evdev_misc[] = {
 #if defined(MSC_SERIAL) || (defined(HAVE_DECL_MSC_SERIAL) && HAVE_DECL_MSC_SERIAL)
- XLAT(MSC_SERIAL),
+  XLAT(MSC_SERIAL),
 #endif
 #if defined(MSC_PULSELED) || (defined(HAVE_DECL_MSC_PULSELED) && HAVE_DECL_MSC_PULSELED)
- XLAT(MSC_PULSELED),
+  XLAT(MSC_PULSELED),
 #endif
 #if defined(MSC_GESTURE) || (defined(HAVE_DECL_MSC_GESTURE) && HAVE_DECL_MSC_GESTURE)
- XLAT(MSC_GESTURE),
+  XLAT(MSC_GESTURE),
 #endif
 #if defined(MSC_RAW) || (defined(HAVE_DECL_MSC_RAW) && HAVE_DECL_MSC_RAW)
- XLAT(MSC_RAW),
+  XLAT(MSC_RAW),
 #endif
 #if defined(MSC_SCAN) || (defined(HAVE_DECL_MSC_SCAN) && HAVE_DECL_MSC_SCAN)
- XLAT(MSC_SCAN),
+  XLAT(MSC_SCAN),
 #endif
 #if defined(MSC_TIMESTAMP) || (defined(HAVE_DECL_MSC_TIMESTAMP) && HAVE_DECL_MSC_TIMESTAMP)
- XLAT(MSC_TIMESTAMP),
+  XLAT(MSC_TIMESTAMP),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/evdev_mtslots.h b/xlat/evdev_mtslots.h
index 7e776c6..3633514 100644
--- a/xlat/evdev_mtslots.h
+++ b/xlat/evdev_mtslots.h
@@ -1,50 +1,59 @@
 /* Generated by ./xlat/gen.sh from ./xlat/evdev_mtslots.in; do not edit. */
 
-static const struct xlat evdev_mtslots[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat evdev_mtslots in mpers mode
+
+#else
+
+static
+const struct xlat evdev_mtslots[] = {
 #if defined(ABS_MT_SLOT) || (defined(HAVE_DECL_ABS_MT_SLOT) && HAVE_DECL_ABS_MT_SLOT)
- XLAT(ABS_MT_SLOT),
+  XLAT(ABS_MT_SLOT),
 #endif
 #if defined(ABS_MT_TOUCH_MAJOR) || (defined(HAVE_DECL_ABS_MT_TOUCH_MAJOR) && HAVE_DECL_ABS_MT_TOUCH_MAJOR)
- XLAT(ABS_MT_TOUCH_MAJOR),
+  XLAT(ABS_MT_TOUCH_MAJOR),
 #endif
 #if defined(ABS_MT_TOUCH_MINOR) || (defined(HAVE_DECL_ABS_MT_TOUCH_MINOR) && HAVE_DECL_ABS_MT_TOUCH_MINOR)
- XLAT(ABS_MT_TOUCH_MINOR),
+  XLAT(ABS_MT_TOUCH_MINOR),
 #endif
 #if defined(ABS_MT_WIDTH_MAJOR) || (defined(HAVE_DECL_ABS_MT_WIDTH_MAJOR) && HAVE_DECL_ABS_MT_WIDTH_MAJOR)
- XLAT(ABS_MT_WIDTH_MAJOR),
+  XLAT(ABS_MT_WIDTH_MAJOR),
 #endif
 #if defined(ABS_MT_WIDTH_MINOR) || (defined(HAVE_DECL_ABS_MT_WIDTH_MINOR) && HAVE_DECL_ABS_MT_WIDTH_MINOR)
- XLAT(ABS_MT_WIDTH_MINOR),
+  XLAT(ABS_MT_WIDTH_MINOR),
 #endif
 #if defined(ABS_MT_ORIENTATION) || (defined(HAVE_DECL_ABS_MT_ORIENTATION) && HAVE_DECL_ABS_MT_ORIENTATION)
- XLAT(ABS_MT_ORIENTATION),
+  XLAT(ABS_MT_ORIENTATION),
 #endif
 #if defined(ABS_MT_POSITION_X) || (defined(HAVE_DECL_ABS_MT_POSITION_X) && HAVE_DECL_ABS_MT_POSITION_X)
- XLAT(ABS_MT_POSITION_X),
+  XLAT(ABS_MT_POSITION_X),
 #endif
 #if defined(ABS_MT_POSITION_Y) || (defined(HAVE_DECL_ABS_MT_POSITION_Y) && HAVE_DECL_ABS_MT_POSITION_Y)
- XLAT(ABS_MT_POSITION_Y),
+  XLAT(ABS_MT_POSITION_Y),
 #endif
 #if defined(ABS_MT_TOOL_TYPE) || (defined(HAVE_DECL_ABS_MT_TOOL_TYPE) && HAVE_DECL_ABS_MT_TOOL_TYPE)
- XLAT(ABS_MT_TOOL_TYPE),
+  XLAT(ABS_MT_TOOL_TYPE),
 #endif
 #if defined(ABS_MT_BLOB_ID) || (defined(HAVE_DECL_ABS_MT_BLOB_ID) && HAVE_DECL_ABS_MT_BLOB_ID)
- XLAT(ABS_MT_BLOB_ID),
+  XLAT(ABS_MT_BLOB_ID),
 #endif
 #if defined(ABS_MT_TRACKING_ID) || (defined(HAVE_DECL_ABS_MT_TRACKING_ID) && HAVE_DECL_ABS_MT_TRACKING_ID)
- XLAT(ABS_MT_TRACKING_ID),
+  XLAT(ABS_MT_TRACKING_ID),
 #endif
 #if defined(ABS_MT_PRESSURE) || (defined(HAVE_DECL_ABS_MT_PRESSURE) && HAVE_DECL_ABS_MT_PRESSURE)
- XLAT(ABS_MT_PRESSURE),
+  XLAT(ABS_MT_PRESSURE),
 #endif
 #if defined(ABS_MT_DISTANCE) || (defined(HAVE_DECL_ABS_MT_DISTANCE) && HAVE_DECL_ABS_MT_DISTANCE)
- XLAT(ABS_MT_DISTANCE),
+  XLAT(ABS_MT_DISTANCE),
 #endif
 #if defined(ABS_MT_TOOL_X) || (defined(HAVE_DECL_ABS_MT_TOOL_X) && HAVE_DECL_ABS_MT_TOOL_X)
- XLAT(ABS_MT_TOOL_X),
+  XLAT(ABS_MT_TOOL_X),
 #endif
 #if defined(ABS_MT_TOOL_Y) || (defined(HAVE_DECL_ABS_MT_TOOL_Y) && HAVE_DECL_ABS_MT_TOOL_Y)
- XLAT(ABS_MT_TOOL_Y),
+  XLAT(ABS_MT_TOOL_Y),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/evdev_prop.h b/xlat/evdev_prop.h
index 26ed7b5..c998c82 100644
--- a/xlat/evdev_prop.h
+++ b/xlat/evdev_prop.h
@@ -1,23 +1,35 @@
 /* Generated by ./xlat/gen.sh from ./xlat/evdev_prop.in; do not edit. */
 
-static const struct xlat evdev_prop[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat evdev_prop in mpers mode
+
+#else
+
+static
+const struct xlat evdev_prop[] = {
 #if defined(INPUT_PROP_POINTER) || (defined(HAVE_DECL_INPUT_PROP_POINTER) && HAVE_DECL_INPUT_PROP_POINTER)
- XLAT(INPUT_PROP_POINTER),
+  XLAT(INPUT_PROP_POINTER),
 #endif
 #if defined(INPUT_PROP_DIRECT) || (defined(HAVE_DECL_INPUT_PROP_DIRECT) && HAVE_DECL_INPUT_PROP_DIRECT)
- XLAT(INPUT_PROP_DIRECT),
+  XLAT(INPUT_PROP_DIRECT),
 #endif
 #if defined(INPUT_PROP_BUTTONPAD) || (defined(HAVE_DECL_INPUT_PROP_BUTTONPAD) && HAVE_DECL_INPUT_PROP_BUTTONPAD)
- XLAT(INPUT_PROP_BUTTONPAD),
+  XLAT(INPUT_PROP_BUTTONPAD),
 #endif
 #if defined(INPUT_PROP_SEMI_MT) || (defined(HAVE_DECL_INPUT_PROP_SEMI_MT) && HAVE_DECL_INPUT_PROP_SEMI_MT)
- XLAT(INPUT_PROP_SEMI_MT),
+  XLAT(INPUT_PROP_SEMI_MT),
 #endif
 #if defined(INPUT_PROP_TOPBUTTONPAD) || (defined(HAVE_DECL_INPUT_PROP_TOPBUTTONPAD) && HAVE_DECL_INPUT_PROP_TOPBUTTONPAD)
- XLAT(INPUT_PROP_TOPBUTTONPAD),
+  XLAT(INPUT_PROP_TOPBUTTONPAD),
 #endif
 #if defined(INPUT_PROP_POINTING_STICK) || (defined(HAVE_DECL_INPUT_PROP_POINTING_STICK) && HAVE_DECL_INPUT_PROP_POINTING_STICK)
- XLAT(INPUT_PROP_POINTING_STICK),
+  XLAT(INPUT_PROP_POINTING_STICK),
+#endif
+#if defined(INPUT_PROP_ACCELEROMETER) || (defined(HAVE_DECL_INPUT_PROP_ACCELEROMETER) && HAVE_DECL_INPUT_PROP_ACCELEROMETER)
+  XLAT(INPUT_PROP_ACCELEROMETER),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/evdev_relative_axes.h b/xlat/evdev_relative_axes.h
index 2d58bf7..cf9efb4 100644
--- a/xlat/evdev_relative_axes.h
+++ b/xlat/evdev_relative_axes.h
@@ -1,35 +1,44 @@
 /* Generated by ./xlat/gen.sh from ./xlat/evdev_relative_axes.in; do not edit. */
 
-static const struct xlat evdev_relative_axes[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat evdev_relative_axes in mpers mode
+
+#else
+
+static
+const struct xlat evdev_relative_axes[] = {
 #if defined(REL_X) || (defined(HAVE_DECL_REL_X) && HAVE_DECL_REL_X)
- XLAT(REL_X),
+  XLAT(REL_X),
 #endif
 #if defined(REL_Y) || (defined(HAVE_DECL_REL_Y) && HAVE_DECL_REL_Y)
- XLAT(REL_Y),
+  XLAT(REL_Y),
 #endif
 #if defined(REL_Z) || (defined(HAVE_DECL_REL_Z) && HAVE_DECL_REL_Z)
- XLAT(REL_Z),
+  XLAT(REL_Z),
 #endif
 #if defined(REL_RX) || (defined(HAVE_DECL_REL_RX) && HAVE_DECL_REL_RX)
- XLAT(REL_RX),
+  XLAT(REL_RX),
 #endif
 #if defined(REL_RY) || (defined(HAVE_DECL_REL_RY) && HAVE_DECL_REL_RY)
- XLAT(REL_RY),
+  XLAT(REL_RY),
 #endif
 #if defined(REL_RZ) || (defined(HAVE_DECL_REL_RZ) && HAVE_DECL_REL_RZ)
- XLAT(REL_RZ),
+  XLAT(REL_RZ),
 #endif
 #if defined(REL_HWHEEL) || (defined(HAVE_DECL_REL_HWHEEL) && HAVE_DECL_REL_HWHEEL)
- XLAT(REL_HWHEEL),
+  XLAT(REL_HWHEEL),
 #endif
 #if defined(REL_DIAL) || (defined(HAVE_DECL_REL_DIAL) && HAVE_DECL_REL_DIAL)
- XLAT(REL_DIAL),
+  XLAT(REL_DIAL),
 #endif
 #if defined(REL_WHEEL) || (defined(HAVE_DECL_REL_WHEEL) && HAVE_DECL_REL_WHEEL)
- XLAT(REL_WHEEL),
+  XLAT(REL_WHEEL),
 #endif
 #if defined(REL_MISC) || (defined(HAVE_DECL_REL_MISC) && HAVE_DECL_REL_MISC)
- XLAT(REL_MISC),
+  XLAT(REL_MISC),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/evdev_snd.h b/xlat/evdev_snd.h
index d090af7..95e4cd9 100644
--- a/xlat/evdev_snd.h
+++ b/xlat/evdev_snd.h
@@ -1,14 +1,23 @@
 /* Generated by ./xlat/gen.sh from ./xlat/evdev_snd.in; do not edit. */
 
-static const struct xlat evdev_snd[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat evdev_snd in mpers mode
+
+#else
+
+static
+const struct xlat evdev_snd[] = {
 #if defined(SND_CLICK) || (defined(HAVE_DECL_SND_CLICK) && HAVE_DECL_SND_CLICK)
- XLAT(SND_CLICK),
+  XLAT(SND_CLICK),
 #endif
 #if defined(SND_BELL) || (defined(HAVE_DECL_SND_BELL) && HAVE_DECL_SND_BELL)
- XLAT(SND_BELL),
+  XLAT(SND_BELL),
 #endif
 #if defined(SND_TONE) || (defined(HAVE_DECL_SND_TONE) && HAVE_DECL_SND_TONE)
- XLAT(SND_TONE),
+  XLAT(SND_TONE),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/evdev_switch.h b/xlat/evdev_switch.h
index e38ad32..afa4b3b 100644
--- a/xlat/evdev_switch.h
+++ b/xlat/evdev_switch.h
@@ -1,53 +1,62 @@
 /* Generated by ./xlat/gen.sh from ./xlat/evdev_switch.in; do not edit. */
 
-static const struct xlat evdev_switch[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat evdev_switch in mpers mode
+
+#else
+
+static
+const struct xlat evdev_switch[] = {
 #if defined(SW_LID) || (defined(HAVE_DECL_SW_LID) && HAVE_DECL_SW_LID)
- XLAT(SW_LID),
+  XLAT(SW_LID),
 #endif
 #if defined(SW_TABLET_MODE) || (defined(HAVE_DECL_SW_TABLET_MODE) && HAVE_DECL_SW_TABLET_MODE)
- XLAT(SW_TABLET_MODE),
+  XLAT(SW_TABLET_MODE),
 #endif
 #if defined(SW_HEADPHONE_INSERT) || (defined(HAVE_DECL_SW_HEADPHONE_INSERT) && HAVE_DECL_SW_HEADPHONE_INSERT)
- XLAT(SW_HEADPHONE_INSERT),
+  XLAT(SW_HEADPHONE_INSERT),
 #endif
 #if defined(SW_RFKILL_ALL) || (defined(HAVE_DECL_SW_RFKILL_ALL) && HAVE_DECL_SW_RFKILL_ALL)
- XLAT(SW_RFKILL_ALL),
+  XLAT(SW_RFKILL_ALL),
 #endif
 #if defined(SW_RADIO) || (defined(HAVE_DECL_SW_RADIO) && HAVE_DECL_SW_RADIO)
- XLAT(SW_RADIO),
+  XLAT(SW_RADIO),
 #endif
 #if defined(SW_MICROPHONE_INSERT) || (defined(HAVE_DECL_SW_MICROPHONE_INSERT) && HAVE_DECL_SW_MICROPHONE_INSERT)
- XLAT(SW_MICROPHONE_INSERT),
+  XLAT(SW_MICROPHONE_INSERT),
 #endif
 #if defined(SW_DOCK) || (defined(HAVE_DECL_SW_DOCK) && HAVE_DECL_SW_DOCK)
- XLAT(SW_DOCK),
+  XLAT(SW_DOCK),
 #endif
 #if defined(SW_LINEOUT_INSERT) || (defined(HAVE_DECL_SW_LINEOUT_INSERT) && HAVE_DECL_SW_LINEOUT_INSERT)
- XLAT(SW_LINEOUT_INSERT),
+  XLAT(SW_LINEOUT_INSERT),
 #endif
 #if defined(SW_JACK_PHYSICAL_INSERT) || (defined(HAVE_DECL_SW_JACK_PHYSICAL_INSERT) && HAVE_DECL_SW_JACK_PHYSICAL_INSERT)
- XLAT(SW_JACK_PHYSICAL_INSERT),
+  XLAT(SW_JACK_PHYSICAL_INSERT),
 #endif
 #if defined(SW_VIDEOOUT_INSERT) || (defined(HAVE_DECL_SW_VIDEOOUT_INSERT) && HAVE_DECL_SW_VIDEOOUT_INSERT)
- XLAT(SW_VIDEOOUT_INSERT),
+  XLAT(SW_VIDEOOUT_INSERT),
 #endif
 #if defined(SW_CAMERA_LENS_COVER) || (defined(HAVE_DECL_SW_CAMERA_LENS_COVER) && HAVE_DECL_SW_CAMERA_LENS_COVER)
- XLAT(SW_CAMERA_LENS_COVER),
+  XLAT(SW_CAMERA_LENS_COVER),
 #endif
 #if defined(SW_KEYPAD_SLIDE) || (defined(HAVE_DECL_SW_KEYPAD_SLIDE) && HAVE_DECL_SW_KEYPAD_SLIDE)
- XLAT(SW_KEYPAD_SLIDE),
+  XLAT(SW_KEYPAD_SLIDE),
 #endif
 #if defined(SW_FRONT_PROXIMITY) || (defined(HAVE_DECL_SW_FRONT_PROXIMITY) && HAVE_DECL_SW_FRONT_PROXIMITY)
- XLAT(SW_FRONT_PROXIMITY),
+  XLAT(SW_FRONT_PROXIMITY),
 #endif
 #if defined(SW_ROTATE_LOCK) || (defined(HAVE_DECL_SW_ROTATE_LOCK) && HAVE_DECL_SW_ROTATE_LOCK)
- XLAT(SW_ROTATE_LOCK),
+  XLAT(SW_ROTATE_LOCK),
 #endif
 #if defined(SW_LINEIN_INSERT) || (defined(HAVE_DECL_SW_LINEIN_INSERT) && HAVE_DECL_SW_LINEIN_INSERT)
- XLAT(SW_LINEIN_INSERT),
+  XLAT(SW_LINEIN_INSERT),
 #endif
 #if defined(SW_MUTE_DEVICE) || (defined(HAVE_DECL_SW_MUTE_DEVICE) && HAVE_DECL_SW_MUTE_DEVICE)
- XLAT(SW_MUTE_DEVICE),
+  XLAT(SW_MUTE_DEVICE),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/evdev_sync.h b/xlat/evdev_sync.h
index 232f562..85372a3 100644
--- a/xlat/evdev_sync.h
+++ b/xlat/evdev_sync.h
@@ -1,17 +1,26 @@
 /* Generated by ./xlat/gen.sh from ./xlat/evdev_sync.in; do not edit. */
 
-static const struct xlat evdev_sync[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat evdev_sync in mpers mode
+
+#else
+
+static
+const struct xlat evdev_sync[] = {
 #if defined(SYN_REPORT) || (defined(HAVE_DECL_SYN_REPORT) && HAVE_DECL_SYN_REPORT)
- XLAT(SYN_REPORT),
+  XLAT(SYN_REPORT),
 #endif
 #if defined(SYN_CONFIG) || (defined(HAVE_DECL_SYN_CONFIG) && HAVE_DECL_SYN_CONFIG)
- XLAT(SYN_CONFIG),
+  XLAT(SYN_CONFIG),
 #endif
 #if defined(SYN_MT_REPORT) || (defined(HAVE_DECL_SYN_MT_REPORT) && HAVE_DECL_SYN_MT_REPORT)
- XLAT(SYN_MT_REPORT),
+  XLAT(SYN_MT_REPORT),
 #endif
 #if defined(SYN_DROPPED) || (defined(HAVE_DECL_SYN_DROPPED) && HAVE_DECL_SYN_DROPPED)
- XLAT(SYN_DROPPED),
+  XLAT(SYN_DROPPED),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/f_owner_types.h b/xlat/f_owner_types.h
new file mode 100644
index 0000000..611895a
--- /dev/null
+++ b/xlat/f_owner_types.h
@@ -0,0 +1,26 @@
+/* Generated by ./xlat/gen.sh from ./xlat/f_owner_types.in; do not edit. */
+#if !(defined(F_OWNER_TID) || (defined(HAVE_DECL_F_OWNER_TID) && HAVE_DECL_F_OWNER_TID))
+# define F_OWNER_TID 0
+#endif
+#if !(defined(F_OWNER_PID) || (defined(HAVE_DECL_F_OWNER_PID) && HAVE_DECL_F_OWNER_PID))
+# define F_OWNER_PID 1
+#endif
+#if !(defined(F_OWNER_PGRP) || (defined(HAVE_DECL_F_OWNER_PGRP) && HAVE_DECL_F_OWNER_PGRP))
+# define F_OWNER_PGRP 2
+#endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat f_owner_types in mpers mode
+
+#else
+
+static
+const struct xlat f_owner_types[] = {
+ XLAT(F_OWNER_TID),
+ XLAT(F_OWNER_PID),
+ XLAT(F_OWNER_PGRP),
+ XLAT_END
+};
+
+#endif /* !IN_MPERS */
diff --git a/xlat/f_seals.h b/xlat/f_seals.h
new file mode 100644
index 0000000..6efd079
--- /dev/null
+++ b/xlat/f_seals.h
@@ -0,0 +1,30 @@
+/* Generated by ./xlat/gen.sh from ./xlat/f_seals.in; do not edit. */
+#if !(defined(F_SEAL_SEAL) || (defined(HAVE_DECL_F_SEAL_SEAL) && HAVE_DECL_F_SEAL_SEAL))
+# define F_SEAL_SEAL 1
+#endif
+#if !(defined(F_SEAL_SHRINK) || (defined(HAVE_DECL_F_SEAL_SHRINK) && HAVE_DECL_F_SEAL_SHRINK))
+# define F_SEAL_SHRINK 2
+#endif
+#if !(defined(F_SEAL_GROW) || (defined(HAVE_DECL_F_SEAL_GROW) && HAVE_DECL_F_SEAL_GROW))
+# define F_SEAL_GROW 4
+#endif
+#if !(defined(F_SEAL_WRITE) || (defined(HAVE_DECL_F_SEAL_WRITE) && HAVE_DECL_F_SEAL_WRITE))
+# define F_SEAL_WRITE 8
+#endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat f_seals in mpers mode
+
+#else
+
+static
+const struct xlat f_seals[] = {
+ XLAT(F_SEAL_SEAL),
+ XLAT(F_SEAL_SHRINK),
+ XLAT(F_SEAL_GROW),
+ XLAT(F_SEAL_WRITE),
+ XLAT_END
+};
+
+#endif /* !IN_MPERS */
diff --git a/xlat/falloc_flags.h b/xlat/falloc_flags.h
index 9288bc8..0e34b47 100644
--- a/xlat/falloc_flags.h
+++ b/xlat/falloc_flags.h
@@ -1,20 +1,32 @@
 /* Generated by ./xlat/gen.sh from ./xlat/falloc_flags.in; do not edit. */
 
-static const struct xlat falloc_flags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat falloc_flags in mpers mode
+
+#else
+
+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
+#if defined(FALLOC_FL_INSERT_RANGE) || (defined(HAVE_DECL_FALLOC_FL_INSERT_RANGE) && HAVE_DECL_FALLOC_FL_INSERT_RANGE)
+  XLAT(FALLOC_FL_INSERT_RANGE),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/fan_classes.h b/xlat/fan_classes.h
index 0a4d727..cd26d75 100644
--- a/xlat/fan_classes.h
+++ b/xlat/fan_classes.h
@@ -1,17 +1,26 @@
 /* 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))
 # define FAN_CLASS_NOTIF 0x00000000
 #endif
- 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
- 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
+
+#ifdef IN_MPERS
+
+# error static const struct xlat fan_classes in mpers mode
+
+#else
+
+static
+const struct xlat fan_classes[] = {
+ XLAT(FAN_CLASS_NOTIF),
+ XLAT(FAN_CLASS_CONTENT),
  XLAT(FAN_CLASS_PRE_CONTENT),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/fan_event_flags.h b/xlat/fan_event_flags.h
index ad875e5..7c19d82 100644
--- a/xlat/fan_event_flags.h
+++ b/xlat/fan_event_flags.h
@@ -1,45 +1,54 @@
 /* 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))
 # define FAN_ACCESS 0x00000001
 #endif
- XLAT(FAN_ACCESS),
 #if !(defined(FAN_MODIFY) || (defined(HAVE_DECL_FAN_MODIFY) && HAVE_DECL_FAN_MODIFY))
 # define FAN_MODIFY 0x00000002
 #endif
- 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
- 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
- XLAT(FAN_CLOSE_NOWRITE),
 #if !(defined(FAN_OPEN) || (defined(HAVE_DECL_FAN_OPEN) && HAVE_DECL_FAN_OPEN))
 # define FAN_OPEN 0x00000020
 #endif
- 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
- 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
- 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
- XLAT(FAN_ACCESS_PERM),
 #if !(defined(FAN_ONDIR) || (defined(HAVE_DECL_FAN_ONDIR) && HAVE_DECL_FAN_ONDIR))
 # define FAN_ONDIR 0x40000000
 #endif
- 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
+
+#ifdef IN_MPERS
+
+# error static const struct xlat fan_event_flags in mpers mode
+
+#else
+
+static
+const struct xlat fan_event_flags[] = {
+ XLAT(FAN_ACCESS),
+ XLAT(FAN_MODIFY),
+ XLAT(FAN_CLOSE_WRITE),
+ XLAT(FAN_CLOSE_NOWRITE),
+ XLAT(FAN_OPEN),
+ XLAT(FAN_Q_OVERFLOW),
+ XLAT(FAN_OPEN_PERM),
+ XLAT(FAN_ACCESS_PERM),
+ XLAT(FAN_ONDIR),
  XLAT(FAN_EVENT_ON_CHILD),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/fan_init_flags.h b/xlat/fan_init_flags.h
index 9996ef8..b11e47a 100644
--- a/xlat/fan_init_flags.h
+++ b/xlat/fan_init_flags.h
@@ -1,21 +1,30 @@
 /* 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))
 # define FAN_CLOEXEC 0x00000001
 #endif
- XLAT(FAN_CLOEXEC),
 #if !(defined(FAN_NONBLOCK) || (defined(HAVE_DECL_FAN_NONBLOCK) && HAVE_DECL_FAN_NONBLOCK))
 # define FAN_NONBLOCK 0x00000002
 #endif
- 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
- 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
+
+#ifdef IN_MPERS
+
+# error static const struct xlat fan_init_flags in mpers mode
+
+#else
+
+static
+const struct xlat fan_init_flags[] = {
+ XLAT(FAN_CLOEXEC),
+ XLAT(FAN_NONBLOCK),
+ XLAT(FAN_UNLIMITED_QUEUE),
  XLAT(FAN_UNLIMITED_MARKS),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/fan_mark_flags.h b/xlat/fan_mark_flags.h
index efa936e..f2f9140 100644
--- a/xlat/fan_mark_flags.h
+++ b/xlat/fan_mark_flags.h
@@ -1,37 +1,46 @@
 /* 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))
 # define FAN_MARK_ADD 0x00000001
 #endif
- 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
- 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
- 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
- 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
- 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
- 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
- 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
+
+#ifdef IN_MPERS
+
+# error static const struct xlat fan_mark_flags in mpers mode
+
+#else
+
+static
+const struct xlat fan_mark_flags[] = {
+ XLAT(FAN_MARK_ADD),
+ XLAT(FAN_MARK_REMOVE),
+ XLAT(FAN_MARK_DONT_FOLLOW),
+ XLAT(FAN_MARK_ONLYDIR),
+ XLAT(FAN_MARK_MOUNT),
+ XLAT(FAN_MARK_IGNORED_MASK),
+ XLAT(FAN_MARK_IGNORED_SURV_MODIFY),
  XLAT(FAN_MARK_FLUSH),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/fcntl64cmds.h b/xlat/fcntl64cmds.h
new file mode 100644
index 0000000..e01e533
--- /dev/null
+++ b/xlat/fcntl64cmds.h
@@ -0,0 +1,27 @@
+/* Generated by ./xlat/gen.sh from ./xlat/fcntl64cmds.in; do not edit. */
+#if !(defined(F_GETLK64) || (defined(HAVE_DECL_F_GETLK64) && HAVE_DECL_F_GETLK64))
+# define F_GETLK64 12
+#endif
+#if !(defined(F_SETLK64) || (defined(HAVE_DECL_F_SETLK64) && HAVE_DECL_F_SETLK64))
+# define F_SETLK64 13
+#endif
+#if !(defined(F_SETLKW64) || (defined(HAVE_DECL_F_SETLKW64) && HAVE_DECL_F_SETLKW64))
+# define F_SETLKW64 14
+#endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat fcntl64cmds in mpers mode
+
+#else
+
+static
+const struct xlat fcntl64cmds[] = {
+/* asm-generic/fcntl.h */
+ XLAT(F_GETLK64),
+ XLAT(F_SETLK64),
+ XLAT(F_SETLKW64),
+ XLAT_END
+};
+
+#endif /* !IN_MPERS */
diff --git a/xlat/fcntlcmds.h b/xlat/fcntlcmds.h
index 455aa77..33280f3 100644
--- a/xlat/fcntlcmds.h
+++ b/xlat/fcntlcmds.h
@@ -1,125 +1,125 @@
 /* Generated by ./xlat/gen.sh from ./xlat/fcntlcmds.in; do not edit. */
+#if !(defined(F_DUPFD) || (defined(HAVE_DECL_F_DUPFD) && HAVE_DECL_F_DUPFD))
+# define F_DUPFD 0
+#endif
+#if !(defined(F_GETFD) || (defined(HAVE_DECL_F_GETFD) && HAVE_DECL_F_GETFD))
+# define F_GETFD 1
+#endif
+#if !(defined(F_SETFD) || (defined(HAVE_DECL_F_SETFD) && HAVE_DECL_F_SETFD))
+# define F_SETFD 2
+#endif
+#if !(defined(F_GETFL) || (defined(HAVE_DECL_F_GETFL) && HAVE_DECL_F_GETFL))
+# define F_GETFL 3
+#endif
+#if !(defined(F_SETFL) || (defined(HAVE_DECL_F_SETFL) && HAVE_DECL_F_SETFL))
+# define F_SETFL 4
+#endif
+#if !(defined(F_GETLK) || (defined(HAVE_DECL_F_GETLK) && HAVE_DECL_F_GETLK))
+# define F_GETLK 5
+#endif
+#if !(defined(F_SETLK) || (defined(HAVE_DECL_F_SETLK) && HAVE_DECL_F_SETLK))
+# define F_SETLK 6
+#endif
+#if !(defined(F_SETLKW) || (defined(HAVE_DECL_F_SETLKW) && HAVE_DECL_F_SETLKW))
+# define F_SETLKW 7
+#endif
+#if !(defined(F_SETOWN) || (defined(HAVE_DECL_F_SETOWN) && HAVE_DECL_F_SETOWN))
+# define F_SETOWN 8
+#endif
+#if !(defined(F_GETOWN) || (defined(HAVE_DECL_F_GETOWN) && HAVE_DECL_F_GETOWN))
+# define F_GETOWN 9
+#endif
+#if !(defined(F_SETSIG) || (defined(HAVE_DECL_F_SETSIG) && HAVE_DECL_F_SETSIG))
+# define F_SETSIG 10
+#endif
+#if !(defined(F_GETSIG) || (defined(HAVE_DECL_F_GETSIG) && HAVE_DECL_F_GETSIG))
+# define F_GETSIG 11
+#endif
+#if !(defined(F_SETOWN_EX) || (defined(HAVE_DECL_F_SETOWN_EX) && HAVE_DECL_F_SETOWN_EX))
+# define F_SETOWN_EX 15
+#endif
+#if !(defined(F_GETOWN_EX) || (defined(HAVE_DECL_F_GETOWN_EX) && HAVE_DECL_F_GETOWN_EX))
+# define F_GETOWN_EX 16
+#endif
+#if !(defined(F_GETOWNER_UIDS) || (defined(HAVE_DECL_F_GETOWNER_UIDS) && HAVE_DECL_F_GETOWNER_UIDS))
+# define F_GETOWNER_UIDS 17
+#endif
+#if !(defined(F_OFD_GETLK) || (defined(HAVE_DECL_F_OFD_GETLK) && HAVE_DECL_F_OFD_GETLK))
+# define F_OFD_GETLK 36
+#endif
+#if !(defined(F_OFD_SETLK) || (defined(HAVE_DECL_F_OFD_SETLK) && HAVE_DECL_F_OFD_SETLK))
+# define F_OFD_SETLK 37
+#endif
+#if !(defined(F_OFD_SETLKW) || (defined(HAVE_DECL_F_OFD_SETLKW) && HAVE_DECL_F_OFD_SETLKW))
+# define F_OFD_SETLKW 38
+#endif
+#if !(defined(F_SETLEASE) || (defined(HAVE_DECL_F_SETLEASE) && HAVE_DECL_F_SETLEASE))
+# define F_SETLEASE (1024 + 0)
+#endif
+#if !(defined(F_GETLEASE) || (defined(HAVE_DECL_F_GETLEASE) && HAVE_DECL_F_GETLEASE))
+# define F_GETLEASE (1024 + 1)
+#endif
+#if !(defined(F_NOTIFY) || (defined(HAVE_DECL_F_NOTIFY) && HAVE_DECL_F_NOTIFY))
+# define F_NOTIFY (1024 + 2)
+#endif
+#if !(defined(F_CANCELLK) || (defined(HAVE_DECL_F_CANCELLK) && HAVE_DECL_F_CANCELLK))
+# define F_CANCELLK (1024 + 5)
+#endif
+#if !(defined(F_DUPFD_CLOEXEC) || (defined(HAVE_DECL_F_DUPFD_CLOEXEC) && HAVE_DECL_F_DUPFD_CLOEXEC))
+# define F_DUPFD_CLOEXEC (1024 + 6)
+#endif
+#if !(defined(F_SETPIPE_SZ) || (defined(HAVE_DECL_F_SETPIPE_SZ) && HAVE_DECL_F_SETPIPE_SZ))
+# define F_SETPIPE_SZ (1024 + 7)
+#endif
+#if !(defined(F_GETPIPE_SZ) || (defined(HAVE_DECL_F_GETPIPE_SZ) && HAVE_DECL_F_GETPIPE_SZ))
+# define F_GETPIPE_SZ (1024 + 8)
+#endif
+#if !(defined(F_ADD_SEALS) || (defined(HAVE_DECL_F_ADD_SEALS) && HAVE_DECL_F_ADD_SEALS))
+# define F_ADD_SEALS (1024 + 9)
+#endif
+#if !(defined(F_GET_SEALS) || (defined(HAVE_DECL_F_GET_SEALS) && HAVE_DECL_F_GET_SEALS))
+# define F_GET_SEALS (1024 + 10)
+#endif
 
-static const struct xlat fcntlcmds[] = {
-#if defined(F_DUPFD) || (defined(HAVE_DECL_F_DUPFD) && HAVE_DECL_F_DUPFD)
+#ifdef IN_MPERS
+
+# error static const struct xlat fcntlcmds in mpers mode
+
+#else
+
+static
+const struct xlat fcntlcmds[] = {
+/* asm-generic/fcntl.h */
  XLAT(F_DUPFD),
-#endif
-#if defined(F_GETFD) || (defined(HAVE_DECL_F_GETFD) && HAVE_DECL_F_GETFD)
  XLAT(F_GETFD),
-#endif
-#if defined(F_SETFD) || (defined(HAVE_DECL_F_SETFD) && HAVE_DECL_F_SETFD)
  XLAT(F_SETFD),
-#endif
-#if defined(F_GETFL) || (defined(HAVE_DECL_F_GETFL) && HAVE_DECL_F_GETFL)
  XLAT(F_GETFL),
-#endif
-#if defined(F_SETFL) || (defined(HAVE_DECL_F_SETFL) && HAVE_DECL_F_SETFL)
  XLAT(F_SETFL),
-#endif
-#if defined(F_GETLK) || (defined(HAVE_DECL_F_GETLK) && HAVE_DECL_F_GETLK)
  XLAT(F_GETLK),
-#endif
-#if defined(F_SETLK) || (defined(HAVE_DECL_F_SETLK) && HAVE_DECL_F_SETLK)
  XLAT(F_SETLK),
-#endif
-#if defined(F_SETLKW) || (defined(HAVE_DECL_F_SETLKW) && HAVE_DECL_F_SETLKW)
  XLAT(F_SETLKW),
-#endif
-#if defined(F_GETOWN) || (defined(HAVE_DECL_F_GETOWN) && HAVE_DECL_F_GETOWN)
- XLAT(F_GETOWN),
-#endif
-#if defined(F_SETOWN) || (defined(HAVE_DECL_F_SETOWN) && HAVE_DECL_F_SETOWN)
  XLAT(F_SETOWN),
-#endif
-#if defined(F_RSETLK) || (defined(HAVE_DECL_F_RSETLK) && HAVE_DECL_F_RSETLK)
- XLAT(F_RSETLK),
-#endif
-#if defined(F_RSETLKW) || (defined(HAVE_DECL_F_RSETLKW) && HAVE_DECL_F_RSETLKW)
- XLAT(F_RSETLKW),
-#endif
-#if defined(F_RGETLK) || (defined(HAVE_DECL_F_RGETLK) && HAVE_DECL_F_RGETLK)
- XLAT(F_RGETLK),
-#endif
-#if defined(F_CNVT) || (defined(HAVE_DECL_F_CNVT) && HAVE_DECL_F_CNVT)
- XLAT(F_CNVT),
-#endif
-#if defined(F_SETSIG) || (defined(HAVE_DECL_F_SETSIG) && HAVE_DECL_F_SETSIG)
+ XLAT(F_GETOWN),
  XLAT(F_SETSIG),
-#endif
-#if defined(F_GETSIG) || (defined(HAVE_DECL_F_GETSIG) && HAVE_DECL_F_GETSIG)
  XLAT(F_GETSIG),
-#endif
-#if defined(F_CHKFL) || (defined(HAVE_DECL_F_CHKFL) && HAVE_DECL_F_CHKFL)
- XLAT(F_CHKFL),
-#endif
-#if defined(F_DUP2FD) || (defined(HAVE_DECL_F_DUP2FD) && HAVE_DECL_F_DUP2FD)
- XLAT(F_DUP2FD),
-#endif
-#if defined(F_ALLOCSP) || (defined(HAVE_DECL_F_ALLOCSP) && HAVE_DECL_F_ALLOCSP)
- XLAT(F_ALLOCSP),
-#endif
-#if defined(F_ISSTREAM) || (defined(HAVE_DECL_F_ISSTREAM) && HAVE_DECL_F_ISSTREAM)
- XLAT(F_ISSTREAM),
-#endif
-#if defined(F_PRIV) || (defined(HAVE_DECL_F_PRIV) && HAVE_DECL_F_PRIV)
- XLAT(F_PRIV),
-#endif
-#if defined(F_NPRIV) || (defined(HAVE_DECL_F_NPRIV) && HAVE_DECL_F_NPRIV)
- XLAT(F_NPRIV),
-#endif
-#if defined(F_QUOTACL) || (defined(HAVE_DECL_F_QUOTACL) && HAVE_DECL_F_QUOTACL)
- XLAT(F_QUOTACL),
-#endif
-#if defined(F_BLOCKS) || (defined(HAVE_DECL_F_BLOCKS) && HAVE_DECL_F_BLOCKS)
- XLAT(F_BLOCKS),
-#endif
-#if defined(F_BLKSIZE) || (defined(HAVE_DECL_F_BLKSIZE) && HAVE_DECL_F_BLKSIZE)
- XLAT(F_BLKSIZE),
-#endif
-#if defined(F_GETOWN) || (defined(HAVE_DECL_F_GETOWN) && HAVE_DECL_F_GETOWN)
- XLAT(F_GETOWN),
-#endif
-#if defined(F_SETOWN) || (defined(HAVE_DECL_F_SETOWN) && HAVE_DECL_F_SETOWN)
- XLAT(F_SETOWN),
-#endif
-#if defined(F_REVOKE) || (defined(HAVE_DECL_F_REVOKE) && HAVE_DECL_F_REVOKE)
- XLAT(F_REVOKE),
-#endif
-#if defined(F_SETLK) || (defined(HAVE_DECL_F_SETLK) && HAVE_DECL_F_SETLK)
- XLAT(F_SETLK),
-#endif
-#if defined(F_SETLKW) || (defined(HAVE_DECL_F_SETLKW) && HAVE_DECL_F_SETLKW)
- XLAT(F_SETLKW),
-#endif
-#if defined(F_GETLK) || (defined(HAVE_DECL_F_GETLK) && HAVE_DECL_F_GETLK)
- XLAT(F_GETLK),
-#endif
-#if defined(F_SETLK64) || (defined(HAVE_DECL_F_SETLK64) && HAVE_DECL_F_SETLK64)
- XLAT(F_SETLK64),
-#endif
-#if defined(F_SETLKW64) || (defined(HAVE_DECL_F_SETLKW64) && HAVE_DECL_F_SETLKW64)
- XLAT(F_SETLKW64),
-#endif
-#if defined(F_GETLK64) || (defined(HAVE_DECL_F_GETLK64) && HAVE_DECL_F_GETLK64)
- XLAT(F_GETLK64),
-#endif
-#if defined(F_SHARE) || (defined(HAVE_DECL_F_SHARE) && HAVE_DECL_F_SHARE)
- XLAT(F_SHARE),
-#endif
-#if defined(F_UNSHARE) || (defined(HAVE_DECL_F_UNSHARE) && HAVE_DECL_F_UNSHARE)
- XLAT(F_UNSHARE),
-#endif
-#if defined(F_SETLEASE) || (defined(HAVE_DECL_F_SETLEASE) && HAVE_DECL_F_SETLEASE)
+ XLAT(F_SETOWN_EX),
+ XLAT(F_GETOWN_EX),
+ XLAT(F_GETOWNER_UIDS),
+ XLAT(F_OFD_GETLK),
+ XLAT(F_OFD_SETLK),
+ XLAT(F_OFD_SETLKW),
+
+/* linux/fcntl.h */
  XLAT(F_SETLEASE),
-#endif
-#if defined(F_GETLEASE) || (defined(HAVE_DECL_F_GETLEASE) && HAVE_DECL_F_GETLEASE)
  XLAT(F_GETLEASE),
-#endif
-#if defined(F_NOTIFY) || (defined(HAVE_DECL_F_NOTIFY) && HAVE_DECL_F_NOTIFY)
  XLAT(F_NOTIFY),
-#endif
-#if defined(F_DUPFD_CLOEXEC) || (defined(HAVE_DECL_F_DUPFD_CLOEXEC) && HAVE_DECL_F_DUPFD_CLOEXEC)
+ XLAT(F_CANCELLK),
  XLAT(F_DUPFD_CLOEXEC),
-#endif
+ XLAT(F_SETPIPE_SZ),
+ XLAT(F_GETPIPE_SZ),
+ XLAT(F_ADD_SEALS),
+ XLAT(F_GET_SEALS),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/fdflags.h b/xlat/fdflags.h
index cd44cb6..8a5d03c 100644
--- a/xlat/fdflags.h
+++ b/xlat/fdflags.h
@@ -1,8 +1,17 @@
 /* Generated by ./xlat/gen.sh from ./xlat/fdflags.in; do not edit. */
 
-static const struct xlat fdflags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat fdflags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/flockcmds.h b/xlat/flockcmds.h
index ad8302a..2ccd714 100644
--- a/xlat/flockcmds.h
+++ b/xlat/flockcmds.h
@@ -1,17 +1,46 @@
 /* Generated by ./xlat/gen.sh from ./xlat/flockcmds.in; do not edit. */
+#if !(defined(LOCK_SH) || (defined(HAVE_DECL_LOCK_SH) && HAVE_DECL_LOCK_SH))
+# define LOCK_SH 1
+#endif
+#if !(defined(LOCK_EX) || (defined(HAVE_DECL_LOCK_EX) && HAVE_DECL_LOCK_EX))
+# define LOCK_EX 2
+#endif
+#if !(defined(LOCK_NB) || (defined(HAVE_DECL_LOCK_NB) && HAVE_DECL_LOCK_NB))
+# define LOCK_NB 4
+#endif
+#if !(defined(LOCK_UN) || (defined(HAVE_DECL_LOCK_UN) && HAVE_DECL_LOCK_UN))
+# define LOCK_UN 8
+#endif
+#if !(defined(LOCK_MAND) || (defined(HAVE_DECL_LOCK_MAND) && HAVE_DECL_LOCK_MAND))
+# define LOCK_MAND 32
+#endif
+#if !(defined(LOCK_RW) || (defined(HAVE_DECL_LOCK_RW) && HAVE_DECL_LOCK_RW))
+# define LOCK_RW 192
+#endif
+#if !(defined(LOCK_READ) || (defined(HAVE_DECL_LOCK_READ) && HAVE_DECL_LOCK_READ))
+# define LOCK_READ 64
+#endif
+#if !(defined(LOCK_WRITE) || (defined(HAVE_DECL_LOCK_WRITE) && HAVE_DECL_LOCK_WRITE))
+# define LOCK_WRITE 128
+#endif
 
-static const struct xlat flockcmds[] = {
-#if defined(LOCK_SH) || (defined(HAVE_DECL_LOCK_SH) && HAVE_DECL_LOCK_SH)
+#ifdef IN_MPERS
+
+# error static const struct xlat flockcmds in mpers mode
+
+#else
+
+static
+const struct xlat flockcmds[] = {
  XLAT(LOCK_SH),
-#endif
-#if defined(LOCK_EX) || (defined(HAVE_DECL_LOCK_EX) && HAVE_DECL_LOCK_EX)
  XLAT(LOCK_EX),
-#endif
-#if defined(LOCK_NB) || (defined(HAVE_DECL_LOCK_NB) && HAVE_DECL_LOCK_NB)
  XLAT(LOCK_NB),
-#endif
-#if defined(LOCK_UN) || (defined(HAVE_DECL_LOCK_UN) && HAVE_DECL_LOCK_UN)
  XLAT(LOCK_UN),
-#endif
+ XLAT(LOCK_MAND),
+ XLAT(LOCK_RW),
+ XLAT(LOCK_READ),
+ XLAT(LOCK_WRITE),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/fsmagic.h b/xlat/fsmagic.h
index 6a16baf..1ec892e 100644
--- a/xlat/fsmagic.h
+++ b/xlat/fsmagic.h
@@ -1,6 +1,13 @@
 /* Generated by ./xlat/gen.sh from ./xlat/fsmagic.in; do not edit. */
 
-static const struct xlat fsmagic[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat fsmagic in mpers mode
+
+#else
+
+static
+const struct xlat fsmagic[] = {
 /* sorted by value, suitable for bsearch(3) */
 { 0x0000002f,	"QNX4_SUPER_MAGIC"	},
 { 0x00000187,	"AUTOFS_SUPER_MAGIC"	},
@@ -71,3 +78,5 @@
 { 0xf995e849,	"HPFS_SUPER_MAGIC"	},
  /* this array should remain not NULL-terminated */
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/futexops.h b/xlat/futexops.h
index e992186..536b162 100644
--- a/xlat/futexops.h
+++ b/xlat/futexops.h
@@ -1,120 +1,129 @@
 /* Generated by ./xlat/gen.sh from ./xlat/futexops.in; do not edit. */
-
-static const struct xlat futexops[] = {
 #if !(defined(FUTEX_WAIT) || (defined(HAVE_DECL_FUTEX_WAIT) && HAVE_DECL_FUTEX_WAIT))
 # define FUTEX_WAIT 0
 #endif
- XLAT(FUTEX_WAIT),
 #if !(defined(FUTEX_WAKE) || (defined(HAVE_DECL_FUTEX_WAKE) && HAVE_DECL_FUTEX_WAKE))
 # define FUTEX_WAKE 1
 #endif
- XLAT(FUTEX_WAKE),
 #if !(defined(FUTEX_FD) || (defined(HAVE_DECL_FUTEX_FD) && HAVE_DECL_FUTEX_FD))
 # define FUTEX_FD 2
 #endif
- XLAT(FUTEX_FD),
 #if !(defined(FUTEX_REQUEUE) || (defined(HAVE_DECL_FUTEX_REQUEUE) && HAVE_DECL_FUTEX_REQUEUE))
 # define FUTEX_REQUEUE 3
 #endif
- XLAT(FUTEX_REQUEUE),
 #if !(defined(FUTEX_CMP_REQUEUE) || (defined(HAVE_DECL_FUTEX_CMP_REQUEUE) && HAVE_DECL_FUTEX_CMP_REQUEUE))
 # define FUTEX_CMP_REQUEUE 4
 #endif
- XLAT(FUTEX_CMP_REQUEUE),
 #if !(defined(FUTEX_WAKE_OP) || (defined(HAVE_DECL_FUTEX_WAKE_OP) && HAVE_DECL_FUTEX_WAKE_OP))
 # define FUTEX_WAKE_OP 5
 #endif
- XLAT(FUTEX_WAKE_OP),
 #if !(defined(FUTEX_LOCK_PI) || (defined(HAVE_DECL_FUTEX_LOCK_PI) && HAVE_DECL_FUTEX_LOCK_PI))
 # define FUTEX_LOCK_PI 6
 #endif
- XLAT(FUTEX_LOCK_PI),
 #if !(defined(FUTEX_UNLOCK_PI) || (defined(HAVE_DECL_FUTEX_UNLOCK_PI) && HAVE_DECL_FUTEX_UNLOCK_PI))
 # define FUTEX_UNLOCK_PI 7
 #endif
- XLAT(FUTEX_UNLOCK_PI),
 #if !(defined(FUTEX_TRYLOCK_PI) || (defined(HAVE_DECL_FUTEX_TRYLOCK_PI) && HAVE_DECL_FUTEX_TRYLOCK_PI))
 # define FUTEX_TRYLOCK_PI 8
 #endif
- XLAT(FUTEX_TRYLOCK_PI),
 #if !(defined(FUTEX_WAIT_BITSET) || (defined(HAVE_DECL_FUTEX_WAIT_BITSET) && HAVE_DECL_FUTEX_WAIT_BITSET))
 # define FUTEX_WAIT_BITSET 9
 #endif
- XLAT(FUTEX_WAIT_BITSET),
 #if !(defined(FUTEX_WAKE_BITSET) || (defined(HAVE_DECL_FUTEX_WAKE_BITSET) && HAVE_DECL_FUTEX_WAKE_BITSET))
 # define FUTEX_WAKE_BITSET 10
 #endif
- XLAT(FUTEX_WAKE_BITSET),
 #if !(defined(FUTEX_WAIT_REQUEUE_PI) || (defined(HAVE_DECL_FUTEX_WAIT_REQUEUE_PI) && HAVE_DECL_FUTEX_WAIT_REQUEUE_PI))
 # define FUTEX_WAIT_REQUEUE_PI 11
 #endif
- XLAT(FUTEX_WAIT_REQUEUE_PI),
 #if !(defined(FUTEX_CMP_REQUEUE_PI) || (defined(HAVE_DECL_FUTEX_CMP_REQUEUE_PI) && HAVE_DECL_FUTEX_CMP_REQUEUE_PI))
 # define FUTEX_CMP_REQUEUE_PI 12
 #endif
- XLAT(FUTEX_CMP_REQUEUE_PI),
 #if !(defined(FUTEX_WAIT_PRIVATE) || (defined(HAVE_DECL_FUTEX_WAIT_PRIVATE) && HAVE_DECL_FUTEX_WAIT_PRIVATE))
 # define FUTEX_WAIT_PRIVATE (FUTEX_WAIT | FUTEX_PRIVATE_FLAG)
 #endif
- XLAT(FUTEX_WAIT_PRIVATE),
 #if !(defined(FUTEX_WAKE_PRIVATE) || (defined(HAVE_DECL_FUTEX_WAKE_PRIVATE) && HAVE_DECL_FUTEX_WAKE_PRIVATE))
 # define FUTEX_WAKE_PRIVATE (FUTEX_WAKE | FUTEX_PRIVATE_FLAG)
 #endif
- XLAT(FUTEX_WAKE_PRIVATE),
-#if defined(FUTEX_FD) || (defined(HAVE_DECL_FUTEX_FD) && HAVE_DECL_FUTEX_FD)
- XLAT(FUTEX_FD|FUTEX_PRIVATE_FLAG),
-#endif
 #if !(defined(FUTEX_REQUEUE_PRIVATE) || (defined(HAVE_DECL_FUTEX_REQUEUE_PRIVATE) && HAVE_DECL_FUTEX_REQUEUE_PRIVATE))
 # define FUTEX_REQUEUE_PRIVATE (FUTEX_REQUEUE | FUTEX_PRIVATE_FLAG)
 #endif
- XLAT(FUTEX_REQUEUE_PRIVATE),
 #if !(defined(FUTEX_CMP_REQUEUE_PRIVATE) || (defined(HAVE_DECL_FUTEX_CMP_REQUEUE_PRIVATE) && HAVE_DECL_FUTEX_CMP_REQUEUE_PRIVATE))
 # define FUTEX_CMP_REQUEUE_PRIVATE (FUTEX_CMP_REQUEUE | FUTEX_PRIVATE_FLAG)
 #endif
- XLAT(FUTEX_CMP_REQUEUE_PRIVATE),
 #if !(defined(FUTEX_WAKE_OP_PRIVATE) || (defined(HAVE_DECL_FUTEX_WAKE_OP_PRIVATE) && HAVE_DECL_FUTEX_WAKE_OP_PRIVATE))
 # define FUTEX_WAKE_OP_PRIVATE (FUTEX_WAKE_OP | FUTEX_PRIVATE_FLAG)
 #endif
- XLAT(FUTEX_WAKE_OP_PRIVATE),
 #if !(defined(FUTEX_LOCK_PI_PRIVATE) || (defined(HAVE_DECL_FUTEX_LOCK_PI_PRIVATE) && HAVE_DECL_FUTEX_LOCK_PI_PRIVATE))
 # define FUTEX_LOCK_PI_PRIVATE (FUTEX_LOCK_PI | FUTEX_PRIVATE_FLAG)
 #endif
- XLAT(FUTEX_LOCK_PI_PRIVATE),
 #if !(defined(FUTEX_UNLOCK_PI_PRIVATE) || (defined(HAVE_DECL_FUTEX_UNLOCK_PI_PRIVATE) && HAVE_DECL_FUTEX_UNLOCK_PI_PRIVATE))
 # define FUTEX_UNLOCK_PI_PRIVATE (FUTEX_UNLOCK_PI | FUTEX_PRIVATE_FLAG)
 #endif
- XLAT(FUTEX_UNLOCK_PI_PRIVATE),
 #if !(defined(FUTEX_TRYLOCK_PI_PRIVATE) || (defined(HAVE_DECL_FUTEX_TRYLOCK_PI_PRIVATE) && HAVE_DECL_FUTEX_TRYLOCK_PI_PRIVATE))
 # define FUTEX_TRYLOCK_PI_PRIVATE (FUTEX_TRYLOCK_PI | FUTEX_PRIVATE_FLAG)
 #endif
- XLAT(FUTEX_TRYLOCK_PI_PRIVATE),
 #if !(defined(FUTEX_WAIT_BITSET_PRIVATE) || (defined(HAVE_DECL_FUTEX_WAIT_BITSET_PRIVATE) && HAVE_DECL_FUTEX_WAIT_BITSET_PRIVATE))
 # define FUTEX_WAIT_BITSET_PRIVATE (FUTEX_WAIT_BITSET | FUTEX_PRIVATE_FLAG)
 #endif
- XLAT(FUTEX_WAIT_BITSET_PRIVATE),
 #if !(defined(FUTEX_WAKE_BITSET_PRIVATE) || (defined(HAVE_DECL_FUTEX_WAKE_BITSET_PRIVATE) && HAVE_DECL_FUTEX_WAKE_BITSET_PRIVATE))
 # define FUTEX_WAKE_BITSET_PRIVATE (FUTEX_WAKE_BITSET | FUTEX_PRIVATE_FLAG)
 #endif
- XLAT(FUTEX_WAKE_BITSET_PRIVATE),
 #if !(defined(FUTEX_WAIT_REQUEUE_PI_PRIVATE) || (defined(HAVE_DECL_FUTEX_WAIT_REQUEUE_PI_PRIVATE) && HAVE_DECL_FUTEX_WAIT_REQUEUE_PI_PRIVATE))
 # define FUTEX_WAIT_REQUEUE_PI_PRIVATE (FUTEX_WAIT_REQUEUE_PI | FUTEX_PRIVATE_FLAG)
 #endif
- XLAT(FUTEX_WAIT_REQUEUE_PI_PRIVATE),
 #if !(defined(FUTEX_CMP_REQUEUE_PI_PRIVATE) || (defined(HAVE_DECL_FUTEX_CMP_REQUEUE_PI_PRIVATE) && HAVE_DECL_FUTEX_CMP_REQUEUE_PI_PRIVATE))
 # define FUTEX_CMP_REQUEUE_PI_PRIVATE (FUTEX_CMP_REQUEUE_PI | FUTEX_PRIVATE_FLAG)
 #endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat futexops in mpers mode
+
+#else
+
+static
+const struct xlat futexops[] = {
+ XLAT(FUTEX_WAIT),
+ XLAT(FUTEX_WAKE),
+ XLAT(FUTEX_FD),
+ XLAT(FUTEX_REQUEUE),
+ XLAT(FUTEX_CMP_REQUEUE),
+ XLAT(FUTEX_WAKE_OP),
+ XLAT(FUTEX_LOCK_PI),
+ XLAT(FUTEX_UNLOCK_PI),
+ XLAT(FUTEX_TRYLOCK_PI),
+ XLAT(FUTEX_WAIT_BITSET),
+ XLAT(FUTEX_WAKE_BITSET),
+ XLAT(FUTEX_WAIT_REQUEUE_PI),
+ XLAT(FUTEX_CMP_REQUEUE_PI),
+ XLAT(FUTEX_WAIT_PRIVATE),
+ XLAT(FUTEX_WAKE_PRIVATE),
+#if defined(FUTEX_FD) || (defined(HAVE_DECL_FUTEX_FD) && HAVE_DECL_FUTEX_FD)
+  XLAT(FUTEX_FD|FUTEX_PRIVATE_FLAG),
+#endif
+ XLAT(FUTEX_REQUEUE_PRIVATE),
+ XLAT(FUTEX_CMP_REQUEUE_PRIVATE),
+ XLAT(FUTEX_WAKE_OP_PRIVATE),
+ XLAT(FUTEX_LOCK_PI_PRIVATE),
+ XLAT(FUTEX_UNLOCK_PI_PRIVATE),
+ XLAT(FUTEX_TRYLOCK_PI_PRIVATE),
+ XLAT(FUTEX_WAIT_BITSET_PRIVATE),
+ XLAT(FUTEX_WAKE_BITSET_PRIVATE),
+ XLAT(FUTEX_WAIT_REQUEUE_PI_PRIVATE),
  XLAT(FUTEX_CMP_REQUEUE_PI_PRIVATE),
 #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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/futexwakecmps.h b/xlat/futexwakecmps.h
index 834c7c8..379e0a0 100644
--- a/xlat/futexwakecmps.h
+++ b/xlat/futexwakecmps.h
@@ -1,29 +1,38 @@
 /* Generated by ./xlat/gen.sh from ./xlat/futexwakecmps.in; do not edit. */
-
-static const struct xlat futexwakecmps[] = {
 #if !(defined(FUTEX_OP_CMP_EQ) || (defined(HAVE_DECL_FUTEX_OP_CMP_EQ) && HAVE_DECL_FUTEX_OP_CMP_EQ))
 # define FUTEX_OP_CMP_EQ 0
 #endif
- XLAT(FUTEX_OP_CMP_EQ),
 #if !(defined(FUTEX_OP_CMP_NE) || (defined(HAVE_DECL_FUTEX_OP_CMP_NE) && HAVE_DECL_FUTEX_OP_CMP_NE))
 # define FUTEX_OP_CMP_NE 1
 #endif
- XLAT(FUTEX_OP_CMP_NE),
 #if !(defined(FUTEX_OP_CMP_LT) || (defined(HAVE_DECL_FUTEX_OP_CMP_LT) && HAVE_DECL_FUTEX_OP_CMP_LT))
 # define FUTEX_OP_CMP_LT 2
 #endif
- XLAT(FUTEX_OP_CMP_LT),
 #if !(defined(FUTEX_OP_CMP_LE) || (defined(HAVE_DECL_FUTEX_OP_CMP_LE) && HAVE_DECL_FUTEX_OP_CMP_LE))
 # define FUTEX_OP_CMP_LE 3
 #endif
- XLAT(FUTEX_OP_CMP_LE),
 #if !(defined(FUTEX_OP_CMP_GT) || (defined(HAVE_DECL_FUTEX_OP_CMP_GT) && HAVE_DECL_FUTEX_OP_CMP_GT))
 # define FUTEX_OP_CMP_GT 4
 #endif
- XLAT(FUTEX_OP_CMP_GT),
 #if !(defined(FUTEX_OP_CMP_GE) || (defined(HAVE_DECL_FUTEX_OP_CMP_GE) && HAVE_DECL_FUTEX_OP_CMP_GE))
 # define FUTEX_OP_CMP_GE 5
 #endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat futexwakecmps in mpers mode
+
+#else
+
+static
+const struct xlat futexwakecmps[] = {
+ XLAT(FUTEX_OP_CMP_EQ),
+ XLAT(FUTEX_OP_CMP_NE),
+ XLAT(FUTEX_OP_CMP_LT),
+ XLAT(FUTEX_OP_CMP_LE),
+ XLAT(FUTEX_OP_CMP_GT),
  XLAT(FUTEX_OP_CMP_GE),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/futexwakeops.h b/xlat/futexwakeops.h
index 5604103..cd9b6b5 100644
--- a/xlat/futexwakeops.h
+++ b/xlat/futexwakeops.h
@@ -1,25 +1,34 @@
 /* Generated by ./xlat/gen.sh from ./xlat/futexwakeops.in; do not edit. */
-
-static const struct xlat futexwakeops[] = {
 #if !(defined(FUTEX_OP_SET) || (defined(HAVE_DECL_FUTEX_OP_SET) && HAVE_DECL_FUTEX_OP_SET))
 # define FUTEX_OP_SET 0
 #endif
- XLAT(FUTEX_OP_SET),
 #if !(defined(FUTEX_OP_ADD) || (defined(HAVE_DECL_FUTEX_OP_ADD) && HAVE_DECL_FUTEX_OP_ADD))
 # define FUTEX_OP_ADD 1
 #endif
- XLAT(FUTEX_OP_ADD),
 #if !(defined(FUTEX_OP_OR) || (defined(HAVE_DECL_FUTEX_OP_OR) && HAVE_DECL_FUTEX_OP_OR))
 # define FUTEX_OP_OR 2
 #endif
- XLAT(FUTEX_OP_OR),
 #if !(defined(FUTEX_OP_ANDN) || (defined(HAVE_DECL_FUTEX_OP_ANDN) && HAVE_DECL_FUTEX_OP_ANDN))
 # define FUTEX_OP_ANDN 3
 #endif
- XLAT(FUTEX_OP_ANDN),
 #if !(defined(FUTEX_OP_XOR) || (defined(HAVE_DECL_FUTEX_OP_XOR) && HAVE_DECL_FUTEX_OP_XOR))
 # define FUTEX_OP_XOR 4
 #endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat futexwakeops in mpers mode
+
+#else
+
+static
+const struct xlat futexwakeops[] = {
+ XLAT(FUTEX_OP_SET),
+ XLAT(FUTEX_OP_ADD),
+ XLAT(FUTEX_OP_OR),
+ XLAT(FUTEX_OP_ANDN),
  XLAT(FUTEX_OP_XOR),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/getrandom_flags.h b/xlat/getrandom_flags.h
index 13f1e63..6b88199 100644
--- a/xlat/getrandom_flags.h
+++ b/xlat/getrandom_flags.h
@@ -1,16 +1,22 @@
 /* Generated by ./xlat/gen.sh from ./xlat/getrandom_flags.in; do not edit. */
-
-static const struct xlat getrandom_flags[] = {
-
-#ifndef GRND_NONBLOCK
+#if !(defined(GRND_NONBLOCK) || (defined(HAVE_DECL_GRND_NONBLOCK) && HAVE_DECL_GRND_NONBLOCK))
 # define GRND_NONBLOCK 1
 #endif
-
-#ifndef GRND_RANDOM
+#if !(defined(GRND_RANDOM) || (defined(HAVE_DECL_GRND_RANDOM) && HAVE_DECL_GRND_RANDOM))
 # define GRND_RANDOM 2
 #endif
 
+#ifdef IN_MPERS
+
+# error static const struct xlat getrandom_flags in mpers mode
+
+#else
+
+static
+const struct xlat getrandom_flags[] = {
  XLAT(GRND_NONBLOCK),
  XLAT(GRND_RANDOM),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/getsockipoptions.h b/xlat/getsockipoptions.h
new file mode 100644
index 0000000..cd043a1
--- /dev/null
+++ b/xlat/getsockipoptions.h
@@ -0,0 +1,83 @@
+/* Generated by ./xlat/gen.sh from ./xlat/getsockipoptions.in; do not edit. */
+
+#ifdef IN_MPERS
+
+# error static const struct xlat getsockipoptions in mpers mode
+
+#else
+
+static
+const struct xlat getsockipoptions[] = {
+/*
+* Options specific to getsockopt(SOL_IP).
+* Common {g,s}etsockopt(SOL_IP) options
+* should be in sockipoptions.in instead.
+*/
+
+#if defined(ARPT_SO_GET_INFO) || (defined(HAVE_DECL_ARPT_SO_GET_INFO) && HAVE_DECL_ARPT_SO_GET_INFO)
+  XLAT(ARPT_SO_GET_INFO),
+#endif
+#if defined(ARPT_SO_GET_ENTRIES) || (defined(HAVE_DECL_ARPT_SO_GET_ENTRIES) && HAVE_DECL_ARPT_SO_GET_ENTRIES)
+  XLAT(ARPT_SO_GET_ENTRIES),
+#endif
+#if defined(ARPT_SO_GET_REVISION_MATCH) || (defined(HAVE_DECL_ARPT_SO_GET_REVISION_MATCH) && HAVE_DECL_ARPT_SO_GET_REVISION_MATCH)
+  XLAT(ARPT_SO_GET_REVISION_MATCH),
+#endif
+#if defined(ARPT_SO_GET_REVISION_TARGET) || (defined(HAVE_DECL_ARPT_SO_GET_REVISION_TARGET) && HAVE_DECL_ARPT_SO_GET_REVISION_TARGET)
+  XLAT(ARPT_SO_GET_REVISION_TARGET),
+#endif
+
+#if defined(EBT_SO_GET_INFO) || (defined(HAVE_DECL_EBT_SO_GET_INFO) && HAVE_DECL_EBT_SO_GET_INFO)
+  XLAT(EBT_SO_GET_INFO),
+#endif
+#if defined(EBT_SO_GET_ENTRIES) || (defined(HAVE_DECL_EBT_SO_GET_ENTRIES) && HAVE_DECL_EBT_SO_GET_ENTRIES)
+  XLAT(EBT_SO_GET_ENTRIES),
+#endif
+#if defined(EBT_SO_GET_INIT_INFO) || (defined(HAVE_DECL_EBT_SO_GET_INIT_INFO) && HAVE_DECL_EBT_SO_GET_INIT_INFO)
+  XLAT(EBT_SO_GET_INIT_INFO),
+#endif
+#if defined(EBT_SO_GET_INIT_ENTRIES) || (defined(HAVE_DECL_EBT_SO_GET_INIT_ENTRIES) && HAVE_DECL_EBT_SO_GET_INIT_ENTRIES)
+  XLAT(EBT_SO_GET_INIT_ENTRIES),
+#endif
+
+#if defined(IP_VS_SO_GET_VERSION) || (defined(HAVE_DECL_IP_VS_SO_GET_VERSION) && HAVE_DECL_IP_VS_SO_GET_VERSION)
+  XLAT(IP_VS_SO_GET_VERSION),
+#endif
+#if defined(IP_VS_SO_GET_INFO) || (defined(HAVE_DECL_IP_VS_SO_GET_INFO) && HAVE_DECL_IP_VS_SO_GET_INFO)
+  XLAT(IP_VS_SO_GET_INFO),
+#endif
+#if defined(IP_VS_SO_GET_SERVICES) || (defined(HAVE_DECL_IP_VS_SO_GET_SERVICES) && HAVE_DECL_IP_VS_SO_GET_SERVICES)
+  XLAT(IP_VS_SO_GET_SERVICES),
+#endif
+#if defined(IP_VS_SO_GET_SERVICE) || (defined(HAVE_DECL_IP_VS_SO_GET_SERVICE) && HAVE_DECL_IP_VS_SO_GET_SERVICE)
+  XLAT(IP_VS_SO_GET_SERVICE),
+#endif
+#if defined(IP_VS_SO_GET_DESTS) || (defined(HAVE_DECL_IP_VS_SO_GET_DESTS) && HAVE_DECL_IP_VS_SO_GET_DESTS)
+  XLAT(IP_VS_SO_GET_DESTS),
+#endif
+#if defined(IP_VS_SO_GET_DEST) || (defined(HAVE_DECL_IP_VS_SO_GET_DEST) && HAVE_DECL_IP_VS_SO_GET_DEST)
+  XLAT(IP_VS_SO_GET_DEST),
+#endif
+#if defined(IP_VS_SO_GET_TIMEOUT) || (defined(HAVE_DECL_IP_VS_SO_GET_TIMEOUT) && HAVE_DECL_IP_VS_SO_GET_TIMEOUT)
+  XLAT(IP_VS_SO_GET_TIMEOUT),
+#endif
+#if defined(IP_VS_SO_GET_DAEMON) || (defined(HAVE_DECL_IP_VS_SO_GET_DAEMON) && HAVE_DECL_IP_VS_SO_GET_DAEMON)
+  XLAT(IP_VS_SO_GET_DAEMON),
+#endif
+
+#if defined(IPT_SO_GET_INFO) || (defined(HAVE_DECL_IPT_SO_GET_INFO) && HAVE_DECL_IPT_SO_GET_INFO)
+  XLAT(IPT_SO_GET_INFO),
+#endif
+#if defined(IPT_SO_GET_ENTRIES) || (defined(HAVE_DECL_IPT_SO_GET_ENTRIES) && HAVE_DECL_IPT_SO_GET_ENTRIES)
+  XLAT(IPT_SO_GET_ENTRIES),
+#endif
+#if defined(IPT_SO_GET_REVISION_MATCH) || (defined(HAVE_DECL_IPT_SO_GET_REVISION_MATCH) && HAVE_DECL_IPT_SO_GET_REVISION_MATCH)
+  XLAT(IPT_SO_GET_REVISION_MATCH),
+#endif
+#if defined(IPT_SO_GET_REVISION_TARGET) || (defined(HAVE_DECL_IPT_SO_GET_REVISION_TARGET) && HAVE_DECL_IPT_SO_GET_REVISION_TARGET)
+  XLAT(IPT_SO_GET_REVISION_TARGET),
+#endif
+ XLAT_END
+};
+
+#endif /* !IN_MPERS */
diff --git a/xlat/getsockipv6options.h b/xlat/getsockipv6options.h
new file mode 100644
index 0000000..402be18
--- /dev/null
+++ b/xlat/getsockipv6options.h
@@ -0,0 +1,32 @@
+/* Generated by ./xlat/gen.sh from ./xlat/getsockipv6options.in; do not edit. */
+
+#ifdef IN_MPERS
+
+# error static const struct xlat getsockipv6options in mpers mode
+
+#else
+
+static
+const struct xlat getsockipv6options[] = {
+/*
+* Options specific to getsockopt(SOL_IPV6).
+* Common {g,s}etsockopt(SOL_IPV6) options
+* should be in sockipv6options.in instead.
+*/
+
+#if defined(IP6T_SO_GET_INFO) || (defined(HAVE_DECL_IP6T_SO_GET_INFO) && HAVE_DECL_IP6T_SO_GET_INFO)
+  XLAT(IP6T_SO_GET_INFO),
+#endif
+#if defined(IP6T_SO_GET_ENTRIES) || (defined(HAVE_DECL_IP6T_SO_GET_ENTRIES) && HAVE_DECL_IP6T_SO_GET_ENTRIES)
+  XLAT(IP6T_SO_GET_ENTRIES),
+#endif
+#if defined(IP6T_SO_GET_REVISION_MATCH) || (defined(HAVE_DECL_IP6T_SO_GET_REVISION_MATCH) && HAVE_DECL_IP6T_SO_GET_REVISION_MATCH)
+  XLAT(IP6T_SO_GET_REVISION_MATCH),
+#endif
+#if defined(IP6T_SO_GET_REVISION_TARGET) || (defined(HAVE_DECL_IP6T_SO_GET_REVISION_TARGET) && HAVE_DECL_IP6T_SO_GET_REVISION_TARGET)
+  XLAT(IP6T_SO_GET_REVISION_TARGET),
+#endif
+ XLAT_END
+};
+
+#endif /* !IN_MPERS */
diff --git a/xlat/icmpfilterflags.h b/xlat/icmpfilterflags.h
index cd1f184..013eb4d 100644
--- a/xlat/icmpfilterflags.h
+++ b/xlat/icmpfilterflags.h
@@ -1,6 +1,13 @@
 /* Generated by ./xlat/gen.sh from ./xlat/icmpfilterflags.in; do not edit. */
 
-static const struct xlat icmpfilterflags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat icmpfilterflags in mpers mode
+
+#else
+
+static
+const struct xlat icmpfilterflags[] = {
 #if defined(ICMP_ECHOREPLY) || (defined(HAVE_DECL_ICMP_ECHOREPLY) && HAVE_DECL_ICMP_ECHOREPLY)
   { 1<<ICMP_ECHOREPLY, "ICMP_ECHOREPLY" },
 #endif
@@ -42,3 +49,5 @@
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/if_dqblk_valid.h b/xlat/if_dqblk_valid.h
index 112251b..77f77e6 100644
--- a/xlat/if_dqblk_valid.h
+++ b/xlat/if_dqblk_valid.h
@@ -1,23 +1,32 @@
 /* Generated by ./xlat/gen.sh from ./xlat/if_dqblk_valid.in; do not edit. */
 
-static const struct xlat if_dqblk_valid[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat if_dqblk_valid in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/if_dqinfo_valid.h b/xlat/if_dqinfo_valid.h
index 982213f..b041dbd 100644
--- a/xlat/if_dqinfo_valid.h
+++ b/xlat/if_dqinfo_valid.h
@@ -1,14 +1,23 @@
 /* Generated by ./xlat/gen.sh from ./xlat/if_dqinfo_valid.in; do not edit. */
 
-static const struct xlat if_dqinfo_valid[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat if_dqinfo_valid in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/iffflags.h b/xlat/iffflags.h
index c37bc84..5047b65 100644
--- a/xlat/iffflags.h
+++ b/xlat/iffflags.h
@@ -1,50 +1,59 @@
 /* Generated by ./xlat/gen.sh from ./xlat/iffflags.in; do not edit. */
 
-static const struct xlat iffflags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat iffflags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/inet_protocols.h b/xlat/inet_protocols.h
index 5e969ff..73d1133 100644
--- a/xlat/inet_protocols.h
+++ b/xlat/inet_protocols.h
@@ -1,101 +1,113 @@
 /* Generated by ./xlat/gen.sh from ./xlat/inet_protocols.in; do not edit. */
 
-static const struct xlat inet_protocols[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat inet_protocols in mpers mode
+
+#else
+
+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_MPLS) || (defined(HAVE_DECL_IPPROTO_MPLS) && HAVE_DECL_IPPROTO_MPLS)
+  XLAT(IPPROTO_MPLS),
 #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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/inotify_flags.h b/xlat/inotify_flags.h
index 27e4f64..5638f5b 100644
--- a/xlat/inotify_flags.h
+++ b/xlat/inotify_flags.h
@@ -1,89 +1,98 @@
 /* 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))
 # define IN_ACCESS 0x00000001
 #endif
- XLAT(IN_ACCESS),
 #if !(defined(IN_MODIFY) || (defined(HAVE_DECL_IN_MODIFY) && HAVE_DECL_IN_MODIFY))
 # define IN_MODIFY 0x00000002
 #endif
- XLAT(IN_MODIFY),
 #if !(defined(IN_ATTRIB) || (defined(HAVE_DECL_IN_ATTRIB) && HAVE_DECL_IN_ATTRIB))
 # define IN_ATTRIB 0x00000004
 #endif
- 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
- 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
- XLAT(IN_CLOSE_NOWRITE),
 #if !(defined(IN_OPEN) || (defined(HAVE_DECL_IN_OPEN) && HAVE_DECL_IN_OPEN))
 # define IN_OPEN 0x00000020
 #endif
- 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
- 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
- XLAT(IN_MOVED_TO),
 #if !(defined(IN_CREATE) || (defined(HAVE_DECL_IN_CREATE) && HAVE_DECL_IN_CREATE))
 # define IN_CREATE 0x00000100
 #endif
- XLAT(IN_CREATE),
 #if !(defined(IN_DELETE) || (defined(HAVE_DECL_IN_DELETE) && HAVE_DECL_IN_DELETE))
 # define IN_DELETE 0x00000200
 #endif
- 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
- 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
- XLAT(IN_MOVE_SELF),
 #if !(defined(IN_UNMOUNT) || (defined(HAVE_DECL_IN_UNMOUNT) && HAVE_DECL_IN_UNMOUNT))
 # define IN_UNMOUNT 0x00002000
 #endif
- 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
- XLAT(IN_Q_OVERFLOW),
 #if !(defined(IN_IGNORED) || (defined(HAVE_DECL_IN_IGNORED) && HAVE_DECL_IN_IGNORED))
 # define IN_IGNORED 0x00008000
 #endif
- XLAT(IN_IGNORED),
 #if !(defined(IN_ONLYDIR) || (defined(HAVE_DECL_IN_ONLYDIR) && HAVE_DECL_IN_ONLYDIR))
 # define IN_ONLYDIR 0x01000000
 #endif
- 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
- 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
- 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
- XLAT(IN_MASK_ADD),
 #if !(defined(IN_ISDIR) || (defined(HAVE_DECL_IN_ISDIR) && HAVE_DECL_IN_ISDIR))
 # define IN_ISDIR 0x40000000
 #endif
- XLAT(IN_ISDIR),
 #if !(defined(IN_ONESHOT) || (defined(HAVE_DECL_IN_ONESHOT) && HAVE_DECL_IN_ONESHOT))
 # define IN_ONESHOT 0x80000000
 #endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat inotify_flags in mpers mode
+
+#else
+
+static
+const struct xlat inotify_flags[] = {
+ XLAT(IN_ACCESS),
+ XLAT(IN_MODIFY),
+ XLAT(IN_ATTRIB),
+ XLAT(IN_CLOSE_WRITE),
+ XLAT(IN_CLOSE_NOWRITE),
+ XLAT(IN_OPEN),
+ XLAT(IN_MOVED_FROM),
+ XLAT(IN_MOVED_TO),
+ XLAT(IN_CREATE),
+ XLAT(IN_DELETE),
+ XLAT(IN_DELETE_SELF),
+ XLAT(IN_MOVE_SELF),
+ XLAT(IN_UNMOUNT),
+ XLAT(IN_Q_OVERFLOW),
+ XLAT(IN_IGNORED),
+ XLAT(IN_ONLYDIR),
+ XLAT(IN_DONT_FOLLOW),
+ XLAT(IN_EXCL_UNLINK),
+ XLAT(IN_MASK_ADD),
+ XLAT(IN_ISDIR),
  XLAT(IN_ONESHOT),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/inotify_init_flags.h b/xlat/inotify_init_flags.h
index 26dafa7..80991f6 100644
--- a/xlat/inotify_init_flags.h
+++ b/xlat/inotify_init_flags.h
@@ -1,11 +1,20 @@
 /* Generated by ./xlat/gen.sh from ./xlat/inotify_init_flags.in; do not edit. */
 
-static const struct xlat inotify_init_flags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat inotify_init_flags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/ioctl_dirs.h b/xlat/ioctl_dirs.h
index 56e3573..14bb3e4 100644
--- a/xlat/ioctl_dirs.h
+++ b/xlat/ioctl_dirs.h
@@ -1,14 +1,23 @@
 /* Generated by ./xlat/gen.sh from ./xlat/ioctl_dirs.in; do not edit. */
 
-static const struct xlat ioctl_dirs[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat ioctl_dirs in mpers mode
+
+#else
+
+static
+const struct xlat ioctl_dirs[] = {
 #if defined(_IOC_READ) || (defined(HAVE_DECL__IOC_READ) && HAVE_DECL__IOC_READ)
- XLAT(_IOC_READ),
+  XLAT(_IOC_READ),
 #endif
 #if defined(_IOC_WRITE) || (defined(HAVE_DECL__IOC_WRITE) && HAVE_DECL__IOC_WRITE)
- XLAT(_IOC_WRITE),
+  XLAT(_IOC_WRITE),
 #endif
 #if defined(_IOC_NONE) || (defined(HAVE_DECL__IOC_NONE) && HAVE_DECL__IOC_NONE)
- XLAT(_IOC_NONE),
+  XLAT(_IOC_NONE),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/ioprio_class.h b/xlat/ioprio_class.h
index c9073e8..3e4f893 100644
--- a/xlat/ioprio_class.h
+++ b/xlat/ioprio_class.h
@@ -1,9 +1,18 @@
 /* Generated by ./xlat/gen.sh from ./xlat/ioprio_class.in; do not edit. */
 
-static const struct xlat ioprio_class[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat ioprio_class in mpers mode
+
+#else
+
+static
+const struct xlat ioprio_class[] = {
  XLAT(IOPRIO_CLASS_NONE),
  XLAT(IOPRIO_CLASS_RT),
  XLAT(IOPRIO_CLASS_BE),
  XLAT(IOPRIO_CLASS_IDLE),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/ioprio_who.h b/xlat/ioprio_who.h
index 7aa28c5..b7880ca 100644
--- a/xlat/ioprio_who.h
+++ b/xlat/ioprio_who.h
@@ -1,8 +1,17 @@
 /* Generated by ./xlat/gen.sh from ./xlat/ioprio_who.in; do not edit. */
 
-static const struct xlat ioprio_who[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat ioprio_who in mpers mode
+
+#else
+
+static
+const struct xlat ioprio_who[] = {
  XLAT(IOPRIO_WHO_PROCESS),
  XLAT(IOPRIO_WHO_PGRP),
  XLAT(IOPRIO_WHO_USER),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/ip_cmsg_types.h b/xlat/ip_cmsg_types.h
new file mode 100644
index 0000000..979d295
--- /dev/null
+++ b/xlat/ip_cmsg_types.h
@@ -0,0 +1,49 @@
+/* Generated by ./xlat/gen.sh from ./xlat/ip_cmsg_types.in; do not edit. */
+#if !(defined(IP_TOS) || (defined(HAVE_DECL_IP_TOS) && HAVE_DECL_IP_TOS))
+# define IP_TOS 1
+#endif
+#if !(defined(IP_TTL) || (defined(HAVE_DECL_IP_TTL) && HAVE_DECL_IP_TTL))
+# define IP_TTL 2
+#endif
+#if !(defined(IP_RECVOPTS) || (defined(HAVE_DECL_IP_RECVOPTS) && HAVE_DECL_IP_RECVOPTS))
+# define IP_RECVOPTS 6
+#endif
+#if !(defined(IP_RETOPTS) || (defined(HAVE_DECL_IP_RETOPTS) && HAVE_DECL_IP_RETOPTS))
+# define IP_RETOPTS 7
+#endif
+#if !(defined(IP_PKTINFO) || (defined(HAVE_DECL_IP_PKTINFO) && HAVE_DECL_IP_PKTINFO))
+# define IP_PKTINFO 8
+#endif
+#if !(defined(IP_RECVERR) || (defined(HAVE_DECL_IP_RECVERR) && HAVE_DECL_IP_RECVERR))
+# define IP_RECVERR 11
+#endif
+#if !(defined(IP_ORIGDSTADDR) || (defined(HAVE_DECL_IP_ORIGDSTADDR) && HAVE_DECL_IP_ORIGDSTADDR))
+# define IP_ORIGDSTADDR 20
+#endif
+#if !(defined(IP_CHECKSUM) || (defined(HAVE_DECL_IP_CHECKSUM) && HAVE_DECL_IP_CHECKSUM))
+# define IP_CHECKSUM 23
+#endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat ip_cmsg_types in mpers mode
+
+#else
+
+static
+const struct xlat ip_cmsg_types[] = {
+ XLAT(IP_TOS),
+ XLAT(IP_TTL),
+ XLAT(IP_RECVOPTS),
+ XLAT(IP_RETOPTS),
+ XLAT(IP_PKTINFO),
+ XLAT(IP_RECVERR),
+ XLAT(IP_ORIGDSTADDR),
+ XLAT(IP_CHECKSUM),
+#if defined(SCM_SECURITY) || (defined(HAVE_DECL_SCM_SECURITY) && HAVE_DECL_SCM_SECURITY)
+  XLAT(SCM_SECURITY),
+#endif
+ XLAT_END
+};
+
+#endif /* !IN_MPERS */
diff --git a/xlat/ipc_msg_flags.h b/xlat/ipc_msg_flags.h
index 22490dd..a37ca87 100644
--- a/xlat/ipc_msg_flags.h
+++ b/xlat/ipc_msg_flags.h
@@ -1,14 +1,23 @@
 /* Generated by ./xlat/gen.sh from ./xlat/ipc_msg_flags.in; do not edit. */
 
-static const struct xlat ipc_msg_flags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat ipc_msg_flags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/itimer_which.h b/xlat/itimer_which.h
index abee625..a9180c6 100644
--- a/xlat/itimer_which.h
+++ b/xlat/itimer_which.h
@@ -1,14 +1,23 @@
 /* Generated by ./xlat/gen.sh from ./xlat/itimer_which.in; do not edit. */
 
-static const struct xlat itimer_which[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat itimer_which in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/kcmp_types.h b/xlat/kcmp_types.h
new file mode 100644
index 0000000..ba067f0
--- /dev/null
+++ b/xlat/kcmp_types.h
@@ -0,0 +1,42 @@
+/* Generated by ./xlat/gen.sh from ./xlat/kcmp_types.in; do not edit. */
+#if !(defined(KCMP_FILE) || (defined(HAVE_DECL_KCMP_FILE) && HAVE_DECL_KCMP_FILE))
+# define KCMP_FILE 0
+#endif
+#if !(defined(KCMP_VM) || (defined(HAVE_DECL_KCMP_VM) && HAVE_DECL_KCMP_VM))
+# define KCMP_VM 1
+#endif
+#if !(defined(KCMP_FILES) || (defined(HAVE_DECL_KCMP_FILES) && HAVE_DECL_KCMP_FILES))
+# define KCMP_FILES 2
+#endif
+#if !(defined(KCMP_FS) || (defined(HAVE_DECL_KCMP_FS) && HAVE_DECL_KCMP_FS))
+# define KCMP_FS 3
+#endif
+#if !(defined(KCMP_SIGHAND) || (defined(HAVE_DECL_KCMP_SIGHAND) && HAVE_DECL_KCMP_SIGHAND))
+# define KCMP_SIGHAND 4
+#endif
+#if !(defined(KCMP_IO) || (defined(HAVE_DECL_KCMP_IO) && HAVE_DECL_KCMP_IO))
+# define KCMP_IO 5
+#endif
+#if !(defined(KCMP_SYSVSEM) || (defined(HAVE_DECL_KCMP_SYSVSEM) && HAVE_DECL_KCMP_SYSVSEM))
+# define KCMP_SYSVSEM 6
+#endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat kcmp_types in mpers mode
+
+#else
+
+static
+const struct xlat kcmp_types[] = {
+ XLAT(KCMP_FILE),
+ XLAT(KCMP_VM),
+ XLAT(KCMP_FILES),
+ XLAT(KCMP_FS),
+ XLAT(KCMP_SIGHAND),
+ XLAT(KCMP_IO),
+ XLAT(KCMP_SYSVSEM),
+ XLAT_END
+};
+
+#endif /* !IN_MPERS */
diff --git a/xlat/kexec_arch_values.h b/xlat/kexec_arch_values.h
index c795a95..1850d94 100644
--- a/xlat/kexec_arch_values.h
+++ b/xlat/kexec_arch_values.h
@@ -1,53 +1,62 @@
 /* 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))
 # define KEXEC_ARCH_DEFAULT ( 0 << 16)
 #endif
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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(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
+
+#ifdef IN_MPERS
+
+# error static const struct xlat kexec_arch_values in mpers mode
+
+#else
+
+static
+const struct xlat kexec_arch_values[] = {
+ XLAT(KEXEC_ARCH_DEFAULT),
+ XLAT(KEXEC_ARCH_386),
+ XLAT(KEXEC_ARCH_68K),
+ XLAT(KEXEC_ARCH_X86_64),
+ XLAT(KEXEC_ARCH_PPC),
+ XLAT(KEXEC_ARCH_PPC64),
+ XLAT(KEXEC_ARCH_IA_64),
+ XLAT(KEXEC_ARCH_ARM),
+ XLAT(KEXEC_ARCH_S390),
+ XLAT(KEXEC_ARCH_SH),
+ XLAT(KEXEC_ARCH_MIPS_LE),
  XLAT(KEXEC_ARCH_MIPS),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/kexec_file_load_flags.h b/xlat/kexec_file_load_flags.h
new file mode 100644
index 0000000..340ca3f
--- /dev/null
+++ b/xlat/kexec_file_load_flags.h
@@ -0,0 +1,26 @@
+/* Generated by ./xlat/gen.sh from ./xlat/kexec_file_load_flags.in; do not edit. */
+#if !(defined(KEXEC_FILE_UNLOAD) || (defined(HAVE_DECL_KEXEC_FILE_UNLOAD) && HAVE_DECL_KEXEC_FILE_UNLOAD))
+# define KEXEC_FILE_UNLOAD 1
+#endif
+#if !(defined(KEXEC_FILE_ON_CRASH) || (defined(HAVE_DECL_KEXEC_FILE_ON_CRASH) && HAVE_DECL_KEXEC_FILE_ON_CRASH))
+# define KEXEC_FILE_ON_CRASH 2
+#endif
+#if !(defined(KEXEC_FILE_NO_INITRAMFS) || (defined(HAVE_DECL_KEXEC_FILE_NO_INITRAMFS) && HAVE_DECL_KEXEC_FILE_NO_INITRAMFS))
+# define KEXEC_FILE_NO_INITRAMFS 4
+#endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat kexec_file_load_flags in mpers mode
+
+#else
+
+static
+const struct xlat kexec_file_load_flags[] = {
+ XLAT(KEXEC_FILE_UNLOAD),
+ XLAT(KEXEC_FILE_ON_CRASH),
+ XLAT(KEXEC_FILE_NO_INITRAMFS),
+ XLAT_END
+};
+
+#endif /* !IN_MPERS */
diff --git a/xlat/kexec_load_flags.h b/xlat/kexec_load_flags.h
index 8154438..00a51c7 100644
--- a/xlat/kexec_load_flags.h
+++ b/xlat/kexec_load_flags.h
@@ -1,13 +1,22 @@
 /* Generated by ./xlat/gen.sh from ./xlat/kexec_load_flags.in; do not edit. */
-
-static const struct xlat kexec_load_flags[] = {
 #if !(defined(KEXEC_ON_CRASH) || (defined(HAVE_DECL_KEXEC_ON_CRASH) && HAVE_DECL_KEXEC_ON_CRASH))
 # define KEXEC_ON_CRASH 0x00000001
 #endif
- XLAT(KEXEC_ON_CRASH),
 #if !(defined(KEXEC_PRESERVE_CONTEXT) || (defined(HAVE_DECL_KEXEC_PRESERVE_CONTEXT) && HAVE_DECL_KEXEC_PRESERVE_CONTEXT))
 # define KEXEC_PRESERVE_CONTEXT 0x00000002
 #endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat kexec_load_flags in mpers mode
+
+#else
+
+static
+const struct xlat kexec_load_flags[] = {
+ XLAT(KEXEC_ON_CRASH),
  XLAT(KEXEC_PRESERVE_CONTEXT),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/key_perms.h b/xlat/key_perms.h
index 37af118..4488f70 100644
--- a/xlat/key_perms.h
+++ b/xlat/key_perms.h
@@ -1,117 +1,126 @@
 /* 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))
 # define KEY_POS_VIEW 0x01000000
 #endif
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
+
+#ifdef IN_MPERS
+
+# error static const struct xlat key_perms in mpers mode
+
+#else
+
+static
+const struct xlat key_perms[] = {
+ XLAT(KEY_POS_VIEW),
+ XLAT(KEY_POS_READ),
+ XLAT(KEY_POS_WRITE),
+ XLAT(KEY_POS_SEARCH),
+ XLAT(KEY_POS_LINK),
+ XLAT(KEY_POS_SETATTR),
+ XLAT(KEY_POS_ALL),
+ XLAT(KEY_USR_VIEW),
+ XLAT(KEY_USR_READ),
+ XLAT(KEY_USR_WRITE),
+ XLAT(KEY_USR_SEARCH),
+ XLAT(KEY_USR_LINK),
+ XLAT(KEY_USR_SETATTR),
+ XLAT(KEY_USR_ALL),
+ XLAT(KEY_GRP_VIEW),
+ XLAT(KEY_GRP_READ),
+ XLAT(KEY_GRP_WRITE),
+ XLAT(KEY_GRP_SEARCH),
+ XLAT(KEY_GRP_LINK),
+ XLAT(KEY_GRP_SETATTR),
+ XLAT(KEY_GRP_ALL),
+ XLAT(KEY_OTH_VIEW),
+ XLAT(KEY_OTH_READ),
+ XLAT(KEY_OTH_WRITE),
+ XLAT(KEY_OTH_SEARCH),
+ XLAT(KEY_OTH_LINK),
+ XLAT(KEY_OTH_SETATTR),
  XLAT(KEY_OTH_ALL),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/key_reqkeys.h b/xlat/key_reqkeys.h
index 2880c1f..920fbe4 100644
--- a/xlat/key_reqkeys.h
+++ b/xlat/key_reqkeys.h
@@ -1,41 +1,50 @@
 /* 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))
 # define KEY_REQKEY_DEFL_NO_CHANGE -1
 #endif
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
+
+#ifdef IN_MPERS
+
+# error static const struct xlat key_reqkeys in mpers mode
+
+#else
+
+static
+const struct xlat key_reqkeys[] = {
+ XLAT(KEY_REQKEY_DEFL_NO_CHANGE),
+ XLAT(KEY_REQKEY_DEFL_DEFAULT),
+ XLAT(KEY_REQKEY_DEFL_THREAD_KEYRING),
+ XLAT(KEY_REQKEY_DEFL_PROCESS_KEYRING),
+ XLAT(KEY_REQKEY_DEFL_SESSION_KEYRING),
+ XLAT(KEY_REQKEY_DEFL_USER_KEYRING),
+ XLAT(KEY_REQKEY_DEFL_USER_SESSION_KEYRING),
+ XLAT(KEY_REQKEY_DEFL_GROUP_KEYRING),
  XLAT(KEY_REQKEY_DEFL_REQUESTOR_KEYRING),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/key_spec.h b/xlat/key_spec.h
index ca5c5d9..888a8f3 100644
--- a/xlat/key_spec.h
+++ b/xlat/key_spec.h
@@ -1,37 +1,46 @@
 /* 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))
 # define KEY_SPEC_THREAD_KEYRING -1
 #endif
- 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
- 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
- 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
- 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
- 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
- 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
- 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
+
+#ifdef IN_MPERS
+
+# error static const struct xlat key_spec in mpers mode
+
+#else
+
+static
+const struct xlat key_spec[] = {
+ XLAT(KEY_SPEC_THREAD_KEYRING),
+ XLAT(KEY_SPEC_PROCESS_KEYRING),
+ XLAT(KEY_SPEC_SESSION_KEYRING),
+ XLAT(KEY_SPEC_USER_KEYRING),
+ XLAT(KEY_SPEC_USER_SESSION_KEYRING),
+ XLAT(KEY_SPEC_GROUP_KEYRING),
+ XLAT(KEY_SPEC_REQKEY_AUTH_KEY),
  XLAT(KEY_SPEC_REQUESTOR_KEYRING),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/keyctl_commands.h b/xlat/keyctl_commands.h
index 80b7234..3e7ce5a 100644
--- a/xlat/keyctl_commands.h
+++ b/xlat/keyctl_commands.h
@@ -1,97 +1,106 @@
 /* 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))
 # define KEYCTL_GET_KEYRING_ID 0
 #endif
- 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
- XLAT(KEYCTL_JOIN_SESSION_KEYRING),
 #if !(defined(KEYCTL_UPDATE) || (defined(HAVE_DECL_KEYCTL_UPDATE) && HAVE_DECL_KEYCTL_UPDATE))
 # define KEYCTL_UPDATE 2
 #endif
- XLAT(KEYCTL_UPDATE),
 #if !(defined(KEYCTL_REVOKE) || (defined(HAVE_DECL_KEYCTL_REVOKE) && HAVE_DECL_KEYCTL_REVOKE))
 # define KEYCTL_REVOKE 3
 #endif
- XLAT(KEYCTL_REVOKE),
 #if !(defined(KEYCTL_CHOWN) || (defined(HAVE_DECL_KEYCTL_CHOWN) && HAVE_DECL_KEYCTL_CHOWN))
 # define KEYCTL_CHOWN 4
 #endif
- XLAT(KEYCTL_CHOWN),
 #if !(defined(KEYCTL_SETPERM) || (defined(HAVE_DECL_KEYCTL_SETPERM) && HAVE_DECL_KEYCTL_SETPERM))
 # define KEYCTL_SETPERM 5
 #endif
- XLAT(KEYCTL_SETPERM),
 #if !(defined(KEYCTL_DESCRIBE) || (defined(HAVE_DECL_KEYCTL_DESCRIBE) && HAVE_DECL_KEYCTL_DESCRIBE))
 # define KEYCTL_DESCRIBE 6
 #endif
- XLAT(KEYCTL_DESCRIBE),
 #if !(defined(KEYCTL_CLEAR) || (defined(HAVE_DECL_KEYCTL_CLEAR) && HAVE_DECL_KEYCTL_CLEAR))
 # define KEYCTL_CLEAR 7
 #endif
- XLAT(KEYCTL_CLEAR),
 #if !(defined(KEYCTL_LINK) || (defined(HAVE_DECL_KEYCTL_LINK) && HAVE_DECL_KEYCTL_LINK))
 # define KEYCTL_LINK 8
 #endif
- XLAT(KEYCTL_LINK),
 #if !(defined(KEYCTL_UNLINK) || (defined(HAVE_DECL_KEYCTL_UNLINK) && HAVE_DECL_KEYCTL_UNLINK))
 # define KEYCTL_UNLINK 9
 #endif
- XLAT(KEYCTL_UNLINK),
 #if !(defined(KEYCTL_SEARCH) || (defined(HAVE_DECL_KEYCTL_SEARCH) && HAVE_DECL_KEYCTL_SEARCH))
 # define KEYCTL_SEARCH 10
 #endif
- XLAT(KEYCTL_SEARCH),
 #if !(defined(KEYCTL_READ) || (defined(HAVE_DECL_KEYCTL_READ) && HAVE_DECL_KEYCTL_READ))
 # define KEYCTL_READ 11
 #endif
- XLAT(KEYCTL_READ),
 #if !(defined(KEYCTL_INSTANTIATE) || (defined(HAVE_DECL_KEYCTL_INSTANTIATE) && HAVE_DECL_KEYCTL_INSTANTIATE))
 # define KEYCTL_INSTANTIATE 12
 #endif
- XLAT(KEYCTL_INSTANTIATE),
 #if !(defined(KEYCTL_NEGATE) || (defined(HAVE_DECL_KEYCTL_NEGATE) && HAVE_DECL_KEYCTL_NEGATE))
 # define KEYCTL_NEGATE 13
 #endif
- 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
- 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
- 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
- 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
- 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
- XLAT(KEYCTL_SESSION_TO_PARENT),
 #if !(defined(KEYCTL_REJECT) || (defined(HAVE_DECL_KEYCTL_REJECT) && HAVE_DECL_KEYCTL_REJECT))
 # define KEYCTL_REJECT 19
 #endif
- 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
- XLAT(KEYCTL_INSTANTIATE_IOV),
 #if !(defined(KEYCTL_INVALIDATE) || (defined(HAVE_DECL_KEYCTL_INVALIDATE) && HAVE_DECL_KEYCTL_INVALIDATE))
 # define KEYCTL_INVALIDATE 21
 #endif
- 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
+
+#ifdef IN_MPERS
+
+# error static const struct xlat keyctl_commands in mpers mode
+
+#else
+
+static
+const struct xlat keyctl_commands[] = {
+ XLAT(KEYCTL_GET_KEYRING_ID),
+ XLAT(KEYCTL_JOIN_SESSION_KEYRING),
+ XLAT(KEYCTL_UPDATE),
+ XLAT(KEYCTL_REVOKE),
+ XLAT(KEYCTL_CHOWN),
+ XLAT(KEYCTL_SETPERM),
+ XLAT(KEYCTL_DESCRIBE),
+ XLAT(KEYCTL_CLEAR),
+ XLAT(KEYCTL_LINK),
+ XLAT(KEYCTL_UNLINK),
+ XLAT(KEYCTL_SEARCH),
+ XLAT(KEYCTL_READ),
+ XLAT(KEYCTL_INSTANTIATE),
+ XLAT(KEYCTL_NEGATE),
+ XLAT(KEYCTL_SET_REQKEY_KEYRING),
+ XLAT(KEYCTL_SET_TIMEOUT),
+ XLAT(KEYCTL_ASSUME_AUTHORITY),
+ XLAT(KEYCTL_GET_SECURITY),
+ XLAT(KEYCTL_SESSION_TO_PARENT),
+ XLAT(KEYCTL_REJECT),
+ XLAT(KEYCTL_INSTANTIATE_IOV),
+ XLAT(KEYCTL_INVALIDATE),
  XLAT(KEYCTL_GET_PERSISTENT),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/lockfcmds.h b/xlat/lockfcmds.h
index 04f2ccc..632c9cb 100644
--- a/xlat/lockfcmds.h
+++ b/xlat/lockfcmds.h
@@ -1,20 +1,29 @@
 /* Generated by ./xlat/gen.sh from ./xlat/lockfcmds.in; do not edit. */
 
-static const struct xlat lockfcmds[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat lockfcmds in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/loop_crypt_type_options.h b/xlat/loop_crypt_type_options.h
index 1d3d72e..3b309aa 100644
--- a/xlat/loop_crypt_type_options.h
+++ b/xlat/loop_crypt_type_options.h
@@ -1,35 +1,44 @@
 /* Generated by ./xlat/gen.sh from ./xlat/loop_crypt_type_options.in; do not edit. */
 
-static const struct xlat loop_crypt_type_options[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat loop_crypt_type_options in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/loop_flags_options.h b/xlat/loop_flags_options.h
index 5d66ea2..8ee1fea 100644
--- a/xlat/loop_flags_options.h
+++ b/xlat/loop_flags_options.h
@@ -1,14 +1,23 @@
 /* Generated by ./xlat/gen.sh from ./xlat/loop_flags_options.in; do not edit. */
 
-static const struct xlat loop_flags_options[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat loop_flags_options in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/madvise_cmds.h b/xlat/madvise_cmds.h
index fbb8eb2..4e0a967 100644
--- a/xlat/madvise_cmds.h
+++ b/xlat/madvise_cmds.h
@@ -1,53 +1,62 @@
 /* Generated by ./xlat/gen.sh from ./xlat/madvise_cmds.in; do not edit. */
 
-static const struct xlat madvise_cmds[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat madvise_cmds in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/mbindflags.h b/xlat/mbindflags.h
index ad47048..aee1b42 100644
--- a/xlat/mbindflags.h
+++ b/xlat/mbindflags.h
@@ -1,14 +1,23 @@
 /* Generated by ./xlat/gen.sh from ./xlat/mbindflags.in; do not edit. */
 
-static const struct xlat mbindflags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat mbindflags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/mctl_sync.h b/xlat/mctl_sync.h
index ac5ba6d..144f7f7 100644
--- a/xlat/mctl_sync.h
+++ b/xlat/mctl_sync.h
@@ -1,14 +1,23 @@
 /* Generated by ./xlat/gen.sh from ./xlat/mctl_sync.in; do not edit. */
 
-static const struct xlat mctl_sync[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat mctl_sync in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/membarrier_cmds.h b/xlat/membarrier_cmds.h
new file mode 100644
index 0000000..9d4d518
--- /dev/null
+++ b/xlat/membarrier_cmds.h
@@ -0,0 +1,22 @@
+/* Generated by ./xlat/gen.sh from ./xlat/membarrier_cmds.in; do not edit. */
+#if !(defined(MEMBARRIER_CMD_QUERY) || (defined(HAVE_DECL_MEMBARRIER_CMD_QUERY) && HAVE_DECL_MEMBARRIER_CMD_QUERY))
+# define MEMBARRIER_CMD_QUERY 0
+#endif
+#if !(defined(MEMBARRIER_CMD_SHARED) || (defined(HAVE_DECL_MEMBARRIER_CMD_SHARED) && HAVE_DECL_MEMBARRIER_CMD_SHARED))
+# define MEMBARRIER_CMD_SHARED 1
+#endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat membarrier_cmds in mpers mode
+
+#else
+
+static
+const struct xlat membarrier_cmds[] = {
+ XLAT(MEMBARRIER_CMD_QUERY),
+ XLAT(MEMBARRIER_CMD_SHARED),
+ XLAT_END
+};
+
+#endif /* !IN_MPERS */
diff --git a/xlat/memfd_create_flags.h b/xlat/memfd_create_flags.h
index 6337559..9b76099 100644
--- a/xlat/memfd_create_flags.h
+++ b/xlat/memfd_create_flags.h
@@ -1,13 +1,22 @@
 /* Generated by ./xlat/gen.sh from ./xlat/memfd_create_flags.in; do not edit. */
-
-static const struct xlat memfd_create_flags[] = {
 #if !(defined(MFD_CLOEXEC) || (defined(HAVE_DECL_MFD_CLOEXEC) && HAVE_DECL_MFD_CLOEXEC))
 # define MFD_CLOEXEC 1
 #endif
- XLAT(MFD_CLOEXEC),
 #if !(defined(MFD_ALLOW_SEALING) || (defined(HAVE_DECL_MFD_ALLOW_SEALING) && HAVE_DECL_MFD_ALLOW_SEALING))
 # define MFD_ALLOW_SEALING 2
 #endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat memfd_create_flags in mpers mode
+
+#else
+
+static
+const struct xlat memfd_create_flags[] = {
+ XLAT(MFD_CLOEXEC),
  XLAT(MFD_ALLOW_SEALING),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/mempolicyflags.h b/xlat/mempolicyflags.h
index fec9b30..e349b17 100644
--- a/xlat/mempolicyflags.h
+++ b/xlat/mempolicyflags.h
@@ -1,11 +1,20 @@
 /* Generated by ./xlat/gen.sh from ./xlat/mempolicyflags.in; do not edit. */
 
-static const struct xlat mempolicyflags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat mempolicyflags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/mlock_flags.h b/xlat/mlock_flags.h
new file mode 100644
index 0000000..9ec2e54
--- /dev/null
+++ b/xlat/mlock_flags.h
@@ -0,0 +1,18 @@
+/* Generated by ./xlat/gen.sh from ./xlat/mlock_flags.in; do not edit. */
+#if !(defined(MLOCK_ONFAULT) || (defined(HAVE_DECL_MLOCK_ONFAULT) && HAVE_DECL_MLOCK_ONFAULT))
+# define MLOCK_ONFAULT 1
+#endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat mlock_flags in mpers mode
+
+#else
+
+static
+const struct xlat mlock_flags[] = {
+ XLAT(MLOCK_ONFAULT),
+ XLAT_END
+};
+
+#endif /* !IN_MPERS */
diff --git a/xlat/mlockall_flags.h b/xlat/mlockall_flags.h
index 12bb506..c3fb08f 100644
--- a/xlat/mlockall_flags.h
+++ b/xlat/mlockall_flags.h
@@ -1,11 +1,26 @@
 /* Generated by ./xlat/gen.sh from ./xlat/mlockall_flags.in; do not edit. */
+#if !(defined(MCL_CURRENT) || (defined(HAVE_DECL_MCL_CURRENT) && HAVE_DECL_MCL_CURRENT))
+# define MCL_CURRENT 1
+#endif
+#if !(defined(MCL_FUTURE) || (defined(HAVE_DECL_MCL_FUTURE) && HAVE_DECL_MCL_FUTURE))
+# define MCL_FUTURE 2
+#endif
+#if !(defined(MCL_ONFAULT) || (defined(HAVE_DECL_MCL_ONFAULT) && HAVE_DECL_MCL_ONFAULT))
+# define MCL_ONFAULT 4
+#endif
 
-static const struct xlat mlockall_flags[] = {
-#if defined(MCL_CURRENT) || (defined(HAVE_DECL_MCL_CURRENT) && HAVE_DECL_MCL_CURRENT)
+#ifdef IN_MPERS
+
+# error static const struct xlat mlockall_flags in mpers mode
+
+#else
+
+static
+const struct xlat mlockall_flags[] = {
  XLAT(MCL_CURRENT),
-#endif
-#if defined(MCL_FUTURE) || (defined(HAVE_DECL_MCL_FUTURE) && HAVE_DECL_MCL_FUTURE)
  XLAT(MCL_FUTURE),
-#endif
+ XLAT(MCL_ONFAULT),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/mmap_flags.h b/xlat/mmap_flags.h
index 3b9c3d8..9ccc87e 100644
--- a/xlat/mmap_flags.h
+++ b/xlat/mmap_flags.h
@@ -1,32 +1,43 @@
 /* Generated by ./xlat/gen.sh from ./xlat/mmap_flags.in; do not edit. */
+#if defined(MAP_ANON) && (!defined(MAP_ANONYMOUS) || MAP_ANON != MAP_ANONYMOUS)
+#endif
+#if defined MAP_UNINITIALIZED && MAP_UNINITIALIZED > 0
+#endif
 
-static const struct xlat mmap_flags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat mmap_flags in mpers mode
+
+#else
+
+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 +67,53 @@
 * 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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/mmap_prot.h b/xlat/mmap_prot.h
index 9751412..0ff04eb 100644
--- a/xlat/mmap_prot.h
+++ b/xlat/mmap_prot.h
@@ -1,29 +1,38 @@
 /* Generated by ./xlat/gen.sh from ./xlat/mmap_prot.in; do not edit. */
 
-static const struct xlat mmap_prot[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat mmap_prot in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/modem_flags.h b/xlat/modem_flags.h
index 1726028..f171975 100644
--- a/xlat/modem_flags.h
+++ b/xlat/modem_flags.h
@@ -1,38 +1,47 @@
 /* Generated by ./xlat/gen.sh from ./xlat/modem_flags.in; do not edit. */
 
-static const struct xlat modem_flags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat modem_flags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/modetypes.h b/xlat/modetypes.h
index e0fe383..70d1868 100644
--- a/xlat/modetypes.h
+++ b/xlat/modetypes.h
@@ -1,26 +1,35 @@
 /* Generated by ./xlat/gen.sh from ./xlat/modetypes.in; do not edit. */
 
-static const struct xlat modetypes[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat modetypes in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/module_init_flags.h b/xlat/module_init_flags.h
index 1b9f260..0161d2a 100644
--- a/xlat/module_init_flags.h
+++ b/xlat/module_init_flags.h
@@ -1,11 +1,20 @@
 /* Generated by ./xlat/gen.sh from ./xlat/module_init_flags.in; do not edit. */
 
-static const struct xlat module_init_flags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat module_init_flags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/mount_flags.h b/xlat/mount_flags.h
index 7558d74..73e250e 100644
--- a/xlat/mount_flags.h
+++ b/xlat/mount_flags.h
@@ -1,117 +1,126 @@
 /* Generated by ./xlat/gen.sh from ./xlat/mount_flags.in; do not edit. */
-
-static const struct xlat mount_flags[] = {
 #if !(defined(MS_RDONLY) || (defined(HAVE_DECL_MS_RDONLY) && HAVE_DECL_MS_RDONLY))
 # define MS_RDONLY 1
 #endif
- XLAT(MS_RDONLY),
 #if !(defined(MS_NOSUID) || (defined(HAVE_DECL_MS_NOSUID) && HAVE_DECL_MS_NOSUID))
 # define MS_NOSUID 2
 #endif
- XLAT(MS_NOSUID),
 #if !(defined(MS_NODEV) || (defined(HAVE_DECL_MS_NODEV) && HAVE_DECL_MS_NODEV))
 # define MS_NODEV 4
 #endif
- XLAT(MS_NODEV),
 #if !(defined(MS_NOEXEC) || (defined(HAVE_DECL_MS_NOEXEC) && HAVE_DECL_MS_NOEXEC))
 # define MS_NOEXEC 8
 #endif
- XLAT(MS_NOEXEC),
 #if !(defined(MS_SYNCHRONOUS) || (defined(HAVE_DECL_MS_SYNCHRONOUS) && HAVE_DECL_MS_SYNCHRONOUS))
 # define MS_SYNCHRONOUS 16
 #endif
- XLAT(MS_SYNCHRONOUS),
 #if !(defined(MS_REMOUNT) || (defined(HAVE_DECL_MS_REMOUNT) && HAVE_DECL_MS_REMOUNT))
 # define MS_REMOUNT 32
 #endif
- XLAT(MS_REMOUNT),
 #if !(defined(MS_MANDLOCK) || (defined(HAVE_DECL_MS_MANDLOCK) && HAVE_DECL_MS_MANDLOCK))
 # define MS_MANDLOCK 64
 #endif
- XLAT(MS_MANDLOCK),
 #if !(defined(MS_DIRSYNC) || (defined(HAVE_DECL_MS_DIRSYNC) && HAVE_DECL_MS_DIRSYNC))
 # define MS_DIRSYNC 128
 #endif
- XLAT(MS_DIRSYNC),
 #if !(defined(MS_NOATIME) || (defined(HAVE_DECL_MS_NOATIME) && HAVE_DECL_MS_NOATIME))
 # define MS_NOATIME 1024
 #endif
- XLAT(MS_NOATIME),
 #if !(defined(MS_NODIRATIME) || (defined(HAVE_DECL_MS_NODIRATIME) && HAVE_DECL_MS_NODIRATIME))
 # define MS_NODIRATIME 2048
 #endif
- XLAT(MS_NODIRATIME),
 #if !(defined(MS_BIND) || (defined(HAVE_DECL_MS_BIND) && HAVE_DECL_MS_BIND))
 # define MS_BIND 4096
 #endif
- XLAT(MS_BIND),
 #if !(defined(MS_MOVE) || (defined(HAVE_DECL_MS_MOVE) && HAVE_DECL_MS_MOVE))
 # define MS_MOVE 8192
 #endif
- XLAT(MS_MOVE),
 #if !(defined(MS_REC) || (defined(HAVE_DECL_MS_REC) && HAVE_DECL_MS_REC))
 # define MS_REC 16384
 #endif
- XLAT(MS_REC),
 #if !(defined(MS_SILENT) || (defined(HAVE_DECL_MS_SILENT) && HAVE_DECL_MS_SILENT))
 # define MS_SILENT 32768
 #endif
- XLAT(MS_SILENT),
 #if !(defined(MS_POSIXACL) || (defined(HAVE_DECL_MS_POSIXACL) && HAVE_DECL_MS_POSIXACL))
 # define MS_POSIXACL (1<<16)
 #endif
- XLAT(MS_POSIXACL),
 #if !(defined(MS_UNBINDABLE) || (defined(HAVE_DECL_MS_UNBINDABLE) && HAVE_DECL_MS_UNBINDABLE))
 # define MS_UNBINDABLE (1<<17)
 #endif
- XLAT(MS_UNBINDABLE),
 #if !(defined(MS_PRIVATE) || (defined(HAVE_DECL_MS_PRIVATE) && HAVE_DECL_MS_PRIVATE))
 # define MS_PRIVATE (1<<18)
 #endif
- XLAT(MS_PRIVATE),
 #if !(defined(MS_SLAVE) || (defined(HAVE_DECL_MS_SLAVE) && HAVE_DECL_MS_SLAVE))
 # define MS_SLAVE (1<<19)
 #endif
- XLAT(MS_SLAVE),
 #if !(defined(MS_SHARED) || (defined(HAVE_DECL_MS_SHARED) && HAVE_DECL_MS_SHARED))
 # define MS_SHARED (1<<20)
 #endif
- XLAT(MS_SHARED),
 #if !(defined(MS_RELATIME) || (defined(HAVE_DECL_MS_RELATIME) && HAVE_DECL_MS_RELATIME))
 # define MS_RELATIME (1<<21)
 #endif
- XLAT(MS_RELATIME),
 #if !(defined(MS_KERNMOUNT) || (defined(HAVE_DECL_MS_KERNMOUNT) && HAVE_DECL_MS_KERNMOUNT))
 # define MS_KERNMOUNT (1<<22)
 #endif
- XLAT(MS_KERNMOUNT),
 #if !(defined(MS_I_VERSION) || (defined(HAVE_DECL_MS_I_VERSION) && HAVE_DECL_MS_I_VERSION))
 # define MS_I_VERSION (1<<23)
 #endif
- XLAT(MS_I_VERSION),
 #if !(defined(MS_STRICTATIME) || (defined(HAVE_DECL_MS_STRICTATIME) && HAVE_DECL_MS_STRICTATIME))
 # define MS_STRICTATIME (1<<24)
 #endif
- XLAT(MS_STRICTATIME),
 #if !(defined(MS_LAZYTIME) || (defined(HAVE_DECL_MS_LAZYTIME) && HAVE_DECL_MS_LAZYTIME))
 # define MS_LAZYTIME (1<<25)
 #endif
- XLAT(MS_LAZYTIME),
 #if !(defined(MS_NOSEC) || (defined(HAVE_DECL_MS_NOSEC) && HAVE_DECL_MS_NOSEC))
 # define MS_NOSEC (1<<28)
 #endif
- XLAT(MS_NOSEC),
 #if !(defined(MS_BORN) || (defined(HAVE_DECL_MS_BORN) && HAVE_DECL_MS_BORN))
 # define MS_BORN (1<<29)
 #endif
- XLAT(MS_BORN),
 #if !(defined(MS_ACTIVE) || (defined(HAVE_DECL_MS_ACTIVE) && HAVE_DECL_MS_ACTIVE))
 # define MS_ACTIVE (1<<30)
 #endif
- XLAT(MS_ACTIVE),
 #if !(defined(MS_NOUSER) || (defined(HAVE_DECL_MS_NOUSER) && HAVE_DECL_MS_NOUSER))
 # define MS_NOUSER (1<<31)
 #endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat mount_flags in mpers mode
+
+#else
+
+static
+const struct xlat mount_flags[] = {
+ XLAT(MS_RDONLY),
+ XLAT(MS_NOSUID),
+ XLAT(MS_NODEV),
+ XLAT(MS_NOEXEC),
+ XLAT(MS_SYNCHRONOUS),
+ XLAT(MS_REMOUNT),
+ XLAT(MS_MANDLOCK),
+ XLAT(MS_DIRSYNC),
+ XLAT(MS_NOATIME),
+ XLAT(MS_NODIRATIME),
+ XLAT(MS_BIND),
+ XLAT(MS_MOVE),
+ XLAT(MS_REC),
+ XLAT(MS_SILENT),
+ XLAT(MS_POSIXACL),
+ XLAT(MS_UNBINDABLE),
+ XLAT(MS_PRIVATE),
+ XLAT(MS_SLAVE),
+ XLAT(MS_SHARED),
+ XLAT(MS_RELATIME),
+ XLAT(MS_KERNMOUNT),
+ XLAT(MS_I_VERSION),
+ XLAT(MS_STRICTATIME),
+ XLAT(MS_LAZYTIME),
+ XLAT(MS_NOSEC),
+ XLAT(MS_BORN),
+ XLAT(MS_ACTIVE),
  XLAT(MS_NOUSER),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/move_pages_flags.h b/xlat/move_pages_flags.h
index 4c8a0a2..0844fda 100644
--- a/xlat/move_pages_flags.h
+++ b/xlat/move_pages_flags.h
@@ -1,11 +1,20 @@
 /* Generated by ./xlat/gen.sh from ./xlat/move_pages_flags.in; do not edit. */
 
-static const struct xlat move_pages_flags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat move_pages_flags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/mremap_flags.h b/xlat/mremap_flags.h
index 0fec3bc..803cdeb 100644
--- a/xlat/mremap_flags.h
+++ b/xlat/mremap_flags.h
@@ -1,11 +1,20 @@
 /* Generated by ./xlat/gen.sh from ./xlat/mremap_flags.in; do not edit. */
 
-static const struct xlat mremap_flags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat mremap_flags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/msg_flags.h b/xlat/msg_flags.h
index e3cde10..bec25d1 100644
--- a/xlat/msg_flags.h
+++ b/xlat/msg_flags.h
@@ -1,65 +1,74 @@
 /* Generated by ./xlat/gen.sh from ./xlat/msg_flags.in; do not edit. */
 
-static const struct xlat msg_flags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat msg_flags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/msgctl_flags.h b/xlat/msgctl_flags.h
index 9ae62cd..a78ee14 100644
--- a/xlat/msgctl_flags.h
+++ b/xlat/msgctl_flags.h
@@ -1,23 +1,36 @@
 /* Generated by ./xlat/gen.sh from ./xlat/msgctl_flags.in; do not edit. */
+#if !(defined(MSG_STAT) || (defined(HAVE_DECL_MSG_STAT) && HAVE_DECL_MSG_STAT))
+# define MSG_STAT 11
+#endif
+#if !(defined(MSG_INFO) || (defined(HAVE_DECL_MSG_INFO) && HAVE_DECL_MSG_INFO))
+# define MSG_INFO 12
+#endif
 
-static const struct xlat msgctl_flags[] = {
+#ifdef IN_MPERS
+
+extern const struct xlat msgctl_flags[];
+
+#else
+
+# if !(defined HAVE_M32_MPERS || defined HAVE_MX32_MPERS)
+static
+# endif
+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),
-#endif
-#if defined(MSG_INFO) || (defined(HAVE_DECL_MSG_INFO) && HAVE_DECL_MSG_INFO)
  XLAT(MSG_INFO),
-#endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/mtd_file_mode_options.h b/xlat/mtd_file_mode_options.h
index 22b7feb..dfb877a 100644
--- a/xlat/mtd_file_mode_options.h
+++ b/xlat/mtd_file_mode_options.h
@@ -1,9 +1,18 @@
 /* Generated by ./xlat/gen.sh from ./xlat/mtd_file_mode_options.in; do not edit. */
 
-static const struct xlat mtd_file_mode_options[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat mtd_file_mode_options in mpers mode
+
+#else
+
+static
+const struct xlat mtd_file_mode_options[] = {
  XLAT(MTD_FILE_MODE_NORMAL),
  XLAT(MTD_FILE_MODE_OTP_FACTORY),
  XLAT(MTD_FILE_MODE_OTP_USER),
  XLAT(MTD_FILE_MODE_RAW),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/mtd_flags_options.h b/xlat/mtd_flags_options.h
index 004760c..6d87b4c 100644
--- a/xlat/mtd_flags_options.h
+++ b/xlat/mtd_flags_options.h
@@ -1,17 +1,26 @@
 /* Generated by ./xlat/gen.sh from ./xlat/mtd_flags_options.in; do not edit. */
 
-static const struct xlat mtd_flags_options[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat mtd_flags_options in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/mtd_mode_options.h b/xlat/mtd_mode_options.h
index 70b8cfd..2a8ddf3 100644
--- a/xlat/mtd_mode_options.h
+++ b/xlat/mtd_mode_options.h
@@ -1,8 +1,17 @@
 /* Generated by ./xlat/gen.sh from ./xlat/mtd_mode_options.in; do not edit. */
 
-static const struct xlat mtd_mode_options[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat mtd_mode_options in mpers mode
+
+#else
+
+static
+const struct xlat mtd_mode_options[] = {
  XLAT(MTD_OPS_PLACE_OOB),
  XLAT(MTD_OPS_AUTO_OOB),
  XLAT(MTD_OPS_RAW),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/mtd_nandecc_options.h b/xlat/mtd_nandecc_options.h
index c4fa57d..1cceb82 100644
--- a/xlat/mtd_nandecc_options.h
+++ b/xlat/mtd_nandecc_options.h
@@ -1,20 +1,29 @@
 /* Generated by ./xlat/gen.sh from ./xlat/mtd_nandecc_options.in; do not edit. */
 
-static const struct xlat mtd_nandecc_options[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat mtd_nandecc_options in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/mtd_otp_options.h b/xlat/mtd_otp_options.h
index 25dd3e3..3d0caee 100644
--- a/xlat/mtd_otp_options.h
+++ b/xlat/mtd_otp_options.h
@@ -1,14 +1,23 @@
 /* Generated by ./xlat/gen.sh from ./xlat/mtd_otp_options.in; do not edit. */
 
-static const struct xlat mtd_otp_options[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat mtd_otp_options in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/mtd_type_options.h b/xlat/mtd_type_options.h
index ec8c94c..138b768 100644
--- a/xlat/mtd_type_options.h
+++ b/xlat/mtd_type_options.h
@@ -1,29 +1,38 @@
 /* Generated by ./xlat/gen.sh from ./xlat/mtd_type_options.in; do not edit. */
 
-static const struct xlat mtd_type_options[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat mtd_type_options in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/netlink_protocols.h b/xlat/netlink_protocols.h
index ef28f37..ca2cc12 100644
--- a/xlat/netlink_protocols.h
+++ b/xlat/netlink_protocols.h
@@ -1,68 +1,77 @@
 /* Generated by ./xlat/gen.sh from ./xlat/netlink_protocols.in; do not edit. */
 
-static const struct xlat netlink_protocols[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat netlink_protocols in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/notifyflags.h b/xlat/notifyflags.h
index 82a6e36..e496e8c 100644
--- a/xlat/notifyflags.h
+++ b/xlat/notifyflags.h
@@ -1,26 +1,35 @@
 /* Generated by ./xlat/gen.sh from ./xlat/notifyflags.in; do not edit. */
 
-static const struct xlat notifyflags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat notifyflags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/nt_descriptor_types.h b/xlat/nt_descriptor_types.h
index 2a3a727..715c281 100644
--- a/xlat/nt_descriptor_types.h
+++ b/xlat/nt_descriptor_types.h
@@ -1,74 +1,83 @@
 /* Generated by ./xlat/gen.sh from ./xlat/nt_descriptor_types.in; do not edit. */
 
-static const struct xlat nt_descriptor_types[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat nt_descriptor_types in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/open_access_modes.h b/xlat/open_access_modes.h
index 935559f..8b11517 100644
--- a/xlat/open_access_modes.h
+++ b/xlat/open_access_modes.h
@@ -1,17 +1,21 @@
 /* Generated by ./xlat/gen.sh from ./xlat/open_access_modes.in; do not edit. */
 
+#ifndef IN_MPERS
+
 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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/open_mode_flags.h b/xlat/open_mode_flags.h
index 67f198b..f81f16b 100644
--- a/xlat/open_mode_flags.h
+++ b/xlat/open_mode_flags.h
@@ -1,113 +1,121 @@
 /* Generated by ./xlat/gen.sh from ./xlat/open_mode_flags.in; do not edit. */
+#if defined(O_NDELAY) && (O_NDELAY != O_NONBLOCK)
+#endif
+#if defined(O_TMPFILE) && defined(O_DIRECTORY)
+#endif
+
+#ifndef IN_MPERS
 
 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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/openmodessol.h b/xlat/openmodessol.h
index 510527d..fb6a553 100644
--- a/xlat/openmodessol.h
+++ b/xlat/openmodessol.h
@@ -1,6 +1,13 @@
 /* Generated by ./xlat/gen.sh from ./xlat/openmodessol.in; do not edit. */
 
-static const struct xlat openmodessol[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat openmodessol in mpers mode
+
+#else
+
+static
+const struct xlat openmodessol[] = {
 { 0,		"O_RDWR"	},
 { 1,		"O_RDONLY"	},
 { 2,		"O_WRONLY"	},
@@ -17,3 +24,5 @@
 { 0x1000,	"O_PRIV"	},
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/packet_mreq_type.h b/xlat/packet_mreq_type.h
index c62a634..012d3e7 100644
--- a/xlat/packet_mreq_type.h
+++ b/xlat/packet_mreq_type.h
@@ -1,17 +1,26 @@
 /* Generated by ./xlat/gen.sh from ./xlat/packet_mreq_type.in; do not edit. */
 
-static const struct xlat packet_mreq_type[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat packet_mreq_type in mpers mode
+
+#else
+
+static
+const struct xlat packet_mreq_type[] = {
 #if defined(PACKET_MR_MULTICAST) || (defined(HAVE_DECL_PACKET_MR_MULTICAST) && HAVE_DECL_PACKET_MR_MULTICAST)
- XLAT(PACKET_MR_MULTICAST),
+  XLAT(PACKET_MR_MULTICAST),
 #endif
 #if defined(PACKET_MR_PROMISC) || (defined(HAVE_DECL_PACKET_MR_PROMISC) && HAVE_DECL_PACKET_MR_PROMISC)
- XLAT(PACKET_MR_PROMISC),
+  XLAT(PACKET_MR_PROMISC),
 #endif
 #if defined(PACKET_MR_ALLMULTI) || (defined(HAVE_DECL_PACKET_MR_ALLMULTI) && HAVE_DECL_PACKET_MR_ALLMULTI)
- XLAT(PACKET_MR_ALLMULTI),
+  XLAT(PACKET_MR_ALLMULTI),
 #endif
 #if defined(PACKET_MR_UNICAST) || (defined(HAVE_DECL_PACKET_MR_UNICAST) && HAVE_DECL_PACKET_MR_UNICAST)
- XLAT(PACKET_MR_UNICAST),
+  XLAT(PACKET_MR_UNICAST),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/perf_event_open_flags.h b/xlat/perf_event_open_flags.h
index 83fbe8b..922f9c4 100644
--- a/xlat/perf_event_open_flags.h
+++ b/xlat/perf_event_open_flags.h
@@ -1,14 +1,30 @@
 /* Generated by ./xlat/gen.sh from ./xlat/perf_event_open_flags.in; do not edit. */
+#if !(defined(PERF_FLAG_FD_NO_GROUP) || (defined(HAVE_DECL_PERF_FLAG_FD_NO_GROUP) && HAVE_DECL_PERF_FLAG_FD_NO_GROUP))
+# define PERF_FLAG_FD_NO_GROUP 1
+#endif
+#if !(defined(PERF_FLAG_FD_OUTPUT) || (defined(HAVE_DECL_PERF_FLAG_FD_OUTPUT) && HAVE_DECL_PERF_FLAG_FD_OUTPUT))
+# define PERF_FLAG_FD_OUTPUT 2
+#endif
+#if !(defined(PERF_FLAG_PID_CGROUP) || (defined(HAVE_DECL_PERF_FLAG_PID_CGROUP) && HAVE_DECL_PERF_FLAG_PID_CGROUP))
+# define PERF_FLAG_PID_CGROUP 4
+#endif
+#if !(defined(PERF_FLAG_FD_CLOEXEC) || (defined(HAVE_DECL_PERF_FLAG_FD_CLOEXEC) && HAVE_DECL_PERF_FLAG_FD_CLOEXEC))
+# define PERF_FLAG_FD_CLOEXEC 8
+#endif
 
-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)
+#ifdef IN_MPERS
+
+# error static const struct xlat perf_event_open_flags in mpers mode
+
+#else
+
+static
+const struct xlat perf_event_open_flags[] = {
  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),
-#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),
-#endif
+ XLAT(PERF_FLAG_FD_CLOEXEC),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/personality_options.h b/xlat/personality_options.h
index 99301a9..64fb6af 100644
--- a/xlat/personality_options.h
+++ b/xlat/personality_options.h
@@ -1,6 +1,13 @@
 /* Generated by ./xlat/gen.sh from ./xlat/personality_options.in; do not edit. */
 
-static const struct xlat personality_options[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat personality_options in mpers mode
+
+#else
+
+static
+const struct xlat personality_options[] = {
  XLAT(PER_LINUX),
  XLAT(PER_LINUX_32BIT),
  XLAT(PER_LINUX_FDPIC),
@@ -25,3 +32,5 @@
  XLAT(PER_HPUX),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/policies.h b/xlat/policies.h
index c103799..1b2a13a 100644
--- a/xlat/policies.h
+++ b/xlat/policies.h
@@ -1,17 +1,26 @@
 /* Generated by ./xlat/gen.sh from ./xlat/policies.in; do not edit. */
 
-static const struct xlat policies[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat policies in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/pollflags.h b/xlat/pollflags.h
index fb9959a..3c9f24a 100644
--- a/xlat/pollflags.h
+++ b/xlat/pollflags.h
@@ -1,35 +1,44 @@
 /* Generated by ./xlat/gen.sh from ./xlat/pollflags.in; do not edit. */
 
-static const struct xlat pollflags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat pollflags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/pr_cap_ambient.h b/xlat/pr_cap_ambient.h
new file mode 100644
index 0000000..83fa882
--- /dev/null
+++ b/xlat/pr_cap_ambient.h
@@ -0,0 +1,30 @@
+/* Generated by ./xlat/gen.sh from ./xlat/pr_cap_ambient.in; do not edit. */
+#if !(defined(PR_CAP_AMBIENT_IS_SET) || (defined(HAVE_DECL_PR_CAP_AMBIENT_IS_SET) && HAVE_DECL_PR_CAP_AMBIENT_IS_SET))
+# define PR_CAP_AMBIENT_IS_SET 1
+#endif
+#if !(defined(PR_CAP_AMBIENT_RAISE) || (defined(HAVE_DECL_PR_CAP_AMBIENT_RAISE) && HAVE_DECL_PR_CAP_AMBIENT_RAISE))
+# define PR_CAP_AMBIENT_RAISE 2
+#endif
+#if !(defined(PR_CAP_AMBIENT_LOWER) || (defined(HAVE_DECL_PR_CAP_AMBIENT_LOWER) && HAVE_DECL_PR_CAP_AMBIENT_LOWER))
+# define PR_CAP_AMBIENT_LOWER 3
+#endif
+#if !(defined(PR_CAP_AMBIENT_CLEAR_ALL) || (defined(HAVE_DECL_PR_CAP_AMBIENT_CLEAR_ALL) && HAVE_DECL_PR_CAP_AMBIENT_CLEAR_ALL))
+# define PR_CAP_AMBIENT_CLEAR_ALL 4
+#endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat pr_cap_ambient in mpers mode
+
+#else
+
+static
+const struct xlat pr_cap_ambient[] = {
+ XLAT(PR_CAP_AMBIENT_IS_SET),
+ XLAT(PR_CAP_AMBIENT_RAISE),
+ XLAT(PR_CAP_AMBIENT_LOWER),
+ XLAT(PR_CAP_AMBIENT_CLEAR_ALL),
+ XLAT_END
+};
+
+#endif /* !IN_MPERS */
diff --git a/xlat/pr_mce_kill.h b/xlat/pr_mce_kill.h
index b2e3b55..d2839db 100644
--- a/xlat/pr_mce_kill.h
+++ b/xlat/pr_mce_kill.h
@@ -1,13 +1,22 @@
 /* Generated by ./xlat/gen.sh from ./xlat/pr_mce_kill.in; do not edit. */
-
-static const struct xlat pr_mce_kill[] = {
 #if !(defined(PR_MCE_KILL_CLEAR) || (defined(HAVE_DECL_PR_MCE_KILL_CLEAR) && HAVE_DECL_PR_MCE_KILL_CLEAR))
 # define PR_MCE_KILL_CLEAR 0
 #endif
- XLAT(PR_MCE_KILL_CLEAR),
 #if !(defined(PR_MCE_KILL_SET) || (defined(HAVE_DECL_PR_MCE_KILL_SET) && HAVE_DECL_PR_MCE_KILL_SET))
 # define PR_MCE_KILL_SET 1
 #endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat pr_mce_kill in mpers mode
+
+#else
+
+static
+const struct xlat pr_mce_kill[] = {
+ XLAT(PR_MCE_KILL_CLEAR),
  XLAT(PR_MCE_KILL_SET),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/pr_mce_kill_policy.h b/xlat/pr_mce_kill_policy.h
index 1d9f86b..aee9568 100644
--- a/xlat/pr_mce_kill_policy.h
+++ b/xlat/pr_mce_kill_policy.h
@@ -1,17 +1,26 @@
 /* Generated by ./xlat/gen.sh from ./xlat/pr_mce_kill_policy.in; do not edit. */
-
-static const struct xlat pr_mce_kill_policy[] = {
 #if !(defined(PR_MCE_KILL_LATE) || (defined(HAVE_DECL_PR_MCE_KILL_LATE) && HAVE_DECL_PR_MCE_KILL_LATE))
 # define PR_MCE_KILL_LATE 0
 #endif
- XLAT(PR_MCE_KILL_LATE),
 #if !(defined(PR_MCE_KILL_EARLY) || (defined(HAVE_DECL_PR_MCE_KILL_EARLY) && HAVE_DECL_PR_MCE_KILL_EARLY))
 # define PR_MCE_KILL_EARLY 1
 #endif
- XLAT(PR_MCE_KILL_EARLY),
 #if !(defined(PR_MCE_KILL_DEFAULT) || (defined(HAVE_DECL_PR_MCE_KILL_DEFAULT) && HAVE_DECL_PR_MCE_KILL_DEFAULT))
 # define PR_MCE_KILL_DEFAULT 2
 #endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat pr_mce_kill_policy in mpers mode
+
+#else
+
+static
+const struct xlat pr_mce_kill_policy[] = {
+ XLAT(PR_MCE_KILL_LATE),
+ XLAT(PR_MCE_KILL_EARLY),
  XLAT(PR_MCE_KILL_DEFAULT),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/pr_set_mm.h b/xlat/pr_set_mm.h
index e379cc8..bc07483 100644
--- a/xlat/pr_set_mm.h
+++ b/xlat/pr_set_mm.h
@@ -1,65 +1,74 @@
 /* Generated by ./xlat/gen.sh from ./xlat/pr_set_mm.in; do not edit. */
-
-static const struct xlat pr_set_mm[] = {
 #if !(defined(PR_SET_MM_START_CODE) || (defined(HAVE_DECL_PR_SET_MM_START_CODE) && HAVE_DECL_PR_SET_MM_START_CODE))
 # define PR_SET_MM_START_CODE 1
 #endif
- XLAT(PR_SET_MM_START_CODE),
 #if !(defined(PR_SET_MM_END_CODE) || (defined(HAVE_DECL_PR_SET_MM_END_CODE) && HAVE_DECL_PR_SET_MM_END_CODE))
 # define PR_SET_MM_END_CODE 2
 #endif
- XLAT(PR_SET_MM_END_CODE),
 #if !(defined(PR_SET_MM_START_DATA) || (defined(HAVE_DECL_PR_SET_MM_START_DATA) && HAVE_DECL_PR_SET_MM_START_DATA))
 # define PR_SET_MM_START_DATA 3
 #endif
- XLAT(PR_SET_MM_START_DATA),
 #if !(defined(PR_SET_MM_END_DATA) || (defined(HAVE_DECL_PR_SET_MM_END_DATA) && HAVE_DECL_PR_SET_MM_END_DATA))
 # define PR_SET_MM_END_DATA 4
 #endif
- XLAT(PR_SET_MM_END_DATA),
 #if !(defined(PR_SET_MM_START_STACK) || (defined(HAVE_DECL_PR_SET_MM_START_STACK) && HAVE_DECL_PR_SET_MM_START_STACK))
 # define PR_SET_MM_START_STACK 5
 #endif
- XLAT(PR_SET_MM_START_STACK),
 #if !(defined(PR_SET_MM_START_BRK) || (defined(HAVE_DECL_PR_SET_MM_START_BRK) && HAVE_DECL_PR_SET_MM_START_BRK))
 # define PR_SET_MM_START_BRK 6
 #endif
- XLAT(PR_SET_MM_START_BRK),
 #if !(defined(PR_SET_MM_BRK) || (defined(HAVE_DECL_PR_SET_MM_BRK) && HAVE_DECL_PR_SET_MM_BRK))
 # define PR_SET_MM_BRK 7
 #endif
- XLAT(PR_SET_MM_BRK),
 #if !(defined(PR_SET_MM_ARG_START) || (defined(HAVE_DECL_PR_SET_MM_ARG_START) && HAVE_DECL_PR_SET_MM_ARG_START))
 # define PR_SET_MM_ARG_START 8
 #endif
- XLAT(PR_SET_MM_ARG_START),
 #if !(defined(PR_SET_MM_ARG_END) || (defined(HAVE_DECL_PR_SET_MM_ARG_END) && HAVE_DECL_PR_SET_MM_ARG_END))
 # define PR_SET_MM_ARG_END 9
 #endif
- XLAT(PR_SET_MM_ARG_END),
 #if !(defined(PR_SET_MM_ENV_START) || (defined(HAVE_DECL_PR_SET_MM_ENV_START) && HAVE_DECL_PR_SET_MM_ENV_START))
 # define PR_SET_MM_ENV_START 10
 #endif
- XLAT(PR_SET_MM_ENV_START),
 #if !(defined(PR_SET_MM_ENV_END) || (defined(HAVE_DECL_PR_SET_MM_ENV_END) && HAVE_DECL_PR_SET_MM_ENV_END))
 # define PR_SET_MM_ENV_END 11
 #endif
- XLAT(PR_SET_MM_ENV_END),
 #if !(defined(PR_SET_MM_AUXV) || (defined(HAVE_DECL_PR_SET_MM_AUXV) && HAVE_DECL_PR_SET_MM_AUXV))
 # define PR_SET_MM_AUXV 12
 #endif
- XLAT(PR_SET_MM_AUXV),
 #if !(defined(PR_SET_MM_EXE_FILE) || (defined(HAVE_DECL_PR_SET_MM_EXE_FILE) && HAVE_DECL_PR_SET_MM_EXE_FILE))
 # define PR_SET_MM_EXE_FILE 13
 #endif
- XLAT(PR_SET_MM_EXE_FILE),
 #if !(defined(PR_SET_MM_MAP) || (defined(HAVE_DECL_PR_SET_MM_MAP) && HAVE_DECL_PR_SET_MM_MAP))
 # define PR_SET_MM_MAP 14
 #endif
- XLAT(PR_SET_MM_MAP),
 #if !(defined(PR_SET_MM_MAP_SIZE) || (defined(HAVE_DECL_PR_SET_MM_MAP_SIZE) && HAVE_DECL_PR_SET_MM_MAP_SIZE))
 # define PR_SET_MM_MAP_SIZE 15
 #endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat pr_set_mm in mpers mode
+
+#else
+
+static
+const struct xlat pr_set_mm[] = {
+ XLAT(PR_SET_MM_START_CODE),
+ XLAT(PR_SET_MM_END_CODE),
+ XLAT(PR_SET_MM_START_DATA),
+ XLAT(PR_SET_MM_END_DATA),
+ XLAT(PR_SET_MM_START_STACK),
+ XLAT(PR_SET_MM_START_BRK),
+ XLAT(PR_SET_MM_BRK),
+ XLAT(PR_SET_MM_ARG_START),
+ XLAT(PR_SET_MM_ARG_END),
+ XLAT(PR_SET_MM_ENV_START),
+ XLAT(PR_SET_MM_ENV_END),
+ XLAT(PR_SET_MM_AUXV),
+ XLAT(PR_SET_MM_EXE_FILE),
+ XLAT(PR_SET_MM_MAP),
  XLAT(PR_SET_MM_MAP_SIZE),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/pr_tsc.h b/xlat/pr_tsc.h
index 9a1a122..daec871 100644
--- a/xlat/pr_tsc.h
+++ b/xlat/pr_tsc.h
@@ -1,13 +1,22 @@
 /* Generated by ./xlat/gen.sh from ./xlat/pr_tsc.in; do not edit. */
-
-static const struct xlat pr_tsc[] = {
 #if !(defined(PR_TSC_ENABLE) || (defined(HAVE_DECL_PR_TSC_ENABLE) && HAVE_DECL_PR_TSC_ENABLE))
 # define PR_TSC_ENABLE 1
 #endif
- XLAT(PR_TSC_ENABLE),
 #if !(defined(PR_TSC_SIGSEGV) || (defined(HAVE_DECL_PR_TSC_SIGSEGV) && HAVE_DECL_PR_TSC_SIGSEGV))
 # define PR_TSC_SIGSEGV 2
 #endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat pr_tsc in mpers mode
+
+#else
+
+static
+const struct xlat pr_tsc[] = {
+ XLAT(PR_TSC_ENABLE),
  XLAT(PR_TSC_SIGSEGV),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/pr_unalign_flags.h b/xlat/pr_unalign_flags.h
index 43f3abc..5a92686 100644
--- a/xlat/pr_unalign_flags.h
+++ b/xlat/pr_unalign_flags.h
@@ -1,13 +1,22 @@
 /* Generated by ./xlat/gen.sh from ./xlat/pr_unalign_flags.in; do not edit. */
-
-static const struct xlat pr_unalign_flags[] = {
 #if !(defined(PR_UNALIGN_NOPRINT) || (defined(HAVE_DECL_PR_UNALIGN_NOPRINT) && HAVE_DECL_PR_UNALIGN_NOPRINT))
 # define PR_UNALIGN_NOPRINT 1
 #endif
- XLAT(PR_UNALIGN_NOPRINT),
 #if !(defined(PR_UNALIGN_SIGBUS) || (defined(HAVE_DECL_PR_UNALIGN_SIGBUS) && HAVE_DECL_PR_UNALIGN_SIGBUS))
 # define PR_UNALIGN_SIGBUS 2
 #endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat pr_unalign_flags in mpers mode
+
+#else
+
+static
+const struct xlat pr_unalign_flags[] = {
+ XLAT(PR_UNALIGN_NOPRINT),
  XLAT(PR_UNALIGN_SIGBUS),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/prctl_options.h b/xlat/prctl_options.h
index a3fc8ee..9cffcfb 100644
--- a/xlat/prctl_options.h
+++ b/xlat/prctl_options.h
@@ -1,177 +1,198 @@
 /* Generated by ./xlat/gen.sh from ./xlat/prctl_options.in; do not edit. */
-
-static const struct xlat prctl_options[] = {
 #if !(defined(PR_SET_PDEATHSIG) || (defined(HAVE_DECL_PR_SET_PDEATHSIG) && HAVE_DECL_PR_SET_PDEATHSIG))
 # define PR_SET_PDEATHSIG 1
 #endif
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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_FP_MODE) || (defined(HAVE_DECL_PR_SET_FP_MODE) && HAVE_DECL_PR_SET_FP_MODE))
+# define PR_SET_FP_MODE 45
+#endif
+#if !(defined(PR_GET_FP_MODE) || (defined(HAVE_DECL_PR_GET_FP_MODE) && HAVE_DECL_PR_GET_FP_MODE))
+# define PR_GET_FP_MODE 46
+#endif
+#if !(defined(PR_CAP_AMBIENT) || (defined(HAVE_DECL_PR_CAP_AMBIENT) && HAVE_DECL_PR_CAP_AMBIENT))
+# define PR_CAP_AMBIENT 47
+#endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat prctl_options in mpers mode
+
+#else
+
+static
+const struct xlat prctl_options[] = {
+ XLAT(PR_SET_PDEATHSIG),
+ XLAT(PR_GET_PDEATHSIG),
+ XLAT(PR_GET_DUMPABLE),
+ XLAT(PR_SET_DUMPABLE),
+ XLAT(PR_GET_UNALIGN),
+ XLAT(PR_SET_UNALIGN),
+ XLAT(PR_GET_KEEPCAPS),
+ XLAT(PR_SET_KEEPCAPS),
+ XLAT(PR_GET_FPEMU),
+ XLAT(PR_SET_FPEMU),
+ XLAT(PR_GET_FPEXC),
+ XLAT(PR_SET_FPEXC),
+ XLAT(PR_GET_TIMING),
+ XLAT(PR_SET_TIMING),
+ XLAT(PR_SET_NAME),
+ XLAT(PR_GET_NAME),
+ XLAT(PR_GET_ENDIAN),
+ XLAT(PR_SET_ENDIAN),
+ XLAT(PR_GET_SECCOMP),
+ XLAT(PR_SET_SECCOMP),
+ XLAT(PR_CAPBSET_READ),
+ XLAT(PR_CAPBSET_DROP),
+ XLAT(PR_GET_TSC),
+ XLAT(PR_SET_TSC),
+ XLAT(PR_GET_SECUREBITS),
+ XLAT(PR_SET_SECUREBITS),
+ XLAT(PR_SET_TIMERSLACK),
+ XLAT(PR_GET_TIMERSLACK),
+ XLAT(PR_TASK_PERF_EVENTS_DISABLE),
+ XLAT(PR_TASK_PERF_EVENTS_ENABLE),
+ XLAT(PR_MCE_KILL),
+ XLAT(PR_MCE_KILL_GET),
+ XLAT(PR_SET_MM),
+ XLAT(PR_SET_PTRACER),
+ XLAT(PR_SET_CHILD_SUBREAPER),
+ XLAT(PR_GET_CHILD_SUBREAPER),
+ XLAT(PR_SET_NO_NEW_PRIVS),
+ XLAT(PR_GET_NO_NEW_PRIVS),
+ XLAT(PR_GET_TID_ADDRESS),
+ XLAT(PR_SET_THP_DISABLE),
+ XLAT(PR_GET_THP_DISABLE),
+ XLAT(PR_MPX_ENABLE_MANAGEMENT),
  XLAT(PR_MPX_DISABLE_MANAGEMENT),
+ XLAT(PR_SET_FP_MODE),
+ XLAT(PR_GET_FP_MODE),
+ XLAT(PR_CAP_AMBIENT),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/priorities.h b/xlat/priorities.h
index b74e529..72c1a44 100644
--- a/xlat/priorities.h
+++ b/xlat/priorities.h
@@ -1,14 +1,23 @@
 /* Generated by ./xlat/gen.sh from ./xlat/priorities.in; do not edit. */
 
-static const struct xlat priorities[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat priorities in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/ptp_flags_options.h b/xlat/ptp_flags_options.h
index 22ae5ce..4ceffa6 100644
--- a/xlat/ptp_flags_options.h
+++ b/xlat/ptp_flags_options.h
@@ -1,14 +1,23 @@
 /* Generated by ./xlat/gen.sh from ./xlat/ptp_flags_options.in; do not edit. */
 
-static const struct xlat ptp_flags_options[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat ptp_flags_options in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/ptrace_cmds.h b/xlat/ptrace_cmds.h
index 215f75e..92143b9 100644
--- a/xlat/ptrace_cmds.h
+++ b/xlat/ptrace_cmds.h
@@ -1,279 +1,297 @@
 /* Generated by ./xlat/gen.sh from ./xlat/ptrace_cmds.in; do not edit. */
 
-static const struct xlat ptrace_cmds[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat ptrace_cmds in mpers mode
+
+#else
+
+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
 /* 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),
+  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),
+  XLAT(PTRACE_SET_THREAD_AREA),
 #endif
 #if defined(PTRACE_OLDSETOPTIONS) || (defined(HAVE_DECL_PTRACE_OLDSETOPTIONS) && HAVE_DECL_PTRACE_OLDSETOPTIONS)
- XLAT(PTRACE_OLDSETOPTIONS),
+  XLAT(PTRACE_OLDSETOPTIONS),
 #endif
 #if defined(PTRACE_GETFDPIC) || (defined(HAVE_DECL_PTRACE_GETFDPIC) && HAVE_DECL_PTRACE_GETFDPIC)
- XLAT(PTRACE_GETFDPIC),
+  XLAT(PTRACE_GETFDPIC),
 #endif
 #if defined(PTRACE_SINGLEBLOCK) || (defined(HAVE_DECL_PTRACE_SINGLEBLOCK) && HAVE_DECL_PTRACE_SINGLEBLOCK)
- XLAT(PTRACE_SINGLEBLOCK),
+  XLAT(PTRACE_SINGLEBLOCK),
 #endif
 /* arm */
 #if defined(PTRACE_GETWMMXREGS) || (defined(HAVE_DECL_PTRACE_GETWMMXREGS) && HAVE_DECL_PTRACE_GETWMMXREGS)
- XLAT(PTRACE_GETWMMXREGS),
+  XLAT(PTRACE_GETWMMXREGS),
 #endif
 #if defined(PTRACE_SETWMMXREGS) || (defined(HAVE_DECL_PTRACE_SETWMMXREGS) && HAVE_DECL_PTRACE_SETWMMXREGS)
- XLAT(PTRACE_SETWMMXREGS),
+  XLAT(PTRACE_SETWMMXREGS),
 #endif
 #if defined(PTRACE_GETCRUNCHREGS) || (defined(HAVE_DECL_PTRACE_GETCRUNCHREGS) && HAVE_DECL_PTRACE_GETCRUNCHREGS)
- XLAT(PTRACE_GETCRUNCHREGS),
+  XLAT(PTRACE_GETCRUNCHREGS),
 #endif
 #if defined(PTRACE_SETCRUNCHREGS) || (defined(HAVE_DECL_PTRACE_SETCRUNCHREGS) && HAVE_DECL_PTRACE_SETCRUNCHREGS)
- XLAT(PTRACE_SETCRUNCHREGS),
+  XLAT(PTRACE_SETCRUNCHREGS),
 #endif
 #if defined(PTRACE_GETVFPREGS) || (defined(HAVE_DECL_PTRACE_GETVFPREGS) && HAVE_DECL_PTRACE_GETVFPREGS)
- XLAT(PTRACE_GETVFPREGS),
+  XLAT(PTRACE_GETVFPREGS),
 #endif
 #if defined(PTRACE_SETVFPREGS) || (defined(HAVE_DECL_PTRACE_SETVFPREGS) && HAVE_DECL_PTRACE_SETVFPREGS)
- XLAT(PTRACE_SETVFPREGS),
+  XLAT(PTRACE_SETVFPREGS),
 #endif
 #if defined(PTRACE_GETHBPREGS) || (defined(HAVE_DECL_PTRACE_GETHBPREGS) && HAVE_DECL_PTRACE_GETHBPREGS)
- XLAT(PTRACE_GETHBPREGS),
+  XLAT(PTRACE_GETHBPREGS),
 #endif
 #if defined(PTRACE_SETHBPREGS) || (defined(HAVE_DECL_PTRACE_SETHBPREGS) && HAVE_DECL_PTRACE_SETHBPREGS)
- XLAT(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),
+  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),
+  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),
+  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),
+  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),
+  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),
+  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),
+  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),
+  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),
+  XLAT(PTRACE_SET_WATCH_REGS),
 #endif
 /* powerpc */
 #if defined(PTRACE_GETEVRREGS) || (defined(HAVE_DECL_PTRACE_GETEVRREGS) && HAVE_DECL_PTRACE_GETEVRREGS)
- XLAT(PTRACE_GETEVRREGS),
+  XLAT(PTRACE_GETEVRREGS),
 #endif
 #if defined(PTRACE_SETEVRREGS) || (defined(HAVE_DECL_PTRACE_SETEVRREGS) && HAVE_DECL_PTRACE_SETEVRREGS)
- XLAT(PTRACE_SETEVRREGS),
+  XLAT(PTRACE_SETEVRREGS),
 #endif
 #if defined(PTRACE_GETVSRREGS) || (defined(HAVE_DECL_PTRACE_GETVSRREGS) && HAVE_DECL_PTRACE_GETVSRREGS)
- XLAT(PTRACE_GETVSRREGS),
+  XLAT(PTRACE_GETVSRREGS),
 #endif
 #if defined(PTRACE_SETVSRREGS) || (defined(HAVE_DECL_PTRACE_SETVSRREGS) && HAVE_DECL_PTRACE_SETVSRREGS)
- XLAT(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),
+  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),
+  XLAT(PTRACE_SET_DEBUGREG),
+#endif
+#if defined(PPC_PTRACE_GETHWDBGINFO) || (defined(HAVE_DECL_PPC_PTRACE_GETHWDBGINFO) && HAVE_DECL_PPC_PTRACE_GETHWDBGINFO)
+  XLAT(PPC_PTRACE_GETHWDBGINFO),
+#endif
+#if defined(PPC_PTRACE_SETHWDEBUG) || (defined(HAVE_DECL_PPC_PTRACE_SETHWDEBUG) && HAVE_DECL_PPC_PTRACE_SETHWDEBUG)
+  XLAT(PPC_PTRACE_SETHWDEBUG),
+#endif
+#if defined(PPC_PTRACE_DELHWDEBUG) || (defined(HAVE_DECL_PPC_PTRACE_DELHWDEBUG) && HAVE_DECL_PPC_PTRACE_DELHWDEBUG)
+  XLAT(PPC_PTRACE_DELHWDEBUG),
 #endif
 /* s390 */
 #if defined(PTRACE_PEEKUSR_AREA) || (defined(HAVE_DECL_PTRACE_PEEKUSR_AREA) && HAVE_DECL_PTRACE_PEEKUSR_AREA)
- XLAT(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),
+  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),
+  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),
+  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),
+  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),
+  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),
+  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),
+  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),
+  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),
+  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),
+  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),
+  XLAT(PTRACE_TE_ABORT_RAND),
 #endif
 /* sh */
 #if defined(PTRACE_GETDSPREGS) || (defined(HAVE_DECL_PTRACE_GETDSPREGS) && HAVE_DECL_PTRACE_GETDSPREGS)
- XLAT(PTRACE_GETDSPREGS),
+  XLAT(PTRACE_GETDSPREGS),
 #endif
 #if defined(PTRACE_SETDSPREGS) || (defined(HAVE_DECL_PTRACE_SETDSPREGS) && HAVE_DECL_PTRACE_SETDSPREGS)
- XLAT(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),
+  XLAT(PTRACE_SPARC_DETACH),
 #endif
 #if defined(PTRACE_READDATA) || (defined(HAVE_DECL_PTRACE_READDATA) && HAVE_DECL_PTRACE_READDATA)
- XLAT(PTRACE_READDATA),
+  XLAT(PTRACE_READDATA),
 #endif
 #if defined(PTRACE_WRITEDATA) || (defined(HAVE_DECL_PTRACE_WRITEDATA) && HAVE_DECL_PTRACE_WRITEDATA)
- XLAT(PTRACE_WRITEDATA),
+  XLAT(PTRACE_WRITEDATA),
 #endif
 #if defined(PTRACE_READTEXT) || (defined(HAVE_DECL_PTRACE_READTEXT) && HAVE_DECL_PTRACE_READTEXT)
- XLAT(PTRACE_READTEXT),
+  XLAT(PTRACE_READTEXT),
 #endif
 #if defined(PTRACE_WRITETEXT) || (defined(HAVE_DECL_PTRACE_WRITETEXT) && HAVE_DECL_PTRACE_WRITETEXT)
- XLAT(PTRACE_WRITETEXT),
+  XLAT(PTRACE_WRITETEXT),
 #endif
 #if defined(PTRACE_GETFPAREGS) || (defined(HAVE_DECL_PTRACE_GETFPAREGS) && HAVE_DECL_PTRACE_GETFPAREGS)
- XLAT(PTRACE_GETFPAREGS),
+  XLAT(PTRACE_GETFPAREGS),
 #endif
 #if defined(PTRACE_SETFPAREGS) || (defined(HAVE_DECL_PTRACE_SETFPAREGS) && HAVE_DECL_PTRACE_SETFPAREGS)
- XLAT(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),
+  XLAT(PTRACE_ARCH_PRCTL),
 #endif
 #if defined(PTRACE_SYSEMU) || (defined(HAVE_DECL_PTRACE_SYSEMU) && HAVE_DECL_PTRACE_SYSEMU)
- XLAT(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),
+  XLAT(PTRACE_SYSEMU_SINGLESTEP),
 #endif
 /* xtensa */
 #if defined(PTRACE_GETXTREGS) || (defined(HAVE_DECL_PTRACE_GETXTREGS) && HAVE_DECL_PTRACE_GETXTREGS)
- XLAT(PTRACE_GETXTREGS),
+  XLAT(PTRACE_GETXTREGS),
 #endif
 #if defined(PTRACE_SETXTREGS) || (defined(HAVE_DECL_PTRACE_SETXTREGS) && HAVE_DECL_PTRACE_SETXTREGS)
- XLAT(PTRACE_SETXTREGS),
+  XLAT(PTRACE_SETXTREGS),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/ptrace_events.h b/xlat/ptrace_events.h
index 6212a9e..a466f10 100644
--- a/xlat/ptrace_events.h
+++ b/xlat/ptrace_events.h
@@ -1,33 +1,42 @@
 /* Generated by ./xlat/gen.sh from ./xlat/ptrace_events.in; do not edit. */
 
-static const struct xlat ptrace_events[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat ptrace_events in mpers mode
+
+#else
+
+static
+const struct xlat ptrace_events[] = {
 #if defined(PTRACE_EVENT_FORK) || (defined(HAVE_DECL_PTRACE_EVENT_FORK) && HAVE_DECL_PTRACE_EVENT_FORK)
- XLAT(PTRACE_EVENT_FORK),
+  XLAT(PTRACE_EVENT_FORK),
 #endif
 #if defined(PTRACE_EVENT_VFORK) || (defined(HAVE_DECL_PTRACE_EVENT_VFORK) && HAVE_DECL_PTRACE_EVENT_VFORK)
- XLAT(PTRACE_EVENT_VFORK),
+  XLAT(PTRACE_EVENT_VFORK),
 #endif
 #if defined(PTRACE_EVENT_CLONE) || (defined(HAVE_DECL_PTRACE_EVENT_CLONE) && HAVE_DECL_PTRACE_EVENT_CLONE)
- XLAT(PTRACE_EVENT_CLONE),
+  XLAT(PTRACE_EVENT_CLONE),
 #endif
 #if defined(PTRACE_EVENT_EXEC) || (defined(HAVE_DECL_PTRACE_EVENT_EXEC) && HAVE_DECL_PTRACE_EVENT_EXEC)
- XLAT(PTRACE_EVENT_EXEC),
+  XLAT(PTRACE_EVENT_EXEC),
 #endif
 #if defined(PTRACE_EVENT_VFORK_DONE) || (defined(HAVE_DECL_PTRACE_EVENT_VFORK_DONE) && HAVE_DECL_PTRACE_EVENT_VFORK_DONE)
- XLAT(PTRACE_EVENT_VFORK_DONE),
+  XLAT(PTRACE_EVENT_VFORK_DONE),
 #endif
 #if defined(PTRACE_EVENT_EXIT) || (defined(HAVE_DECL_PTRACE_EVENT_EXIT) && HAVE_DECL_PTRACE_EVENT_EXIT)
- XLAT(PTRACE_EVENT_EXIT),
+  XLAT(PTRACE_EVENT_EXIT),
 #endif
 #if defined(PTRACE_EVENT_SECCOMP) || (defined(HAVE_DECL_PTRACE_EVENT_SECCOMP) && HAVE_DECL_PTRACE_EVENT_SECCOMP)
- XLAT(PTRACE_EVENT_SECCOMP),
+  XLAT(PTRACE_EVENT_SECCOMP),
 #endif
 #if defined(PTRACE_EVENT_STOP) || (defined(HAVE_DECL_PTRACE_EVENT_STOP) && HAVE_DECL_PTRACE_EVENT_STOP)
- XLAT(PTRACE_EVENT_STOP),
+  XLAT(PTRACE_EVENT_STOP),
 #endif
 /* tile */
 #if defined(PTRACE_EVENT_MIGRATE) || (defined(HAVE_DECL_PTRACE_EVENT_MIGRATE) && HAVE_DECL_PTRACE_EVENT_MIGRATE)
- XLAT(PTRACE_EVENT_MIGRATE),
+  XLAT(PTRACE_EVENT_MIGRATE),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/ptrace_setoptions_flags.h b/xlat/ptrace_setoptions_flags.h
index 38a3e74..4eaca06 100644
--- a/xlat/ptrace_setoptions_flags.h
+++ b/xlat/ptrace_setoptions_flags.h
@@ -1,36 +1,48 @@
 /* Generated by ./xlat/gen.sh from ./xlat/ptrace_setoptions_flags.in; do not edit. */
 
-static const struct xlat ptrace_setoptions_flags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat ptrace_setoptions_flags in mpers mode
+
+#else
+
+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
+#if defined(PTRACE_O_SUSPEND_SECCOMP) || (defined(HAVE_DECL_PTRACE_O_SUSPEND_SECCOMP) && HAVE_DECL_PTRACE_O_SUSPEND_SECCOMP)
+  XLAT(PTRACE_O_SUSPEND_SECCOMP),
 #endif
 /* tile */
 #if defined(PTRACE_O_TRACEMIGRATE) || (defined(HAVE_DECL_PTRACE_O_TRACEMIGRATE) && HAVE_DECL_PTRACE_O_TRACEMIGRATE)
- XLAT(PTRACE_O_TRACEMIGRATE),
+  XLAT(PTRACE_O_TRACEMIGRATE),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/quota_formats.h b/xlat/quota_formats.h
index f07b9cc..4747a14 100644
--- a/xlat/quota_formats.h
+++ b/xlat/quota_formats.h
@@ -1,11 +1,20 @@
 /* Generated by ./xlat/gen.sh from ./xlat/quota_formats.in; do not edit. */
 
-static const struct xlat quota_formats[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat quota_formats in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/quotacmds.h b/xlat/quotacmds.h
index 1341080..de61a65 100644
--- a/xlat/quotacmds.h
+++ b/xlat/quotacmds.h
@@ -1,101 +1,110 @@
 /* Generated by ./xlat/gen.sh from ./xlat/quotacmds.in; do not edit. */
 
-static const struct xlat quotacmds[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat quotacmds in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/quotatypes.h b/xlat/quotatypes.h
index b326f32..affa010 100644
--- a/xlat/quotatypes.h
+++ b/xlat/quotatypes.h
@@ -1,11 +1,20 @@
 /* Generated by ./xlat/gen.sh from ./xlat/quotatypes.in; do not edit. */
 
-static const struct xlat quotatypes[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat quotatypes in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/rename_flags.h b/xlat/rename_flags.h
index 034faed..71be045 100644
--- a/xlat/rename_flags.h
+++ b/xlat/rename_flags.h
@@ -1,11 +1,23 @@
 /* Generated by ./xlat/gen.sh from ./xlat/rename_flags.in; do not edit. */
 
-static const struct xlat rename_flags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat rename_flags in mpers mode
+
+#else
+
+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
+#if defined(RENAME_WHITEOUT) || (defined(HAVE_DECL_RENAME_WHITEOUT) && HAVE_DECL_RENAME_WHITEOUT)
+  XLAT(RENAME_WHITEOUT),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/resource_flags.h b/xlat/resource_flags.h
index 1431f89..7761ca2 100644
--- a/xlat/resource_flags.h
+++ b/xlat/resource_flags.h
@@ -1,14 +1,18 @@
 /* Generated by ./xlat/gen.sh from ./xlat/resource_flags.in; do not edit. */
 
-static const struct xlat resource_flags[] = {
+#ifndef IN_MPERS
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/resources.h b/xlat/resources.h
index 46e4d15..4493b08 100644
--- a/xlat/resources.h
+++ b/xlat/resources.h
@@ -1,56 +1,65 @@
 /* Generated by ./xlat/gen.sh from ./xlat/resources.in; do not edit. */
 
-static const struct xlat resources[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat resources in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sched_flags.h b/xlat/sched_flags.h
index 5d327ff..7863861 100644
--- a/xlat/sched_flags.h
+++ b/xlat/sched_flags.h
@@ -1,9 +1,18 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sched_flags.in; do not edit. */
-
-static const struct xlat sched_flags[] = {
 #if !(defined(SCHED_FLAG_RESET_ON_FORK) || (defined(HAVE_DECL_SCHED_FLAG_RESET_ON_FORK) && HAVE_DECL_SCHED_FLAG_RESET_ON_FORK))
 # define SCHED_FLAG_RESET_ON_FORK 1
 #endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat sched_flags in mpers mode
+
+#else
+
+static
+const struct xlat sched_flags[] = {
  XLAT(SCHED_FLAG_RESET_ON_FORK),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/schedulers.h b/xlat/schedulers.h
index b1eb0ce..099db27 100644
--- a/xlat/schedulers.h
+++ b/xlat/schedulers.h
@@ -1,26 +1,35 @@
 /* Generated by ./xlat/gen.sh from ./xlat/schedulers.in; do not edit. */
 
-static const struct xlat schedulers[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat schedulers in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/scmvals.h b/xlat/scmvals.h
index 850473d..a7ca2f0 100644
--- a/xlat/scmvals.h
+++ b/xlat/scmvals.h
@@ -1,14 +1,26 @@
 /* Generated by ./xlat/gen.sh from ./xlat/scmvals.in; do not edit. */
+#if !(defined(SCM_RIGHTS) || (defined(HAVE_DECL_SCM_RIGHTS) && HAVE_DECL_SCM_RIGHTS))
+# define SCM_RIGHTS 1
+#endif
+#if !(defined(SCM_CREDENTIALS) || (defined(HAVE_DECL_SCM_CREDENTIALS) && HAVE_DECL_SCM_CREDENTIALS))
+# define SCM_CREDENTIALS 2
+#endif
+#if !(defined(SCM_SECURITY) || (defined(HAVE_DECL_SCM_SECURITY) && HAVE_DECL_SCM_SECURITY))
+# define SCM_SECURITY 3
+#endif
 
-static const struct xlat scmvals[] = {
-#if defined(SCM_RIGHTS) || (defined(HAVE_DECL_SCM_RIGHTS) && HAVE_DECL_SCM_RIGHTS)
+#ifdef IN_MPERS
+
+# error static const struct xlat scmvals in mpers mode
+
+#else
+
+static
+const struct xlat scmvals[] = {
  XLAT(SCM_RIGHTS),
-#endif
-#if defined(SCM_CREDENTIALS) || (defined(HAVE_DECL_SCM_CREDENTIALS) && HAVE_DECL_SCM_CREDENTIALS)
  XLAT(SCM_CREDENTIALS),
-#endif
-#if defined(SCM_SECURITY) || (defined(HAVE_DECL_SCM_SECURITY) && HAVE_DECL_SCM_SECURITY)
  XLAT(SCM_SECURITY),
-#endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/secbits.h b/xlat/secbits.h
index 2fe358a..d616e1f 100644
--- a/xlat/secbits.h
+++ b/xlat/secbits.h
@@ -1,29 +1,46 @@
 /* Generated by ./xlat/gen.sh from ./xlat/secbits.in; do not edit. */
-
-static const struct xlat secbits[] = {
 #if !(defined(SECBIT_NOROOT) || (defined(HAVE_DECL_SECBIT_NOROOT) && HAVE_DECL_SECBIT_NOROOT))
 # define SECBIT_NOROOT (1 << 0)
 #endif
- XLAT(SECBIT_NOROOT),
 #if !(defined(SECBIT_NOROOT_LOCKED) || (defined(HAVE_DECL_SECBIT_NOROOT_LOCKED) && HAVE_DECL_SECBIT_NOROOT_LOCKED))
 # define SECBIT_NOROOT_LOCKED (1 << 1)
 #endif
- XLAT(SECBIT_NOROOT_LOCKED),
 #if !(defined(SECBIT_NO_SETUID_FIXUP) || (defined(HAVE_DECL_SECBIT_NO_SETUID_FIXUP) && HAVE_DECL_SECBIT_NO_SETUID_FIXUP))
 # define SECBIT_NO_SETUID_FIXUP (1 << 2)
 #endif
- XLAT(SECBIT_NO_SETUID_FIXUP),
 #if !(defined(SECBIT_NO_SETUID_FIXUP_LOCKED) || (defined(HAVE_DECL_SECBIT_NO_SETUID_FIXUP_LOCKED) && HAVE_DECL_SECBIT_NO_SETUID_FIXUP_LOCKED))
 # define SECBIT_NO_SETUID_FIXUP_LOCKED (1 << 3)
 #endif
- XLAT(SECBIT_NO_SETUID_FIXUP_LOCKED),
 #if !(defined(SECBIT_KEEP_CAPS) || (defined(HAVE_DECL_SECBIT_KEEP_CAPS) && HAVE_DECL_SECBIT_KEEP_CAPS))
 # define SECBIT_KEEP_CAPS (1 << 4)
 #endif
- XLAT(SECBIT_KEEP_CAPS),
 #if !(defined(SECBIT_KEEP_CAPS_LOCKED) || (defined(HAVE_DECL_SECBIT_KEEP_CAPS_LOCKED) && HAVE_DECL_SECBIT_KEEP_CAPS_LOCKED))
 # define SECBIT_KEEP_CAPS_LOCKED (1 << 5)
 #endif
+#if !(defined(SECBIT_NO_CAP_AMBIENT_RAISE) || (defined(HAVE_DECL_SECBIT_NO_CAP_AMBIENT_RAISE) && HAVE_DECL_SECBIT_NO_CAP_AMBIENT_RAISE))
+# define SECBIT_NO_CAP_AMBIENT_RAISE (1 << 6)
+#endif
+#if !(defined(SECBIT_NO_CAP_AMBIENT_RAISE_LOCKED) || (defined(HAVE_DECL_SECBIT_NO_CAP_AMBIENT_RAISE_LOCKED) && HAVE_DECL_SECBIT_NO_CAP_AMBIENT_RAISE_LOCKED))
+# define SECBIT_NO_CAP_AMBIENT_RAISE_LOCKED (1 << 7)
+#endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat secbits in mpers mode
+
+#else
+
+static
+const struct xlat secbits[] = {
+ XLAT(SECBIT_NOROOT),
+ XLAT(SECBIT_NOROOT_LOCKED),
+ XLAT(SECBIT_NO_SETUID_FIXUP),
+ XLAT(SECBIT_NO_SETUID_FIXUP_LOCKED),
+ XLAT(SECBIT_KEEP_CAPS),
  XLAT(SECBIT_KEEP_CAPS_LOCKED),
+ XLAT(SECBIT_NO_CAP_AMBIENT_RAISE),
+ XLAT(SECBIT_NO_CAP_AMBIENT_RAISE_LOCKED),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/seccomp_filter_flags.h b/xlat/seccomp_filter_flags.h
index 7fbdbd9..5c0decd 100644
--- a/xlat/seccomp_filter_flags.h
+++ b/xlat/seccomp_filter_flags.h
@@ -1,9 +1,18 @@
 /* Generated by ./xlat/gen.sh from ./xlat/seccomp_filter_flags.in; do not edit. */
-
-static const struct xlat seccomp_filter_flags[] = {
 #if !(defined(SECCOMP_FILTER_FLAG_TSYNC) || (defined(HAVE_DECL_SECCOMP_FILTER_FLAG_TSYNC) && HAVE_DECL_SECCOMP_FILTER_FLAG_TSYNC))
 # define SECCOMP_FILTER_FLAG_TSYNC 1
 #endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat seccomp_filter_flags in mpers mode
+
+#else
+
+static
+const struct xlat seccomp_filter_flags[] = {
  XLAT(SECCOMP_FILTER_FLAG_TSYNC),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/seccomp_mode.h b/xlat/seccomp_mode.h
index fdb54fc..842dd44 100644
--- a/xlat/seccomp_mode.h
+++ b/xlat/seccomp_mode.h
@@ -1,17 +1,26 @@
 /* Generated by ./xlat/gen.sh from ./xlat/seccomp_mode.in; do not edit. */
-
-static const struct xlat seccomp_mode[] = {
 #if !(defined(SECCOMP_MODE_DISABLED) || (defined(HAVE_DECL_SECCOMP_MODE_DISABLED) && HAVE_DECL_SECCOMP_MODE_DISABLED))
 # define SECCOMP_MODE_DISABLED 0
 #endif
- XLAT(SECCOMP_MODE_DISABLED),
 #if !(defined(SECCOMP_MODE_STRICT) || (defined(HAVE_DECL_SECCOMP_MODE_STRICT) && HAVE_DECL_SECCOMP_MODE_STRICT))
 # define SECCOMP_MODE_STRICT 1
 #endif
- XLAT(SECCOMP_MODE_STRICT),
 #if !(defined(SECCOMP_MODE_FILTER) || (defined(HAVE_DECL_SECCOMP_MODE_FILTER) && HAVE_DECL_SECCOMP_MODE_FILTER))
 # define SECCOMP_MODE_FILTER 2
 #endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat seccomp_mode in mpers mode
+
+#else
+
+static
+const struct xlat seccomp_mode[] = {
+ XLAT(SECCOMP_MODE_DISABLED),
+ XLAT(SECCOMP_MODE_STRICT),
  XLAT(SECCOMP_MODE_FILTER),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/seccomp_ops.h b/xlat/seccomp_ops.h
index afaf74f..3fd0dc6 100644
--- a/xlat/seccomp_ops.h
+++ b/xlat/seccomp_ops.h
@@ -1,13 +1,22 @@
 /* Generated by ./xlat/gen.sh from ./xlat/seccomp_ops.in; do not edit. */
-
-static const struct xlat seccomp_ops[] = {
 #if !(defined(SECCOMP_SET_MODE_STRICT) || (defined(HAVE_DECL_SECCOMP_SET_MODE_STRICT) && HAVE_DECL_SECCOMP_SET_MODE_STRICT))
 # define SECCOMP_SET_MODE_STRICT 0
 #endif
- XLAT(SECCOMP_SET_MODE_STRICT),
 #if !(defined(SECCOMP_SET_MODE_FILTER) || (defined(HAVE_DECL_SECCOMP_SET_MODE_FILTER) && HAVE_DECL_SECCOMP_SET_MODE_FILTER))
 # define SECCOMP_SET_MODE_FILTER 1
 #endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat seccomp_ops in mpers mode
+
+#else
+
+static
+const struct xlat seccomp_ops[] = {
+ XLAT(SECCOMP_SET_MODE_STRICT),
  XLAT(SECCOMP_SET_MODE_FILTER),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/seccomp_ret_action.h b/xlat/seccomp_ret_action.h
index cf4ff21..2d41609 100644
--- a/xlat/seccomp_ret_action.h
+++ b/xlat/seccomp_ret_action.h
@@ -1,20 +1,29 @@
 /* Generated by ./xlat/gen.sh from ./xlat/seccomp_ret_action.in; do not edit. */
 
-static const struct xlat seccomp_ret_action[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat seccomp_ret_action in mpers mode
+
+#else
+
+static
+const struct xlat seccomp_ret_action[] = {
 #if defined(SECCOMP_RET_KILL) || (defined(HAVE_DECL_SECCOMP_RET_KILL) && HAVE_DECL_SECCOMP_RET_KILL)
- XLAT(SECCOMP_RET_KILL),
+  XLAT(SECCOMP_RET_KILL),
 #endif
 #if defined(SECCOMP_RET_TRAP) || (defined(HAVE_DECL_SECCOMP_RET_TRAP) && HAVE_DECL_SECCOMP_RET_TRAP)
- XLAT(SECCOMP_RET_TRAP),
+  XLAT(SECCOMP_RET_TRAP),
 #endif
 #if defined(SECCOMP_RET_ERRNO) || (defined(HAVE_DECL_SECCOMP_RET_ERRNO) && HAVE_DECL_SECCOMP_RET_ERRNO)
- XLAT(SECCOMP_RET_ERRNO),
+  XLAT(SECCOMP_RET_ERRNO),
 #endif
 #if defined(SECCOMP_RET_TRACE) || (defined(HAVE_DECL_SECCOMP_RET_TRACE) && HAVE_DECL_SECCOMP_RET_TRACE)
- XLAT(SECCOMP_RET_TRACE),
+  XLAT(SECCOMP_RET_TRACE),
 #endif
 #if defined(SECCOMP_RET_ALLOW) || (defined(HAVE_DECL_SECCOMP_RET_ALLOW) && HAVE_DECL_SECCOMP_RET_ALLOW)
- XLAT(SECCOMP_RET_ALLOW),
+  XLAT(SECCOMP_RET_ALLOW),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/semctl_flags.h b/xlat/semctl_flags.h
index 1a8dbcf..b8e0c62 100644
--- a/xlat/semctl_flags.h
+++ b/xlat/semctl_flags.h
@@ -1,44 +1,55 @@
 /* Generated by ./xlat/gen.sh from ./xlat/semctl_flags.in; do not edit. */
+#if !(defined(SEM_STAT) || (defined(HAVE_DECL_SEM_STAT) && HAVE_DECL_SEM_STAT))
+# define SEM_STAT 18
+#endif
+#if !(defined(SEM_INFO) || (defined(HAVE_DECL_SEM_INFO) && HAVE_DECL_SEM_INFO))
+# define SEM_INFO 19
+#endif
 
-static const struct xlat semctl_flags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat semctl_flags in mpers mode
+
+#else
+
+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),
-#endif
-#if defined(SEM_INFO) || (defined(HAVE_DECL_SEM_INFO) && HAVE_DECL_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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/semop_flags.h b/xlat/semop_flags.h
index ee2f64e..b5ce4a0 100644
--- a/xlat/semop_flags.h
+++ b/xlat/semop_flags.h
@@ -1,11 +1,20 @@
 /* Generated by ./xlat/gen.sh from ./xlat/semop_flags.in; do not edit. */
 
-static const struct xlat semop_flags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat semop_flags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/setsockipoptions.h b/xlat/setsockipoptions.h
new file mode 100644
index 0000000..34ae307
--- /dev/null
+++ b/xlat/setsockipoptions.h
@@ -0,0 +1,89 @@
+/* Generated by ./xlat/gen.sh from ./xlat/setsockipoptions.in; do not edit. */
+
+#ifdef IN_MPERS
+
+# error static const struct xlat setsockipoptions in mpers mode
+
+#else
+
+static
+const struct xlat setsockipoptions[] = {
+/*
+* Options specific to setsockopt(SOL_IP).
+* Common {g,s}etsockopt(SOL_IP) options
+* should be in sockipoptions.in instead.
+*/
+
+#if defined(ARPT_SO_SET_REPLACE) || (defined(HAVE_DECL_ARPT_SO_SET_REPLACE) && HAVE_DECL_ARPT_SO_SET_REPLACE)
+  XLAT(ARPT_SO_SET_REPLACE),
+#endif
+#if defined(ARPT_SO_SET_ADD_COUNTERS) || (defined(HAVE_DECL_ARPT_SO_SET_ADD_COUNTERS) && HAVE_DECL_ARPT_SO_SET_ADD_COUNTERS)
+  XLAT(ARPT_SO_SET_ADD_COUNTERS),
+#endif
+
+#if defined(EBT_SO_SET_ENTRIES) || (defined(HAVE_DECL_EBT_SO_SET_ENTRIES) && HAVE_DECL_EBT_SO_SET_ENTRIES)
+  XLAT(EBT_SO_SET_ENTRIES),
+#endif
+#if defined(EBT_SO_SET_COUNTERS) || (defined(HAVE_DECL_EBT_SO_SET_COUNTERS) && HAVE_DECL_EBT_SO_SET_COUNTERS)
+  XLAT(EBT_SO_SET_COUNTERS),
+#endif
+
+#if defined(IP_VS_SO_SET_NONE) || (defined(HAVE_DECL_IP_VS_SO_SET_NONE) && HAVE_DECL_IP_VS_SO_SET_NONE)
+  XLAT(IP_VS_SO_SET_NONE),
+#endif
+#if defined(IP_VS_SO_SET_INSERT) || (defined(HAVE_DECL_IP_VS_SO_SET_INSERT) && HAVE_DECL_IP_VS_SO_SET_INSERT)
+  XLAT(IP_VS_SO_SET_INSERT),
+#endif
+#if defined(IP_VS_SO_SET_ADD) || (defined(HAVE_DECL_IP_VS_SO_SET_ADD) && HAVE_DECL_IP_VS_SO_SET_ADD)
+  XLAT(IP_VS_SO_SET_ADD),
+#endif
+#if defined(IP_VS_SO_SET_EDIT) || (defined(HAVE_DECL_IP_VS_SO_SET_EDIT) && HAVE_DECL_IP_VS_SO_SET_EDIT)
+  XLAT(IP_VS_SO_SET_EDIT),
+#endif
+#if defined(IP_VS_SO_SET_DEL) || (defined(HAVE_DECL_IP_VS_SO_SET_DEL) && HAVE_DECL_IP_VS_SO_SET_DEL)
+  XLAT(IP_VS_SO_SET_DEL),
+#endif
+#if defined(IP_VS_SO_SET_FLUSH) || (defined(HAVE_DECL_IP_VS_SO_SET_FLUSH) && HAVE_DECL_IP_VS_SO_SET_FLUSH)
+  XLAT(IP_VS_SO_SET_FLUSH),
+#endif
+#if defined(IP_VS_SO_SET_LIST) || (defined(HAVE_DECL_IP_VS_SO_SET_LIST) && HAVE_DECL_IP_VS_SO_SET_LIST)
+  XLAT(IP_VS_SO_SET_LIST),
+#endif
+#if defined(IP_VS_SO_SET_ADDDEST) || (defined(HAVE_DECL_IP_VS_SO_SET_ADDDEST) && HAVE_DECL_IP_VS_SO_SET_ADDDEST)
+  XLAT(IP_VS_SO_SET_ADDDEST),
+#endif
+#if defined(IP_VS_SO_SET_DELDEST) || (defined(HAVE_DECL_IP_VS_SO_SET_DELDEST) && HAVE_DECL_IP_VS_SO_SET_DELDEST)
+  XLAT(IP_VS_SO_SET_DELDEST),
+#endif
+#if defined(IP_VS_SO_SET_EDITDEST) || (defined(HAVE_DECL_IP_VS_SO_SET_EDITDEST) && HAVE_DECL_IP_VS_SO_SET_EDITDEST)
+  XLAT(IP_VS_SO_SET_EDITDEST),
+#endif
+#if defined(IP_VS_SO_SET_TIMEOUT) || (defined(HAVE_DECL_IP_VS_SO_SET_TIMEOUT) && HAVE_DECL_IP_VS_SO_SET_TIMEOUT)
+  XLAT(IP_VS_SO_SET_TIMEOUT),
+#endif
+#if defined(IP_VS_SO_SET_STARTDAEMON) || (defined(HAVE_DECL_IP_VS_SO_SET_STARTDAEMON) && HAVE_DECL_IP_VS_SO_SET_STARTDAEMON)
+  XLAT(IP_VS_SO_SET_STARTDAEMON),
+#endif
+#if defined(IP_VS_SO_SET_STOPDAEMON) || (defined(HAVE_DECL_IP_VS_SO_SET_STOPDAEMON) && HAVE_DECL_IP_VS_SO_SET_STOPDAEMON)
+  XLAT(IP_VS_SO_SET_STOPDAEMON),
+#endif
+#if defined(IP_VS_SO_SET_RESTORE) || (defined(HAVE_DECL_IP_VS_SO_SET_RESTORE) && HAVE_DECL_IP_VS_SO_SET_RESTORE)
+  XLAT(IP_VS_SO_SET_RESTORE),
+#endif
+#if defined(IP_VS_SO_SET_SAVE) || (defined(HAVE_DECL_IP_VS_SO_SET_SAVE) && HAVE_DECL_IP_VS_SO_SET_SAVE)
+  XLAT(IP_VS_SO_SET_SAVE),
+#endif
+#if defined(IP_VS_SO_SET_ZERO) || (defined(HAVE_DECL_IP_VS_SO_SET_ZERO) && HAVE_DECL_IP_VS_SO_SET_ZERO)
+  XLAT(IP_VS_SO_SET_ZERO),
+#endif
+
+#if defined(IPT_SO_SET_REPLACE) || (defined(HAVE_DECL_IPT_SO_SET_REPLACE) && HAVE_DECL_IPT_SO_SET_REPLACE)
+  XLAT(IPT_SO_SET_REPLACE),
+#endif
+#if defined(IPT_SO_SET_ADD_COUNTERS) || (defined(HAVE_DECL_IPT_SO_SET_ADD_COUNTERS) && HAVE_DECL_IPT_SO_SET_ADD_COUNTERS)
+  XLAT(IPT_SO_SET_ADD_COUNTERS),
+#endif
+ XLAT_END
+};
+
+#endif /* !IN_MPERS */
diff --git a/xlat/setsockipv6options.h b/xlat/setsockipv6options.h
new file mode 100644
index 0000000..4fea6bc
--- /dev/null
+++ b/xlat/setsockipv6options.h
@@ -0,0 +1,26 @@
+/* Generated by ./xlat/gen.sh from ./xlat/setsockipv6options.in; do not edit. */
+
+#ifdef IN_MPERS
+
+# error static const struct xlat setsockipv6options in mpers mode
+
+#else
+
+static
+const struct xlat setsockipv6options[] = {
+/*
+* Options specific to setsockopt(SOL_IPV6).
+* Common {g,s}etsockopt(SOL_IPV6) options
+* should be in sockipv6options.in instead.
+*/
+
+#if defined(IP6T_SO_SET_REPLACE) || (defined(HAVE_DECL_IP6T_SO_SET_REPLACE) && HAVE_DECL_IP6T_SO_SET_REPLACE)
+  XLAT(IP6T_SO_SET_REPLACE),
+#endif
+#if defined(IP6T_SO_SET_ADD_COUNTERS) || (defined(HAVE_DECL_IP6T_SO_SET_ADD_COUNTERS) && HAVE_DECL_IP6T_SO_SET_ADD_COUNTERS)
+  XLAT(IP6T_SO_SET_ADD_COUNTERS),
+#endif
+ XLAT_END
+};
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sfd_flags.h b/xlat/sfd_flags.h
new file mode 100644
index 0000000..23d08b8
--- /dev/null
+++ b/xlat/sfd_flags.h
@@ -0,0 +1,26 @@
+/* Generated by ./xlat/gen.sh from ./xlat/sfd_flags.in; do not edit. */
+#if defined SFD_CLOEXEC || defined O_CLOEXEC
+#if !(defined(SFD_CLOEXEC) || (defined(HAVE_DECL_SFD_CLOEXEC) && HAVE_DECL_SFD_CLOEXEC))
+# define SFD_CLOEXEC O_CLOEXEC
+#endif
+#endif
+#if !(defined(SFD_NONBLOCK) || (defined(HAVE_DECL_SFD_NONBLOCK) && HAVE_DECL_SFD_NONBLOCK))
+# define SFD_NONBLOCK O_NONBLOCK
+#endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat sfd_flags in mpers mode
+
+#else
+
+static
+const struct xlat sfd_flags[] = {
+#if defined SFD_CLOEXEC || defined O_CLOEXEC
+ XLAT(SFD_CLOEXEC),
+#endif
+ XLAT(SFD_NONBLOCK),
+ XLAT_END
+};
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sg_io_dxfer_direction.h b/xlat/sg_io_dxfer_direction.h
index d430469..51248f5 100644
--- a/xlat/sg_io_dxfer_direction.h
+++ b/xlat/sg_io_dxfer_direction.h
@@ -1,17 +1,26 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sg_io_dxfer_direction.in; do not edit. */
 
-static const struct xlat sg_io_dxfer_direction[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat sg_io_dxfer_direction in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/shm_flags.h b/xlat/shm_flags.h
index c5100f2..79e5407 100644
--- a/xlat/shm_flags.h
+++ b/xlat/shm_flags.h
@@ -1,14 +1,23 @@
 /* Generated by ./xlat/gen.sh from ./xlat/shm_flags.in; do not edit. */
 
-static const struct xlat shm_flags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat shm_flags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/shm_resource_flags.h b/xlat/shm_resource_flags.h
index 059263e..b216b45 100644
--- a/xlat/shm_resource_flags.h
+++ b/xlat/shm_resource_flags.h
@@ -1,14 +1,23 @@
 /* Generated by ./xlat/gen.sh from ./xlat/shm_resource_flags.in; do not edit. */
 
-static const struct xlat shm_resource_flags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat shm_resource_flags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/shmctl_flags.h b/xlat/shmctl_flags.h
index 25773e3..a5e9f1b 100644
--- a/xlat/shmctl_flags.h
+++ b/xlat/shmctl_flags.h
@@ -1,29 +1,42 @@
 /* Generated by ./xlat/gen.sh from ./xlat/shmctl_flags.in; do not edit. */
+#if !(defined(SHM_STAT) || (defined(HAVE_DECL_SHM_STAT) && HAVE_DECL_SHM_STAT))
+# define SHM_STAT 13
+#endif
+#if !(defined(SHM_INFO) || (defined(HAVE_DECL_SHM_INFO) && HAVE_DECL_SHM_INFO))
+# define SHM_INFO 14
+#endif
 
-static const struct xlat shmctl_flags[] = {
+#ifdef IN_MPERS
+
+extern const struct xlat shmctl_flags[];
+
+#else
+
+# if !(defined HAVE_M32_MPERS || defined HAVE_MX32_MPERS)
+static
+# endif
+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),
-#endif
-#if defined(SHM_INFO) || (defined(HAVE_DECL_SHM_INFO) && HAVE_DECL_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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/shutdown_modes.h b/xlat/shutdown_modes.h
index 390ee5d..073c583 100644
--- a/xlat/shutdown_modes.h
+++ b/xlat/shutdown_modes.h
@@ -1,8 +1,17 @@
 /* Generated by ./xlat/gen.sh from ./xlat/shutdown_modes.in; do not edit. */
 
-static const struct xlat shutdown_modes[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat shutdown_modes in mpers mode
+
+#else
+
+static
+const struct xlat shutdown_modes[] = {
 { 0,	"SHUT_RD"	},
 { 1,	"SHUT_WR"	},
 { 2,	"SHUT_RDWR"	},
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sigact_flags.h b/xlat/sigact_flags.h
index 7837a40..31debc4 100644
--- a/xlat/sigact_flags.h
+++ b/xlat/sigact_flags.h
@@ -1,57 +1,70 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sigact_flags.in; do not edit. */
+#if defined SA_NOMASK && SA_NODEFER != SA_NOMASK
+#endif
+#if defined SA_ONESHOT && SA_ONESHOT != SA_RESETHAND
+#endif
 
-static const struct xlat sigact_flags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat sigact_flags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sigaltstack_flags.h b/xlat/sigaltstack_flags.h
index d438108..1ad31bc 100644
--- a/xlat/sigaltstack_flags.h
+++ b/xlat/sigaltstack_flags.h
@@ -1,13 +1,24 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sigaltstack_flags.in; do not edit. */
-
-static const struct xlat sigaltstack_flags[] = {
 #if !(defined(SS_ONSTACK) || (defined(HAVE_DECL_SS_ONSTACK) && HAVE_DECL_SS_ONSTACK))
 # define SS_ONSTACK 1
 #endif
- XLAT(SS_ONSTACK),
 #if !(defined(SS_DISABLE) || (defined(HAVE_DECL_SS_DISABLE) && HAVE_DECL_SS_DISABLE))
 # define SS_DISABLE 2
 #endif
+
+#ifdef IN_MPERS
+
+extern const struct xlat sigaltstack_flags[];
+
+#else
+
+# if !(defined HAVE_M32_MPERS || defined HAVE_MX32_MPERS)
+static
+# endif
+const struct xlat sigaltstack_flags[] = {
+ XLAT(SS_ONSTACK),
  XLAT(SS_DISABLE),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sigbus_codes.h b/xlat/sigbus_codes.h
index a666134..4ad49ab 100644
--- a/xlat/sigbus_codes.h
+++ b/xlat/sigbus_codes.h
@@ -1,25 +1,36 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sigbus_codes.in; do not edit. */
-
-static const struct xlat sigbus_codes[] = {
 #if !(defined(BUS_ADRALN) || (defined(HAVE_DECL_BUS_ADRALN) && HAVE_DECL_BUS_ADRALN))
 # define BUS_ADRALN 1
 #endif
- XLAT(BUS_ADRALN),
 #if !(defined(BUS_ADRERR) || (defined(HAVE_DECL_BUS_ADRERR) && HAVE_DECL_BUS_ADRERR))
 # define BUS_ADRERR 2
 #endif
- XLAT(BUS_ADRERR),
 #if !(defined(BUS_OBJERR) || (defined(HAVE_DECL_BUS_OBJERR) && HAVE_DECL_BUS_OBJERR))
 # define BUS_OBJERR 3
 #endif
- XLAT(BUS_OBJERR),
 #if !(defined(BUS_MCEERR_AR) || (defined(HAVE_DECL_BUS_MCEERR_AR) && HAVE_DECL_BUS_MCEERR_AR))
 # define BUS_MCEERR_AR 4
 #endif
- XLAT(BUS_MCEERR_AR),
 #if !(defined(BUS_MCEERR_AO) || (defined(HAVE_DECL_BUS_MCEERR_AO) && HAVE_DECL_BUS_MCEERR_AO))
 # define BUS_MCEERR_AO 5
 #endif
+
+#ifdef IN_MPERS
+
+extern const struct xlat sigbus_codes[];
+
+#else
+
+# if !(defined HAVE_M32_MPERS || defined HAVE_MX32_MPERS)
+static
+# endif
+const struct xlat sigbus_codes[] = {
+ XLAT(BUS_ADRALN),
+ XLAT(BUS_ADRERR),
+ XLAT(BUS_OBJERR),
+ XLAT(BUS_MCEERR_AR),
  XLAT(BUS_MCEERR_AO),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sigchld_codes.h b/xlat/sigchld_codes.h
index eb4a3d6..e1bf046 100644
--- a/xlat/sigchld_codes.h
+++ b/xlat/sigchld_codes.h
@@ -1,29 +1,40 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sigchld_codes.in; do not edit. */
-
-static const struct xlat sigchld_codes[] = {
 #if !(defined(CLD_EXITED) || (defined(HAVE_DECL_CLD_EXITED) && HAVE_DECL_CLD_EXITED))
 # define CLD_EXITED 1
 #endif
- XLAT(CLD_EXITED),
 #if !(defined(CLD_KILLED) || (defined(HAVE_DECL_CLD_KILLED) && HAVE_DECL_CLD_KILLED))
 # define CLD_KILLED 2
 #endif
- XLAT(CLD_KILLED),
 #if !(defined(CLD_DUMPED) || (defined(HAVE_DECL_CLD_DUMPED) && HAVE_DECL_CLD_DUMPED))
 # define CLD_DUMPED 3
 #endif
- XLAT(CLD_DUMPED),
 #if !(defined(CLD_TRAPPED) || (defined(HAVE_DECL_CLD_TRAPPED) && HAVE_DECL_CLD_TRAPPED))
 # define CLD_TRAPPED 4
 #endif
- XLAT(CLD_TRAPPED),
 #if !(defined(CLD_STOPPED) || (defined(HAVE_DECL_CLD_STOPPED) && HAVE_DECL_CLD_STOPPED))
 # define CLD_STOPPED 5
 #endif
- XLAT(CLD_STOPPED),
 #if !(defined(CLD_CONTINUED) || (defined(HAVE_DECL_CLD_CONTINUED) && HAVE_DECL_CLD_CONTINUED))
 # define CLD_CONTINUED 6
 #endif
+
+#ifdef IN_MPERS
+
+extern const struct xlat sigchld_codes[];
+
+#else
+
+# if !(defined HAVE_M32_MPERS || defined HAVE_MX32_MPERS)
+static
+# endif
+const struct xlat sigchld_codes[] = {
+ XLAT(CLD_EXITED),
+ XLAT(CLD_KILLED),
+ XLAT(CLD_DUMPED),
+ XLAT(CLD_TRAPPED),
+ XLAT(CLD_STOPPED),
  XLAT(CLD_CONTINUED),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sigemt_codes.h b/xlat/sigemt_codes.h
index 0804e61..68f6fb4 100644
--- a/xlat/sigemt_codes.h
+++ b/xlat/sigemt_codes.h
@@ -1,9 +1,20 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sigemt_codes.in; do not edit. */
-
-static const struct xlat sigemt_codes[] = {
 #if !(defined(EMT_TAGOVF) || (defined(HAVE_DECL_EMT_TAGOVF) && HAVE_DECL_EMT_TAGOVF))
 # define EMT_TAGOVF 1
 #endif
+
+#ifdef IN_MPERS
+
+extern const struct xlat sigemt_codes[];
+
+#else
+
+# if !(defined HAVE_M32_MPERS || defined HAVE_MX32_MPERS)
+static
+# endif
+const struct xlat sigemt_codes[] = {
  XLAT(EMT_TAGOVF),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sigev_value.h b/xlat/sigev_value.h
index 04ed1b2..7c569a5 100644
--- a/xlat/sigev_value.h
+++ b/xlat/sigev_value.h
@@ -1,17 +1,32 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sigev_value.in; do not edit. */
+#if !(defined(SIGEV_SIGNAL) || (defined(HAVE_DECL_SIGEV_SIGNAL) && HAVE_DECL_SIGEV_SIGNAL))
+# define SIGEV_SIGNAL 0
+#endif
+#if !(defined(SIGEV_NONE) || (defined(HAVE_DECL_SIGEV_NONE) && HAVE_DECL_SIGEV_NONE))
+# define SIGEV_NONE 1
+#endif
+#if !(defined(SIGEV_THREAD) || (defined(HAVE_DECL_SIGEV_THREAD) && HAVE_DECL_SIGEV_THREAD))
+# define SIGEV_THREAD 2
+#endif
+#if !(defined(SIGEV_THREAD_ID) || (defined(HAVE_DECL_SIGEV_THREAD_ID) && HAVE_DECL_SIGEV_THREAD_ID))
+# define SIGEV_THREAD_ID 4
+#endif
 
-static const struct xlat sigev_value[] = {
-#if defined(SIGEV_SIGNAL) || (defined(HAVE_DECL_SIGEV_SIGNAL) && HAVE_DECL_SIGEV_SIGNAL)
+#ifdef IN_MPERS
+
+extern const struct xlat sigev_value[];
+
+#else
+
+# if !(defined HAVE_M32_MPERS || defined HAVE_MX32_MPERS)
+static
+# endif
+const struct xlat sigev_value[] = {
  XLAT(SIGEV_SIGNAL),
-#endif
-#if defined(SIGEV_NONE) || (defined(HAVE_DECL_SIGEV_NONE) && HAVE_DECL_SIGEV_NONE)
  XLAT(SIGEV_NONE),
-#endif
-#if defined(SIGEV_THREAD) || (defined(HAVE_DECL_SIGEV_THREAD) && HAVE_DECL_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),
-#endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sigfpe_codes.h b/xlat/sigfpe_codes.h
index 6624a31..c9e2959 100644
--- a/xlat/sigfpe_codes.h
+++ b/xlat/sigfpe_codes.h
@@ -1,37 +1,48 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sigfpe_codes.in; do not edit. */
-
-static const struct xlat sigfpe_codes[] = {
 #if !(defined(FPE_INTDIV) || (defined(HAVE_DECL_FPE_INTDIV) && HAVE_DECL_FPE_INTDIV))
 # define FPE_INTDIV 1
 #endif
- XLAT(FPE_INTDIV),
 #if !(defined(FPE_INTOVF) || (defined(HAVE_DECL_FPE_INTOVF) && HAVE_DECL_FPE_INTOVF))
 # define FPE_INTOVF 2
 #endif
- XLAT(FPE_INTOVF),
 #if !(defined(FPE_FLTDIV) || (defined(HAVE_DECL_FPE_FLTDIV) && HAVE_DECL_FPE_FLTDIV))
 # define FPE_FLTDIV 3
 #endif
- XLAT(FPE_FLTDIV),
 #if !(defined(FPE_FLTOVF) || (defined(HAVE_DECL_FPE_FLTOVF) && HAVE_DECL_FPE_FLTOVF))
 # define FPE_FLTOVF 4
 #endif
- XLAT(FPE_FLTOVF),
 #if !(defined(FPE_FLTUND) || (defined(HAVE_DECL_FPE_FLTUND) && HAVE_DECL_FPE_FLTUND))
 # define FPE_FLTUND 5
 #endif
- XLAT(FPE_FLTUND),
 #if !(defined(FPE_FLTRES) || (defined(HAVE_DECL_FPE_FLTRES) && HAVE_DECL_FPE_FLTRES))
 # define FPE_FLTRES 6
 #endif
- XLAT(FPE_FLTRES),
 #if !(defined(FPE_FLTINV) || (defined(HAVE_DECL_FPE_FLTINV) && HAVE_DECL_FPE_FLTINV))
 # define FPE_FLTINV 7
 #endif
- XLAT(FPE_FLTINV),
 #if !(defined(FPE_FLTSUB) || (defined(HAVE_DECL_FPE_FLTSUB) && HAVE_DECL_FPE_FLTSUB))
 # define FPE_FLTSUB 8
 #endif
+
+#ifdef IN_MPERS
+
+extern const struct xlat sigfpe_codes[];
+
+#else
+
+# if !(defined HAVE_M32_MPERS || defined HAVE_MX32_MPERS)
+static
+# endif
+const struct xlat sigfpe_codes[] = {
+ XLAT(FPE_INTDIV),
+ XLAT(FPE_INTOVF),
+ XLAT(FPE_FLTDIV),
+ XLAT(FPE_FLTOVF),
+ XLAT(FPE_FLTUND),
+ XLAT(FPE_FLTRES),
+ XLAT(FPE_FLTINV),
  XLAT(FPE_FLTSUB),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sigill_codes.h b/xlat/sigill_codes.h
index 8922257..f16a69c 100644
--- a/xlat/sigill_codes.h
+++ b/xlat/sigill_codes.h
@@ -1,37 +1,48 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sigill_codes.in; do not edit. */
-
-static const struct xlat sigill_codes[] = {
 #if !(defined(ILL_ILLOPC) || (defined(HAVE_DECL_ILL_ILLOPC) && HAVE_DECL_ILL_ILLOPC))
 # define ILL_ILLOPC 1
 #endif
- XLAT(ILL_ILLOPC),
 #if !(defined(ILL_ILLOPN) || (defined(HAVE_DECL_ILL_ILLOPN) && HAVE_DECL_ILL_ILLOPN))
 # define ILL_ILLOPN 2
 #endif
- XLAT(ILL_ILLOPN),
 #if !(defined(ILL_ILLADR) || (defined(HAVE_DECL_ILL_ILLADR) && HAVE_DECL_ILL_ILLADR))
 # define ILL_ILLADR 3
 #endif
- XLAT(ILL_ILLADR),
 #if !(defined(ILL_ILLTRP) || (defined(HAVE_DECL_ILL_ILLTRP) && HAVE_DECL_ILL_ILLTRP))
 # define ILL_ILLTRP 4
 #endif
- XLAT(ILL_ILLTRP),
 #if !(defined(ILL_PRVOPC) || (defined(HAVE_DECL_ILL_PRVOPC) && HAVE_DECL_ILL_PRVOPC))
 # define ILL_PRVOPC 5
 #endif
- XLAT(ILL_PRVOPC),
 #if !(defined(ILL_PRVREG) || (defined(HAVE_DECL_ILL_PRVREG) && HAVE_DECL_ILL_PRVREG))
 # define ILL_PRVREG 6
 #endif
- XLAT(ILL_PRVREG),
 #if !(defined(ILL_COPROC) || (defined(HAVE_DECL_ILL_COPROC) && HAVE_DECL_ILL_COPROC))
 # define ILL_COPROC 7
 #endif
- XLAT(ILL_COPROC),
 #if !(defined(ILL_BADSTK) || (defined(HAVE_DECL_ILL_BADSTK) && HAVE_DECL_ILL_BADSTK))
 # define ILL_BADSTK 8
 #endif
+
+#ifdef IN_MPERS
+
+extern const struct xlat sigill_codes[];
+
+#else
+
+# if !(defined HAVE_M32_MPERS || defined HAVE_MX32_MPERS)
+static
+# endif
+const struct xlat sigill_codes[] = {
+ XLAT(ILL_ILLOPC),
+ XLAT(ILL_ILLOPN),
+ XLAT(ILL_ILLADR),
+ XLAT(ILL_ILLTRP),
+ XLAT(ILL_PRVOPC),
+ XLAT(ILL_PRVREG),
+ XLAT(ILL_COPROC),
  XLAT(ILL_BADSTK),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/siginfo_codes.h b/xlat/siginfo_codes.h
index 7ac5a9f..faef6c7 100644
--- a/xlat/siginfo_codes.h
+++ b/xlat/siginfo_codes.h
@@ -1,51 +1,62 @@
 /* Generated by ./xlat/gen.sh from ./xlat/siginfo_codes.in; do not edit. */
-
-static const struct xlat siginfo_codes[] = {
 #if !(defined(SI_USER) || (defined(HAVE_DECL_SI_USER) && HAVE_DECL_SI_USER))
 # define SI_USER 0
 #endif
- XLAT(SI_USER),
 #if !(defined(SI_KERNEL) || (defined(HAVE_DECL_SI_KERNEL) && HAVE_DECL_SI_KERNEL))
 # define SI_KERNEL 0x80
 #endif
- XLAT(SI_KERNEL),
 #if !(defined(SI_QUEUE) || (defined(HAVE_DECL_SI_QUEUE) && HAVE_DECL_SI_QUEUE))
 # define SI_QUEUE -1
 #endif
- XLAT(SI_QUEUE),
 #if !(defined(SI_TIMER) || (defined(HAVE_DECL_SI_TIMER) && HAVE_DECL_SI_TIMER))
 # define SI_TIMER -2
 #endif
- XLAT(SI_TIMER),
 #if !(defined(SI_MESGQ) || (defined(HAVE_DECL_SI_MESGQ) && HAVE_DECL_SI_MESGQ))
 # define SI_MESGQ -3
 #endif
- XLAT(SI_MESGQ),
 #if !(defined(SI_ASYNCIO) || (defined(HAVE_DECL_SI_ASYNCIO) && HAVE_DECL_SI_ASYNCIO))
 # define SI_ASYNCIO -4
 #endif
- XLAT(SI_ASYNCIO),
 #if !(defined(SI_SIGIO) || (defined(HAVE_DECL_SI_SIGIO) && HAVE_DECL_SI_SIGIO))
 # define SI_SIGIO -5
 #endif
- XLAT(SI_SIGIO),
 #if !(defined(SI_TKILL) || (defined(HAVE_DECL_SI_TKILL) && HAVE_DECL_SI_TKILL))
 # define SI_TKILL -6
 #endif
- XLAT(SI_TKILL),
 #if !(defined(SI_DETHREAD) || (defined(HAVE_DECL_SI_DETHREAD) && HAVE_DECL_SI_DETHREAD))
 # define SI_DETHREAD -7
 #endif
- XLAT(SI_DETHREAD),
 #if !(defined(SI_ASYNCNL) || (defined(HAVE_DECL_SI_ASYNCNL) && HAVE_DECL_SI_ASYNCNL))
 # define SI_ASYNCNL -60
 #endif
+
+#ifdef IN_MPERS
+
+extern const struct xlat siginfo_codes[];
+
+#else
+
+# if !(defined HAVE_M32_MPERS || defined HAVE_MX32_MPERS)
+static
+# endif
+const struct xlat siginfo_codes[] = {
+ XLAT(SI_USER),
+ XLAT(SI_KERNEL),
+ XLAT(SI_QUEUE),
+ XLAT(SI_TIMER),
+ XLAT(SI_MESGQ),
+ XLAT(SI_ASYNCIO),
+ XLAT(SI_SIGIO),
+ XLAT(SI_TKILL),
+ XLAT(SI_DETHREAD),
  XLAT(SI_ASYNCNL),
 #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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sigpoll_codes.h b/xlat/sigpoll_codes.h
index f963b63..55cc1bb 100644
--- a/xlat/sigpoll_codes.h
+++ b/xlat/sigpoll_codes.h
@@ -1,29 +1,40 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sigpoll_codes.in; do not edit. */
-
-static const struct xlat sigpoll_codes[] = {
 #if !(defined(POLL_IN) || (defined(HAVE_DECL_POLL_IN) && HAVE_DECL_POLL_IN))
 # define POLL_IN 1
 #endif
- XLAT(POLL_IN),
 #if !(defined(POLL_OUT) || (defined(HAVE_DECL_POLL_OUT) && HAVE_DECL_POLL_OUT))
 # define POLL_OUT 2
 #endif
- XLAT(POLL_OUT),
 #if !(defined(POLL_MSG) || (defined(HAVE_DECL_POLL_MSG) && HAVE_DECL_POLL_MSG))
 # define POLL_MSG 3
 #endif
- XLAT(POLL_MSG),
 #if !(defined(POLL_ERR) || (defined(HAVE_DECL_POLL_ERR) && HAVE_DECL_POLL_ERR))
 # define POLL_ERR 4
 #endif
- XLAT(POLL_ERR),
 #if !(defined(POLL_PRI) || (defined(HAVE_DECL_POLL_PRI) && HAVE_DECL_POLL_PRI))
 # define POLL_PRI 5
 #endif
- XLAT(POLL_PRI),
 #if !(defined(POLL_HUP) || (defined(HAVE_DECL_POLL_HUP) && HAVE_DECL_POLL_HUP))
 # define POLL_HUP 6
 #endif
+
+#ifdef IN_MPERS
+
+extern const struct xlat sigpoll_codes[];
+
+#else
+
+# if !(defined HAVE_M32_MPERS || defined HAVE_MX32_MPERS)
+static
+# endif
+const struct xlat sigpoll_codes[] = {
+ XLAT(POLL_IN),
+ XLAT(POLL_OUT),
+ XLAT(POLL_MSG),
+ XLAT(POLL_ERR),
+ XLAT(POLL_PRI),
  XLAT(POLL_HUP),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sigprocmaskcmds.h b/xlat/sigprocmaskcmds.h
index fc37e5b..427680b 100644
--- a/xlat/sigprocmaskcmds.h
+++ b/xlat/sigprocmaskcmds.h
@@ -1,17 +1,26 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sigprocmaskcmds.in; do not edit. */
 
-static const struct xlat sigprocmaskcmds[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat sigprocmaskcmds in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sigprof_codes.h b/xlat/sigprof_codes.h
index 3d08a24..2323b9e 100644
--- a/xlat/sigprof_codes.h
+++ b/xlat/sigprof_codes.h
@@ -1,8 +1,19 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sigprof_codes.in; do not edit. */
 
-static const struct xlat sigprof_codes[] = {
+#ifdef IN_MPERS
+
+extern const struct xlat sigprof_codes[];
+
+#else
+
+# if !(defined HAVE_M32_MPERS || defined HAVE_MX32_MPERS)
+static
+# endif
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sigsegv_codes.h b/xlat/sigsegv_codes.h
index 3f2a5b9..3fe1461 100644
--- a/xlat/sigsegv_codes.h
+++ b/xlat/sigsegv_codes.h
@@ -1,17 +1,28 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sigsegv_codes.in; do not edit. */
-
-static const struct xlat sigsegv_codes[] = {
 #if !(defined(SEGV_MAPERR) || (defined(HAVE_DECL_SEGV_MAPERR) && HAVE_DECL_SEGV_MAPERR))
 # define SEGV_MAPERR 1
 #endif
- XLAT(SEGV_MAPERR),
 #if !(defined(SEGV_ACCERR) || (defined(HAVE_DECL_SEGV_ACCERR) && HAVE_DECL_SEGV_ACCERR))
 # define SEGV_ACCERR 2
 #endif
- XLAT(SEGV_ACCERR),
 #if !(defined(SEGV_BNDERR) || (defined(HAVE_DECL_SEGV_BNDERR) && HAVE_DECL_SEGV_BNDERR))
 # define SEGV_BNDERR 3
 #endif
+
+#ifdef IN_MPERS
+
+extern const struct xlat sigsegv_codes[];
+
+#else
+
+# if !(defined HAVE_M32_MPERS || defined HAVE_MX32_MPERS)
+static
+# endif
+const struct xlat sigsegv_codes[] = {
+ XLAT(SEGV_MAPERR),
+ XLAT(SEGV_ACCERR),
  XLAT(SEGV_BNDERR),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sigsys_codes.h b/xlat/sigsys_codes.h
index 19c63f8..6fba1fb 100644
--- a/xlat/sigsys_codes.h
+++ b/xlat/sigsys_codes.h
@@ -1,9 +1,20 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sigsys_codes.in; do not edit. */
-
-static const struct xlat sigsys_codes[] = {
 #if !(defined(SYS_SECCOMP) || (defined(HAVE_DECL_SYS_SECCOMP) && HAVE_DECL_SYS_SECCOMP))
 # define SYS_SECCOMP 1
 #endif
+
+#ifdef IN_MPERS
+
+extern const struct xlat sigsys_codes[];
+
+#else
+
+# if !(defined HAVE_M32_MPERS || defined HAVE_MX32_MPERS)
+static
+# endif
+const struct xlat sigsys_codes[] = {
  XLAT(SYS_SECCOMP),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sigtrap_codes.h b/xlat/sigtrap_codes.h
index a1db5ad..f451dc4 100644
--- a/xlat/sigtrap_codes.h
+++ b/xlat/sigtrap_codes.h
@@ -1,21 +1,32 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sigtrap_codes.in; do not edit. */
-
-static const struct xlat sigtrap_codes[] = {
 #if !(defined(TRAP_BRKPT) || (defined(HAVE_DECL_TRAP_BRKPT) && HAVE_DECL_TRAP_BRKPT))
 # define TRAP_BRKPT 1
 #endif
- XLAT(TRAP_BRKPT),
 #if !(defined(TRAP_TRACE) || (defined(HAVE_DECL_TRAP_TRACE) && HAVE_DECL_TRAP_TRACE))
 # define TRAP_TRACE 2
 #endif
- XLAT(TRAP_TRACE),
 #if !(defined(TRAP_BRANCH) || (defined(HAVE_DECL_TRAP_BRANCH) && HAVE_DECL_TRAP_BRANCH))
 # define TRAP_BRANCH 3
 #endif
- XLAT(TRAP_BRANCH),
 #if !(defined(TRAP_HWBKPT) || (defined(HAVE_DECL_TRAP_HWBKPT) && HAVE_DECL_TRAP_HWBKPT))
 # define TRAP_HWBKPT 4
 #endif
+
+#ifdef IN_MPERS
+
+extern const struct xlat sigtrap_codes[];
+
+#else
+
+# if !(defined HAVE_M32_MPERS || defined HAVE_MX32_MPERS)
+static
+# endif
+const struct xlat sigtrap_codes[] = {
+ XLAT(TRAP_BRKPT),
+ XLAT(TRAP_TRACE),
+ XLAT(TRAP_BRANCH),
  XLAT(TRAP_HWBKPT),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sock_type_flags.h b/xlat/sock_type_flags.h
index 5f12933..d1af088 100644
--- a/xlat/sock_type_flags.h
+++ b/xlat/sock_type_flags.h
@@ -1,11 +1,20 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sock_type_flags.in; do not edit. */
 
-static const struct xlat sock_type_flags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat sock_type_flags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/socketlayers.h b/xlat/socketlayers.h
index 2544b50..c3af327 100644
--- a/xlat/socketlayers.h
+++ b/xlat/socketlayers.h
@@ -1,141 +1,150 @@
 /* Generated by ./xlat/gen.sh from ./xlat/socketlayers.in; do not edit. */
-
-static const struct xlat socketlayers[] = {
 #if !(defined(SOL_IP) || (defined(HAVE_DECL_SOL_IP) && HAVE_DECL_SOL_IP))
 # define SOL_IP 0
 #endif
- XLAT(SOL_IP),
 #if !(defined(SOL_SOCKET) || (defined(HAVE_DECL_SOL_SOCKET) && HAVE_DECL_SOL_SOCKET))
 # define SOL_SOCKET 1
 #endif
- XLAT(SOL_SOCKET),
 #if !(defined(SOL_TCP) || (defined(HAVE_DECL_SOL_TCP) && HAVE_DECL_SOL_TCP))
 # define SOL_TCP 6
 #endif
- XLAT(SOL_TCP),
 #if !(defined(SOL_UDP) || (defined(HAVE_DECL_SOL_UDP) && HAVE_DECL_SOL_UDP))
 # define SOL_UDP 17
 #endif
- XLAT(SOL_UDP),
 #if !(defined(SOL_IPV6) || (defined(HAVE_DECL_SOL_IPV6) && HAVE_DECL_SOL_IPV6))
 # define SOL_IPV6 41
 #endif
- XLAT(SOL_IPV6),
 #if !(defined(SOL_ICMPV6) || (defined(HAVE_DECL_SOL_ICMPV6) && HAVE_DECL_SOL_ICMPV6))
 # define SOL_ICMPV6 58
 #endif
- XLAT(SOL_ICMPV6),
 #if !(defined(SOL_SCTP) || (defined(HAVE_DECL_SOL_SCTP) && HAVE_DECL_SOL_SCTP))
 # define SOL_SCTP 132
 #endif
- XLAT(SOL_SCTP),
 #if !(defined(SOL_UDPLITE) || (defined(HAVE_DECL_SOL_UDPLITE) && HAVE_DECL_SOL_UDPLITE))
 # define SOL_UDPLITE 136
 #endif
- XLAT(SOL_UDPLITE),
 #if !(defined(SOL_RAW) || (defined(HAVE_DECL_SOL_RAW) && HAVE_DECL_SOL_RAW))
 # define SOL_RAW 255
 #endif
- XLAT(SOL_RAW),
 #if !(defined(SOL_IPX) || (defined(HAVE_DECL_SOL_IPX) && HAVE_DECL_SOL_IPX))
 # define SOL_IPX 256
 #endif
- XLAT(SOL_IPX),
 #if !(defined(SOL_AX25) || (defined(HAVE_DECL_SOL_AX25) && HAVE_DECL_SOL_AX25))
 # define SOL_AX25 257
 #endif
- XLAT(SOL_AX25),
 #if !(defined(SOL_ATALK) || (defined(HAVE_DECL_SOL_ATALK) && HAVE_DECL_SOL_ATALK))
 # define SOL_ATALK 258
 #endif
- XLAT(SOL_ATALK),
 #if !(defined(SOL_NETROM) || (defined(HAVE_DECL_SOL_NETROM) && HAVE_DECL_SOL_NETROM))
 # define SOL_NETROM 259
 #endif
- XLAT(SOL_NETROM),
 #if !(defined(SOL_ROSE) || (defined(HAVE_DECL_SOL_ROSE) && HAVE_DECL_SOL_ROSE))
 # define SOL_ROSE 260
 #endif
- XLAT(SOL_ROSE),
 #if !(defined(SOL_DECNET) || (defined(HAVE_DECL_SOL_DECNET) && HAVE_DECL_SOL_DECNET))
 # define SOL_DECNET 261
 #endif
- XLAT(SOL_DECNET),
 #if !(defined(SOL_X25) || (defined(HAVE_DECL_SOL_X25) && HAVE_DECL_SOL_X25))
 # define SOL_X25 262
 #endif
- XLAT(SOL_X25),
 #if !(defined(SOL_PACKET) || (defined(HAVE_DECL_SOL_PACKET) && HAVE_DECL_SOL_PACKET))
 # define SOL_PACKET 263
 #endif
- XLAT(SOL_PACKET),
 #if !(defined(SOL_ATM) || (defined(HAVE_DECL_SOL_ATM) && HAVE_DECL_SOL_ATM))
 # define SOL_ATM 264
 #endif
- XLAT(SOL_ATM),
 #if !(defined(SOL_AAL) || (defined(HAVE_DECL_SOL_AAL) && HAVE_DECL_SOL_AAL))
 # define SOL_AAL 265
 #endif
- XLAT(SOL_AAL),
 #if !(defined(SOL_IRDA) || (defined(HAVE_DECL_SOL_IRDA) && HAVE_DECL_SOL_IRDA))
 # define SOL_IRDA 266
 #endif
- XLAT(SOL_IRDA),
 #if !(defined(SOL_NETBEUI) || (defined(HAVE_DECL_SOL_NETBEUI) && HAVE_DECL_SOL_NETBEUI))
 # define SOL_NETBEUI 267
 #endif
- XLAT(SOL_NETBEUI),
 #if !(defined(SOL_LLC) || (defined(HAVE_DECL_SOL_LLC) && HAVE_DECL_SOL_LLC))
 # define SOL_LLC 268
 #endif
- XLAT(SOL_LLC),
 #if !(defined(SOL_DCCP) || (defined(HAVE_DECL_SOL_DCCP) && HAVE_DECL_SOL_DCCP))
 # define SOL_DCCP 269
 #endif
- XLAT(SOL_DCCP),
 #if !(defined(SOL_NETLINK) || (defined(HAVE_DECL_SOL_NETLINK) && HAVE_DECL_SOL_NETLINK))
 # define SOL_NETLINK 270
 #endif
- XLAT(SOL_NETLINK),
 #if !(defined(SOL_TIPC) || (defined(HAVE_DECL_SOL_TIPC) && HAVE_DECL_SOL_TIPC))
 # define SOL_TIPC 271
 #endif
- XLAT(SOL_TIPC),
 #if !(defined(SOL_RXRPC) || (defined(HAVE_DECL_SOL_RXRPC) && HAVE_DECL_SOL_RXRPC))
 # define SOL_RXRPC 272
 #endif
- XLAT(SOL_RXRPC),
 #if !(defined(SOL_PPPOL2TP) || (defined(HAVE_DECL_SOL_PPPOL2TP) && HAVE_DECL_SOL_PPPOL2TP))
 # define SOL_PPPOL2TP 273
 #endif
- XLAT(SOL_PPPOL2TP),
 #if !(defined(SOL_BLUETOOTH) || (defined(HAVE_DECL_SOL_BLUETOOTH) && HAVE_DECL_SOL_BLUETOOTH))
 # define SOL_BLUETOOTH 274
 #endif
- XLAT(SOL_BLUETOOTH),
 #if !(defined(SOL_PNPIPE) || (defined(HAVE_DECL_SOL_PNPIPE) && HAVE_DECL_SOL_PNPIPE))
 # define SOL_PNPIPE 275
 #endif
- XLAT(SOL_PNPIPE),
 #if !(defined(SOL_RDS) || (defined(HAVE_DECL_SOL_RDS) && HAVE_DECL_SOL_RDS))
 # define SOL_RDS 276
 #endif
- XLAT(SOL_RDS),
 #if !(defined(SOL_IUCV) || (defined(HAVE_DECL_SOL_IUCV) && HAVE_DECL_SOL_IUCV))
 # define SOL_IUCV 277
 #endif
- XLAT(SOL_IUCV),
 #if !(defined(SOL_CAIF) || (defined(HAVE_DECL_SOL_CAIF) && HAVE_DECL_SOL_CAIF))
 # define SOL_CAIF 278
 #endif
- XLAT(SOL_CAIF),
 #if !(defined(SOL_ALG) || (defined(HAVE_DECL_SOL_ALG) && HAVE_DECL_SOL_ALG))
 # define SOL_ALG 279
 #endif
- XLAT(SOL_ALG),
 #if !(defined(SOL_NFC) || (defined(HAVE_DECL_SOL_NFC) && HAVE_DECL_SOL_NFC))
 # define SOL_NFC 280
 #endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat socketlayers in mpers mode
+
+#else
+
+static
+const struct xlat socketlayers[] = {
+ XLAT(SOL_IP),
+ XLAT(SOL_SOCKET),
+ XLAT(SOL_TCP),
+ XLAT(SOL_UDP),
+ XLAT(SOL_IPV6),
+ XLAT(SOL_ICMPV6),
+ XLAT(SOL_SCTP),
+ XLAT(SOL_UDPLITE),
+ XLAT(SOL_RAW),
+ XLAT(SOL_IPX),
+ XLAT(SOL_AX25),
+ XLAT(SOL_ATALK),
+ XLAT(SOL_NETROM),
+ XLAT(SOL_ROSE),
+ XLAT(SOL_DECNET),
+ XLAT(SOL_X25),
+ XLAT(SOL_PACKET),
+ XLAT(SOL_ATM),
+ XLAT(SOL_AAL),
+ XLAT(SOL_IRDA),
+ XLAT(SOL_NETBEUI),
+ XLAT(SOL_LLC),
+ XLAT(SOL_DCCP),
+ XLAT(SOL_NETLINK),
+ XLAT(SOL_TIPC),
+ XLAT(SOL_RXRPC),
+ XLAT(SOL_PPPOL2TP),
+ XLAT(SOL_BLUETOOTH),
+ XLAT(SOL_PNPIPE),
+ XLAT(SOL_RDS),
+ XLAT(SOL_IUCV),
+ XLAT(SOL_CAIF),
+ XLAT(SOL_ALG),
  XLAT(SOL_NFC),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sockipoptions.h b/xlat/sockipoptions.h
index 6956491..7a75f87 100644
--- a/xlat/sockipoptions.h
+++ b/xlat/sockipoptions.h
@@ -1,146 +1,161 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sockipoptions.in; do not edit. */
 
-static const struct xlat sockipoptions[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat sockipoptions in mpers mode
+
+#else
+
+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),
-#endif
-#if defined(IP_RECVRETOPTS) || (defined(HAVE_DECL_IP_RECVRETOPTS) && HAVE_DECL_IP_RECVRETOPTS)
- XLAT(IP_RECVRETOPTS),
-#endif
-#if defined(IP_RECVDSTADDR) || (defined(HAVE_DECL_IP_RECVDSTADDR) && HAVE_DECL_IP_RECVDSTADDR)
- XLAT(IP_RECVDSTADDR),
+  XLAT(IP_RECVOPTS),
 #endif
 #if defined(IP_RETOPTS) || (defined(HAVE_DECL_IP_RETOPTS) && HAVE_DECL_IP_RETOPTS)
- XLAT(IP_RETOPTS),
+  XLAT(IP_RETOPTS),
+#endif
+#if defined(IP_RECVRETOPTS) || (defined(HAVE_DECL_IP_RECVRETOPTS) && HAVE_DECL_IP_RECVRETOPTS)
+  XLAT(IP_RECVRETOPTS),
+#endif
+#if defined(IP_RECVDSTADDR) || (defined(HAVE_DECL_IP_RECVDSTADDR) && HAVE_DECL_IP_RECVDSTADDR)
+  XLAT(IP_RECVDSTADDR),
 #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),
-#endif
-#if defined(MCAST_MSFILTER) || (defined(HAVE_DECL_MCAST_MSFILTER) && HAVE_DECL_MCAST_MSFILTER)
- XLAT(MCAST_MSFILTER),
+  XLAT(IP_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_CHECKSUM) || (defined(HAVE_DECL_IP_CHECKSUM) && HAVE_DECL_IP_CHECKSUM)
+  XLAT(IP_CHECKSUM),
+#endif
+#if defined(IP_BIND_ADDRESS_NO_PORT) || (defined(HAVE_DECL_IP_BIND_ADDRESS_NO_PORT) && HAVE_DECL_IP_BIND_ADDRESS_NO_PORT)
+  XLAT(IP_BIND_ADDRESS_NO_PORT),
 #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(MCAST_MSFILTER) || (defined(HAVE_DECL_MCAST_MSFILTER) && HAVE_DECL_MCAST_MSFILTER)
+  XLAT(MCAST_MSFILTER),
 #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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sockipv6options.h b/xlat/sockipv6options.h
index 9b36ed9..85bdd65 100644
--- a/xlat/sockipv6options.h
+++ b/xlat/sockipv6options.h
@@ -1,161 +1,170 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sockipv6options.in; do not edit. */
 
-static const struct xlat sockipv6options[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat sockipv6options in mpers mode
+
+#else
+
+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(IPV6_2292PKTINFO) || (defined(HAVE_DECL_IPV6_2292PKTINFO) && HAVE_DECL_IPV6_2292PKTINFO)
- XLAT(IPV6_2292PKTINFO),
+  XLAT(IPV6_2292PKTINFO),
 #endif
 #if defined(IPV6_2292HOPOPTS) || (defined(HAVE_DECL_IPV6_2292HOPOPTS) && HAVE_DECL_IPV6_2292HOPOPTS)
- XLAT(IPV6_2292HOPOPTS),
+  XLAT(IPV6_2292HOPOPTS),
 #endif
 #if defined(IPV6_2292DSTOPTS) || (defined(HAVE_DECL_IPV6_2292DSTOPTS) && HAVE_DECL_IPV6_2292DSTOPTS)
- XLAT(IPV6_2292DSTOPTS),
+  XLAT(IPV6_2292DSTOPTS),
 #endif
 #if defined(IPV6_2292RTHDR) || (defined(HAVE_DECL_IPV6_2292RTHDR) && HAVE_DECL_IPV6_2292RTHDR)
- XLAT(IPV6_2292RTHDR),
+  XLAT(IPV6_2292RTHDR),
 #endif
 #if defined(IPV6_2292PKTOPTIONS) || (defined(HAVE_DECL_IPV6_2292PKTOPTIONS) && HAVE_DECL_IPV6_2292PKTOPTIONS)
- XLAT(IPV6_2292PKTOPTIONS),
+  XLAT(IPV6_2292PKTOPTIONS),
 #endif
 #if defined(IPV6_CHECKSUM) || (defined(HAVE_DECL_IPV6_CHECKSUM) && HAVE_DECL_IPV6_CHECKSUM)
- XLAT(IPV6_CHECKSUM),
+  XLAT(IPV6_CHECKSUM),
 #endif
 #if defined(IPV6_2292HOPLIMIT) || (defined(HAVE_DECL_IPV6_2292HOPLIMIT) && HAVE_DECL_IPV6_2292HOPLIMIT)
- XLAT(IPV6_2292HOPLIMIT),
+  XLAT(IPV6_2292HOPLIMIT),
 #endif
 #if defined(IPV6_NEXTHOP) || (defined(HAVE_DECL_IPV6_NEXTHOP) && HAVE_DECL_IPV6_NEXTHOP)
- XLAT(IPV6_NEXTHOP),
+  XLAT(IPV6_NEXTHOP),
 #endif
 #if defined(IPV6_AUTHHDR) || (defined(HAVE_DECL_IPV6_AUTHHDR) && HAVE_DECL_IPV6_AUTHHDR)
- XLAT(IPV6_AUTHHDR),
+  XLAT(IPV6_AUTHHDR),
 #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_IF) || (defined(HAVE_DECL_IPV6_MULTICAST_IF) && HAVE_DECL_IPV6_MULTICAST_IF)
- XLAT(IPV6_MULTICAST_IF),
+  XLAT(IPV6_MULTICAST_IF),
 #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_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
 #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_MTU) || (defined(HAVE_DECL_IPV6_MTU) && HAVE_DECL_IPV6_MTU)
- XLAT(IPV6_MTU),
+  XLAT(IPV6_MTU),
 #endif
 #if defined(IPV6_RECVERR) || (defined(HAVE_DECL_IPV6_RECVERR) && HAVE_DECL_IPV6_RECVERR)
- XLAT(IPV6_RECVERR),
+  XLAT(IPV6_RECVERR),
 #endif
 #if defined(IPV6_V6ONLY) || (defined(HAVE_DECL_IPV6_V6ONLY) && HAVE_DECL_IPV6_V6ONLY)
- XLAT(IPV6_V6ONLY),
+  XLAT(IPV6_V6ONLY),
 #endif
 #if defined(IPV6_JOIN_ANYCAST) || (defined(HAVE_DECL_IPV6_JOIN_ANYCAST) && HAVE_DECL_IPV6_JOIN_ANYCAST)
- XLAT(IPV6_JOIN_ANYCAST),
+  XLAT(IPV6_JOIN_ANYCAST),
 #endif
 #if defined(IPV6_LEAVE_ANYCAST) || (defined(HAVE_DECL_IPV6_LEAVE_ANYCAST) && HAVE_DECL_IPV6_LEAVE_ANYCAST)
- XLAT(IPV6_LEAVE_ANYCAST),
+  XLAT(IPV6_LEAVE_ANYCAST),
 #endif
 #if defined(IPV6_FLOWLABEL_MGR) || (defined(HAVE_DECL_IPV6_FLOWLABEL_MGR) && HAVE_DECL_IPV6_FLOWLABEL_MGR)
- XLAT(IPV6_FLOWLABEL_MGR),
+  XLAT(IPV6_FLOWLABEL_MGR),
 #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_IPSEC_POLICY) || (defined(HAVE_DECL_IPV6_IPSEC_POLICY) && HAVE_DECL_IPV6_IPSEC_POLICY)
- XLAT(IPV6_IPSEC_POLICY),
+  XLAT(IPV6_IPSEC_POLICY),
 #endif
 #if defined(IPV6_XFRM_POLICY) || (defined(HAVE_DECL_IPV6_XFRM_POLICY) && HAVE_DECL_IPV6_XFRM_POLICY)
- XLAT(IPV6_XFRM_POLICY),
+  XLAT(IPV6_XFRM_POLICY),
 #endif
 #if defined(IPV6_RECVPKTINFO) || (defined(HAVE_DECL_IPV6_RECVPKTINFO) && HAVE_DECL_IPV6_RECVPKTINFO)
- XLAT(IPV6_RECVPKTINFO),
+  XLAT(IPV6_RECVPKTINFO),
 #endif
 #if defined(IPV6_PKTINFO) || (defined(HAVE_DECL_IPV6_PKTINFO) && HAVE_DECL_IPV6_PKTINFO)
- XLAT(IPV6_PKTINFO),
+  XLAT(IPV6_PKTINFO),
 #endif
 #if defined(IPV6_RECVHOPLIMIT) || (defined(HAVE_DECL_IPV6_RECVHOPLIMIT) && HAVE_DECL_IPV6_RECVHOPLIMIT)
- XLAT(IPV6_RECVHOPLIMIT),
+  XLAT(IPV6_RECVHOPLIMIT),
 #endif
 #if defined(IPV6_HOPLIMIT) || (defined(HAVE_DECL_IPV6_HOPLIMIT) && HAVE_DECL_IPV6_HOPLIMIT)
- XLAT(IPV6_HOPLIMIT),
+  XLAT(IPV6_HOPLIMIT),
 #endif
 #if defined(IPV6_RECVHOPOPTS) || (defined(HAVE_DECL_IPV6_RECVHOPOPTS) && HAVE_DECL_IPV6_RECVHOPOPTS)
- XLAT(IPV6_RECVHOPOPTS),
+  XLAT(IPV6_RECVHOPOPTS),
 #endif
 #if defined(IPV6_HOPOPTS) || (defined(HAVE_DECL_IPV6_HOPOPTS) && HAVE_DECL_IPV6_HOPOPTS)
- XLAT(IPV6_HOPOPTS),
+  XLAT(IPV6_HOPOPTS),
 #endif
 #if defined(IPV6_RTHDRDSTOPTS) || (defined(HAVE_DECL_IPV6_RTHDRDSTOPTS) && HAVE_DECL_IPV6_RTHDRDSTOPTS)
- XLAT(IPV6_RTHDRDSTOPTS),
+  XLAT(IPV6_RTHDRDSTOPTS),
 #endif
 #if defined(IPV6_RECVRTHDR) || (defined(HAVE_DECL_IPV6_RECVRTHDR) && HAVE_DECL_IPV6_RECVRTHDR)
- XLAT(IPV6_RECVRTHDR),
+  XLAT(IPV6_RECVRTHDR),
 #endif
 #if defined(IPV6_RTHDR) || (defined(HAVE_DECL_IPV6_RTHDR) && HAVE_DECL_IPV6_RTHDR)
- XLAT(IPV6_RTHDR),
+  XLAT(IPV6_RTHDR),
 #endif
 #if defined(IPV6_RECVDSTOPTS) || (defined(HAVE_DECL_IPV6_RECVDSTOPTS) && HAVE_DECL_IPV6_RECVDSTOPTS)
- XLAT(IPV6_RECVDSTOPTS),
+  XLAT(IPV6_RECVDSTOPTS),
 #endif
 #if defined(IPV6_DSTOPTS) || (defined(HAVE_DECL_IPV6_DSTOPTS) && HAVE_DECL_IPV6_DSTOPTS)
- XLAT(IPV6_DSTOPTS),
+  XLAT(IPV6_DSTOPTS),
 #endif
 #if defined(IPV6_RECVPATHMTU) || (defined(HAVE_DECL_IPV6_RECVPATHMTU) && HAVE_DECL_IPV6_RECVPATHMTU)
- XLAT(IPV6_RECVPATHMTU),
+  XLAT(IPV6_RECVPATHMTU),
 #endif
 #if defined(IPV6_PATHMTU) || (defined(HAVE_DECL_IPV6_PATHMTU) && HAVE_DECL_IPV6_PATHMTU)
- XLAT(IPV6_PATHMTU),
+  XLAT(IPV6_PATHMTU),
 #endif
 #if defined(IPV6_DONTFRAG) || (defined(HAVE_DECL_IPV6_DONTFRAG) && HAVE_DECL_IPV6_DONTFRAG)
- XLAT(IPV6_DONTFRAG),
+  XLAT(IPV6_DONTFRAG),
 #endif
 #if defined(IPV6_USE_MIN_MTU) || (defined(HAVE_DECL_IPV6_USE_MIN_MTU) && HAVE_DECL_IPV6_USE_MIN_MTU)
- XLAT(IPV6_USE_MIN_MTU),
+  XLAT(IPV6_USE_MIN_MTU),
 #endif
 #if defined(IPV6_RECVTCLASS) || (defined(HAVE_DECL_IPV6_RECVTCLASS) && HAVE_DECL_IPV6_RECVTCLASS)
- XLAT(IPV6_RECVTCLASS),
+  XLAT(IPV6_RECVTCLASS),
 #endif
 #if defined(IPV6_TCLASS) || (defined(HAVE_DECL_IPV6_TCLASS) && HAVE_DECL_IPV6_TCLASS)
- XLAT(IPV6_TCLASS),
+  XLAT(IPV6_TCLASS),
 #endif
 #if defined(IPV6_AUTOFLOWLABEL) || (defined(HAVE_DECL_IPV6_AUTOFLOWLABEL) && HAVE_DECL_IPV6_AUTOFLOWLABEL)
- XLAT(IPV6_AUTOFLOWLABEL),
+  XLAT(IPV6_AUTOFLOWLABEL),
 #endif
 #if defined(IPV6_ADDR_PREFERENCES) || (defined(HAVE_DECL_IPV6_ADDR_PREFERENCES) && HAVE_DECL_IPV6_ADDR_PREFERENCES)
- XLAT(IPV6_ADDR_PREFERENCES),
+  XLAT(IPV6_ADDR_PREFERENCES),
 #endif
 #if defined(IPV6_MINHOPCOUNT) || (defined(HAVE_DECL_IPV6_MINHOPCOUNT) && HAVE_DECL_IPV6_MINHOPCOUNT)
- XLAT(IPV6_MINHOPCOUNT),
+  XLAT(IPV6_MINHOPCOUNT),
 #endif
 #if defined(IPV6_ORIGDSTADDR) || (defined(HAVE_DECL_IPV6_ORIGDSTADDR) && HAVE_DECL_IPV6_ORIGDSTADDR)
- XLAT(IPV6_ORIGDSTADDR),
+  XLAT(IPV6_ORIGDSTADDR),
 #endif
 #if defined(IPV6_RECVORIGDSTADDR) || (defined(HAVE_DECL_IPV6_RECVORIGDSTADDR) && HAVE_DECL_IPV6_RECVORIGDSTADDR)
- XLAT(IPV6_RECVORIGDSTADDR),
+  XLAT(IPV6_RECVORIGDSTADDR),
 #endif
 #if defined(IPV6_TRANSPARENT) || (defined(HAVE_DECL_IPV6_TRANSPARENT) && HAVE_DECL_IPV6_TRANSPARENT)
- XLAT(IPV6_TRANSPARENT),
+  XLAT(IPV6_TRANSPARENT),
 #endif
 #if defined(IPV6_UNICAST_IF) || (defined(HAVE_DECL_IPV6_UNICAST_IF) && HAVE_DECL_IPV6_UNICAST_IF)
- XLAT(IPV6_UNICAST_IF),
+  XLAT(IPV6_UNICAST_IF),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sockipxoptions.h b/xlat/sockipxoptions.h
index 1d98947..0e92f0e 100644
--- a/xlat/sockipxoptions.h
+++ b/xlat/sockipxoptions.h
@@ -1,8 +1,17 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sockipxoptions.in; do not edit. */
 
-static const struct xlat sockipxoptions[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat sockipxoptions in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sockoptions.h b/xlat/sockoptions.h
index 75eaea3..ef2d7d6 100644
--- a/xlat/sockoptions.h
+++ b/xlat/sockoptions.h
@@ -1,158 +1,204 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sockoptions.in; do not edit. */
 
-static const struct xlat sockoptions[] = {
-#if defined(SO_ACCEPTCONN) || (defined(HAVE_DECL_SO_ACCEPTCONN) && HAVE_DECL_SO_ACCEPTCONN)
- XLAT(SO_ACCEPTCONN),
-#endif
-#if defined(SO_ALLRAW) || (defined(HAVE_DECL_SO_ALLRAW) && HAVE_DECL_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),
-#endif
-#if defined(SO_BINDTODEVICE) || (defined(HAVE_DECL_SO_BINDTODEVICE) && HAVE_DECL_SO_BINDTODEVICE)
- XLAT(SO_BINDTODEVICE),
-#endif
-#if defined(SO_BROADCAST) || (defined(HAVE_DECL_SO_BROADCAST) && HAVE_DECL_SO_BROADCAST)
- XLAT(SO_BROADCAST),
-#endif
-#if defined(SO_BSDCOMPAT) || (defined(HAVE_DECL_SO_BSDCOMPAT) && HAVE_DECL_SO_BSDCOMPAT)
- XLAT(SO_BSDCOMPAT),
-#endif
+#ifdef IN_MPERS
+
+# error static const struct xlat sockoptions in mpers mode
+
+#else
+
+static
+const struct xlat sockoptions[] = {
 #if defined(SO_DEBUG) || (defined(HAVE_DECL_SO_DEBUG) && HAVE_DECL_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),
-#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),
-#endif
-#if defined(SO_ERROR) || (defined(HAVE_DECL_SO_ERROR) && HAVE_DECL_SO_ERROR)
- XLAT(SO_ERROR),
-#endif
-#if defined(SO_ICS) || (defined(HAVE_DECL_SO_ICS) && HAVE_DECL_SO_ICS)
- XLAT(SO_ICS),
-#endif
-#if defined(SO_IMASOCKET) || (defined(HAVE_DECL_SO_IMASOCKET) && HAVE_DECL_SO_IMASOCKET)
- XLAT(SO_IMASOCKET),
-#endif
-#if defined(SO_KEEPALIVE) || (defined(HAVE_DECL_SO_KEEPALIVE) && HAVE_DECL_SO_KEEPALIVE)
- XLAT(SO_KEEPALIVE),
-#endif
-#if defined(SO_LINGER) || (defined(HAVE_DECL_SO_LINGER) && HAVE_DECL_SO_LINGER)
- XLAT(SO_LINGER),
-#endif
-#if defined(SO_LISTENING) || (defined(HAVE_DECL_SO_LISTENING) && HAVE_DECL_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),
-#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),
-#endif
-#if defined(SO_OOBINLINE) || (defined(HAVE_DECL_SO_OOBINLINE) && HAVE_DECL_SO_OOBINLINE)
- XLAT(SO_OOBINLINE),
-#endif
-#if defined(SO_ORDREL) || (defined(HAVE_DECL_SO_ORDREL) && HAVE_DECL_SO_ORDREL)
- XLAT(SO_ORDREL),
-#endif
-#if defined(SO_PARALLELSVR) || (defined(HAVE_DECL_SO_PARALLELSVR) && HAVE_DECL_SO_PARALLELSVR)
- XLAT(SO_PARALLELSVR),
-#endif
-#if defined(SO_PASSCRED) || (defined(HAVE_DECL_SO_PASSCRED) && HAVE_DECL_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),
-#endif
-#if defined(SO_PEERNAME) || (defined(HAVE_DECL_SO_PEERNAME) && HAVE_DECL_SO_PEERNAME)
- XLAT(SO_PEERNAME),
-#endif
-#if defined(SO_PEERSEC) || (defined(HAVE_DECL_SO_PEERSEC) && HAVE_DECL_SO_PEERSEC)
- XLAT(SO_PEERSEC),
-#endif
-#if defined(SO_PRIORITY) || (defined(HAVE_DECL_SO_PRIORITY) && HAVE_DECL_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),
-#endif
-#if defined(SO_RCVBUF) || (defined(HAVE_DECL_SO_RCVBUF) && HAVE_DECL_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),
-#endif
-#if defined(SO_RCVTIMEO) || (defined(HAVE_DECL_SO_RCVTIMEO) && HAVE_DECL_SO_RCVTIMEO)
- XLAT(SO_RCVTIMEO),
-#endif
-#if defined(SO_RDWR) || (defined(HAVE_DECL_SO_RDWR) && HAVE_DECL_SO_RDWR)
- XLAT(SO_RDWR),
+  XLAT(SO_DEBUG),
 #endif
 #if defined(SO_REUSEADDR) || (defined(HAVE_DECL_SO_REUSEADDR) && HAVE_DECL_SO_REUSEADDR)
- XLAT(SO_REUSEADDR),
-#endif
-#if defined(SO_REUSEPORT) || (defined(HAVE_DECL_SO_REUSEPORT) && HAVE_DECL_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),
-#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),
-#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),
-#endif
-#if defined(SO_SEMA) || (defined(HAVE_DECL_SO_SEMA) && HAVE_DECL_SO_SEMA)
- XLAT(SO_SEMA),
-#endif
-#if defined(SO_SNDBUF) || (defined(HAVE_DECL_SO_SNDBUF) && HAVE_DECL_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),
-#endif
-#if defined(SO_SNDTIMEO) || (defined(HAVE_DECL_SO_SNDTIMEO) && HAVE_DECL_SO_SNDTIMEO)
- XLAT(SO_SNDTIMEO),
-#endif
-#if defined(SO_TIMESTAMP) || (defined(HAVE_DECL_SO_TIMESTAMP) && HAVE_DECL_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),
+  XLAT(SO_REUSEADDR),
 #endif
 #if defined(SO_TYPE) || (defined(HAVE_DECL_SO_TYPE) && HAVE_DECL_SO_TYPE)
- XLAT(SO_TYPE),
+  XLAT(SO_TYPE),
+#endif
+#if defined(SO_ERROR) || (defined(HAVE_DECL_SO_ERROR) && HAVE_DECL_SO_ERROR)
+  XLAT(SO_ERROR),
+#endif
+#if defined(SO_DONTROUTE) || (defined(HAVE_DECL_SO_DONTROUTE) && HAVE_DECL_SO_DONTROUTE)
+  XLAT(SO_DONTROUTE),
+#endif
+#if defined(SO_BROADCAST) || (defined(HAVE_DECL_SO_BROADCAST) && HAVE_DECL_SO_BROADCAST)
+  XLAT(SO_BROADCAST),
+#endif
+#if defined(SO_SNDBUF) || (defined(HAVE_DECL_SO_SNDBUF) && HAVE_DECL_SO_SNDBUF)
+  XLAT(SO_SNDBUF),
+#endif
+#if defined(SO_RCVBUF) || (defined(HAVE_DECL_SO_RCVBUF) && HAVE_DECL_SO_RCVBUF)
+  XLAT(SO_RCVBUF),
+#endif
+#if defined(SO_SNDBUFFORCE) || (defined(HAVE_DECL_SO_SNDBUFFORCE) && HAVE_DECL_SO_SNDBUFFORCE)
+  XLAT(SO_SNDBUFFORCE),
+#endif
+#if defined(SO_RCVBUFFORCE) || (defined(HAVE_DECL_SO_RCVBUFFORCE) && HAVE_DECL_SO_RCVBUFFORCE)
+  XLAT(SO_RCVBUFFORCE),
+#endif
+#if defined(SO_KEEPALIVE) || (defined(HAVE_DECL_SO_KEEPALIVE) && HAVE_DECL_SO_KEEPALIVE)
+  XLAT(SO_KEEPALIVE),
+#endif
+#if defined(SO_OOBINLINE) || (defined(HAVE_DECL_SO_OOBINLINE) && HAVE_DECL_SO_OOBINLINE)
+  XLAT(SO_OOBINLINE),
+#endif
+#if defined(SO_NO_CHECK) || (defined(HAVE_DECL_SO_NO_CHECK) && HAVE_DECL_SO_NO_CHECK)
+  XLAT(SO_NO_CHECK),
+#endif
+#if defined(SO_PRIORITY) || (defined(HAVE_DECL_SO_PRIORITY) && HAVE_DECL_SO_PRIORITY)
+  XLAT(SO_PRIORITY),
+#endif
+#if defined(SO_LINGER) || (defined(HAVE_DECL_SO_LINGER) && HAVE_DECL_SO_LINGER)
+  XLAT(SO_LINGER),
+#endif
+#if defined(SO_BSDCOMPAT) || (defined(HAVE_DECL_SO_BSDCOMPAT) && HAVE_DECL_SO_BSDCOMPAT)
+  XLAT(SO_BSDCOMPAT),
+#endif
+#if defined(SO_REUSEPORT) || (defined(HAVE_DECL_SO_REUSEPORT) && HAVE_DECL_SO_REUSEPORT)
+  XLAT(SO_REUSEPORT),
+#endif
+#if defined(SO_PASSCRED) || (defined(HAVE_DECL_SO_PASSCRED) && HAVE_DECL_SO_PASSCRED)
+  XLAT(SO_PASSCRED),
+#endif
+#if defined(SO_PEERCRED) || (defined(HAVE_DECL_SO_PEERCRED) && HAVE_DECL_SO_PEERCRED)
+  XLAT(SO_PEERCRED),
+#endif
+#if defined(SO_RCVLOWAT) || (defined(HAVE_DECL_SO_RCVLOWAT) && HAVE_DECL_SO_RCVLOWAT)
+  XLAT(SO_RCVLOWAT),
+#endif
+#if defined(SO_SNDLOWAT) || (defined(HAVE_DECL_SO_SNDLOWAT) && HAVE_DECL_SO_SNDLOWAT)
+  XLAT(SO_SNDLOWAT),
+#endif
+#if defined(SO_RCVTIMEO) || (defined(HAVE_DECL_SO_RCVTIMEO) && HAVE_DECL_SO_RCVTIMEO)
+  XLAT(SO_RCVTIMEO),
+#endif
+#if defined(SO_SNDTIMEO) || (defined(HAVE_DECL_SO_SNDTIMEO) && HAVE_DECL_SO_SNDTIMEO)
+  XLAT(SO_SNDTIMEO),
+#endif
+#if defined(SO_SECURITY_AUTHENTICATION) || (defined(HAVE_DECL_SO_SECURITY_AUTHENTICATION) && HAVE_DECL_SO_SECURITY_AUTHENTICATION)
+  XLAT(SO_SECURITY_AUTHENTICATION),
+#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),
+#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),
+#endif
+#if defined(SO_BINDTODEVICE) || (defined(HAVE_DECL_SO_BINDTODEVICE) && HAVE_DECL_SO_BINDTODEVICE)
+  XLAT(SO_BINDTODEVICE),
+#endif
+#if defined(SO_ATTACH_FILTER) || (defined(HAVE_DECL_SO_ATTACH_FILTER) && HAVE_DECL_SO_ATTACH_FILTER)
+  XLAT(SO_ATTACH_FILTER),
+#endif
+#if defined(SO_GET_FILTER) || (defined(HAVE_DECL_SO_GET_FILTER) && HAVE_DECL_SO_GET_FILTER)
+  XLAT(SO_GET_FILTER),
+#endif
+#if defined(SO_DETACH_FILTER) || (defined(HAVE_DECL_SO_DETACH_FILTER) && HAVE_DECL_SO_DETACH_FILTER)
+  XLAT(SO_DETACH_FILTER),
+#endif
+#if defined(SO_DETACH_BPF) || (defined(HAVE_DECL_SO_DETACH_BPF) && HAVE_DECL_SO_DETACH_BPF)
+  XLAT(SO_DETACH_BPF),
+#endif
+#if defined(SO_PEERNAME) || (defined(HAVE_DECL_SO_PEERNAME) && HAVE_DECL_SO_PEERNAME)
+  XLAT(SO_PEERNAME),
+#endif
+#if defined(SO_TIMESTAMP) || (defined(HAVE_DECL_SO_TIMESTAMP) && HAVE_DECL_SO_TIMESTAMP)
+  XLAT(SO_TIMESTAMP),
+#endif
+#if defined(SO_ACCEPTCONN) || (defined(HAVE_DECL_SO_ACCEPTCONN) && HAVE_DECL_SO_ACCEPTCONN)
+  XLAT(SO_ACCEPTCONN),
+#endif
+#if defined(SO_PEERSEC) || (defined(HAVE_DECL_SO_PEERSEC) && HAVE_DECL_SO_PEERSEC)
+  XLAT(SO_PEERSEC),
+#endif
+#if defined(SO_PASSSEC) || (defined(HAVE_DECL_SO_PASSSEC) && HAVE_DECL_SO_PASSSEC)
+  XLAT(SO_PASSSEC),
+#endif
+#if defined(SO_TIMESTAMPNS) || (defined(HAVE_DECL_SO_TIMESTAMPNS) && HAVE_DECL_SO_TIMESTAMPNS)
+  XLAT(SO_TIMESTAMPNS),
+#endif
+#if defined(SO_MARK) || (defined(HAVE_DECL_SO_MARK) && HAVE_DECL_SO_MARK)
+  XLAT(SO_MARK),
+#endif
+#if defined(SO_TIMESTAMPING) || (defined(HAVE_DECL_SO_TIMESTAMPING) && HAVE_DECL_SO_TIMESTAMPING)
+  XLAT(SO_TIMESTAMPING),
+#endif
+#if defined(SO_PROTOCOL) || (defined(HAVE_DECL_SO_PROTOCOL) && HAVE_DECL_SO_PROTOCOL)
+  XLAT(SO_PROTOCOL),
+#endif
+#if defined(SO_DOMAIN) || (defined(HAVE_DECL_SO_DOMAIN) && HAVE_DECL_SO_DOMAIN)
+  XLAT(SO_DOMAIN),
+#endif
+#if defined(SO_RXQ_OVFL) || (defined(HAVE_DECL_SO_RXQ_OVFL) && HAVE_DECL_SO_RXQ_OVFL)
+  XLAT(SO_RXQ_OVFL),
+#endif
+#if defined(SO_WIFI_STATUS) || (defined(HAVE_DECL_SO_WIFI_STATUS) && HAVE_DECL_SO_WIFI_STATUS)
+  XLAT(SO_WIFI_STATUS),
+#endif
+#if defined(SO_PEEK_OFF) || (defined(HAVE_DECL_SO_PEEK_OFF) && HAVE_DECL_SO_PEEK_OFF)
+  XLAT(SO_PEEK_OFF),
+#endif
+#if defined(SO_NOFCS) || (defined(HAVE_DECL_SO_NOFCS) && HAVE_DECL_SO_NOFCS)
+  XLAT(SO_NOFCS),
+#endif
+#if defined(SO_LOCK_FILTER) || (defined(HAVE_DECL_SO_LOCK_FILTER) && HAVE_DECL_SO_LOCK_FILTER)
+  XLAT(SO_LOCK_FILTER),
+#endif
+#if defined(SO_SELECT_ERR_QUEUE) || (defined(HAVE_DECL_SO_SELECT_ERR_QUEUE) && HAVE_DECL_SO_SELECT_ERR_QUEUE)
+  XLAT(SO_SELECT_ERR_QUEUE),
+#endif
+#if defined(SO_BUSY_POLL) || (defined(HAVE_DECL_SO_BUSY_POLL) && HAVE_DECL_SO_BUSY_POLL)
+  XLAT(SO_BUSY_POLL),
+#endif
+#if defined(SO_MAX_PACING_RATE) || (defined(HAVE_DECL_SO_MAX_PACING_RATE) && HAVE_DECL_SO_MAX_PACING_RATE)
+  XLAT(SO_MAX_PACING_RATE),
+#endif
+#if defined(SO_BPF_EXTENSIONS) || (defined(HAVE_DECL_SO_BPF_EXTENSIONS) && HAVE_DECL_SO_BPF_EXTENSIONS)
+  XLAT(SO_BPF_EXTENSIONS),
+#endif
+#if defined(SO_INCOMING_CPU) || (defined(HAVE_DECL_SO_INCOMING_CPU) && HAVE_DECL_SO_INCOMING_CPU)
+  XLAT(SO_INCOMING_CPU),
+#endif
+#if defined(SO_ATTACH_BPF) || (defined(HAVE_DECL_SO_ATTACH_BPF) && HAVE_DECL_SO_ATTACH_BPF)
+  XLAT(SO_ATTACH_BPF),
+#endif
+
+#if defined(SO_ALLRAW) || (defined(HAVE_DECL_SO_ALLRAW) && HAVE_DECL_SO_ALLRAW)
+  XLAT(SO_ALLRAW),
+#endif
+#if defined(SO_ICS) || (defined(HAVE_DECL_SO_ICS) && HAVE_DECL_SO_ICS)
+  XLAT(SO_ICS),
+#endif
+#if defined(SO_IMASOCKET) || (defined(HAVE_DECL_SO_IMASOCKET) && HAVE_DECL_SO_IMASOCKET)
+  XLAT(SO_IMASOCKET),
+#endif
+#if defined(SO_LISTENING) || (defined(HAVE_DECL_SO_LISTENING) && HAVE_DECL_SO_LISTENING)
+  XLAT(SO_LISTENING),
+#endif
+#if defined(SO_MGMT) || (defined(HAVE_DECL_SO_MGMT) && HAVE_DECL_SO_MGMT)
+  XLAT(SO_MGMT),
+#endif
+#if defined(SO_ORDREL) || (defined(HAVE_DECL_SO_ORDREL) && HAVE_DECL_SO_ORDREL)
+  XLAT(SO_ORDREL),
+#endif
+#if defined(SO_PARALLELSVR) || (defined(HAVE_DECL_SO_PARALLELSVR) && HAVE_DECL_SO_PARALLELSVR)
+  XLAT(SO_PARALLELSVR),
+#endif
+#if defined(SO_PROTOTYPE) || (defined(HAVE_DECL_SO_PROTOTYPE) && HAVE_DECL_SO_PROTOTYPE)
+  XLAT(SO_PROTOTYPE),
+#endif
+#if defined(SO_RDWR) || (defined(HAVE_DECL_SO_RDWR) && HAVE_DECL_SO_RDWR)
+  XLAT(SO_RDWR),
+#endif
+#if defined(SO_SEMA) || (defined(HAVE_DECL_SO_SEMA) && HAVE_DECL_SO_SEMA)
+  XLAT(SO_SEMA),
 #endif
 #if defined(SO_USELOOPBACK) || (defined(HAVE_DECL_SO_USELOOPBACK) && HAVE_DECL_SO_USELOOPBACK)
- XLAT(SO_USELOOPBACK),
+  XLAT(SO_USELOOPBACK),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sockpacketoptions.h b/xlat/sockpacketoptions.h
index bb34018..ae4c5f4 100644
--- a/xlat/sockpacketoptions.h
+++ b/xlat/sockpacketoptions.h
@@ -1,44 +1,77 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sockpacketoptions.in; do not edit. */
 
-static const struct xlat sockpacketoptions[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat sockpacketoptions in mpers mode
+
+#else
+
+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
+#if defined(PACKET_VNET_HDR) || (defined(HAVE_DECL_PACKET_VNET_HDR) && HAVE_DECL_PACKET_VNET_HDR)
+  XLAT(PACKET_VNET_HDR),
+#endif
+#if defined(PACKET_TX_TIMESTAMP) || (defined(HAVE_DECL_PACKET_TX_TIMESTAMP) && HAVE_DECL_PACKET_TX_TIMESTAMP)
+  XLAT(PACKET_TX_TIMESTAMP),
+#endif
+#if defined(PACKET_TIMESTAMP) || (defined(HAVE_DECL_PACKET_TIMESTAMP) && HAVE_DECL_PACKET_TIMESTAMP)
+  XLAT(PACKET_TIMESTAMP),
+#endif
+#if defined(PACKET_FANOUT) || (defined(HAVE_DECL_PACKET_FANOUT) && HAVE_DECL_PACKET_FANOUT)
+  XLAT(PACKET_FANOUT),
+#endif
+#if defined(PACKET_TX_HAS_OFF) || (defined(HAVE_DECL_PACKET_TX_HAS_OFF) && HAVE_DECL_PACKET_TX_HAS_OFF)
+  XLAT(PACKET_TX_HAS_OFF),
+#endif
+#if defined(PACKET_QDISC_BYPASS) || (defined(HAVE_DECL_PACKET_QDISC_BYPASS) && HAVE_DECL_PACKET_QDISC_BYPASS)
+  XLAT(PACKET_QDISC_BYPASS),
+#endif
+#if defined(PACKET_ROLLOVER_STATS) || (defined(HAVE_DECL_PACKET_ROLLOVER_STATS) && HAVE_DECL_PACKET_ROLLOVER_STATS)
+  XLAT(PACKET_ROLLOVER_STATS),
+#endif
+#if defined(PACKET_FANOUT_DATA) || (defined(HAVE_DECL_PACKET_FANOUT_DATA) && HAVE_DECL_PACKET_FANOUT_DATA)
+  XLAT(PACKET_FANOUT_DATA),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sockrawoptions.h b/xlat/sockrawoptions.h
index d3bdfaa..99868c8 100644
--- a/xlat/sockrawoptions.h
+++ b/xlat/sockrawoptions.h
@@ -1,8 +1,17 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sockrawoptions.in; do not edit. */
 
-static const struct xlat sockrawoptions[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat sockrawoptions in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/socksctpoptions.h b/xlat/socksctpoptions.h
index 4e6d8f8..7aa20db 100644
--- a/xlat/socksctpoptions.h
+++ b/xlat/socksctpoptions.h
@@ -1,123 +1,159 @@
 /* Generated by ./xlat/gen.sh from ./xlat/socksctpoptions.in; do not edit. */
 
-static const struct xlat socksctpoptions[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat socksctpoptions in mpers mode
+
+#else
+
+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
+#if defined(SCTP_GET_ASSOC_ID_LIST) || (defined(HAVE_DECL_SCTP_GET_ASSOC_ID_LIST) && HAVE_DECL_SCTP_GET_ASSOC_ID_LIST)
+  XLAT(SCTP_GET_ASSOC_ID_LIST),
+#endif
+#if defined(SCTP_AUTO_ASCONF) || (defined(HAVE_DECL_SCTP_AUTO_ASCONF) && HAVE_DECL_SCTP_AUTO_ASCONF)
+  XLAT(SCTP_AUTO_ASCONF),
+#endif
+#if defined(SCTP_PEER_ADDR_THLDS) || (defined(HAVE_DECL_SCTP_PEER_ADDR_THLDS) && HAVE_DECL_SCTP_PEER_ADDR_THLDS)
+  XLAT(SCTP_PEER_ADDR_THLDS),
+#endif
+#if defined(SCTP_RECVRCVINFO) || (defined(HAVE_DECL_SCTP_RECVRCVINFO) && HAVE_DECL_SCTP_RECVRCVINFO)
+  XLAT(SCTP_RECVRCVINFO),
+#endif
+#if defined(SCTP_RECVNXTINFO) || (defined(HAVE_DECL_SCTP_RECVNXTINFO) && HAVE_DECL_SCTP_RECVNXTINFO)
+  XLAT(SCTP_RECVNXTINFO),
+#endif
+#if defined(SCTP_DEFAULT_SNDINFO) || (defined(HAVE_DECL_SCTP_DEFAULT_SNDINFO) && HAVE_DECL_SCTP_DEFAULT_SNDINFO)
+  XLAT(SCTP_DEFAULT_SNDINFO),
 #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
+#if defined(SCTP_SOCKOPT_CONNECTX) || (defined(HAVE_DECL_SCTP_SOCKOPT_CONNECTX) && HAVE_DECL_SCTP_SOCKOPT_CONNECTX)
+  XLAT(SCTP_SOCKOPT_CONNECTX),
+#endif
+#if defined(SCTP_SOCKOPT_CONNECTX3) || (defined(HAVE_DECL_SCTP_SOCKOPT_CONNECTX3) && HAVE_DECL_SCTP_SOCKOPT_CONNECTX3)
+  XLAT(SCTP_SOCKOPT_CONNECTX3),
+#endif
+#if defined(SCTP_GET_ASSOC_STATS) || (defined(HAVE_DECL_SCTP_GET_ASSOC_STATS) && HAVE_DECL_SCTP_GET_ASSOC_STATS)
+  XLAT(SCTP_GET_ASSOC_STATS),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/socktcpoptions.h b/xlat/socktcpoptions.h
index 42a2717..23f0770 100644
--- a/xlat/socktcpoptions.h
+++ b/xlat/socktcpoptions.h
@@ -1,77 +1,98 @@
 /* Generated by ./xlat/gen.sh from ./xlat/socktcpoptions.in; do not edit. */
 
-static const struct xlat socktcpoptions[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat socktcpoptions in mpers mode
+
+#else
+
+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
+#if defined(TCP_NOTSENT_LOWAT) || (defined(HAVE_DECL_TCP_NOTSENT_LOWAT) && HAVE_DECL_TCP_NOTSENT_LOWAT)
+  XLAT(TCP_NOTSENT_LOWAT),
+#endif
+#if defined(TCP_CC_INFO) || (defined(HAVE_DECL_TCP_CC_INFO) && HAVE_DECL_TCP_CC_INFO)
+  XLAT(TCP_CC_INFO),
+#endif
+#if defined(TCP_SAVE_SYN) || (defined(HAVE_DECL_TCP_SAVE_SYN) && HAVE_DECL_TCP_SAVE_SYN)
+  XLAT(TCP_SAVE_SYN),
+#endif
+#if defined(TCP_SAVED_SYN) || (defined(HAVE_DECL_TCP_SAVED_SYN) && HAVE_DECL_TCP_SAVED_SYN)
+  XLAT(TCP_SAVED_SYN),
 #endif
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/socktypes.h b/xlat/socktypes.h
index 20c6082..f9db97b 100644
--- a/xlat/socktypes.h
+++ b/xlat/socktypes.h
@@ -1,26 +1,35 @@
 /* Generated by ./xlat/gen.sh from ./xlat/socktypes.in; do not edit. */
 
-static const struct xlat socktypes[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat socktypes in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/splice_flags.h b/xlat/splice_flags.h
index 11302d2..5d30583 100644
--- a/xlat/splice_flags.h
+++ b/xlat/splice_flags.h
@@ -1,17 +1,26 @@
 /* Generated by ./xlat/gen.sh from ./xlat/splice_flags.in; do not edit. */
 
-static const struct xlat splice_flags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat splice_flags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sram_alloc_flags.h b/xlat/sram_alloc_flags.h
index e687073..009324f 100644
--- a/xlat/sram_alloc_flags.h
+++ b/xlat/sram_alloc_flags.h
@@ -1,20 +1,29 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sram_alloc_flags.in; do not edit. */
 
-static const struct xlat sram_alloc_flags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat sram_alloc_flags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/swap_flags.h b/xlat/swap_flags.h
index 6fa9f16..9baec44 100644
--- a/xlat/swap_flags.h
+++ b/xlat/swap_flags.h
@@ -1,21 +1,30 @@
 /* Generated by ./xlat/gen.sh from ./xlat/swap_flags.in; do not edit. */
-
-static const struct xlat swap_flags[] = {
 #if !(defined(SWAP_FLAG_PREFER) || (defined(HAVE_DECL_SWAP_FLAG_PREFER) && HAVE_DECL_SWAP_FLAG_PREFER))
 # define SWAP_FLAG_PREFER 0x8000
 #endif
- XLAT(SWAP_FLAG_PREFER),
 #if !(defined(SWAP_FLAG_DISCARD) || (defined(HAVE_DECL_SWAP_FLAG_DISCARD) && HAVE_DECL_SWAP_FLAG_DISCARD))
 # define SWAP_FLAG_DISCARD 0x10000
 #endif
- XLAT(SWAP_FLAG_DISCARD),
 #if !(defined(SWAP_FLAG_DISCARD_ONCE) || (defined(HAVE_DECL_SWAP_FLAG_DISCARD_ONCE) && HAVE_DECL_SWAP_FLAG_DISCARD_ONCE))
 # define SWAP_FLAG_DISCARD_ONCE 0x20000
 #endif
- XLAT(SWAP_FLAG_DISCARD_ONCE),
 #if !(defined(SWAP_FLAG_DISCARD_PAGES) || (defined(HAVE_DECL_SWAP_FLAG_DISCARD_PAGES) && HAVE_DECL_SWAP_FLAG_DISCARD_PAGES))
 # define SWAP_FLAG_DISCARD_PAGES 0x40000
 #endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat swap_flags in mpers mode
+
+#else
+
+static
+const struct xlat swap_flags[] = {
+ XLAT(SWAP_FLAG_PREFER),
+ XLAT(SWAP_FLAG_DISCARD),
+ XLAT(SWAP_FLAG_DISCARD_ONCE),
  XLAT(SWAP_FLAG_DISCARD_PAGES),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sync_file_range_flags.h b/xlat/sync_file_range_flags.h
index a1ff2f8..184c3c5 100644
--- a/xlat/sync_file_range_flags.h
+++ b/xlat/sync_file_range_flags.h
@@ -1,14 +1,23 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sync_file_range_flags.in; do not edit. */
 
-static const struct xlat sync_file_range_flags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat sync_file_range_flags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sysctl_kern.h b/xlat/sysctl_kern.h
index 87b4a80..ce328ce 100644
--- a/xlat/sysctl_kern.h
+++ b/xlat/sysctl_kern.h
@@ -1,203 +1,212 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sysctl_kern.in; do not edit. */
 
-static const struct xlat sysctl_kern[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat sysctl_kern in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sysctl_net.h b/xlat/sysctl_net.h
index f93d678..ce15583 100644
--- a/xlat/sysctl_net.h
+++ b/xlat/sysctl_net.h
@@ -1,68 +1,77 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sysctl_net.in; do not edit. */
 
-static const struct xlat sysctl_net[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat sysctl_net in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sysctl_net_core.h b/xlat/sysctl_net_core.h
index 25e0f60..453aa5d 100644
--- a/xlat/sysctl_net_core.h
+++ b/xlat/sysctl_net_core.h
@@ -1,71 +1,80 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sysctl_net_core.in; do not edit. */
 
-static const struct xlat sysctl_net_core[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat sysctl_net_core in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sysctl_net_ipv4.h b/xlat/sysctl_net_ipv4.h
index 8c68f63..367e336 100644
--- a/xlat/sysctl_net_ipv4.h
+++ b/xlat/sysctl_net_ipv4.h
@@ -1,281 +1,290 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sysctl_net_ipv4.in; do not edit. */
 
-static const struct xlat sysctl_net_ipv4[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat sysctl_net_ipv4 in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sysctl_net_ipv4_conf.h b/xlat/sysctl_net_ipv4_conf.h
index 47bff97..44bdf2d 100644
--- a/xlat/sysctl_net_ipv4_conf.h
+++ b/xlat/sysctl_net_ipv4_conf.h
@@ -1,71 +1,80 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sysctl_net_ipv4_conf.in; do not edit. */
 
-static const struct xlat sysctl_net_ipv4_conf[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat sysctl_net_ipv4_conf in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sysctl_net_ipv4_route.h b/xlat/sysctl_net_ipv4_route.h
index 1fe2025..6b26ea7 100644
--- a/xlat/sysctl_net_ipv4_route.h
+++ b/xlat/sysctl_net_ipv4_route.h
@@ -1,62 +1,71 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sysctl_net_ipv4_route.in; do not edit. */
 
-static const struct xlat sysctl_net_ipv4_route[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat sysctl_net_ipv4_route in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sysctl_net_ipv6.h b/xlat/sysctl_net_ipv6.h
index 4d4c053..4a9e6c5 100644
--- a/xlat/sysctl_net_ipv6.h
+++ b/xlat/sysctl_net_ipv6.h
@@ -1,35 +1,44 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sysctl_net_ipv6.in; do not edit. */
 
-static const struct xlat sysctl_net_ipv6[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat sysctl_net_ipv6 in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sysctl_net_ipv6_route.h b/xlat/sysctl_net_ipv6_route.h
index 2f23c82..e068281 100644
--- a/xlat/sysctl_net_ipv6_route.h
+++ b/xlat/sysctl_net_ipv6_route.h
@@ -1,35 +1,44 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sysctl_net_ipv6_route.in; do not edit. */
 
-static const struct xlat sysctl_net_ipv6_route[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat sysctl_net_ipv6_route in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sysctl_net_unix.h b/xlat/sysctl_net_unix.h
index 3593591..5c558aa 100644
--- a/xlat/sysctl_net_unix.h
+++ b/xlat/sysctl_net_unix.h
@@ -1,14 +1,23 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sysctl_net_unix.in; do not edit. */
 
-static const struct xlat sysctl_net_unix[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat sysctl_net_unix in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sysctl_root.h b/xlat/sysctl_root.h
index 1e281e8..348ce5b 100644
--- a/xlat/sysctl_root.h
+++ b/xlat/sysctl_root.h
@@ -1,50 +1,59 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sysctl_root.in; do not edit. */
 
-static const struct xlat sysctl_root[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat sysctl_root in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sysctl_vm.h b/xlat/sysctl_vm.h
index 7e7e62d..357a3bb 100644
--- a/xlat/sysctl_vm.h
+++ b/xlat/sysctl_vm.h
@@ -1,65 +1,74 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sysctl_vm.in; do not edit. */
 
-static const struct xlat sysctl_vm[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat sysctl_vm in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/syslog_action_type.h b/xlat/syslog_action_type.h
index 7946337..b4f543f 100644
--- a/xlat/syslog_action_type.h
+++ b/xlat/syslog_action_type.h
@@ -1,6 +1,13 @@
 /* Generated by ./xlat/gen.sh from ./xlat/syslog_action_type.in; do not edit. */
 
-static const struct xlat syslog_action_type[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat syslog_action_type in mpers mode
+
+#else
+
+static
+const struct xlat syslog_action_type[] = {
  XLAT(SYSLOG_ACTION_CLOSE),
  XLAT(SYSLOG_ACTION_OPEN),
  XLAT(SYSLOG_ACTION_READ),
@@ -14,3 +21,5 @@
  XLAT(SYSLOG_ACTION_SIZE_BUFFER),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/sysmips_operations.h b/xlat/sysmips_operations.h
index 7d71c47..107caa2 100644
--- a/xlat/sysmips_operations.h
+++ b/xlat/sysmips_operations.h
@@ -1,20 +1,29 @@
 /* Generated by ./xlat/gen.sh from ./xlat/sysmips_operations.in; do not edit. */
 
-static const struct xlat sysmips_operations[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat sysmips_operations in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/tcflsh_options.h b/xlat/tcflsh_options.h
index 99ce86f..5d67bb7 100644
--- a/xlat/tcflsh_options.h
+++ b/xlat/tcflsh_options.h
@@ -1,14 +1,23 @@
 /* Generated by ./xlat/gen.sh from ./xlat/tcflsh_options.in; do not edit. */
 
-static const struct xlat tcflsh_options[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat tcflsh_options in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/tcxonc_options.h b/xlat/tcxonc_options.h
index ed243be..83aae83 100644
--- a/xlat/tcxonc_options.h
+++ b/xlat/tcxonc_options.h
@@ -1,17 +1,26 @@
 /* Generated by ./xlat/gen.sh from ./xlat/tcxonc_options.in; do not edit. */
 
-static const struct xlat tcxonc_options[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat tcxonc_options in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/timerfdflags.h b/xlat/timerfdflags.h
index 57af36e..2483df8 100644
--- a/xlat/timerfdflags.h
+++ b/xlat/timerfdflags.h
@@ -1,25 +1,36 @@
 /* Generated by ./xlat/gen.sh from ./xlat/timerfdflags.in; do not edit. */
-
-static const struct xlat timerfdflags[] = {
-/* The Linux userspace headers didn't export these for a long time. */
-
 #if !(defined(TFD_TIMER_ABSTIME) || (defined(HAVE_DECL_TFD_TIMER_ABSTIME) && HAVE_DECL_TFD_TIMER_ABSTIME))
 # define TFD_TIMER_ABSTIME (1 << 0)
 #endif
- 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
- XLAT(TFD_TIMER_CANCEL_ON_SET),
-#ifdef O_CLOEXEC
+#if defined TFD_CLOEXEC || defined O_CLOEXEC
 #if !(defined(TFD_CLOEXEC) || (defined(HAVE_DECL_TFD_CLOEXEC) && HAVE_DECL_TFD_CLOEXEC))
 # define TFD_CLOEXEC O_CLOEXEC
 #endif
- XLAT(TFD_CLOEXEC),
 #endif
 #if !(defined(TFD_NONBLOCK) || (defined(HAVE_DECL_TFD_NONBLOCK) && HAVE_DECL_TFD_NONBLOCK))
 # define TFD_NONBLOCK O_NONBLOCK
 #endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat timerfdflags in mpers mode
+
+#else
+
+static
+const struct xlat timerfdflags[] = {
+/* The Linux userspace headers didn't export these for a long time. */
+
+ XLAT(TFD_TIMER_ABSTIME),
+ XLAT(TFD_TIMER_CANCEL_ON_SET),
+#if defined TFD_CLOEXEC || defined O_CLOEXEC
+ XLAT(TFD_CLOEXEC),
+#endif
  XLAT(TFD_NONBLOCK),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/ubi_volume_props.h b/xlat/ubi_volume_props.h
index 721eaa1..cfae600 100644
--- a/xlat/ubi_volume_props.h
+++ b/xlat/ubi_volume_props.h
@@ -1,6 +1,15 @@
 /* Generated by ./xlat/gen.sh from ./xlat/ubi_volume_props.in; do not edit. */
 
-static const struct xlat ubi_volume_props[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat ubi_volume_props in mpers mode
+
+#else
+
+static
+const struct xlat ubi_volume_props[] = {
  XLAT(UBI_VOL_PROP_DIRECT_WRITE),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/ubi_volume_types.h b/xlat/ubi_volume_types.h
index d6759ec..0facbf2 100644
--- a/xlat/ubi_volume_types.h
+++ b/xlat/ubi_volume_types.h
@@ -1,7 +1,16 @@
 /* Generated by ./xlat/gen.sh from ./xlat/ubi_volume_types.in; do not edit. */
 
-static const struct xlat ubi_volume_types[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat ubi_volume_types in mpers mode
+
+#else
+
+static
+const struct xlat ubi_volume_types[] = {
  XLAT(UBI_DYNAMIC_VOLUME),
  XLAT(UBI_STATIC_VOLUME),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/uffd_flags.h b/xlat/uffd_flags.h
new file mode 100644
index 0000000..5fd260e
--- /dev/null
+++ b/xlat/uffd_flags.h
@@ -0,0 +1,20 @@
+/* Generated by ./xlat/gen.sh from ./xlat/uffd_flags.in; do not edit. */
+
+#ifdef IN_MPERS
+
+# error static const struct xlat uffd_flags in mpers mode
+
+#else
+
+static
+const struct xlat uffd_flags[] = {
+#if defined(O_NONBLOCK) || (defined(HAVE_DECL_O_NONBLOCK) && HAVE_DECL_O_NONBLOCK)
+  XLAT(O_NONBLOCK),
+#endif
+#if defined(O_CLOEXEC) || (defined(HAVE_DECL_O_CLOEXEC) && HAVE_DECL_O_CLOEXEC)
+  XLAT(O_CLOEXEC),
+#endif
+ XLAT_END
+};
+
+#endif /* !IN_MPERS */
diff --git a/xlat/umount_flags.h b/xlat/umount_flags.h
index ad978fc..3219782 100644
--- a/xlat/umount_flags.h
+++ b/xlat/umount_flags.h
@@ -1,14 +1,30 @@
 /* Generated by ./xlat/gen.sh from ./xlat/umount_flags.in; do not edit. */
+#if !(defined(MNT_FORCE) || (defined(HAVE_DECL_MNT_FORCE) && HAVE_DECL_MNT_FORCE))
+# define MNT_FORCE 1
+#endif
+#if !(defined(MNT_DETACH) || (defined(HAVE_DECL_MNT_DETACH) && HAVE_DECL_MNT_DETACH))
+# define MNT_DETACH 2
+#endif
+#if !(defined(MNT_EXPIRE) || (defined(HAVE_DECL_MNT_EXPIRE) && HAVE_DECL_MNT_EXPIRE))
+# define MNT_EXPIRE 4
+#endif
+#if !(defined(UMOUNT_NOFOLLOW) || (defined(HAVE_DECL_UMOUNT_NOFOLLOW) && HAVE_DECL_UMOUNT_NOFOLLOW))
+# define UMOUNT_NOFOLLOW 8
+#endif
 
-static const struct xlat umount_flags[] = {
-#if defined(MNT_FORCE) || (defined(HAVE_DECL_MNT_FORCE) && HAVE_DECL_MNT_FORCE)
+#ifdef IN_MPERS
+
+# error static const struct xlat umount_flags in mpers mode
+
+#else
+
+static
+const struct xlat umount_flags[] = {
  XLAT(MNT_FORCE),
-#endif
-#if defined(MNT_DETACH) || (defined(HAVE_DECL_MNT_DETACH) && HAVE_DECL_MNT_DETACH)
  XLAT(MNT_DETACH),
-#endif
-#if defined(MNT_EXPIRE) || (defined(HAVE_DECL_MNT_EXPIRE) && HAVE_DECL_MNT_EXPIRE)
  XLAT(MNT_EXPIRE),
-#endif
+ XLAT(UMOUNT_NOFOLLOW),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/usagewho.h b/xlat/usagewho.h
index e82cefc..810f04c 100644
--- a/xlat/usagewho.h
+++ b/xlat/usagewho.h
@@ -1,14 +1,23 @@
 /* Generated by ./xlat/gen.sh from ./xlat/usagewho.in; do not edit. */
 
-static const struct xlat usagewho[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat usagewho in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/v4l2_buf_flags.h b/xlat/v4l2_buf_flags.h
index b69aecd..45906d3 100644
--- a/xlat/v4l2_buf_flags.h
+++ b/xlat/v4l2_buf_flags.h
@@ -1,29 +1,38 @@
 /* Generated by ./xlat/gen.sh from ./xlat/v4l2_buf_flags.in; do not edit. */
 
-static const struct xlat v4l2_buf_flags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat v4l2_buf_flags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/v4l2_buf_types.h b/xlat/v4l2_buf_types.h
index 019d95d..487b02c 100644
--- a/xlat/v4l2_buf_types.h
+++ b/xlat/v4l2_buf_types.h
@@ -1,35 +1,44 @@
 /* Generated by ./xlat/gen.sh from ./xlat/v4l2_buf_types.in; do not edit. */
 
-static const struct xlat v4l2_buf_types[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat v4l2_buf_types in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/v4l2_capture_modes.h b/xlat/v4l2_capture_modes.h
index d1cbec0..24f677d 100644
--- a/xlat/v4l2_capture_modes.h
+++ b/xlat/v4l2_capture_modes.h
@@ -1,8 +1,17 @@
 /* Generated by ./xlat/gen.sh from ./xlat/v4l2_capture_modes.in; do not edit. */
 
-static const struct xlat v4l2_capture_modes[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat v4l2_capture_modes in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/v4l2_colorspaces.h b/xlat/v4l2_colorspaces.h
index d6d7cb7..524c697 100644
--- a/xlat/v4l2_colorspaces.h
+++ b/xlat/v4l2_colorspaces.h
@@ -1,29 +1,38 @@
 /* Generated by ./xlat/gen.sh from ./xlat/v4l2_colorspaces.in; do not edit. */
 
-static const struct xlat v4l2_colorspaces[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat v4l2_colorspaces in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/v4l2_control_classes.h b/xlat/v4l2_control_classes.h
index 05e67c9..8a7d21a 100644
--- a/xlat/v4l2_control_classes.h
+++ b/xlat/v4l2_control_classes.h
@@ -1,32 +1,41 @@
 /* Generated by ./xlat/gen.sh from ./xlat/v4l2_control_classes.in; do not edit. */
 
-static const struct xlat v4l2_control_classes[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat v4l2_control_classes in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/v4l2_control_flags.h b/xlat/v4l2_control_flags.h
index adf3922..674b05d 100644
--- a/xlat/v4l2_control_flags.h
+++ b/xlat/v4l2_control_flags.h
@@ -1,29 +1,38 @@
 /* Generated by ./xlat/gen.sh from ./xlat/v4l2_control_flags.in; do not edit. */
 
-static const struct xlat v4l2_control_flags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat v4l2_control_flags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/v4l2_control_ids.h b/xlat/v4l2_control_ids.h
index c5a7aae..b70241d 100644
--- a/xlat/v4l2_control_ids.h
+++ b/xlat/v4l2_control_ids.h
@@ -1,232 +1,241 @@
 /* Generated by ./xlat/gen.sh from ./xlat/v4l2_control_ids.in; do not edit. */
 
-static const struct xlat v4l2_control_ids[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat v4l2_control_ids in mpers mode
+
+#else
+
+static
+const struct xlat v4l2_control_ids[] = {
  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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/v4l2_control_types.h b/xlat/v4l2_control_types.h
index 16de05c..d046ba3 100644
--- a/xlat/v4l2_control_types.h
+++ b/xlat/v4l2_control_types.h
@@ -1,32 +1,41 @@
 /* Generated by ./xlat/gen.sh from ./xlat/v4l2_control_types.in; do not edit. */
 
-static const struct xlat v4l2_control_types[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat v4l2_control_types in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/v4l2_device_capabilities_flags.h b/xlat/v4l2_device_capabilities_flags.h
index b97fa64..727e09e 100644
--- a/xlat/v4l2_device_capabilities_flags.h
+++ b/xlat/v4l2_device_capabilities_flags.h
@@ -1,74 +1,83 @@
 /* Generated by ./xlat/gen.sh from ./xlat/v4l2_device_capabilities_flags.in; do not edit. */
 
-static const struct xlat v4l2_device_capabilities_flags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat v4l2_device_capabilities_flags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/v4l2_fields.h b/xlat/v4l2_fields.h
index d0e0083..a7cad92 100644
--- a/xlat/v4l2_fields.h
+++ b/xlat/v4l2_fields.h
@@ -1,35 +1,44 @@
 /* Generated by ./xlat/gen.sh from ./xlat/v4l2_fields.in; do not edit. */
 
-static const struct xlat v4l2_fields[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat v4l2_fields in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/v4l2_format_description_flags.h b/xlat/v4l2_format_description_flags.h
index f2b57bb..ee2300c 100644
--- a/xlat/v4l2_format_description_flags.h
+++ b/xlat/v4l2_format_description_flags.h
@@ -1,11 +1,20 @@
 /* Generated by ./xlat/gen.sh from ./xlat/v4l2_format_description_flags.in; do not edit. */
 
-static const struct xlat v4l2_format_description_flags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat v4l2_format_description_flags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/v4l2_frameinterval_types.h b/xlat/v4l2_frameinterval_types.h
index e13a6b6..071d9a9 100644
--- a/xlat/v4l2_frameinterval_types.h
+++ b/xlat/v4l2_frameinterval_types.h
@@ -1,14 +1,23 @@
 /* Generated by ./xlat/gen.sh from ./xlat/v4l2_frameinterval_types.in; do not edit. */
 
-static const struct xlat v4l2_frameinterval_types[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat v4l2_frameinterval_types in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/v4l2_framesize_types.h b/xlat/v4l2_framesize_types.h
index 58f2991..cd72ce1 100644
--- a/xlat/v4l2_framesize_types.h
+++ b/xlat/v4l2_framesize_types.h
@@ -1,14 +1,23 @@
 /* Generated by ./xlat/gen.sh from ./xlat/v4l2_framesize_types.in; do not edit. */
 
-static const struct xlat v4l2_framesize_types[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat v4l2_framesize_types in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/v4l2_input_types.h b/xlat/v4l2_input_types.h
index 17a04fa..e090a88 100644
--- a/xlat/v4l2_input_types.h
+++ b/xlat/v4l2_input_types.h
@@ -1,11 +1,20 @@
 /* Generated by ./xlat/gen.sh from ./xlat/v4l2_input_types.in; do not edit. */
 
-static const struct xlat v4l2_input_types[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat v4l2_input_types in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/v4l2_memories.h b/xlat/v4l2_memories.h
index ea69e9e..e34deef 100644
--- a/xlat/v4l2_memories.h
+++ b/xlat/v4l2_memories.h
@@ -1,11 +1,20 @@
 /* Generated by ./xlat/gen.sh from ./xlat/v4l2_memories.in; do not edit. */
 
-static const struct xlat v4l2_memories[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat v4l2_memories in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/v4l2_streaming_capabilities.h b/xlat/v4l2_streaming_capabilities.h
index 3ca4e54..1985639 100644
--- a/xlat/v4l2_streaming_capabilities.h
+++ b/xlat/v4l2_streaming_capabilities.h
@@ -1,8 +1,17 @@
 /* Generated by ./xlat/gen.sh from ./xlat/v4l2_streaming_capabilities.in; do not edit. */
 
-static const struct xlat v4l2_streaming_capabilities[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat v4l2_streaming_capabilities in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/wait4_options.h b/xlat/wait4_options.h
index e13b4b0..4960200 100644
--- a/xlat/wait4_options.h
+++ b/xlat/wait4_options.h
@@ -1,40 +1,51 @@
 /* Generated by ./xlat/gen.sh from ./xlat/wait4_options.in; do not edit. */
-
-static const struct xlat wait4_options[] = {
-#if defined(WNOHANG) || (defined(HAVE_DECL_WNOHANG) && HAVE_DECL_WNOHANG)
- XLAT(WNOHANG),
-#endif
 #ifndef WSTOPPED
-#if defined(WUNTRACED) || (defined(HAVE_DECL_WUNTRACED) && HAVE_DECL_WUNTRACED)
- XLAT(WUNTRACED),
-#endif
-#endif
-#if defined(WEXITED) || (defined(HAVE_DECL_WEXITED) && HAVE_DECL_WEXITED)
- XLAT(WEXITED),
-#endif
-#if defined(WTRAPPED) || (defined(HAVE_DECL_WTRAPPED) && HAVE_DECL_WTRAPPED)
- XLAT(WTRAPPED),
-#endif
-#if defined(WSTOPPED) || (defined(HAVE_DECL_WSTOPPED) && HAVE_DECL_WSTOPPED)
- XLAT(WSTOPPED),
-#endif
-#if defined(WCONTINUED) || (defined(HAVE_DECL_WCONTINUED) && HAVE_DECL_WCONTINUED)
- XLAT(WCONTINUED),
-#endif
-#if defined(WNOWAIT) || (defined(HAVE_DECL_WNOWAIT) && HAVE_DECL_WNOWAIT)
- XLAT(WNOWAIT),
 #endif
 #if !(defined(__WCLONE) || (defined(HAVE_DECL___WCLONE) && HAVE_DECL___WCLONE))
 # define __WCLONE 0x80000000
 #endif
- XLAT(__WCLONE),
 #if !(defined(__WALL) || (defined(HAVE_DECL___WALL) && HAVE_DECL___WALL))
 # define __WALL 0x40000000
 #endif
- XLAT(__WALL),
 #if !(defined(__WNOTHREAD) || (defined(HAVE_DECL___WNOTHREAD) && HAVE_DECL___WNOTHREAD))
 # define __WNOTHREAD 0x20000000
 #endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat wait4_options in mpers mode
+
+#else
+
+static
+const struct xlat wait4_options[] = {
+#if defined(WNOHANG) || (defined(HAVE_DECL_WNOHANG) && HAVE_DECL_WNOHANG)
+  XLAT(WNOHANG),
+#endif
+#ifndef WSTOPPED
+#if defined(WUNTRACED) || (defined(HAVE_DECL_WUNTRACED) && HAVE_DECL_WUNTRACED)
+  XLAT(WUNTRACED),
+#endif
+#endif
+#if defined(WEXITED) || (defined(HAVE_DECL_WEXITED) && HAVE_DECL_WEXITED)
+  XLAT(WEXITED),
+#endif
+#if defined(WTRAPPED) || (defined(HAVE_DECL_WTRAPPED) && HAVE_DECL_WTRAPPED)
+  XLAT(WTRAPPED),
+#endif
+#if defined(WSTOPPED) || (defined(HAVE_DECL_WSTOPPED) && HAVE_DECL_WSTOPPED)
+  XLAT(WSTOPPED),
+#endif
+#if defined(WCONTINUED) || (defined(HAVE_DECL_WCONTINUED) && HAVE_DECL_WCONTINUED)
+  XLAT(WCONTINUED),
+#endif
+#if defined(WNOWAIT) || (defined(HAVE_DECL_WNOWAIT) && HAVE_DECL_WNOWAIT)
+  XLAT(WNOWAIT),
+#endif
+ XLAT(__WCLONE),
+ XLAT(__WALL),
  XLAT(__WNOTHREAD),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/waitid_types.h b/xlat/waitid_types.h
index 7087a80..ddee8ef 100644
--- a/xlat/waitid_types.h
+++ b/xlat/waitid_types.h
@@ -1,32 +1,41 @@
 /* Generated by ./xlat/gen.sh from ./xlat/waitid_types.in; do not edit. */
 
-static const struct xlat waitid_types[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat waitid_types in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/whence_codes.h b/xlat/whence_codes.h
index 448aa72..aa3f862 100644
--- a/xlat/whence_codes.h
+++ b/xlat/whence_codes.h
@@ -1,20 +1,24 @@
 /* Generated by ./xlat/gen.sh from ./xlat/whence_codes.in; do not edit. */
 
+#ifndef IN_MPERS
+
 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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/xattrflags.h b/xlat/xattrflags.h
index 5e74957..36adfd0 100644
--- a/xlat/xattrflags.h
+++ b/xlat/xattrflags.h
@@ -1,13 +1,22 @@
 /* Generated by ./xlat/gen.sh from ./xlat/xattrflags.in; do not edit. */
-
-static const struct xlat xattrflags[] = {
 #if !(defined(XATTR_CREATE) || (defined(HAVE_DECL_XATTR_CREATE) && HAVE_DECL_XATTR_CREATE))
 # define XATTR_CREATE 1
 #endif
- XLAT(XATTR_CREATE),
 #if !(defined(XATTR_REPLACE) || (defined(HAVE_DECL_XATTR_REPLACE) && HAVE_DECL_XATTR_REPLACE))
 # define XATTR_REPLACE 2
 #endif
+
+#ifdef IN_MPERS
+
+# error static const struct xlat xattrflags in mpers mode
+
+#else
+
+static
+const struct xlat xattrflags[] = {
+ XLAT(XATTR_CREATE),
  XLAT(XATTR_REPLACE),
  XLAT_END
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/xfs_dqblk_flags.h b/xlat/xfs_dqblk_flags.h
index 9cd4509..e9637d8 100644
--- a/xlat/xfs_dqblk_flags.h
+++ b/xlat/xfs_dqblk_flags.h
@@ -1,14 +1,23 @@
 /* Generated by ./xlat/gen.sh from ./xlat/xfs_dqblk_flags.in; do not edit. */
 
-static const struct xlat xfs_dqblk_flags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat xfs_dqblk_flags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */
diff --git a/xlat/xfs_quota_flags.h b/xlat/xfs_quota_flags.h
index e71e052..2269515 100644
--- a/xlat/xfs_quota_flags.h
+++ b/xlat/xfs_quota_flags.h
@@ -1,17 +1,26 @@
 /* Generated by ./xlat/gen.sh from ./xlat/xfs_quota_flags.in; do not edit. */
 
-static const struct xlat xfs_quota_flags[] = {
+#ifdef IN_MPERS
+
+# error static const struct xlat xfs_quota_flags in mpers mode
+
+#else
+
+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
 };
+
+#endif /* !IN_MPERS */