Move source files into src subdirectory

* src/Makefile.am: New file.
* src/.gitignore: Likewise.
* scno.am: Move into src subdirectory.
* scno.head: Likewise.
* strace-graph: Likewise.
* strace-log-merge: Likewise.
* linux/: Likewise.
* types/: Likewise.
* xlat/: Likewise.
* *.awk: Likewise.
* *.c: Likewise.
* *.h: Likewise.
* *.sh: Likewise.
* .gitignore: Update.
* Makefile.am: Update.
* bootstrap: Update.
* configure.ac: Update.
* debian/rules: Update.
* debian/strace-udeb.install: Update.
* debian/strace.examples: Update.
* debian/strace.install: Update.
* debian/strace64.install: Update.
* m4/gen_bpf_attr_m4.sh: Update.
* m4/mpers.m4: Update.
* tests/Makefile.am: Update.
* tests/init.sh: Update.
* tests/legacy_syscall_info.test: Update.
* tests/strace-log-merge-error.test: Update.
* tests/strace-log-merge-suffix.test: Update.

1479 files changed, 1246 insertions, 1216 deletions

diff --git a/.gitignore b/.gitignore
index aaf4c3d5c..5ee1d6f08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,6 @@
 .gdb_history
 .gdbinit
 .libs
-/*.mpers.i
 /.version
 /CREDITS
 /ChangeLog
@@ -19,53 +18,17 @@
 /TAGS
 /aclocal.m4
 /autom4te.cache
-/bpf_attr_check.c
-/config.h
-/config.h.in
 /config.log
 /config.status
 /configure
 /cscope.*
-/disable_ptrace_get_syscall_info
-/disable_ptrace_getregset
-/gnu
-/ioctl_iocdef.[ih]
-/ioctl_redefs[12].h
-/ioctlent[012].h
-/ioctls_all[012].h
-/ioctlsort[012]
-/libmpers-m32.a
-/libmpers-mx32.a
-/libstrace.a
-/linux/linux
-/m32_funcs.h
-/m32_printer_decls.h
-/m32_printer_defs.h
-/m32_type_defs.h
 /mpers-m32
-/mpers-m32.stamp
 /mpers-mx32
-/mpers-mx32.stamp
-/mpers.am
-/mpers_xlat.h
-/mx32_funcs.h
-/mx32_printer_decls.h
-/mx32_printer_defs.h
-/mx32_type_defs.h
-/native_printer_decls.h
-/native_printer_defs.h
 /ncscope.*
-/printers.h
-/scno.h
-/sen.h
-/stamp-h1
-/strace
 /strace-*.tar.gz
 /strace-*.tar.xz
 /strace.dsc
 /strace.spec
-/sys_func.h
-/syscallent.i
 /tags
 /tests-m32
 /tests-mx32
diff --git a/Makefile.am b/Makefile.am
index ac9cddbd7..a44879b0c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,418 +15,20 @@ endif
 if HAVE_MX32_RUNTIME
 TESTS_MX32 = tests-mx32
 endif
-SUBDIRS = . tests $(TESTS_M32) $(TESTS_MX32)
+SUBDIRS = src tests $(TESTS_M32) $(TESTS_MX32)
 
-bin_PROGRAMS = strace
 man_MANS = doc/strace.1 doc/strace-log-merge.1
-bin_SCRIPTS = strace-log-merge
 
-OS		= linux
-# ARCH is `i386', `m68k', `sparc', etc.
-ARCH		= @arch@
-
-READELF		= @READELF@
-
-ACLOCAL_AMFLAGS = -I m4 -I types -I xlat
-AM_CFLAGS = $(WARN_CFLAGS)
-AM_CPPFLAGS = -I$(builddir)/$(OS)/$(ARCH) \
-	      -I$(srcdir)/$(OS)/$(ARCH) \
-	      -I$(builddir)/$(OS) \
-	      -I$(srcdir)/$(OS) \
-	      -I$(builddir) \
-	      -I$(srcdir)
-
-AM_CFLAGS_FOR_BUILD = $(WARN_CFLAGS_FOR_BUILD)
-AM_CPPFLAGS_FOR_BUILD = $(AM_CPPFLAGS)
-
-include types/Makemodule.am
-include xlat/Makemodule.am
-
-strace_CPPFLAGS = $(AM_CPPFLAGS) -DIN_STRACE=1
-strace_CFLAGS = $(AM_CFLAGS)
-strace_LDFLAGS =
-strace_LDADD = libstrace.a $(clock_LIBS) $(timer_LIBS)
-strace_SOURCES = strace.c
-
-noinst_PROGRAMS = disable_ptrace_get_syscall_info disable_ptrace_getregset
-disable_ptrace_get_syscall_info_LDADD = $(strace_LDADD)
-disable_ptrace_getregset_LDADD = $(strace_LDADD)
-
-noinst_LIBRARIES = libstrace.a
-libstrace_a_CPPFLAGS = $(strace_CPPFLAGS)
-libstrace_a_CFLAGS = $(strace_CFLAGS)
-libstrace_a_SOURCES =	\
-	access.c	\
-	affinity.c	\
-	aio.c		\
-	alpha.c		\
-	arch_defs.h	\
-	basic_filters.c	\
-	bind.c		\
-	bjm.c		\
-	block.c		\
-	bpf.c		\
-	bpf_attr.h	\
-	bpf_filter.c	\
-	bpf_filter.h	\
-	bpf_fprog.h	\
-	bpf_seccomp_filter.c \
-	bpf_sock_filter.c \
-	btrfs.c		\
-	cacheflush.c	\
-	capability.c	\
-	caps0.h		\
-	caps1.h		\
-	chdir.c		\
-	chmod.c		\
-	clone.c		\
-	close_range.c	\
-	copy_file_range.c \
-	count.c		\
-	defs.h		\
-	delay.c		\
-	delay.h		\
-	desc.c		\
-	dirent.c	\
-	dirent64.c	\
-	dirent_types.c	\
-	dm.c		\
-	dup.c		\
-	dyxlat.c	\
-	empty.h		\
-	epoll.c		\
-	error_prints.c	\
-	error_prints.h	\
-	evdev.c		\
-	evdev_mpers.c	\
-	eventfd.c	\
-	execve.c	\
-	f_owner_ex.h	\
-	fadvise.c	\
-	fallocate.c	\
-	fanotify.c	\
-	fchownat.c	\
-	fcntl.c		\
-	fetch_bpf_fprog.c \
-	fetch_indirect_syscall_args.c \
-	fetch_struct_flock.c \
-	fetch_struct_keyctl_kdf_params.c \
-	fetch_struct_mmsghdr.c \
-	fetch_struct_msghdr.c \
-	fetch_struct_stat.c \
-	fetch_struct_stat64.c \
-	fetch_struct_statfs.c \
-	fetch_struct_xfs_quotastat.c \
-	file_handle.c	\
-	filter.h	\
-	filter_qualify.c \
-	filter_seccomp.c \
-	filter_seccomp.h \
-	flock.c		\
-	flock.h		\
-	fs_0x94_ioctl.c	\
-	fs_f_ioctl.c	\
-	fs_x_ioctl.c	\
-	fsconfig.c	\
-	fsmount.c	\
-	fsopen.c	\
-	fspick.c	\
-	fstatfs.c \
-	fstatfs64.c \
-	futex.c		\
-	gcc_compat.h	\
-	get_personality.c \
-	get_personality.h \
-	get_robust_list.c \
-	getcpu.c	\
-	getcwd.c	\
-	getpagesize.c \
-	getpid.c	\
-	getrandom.c	\
-	gpio_ioctl.c	\
-	hdio.c		\
-	hostname.c	\
-	inotify.c	\
-	inotify_ioctl.c	\
-	io.c		\
-	io_uring.c	\
-	ioctl.c		\
-	ioperm.c	\
-	iopl.c		\
-	ioprio.c	\
-	ipc.c \
-	ipc_defs.h	\
-	ipc_msg.c	\
-	ipc_msgctl.c	\
-	ipc_sem.c	\
-	ipc_semctl.c	\
-	ipc_shm.c	\
-	ipc_shmctl.c	\
-	kcmp.c		\
-	kernel_dirent.h	\
-	kernel_rusage.h	\
-	kernel_timespec.h \
-	kernel_timeval.h \
-	kernel_timex.h	\
-	kernel_types.h	\
-	kernel_v4l2_types.h \
-	kexec.c		\
-	keyctl.c	\
-	keyctl_kdf_params.h \
-	kill_save_errno.h \
-	kvm.c		\
-	largefile_wrappers.h \
-	ldt.c		\
-	link.c		\
-	linux/asm_stat.h \
-	linux/x32/asm_stat.h \
-	linux/x86_64/asm_stat.h \
-	list.h		\
-	listen.c	\
-	lookup_dcookie.c \
-	loop.c		\
-	lseek.c		\
-	macros.h	\
-	mem.c		\
-	membarrier.c	\
-	memfd_create.c	\
-	mknod.c		\
-	mmap_cache.c	\
-	mmap_cache.h	\
-	mmap_notify.c	\
-	mmap_notify.h	\
-	mmsghdr.c	\
-	mount.c		\
-	move_mount.c	\
-	mpers_type.h	\
-	mq.c		\
-	msghdr.c	\
-	msghdr.h	\
-	mtd.c		\
-	native_defs.h	\
-	nbd_ioctl.c	\
-	negated_errno.h	\
-	net.c		\
-	netlink.c       \
-	netlink.h	\
-	netlink_crypto.c \
-	netlink_inet_diag.c \
-	netlink_kobject_uevent.c \
-	netlink_kobject_uevent.h \
-	netlink_netfilter.c \
-	netlink_netlink_diag.c \
-	netlink_packet_diag.c \
-	netlink_route.c	\
-	netlink_route.h	\
-	netlink_selinux.c \
-	netlink_smc_diag.c \
-	netlink_sock_diag.c \
-	netlink_sock_diag.h \
-	netlink_unix_diag.c \
-	nlattr.c	\
-	nlattr.h	\
-	nsfs.c          \
-	nsfs.h          \
-	nsig.h		\
-	numa.c		\
-	number_set.c	\
-	number_set.h	\
-	oldstat.c	\
-	open.c		\
-	open_tree.c	\
-	or1k_atomic.c	\
-	pathtrace.c	\
-	perf.c		\
-	perf_event_struct.h \
-	perf_ioctl.c	\
-	personality.c	\
-	pidfd_getfd.c	\
-	pidfd_open.c	\
-	pidns.c		\
-	pkeys.c		\
-	poll.c		\
-	prctl.c		\
-	print_kernel_sigset.c \
-	print_dev_t.c	\
-	print_fields.h	\
-	print_group_req.c \
-	print_ifindex.c	\
-	print_instruction_pointer.c \
-	print_kernel_version.c \
-	print_mac.c	\
-	print_mq_attr.c	\
-	print_msgbuf.c	\
-	print_sg_req_info.c \
-	print_sigevent.c \
-	print_statfs.c	\
-	print_struct_stat.c \
-	print_syscall_number.c \
-	print_time.c	\
-	print_timespec.h \
-	print_timespec32.c \
-	print_timespec64.c \
-	print_timeval.c	\
-	print_timeval64.c \
-	print_timex.c	\
-	print_timex.h	\
-	print_utils.h	\
-	printmode.c	\
-	printrusage.c	\
-	printsiginfo.c	\
-	printsiginfo.h	\
-	process.c	\
-	process_vm.c	\
-	ptp.c		\
-	ptrace.h	\
-	ptrace_syscall_info.c \
-	ptrace_syscall_info.h \
-	quota.c		\
-	random_ioctl.c	\
-	readahead.c	\
-	readlink.c	\
-	reboot.c	\
-	regs.h		\
-	renameat.c	\
-	resource.c	\
-	retval.c	\
-	retval.h	\
-	riscv.c		\
-	rt_sigframe.c	\
-	rt_sigreturn.c	\
-	rtc.c		\
-	rtnl_addr.c	\
-	rtnl_addrlabel.c \
-	rtnl_dcb.c	\
-	rtnl_link.c	\
-	rtnl_mdb.c	\
-	rtnl_neigh.c	\
-	rtnl_neightbl.c	\
-	rtnl_netconf.c	\
-	rtnl_nsid.c	\
-	rtnl_route.c	\
-	rtnl_rule.c	\
-	rtnl_tc.c	\
-	rtnl_tc_action.c \
-	s390.c		\
-	sched.c		\
-	sched_attr.h	\
-	scsi.c		\
-	seccomp.c	\
-	sendfile.c	\
-	sg_io_v3.c	\
-	sg_io_v4.c	\
-	shutdown.c	\
-	sigaltstack.c	\
-	sigevent.h	\
-	signal.c	\
-	signalfd.c	\
-	sigreturn.c	\
-	sock.c		\
-	sockaddr.c	\
-	socketcall.c \
-	socketutils.c	\
-	sparc.c		\
-	sram_alloc.c	\
-	stage_output.c	\
-	stat.c		\
-	stat.h		\
-	stat64.c	\
-	statfs.c	\
-	statfs.c \
-	statfs.h	\
-	statfs64.c \
-	static_assert.h	\
-	statx.c		\
-	statx.h		\
-	string_to_uint.c \
-	string_to_uint.h \
-	swapon.c	\
-	sync_file_range.c \
-	sync_file_range2.c \
-	syscall.c	\
-	sysctl.c	\
-	sysent.h	\
-	sysent_shorthand_defs.h \
-	sysent_shorthand_undefs.h \
-	sysinfo.c	\
-	syslog.c	\
-	sysmips.c	\
-	tee.c		\
-	term.c		\
-	time.c		\
-	times.c		\
-	trace_event.h	\
-	trie.c 		\
-	trie.h 		\
-	truncate.c	\
-	ubi.c		\
-	ucopy.c		\
-	uid.c		\
-	uid16.c		\
-	umask.c		\
-	umount.c	\
-	uname.c		\
-	upeek.c		\
-	upoke.c		\
-	userfaultfd.c	\
-	ustat.c		\
-	util.c		\
-	utime.c		\
-	utimes.c	\
-	v4l2.c		\
-	wait.c		\
-	wait.h		\
-	watchdog_ioctl.c \
-	xattr.c		\
-	xfs_quota_stat.h \
-	xgetdents.c	\
-	xgetdents.h	\
-	xlat.c		\
-	xlat.h		\
-	xmalloc.c	\
-	xmalloc.h	\
-	xstring.h	\
-	$(TYPES_HEADER_FILES) \
-	$(strace_SOURCES_check) \
-	# end of libstrace_a_SOURCES
-
-strace_SOURCES_check = bpf_attr_check.c $(TYPES_CHECK_FILES)
-
-if ENABLE_STACKTRACE
-libstrace_a_SOURCES += unwind.c unwind.h
-if USE_LIBDW
-libstrace_a_SOURCES += unwind-libdw.c
-strace_CPPFLAGS += $(libdw_CPPFLAGS)
-strace_CFLAGS += $(libdw_CFLAGS)
-strace_LDFLAGS += $(libdw_LDFLAGS)
-strace_LDADD += $(libdw_LIBS)
-endif
-if USE_LIBUNWIND
-libstrace_a_SOURCES += unwind-libunwind.c
-strace_CPPFLAGS += $(libunwind_CPPFLAGS)
-strace_LDFLAGS += $(libunwind_LDFLAGS)
-strace_LDADD += $(libunwind_LIBS)
-endif
-if USE_DEMANGLE
-strace_CPPFLAGS += $(libiberty_CPPFLAGS)
-strace_LDFLAGS += $(libiberty_LDFLAGS)
-strace_LDADD += $(libiberty_LIBS)
-endif
-endif
+ACLOCAL_AMFLAGS = -I m4 -I src/types -I src/xlat
 
 @CODE_COVERAGE_RULES@
 CODE_COVERAGE_BRANCH_COVERAGE = 1
 CODE_COVERAGE_GENHTML_OPTIONS = $(CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT) \
 	--title "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
 	--precision 2 --missed \
-	--prefix $(abspath $(abs_top_srcdir)/..)
+	--prefix $(abs_top_srcdir) \
+	--prefix $(abspath $(abs_top_srcdir))
 CODE_COVERAGE_IGNORE_PATTERN = '/usr/include/*' '*/tests/*' '*/tests-m32/*' '*/tests-mx32/*'
-strace_CPPFLAGS += $(CODE_COVERAGE_CPPFLAGS)
-strace_CFLAGS += $(CODE_COVERAGE_CFLAGS)
-strace_LDADD += $(CODE_COVERAGE_LIBS)
-
-# Enable this to get link map generated
-#strace_LDFLAGS += -Wl,-Map=strace.mapfile
 
 EXTRA_DIST =				\
 	$(man_MANS)			\
@@ -454,540 +56,8 @@ EXTRA_DIST =				\
 	debian/strace64.install		\
 	debian/strace64.manpages	\
 	debian/watch			\
-	disable_ptrace_request.c	\
 	doc/README-linux-ptrace		\
-	gen_bpf_attr_check.sh		\
-	generate_sen.sh			\
-	ioctl_iocdef.c			\
-	ioctlsort.c			\
-	linux/32/ioctls_inc.h		\
-	linux/32/ioctls_inc_align16.h	\
-	linux/32/ioctls_inc_align32.h	\
-	linux/32/ioctls_inc_align64.h	\
-	linux/32/syscallent-time32.h	\
-	linux/32/syscallent.h		\
-	linux/64/ioctls_inc.h		\
-	linux/64/syscallent.h		\
-	linux/aarch64/arch_defs_.h	\
-	linux/aarch64/arch_get_personality.c \
-	linux/aarch64/arch_regs.c	\
-	linux/aarch64/arch_sigreturn.c	\
-	linux/aarch64/get_error.c	\
-	linux/aarch64/get_scno.c	\
-	linux/aarch64/get_syscall_args.c	\
-	linux/aarch64/ioctls_arch0.h	\
-	linux/aarch64/ioctls_arch1.h	\
-	linux/aarch64/ioctls_inc0.h	\
-	linux/aarch64/ioctls_inc1.h	\
-	linux/aarch64/nr_prefix.c	\
-	linux/aarch64/raw_syscall.h	\
-	linux/aarch64/set_error.c	\
-	linux/aarch64/set_scno.c	\
-	linux/aarch64/shuffle_scno.c	\
-	linux/aarch64/syscallent.h	\
-	linux/aarch64/syscallent1.h	\
-	linux/alpha/arch_defs_.h	\
-	linux/alpha/arch_getrval2.c	\
-	linux/alpha/arch_regs.c		\
-	linux/alpha/arch_sigreturn.c	\
-	linux/alpha/errnoent.h		\
-	linux/alpha/get_error.c		\
-	linux/alpha/get_scno.c		\
-	linux/alpha/get_syscall_args.c	\
-	linux/alpha/get_syscall_result.c	\
-	linux/alpha/ioctls_arch0.h	\
-	linux/alpha/ioctls_inc0.h	\
-	linux/alpha/raw_syscall.h	\
-	linux/alpha/set_error.c		\
-	linux/alpha/set_scno.c		\
-	linux/alpha/signalent.h		\
-	linux/alpha/syscallent.h	\
-	linux/alpha/userent.h		\
-	linux/arc/arch_regs.c		\
-	linux/arc/get_error.c		\
-	linux/arc/get_scno.c		\
-	linux/arc/get_syscall_args.c	\
-	linux/arc/ioctls_arch0.h	\
-	linux/arc/ioctls_inc0.h		\
-	linux/arc/raw_syscall.h		\
-	linux/arc/set_error.c		\
-	linux/arc/set_scno.c		\
-	linux/arc/syscallent.h		\
-	linux/arch_defs_.h		\
-	linux/arch_kvm.c		\
-	linux/arch_regs.h		\
-	linux/arch_rt_sigframe.c	\
-	linux/arch_sigreturn.c		\
-	linux/arm/arch_defs_.h		\
-	linux/arm/arch_regs.c		\
-	linux/arm/arch_sigreturn.c	\
-	linux/arm/get_error.c		\
-	linux/arm/get_scno.c		\
-	linux/arm/get_syscall_args.c	\
-	linux/arm/ioctls_arch0.h	\
-	linux/arm/ioctls_inc0.h		\
-	linux/arm/nr_prefix.c		\
-	linux/arm/raw_syscall.h		\
-	linux/arm/set_error.c		\
-	linux/arm/set_scno.c		\
-	linux/arm/shuffle_scno.c	\
-	linux/arm/syscallent.h		\
-	linux/arm/userent.h		\
-	linux/avr32/arch_regs.c		\
-	linux/avr32/get_error.c		\
-	linux/avr32/get_scno.c		\
-	linux/avr32/get_syscall_args.c	\
-	linux/avr32/ioctls_arch0.h	\
-	linux/avr32/ioctls_inc0.h	\
-	linux/avr32/raw_syscall.h	\
-	linux/avr32/set_error.c		\
-	linux/avr32/set_scno.c		\
-	linux/avr32/syscallent.h	\
-	linux/avr32/userent.h		\
-	linux/bfin/arch_defs_.h		\
-	linux/bfin/arch_regs.c		\
-	linux/bfin/get_error.c		\
-	linux/bfin/get_scno.c		\
-	linux/bfin/get_syscall_args.c	\
-	linux/bfin/get_syscall_result.c	\
-	linux/bfin/ioctls_arch0.h	\
-	linux/bfin/ioctls_inc0.h	\
-	linux/bfin/raw_syscall.h	\
-	linux/bfin/rt_sigframe.h	\
-	linux/bfin/set_error.c		\
-	linux/bfin/set_scno.c		\
-	linux/bfin/syscallent.h		\
-	linux/csky/arch_regs.c		\
-	linux/csky/get_error.c		\
-	linux/csky/get_scno.c		\
-	linux/csky/get_syscall_args.c	\
-	linux/csky/ioctls_arch0.h	\
-	linux/csky/ioctls_inc0.h	\
-	linux/csky/raw_syscall.h	\
-	linux/csky/set_error.c		\
-	linux/csky/set_scno.c		\
-	linux/csky/syscallent.h		\
-	linux/bfin/userent.h		\
-	linux/check_scno.c		\
-	linux/dummy.h			\
-	linux/errnoent.h		\
-	linux/getregs_old.h		\
-	linux/hppa/arch_defs_.h		\
-	linux/hppa/arch_regs.c		\
-	linux/hppa/arch_rt_sigframe.c	\
-	linux/hppa/errnoent.h		\
-	linux/hppa/get_error.c		\
-	linux/hppa/get_scno.c		\
-	linux/hppa/get_syscall_args.c	\
-	linux/hppa/ioctls_arch0.h	\
-	linux/hppa/ioctls_inc0.h	\
-	linux/hppa/raw_syscall.h	\
-	linux/hppa/rt_sigframe.h	\
-	linux/hppa/set_error.c		\
-	linux/hppa/set_scno.c		\
-	linux/hppa/signalent.h		\
-	linux/hppa/syscallent.h		\
-	linux/hppa/userent.h		\
-	linux/i386/arch_defs_.h		\
-	linux/i386/arch_kvm.c		\
-	linux/i386/arch_regs.c		\
-	linux/i386/arch_rt_sigframe.c	\
-	linux/i386/arch_sigreturn.c	\
-	linux/i386/get_error.c		\
-	linux/i386/get_scno.c		\
-	linux/i386/get_syscall_args.c	\
-	linux/i386/ioctls_arch0.h	\
-	linux/i386/ioctls_inc0.h	\
-	linux/i386/raw_syscall.h	\
-	linux/i386/rt_sigframe.h	\
-	linux/i386/set_error.c		\
-	linux/i386/set_scno.c		\
-	linux/i386/syscallent.h		\
-	linux/i386/userent.h		\
-	linux/i386/userent0.h		\
-	linux/ia64/arch_defs_.h		\
-	linux/ia64/arch_getrval2.c	\
-	linux/ia64/arch_regs.c		\
-	linux/ia64/arch_regs.h		\
-	linux/ia64/arch_rt_sigframe.c	\
-	linux/ia64/get_error.c		\
-	linux/ia64/get_scno.c		\
-	linux/ia64/get_syscall_args.c	\
-	linux/ia64/ioctls_arch0.h	\
-	linux/ia64/ioctls_inc0.h	\
-	linux/ia64/raw_syscall.h	\
-	linux/ia64/rt_sigframe.h	\
-	linux/ia64/set_error.c		\
-	linux/ia64/set_scno.c		\
-	linux/ia64/shuffle_scno.c	\
-	linux/ia64/syscallent.h		\
-	linux/ia64/syscallent_base_nr.h	\
-	linux/ia64/userent.h		\
-	linux/inet_diag.h		\
-	linux/m68k/arch_defs_.h		\
-	linux/m68k/arch_regs.c		\
-	linux/m68k/arch_rt_sigframe.c	\
-	linux/m68k/arch_sigreturn.c	\
-	linux/m68k/get_error.c		\
-	linux/m68k/get_scno.c		\
-	linux/m68k/get_syscall_args.c	\
-	linux/m68k/ioctls_arch0.h	\
-	linux/m68k/ioctls_inc0.h	\
-	linux/m68k/raw_syscall.h	\
-	linux/m68k/rt_sigframe.h	\
-	linux/m68k/set_error.c		\
-	linux/m68k/set_scno.c		\
-	linux/m68k/syscallent.h		\
-	linux/m68k/userent.h		\
-	linux/metag/arch_regs.c		\
-	linux/metag/arch_rt_sigframe.c	\
-	linux/metag/get_error.c		\
-	linux/metag/get_scno.c		\
-	linux/metag/get_syscall_args.c	\
-	linux/metag/ioctls_arch0.h	\
-	linux/metag/ioctls_inc0.h	\
-	linux/metag/raw_syscall.h	\
-	linux/metag/set_error.c		\
-	linux/metag/set_scno.c		\
-	linux/metag/syscallent.h	\
-	linux/microblaze/arch_defs_.h	\
-	linux/microblaze/arch_regs.c	\
-	linux/microblaze/arch_sigreturn.c	\
-	linux/microblaze/get_error.c	\
-	linux/microblaze/get_scno.c	\
-	linux/microblaze/get_syscall_args.c	\
-	linux/microblaze/get_syscall_result.c	\
-	linux/microblaze/ioctls_arch0.h	\
-	linux/microblaze/ioctls_inc0.h	\
-	linux/microblaze/raw_syscall.h	\
-	linux/microblaze/set_error.c	\
-	linux/microblaze/set_scno.c	\
-	linux/microblaze/syscallent.h	\
-	linux/microblaze/userent.h	\
-	linux/mips/arch_defs_.h		\
-	linux/mips/arch_getrval2.c	\
-	linux/mips/arch_regs.c		\
-	linux/mips/arch_sigreturn.c	\
-	linux/mips/errnoent.h		\
-	linux/mips/genstub.sh		\
-	linux/mips/get_error.c		\
-	linux/mips/get_scno.c		\
-	linux/mips/get_syscall_args.c	\
-	linux/mips/ioctls_arch0.h	\
-	linux/mips/ioctls_inc0.h	\
-	linux/mips/raw_syscall.h	\
-	linux/mips/rt_sigframe.h	\
-	linux/mips/set_error.c		\
-	linux/mips/set_scno.c		\
-	linux/mips/signalent.h		\
-	linux/mips/syscallent-compat.h	\
-	linux/mips/syscallent-n32.h	\
-	linux/mips/syscallent-n64.h	\
-	linux/mips/syscallent-o32.h	\
-	linux/mips/syscallent.h		\
-	linux/mips/userent.h		\
-	linux/netlink_diag.h		\
-	linux/nios2/arch_defs_.h	\
-	linux/nios2/arch_regs.c		\
-	linux/nios2/get_error.c		\
-	linux/nios2/get_scno.c		\
-	linux/nios2/get_syscall_args.c	\
-	linux/nios2/ioctls_arch0.h	\
-	linux/nios2/ioctls_inc0.h	\
-	linux/nios2/raw_syscall.h	\
-	linux/nios2/set_error.c		\
-	linux/nios2/set_scno.c		\
-	linux/nios2/syscallent.h	\
-	linux/nr_prefix.c		\
-	linux/or1k/arch_regs.c		\
-	linux/or1k/get_error.c		\
-	linux/or1k/get_scno.c		\
-	linux/or1k/get_syscall_args.c	\
-	linux/or1k/ioctls_arch0.h	\
-	linux/or1k/ioctls_inc0.h	\
-	linux/or1k/raw_syscall.h	\
-	linux/or1k/set_error.c		\
-	linux/or1k/set_scno.c		\
-	linux/or1k/syscallent.h		\
-	linux/or1k/userent.h		\
-	linux/packet_diag.h		\
-	linux/powerpc/arch_defs_.h	\
-	linux/powerpc/arch_regs.c	\
-	linux/powerpc/arch_rt_sigframe.c	\
-	linux/powerpc/arch_sigreturn.c	\
-	linux/powerpc/errnoent.h	\
-	linux/powerpc/get_error.c	\
-	linux/powerpc/get_scno.c	\
-	linux/powerpc/get_syscall_args.c	\
-	linux/powerpc/getregs_old.c	\
-	linux/powerpc/getregs_old.h	\
-	linux/powerpc/ioctls_arch0.h	\
-	linux/powerpc/ioctls_inc0.h	\
-	linux/powerpc/raw_syscall.h	\
-	linux/powerpc/set_error.c	\
-	linux/powerpc/set_scno.c	\
-	linux/powerpc/syscallent.h	\
-	linux/powerpc/userent.h		\
-	linux/powerpc64/arch_defs_.h	\
-	linux/powerpc64/arch_get_personality.c \
-	linux/powerpc64/arch_regs.c	\
-	linux/powerpc64/arch_rt_sigframe.c	\
-	linux/powerpc64/arch_sigreturn.c	\
-	linux/powerpc64/errnoent.h	\
-	linux/powerpc64/get_error.c	\
-	linux/powerpc64/get_scno.c	\
-	linux/powerpc64/get_syscall_args.c	\
-	linux/powerpc64/getregs_old.c	\
-	linux/powerpc64/getregs_old.h	\
-	linux/powerpc64/ioctls_arch0.h	\
-	linux/powerpc64/ioctls_arch1.h	\
-	linux/powerpc64/ioctls_inc0.h	\
-	linux/powerpc64/ioctls_inc1.h	\
-	linux/powerpc64/raw_syscall.h	\
-	linux/powerpc64/rt_sigframe.h	\
-	linux/powerpc64/set_error.c	\
-	linux/powerpc64/set_scno.c	\
-	linux/powerpc64/syscallent.h	\
-	linux/powerpc64/syscallent1.h	\
-	linux/powerpc64/userent.h	\
-	linux/powerpc64le/arch_defs_.h	\
-	linux/powerpc64le/arch_regs.c	\
-	linux/powerpc64le/arch_rt_sigframe.c	\
-	linux/powerpc64le/errnoent.h	\
-	linux/powerpc64le/get_error.c	\
-	linux/powerpc64le/get_scno.c	\
-	linux/powerpc64le/get_syscall_args.c	\
-	linux/powerpc64le/ioctls_arch0.h	\
-	linux/powerpc64le/ioctls_inc0.h	\
-	linux/powerpc64le/raw_syscall.h	\
-	linux/powerpc64le/rt_sigframe.h	\
-	linux/powerpc64le/set_error.c	\
-	linux/powerpc64le/set_scno.c	\
-	linux/powerpc64le/syscallent.h	\
-	linux/powerpc64le/userent.h	\
-	linux/ptrace_pokeuser.c		\
-	linux/raw_syscall.h		\
-	linux/riscv64/arch_regs.c		\
-	linux/riscv64/get_error.c		\
-	linux/riscv64/get_scno.c		\
-	linux/riscv64/get_syscall_args.c	\
-	linux/riscv64/ioctls_arch0.h	\
-	linux/riscv64/ioctls_inc0.h	\
-	linux/riscv64/raw_syscall.h	\
-	linux/riscv64/set_error.c		\
-	linux/riscv64/set_scno.c		\
-	linux/riscv64/syscallent.h	\
-	linux/rt_sigframe.h		\
-	linux/s390/arch_defs_.h		\
-	linux/s390/arch_regs.c		\
-	linux/s390/arch_sigreturn.c	\
-	linux/s390/check_scno.c		\
-	linux/s390/get_error.c		\
-	linux/s390/get_scno.c		\
-	linux/s390/get_syscall_args.c	\
-	linux/s390/ioctls_arch0.h	\
-	linux/s390/ioctls_inc0.h	\
-	linux/s390/raw_syscall.h	\
-	linux/s390/rt_sigframe.h	\
-	linux/s390/set_error.c		\
-	linux/s390/set_scno.c		\
-	linux/s390/syscallent.h		\
-	linux/s390/userent.h		\
-	linux/s390/userent0.h		\
-	linux/s390/userent1.h		\
-	linux/s390x/arch_defs_.h	\
-	linux/s390x/arch_get_personality.c \
-	linux/s390x/arch_regs.c		\
-	linux/s390x/arch_sigreturn.c	\
-	linux/s390x/check_scno.c	\
-	linux/s390x/get_error.c		\
-	linux/s390x/get_scno.c		\
-	linux/s390x/get_syscall_args.c	\
-	linux/s390x/ioctls_arch0.h	\
-	linux/s390x/ioctls_arch1.h	\
-	linux/s390x/ioctls_inc0.h	\
-	linux/s390x/ioctls_inc1.h	\
-	linux/s390x/raw_syscall.h	\
-	linux/s390x/rt_sigframe.h	\
-	linux/s390x/set_error.c		\
-	linux/s390x/set_scno.c		\
-	linux/s390x/syscallent.h	\
-	linux/s390x/syscallent1.h	\
-	linux/s390x/userent.h		\
-	linux/sh/arch_defs_.h		\
-	linux/sh/arch_getrval2.c	\
-	linux/sh/arch_regs.c		\
-	linux/sh/get_error.c		\
-	linux/sh/get_scno.c		\
-	linux/sh/get_syscall_args.c	\
-	linux/sh/ioctls_arch0.h		\
-	linux/sh/ioctls_inc0.h		\
-	linux/sh/raw_syscall.h		\
-	linux/sh/set_error.c		\
-	linux/sh/set_scno.c		\
-	linux/sh/syscallent.h		\
-	linux/sh/userent.h		\
-	linux/sh/userent0.h		\
-	linux/sh64/arch_defs_.h		\
-	linux/sh64/arch_regs.c		\
-	linux/sh64/get_error.c		\
-	linux/sh64/get_scno.c		\
-	linux/sh64/get_syscall_args.c	\
-	linux/sh64/ioctls_arch0.h	\
-	linux/sh64/ioctls_inc0.h	\
-	linux/sh64/raw_syscall.h	\
-	linux/sh64/rt_sigframe.h	\
-	linux/sh64/set_error.c		\
-	linux/sh64/set_scno.c		\
-	linux/sh64/syscallent.h		\
-	linux/sh64/userent.h		\
-	linux/shuffle_scno.c		\
-	linux/signal.h.in		\
-	linux/signalent.h		\
-	linux/smc_diag.h		\
-	linux/sock_diag.h		\
-	linux/sparc/arch_defs_.h	\
-	linux/sparc/arch_getrval2.c	\
-	linux/sparc/arch_regs.c		\
-	linux/sparc/arch_sigreturn.c	\
-	linux/sparc/errnoent.h		\
-	linux/sparc/get_error.c		\
-	linux/sparc/get_scno.c		\
-	linux/sparc/get_syscall_args.c	\
-	linux/sparc/ioctls_arch0.h	\
-	linux/sparc/ioctls_inc0.h	\
-	linux/sparc/raw_syscall.h	\
-	linux/sparc/rt_sigframe.h	\
-	linux/sparc/set_error.c		\
-	linux/sparc/set_scno.c		\
-	linux/sparc/signalent.h		\
-	linux/sparc/syscallent.h	\
-	linux/sparc/userent.h		\
-	linux/sparc64/arch_defs_.h	\
-	linux/sparc64/arch_get_personality.c \
-	linux/sparc64/arch_getrval2.c	\
-	linux/sparc64/arch_regs.c	\
-	linux/sparc64/arch_rt_sigframe.c	\
-	linux/sparc64/arch_sigreturn.c	\
-	linux/sparc64/errnoent.h	\
-	linux/sparc64/get_error.c	\
-	linux/sparc64/get_scno.c	\
-	linux/sparc64/get_syscall_args.c	\
-	linux/sparc64/ioctls_arch0.h	\
-	linux/sparc64/ioctls_arch1.h	\
-	linux/sparc64/ioctls_inc0.h	\
-	linux/sparc64/ioctls_inc1.h	\
-	linux/sparc64/raw_syscall.h	\
-	linux/sparc64/rt_sigframe.h	\
-	linux/sparc64/set_error.c	\
-	linux/sparc64/set_scno.c	\
-	linux/sparc64/signalent.h	\
-	linux/sparc64/syscallent.h	\
-	linux/sparc64/syscallent1.h	\
-	linux/sparc64/userent.h		\
-	linux/subcall.h			\
-	linux/subcall32.h		\
-	linux/subcall64.h		\
-	linux/syscall.h			\
-	linux/syscallent-common-32.h	\
-	linux/syscallent-common.h	\
-	linux/syscallent_base_nr.h	\
-	linux/tile/arch_defs_.h		\
-	linux/tile/arch_get_personality.c \
-	linux/tile/arch_regs.c		\
-	linux/tile/arch_sigreturn.c	\
-	linux/tile/get_error.c		\
-	linux/tile/get_scno.c		\
-	linux/tile/get_syscall_args.c	\
-	linux/tile/ioctls_arch0.h	\
-	linux/tile/ioctls_arch1.h	\
-	linux/tile/ioctls_inc0.h	\
-	linux/tile/ioctls_inc1.h	\
-	linux/tile/raw_syscall.h	\
-	linux/tile/rt_sigframe.h	\
-	linux/tile/set_error.c		\
-	linux/tile/set_scno.c		\
-	linux/tile/syscallent.h		\
-	linux/tile/syscallent1.h	\
-	linux/tile/userent.h		\
-	linux/unix_diag.h		\
-	linux/userent.h			\
-	linux/userent0.h		\
-	linux/x32/arch_defs_.h		\
-	linux/x32/arch_get_personality.c \
-	linux/x32/arch_kvm.c		\
-	linux/x32/arch_regs.c		\
-	linux/x32/arch_regs.h		\
-	linux/x32/arch_rt_sigframe.c	\
-	linux/x32/arch_sigreturn.c	\
-	linux/x32/check_scno.c		\
-	linux/x32/get_error.c		\
-	linux/x32/get_scno.c		\
-	linux/x32/get_syscall_args.c	\
-	linux/x32/ioctls_arch0.h	\
-	linux/x32/ioctls_arch1.h	\
-	linux/x32/ioctls_inc0.h		\
-	linux/x32/ioctls_inc1.h		\
-	linux/x32/ptrace_pokeuser.c	\
-	linux/x32/raw_syscall.h		\
-	linux/x32/rt_sigframe.h		\
-	linux/x32/set_error.c		\
-	linux/x32/set_scno.c		\
-	linux/x32/shuffle_scno.c	\
-	linux/x32/syscallent.h		\
-	linux/x32/syscallent1.h		\
-	linux/x32/userent.h		\
-	linux/x86_64/arch_defs_.h	\
-	linux/x86_64/arch_get_personality.c \
-	linux/x86_64/arch_kvm.c		\
-	linux/x86_64/arch_regs.c	\
-	linux/x86_64/arch_regs.h	\
-	linux/x86_64/arch_rt_sigframe.c	\
-	linux/x86_64/arch_sigreturn.c	\
-	linux/x86_64/get_error.c	\
-	linux/x86_64/get_scno.c		\
-	linux/x86_64/get_syscall_args.c	\
-	linux/x86_64/getregs_old.c	\
-	linux/x86_64/getregs_old.h	\
-	linux/x86_64/ioctls_arch0.h	\
-	linux/x86_64/ioctls_arch1.h	\
-	linux/x86_64/ioctls_arch2.h	\
-	linux/x86_64/ioctls_inc0.h	\
-	linux/x86_64/ioctls_inc1.h	\
-	linux/x86_64/ioctls_inc2.h	\
-	linux/x86_64/raw_syscall.h	\
-	linux/x86_64/rt_sigframe.h	\
-	linux/x86_64/set_error.c	\
-	linux/x86_64/set_scno.c		\
-	linux/x86_64/shuffle_scno.c	\
-	linux/x86_64/syscallent.h	\
-	linux/x86_64/syscallent1.h	\
-	linux/x86_64/syscallent2.h	\
-	linux/x86_64/userent.h		\
-	linux/xtensa/arch_regs.c	\
-	linux/xtensa/get_error.c	\
-	linux/xtensa/get_scno.c		\
-	linux/xtensa/get_syscall_args.c	\
-	linux/xtensa/ioctls_arch0.h	\
-	linux/xtensa/ioctls_inc0.h	\
-	linux/xtensa/raw_syscall.h	\
-	linux/xtensa/set_error.c	\
-	linux/xtensa/set_scno.c		\
-	linux/xtensa/syscallent.h	\
-	linux/xtensa/userent.h		\
-	mpers.awk			\
-	mpers.sh			\
-	mpers_test.sh			\
-	mpers_xlat.h			\
-	scno.head			\
-	strace-graph			\
-	strace-log-merge		\
 	strace.spec			\
-	types/find_last_type_fields.awk	\
-	types/gen.sh			\
-	$(XLAT_INPUT_FILES)		\
-	$(XLAT_HEADER_FILES)		\
-	xlat/gen.sh			\
 	# end of EXTRA_DIST
 
 .PHONY: check-valgrind-local
@@ -1000,31 +70,6 @@ srpm: dist-xz
 $(srcdir)/.version:
 	$(AM_V_GEN)echo $(VERSION) > $@-t && mv $@-t $@
 
-bpf_attr_check.c: $(srcdir)/bpf_attr.h $(srcdir)/gen_bpf_attr_check.sh
-	D="$(D)" \
-	$(srcdir)/gen_bpf_attr_check.sh $< > $@-t && mv $@-t $@
-
-strace_SOURCES_c = \
-	$(filter %.c,$(strace_SOURCES)) $(filter %.c,$(libstrace_a_SOURCES))
-
-sys_func_h_sources = $(filter-out $(strace_SOURCES_check),$(strace_SOURCES_c))
-
-sys_func.h: $(patsubst %,$(srcdir)/%,$(sys_func_h_sources))
-	for f in $^; do \
-		sed -n 's/^SYS_FUNC(.*/extern &;/p' $$f; \
-	done | sort -u > $@
-
-syscallent_names = subcall.h syscallent.h syscallent1.h \
-		   syscallent-common.h syscallent-common-32.h \
-		   syscallent-n32.h syscallent-n64.h syscallent-o32.h
-syscallent_patterns = $(patsubst %,\%/%,$(syscallent_names))
-syscallent_files = $(filter $(syscallent_patterns),$(EXTRA_DIST))
-
-sen.h: $(patsubst %,$(srcdir)/%,$(syscallent_files))
-	for f in $^; do cat -- $$f; done | \
-		D="$(D)" \
-		$(srcdir)/generate_sen.sh > $@
-
 dist-hook:
 	$(AM_V_GEN)echo $(VERSION) > $(distdir)/.tarball-version
 	${AM_V_GEN}echo $(COPYRIGHT_YEAR) > $(distdir)/.year
@@ -1043,178 +88,7 @@ news-check: NEWS
 		exit 1;						\
 	fi
 
-ioctlsort_CC = $(CC_FOR_BUILD)
-ioctlsort_DEFS = $(DEFS)
-ioctlsort_INCLUDES = $(DEFAULT_INCLUDES) $(INCLUDES)
-ioctlsort_CPPFLAGS = $(AM_CPPFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD)
-ioctlsort_CFLAGS = $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)
-ioctlsort_LDFLAGS = $(AM_LDFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD)
-
-ioctls_inc_h = $(wildcard $(srcdir)/$(OS)/$(ARCH)/ioctls_inc*.h)
-ioctlent_h = $(patsubst $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%,ioctlent%,$(ioctls_inc_h))
-ioctl_redefs_h = $(filter-out ioctl_redefs0.h,$(subst ioctlent,ioctl_redefs,$(ioctlent_h)))
-
-ioctl_redefs%.h: ioctlent%.h ioctlent0.h
-	sort $< > $<-t
-	sort ioctlent0.h | comm -23 $<-t - | \
-		sed -r -n 's/^\{ "([^"]+)", (0x[[:xdigit:]]+) \},$$/#ifdef \1\n# undef \1\n# define \1 \2\n#endif/p' \
-		> $@-t
-	rm -f $<-t
-	mv $@-t $@
-
-ioctlent%.h: ioctlsort%
-	./$< > $@
-
-# Need to pick up <linux/ioctl.h> definitions *for host* while compiling
-# ioctlsort *for build*, hence this magic.
-ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c
-	$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-		$(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@
-
-ioctl_iocdef.h: ioctl_iocdef.i
-	sed -n 's/^DEFINE HOST/#define /p' $< > $@
-
-ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o
-	$(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@
-
-ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c
-	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
-
-ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
-	cat $^ > $@
-
-BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) \
-		bpf_attr_check.c native_printer_decls.h native_printer_defs.h \
-		printers.h sen.h sys_func.h .version
-CLEANFILES    = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \
-		ioctl_iocdef.h ioctl_iocdef.i \
-		bpf_attr_check.c native_printer_decls.h native_printer_defs.h \
-		printers.h sen.h sys_func.h
-DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h linux/linux/signal.h
-
-include scno.am
-
-$(strace_OBJECTS): scno.h
-
-# defines mpers_source_files
-include mpers.am
-srcdir_mpers_source_files = $(patsubst %,$(srcdir)/%,$(mpers_source_files))
-mpers_preproc_files = $(mpers_source_files:.c=.c.mpers.i)
-
-mpers_NAME =
-mpers_PREFIX = $(mpers_NAME)_
-mpers_DEFS = $(DEFS)
-mpers_INCLUDES = $(DEFAULT_INCLUDES) $(INCLUDES)
-mpers_CPPFLAGS = $(CPPFLAGS)
-mpers_sh_opts = $(mpers_DEFS) $(mpers_INCLUDES) $(strace_CPPFLAGS) $(mpers_CPPFLAGS)
-libmpers_CPPFLAGS = $(strace_CPPFLAGS) -DIN_MPERS
-libmpers_CFLAGS = $(strace_CFLAGS)
-
-# mpers targets
-
-mpers-m%.stamp: $(srcdir_mpers_source_files) | printers.h
-	for f in $^; do \
-		D="$(D)" \
-		READELF="$(READELF)" \
-		CC="$(mpers_CC)" \
-		CFLAGS="$(mpers_sh_opts) -DMPERS_IS_$(mpers_NAME)" \
-		CPP="$(CPP)" \
-		CPPFLAGS="$(mpers_sh_opts) -DIN_MPERS -DMPERS_IS_$(mpers_NAME)" \
-		$(srcdir)/mpers.sh $(mpers_NAME) "$(mpers_CC_FLAGS)" $$f || exit; \
-	done
-	> $@
-
-m%_type_defs.h: $(srcdir_mpers_source_files)
-	for f in $^; do \
-		sed -r -n 's/^#[[:space:]]*include DEF_MPERS_TYPE\(([^)]+)\)/#ifdef MPERS_$(mpers_PREFIX)\1\n# define \1 MPERS_$(mpers_PREFIX)\1\n#endif/p' $$f || exit; \
-	done > $@-t
-	echo '#undef MPERS_PRINTER_NAME' >> $@-t
-	echo '#define MPERS_PRINTER_NAME(printer_name) printer_name' >> $@-t
-	echo '#include "$(mpers_PREFIX)printer_decls.h"' >> $@-t
-	echo '#include MPERS_$(mpers_PREFIX)IOCTL_MACROS' >> $@-t
-	mv $@-t $@
-
-m%_funcs.h: $(srcdir_mpers_source_files)
-	for f in $^; do \
-		sed -r -n 's/^SYS_FUNC\(([^)]+)\)/#undef sys_\1\n#define sys_\1 $(mpers_PREFIX)sys_\1/p' $$f || exit; \
-	done > $@-t && \
-	echo '#include "sys_func.h"' >> $@-t
-	mv $@-t $@
-
-# printers
-
-%.c.mpers.i: $(srcdir)/%.c
-	$(CPP) -P $(mpers_sh_opts) -DIN_MPERS_BOOTSTRAP $< -o $@
-
-mpers_printer_decl_pattern = ^MPERS_PRINTER_DECL\(([^,)]+),[[:space:]]*([^,)]+),[[:space:]]*([^)]+)\)$$
-
-printers.h: $(mpers_preproc_files)
-	echo '/* Generated by Makefile from $^; do not edit. */' > $@-t
-	echo 'typedef struct {' >> $@-t
-	for f in $^; do \
-		sed -r -n 's/$(mpers_printer_decl_pattern)/ \1 (*\2)(\3);\n#define \2 MPERS_PRINTER_NAME(\2)\n/p' $$f \
-		|| exit; \
-	done >> $@-t
-	echo '} struct_printers;' >> $@-t
-	echo 'extern const struct_printers *printers;' >> $@-t
-	echo '#define MPERS_PRINTER_NAME(printer_name) printers->printer_name' >> $@-t
-	mv $@-t $@
-
-%_printer_decls.h: $(mpers_preproc_files)
-	echo '/* Generated by Makefile from $^; do not edit. */' > $@-t
-	for f in $^; do \
-		sed -r -n 's/$(mpers_printer_decl_pattern)/extern \1 $(mpers_PREFIX)\2(\3);/p' $$f \
-		|| exit; \
-	done >> $@-t
-	mv $@-t $@
-
-%_printer_defs.h: $(mpers_preproc_files)
-	echo '/* Generated by Makefile from $^; do not edit. */' > $@-t
-	for f in $^; do \
-		sed -r -n 's/$(mpers_printer_decl_pattern)/.\2 = $(mpers_PREFIX)\2,/p' $$f \
-		|| exit; \
-	done >> $@-t
-	mv $@-t $@
-
-native_printer_decls.h native_printer_defs.h: mpers_PREFIX =
-
-if HAVE_M32_MPERS
-
-strace_LDADD += libmpers-m32.a
-noinst_LIBRARIES += libmpers-m32.a
-libmpers_m32_a_SOURCES = $(mpers_source_files)
-libmpers_m32_a_CPPFLAGS = $(libmpers_CPPFLAGS) -DMPERS_IS_m32 -I$(builddir)/mpers-m32
-libmpers_m32_a_CFLAGS = $(libmpers_CFLAGS)
-mpers_m32_targets = mpers-m32.stamp m32_type_defs.h m32_funcs.h m32_printer_decls.h m32_printer_defs.h
-
-BUILT_SOURCES += $(mpers_m32_targets)
-CLEANFILES    += $(mpers_m32_targets)
-
-$(mpers_m32_targets): mpers_NAME = m32
-$(mpers_m32_targets): mpers_CC_FLAGS = @CFLAGS_FOR_M32@ @cc_flags_m32@
-$(mpers_m32_targets): mpers_CPPFLAGS = @CPPFLAGS_FOR_M32@
-$(mpers_m32_targets): mpers_CC = @CC_FOR_M32@
-
-endif # HAVE_M32_MPERS
-
-if HAVE_MX32_MPERS
-
-strace_LDADD += libmpers-mx32.a
-noinst_LIBRARIES += libmpers-mx32.a
-libmpers_mx32_a_SOURCES = $(mpers_source_files)
-libmpers_mx32_a_CPPFLAGS = $(libmpers_CPPFLAGS) -DMPERS_IS_mx32 -I$(builddir)/mpers-mx32
-libmpers_mx32_a_CFLAGS = $(libmpers_CFLAGS)
-mpers_mx32_targets = mpers-mx32.stamp mx32_type_defs.h mx32_funcs.h mx32_printer_decls.h mx32_printer_defs.h
-
-BUILT_SOURCES += $(mpers_mx32_targets)
-CLEANFILES    += $(mpers_mx32_targets)
-
-$(mpers_mx32_targets): mpers_NAME = mx32
-$(mpers_mx32_targets): mpers_CC_FLAGS = @CFLAGS_FOR_MX32@ @cc_flags_mx32@
-$(mpers_mx32_targets): mpers_CPPFLAGS = @CPPFLAGS_FOR_MX32@
-$(mpers_mx32_targets): mpers_CC = @CC_FOR_MX32@
-
-endif # HAVE_MX32_MPERS
+BUILT_SOURCES = .version
 
 clean-local:
 	-rm -rf mpers-m32 mpers-mx32
diff --git a/bootstrap b/bootstrap
index 1476e9a68..6a0e3d9a0 100755
--- a/bootstrap
+++ b/bootstrap
@@ -6,9 +6,9 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 ./m4/gen_bpf_attr_m4.sh
-./generate_mpers_am.sh
-./types/gen.sh
-./xlat/gen.sh
+./src/generate_mpers_am.sh
+./src/types/gen.sh
+./src/xlat/gen.sh
 ./tests/gen_pure_executables.sh
 ./tests/gen_tests.sh
 
diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
index 8e9e9b82c..1fde287db 100755
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -99,8 +99,10 @@ case "${CHECK-}" in
 			clang*) GCOV="llvm-cov${CC#clang} gcov" ;;
 			*) GCOV=gcov ;;
 		esac
-		./codecov.bash -Z -x "$GCOV" -a -abc
-		rm ./codecov.bash
+		cd src
+		../codecov.bash -Z -x "$GCOV" -a -abc
+		rm ../codecov.bash
+		cd -
 		;;
 	valgrind)
 		make -k $j all VERBOSE=${VERBOSE-}
diff --git a/configure.ac b/configure.ac
index 6b145f2bb..86dd24e41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,9 +19,9 @@ AC_INIT([strace],
 m4_define([copyright_year], st_esyscmd_s([./build-aux/copyright-year-gen .year]))
 m4_define([manpage_date], st_esyscmd_s([./build-aux/file-date-gen doc/strace.1.in]))
 AC_COPYRIGHT([Copyright (c) 1999-]copyright_year[ The strace developers.])
-AC_CONFIG_SRCDIR([strace.c])
+AC_CONFIG_SRCDIR([src/strace.c])
 AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADERS([src/config.h])
 AM_INIT_AUTOMAKE([foreign nostdinc dist-xz silent-rules parallel-tests subdir-objects 1.13])
 AM_MAINTAINER_MODE
 AC_CANONICAL_HOST
@@ -577,8 +577,8 @@ AC_CACHE_CHECK([whether <linux/signal.h> can be used along with <signal.h>],
 				  [st_cv_linux_signal=yes],
 				  [st_cv_linux_signal=no])])
 if test "x$st_cv_linux_signal" = xno; then
-	mkdir -p linux/linux
-	cp $srcdir/linux/signal.h.in linux/linux/signal.h
+	mkdir -p src/linux/linux
+	cp $srcdir/src/linux/signal.h.in src/linux/linux/signal.h
 	CPPFLAGS="$CPPFLAGS -Ilinux"
 fi
 
@@ -630,7 +630,7 @@ SIZEOF_LONG="$ac_cv_sizeof_long"
 AC_SUBST(SIZEOF_LONG)
 AC_CHECK_SIZEOF([long long])
 AC_CHECK_SIZEOF([off_t],,[#include <sys/types.h>])
-AC_CHECK_SIZEOF([kernel_long_t],,[#include "$srcdir/kernel_types.h"])
+AC_CHECK_SIZEOF([kernel_long_t],,[#include "$srcdir/src/kernel_types.h"])
 SIZEOF_KERNEL_LONG_T="$ac_cv_sizeof_kernel_long_t"
 AC_SUBST(SIZEOF_KERNEL_LONG_T)
 AC_CHECK_SIZEOF([struct i64_i32],,[struct i64_i32 {long long i64; int i32;};])
@@ -749,11 +749,11 @@ AC_CHECK_TOOL([READELF], [readelf])
 st_STACKTRACE
 
 if test "$arch" = mips && test "$no_create" != yes; then
-	mkdir -p linux/mips
-	if $srcdir/linux/mips/genstub.sh \
-	   $srcdir/linux/mips linux/mips n32 n64 o32 &&
-	   $srcdir/linux/mips/genstub.sh \
-	   $srcdir/linux linux/mips common common-32; then
+	mkdir -p src/linux/mips
+	if $srcdir/src/linux/mips/genstub.sh \
+	   $srcdir/src/linux/mips src/linux/mips n32 n64 o32 &&
+	   $srcdir/src/linux/mips/genstub.sh \
+	   $srcdir/src/linux src/linux/mips common common-32; then
 		AC_MSG_RESULT([Generated MIPS syscallent stubs])
 	else
 		AC_MSG_ERROR([Failed to generate syscallent stubs])
@@ -817,6 +817,7 @@ AC_CONFIG_FILES([Makefile
 		 debian/changelog
 		 doc/strace.1
 		 doc/strace-log-merge.1
+		 src/Makefile
 		 strace.spec
 		 tests/Makefile
 		 tests-m32/Makefile
diff --git a/debian/rules b/debian/rules
index 2214c17d2..0bfda7e2e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,7 @@ configure:
 %-stamp: %/Makefile
 	$(MAKE) -C $*
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	$*/strace -V
+	$*/src/strace -V
 	$(MAKE) -C $* check VERBOSE=1
 endif
 	touch $@
@@ -81,7 +81,7 @@ binary-arch: build
 	test -f build-stamp || make $(MFLAGS) -f debian/rules build
 
 	# prepare 64bit executable and manpage, if it has been built
-	test -f build64-stamp && ( mv build64/strace build64/strace64 ; \
+	test -f build64-stamp && ( mv build64/src/strace build64/src/strace64 ; \
 		mv build64/doc/strace.1 build64/doc/strace64.1 ) || true
 
 	dh_testdir -a
diff --git a/debian/strace-udeb.install b/debian/strace-udeb.install
index d823419a0..b48f13581 100644
--- a/debian/strace-udeb.install
+++ b/debian/strace-udeb.install
@@ -1 +1 @@
-build-udeb/strace usr/bin
+build-udeb/src/strace usr/bin
diff --git a/debian/strace.examples b/debian/strace.examples
index 06b4d96c2..aa8256c93 100644
--- a/debian/strace.examples
+++ b/debian/strace.examples
@@ -1 +1 @@
-strace-graph
+src/strace-graph
diff --git a/debian/strace.install b/debian/strace.install
index 30b0a6b04..cc81d2ea9 100644
--- a/debian/strace.install
+++ b/debian/strace.install
@@ -1,2 +1,2 @@
-build/strace usr/bin
-strace-log-merge usr/bin
+build/src/strace usr/bin
+src/strace-log-merge usr/bin
diff --git a/debian/strace64.install b/debian/strace64.install
index 2d3036d57..bd13047a4 100644
--- a/debian/strace64.install
+++ b/debian/strace64.install
@@ -1 +1 @@
-build64/strace64 usr/bin
+build64/src/strace64 usr/bin
diff --git a/m4/gen_bpf_attr_m4.sh b/m4/gen_bpf_attr_m4.sh
index 13b1600b5..a6128c1c5 100755
--- a/m4/gen_bpf_attr_m4.sh
+++ b/m4/gen_bpf_attr_m4.sh
@@ -4,7 +4,7 @@
 #
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-input=bpf_attr.h
+input=src/bpf_attr.h
 output="${0%/*}"/bpf_attr.m4
 exec > "$output"
 
diff --git a/m4/mpers.m4 b/m4/mpers.m4
index 51a845b92..7dbef9381 100644
--- a/m4/mpers.m4
+++ b/m4/mpers.m4
@@ -94,10 +94,10 @@ case "$arch" in
 		    [Define to 1 if you have the <gnu/stubs-x32.h> header file.])
 	pushdef([gnu_stubs], [gnu/stubs-][m4_substr([$1], 1)][.h])
 	AC_CHECK_HEADERS([gnu_stubs], [IFLAG=],
-			 [mkdir -p gnu
-			  : > gnu_stubs
+			 [mkdir -p src/gnu
+			  : > src/gnu_stubs
 			  AC_MSG_NOTICE([Created empty gnu_stubs])
-			  IFLAG=-I.])
+			  IFLAG=-Isrc])
 	popdef([gnu_stubs])
 	saved_CPPFLAGS="$CPPFLAGS"
 	CPPFLAGS="$CPPFLAGS${IFLAG:+ }$IFLAG"
@@ -121,7 +121,7 @@ case "$arch" in
 			[st_cv_mpers],
 			[if READELF="$READELF" \
 			    CC="$CC" CPP="$CPP" CPPFLAGS="$CPPFLAGS" \
-			    $srcdir/mpers_test.sh [$1] "MPERS_CFLAGS"; then
+			    $srcdir/src/mpers_test.sh [$1] "MPERS_CFLAGS"; then
 				st_cv_mpers=yes
 			 else
 				st_cv_mpers=no
@@ -144,7 +144,7 @@ case "$arch" in
 					MPERS_NAME[_SIZEOF_KERNEL_LONG_T])
 				st_MPERS_LOAD_AC_CV([sizeof_kernel_long_t])
 				AC_CHECK_SIZEOF([kernel_long_t],,
-						[#include "$srcdir/kernel_types.h"])
+						[#include "$srcdir/src/kernel_types.h"])
 				st_MPERS_SAVE_AC_CV([sizeof_kernel_long_t])
 				popdef([SIZEOF_KERNEL_LONG_T])
 
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 000000000..c99b434ef
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,39 @@
+/*.mpers.i
+/bpf_attr_check.c
+/config.h
+/config.h.in
+/disable_ptrace_get_syscall_info
+/disable_ptrace_getregset
+/gnu
+/ioctl_iocdef.[ih]
+/ioctl_redefs[12].h
+/ioctlent[012].h
+/ioctls_all[012].h
+/ioctlsort[012]
+/libmpers-m32.a
+/libmpers-mx32.a
+/libstrace.a
+/linux/linux
+/m32_funcs.h
+/m32_printer_decls.h
+/m32_printer_defs.h
+/m32_type_defs.h
+/mpers-m32
+/mpers-m32.stamp
+/mpers-mx32
+/mpers-mx32.stamp
+/mpers.am
+/mpers_xlat.h
+/mx32_funcs.h
+/mx32_printer_decls.h
+/mx32_printer_defs.h
+/mx32_type_defs.h
+/native_printer_decls.h
+/native_printer_defs.h
+/printers.h
+/scno.h
+/sen.h
+/stamp-h1
+/strace
+/sys_func.h
+/syscallent.i
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 000000000..71406a979
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,1151 @@
+# Automake input for strace.
+#
+# Copyright (c) 2002-2009 Roland McGrath <roland@redhat.com>
+# Copyright (c) 2006-2016 Dmitry V. Levin <ldv@strace.io>
+# Copyright (c) 2008-2015 Mike Frysinger <vapier@gentoo.org>
+# Copyright (c) 2015 Elvira Khabirova <lineprinter0@gmail.com>
+# Copyright (c) 2002-2021 The strace developers.
+# All rights reserved.
+#
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+bin_PROGRAMS = strace
+bin_SCRIPTS = strace-log-merge
+
+OS		= linux
+# ARCH is `i386', `m68k', `sparc', etc.
+ARCH		= @arch@
+
+READELF		= @READELF@
+
+AM_CFLAGS = $(WARN_CFLAGS)
+AM_CPPFLAGS = -I$(builddir)/$(OS)/$(ARCH) \
+	      -I$(srcdir)/$(OS)/$(ARCH) \
+	      -I$(builddir)/$(OS) \
+	      -I$(srcdir)/$(OS) \
+	      -I$(builddir) \
+	      -I$(srcdir)
+
+AM_CFLAGS_FOR_BUILD = $(WARN_CFLAGS_FOR_BUILD)
+AM_CPPFLAGS_FOR_BUILD = $(AM_CPPFLAGS)
+
+include types/Makemodule.am
+include xlat/Makemodule.am
+
+strace_CPPFLAGS = $(AM_CPPFLAGS) -DIN_STRACE=1
+strace_CFLAGS = $(AM_CFLAGS)
+strace_LDFLAGS =
+strace_LDADD = libstrace.a $(clock_LIBS) $(timer_LIBS)
+strace_SOURCES = strace.c
+
+noinst_PROGRAMS = disable_ptrace_get_syscall_info disable_ptrace_getregset
+disable_ptrace_get_syscall_info_LDADD = $(strace_LDADD)
+disable_ptrace_getregset_LDADD = $(strace_LDADD)
+
+noinst_LIBRARIES = libstrace.a
+libstrace_a_CPPFLAGS = $(strace_CPPFLAGS)
+libstrace_a_CFLAGS = $(strace_CFLAGS)
+libstrace_a_SOURCES =	\
+	access.c	\
+	affinity.c	\
+	aio.c		\
+	alpha.c		\
+	arch_defs.h	\
+	basic_filters.c	\
+	bind.c		\
+	bjm.c		\
+	block.c		\
+	bpf.c		\
+	bpf_attr.h	\
+	bpf_filter.c	\
+	bpf_filter.h	\
+	bpf_fprog.h	\
+	bpf_seccomp_filter.c \
+	bpf_sock_filter.c \
+	btrfs.c		\
+	cacheflush.c	\
+	capability.c	\
+	caps0.h		\
+	caps1.h		\
+	chdir.c		\
+	chmod.c		\
+	clone.c		\
+	close_range.c	\
+	copy_file_range.c \
+	count.c		\
+	defs.h		\
+	delay.c		\
+	delay.h		\
+	desc.c		\
+	dirent.c	\
+	dirent64.c	\
+	dirent_types.c	\
+	dm.c		\
+	dup.c		\
+	dyxlat.c	\
+	empty.h		\
+	epoll.c		\
+	error_prints.c	\
+	error_prints.h	\
+	evdev.c		\
+	evdev_mpers.c	\
+	eventfd.c	\
+	execve.c	\
+	f_owner_ex.h	\
+	fadvise.c	\
+	fallocate.c	\
+	fanotify.c	\
+	fchownat.c	\
+	fcntl.c		\
+	fetch_bpf_fprog.c \
+	fetch_indirect_syscall_args.c \
+	fetch_struct_flock.c \
+	fetch_struct_keyctl_kdf_params.c \
+	fetch_struct_mmsghdr.c \
+	fetch_struct_msghdr.c \
+	fetch_struct_stat.c \
+	fetch_struct_stat64.c \
+	fetch_struct_statfs.c \
+	fetch_struct_xfs_quotastat.c \
+	file_handle.c	\
+	filter.h	\
+	filter_qualify.c \
+	filter_seccomp.c \
+	filter_seccomp.h \
+	flock.c		\
+	flock.h		\
+	fs_0x94_ioctl.c	\
+	fs_f_ioctl.c	\
+	fs_x_ioctl.c	\
+	fsconfig.c	\
+	fsmount.c	\
+	fsopen.c	\
+	fspick.c	\
+	fstatfs.c \
+	fstatfs64.c \
+	futex.c		\
+	gcc_compat.h	\
+	get_personality.c \
+	get_personality.h \
+	get_robust_list.c \
+	getcpu.c	\
+	getcwd.c	\
+	getpagesize.c \
+	getpid.c	\
+	getrandom.c	\
+	gpio_ioctl.c	\
+	hdio.c		\
+	hostname.c	\
+	inotify.c	\
+	inotify_ioctl.c	\
+	io.c		\
+	io_uring.c	\
+	ioctl.c		\
+	ioperm.c	\
+	iopl.c		\
+	ioprio.c	\
+	ipc.c \
+	ipc_defs.h	\
+	ipc_msg.c	\
+	ipc_msgctl.c	\
+	ipc_sem.c	\
+	ipc_semctl.c	\
+	ipc_shm.c	\
+	ipc_shmctl.c	\
+	kcmp.c		\
+	kernel_dirent.h	\
+	kernel_rusage.h	\
+	kernel_timespec.h \
+	kernel_timeval.h \
+	kernel_timex.h	\
+	kernel_types.h	\
+	kernel_v4l2_types.h \
+	kexec.c		\
+	keyctl.c	\
+	keyctl_kdf_params.h \
+	kill_save_errno.h \
+	kvm.c		\
+	largefile_wrappers.h \
+	ldt.c		\
+	link.c		\
+	linux/asm_stat.h \
+	linux/x32/asm_stat.h \
+	linux/x86_64/asm_stat.h \
+	list.h		\
+	listen.c	\
+	lookup_dcookie.c \
+	loop.c		\
+	lseek.c		\
+	macros.h	\
+	mem.c		\
+	membarrier.c	\
+	memfd_create.c	\
+	mknod.c		\
+	mmap_cache.c	\
+	mmap_cache.h	\
+	mmap_notify.c	\
+	mmap_notify.h	\
+	mmsghdr.c	\
+	mount.c		\
+	move_mount.c	\
+	mpers_type.h	\
+	mq.c		\
+	msghdr.c	\
+	msghdr.h	\
+	mtd.c		\
+	native_defs.h	\
+	nbd_ioctl.c	\
+	negated_errno.h	\
+	net.c		\
+	netlink.c       \
+	netlink.h	\
+	netlink_crypto.c \
+	netlink_inet_diag.c \
+	netlink_kobject_uevent.c \
+	netlink_kobject_uevent.h \
+	netlink_netfilter.c \
+	netlink_netlink_diag.c \
+	netlink_packet_diag.c \
+	netlink_route.c	\
+	netlink_route.h	\
+	netlink_selinux.c \
+	netlink_smc_diag.c \
+	netlink_sock_diag.c \
+	netlink_sock_diag.h \
+	netlink_unix_diag.c \
+	nlattr.c	\
+	nlattr.h	\
+	nsfs.c          \
+	nsfs.h          \
+	nsig.h		\
+	numa.c		\
+	number_set.c	\
+	number_set.h	\
+	oldstat.c	\
+	open.c		\
+	open_tree.c	\
+	or1k_atomic.c	\
+	pathtrace.c	\
+	perf.c		\
+	perf_event_struct.h \
+	perf_ioctl.c	\
+	personality.c	\
+	pidfd_getfd.c	\
+	pidfd_open.c	\
+	pidns.c		\
+	pkeys.c		\
+	poll.c		\
+	prctl.c		\
+	print_kernel_sigset.c \
+	print_dev_t.c	\
+	print_fields.h	\
+	print_group_req.c \
+	print_ifindex.c	\
+	print_instruction_pointer.c \
+	print_kernel_version.c \
+	print_mac.c	\
+	print_mq_attr.c	\
+	print_msgbuf.c	\
+	print_sg_req_info.c \
+	print_sigevent.c \
+	print_statfs.c	\
+	print_struct_stat.c \
+	print_syscall_number.c \
+	print_time.c	\
+	print_timespec.h \
+	print_timespec32.c \
+	print_timespec64.c \
+	print_timeval.c	\
+	print_timeval64.c \
+	print_timex.c	\
+	print_timex.h	\
+	print_utils.h	\
+	printmode.c	\
+	printrusage.c	\
+	printsiginfo.c	\
+	printsiginfo.h	\
+	process.c	\
+	process_vm.c	\
+	ptp.c		\
+	ptrace.h	\
+	ptrace_syscall_info.c \
+	ptrace_syscall_info.h \
+	quota.c		\
+	random_ioctl.c	\
+	readahead.c	\
+	readlink.c	\
+	reboot.c	\
+	regs.h		\
+	renameat.c	\
+	resource.c	\
+	retval.c	\
+	retval.h	\
+	riscv.c		\
+	rt_sigframe.c	\
+	rt_sigreturn.c	\
+	rtc.c		\
+	rtnl_addr.c	\
+	rtnl_addrlabel.c \
+	rtnl_dcb.c	\
+	rtnl_link.c	\
+	rtnl_mdb.c	\
+	rtnl_neigh.c	\
+	rtnl_neightbl.c	\
+	rtnl_netconf.c	\
+	rtnl_nsid.c	\
+	rtnl_route.c	\
+	rtnl_rule.c	\
+	rtnl_tc.c	\
+	rtnl_tc_action.c \
+	s390.c		\
+	sched.c		\
+	sched_attr.h	\
+	scsi.c		\
+	seccomp.c	\
+	sendfile.c	\
+	sg_io_v3.c	\
+	sg_io_v4.c	\
+	shutdown.c	\
+	sigaltstack.c	\
+	sigevent.h	\
+	signal.c	\
+	signalfd.c	\
+	sigreturn.c	\
+	sock.c		\
+	sockaddr.c	\
+	socketcall.c \
+	socketutils.c	\
+	sparc.c		\
+	sram_alloc.c	\
+	stage_output.c	\
+	stat.c		\
+	stat.h		\
+	stat64.c	\
+	statfs.c	\
+	statfs.c \
+	statfs.h	\
+	statfs64.c \
+	static_assert.h	\
+	statx.c		\
+	statx.h		\
+	string_to_uint.c \
+	string_to_uint.h \
+	swapon.c	\
+	sync_file_range.c \
+	sync_file_range2.c \
+	syscall.c	\
+	sysctl.c	\
+	sysent.h	\
+	sysent_shorthand_defs.h \
+	sysent_shorthand_undefs.h \
+	sysinfo.c	\
+	syslog.c	\
+	sysmips.c	\
+	tee.c		\
+	term.c		\
+	time.c		\
+	times.c		\
+	trace_event.h	\
+	trie.c 		\
+	trie.h 		\
+	truncate.c	\
+	ubi.c		\
+	ucopy.c		\
+	uid.c		\
+	uid16.c		\
+	umask.c		\
+	umount.c	\
+	uname.c		\
+	upeek.c		\
+	upoke.c		\
+	userfaultfd.c	\
+	ustat.c		\
+	util.c		\
+	utime.c		\
+	utimes.c	\
+	v4l2.c		\
+	wait.c		\
+	wait.h		\
+	watchdog_ioctl.c \
+	xattr.c		\
+	xfs_quota_stat.h \
+	xgetdents.c	\
+	xgetdents.h	\
+	xlat.c		\
+	xlat.h		\
+	xmalloc.c	\
+	xmalloc.h	\
+	xstring.h	\
+	$(TYPES_HEADER_FILES) \
+	$(strace_SOURCES_check) \
+	# end of libstrace_a_SOURCES
+
+strace_SOURCES_check = bpf_attr_check.c $(TYPES_CHECK_FILES)
+
+if ENABLE_STACKTRACE
+libstrace_a_SOURCES += unwind.c unwind.h
+if USE_LIBDW
+libstrace_a_SOURCES += unwind-libdw.c
+strace_CPPFLAGS += $(libdw_CPPFLAGS)
+strace_CFLAGS += $(libdw_CFLAGS)
+strace_LDFLAGS += $(libdw_LDFLAGS)
+strace_LDADD += $(libdw_LIBS)
+endif
+if USE_LIBUNWIND
+libstrace_a_SOURCES += unwind-libunwind.c
+strace_CPPFLAGS += $(libunwind_CPPFLAGS)
+strace_LDFLAGS += $(libunwind_LDFLAGS)
+strace_LDADD += $(libunwind_LIBS)
+endif
+if USE_DEMANGLE
+strace_CPPFLAGS += $(libiberty_CPPFLAGS)
+strace_LDFLAGS += $(libiberty_LDFLAGS)
+strace_LDADD += $(libiberty_LIBS)
+endif
+endif
+
+strace_CPPFLAGS += $(CODE_COVERAGE_CPPFLAGS)
+strace_CFLAGS += $(CODE_COVERAGE_CFLAGS)
+strace_LDADD += $(CODE_COVERAGE_LIBS)
+
+# Enable this to get link map generated
+#strace_LDFLAGS += -Wl,-Map=strace.mapfile
+
+EXTRA_DIST =				\
+	disable_ptrace_request.c	\
+	gen_bpf_attr_check.sh		\
+	generate_sen.sh			\
+	ioctl_iocdef.c			\
+	ioctlsort.c			\
+	linux/32/ioctls_inc.h		\
+	linux/32/ioctls_inc_align16.h	\
+	linux/32/ioctls_inc_align32.h	\
+	linux/32/ioctls_inc_align64.h	\
+	linux/32/syscallent-time32.h	\
+	linux/32/syscallent.h		\
+	linux/64/ioctls_inc.h		\
+	linux/64/syscallent.h		\
+	linux/aarch64/arch_defs_.h	\
+	linux/aarch64/arch_get_personality.c \
+	linux/aarch64/arch_regs.c	\
+	linux/aarch64/arch_sigreturn.c	\
+	linux/aarch64/get_error.c	\
+	linux/aarch64/get_scno.c	\
+	linux/aarch64/get_syscall_args.c	\
+	linux/aarch64/ioctls_arch0.h	\
+	linux/aarch64/ioctls_arch1.h	\
+	linux/aarch64/ioctls_inc0.h	\
+	linux/aarch64/ioctls_inc1.h	\
+	linux/aarch64/nr_prefix.c	\
+	linux/aarch64/raw_syscall.h	\
+	linux/aarch64/set_error.c	\
+	linux/aarch64/set_scno.c	\
+	linux/aarch64/shuffle_scno.c	\
+	linux/aarch64/syscallent.h	\
+	linux/aarch64/syscallent1.h	\
+	linux/alpha/arch_defs_.h	\
+	linux/alpha/arch_getrval2.c	\
+	linux/alpha/arch_regs.c		\
+	linux/alpha/arch_sigreturn.c	\
+	linux/alpha/errnoent.h		\
+	linux/alpha/get_error.c		\
+	linux/alpha/get_scno.c		\
+	linux/alpha/get_syscall_args.c	\
+	linux/alpha/get_syscall_result.c	\
+	linux/alpha/ioctls_arch0.h	\
+	linux/alpha/ioctls_inc0.h	\
+	linux/alpha/raw_syscall.h	\
+	linux/alpha/set_error.c		\
+	linux/alpha/set_scno.c		\
+	linux/alpha/signalent.h		\
+	linux/alpha/syscallent.h	\
+	linux/alpha/userent.h		\
+	linux/arc/arch_regs.c		\
+	linux/arc/get_error.c		\
+	linux/arc/get_scno.c		\
+	linux/arc/get_syscall_args.c	\
+	linux/arc/ioctls_arch0.h	\
+	linux/arc/ioctls_inc0.h		\
+	linux/arc/raw_syscall.h		\
+	linux/arc/set_error.c		\
+	linux/arc/set_scno.c		\
+	linux/arc/syscallent.h		\
+	linux/arch_defs_.h		\
+	linux/arch_kvm.c		\
+	linux/arch_regs.h		\
+	linux/arch_rt_sigframe.c	\
+	linux/arch_sigreturn.c		\
+	linux/arm/arch_defs_.h		\
+	linux/arm/arch_regs.c		\
+	linux/arm/arch_sigreturn.c	\
+	linux/arm/get_error.c		\
+	linux/arm/get_scno.c		\
+	linux/arm/get_syscall_args.c	\
+	linux/arm/ioctls_arch0.h	\
+	linux/arm/ioctls_inc0.h		\
+	linux/arm/nr_prefix.c		\
+	linux/arm/raw_syscall.h		\
+	linux/arm/set_error.c		\
+	linux/arm/set_scno.c		\
+	linux/arm/shuffle_scno.c	\
+	linux/arm/syscallent.h		\
+	linux/arm/userent.h		\
+	linux/avr32/arch_regs.c		\
+	linux/avr32/get_error.c		\
+	linux/avr32/get_scno.c		\
+	linux/avr32/get_syscall_args.c	\
+	linux/avr32/ioctls_arch0.h	\
+	linux/avr32/ioctls_inc0.h	\
+	linux/avr32/raw_syscall.h	\
+	linux/avr32/set_error.c		\
+	linux/avr32/set_scno.c		\
+	linux/avr32/syscallent.h	\
+	linux/avr32/userent.h		\
+	linux/bfin/arch_defs_.h		\
+	linux/bfin/arch_regs.c		\
+	linux/bfin/get_error.c		\
+	linux/bfin/get_scno.c		\
+	linux/bfin/get_syscall_args.c	\
+	linux/bfin/get_syscall_result.c	\
+	linux/bfin/ioctls_arch0.h	\
+	linux/bfin/ioctls_inc0.h	\
+	linux/bfin/raw_syscall.h	\
+	linux/bfin/rt_sigframe.h	\
+	linux/bfin/set_error.c		\
+	linux/bfin/set_scno.c		\
+	linux/bfin/syscallent.h		\
+	linux/csky/arch_regs.c		\
+	linux/csky/get_error.c		\
+	linux/csky/get_scno.c		\
+	linux/csky/get_syscall_args.c	\
+	linux/csky/ioctls_arch0.h	\
+	linux/csky/ioctls_inc0.h	\
+	linux/csky/raw_syscall.h	\
+	linux/csky/set_error.c		\
+	linux/csky/set_scno.c		\
+	linux/csky/syscallent.h		\
+	linux/bfin/userent.h		\
+	linux/check_scno.c		\
+	linux/dummy.h			\
+	linux/errnoent.h		\
+	linux/getregs_old.h		\
+	linux/hppa/arch_defs_.h		\
+	linux/hppa/arch_regs.c		\
+	linux/hppa/arch_rt_sigframe.c	\
+	linux/hppa/errnoent.h		\
+	linux/hppa/get_error.c		\
+	linux/hppa/get_scno.c		\
+	linux/hppa/get_syscall_args.c	\
+	linux/hppa/ioctls_arch0.h	\
+	linux/hppa/ioctls_inc0.h	\
+	linux/hppa/raw_syscall.h	\
+	linux/hppa/rt_sigframe.h	\
+	linux/hppa/set_error.c		\
+	linux/hppa/set_scno.c		\
+	linux/hppa/signalent.h		\
+	linux/hppa/syscallent.h		\
+	linux/hppa/userent.h		\
+	linux/i386/arch_defs_.h		\
+	linux/i386/arch_kvm.c		\
+	linux/i386/arch_regs.c		\
+	linux/i386/arch_rt_sigframe.c	\
+	linux/i386/arch_sigreturn.c	\
+	linux/i386/get_error.c		\
+	linux/i386/get_scno.c		\
+	linux/i386/get_syscall_args.c	\
+	linux/i386/ioctls_arch0.h	\
+	linux/i386/ioctls_inc0.h	\
+	linux/i386/raw_syscall.h	\
+	linux/i386/rt_sigframe.h	\
+	linux/i386/set_error.c		\
+	linux/i386/set_scno.c		\
+	linux/i386/syscallent.h		\
+	linux/i386/userent.h		\
+	linux/i386/userent0.h		\
+	linux/ia64/arch_defs_.h		\
+	linux/ia64/arch_getrval2.c	\
+	linux/ia64/arch_regs.c		\
+	linux/ia64/arch_regs.h		\
+	linux/ia64/arch_rt_sigframe.c	\
+	linux/ia64/get_error.c		\
+	linux/ia64/get_scno.c		\
+	linux/ia64/get_syscall_args.c	\
+	linux/ia64/ioctls_arch0.h	\
+	linux/ia64/ioctls_inc0.h	\
+	linux/ia64/raw_syscall.h	\
+	linux/ia64/rt_sigframe.h	\
+	linux/ia64/set_error.c		\
+	linux/ia64/set_scno.c		\
+	linux/ia64/shuffle_scno.c	\
+	linux/ia64/syscallent.h		\
+	linux/ia64/syscallent_base_nr.h	\
+	linux/ia64/userent.h		\
+	linux/inet_diag.h		\
+	linux/m68k/arch_defs_.h		\
+	linux/m68k/arch_regs.c		\
+	linux/m68k/arch_rt_sigframe.c	\
+	linux/m68k/arch_sigreturn.c	\
+	linux/m68k/get_error.c		\
+	linux/m68k/get_scno.c		\
+	linux/m68k/get_syscall_args.c	\
+	linux/m68k/ioctls_arch0.h	\
+	linux/m68k/ioctls_inc0.h	\
+	linux/m68k/raw_syscall.h	\
+	linux/m68k/rt_sigframe.h	\
+	linux/m68k/set_error.c		\
+	linux/m68k/set_scno.c		\
+	linux/m68k/syscallent.h		\
+	linux/m68k/userent.h		\
+	linux/metag/arch_regs.c		\
+	linux/metag/arch_rt_sigframe.c	\
+	linux/metag/get_error.c		\
+	linux/metag/get_scno.c		\
+	linux/metag/get_syscall_args.c	\
+	linux/metag/ioctls_arch0.h	\
+	linux/metag/ioctls_inc0.h	\
+	linux/metag/raw_syscall.h	\
+	linux/metag/set_error.c		\
+	linux/metag/set_scno.c		\
+	linux/metag/syscallent.h	\
+	linux/microblaze/arch_defs_.h	\
+	linux/microblaze/arch_regs.c	\
+	linux/microblaze/arch_sigreturn.c	\
+	linux/microblaze/get_error.c	\
+	linux/microblaze/get_scno.c	\
+	linux/microblaze/get_syscall_args.c	\
+	linux/microblaze/get_syscall_result.c	\
+	linux/microblaze/ioctls_arch0.h	\
+	linux/microblaze/ioctls_inc0.h	\
+	linux/microblaze/raw_syscall.h	\
+	linux/microblaze/set_error.c	\
+	linux/microblaze/set_scno.c	\
+	linux/microblaze/syscallent.h	\
+	linux/microblaze/userent.h	\
+	linux/mips/arch_defs_.h		\
+	linux/mips/arch_getrval2.c	\
+	linux/mips/arch_regs.c		\
+	linux/mips/arch_sigreturn.c	\
+	linux/mips/errnoent.h		\
+	linux/mips/genstub.sh		\
+	linux/mips/get_error.c		\
+	linux/mips/get_scno.c		\
+	linux/mips/get_syscall_args.c	\
+	linux/mips/ioctls_arch0.h	\
+	linux/mips/ioctls_inc0.h	\
+	linux/mips/raw_syscall.h	\
+	linux/mips/rt_sigframe.h	\
+	linux/mips/set_error.c		\
+	linux/mips/set_scno.c		\
+	linux/mips/signalent.h		\
+	linux/mips/syscallent-compat.h	\
+	linux/mips/syscallent-n32.h	\
+	linux/mips/syscallent-n64.h	\
+	linux/mips/syscallent-o32.h	\
+	linux/mips/syscallent.h		\
+	linux/mips/userent.h		\
+	linux/netlink_diag.h		\
+	linux/nios2/arch_defs_.h	\
+	linux/nios2/arch_regs.c		\
+	linux/nios2/get_error.c		\
+	linux/nios2/get_scno.c		\
+	linux/nios2/get_syscall_args.c	\
+	linux/nios2/ioctls_arch0.h	\
+	linux/nios2/ioctls_inc0.h	\
+	linux/nios2/raw_syscall.h	\
+	linux/nios2/set_error.c		\
+	linux/nios2/set_scno.c		\
+	linux/nios2/syscallent.h	\
+	linux/nr_prefix.c		\
+	linux/or1k/arch_regs.c		\
+	linux/or1k/get_error.c		\
+	linux/or1k/get_scno.c		\
+	linux/or1k/get_syscall_args.c	\
+	linux/or1k/ioctls_arch0.h	\
+	linux/or1k/ioctls_inc0.h	\
+	linux/or1k/raw_syscall.h	\
+	linux/or1k/set_error.c		\
+	linux/or1k/set_scno.c		\
+	linux/or1k/syscallent.h		\
+	linux/or1k/userent.h		\
+	linux/packet_diag.h		\
+	linux/powerpc/arch_defs_.h	\
+	linux/powerpc/arch_regs.c	\
+	linux/powerpc/arch_rt_sigframe.c	\
+	linux/powerpc/arch_sigreturn.c	\
+	linux/powerpc/errnoent.h	\
+	linux/powerpc/get_error.c	\
+	linux/powerpc/get_scno.c	\
+	linux/powerpc/get_syscall_args.c	\
+	linux/powerpc/getregs_old.c	\
+	linux/powerpc/getregs_old.h	\
+	linux/powerpc/ioctls_arch0.h	\
+	linux/powerpc/ioctls_inc0.h	\
+	linux/powerpc/raw_syscall.h	\
+	linux/powerpc/set_error.c	\
+	linux/powerpc/set_scno.c	\
+	linux/powerpc/syscallent.h	\
+	linux/powerpc/userent.h		\
+	linux/powerpc64/arch_defs_.h	\
+	linux/powerpc64/arch_get_personality.c \
+	linux/powerpc64/arch_regs.c	\
+	linux/powerpc64/arch_rt_sigframe.c	\
+	linux/powerpc64/arch_sigreturn.c	\
+	linux/powerpc64/errnoent.h	\
+	linux/powerpc64/get_error.c	\
+	linux/powerpc64/get_scno.c	\
+	linux/powerpc64/get_syscall_args.c	\
+	linux/powerpc64/getregs_old.c	\
+	linux/powerpc64/getregs_old.h	\
+	linux/powerpc64/ioctls_arch0.h	\
+	linux/powerpc64/ioctls_arch1.h	\
+	linux/powerpc64/ioctls_inc0.h	\
+	linux/powerpc64/ioctls_inc1.h	\
+	linux/powerpc64/raw_syscall.h	\
+	linux/powerpc64/rt_sigframe.h	\
+	linux/powerpc64/set_error.c	\
+	linux/powerpc64/set_scno.c	\
+	linux/powerpc64/syscallent.h	\
+	linux/powerpc64/syscallent1.h	\
+	linux/powerpc64/userent.h	\
+	linux/powerpc64le/arch_defs_.h	\
+	linux/powerpc64le/arch_regs.c	\
+	linux/powerpc64le/arch_rt_sigframe.c	\
+	linux/powerpc64le/errnoent.h	\
+	linux/powerpc64le/get_error.c	\
+	linux/powerpc64le/get_scno.c	\
+	linux/powerpc64le/get_syscall_args.c	\
+	linux/powerpc64le/ioctls_arch0.h	\
+	linux/powerpc64le/ioctls_inc0.h	\
+	linux/powerpc64le/raw_syscall.h	\
+	linux/powerpc64le/rt_sigframe.h	\
+	linux/powerpc64le/set_error.c	\
+	linux/powerpc64le/set_scno.c	\
+	linux/powerpc64le/syscallent.h	\
+	linux/powerpc64le/userent.h	\
+	linux/ptrace_pokeuser.c		\
+	linux/raw_syscall.h		\
+	linux/riscv64/arch_regs.c		\
+	linux/riscv64/get_error.c		\
+	linux/riscv64/get_scno.c		\
+	linux/riscv64/get_syscall_args.c	\
+	linux/riscv64/ioctls_arch0.h	\
+	linux/riscv64/ioctls_inc0.h	\
+	linux/riscv64/raw_syscall.h	\
+	linux/riscv64/set_error.c		\
+	linux/riscv64/set_scno.c		\
+	linux/riscv64/syscallent.h	\
+	linux/rt_sigframe.h		\
+	linux/s390/arch_defs_.h		\
+	linux/s390/arch_regs.c		\
+	linux/s390/arch_sigreturn.c	\
+	linux/s390/check_scno.c		\
+	linux/s390/get_error.c		\
+	linux/s390/get_scno.c		\
+	linux/s390/get_syscall_args.c	\
+	linux/s390/ioctls_arch0.h	\
+	linux/s390/ioctls_inc0.h	\
+	linux/s390/raw_syscall.h	\
+	linux/s390/rt_sigframe.h	\
+	linux/s390/set_error.c		\
+	linux/s390/set_scno.c		\
+	linux/s390/syscallent.h		\
+	linux/s390/userent.h		\
+	linux/s390/userent0.h		\
+	linux/s390/userent1.h		\
+	linux/s390x/arch_defs_.h	\
+	linux/s390x/arch_get_personality.c \
+	linux/s390x/arch_regs.c		\
+	linux/s390x/arch_sigreturn.c	\
+	linux/s390x/check_scno.c	\
+	linux/s390x/get_error.c		\
+	linux/s390x/get_scno.c		\
+	linux/s390x/get_syscall_args.c	\
+	linux/s390x/ioctls_arch0.h	\
+	linux/s390x/ioctls_arch1.h	\
+	linux/s390x/ioctls_inc0.h	\
+	linux/s390x/ioctls_inc1.h	\
+	linux/s390x/raw_syscall.h	\
+	linux/s390x/rt_sigframe.h	\
+	linux/s390x/set_error.c		\
+	linux/s390x/set_scno.c		\
+	linux/s390x/syscallent.h	\
+	linux/s390x/syscallent1.h	\
+	linux/s390x/userent.h		\
+	linux/sh/arch_defs_.h		\
+	linux/sh/arch_getrval2.c	\
+	linux/sh/arch_regs.c		\
+	linux/sh/get_error.c		\
+	linux/sh/get_scno.c		\
+	linux/sh/get_syscall_args.c	\
+	linux/sh/ioctls_arch0.h		\
+	linux/sh/ioctls_inc0.h		\
+	linux/sh/raw_syscall.h		\
+	linux/sh/set_error.c		\
+	linux/sh/set_scno.c		\
+	linux/sh/syscallent.h		\
+	linux/sh/userent.h		\
+	linux/sh/userent0.h		\
+	linux/sh64/arch_defs_.h		\
+	linux/sh64/arch_regs.c		\
+	linux/sh64/get_error.c		\
+	linux/sh64/get_scno.c		\
+	linux/sh64/get_syscall_args.c	\
+	linux/sh64/ioctls_arch0.h	\
+	linux/sh64/ioctls_inc0.h	\
+	linux/sh64/raw_syscall.h	\
+	linux/sh64/rt_sigframe.h	\
+	linux/sh64/set_error.c		\
+	linux/sh64/set_scno.c		\
+	linux/sh64/syscallent.h		\
+	linux/sh64/userent.h		\
+	linux/shuffle_scno.c		\
+	linux/signal.h.in		\
+	linux/signalent.h		\
+	linux/smc_diag.h		\
+	linux/sock_diag.h		\
+	linux/sparc/arch_defs_.h	\
+	linux/sparc/arch_getrval2.c	\
+	linux/sparc/arch_regs.c		\
+	linux/sparc/arch_sigreturn.c	\
+	linux/sparc/errnoent.h		\
+	linux/sparc/get_error.c		\
+	linux/sparc/get_scno.c		\
+	linux/sparc/get_syscall_args.c	\
+	linux/sparc/ioctls_arch0.h	\
+	linux/sparc/ioctls_inc0.h	\
+	linux/sparc/raw_syscall.h	\
+	linux/sparc/rt_sigframe.h	\
+	linux/sparc/set_error.c		\
+	linux/sparc/set_scno.c		\
+	linux/sparc/signalent.h		\
+	linux/sparc/syscallent.h	\
+	linux/sparc/userent.h		\
+	linux/sparc64/arch_defs_.h	\
+	linux/sparc64/arch_get_personality.c \
+	linux/sparc64/arch_getrval2.c	\
+	linux/sparc64/arch_regs.c	\
+	linux/sparc64/arch_rt_sigframe.c	\
+	linux/sparc64/arch_sigreturn.c	\
+	linux/sparc64/errnoent.h	\
+	linux/sparc64/get_error.c	\
+	linux/sparc64/get_scno.c	\
+	linux/sparc64/get_syscall_args.c	\
+	linux/sparc64/ioctls_arch0.h	\
+	linux/sparc64/ioctls_arch1.h	\
+	linux/sparc64/ioctls_inc0.h	\
+	linux/sparc64/ioctls_inc1.h	\
+	linux/sparc64/raw_syscall.h	\
+	linux/sparc64/rt_sigframe.h	\
+	linux/sparc64/set_error.c	\
+	linux/sparc64/set_scno.c	\
+	linux/sparc64/signalent.h	\
+	linux/sparc64/syscallent.h	\
+	linux/sparc64/syscallent1.h	\
+	linux/sparc64/userent.h		\
+	linux/subcall.h			\
+	linux/subcall32.h		\
+	linux/subcall64.h		\
+	linux/syscall.h			\
+	linux/syscallent-common-32.h	\
+	linux/syscallent-common.h	\
+	linux/syscallent_base_nr.h	\
+	linux/tile/arch_defs_.h		\
+	linux/tile/arch_get_personality.c \
+	linux/tile/arch_regs.c		\
+	linux/tile/arch_sigreturn.c	\
+	linux/tile/get_error.c		\
+	linux/tile/get_scno.c		\
+	linux/tile/get_syscall_args.c	\
+	linux/tile/ioctls_arch0.h	\
+	linux/tile/ioctls_arch1.h	\
+	linux/tile/ioctls_inc0.h	\
+	linux/tile/ioctls_inc1.h	\
+	linux/tile/raw_syscall.h	\
+	linux/tile/rt_sigframe.h	\
+	linux/tile/set_error.c		\
+	linux/tile/set_scno.c		\
+	linux/tile/syscallent.h		\
+	linux/tile/syscallent1.h	\
+	linux/tile/userent.h		\
+	linux/unix_diag.h		\
+	linux/userent.h			\
+	linux/userent0.h		\
+	linux/x32/arch_defs_.h		\
+	linux/x32/arch_get_personality.c \
+	linux/x32/arch_kvm.c		\
+	linux/x32/arch_regs.c		\
+	linux/x32/arch_regs.h		\
+	linux/x32/arch_rt_sigframe.c	\
+	linux/x32/arch_sigreturn.c	\
+	linux/x32/check_scno.c		\
+	linux/x32/get_error.c		\
+	linux/x32/get_scno.c		\
+	linux/x32/get_syscall_args.c	\
+	linux/x32/ioctls_arch0.h	\
+	linux/x32/ioctls_arch1.h	\
+	linux/x32/ioctls_inc0.h		\
+	linux/x32/ioctls_inc1.h		\
+	linux/x32/ptrace_pokeuser.c	\
+	linux/x32/raw_syscall.h		\
+	linux/x32/rt_sigframe.h		\
+	linux/x32/set_error.c		\
+	linux/x32/set_scno.c		\
+	linux/x32/shuffle_scno.c	\
+	linux/x32/syscallent.h		\
+	linux/x32/syscallent1.h		\
+	linux/x32/userent.h		\
+	linux/x86_64/arch_defs_.h	\
+	linux/x86_64/arch_get_personality.c \
+	linux/x86_64/arch_kvm.c		\
+	linux/x86_64/arch_regs.c	\
+	linux/x86_64/arch_regs.h	\
+	linux/x86_64/arch_rt_sigframe.c	\
+	linux/x86_64/arch_sigreturn.c	\
+	linux/x86_64/get_error.c	\
+	linux/x86_64/get_scno.c		\
+	linux/x86_64/get_syscall_args.c	\
+	linux/x86_64/getregs_old.c	\
+	linux/x86_64/getregs_old.h	\
+	linux/x86_64/ioctls_arch0.h	\
+	linux/x86_64/ioctls_arch1.h	\
+	linux/x86_64/ioctls_arch2.h	\
+	linux/x86_64/ioctls_inc0.h	\
+	linux/x86_64/ioctls_inc1.h	\
+	linux/x86_64/ioctls_inc2.h	\
+	linux/x86_64/raw_syscall.h	\
+	linux/x86_64/rt_sigframe.h	\
+	linux/x86_64/set_error.c	\
+	linux/x86_64/set_scno.c		\
+	linux/x86_64/shuffle_scno.c	\
+	linux/x86_64/syscallent.h	\
+	linux/x86_64/syscallent1.h	\
+	linux/x86_64/syscallent2.h	\
+	linux/x86_64/userent.h		\
+	linux/xtensa/arch_regs.c	\
+	linux/xtensa/get_error.c	\
+	linux/xtensa/get_scno.c		\
+	linux/xtensa/get_syscall_args.c	\
+	linux/xtensa/ioctls_arch0.h	\
+	linux/xtensa/ioctls_inc0.h	\
+	linux/xtensa/raw_syscall.h	\
+	linux/xtensa/set_error.c	\
+	linux/xtensa/set_scno.c		\
+	linux/xtensa/syscallent.h	\
+	linux/xtensa/userent.h		\
+	mpers.awk			\
+	mpers.sh			\
+	mpers_test.sh			\
+	mpers_xlat.h			\
+	scno.head			\
+	strace-graph			\
+	strace-log-merge		\
+	types/find_last_type_fields.awk	\
+	types/gen.sh			\
+	$(XLAT_INPUT_FILES)		\
+	$(XLAT_HEADER_FILES)		\
+	xlat/gen.sh			\
+	# end of EXTRA_DIST
+
+.PHONY: check-valgrind-local
+check-valgrind-local:
+
+bpf_attr_check.c: $(srcdir)/bpf_attr.h $(srcdir)/gen_bpf_attr_check.sh
+	D="$(D)" \
+	$(srcdir)/gen_bpf_attr_check.sh $< > $@-t && mv $@-t $@
+
+strace_SOURCES_c = \
+	$(filter %.c,$(strace_SOURCES)) $(filter %.c,$(libstrace_a_SOURCES))
+
+sys_func_h_sources = $(filter-out $(strace_SOURCES_check),$(strace_SOURCES_c))
+
+sys_func.h: $(patsubst %,$(srcdir)/%,$(sys_func_h_sources))
+	for f in $^; do \
+		sed -n 's/^SYS_FUNC(.*/extern &;/p' $$f; \
+	done | sort -u > $@
+
+syscallent_names = subcall.h syscallent.h syscallent1.h \
+		   syscallent-common.h syscallent-common-32.h \
+		   syscallent-n32.h syscallent-n64.h syscallent-o32.h
+syscallent_patterns = $(patsubst %,\%/%,$(syscallent_names))
+syscallent_files = $(filter $(syscallent_patterns),$(EXTRA_DIST))
+
+sen.h: $(patsubst %,$(srcdir)/%,$(syscallent_files))
+	for f in $^; do cat -- $$f; done | \
+		D="$(D)" \
+		$(srcdir)/generate_sen.sh > $@
+
+ioctlsort_CC = $(CC_FOR_BUILD)
+ioctlsort_DEFS = $(DEFS)
+ioctlsort_INCLUDES = $(DEFAULT_INCLUDES) $(INCLUDES)
+ioctlsort_CPPFLAGS = $(AM_CPPFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD)
+ioctlsort_CFLAGS = $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)
+ioctlsort_LDFLAGS = $(AM_LDFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD)
+
+ioctls_inc_h = $(wildcard $(srcdir)/$(OS)/$(ARCH)/ioctls_inc*.h)
+ioctlent_h = $(patsubst $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%,ioctlent%,$(ioctls_inc_h))
+ioctl_redefs_h = $(filter-out ioctl_redefs0.h,$(subst ioctlent,ioctl_redefs,$(ioctlent_h)))
+
+ioctl_redefs%.h: ioctlent%.h ioctlent0.h
+	sort $< > $<-t
+	sort ioctlent0.h | comm -23 $<-t - | \
+		sed -r -n 's/^\{ "([^"]+)", (0x[[:xdigit:]]+) \},$$/#ifdef \1\n# undef \1\n# define \1 \2\n#endif/p' \
+		> $@-t
+	rm -f $<-t
+	mv $@-t $@
+
+ioctlent%.h: ioctlsort%
+	./$< > $@
+
+# Need to pick up <linux/ioctl.h> definitions *for host* while compiling
+# ioctlsort *for build*, hence this magic.
+ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c
+	$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+		$(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@
+
+ioctl_iocdef.h: ioctl_iocdef.i
+	sed -n 's/^DEFINE HOST/#define /p' $< > $@
+
+ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o
+	$(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@
+
+ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c
+	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
+
+ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
+	cat $^ > $@
+
+BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) \
+		bpf_attr_check.c native_printer_decls.h native_printer_defs.h \
+		printers.h sen.h sys_func.h
+CLEANFILES    = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \
+		ioctl_iocdef.h ioctl_iocdef.i \
+		bpf_attr_check.c native_printer_decls.h native_printer_defs.h \
+		printers.h sen.h sys_func.h
+DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h linux/linux/signal.h
+
+include scno.am
+
+$(strace_OBJECTS): scno.h
+
+# defines mpers_source_files
+include mpers.am
+srcdir_mpers_source_files = $(patsubst %,$(srcdir)/%,$(mpers_source_files))
+mpers_preproc_files = $(mpers_source_files:.c=.c.mpers.i)
+
+mpers_NAME =
+mpers_PREFIX = $(mpers_NAME)_
+mpers_DEFS = $(DEFS)
+mpers_INCLUDES = $(DEFAULT_INCLUDES) $(INCLUDES)
+mpers_CPPFLAGS = $(CPPFLAGS)
+mpers_sh_opts = $(mpers_DEFS) $(mpers_INCLUDES) $(strace_CPPFLAGS) $(mpers_CPPFLAGS)
+libmpers_CPPFLAGS = $(strace_CPPFLAGS) -DIN_MPERS
+libmpers_CFLAGS = $(strace_CFLAGS)
+
+# mpers targets
+
+mpers-m%.stamp: $(srcdir_mpers_source_files) | printers.h
+	for f in $^; do \
+		D="$(D)" \
+		READELF="$(READELF)" \
+		CC="$(mpers_CC)" \
+		CFLAGS="$(mpers_sh_opts) -DMPERS_IS_$(mpers_NAME)" \
+		CPP="$(CPP)" \
+		CPPFLAGS="$(mpers_sh_opts) -DIN_MPERS -DMPERS_IS_$(mpers_NAME)" \
+		$(srcdir)/mpers.sh $(mpers_NAME) "$(mpers_CC_FLAGS)" $$f || exit; \
+	done
+	> $@
+
+m%_type_defs.h: $(srcdir_mpers_source_files)
+	for f in $^; do \
+		sed -r -n 's/^#[[:space:]]*include DEF_MPERS_TYPE\(([^)]+)\)/#ifdef MPERS_$(mpers_PREFIX)\1\n# define \1 MPERS_$(mpers_PREFIX)\1\n#endif/p' $$f || exit; \
+	done > $@-t
+	echo '#undef MPERS_PRINTER_NAME' >> $@-t
+	echo '#define MPERS_PRINTER_NAME(printer_name) printer_name' >> $@-t
+	echo '#include "$(mpers_PREFIX)printer_decls.h"' >> $@-t
+	echo '#include MPERS_$(mpers_PREFIX)IOCTL_MACROS' >> $@-t
+	mv $@-t $@
+
+m%_funcs.h: $(srcdir_mpers_source_files)
+	for f in $^; do \
+		sed -r -n 's/^SYS_FUNC\(([^)]+)\)/#undef sys_\1\n#define sys_\1 $(mpers_PREFIX)sys_\1/p' $$f || exit; \
+	done > $@-t && \
+	echo '#include "sys_func.h"' >> $@-t
+	mv $@-t $@
+
+# printers
+
+%.c.mpers.i: $(srcdir)/%.c
+	$(CPP) -P $(mpers_sh_opts) -DIN_MPERS_BOOTSTRAP $< -o $@
+
+mpers_printer_decl_pattern = ^MPERS_PRINTER_DECL\(([^,)]+),[[:space:]]*([^,)]+),[[:space:]]*([^)]+)\)$$
+
+printers.h: $(mpers_preproc_files)
+	echo '/* Generated by Makefile from $^; do not edit. */' > $@-t
+	echo 'typedef struct {' >> $@-t
+	for f in $^; do \
+		sed -r -n 's/$(mpers_printer_decl_pattern)/ \1 (*\2)(\3);\n#define \2 MPERS_PRINTER_NAME(\2)\n/p' $$f \
+		|| exit; \
+	done >> $@-t
+	echo '} struct_printers;' >> $@-t
+	echo 'extern const struct_printers *printers;' >> $@-t
+	echo '#define MPERS_PRINTER_NAME(printer_name) printers->printer_name' >> $@-t
+	mv $@-t $@
+
+%_printer_decls.h: $(mpers_preproc_files)
+	echo '/* Generated by Makefile from $^; do not edit. */' > $@-t
+	for f in $^; do \
+		sed -r -n 's/$(mpers_printer_decl_pattern)/extern \1 $(mpers_PREFIX)\2(\3);/p' $$f \
+		|| exit; \
+	done >> $@-t
+	mv $@-t $@
+
+%_printer_defs.h: $(mpers_preproc_files)
+	echo '/* Generated by Makefile from $^; do not edit. */' > $@-t
+	for f in $^; do \
+		sed -r -n 's/$(mpers_printer_decl_pattern)/.\2 = $(mpers_PREFIX)\2,/p' $$f \
+		|| exit; \
+	done >> $@-t
+	mv $@-t $@
+
+native_printer_decls.h native_printer_defs.h: mpers_PREFIX =
+
+if HAVE_M32_MPERS
+
+strace_LDADD += libmpers-m32.a
+noinst_LIBRARIES += libmpers-m32.a
+libmpers_m32_a_SOURCES = $(mpers_source_files)
+libmpers_m32_a_CPPFLAGS = $(libmpers_CPPFLAGS) -DMPERS_IS_m32 -I$(builddir)/mpers-m32
+libmpers_m32_a_CFLAGS = $(libmpers_CFLAGS)
+mpers_m32_targets = mpers-m32.stamp m32_type_defs.h m32_funcs.h m32_printer_decls.h m32_printer_defs.h
+
+BUILT_SOURCES += $(mpers_m32_targets)
+CLEANFILES    += $(mpers_m32_targets)
+
+$(mpers_m32_targets): mpers_NAME = m32
+$(mpers_m32_targets): mpers_CC_FLAGS = @CFLAGS_FOR_M32@ @cc_flags_m32@
+$(mpers_m32_targets): mpers_CPPFLAGS = @CPPFLAGS_FOR_M32@
+$(mpers_m32_targets): mpers_CC = @CC_FOR_M32@
+
+endif # HAVE_M32_MPERS
+
+if HAVE_MX32_MPERS
+
+strace_LDADD += libmpers-mx32.a
+noinst_LIBRARIES += libmpers-mx32.a
+libmpers_mx32_a_SOURCES = $(mpers_source_files)
+libmpers_mx32_a_CPPFLAGS = $(libmpers_CPPFLAGS) -DMPERS_IS_mx32 -I$(builddir)/mpers-mx32
+libmpers_mx32_a_CFLAGS = $(libmpers_CFLAGS)
+mpers_mx32_targets = mpers-mx32.stamp mx32_type_defs.h mx32_funcs.h mx32_printer_decls.h mx32_printer_defs.h
+
+BUILT_SOURCES += $(mpers_mx32_targets)
+CLEANFILES    += $(mpers_mx32_targets)
+
+$(mpers_mx32_targets): mpers_NAME = mx32
+$(mpers_mx32_targets): mpers_CC_FLAGS = @CFLAGS_FOR_MX32@ @cc_flags_mx32@
+$(mpers_mx32_targets): mpers_CPPFLAGS = @CPPFLAGS_FOR_MX32@
+$(mpers_mx32_targets): mpers_CC = @CC_FOR_MX32@
+
+endif # HAVE_MX32_MPERS
+
+clean-local:
+	-rm -rf mpers-m32 mpers-mx32
diff --git a/access.c b/src/access.c
index 759e0a6a2..759e0a6a2 100644
--- a/access.c
+++ b/src/access.c
diff --git a/affinity.c b/src/affinity.c
index 26fe3500a..26fe3500a 100644
--- a/affinity.c
+++ b/src/affinity.c
diff --git a/aio.c b/src/aio.c
index 6d504369f..6d504369f 100644
--- a/aio.c
+++ b/src/aio.c
diff --git a/alpha.c b/src/alpha.c
index e6a3f75ae..e6a3f75ae 100644
--- a/alpha.c
+++ b/src/alpha.c
diff --git a/arch_defs.h b/src/arch_defs.h
index 02aa6cca1..02aa6cca1 100644
--- a/arch_defs.h
+++ b/src/arch_defs.h
diff --git a/basic_filters.c b/src/basic_filters.c
index 371338278..371338278 100644
--- a/basic_filters.c
+++ b/src/basic_filters.c
diff --git a/bind.c b/src/bind.c
index ff773fd91..ff773fd91 100644
--- a/bind.c
+++ b/src/bind.c
diff --git a/bjm.c b/src/bjm.c
index fb5af8bda..fb5af8bda 100644
--- a/bjm.c
+++ b/src/bjm.c
diff --git a/block.c b/src/block.c
index 2502bbbb0..2502bbbb0 100644
--- a/block.c
+++ b/src/block.c
diff --git a/bpf.c b/src/bpf.c
index 0c503f054..0c503f054 100644
--- a/bpf.c
+++ b/src/bpf.c
diff --git a/bpf_attr.h b/src/bpf_attr.h
index 59146e446..59146e446 100644
--- a/bpf_attr.h
+++ b/src/bpf_attr.h
diff --git a/bpf_filter.c b/src/bpf_filter.c
index dfe48d165..dfe48d165 100644
--- a/bpf_filter.c
+++ b/src/bpf_filter.c
diff --git a/bpf_filter.h b/src/bpf_filter.h
index 790f13dcf..790f13dcf 100644
--- a/bpf_filter.h
+++ b/src/bpf_filter.h
diff --git a/bpf_fprog.h b/src/bpf_fprog.h
index 6f1f1aa22..6f1f1aa22 100644
--- a/bpf_fprog.h
+++ b/src/bpf_fprog.h
diff --git a/bpf_seccomp_filter.c b/src/bpf_seccomp_filter.c
index c75f72fd1..c75f72fd1 100644
--- a/bpf_seccomp_filter.c
+++ b/src/bpf_seccomp_filter.c
diff --git a/bpf_sock_filter.c b/src/bpf_sock_filter.c
index 0df4c41f8..0df4c41f8 100644
--- a/bpf_sock_filter.c
+++ b/src/bpf_sock_filter.c
diff --git a/btrfs.c b/src/btrfs.c
index 1933cf33a..1933cf33a 100644
--- a/btrfs.c
+++ b/src/btrfs.c
diff --git a/cacheflush.c b/src/cacheflush.c
index 677adede6..677adede6 100644
--- a/cacheflush.c
+++ b/src/cacheflush.c
diff --git a/capability.c b/src/capability.c
index a4f493a4b..a4f493a4b 100644
--- a/capability.c
+++ b/src/capability.c
diff --git a/caps0.h b/src/caps0.h
index 3789c25fb..3789c25fb 100644
--- a/caps0.h
+++ b/src/caps0.h
diff --git a/caps1.h b/src/caps1.h
index ca3147b60..ca3147b60 100644
--- a/caps1.h
+++ b/src/caps1.h
diff --git a/chdir.c b/src/chdir.c
index b07d164e8..b07d164e8 100644
--- a/chdir.c
+++ b/src/chdir.c
diff --git a/chmod.c b/src/chmod.c
index 85b3abec3..85b3abec3 100644
--- a/chmod.c
+++ b/src/chmod.c
diff --git a/clone.c b/src/clone.c
index 433c59d39..433c59d39 100644
--- a/clone.c
+++ b/src/clone.c
diff --git a/close_range.c b/src/close_range.c
index 191537a16..191537a16 100644
--- a/close_range.c
+++ b/src/close_range.c
diff --git a/copy_file_range.c b/src/copy_file_range.c
index 7d6de0f51..7d6de0f51 100644
--- a/copy_file_range.c
+++ b/src/copy_file_range.c
diff --git a/count.c b/src/count.c
index 6e1401f1f..6e1401f1f 100644
--- a/count.c
+++ b/src/count.c
diff --git a/defs.h b/src/defs.h
index 0ccb19b24..0ccb19b24 100644
--- a/defs.h
+++ b/src/defs.h
diff --git a/delay.c b/src/delay.c
index 538992ff9..538992ff9 100644
--- a/delay.c
+++ b/src/delay.c
diff --git a/delay.h b/src/delay.h
index 1dc273042..1dc273042 100644
--- a/delay.h
+++ b/src/delay.h
diff --git a/desc.c b/src/desc.c
index ac4585f17..ac4585f17 100644
--- a/desc.c
+++ b/src/desc.c
diff --git a/dirent.c b/src/dirent.c
index 91167b9a0..91167b9a0 100644
--- a/dirent.c
+++ b/src/dirent.c
diff --git a/dirent64.c b/src/dirent64.c
index b1f6141dc..b1f6141dc 100644
--- a/dirent64.c
+++ b/src/dirent64.c
diff --git a/dirent_types.c b/src/dirent_types.c
index 593563e14..593563e14 100644
--- a/dirent_types.c
+++ b/src/dirent_types.c
diff --git a/disable_ptrace_get_syscall_info.c b/src/disable_ptrace_get_syscall_info.c
index 337c2a566..337c2a566 100644
--- a/disable_ptrace_get_syscall_info.c
+++ b/src/disable_ptrace_get_syscall_info.c
diff --git a/disable_ptrace_getregset.c b/src/disable_ptrace_getregset.c
index e7834aa83..e7834aa83 100644
--- a/disable_ptrace_getregset.c
+++ b/src/disable_ptrace_getregset.c
diff --git a/disable_ptrace_request.c b/src/disable_ptrace_request.c
index 872c644df..872c644df 100644
--- a/disable_ptrace_request.c
+++ b/src/disable_ptrace_request.c
diff --git a/dm.c b/src/dm.c
index f77d14eb2..f77d14eb2 100644
--- a/dm.c
+++ b/src/dm.c
diff --git a/dup.c b/src/dup.c
index aa86dd935..aa86dd935 100644
--- a/dup.c
+++ b/src/dup.c
diff --git a/dyxlat.c b/src/dyxlat.c
index 52d20a497..52d20a497 100644
--- a/dyxlat.c
+++ b/src/dyxlat.c
diff --git a/empty.h b/src/empty.h
index e69de29bb..e69de29bb 100644
--- a/empty.h
+++ b/src/empty.h
diff --git a/epoll.c b/src/epoll.c
index d87e0b8bc..d87e0b8bc 100644
--- a/epoll.c
+++ b/src/epoll.c
diff --git a/error_prints.c b/src/error_prints.c
index d14268df7..d14268df7 100644
--- a/error_prints.c
+++ b/src/error_prints.c
diff --git a/error_prints.h b/src/error_prints.h
index 678c1d15a..678c1d15a 100644
--- a/error_prints.h
+++ b/src/error_prints.h
diff --git a/evdev.c b/src/evdev.c
index d8fd40489..d8fd40489 100644
--- a/evdev.c
+++ b/src/evdev.c
diff --git a/evdev_mpers.c b/src/evdev_mpers.c
index a91e38749..a91e38749 100644
--- a/evdev_mpers.c
+++ b/src/evdev_mpers.c
diff --git a/eventfd.c b/src/eventfd.c
index 395ac6524..395ac6524 100644
--- a/eventfd.c
+++ b/src/eventfd.c
diff --git a/execve.c b/src/execve.c
index 6fcb4cafe..6fcb4cafe 100644
--- a/execve.c
+++ b/src/execve.c
diff --git a/f_owner_ex.h b/src/f_owner_ex.h
index 81e4a4d7b..81e4a4d7b 100644
--- a/f_owner_ex.h
+++ b/src/f_owner_ex.h
diff --git a/fadvise.c b/src/fadvise.c
index 02e4df63f..02e4df63f 100644
--- a/fadvise.c
+++ b/src/fadvise.c
diff --git a/fallocate.c b/src/fallocate.c
index 82c0d642d..82c0d642d 100644
--- a/fallocate.c
+++ b/src/fallocate.c
diff --git a/fanotify.c b/src/fanotify.c
index 389b373e9..389b373e9 100644
--- a/fanotify.c
+++ b/src/fanotify.c
diff --git a/fchownat.c b/src/fchownat.c
index b573b5bae..b573b5bae 100644
--- a/fchownat.c
+++ b/src/fchownat.c
diff --git a/fcntl.c b/src/fcntl.c
index 5fd916ced..5fd916ced 100644
--- a/fcntl.c
+++ b/src/fcntl.c
diff --git a/fetch_bpf_fprog.c b/src/fetch_bpf_fprog.c
index 4fb7812f7..4fb7812f7 100644
--- a/fetch_bpf_fprog.c
+++ b/src/fetch_bpf_fprog.c
diff --git a/fetch_indirect_syscall_args.c b/src/fetch_indirect_syscall_args.c
index 10d0c8474..10d0c8474 100644
--- a/fetch_indirect_syscall_args.c
+++ b/src/fetch_indirect_syscall_args.c
diff --git a/fetch_struct_flock.c b/src/fetch_struct_flock.c
index 7262a9756..7262a9756 100644
--- a/fetch_struct_flock.c
+++ b/src/fetch_struct_flock.c
diff --git a/fetch_struct_keyctl_kdf_params.c b/src/fetch_struct_keyctl_kdf_params.c
index 63eadb2e7..63eadb2e7 100644
--- a/fetch_struct_keyctl_kdf_params.c
+++ b/src/fetch_struct_keyctl_kdf_params.c
diff --git a/fetch_struct_mmsghdr.c b/src/fetch_struct_mmsghdr.c
index 9d2c8bf83..9d2c8bf83 100644
--- a/fetch_struct_mmsghdr.c
+++ b/src/fetch_struct_mmsghdr.c
diff --git a/fetch_struct_msghdr.c b/src/fetch_struct_msghdr.c
index 220dcce0a..220dcce0a 100644
--- a/fetch_struct_msghdr.c
+++ b/src/fetch_struct_msghdr.c
diff --git a/fetch_struct_stat.c b/src/fetch_struct_stat.c
index 60eb3608c..60eb3608c 100644
--- a/fetch_struct_stat.c
+++ b/src/fetch_struct_stat.c
diff --git a/fetch_struct_stat64.c b/src/fetch_struct_stat64.c
index bec5306fe..bec5306fe 100644
--- a/fetch_struct_stat64.c
+++ b/src/fetch_struct_stat64.c
diff --git a/fetch_struct_statfs.c b/src/fetch_struct_statfs.c
index cdb86798c..cdb86798c 100644
--- a/fetch_struct_statfs.c
+++ b/src/fetch_struct_statfs.c
diff --git a/fetch_struct_xfs_quotastat.c b/src/fetch_struct_xfs_quotastat.c
index d78767588..d78767588 100644
--- a/fetch_struct_xfs_quotastat.c
+++ b/src/fetch_struct_xfs_quotastat.c
diff --git a/file_handle.c b/src/file_handle.c
index cd92f9993..cd92f9993 100644
--- a/file_handle.c
+++ b/src/file_handle.c
diff --git a/filter.h b/src/filter.h
index 54b0a72bf..54b0a72bf 100644
--- a/filter.h
+++ b/src/filter.h
diff --git a/filter_qualify.c b/src/filter_qualify.c
index 5f931f6ea..5f931f6ea 100644
--- a/filter_qualify.c
+++ b/src/filter_qualify.c
diff --git a/filter_seccomp.c b/src/filter_seccomp.c
index adb9f230b..adb9f230b 100644
--- a/filter_seccomp.c
+++ b/src/filter_seccomp.c
diff --git a/filter_seccomp.h b/src/filter_seccomp.h
index 76539e079..76539e079 100644
--- a/filter_seccomp.h
+++ b/src/filter_seccomp.h
diff --git a/flock.c b/src/flock.c
index b3f2b3b55..b3f2b3b55 100644
--- a/flock.c
+++ b/src/flock.c
diff --git a/flock.h b/src/flock.h
index 12ab1b5cb..12ab1b5cb 100644
--- a/flock.h
+++ b/src/flock.h
diff --git a/fs_0x94_ioctl.c b/src/fs_0x94_ioctl.c
index e980d1761..e980d1761 100644
--- a/fs_0x94_ioctl.c
+++ b/src/fs_0x94_ioctl.c
diff --git a/fs_f_ioctl.c b/src/fs_f_ioctl.c
index d0de799f9..d0de799f9 100644
--- a/fs_f_ioctl.c
+++ b/src/fs_f_ioctl.c
diff --git a/fs_x_ioctl.c b/src/fs_x_ioctl.c
index b7abc409c..b7abc409c 100644
--- a/fs_x_ioctl.c
+++ b/src/fs_x_ioctl.c
diff --git a/fsconfig.c b/src/fsconfig.c
index 6134155ca..6134155ca 100644
--- a/fsconfig.c
+++ b/src/fsconfig.c
diff --git a/fsmount.c b/src/fsmount.c
index 5922421c2..5922421c2 100644
--- a/fsmount.c
+++ b/src/fsmount.c
diff --git a/fsopen.c b/src/fsopen.c
index 293bbfa52..293bbfa52 100644
--- a/fsopen.c
+++ b/src/fsopen.c
diff --git a/fspick.c b/src/fspick.c
index 1d9b43d70..1d9b43d70 100644
--- a/fspick.c
+++ b/src/fspick.c
diff --git a/fstatfs.c b/src/fstatfs.c
index e5029f32c..e5029f32c 100644
--- a/fstatfs.c
+++ b/src/fstatfs.c
diff --git a/fstatfs64.c b/src/fstatfs64.c
index 0aac13d2c..0aac13d2c 100644
--- a/fstatfs64.c
+++ b/src/fstatfs64.c
diff --git a/futex.c b/src/futex.c
index a31d7fc7d..a31d7fc7d 100644
--- a/futex.c
+++ b/src/futex.c
diff --git a/gcc_compat.h b/src/gcc_compat.h
index 9ea8bbd56..9ea8bbd56 100644
--- a/gcc_compat.h
+++ b/src/gcc_compat.h
diff --git a/gen_bpf_attr_check.sh b/src/gen_bpf_attr_check.sh
index 513d662a4..513d662a4 100755
--- a/gen_bpf_attr_check.sh
+++ b/src/gen_bpf_attr_check.sh
diff --git a/generate_mpers_am.sh b/src/generate_mpers_am.sh
index 5676b65b6..5676b65b6 100755
--- a/generate_mpers_am.sh
+++ b/src/generate_mpers_am.sh
diff --git a/generate_sen.sh b/src/generate_sen.sh
index fd435c906..fd435c906 100755
--- a/generate_sen.sh
+++ b/src/generate_sen.sh
diff --git a/get_personality.c b/src/get_personality.c
index 0af9095fc..0af9095fc 100644
--- a/get_personality.c
+++ b/src/get_personality.c
diff --git a/get_personality.h b/src/get_personality.h
index bb02bd4e2..bb02bd4e2 100644
--- a/get_personality.h
+++ b/src/get_personality.h
diff --git a/get_robust_list.c b/src/get_robust_list.c
index 111aab424..111aab424 100644
--- a/get_robust_list.c
+++ b/src/get_robust_list.c
diff --git a/getcpu.c b/src/getcpu.c
index e91c76ff2..e91c76ff2 100644
--- a/getcpu.c
+++ b/src/getcpu.c
diff --git a/getcwd.c b/src/getcwd.c
index 7c6de9afb..7c6de9afb 100644
--- a/getcwd.c
+++ b/src/getcwd.c
diff --git a/getpagesize.c b/src/getpagesize.c
index 6dae186de..6dae186de 100644
--- a/getpagesize.c
+++ b/src/getpagesize.c
diff --git a/getpid.c b/src/getpid.c
index 5e9a1a294..5e9a1a294 100644
--- a/getpid.c
+++ b/src/getpid.c
diff --git a/getrandom.c b/src/getrandom.c
index f2985f0c3..f2985f0c3 100644
--- a/getrandom.c
+++ b/src/getrandom.c
diff --git a/gpio_ioctl.c b/src/gpio_ioctl.c
index ced418bd6..ced418bd6 100644
--- a/gpio_ioctl.c
+++ b/src/gpio_ioctl.c
diff --git a/hdio.c b/src/hdio.c
index 085192183..085192183 100644
--- a/hdio.c
+++ b/src/hdio.c
diff --git a/hostname.c b/src/hostname.c
index c13cf1d2d..c13cf1d2d 100644
--- a/hostname.c
+++ b/src/hostname.c
diff --git a/inotify.c b/src/inotify.c
index f5095914b..f5095914b 100644
--- a/inotify.c
+++ b/src/inotify.c
diff --git a/inotify_ioctl.c b/src/inotify_ioctl.c
index 7e06dcb0c..7e06dcb0c 100644
--- a/inotify_ioctl.c
+++ b/src/inotify_ioctl.c
diff --git a/io.c b/src/io.c
index db4b667d9..db4b667d9 100644
--- a/io.c
+++ b/src/io.c
diff --git a/io_uring.c b/src/io_uring.c
index 9f2e3b8af..9f2e3b8af 100644
--- a/io_uring.c
+++ b/src/io_uring.c
diff --git a/ioctl.c b/src/ioctl.c
index f3d31b8ad..f3d31b8ad 100644
--- a/ioctl.c
+++ b/src/ioctl.c
diff --git a/ioctl_iocdef.c b/src/ioctl_iocdef.c
index 1f43fc417..1f43fc417 100644
--- a/ioctl_iocdef.c
+++ b/src/ioctl_iocdef.c
diff --git a/ioctlsort.c b/src/ioctlsort.c
index b92cbecce..b92cbecce 100644
--- a/ioctlsort.c
+++ b/src/ioctlsort.c
diff --git a/ioperm.c b/src/ioperm.c
index 4dd3a2203..4dd3a2203 100644
--- a/ioperm.c
+++ b/src/ioperm.c
diff --git a/iopl.c b/src/iopl.c
index 0e2c5da75..0e2c5da75 100644
--- a/iopl.c
+++ b/src/iopl.c
diff --git a/ioprio.c b/src/ioprio.c
index f98300e9b..f98300e9b 100644
--- a/ioprio.c
+++ b/src/ioprio.c
diff --git a/ipc.c b/src/ipc.c
index 52cadea2f..52cadea2f 100644
--- a/ipc.c
+++ b/src/ipc.c
diff --git a/ipc_defs.h b/src/ipc_defs.h
index 1fb5a7920..1fb5a7920 100644
--- a/ipc_defs.h
+++ b/src/ipc_defs.h
diff --git a/ipc_msg.c b/src/ipc_msg.c
index 9b98054b0..9b98054b0 100644
--- a/ipc_msg.c
+++ b/src/ipc_msg.c
diff --git a/ipc_msgctl.c b/src/ipc_msgctl.c
index 4c95e5cd3..4c95e5cd3 100644
--- a/ipc_msgctl.c
+++ b/src/ipc_msgctl.c
diff --git a/ipc_sem.c b/src/ipc_sem.c
index 1be0bb6d7..1be0bb6d7 100644
--- a/ipc_sem.c
+++ b/src/ipc_sem.c
diff --git a/ipc_semctl.c b/src/ipc_semctl.c
index c4bbceca1..c4bbceca1 100644
--- a/ipc_semctl.c
+++ b/src/ipc_semctl.c
diff --git a/ipc_shm.c b/src/ipc_shm.c
index f62a7ebbf..f62a7ebbf 100644
--- a/ipc_shm.c
+++ b/src/ipc_shm.c
diff --git a/ipc_shmctl.c b/src/ipc_shmctl.c
index 6b23449ea..6b23449ea 100644
--- a/ipc_shmctl.c
+++ b/src/ipc_shmctl.c
diff --git a/kcmp.c b/src/kcmp.c
index 2fca20053..2fca20053 100644
--- a/kcmp.c
+++ b/src/kcmp.c
diff --git a/kernel_dirent.h b/src/kernel_dirent.h
index f4d55d28f..f4d55d28f 100644
--- a/kernel_dirent.h
+++ b/src/kernel_dirent.h
diff --git a/kernel_rusage.h b/src/kernel_rusage.h
index c9028cb4d..c9028cb4d 100644
--- a/kernel_rusage.h
+++ b/src/kernel_rusage.h
diff --git a/kernel_timespec.h b/src/kernel_timespec.h
index 2fa38a432..2fa38a432 100644
--- a/kernel_timespec.h
+++ b/src/kernel_timespec.h
diff --git a/kernel_timeval.h b/src/kernel_timeval.h
index 4364efcaf..4364efcaf 100644
--- a/kernel_timeval.h
+++ b/src/kernel_timeval.h
diff --git a/kernel_timex.h b/src/kernel_timex.h
index c69468876..c69468876 100644
--- a/kernel_timex.h
+++ b/src/kernel_timex.h
diff --git a/kernel_types.h b/src/kernel_types.h
index 5bdde1bbb..5bdde1bbb 100644
--- a/kernel_types.h
+++ b/src/kernel_types.h
diff --git a/kernel_v4l2_types.h b/src/kernel_v4l2_types.h
index b0c49e37b..b0c49e37b 100644
--- a/kernel_v4l2_types.h
+++ b/src/kernel_v4l2_types.h
diff --git a/kexec.c b/src/kexec.c
index 73a2c17f6..73a2c17f6 100644
--- a/kexec.c
+++ b/src/kexec.c
diff --git a/keyctl.c b/src/keyctl.c
index 800018bb2..800018bb2 100644
--- a/keyctl.c
+++ b/src/keyctl.c
diff --git a/keyctl_kdf_params.h b/src/keyctl_kdf_params.h
index 80fff1a6f..80fff1a6f 100644
--- a/keyctl_kdf_params.h
+++ b/src/keyctl_kdf_params.h
diff --git a/kill_save_errno.h b/src/kill_save_errno.h
index a777b9a44..a777b9a44 100644
--- a/kill_save_errno.h
+++ b/src/kill_save_errno.h
diff --git a/kvm.c b/src/kvm.c
index 8a89b254e..8a89b254e 100644
--- a/kvm.c
+++ b/src/kvm.c
diff --git a/largefile_wrappers.h b/src/largefile_wrappers.h
index bde4eb1ba..bde4eb1ba 100644
--- a/largefile_wrappers.h
+++ b/src/largefile_wrappers.h
diff --git a/ldt.c b/src/ldt.c
index de93cf896..de93cf896 100644
--- a/ldt.c
+++ b/src/ldt.c
diff --git a/link.c b/src/link.c
index 0d170485c..0d170485c 100644
--- a/link.c
+++ b/src/link.c
diff --git a/linux/32/ioctls_inc.h b/src/linux/32/ioctls_inc.h
index 84294ba01..84294ba01 100644
--- a/linux/32/ioctls_inc.h
+++ b/src/linux/32/ioctls_inc.h
diff --git a/linux/32/ioctls_inc_align16.h b/src/linux/32/ioctls_inc_align16.h
index 867fde590..867fde590 100644
--- a/linux/32/ioctls_inc_align16.h
+++ b/src/linux/32/ioctls_inc_align16.h
diff --git a/linux/32/ioctls_inc_align32.h b/src/linux/32/ioctls_inc_align32.h
index edbdf6996..edbdf6996 100644
--- a/linux/32/ioctls_inc_align32.h
+++ b/src/linux/32/ioctls_inc_align32.h
diff --git a/linux/32/ioctls_inc_align64.h b/src/linux/32/ioctls_inc_align64.h
index 6546c1f9f..6546c1f9f 100644
--- a/linux/32/ioctls_inc_align64.h
+++ b/src/linux/32/ioctls_inc_align64.h
diff --git a/linux/32/syscallent-time32.h b/src/linux/32/syscallent-time32.h
index 5f9d0e448..5f9d0e448 100644
--- a/linux/32/syscallent-time32.h
+++ b/src/linux/32/syscallent-time32.h
diff --git a/linux/32/syscallent.h b/src/linux/32/syscallent.h
index b31e2e503..b31e2e503 100644
--- a/linux/32/syscallent.h
+++ b/src/linux/32/syscallent.h
diff --git a/linux/64/ioctls_inc.h b/src/linux/64/ioctls_inc.h
index e144ca028..e144ca028 100644
--- a/linux/64/ioctls_inc.h
+++ b/src/linux/64/ioctls_inc.h
diff --git a/linux/64/syscallent.h b/src/linux/64/syscallent.h
index e73cecddc..e73cecddc 100644
--- a/linux/64/syscallent.h
+++ b/src/linux/64/syscallent.h
diff --git a/linux/aarch64/arch_defs_.h b/src/linux/aarch64/arch_defs_.h
index fb75722f6..fb75722f6 100644
--- a/linux/aarch64/arch_defs_.h
+++ b/src/linux/aarch64/arch_defs_.h
diff --git a/linux/aarch64/arch_get_personality.c b/src/linux/aarch64/arch_get_personality.c
index 4cf0cb1e8..4cf0cb1e8 100644
--- a/linux/aarch64/arch_get_personality.c
+++ b/src/linux/aarch64/arch_get_personality.c
diff --git a/linux/aarch64/arch_regs.c b/src/linux/aarch64/arch_regs.c
index f88067dbe..f88067dbe 100644
--- a/linux/aarch64/arch_regs.c
+++ b/src/linux/aarch64/arch_regs.c
diff --git a/linux/aarch64/arch_sigreturn.c b/src/linux/aarch64/arch_sigreturn.c
index f0e29c26c..f0e29c26c 100644
--- a/linux/aarch64/arch_sigreturn.c
+++ b/src/linux/aarch64/arch_sigreturn.c
diff --git a/linux/aarch64/get_error.c b/src/linux/aarch64/get_error.c
index 38856a978..38856a978 100644
--- a/linux/aarch64/get_error.c
+++ b/src/linux/aarch64/get_error.c
diff --git a/linux/aarch64/get_scno.c b/src/linux/aarch64/get_scno.c
index af758aeee..af758aeee 100644
--- a/linux/aarch64/get_scno.c
+++ b/src/linux/aarch64/get_scno.c
diff --git a/linux/aarch64/get_syscall_args.c b/src/linux/aarch64/get_syscall_args.c
index fce96273a..fce96273a 100644
--- a/linux/aarch64/get_syscall_args.c
+++ b/src/linux/aarch64/get_syscall_args.c
diff --git a/linux/aarch64/ioctls_arch0.h b/src/linux/aarch64/ioctls_arch0.h
index 5b5121d9d..5b5121d9d 100644
--- a/linux/aarch64/ioctls_arch0.h
+++ b/src/linux/aarch64/ioctls_arch0.h
diff --git a/linux/aarch64/ioctls_arch1.h b/src/linux/aarch64/ioctls_arch1.h
index b722d22b4..b722d22b4 100644
--- a/linux/aarch64/ioctls_arch1.h
+++ b/src/linux/aarch64/ioctls_arch1.h
diff --git a/linux/aarch64/ioctls_inc0.h b/src/linux/aarch64/ioctls_inc0.h
index f9939faa4..f9939faa4 100644
--- a/linux/aarch64/ioctls_inc0.h
+++ b/src/linux/aarch64/ioctls_inc0.h
diff --git a/linux/aarch64/ioctls_inc1.h b/src/linux/aarch64/ioctls_inc1.h
index 46c11b11f..46c11b11f 100644
--- a/linux/aarch64/ioctls_inc1.h
+++ b/src/linux/aarch64/ioctls_inc1.h
diff --git a/linux/aarch64/nr_prefix.c b/src/linux/aarch64/nr_prefix.c
index 49fe77ae6..49fe77ae6 100644
--- a/linux/aarch64/nr_prefix.c
+++ b/src/linux/aarch64/nr_prefix.c
diff --git a/linux/aarch64/raw_syscall.h b/src/linux/aarch64/raw_syscall.h
index aa27e1d5f..aa27e1d5f 100644
--- a/linux/aarch64/raw_syscall.h
+++ b/src/linux/aarch64/raw_syscall.h
diff --git a/linux/aarch64/set_error.c b/src/linux/aarch64/set_error.c
index bb04450d6..bb04450d6 100644
--- a/linux/aarch64/set_error.c
+++ b/src/linux/aarch64/set_error.c
diff --git a/linux/aarch64/set_scno.c b/src/linux/aarch64/set_scno.c
index 668a7570d..668a7570d 100644
--- a/linux/aarch64/set_scno.c
+++ b/src/linux/aarch64/set_scno.c
diff --git a/linux/aarch64/shuffle_scno.c b/src/linux/aarch64/shuffle_scno.c
index a4c0d3bec..a4c0d3bec 100644
--- a/linux/aarch64/shuffle_scno.c
+++ b/src/linux/aarch64/shuffle_scno.c
diff --git a/linux/aarch64/syscallent.h b/src/linux/aarch64/syscallent.h
index 4750cd999..4750cd999 100644
--- a/linux/aarch64/syscallent.h
+++ b/src/linux/aarch64/syscallent.h
diff --git a/linux/aarch64/syscallent1.h b/src/linux/aarch64/syscallent1.h
index 1b892be03..1b892be03 100644
--- a/linux/aarch64/syscallent1.h
+++ b/src/linux/aarch64/syscallent1.h
diff --git a/linux/alpha/arch_defs_.h b/src/linux/alpha/arch_defs_.h
index 78227c79f..78227c79f 100644
--- a/linux/alpha/arch_defs_.h
+++ b/src/linux/alpha/arch_defs_.h
diff --git a/linux/alpha/arch_getrval2.c b/src/linux/alpha/arch_getrval2.c
index 6232f6fcb..6232f6fcb 100644
--- a/linux/alpha/arch_getrval2.c
+++ b/src/linux/alpha/arch_getrval2.c
diff --git a/linux/alpha/arch_regs.c b/src/linux/alpha/arch_regs.c
index ac6c35f27..ac6c35f27 100644
--- a/linux/alpha/arch_regs.c
+++ b/src/linux/alpha/arch_regs.c
diff --git a/linux/alpha/arch_sigreturn.c b/src/linux/alpha/arch_sigreturn.c
index c6a254554..c6a254554 100644
--- a/linux/alpha/arch_sigreturn.c
+++ b/src/linux/alpha/arch_sigreturn.c
diff --git a/linux/alpha/errnoent.h b/src/linux/alpha/errnoent.h
index 4f3ec926f..4f3ec926f 100644
--- a/linux/alpha/errnoent.h
+++ b/src/linux/alpha/errnoent.h
diff --git a/linux/alpha/get_error.c b/src/linux/alpha/get_error.c
index 3c8e8ebff..3c8e8ebff 100644
--- a/linux/alpha/get_error.c
+++ b/src/linux/alpha/get_error.c
diff --git a/linux/alpha/get_scno.c b/src/linux/alpha/get_scno.c
index 7cb61fa18..7cb61fa18 100644
--- a/linux/alpha/get_scno.c
+++ b/src/linux/alpha/get_scno.c
diff --git a/linux/alpha/get_syscall_args.c b/src/linux/alpha/get_syscall_args.c
index 83f4d4541..83f4d4541 100644
--- a/linux/alpha/get_syscall_args.c
+++ b/src/linux/alpha/get_syscall_args.c
diff --git a/linux/alpha/get_syscall_result.c b/src/linux/alpha/get_syscall_result.c
index 85fef4f94..85fef4f94 100644
--- a/linux/alpha/get_syscall_result.c
+++ b/src/linux/alpha/get_syscall_result.c
diff --git a/linux/alpha/ioctls_arch0.h b/src/linux/alpha/ioctls_arch0.h
index 39f87ce86..39f87ce86 100644
--- a/linux/alpha/ioctls_arch0.h
+++ b/src/linux/alpha/ioctls_arch0.h
diff --git a/linux/alpha/ioctls_inc0.h b/src/linux/alpha/ioctls_inc0.h
index f9939faa4..f9939faa4 100644
--- a/linux/alpha/ioctls_inc0.h
+++ b/src/linux/alpha/ioctls_inc0.h
diff --git a/linux/alpha/raw_syscall.h b/src/linux/alpha/raw_syscall.h
index f44dd27f8..f44dd27f8 100644
--- a/linux/alpha/raw_syscall.h
+++ b/src/linux/alpha/raw_syscall.h
diff --git a/linux/alpha/set_error.c b/src/linux/alpha/set_error.c
index 2136e994a..2136e994a 100644
--- a/linux/alpha/set_error.c
+++ b/src/linux/alpha/set_error.c
diff --git a/linux/alpha/set_scno.c b/src/linux/alpha/set_scno.c
index 09059a38e..09059a38e 100644
--- a/linux/alpha/set_scno.c
+++ b/src/linux/alpha/set_scno.c
diff --git a/linux/alpha/signalent.h b/src/linux/alpha/signalent.h
index f086a42a4..f086a42a4 100644
--- a/linux/alpha/signalent.h
+++ b/src/linux/alpha/signalent.h
diff --git a/linux/alpha/syscallent.h b/src/linux/alpha/syscallent.h
index 235e52ec5..235e52ec5 100644
--- a/linux/alpha/syscallent.h
+++ b/src/linux/alpha/syscallent.h
diff --git a/linux/alpha/userent.h b/src/linux/alpha/userent.h
index fa5240f3a..fa5240f3a 100644
--- a/linux/alpha/userent.h
+++ b/src/linux/alpha/userent.h
diff --git a/linux/arc/arch_regs.c b/src/linux/arc/arch_regs.c
index ee11f21b1..ee11f21b1 100644
--- a/linux/arc/arch_regs.c
+++ b/src/linux/arc/arch_regs.c
diff --git a/linux/arc/get_error.c b/src/linux/arc/get_error.c
index 791a0aabd..791a0aabd 100644
--- a/linux/arc/get_error.c
+++ b/src/linux/arc/get_error.c
diff --git a/linux/arc/get_scno.c b/src/linux/arc/get_scno.c
index 4d9a93e60..4d9a93e60 100644
--- a/linux/arc/get_scno.c
+++ b/src/linux/arc/get_scno.c
diff --git a/linux/arc/get_syscall_args.c b/src/linux/arc/get_syscall_args.c
index 94b886ea2..94b886ea2 100644
--- a/linux/arc/get_syscall_args.c
+++ b/src/linux/arc/get_syscall_args.c
diff --git a/linux/arc/ioctls_arch0.h b/src/linux/arc/ioctls_arch0.h
index 2103d5b0f..2103d5b0f 100644
--- a/linux/arc/ioctls_arch0.h
+++ b/src/linux/arc/ioctls_arch0.h
diff --git a/linux/arc/ioctls_inc0.h b/src/linux/arc/ioctls_inc0.h
index 4aecf983e..4aecf983e 100644
--- a/linux/arc/ioctls_inc0.h
+++ b/src/linux/arc/ioctls_inc0.h
diff --git a/linux/arc/raw_syscall.h b/src/linux/arc/raw_syscall.h
index f51c84ecd..f51c84ecd 100644
--- a/linux/arc/raw_syscall.h
+++ b/src/linux/arc/raw_syscall.h
diff --git a/linux/arc/set_error.c b/src/linux/arc/set_error.c
index 546362e43..546362e43 100644
--- a/linux/arc/set_error.c
+++ b/src/linux/arc/set_error.c
diff --git a/linux/arc/set_scno.c b/src/linux/arc/set_scno.c
index 9433655a6..9433655a6 100644
--- a/linux/arc/set_scno.c
+++ b/src/linux/arc/set_scno.c
diff --git a/linux/arc/syscallent.h b/src/linux/arc/syscallent.h
index aed2e55a6..aed2e55a6 100644
--- a/linux/arc/syscallent.h
+++ b/src/linux/arc/syscallent.h
diff --git a/linux/arch_defs_.h b/src/linux/arch_defs_.h
index eb2f97eb9..eb2f97eb9 100644
--- a/linux/arch_defs_.h
+++ b/src/linux/arch_defs_.h
diff --git a/linux/arch_kvm.c b/src/linux/arch_kvm.c
index c7ae7b7be..c7ae7b7be 100644
--- a/linux/arch_kvm.c
+++ b/src/linux/arch_kvm.c
diff --git a/linux/arch_regs.h b/src/linux/arch_regs.h
index da84fa5f6..da84fa5f6 100644
--- a/linux/arch_regs.h
+++ b/src/linux/arch_regs.h
diff --git a/linux/arch_rt_sigframe.c b/src/linux/arch_rt_sigframe.c
index 24c3c0fcf..24c3c0fcf 100644
--- a/linux/arch_rt_sigframe.c
+++ b/src/linux/arch_rt_sigframe.c
diff --git a/linux/arch_sigreturn.c b/src/linux/arch_sigreturn.c
index 318901a9b..318901a9b 100644
--- a/linux/arch_sigreturn.c
+++ b/src/linux/arch_sigreturn.c
diff --git a/linux/arm/arch_defs_.h b/src/linux/arm/arch_defs_.h
index 0b2f3b0d6..0b2f3b0d6 100644
--- a/linux/arm/arch_defs_.h
+++ b/src/linux/arm/arch_defs_.h
diff --git a/linux/arm/arch_regs.c b/src/linux/arm/arch_regs.c
index bc453bb79..bc453bb79 100644
--- a/linux/arm/arch_regs.c
+++ b/src/linux/arm/arch_regs.c
diff --git a/linux/arm/arch_sigreturn.c b/src/linux/arm/arch_sigreturn.c
index 3b1ee64ac..3b1ee64ac 100644
--- a/linux/arm/arch_sigreturn.c
+++ b/src/linux/arm/arch_sigreturn.c
diff --git a/linux/arm/get_error.c b/src/linux/arm/get_error.c
index df0571c9e..df0571c9e 100644
--- a/linux/arm/get_error.c
+++ b/src/linux/arm/get_error.c
diff --git a/linux/arm/get_scno.c b/src/linux/arm/get_scno.c
index fde0f83c9..fde0f83c9 100644
--- a/linux/arm/get_scno.c
+++ b/src/linux/arm/get_scno.c
diff --git a/linux/arm/get_syscall_args.c b/src/linux/arm/get_syscall_args.c
index bc8e9c4ab..bc8e9c4ab 100644
--- a/linux/arm/get_syscall_args.c
+++ b/src/linux/arm/get_syscall_args.c
diff --git a/linux/arm/ioctls_arch0.h b/src/linux/arm/ioctls_arch0.h
index 35d9ce8c0..35d9ce8c0 100644
--- a/linux/arm/ioctls_arch0.h
+++ b/src/linux/arm/ioctls_arch0.h
diff --git a/linux/arm/ioctls_inc0.h b/src/linux/arm/ioctls_inc0.h
index 4aecf983e..4aecf983e 100644
--- a/linux/arm/ioctls_inc0.h
+++ b/src/linux/arm/ioctls_inc0.h
diff --git a/linux/arm/nr_prefix.c b/src/linux/arm/nr_prefix.c
index bbbcf80b3..bbbcf80b3 100644
--- a/linux/arm/nr_prefix.c
+++ b/src/linux/arm/nr_prefix.c
diff --git a/linux/arm/raw_syscall.h b/src/linux/arm/raw_syscall.h
index c052a2983..c052a2983 100644
--- a/linux/arm/raw_syscall.h
+++ b/src/linux/arm/raw_syscall.h
diff --git a/linux/arm/set_error.c b/src/linux/arm/set_error.c
index 8b754dca1..8b754dca1 100644
--- a/linux/arm/set_error.c
+++ b/src/linux/arm/set_error.c
diff --git a/linux/arm/set_scno.c b/src/linux/arm/set_scno.c
index 0c4de440a..0c4de440a 100644
--- a/linux/arm/set_scno.c
+++ b/src/linux/arm/set_scno.c
diff --git a/linux/arm/shuffle_scno.c b/src/linux/arm/shuffle_scno.c
index 68199cfcb..68199cfcb 100644
--- a/linux/arm/shuffle_scno.c
+++ b/src/linux/arm/shuffle_scno.c
diff --git a/linux/arm/syscallent.h b/src/linux/arm/syscallent.h
index b6b105de2..b6b105de2 100644
--- a/linux/arm/syscallent.h
+++ b/src/linux/arm/syscallent.h
diff --git a/linux/arm/userent.h b/src/linux/arm/userent.h
index a3555def6..a3555def6 100644
--- a/linux/arm/userent.h
+++ b/src/linux/arm/userent.h
diff --git a/linux/asm_stat.h b/src/linux/asm_stat.h
index b3510a5d1..b3510a5d1 100644
--- a/linux/asm_stat.h
+++ b/src/linux/asm_stat.h
diff --git a/linux/avr32/arch_regs.c b/src/linux/avr32/arch_regs.c
index f3d60dac3..f3d60dac3 100644
--- a/linux/avr32/arch_regs.c
+++ b/src/linux/avr32/arch_regs.c
diff --git a/linux/avr32/get_error.c b/src/linux/avr32/get_error.c
index bd1013f15..bd1013f15 100644
--- a/linux/avr32/get_error.c
+++ b/src/linux/avr32/get_error.c
diff --git a/linux/avr32/get_scno.c b/src/linux/avr32/get_scno.c
index 22ace6f4d..22ace6f4d 100644
--- a/linux/avr32/get_scno.c
+++ b/src/linux/avr32/get_scno.c
diff --git a/linux/avr32/get_syscall_args.c b/src/linux/avr32/get_syscall_args.c
index 796b68a88..796b68a88 100644
--- a/linux/avr32/get_syscall_args.c
+++ b/src/linux/avr32/get_syscall_args.c
diff --git a/linux/avr32/ioctls_arch0.h b/src/linux/avr32/ioctls_arch0.h
index 96538c704..96538c704 100644
--- a/linux/avr32/ioctls_arch0.h
+++ b/src/linux/avr32/ioctls_arch0.h
diff --git a/linux/avr32/ioctls_inc0.h b/src/linux/avr32/ioctls_inc0.h
index 4aecf983e..4aecf983e 100644
--- a/linux/avr32/ioctls_inc0.h
+++ b/src/linux/avr32/ioctls_inc0.h
diff --git a/linux/avr32/raw_syscall.h b/src/linux/avr32/raw_syscall.h
index 518adb117..518adb117 100644
--- a/linux/avr32/raw_syscall.h
+++ b/src/linux/avr32/raw_syscall.h
diff --git a/linux/avr32/set_error.c b/src/linux/avr32/set_error.c
index 5b7137c79..5b7137c79 100644
--- a/linux/avr32/set_error.c
+++ b/src/linux/avr32/set_error.c
diff --git a/linux/avr32/set_scno.c b/src/linux/avr32/set_scno.c
index 77dd9477a..77dd9477a 100644
--- a/linux/avr32/set_scno.c
+++ b/src/linux/avr32/set_scno.c
diff --git a/linux/avr32/syscallent.h b/src/linux/avr32/syscallent.h
index a58edda73..a58edda73 100644
--- a/linux/avr32/syscallent.h
+++ b/src/linux/avr32/syscallent.h
diff --git a/linux/avr32/userent.h b/src/linux/avr32/userent.h
index b1b52fe5d..b1b52fe5d 100644
--- a/linux/avr32/userent.h
+++ b/src/linux/avr32/userent.h
diff --git a/linux/bfin/arch_defs_.h b/src/linux/bfin/arch_defs_.h
index 309d8e7e0..309d8e7e0 100644
--- a/linux/bfin/arch_defs_.h
+++ b/src/linux/bfin/arch_defs_.h
diff --git a/linux/bfin/arch_regs.c b/src/linux/bfin/arch_regs.c
index 426e589c2..426e589c2 100644
--- a/linux/bfin/arch_regs.c
+++ b/src/linux/bfin/arch_regs.c
diff --git a/linux/bfin/get_error.c b/src/linux/bfin/get_error.c
index 2d1059a1c..2d1059a1c 100644
--- a/linux/bfin/get_error.c
+++ b/src/linux/bfin/get_error.c
diff --git a/linux/bfin/get_scno.c b/src/linux/bfin/get_scno.c
index 6968e4806..6968e4806 100644
--- a/linux/bfin/get_scno.c
+++ b/src/linux/bfin/get_scno.c
diff --git a/linux/bfin/get_syscall_args.c b/src/linux/bfin/get_syscall_args.c
index c0eb7a5b4..c0eb7a5b4 100644
--- a/linux/bfin/get_syscall_args.c
+++ b/src/linux/bfin/get_syscall_args.c
diff --git a/linux/bfin/get_syscall_result.c b/src/linux/bfin/get_syscall_result.c
index 923542f94..923542f94 100644
--- a/linux/bfin/get_syscall_result.c
+++ b/src/linux/bfin/get_syscall_result.c
diff --git a/linux/bfin/ioctls_arch0.h b/src/linux/bfin/ioctls_arch0.h
index 7d9804d6f..7d9804d6f 100644
--- a/linux/bfin/ioctls_arch0.h
+++ b/src/linux/bfin/ioctls_arch0.h
diff --git a/linux/bfin/ioctls_inc0.h b/src/linux/bfin/ioctls_inc0.h
index 4aecf983e..4aecf983e 100644
--- a/linux/bfin/ioctls_inc0.h
+++ b/src/linux/bfin/ioctls_inc0.h
diff --git a/linux/bfin/raw_syscall.h b/src/linux/bfin/raw_syscall.h
index 8ac705cc7..8ac705cc7 100644
--- a/linux/bfin/raw_syscall.h
+++ b/src/linux/bfin/raw_syscall.h
diff --git a/linux/bfin/rt_sigframe.h b/src/linux/bfin/rt_sigframe.h
index b375272d9..b375272d9 100644
--- a/linux/bfin/rt_sigframe.h
+++ b/src/linux/bfin/rt_sigframe.h
diff --git a/linux/bfin/set_error.c b/src/linux/bfin/set_error.c
index c39cde27a..c39cde27a 100644
--- a/linux/bfin/set_error.c
+++ b/src/linux/bfin/set_error.c
diff --git a/linux/bfin/set_scno.c b/src/linux/bfin/set_scno.c
index 00a325b45..00a325b45 100644
--- a/linux/bfin/set_scno.c
+++ b/src/linux/bfin/set_scno.c
diff --git a/linux/bfin/syscallent.h b/src/linux/bfin/syscallent.h
index 53d5c235d..53d5c235d 100644
--- a/linux/bfin/syscallent.h
+++ b/src/linux/bfin/syscallent.h
diff --git a/linux/bfin/userent.h b/src/linux/bfin/userent.h
index a35ba9fd4..a35ba9fd4 100644
--- a/linux/bfin/userent.h
+++ b/src/linux/bfin/userent.h
diff --git a/linux/check_scno.c b/src/linux/check_scno.c
index acadab257..acadab257 100644
--- a/linux/check_scno.c
+++ b/src/linux/check_scno.c
diff --git a/linux/csky/arch_regs.c b/src/linux/csky/arch_regs.c
index 3caed7b1b..3caed7b1b 100644
--- a/linux/csky/arch_regs.c
+++ b/src/linux/csky/arch_regs.c
diff --git a/linux/csky/get_error.c b/src/linux/csky/get_error.c
index c21a92486..c21a92486 100644
--- a/linux/csky/get_error.c
+++ b/src/linux/csky/get_error.c
diff --git a/linux/csky/get_scno.c b/src/linux/csky/get_scno.c
index bfc8619f8..bfc8619f8 100644
--- a/linux/csky/get_scno.c
+++ b/src/linux/csky/get_scno.c
diff --git a/linux/csky/get_syscall_args.c b/src/linux/csky/get_syscall_args.c
index 05dbfb4f1..05dbfb4f1 100644
--- a/linux/csky/get_syscall_args.c
+++ b/src/linux/csky/get_syscall_args.c
diff --git a/linux/csky/ioctls_arch0.h b/src/linux/csky/ioctls_arch0.h
index 8b7ac89b3..8b7ac89b3 100644
--- a/linux/csky/ioctls_arch0.h
+++ b/src/linux/csky/ioctls_arch0.h
diff --git a/linux/csky/ioctls_inc0.h b/src/linux/csky/ioctls_inc0.h
index 4aecf983e..4aecf983e 100644
--- a/linux/csky/ioctls_inc0.h
+++ b/src/linux/csky/ioctls_inc0.h
diff --git a/linux/csky/raw_syscall.h b/src/linux/csky/raw_syscall.h
index 0ffb83ca2..0ffb83ca2 100644
--- a/linux/csky/raw_syscall.h
+++ b/src/linux/csky/raw_syscall.h
diff --git a/linux/csky/set_error.c b/src/linux/csky/set_error.c
index f8cb6333c..f8cb6333c 100644
--- a/linux/csky/set_error.c
+++ b/src/linux/csky/set_error.c
diff --git a/linux/csky/set_scno.c b/src/linux/csky/set_scno.c
index 88870e524..88870e524 100644
--- a/linux/csky/set_scno.c
+++ b/src/linux/csky/set_scno.c
diff --git a/linux/csky/syscallent.h b/src/linux/csky/syscallent.h
index 33e3e73fc..33e3e73fc 100644
--- a/linux/csky/syscallent.h
+++ b/src/linux/csky/syscallent.h
diff --git a/linux/dummy.h b/src/linux/dummy.h
index 61047190b..61047190b 100644
--- a/linux/dummy.h
+++ b/src/linux/dummy.h
diff --git a/linux/errnoent.h b/src/linux/errnoent.h
index 1b1dbbed9..1b1dbbed9 100644
--- a/linux/errnoent.h
+++ b/src/linux/errnoent.h
diff --git a/linux/getregs_old.h b/src/linux/getregs_old.h
index 5c73c9f93..5c73c9f93 100644
--- a/linux/getregs_old.h
+++ b/src/linux/getregs_old.h
diff --git a/linux/hppa/arch_defs_.h b/src/linux/hppa/arch_defs_.h
index 1bc3590b9..1bc3590b9 100644
--- a/linux/hppa/arch_defs_.h
+++ b/src/linux/hppa/arch_defs_.h
diff --git a/linux/hppa/arch_regs.c b/src/linux/hppa/arch_regs.c
index ec09f9c78..ec09f9c78 100644
--- a/linux/hppa/arch_regs.c
+++ b/src/linux/hppa/arch_regs.c
diff --git a/linux/hppa/arch_rt_sigframe.c b/src/linux/hppa/arch_rt_sigframe.c
index ecaaef608..ecaaef608 100644
--- a/linux/hppa/arch_rt_sigframe.c
+++ b/src/linux/hppa/arch_rt_sigframe.c
diff --git a/linux/hppa/errnoent.h b/src/linux/hppa/errnoent.h
index 3c8b06fd6..3c8b06fd6 100644
--- a/linux/hppa/errnoent.h
+++ b/src/linux/hppa/errnoent.h
diff --git a/linux/hppa/get_error.c b/src/linux/hppa/get_error.c
index a3721797f..a3721797f 100644
--- a/linux/hppa/get_error.c
+++ b/src/linux/hppa/get_error.c
diff --git a/linux/hppa/get_scno.c b/src/linux/hppa/get_scno.c
index d20c8011a..d20c8011a 100644
--- a/linux/hppa/get_scno.c
+++ b/src/linux/hppa/get_scno.c
diff --git a/linux/hppa/get_syscall_args.c b/src/linux/hppa/get_syscall_args.c
index 7ed762fd4..7ed762fd4 100644
--- a/linux/hppa/get_syscall_args.c
+++ b/src/linux/hppa/get_syscall_args.c
diff --git a/linux/hppa/ioctls_arch0.h b/src/linux/hppa/ioctls_arch0.h
index b13386bb3..b13386bb3 100644
--- a/linux/hppa/ioctls_arch0.h
+++ b/src/linux/hppa/ioctls_arch0.h
diff --git a/linux/hppa/ioctls_inc0.h b/src/linux/hppa/ioctls_inc0.h
index 4aecf983e..4aecf983e 100644
--- a/linux/hppa/ioctls_inc0.h
+++ b/src/linux/hppa/ioctls_inc0.h
diff --git a/linux/hppa/raw_syscall.h b/src/linux/hppa/raw_syscall.h
index 82a4de944..82a4de944 100644
--- a/linux/hppa/raw_syscall.h
+++ b/src/linux/hppa/raw_syscall.h
diff --git a/linux/hppa/rt_sigframe.h b/src/linux/hppa/rt_sigframe.h
index acc0381c0..acc0381c0 100644
--- a/linux/hppa/rt_sigframe.h
+++ b/src/linux/hppa/rt_sigframe.h
diff --git a/linux/hppa/set_error.c b/src/linux/hppa/set_error.c
index a61c576d1..a61c576d1 100644
--- a/linux/hppa/set_error.c
+++ b/src/linux/hppa/set_error.c
diff --git a/linux/hppa/set_scno.c b/src/linux/hppa/set_scno.c
index 8553352cb..8553352cb 100644
--- a/linux/hppa/set_scno.c
+++ b/src/linux/hppa/set_scno.c
diff --git a/linux/hppa/signalent.h b/src/linux/hppa/signalent.h
index 7f38ee499..7f38ee499 100644
--- a/linux/hppa/signalent.h
+++ b/src/linux/hppa/signalent.h
diff --git a/linux/hppa/syscallent.h b/src/linux/hppa/syscallent.h
index 0c5887f2c..0c5887f2c 100644
--- a/linux/hppa/syscallent.h
+++ b/src/linux/hppa/syscallent.h
diff --git a/linux/hppa/userent.h b/src/linux/hppa/userent.h
index 454b95a4d..454b95a4d 100644
--- a/linux/hppa/userent.h
+++ b/src/linux/hppa/userent.h
diff --git a/linux/i386/arch_defs_.h b/src/linux/i386/arch_defs_.h
index 0b2f3b0d6..0b2f3b0d6 100644
--- a/linux/i386/arch_defs_.h
+++ b/src/linux/i386/arch_defs_.h
diff --git a/linux/i386/arch_kvm.c b/src/linux/i386/arch_kvm.c
index e8e982ee9..e8e982ee9 100644
--- a/linux/i386/arch_kvm.c
+++ b/src/linux/i386/arch_kvm.c
diff --git a/linux/i386/arch_regs.c b/src/linux/i386/arch_regs.c
index fac427441..fac427441 100644
--- a/linux/i386/arch_regs.c
+++ b/src/linux/i386/arch_regs.c
diff --git a/linux/i386/arch_rt_sigframe.c b/src/linux/i386/arch_rt_sigframe.c
index 1172e602b..1172e602b 100644
--- a/linux/i386/arch_rt_sigframe.c
+++ b/src/linux/i386/arch_rt_sigframe.c
diff --git a/linux/i386/arch_sigreturn.c b/src/linux/i386/arch_sigreturn.c
index f9c4a2878..f9c4a2878 100644
--- a/linux/i386/arch_sigreturn.c
+++ b/src/linux/i386/arch_sigreturn.c
diff --git a/linux/i386/get_error.c b/src/linux/i386/get_error.c
index c5e95c170..c5e95c170 100644
--- a/linux/i386/get_error.c
+++ b/src/linux/i386/get_error.c
diff --git a/linux/i386/get_scno.c b/src/linux/i386/get_scno.c
index 980952f35..980952f35 100644
--- a/linux/i386/get_scno.c
+++ b/src/linux/i386/get_scno.c
diff --git a/linux/i386/get_syscall_args.c b/src/linux/i386/get_syscall_args.c
index c048285a5..c048285a5 100644
--- a/linux/i386/get_syscall_args.c
+++ b/src/linux/i386/get_syscall_args.c
diff --git a/linux/i386/ioctls_arch0.h b/src/linux/i386/ioctls_arch0.h
index eaf140adc..eaf140adc 100644
--- a/linux/i386/ioctls_arch0.h
+++ b/src/linux/i386/ioctls_arch0.h
diff --git a/linux/i386/ioctls_inc0.h b/src/linux/i386/ioctls_inc0.h
index 4aecf983e..4aecf983e 100644
--- a/linux/i386/ioctls_inc0.h
+++ b/src/linux/i386/ioctls_inc0.h
diff --git a/linux/i386/raw_syscall.h b/src/linux/i386/raw_syscall.h
index 71160397d..71160397d 100644
--- a/linux/i386/raw_syscall.h
+++ b/src/linux/i386/raw_syscall.h
diff --git a/linux/i386/rt_sigframe.h b/src/linux/i386/rt_sigframe.h
index 0d14e2260..0d14e2260 100644
--- a/linux/i386/rt_sigframe.h
+++ b/src/linux/i386/rt_sigframe.h
diff --git a/linux/i386/set_error.c b/src/linux/i386/set_error.c
index 07861ac31..07861ac31 100644
--- a/linux/i386/set_error.c
+++ b/src/linux/i386/set_error.c
diff --git a/linux/i386/set_scno.c b/src/linux/i386/set_scno.c
index fcff8aeba..fcff8aeba 100644
--- a/linux/i386/set_scno.c
+++ b/src/linux/i386/set_scno.c
diff --git a/linux/i386/syscallent.h b/src/linux/i386/syscallent.h
index be41734a0..be41734a0 100644
--- a/linux/i386/syscallent.h
+++ b/src/linux/i386/syscallent.h
diff --git a/linux/i386/userent.h b/src/linux/i386/userent.h
index bdbefd8c8..bdbefd8c8 100644
--- a/linux/i386/userent.h
+++ b/src/linux/i386/userent.h
diff --git a/linux/i386/userent0.h b/src/linux/i386/userent0.h
index da7d4440e..da7d4440e 100644
--- a/linux/i386/userent0.h
+++ b/src/linux/i386/userent0.h
diff --git a/linux/ia64/arch_defs_.h b/src/linux/ia64/arch_defs_.h
index 107a74df2..107a74df2 100644
--- a/linux/ia64/arch_defs_.h
+++ b/src/linux/ia64/arch_defs_.h
diff --git a/linux/ia64/arch_getrval2.c b/src/linux/ia64/arch_getrval2.c
index c518b607c..c518b607c 100644
--- a/linux/ia64/arch_getrval2.c
+++ b/src/linux/ia64/arch_getrval2.c
diff --git a/linux/ia64/arch_regs.c b/src/linux/ia64/arch_regs.c
index 9d539da5a..9d539da5a 100644
--- a/linux/ia64/arch_regs.c
+++ b/src/linux/ia64/arch_regs.c
diff --git a/linux/ia64/arch_regs.h b/src/linux/ia64/arch_regs.h
index 2dcdc4148..2dcdc4148 100644
--- a/linux/ia64/arch_regs.h
+++ b/src/linux/ia64/arch_regs.h
diff --git a/linux/ia64/arch_rt_sigframe.c b/src/linux/ia64/arch_rt_sigframe.c
index 5a36d2024..5a36d2024 100644
--- a/linux/ia64/arch_rt_sigframe.c
+++ b/src/linux/ia64/arch_rt_sigframe.c
diff --git a/linux/ia64/get_error.c b/src/linux/ia64/get_error.c
index ce196bce1..ce196bce1 100644
--- a/linux/ia64/get_error.c
+++ b/src/linux/ia64/get_error.c
diff --git a/linux/ia64/get_scno.c b/src/linux/ia64/get_scno.c
index 6aba4097b..6aba4097b 100644
--- a/linux/ia64/get_scno.c
+++ b/src/linux/ia64/get_scno.c
diff --git a/linux/ia64/get_syscall_args.c b/src/linux/ia64/get_syscall_args.c
index 83a933eb5..83a933eb5 100644
--- a/linux/ia64/get_syscall_args.c
+++ b/src/linux/ia64/get_syscall_args.c
diff --git a/linux/ia64/ioctls_arch0.h b/src/linux/ia64/ioctls_arch0.h
index 455b9dee6..455b9dee6 100644
--- a/linux/ia64/ioctls_arch0.h
+++ b/src/linux/ia64/ioctls_arch0.h
diff --git a/linux/ia64/ioctls_inc0.h b/src/linux/ia64/ioctls_inc0.h
index f9939faa4..f9939faa4 100644
--- a/linux/ia64/ioctls_inc0.h
+++ b/src/linux/ia64/ioctls_inc0.h
diff --git a/linux/ia64/raw_syscall.h b/src/linux/ia64/raw_syscall.h
index 1e1f540fe..1e1f540fe 100644
--- a/linux/ia64/raw_syscall.h
+++ b/src/linux/ia64/raw_syscall.h
diff --git a/linux/ia64/rt_sigframe.h b/src/linux/ia64/rt_sigframe.h
index 15c0ea60d..15c0ea60d 100644
--- a/linux/ia64/rt_sigframe.h
+++ b/src/linux/ia64/rt_sigframe.h
diff --git a/linux/ia64/set_error.c b/src/linux/ia64/set_error.c
index b27154e13..b27154e13 100644
--- a/linux/ia64/set_error.c
+++ b/src/linux/ia64/set_error.c
diff --git a/linux/ia64/set_scno.c b/src/linux/ia64/set_scno.c
index c68c4cd8f..c68c4cd8f 100644
--- a/linux/ia64/set_scno.c
+++ b/src/linux/ia64/set_scno.c
diff --git a/linux/ia64/shuffle_scno.c b/src/linux/ia64/shuffle_scno.c
index 6bac3a8b7..6bac3a8b7 100644
--- a/linux/ia64/shuffle_scno.c
+++ b/src/linux/ia64/shuffle_scno.c
diff --git a/linux/ia64/syscallent.h b/src/linux/ia64/syscallent.h
index 7affb9730..7affb9730 100644
--- a/linux/ia64/syscallent.h
+++ b/src/linux/ia64/syscallent.h
diff --git a/linux/ia64/syscallent_base_nr.h b/src/linux/ia64/syscallent_base_nr.h
index 612668ec8..612668ec8 100644
--- a/linux/ia64/syscallent_base_nr.h
+++ b/src/linux/ia64/syscallent_base_nr.h
diff --git a/linux/ia64/userent.h b/src/linux/ia64/userent.h
index f6f637243..f6f637243 100644
--- a/linux/ia64/userent.h
+++ b/src/linux/ia64/userent.h
diff --git a/linux/inet_diag.h b/src/linux/inet_diag.h
index e21b92770..e21b92770 100644
--- a/linux/inet_diag.h
+++ b/src/linux/inet_diag.h
diff --git a/linux/m68k/arch_defs_.h b/src/linux/m68k/arch_defs_.h
index 1a8da94f6..1a8da94f6 100644
--- a/linux/m68k/arch_defs_.h
+++ b/src/linux/m68k/arch_defs_.h
diff --git a/linux/m68k/arch_regs.c b/src/linux/m68k/arch_regs.c
index 13b82eb09..13b82eb09 100644
--- a/linux/m68k/arch_regs.c
+++ b/src/linux/m68k/arch_regs.c
diff --git a/linux/m68k/arch_rt_sigframe.c b/src/linux/m68k/arch_rt_sigframe.c
index bb60b44d4..bb60b44d4 100644
--- a/linux/m68k/arch_rt_sigframe.c
+++ b/src/linux/m68k/arch_rt_sigframe.c
diff --git a/linux/m68k/arch_sigreturn.c b/src/linux/m68k/arch_sigreturn.c
index cfdaaf226..cfdaaf226 100644
--- a/linux/m68k/arch_sigreturn.c
+++ b/src/linux/m68k/arch_sigreturn.c
diff --git a/linux/m68k/get_error.c b/src/linux/m68k/get_error.c
index 9af044783..9af044783 100644
--- a/linux/m68k/get_error.c
+++ b/src/linux/m68k/get_error.c
diff --git a/linux/m68k/get_scno.c b/src/linux/m68k/get_scno.c
index 41db19c56..41db19c56 100644
--- a/linux/m68k/get_scno.c
+++ b/src/linux/m68k/get_scno.c
diff --git a/linux/m68k/get_syscall_args.c b/src/linux/m68k/get_syscall_args.c
index f2657b375..f2657b375 100644
--- a/linux/m68k/get_syscall_args.c
+++ b/src/linux/m68k/get_syscall_args.c
diff --git a/linux/m68k/ioctls_arch0.h b/src/linux/m68k/ioctls_arch0.h
index c8636ab23..c8636ab23 100644
--- a/linux/m68k/ioctls_arch0.h
+++ b/src/linux/m68k/ioctls_arch0.h
diff --git a/linux/m68k/ioctls_inc0.h b/src/linux/m68k/ioctls_inc0.h
index 4aecf983e..4aecf983e 100644
--- a/linux/m68k/ioctls_inc0.h
+++ b/src/linux/m68k/ioctls_inc0.h
diff --git a/linux/m68k/raw_syscall.h b/src/linux/m68k/raw_syscall.h
index 345bc7672..345bc7672 100644
--- a/linux/m68k/raw_syscall.h
+++ b/src/linux/m68k/raw_syscall.h
diff --git a/linux/m68k/rt_sigframe.h b/src/linux/m68k/rt_sigframe.h
index 5d6ff22f5..5d6ff22f5 100644
--- a/linux/m68k/rt_sigframe.h
+++ b/src/linux/m68k/rt_sigframe.h
diff --git a/linux/m68k/set_error.c b/src/linux/m68k/set_error.c
index bf01eef76..bf01eef76 100644
--- a/linux/m68k/set_error.c
+++ b/src/linux/m68k/set_error.c
diff --git a/linux/m68k/set_scno.c b/src/linux/m68k/set_scno.c
index 05af3dee0..05af3dee0 100644
--- a/linux/m68k/set_scno.c
+++ b/src/linux/m68k/set_scno.c
diff --git a/linux/m68k/syscallent.h b/src/linux/m68k/syscallent.h
index d4e50c72b..d4e50c72b 100644
--- a/linux/m68k/syscallent.h
+++ b/src/linux/m68k/syscallent.h
diff --git a/linux/m68k/userent.h b/src/linux/m68k/userent.h
index ba14c11ab..ba14c11ab 100644
--- a/linux/m68k/userent.h
+++ b/src/linux/m68k/userent.h
diff --git a/linux/metag/arch_regs.c b/src/linux/metag/arch_regs.c
index 67ee70fe9..67ee70fe9 100644
--- a/linux/metag/arch_regs.c
+++ b/src/linux/metag/arch_regs.c
diff --git a/linux/metag/arch_rt_sigframe.c b/src/linux/metag/arch_rt_sigframe.c
index 13f95f608..13f95f608 100644
--- a/linux/metag/arch_rt_sigframe.c
+++ b/src/linux/metag/arch_rt_sigframe.c
diff --git a/linux/metag/get_error.c b/src/linux/metag/get_error.c
index b1e1649c3..b1e1649c3 100644
--- a/linux/metag/get_error.c
+++ b/src/linux/metag/get_error.c
diff --git a/linux/metag/get_scno.c b/src/linux/metag/get_scno.c
index e7b83e285..e7b83e285 100644
--- a/linux/metag/get_scno.c
+++ b/src/linux/metag/get_scno.c
diff --git a/linux/metag/get_syscall_args.c b/src/linux/metag/get_syscall_args.c
index 7f3c5cf2c..7f3c5cf2c 100644
--- a/linux/metag/get_syscall_args.c
+++ b/src/linux/metag/get_syscall_args.c
diff --git a/linux/metag/ioctls_arch0.h b/src/linux/metag/ioctls_arch0.h
index 191bb36ec..191bb36ec 100644
--- a/linux/metag/ioctls_arch0.h
+++ b/src/linux/metag/ioctls_arch0.h
diff --git a/linux/metag/ioctls_inc0.h b/src/linux/metag/ioctls_inc0.h
index 4aecf983e..4aecf983e 100644
--- a/linux/metag/ioctls_inc0.h
+++ b/src/linux/metag/ioctls_inc0.h
diff --git a/linux/metag/raw_syscall.h b/src/linux/metag/raw_syscall.h
index f8d12d5fc..f8d12d5fc 100644
--- a/linux/metag/raw_syscall.h
+++ b/src/linux/metag/raw_syscall.h
diff --git a/linux/metag/set_error.c b/src/linux/metag/set_error.c
index 18e42dd40..18e42dd40 100644
--- a/linux/metag/set_error.c
+++ b/src/linux/metag/set_error.c
diff --git a/linux/metag/set_scno.c b/src/linux/metag/set_scno.c
index ae8f52dc3..ae8f52dc3 100644
--- a/linux/metag/set_scno.c
+++ b/src/linux/metag/set_scno.c
diff --git a/linux/metag/syscallent.h b/src/linux/metag/syscallent.h
index f305974e6..f305974e6 100644
--- a/linux/metag/syscallent.h
+++ b/src/linux/metag/syscallent.h
diff --git a/linux/microblaze/arch_defs_.h b/src/linux/microblaze/arch_defs_.h
index 309d8e7e0..309d8e7e0 100644
--- a/linux/microblaze/arch_defs_.h
+++ b/src/linux/microblaze/arch_defs_.h
diff --git a/linux/microblaze/arch_regs.c b/src/linux/microblaze/arch_regs.c
index 4faf93764..4faf93764 100644
--- a/linux/microblaze/arch_regs.c
+++ b/src/linux/microblaze/arch_regs.c
diff --git a/linux/microblaze/arch_sigreturn.c b/src/linux/microblaze/arch_sigreturn.c
index c15d1773b..c15d1773b 100644
--- a/linux/microblaze/arch_sigreturn.c
+++ b/src/linux/microblaze/arch_sigreturn.c
diff --git a/linux/microblaze/get_error.c b/src/linux/microblaze/get_error.c
index b7ad28dc9..b7ad28dc9 100644
--- a/linux/microblaze/get_error.c
+++ b/src/linux/microblaze/get_error.c
diff --git a/linux/microblaze/get_scno.c b/src/linux/microblaze/get_scno.c
index aaf2dcb34..aaf2dcb34 100644
--- a/linux/microblaze/get_scno.c
+++ b/src/linux/microblaze/get_scno.c
diff --git a/linux/microblaze/get_syscall_args.c b/src/linux/microblaze/get_syscall_args.c
index 0be850156..0be850156 100644
--- a/linux/microblaze/get_syscall_args.c
+++ b/src/linux/microblaze/get_syscall_args.c
diff --git a/linux/microblaze/get_syscall_result.c b/src/linux/microblaze/get_syscall_result.c
index 79f23ca49..79f23ca49 100644
--- a/linux/microblaze/get_syscall_result.c
+++ b/src/linux/microblaze/get_syscall_result.c
diff --git a/linux/microblaze/ioctls_arch0.h b/src/linux/microblaze/ioctls_arch0.h
index e310f8e7e..e310f8e7e 100644
--- a/linux/microblaze/ioctls_arch0.h
+++ b/src/linux/microblaze/ioctls_arch0.h
diff --git a/linux/microblaze/ioctls_inc0.h b/src/linux/microblaze/ioctls_inc0.h
index 4aecf983e..4aecf983e 100644
--- a/linux/microblaze/ioctls_inc0.h
+++ b/src/linux/microblaze/ioctls_inc0.h
diff --git a/linux/microblaze/raw_syscall.h b/src/linux/microblaze/raw_syscall.h
index fe47aa346..fe47aa346 100644
--- a/linux/microblaze/raw_syscall.h
+++ b/src/linux/microblaze/raw_syscall.h
diff --git a/linux/microblaze/set_error.c b/src/linux/microblaze/set_error.c
index 71b3fbc31..71b3fbc31 100644
--- a/linux/microblaze/set_error.c
+++ b/src/linux/microblaze/set_error.c
diff --git a/linux/microblaze/set_scno.c b/src/linux/microblaze/set_scno.c
index cf896cc20..cf896cc20 100644
--- a/linux/microblaze/set_scno.c
+++ b/src/linux/microblaze/set_scno.c
diff --git a/linux/microblaze/syscallent.h b/src/linux/microblaze/syscallent.h
index 6e557b300..6e557b300 100644
--- a/linux/microblaze/syscallent.h
+++ b/src/linux/microblaze/syscallent.h
diff --git a/linux/microblaze/userent.h b/src/linux/microblaze/userent.h
index d3b64880f..d3b64880f 100644
--- a/linux/microblaze/userent.h
+++ b/src/linux/microblaze/userent.h
diff --git a/linux/mips/.gitignore b/src/linux/mips/.gitignore
index ece2db345..ece2db345 100644
--- a/linux/mips/.gitignore
+++ b/src/linux/mips/.gitignore
diff --git a/linux/mips/arch_defs_.h b/src/linux/mips/arch_defs_.h
index f789e18d9..f789e18d9 100644
--- a/linux/mips/arch_defs_.h
+++ b/src/linux/mips/arch_defs_.h
diff --git a/linux/mips/arch_getrval2.c b/src/linux/mips/arch_getrval2.c
index 33b53ba2b..33b53ba2b 100644
--- a/linux/mips/arch_getrval2.c
+++ b/src/linux/mips/arch_getrval2.c
diff --git a/linux/mips/arch_regs.c b/src/linux/mips/arch_regs.c
index 0874e31ef..0874e31ef 100644
--- a/linux/mips/arch_regs.c
+++ b/src/linux/mips/arch_regs.c
diff --git a/linux/mips/arch_sigreturn.c b/src/linux/mips/arch_sigreturn.c
index 14546b95c..14546b95c 100644
--- a/linux/mips/arch_sigreturn.c
+++ b/src/linux/mips/arch_sigreturn.c
diff --git a/linux/mips/errnoent.h b/src/linux/mips/errnoent.h
index 6f0c16fb6..6f0c16fb6 100644
--- a/linux/mips/errnoent.h
+++ b/src/linux/mips/errnoent.h
diff --git a/linux/mips/genstub.sh b/src/linux/mips/genstub.sh
index 68775ba3a..68775ba3a 100755
--- a/linux/mips/genstub.sh
+++ b/src/linux/mips/genstub.sh
diff --git a/linux/mips/get_error.c b/src/linux/mips/get_error.c
index bcc219d59..bcc219d59 100644
--- a/linux/mips/get_error.c
+++ b/src/linux/mips/get_error.c
diff --git a/linux/mips/get_scno.c b/src/linux/mips/get_scno.c
index d9815f630..d9815f630 100644
--- a/linux/mips/get_scno.c
+++ b/src/linux/mips/get_scno.c
diff --git a/linux/mips/get_syscall_args.c b/src/linux/mips/get_syscall_args.c
index 96cd1ce1b..96cd1ce1b 100644
--- a/linux/mips/get_syscall_args.c
+++ b/src/linux/mips/get_syscall_args.c
diff --git a/linux/mips/ioctls_arch0.h b/src/linux/mips/ioctls_arch0.h
index 146c27bfb..146c27bfb 100644
--- a/linux/mips/ioctls_arch0.h
+++ b/src/linux/mips/ioctls_arch0.h
diff --git a/linux/mips/ioctls_inc0.h b/src/linux/mips/ioctls_inc0.h
index da4259efd..da4259efd 100644
--- a/linux/mips/ioctls_inc0.h
+++ b/src/linux/mips/ioctls_inc0.h
diff --git a/linux/mips/raw_syscall.h b/src/linux/mips/raw_syscall.h
index d1d33bc63..d1d33bc63 100644
--- a/linux/mips/raw_syscall.h
+++ b/src/linux/mips/raw_syscall.h
diff --git a/linux/mips/rt_sigframe.h b/src/linux/mips/rt_sigframe.h
index d8e3797bd..d8e3797bd 100644
--- a/linux/mips/rt_sigframe.h
+++ b/src/linux/mips/rt_sigframe.h
diff --git a/linux/mips/set_error.c b/src/linux/mips/set_error.c
index af019ae02..af019ae02 100644
--- a/linux/mips/set_error.c
+++ b/src/linux/mips/set_error.c
diff --git a/linux/mips/set_scno.c b/src/linux/mips/set_scno.c
index 66448cfee..66448cfee 100644
--- a/linux/mips/set_scno.c
+++ b/src/linux/mips/set_scno.c
diff --git a/linux/mips/signalent.h b/src/linux/mips/signalent.h
index c3caf2bb4..c3caf2bb4 100644
--- a/linux/mips/signalent.h
+++ b/src/linux/mips/signalent.h
diff --git a/linux/mips/syscallent-compat.h b/src/linux/mips/syscallent-compat.h
index 61ccfe4ed..61ccfe4ed 100644
--- a/linux/mips/syscallent-compat.h
+++ b/src/linux/mips/syscallent-compat.h
diff --git a/linux/mips/syscallent-n32.h b/src/linux/mips/syscallent-n32.h
index 9a23126ec..9a23126ec 100644
--- a/linux/mips/syscallent-n32.h
+++ b/src/linux/mips/syscallent-n32.h
diff --git a/linux/mips/syscallent-n64.h b/src/linux/mips/syscallent-n64.h
index ada21ba43..ada21ba43 100644
--- a/linux/mips/syscallent-n64.h
+++ b/src/linux/mips/syscallent-n64.h
diff --git a/linux/mips/syscallent-o32.h b/src/linux/mips/syscallent-o32.h
index f6954a9df..f6954a9df 100644
--- a/linux/mips/syscallent-o32.h
+++ b/src/linux/mips/syscallent-o32.h
diff --git a/linux/mips/syscallent.h b/src/linux/mips/syscallent.h
index 61430d215..61430d215 100644
--- a/linux/mips/syscallent.h
+++ b/src/linux/mips/syscallent.h
diff --git a/linux/mips/userent.h b/src/linux/mips/userent.h
index 77cf50da3..77cf50da3 100644
--- a/linux/mips/userent.h
+++ b/src/linux/mips/userent.h
diff --git a/linux/netlink_diag.h b/src/linux/netlink_diag.h
index 02ea34242..02ea34242 100644
--- a/linux/netlink_diag.h
+++ b/src/linux/netlink_diag.h
diff --git a/linux/nios2/arch_defs_.h b/src/linux/nios2/arch_defs_.h
index 9c778e248..9c778e248 100644
--- a/linux/nios2/arch_defs_.h
+++ b/src/linux/nios2/arch_defs_.h
diff --git a/linux/nios2/arch_regs.c b/src/linux/nios2/arch_regs.c
index 3c28e6208..3c28e6208 100644
--- a/linux/nios2/arch_regs.c
+++ b/src/linux/nios2/arch_regs.c
diff --git a/linux/nios2/get_error.c b/src/linux/nios2/get_error.c
index d202abd9c..d202abd9c 100644
--- a/linux/nios2/get_error.c
+++ b/src/linux/nios2/get_error.c
diff --git a/linux/nios2/get_scno.c b/src/linux/nios2/get_scno.c
index cc0bd06d0..cc0bd06d0 100644
--- a/linux/nios2/get_scno.c
+++ b/src/linux/nios2/get_scno.c
diff --git a/linux/nios2/get_syscall_args.c b/src/linux/nios2/get_syscall_args.c
index 1e42fcd75..1e42fcd75 100644
--- a/linux/nios2/get_syscall_args.c
+++ b/src/linux/nios2/get_syscall_args.c
diff --git a/linux/nios2/ioctls_arch0.h b/src/linux/nios2/ioctls_arch0.h
index f015def48..f015def48 100644
--- a/linux/nios2/ioctls_arch0.h
+++ b/src/linux/nios2/ioctls_arch0.h
diff --git a/linux/nios2/ioctls_inc0.h b/src/linux/nios2/ioctls_inc0.h
index 4aecf983e..4aecf983e 100644
--- a/linux/nios2/ioctls_inc0.h
+++ b/src/linux/nios2/ioctls_inc0.h
diff --git a/linux/nios2/raw_syscall.h b/src/linux/nios2/raw_syscall.h
index 02f6e7ee7..02f6e7ee7 100644
--- a/linux/nios2/raw_syscall.h
+++ b/src/linux/nios2/raw_syscall.h
diff --git a/linux/nios2/set_error.c b/src/linux/nios2/set_error.c
index 61fc03003..61fc03003 100644
--- a/linux/nios2/set_error.c
+++ b/src/linux/nios2/set_error.c
diff --git a/linux/nios2/set_scno.c b/src/linux/nios2/set_scno.c
index ae1b196fa..ae1b196fa 100644
--- a/linux/nios2/set_scno.c
+++ b/src/linux/nios2/set_scno.c
diff --git a/linux/nios2/syscallent.h b/src/linux/nios2/syscallent.h
index 31431cf0d..31431cf0d 100644
--- a/linux/nios2/syscallent.h
+++ b/src/linux/nios2/syscallent.h
diff --git a/linux/nr_prefix.c b/src/linux/nr_prefix.c
index 3b3d2d4ef..3b3d2d4ef 100644
--- a/linux/nr_prefix.c
+++ b/src/linux/nr_prefix.c
diff --git a/linux/or1k/arch_regs.c b/src/linux/or1k/arch_regs.c
index 196419dfc..196419dfc 100644
--- a/linux/or1k/arch_regs.c
+++ b/src/linux/or1k/arch_regs.c
diff --git a/linux/or1k/get_error.c b/src/linux/or1k/get_error.c
index e551f13f5..e551f13f5 100644
--- a/linux/or1k/get_error.c
+++ b/src/linux/or1k/get_error.c
diff --git a/linux/or1k/get_scno.c b/src/linux/or1k/get_scno.c
index f997abd4e..f997abd4e 100644
--- a/linux/or1k/get_scno.c
+++ b/src/linux/or1k/get_scno.c
diff --git a/linux/or1k/get_syscall_args.c b/src/linux/or1k/get_syscall_args.c
index f06d0a886..f06d0a886 100644
--- a/linux/or1k/get_syscall_args.c
+++ b/src/linux/or1k/get_syscall_args.c
diff --git a/linux/or1k/ioctls_arch0.h b/src/linux/or1k/ioctls_arch0.h
index 5950cbeca..5950cbeca 100644
--- a/linux/or1k/ioctls_arch0.h
+++ b/src/linux/or1k/ioctls_arch0.h
diff --git a/linux/or1k/ioctls_inc0.h b/src/linux/or1k/ioctls_inc0.h
index 4aecf983e..4aecf983e 100644
--- a/linux/or1k/ioctls_inc0.h
+++ b/src/linux/or1k/ioctls_inc0.h
diff --git a/linux/or1k/raw_syscall.h b/src/linux/or1k/raw_syscall.h
index e31df27e8..e31df27e8 100644
--- a/linux/or1k/raw_syscall.h
+++ b/src/linux/or1k/raw_syscall.h
diff --git a/linux/or1k/set_error.c b/src/linux/or1k/set_error.c
index b5cb7016f..b5cb7016f 100644
--- a/linux/or1k/set_error.c
+++ b/src/linux/or1k/set_error.c
diff --git a/linux/or1k/set_scno.c b/src/linux/or1k/set_scno.c
index 853364acd..853364acd 100644
--- a/linux/or1k/set_scno.c
+++ b/src/linux/or1k/set_scno.c
diff --git a/linux/or1k/syscallent.h b/src/linux/or1k/syscallent.h
index ac339463a..ac339463a 100644
--- a/linux/or1k/syscallent.h
+++ b/src/linux/or1k/syscallent.h
diff --git a/linux/or1k/userent.h b/src/linux/or1k/userent.h
index 056d1009e..056d1009e 100644
--- a/linux/or1k/userent.h
+++ b/src/linux/or1k/userent.h
diff --git a/linux/packet_diag.h b/src/linux/packet_diag.h
index 0efb76752..0efb76752 100644
--- a/linux/packet_diag.h
+++ b/src/linux/packet_diag.h
diff --git a/linux/powerpc/arch_defs_.h b/src/linux/powerpc/arch_defs_.h
index 310337129..310337129 100644
--- a/linux/powerpc/arch_defs_.h
+++ b/src/linux/powerpc/arch_defs_.h
diff --git a/linux/powerpc/arch_regs.c b/src/linux/powerpc/arch_regs.c
index f9d0de596..f9d0de596 100644
--- a/linux/powerpc/arch_regs.c
+++ b/src/linux/powerpc/arch_regs.c
diff --git a/linux/powerpc/arch_rt_sigframe.c b/src/linux/powerpc/arch_rt_sigframe.c
index 4fdad4810..4fdad4810 100644
--- a/linux/powerpc/arch_rt_sigframe.c
+++ b/src/linux/powerpc/arch_rt_sigframe.c
diff --git a/linux/powerpc/arch_sigreturn.c b/src/linux/powerpc/arch_sigreturn.c
index 0926e4faf..0926e4faf 100644
--- a/linux/powerpc/arch_sigreturn.c
+++ b/src/linux/powerpc/arch_sigreturn.c
diff --git a/linux/powerpc/errnoent.h b/src/linux/powerpc/errnoent.h
index 23d2111b1..23d2111b1 100644
--- a/linux/powerpc/errnoent.h
+++ b/src/linux/powerpc/errnoent.h
diff --git a/linux/powerpc/get_error.c b/src/linux/powerpc/get_error.c
index 716e8782c..716e8782c 100644
--- a/linux/powerpc/get_error.c
+++ b/src/linux/powerpc/get_error.c
diff --git a/linux/powerpc/get_scno.c b/src/linux/powerpc/get_scno.c
index 6624614ad..6624614ad 100644
--- a/linux/powerpc/get_scno.c
+++ b/src/linux/powerpc/get_scno.c
diff --git a/linux/powerpc/get_syscall_args.c b/src/linux/powerpc/get_syscall_args.c
index 823d7839d..823d7839d 100644
--- a/linux/powerpc/get_syscall_args.c
+++ b/src/linux/powerpc/get_syscall_args.c
diff --git a/linux/powerpc/getregs_old.c b/src/linux/powerpc/getregs_old.c
index 7edb796f2..7edb796f2 100644
--- a/linux/powerpc/getregs_old.c
+++ b/src/linux/powerpc/getregs_old.c
diff --git a/linux/powerpc/getregs_old.h b/src/linux/powerpc/getregs_old.h
index 31388e27d..31388e27d 100644
--- a/linux/powerpc/getregs_old.h
+++ b/src/linux/powerpc/getregs_old.h
diff --git a/linux/powerpc/ioctls_arch0.h b/src/linux/powerpc/ioctls_arch0.h
index c52552429..c52552429 100644
--- a/linux/powerpc/ioctls_arch0.h
+++ b/src/linux/powerpc/ioctls_arch0.h
diff --git a/linux/powerpc/ioctls_inc0.h b/src/linux/powerpc/ioctls_inc0.h
index 4aecf983e..4aecf983e 100644
--- a/linux/powerpc/ioctls_inc0.h
+++ b/src/linux/powerpc/ioctls_inc0.h
diff --git a/linux/powerpc/raw_syscall.h b/src/linux/powerpc/raw_syscall.h
index e023fcd1c..e023fcd1c 100644
--- a/linux/powerpc/raw_syscall.h
+++ b/src/linux/powerpc/raw_syscall.h
diff --git a/linux/powerpc/set_error.c b/src/linux/powerpc/set_error.c
index 90dae8b6d..90dae8b6d 100644
--- a/linux/powerpc/set_error.c
+++ b/src/linux/powerpc/set_error.c
diff --git a/linux/powerpc/set_scno.c b/src/linux/powerpc/set_scno.c
index f47ad85bd..f47ad85bd 100644
--- a/linux/powerpc/set_scno.c
+++ b/src/linux/powerpc/set_scno.c
diff --git a/linux/powerpc/syscallent.h b/src/linux/powerpc/syscallent.h
index d1fe9261c..d1fe9261c 100644
--- a/linux/powerpc/syscallent.h
+++ b/src/linux/powerpc/syscallent.h
diff --git a/linux/powerpc/userent.h b/src/linux/powerpc/userent.h
index 93cc656b8..93cc656b8 100644
--- a/linux/powerpc/userent.h
+++ b/src/linux/powerpc/userent.h
diff --git a/linux/powerpc64/arch_defs_.h b/src/linux/powerpc64/arch_defs_.h
index a4ac007ef..a4ac007ef 100644
--- a/linux/powerpc64/arch_defs_.h
+++ b/src/linux/powerpc64/arch_defs_.h
diff --git a/linux/powerpc64/arch_get_personality.c b/src/linux/powerpc64/arch_get_personality.c
index ad311f6d6..ad311f6d6 100644
--- a/linux/powerpc64/arch_get_personality.c
+++ b/src/linux/powerpc64/arch_get_personality.c
diff --git a/linux/powerpc64/arch_regs.c b/src/linux/powerpc64/arch_regs.c
index b5c572dcc..b5c572dcc 100644
--- a/linux/powerpc64/arch_regs.c
+++ b/src/linux/powerpc64/arch_regs.c
diff --git a/linux/powerpc64/arch_rt_sigframe.c b/src/linux/powerpc64/arch_rt_sigframe.c
index 43ba4c88b..43ba4c88b 100644
--- a/linux/powerpc64/arch_rt_sigframe.c
+++ b/src/linux/powerpc64/arch_rt_sigframe.c
diff --git a/linux/powerpc64/arch_sigreturn.c b/src/linux/powerpc64/arch_sigreturn.c
index 316022fdc..316022fdc 100644
--- a/linux/powerpc64/arch_sigreturn.c
+++ b/src/linux/powerpc64/arch_sigreturn.c
diff --git a/linux/powerpc64/errnoent.h b/src/linux/powerpc64/errnoent.h
index 30f6425e2..30f6425e2 100644
--- a/linux/powerpc64/errnoent.h
+++ b/src/linux/powerpc64/errnoent.h
diff --git a/linux/powerpc64/get_error.c b/src/linux/powerpc64/get_error.c
index 209bfd8f8..209bfd8f8 100644
--- a/linux/powerpc64/get_error.c
+++ b/src/linux/powerpc64/get_error.c
diff --git a/linux/powerpc64/get_scno.c b/src/linux/powerpc64/get_scno.c
index 03523d397..03523d397 100644
--- a/linux/powerpc64/get_scno.c
+++ b/src/linux/powerpc64/get_scno.c
diff --git a/linux/powerpc64/get_syscall_args.c b/src/linux/powerpc64/get_syscall_args.c
index 5561a5519..5561a5519 100644
--- a/linux/powerpc64/get_syscall_args.c
+++ b/src/linux/powerpc64/get_syscall_args.c
diff --git a/linux/powerpc64/getregs_old.c b/src/linux/powerpc64/getregs_old.c
index 177ff74b7..177ff74b7 100644
--- a/linux/powerpc64/getregs_old.c
+++ b/src/linux/powerpc64/getregs_old.c
diff --git a/linux/powerpc64/getregs_old.h b/src/linux/powerpc64/getregs_old.h
index fdd98f9fb..fdd98f9fb 100644
--- a/linux/powerpc64/getregs_old.h
+++ b/src/linux/powerpc64/getregs_old.h
diff --git a/linux/powerpc64/ioctls_arch0.h b/src/linux/powerpc64/ioctls_arch0.h
index bf6962ce7..bf6962ce7 100644
--- a/linux/powerpc64/ioctls_arch0.h
+++ b/src/linux/powerpc64/ioctls_arch0.h
diff --git a/linux/powerpc64/ioctls_arch1.h b/src/linux/powerpc64/ioctls_arch1.h
index bf6962ce7..bf6962ce7 100644
--- a/linux/powerpc64/ioctls_arch1.h
+++ b/src/linux/powerpc64/ioctls_arch1.h
diff --git a/linux/powerpc64/ioctls_inc0.h b/src/linux/powerpc64/ioctls_inc0.h
index f9939faa4..f9939faa4 100644
--- a/linux/powerpc64/ioctls_inc0.h
+++ b/src/linux/powerpc64/ioctls_inc0.h
diff --git a/linux/powerpc64/ioctls_inc1.h b/src/linux/powerpc64/ioctls_inc1.h
index 2e5b2de96..2e5b2de96 100644
--- a/linux/powerpc64/ioctls_inc1.h
+++ b/src/linux/powerpc64/ioctls_inc1.h
diff --git a/linux/powerpc64/raw_syscall.h b/src/linux/powerpc64/raw_syscall.h
index 05577ee9c..05577ee9c 100644
--- a/linux/powerpc64/raw_syscall.h
+++ b/src/linux/powerpc64/raw_syscall.h
diff --git a/linux/powerpc64/rt_sigframe.h b/src/linux/powerpc64/rt_sigframe.h
index 78e13eac5..78e13eac5 100644
--- a/linux/powerpc64/rt_sigframe.h
+++ b/src/linux/powerpc64/rt_sigframe.h
diff --git a/linux/powerpc64/set_error.c b/src/linux/powerpc64/set_error.c
index b8dc768fc..b8dc768fc 100644
--- a/linux/powerpc64/set_error.c
+++ b/src/linux/powerpc64/set_error.c
diff --git a/linux/powerpc64/set_scno.c b/src/linux/powerpc64/set_scno.c
index c23bb83e9..c23bb83e9 100644
--- a/linux/powerpc64/set_scno.c
+++ b/src/linux/powerpc64/set_scno.c
diff --git a/linux/powerpc64/syscallent.h b/src/linux/powerpc64/syscallent.h
index 2feb068de..2feb068de 100644
--- a/linux/powerpc64/syscallent.h
+++ b/src/linux/powerpc64/syscallent.h
diff --git a/linux/powerpc64/syscallent1.h b/src/linux/powerpc64/syscallent1.h
index 64a9f01c7..64a9f01c7 100644
--- a/linux/powerpc64/syscallent1.h
+++ b/src/linux/powerpc64/syscallent1.h
diff --git a/linux/powerpc64/userent.h b/src/linux/powerpc64/userent.h
index 27c240b5b..27c240b5b 100644
--- a/linux/powerpc64/userent.h
+++ b/src/linux/powerpc64/userent.h
diff --git a/linux/powerpc64le/arch_defs_.h b/src/linux/powerpc64le/arch_defs_.h
index 494672a02..494672a02 100644
--- a/linux/powerpc64le/arch_defs_.h
+++ b/src/linux/powerpc64le/arch_defs_.h
diff --git a/linux/powerpc64le/arch_regs.c b/src/linux/powerpc64le/arch_regs.c
index 8c4a45d67..8c4a45d67 100644
--- a/linux/powerpc64le/arch_regs.c
+++ b/src/linux/powerpc64le/arch_regs.c
diff --git a/linux/powerpc64le/arch_rt_sigframe.c b/src/linux/powerpc64le/arch_rt_sigframe.c
index 176fa8227..176fa8227 100644
--- a/linux/powerpc64le/arch_rt_sigframe.c
+++ b/src/linux/powerpc64le/arch_rt_sigframe.c
diff --git a/linux/powerpc64le/errnoent.h b/src/linux/powerpc64le/errnoent.h
index 945ce8538..945ce8538 100644
--- a/linux/powerpc64le/errnoent.h
+++ b/src/linux/powerpc64le/errnoent.h
diff --git a/linux/powerpc64le/get_error.c b/src/linux/powerpc64le/get_error.c
index c7fc341d9..c7fc341d9 100644
--- a/linux/powerpc64le/get_error.c
+++ b/src/linux/powerpc64le/get_error.c
diff --git a/linux/powerpc64le/get_scno.c b/src/linux/powerpc64le/get_scno.c
index 9a0c9e4aa..9a0c9e4aa 100644
--- a/linux/powerpc64le/get_scno.c
+++ b/src/linux/powerpc64le/get_scno.c
diff --git a/linux/powerpc64le/get_syscall_args.c b/src/linux/powerpc64le/get_syscall_args.c
index 281eb6061..281eb6061 100644
--- a/linux/powerpc64le/get_syscall_args.c
+++ b/src/linux/powerpc64le/get_syscall_args.c
diff --git a/linux/powerpc64le/ioctls_arch0.h b/src/linux/powerpc64le/ioctls_arch0.h
index 14d0c0b10..14d0c0b10 100644
--- a/linux/powerpc64le/ioctls_arch0.h
+++ b/src/linux/powerpc64le/ioctls_arch0.h
diff --git a/linux/powerpc64le/ioctls_inc0.h b/src/linux/powerpc64le/ioctls_inc0.h
index a89fa3c0a..a89fa3c0a 100644
--- a/linux/powerpc64le/ioctls_inc0.h
+++ b/src/linux/powerpc64le/ioctls_inc0.h
diff --git a/linux/powerpc64le/raw_syscall.h b/src/linux/powerpc64le/raw_syscall.h
index f1800fc56..f1800fc56 100644
--- a/linux/powerpc64le/raw_syscall.h
+++ b/src/linux/powerpc64le/raw_syscall.h
diff --git a/linux/powerpc64le/rt_sigframe.h b/src/linux/powerpc64le/rt_sigframe.h
index cd8902f46..cd8902f46 100644
--- a/linux/powerpc64le/rt_sigframe.h
+++ b/src/linux/powerpc64le/rt_sigframe.h
diff --git a/linux/powerpc64le/set_error.c b/src/linux/powerpc64le/set_error.c
index 207ffe9a5..207ffe9a5 100644
--- a/linux/powerpc64le/set_error.c
+++ b/src/linux/powerpc64le/set_error.c
diff --git a/linux/powerpc64le/set_scno.c b/src/linux/powerpc64le/set_scno.c
index d3f6479ab..d3f6479ab 100644
--- a/linux/powerpc64le/set_scno.c
+++ b/src/linux/powerpc64le/set_scno.c
diff --git a/linux/powerpc64le/syscallent.h b/src/linux/powerpc64le/syscallent.h
index 785a81b0d..785a81b0d 100644
--- a/linux/powerpc64le/syscallent.h
+++ b/src/linux/powerpc64le/syscallent.h
diff --git a/linux/powerpc64le/userent.h b/src/linux/powerpc64le/userent.h
index 1f7118117..1f7118117 100644
--- a/linux/powerpc64le/userent.h
+++ b/src/linux/powerpc64le/userent.h
diff --git a/linux/ptrace_pokeuser.c b/src/linux/ptrace_pokeuser.c
index 4a212a02a..4a212a02a 100644
--- a/linux/ptrace_pokeuser.c
+++ b/src/linux/ptrace_pokeuser.c
diff --git a/linux/raw_syscall.h b/src/linux/raw_syscall.h
index da84fa5f6..da84fa5f6 100644
--- a/linux/raw_syscall.h
+++ b/src/linux/raw_syscall.h
diff --git a/linux/riscv64/arch_regs.c b/src/linux/riscv64/arch_regs.c
index 5a2bab905..5a2bab905 100644
--- a/linux/riscv64/arch_regs.c
+++ b/src/linux/riscv64/arch_regs.c
diff --git a/linux/riscv64/get_error.c b/src/linux/riscv64/get_error.c
index ac20c7690..ac20c7690 100644
--- a/linux/riscv64/get_error.c
+++ b/src/linux/riscv64/get_error.c
diff --git a/linux/riscv64/get_scno.c b/src/linux/riscv64/get_scno.c
index c77f4f550..c77f4f550 100644
--- a/linux/riscv64/get_scno.c
+++ b/src/linux/riscv64/get_scno.c
diff --git a/linux/riscv64/get_syscall_args.c b/src/linux/riscv64/get_syscall_args.c
index 0167fa520..0167fa520 100644
--- a/linux/riscv64/get_syscall_args.c
+++ b/src/linux/riscv64/get_syscall_args.c
diff --git a/linux/riscv64/ioctls_arch0.h b/src/linux/riscv64/ioctls_arch0.h
index 9c039fc86..9c039fc86 100644
--- a/linux/riscv64/ioctls_arch0.h
+++ b/src/linux/riscv64/ioctls_arch0.h
diff --git a/linux/riscv64/ioctls_inc0.h b/src/linux/riscv64/ioctls_inc0.h
index f9939faa4..f9939faa4 100644
--- a/linux/riscv64/ioctls_inc0.h
+++ b/src/linux/riscv64/ioctls_inc0.h
diff --git a/linux/riscv64/raw_syscall.h b/src/linux/riscv64/raw_syscall.h
index 932975cdb..932975cdb 100644
--- a/linux/riscv64/raw_syscall.h
+++ b/src/linux/riscv64/raw_syscall.h
diff --git a/linux/riscv64/set_error.c b/src/linux/riscv64/set_error.c
index b922e102a..b922e102a 100644
--- a/linux/riscv64/set_error.c
+++ b/src/linux/riscv64/set_error.c
diff --git a/linux/riscv64/set_scno.c b/src/linux/riscv64/set_scno.c
index f6d08d4c8..f6d08d4c8 100644
--- a/linux/riscv64/set_scno.c
+++ b/src/linux/riscv64/set_scno.c
diff --git a/linux/riscv64/syscallent.h b/src/linux/riscv64/syscallent.h
index 60c6ce587..60c6ce587 100644
--- a/linux/riscv64/syscallent.h
+++ b/src/linux/riscv64/syscallent.h
diff --git a/linux/rt_sigframe.h b/src/linux/rt_sigframe.h
index bab5bc5f5..bab5bc5f5 100644
--- a/linux/rt_sigframe.h
+++ b/src/linux/rt_sigframe.h
diff --git a/linux/s390/arch_defs_.h b/src/linux/s390/arch_defs_.h
index 39b7658df..39b7658df 100644
--- a/linux/s390/arch_defs_.h
+++ b/src/linux/s390/arch_defs_.h
diff --git a/linux/s390/arch_regs.c b/src/linux/s390/arch_regs.c
index e9bda5c0f..e9bda5c0f 100644
--- a/linux/s390/arch_regs.c
+++ b/src/linux/s390/arch_regs.c
diff --git a/linux/s390/arch_sigreturn.c b/src/linux/s390/arch_sigreturn.c
index 0c9aa4fd5..0c9aa4fd5 100644
--- a/linux/s390/arch_sigreturn.c
+++ b/src/linux/s390/arch_sigreturn.c
diff --git a/linux/s390/check_scno.c b/src/linux/s390/check_scno.c
index 76d0f9cf5..76d0f9cf5 100644
--- a/linux/s390/check_scno.c
+++ b/src/linux/s390/check_scno.c
diff --git a/linux/s390/get_error.c b/src/linux/s390/get_error.c
index 5b5801305..5b5801305 100644
--- a/linux/s390/get_error.c
+++ b/src/linux/s390/get_error.c
diff --git a/linux/s390/get_scno.c b/src/linux/s390/get_scno.c
index 2af6c8e6f..2af6c8e6f 100644
--- a/linux/s390/get_scno.c
+++ b/src/linux/s390/get_scno.c
diff --git a/linux/s390/get_syscall_args.c b/src/linux/s390/get_syscall_args.c
index 66570ff53..66570ff53 100644
--- a/linux/s390/get_syscall_args.c
+++ b/src/linux/s390/get_syscall_args.c
diff --git a/linux/s390/ioctls_arch0.h b/src/linux/s390/ioctls_arch0.h
index 3aa7105b1..3aa7105b1 100644
--- a/linux/s390/ioctls_arch0.h
+++ b/src/linux/s390/ioctls_arch0.h
diff --git a/linux/s390/ioctls_inc0.h b/src/linux/s390/ioctls_inc0.h
index 4aecf983e..4aecf983e 100644
--- a/linux/s390/ioctls_inc0.h
+++ b/src/linux/s390/ioctls_inc0.h
diff --git a/linux/s390/raw_syscall.h b/src/linux/s390/raw_syscall.h
index 96d6230eb..96d6230eb 100644
--- a/linux/s390/raw_syscall.h
+++ b/src/linux/s390/raw_syscall.h
diff --git a/linux/s390/rt_sigframe.h b/src/linux/s390/rt_sigframe.h
index 2feb5a66f..2feb5a66f 100644
--- a/linux/s390/rt_sigframe.h
+++ b/src/linux/s390/rt_sigframe.h
diff --git a/linux/s390/set_error.c b/src/linux/s390/set_error.c
index f71865ef1..f71865ef1 100644
--- a/linux/s390/set_error.c
+++ b/src/linux/s390/set_error.c
diff --git a/linux/s390/set_scno.c b/src/linux/s390/set_scno.c
index 6ce2c12f3..6ce2c12f3 100644
--- a/linux/s390/set_scno.c
+++ b/src/linux/s390/set_scno.c
diff --git a/linux/s390/syscallent.h b/src/linux/s390/syscallent.h
index 6b4d930a7..6b4d930a7 100644
--- a/linux/s390/syscallent.h
+++ b/src/linux/s390/syscallent.h
diff --git a/linux/s390/userent.h b/src/linux/s390/userent.h
index 8ba070b98..8ba070b98 100644
--- a/linux/s390/userent.h
+++ b/src/linux/s390/userent.h
diff --git a/linux/s390/userent0.h b/src/linux/s390/userent0.h
index 21a90fb7b..21a90fb7b 100644
--- a/linux/s390/userent0.h
+++ b/src/linux/s390/userent0.h
diff --git a/linux/s390/userent1.h b/src/linux/s390/userent1.h
index 6691167cc..6691167cc 100644
--- a/linux/s390/userent1.h
+++ b/src/linux/s390/userent1.h
diff --git a/linux/s390x/arch_defs_.h b/src/linux/s390x/arch_defs_.h
index 750ab5121..750ab5121 100644
--- a/linux/s390x/arch_defs_.h
+++ b/src/linux/s390x/arch_defs_.h
diff --git a/linux/s390x/arch_get_personality.c b/src/linux/s390x/arch_get_personality.c
index a87346393..a87346393 100644
--- a/linux/s390x/arch_get_personality.c
+++ b/src/linux/s390x/arch_get_personality.c
diff --git a/linux/s390x/arch_regs.c b/src/linux/s390x/arch_regs.c
index 7a2c0a6a4..7a2c0a6a4 100644
--- a/linux/s390x/arch_regs.c
+++ b/src/linux/s390x/arch_regs.c
diff --git a/linux/s390x/arch_sigreturn.c b/src/linux/s390x/arch_sigreturn.c
index 641c00807..641c00807 100644
--- a/linux/s390x/arch_sigreturn.c
+++ b/src/linux/s390x/arch_sigreturn.c
diff --git a/linux/s390x/check_scno.c b/src/linux/s390x/check_scno.c
index c2e9aaa16..c2e9aaa16 100644
--- a/linux/s390x/check_scno.c
+++ b/src/linux/s390x/check_scno.c
diff --git a/linux/s390x/get_error.c b/src/linux/s390x/get_error.c
index 0d3b610c8..0d3b610c8 100644
--- a/linux/s390x/get_error.c
+++ b/src/linux/s390x/get_error.c
diff --git a/linux/s390x/get_scno.c b/src/linux/s390x/get_scno.c
index 5f9cf4e7f..5f9cf4e7f 100644
--- a/linux/s390x/get_scno.c
+++ b/src/linux/s390x/get_scno.c
diff --git a/linux/s390x/get_syscall_args.c b/src/linux/s390x/get_syscall_args.c
index 1a7147c0d..1a7147c0d 100644
--- a/linux/s390x/get_syscall_args.c
+++ b/src/linux/s390x/get_syscall_args.c
diff --git a/linux/s390x/ioctls_arch0.h b/src/linux/s390x/ioctls_arch0.h
index d3ddf0361..d3ddf0361 100644
--- a/linux/s390x/ioctls_arch0.h
+++ b/src/linux/s390x/ioctls_arch0.h
diff --git a/linux/s390x/ioctls_arch1.h b/src/linux/s390x/ioctls_arch1.h
index 4a16cb5cc..4a16cb5cc 100644
--- a/linux/s390x/ioctls_arch1.h
+++ b/src/linux/s390x/ioctls_arch1.h
diff --git a/linux/s390x/ioctls_inc0.h b/src/linux/s390x/ioctls_inc0.h
index f9939faa4..f9939faa4 100644
--- a/linux/s390x/ioctls_inc0.h
+++ b/src/linux/s390x/ioctls_inc0.h
diff --git a/linux/s390x/ioctls_inc1.h b/src/linux/s390x/ioctls_inc1.h
index e09b6c6d5..e09b6c6d5 100644
--- a/linux/s390x/ioctls_inc1.h
+++ b/src/linux/s390x/ioctls_inc1.h
diff --git a/linux/s390x/raw_syscall.h b/src/linux/s390x/raw_syscall.h
index 05789ce13..05789ce13 100644
--- a/linux/s390x/raw_syscall.h
+++ b/src/linux/s390x/raw_syscall.h
diff --git a/linux/s390x/rt_sigframe.h b/src/linux/s390x/rt_sigframe.h
index fc9b22473..fc9b22473 100644
--- a/linux/s390x/rt_sigframe.h
+++ b/src/linux/s390x/rt_sigframe.h
diff --git a/linux/s390x/set_error.c b/src/linux/s390x/set_error.c
index 2acd00a0f..2acd00a0f 100644
--- a/linux/s390x/set_error.c
+++ b/src/linux/s390x/set_error.c
diff --git a/linux/s390x/set_scno.c b/src/linux/s390x/set_scno.c
index a8d6f3bfa..a8d6f3bfa 100644
--- a/linux/s390x/set_scno.c
+++ b/src/linux/s390x/set_scno.c
diff --git a/linux/s390x/syscallent.h b/src/linux/s390x/syscallent.h
index d0723b3ec..d0723b3ec 100644
--- a/linux/s390x/syscallent.h
+++ b/src/linux/s390x/syscallent.h
diff --git a/linux/s390x/syscallent1.h b/src/linux/s390x/syscallent1.h
index 6b7a4b3c5..6b7a4b3c5 100644
--- a/linux/s390x/syscallent1.h
+++ b/src/linux/s390x/syscallent1.h
diff --git a/linux/s390x/userent.h b/src/linux/s390x/userent.h
index 8997dd884..8997dd884 100644
--- a/linux/s390x/userent.h
+++ b/src/linux/s390x/userent.h
diff --git a/linux/sh/arch_defs_.h b/src/linux/sh/arch_defs_.h
index 1809580d8..1809580d8 100644
--- a/linux/sh/arch_defs_.h
+++ b/src/linux/sh/arch_defs_.h
diff --git a/linux/sh/arch_getrval2.c b/src/linux/sh/arch_getrval2.c
index a01fb20fe..a01fb20fe 100644
--- a/linux/sh/arch_getrval2.c
+++ b/src/linux/sh/arch_getrval2.c
diff --git a/linux/sh/arch_regs.c b/src/linux/sh/arch_regs.c
index f318fab89..f318fab89 100644
--- a/linux/sh/arch_regs.c
+++ b/src/linux/sh/arch_regs.c
diff --git a/linux/sh/get_error.c b/src/linux/sh/get_error.c
index 010957610..010957610 100644
--- a/linux/sh/get_error.c
+++ b/src/linux/sh/get_error.c
diff --git a/linux/sh/get_scno.c b/src/linux/sh/get_scno.c
index 7dd26bf0e..7dd26bf0e 100644
--- a/linux/sh/get_scno.c
+++ b/src/linux/sh/get_scno.c
diff --git a/linux/sh/get_syscall_args.c b/src/linux/sh/get_syscall_args.c
index 3b9391e85..3b9391e85 100644
--- a/linux/sh/get_syscall_args.c
+++ b/src/linux/sh/get_syscall_args.c
diff --git a/linux/sh/ioctls_arch0.h b/src/linux/sh/ioctls_arch0.h
index 96eb59622..96eb59622 100644
--- a/linux/sh/ioctls_arch0.h
+++ b/src/linux/sh/ioctls_arch0.h
diff --git a/linux/sh/ioctls_inc0.h b/src/linux/sh/ioctls_inc0.h
index 4aecf983e..4aecf983e 100644
--- a/linux/sh/ioctls_inc0.h
+++ b/src/linux/sh/ioctls_inc0.h
diff --git a/linux/sh/raw_syscall.h b/src/linux/sh/raw_syscall.h
index 1c2f8136b..1c2f8136b 100644
--- a/linux/sh/raw_syscall.h
+++ b/src/linux/sh/raw_syscall.h
diff --git a/linux/sh/set_error.c b/src/linux/sh/set_error.c
index 28ed085fb..28ed085fb 100644
--- a/linux/sh/set_error.c
+++ b/src/linux/sh/set_error.c
diff --git a/linux/sh/set_scno.c b/src/linux/sh/set_scno.c
index fc2a01d75..fc2a01d75 100644
--- a/linux/sh/set_scno.c
+++ b/src/linux/sh/set_scno.c
diff --git a/linux/sh/syscallent.h b/src/linux/sh/syscallent.h
index aef820d9e..aef820d9e 100644
--- a/linux/sh/syscallent.h
+++ b/src/linux/sh/syscallent.h
diff --git a/linux/sh/userent.h b/src/linux/sh/userent.h
index 8d769e5f4..8d769e5f4 100644
--- a/linux/sh/userent.h
+++ b/src/linux/sh/userent.h
diff --git a/linux/sh/userent0.h b/src/linux/sh/userent0.h
index c1d412242..c1d412242 100644
--- a/linux/sh/userent0.h
+++ b/src/linux/sh/userent0.h
diff --git a/linux/sh64/arch_defs_.h b/src/linux/sh64/arch_defs_.h
index 18f4d7387..18f4d7387 100644
--- a/linux/sh64/arch_defs_.h
+++ b/src/linux/sh64/arch_defs_.h
diff --git a/linux/sh64/arch_regs.c b/src/linux/sh64/arch_regs.c
index 4bd08b6d3..4bd08b6d3 100644
--- a/linux/sh64/arch_regs.c
+++ b/src/linux/sh64/arch_regs.c
diff --git a/linux/sh64/get_error.c b/src/linux/sh64/get_error.c
index 44242299a..44242299a 100644
--- a/linux/sh64/get_error.c
+++ b/src/linux/sh64/get_error.c
diff --git a/linux/sh64/get_scno.c b/src/linux/sh64/get_scno.c
index c769dce47..c769dce47 100644
--- a/linux/sh64/get_scno.c
+++ b/src/linux/sh64/get_scno.c
diff --git a/linux/sh64/get_syscall_args.c b/src/linux/sh64/get_syscall_args.c
index 8dd38b0b4..8dd38b0b4 100644
--- a/linux/sh64/get_syscall_args.c
+++ b/src/linux/sh64/get_syscall_args.c
diff --git a/linux/sh64/ioctls_arch0.h b/src/linux/sh64/ioctls_arch0.h
index 36338dcea..36338dcea 100644
--- a/linux/sh64/ioctls_arch0.h
+++ b/src/linux/sh64/ioctls_arch0.h
diff --git a/linux/sh64/ioctls_inc0.h b/src/linux/sh64/ioctls_inc0.h
index f9939faa4..f9939faa4 100644
--- a/linux/sh64/ioctls_inc0.h
+++ b/src/linux/sh64/ioctls_inc0.h
diff --git a/linux/sh64/raw_syscall.h b/src/linux/sh64/raw_syscall.h
index 2477b3237..2477b3237 100644
--- a/linux/sh64/raw_syscall.h
+++ b/src/linux/sh64/raw_syscall.h
diff --git a/linux/sh64/rt_sigframe.h b/src/linux/sh64/rt_sigframe.h
index 493948f8c..493948f8c 100644
--- a/linux/sh64/rt_sigframe.h
+++ b/src/linux/sh64/rt_sigframe.h
diff --git a/linux/sh64/set_error.c b/src/linux/sh64/set_error.c
index 91da77724..91da77724 100644
--- a/linux/sh64/set_error.c
+++ b/src/linux/sh64/set_error.c
diff --git a/linux/sh64/set_scno.c b/src/linux/sh64/set_scno.c
index 79d7213b0..79d7213b0 100644
--- a/linux/sh64/set_scno.c
+++ b/src/linux/sh64/set_scno.c
diff --git a/linux/sh64/syscallent.h b/src/linux/sh64/syscallent.h
index b4041fe8e..b4041fe8e 100644
--- a/linux/sh64/syscallent.h
+++ b/src/linux/sh64/syscallent.h
diff --git a/linux/sh64/userent.h b/src/linux/sh64/userent.h
index ecff5f63e..ecff5f63e 100644
--- a/linux/sh64/userent.h
+++ b/src/linux/sh64/userent.h
diff --git a/linux/shuffle_scno.c b/src/linux/shuffle_scno.c
index dc1633d2f..dc1633d2f 100644
--- a/linux/shuffle_scno.c
+++ b/src/linux/shuffle_scno.c
diff --git a/linux/signal.h.in b/src/linux/signal.h.in
index 44e7ea39e..44e7ea39e 100644
--- a/linux/signal.h.in
+++ b/src/linux/signal.h.in
diff --git a/linux/signalent.h b/src/linux/signalent.h
index b17ea8439..b17ea8439 100644
--- a/linux/signalent.h
+++ b/src/linux/signalent.h
diff --git a/linux/smc_diag.h b/src/linux/smc_diag.h
index f4bdd7939..f4bdd7939 100644
--- a/linux/smc_diag.h
+++ b/src/linux/smc_diag.h
diff --git a/linux/sock_diag.h b/src/linux/sock_diag.h
index 50ce15eac..50ce15eac 100644
--- a/linux/sock_diag.h
+++ b/src/linux/sock_diag.h
diff --git a/linux/sparc/arch_defs_.h b/src/linux/sparc/arch_defs_.h
index 184d0010a..184d0010a 100644
--- a/linux/sparc/arch_defs_.h
+++ b/src/linux/sparc/arch_defs_.h
diff --git a/linux/sparc/arch_getrval2.c b/src/linux/sparc/arch_getrval2.c
index fd8908bbf..fd8908bbf 100644
--- a/linux/sparc/arch_getrval2.c
+++ b/src/linux/sparc/arch_getrval2.c
diff --git a/linux/sparc/arch_regs.c b/src/linux/sparc/arch_regs.c
index 62d240f71..62d240f71 100644
--- a/linux/sparc/arch_regs.c
+++ b/src/linux/sparc/arch_regs.c
diff --git a/linux/sparc/arch_sigreturn.c b/src/linux/sparc/arch_sigreturn.c
index 11da882d6..11da882d6 100644
--- a/linux/sparc/arch_sigreturn.c
+++ b/src/linux/sparc/arch_sigreturn.c
diff --git a/linux/sparc/errnoent.h b/src/linux/sparc/errnoent.h
index 4e6d471a5..4e6d471a5 100644
--- a/linux/sparc/errnoent.h
+++ b/src/linux/sparc/errnoent.h
diff --git a/linux/sparc/get_error.c b/src/linux/sparc/get_error.c
index b3e80c31f..b3e80c31f 100644
--- a/linux/sparc/get_error.c
+++ b/src/linux/sparc/get_error.c
diff --git a/linux/sparc/get_scno.c b/src/linux/sparc/get_scno.c
index b515952a7..b515952a7 100644
--- a/linux/sparc/get_scno.c
+++ b/src/linux/sparc/get_scno.c
diff --git a/linux/sparc/get_syscall_args.c b/src/linux/sparc/get_syscall_args.c
index 96c61c44c..96c61c44c 100644
--- a/linux/sparc/get_syscall_args.c
+++ b/src/linux/sparc/get_syscall_args.c
diff --git a/linux/sparc/ioctls_arch0.h b/src/linux/sparc/ioctls_arch0.h
index 5e54ac570..5e54ac570 100644
--- a/linux/sparc/ioctls_arch0.h
+++ b/src/linux/sparc/ioctls_arch0.h
diff --git a/linux/sparc/ioctls_inc0.h b/src/linux/sparc/ioctls_inc0.h
index 4aecf983e..4aecf983e 100644
--- a/linux/sparc/ioctls_inc0.h
+++ b/src/linux/sparc/ioctls_inc0.h
diff --git a/linux/sparc/raw_syscall.h b/src/linux/sparc/raw_syscall.h
index d4799fde0..d4799fde0 100644
--- a/linux/sparc/raw_syscall.h
+++ b/src/linux/sparc/raw_syscall.h
diff --git a/linux/sparc/rt_sigframe.h b/src/linux/sparc/rt_sigframe.h
index 5d192b1bc..5d192b1bc 100644
--- a/linux/sparc/rt_sigframe.h
+++ b/src/linux/sparc/rt_sigframe.h
diff --git a/linux/sparc/set_error.c b/src/linux/sparc/set_error.c
index 767be69d3..767be69d3 100644
--- a/linux/sparc/set_error.c
+++ b/src/linux/sparc/set_error.c
diff --git a/linux/sparc/set_scno.c b/src/linux/sparc/set_scno.c
index b5ab93ca9..b5ab93ca9 100644
--- a/linux/sparc/set_scno.c
+++ b/src/linux/sparc/set_scno.c
diff --git a/linux/sparc/signalent.h b/src/linux/sparc/signalent.h
index 7a3a6281a..7a3a6281a 100644
--- a/linux/sparc/signalent.h
+++ b/src/linux/sparc/signalent.h
diff --git a/linux/sparc/syscallent.h b/src/linux/sparc/syscallent.h
index e68f48b55..e68f48b55 100644
--- a/linux/sparc/syscallent.h
+++ b/src/linux/sparc/syscallent.h
diff --git a/linux/sparc/userent.h b/src/linux/sparc/userent.h
index f842946b6..f842946b6 100644
--- a/linux/sparc/userent.h
+++ b/src/linux/sparc/userent.h
diff --git a/linux/sparc64/arch_defs_.h b/src/linux/sparc64/arch_defs_.h
index abefb5388..abefb5388 100644
--- a/linux/sparc64/arch_defs_.h
+++ b/src/linux/sparc64/arch_defs_.h
diff --git a/linux/sparc64/arch_get_personality.c b/src/linux/sparc64/arch_get_personality.c
index 8366e85de..8366e85de 100644
--- a/linux/sparc64/arch_get_personality.c
+++ b/src/linux/sparc64/arch_get_personality.c
diff --git a/linux/sparc64/arch_getrval2.c b/src/linux/sparc64/arch_getrval2.c
index 81f155625..81f155625 100644
--- a/linux/sparc64/arch_getrval2.c
+++ b/src/linux/sparc64/arch_getrval2.c
diff --git a/linux/sparc64/arch_regs.c b/src/linux/sparc64/arch_regs.c
index 07f0e4055..07f0e4055 100644
--- a/linux/sparc64/arch_regs.c
+++ b/src/linux/sparc64/arch_regs.c
diff --git a/linux/sparc64/arch_rt_sigframe.c b/src/linux/sparc64/arch_rt_sigframe.c
index ef9dc2659..ef9dc2659 100644
--- a/linux/sparc64/arch_rt_sigframe.c
+++ b/src/linux/sparc64/arch_rt_sigframe.c
diff --git a/linux/sparc64/arch_sigreturn.c b/src/linux/sparc64/arch_sigreturn.c
index 6a9f4c355..6a9f4c355 100644
--- a/linux/sparc64/arch_sigreturn.c
+++ b/src/linux/sparc64/arch_sigreturn.c
diff --git a/linux/sparc64/errnoent.h b/src/linux/sparc64/errnoent.h
index 4ac2b7307..4ac2b7307 100644
--- a/linux/sparc64/errnoent.h
+++ b/src/linux/sparc64/errnoent.h
diff --git a/linux/sparc64/get_error.c b/src/linux/sparc64/get_error.c
index f254e2bf1..f254e2bf1 100644
--- a/linux/sparc64/get_error.c
+++ b/src/linux/sparc64/get_error.c
diff --git a/linux/sparc64/get_scno.c b/src/linux/sparc64/get_scno.c
index 56ecbce2a..56ecbce2a 100644
--- a/linux/sparc64/get_scno.c
+++ b/src/linux/sparc64/get_scno.c
diff --git a/linux/sparc64/get_syscall_args.c b/src/linux/sparc64/get_syscall_args.c
index 40a306ce2..40a306ce2 100644
--- a/linux/sparc64/get_syscall_args.c
+++ b/src/linux/sparc64/get_syscall_args.c
diff --git a/linux/sparc64/ioctls_arch0.h b/src/linux/sparc64/ioctls_arch0.h
index f444ff473..f444ff473 100644
--- a/linux/sparc64/ioctls_arch0.h
+++ b/src/linux/sparc64/ioctls_arch0.h
diff --git a/linux/sparc64/ioctls_arch1.h b/src/linux/sparc64/ioctls_arch1.h
index 96bd895fd..96bd895fd 100644
--- a/linux/sparc64/ioctls_arch1.h
+++ b/src/linux/sparc64/ioctls_arch1.h
diff --git a/linux/sparc64/ioctls_inc0.h b/src/linux/sparc64/ioctls_inc0.h
index f9939faa4..f9939faa4 100644
--- a/linux/sparc64/ioctls_inc0.h
+++ b/src/linux/sparc64/ioctls_inc0.h
diff --git a/linux/sparc64/ioctls_inc1.h b/src/linux/sparc64/ioctls_inc1.h
index 63b70e437..63b70e437 100644
--- a/linux/sparc64/ioctls_inc1.h
+++ b/src/linux/sparc64/ioctls_inc1.h
diff --git a/linux/sparc64/raw_syscall.h b/src/linux/sparc64/raw_syscall.h
index efb732772..efb732772 100644
--- a/linux/sparc64/raw_syscall.h
+++ b/src/linux/sparc64/raw_syscall.h
diff --git a/linux/sparc64/rt_sigframe.h b/src/linux/sparc64/rt_sigframe.h
index 22418d14d..22418d14d 100644
--- a/linux/sparc64/rt_sigframe.h
+++ b/src/linux/sparc64/rt_sigframe.h
diff --git a/linux/sparc64/set_error.c b/src/linux/sparc64/set_error.c
index 69778e573..69778e573 100644
--- a/linux/sparc64/set_error.c
+++ b/src/linux/sparc64/set_error.c
diff --git a/linux/sparc64/set_scno.c b/src/linux/sparc64/set_scno.c
index ae57cdfbd..ae57cdfbd 100644
--- a/linux/sparc64/set_scno.c
+++ b/src/linux/sparc64/set_scno.c
diff --git a/linux/sparc64/signalent.h b/src/linux/sparc64/signalent.h
index b4c6c15c1..b4c6c15c1 100644
--- a/linux/sparc64/signalent.h
+++ b/src/linux/sparc64/signalent.h
diff --git a/linux/sparc64/syscallent.h b/src/linux/sparc64/syscallent.h
index 1a85c46ad..1a85c46ad 100644
--- a/linux/sparc64/syscallent.h
+++ b/src/linux/sparc64/syscallent.h
diff --git a/linux/sparc64/syscallent1.h b/src/linux/sparc64/syscallent1.h
index 776b5f110..776b5f110 100644
--- a/linux/sparc64/syscallent1.h
+++ b/src/linux/sparc64/syscallent1.h
diff --git a/linux/sparc64/userent.h b/src/linux/sparc64/userent.h
index 87076bf32..87076bf32 100644
--- a/linux/sparc64/userent.h
+++ b/src/linux/sparc64/userent.h
diff --git a/linux/subcall.h b/src/linux/subcall.h
index 79fc0d0a8..79fc0d0a8 100644
--- a/linux/subcall.h
+++ b/src/linux/subcall.h
diff --git a/linux/subcall32.h b/src/linux/subcall32.h
index 922d83d40..922d83d40 100644
--- a/linux/subcall32.h
+++ b/src/linux/subcall32.h
diff --git a/linux/subcall64.h b/src/linux/subcall64.h
index 95e15bfb2..95e15bfb2 100644
--- a/linux/subcall64.h
+++ b/src/linux/subcall64.h
diff --git a/linux/syscall.h b/src/linux/syscall.h
index d770eab4e..d770eab4e 100644
--- a/linux/syscall.h
+++ b/src/linux/syscall.h
diff --git a/linux/syscallent-common-32.h b/src/linux/syscallent-common-32.h
index 99558300c..99558300c 100644
--- a/linux/syscallent-common-32.h
+++ b/src/linux/syscallent-common-32.h
diff --git a/linux/syscallent-common.h b/src/linux/syscallent-common.h
index 3062c19f6..3062c19f6 100644
--- a/linux/syscallent-common.h
+++ b/src/linux/syscallent-common.h
diff --git a/linux/syscallent_base_nr.h b/src/linux/syscallent_base_nr.h
index da84fa5f6..da84fa5f6 100644
--- a/linux/syscallent_base_nr.h
+++ b/src/linux/syscallent_base_nr.h
diff --git a/linux/tile/arch_defs_.h b/src/linux/tile/arch_defs_.h
index 12ba0d8b6..12ba0d8b6 100644
--- a/linux/tile/arch_defs_.h
+++ b/src/linux/tile/arch_defs_.h
diff --git a/linux/tile/arch_get_personality.c b/src/linux/tile/arch_get_personality.c
index b903f2a25..b903f2a25 100644
--- a/linux/tile/arch_get_personality.c
+++ b/src/linux/tile/arch_get_personality.c
diff --git a/linux/tile/arch_regs.c b/src/linux/tile/arch_regs.c
index f792e7734..f792e7734 100644
--- a/linux/tile/arch_regs.c
+++ b/src/linux/tile/arch_regs.c
diff --git a/linux/tile/arch_sigreturn.c b/src/linux/tile/arch_sigreturn.c
index 3f0855e2b..3f0855e2b 100644
--- a/linux/tile/arch_sigreturn.c
+++ b/src/linux/tile/arch_sigreturn.c
diff --git a/linux/tile/get_error.c b/src/linux/tile/get_error.c
index c6b6c807e..c6b6c807e 100644
--- a/linux/tile/get_error.c
+++ b/src/linux/tile/get_error.c
diff --git a/linux/tile/get_scno.c b/src/linux/tile/get_scno.c
index 9be1ea76a..9be1ea76a 100644
--- a/linux/tile/get_scno.c
+++ b/src/linux/tile/get_scno.c
diff --git a/linux/tile/get_syscall_args.c b/src/linux/tile/get_syscall_args.c
index 34d596ab5..34d596ab5 100644
--- a/linux/tile/get_syscall_args.c
+++ b/src/linux/tile/get_syscall_args.c
diff --git a/linux/tile/ioctls_arch0.h b/src/linux/tile/ioctls_arch0.h
index 056358521..056358521 100644
--- a/linux/tile/ioctls_arch0.h
+++ b/src/linux/tile/ioctls_arch0.h
diff --git a/linux/tile/ioctls_arch1.h b/src/linux/tile/ioctls_arch1.h
index 056358521..056358521 100644
--- a/linux/tile/ioctls_arch1.h
+++ b/src/linux/tile/ioctls_arch1.h
diff --git a/linux/tile/ioctls_inc0.h b/src/linux/tile/ioctls_inc0.h
index f9939faa4..f9939faa4 100644
--- a/linux/tile/ioctls_inc0.h
+++ b/src/linux/tile/ioctls_inc0.h
diff --git a/linux/tile/ioctls_inc1.h b/src/linux/tile/ioctls_inc1.h
index 4aecf983e..4aecf983e 100644
--- a/linux/tile/ioctls_inc1.h
+++ b/src/linux/tile/ioctls_inc1.h
diff --git a/linux/tile/raw_syscall.h b/src/linux/tile/raw_syscall.h
index c006ad1e3..c006ad1e3 100644
--- a/linux/tile/raw_syscall.h
+++ b/src/linux/tile/raw_syscall.h
diff --git a/linux/tile/rt_sigframe.h b/src/linux/tile/rt_sigframe.h
index f6c1f1240..f6c1f1240 100644
--- a/linux/tile/rt_sigframe.h
+++ b/src/linux/tile/rt_sigframe.h
diff --git a/linux/tile/set_error.c b/src/linux/tile/set_error.c
index 78e476cfe..78e476cfe 100644
--- a/linux/tile/set_error.c
+++ b/src/linux/tile/set_error.c
diff --git a/linux/tile/set_scno.c b/src/linux/tile/set_scno.c
index d96ebc23e..d96ebc23e 100644
--- a/linux/tile/set_scno.c
+++ b/src/linux/tile/set_scno.c
diff --git a/linux/tile/syscallent.h b/src/linux/tile/syscallent.h
index 50b60a4ff..50b60a4ff 100644
--- a/linux/tile/syscallent.h
+++ b/src/linux/tile/syscallent.h
diff --git a/linux/tile/syscallent1.h b/src/linux/tile/syscallent1.h
index 19941c294..19941c294 100644
--- a/linux/tile/syscallent1.h
+++ b/src/linux/tile/syscallent1.h
diff --git a/linux/tile/userent.h b/src/linux/tile/userent.h
index 167e97296..167e97296 100644
--- a/linux/tile/userent.h
+++ b/src/linux/tile/userent.h
diff --git a/linux/unix_diag.h b/src/linux/unix_diag.h
index ffabdce58..ffabdce58 100644
--- a/linux/unix_diag.h
+++ b/src/linux/unix_diag.h
diff --git a/linux/userent.h b/src/linux/userent.h
index da84fa5f6..da84fa5f6 100644
--- a/linux/userent.h
+++ b/src/linux/userent.h
diff --git a/linux/userent0.h b/src/linux/userent0.h
index c9e24cd1f..c9e24cd1f 100644
--- a/linux/userent0.h
+++ b/src/linux/userent0.h
diff --git a/linux/x32/arch_defs_.h b/src/linux/x32/arch_defs_.h
index dfdd440ec..dfdd440ec 100644
--- a/linux/x32/arch_defs_.h
+++ b/src/linux/x32/arch_defs_.h
diff --git a/linux/x32/arch_get_personality.c b/src/linux/x32/arch_get_personality.c
index a8ede47ea..a8ede47ea 100644
--- a/linux/x32/arch_get_personality.c
+++ b/src/linux/x32/arch_get_personality.c
diff --git a/linux/x32/arch_kvm.c b/src/linux/x32/arch_kvm.c
index e8e982ee9..e8e982ee9 100644
--- a/linux/x32/arch_kvm.c
+++ b/src/linux/x32/arch_kvm.c
diff --git a/linux/x32/arch_regs.c b/src/linux/x32/arch_regs.c
index 62c70be82..62c70be82 100644
--- a/linux/x32/arch_regs.c
+++ b/src/linux/x32/arch_regs.c
diff --git a/linux/x32/arch_regs.h b/src/linux/x32/arch_regs.h
index 9064ca693..9064ca693 100644
--- a/linux/x32/arch_regs.h
+++ b/src/linux/x32/arch_regs.h
diff --git a/linux/x32/arch_rt_sigframe.c b/src/linux/x32/arch_rt_sigframe.c
index 1cc45e5f0..1cc45e5f0 100644
--- a/linux/x32/arch_rt_sigframe.c
+++ b/src/linux/x32/arch_rt_sigframe.c
diff --git a/linux/x32/arch_sigreturn.c b/src/linux/x32/arch_sigreturn.c
index 9a778fc76..9a778fc76 100644
--- a/linux/x32/arch_sigreturn.c
+++ b/src/linux/x32/arch_sigreturn.c
diff --git a/linux/x32/asm_stat.h b/src/linux/x32/asm_stat.h
index 865aa4a09..865aa4a09 100644
--- a/linux/x32/asm_stat.h
+++ b/src/linux/x32/asm_stat.h
diff --git a/linux/x32/check_scno.c b/src/linux/x32/check_scno.c
index 423870128..423870128 100644
--- a/linux/x32/check_scno.c
+++ b/src/linux/x32/check_scno.c
diff --git a/linux/x32/get_error.c b/src/linux/x32/get_error.c
index 6c6fbaf37..6c6fbaf37 100644
--- a/linux/x32/get_error.c
+++ b/src/linux/x32/get_error.c
diff --git a/linux/x32/get_scno.c b/src/linux/x32/get_scno.c
index 492863fa6..492863fa6 100644
--- a/linux/x32/get_scno.c
+++ b/src/linux/x32/get_scno.c
diff --git a/linux/x32/get_syscall_args.c b/src/linux/x32/get_syscall_args.c
index 6cdb465b1..6cdb465b1 100644
--- a/linux/x32/get_syscall_args.c
+++ b/src/linux/x32/get_syscall_args.c
diff --git a/linux/x32/ioctls_arch0.h b/src/linux/x32/ioctls_arch0.h
index 7070560b7..7070560b7 100644
--- a/linux/x32/ioctls_arch0.h
+++ b/src/linux/x32/ioctls_arch0.h
diff --git a/linux/x32/ioctls_arch1.h b/src/linux/x32/ioctls_arch1.h
index 58a57064d..58a57064d 100644
--- a/linux/x32/ioctls_arch1.h
+++ b/src/linux/x32/ioctls_arch1.h
diff --git a/linux/x32/ioctls_inc0.h b/src/linux/x32/ioctls_inc0.h
index e1b94fa71..e1b94fa71 100644
--- a/linux/x32/ioctls_inc0.h
+++ b/src/linux/x32/ioctls_inc0.h
diff --git a/linux/x32/ioctls_inc1.h b/src/linux/x32/ioctls_inc1.h
index c9fcdf8fa..c9fcdf8fa 100644
--- a/linux/x32/ioctls_inc1.h
+++ b/src/linux/x32/ioctls_inc1.h
diff --git a/linux/x32/ptrace_pokeuser.c b/src/linux/x32/ptrace_pokeuser.c
index a4e70ffbe..a4e70ffbe 100644
--- a/linux/x32/ptrace_pokeuser.c
+++ b/src/linux/x32/ptrace_pokeuser.c
diff --git a/linux/x32/raw_syscall.h b/src/linux/x32/raw_syscall.h
index 6582aa8f1..6582aa8f1 100644
--- a/linux/x32/raw_syscall.h
+++ b/src/linux/x32/raw_syscall.h
diff --git a/linux/x32/rt_sigframe.h b/src/linux/x32/rt_sigframe.h
index 8452e890f..8452e890f 100644
--- a/linux/x32/rt_sigframe.h
+++ b/src/linux/x32/rt_sigframe.h
diff --git a/linux/x32/set_error.c b/src/linux/x32/set_error.c
index 66a732718..66a732718 100644
--- a/linux/x32/set_error.c
+++ b/src/linux/x32/set_error.c
diff --git a/linux/x32/set_scno.c b/src/linux/x32/set_scno.c
index 5f7cdb4bc..5f7cdb4bc 100644
--- a/linux/x32/set_scno.c
+++ b/src/linux/x32/set_scno.c
diff --git a/linux/x32/shuffle_scno.c b/src/linux/x32/shuffle_scno.c
index 0e1abb303..0e1abb303 100644
--- a/linux/x32/shuffle_scno.c
+++ b/src/linux/x32/shuffle_scno.c
diff --git a/linux/x32/syscallent.h b/src/linux/x32/syscallent.h
index 3c7fa0b52..3c7fa0b52 100644
--- a/linux/x32/syscallent.h
+++ b/src/linux/x32/syscallent.h
diff --git a/linux/x32/syscallent1.h b/src/linux/x32/syscallent1.h
index c9100de8a..c9100de8a 100644
--- a/linux/x32/syscallent1.h
+++ b/src/linux/x32/syscallent1.h
diff --git a/linux/x32/userent.h b/src/linux/x32/userent.h
index ae69a3f7b..ae69a3f7b 100644
--- a/linux/x32/userent.h
+++ b/src/linux/x32/userent.h
diff --git a/linux/x86_64/arch_defs_.h b/src/linux/x86_64/arch_defs_.h
index a4daf8727..a4daf8727 100644
--- a/linux/x86_64/arch_defs_.h
+++ b/src/linux/x86_64/arch_defs_.h
diff --git a/linux/x86_64/arch_get_personality.c b/src/linux/x86_64/arch_get_personality.c
index 0e5a3b4b7..0e5a3b4b7 100644
--- a/linux/x86_64/arch_get_personality.c
+++ b/src/linux/x86_64/arch_get_personality.c
diff --git a/linux/x86_64/arch_kvm.c b/src/linux/x86_64/arch_kvm.c
index cbc0cab87..cbc0cab87 100644
--- a/linux/x86_64/arch_kvm.c
+++ b/src/linux/x86_64/arch_kvm.c
diff --git a/linux/x86_64/arch_regs.c b/src/linux/x86_64/arch_regs.c
index 8878569e4..8878569e4 100644
--- a/linux/x86_64/arch_regs.c
+++ b/src/linux/x86_64/arch_regs.c
diff --git a/linux/x86_64/arch_regs.h b/src/linux/x86_64/arch_regs.h
index 08824f220..08824f220 100644
--- a/linux/x86_64/arch_regs.h
+++ b/src/linux/x86_64/arch_regs.h
diff --git a/linux/x86_64/arch_rt_sigframe.c b/src/linux/x86_64/arch_rt_sigframe.c
index bb60b44d4..bb60b44d4 100644
--- a/linux/x86_64/arch_rt_sigframe.c
+++ b/src/linux/x86_64/arch_rt_sigframe.c
diff --git a/linux/x86_64/arch_sigreturn.c b/src/linux/x86_64/arch_sigreturn.c
index 9f4f0d879..9f4f0d879 100644
--- a/linux/x86_64/arch_sigreturn.c
+++ b/src/linux/x86_64/arch_sigreturn.c
diff --git a/linux/x86_64/asm_stat.h b/src/linux/x86_64/asm_stat.h
index 91dd1aafc..91dd1aafc 100644
--- a/linux/x86_64/asm_stat.h
+++ b/src/linux/x86_64/asm_stat.h
diff --git a/linux/x86_64/get_error.c b/src/linux/x86_64/get_error.c
index 92b1a8446..92b1a8446 100644
--- a/linux/x86_64/get_error.c
+++ b/src/linux/x86_64/get_error.c
diff --git a/linux/x86_64/get_scno.c b/src/linux/x86_64/get_scno.c
index aab27ace3..aab27ace3 100644
--- a/linux/x86_64/get_scno.c
+++ b/src/linux/x86_64/get_scno.c
diff --git a/linux/x86_64/get_syscall_args.c b/src/linux/x86_64/get_syscall_args.c
index 60c6344b6..60c6344b6 100644
--- a/linux/x86_64/get_syscall_args.c
+++ b/src/linux/x86_64/get_syscall_args.c
diff --git a/linux/x86_64/getregs_old.c b/src/linux/x86_64/getregs_old.c
index 50e6a46bf..50e6a46bf 100644
--- a/linux/x86_64/getregs_old.c
+++ b/src/linux/x86_64/getregs_old.c
diff --git a/linux/x86_64/getregs_old.h b/src/linux/x86_64/getregs_old.h
index de4958231..de4958231 100644
--- a/linux/x86_64/getregs_old.h
+++ b/src/linux/x86_64/getregs_old.h
diff --git a/linux/x86_64/ioctls_arch0.h b/src/linux/x86_64/ioctls_arch0.h
index 5bcf9a806..5bcf9a806 100644
--- a/linux/x86_64/ioctls_arch0.h
+++ b/src/linux/x86_64/ioctls_arch0.h
diff --git a/linux/x86_64/ioctls_arch1.h b/src/linux/x86_64/ioctls_arch1.h
index 58a57064d..58a57064d 100644
--- a/linux/x86_64/ioctls_arch1.h
+++ b/src/linux/x86_64/ioctls_arch1.h
diff --git a/linux/x86_64/ioctls_arch2.h b/src/linux/x86_64/ioctls_arch2.h
index 41d00f92a..41d00f92a 100644
--- a/linux/x86_64/ioctls_arch2.h
+++ b/src/linux/x86_64/ioctls_arch2.h
diff --git a/linux/x86_64/ioctls_inc0.h b/src/linux/x86_64/ioctls_inc0.h
index f9939faa4..f9939faa4 100644
--- a/linux/x86_64/ioctls_inc0.h
+++ b/src/linux/x86_64/ioctls_inc0.h
diff --git a/linux/x86_64/ioctls_inc1.h b/src/linux/x86_64/ioctls_inc1.h
index c9fcdf8fa..c9fcdf8fa 100644
--- a/linux/x86_64/ioctls_inc1.h
+++ b/src/linux/x86_64/ioctls_inc1.h
diff --git a/linux/x86_64/ioctls_inc2.h b/src/linux/x86_64/ioctls_inc2.h
index 974966444..974966444 100644
--- a/linux/x86_64/ioctls_inc2.h
+++ b/src/linux/x86_64/ioctls_inc2.h
diff --git a/linux/x86_64/raw_syscall.h b/src/linux/x86_64/raw_syscall.h
index 66c3eaf97..66c3eaf97 100644
--- a/linux/x86_64/raw_syscall.h
+++ b/src/linux/x86_64/raw_syscall.h
diff --git a/linux/x86_64/rt_sigframe.h b/src/linux/x86_64/rt_sigframe.h
index afb0221ba..afb0221ba 100644
--- a/linux/x86_64/rt_sigframe.h
+++ b/src/linux/x86_64/rt_sigframe.h
diff --git a/linux/x86_64/set_error.c b/src/linux/x86_64/set_error.c
index 2c781b1d3..2c781b1d3 100644
--- a/linux/x86_64/set_error.c
+++ b/src/linux/x86_64/set_error.c
diff --git a/linux/x86_64/set_scno.c b/src/linux/x86_64/set_scno.c
index 51242c481..51242c481 100644
--- a/linux/x86_64/set_scno.c
+++ b/src/linux/x86_64/set_scno.c
diff --git a/linux/x86_64/shuffle_scno.c b/src/linux/x86_64/shuffle_scno.c
index 6b688345f..6b688345f 100644
--- a/linux/x86_64/shuffle_scno.c
+++ b/src/linux/x86_64/shuffle_scno.c
diff --git a/linux/x86_64/syscallent.h b/src/linux/x86_64/syscallent.h
index 2f01fab55..2f01fab55 100644
--- a/linux/x86_64/syscallent.h
+++ b/src/linux/x86_64/syscallent.h
diff --git a/linux/x86_64/syscallent1.h b/src/linux/x86_64/syscallent1.h
index c9100de8a..c9100de8a 100644
--- a/linux/x86_64/syscallent1.h
+++ b/src/linux/x86_64/syscallent1.h
diff --git a/linux/x86_64/syscallent2.h b/src/linux/x86_64/syscallent2.h
index 5e0df5328..5e0df5328 100644
--- a/linux/x86_64/syscallent2.h
+++ b/src/linux/x86_64/syscallent2.h
diff --git a/linux/x86_64/userent.h b/src/linux/x86_64/userent.h
index a8eab7d57..a8eab7d57 100644
--- a/linux/x86_64/userent.h
+++ b/src/linux/x86_64/userent.h
diff --git a/linux/xtensa/arch_regs.c b/src/linux/xtensa/arch_regs.c
index dfcc31507..dfcc31507 100644
--- a/linux/xtensa/arch_regs.c
+++ b/src/linux/xtensa/arch_regs.c
diff --git a/linux/xtensa/get_error.c b/src/linux/xtensa/get_error.c
index 70e6fa19a..70e6fa19a 100644
--- a/linux/xtensa/get_error.c
+++ b/src/linux/xtensa/get_error.c
diff --git a/linux/xtensa/get_scno.c b/src/linux/xtensa/get_scno.c
index f8edf9f2b..f8edf9f2b 100644
--- a/linux/xtensa/get_scno.c
+++ b/src/linux/xtensa/get_scno.c
diff --git a/linux/xtensa/get_syscall_args.c b/src/linux/xtensa/get_syscall_args.c
index 7bdc19850..7bdc19850 100644
--- a/linux/xtensa/get_syscall_args.c
+++ b/src/linux/xtensa/get_syscall_args.c
diff --git a/linux/xtensa/ioctls_arch0.h b/src/linux/xtensa/ioctls_arch0.h
index 2b8e30aaa..2b8e30aaa 100644
--- a/linux/xtensa/ioctls_arch0.h
+++ b/src/linux/xtensa/ioctls_arch0.h
diff --git a/linux/xtensa/ioctls_inc0.h b/src/linux/xtensa/ioctls_inc0.h
index 4aecf983e..4aecf983e 100644
--- a/linux/xtensa/ioctls_inc0.h
+++ b/src/linux/xtensa/ioctls_inc0.h
diff --git a/linux/xtensa/raw_syscall.h b/src/linux/xtensa/raw_syscall.h
index 883860ed8..883860ed8 100644
--- a/linux/xtensa/raw_syscall.h
+++ b/src/linux/xtensa/raw_syscall.h
diff --git a/linux/xtensa/set_error.c b/src/linux/xtensa/set_error.c
index 8fcc658ac..8fcc658ac 100644
--- a/linux/xtensa/set_error.c
+++ b/src/linux/xtensa/set_error.c
diff --git a/linux/xtensa/set_scno.c b/src/linux/xtensa/set_scno.c
index 8d38c13bc..8d38c13bc 100644
--- a/linux/xtensa/set_scno.c
+++ b/src/linux/xtensa/set_scno.c
diff --git a/linux/xtensa/syscallent.h b/src/linux/xtensa/syscallent.h
index 4ff2ad88f..4ff2ad88f 100644
--- a/linux/xtensa/syscallent.h
+++ b/src/linux/xtensa/syscallent.h
diff --git a/linux/xtensa/userent.h b/src/linux/xtensa/userent.h
index 71fa7d576..71fa7d576 100644
--- a/linux/xtensa/userent.h
+++ b/src/linux/xtensa/userent.h
diff --git a/list.h b/src/list.h
index ddaf33ca1..ddaf33ca1 100644
--- a/list.h
+++ b/src/list.h
diff --git a/listen.c b/src/listen.c
index b8ec00c3b..b8ec00c3b 100644
--- a/listen.c
+++ b/src/listen.c
diff --git a/lookup_dcookie.c b/src/lookup_dcookie.c
index 3e5fcb5ad..3e5fcb5ad 100644
--- a/lookup_dcookie.c
+++ b/src/lookup_dcookie.c
diff --git a/loop.c b/src/loop.c
index e45e094aa..e45e094aa 100644
--- a/loop.c
+++ b/src/loop.c
diff --git a/lseek.c b/src/lseek.c
index 8faa5c8d0..8faa5c8d0 100644
--- a/lseek.c
+++ b/src/lseek.c
diff --git a/macros.h b/src/macros.h
index edfa1ff5c..edfa1ff5c 100644
--- a/macros.h
+++ b/src/macros.h
diff --git a/mem.c b/src/mem.c
index 3f69aeb74..3f69aeb74 100644
--- a/mem.c
+++ b/src/mem.c
diff --git a/membarrier.c b/src/membarrier.c
index 4f933b5c9..4f933b5c9 100644
--- a/membarrier.c
+++ b/src/membarrier.c
diff --git a/memfd_create.c b/src/memfd_create.c
index f45b86fe6..f45b86fe6 100644
--- a/memfd_create.c
+++ b/src/memfd_create.c
diff --git a/mknod.c b/src/mknod.c
index 962e53877..962e53877 100644
--- a/mknod.c
+++ b/src/mknod.c
diff --git a/mmap_cache.c b/src/mmap_cache.c
index 25f15a2b1..25f15a2b1 100644
--- a/mmap_cache.c
+++ b/src/mmap_cache.c
diff --git a/mmap_cache.h b/src/mmap_cache.h
index aec62bf18..aec62bf18 100644
--- a/mmap_cache.h
+++ b/src/mmap_cache.h
diff --git a/mmap_notify.c b/src/mmap_notify.c
index 5fb71cedf..5fb71cedf 100644
--- a/mmap_notify.c
+++ b/src/mmap_notify.c
diff --git a/mmap_notify.h b/src/mmap_notify.h
index e0272ce70..e0272ce70 100644
--- a/mmap_notify.h
+++ b/src/mmap_notify.h
diff --git a/mmsghdr.c b/src/mmsghdr.c
index cc8917ba6..cc8917ba6 100644
--- a/mmsghdr.c
+++ b/src/mmsghdr.c
diff --git a/mount.c b/src/mount.c
index 9ccb714dc..9ccb714dc 100644
--- a/mount.c
+++ b/src/mount.c
diff --git a/move_mount.c b/src/move_mount.c
index dd67b3f42..dd67b3f42 100644
--- a/move_mount.c
+++ b/src/move_mount.c
diff --git a/mpers.awk b/src/mpers.awk
index f5414af6f..f5414af6f 100644
--- a/mpers.awk
+++ b/src/mpers.awk
diff --git a/mpers.sh b/src/mpers.sh
index b28ef703b..b28ef703b 100755
--- a/mpers.sh
+++ b/src/mpers.sh
diff --git a/mpers_test.sh b/src/mpers_test.sh
index f469702e1..f469702e1 100755
--- a/mpers_test.sh
+++ b/src/mpers_test.sh
diff --git a/mpers_type.h b/src/mpers_type.h
index 322cfa904..322cfa904 100644
--- a/mpers_type.h
+++ b/src/mpers_type.h
diff --git a/mq.c b/src/mq.c
index 555e92651..555e92651 100644
--- a/mq.c
+++ b/src/mq.c
diff --git a/msghdr.c b/src/msghdr.c
index 1174e1653..1174e1653 100644
--- a/msghdr.c
+++ b/src/msghdr.c
diff --git a/msghdr.h b/src/msghdr.h
index 7e56aa197..7e56aa197 100644
--- a/msghdr.h
+++ b/src/msghdr.h
diff --git a/mtd.c b/src/mtd.c
index 532f9fe5d..532f9fe5d 100644
--- a/mtd.c
+++ b/src/mtd.c
diff --git a/native_defs.h b/src/native_defs.h
index fca3b43b1..fca3b43b1 100644
--- a/native_defs.h
+++ b/src/native_defs.h
diff --git a/nbd_ioctl.c b/src/nbd_ioctl.c
index a43fdd96b..a43fdd96b 100644
--- a/nbd_ioctl.c
+++ b/src/nbd_ioctl.c
diff --git a/negated_errno.h b/src/negated_errno.h
index 06ae4d6e3..06ae4d6e3 100644
--- a/negated_errno.h
+++ b/src/negated_errno.h
diff --git a/net.c b/src/net.c
index 85bf04c6e..85bf04c6e 100644
--- a/net.c
+++ b/src/net.c
diff --git a/netlink.c b/src/netlink.c
index 74c1029d4..74c1029d4 100644
--- a/netlink.c
+++ b/src/netlink.c
diff --git a/netlink.h b/src/netlink.h
index a079362e8..a079362e8 100644
--- a/netlink.h
+++ b/src/netlink.h
diff --git a/netlink_crypto.c b/src/netlink_crypto.c
index 4cc5c4bee..4cc5c4bee 100644
--- a/netlink_crypto.c
+++ b/src/netlink_crypto.c
diff --git a/netlink_inet_diag.c b/src/netlink_inet_diag.c
index 2267c5be8..2267c5be8 100644
--- a/netlink_inet_diag.c
+++ b/src/netlink_inet_diag.c
diff --git a/netlink_kobject_uevent.c b/src/netlink_kobject_uevent.c
index 272537ced..272537ced 100644
--- a/netlink_kobject_uevent.c
+++ b/src/netlink_kobject_uevent.c
diff --git a/netlink_kobject_uevent.h b/src/netlink_kobject_uevent.h
index 3aea2532a..3aea2532a 100644
--- a/netlink_kobject_uevent.h
+++ b/src/netlink_kobject_uevent.h
diff --git a/netlink_netfilter.c b/src/netlink_netfilter.c
index d2d6e2f50..d2d6e2f50 100644
--- a/netlink_netfilter.c
+++ b/src/netlink_netfilter.c
diff --git a/netlink_netlink_diag.c b/src/netlink_netlink_diag.c
index eaba05393..eaba05393 100644
--- a/netlink_netlink_diag.c
+++ b/src/netlink_netlink_diag.c
diff --git a/netlink_packet_diag.c b/src/netlink_packet_diag.c
index d66a2ad09..d66a2ad09 100644
--- a/netlink_packet_diag.c
+++ b/src/netlink_packet_diag.c
diff --git a/netlink_route.c b/src/netlink_route.c
index 52f5da4ae..52f5da4ae 100644
--- a/netlink_route.c
+++ b/src/netlink_route.c
diff --git a/netlink_route.h b/src/netlink_route.h
index 62aecf7f8..62aecf7f8 100644
--- a/netlink_route.h
+++ b/src/netlink_route.h
diff --git a/netlink_selinux.c b/src/netlink_selinux.c
index 39e1f40ad..39e1f40ad 100644
--- a/netlink_selinux.c
+++ b/src/netlink_selinux.c
diff --git a/netlink_smc_diag.c b/src/netlink_smc_diag.c
index e2243a76a..e2243a76a 100644
--- a/netlink_smc_diag.c
+++ b/src/netlink_smc_diag.c
diff --git a/netlink_sock_diag.c b/src/netlink_sock_diag.c
index 519ce2d81..519ce2d81 100644
--- a/netlink_sock_diag.c
+++ b/src/netlink_sock_diag.c
diff --git a/netlink_sock_diag.h b/src/netlink_sock_diag.h
index 8eb5af210..8eb5af210 100644
--- a/netlink_sock_diag.h
+++ b/src/netlink_sock_diag.h
diff --git a/netlink_unix_diag.c b/src/netlink_unix_diag.c
index ad00f6e99..ad00f6e99 100644
--- a/netlink_unix_diag.c
+++ b/src/netlink_unix_diag.c
diff --git a/nlattr.c b/src/nlattr.c
index 9fba18cb4..9fba18cb4 100644
--- a/nlattr.c
+++ b/src/nlattr.c
diff --git a/nlattr.h b/src/nlattr.h
index 8b9b841fb..8b9b841fb 100644
--- a/nlattr.h
+++ b/src/nlattr.h
diff --git a/nsfs.c b/src/nsfs.c
index 7b804fb31..7b804fb31 100644
--- a/nsfs.c
+++ b/src/nsfs.c
diff --git a/nsfs.h b/src/nsfs.h
index 0f8106a9e..0f8106a9e 100644
--- a/nsfs.h
+++ b/src/nsfs.h
diff --git a/nsig.h b/src/nsig.h
index efedfe9e2..efedfe9e2 100644
--- a/nsig.h
+++ b/src/nsig.h
diff --git a/numa.c b/src/numa.c
index a4f177347..a4f177347 100644
--- a/numa.c
+++ b/src/numa.c
diff --git a/number_set.c b/src/number_set.c
index ee7cacc1d..ee7cacc1d 100644
--- a/number_set.c
+++ b/src/number_set.c
diff --git a/number_set.h b/src/number_set.h
index f1119154f..f1119154f 100644
--- a/number_set.h
+++ b/src/number_set.h
diff --git a/oldstat.c b/src/oldstat.c
index 196e5c0ca..196e5c0ca 100644
--- a/oldstat.c
+++ b/src/oldstat.c
diff --git a/open.c b/src/open.c
index f14a66d25..f14a66d25 100644
--- a/open.c
+++ b/src/open.c
diff --git a/open_tree.c b/src/open_tree.c
index 8f16fc95e..8f16fc95e 100644
--- a/open_tree.c
+++ b/src/open_tree.c
diff --git a/or1k_atomic.c b/src/or1k_atomic.c
index 1cfa1f2f2..1cfa1f2f2 100644
--- a/or1k_atomic.c
+++ b/src/or1k_atomic.c
diff --git a/pathtrace.c b/src/pathtrace.c
index 7c1841517..7c1841517 100644
--- a/pathtrace.c
+++ b/src/pathtrace.c
diff --git a/perf.c b/src/perf.c
index a1dbd9536..a1dbd9536 100644
--- a/perf.c
+++ b/src/perf.c
diff --git a/perf_event_struct.h b/src/perf_event_struct.h
index 69f53b89d..69f53b89d 100644
--- a/perf_event_struct.h
+++ b/src/perf_event_struct.h
diff --git a/perf_ioctl.c b/src/perf_ioctl.c
index 1fe522439..1fe522439 100644
--- a/perf_ioctl.c
+++ b/src/perf_ioctl.c
diff --git a/personality.c b/src/personality.c
index 47682aea6..47682aea6 100644
--- a/personality.c
+++ b/src/personality.c
diff --git a/pidfd_getfd.c b/src/pidfd_getfd.c
index dc263e27b..dc263e27b 100644
--- a/pidfd_getfd.c
+++ b/src/pidfd_getfd.c
diff --git a/pidfd_open.c b/src/pidfd_open.c
index 57cdd4573..57cdd4573 100644
--- a/pidfd_open.c
+++ b/src/pidfd_open.c
diff --git a/pidns.c b/src/pidns.c
index 20f5184be..20f5184be 100644
--- a/pidns.c
+++ b/src/pidns.c
diff --git a/pkeys.c b/src/pkeys.c
index 50dbd5796..50dbd5796 100644
--- a/pkeys.c
+++ b/src/pkeys.c
diff --git a/poll.c b/src/poll.c
index b59b8c304..b59b8c304 100644
--- a/poll.c
+++ b/src/poll.c
diff --git a/prctl.c b/src/prctl.c
index 19b0f5930..19b0f5930 100644
--- a/prctl.c
+++ b/src/prctl.c
diff --git a/print_dev_t.c b/src/print_dev_t.c
index 043ca8aa0..043ca8aa0 100644
--- a/print_dev_t.c
+++ b/src/print_dev_t.c
diff --git a/print_fields.h b/src/print_fields.h
index bce41e24c..bce41e24c 100644
--- a/print_fields.h
+++ b/src/print_fields.h
diff --git a/print_group_req.c b/src/print_group_req.c
index f7602f2a4..f7602f2a4 100644
--- a/print_group_req.c
+++ b/src/print_group_req.c
diff --git a/print_ifindex.c b/src/print_ifindex.c
index b6e5470b3..b6e5470b3 100644
--- a/print_ifindex.c
+++ b/src/print_ifindex.c
diff --git a/print_instruction_pointer.c b/src/print_instruction_pointer.c
index a25dc8f36..a25dc8f36 100644
--- a/print_instruction_pointer.c
+++ b/src/print_instruction_pointer.c
diff --git a/print_kernel_sigset.c b/src/print_kernel_sigset.c
index ee754dbea..ee754dbea 100644
--- a/print_kernel_sigset.c
+++ b/src/print_kernel_sigset.c
diff --git a/print_kernel_version.c b/src/print_kernel_version.c
index 3c32d27b2..3c32d27b2 100644
--- a/print_kernel_version.c
+++ b/src/print_kernel_version.c
diff --git a/print_mac.c b/src/print_mac.c
index c5d5f5c44..c5d5f5c44 100644
--- a/print_mac.c
+++ b/src/print_mac.c
diff --git a/print_mq_attr.c b/src/print_mq_attr.c
index 6a0da15f7..6a0da15f7 100644
--- a/print_mq_attr.c
+++ b/src/print_mq_attr.c
diff --git a/print_msgbuf.c b/src/print_msgbuf.c
index 108fddff7..108fddff7 100644
--- a/print_msgbuf.c
+++ b/src/print_msgbuf.c
diff --git a/print_sg_req_info.c b/src/print_sg_req_info.c
index d4d61be57..d4d61be57 100644
--- a/print_sg_req_info.c
+++ b/src/print_sg_req_info.c
diff --git a/print_sigevent.c b/src/print_sigevent.c
index 8ebb29b19..8ebb29b19 100644
--- a/print_sigevent.c
+++ b/src/print_sigevent.c
diff --git a/print_statfs.c b/src/print_statfs.c
index 4474df246..4474df246 100644
--- a/print_statfs.c
+++ b/src/print_statfs.c
diff --git a/print_struct_stat.c b/src/print_struct_stat.c
index 2abb0621e..2abb0621e 100644
--- a/print_struct_stat.c
+++ b/src/print_struct_stat.c
diff --git a/print_syscall_number.c b/src/print_syscall_number.c
index 5eaef4937..5eaef4937 100644
--- a/print_syscall_number.c
+++ b/src/print_syscall_number.c
diff --git a/print_time.c b/src/print_time.c
index 061fa6b56..061fa6b56 100644
--- a/print_time.c
+++ b/src/print_time.c
diff --git a/print_timespec.h b/src/print_timespec.h
index 806b06884..806b06884 100644
--- a/print_timespec.h
+++ b/src/print_timespec.h
diff --git a/print_timespec32.c b/src/print_timespec32.c
index ef74fa296..ef74fa296 100644
--- a/print_timespec32.c
+++ b/src/print_timespec32.c
diff --git a/print_timespec64.c b/src/print_timespec64.c
index 04fa7eeb5..04fa7eeb5 100644
--- a/print_timespec64.c
+++ b/src/print_timespec64.c
diff --git a/print_timeval.c b/src/print_timeval.c
index 380aed6a7..380aed6a7 100644
--- a/print_timeval.c
+++ b/src/print_timeval.c
diff --git a/print_timeval64.c b/src/print_timeval64.c
index faa8dd7bd..faa8dd7bd 100644
--- a/print_timeval64.c
+++ b/src/print_timeval64.c
diff --git a/print_timex.c b/src/print_timex.c
index 63fba4e2e..63fba4e2e 100644
--- a/print_timex.c
+++ b/src/print_timex.c
diff --git a/print_timex.h b/src/print_timex.h
index 5af06f917..5af06f917 100644
--- a/print_timex.h
+++ b/src/print_timex.h
diff --git a/print_utils.h b/src/print_utils.h
index 519cd4017..519cd4017 100644
--- a/print_utils.h
+++ b/src/print_utils.h
diff --git a/printmode.c b/src/printmode.c
index a53a6ce44..a53a6ce44 100644
--- a/printmode.c
+++ b/src/printmode.c
diff --git a/printrusage.c b/src/printrusage.c
index fe877445f..fe877445f 100644
--- a/printrusage.c
+++ b/src/printrusage.c
diff --git a/printsiginfo.c b/src/printsiginfo.c
index 3cae37657..3cae37657 100644
--- a/printsiginfo.c
+++ b/src/printsiginfo.c
diff --git a/printsiginfo.h b/src/printsiginfo.h
index ee5ecc8eb..ee5ecc8eb 100644
--- a/printsiginfo.h
+++ b/src/printsiginfo.h
diff --git a/process.c b/src/process.c
index a65492a50..a65492a50 100644
--- a/process.c
+++ b/src/process.c
diff --git a/process_vm.c b/src/process_vm.c
index 73f63015b..73f63015b 100644
--- a/process_vm.c
+++ b/src/process_vm.c
diff --git a/ptp.c b/src/ptp.c
index 44a360878..44a360878 100644
--- a/ptp.c
+++ b/src/ptp.c
diff --git a/ptrace.h b/src/ptrace.h
index 525d68e3c..525d68e3c 100644
--- a/ptrace.h
+++ b/src/ptrace.h
diff --git a/ptrace_syscall_info.c b/src/ptrace_syscall_info.c
index e4085a9cf..e4085a9cf 100644
--- a/ptrace_syscall_info.c
+++ b/src/ptrace_syscall_info.c
diff --git a/ptrace_syscall_info.h b/src/ptrace_syscall_info.h
index e3b598d8f..e3b598d8f 100644
--- a/ptrace_syscall_info.h
+++ b/src/ptrace_syscall_info.h
diff --git a/quota.c b/src/quota.c
index 5168b3dac..5168b3dac 100644
--- a/quota.c
+++ b/src/quota.c
diff --git a/random_ioctl.c b/src/random_ioctl.c
index b70b47aee..b70b47aee 100644
--- a/random_ioctl.c
+++ b/src/random_ioctl.c
diff --git a/readahead.c b/src/readahead.c
index 92d170aef..92d170aef 100644
--- a/readahead.c
+++ b/src/readahead.c
diff --git a/readlink.c b/src/readlink.c
index 1da019df2..1da019df2 100644
--- a/readlink.c
+++ b/src/readlink.c
diff --git a/reboot.c b/src/reboot.c
index e0fe65b1c..e0fe65b1c 100644
--- a/reboot.c
+++ b/src/reboot.c
diff --git a/regs.h b/src/regs.h
index f0f359ca5..f0f359ca5 100644
--- a/regs.h
+++ b/src/regs.h
diff --git a/renameat.c b/src/renameat.c
index 584ea0206..584ea0206 100644
--- a/renameat.c
+++ b/src/renameat.c
diff --git a/resource.c b/src/resource.c
index 26c172058..26c172058 100644
--- a/resource.c
+++ b/src/resource.c
diff --git a/retval.c b/src/retval.c
index 4d5721c80..4d5721c80 100644
--- a/retval.c
+++ b/src/retval.c
diff --git a/retval.h b/src/retval.h
index b8a5ee925..b8a5ee925 100644
--- a/retval.h
+++ b/src/retval.h
diff --git a/riscv.c b/src/riscv.c
index 825eb2936..825eb2936 100644
--- a/riscv.c
+++ b/src/riscv.c
diff --git a/rt_sigframe.c b/src/rt_sigframe.c
index ce21f3a35..ce21f3a35 100644
--- a/rt_sigframe.c
+++ b/src/rt_sigframe.c
diff --git a/rt_sigreturn.c b/src/rt_sigreturn.c
index cdbe7e927..cdbe7e927 100644
--- a/rt_sigreturn.c
+++ b/src/rt_sigreturn.c
diff --git a/rtc.c b/src/rtc.c
index 2217b5055..2217b5055 100644
--- a/rtc.c
+++ b/src/rtc.c
diff --git a/rtnl_addr.c b/src/rtnl_addr.c
index 8d43db750..8d43db750 100644
--- a/rtnl_addr.c
+++ b/src/rtnl_addr.c
diff --git a/rtnl_addrlabel.c b/src/rtnl_addrlabel.c
index c4b22f012..c4b22f012 100644
--- a/rtnl_addrlabel.c
+++ b/src/rtnl_addrlabel.c
diff --git a/rtnl_dcb.c b/src/rtnl_dcb.c
index f2c1b8077..f2c1b8077 100644
--- a/rtnl_dcb.c
+++ b/src/rtnl_dcb.c
diff --git a/rtnl_link.c b/src/rtnl_link.c
index 93507c290..93507c290 100644
--- a/rtnl_link.c
+++ b/src/rtnl_link.c
diff --git a/rtnl_mdb.c b/src/rtnl_mdb.c
index f34ec04aa..f34ec04aa 100644
--- a/rtnl_mdb.c
+++ b/src/rtnl_mdb.c
diff --git a/rtnl_neigh.c b/src/rtnl_neigh.c
index 118b4bb43..118b4bb43 100644
--- a/rtnl_neigh.c
+++ b/src/rtnl_neigh.c
diff --git a/rtnl_neightbl.c b/src/rtnl_neightbl.c
index 46a279f58..46a279f58 100644
--- a/rtnl_neightbl.c
+++ b/src/rtnl_neightbl.c
diff --git a/rtnl_netconf.c b/src/rtnl_netconf.c
index c567e2005..c567e2005 100644
--- a/rtnl_netconf.c
+++ b/src/rtnl_netconf.c
diff --git a/rtnl_nsid.c b/src/rtnl_nsid.c
index 5b7bab86b..5b7bab86b 100644
--- a/rtnl_nsid.c
+++ b/src/rtnl_nsid.c
diff --git a/rtnl_route.c b/src/rtnl_route.c
index 729b2c11d..729b2c11d 100644
--- a/rtnl_route.c
+++ b/src/rtnl_route.c
diff --git a/rtnl_rule.c b/src/rtnl_rule.c
index 93492b800..93492b800 100644
--- a/rtnl_rule.c
+++ b/src/rtnl_rule.c
diff --git a/rtnl_tc.c b/src/rtnl_tc.c
index 2d9ea205e..2d9ea205e 100644
--- a/rtnl_tc.c
+++ b/src/rtnl_tc.c
diff --git a/rtnl_tc_action.c b/src/rtnl_tc_action.c
index fefaced04..fefaced04 100644
--- a/rtnl_tc_action.c
+++ b/src/rtnl_tc_action.c
diff --git a/s390.c b/src/s390.c
index 451014610..451014610 100644
--- a/s390.c
+++ b/src/s390.c
diff --git a/sched.c b/src/sched.c
index 4999f9507..4999f9507 100644
--- a/sched.c
+++ b/src/sched.c
diff --git a/sched_attr.h b/src/sched_attr.h
index 35936745f..35936745f 100644
--- a/sched_attr.h
+++ b/src/sched_attr.h
diff --git a/scno.am b/src/scno.am
index d373db4b0..fd5069a12 100644
--- a/scno.am
+++ b/src/scno.am
@@ -8,14 +8,14 @@
 SCNO_CPPFLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 		$(ARCH_MFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS)
 
-syscallent.i: $(top_builddir)/config.h $(top_srcdir)/$(OS)/$(ARCH)/syscallent.h
+syscallent.i: $(top_builddir)/src/config.h $(top_srcdir)/src/$(OS)/$(ARCH)/syscallent.h
 	$(CPP) -P $(SCNO_CPPFLAGS) -include $^ -o $@
 
 digits = [[:digit:]][[:digit:]]*
 al_nums = [[:alnum:]_][[:alnum:]_]*
 SCNO_SED = /TRACE_INDIRECT_SUBCALL/d; s/^\[[[:space:]]*\($(digits)\([[:space:]]*+[[:space:]]*$(digits)\)\?\)\][[:space:]]*=[[:space:]]*{[^,]*,[^,]*,[^,]*,[[:space:]]*"\($(al_nums)\)"[[:space:]]*},.*/\#ifndef __NR_\3\n\# define __NR_\3 (SYSCALL_BIT | (\1))\n\#endif/p
 
-scno.h: $(top_srcdir)/scno.head syscallent.i
+scno.h: $(top_srcdir)/src/scno.head syscallent.i
 	echo '/* Generated by Makefile from $^; do not edit. */' > $@-t
 	cat $< >> $@-t
 	LC_ALL=C sed -n '$(SCNO_SED)' $(filter-out $<,$^) >> $@-t
diff --git a/scno.head b/src/scno.head
index 8e2e6e38f..8e2e6e38f 100644
--- a/scno.head
+++ b/src/scno.head
diff --git a/scsi.c b/src/scsi.c
index b3c034e1a..b3c034e1a 100644
--- a/scsi.c
+++ b/src/scsi.c
diff --git a/seccomp.c b/src/seccomp.c
index 761e9acf4..761e9acf4 100644
--- a/seccomp.c
+++ b/src/seccomp.c
diff --git a/sendfile.c b/src/sendfile.c
index f8ceda3e7..f8ceda3e7 100644
--- a/sendfile.c
+++ b/src/sendfile.c
diff --git a/sg_io_v3.c b/src/sg_io_v3.c
index cb48ad7e3..cb48ad7e3 100644
--- a/sg_io_v3.c
+++ b/src/sg_io_v3.c
diff --git a/sg_io_v4.c b/src/sg_io_v4.c
index 229acbb85..229acbb85 100644
--- a/sg_io_v4.c
+++ b/src/sg_io_v4.c
diff --git a/shutdown.c b/src/shutdown.c
index fba6e994d..fba6e994d 100644
--- a/shutdown.c
+++ b/src/shutdown.c
diff --git a/sigaltstack.c b/src/sigaltstack.c
index b6eca34f1..b6eca34f1 100644
--- a/sigaltstack.c
+++ b/src/sigaltstack.c
diff --git a/sigevent.h b/src/sigevent.h
index 85fd68471..85fd68471 100644
--- a/sigevent.h
+++ b/src/sigevent.h
diff --git a/signal.c b/src/signal.c
index f92464978..f92464978 100644
--- a/signal.c
+++ b/src/signal.c
diff --git a/signalfd.c b/src/signalfd.c
index d9dad4aef..d9dad4aef 100644
--- a/signalfd.c
+++ b/src/signalfd.c
diff --git a/sigreturn.c b/src/sigreturn.c
index 30cf75947..30cf75947 100644
--- a/sigreturn.c
+++ b/src/sigreturn.c
diff --git a/sock.c b/src/sock.c
index d587ca469..d587ca469 100644
--- a/sock.c
+++ b/src/sock.c
diff --git a/sockaddr.c b/src/sockaddr.c
index 62bc1c18d..62bc1c18d 100644
--- a/sockaddr.c
+++ b/src/sockaddr.c
diff --git a/socketcall.c b/src/socketcall.c
index cb0197a3f..cb0197a3f 100644
--- a/socketcall.c
+++ b/src/socketcall.c
diff --git a/socketutils.c b/src/socketutils.c
index 0c0f38319..0c0f38319 100644
--- a/socketutils.c
+++ b/src/socketutils.c
diff --git a/sparc.c b/src/sparc.c
index 608127a86..608127a86 100644
--- a/sparc.c
+++ b/src/sparc.c
diff --git a/sram_alloc.c b/src/sram_alloc.c
index c18e76607..c18e76607 100644
--- a/sram_alloc.c
+++ b/src/sram_alloc.c
diff --git a/stage_output.c b/src/stage_output.c
index 3bfbdba7d..3bfbdba7d 100644
--- a/stage_output.c
+++ b/src/stage_output.c
diff --git a/stat.c b/src/stat.c
index 623a1469b..623a1469b 100644
--- a/stat.c
+++ b/src/stat.c
diff --git a/stat.h b/src/stat.h
index daebbc76f..daebbc76f 100644
--- a/stat.h
+++ b/src/stat.h
diff --git a/stat64.c b/src/stat64.c
index 65993b253..65993b253 100644
--- a/stat64.c
+++ b/src/stat64.c
diff --git a/statfs.c b/src/statfs.c
index 36c99a11d..36c99a11d 100644
--- a/statfs.c
+++ b/src/statfs.c
diff --git a/statfs.h b/src/statfs.h
index 876dbcda8..876dbcda8 100644
--- a/statfs.h
+++ b/src/statfs.h
diff --git a/statfs64.c b/src/statfs64.c
index f42307c40..f42307c40 100644
--- a/statfs64.c
+++ b/src/statfs64.c
diff --git a/static_assert.h b/src/static_assert.h
index 349bcc7ab..349bcc7ab 100644
--- a/static_assert.h
+++ b/src/static_assert.h
diff --git a/statx.c b/src/statx.c
index 4973b0a63..4973b0a63 100644
--- a/statx.c
+++ b/src/statx.c
diff --git a/statx.h b/src/statx.h
index 1e11738bc..1e11738bc 100644
--- a/statx.h
+++ b/src/statx.h
diff --git a/strace-graph b/src/strace-graph
index 41739a3cb..41739a3cb 100755
--- a/strace-graph
+++ b/src/strace-graph
diff --git a/strace-log-merge b/src/strace-log-merge
index 93d87ba28..93d87ba28 100755
--- a/strace-log-merge
+++ b/src/strace-log-merge
diff --git a/strace.c b/src/strace.c
index 8adbe45fa..8adbe45fa 100644
--- a/strace.c
+++ b/src/strace.c
diff --git a/string_to_uint.c b/src/string_to_uint.c
index 6300f9bce..6300f9bce 100644
--- a/string_to_uint.c
+++ b/src/string_to_uint.c
diff --git a/string_to_uint.h b/src/string_to_uint.h
index 3eb9c8e70..3eb9c8e70 100644
--- a/string_to_uint.h
+++ b/src/string_to_uint.h
diff --git a/swapon.c b/src/swapon.c
index 87fd3c1fe..87fd3c1fe 100644
--- a/swapon.c
+++ b/src/swapon.c
diff --git a/sync_file_range.c b/src/sync_file_range.c
index b5637aad6..b5637aad6 100644
--- a/sync_file_range.c
+++ b/src/sync_file_range.c
diff --git a/sync_file_range2.c b/src/sync_file_range2.c
index dce5622b7..dce5622b7 100644
--- a/sync_file_range2.c
+++ b/src/sync_file_range2.c
diff --git a/syscall.c b/src/syscall.c
index 9691de5b5..9691de5b5 100644
--- a/syscall.c
+++ b/src/syscall.c
diff --git a/sysctl.c b/src/sysctl.c
index 3eab1266b..3eab1266b 100644
--- a/sysctl.c
+++ b/src/sysctl.c
diff --git a/sysent.h b/src/sysent.h
index eed15b25a..eed15b25a 100644
--- a/sysent.h
+++ b/src/sysent.h
diff --git a/sysent_shorthand_defs.h b/src/sysent_shorthand_defs.h
index e9c83f74c..e9c83f74c 100644
--- a/sysent_shorthand_defs.h
+++ b/src/sysent_shorthand_defs.h
diff --git a/sysent_shorthand_undefs.h b/src/sysent_shorthand_undefs.h
index 708dd552f..708dd552f 100644
--- a/sysent_shorthand_undefs.h
+++ b/src/sysent_shorthand_undefs.h
diff --git a/sysinfo.c b/src/sysinfo.c
index 202525952..202525952 100644
--- a/sysinfo.c
+++ b/src/sysinfo.c
diff --git a/syslog.c b/src/syslog.c
index e3420802a..e3420802a 100644
--- a/syslog.c
+++ b/src/syslog.c
diff --git a/sysmips.c b/src/sysmips.c
index db595a9de..db595a9de 100644
--- a/sysmips.c
+++ b/src/sysmips.c
diff --git a/tee.c b/src/tee.c
index abd70fb64..abd70fb64 100644
--- a/tee.c
+++ b/src/tee.c
diff --git a/term.c b/src/term.c
index b413a62a4..b413a62a4 100644
--- a/term.c
+++ b/src/term.c
diff --git a/time.c b/src/time.c
index b8b13177a..b8b13177a 100644
--- a/time.c
+++ b/src/time.c
diff --git a/times.c b/src/times.c
index 4729ea72e..4729ea72e 100644
--- a/times.c
+++ b/src/times.c
diff --git a/trace_event.h b/src/trace_event.h
index 9021fc550..9021fc550 100644
--- a/trace_event.h
+++ b/src/trace_event.h
diff --git a/trie.c b/src/trie.c
index c26368edc..c26368edc 100644
--- a/trie.c
+++ b/src/trie.c
diff --git a/trie.h b/src/trie.h
index da8f45e77..da8f45e77 100644
--- a/trie.h
+++ b/src/trie.h
diff --git a/truncate.c b/src/truncate.c
index 12918dd99..12918dd99 100644
--- a/truncate.c
+++ b/src/truncate.c
diff --git a/types/btrfs.h b/src/types/btrfs.h
index 41d4c3ff2..41d4c3ff2 100644
--- a/types/btrfs.h
+++ b/src/types/btrfs.h
diff --git a/types/cryptouser.h b/src/types/cryptouser.h
index 31aea9ca0..31aea9ca0 100644
--- a/types/cryptouser.h
+++ b/src/types/cryptouser.h
diff --git a/types/evdev.h b/src/types/evdev.h
index 06e8183ec..06e8183ec 100644
--- a/types/evdev.h
+++ b/src/types/evdev.h
diff --git a/types/fib_rules.h b/src/types/fib_rules.h
index e8b9f1422..e8b9f1422 100644
--- a/types/fib_rules.h
+++ b/src/types/fib_rules.h
diff --git a/types/fiemap.h b/src/types/fiemap.h
index 10f32e27b..10f32e27b 100644
--- a/types/fiemap.h
+++ b/src/types/fiemap.h
diff --git a/types/find_last_type_fields.awk b/src/types/find_last_type_fields.awk
index b9121e88c..b9121e88c 100644
--- a/types/find_last_type_fields.awk
+++ b/src/types/find_last_type_fields.awk
diff --git a/types/fs_0x94.h b/src/types/fs_0x94.h
index f55e146a6..f55e146a6 100644
--- a/types/fs_0x94.h
+++ b/src/types/fs_0x94.h
diff --git a/types/fs_x.h b/src/types/fs_x.h
index ba61396ae..ba61396ae 100644
--- a/types/fs_x.h
+++ b/src/types/fs_x.h
diff --git a/types/gen.sh b/src/types/gen.sh
index 6a38616ef..019c757e7 100755
--- a/types/gen.sh
+++ b/src/types/gen.sh
@@ -90,7 +90,7 @@ gen_m4_check()
 
 	local inc_expr1 inc_expr2 includes header_includes
 	inc_expr1='s/^#[[:space:]]*include[[:space:]]\+\(<[^>]\+>\).*/#include \1/p'
-	inc_expr2='s/^#[[:space:]]*include[[:space:]]\+"\([^"]\+\)".*/#include "\$srcdir\/\1"/p'
+	inc_expr2='s/^#[[:space:]]*include[[:space:]]\+"\([^"]\+\)".*/#include "\$srcdir\/src\/\1"/p'
 	includes="$(sed -n "$inc_expr1; $inc_expr2" "$input")"
 	header_includes="$(printf %s "$includes" |sed '$d')"
 
diff --git a/types/gpio.h b/src/types/gpio.h
index 67c981cae..67c981cae 100644
--- a/types/gpio.h
+++ b/src/types/gpio.h
diff --git a/types/io_uring.h b/src/types/io_uring.h
index 2fe1c13a4..2fe1c13a4 100644
--- a/types/io_uring.h
+++ b/src/types/io_uring.h
diff --git a/types/loop.h b/src/types/loop.h
index f5127b21e..f5127b21e 100644
--- a/types/loop.h
+++ b/src/types/loop.h
diff --git a/types/openat2.h b/src/types/openat2.h
index 1d9dd7050..1d9dd7050 100644
--- a/types/openat2.h
+++ b/src/types/openat2.h
diff --git a/types/rtnl_link.h b/src/types/rtnl_link.h
index 923df0882..923df0882 100644
--- a/types/rtnl_link.h
+++ b/src/types/rtnl_link.h
diff --git a/types/rtnl_mdb.h b/src/types/rtnl_mdb.h
index 789140b9a..789140b9a 100644
--- a/types/rtnl_mdb.h
+++ b/src/types/rtnl_mdb.h
diff --git a/types/rtnl_neightbl.h b/src/types/rtnl_neightbl.h
index 3bdd22a4a..3bdd22a4a 100644
--- a/types/rtnl_neightbl.h
+++ b/src/types/rtnl_neightbl.h
diff --git a/types/rtnl_route.h b/src/types/rtnl_route.h
index a355e7f53..a355e7f53 100644
--- a/types/rtnl_route.h
+++ b/src/types/rtnl_route.h
diff --git a/types/tee.h b/src/types/tee.h
index ab3a25de9..ab3a25de9 100644
--- a/types/tee.h
+++ b/src/types/tee.h
diff --git a/types/v4l2.h b/src/types/v4l2.h
index 59382001a..59382001a 100644
--- a/types/v4l2.h
+++ b/src/types/v4l2.h
diff --git a/ubi.c b/src/ubi.c
index 93cec79c4..93cec79c4 100644
--- a/ubi.c
+++ b/src/ubi.c
diff --git a/ucopy.c b/src/ucopy.c
index 59af86417..59af86417 100644
--- a/ucopy.c
+++ b/src/ucopy.c
diff --git a/uid.c b/src/uid.c
index 1292f1c83..1292f1c83 100644
--- a/uid.c
+++ b/src/uid.c
diff --git a/uid16.c b/src/uid16.c
index 9502c2d3a..9502c2d3a 100644
--- a/uid16.c
+++ b/src/uid16.c
diff --git a/umask.c b/src/umask.c
index 43de25e19..43de25e19 100644
--- a/umask.c
+++ b/src/umask.c
diff --git a/umount.c b/src/umount.c
index 7f431654b..7f431654b 100644
--- a/umount.c
+++ b/src/umount.c
diff --git a/uname.c b/src/uname.c
index 6e804295d..6e804295d 100644
--- a/uname.c
+++ b/src/uname.c
diff --git a/unwind-libdw.c b/src/unwind-libdw.c
index a16cdce7a..a16cdce7a 100644
--- a/unwind-libdw.c
+++ b/src/unwind-libdw.c
diff --git a/unwind-libunwind.c b/src/unwind-libunwind.c
index 76ec658fe..76ec658fe 100644
--- a/unwind-libunwind.c
+++ b/src/unwind-libunwind.c
diff --git a/unwind.c b/src/unwind.c
index 3d854d0e8..3d854d0e8 100644
--- a/unwind.c
+++ b/src/unwind.c
diff --git a/unwind.h b/src/unwind.h
index 1cf4c367b..1cf4c367b 100644
--- a/unwind.h
+++ b/src/unwind.h
diff --git a/upeek.c b/src/upeek.c
index b28b73cc4..b28b73cc4 100644
--- a/upeek.c
+++ b/src/upeek.c
diff --git a/upoke.c b/src/upoke.c
index b657b1a12..b657b1a12 100644
--- a/upoke.c
+++ b/src/upoke.c
diff --git a/userfaultfd.c b/src/userfaultfd.c
index 2b6c07657..2b6c07657 100644
--- a/userfaultfd.c
+++ b/src/userfaultfd.c
diff --git a/ustat.c b/src/ustat.c
index f69951e89..f69951e89 100644
--- a/ustat.c
+++ b/src/ustat.c
diff --git a/util.c b/src/util.c
index bb88376ab..bb88376ab 100644
--- a/util.c
+++ b/src/util.c
diff --git a/utime.c b/src/utime.c
index fdb41721a..fdb41721a 100644
--- a/utime.c
+++ b/src/utime.c
diff --git a/utimes.c b/src/utimes.c
index 7f351e518..7f351e518 100644
--- a/utimes.c
+++ b/src/utimes.c
diff --git a/v4l2.c b/src/v4l2.c
index 00edf5ebd..00edf5ebd 100644
--- a/v4l2.c
+++ b/src/v4l2.c
diff --git a/wait.c b/src/wait.c
index df2ace9ee..df2ace9ee 100644
--- a/wait.c
+++ b/src/wait.c
diff --git a/wait.h b/src/wait.h
index f4e626bc5..f4e626bc5 100644
--- a/wait.h
+++ b/src/wait.h
diff --git a/watchdog_ioctl.c b/src/watchdog_ioctl.c
index 160c5f52f..160c5f52f 100644
--- a/watchdog_ioctl.c
+++ b/src/watchdog_ioctl.c
diff --git a/xattr.c b/src/xattr.c
index 089b3e3a7..089b3e3a7 100644
--- a/xattr.c
+++ b/src/xattr.c
diff --git a/xfs_quota_stat.h b/src/xfs_quota_stat.h
index 3e78004a0..3e78004a0 100644
--- a/xfs_quota_stat.h
+++ b/src/xfs_quota_stat.h
diff --git a/xgetdents.c b/src/xgetdents.c
index f5764ab1a..f5764ab1a 100644
--- a/xgetdents.c
+++ b/src/xgetdents.c
diff --git a/xgetdents.h b/src/xgetdents.h
index 96fefc73b..96fefc73b 100644
--- a/xgetdents.h
+++ b/src/xgetdents.h
diff --git a/xlat.c b/src/xlat.c
index bc3378cee..bc3378cee 100644
--- a/xlat.c
+++ b/src/xlat.c
diff --git a/xlat.h b/src/xlat.h
index 05311bf98..05311bf98 100644
--- a/xlat.h
+++ b/src/xlat.h
diff --git a/xlat/access_modes.in b/src/xlat/access_modes.in
index 3e57702bb..3e57702bb 100644
--- a/xlat/access_modes.in
+++ b/src/xlat/access_modes.in
diff --git a/xlat/addrfams.in b/src/xlat/addrfams.in
index e6a623290..e6a623290 100644
--- a/xlat/addrfams.in
+++ b/src/xlat/addrfams.in
diff --git a/xlat/adjtimex_modes.in b/src/xlat/adjtimex_modes.in
index fa616e60c..fa616e60c 100644
--- a/xlat/adjtimex_modes.in
+++ b/src/xlat/adjtimex_modes.in
diff --git a/xlat/adjtimex_state.in b/src/xlat/adjtimex_state.in
index c4ec23c4c..c4ec23c4c 100644
--- a/xlat/adjtimex_state.in
+++ b/src/xlat/adjtimex_state.in
diff --git a/xlat/adjtimex_status.in b/src/xlat/adjtimex_status.in
index 7b83da884..7b83da884 100644
--- a/xlat/adjtimex_status.in
+++ b/src/xlat/adjtimex_status.in
diff --git a/xlat/advise.in b/src/xlat/advise.in
index 5284335f0..5284335f0 100644
--- a/xlat/advise.in
+++ b/src/xlat/advise.in
diff --git a/xlat/af_packet_types.in b/src/xlat/af_packet_types.in
index 68f751526..68f751526 100644
--- a/xlat/af_packet_types.in
+++ b/src/xlat/af_packet_types.in
diff --git a/xlat/af_packet_versions.in b/src/xlat/af_packet_versions.in
index 17a9f31a5..17a9f31a5 100644
--- a/xlat/af_packet_versions.in
+++ b/src/xlat/af_packet_versions.in
diff --git a/xlat/aio_cmds.in b/src/xlat/aio_cmds.in
index fd27d94ac..fd27d94ac 100644
--- a/xlat/aio_cmds.in
+++ b/src/xlat/aio_cmds.in
diff --git a/xlat/aio_iocb_flags.in b/src/xlat/aio_iocb_flags.in
index f6a5ab7cc..f6a5ab7cc 100644
--- a/xlat/aio_iocb_flags.in
+++ b/src/xlat/aio_iocb_flags.in
diff --git a/xlat/archvals.in b/src/xlat/archvals.in
index 1dbbb8d00..1dbbb8d00 100644
--- a/xlat/archvals.in
+++ b/src/xlat/archvals.in
diff --git a/xlat/arp_hardware_types.in b/src/xlat/arp_hardware_types.in
index 9b57da344..9b57da344 100644
--- a/xlat/arp_hardware_types.in
+++ b/src/xlat/arp_hardware_types.in
diff --git a/xlat/at_flags.in b/src/xlat/at_flags.in
index 6fe238921..6fe238921 100644
--- a/xlat/at_flags.in
+++ b/src/xlat/at_flags.in
diff --git a/xlat/at_statx_sync_types.in b/src/xlat/at_statx_sync_types.in
index 5d0ed494f..5d0ed494f 100644
--- a/xlat/at_statx_sync_types.in
+++ b/src/xlat/at_statx_sync_types.in
diff --git a/xlat/atomic_ops.in b/src/xlat/atomic_ops.in
index 42261ea54..42261ea54 100644
--- a/xlat/atomic_ops.in
+++ b/src/xlat/atomic_ops.in
diff --git a/xlat/audit_arch.in b/src/xlat/audit_arch.in
index 63d3fe52b..63d3fe52b 100644
--- a/xlat/audit_arch.in
+++ b/src/xlat/audit_arch.in
diff --git a/xlat/ax25_protocols.in b/src/xlat/ax25_protocols.in
index 9cac1a636..9cac1a636 100644
--- a/xlat/ax25_protocols.in
+++ b/src/xlat/ax25_protocols.in
diff --git a/xlat/baud_options.in b/src/xlat/baud_options.in
index be7311abe..be7311abe 100644
--- a/xlat/baud_options.in
+++ b/src/xlat/baud_options.in
diff --git a/xlat/bdaddr_types.in b/src/xlat/bdaddr_types.in
index b81b6fc34..b81b6fc34 100644
--- a/xlat/bdaddr_types.in
+++ b/src/xlat/bdaddr_types.in
diff --git a/xlat/blkpg_ops.in b/src/xlat/blkpg_ops.in
index f4dc1e169..f4dc1e169 100644
--- a/xlat/blkpg_ops.in
+++ b/src/xlat/blkpg_ops.in
diff --git a/xlat/block_ioctl_cmds.in b/src/xlat/block_ioctl_cmds.in
index 45c402f29..45c402f29 100644
--- a/xlat/block_ioctl_cmds.in
+++ b/src/xlat/block_ioctl_cmds.in
diff --git a/xlat/bluetooth_l2_cid.in b/src/xlat/bluetooth_l2_cid.in
index e2b47f732..e2b47f732 100644
--- a/xlat/bluetooth_l2_cid.in
+++ b/src/xlat/bluetooth_l2_cid.in
diff --git a/xlat/bluetooth_l2_psm.in b/src/xlat/bluetooth_l2_psm.in
index f83370432..f83370432 100644
--- a/xlat/bluetooth_l2_psm.in
+++ b/src/xlat/bluetooth_l2_psm.in
diff --git a/xlat/bootflags1.in b/src/xlat/bootflags1.in
index 420482310..420482310 100644
--- a/xlat/bootflags1.in
+++ b/src/xlat/bootflags1.in
diff --git a/xlat/bootflags2.in b/src/xlat/bootflags2.in
index 8daa342ea..8daa342ea 100644
--- a/xlat/bootflags2.in
+++ b/src/xlat/bootflags2.in
diff --git a/xlat/bootflags3.in b/src/xlat/bootflags3.in
index c0337e893..c0337e893 100644
--- a/xlat/bootflags3.in
+++ b/src/xlat/bootflags3.in
diff --git a/xlat/bpf_attach_flags.in b/src/xlat/bpf_attach_flags.in
index cee8d1918..cee8d1918 100644
--- a/xlat/bpf_attach_flags.in
+++ b/src/xlat/bpf_attach_flags.in
diff --git a/xlat/bpf_attach_type.in b/src/xlat/bpf_attach_type.in
index c2da7348e..c2da7348e 100644
--- a/xlat/bpf_attach_type.in
+++ b/src/xlat/bpf_attach_type.in
diff --git a/xlat/bpf_class.in b/src/xlat/bpf_class.in
index 69f6d1666..69f6d1666 100644
--- a/xlat/bpf_class.in
+++ b/src/xlat/bpf_class.in
diff --git a/xlat/bpf_commands.in b/src/xlat/bpf_commands.in
index 07fb7905c..07fb7905c 100644
--- a/xlat/bpf_commands.in
+++ b/src/xlat/bpf_commands.in
diff --git a/xlat/bpf_file_mode_flags.in b/src/xlat/bpf_file_mode_flags.in
index c345891aa..c345891aa 100644
--- a/xlat/bpf_file_mode_flags.in
+++ b/src/xlat/bpf_file_mode_flags.in
diff --git a/xlat/bpf_map_flags.in b/src/xlat/bpf_map_flags.in
index 6d034638d..6d034638d 100644
--- a/xlat/bpf_map_flags.in
+++ b/src/xlat/bpf_map_flags.in
diff --git a/xlat/bpf_map_lookup_elem_flags.in b/src/xlat/bpf_map_lookup_elem_flags.in
index 68c936b75..68c936b75 100644
--- a/xlat/bpf_map_lookup_elem_flags.in
+++ b/src/xlat/bpf_map_lookup_elem_flags.in
diff --git a/xlat/bpf_map_types.in b/src/xlat/bpf_map_types.in
index ff3a26046..ff3a26046 100644
--- a/xlat/bpf_map_types.in
+++ b/src/xlat/bpf_map_types.in
diff --git a/xlat/bpf_map_update_elem_flags.in b/src/xlat/bpf_map_update_elem_flags.in
index 03f362cbc..03f362cbc 100644
--- a/xlat/bpf_map_update_elem_flags.in
+++ b/src/xlat/bpf_map_update_elem_flags.in
diff --git a/xlat/bpf_miscop.in b/src/xlat/bpf_miscop.in
index 6df47b3a0..6df47b3a0 100644
--- a/xlat/bpf_miscop.in
+++ b/src/xlat/bpf_miscop.in
diff --git a/xlat/bpf_mode.in b/src/xlat/bpf_mode.in
index a412c0ed8..a412c0ed8 100644
--- a/xlat/bpf_mode.in
+++ b/src/xlat/bpf_mode.in
diff --git a/xlat/bpf_op_alu.in b/src/xlat/bpf_op_alu.in
index 5016a46ec..5016a46ec 100644
--- a/xlat/bpf_op_alu.in
+++ b/src/xlat/bpf_op_alu.in
diff --git a/xlat/bpf_op_jmp.in b/src/xlat/bpf_op_jmp.in
index 1e9b6f701..1e9b6f701 100644
--- a/xlat/bpf_op_jmp.in
+++ b/src/xlat/bpf_op_jmp.in
diff --git a/xlat/bpf_prog_flags.in b/src/xlat/bpf_prog_flags.in
index d4723c2ad..d4723c2ad 100644
--- a/xlat/bpf_prog_flags.in
+++ b/src/xlat/bpf_prog_flags.in
diff --git a/xlat/bpf_prog_types.in b/src/xlat/bpf_prog_types.in
index 2fcb1ef91..2fcb1ef91 100644
--- a/xlat/bpf_prog_types.in
+++ b/src/xlat/bpf_prog_types.in
diff --git a/xlat/bpf_query_flags.in b/src/xlat/bpf_query_flags.in
index b380ac1b3..b380ac1b3 100644
--- a/xlat/bpf_query_flags.in
+++ b/src/xlat/bpf_query_flags.in
diff --git a/xlat/bpf_rval.in b/src/xlat/bpf_rval.in
index 37073bd24..37073bd24 100644
--- a/xlat/bpf_rval.in
+++ b/src/xlat/bpf_rval.in
diff --git a/xlat/bpf_size.in b/src/xlat/bpf_size.in
index 104428fc4..104428fc4 100644
--- a/xlat/bpf_size.in
+++ b/src/xlat/bpf_size.in
diff --git a/xlat/bpf_src.in b/src/xlat/bpf_src.in
index 46237178a..46237178a 100644
--- a/xlat/bpf_src.in
+++ b/src/xlat/bpf_src.in
diff --git a/xlat/bpf_task_fd_type.in b/src/xlat/bpf_task_fd_type.in
index 33e89ada3..33e89ada3 100644
--- a/xlat/bpf_task_fd_type.in
+++ b/src/xlat/bpf_task_fd_type.in
diff --git a/xlat/bsg_flags.in b/src/xlat/bsg_flags.in
index 6ef777294..6ef777294 100644
--- a/xlat/bsg_flags.in
+++ b/src/xlat/bsg_flags.in
diff --git a/xlat/bsg_protocol.in b/src/xlat/bsg_protocol.in
index d47f15b78..d47f15b78 100644
--- a/xlat/bsg_protocol.in
+++ b/src/xlat/bsg_protocol.in
diff --git a/xlat/bsg_subprotocol.in b/src/xlat/bsg_subprotocol.in
index 5e63cd032..5e63cd032 100644
--- a/xlat/bsg_subprotocol.in
+++ b/src/xlat/bsg_subprotocol.in
diff --git a/xlat/bt_protocols.in b/src/xlat/bt_protocols.in
index a0ad05653..a0ad05653 100644
--- a/xlat/bt_protocols.in
+++ b/src/xlat/bt_protocols.in
diff --git a/xlat/btrfs_balance_args.in b/src/xlat/btrfs_balance_args.in
index ffeaacc08..ffeaacc08 100644
--- a/xlat/btrfs_balance_args.in
+++ b/src/xlat/btrfs_balance_args.in
diff --git a/xlat/btrfs_balance_ctl_cmds.in b/src/xlat/btrfs_balance_ctl_cmds.in
index 3e38dd9a2..3e38dd9a2 100644
--- a/xlat/btrfs_balance_ctl_cmds.in
+++ b/src/xlat/btrfs_balance_ctl_cmds.in
diff --git a/xlat/btrfs_balance_flags.in b/src/xlat/btrfs_balance_flags.in
index 00ae0d105..00ae0d105 100644
--- a/xlat/btrfs_balance_flags.in
+++ b/src/xlat/btrfs_balance_flags.in
diff --git a/xlat/btrfs_balance_state.in b/src/xlat/btrfs_balance_state.in
index 5dbfca5eb..5dbfca5eb 100644
--- a/xlat/btrfs_balance_state.in
+++ b/src/xlat/btrfs_balance_state.in
diff --git a/xlat/btrfs_compress_types.in b/src/xlat/btrfs_compress_types.in
index 595a2855f..595a2855f 100644
--- a/xlat/btrfs_compress_types.in
+++ b/src/xlat/btrfs_compress_types.in
diff --git a/xlat/btrfs_cont_reading_from_srcdev_mode.in b/src/xlat/btrfs_cont_reading_from_srcdev_mode.in
index 0ae8b5164..0ae8b5164 100644
--- a/xlat/btrfs_cont_reading_from_srcdev_mode.in
+++ b/src/xlat/btrfs_cont_reading_from_srcdev_mode.in
diff --git a/xlat/btrfs_defrag_flags.in b/src/xlat/btrfs_defrag_flags.in
index ae026c84e..ae026c84e 100644
--- a/xlat/btrfs_defrag_flags.in
+++ b/src/xlat/btrfs_defrag_flags.in
diff --git a/xlat/btrfs_dev_replace_cmds.in b/src/xlat/btrfs_dev_replace_cmds.in
index 18600f0f1..18600f0f1 100644
--- a/xlat/btrfs_dev_replace_cmds.in
+++ b/src/xlat/btrfs_dev_replace_cmds.in
diff --git a/xlat/btrfs_dev_replace_results.in b/src/xlat/btrfs_dev_replace_results.in
index bf8928239..bf8928239 100644
--- a/xlat/btrfs_dev_replace_results.in
+++ b/src/xlat/btrfs_dev_replace_results.in
diff --git a/xlat/btrfs_dev_replace_state.in b/src/xlat/btrfs_dev_replace_state.in
index bbc0ba150..bbc0ba150 100644
--- a/xlat/btrfs_dev_replace_state.in
+++ b/src/xlat/btrfs_dev_replace_state.in
diff --git a/xlat/btrfs_dev_stats_flags.in b/src/xlat/btrfs_dev_stats_flags.in
index 9ff56c33a..9ff56c33a 100644
--- a/xlat/btrfs_dev_stats_flags.in
+++ b/src/xlat/btrfs_dev_stats_flags.in
diff --git a/xlat/btrfs_dev_stats_values.in b/src/xlat/btrfs_dev_stats_values.in
index 47644b07b..47644b07b 100644
--- a/xlat/btrfs_dev_stats_values.in
+++ b/src/xlat/btrfs_dev_stats_values.in
diff --git a/xlat/btrfs_features_compat.in b/src/xlat/btrfs_features_compat.in
index e69de29bb..e69de29bb 100644
--- a/xlat/btrfs_features_compat.in
+++ b/src/xlat/btrfs_features_compat.in
diff --git a/xlat/btrfs_features_compat_ro.in b/src/xlat/btrfs_features_compat_ro.in
index 5a745ee38..5a745ee38 100644
--- a/xlat/btrfs_features_compat_ro.in
+++ b/src/xlat/btrfs_features_compat_ro.in
diff --git a/xlat/btrfs_features_incompat.in b/src/xlat/btrfs_features_incompat.in
index 248772b59..248772b59 100644
--- a/xlat/btrfs_features_incompat.in
+++ b/src/xlat/btrfs_features_incompat.in
diff --git a/xlat/btrfs_key_types.in b/src/xlat/btrfs_key_types.in
index 5721e6009..5721e6009 100644
--- a/xlat/btrfs_key_types.in
+++ b/src/xlat/btrfs_key_types.in
diff --git a/xlat/btrfs_logical_ino_args_flags.in b/src/xlat/btrfs_logical_ino_args_flags.in
index 5eea6c240..5eea6c240 100644
--- a/xlat/btrfs_logical_ino_args_flags.in
+++ b/src/xlat/btrfs_logical_ino_args_flags.in
diff --git a/xlat/btrfs_qgroup_ctl_cmds.in b/src/xlat/btrfs_qgroup_ctl_cmds.in
index 05e200363..05e200363 100644
--- a/xlat/btrfs_qgroup_ctl_cmds.in
+++ b/src/xlat/btrfs_qgroup_ctl_cmds.in
diff --git a/xlat/btrfs_qgroup_inherit_flags.in b/src/xlat/btrfs_qgroup_inherit_flags.in
index 0e133b9cb..0e133b9cb 100644
--- a/xlat/btrfs_qgroup_inherit_flags.in
+++ b/src/xlat/btrfs_qgroup_inherit_flags.in
diff --git a/xlat/btrfs_qgroup_limit_flags.in b/src/xlat/btrfs_qgroup_limit_flags.in
index bac7abed9..bac7abed9 100644
--- a/xlat/btrfs_qgroup_limit_flags.in
+++ b/src/xlat/btrfs_qgroup_limit_flags.in
diff --git a/xlat/btrfs_qgroup_status_flags.in b/src/xlat/btrfs_qgroup_status_flags.in
index 86f60ac51..86f60ac51 100644
--- a/xlat/btrfs_qgroup_status_flags.in
+++ b/src/xlat/btrfs_qgroup_status_flags.in
diff --git a/xlat/btrfs_scrub_flags.in b/src/xlat/btrfs_scrub_flags.in
index 914de3d12..914de3d12 100644
--- a/xlat/btrfs_scrub_flags.in
+++ b/src/xlat/btrfs_scrub_flags.in
diff --git a/xlat/btrfs_send_flags.in b/src/xlat/btrfs_send_flags.in
index 652ef390f..652ef390f 100644
--- a/xlat/btrfs_send_flags.in
+++ b/src/xlat/btrfs_send_flags.in
diff --git a/xlat/btrfs_snap_flags_v2.in b/src/xlat/btrfs_snap_flags_v2.in
index 43ea5749b..43ea5749b 100644
--- a/xlat/btrfs_snap_flags_v2.in
+++ b/src/xlat/btrfs_snap_flags_v2.in
diff --git a/xlat/btrfs_space_info_flags.in b/src/xlat/btrfs_space_info_flags.in
index be6d1951d..be6d1951d 100644
--- a/xlat/btrfs_space_info_flags.in
+++ b/src/xlat/btrfs_space_info_flags.in
diff --git a/xlat/btrfs_tree_objectids.in b/src/xlat/btrfs_tree_objectids.in
index 0b6e598c5..0b6e598c5 100644
--- a/xlat/btrfs_tree_objectids.in
+++ b/src/xlat/btrfs_tree_objectids.in
diff --git a/xlat/cacheflush_flags.in b/src/xlat/cacheflush_flags.in
index 06ed0d6ca..06ed0d6ca 100644
--- a/xlat/cacheflush_flags.in
+++ b/src/xlat/cacheflush_flags.in
diff --git a/xlat/cacheflush_scope.in b/src/xlat/cacheflush_scope.in
index 5f91b9077..5f91b9077 100644
--- a/xlat/cacheflush_scope.in
+++ b/src/xlat/cacheflush_scope.in
diff --git a/xlat/caif_protocols.in b/src/xlat/caif_protocols.in
index 76ba89600..76ba89600 100644
--- a/xlat/caif_protocols.in
+++ b/src/xlat/caif_protocols.in
diff --git a/xlat/can_protocols.in b/src/xlat/can_protocols.in
index 05a7ae617..05a7ae617 100644
--- a/xlat/can_protocols.in
+++ b/src/xlat/can_protocols.in
diff --git a/xlat/cap.in b/src/xlat/cap.in
index b6af93ba9..b6af93ba9 100644
--- a/xlat/cap.in
+++ b/src/xlat/cap.in
diff --git a/xlat/cap_mask0.in b/src/xlat/cap_mask0.in
index 4c48b847c..4c48b847c 100644
--- a/xlat/cap_mask0.in
+++ b/src/xlat/cap_mask0.in
diff --git a/xlat/cap_mask1.in b/src/xlat/cap_mask1.in
index 82153e1dd..82153e1dd 100644
--- a/xlat/cap_mask1.in
+++ b/src/xlat/cap_mask1.in
diff --git a/xlat/cap_version.in b/src/xlat/cap_version.in
index 3d5b74464..3d5b74464 100644
--- a/xlat/cap_version.in
+++ b/src/xlat/cap_version.in
diff --git a/xlat/clockflags.in b/src/xlat/clockflags.in
index 2c3a82ff2..2c3a82ff2 100644
--- a/xlat/clockflags.in
+++ b/src/xlat/clockflags.in
diff --git a/xlat/clocknames.in b/src/xlat/clocknames.in
index 207ade8e7..207ade8e7 100644
--- a/xlat/clocknames.in
+++ b/src/xlat/clocknames.in
diff --git a/xlat/clone3_flags.in b/src/xlat/clone3_flags.in
index 9eb55e17a..9eb55e17a 100644
--- a/xlat/clone3_flags.in
+++ b/src/xlat/clone3_flags.in
diff --git a/xlat/clone_flags.in b/src/xlat/clone_flags.in
index 9c967234b..9c967234b 100644
--- a/xlat/clone_flags.in
+++ b/src/xlat/clone_flags.in
diff --git a/xlat/close_range_flags.in b/src/xlat/close_range_flags.in
index 5b4261e9c..5b4261e9c 100644
--- a/xlat/close_range_flags.in
+++ b/src/xlat/close_range_flags.in
diff --git a/xlat/cpuclocknames.in b/src/xlat/cpuclocknames.in
index b7b9a828e..b7b9a828e 100644
--- a/xlat/cpuclocknames.in
+++ b/src/xlat/cpuclocknames.in
diff --git a/xlat/crypto_msgs.in b/src/xlat/crypto_msgs.in
index 89426a9ac..89426a9ac 100644
--- a/xlat/crypto_msgs.in
+++ b/src/xlat/crypto_msgs.in
diff --git a/xlat/crypto_nl_attrs.in b/src/xlat/crypto_nl_attrs.in
index 7ec320739..7ec320739 100644
--- a/xlat/crypto_nl_attrs.in
+++ b/src/xlat/crypto_nl_attrs.in
diff --git a/xlat/dcb_commands.in b/src/xlat/dcb_commands.in
index 9b3f5c3ed..9b3f5c3ed 100644
--- a/xlat/dcb_commands.in
+++ b/src/xlat/dcb_commands.in
diff --git a/xlat/delete_module_flags.in b/src/xlat/delete_module_flags.in
index 8f0271180..8f0271180 100644
--- a/xlat/delete_module_flags.in
+++ b/src/xlat/delete_module_flags.in
diff --git a/xlat/dirent_types.in b/src/xlat/dirent_types.in
index b16cc21aa..b16cc21aa 100644
--- a/xlat/dirent_types.in
+++ b/src/xlat/dirent_types.in
diff --git a/xlat/dm_flags.in b/src/xlat/dm_flags.in
index fa734c813..fa734c813 100644
--- a/xlat/dm_flags.in
+++ b/src/xlat/dm_flags.in
diff --git a/xlat/ebpf_class.in b/src/xlat/ebpf_class.in
index 259bdd9d8..259bdd9d8 100644
--- a/xlat/ebpf_class.in
+++ b/src/xlat/ebpf_class.in
diff --git a/xlat/ebpf_mode.in b/src/xlat/ebpf_mode.in
index d8a65b6d4..d8a65b6d4 100644
--- a/xlat/ebpf_mode.in
+++ b/src/xlat/ebpf_mode.in
diff --git a/xlat/ebpf_op_alu.in b/src/xlat/ebpf_op_alu.in
index 2b46f200f..2b46f200f 100644
--- a/xlat/ebpf_op_alu.in
+++ b/src/xlat/ebpf_op_alu.in
diff --git a/xlat/ebpf_op_jmp.in b/src/xlat/ebpf_op_jmp.in
index 8d49cf674..8d49cf674 100644
--- a/xlat/ebpf_op_jmp.in
+++ b/src/xlat/ebpf_op_jmp.in
diff --git a/xlat/ebpf_regs.in b/src/xlat/ebpf_regs.in
index 9db066efe..9db066efe 100644
--- a/xlat/ebpf_regs.in
+++ b/src/xlat/ebpf_regs.in
diff --git a/xlat/ebpf_size.in b/src/xlat/ebpf_size.in
index 5f9afa385..5f9afa385 100644
--- a/xlat/ebpf_size.in
+++ b/src/xlat/ebpf_size.in
diff --git a/xlat/efd_flags.in b/src/xlat/efd_flags.in
index 258fb9f0d..258fb9f0d 100644
--- a/xlat/efd_flags.in
+++ b/src/xlat/efd_flags.in
diff --git a/xlat/elf_em.in b/src/xlat/elf_em.in
index 9ffbcd6e0..9ffbcd6e0 100644
--- a/xlat/elf_em.in
+++ b/src/xlat/elf_em.in
diff --git a/xlat/epollctls.in b/src/xlat/epollctls.in
index 2955c3a0d..2955c3a0d 100644
--- a/xlat/epollctls.in
+++ b/src/xlat/epollctls.in
diff --git a/xlat/epollevents.in b/src/xlat/epollevents.in
index 2dced0049..2dced0049 100644
--- a/xlat/epollevents.in
+++ b/src/xlat/epollevents.in
diff --git a/xlat/epollflags.in b/src/xlat/epollflags.in
index e7ebaafd4..e7ebaafd4 100644
--- a/xlat/epollflags.in
+++ b/src/xlat/epollflags.in
diff --git a/xlat/ethernet_protocols.in b/src/xlat/ethernet_protocols.in
index 6277b4f6a..6277b4f6a 100644
--- a/xlat/ethernet_protocols.in
+++ b/src/xlat/ethernet_protocols.in
diff --git a/xlat/evdev_abs.in b/src/xlat/evdev_abs.in
index e2d69000e..e2d69000e 100644
--- a/xlat/evdev_abs.in
+++ b/src/xlat/evdev_abs.in
diff --git a/xlat/evdev_autorepeat.in b/src/xlat/evdev_autorepeat.in
index 7ab7e2e75..7ab7e2e75 100644
--- a/xlat/evdev_autorepeat.in
+++ b/src/xlat/evdev_autorepeat.in
diff --git a/xlat/evdev_ev.in b/src/xlat/evdev_ev.in
index 4d81952b3..4d81952b3 100644
--- a/xlat/evdev_ev.in
+++ b/src/xlat/evdev_ev.in
diff --git a/xlat/evdev_ff_status.in b/src/xlat/evdev_ff_status.in
index 1f2815f76..1f2815f76 100644
--- a/xlat/evdev_ff_status.in
+++ b/src/xlat/evdev_ff_status.in
diff --git a/xlat/evdev_ff_types.in b/src/xlat/evdev_ff_types.in
index 71dc53822..71dc53822 100644
--- a/xlat/evdev_ff_types.in
+++ b/src/xlat/evdev_ff_types.in
diff --git a/xlat/evdev_ioctl_cmds.in b/src/xlat/evdev_ioctl_cmds.in
index 29a5864e7..29a5864e7 100644
--- a/xlat/evdev_ioctl_cmds.in
+++ b/src/xlat/evdev_ioctl_cmds.in
diff --git a/xlat/evdev_keycode.in b/src/xlat/evdev_keycode.in
index f9669d9ed..f9669d9ed 100644
--- a/xlat/evdev_keycode.in
+++ b/src/xlat/evdev_keycode.in
diff --git a/xlat/evdev_leds.in b/src/xlat/evdev_leds.in
index 6178bbd8a..6178bbd8a 100644
--- a/xlat/evdev_leds.in
+++ b/src/xlat/evdev_leds.in
diff --git a/xlat/evdev_misc.in b/src/xlat/evdev_misc.in
index 0528092ac..0528092ac 100644
--- a/xlat/evdev_misc.in
+++ b/src/xlat/evdev_misc.in
diff --git a/xlat/evdev_mtslots.in b/src/xlat/evdev_mtslots.in
index f0e36b37d..f0e36b37d 100644
--- a/xlat/evdev_mtslots.in
+++ b/src/xlat/evdev_mtslots.in
diff --git a/xlat/evdev_prop.in b/src/xlat/evdev_prop.in
index 5e7d025c2..5e7d025c2 100644
--- a/xlat/evdev_prop.in
+++ b/src/xlat/evdev_prop.in
diff --git a/xlat/evdev_relative_axes.in b/src/xlat/evdev_relative_axes.in
index 657289f72..657289f72 100644
--- a/xlat/evdev_relative_axes.in
+++ b/src/xlat/evdev_relative_axes.in
diff --git a/xlat/evdev_snd.in b/src/xlat/evdev_snd.in
index 22e51cc15..22e51cc15 100644
--- a/xlat/evdev_snd.in
+++ b/src/xlat/evdev_snd.in
diff --git a/xlat/evdev_switch.in b/src/xlat/evdev_switch.in
index 8f8087252..8f8087252 100644
--- a/xlat/evdev_switch.in
+++ b/src/xlat/evdev_switch.in
diff --git a/xlat/f_owner_types.in b/src/xlat/f_owner_types.in
index d1c0d3970..d1c0d3970 100644
--- a/xlat/f_owner_types.in
+++ b/src/xlat/f_owner_types.in
diff --git a/xlat/f_seals.in b/src/xlat/f_seals.in
index 3bdceeb4e..3bdceeb4e 100644
--- a/xlat/f_seals.in
+++ b/src/xlat/f_seals.in
diff --git a/xlat/faccessat_flags.in b/src/xlat/faccessat_flags.in
index d20e8cbcb..d20e8cbcb 100644
--- a/xlat/faccessat_flags.in
+++ b/src/xlat/faccessat_flags.in
diff --git a/xlat/falloc_flags.in b/src/xlat/falloc_flags.in
index 63c4bdbe2..63c4bdbe2 100644
--- a/xlat/falloc_flags.in
+++ b/src/xlat/falloc_flags.in
diff --git a/xlat/fan_classes.in b/src/xlat/fan_classes.in
index e7cd30787..e7cd30787 100644
--- a/xlat/fan_classes.in
+++ b/src/xlat/fan_classes.in
diff --git a/xlat/fan_event_flags.in b/src/xlat/fan_event_flags.in
index 210e2b126..210e2b126 100644
--- a/xlat/fan_event_flags.in
+++ b/src/xlat/fan_event_flags.in
diff --git a/xlat/fan_init_flags.in b/src/xlat/fan_init_flags.in
index 69501bbbc..69501bbbc 100644
--- a/xlat/fan_init_flags.in
+++ b/src/xlat/fan_init_flags.in
diff --git a/xlat/fan_mark_flags.in b/src/xlat/fan_mark_flags.in
index 56cd8e58f..56cd8e58f 100644
--- a/xlat/fan_mark_flags.in
+++ b/src/xlat/fan_mark_flags.in
diff --git a/xlat/fcntlcmds.in b/src/xlat/fcntlcmds.in
index 5602e6fff..5602e6fff 100644
--- a/xlat/fcntlcmds.in
+++ b/src/xlat/fcntlcmds.in
diff --git a/xlat/fdflags.in b/src/xlat/fdflags.in
index f6c02b437..f6c02b437 100644
--- a/xlat/fdflags.in
+++ b/src/xlat/fdflags.in
diff --git a/xlat/fib_rule_actions.in b/src/xlat/fib_rule_actions.in
index 181c2eabb..181c2eabb 100644
--- a/xlat/fib_rule_actions.in
+++ b/src/xlat/fib_rule_actions.in
diff --git a/xlat/fib_rule_flags.in b/src/xlat/fib_rule_flags.in
index 001db9a3c..001db9a3c 100644
--- a/xlat/fib_rule_flags.in
+++ b/src/xlat/fib_rule_flags.in
diff --git a/xlat/fiemap_extent_flags.in b/src/xlat/fiemap_extent_flags.in
index 4d8911ab0..4d8911ab0 100644
--- a/xlat/fiemap_extent_flags.in
+++ b/src/xlat/fiemap_extent_flags.in
diff --git a/xlat/fiemap_flags.in b/src/xlat/fiemap_flags.in
index aff729518..aff729518 100644
--- a/xlat/fiemap_flags.in
+++ b/src/xlat/fiemap_flags.in
diff --git a/xlat/flockcmds.in b/src/xlat/flockcmds.in
index d6bddb32b..d6bddb32b 100644
--- a/xlat/flockcmds.in
+++ b/src/xlat/flockcmds.in
diff --git a/xlat/fs_0x94_ioctl_cmds.in b/src/xlat/fs_0x94_ioctl_cmds.in
index bf13d8eda..bf13d8eda 100644
--- a/xlat/fs_0x94_ioctl_cmds.in
+++ b/src/xlat/fs_0x94_ioctl_cmds.in
diff --git a/xlat/fs_f_ioctl_cmds.in b/src/xlat/fs_f_ioctl_cmds.in
index ec431dbb7..ec431dbb7 100644
--- a/xlat/fs_f_ioctl_cmds.in
+++ b/src/xlat/fs_f_ioctl_cmds.in
diff --git a/xlat/fs_ioc_flags.in b/src/xlat/fs_ioc_flags.in
index c192ea48f..c192ea48f 100644
--- a/xlat/fs_ioc_flags.in
+++ b/src/xlat/fs_ioc_flags.in
diff --git a/xlat/fs_x_ioctl_cmds.in b/src/xlat/fs_x_ioctl_cmds.in
index 80af1f88e..80af1f88e 100644
--- a/xlat/fs_x_ioctl_cmds.in
+++ b/src/xlat/fs_x_ioctl_cmds.in
diff --git a/xlat/fs_xflags.in b/src/xlat/fs_xflags.in
index 42e4a89b2..42e4a89b2 100644
--- a/xlat/fs_xflags.in
+++ b/src/xlat/fs_xflags.in
diff --git a/xlat/fsconfig_cmds.in b/src/xlat/fsconfig_cmds.in
index be33679be..be33679be 100644
--- a/xlat/fsconfig_cmds.in
+++ b/src/xlat/fsconfig_cmds.in
diff --git a/xlat/fsmagic.in b/src/xlat/fsmagic.in
index 9cdaba519..9cdaba519 100644
--- a/xlat/fsmagic.in
+++ b/src/xlat/fsmagic.in
diff --git a/xlat/fsmount_flags.in b/src/xlat/fsmount_flags.in
index 8a3b95e4e..8a3b95e4e 100644
--- a/xlat/fsmount_flags.in
+++ b/src/xlat/fsmount_flags.in
diff --git a/xlat/fsopen_flags.in b/src/xlat/fsopen_flags.in
index ce01ddf0e..ce01ddf0e 100644
--- a/xlat/fsopen_flags.in
+++ b/src/xlat/fsopen_flags.in
diff --git a/xlat/fspick_flags.in b/src/xlat/fspick_flags.in
index 52ed0350e..52ed0350e 100644
--- a/xlat/fspick_flags.in
+++ b/src/xlat/fspick_flags.in
diff --git a/xlat/futexbitset.in b/src/xlat/futexbitset.in
index 1290c87c7..1290c87c7 100644
--- a/xlat/futexbitset.in
+++ b/src/xlat/futexbitset.in
diff --git a/xlat/futexops.in b/src/xlat/futexops.in
index 3e589ab3f..3e589ab3f 100644
--- a/xlat/futexops.in
+++ b/src/xlat/futexops.in
diff --git a/xlat/futexwakecmps.in b/src/xlat/futexwakecmps.in
index 96d92069b..96d92069b 100644
--- a/xlat/futexwakecmps.in
+++ b/src/xlat/futexwakecmps.in
diff --git a/xlat/futexwakeops.in b/src/xlat/futexwakeops.in
index 1086fecf8..1086fecf8 100644
--- a/xlat/futexwakeops.in
+++ b/src/xlat/futexwakeops.in
diff --git a/xlat/gen.sh b/src/xlat/gen.sh
index 0a1b946f2..a952cb822 100755
--- a/xlat/gen.sh
+++ b/src/xlat/gen.sh
@@ -392,9 +392,9 @@ gen_make()
 		printf 'xlat/%s.h ' "$@"
 		echo
 		for name; do
-			printf '$(top_srcdir)/xlat/%s.h: $(top_srcdir)/xlat/%s.in $(top_srcdir)/xlat/gen.sh\n' \
+			printf '$(top_srcdir)/src/xlat/%s.h: $(top_srcdir)/src/xlat/%s.in $(top_srcdir)/src/xlat/gen.sh\n' \
 				"${name}" "${name}"
-			echo '	$(AM_V_GEN)$(top_srcdir)/xlat/gen.sh $< $@'
+			echo '	$(AM_V_GEN)$(top_srcdir)/src/xlat/gen.sh $< $@'
 		done
 	) >"${output}"
 }
diff --git a/xlat/get_mempolicy_flags.in b/src/xlat/get_mempolicy_flags.in
index 4e8025b29..4e8025b29 100644
--- a/xlat/get_mempolicy_flags.in
+++ b/src/xlat/get_mempolicy_flags.in
diff --git a/xlat/getrandom_flags.in b/src/xlat/getrandom_flags.in
index 96fdcb00e..96fdcb00e 100644
--- a/xlat/getrandom_flags.in
+++ b/src/xlat/getrandom_flags.in
diff --git a/xlat/getsock_ip_options.in b/src/xlat/getsock_ip_options.in
index 7b054608c..7b054608c 100644
--- a/xlat/getsock_ip_options.in
+++ b/src/xlat/getsock_ip_options.in
diff --git a/xlat/getsock_ipv6_options.in b/src/xlat/getsock_ipv6_options.in
index 98c450fa7..98c450fa7 100644
--- a/xlat/getsock_ipv6_options.in
+++ b/src/xlat/getsock_ipv6_options.in
diff --git a/xlat/getsock_options.in b/src/xlat/getsock_options.in
index 6e4762393..6e4762393 100644
--- a/xlat/getsock_options.in
+++ b/src/xlat/getsock_options.in
diff --git a/xlat/gpio_event_flags.in b/src/xlat/gpio_event_flags.in
index c355b10bd..c355b10bd 100644
--- a/xlat/gpio_event_flags.in
+++ b/src/xlat/gpio_event_flags.in
diff --git a/xlat/gpio_handle_flags.in b/src/xlat/gpio_handle_flags.in
index 0c75034ee..0c75034ee 100644
--- a/xlat/gpio_handle_flags.in
+++ b/src/xlat/gpio_handle_flags.in
diff --git a/xlat/gpio_ioctl_cmds.in b/src/xlat/gpio_ioctl_cmds.in
index 1b3d70367..1b3d70367 100644
--- a/xlat/gpio_ioctl_cmds.in
+++ b/src/xlat/gpio_ioctl_cmds.in
diff --git a/xlat/gpio_line_flags.in b/src/xlat/gpio_line_flags.in
index a7d505e2d..a7d505e2d 100644
--- a/xlat/gpio_line_flags.in
+++ b/src/xlat/gpio_line_flags.in
diff --git a/xlat/gpio_v2_line_attr_ids.in b/src/xlat/gpio_v2_line_attr_ids.in
index 5217e4004..5217e4004 100644
--- a/xlat/gpio_v2_line_attr_ids.in
+++ b/src/xlat/gpio_v2_line_attr_ids.in
diff --git a/xlat/gpio_v2_line_flags.in b/src/xlat/gpio_v2_line_flags.in
index e2f0da35a..e2f0da35a 100644
--- a/xlat/gpio_v2_line_flags.in
+++ b/src/xlat/gpio_v2_line_flags.in
diff --git a/xlat/hci_channels.in b/src/xlat/hci_channels.in
index 42055bbee..42055bbee 100644
--- a/xlat/hci_channels.in
+++ b/src/xlat/hci_channels.in
diff --git a/xlat/hdio_drive_cmds.in b/src/xlat/hdio_drive_cmds.in
index 1158abb55..1158abb55 100644
--- a/xlat/hdio_drive_cmds.in
+++ b/src/xlat/hdio_drive_cmds.in
diff --git a/xlat/hw_breakpoint_len.in b/src/xlat/hw_breakpoint_len.in
index f2b91a033..f2b91a033 100644
--- a/xlat/hw_breakpoint_len.in
+++ b/src/xlat/hw_breakpoint_len.in
diff --git a/xlat/hw_breakpoint_type.in b/src/xlat/hw_breakpoint_type.in
index 4ffcaae13..4ffcaae13 100644
--- a/xlat/hw_breakpoint_type.in
+++ b/src/xlat/hw_breakpoint_type.in
diff --git a/xlat/icmpfilterflags.in b/src/xlat/icmpfilterflags.in
index dac579edb..dac579edb 100644
--- a/xlat/icmpfilterflags.in
+++ b/src/xlat/icmpfilterflags.in
diff --git a/xlat/if_dqblk_valid.in b/src/xlat/if_dqblk_valid.in
index 2b3ea549c..2b3ea549c 100644
--- a/xlat/if_dqblk_valid.in
+++ b/src/xlat/if_dqblk_valid.in
diff --git a/xlat/if_dqinfo_flags.in b/src/xlat/if_dqinfo_flags.in
index 914532c13..914532c13 100644
--- a/xlat/if_dqinfo_flags.in
+++ b/src/xlat/if_dqinfo_flags.in
diff --git a/xlat/if_dqinfo_valid.in b/src/xlat/if_dqinfo_valid.in
index 7d6eca685..7d6eca685 100644
--- a/xlat/if_dqinfo_valid.in
+++ b/src/xlat/if_dqinfo_valid.in
diff --git a/xlat/ifaddrflags.in b/src/xlat/ifaddrflags.in
index 19df46b18..19df46b18 100644
--- a/xlat/ifaddrflags.in
+++ b/src/xlat/ifaddrflags.in
diff --git a/xlat/iffflags.in b/src/xlat/iffflags.in
index 53b552402..53b552402 100644
--- a/xlat/iffflags.in
+++ b/src/xlat/iffflags.in
diff --git a/xlat/in6_addr_gen_mode.in b/src/xlat/in6_addr_gen_mode.in
index 5d01a135a..5d01a135a 100644
--- a/xlat/in6_addr_gen_mode.in
+++ b/src/xlat/in6_addr_gen_mode.in
diff --git a/xlat/inet6_devconf_indices.in b/src/xlat/inet6_devconf_indices.in
index 89efe7fbf..89efe7fbf 100644
--- a/xlat/inet6_devconf_indices.in
+++ b/src/xlat/inet6_devconf_indices.in
diff --git a/xlat/inet6_if_flags.in b/src/xlat/inet6_if_flags.in
index 634c9ab21..634c9ab21 100644
--- a/xlat/inet6_if_flags.in
+++ b/src/xlat/inet6_if_flags.in
diff --git a/xlat/inet_devconf_indices.in b/src/xlat/inet_devconf_indices.in
index dd262370a..dd262370a 100644
--- a/xlat/inet_devconf_indices.in
+++ b/src/xlat/inet_devconf_indices.in
diff --git a/xlat/inet_diag_attrs.in b/src/xlat/inet_diag_attrs.in
index dd0ae78b5..dd0ae78b5 100644
--- a/xlat/inet_diag_attrs.in
+++ b/src/xlat/inet_diag_attrs.in
diff --git a/xlat/inet_diag_bytecodes.in b/src/xlat/inet_diag_bytecodes.in
index d9f1eb57d..d9f1eb57d 100644
--- a/xlat/inet_diag_bytecodes.in
+++ b/src/xlat/inet_diag_bytecodes.in
diff --git a/xlat/inet_diag_extended_flags.in b/src/xlat/inet_diag_extended_flags.in
index eeaa367d3..eeaa367d3 100644
--- a/xlat/inet_diag_extended_flags.in
+++ b/src/xlat/inet_diag_extended_flags.in
diff --git a/xlat/inet_diag_req_attrs.in b/src/xlat/inet_diag_req_attrs.in
index 26690d3db..26690d3db 100644
--- a/xlat/inet_diag_req_attrs.in
+++ b/src/xlat/inet_diag_req_attrs.in
diff --git a/xlat/inet_protocols.in b/src/xlat/inet_protocols.in
index 89aa56ac4..89aa56ac4 100644
--- a/xlat/inet_protocols.in
+++ b/src/xlat/inet_protocols.in
diff --git a/xlat/inotify_flags.in b/src/xlat/inotify_flags.in
index 671bd0e69..671bd0e69 100644
--- a/xlat/inotify_flags.in
+++ b/src/xlat/inotify_flags.in
diff --git a/xlat/inotify_init_flags.in b/src/xlat/inotify_init_flags.in
index 163fb8f7e..163fb8f7e 100644
--- a/xlat/inotify_init_flags.in
+++ b/src/xlat/inotify_init_flags.in
diff --git a/xlat/ioctl_dirs.in b/src/xlat/ioctl_dirs.in
index c069dd735..c069dd735 100644
--- a/xlat/ioctl_dirs.in
+++ b/src/xlat/ioctl_dirs.in
diff --git a/xlat/ioprio_class.in b/src/xlat/ioprio_class.in
index dafd17427..dafd17427 100644
--- a/xlat/ioprio_class.in
+++ b/src/xlat/ioprio_class.in
diff --git a/xlat/ioprio_who.in b/src/xlat/ioprio_who.in
index 2c2f4521d..2c2f4521d 100644
--- a/xlat/ioprio_who.in
+++ b/src/xlat/ioprio_who.in
diff --git a/xlat/ip_cmsg_types.in b/src/xlat/ip_cmsg_types.in
index 1bc81f496..1bc81f496 100644
--- a/xlat/ip_cmsg_types.in
+++ b/src/xlat/ip_cmsg_types.in
diff --git a/xlat/ip_type_of_services.in b/src/xlat/ip_type_of_services.in
index 41c526a12..41c526a12 100644
--- a/xlat/ip_type_of_services.in
+++ b/src/xlat/ip_type_of_services.in
diff --git a/xlat/ipc_msg_flags.in b/src/xlat/ipc_msg_flags.in
index c49392518..c49392518 100644
--- a/xlat/ipc_msg_flags.in
+++ b/src/xlat/ipc_msg_flags.in
diff --git a/xlat/ipc_private.in b/src/xlat/ipc_private.in
index b3b233be5..b3b233be5 100644
--- a/xlat/ipc_private.in
+++ b/src/xlat/ipc_private.in
diff --git a/xlat/ipccalls.in b/src/xlat/ipccalls.in
index b338678dc..b338678dc 100644
--- a/xlat/ipccalls.in
+++ b/src/xlat/ipccalls.in
diff --git a/xlat/irda_protocols.in b/src/xlat/irda_protocols.in
index e3cd40f64..e3cd40f64 100644
--- a/xlat/irda_protocols.in
+++ b/src/xlat/irda_protocols.in
diff --git a/xlat/isdn_protocols.in b/src/xlat/isdn_protocols.in
index a1936077f..a1936077f 100644
--- a/xlat/isdn_protocols.in
+++ b/src/xlat/isdn_protocols.in
diff --git a/xlat/itimer_which.in b/src/xlat/itimer_which.in
index 23635a23a..23635a23a 100644
--- a/xlat/itimer_which.in
+++ b/src/xlat/itimer_which.in
diff --git a/xlat/kcm_protocols.in b/src/xlat/kcm_protocols.in
index 0001455dc..0001455dc 100644
--- a/xlat/kcm_protocols.in
+++ b/src/xlat/kcm_protocols.in
diff --git a/xlat/kcmp_types.in b/src/xlat/kcmp_types.in
index 66f379250..66f379250 100644
--- a/xlat/kcmp_types.in
+++ b/src/xlat/kcmp_types.in
diff --git a/xlat/kexec_arch_values.in b/src/xlat/kexec_arch_values.in
index 5106f34dd..5106f34dd 100644
--- a/xlat/kexec_arch_values.in
+++ b/src/xlat/kexec_arch_values.in
diff --git a/xlat/kexec_file_load_flags.in b/src/xlat/kexec_file_load_flags.in
index 3ca755298..3ca755298 100644
--- a/xlat/kexec_file_load_flags.in
+++ b/src/xlat/kexec_file_load_flags.in
diff --git a/xlat/kexec_load_flags.in b/src/xlat/kexec_load_flags.in
index 4fa8b68b3..4fa8b68b3 100644
--- a/xlat/kexec_load_flags.in
+++ b/src/xlat/kexec_load_flags.in
diff --git a/xlat/key_perms.in b/src/xlat/key_perms.in
index c96a9ed99..c96a9ed99 100644
--- a/xlat/key_perms.in
+++ b/src/xlat/key_perms.in
diff --git a/xlat/key_reqkeys.in b/src/xlat/key_reqkeys.in
index ca60ca69f..ca60ca69f 100644
--- a/xlat/key_reqkeys.in
+++ b/src/xlat/key_reqkeys.in
diff --git a/xlat/key_spec.in b/src/xlat/key_spec.in
index 02d9ee044..02d9ee044 100644
--- a/xlat/key_spec.in
+++ b/src/xlat/key_spec.in
diff --git a/xlat/keyctl_caps0.in b/src/xlat/keyctl_caps0.in
index e73505275..e73505275 100644
--- a/xlat/keyctl_caps0.in
+++ b/src/xlat/keyctl_caps0.in
diff --git a/xlat/keyctl_caps1.in b/src/xlat/keyctl_caps1.in
index 3ee24ec9c..3ee24ec9c 100644
--- a/xlat/keyctl_caps1.in
+++ b/src/xlat/keyctl_caps1.in
diff --git a/xlat/keyctl_commands.in b/src/xlat/keyctl_commands.in
index e3d82ff52..e3d82ff52 100644
--- a/xlat/keyctl_commands.in
+++ b/src/xlat/keyctl_commands.in
diff --git a/xlat/keyctl_move_flags.in b/src/xlat/keyctl_move_flags.in
index 6588e2cc8..6588e2cc8 100644
--- a/xlat/keyctl_move_flags.in
+++ b/src/xlat/keyctl_move_flags.in
diff --git a/xlat/keyctl_pkey_ops.in b/src/xlat/keyctl_pkey_ops.in
index d77f1dfeb..d77f1dfeb 100644
--- a/xlat/keyctl_pkey_ops.in
+++ b/src/xlat/keyctl_pkey_ops.in
diff --git a/xlat/kvm_cap.in b/src/xlat/kvm_cap.in
index 8cb9f5b0e..8cb9f5b0e 100644
--- a/xlat/kvm_cap.in
+++ b/src/xlat/kvm_cap.in
diff --git a/xlat/kvm_cpuid_flags.in b/src/xlat/kvm_cpuid_flags.in
index 43640b762..43640b762 100644
--- a/xlat/kvm_cpuid_flags.in
+++ b/src/xlat/kvm_cpuid_flags.in
diff --git a/xlat/kvm_exit_reason.in b/src/xlat/kvm_exit_reason.in
index 973c708ca..973c708ca 100644
--- a/xlat/kvm_exit_reason.in
+++ b/src/xlat/kvm_exit_reason.in
diff --git a/xlat/kvm_mem_flags.in b/src/xlat/kvm_mem_flags.in
index 82b93ba77..82b93ba77 100644
--- a/xlat/kvm_mem_flags.in
+++ b/src/xlat/kvm_mem_flags.in
diff --git a/xlat/lockfcmds.in b/src/xlat/lockfcmds.in
index 2d65ba968..2d65ba968 100644
--- a/xlat/lockfcmds.in
+++ b/src/xlat/lockfcmds.in
diff --git a/xlat/loop_cmds.in b/src/xlat/loop_cmds.in
index 17cebe57e..17cebe57e 100644
--- a/xlat/loop_cmds.in
+++ b/src/xlat/loop_cmds.in
diff --git a/xlat/loop_crypt_type_options.in b/src/xlat/loop_crypt_type_options.in
index e9b7bddc5..e9b7bddc5 100644
--- a/xlat/loop_crypt_type_options.in
+++ b/src/xlat/loop_crypt_type_options.in
diff --git a/xlat/loop_flags_options.in b/src/xlat/loop_flags_options.in
index 03d11c4f3..03d11c4f3 100644
--- a/xlat/loop_flags_options.in
+++ b/src/xlat/loop_flags_options.in
diff --git a/xlat/lwtunnel_encap_types.in b/src/xlat/lwtunnel_encap_types.in
index 90a31127d..90a31127d 100644
--- a/xlat/lwtunnel_encap_types.in
+++ b/src/xlat/lwtunnel_encap_types.in
diff --git a/xlat/madvise_cmds.in b/src/xlat/madvise_cmds.in
index 3e8d63580..3e8d63580 100644
--- a/xlat/madvise_cmds.in
+++ b/src/xlat/madvise_cmds.in
diff --git a/xlat/mbind_flags.in b/src/xlat/mbind_flags.in
index 04f3ae65b..04f3ae65b 100644
--- a/xlat/mbind_flags.in
+++ b/src/xlat/mbind_flags.in
diff --git a/xlat/mctl_sync.in b/src/xlat/mctl_sync.in
index 1db406897..1db406897 100644
--- a/xlat/mctl_sync.in
+++ b/src/xlat/mctl_sync.in
diff --git a/xlat/mdb_flags.in b/src/xlat/mdb_flags.in
index b009cce5f..b009cce5f 100644
--- a/xlat/mdb_flags.in
+++ b/src/xlat/mdb_flags.in
diff --git a/xlat/mdb_states.in b/src/xlat/mdb_states.in
index 7a580b901..7a580b901 100644
--- a/xlat/mdb_states.in
+++ b/src/xlat/mdb_states.in
diff --git a/xlat/membarrier_cmds.in b/src/xlat/membarrier_cmds.in
index cfa683328..cfa683328 100644
--- a/xlat/membarrier_cmds.in
+++ b/src/xlat/membarrier_cmds.in
diff --git a/xlat/membarrier_flags.in b/src/xlat/membarrier_flags.in
index 3987d4160..3987d4160 100644
--- a/xlat/membarrier_flags.in
+++ b/src/xlat/membarrier_flags.in
diff --git a/xlat/memfd_create_flags.in b/src/xlat/memfd_create_flags.in
index 9dd625fb1..9dd625fb1 100644
--- a/xlat/memfd_create_flags.in
+++ b/src/xlat/memfd_create_flags.in
diff --git a/xlat/mlock_flags.in b/src/xlat/mlock_flags.in
index b285e673c..b285e673c 100644
--- a/xlat/mlock_flags.in
+++ b/src/xlat/mlock_flags.in
diff --git a/xlat/mlockall_flags.in b/src/xlat/mlockall_flags.in
index d9ad7afdb..d9ad7afdb 100644
--- a/xlat/mlockall_flags.in
+++ b/src/xlat/mlockall_flags.in
diff --git a/xlat/mmap_flags.in b/src/xlat/mmap_flags.in
index 0fb824030..0fb824030 100644
--- a/xlat/mmap_flags.in
+++ b/src/xlat/mmap_flags.in
diff --git a/xlat/mmap_prot.in b/src/xlat/mmap_prot.in
index e99ec2970..e99ec2970 100644
--- a/xlat/mmap_prot.in
+++ b/src/xlat/mmap_prot.in
diff --git a/xlat/modem_flags.in b/src/xlat/modem_flags.in
index ad42d5e61..ad42d5e61 100644
--- a/xlat/modem_flags.in
+++ b/src/xlat/modem_flags.in
diff --git a/xlat/modetypes.in b/src/xlat/modetypes.in
index 602cb0068..602cb0068 100644
--- a/xlat/modetypes.in
+++ b/src/xlat/modetypes.in
diff --git a/xlat/module_init_flags.in b/src/xlat/module_init_flags.in
index 1547189ce..1547189ce 100644
--- a/xlat/module_init_flags.in
+++ b/src/xlat/module_init_flags.in
diff --git a/xlat/mount_attr_flags.in b/src/xlat/mount_attr_flags.in
index f6356c193..f6356c193 100644
--- a/xlat/mount_attr_flags.in
+++ b/src/xlat/mount_attr_flags.in
diff --git a/xlat/mount_flags.in b/src/xlat/mount_flags.in
index 416cdd9c5..416cdd9c5 100644
--- a/xlat/mount_flags.in
+++ b/src/xlat/mount_flags.in
diff --git a/xlat/move_mount_flags.in b/src/xlat/move_mount_flags.in
index 441387c44..441387c44 100644
--- a/xlat/move_mount_flags.in
+++ b/src/xlat/move_mount_flags.in
diff --git a/xlat/move_pages_flags.in b/src/xlat/move_pages_flags.in
index 03555b899..03555b899 100644
--- a/xlat/move_pages_flags.in
+++ b/src/xlat/move_pages_flags.in
diff --git a/xlat/mpol_mode_flags.in b/src/xlat/mpol_mode_flags.in
index eeef95348..eeef95348 100644
--- a/xlat/mpol_mode_flags.in
+++ b/src/xlat/mpol_mode_flags.in
diff --git a/xlat/mpol_modes.in b/src/xlat/mpol_modes.in
index 93d1b10d5..93d1b10d5 100644
--- a/xlat/mpol_modes.in
+++ b/src/xlat/mpol_modes.in
diff --git a/xlat/mq_attr_flags.in b/src/xlat/mq_attr_flags.in
index 062207531..062207531 100644
--- a/xlat/mq_attr_flags.in
+++ b/src/xlat/mq_attr_flags.in
diff --git a/xlat/mremap_flags.in b/src/xlat/mremap_flags.in
index 065f6ed89..065f6ed89 100644
--- a/xlat/mremap_flags.in
+++ b/src/xlat/mremap_flags.in
diff --git a/xlat/msg_flags.in b/src/xlat/msg_flags.in
index 946b1326e..946b1326e 100644
--- a/xlat/msg_flags.in
+++ b/src/xlat/msg_flags.in
diff --git a/xlat/msgctl_flags.in b/src/xlat/msgctl_flags.in
index 20da35d87..20da35d87 100644
--- a/xlat/msgctl_flags.in
+++ b/src/xlat/msgctl_flags.in
diff --git a/xlat/mtd_file_mode_options.in b/src/xlat/mtd_file_mode_options.in
index cbe568c1f..cbe568c1f 100644
--- a/xlat/mtd_file_mode_options.in
+++ b/src/xlat/mtd_file_mode_options.in
diff --git a/xlat/mtd_flags_options.in b/src/xlat/mtd_flags_options.in
index 8b5a0a5e0..8b5a0a5e0 100644
--- a/xlat/mtd_flags_options.in
+++ b/src/xlat/mtd_flags_options.in
diff --git a/xlat/mtd_mode_options.in b/src/xlat/mtd_mode_options.in
index 01962f2ae..01962f2ae 100644
--- a/xlat/mtd_mode_options.in
+++ b/src/xlat/mtd_mode_options.in
diff --git a/xlat/mtd_nandecc_options.in b/src/xlat/mtd_nandecc_options.in
index cd96f3db0..cd96f3db0 100644
--- a/xlat/mtd_nandecc_options.in
+++ b/src/xlat/mtd_nandecc_options.in
diff --git a/xlat/mtd_otp_options.in b/src/xlat/mtd_otp_options.in
index a00248f73..a00248f73 100644
--- a/xlat/mtd_otp_options.in
+++ b/src/xlat/mtd_otp_options.in
diff --git a/xlat/mtd_type_options.in b/src/xlat/mtd_type_options.in
index 42643f9e9..42643f9e9 100644
--- a/xlat/mtd_type_options.in
+++ b/src/xlat/mtd_type_options.in
diff --git a/xlat/multicast_router_types.in b/src/xlat/multicast_router_types.in
index b53ea7893..b53ea7893 100644
--- a/xlat/multicast_router_types.in
+++ b/src/xlat/multicast_router_types.in
diff --git a/xlat/name_to_handle_at_flags.in b/src/xlat/name_to_handle_at_flags.in
index 4522a8014..4522a8014 100644
--- a/xlat/name_to_handle_at_flags.in
+++ b/src/xlat/name_to_handle_at_flags.in
diff --git a/xlat/nbd_ioctl_cmds.in b/src/xlat/nbd_ioctl_cmds.in
index 34f891e3e..34f891e3e 100644
--- a/xlat/nbd_ioctl_cmds.in
+++ b/src/xlat/nbd_ioctl_cmds.in
diff --git a/xlat/nbd_ioctl_flags.in b/src/xlat/nbd_ioctl_flags.in
index 60bb07f99..60bb07f99 100644
--- a/xlat/nbd_ioctl_flags.in
+++ b/src/xlat/nbd_ioctl_flags.in
diff --git a/xlat/neighbor_cache_entry_flags.in b/src/xlat/neighbor_cache_entry_flags.in
index 0f0a83ebf..0f0a83ebf 100644
--- a/xlat/neighbor_cache_entry_flags.in
+++ b/src/xlat/neighbor_cache_entry_flags.in
diff --git a/xlat/neighbor_cache_entry_states.in b/src/xlat/neighbor_cache_entry_states.in
index 5ae9c4dac..5ae9c4dac 100644
--- a/xlat/neighbor_cache_entry_states.in
+++ b/src/xlat/neighbor_cache_entry_states.in
diff --git a/xlat/netfilter_versions.in b/src/xlat/netfilter_versions.in
index 981ab4ac8..981ab4ac8 100644
--- a/xlat/netfilter_versions.in
+++ b/src/xlat/netfilter_versions.in
diff --git a/xlat/netlink_ack_flags.in b/src/xlat/netlink_ack_flags.in
index 8dd223ac4..8dd223ac4 100644
--- a/xlat/netlink_ack_flags.in
+++ b/src/xlat/netlink_ack_flags.in
diff --git a/xlat/netlink_delete_flags.in b/src/xlat/netlink_delete_flags.in
index 01af41db0..01af41db0 100644
--- a/xlat/netlink_delete_flags.in
+++ b/src/xlat/netlink_delete_flags.in
diff --git a/xlat/netlink_diag_attrs.in b/src/xlat/netlink_diag_attrs.in
index 420b29f39..420b29f39 100644
--- a/xlat/netlink_diag_attrs.in
+++ b/src/xlat/netlink_diag_attrs.in
diff --git a/xlat/netlink_diag_show.in b/src/xlat/netlink_diag_show.in
index eee9620e0..eee9620e0 100644
--- a/xlat/netlink_diag_show.in
+++ b/src/xlat/netlink_diag_show.in
diff --git a/xlat/netlink_flags.in b/src/xlat/netlink_flags.in
index d84f4ddb2..d84f4ddb2 100644
--- a/xlat/netlink_flags.in
+++ b/src/xlat/netlink_flags.in
diff --git a/xlat/netlink_get_flags.in b/src/xlat/netlink_get_flags.in
index 96ab4a065..96ab4a065 100644
--- a/xlat/netlink_get_flags.in
+++ b/src/xlat/netlink_get_flags.in
diff --git a/xlat/netlink_new_flags.in b/src/xlat/netlink_new_flags.in
index 4ef2fea63..4ef2fea63 100644
--- a/xlat/netlink_new_flags.in
+++ b/src/xlat/netlink_new_flags.in
diff --git a/xlat/netlink_protocols.in b/src/xlat/netlink_protocols.in
index 020718b85..020718b85 100644
--- a/xlat/netlink_protocols.in
+++ b/src/xlat/netlink_protocols.in
diff --git a/xlat/netlink_sk_meminfo_indices.in b/src/xlat/netlink_sk_meminfo_indices.in
index 1e2f7950d..1e2f7950d 100644
--- a/xlat/netlink_sk_meminfo_indices.in
+++ b/src/xlat/netlink_sk_meminfo_indices.in
diff --git a/xlat/netlink_socket_flags.in b/src/xlat/netlink_socket_flags.in
index f36e35c65..f36e35c65 100644
--- a/xlat/netlink_socket_flags.in
+++ b/src/xlat/netlink_socket_flags.in
diff --git a/xlat/netlink_states.in b/src/xlat/netlink_states.in
index d2ffb7bc8..d2ffb7bc8 100644
--- a/xlat/netlink_states.in
+++ b/src/xlat/netlink_states.in
diff --git a/xlat/netlink_types.in b/src/xlat/netlink_types.in
index ad4a841ec..ad4a841ec 100644
--- a/xlat/netlink_types.in
+++ b/src/xlat/netlink_types.in
diff --git a/xlat/nf_acct_msg_types.in b/src/xlat/nf_acct_msg_types.in
index b5c16024b..b5c16024b 100644
--- a/xlat/nf_acct_msg_types.in
+++ b/src/xlat/nf_acct_msg_types.in
diff --git a/xlat/nf_cthelper_msg_types.in b/src/xlat/nf_cthelper_msg_types.in
index 34959a83f..34959a83f 100644
--- a/xlat/nf_cthelper_msg_types.in
+++ b/src/xlat/nf_cthelper_msg_types.in
diff --git a/xlat/nf_ctnetlink_exp_msg_types.in b/src/xlat/nf_ctnetlink_exp_msg_types.in
index 0f4eed4f3..0f4eed4f3 100644
--- a/xlat/nf_ctnetlink_exp_msg_types.in
+++ b/src/xlat/nf_ctnetlink_exp_msg_types.in
diff --git a/xlat/nf_ctnetlink_msg_types.in b/src/xlat/nf_ctnetlink_msg_types.in
index ceec1c322..ceec1c322 100644
--- a/xlat/nf_ctnetlink_msg_types.in
+++ b/src/xlat/nf_ctnetlink_msg_types.in
diff --git a/xlat/nf_cttimeout_msg_types.in b/src/xlat/nf_cttimeout_msg_types.in
index cbb5429e3..cbb5429e3 100644
--- a/xlat/nf_cttimeout_msg_types.in
+++ b/src/xlat/nf_cttimeout_msg_types.in
diff --git a/xlat/nf_ipset_msg_types.in b/src/xlat/nf_ipset_msg_types.in
index 22410324e..22410324e 100644
--- a/xlat/nf_ipset_msg_types.in
+++ b/src/xlat/nf_ipset_msg_types.in
diff --git a/xlat/nf_nft_compat_msg_types.in b/src/xlat/nf_nft_compat_msg_types.in
index e2f7da1c3..e2f7da1c3 100644
--- a/xlat/nf_nft_compat_msg_types.in
+++ b/src/xlat/nf_nft_compat_msg_types.in
diff --git a/xlat/nf_nftables_msg_types.in b/src/xlat/nf_nftables_msg_types.in
index d1c6732bf..d1c6732bf 100644
--- a/xlat/nf_nftables_msg_types.in
+++ b/src/xlat/nf_nftables_msg_types.in
diff --git a/xlat/nf_osf_msg_types.in b/src/xlat/nf_osf_msg_types.in
index def28f777..def28f777 100644
--- a/xlat/nf_osf_msg_types.in
+++ b/src/xlat/nf_osf_msg_types.in
diff --git a/xlat/nf_queue_msg_types.in b/src/xlat/nf_queue_msg_types.in
index 76b113d82..76b113d82 100644
--- a/xlat/nf_queue_msg_types.in
+++ b/src/xlat/nf_queue_msg_types.in
diff --git a/xlat/nf_ulog_msg_types.in b/src/xlat/nf_ulog_msg_types.in
index 00b48559a..00b48559a 100644
--- a/xlat/nf_ulog_msg_types.in
+++ b/src/xlat/nf_ulog_msg_types.in
diff --git a/xlat/nfc_protocols.in b/src/xlat/nfc_protocols.in
index 277189764..277189764 100644
--- a/xlat/nfc_protocols.in
+++ b/src/xlat/nfc_protocols.in
diff --git a/xlat/nl_audit_types.in b/src/xlat/nl_audit_types.in
index 109bc6364..109bc6364 100644
--- a/xlat/nl_audit_types.in
+++ b/src/xlat/nl_audit_types.in
diff --git a/xlat/nl_crypto_types.in b/src/xlat/nl_crypto_types.in
index 021f85fca..021f85fca 100644
--- a/xlat/nl_crypto_types.in
+++ b/src/xlat/nl_crypto_types.in
diff --git a/xlat/nl_netfilter_msg_types.in b/src/xlat/nl_netfilter_msg_types.in
index dd13207ec..dd13207ec 100644
--- a/xlat/nl_netfilter_msg_types.in
+++ b/src/xlat/nl_netfilter_msg_types.in
diff --git a/xlat/nl_netfilter_subsys_ids.in b/src/xlat/nl_netfilter_subsys_ids.in
index 815d0772a..815d0772a 100644
--- a/xlat/nl_netfilter_subsys_ids.in
+++ b/src/xlat/nl_netfilter_subsys_ids.in
diff --git a/xlat/nl_route_types.in b/src/xlat/nl_route_types.in
index c389ab962..c389ab962 100644
--- a/xlat/nl_route_types.in
+++ b/src/xlat/nl_route_types.in
diff --git a/xlat/nl_selinux_types.in b/src/xlat/nl_selinux_types.in
index 1ac46053c..1ac46053c 100644
--- a/xlat/nl_selinux_types.in
+++ b/src/xlat/nl_selinux_types.in
diff --git a/xlat/nl_sock_diag_types.in b/src/xlat/nl_sock_diag_types.in
index 5c176c808..5c176c808 100644
--- a/xlat/nl_sock_diag_types.in
+++ b/src/xlat/nl_sock_diag_types.in
diff --git a/xlat/nl_xfrm_types.in b/src/xlat/nl_xfrm_types.in
index ee81394c3..ee81394c3 100644
--- a/xlat/nl_xfrm_types.in
+++ b/src/xlat/nl_xfrm_types.in
diff --git a/xlat/nlmsgerr_attrs.in b/src/xlat/nlmsgerr_attrs.in
index 7cc38d83e..7cc38d83e 100644
--- a/xlat/nlmsgerr_attrs.in
+++ b/src/xlat/nlmsgerr_attrs.in
diff --git a/xlat/notifyflags.in b/src/xlat/notifyflags.in
index e9f1492a1..e9f1492a1 100644
--- a/xlat/notifyflags.in
+++ b/src/xlat/notifyflags.in
diff --git a/xlat/nt_descriptor_types.in b/src/xlat/nt_descriptor_types.in
index 2be960076..2be960076 100644
--- a/xlat/nt_descriptor_types.in
+++ b/src/xlat/nt_descriptor_types.in
diff --git a/xlat/numa_node.in b/src/xlat/numa_node.in
index 414b35a9a..414b35a9a 100644
--- a/xlat/numa_node.in
+++ b/src/xlat/numa_node.in
diff --git a/xlat/open_access_modes.in b/src/xlat/open_access_modes.in
index 45dcd7374..45dcd7374 100644
--- a/xlat/open_access_modes.in
+++ b/src/xlat/open_access_modes.in
diff --git a/xlat/open_mode_flags.in b/src/xlat/open_mode_flags.in
index 82377e2bc..82377e2bc 100644
--- a/xlat/open_mode_flags.in
+++ b/src/xlat/open_mode_flags.in
diff --git a/xlat/open_resolve_flags.in b/src/xlat/open_resolve_flags.in
index 22d397a65..22d397a65 100644
--- a/xlat/open_resolve_flags.in
+++ b/src/xlat/open_resolve_flags.in
diff --git a/xlat/open_tree_flags.in b/src/xlat/open_tree_flags.in
index 3080dc083..3080dc083 100644
--- a/xlat/open_tree_flags.in
+++ b/src/xlat/open_tree_flags.in
diff --git a/xlat/packet_diag_attrs.in b/src/xlat/packet_diag_attrs.in
index 4f688b450..4f688b450 100644
--- a/xlat/packet_diag_attrs.in
+++ b/src/xlat/packet_diag_attrs.in
diff --git a/xlat/packet_diag_info_flags.in b/src/xlat/packet_diag_info_flags.in
index 7e591d853..7e591d853 100644
--- a/xlat/packet_diag_info_flags.in
+++ b/src/xlat/packet_diag_info_flags.in
diff --git a/xlat/packet_diag_show.in b/src/xlat/packet_diag_show.in
index b495af810..b495af810 100644
--- a/xlat/packet_diag_show.in
+++ b/src/xlat/packet_diag_show.in
diff --git a/xlat/packet_mreq_type.in b/src/xlat/packet_mreq_type.in
index 0d6adfe3a..0d6adfe3a 100644
--- a/xlat/packet_mreq_type.in
+++ b/src/xlat/packet_mreq_type.in
diff --git a/xlat/perf_attr_size.in b/src/xlat/perf_attr_size.in
index 9b5cf9894..9b5cf9894 100644
--- a/xlat/perf_attr_size.in
+++ b/src/xlat/perf_attr_size.in
diff --git a/xlat/perf_branch_sample_type.in b/src/xlat/perf_branch_sample_type.in
index 7ae59a65e..7ae59a65e 100644
--- a/xlat/perf_branch_sample_type.in
+++ b/src/xlat/perf_branch_sample_type.in
diff --git a/xlat/perf_event_open_flags.in b/src/xlat/perf_event_open_flags.in
index b2a3450e0..b2a3450e0 100644
--- a/xlat/perf_event_open_flags.in
+++ b/src/xlat/perf_event_open_flags.in
diff --git a/xlat/perf_event_read_format.in b/src/xlat/perf_event_read_format.in
index a270700fa..a270700fa 100644
--- a/xlat/perf_event_read_format.in
+++ b/src/xlat/perf_event_read_format.in
diff --git a/xlat/perf_event_sample_format.in b/src/xlat/perf_event_sample_format.in
index cfa2da65a..cfa2da65a 100644
--- a/xlat/perf_event_sample_format.in
+++ b/src/xlat/perf_event_sample_format.in
diff --git a/xlat/perf_hw_cache_id.in b/src/xlat/perf_hw_cache_id.in
index 40c2827d3..40c2827d3 100644
--- a/xlat/perf_hw_cache_id.in
+++ b/src/xlat/perf_hw_cache_id.in
diff --git a/xlat/perf_hw_cache_op_id.in b/src/xlat/perf_hw_cache_op_id.in
index 0b27e866d..0b27e866d 100644
--- a/xlat/perf_hw_cache_op_id.in
+++ b/src/xlat/perf_hw_cache_op_id.in
diff --git a/xlat/perf_hw_cache_op_result_id.in b/src/xlat/perf_hw_cache_op_result_id.in
index e40322902..e40322902 100644
--- a/xlat/perf_hw_cache_op_result_id.in
+++ b/src/xlat/perf_hw_cache_op_result_id.in
diff --git a/xlat/perf_hw_id.in b/src/xlat/perf_hw_id.in
index 3b0ce4a7c..3b0ce4a7c 100644
--- a/xlat/perf_hw_id.in
+++ b/src/xlat/perf_hw_id.in
diff --git a/xlat/perf_ioctl_cmds.in b/src/xlat/perf_ioctl_cmds.in
index bf7ad78a3..bf7ad78a3 100644
--- a/xlat/perf_ioctl_cmds.in
+++ b/src/xlat/perf_ioctl_cmds.in
diff --git a/xlat/perf_ioctl_flags.in b/src/xlat/perf_ioctl_flags.in
index 502f69a73..502f69a73 100644
--- a/xlat/perf_ioctl_flags.in
+++ b/src/xlat/perf_ioctl_flags.in
diff --git a/xlat/perf_sw_ids.in b/src/xlat/perf_sw_ids.in
index 0e097112c..0e097112c 100644
--- a/xlat/perf_sw_ids.in
+++ b/src/xlat/perf_sw_ids.in
diff --git a/xlat/perf_type_id.in b/src/xlat/perf_type_id.in
index 29f6f2b85..29f6f2b85 100644
--- a/xlat/perf_type_id.in
+++ b/src/xlat/perf_type_id.in
diff --git a/xlat/personality_flags.in b/src/xlat/personality_flags.in
index 886b5b998..886b5b998 100644
--- a/xlat/personality_flags.in
+++ b/src/xlat/personality_flags.in
diff --git a/xlat/personality_types.in b/src/xlat/personality_types.in
index 5b2f545de..5b2f545de 100644
--- a/xlat/personality_types.in
+++ b/src/xlat/personality_types.in
diff --git a/xlat/phonet_protocols.in b/src/xlat/phonet_protocols.in
index 5245ed7eb..5245ed7eb 100644
--- a/xlat/phonet_protocols.in
+++ b/src/xlat/phonet_protocols.in
diff --git a/xlat/pidfd_open_flags.in b/src/xlat/pidfd_open_flags.in
index aac14f2ae..aac14f2ae 100644
--- a/xlat/pidfd_open_flags.in
+++ b/src/xlat/pidfd_open_flags.in
diff --git a/xlat/pkey_access.in b/src/xlat/pkey_access.in
index 108eb3b73..108eb3b73 100644
--- a/xlat/pkey_access.in
+++ b/src/xlat/pkey_access.in
diff --git a/xlat/pollflags.in b/src/xlat/pollflags.in
index 8081e78ba..8081e78ba 100644
--- a/xlat/pollflags.in
+++ b/src/xlat/pollflags.in
diff --git a/xlat/pr_cap_ambient.in b/src/xlat/pr_cap_ambient.in
index 321fe364f..321fe364f 100644
--- a/xlat/pr_cap_ambient.in
+++ b/src/xlat/pr_cap_ambient.in
diff --git a/xlat/pr_dumpable.in b/src/xlat/pr_dumpable.in
index b73fb648d..b73fb648d 100644
--- a/xlat/pr_dumpable.in
+++ b/src/xlat/pr_dumpable.in
diff --git a/xlat/pr_fp_mode.in b/src/xlat/pr_fp_mode.in
index 8f1445466..8f1445466 100644
--- a/xlat/pr_fp_mode.in
+++ b/src/xlat/pr_fp_mode.in
diff --git a/xlat/pr_mce_kill.in b/src/xlat/pr_mce_kill.in
index 66f5121f2..66f5121f2 100644
--- a/xlat/pr_mce_kill.in
+++ b/src/xlat/pr_mce_kill.in
diff --git a/xlat/pr_mce_kill_policy.in b/src/xlat/pr_mce_kill_policy.in
index ad05cbf13..ad05cbf13 100644
--- a/xlat/pr_mce_kill_policy.in
+++ b/src/xlat/pr_mce_kill_policy.in
diff --git a/xlat/pr_set_mm.in b/src/xlat/pr_set_mm.in
index 65dda0809..65dda0809 100644
--- a/xlat/pr_set_mm.in
+++ b/src/xlat/pr_set_mm.in
diff --git a/xlat/pr_spec_cmds.in b/src/xlat/pr_spec_cmds.in
index 8e5ded0b3..8e5ded0b3 100644
--- a/xlat/pr_spec_cmds.in
+++ b/src/xlat/pr_spec_cmds.in
diff --git a/xlat/pr_spec_get_store_bypass_flags.in b/src/xlat/pr_spec_get_store_bypass_flags.in
index 64309c380..64309c380 100644
--- a/xlat/pr_spec_get_store_bypass_flags.in
+++ b/src/xlat/pr_spec_get_store_bypass_flags.in
diff --git a/xlat/pr_spec_set_store_bypass_flags.in b/src/xlat/pr_spec_set_store_bypass_flags.in
index 6f9b62595..6f9b62595 100644
--- a/xlat/pr_spec_set_store_bypass_flags.in
+++ b/src/xlat/pr_spec_set_store_bypass_flags.in
diff --git a/xlat/pr_sve_vl_flags.in b/src/xlat/pr_sve_vl_flags.in
index dcd699803..dcd699803 100644
--- a/xlat/pr_sve_vl_flags.in
+++ b/src/xlat/pr_sve_vl_flags.in
diff --git a/xlat/pr_tsc.in b/src/xlat/pr_tsc.in
index 2c3eb0026..2c3eb0026 100644
--- a/xlat/pr_tsc.in
+++ b/src/xlat/pr_tsc.in
diff --git a/xlat/pr_unalign_flags.in b/src/xlat/pr_unalign_flags.in
index 0d3f2ff84..0d3f2ff84 100644
--- a/xlat/pr_unalign_flags.in
+++ b/src/xlat/pr_unalign_flags.in
diff --git a/xlat/prctl_options.in b/src/xlat/prctl_options.in
index 892fff601..892fff601 100644
--- a/xlat/prctl_options.in
+++ b/src/xlat/prctl_options.in
diff --git a/xlat/priorities.in b/src/xlat/priorities.in
index d1eaaeeec..d1eaaeeec 100644
--- a/xlat/priorities.in
+++ b/src/xlat/priorities.in
diff --git a/xlat/ptp_extts_flags.in b/src/xlat/ptp_extts_flags.in
index 63e8fc97e..63e8fc97e 100644
--- a/xlat/ptp_extts_flags.in
+++ b/src/xlat/ptp_extts_flags.in
diff --git a/xlat/ptp_perout_flags.in b/src/xlat/ptp_perout_flags.in
index ecb0c298c..ecb0c298c 100644
--- a/xlat/ptp_perout_flags.in
+++ b/src/xlat/ptp_perout_flags.in
diff --git a/xlat/ptrace_cmds.in b/src/xlat/ptrace_cmds.in
index 48ae959b2..48ae959b2 100644
--- a/xlat/ptrace_cmds.in
+++ b/src/xlat/ptrace_cmds.in
diff --git a/xlat/ptrace_events.in b/src/xlat/ptrace_events.in
index a772e3c15..a772e3c15 100644
--- a/xlat/ptrace_events.in
+++ b/src/xlat/ptrace_events.in
diff --git a/xlat/ptrace_peeksiginfo_flags.in b/src/xlat/ptrace_peeksiginfo_flags.in
index 28a4c222c..28a4c222c 100644
--- a/xlat/ptrace_peeksiginfo_flags.in
+++ b/src/xlat/ptrace_peeksiginfo_flags.in
diff --git a/xlat/ptrace_setoptions_flags.in b/src/xlat/ptrace_setoptions_flags.in
index 8610c86dc..8610c86dc 100644
--- a/xlat/ptrace_setoptions_flags.in
+++ b/src/xlat/ptrace_setoptions_flags.in
diff --git a/xlat/ptrace_syscall_info_op.in b/src/xlat/ptrace_syscall_info_op.in
index 96e762099..96e762099 100644
--- a/xlat/ptrace_syscall_info_op.in
+++ b/src/xlat/ptrace_syscall_info_op.in
diff --git a/xlat/quota_formats.in b/src/xlat/quota_formats.in
index 6f59c058d..6f59c058d 100644
--- a/xlat/quota_formats.in
+++ b/src/xlat/quota_formats.in
diff --git a/xlat/quotacmds.in b/src/xlat/quotacmds.in
index 5ff19937c..5ff19937c 100644
--- a/xlat/quotacmds.in
+++ b/src/xlat/quotacmds.in
diff --git a/xlat/quotatypes.in b/src/xlat/quotatypes.in
index fec94f8b9..fec94f8b9 100644
--- a/xlat/quotatypes.in
+++ b/src/xlat/quotatypes.in
diff --git a/xlat/random_ioctl_cmds.in b/src/xlat/random_ioctl_cmds.in
index 1b31dc527..1b31dc527 100644
--- a/xlat/random_ioctl_cmds.in
+++ b/src/xlat/random_ioctl_cmds.in
diff --git a/xlat/rename_flags.in b/src/xlat/rename_flags.in
index 8d96b9b49..8d96b9b49 100644
--- a/xlat/rename_flags.in
+++ b/src/xlat/rename_flags.in
diff --git a/xlat/resource_flags.in b/src/xlat/resource_flags.in
index e7ce9c6e3..e7ce9c6e3 100644
--- a/xlat/resource_flags.in
+++ b/src/xlat/resource_flags.in
diff --git a/xlat/resources.in b/src/xlat/resources.in
index f12cb855d..f12cb855d 100644
--- a/xlat/resources.in
+++ b/src/xlat/resources.in
diff --git a/xlat/riscv_flush_icache_flags.in b/src/xlat/riscv_flush_icache_flags.in
index 173da0762..173da0762 100644
--- a/xlat/riscv_flush_icache_flags.in
+++ b/src/xlat/riscv_flush_icache_flags.in
diff --git a/xlat/route_nexthop_flags.in b/src/xlat/route_nexthop_flags.in
index a64a98859..a64a98859 100644
--- a/xlat/route_nexthop_flags.in
+++ b/src/xlat/route_nexthop_flags.in
diff --git a/xlat/routing_flags.in b/src/xlat/routing_flags.in
index 28501a27f..28501a27f 100644
--- a/xlat/routing_flags.in
+++ b/src/xlat/routing_flags.in
diff --git a/xlat/routing_protocols.in b/src/xlat/routing_protocols.in
index 4c6897d8a..4c6897d8a 100644
--- a/xlat/routing_protocols.in
+++ b/src/xlat/routing_protocols.in
diff --git a/xlat/routing_scopes.in b/src/xlat/routing_scopes.in
index c431e9f2e..c431e9f2e 100644
--- a/xlat/routing_scopes.in
+++ b/src/xlat/routing_scopes.in
diff --git a/xlat/routing_table_ids.in b/src/xlat/routing_table_ids.in
index 6a1f79777..6a1f79777 100644
--- a/xlat/routing_table_ids.in
+++ b/src/xlat/routing_table_ids.in
diff --git a/xlat/routing_types.in b/src/xlat/routing_types.in
index e9656a7d1..e9656a7d1 100644
--- a/xlat/routing_types.in
+++ b/src/xlat/routing_types.in
diff --git a/xlat/rtc_ioctl_cmds.in b/src/xlat/rtc_ioctl_cmds.in
index cc781982f..cc781982f 100644
--- a/xlat/rtc_ioctl_cmds.in
+++ b/src/xlat/rtc_ioctl_cmds.in
diff --git a/xlat/rtc_vl_flags.in b/src/xlat/rtc_vl_flags.in
index b82618271..b82618271 100644
--- a/xlat/rtc_vl_flags.in
+++ b/src/xlat/rtc_vl_flags.in
diff --git a/xlat/rtnl_addr_attrs.in b/src/xlat/rtnl_addr_attrs.in
index 71a9afb48..71a9afb48 100644
--- a/xlat/rtnl_addr_attrs.in
+++ b/src/xlat/rtnl_addr_attrs.in
diff --git a/xlat/rtnl_addrlabel_attrs.in b/src/xlat/rtnl_addrlabel_attrs.in
index bae0b6075..bae0b6075 100644
--- a/xlat/rtnl_addrlabel_attrs.in
+++ b/src/xlat/rtnl_addrlabel_attrs.in
diff --git a/xlat/rtnl_dcb_attrs.in b/src/xlat/rtnl_dcb_attrs.in
index 19cac7782..19cac7782 100644
--- a/xlat/rtnl_dcb_attrs.in
+++ b/src/xlat/rtnl_dcb_attrs.in
diff --git a/xlat/rtnl_ifla_af_spec_inet6_attrs.in b/src/xlat/rtnl_ifla_af_spec_inet6_attrs.in
index 9717d5aa2..9717d5aa2 100644
--- a/xlat/rtnl_ifla_af_spec_inet6_attrs.in
+++ b/src/xlat/rtnl_ifla_af_spec_inet6_attrs.in
diff --git a/xlat/rtnl_ifla_af_spec_inet_attrs.in b/src/xlat/rtnl_ifla_af_spec_inet_attrs.in
index 79799758c..79799758c 100644
--- a/xlat/rtnl_ifla_af_spec_inet_attrs.in
+++ b/src/xlat/rtnl_ifla_af_spec_inet_attrs.in
diff --git a/xlat/rtnl_ifla_brport_attrs.in b/src/xlat/rtnl_ifla_brport_attrs.in
index 2a5150bbc..2a5150bbc 100644
--- a/xlat/rtnl_ifla_brport_attrs.in
+++ b/src/xlat/rtnl_ifla_brport_attrs.in
diff --git a/xlat/rtnl_ifla_events.in b/src/xlat/rtnl_ifla_events.in
index ff7ca83f1..ff7ca83f1 100644
--- a/xlat/rtnl_ifla_events.in
+++ b/src/xlat/rtnl_ifla_events.in
diff --git a/xlat/rtnl_ifla_info_attrs.in b/src/xlat/rtnl_ifla_info_attrs.in
index 2b1445c42..2b1445c42 100644
--- a/xlat/rtnl_ifla_info_attrs.in
+++ b/src/xlat/rtnl_ifla_info_attrs.in
diff --git a/xlat/rtnl_ifla_info_data_bridge_attrs.in b/src/xlat/rtnl_ifla_info_data_bridge_attrs.in
index 87988471e..87988471e 100644
--- a/xlat/rtnl_ifla_info_data_bridge_attrs.in
+++ b/src/xlat/rtnl_ifla_info_data_bridge_attrs.in
diff --git a/xlat/rtnl_ifla_info_data_tun_attrs.in b/src/xlat/rtnl_ifla_info_data_tun_attrs.in
index 2ac187e3f..2ac187e3f 100644
--- a/xlat/rtnl_ifla_info_data_tun_attrs.in
+++ b/src/xlat/rtnl_ifla_info_data_tun_attrs.in
diff --git a/xlat/rtnl_ifla_port_attrs.in b/src/xlat/rtnl_ifla_port_attrs.in
index e498c6993..e498c6993 100644
--- a/xlat/rtnl_ifla_port_attrs.in
+++ b/src/xlat/rtnl_ifla_port_attrs.in
diff --git a/xlat/rtnl_ifla_vf_port_attrs.in b/src/xlat/rtnl_ifla_vf_port_attrs.in
index afff1f3fb..afff1f3fb 100644
--- a/xlat/rtnl_ifla_vf_port_attrs.in
+++ b/src/xlat/rtnl_ifla_vf_port_attrs.in
diff --git a/xlat/rtnl_ifla_xdp_attached_mode.in b/src/xlat/rtnl_ifla_xdp_attached_mode.in
index 2d8365e99..2d8365e99 100644
--- a/xlat/rtnl_ifla_xdp_attached_mode.in
+++ b/src/xlat/rtnl_ifla_xdp_attached_mode.in
diff --git a/xlat/rtnl_ifla_xdp_attrs.in b/src/xlat/rtnl_ifla_xdp_attrs.in
index d743ac8a8..d743ac8a8 100644
--- a/xlat/rtnl_ifla_xdp_attrs.in
+++ b/src/xlat/rtnl_ifla_xdp_attrs.in
diff --git a/xlat/rtnl_link_attrs.in b/src/xlat/rtnl_link_attrs.in
index 904494125..904494125 100644
--- a/xlat/rtnl_link_attrs.in
+++ b/src/xlat/rtnl_link_attrs.in
diff --git a/xlat/rtnl_mdb_attrs.in b/src/xlat/rtnl_mdb_attrs.in
index 9db05cd1e..9db05cd1e 100644
--- a/xlat/rtnl_mdb_attrs.in
+++ b/src/xlat/rtnl_mdb_attrs.in
diff --git a/xlat/rtnl_mdba_mdb_attrs.in b/src/xlat/rtnl_mdba_mdb_attrs.in
index 41f396272..41f396272 100644
--- a/xlat/rtnl_mdba_mdb_attrs.in
+++ b/src/xlat/rtnl_mdba_mdb_attrs.in
diff --git a/xlat/rtnl_mdba_mdb_eattr_attrs.in b/src/xlat/rtnl_mdba_mdb_eattr_attrs.in
index ed01faeae..ed01faeae 100644
--- a/xlat/rtnl_mdba_mdb_eattr_attrs.in
+++ b/src/xlat/rtnl_mdba_mdb_eattr_attrs.in
diff --git a/xlat/rtnl_mdba_mdb_entry_attrs.in b/src/xlat/rtnl_mdba_mdb_entry_attrs.in
index 7216a6b09..7216a6b09 100644
--- a/xlat/rtnl_mdba_mdb_entry_attrs.in
+++ b/src/xlat/rtnl_mdba_mdb_entry_attrs.in
diff --git a/xlat/rtnl_mdba_router_attrs.in b/src/xlat/rtnl_mdba_router_attrs.in
index 04505a155..04505a155 100644
--- a/xlat/rtnl_mdba_router_attrs.in
+++ b/src/xlat/rtnl_mdba_router_attrs.in
diff --git a/xlat/rtnl_mdba_router_pattr_attrs.in b/src/xlat/rtnl_mdba_router_pattr_attrs.in
index c2964defd..c2964defd 100644
--- a/xlat/rtnl_mdba_router_pattr_attrs.in
+++ b/src/xlat/rtnl_mdba_router_pattr_attrs.in
diff --git a/xlat/rtnl_neigh_attrs.in b/src/xlat/rtnl_neigh_attrs.in
index 5b09915f5..5b09915f5 100644
--- a/xlat/rtnl_neigh_attrs.in
+++ b/src/xlat/rtnl_neigh_attrs.in
diff --git a/xlat/rtnl_neightbl_attrs.in b/src/xlat/rtnl_neightbl_attrs.in
index 92982d299..92982d299 100644
--- a/xlat/rtnl_neightbl_attrs.in
+++ b/src/xlat/rtnl_neightbl_attrs.in
diff --git a/xlat/rtnl_neightbl_parms_attrs.in b/src/xlat/rtnl_neightbl_parms_attrs.in
index 47f4adea1..47f4adea1 100644
--- a/xlat/rtnl_neightbl_parms_attrs.in
+++ b/src/xlat/rtnl_neightbl_parms_attrs.in
diff --git a/xlat/rtnl_netconf_attrs.in b/src/xlat/rtnl_netconf_attrs.in
index 3aab81eee..3aab81eee 100644
--- a/xlat/rtnl_netconf_attrs.in
+++ b/src/xlat/rtnl_netconf_attrs.in
diff --git a/xlat/rtnl_nsid_attrs.in b/src/xlat/rtnl_nsid_attrs.in
index 591fb23f5..591fb23f5 100644
--- a/xlat/rtnl_nsid_attrs.in
+++ b/src/xlat/rtnl_nsid_attrs.in
diff --git a/xlat/rtnl_route_attrs.in b/src/xlat/rtnl_route_attrs.in
index dd7c973e3..dd7c973e3 100644
--- a/xlat/rtnl_route_attrs.in
+++ b/src/xlat/rtnl_route_attrs.in
diff --git a/xlat/rtnl_rta_metrics_attrs.in b/src/xlat/rtnl_rta_metrics_attrs.in
index 17d7a9a13..17d7a9a13 100644
--- a/xlat/rtnl_rta_metrics_attrs.in
+++ b/src/xlat/rtnl_rta_metrics_attrs.in
diff --git a/xlat/rtnl_rule_attrs.in b/src/xlat/rtnl_rule_attrs.in
index 4552f2a28..4552f2a28 100644
--- a/xlat/rtnl_rule_attrs.in
+++ b/src/xlat/rtnl_rule_attrs.in
diff --git a/xlat/rtnl_tc_action_attrs.in b/src/xlat/rtnl_tc_action_attrs.in
index dcf9f407f..dcf9f407f 100644
--- a/xlat/rtnl_tc_action_attrs.in
+++ b/src/xlat/rtnl_tc_action_attrs.in
diff --git a/xlat/rtnl_tc_attrs.in b/src/xlat/rtnl_tc_attrs.in
index d822920c1..d822920c1 100644
--- a/xlat/rtnl_tc_attrs.in
+++ b/src/xlat/rtnl_tc_attrs.in
diff --git a/xlat/rtnl_tca_act_flags.in b/src/xlat/rtnl_tca_act_flags.in
index 2541b64c3..2541b64c3 100644
--- a/xlat/rtnl_tca_act_flags.in
+++ b/src/xlat/rtnl_tca_act_flags.in
diff --git a/xlat/rtnl_tca_act_hw_stats.in b/src/xlat/rtnl_tca_act_hw_stats.in
index 46eff98dc..46eff98dc 100644
--- a/xlat/rtnl_tca_act_hw_stats.in
+++ b/src/xlat/rtnl_tca_act_hw_stats.in
diff --git a/xlat/rtnl_tca_stab_attrs.in b/src/xlat/rtnl_tca_stab_attrs.in
index 1c83326f0..1c83326f0 100644
--- a/xlat/rtnl_tca_stab_attrs.in
+++ b/src/xlat/rtnl_tca_stab_attrs.in
diff --git a/xlat/rtnl_tca_stats_attrs.in b/src/xlat/rtnl_tca_stats_attrs.in
index ad19d3136..ad19d3136 100644
--- a/xlat/rtnl_tca_stats_attrs.in
+++ b/src/xlat/rtnl_tca_stats_attrs.in
diff --git a/xlat/rwf_flags.in b/src/xlat/rwf_flags.in
index 3f63f5a2d..3f63f5a2d 100644
--- a/xlat/rwf_flags.in
+++ b/src/xlat/rwf_flags.in
diff --git a/xlat/s390_guarded_storage_commands.in b/src/xlat/s390_guarded_storage_commands.in
index e9a82dde8..e9a82dde8 100644
--- a/xlat/s390_guarded_storage_commands.in
+++ b/src/xlat/s390_guarded_storage_commands.in
diff --git a/xlat/s390_runtime_instr_commands.in b/src/xlat/s390_runtime_instr_commands.in
index 220acc4b5..220acc4b5 100644
--- a/xlat/s390_runtime_instr_commands.in
+++ b/src/xlat/s390_runtime_instr_commands.in
diff --git a/xlat/s390_sthyi_function_codes.in b/src/xlat/s390_sthyi_function_codes.in
index 380cd7fcd..380cd7fcd 100644
--- a/xlat/s390_sthyi_function_codes.in
+++ b/src/xlat/s390_sthyi_function_codes.in
diff --git a/xlat/sa_handler_values.in b/src/xlat/sa_handler_values.in
index e90761163..e90761163 100644
--- a/xlat/sa_handler_values.in
+++ b/src/xlat/sa_handler_values.in
diff --git a/xlat/sched_flags.in b/src/xlat/sched_flags.in
index 62698327e..62698327e 100644
--- a/xlat/sched_flags.in
+++ b/src/xlat/sched_flags.in
diff --git a/xlat/schedulers.in b/src/xlat/schedulers.in
index 4a6e366e1..4a6e366e1 100644
--- a/xlat/schedulers.in
+++ b/src/xlat/schedulers.in
diff --git a/xlat/scmvals.in b/src/xlat/scmvals.in
index c3b5539b1..c3b5539b1 100644
--- a/xlat/scmvals.in
+++ b/src/xlat/scmvals.in
diff --git a/xlat/scsi_sg_commands.in b/src/xlat/scsi_sg_commands.in
index 44631b533..44631b533 100644
--- a/xlat/scsi_sg_commands.in
+++ b/src/xlat/scsi_sg_commands.in
diff --git a/xlat/secbits.in b/src/xlat/secbits.in
index 975bd8306..975bd8306 100644
--- a/xlat/secbits.in
+++ b/src/xlat/secbits.in
diff --git a/xlat/seccomp_filter_flags.in b/src/xlat/seccomp_filter_flags.in
index af18f7011..af18f7011 100644
--- a/xlat/seccomp_filter_flags.in
+++ b/src/xlat/seccomp_filter_flags.in
diff --git a/xlat/seccomp_mode.in b/src/xlat/seccomp_mode.in
index bdaab34fb..bdaab34fb 100644
--- a/xlat/seccomp_mode.in
+++ b/src/xlat/seccomp_mode.in
diff --git a/xlat/seccomp_ops.in b/src/xlat/seccomp_ops.in
index 6695f25bd..6695f25bd 100644
--- a/xlat/seccomp_ops.in
+++ b/src/xlat/seccomp_ops.in
diff --git a/xlat/seccomp_ret_action.in b/src/xlat/seccomp_ret_action.in
index 4b1455f52..4b1455f52 100644
--- a/xlat/seccomp_ret_action.in
+++ b/src/xlat/seccomp_ret_action.in
diff --git a/xlat/semctl_flags.in b/src/xlat/semctl_flags.in
index 455ceebd4..455ceebd4 100644
--- a/xlat/semctl_flags.in
+++ b/src/xlat/semctl_flags.in
diff --git a/xlat/semop_flags.in b/src/xlat/semop_flags.in
index 110eca640..110eca640 100644
--- a/xlat/semop_flags.in
+++ b/src/xlat/semop_flags.in
diff --git a/xlat/setns_types.in b/src/xlat/setns_types.in
index df71d25b9..df71d25b9 100644
--- a/xlat/setns_types.in
+++ b/src/xlat/setns_types.in
diff --git a/xlat/setsock_ip_options.in b/src/xlat/setsock_ip_options.in
index c811439f0..c811439f0 100644
--- a/xlat/setsock_ip_options.in
+++ b/src/xlat/setsock_ip_options.in
diff --git a/xlat/setsock_ipv6_options.in b/src/xlat/setsock_ipv6_options.in
index 5a42cdf9a..5a42cdf9a 100644
--- a/xlat/setsock_ipv6_options.in
+++ b/src/xlat/setsock_ipv6_options.in
diff --git a/xlat/setsock_options.in b/src/xlat/setsock_options.in
index 3f14eefd0..3f14eefd0 100644
--- a/xlat/setsock_options.in
+++ b/src/xlat/setsock_options.in
diff --git a/xlat/sfd_flags.in b/src/xlat/sfd_flags.in
index 20a5d1f85..20a5d1f85 100644
--- a/xlat/sfd_flags.in
+++ b/src/xlat/sfd_flags.in
diff --git a/xlat/sg_io_dxfer_direction.in b/src/xlat/sg_io_dxfer_direction.in
index ef2ebd323..ef2ebd323 100644
--- a/xlat/sg_io_dxfer_direction.in
+++ b/src/xlat/sg_io_dxfer_direction.in
diff --git a/xlat/sg_io_flags.in b/src/xlat/sg_io_flags.in
index 68ed12c8a..68ed12c8a 100644
--- a/xlat/sg_io_flags.in
+++ b/src/xlat/sg_io_flags.in
diff --git a/xlat/sg_io_info.in b/src/xlat/sg_io_info.in
index afebe4f3f..afebe4f3f 100644
--- a/xlat/sg_io_info.in
+++ b/src/xlat/sg_io_info.in
diff --git a/xlat/sg_scsi_reset.in b/src/xlat/sg_scsi_reset.in
index 0df4a90df..0df4a90df 100644
--- a/xlat/sg_scsi_reset.in
+++ b/src/xlat/sg_scsi_reset.in
diff --git a/xlat/shm_flags.in b/src/xlat/shm_flags.in
index d93745b9c..d93745b9c 100644
--- a/xlat/shm_flags.in
+++ b/src/xlat/shm_flags.in
diff --git a/xlat/shm_resource_flags.in b/src/xlat/shm_resource_flags.in
index 30ace6788..30ace6788 100644
--- a/xlat/shm_resource_flags.in
+++ b/src/xlat/shm_resource_flags.in
diff --git a/xlat/shmctl_flags.in b/src/xlat/shmctl_flags.in
index 8394a53e8..8394a53e8 100644
--- a/xlat/shmctl_flags.in
+++ b/src/xlat/shmctl_flags.in
diff --git a/xlat/shutdown_modes.in b/src/xlat/shutdown_modes.in
index da592b912..da592b912 100644
--- a/xlat/shutdown_modes.in
+++ b/src/xlat/shutdown_modes.in
diff --git a/xlat/sigact_flags.in b/src/xlat/sigact_flags.in
index 00ad94314..00ad94314 100644
--- a/xlat/sigact_flags.in
+++ b/src/xlat/sigact_flags.in
diff --git a/xlat/sigaltstack_flags.in b/src/xlat/sigaltstack_flags.in
index 931379844..931379844 100644
--- a/xlat/sigaltstack_flags.in
+++ b/src/xlat/sigaltstack_flags.in
diff --git a/xlat/sigbus_codes.in b/src/xlat/sigbus_codes.in
index 54f1b433a..54f1b433a 100644
--- a/xlat/sigbus_codes.in
+++ b/src/xlat/sigbus_codes.in
diff --git a/xlat/sigchld_codes.in b/src/xlat/sigchld_codes.in
index a919bbae8..a919bbae8 100644
--- a/xlat/sigchld_codes.in
+++ b/src/xlat/sigchld_codes.in
diff --git a/xlat/sigemt_codes.in b/src/xlat/sigemt_codes.in
index eb8756160..eb8756160 100644
--- a/xlat/sigemt_codes.in
+++ b/src/xlat/sigemt_codes.in
diff --git a/xlat/sigev_value.in b/src/xlat/sigev_value.in
index 961d0ec77..961d0ec77 100644
--- a/xlat/sigev_value.in
+++ b/src/xlat/sigev_value.in
diff --git a/xlat/sigfpe_codes.in b/src/xlat/sigfpe_codes.in
index 4abd621aa..4abd621aa 100644
--- a/xlat/sigfpe_codes.in
+++ b/src/xlat/sigfpe_codes.in
diff --git a/xlat/sigill_codes.in b/src/xlat/sigill_codes.in
index 12cd2cfa6..12cd2cfa6 100644
--- a/xlat/sigill_codes.in
+++ b/src/xlat/sigill_codes.in
diff --git a/xlat/siginfo_codes.in b/src/xlat/siginfo_codes.in
index b3e0888a0..b3e0888a0 100644
--- a/xlat/siginfo_codes.in
+++ b/src/xlat/siginfo_codes.in
diff --git a/xlat/sigpoll_codes.in b/src/xlat/sigpoll_codes.in
index a5471678b..a5471678b 100644
--- a/xlat/sigpoll_codes.in
+++ b/src/xlat/sigpoll_codes.in
diff --git a/xlat/sigprocmaskcmds.in b/src/xlat/sigprocmaskcmds.in
index d88a02db2..d88a02db2 100644
--- a/xlat/sigprocmaskcmds.in
+++ b/src/xlat/sigprocmaskcmds.in
diff --git a/xlat/sigprof_codes.in b/src/xlat/sigprof_codes.in
index 64dac115e..64dac115e 100644
--- a/xlat/sigprof_codes.in
+++ b/src/xlat/sigprof_codes.in
diff --git a/xlat/sigsegv_codes.in b/src/xlat/sigsegv_codes.in
index a5fa5f833..a5fa5f833 100644
--- a/xlat/sigsegv_codes.in
+++ b/src/xlat/sigsegv_codes.in
diff --git a/xlat/sigsys_codes.in b/src/xlat/sigsys_codes.in
index a8c489160..a8c489160 100644
--- a/xlat/sigsys_codes.in
+++ b/src/xlat/sigsys_codes.in
diff --git a/xlat/sigtrap_codes.in b/src/xlat/sigtrap_codes.in
index 55917a7f0..55917a7f0 100644
--- a/xlat/sigtrap_codes.in
+++ b/src/xlat/sigtrap_codes.in
diff --git a/xlat/skf_ad.in b/src/xlat/skf_ad.in
index f5b56134f..f5b56134f 100644
--- a/xlat/skf_ad.in
+++ b/src/xlat/skf_ad.in
diff --git a/xlat/skf_off.in b/src/xlat/skf_off.in
index afb75eeab..afb75eeab 100644
--- a/xlat/skf_off.in
+++ b/src/xlat/skf_off.in
diff --git a/xlat/smc_decl_codes.in b/src/xlat/smc_decl_codes.in
index 2832da334..2832da334 100644
--- a/xlat/smc_decl_codes.in
+++ b/src/xlat/smc_decl_codes.in
diff --git a/xlat/smc_diag_attrs.in b/src/xlat/smc_diag_attrs.in
index 4da24d57e..4da24d57e 100644
--- a/xlat/smc_diag_attrs.in
+++ b/src/xlat/smc_diag_attrs.in
diff --git a/xlat/smc_diag_extended_flags.in b/src/xlat/smc_diag_extended_flags.in
index 9bd395813..9bd395813 100644
--- a/xlat/smc_diag_extended_flags.in
+++ b/src/xlat/smc_diag_extended_flags.in
diff --git a/xlat/smc_diag_mode.in b/src/xlat/smc_diag_mode.in
index 4ac39639c..4ac39639c 100644
--- a/xlat/smc_diag_mode.in
+++ b/src/xlat/smc_diag_mode.in
diff --git a/xlat/smc_link_group_roles.in b/src/xlat/smc_link_group_roles.in
index c278526ae..c278526ae 100644
--- a/xlat/smc_link_group_roles.in
+++ b/src/xlat/smc_link_group_roles.in
diff --git a/xlat/smc_protocols.in b/src/xlat/smc_protocols.in
index b8c1aaeaf..b8c1aaeaf 100644
--- a/xlat/smc_protocols.in
+++ b/src/xlat/smc_protocols.in
diff --git a/xlat/smc_states.in b/src/xlat/smc_states.in
index d197b1f7b..d197b1f7b 100644
--- a/xlat/smc_states.in
+++ b/src/xlat/smc_states.in
diff --git a/xlat/snmp_icmp6_stats.in b/src/xlat/snmp_icmp6_stats.in
index ee4769e7c..ee4769e7c 100644
--- a/xlat/snmp_icmp6_stats.in
+++ b/src/xlat/snmp_icmp6_stats.in
diff --git a/xlat/snmp_ip_stats.in b/src/xlat/snmp_ip_stats.in
index 7de755dc9..7de755dc9 100644
--- a/xlat/snmp_ip_stats.in
+++ b/src/xlat/snmp_ip_stats.in
diff --git a/xlat/sock_alg_options.in b/src/xlat/sock_alg_options.in
index ca1f870bc..ca1f870bc 100644
--- a/xlat/sock_alg_options.in
+++ b/src/xlat/sock_alg_options.in
diff --git a/xlat/sock_ax25_options.in b/src/xlat/sock_ax25_options.in
index 2a526104f..2a526104f 100644
--- a/xlat/sock_ax25_options.in
+++ b/src/xlat/sock_ax25_options.in
diff --git a/xlat/sock_bluetooth_options.in b/src/xlat/sock_bluetooth_options.in
index 4c91dd296..4c91dd296 100644
--- a/xlat/sock_bluetooth_options.in
+++ b/src/xlat/sock_bluetooth_options.in
diff --git a/xlat/sock_caif_options.in b/src/xlat/sock_caif_options.in
index 5e1c0444f..5e1c0444f 100644
--- a/xlat/sock_caif_options.in
+++ b/src/xlat/sock_caif_options.in
diff --git a/xlat/sock_dccp_options.in b/src/xlat/sock_dccp_options.in
index e168b06b3..e168b06b3 100644
--- a/xlat/sock_dccp_options.in
+++ b/src/xlat/sock_dccp_options.in
diff --git a/xlat/sock_ip_options.in b/src/xlat/sock_ip_options.in
index d9a60d389..d9a60d389 100644
--- a/xlat/sock_ip_options.in
+++ b/src/xlat/sock_ip_options.in
diff --git a/xlat/sock_ipv6_options.in b/src/xlat/sock_ipv6_options.in
index 39c811d14..39c811d14 100644
--- a/xlat/sock_ipv6_options.in
+++ b/src/xlat/sock_ipv6_options.in
diff --git a/xlat/sock_ipx_options.in b/src/xlat/sock_ipx_options.in
index eba97fd71..eba97fd71 100644
--- a/xlat/sock_ipx_options.in
+++ b/src/xlat/sock_ipx_options.in
diff --git a/xlat/sock_irda_options.in b/src/xlat/sock_irda_options.in
index a26e098b5..a26e098b5 100644
--- a/xlat/sock_irda_options.in
+++ b/src/xlat/sock_irda_options.in
diff --git a/xlat/sock_iucv_options.in b/src/xlat/sock_iucv_options.in
index 827b54c2b..827b54c2b 100644
--- a/xlat/sock_iucv_options.in
+++ b/src/xlat/sock_iucv_options.in
diff --git a/xlat/sock_kcm_options.in b/src/xlat/sock_kcm_options.in
index ee58639a4..ee58639a4 100644
--- a/xlat/sock_kcm_options.in
+++ b/src/xlat/sock_kcm_options.in
diff --git a/xlat/sock_llc_options.in b/src/xlat/sock_llc_options.in
index 7a948d712..7a948d712 100644
--- a/xlat/sock_llc_options.in
+++ b/src/xlat/sock_llc_options.in
diff --git a/xlat/sock_netlink_options.in b/src/xlat/sock_netlink_options.in
index e754ba590..e754ba590 100644
--- a/xlat/sock_netlink_options.in
+++ b/src/xlat/sock_netlink_options.in
diff --git a/xlat/sock_nfcllcp_options.in b/src/xlat/sock_nfcllcp_options.in
index c9f9fdc0f..c9f9fdc0f 100644
--- a/xlat/sock_nfcllcp_options.in
+++ b/src/xlat/sock_nfcllcp_options.in
diff --git a/xlat/sock_options.in b/src/xlat/sock_options.in
index d6452a5d7..d6452a5d7 100644
--- a/xlat/sock_options.in
+++ b/src/xlat/sock_options.in
diff --git a/xlat/sock_packet_options.in b/src/xlat/sock_packet_options.in
index d11ad0b4b..d11ad0b4b 100644
--- a/xlat/sock_packet_options.in
+++ b/src/xlat/sock_packet_options.in
diff --git a/xlat/sock_pnp_options.in b/src/xlat/sock_pnp_options.in
index 03d251b36..03d251b36 100644
--- a/xlat/sock_pnp_options.in
+++ b/src/xlat/sock_pnp_options.in
diff --git a/xlat/sock_pppol2tp_options.in b/src/xlat/sock_pppol2tp_options.in
index 9c4177a01..9c4177a01 100644
--- a/xlat/sock_pppol2tp_options.in
+++ b/src/xlat/sock_pppol2tp_options.in
diff --git a/xlat/sock_raw_options.in b/src/xlat/sock_raw_options.in
index b34113479..b34113479 100644
--- a/xlat/sock_raw_options.in
+++ b/src/xlat/sock_raw_options.in
diff --git a/xlat/sock_rds_options.in b/src/xlat/sock_rds_options.in
index 041261c28..041261c28 100644
--- a/xlat/sock_rds_options.in
+++ b/src/xlat/sock_rds_options.in
diff --git a/xlat/sock_rxrpc_options.in b/src/xlat/sock_rxrpc_options.in
index 554082927..554082927 100644
--- a/xlat/sock_rxrpc_options.in
+++ b/src/xlat/sock_rxrpc_options.in
diff --git a/xlat/sock_sctp_options.in b/src/xlat/sock_sctp_options.in
index b7bec4a8d..b7bec4a8d 100644
--- a/xlat/sock_sctp_options.in
+++ b/src/xlat/sock_sctp_options.in
diff --git a/xlat/sock_shutdown_flags.in b/src/xlat/sock_shutdown_flags.in
index ff7d4322c..ff7d4322c 100644
--- a/xlat/sock_shutdown_flags.in
+++ b/src/xlat/sock_shutdown_flags.in
diff --git a/xlat/sock_tcp_options.in b/src/xlat/sock_tcp_options.in
index cb1de24b7..cb1de24b7 100644
--- a/xlat/sock_tcp_options.in
+++ b/src/xlat/sock_tcp_options.in
diff --git a/xlat/sock_tipc_options.in b/src/xlat/sock_tipc_options.in
index fbc70d64e..fbc70d64e 100644
--- a/xlat/sock_tipc_options.in
+++ b/src/xlat/sock_tipc_options.in
diff --git a/xlat/sock_tls_options.in b/src/xlat/sock_tls_options.in
index 9a2ddb0a1..9a2ddb0a1 100644
--- a/xlat/sock_tls_options.in
+++ b/src/xlat/sock_tls_options.in
diff --git a/xlat/sock_type_flags.in b/src/xlat/sock_type_flags.in
index b99786b70..b99786b70 100644
--- a/xlat/sock_type_flags.in
+++ b/src/xlat/sock_type_flags.in
diff --git a/xlat/sock_udp_options.in b/src/xlat/sock_udp_options.in
index 753582f30..753582f30 100644
--- a/xlat/sock_udp_options.in
+++ b/src/xlat/sock_udp_options.in
diff --git a/xlat/sock_xdp_options.in b/src/xlat/sock_xdp_options.in
index b98f83c41..b98f83c41 100644
--- a/xlat/sock_xdp_options.in
+++ b/src/xlat/sock_xdp_options.in
diff --git a/xlat/socketcalls.in b/src/xlat/socketcalls.in
index d31a91042..d31a91042 100644
--- a/xlat/socketcalls.in
+++ b/src/xlat/socketcalls.in
diff --git a/xlat/socketlayers.in b/src/xlat/socketlayers.in
index e633cf5cd..e633cf5cd 100644
--- a/xlat/socketlayers.in
+++ b/src/xlat/socketlayers.in
diff --git a/xlat/socktypes.in b/src/xlat/socktypes.in
index 678c2dae9..678c2dae9 100644
--- a/xlat/socktypes.in
+++ b/src/xlat/socktypes.in
diff --git a/xlat/sparc_kern_features.in b/src/xlat/sparc_kern_features.in
index 6c4b2d707..6c4b2d707 100644
--- a/xlat/sparc_kern_features.in
+++ b/src/xlat/sparc_kern_features.in
diff --git a/xlat/splice_flags.in b/src/xlat/splice_flags.in
index 72e2c0bee..72e2c0bee 100644
--- a/xlat/splice_flags.in
+++ b/src/xlat/splice_flags.in
diff --git a/xlat/sram_alloc_flags.in b/src/xlat/sram_alloc_flags.in
index 8c0663329..8c0663329 100644
--- a/xlat/sram_alloc_flags.in
+++ b/src/xlat/sram_alloc_flags.in
diff --git a/xlat/statfs_flags.in b/src/xlat/statfs_flags.in
index f791a60e5..f791a60e5 100644
--- a/xlat/statfs_flags.in
+++ b/src/xlat/statfs_flags.in
diff --git a/xlat/statx_attrs.in b/src/xlat/statx_attrs.in
index 4d5c6ae87..4d5c6ae87 100644
--- a/xlat/statx_attrs.in
+++ b/src/xlat/statx_attrs.in
diff --git a/xlat/statx_masks.in b/src/xlat/statx_masks.in
index 3438672bb..3438672bb 100644
--- a/xlat/statx_masks.in
+++ b/src/xlat/statx_masks.in
diff --git a/xlat/swap_flags.in b/src/xlat/swap_flags.in
index 8800e3015..8800e3015 100644
--- a/xlat/swap_flags.in
+++ b/src/xlat/swap_flags.in
diff --git a/xlat/sync_file_range_flags.in b/src/xlat/sync_file_range_flags.in
index 0b179a10c..0b179a10c 100644
--- a/xlat/sync_file_range_flags.in
+++ b/src/xlat/sync_file_range_flags.in
diff --git a/xlat/sysctl_kern.in b/src/xlat/sysctl_kern.in
index 150657bc5..150657bc5 100644
--- a/xlat/sysctl_kern.in
+++ b/src/xlat/sysctl_kern.in
diff --git a/xlat/sysctl_net.in b/src/xlat/sysctl_net.in
index d922bbfa9..d922bbfa9 100644
--- a/xlat/sysctl_net.in
+++ b/src/xlat/sysctl_net.in
diff --git a/xlat/sysctl_net_core.in b/src/xlat/sysctl_net_core.in
index 07719cf81..07719cf81 100644
--- a/xlat/sysctl_net_core.in
+++ b/src/xlat/sysctl_net_core.in
diff --git a/xlat/sysctl_net_ipv4.in b/src/xlat/sysctl_net_ipv4.in
index be0f5ed82..be0f5ed82 100644
--- a/xlat/sysctl_net_ipv4.in
+++ b/src/xlat/sysctl_net_ipv4.in
diff --git a/xlat/sysctl_net_ipv4_conf.in b/src/xlat/sysctl_net_ipv4_conf.in
index 9558be291..9558be291 100644
--- a/xlat/sysctl_net_ipv4_conf.in
+++ b/src/xlat/sysctl_net_ipv4_conf.in
diff --git a/xlat/sysctl_net_ipv4_route.in b/src/xlat/sysctl_net_ipv4_route.in
index d7b5bc65c..d7b5bc65c 100644
--- a/xlat/sysctl_net_ipv4_route.in
+++ b/src/xlat/sysctl_net_ipv4_route.in
diff --git a/xlat/sysctl_net_ipv6.in b/src/xlat/sysctl_net_ipv6.in
index 3cd48c523..3cd48c523 100644
--- a/xlat/sysctl_net_ipv6.in
+++ b/src/xlat/sysctl_net_ipv6.in
diff --git a/xlat/sysctl_net_ipv6_route.in b/src/xlat/sysctl_net_ipv6_route.in
index ec3f958f9..ec3f958f9 100644
--- a/xlat/sysctl_net_ipv6_route.in
+++ b/src/xlat/sysctl_net_ipv6_route.in
diff --git a/xlat/sysctl_net_unix.in b/src/xlat/sysctl_net_unix.in
index c20eb0cd1..c20eb0cd1 100644
--- a/xlat/sysctl_net_unix.in
+++ b/src/xlat/sysctl_net_unix.in
diff --git a/xlat/sysctl_root.in b/src/xlat/sysctl_root.in
index f8d18485a..f8d18485a 100644
--- a/xlat/sysctl_root.in
+++ b/src/xlat/sysctl_root.in
diff --git a/xlat/sysctl_vm.in b/src/xlat/sysctl_vm.in
index 71c41727a..71c41727a 100644
--- a/xlat/sysctl_vm.in
+++ b/src/xlat/sysctl_vm.in
diff --git a/xlat/syslog_action_type.in b/src/xlat/syslog_action_type.in
index e2f78e765..e2f78e765 100644
--- a/xlat/syslog_action_type.in
+++ b/src/xlat/syslog_action_type.in
diff --git a/xlat/syslog_console_levels.in b/src/xlat/syslog_console_levels.in
index 9309658e5..9309658e5 100644
--- a/xlat/syslog_console_levels.in
+++ b/src/xlat/syslog_console_levels.in
diff --git a/xlat/sysmips_operations.in b/src/xlat/sysmips_operations.in
index 3d367cb9b..3d367cb9b 100644
--- a/xlat/sysmips_operations.in
+++ b/src/xlat/sysmips_operations.in
diff --git a/xlat/tcflsh_options.in b/src/xlat/tcflsh_options.in
index 470a5a4e0..470a5a4e0 100644
--- a/xlat/tcflsh_options.in
+++ b/src/xlat/tcflsh_options.in
diff --git a/xlat/tcp_state_flags.in b/src/xlat/tcp_state_flags.in
index 8b63c1582..8b63c1582 100644
--- a/xlat/tcp_state_flags.in
+++ b/src/xlat/tcp_state_flags.in
diff --git a/xlat/tcp_states.in b/src/xlat/tcp_states.in
index d78d779fd..d78d779fd 100644
--- a/xlat/tcp_states.in
+++ b/src/xlat/tcp_states.in
diff --git a/xlat/tcxonc_options.in b/src/xlat/tcxonc_options.in
index 733aee930..733aee930 100644
--- a/xlat/tcxonc_options.in
+++ b/src/xlat/tcxonc_options.in
diff --git a/xlat/tee_ioctl_cmds.in b/src/xlat/tee_ioctl_cmds.in
index abd9700d7..abd9700d7 100644
--- a/xlat/tee_ioctl_cmds.in
+++ b/src/xlat/tee_ioctl_cmds.in
diff --git a/xlat/tee_ioctl_gen_caps.in b/src/xlat/tee_ioctl_gen_caps.in
index c6a22526a..c6a22526a 100644
--- a/xlat/tee_ioctl_gen_caps.in
+++ b/src/xlat/tee_ioctl_gen_caps.in
diff --git a/xlat/tee_ioctl_impl_ids.in b/src/xlat/tee_ioctl_impl_ids.in
index b62ed35b9..b62ed35b9 100644
--- a/xlat/tee_ioctl_impl_ids.in
+++ b/src/xlat/tee_ioctl_impl_ids.in
diff --git a/xlat/tee_ioctl_login_types.in b/src/xlat/tee_ioctl_login_types.in
index 2e59bc6cd..2e59bc6cd 100644
--- a/xlat/tee_ioctl_login_types.in
+++ b/src/xlat/tee_ioctl_login_types.in
diff --git a/xlat/tee_ioctl_max_arg_size.in b/src/xlat/tee_ioctl_max_arg_size.in
index 5e7f6fa69..5e7f6fa69 100644
--- a/xlat/tee_ioctl_max_arg_size.in
+++ b/src/xlat/tee_ioctl_max_arg_size.in
diff --git a/xlat/tee_ioctl_optee_caps.in b/src/xlat/tee_ioctl_optee_caps.in
index 8d46cf04c..8d46cf04c 100644
--- a/xlat/tee_ioctl_optee_caps.in
+++ b/src/xlat/tee_ioctl_optee_caps.in
diff --git a/xlat/tee_ioctl_origins.in b/src/xlat/tee_ioctl_origins.in
index 4b4937898..4b4937898 100644
--- a/xlat/tee_ioctl_origins.in
+++ b/src/xlat/tee_ioctl_origins.in
diff --git a/xlat/tee_ioctl_param_attr_types.in b/src/xlat/tee_ioctl_param_attr_types.in
index 2c15d5148..2c15d5148 100644
--- a/xlat/tee_ioctl_param_attr_types.in
+++ b/src/xlat/tee_ioctl_param_attr_types.in
diff --git a/xlat/tee_ioctl_shm_flags.in b/src/xlat/tee_ioctl_shm_flags.in
index 881044b9d..881044b9d 100644
--- a/xlat/tee_ioctl_shm_flags.in
+++ b/src/xlat/tee_ioctl_shm_flags.in
diff --git a/xlat/timerfdflags.in b/src/xlat/timerfdflags.in
index bf767e3f4..bf767e3f4 100644
--- a/xlat/timerfdflags.in
+++ b/src/xlat/timerfdflags.in
diff --git a/xlat/tun_device_types.in b/src/xlat/tun_device_types.in
index 81af0bc15..81af0bc15 100644
--- a/xlat/tun_device_types.in
+++ b/src/xlat/tun_device_types.in
diff --git a/xlat/ubi_data_types.in b/src/xlat/ubi_data_types.in
index 6fda7d417..6fda7d417 100644
--- a/xlat/ubi_data_types.in
+++ b/src/xlat/ubi_data_types.in
diff --git a/xlat/ubi_volume_flags.in b/src/xlat/ubi_volume_flags.in
index 02c732103..02c732103 100644
--- a/xlat/ubi_volume_flags.in
+++ b/src/xlat/ubi_volume_flags.in
diff --git a/xlat/ubi_volume_props.in b/src/xlat/ubi_volume_props.in
index 78f288094..78f288094 100644
--- a/xlat/ubi_volume_props.in
+++ b/src/xlat/ubi_volume_props.in
diff --git a/xlat/ubi_volume_types.in b/src/xlat/ubi_volume_types.in
index b4de52e57..b4de52e57 100644
--- a/xlat/ubi_volume_types.in
+++ b/src/xlat/ubi_volume_types.in
diff --git a/xlat/uffd_api_features.in b/src/xlat/uffd_api_features.in
index 33d644778..33d644778 100644
--- a/xlat/uffd_api_features.in
+++ b/src/xlat/uffd_api_features.in
diff --git a/xlat/uffd_api_flags.in b/src/xlat/uffd_api_flags.in
index fd210872b..fd210872b 100644
--- a/xlat/uffd_api_flags.in
+++ b/src/xlat/uffd_api_flags.in
diff --git a/xlat/uffd_copy_flags.in b/src/xlat/uffd_copy_flags.in
index a9e3e9416..a9e3e9416 100644
--- a/xlat/uffd_copy_flags.in
+++ b/src/xlat/uffd_copy_flags.in
diff --git a/xlat/uffd_flags.in b/src/xlat/uffd_flags.in
index fb0338bcc..fb0338bcc 100644
--- a/xlat/uffd_flags.in
+++ b/src/xlat/uffd_flags.in
diff --git a/xlat/uffd_register_ioctl_flags.in b/src/xlat/uffd_register_ioctl_flags.in
index 077871f93..077871f93 100644
--- a/xlat/uffd_register_ioctl_flags.in
+++ b/src/xlat/uffd_register_ioctl_flags.in
diff --git a/xlat/uffd_register_mode_flags.in b/src/xlat/uffd_register_mode_flags.in
index 996b1f32e..996b1f32e 100644
--- a/xlat/uffd_register_mode_flags.in
+++ b/src/xlat/uffd_register_mode_flags.in
diff --git a/xlat/uffd_zeropage_flags.in b/src/xlat/uffd_zeropage_flags.in
index 6d48a040d..6d48a040d 100644
--- a/xlat/uffd_zeropage_flags.in
+++ b/src/xlat/uffd_zeropage_flags.in
diff --git a/xlat/umount_flags.in b/src/xlat/umount_flags.in
index 2edabcdbb..2edabcdbb 100644
--- a/xlat/umount_flags.in
+++ b/src/xlat/umount_flags.in
diff --git a/xlat/unix_diag_attrs.in b/src/xlat/unix_diag_attrs.in
index 3d34d6765..3d34d6765 100644
--- a/xlat/unix_diag_attrs.in
+++ b/src/xlat/unix_diag_attrs.in
diff --git a/xlat/unix_diag_show.in b/src/xlat/unix_diag_show.in
index 5f50887fc..5f50887fc 100644
--- a/xlat/unix_diag_show.in
+++ b/src/xlat/unix_diag_show.in
diff --git a/xlat/unshare_flags.in b/src/xlat/unshare_flags.in
index e9b574926..e9b574926 100644
--- a/xlat/unshare_flags.in
+++ b/src/xlat/unshare_flags.in
diff --git a/xlat/uring_cqring_flags.in b/src/xlat/uring_cqring_flags.in
index c81fbc20e..c81fbc20e 100644
--- a/xlat/uring_cqring_flags.in
+++ b/src/xlat/uring_cqring_flags.in
diff --git a/xlat/uring_enter_flags.in b/src/xlat/uring_enter_flags.in
index 2bc892ec4..2bc892ec4 100644
--- a/xlat/uring_enter_flags.in
+++ b/src/xlat/uring_enter_flags.in
diff --git a/xlat/uring_op_flags.in b/src/xlat/uring_op_flags.in
index 98d25cee8..98d25cee8 100644
--- a/xlat/uring_op_flags.in
+++ b/src/xlat/uring_op_flags.in
diff --git a/xlat/uring_ops.in b/src/xlat/uring_ops.in
index d27261443..d27261443 100644
--- a/xlat/uring_ops.in
+++ b/src/xlat/uring_ops.in
diff --git a/xlat/uring_register_opcodes.in b/src/xlat/uring_register_opcodes.in
index c6604291a..c6604291a 100644
--- a/xlat/uring_register_opcodes.in
+++ b/src/xlat/uring_register_opcodes.in
diff --git a/xlat/uring_setup_features.in b/src/xlat/uring_setup_features.in
index 29d963c0d..29d963c0d 100644
--- a/xlat/uring_setup_features.in
+++ b/src/xlat/uring_setup_features.in
diff --git a/xlat/uring_setup_flags.in b/src/xlat/uring_setup_flags.in
index 3011ac261..3011ac261 100644
--- a/xlat/uring_setup_flags.in
+++ b/src/xlat/uring_setup_flags.in
diff --git a/xlat/usagewho.in b/src/xlat/usagewho.in
index 1b1255c92..1b1255c92 100644
--- a/xlat/usagewho.in
+++ b/src/xlat/usagewho.in
diff --git a/xlat/v4l2_buf_flags.in b/src/xlat/v4l2_buf_flags.in
index 276004271..276004271 100644
--- a/xlat/v4l2_buf_flags.in
+++ b/src/xlat/v4l2_buf_flags.in
diff --git a/xlat/v4l2_buf_flags_masks.in b/src/xlat/v4l2_buf_flags_masks.in
index f7f51fa8e..f7f51fa8e 100644
--- a/xlat/v4l2_buf_flags_masks.in
+++ b/src/xlat/v4l2_buf_flags_masks.in
diff --git a/xlat/v4l2_buf_flags_ts_src.in b/src/xlat/v4l2_buf_flags_ts_src.in
index 01a1c87db..01a1c87db 100644
--- a/xlat/v4l2_buf_flags_ts_src.in
+++ b/src/xlat/v4l2_buf_flags_ts_src.in
diff --git a/xlat/v4l2_buf_flags_ts_type.in b/src/xlat/v4l2_buf_flags_ts_type.in
index b9d2f1790..b9d2f1790 100644
--- a/xlat/v4l2_buf_flags_ts_type.in
+++ b/src/xlat/v4l2_buf_flags_ts_type.in
diff --git a/xlat/v4l2_buf_types.in b/src/xlat/v4l2_buf_types.in
index a3e77bb29..a3e77bb29 100644
--- a/xlat/v4l2_buf_types.in
+++ b/src/xlat/v4l2_buf_types.in
diff --git a/xlat/v4l2_capture_modes.in b/src/xlat/v4l2_capture_modes.in
index 2ef053742..2ef053742 100644
--- a/xlat/v4l2_capture_modes.in
+++ b/src/xlat/v4l2_capture_modes.in
diff --git a/xlat/v4l2_colorspaces.in b/src/xlat/v4l2_colorspaces.in
index 4012d2d57..4012d2d57 100644
--- a/xlat/v4l2_colorspaces.in
+++ b/src/xlat/v4l2_colorspaces.in
diff --git a/xlat/v4l2_control_classes.in b/src/xlat/v4l2_control_classes.in
index cc86e3b2f..cc86e3b2f 100644
--- a/xlat/v4l2_control_classes.in
+++ b/src/xlat/v4l2_control_classes.in
diff --git a/xlat/v4l2_control_flags.in b/src/xlat/v4l2_control_flags.in
index 025b2b1ba..025b2b1ba 100644
--- a/xlat/v4l2_control_flags.in
+++ b/src/xlat/v4l2_control_flags.in
diff --git a/xlat/v4l2_control_id_bases.in b/src/xlat/v4l2_control_id_bases.in
index e2e68073a..e2e68073a 100644
--- a/xlat/v4l2_control_id_bases.in
+++ b/src/xlat/v4l2_control_id_bases.in
diff --git a/xlat/v4l2_control_ids.in b/src/xlat/v4l2_control_ids.in
index eeb495f42..eeb495f42 100644
--- a/xlat/v4l2_control_ids.in
+++ b/src/xlat/v4l2_control_ids.in
diff --git a/xlat/v4l2_control_query_flags.in b/src/xlat/v4l2_control_query_flags.in
index 3d32bf5de..3d32bf5de 100644
--- a/xlat/v4l2_control_query_flags.in
+++ b/src/xlat/v4l2_control_query_flags.in
diff --git a/xlat/v4l2_control_types.in b/src/xlat/v4l2_control_types.in
index eb8966d7c..eb8966d7c 100644
--- a/xlat/v4l2_control_types.in
+++ b/src/xlat/v4l2_control_types.in
diff --git a/xlat/v4l2_device_capabilities_flags.in b/src/xlat/v4l2_device_capabilities_flags.in
index fa65c105f..fa65c105f 100644
--- a/xlat/v4l2_device_capabilities_flags.in
+++ b/src/xlat/v4l2_device_capabilities_flags.in
diff --git a/xlat/v4l2_fields.in b/src/xlat/v4l2_fields.in
index 5a8dcf839..5a8dcf839 100644
--- a/xlat/v4l2_fields.in
+++ b/src/xlat/v4l2_fields.in
diff --git a/xlat/v4l2_format_description_flags.in b/src/xlat/v4l2_format_description_flags.in
index e091075f4..e091075f4 100644
--- a/xlat/v4l2_format_description_flags.in
+++ b/src/xlat/v4l2_format_description_flags.in
diff --git a/xlat/v4l2_frameinterval_types.in b/src/xlat/v4l2_frameinterval_types.in
index 8cd22563d..8cd22563d 100644
--- a/xlat/v4l2_frameinterval_types.in
+++ b/src/xlat/v4l2_frameinterval_types.in
diff --git a/xlat/v4l2_framesize_types.in b/src/xlat/v4l2_framesize_types.in
index 49ae6a2d9..49ae6a2d9 100644
--- a/xlat/v4l2_framesize_types.in
+++ b/src/xlat/v4l2_framesize_types.in
diff --git a/xlat/v4l2_input_types.in b/src/xlat/v4l2_input_types.in
index 1a8ec1bef..1a8ec1bef 100644
--- a/xlat/v4l2_input_types.in
+++ b/src/xlat/v4l2_input_types.in
diff --git a/xlat/v4l2_ioctl_cmds.in b/src/xlat/v4l2_ioctl_cmds.in
index 4d1a0f0ee..4d1a0f0ee 100644
--- a/xlat/v4l2_ioctl_cmds.in
+++ b/src/xlat/v4l2_ioctl_cmds.in
diff --git a/xlat/v4l2_memories.in b/src/xlat/v4l2_memories.in
index 6e9df1909..6e9df1909 100644
--- a/xlat/v4l2_memories.in
+++ b/src/xlat/v4l2_memories.in
diff --git a/xlat/v4l2_meta_fmts.in b/src/xlat/v4l2_meta_fmts.in
index 61a72d371..61a72d371 100644
--- a/xlat/v4l2_meta_fmts.in
+++ b/src/xlat/v4l2_meta_fmts.in
diff --git a/xlat/v4l2_pix_fmts.in b/src/xlat/v4l2_pix_fmts.in
index 006564c22..006564c22 100644
--- a/xlat/v4l2_pix_fmts.in
+++ b/src/xlat/v4l2_pix_fmts.in
diff --git a/xlat/v4l2_sdr_fmts.in b/src/xlat/v4l2_sdr_fmts.in
index bd5a24822..bd5a24822 100644
--- a/xlat/v4l2_sdr_fmts.in
+++ b/src/xlat/v4l2_sdr_fmts.in
diff --git a/xlat/v4l2_sliced_flags.in b/src/xlat/v4l2_sliced_flags.in
index 6c509fa18..6c509fa18 100644
--- a/xlat/v4l2_sliced_flags.in
+++ b/src/xlat/v4l2_sliced_flags.in
diff --git a/xlat/v4l2_streaming_capabilities.in b/src/xlat/v4l2_streaming_capabilities.in
index a9d8508a7..a9d8508a7 100644
--- a/xlat/v4l2_streaming_capabilities.in
+++ b/src/xlat/v4l2_streaming_capabilities.in
diff --git a/xlat/v4l2_tuner_audmodes.in b/src/xlat/v4l2_tuner_audmodes.in
index cfa308e7e..cfa308e7e 100644
--- a/xlat/v4l2_tuner_audmodes.in
+++ b/src/xlat/v4l2_tuner_audmodes.in
diff --git a/xlat/v4l2_tuner_capabilities.in b/src/xlat/v4l2_tuner_capabilities.in
index 60ed20a09..60ed20a09 100644
--- a/xlat/v4l2_tuner_capabilities.in
+++ b/src/xlat/v4l2_tuner_capabilities.in
diff --git a/xlat/v4l2_tuner_rxsubchanses.in b/src/xlat/v4l2_tuner_rxsubchanses.in
index 578309cae..578309cae 100644
--- a/xlat/v4l2_tuner_rxsubchanses.in
+++ b/src/xlat/v4l2_tuner_rxsubchanses.in
diff --git a/xlat/v4l2_tuner_types.in b/src/xlat/v4l2_tuner_types.in
index 22e1b2318..22e1b2318 100644
--- a/xlat/v4l2_tuner_types.in
+++ b/src/xlat/v4l2_tuner_types.in
diff --git a/xlat/v4l2_vbi_flags.in b/src/xlat/v4l2_vbi_flags.in
index 1bd6ef534..1bd6ef534 100644
--- a/xlat/v4l2_vbi_flags.in
+++ b/src/xlat/v4l2_vbi_flags.in
diff --git a/xlat/wait4_options.in b/src/xlat/wait4_options.in
index df9f085a9..df9f085a9 100644
--- a/xlat/wait4_options.in
+++ b/src/xlat/wait4_options.in
diff --git a/xlat/waitid_types.in b/src/xlat/waitid_types.in
index cec9a7c09..cec9a7c09 100644
--- a/xlat/waitid_types.in
+++ b/src/xlat/waitid_types.in
diff --git a/xlat/watchdog_ioctl_cmds.in b/src/xlat/watchdog_ioctl_cmds.in
index b871cbd1e..b871cbd1e 100644
--- a/xlat/watchdog_ioctl_cmds.in
+++ b/src/xlat/watchdog_ioctl_cmds.in
diff --git a/xlat/whence_codes.in b/src/xlat/whence_codes.in
index c04d79ab2..c04d79ab2 100644
--- a/xlat/whence_codes.in
+++ b/src/xlat/whence_codes.in
diff --git a/xlat/xattrflags.in b/src/xlat/xattrflags.in
index 37488ee50..37488ee50 100644
--- a/xlat/xattrflags.in
+++ b/src/xlat/xattrflags.in
diff --git a/xlat/xdp_flags.in b/src/xlat/xdp_flags.in
index b6a1787ce..b6a1787ce 100644
--- a/xlat/xdp_flags.in
+++ b/src/xlat/xdp_flags.in
diff --git a/xlat/xfs_dqblk_flags.in b/src/xlat/xfs_dqblk_flags.in
index c3277bb1e..c3277bb1e 100644
--- a/xlat/xfs_dqblk_flags.in
+++ b/src/xlat/xfs_dqblk_flags.in
diff --git a/xlat/xfs_quota_flags.in b/src/xlat/xfs_quota_flags.in
index cf44da513..cf44da513 100644
--- a/xlat/xfs_quota_flags.in
+++ b/src/xlat/xfs_quota_flags.in
diff --git a/xmalloc.c b/src/xmalloc.c
index cb085cd8f..cb085cd8f 100644
--- a/xmalloc.c
+++ b/src/xmalloc.c
diff --git a/xmalloc.h b/src/xmalloc.h
index 4bf1e2ce9..4bf1e2ce9 100644
--- a/xmalloc.h
+++ b/src/xmalloc.h
diff --git a/xstring.h b/src/xstring.h
index affaf791d..affaf791d 100644
--- a/xstring.h
+++ b/src/xstring.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8e9550e35..facb30cf5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,12 +18,12 @@ ARCH_MFLAGS =
 AM_CFLAGS = $(WARN_CFLAGS)
 AM_CPPFLAGS = $(ARCH_MFLAGS) \
 	      -I$(builddir) \
-	      -I$(top_builddir)/$(OS)/$(ARCH) \
-	      -I$(top_srcdir)/$(OS)/$(ARCH) \
-	      -I$(top_builddir)/$(OS) \
-	      -I$(top_srcdir)/$(OS) \
-	      -I$(top_builddir) \
-	      -I$(top_srcdir) \
+	      -I$(top_builddir)/src/$(OS)/$(ARCH) \
+	      -I$(top_srcdir)/src/$(OS)/$(ARCH) \
+	      -I$(top_builddir)/src/$(OS) \
+	      -I$(top_srcdir)/src/$(OS) \
+	      -I$(top_builddir)/src \
+	      -I$(top_srcdir)/src \
 	      -DTESTS_SIZEOF_KERNEL_LONG_T=$(SIZEOF_KERNEL_LONG_T) \
 	      -DTESTS_SIZEOF_LONG=$(SIZEOF_LONG)
 AM_LDFLAGS = $(ARCH_MFLAGS)
@@ -681,4 +681,4 @@ check-valgrind-local: $(check_LIBRARIES) $(check_PROGRAMS)
 BUILT_SOURCES = ksysent.h
 CLEANFILES = ksysent.h
 
-include ../scno.am
+include ../src/scno.am
diff --git a/tests/init.sh b/tests/init.sh
index 4460b2978..23799e9b4 100644
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -11,7 +11,7 @@ ME_="${0##*/}"
 LOG="log"
 OUT="out"
 EXP="exp"
-CONFIG_H="../../config.h"
+CONFIG_H="../../src/config.h"
 
 warn_() { printf >&2 '%s\n' "$*"; }
 fail_() { warn_ "$ME_: failed test: $*"; exit 1; }
@@ -107,7 +107,7 @@ run_strace_merge()
 {
 	rm -f -- "$LOG".[0-9]*
 	run_strace -ff -tt "$@"
-	"$srcdir"/../strace-log-merge "$LOG" > "$LOG" ||
+	"$srcdir"/../src/strace-log-merge "$LOG" > "$LOG" ||
 		dump_log_and_fail_with 'strace-log-merge failed with code $?'
 	rm -f -- "$LOG".[0-9]*
 }
@@ -439,7 +439,7 @@ if [ -n "$NAME" ]; then
 	esac
 
 	[ -n "${STRACE-}" ] || {
-		STRACE=../../strace
+		STRACE=../../src/strace
 		case "${LOG_COMPILER-} ${LOG_FLAGS-}" in
 			*--suppressions=*--error-exitcode=*--tool=*)
 			STRACE_EXE="$STRACE"
@@ -451,7 +451,7 @@ if [ -n "$NAME" ]; then
 
 	trap 'dump_log_and_fail_with "time limit ($TIMEOUT_DURATION) exceeded"' XCPU
 else
-	: "${STRACE:=../strace}"
+	: "${STRACE:=../src/strace}"
 fi
 
 # Export $STRACE_EXE to check_PROGRAMS.
diff --git a/tests/legacy_syscall_info.test b/tests/legacy_syscall_info.test
index b21cb271a..7275fcb72 100755
--- a/tests/legacy_syscall_info.test
+++ b/tests/legacy_syscall_info.test
@@ -17,7 +17,7 @@ grep -x "[^:]*strace: PTRACE_GET_SYSCALL_INFO works" "$LOG" > /dev/null ||
 
 run_prog ../chdir > /dev/null
 
-helper='../../disable_ptrace_get_syscall_info'
+helper='../../src/disable_ptrace_get_syscall_info'
 $helper $args > /dev/null ||
 	skip_ "$helper does not work"
 
@@ -32,7 +32,7 @@ $helper $STRACE -o "$LOG" "$@" > "$EXP" ||
 
 match_diff "$LOG" "$EXP"
 
-helper2='../../disable_ptrace_getregset'
+helper2='../../src/disable_ptrace_getregset'
 $helper2 $helper $args > /dev/null ||
 	exit 0 # the second part of the test is not applicable
 
diff --git a/tests/strace-log-merge-error.test b/tests/strace-log-merge-error.test
index 35a2de82d..21356fb7e 100755
--- a/tests/strace-log-merge-error.test
+++ b/tests/strace-log-merge-error.test
@@ -14,7 +14,7 @@ echo "strace-log-merge: $LOG: strace output not found" > "$EXP"
 
 check_strace_log_merge()
 {
-	"$srcdir"/../strace-log-merge "$LOG" > "$OUT" 2> "$LOG"
+	"$srcdir"/../src/strace-log-merge "$LOG" > "$OUT" 2> "$LOG"
 	rc=$?
 
 	[ $rc -gt 0 ] ||
diff --git a/tests/strace-log-merge-suffix.test b/tests/strace-log-merge-suffix.test
index 51a2e5fbc..031239a1f 100755
--- a/tests/strace-log-merge-suffix.test
+++ b/tests/strace-log-merge-suffix.test
@@ -21,7 +21,7 @@ cat > "$EXP" <<'EOF'
 4294967295 3456789012.345678 +++ exited with 3 +++
 EOF
 
-"$srcdir"/../strace-log-merge "$LOG" > "$OUT" 2> "$LOG" ||
+"$srcdir"/../src/strace-log-merge "$LOG" > "$OUT" 2> "$LOG" ||
 	dump_log_and_fail_with 'strace-log-merge failed'
 
 match_diff "$OUT" "$EXP" 'strace-log-merge output mismatch'