diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 1f256449ffce..f96dddbf99f6 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -1,215 +1,217 @@
 
 PACKAGE=	clibs
 SHLIBDIR?= /lib
 
 .include <src.opts.mk>
 
 LIBC_SRCTOP?= ${.CURDIR}
+LIBSYS_SRCTOP?=	${.CURDIR:H}/libsys
 
 # Pick the current architecture directory for libc. In general, this is named
 # MACHINE_CPUARCH, but some ABIs are different enough to require their own libc,
 # so allow a directory named MACHINE_ARCH to override this (though treat
 # powerpc64le and powerpc64 the same).
 # Note: This is copied to msun/Makefile
 M=${MACHINE_ARCH:S/powerpc64le/powerpc64/}
 .if exists(${LIBC_SRCTOP}/${M})
 LIBC_ARCH=${M}
 .else
 LIBC_ARCH=${MACHINE_CPUARCH}
 .endif
 
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
 # not contain these strings, add -DSTRIP_FBSDID (see <sys/cdefs.h>) to CFLAGS
 # below.  Note: there are no IDs for syscall stubs whose sources are generated.
 # To include legacy CSRG SCCS ID strings, remove -DNO__SCCSID from CFLAGS.
 # To include RCS ID strings from other BSD projects, remove -DNO__RCSID from CFLAGS.
 CFLAGS+=-DNO__SCCSID -DNO__RCSID
 
 LIB=c
 SHLIB_MAJOR= 7
 .if ${MK_SSP} != "no" && \
     (${LIBC_ARCH} == "i386" || ${LIBC_ARCH:Mpowerpc*} != "")
 SHLIB_LDSCRIPT=libc.ldscript
 .else
 SHLIB_LDSCRIPT=libc_nossp.ldscript
 .endif
 SHLIB_LDSCRIPT_LINKS=libxnet.so
 WARNS?=	2
 CFLAGS+=-I${LIBC_SRCTOP}/include -I${SRCTOP}/include
 CFLAGS+=-I${LIBC_SRCTOP}/${LIBC_ARCH}
+CFLAGS+=-I${LIBSYS_SRCTOP}/${LIBC_ARCH}
 .if ${MK_NLS} != "no"
 CFLAGS+=-DNLS
 .endif
 CLEANFILES+=tags
 INSTALL_PIC_ARCHIVE=
 BUILD_NOSSP_PIC_ARCHIVE=
 PRECIOUSLIB=
 
 .ifndef NO_THREAD_STACK_UNWIND
 CANCELPOINTS_CFLAGS=-fexceptions
 CFLAGS+=${CANCELPOINTS_CFLAGS}
 .endif
 
 # Use a more efficient TLS model for libc since we can reasonably assume that
 # it will be loaded during program startup.
 CFLAGS+= -ftls-model=initial-exec
 
 #
 # Link with static libcompiler_rt.a.
 #
 LDFLAGS+= -nodefaultlibs
 LIBADD+=	compiler_rt
 
 .if ${MK_SSP} != "no" && \
     (${LIBC_ARCH} == "i386" || ${LIBC_ARCH:Mpowerpc*} != "")
 LIBADD+=	ssp_nonshared
 .endif
 
 # Extras that live in either libc.a or libc_nonshared.a
 LIBC_NONSHARED_SRCS=
 
 RTLD_ELF_DIR=${SRCTOP}/libexec/rtld-elf
 .if exists(${RTLD_ELF_DIR}/${MACHINE_ARCH:S/powerpc64le/powerpc64/})
 RTLD_ARCH=	${MACHINE_ARCH:S/powerpc64le/powerpc64/}
 .else
 RTLD_ARCH=	${MACHINE_CPUARCH}
 .endif
 RTLD_HDRS= -I${RTLD_ELF_DIR}/${RTLD_ARCH} -I${RTLD_ELF_DIR}
 
 # Define (empty) variables so that make doesn't give substitution
 # errors if the included makefiles don't change these:
 MDSRCS=
 MISRCS=
 MDASM=
 MIASM=
 NOASM=
 
 .include "${LIBC_SRCTOP}/${LIBC_ARCH}/Makefile.inc"
 .include "${LIBC_SRCTOP}/csu/Makefile.inc"
 .include "${LIBC_SRCTOP}/db/Makefile.inc"
 .include "${LIBC_SRCTOP}/compat-43/Makefile.inc"
 .include "${LIBC_SRCTOP}/gdtoa/Makefile.inc"
 .include "${LIBC_SRCTOP}/gen/Makefile.inc"
 .include "${LIBC_SRCTOP}/gmon/Makefile.inc"
 .if ${MK_ICONV} != "no"
 .include "${LIBC_SRCTOP}/iconv/Makefile.inc"
 .endif
 .include "${LIBC_SRCTOP}/inet/Makefile.inc"
 .include "${LIBC_SRCTOP}/isc/Makefile.inc"
 .include "${LIBC_SRCTOP}/locale/Makefile.inc"
 .include "${LIBC_SRCTOP}/md/Makefile.inc"
 .include "${LIBC_SRCTOP}/nameser/Makefile.inc"
 .include "${LIBC_SRCTOP}/net/Makefile.inc"
 .include "${LIBC_SRCTOP}/nls/Makefile.inc"
 .include "${LIBC_SRCTOP}/posix1e/Makefile.inc"
 .if ${MACHINE_ABI:Mlong32}
 .include "${LIBC_SRCTOP}/quad/Makefile.inc"
 .endif
 .include "${LIBC_SRCTOP}/regex/Makefile.inc"
 .include "${LIBC_SRCTOP}/resolv/Makefile.inc"
 .include "${LIBC_SRCTOP}/stdio/Makefile.inc"
 .include "${LIBC_SRCTOP}/stdlib/Makefile.inc"
 .include "${LIBC_SRCTOP}/stdtime/Makefile.inc"
 .include "${LIBC_SRCTOP}/string/Makefile.inc"
 .include "${LIBC_SRCTOP}/sys/Makefile.inc"
 .include "${LIBC_SRCTOP}/secure/Makefile.inc"
 .include "${LIBC_SRCTOP}/rpc/Makefile.inc"
 .include "${LIBC_SRCTOP}/uuid/Makefile.inc"
 .include "${LIBC_SRCTOP}/xdr/Makefile.inc"
 .if (${LIBC_ARCH} == "arm" && (defined(CPUTYPE) && ${CPUTYPE:M*soft*}))
 .include "${LIBC_SRCTOP}/softfloat/Makefile.inc"
 .endif
 .if ${LIBC_ARCH} == "i386" || ${LIBC_ARCH} == "amd64"
 .include "${LIBC_SRCTOP}/x86/sys/Makefile.inc"
 .include "${LIBC_SRCTOP}/x86/gen/Makefile.inc"
 .endif
 .if ${MK_NIS} != "no"
 CFLAGS+= -DYP
 .include "${LIBC_SRCTOP}/yp/Makefile.inc"
 .endif
 .include "${LIBC_SRCTOP}/capability/Makefile.inc"
 .if ${MK_HESIOD} != "no"
 CFLAGS+= -DHESIOD
 .endif
 .if ${MK_FP_LIBC} == "no"
 CFLAGS+= -DNO_FLOATING_POINT
 .endif
 .if ${MK_NS_CACHING} != "no"
 CFLAGS+= -DNS_CACHING
 .endif
 .if defined(_FREEFALL_CONFIG)
 CFLAGS+=-D_FREEFALL_CONFIG
 .endif
 
 STATICOBJS+=${LIBC_NONSHARED_SRCS:S/.c$/.o/}
 
 VERSION_DEF=${LIBC_SRCTOP}/Versions.def
 SYMBOL_MAPS=${SYM_MAPS}
 
 # If there are no machine dependent sources, append all the
 # machine-independent sources:
 .if empty(MDSRCS) || ${MK_MACHDEP_OPTIMIZATIONS} == no
 SRCS+=	${MISRCS}
 .else
 # Append machine-dependent sources, then append machine-independent sources
 # for which there is no machine-dependent variant.
 SRCS+=	${MDSRCS}
 .for _src in ${MISRCS}
 .if ${MDSRCS:R:M${_src:R}} == ""
 SRCS+=	${_src}
 .endif
 .endfor
 .endif
 
 KQSRCS=	adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c iordi3.c \
 	lshldi3.c lshrdi3.c moddi3.c muldi3.c negdi2.c notdi2.c qdivrem.c \
 	subdi3.c ucmpdi2.c udivdi3.c umoddi3.c xordi3.c
 KSRCS=	bcmp.c ffs.c ffsl.c fls.c flsl.c mcount.c strcat.c strchr.c \
 	strcmp.c strcpy.c strlen.c strncpy.c strrchr.c
 
 libkern: libkern.gen libkern.${LIBC_ARCH}
 
 libkern.gen: ${KQSRCS} ${KSRCS}
 	${CP} ${LIBC_SRCTOP}/quad/quad.h ${.ALLSRC} ${DESTDIR}/sys/libkern
 
 libkern.${LIBC_ARCH}:: ${KMSRCS}
 .if defined(KMSRCS) && !empty(KMSRCS)
 	${CP} ${.ALLSRC} ${DESTDIR}/sys/libkern/${LIBC_ARCH}
 .endif
 
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>
 
 .if (${LIBC_ARCH} == amd64 || ${LIBC_ARCH} == i386) && \
     ${.TARGETS:Mall} == all && \
     defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mifunc} == ""
 .error ${LIBC_ARCH} libc requires linker ifunc support
 .endif
 
 .if !defined(_SKIP_BUILD)
 # We need libutil.h, get it directly to avoid
 # recording a build dependency
 CFLAGS+= -I${SRCTOP}/lib/libutil
 # Same issue with libm
 MSUN_ARCH_SUBDIR != ${MAKE} -B -C ${SRCTOP}/lib/msun -V ARCH_SUBDIR
 # unfortunately msun/src contains both private and public headers
 CFLAGS+= -I${SRCTOP}/lib/msun/${MSUN_ARCH_SUBDIR}
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 CFLAGS+= -I${SRCTOP}/lib/msun/x86
 .endif
 CFLAGS+= -I${SRCTOP}/lib/msun/src
 # and we do not want to record a dependency on msun
 .if ${.MAKE.LEVEL} > 0
 GENDIRDEPS_FILTER+= N${RELDIR:H}/msun
 .endif
 .endif
 
 # Disable warnings in contributed sources.
 CWARNFLAGS:=	${.IMPSRC:Ngdtoa_*.c:C/^.+$/${CWARNFLAGS}/:C/^$/-w/}
 # Disable stack protection for SSP symbols.
 SSP_CFLAGS:=	${.IMPSRC:N*/stack_protector.c:C/^.+$/${SSP_CFLAGS}/}
 # Generate stack unwinding tables for cancellation points
 CANCELPOINTS_CFLAGS:=	${.IMPSRC:Mcancelpoints_*:C/^.+$/${CANCELPOINTS_CFLAGS}/:C/^$//}
diff --git a/lib/libc/powerpcspe/sys/Makefile.inc b/lib/libc/powerpcspe/sys/Makefile.inc
index 328c43d2b1ca..70662c94db0b 100644
--- a/lib/libc/powerpcspe/sys/Makefile.inc
+++ b/lib/libc/powerpcspe/sys/Makefile.inc
@@ -1,2 +1,3 @@
 .PATH: ${LIBC_SRCTOP}/powerpc/sys
+.PATH: ${LIBSYS_SRCTOP}/powerpc
 .sinclude "${LIBC_SRCTOP}/powerpc/sys/Makefile.inc"
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index b533443f96b2..2c7472ebad06 100644
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -1,515 +1,516 @@
 
 # sys sources
-.PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/sys ${LIBC_SRCTOP}/sys
+.PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/sys
+.PATH: ${LIBSYS_SRCTOP}/${LIBC_ARCH} ${LIBSYS_SRCTOP}
 
 # Include the generated makefile containing the *complete* list
 # of syscall names in MIASM.
 .include "${SRCTOP}/sys/sys/syscall.mk"
 
 # Include machine dependent definitions.
 #
 # MDASM names override the default syscall names in MIASM.
 # NOASM will prevent the default syscall code from being generated.
 # PSEUDO generates _<sys>() and __sys_<sys>() symbols, but not <sys>().
 #
 # While historically machine dependent, all architectures have the following
 # declarations in common:
 #
 NOASM=	exit.o \
 	getlogin.o \
 	yield.o
 PSEUDO=	_exit.o \
 	_getlogin.o
 .sinclude "${LIBC_SRCTOP}/${LIBC_ARCH}/sys/Makefile.inc"
 
 SRCS+= clock_gettime.c gettimeofday.c __vdso_gettimeofday.c
 NOASM+=  clock_gettime.o gettimeofday.o
 PSEUDO+= _clock_gettime.o _gettimeofday.o
 
 # Sources common to both syscall interfaces:
 SRCS+=	\
 	__error.c \
 	interposing_table.c
 
 SRCS+= getdents.c lstat.c mknod.c stat.c
 
 NOASM+=  sched_getcpu.o
 PSEUDO+= _sched_getcpu.o
 
 SRCS+= brk.c
 SRCS+= closefrom.c
 SRCS+= pipe.c
 SRCS+= shm_open.c
 SRCS+= vadvise.c
 SRCS+= POSIX2x_Fork.c
 
 SRCS+=	compat-stub.c
 
 INTERPOSED = \
 	accept \
 	accept4 \
 	aio_suspend \
 	clock_nanosleep \
 	close \
 	connect \
 	fcntl \
 	fdatasync \
 	fsync \
 	fork \
 	kevent \
 	msync \
 	nanosleep \
 	open \
 	openat \
 	pdfork \
 	poll \
 	ppoll \
 	pselect \
 	ptrace \
 	read \
 	readv \
 	recvfrom \
 	recvmsg \
 	select \
 	sendmsg \
 	sendto \
 	setcontext \
 	sigaction \
 	sigprocmask \
 	sigsuspend \
 	sigtimedwait \
 	sigwait \
 	sigwaitinfo \
 	swapcontext \
 	wait4 \
 	wait6 \
 	write \
 	writev
 
 SRCS+=	${INTERPOSED:S/$/.c/}
 NOASM+=	${INTERPOSED:S/$/.o/}
 PSEUDO+=	${INTERPOSED:C/^.*$/_&.o/}
 
 # Add machine dependent asm sources:
 SRCS+=${MDASM}
 
 # Look though the complete list of syscalls (MIASM) for names that are
 # not defined with machine dependent implementations (MDASM) and are
 # not declared for no generation of default code (NOASM).  Add each
 # syscall that satisfies these conditions to the ASM list.
 .for _asm in ${MIASM}
 .if !${MDASM:R:M${_asm:R}} && !${NOASM:R:M${_asm:R}}
 ASM+=$(_asm)
 .endif
 .endfor
 
 SASM=	${ASM:S/.o/.S/}
 
 SPSEUDO= ${PSEUDO:S/.o/.S/}
 
 SRCS+=	${SASM} ${SPSEUDO}
 
-SYM_MAPS+=	${LIBC_SRCTOP}/sys/Symbol.map
+SYM_MAPS+=	${LIBSYS_SRCTOP}/Symbol.sys.map
 
 # Generated files
 CLEANFILES+=	${SASM} ${SPSEUDO}
 
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \
     ${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_CPUARCH} == "arm"
 NOTE_GNU_STACK='\t.section .note.GNU-stack,"",%%progbits\n'
 .else
 NOTE_GNU_STACK=''
 .endif
 .if ${MACHINE_CPUARCH} == "aarch64"
 FEATURE_NOTE='\#include <sys/elf_common.h>\nGNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL)'
 .else
 FEATURE_NOTE=''
 .endif
 
 ${SASM}:
 	printf '/* %sgenerated by libc/sys/Makefile.inc */\n' @ > ${.TARGET}
 	printf '#include "compat.h"\n' >> ${.TARGET}
 	printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' >> ${.TARGET}
 	printf  ${NOTE_GNU_STACK} >>${.TARGET}
 	printf  ${FEATURE_NOTE} >> ${.TARGET}
 
 ${SPSEUDO}:
 	printf '/* %sgenerated by libc/sys/Makefile.inc */\n' @ > ${.TARGET}
 	printf '#include "compat.h"\n' >> ${.TARGET}
 	printf '#include "SYS.h"\nPSEUDO(${.PREFIX:S/_//})\n' \
 	    >> ${.TARGET}
 	printf ${NOTE_GNU_STACK} >>${.TARGET}
 	printf ${FEATURE_NOTE} >> ${.TARGET}
 
 MAN+=	abort2.2 \
 	accept.2 \
 	access.2 \
 	acct.2 \
 	adjtime.2 \
 	aio_cancel.2 \
 	aio_error.2 \
 	aio_fsync.2 \
 	aio_mlock.2 \
 	aio_read.2 \
 	aio_return.2 \
 	aio_suspend.2 \
 	aio_waitcomplete.2 \
 	aio_write.2 \
 	bind.2 \
 	bindat.2 \
 	brk.2 \
 	cap_enter.2 \
 	cap_fcntls_limit.2 \
 	cap_ioctls_limit.2 \
 	cap_rights_limit.2 \
 	chdir.2 \
 	chflags.2 \
 	chmod.2 \
 	chown.2 \
 	chroot.2 \
 	clock_gettime.2 \
 	close.2 \
 	closefrom.2 \
 	connect.2 \
 	connectat.2 \
 	copy_file_range.2 \
 	cpuset.2 \
 	cpuset_getaffinity.2 \
 	cpuset_getdomain.2 \
 	dup.2 \
 	eventfd.2 \
 	execve.2 \
 	_exit.2 \
 	extattr_get_file.2 \
 	fcntl.2 \
 	ffclock.2 \
 	fhlink.2 \
 	fhopen.2 \
 	fhreadlink.2 \
 	flock.2 \
 	fork.2 \
 	fspacectl.2 \
 	fsync.2 \
 	getdirentries.2 \
 	getdtablesize.2 \
 	getfh.2 \
 	getfsstat.2 \
 	getgid.2 \
 	getgroups.2 \
 	getitimer.2 \
 	getlogin.2 \
 	getloginclass.2 \
 	getpeername.2 \
 	getpgrp.2 \
 	getpid.2 \
 	getpriority.2 \
 	getrandom.2 \
 	getrlimit.2 \
 	getrusage.2 \
 	getsid.2 \
 	getsockname.2 \
 	getsockopt.2 \
 	gettimeofday.2 \
 	getuid.2 \
 	intro.2 \
 	ioctl.2 \
 	issetugid.2 \
 	jail.2 \
 	kcmp.2 \
 	kenv.2 \
 	kill.2 \
 	kldfind.2 \
 	kldfirstmod.2 \
 	kldload.2 \
 	kldnext.2 \
 	kldstat.2 \
 	kldsym.2 \
 	kldunload.2 \
 	kqueue.2 \
 	ktrace.2 \
 	link.2 \
 	lio_listio.2 \
 	listen.2 \
 	lseek.2 \
 	madvise.2 \
 	mincore.2 \
 	minherit.2 \
 	mkdir.2 \
 	mkfifo.2 \
 	mknod.2 \
 	mlock.2 \
 	mlockall.2 \
 	mmap.2 \
 	modfind.2 \
 	modnext.2 \
 	modstat.2 \
 	mount.2 \
 	mprotect.2 \
 	mq_close.2 \
 	mq_getattr.2 \
 	mq_notify.2 \
 	mq_open.2 \
 	mq_receive.2 \
 	mq_send.2 \
 	mq_setattr.2 \
 	mq_unlink.2 \
 	msgctl.2 \
 	msgget.2 \
 	msgrcv.2 \
 	msgsnd.2 \
 	msync.2 \
 	munmap.2 \
 	nanosleep.2 \
 	nfssvc.2 \
 	ntp_adjtime.2 \
 	open.2 \
 	pathconf.2 \
 	pdfork.2 \
 	pipe.2 \
 	poll.2 \
 	posix_fadvise.2 \
 	posix_fallocate.2 \
 	posix_openpt.2 \
 	procctl.2 \
 	profil.2 \
 	pselect.2 \
 	ptrace.2 \
 	quotactl.2 \
 	rctl_add_rule.2 \
 	read.2 \
 	readlink.2 \
 	reboot.2 \
 	recv.2 \
 	rename.2 \
 	revoke.2 \
 	rfork.2 \
 	rmdir.2 \
 	rtprio.2 \
 	sched_get_priority_max.2 \
 	sched_setparam.2 \
 	sched_setscheduler.2 \
 	sched_yield.2 \
 	sctp_generic_recvmsg.2 \
 	sctp_generic_sendmsg.2 \
 	sctp_peeloff.2 \
 	select.2 \
 	semctl.2 \
 	semget.2 \
 	semop.2 \
 	send.2 \
 	setfib.2 \
 	sendfile.2 \
 	setgroups.2 \
 	setpgid.2 \
 	setregid.2 \
 	setresuid.2 \
 	setreuid.2 \
 	setsid.2 \
 	setuid.2 \
 	shmat.2 \
 	shmctl.2 \
 	shmget.2 \
 	shm_open.2 \
 	shutdown.2 \
 	sigaction.2 \
 	sigaltstack.2 \
 	sigfastblock.2 \
 	sigpending.2 \
 	sigprocmask.2 \
 	sigqueue.2 \
 	sigreturn.2 \
 	sigstack.2 \
 	sigsuspend.2 \
 	sigwait.2 \
 	sigwaitinfo.2 \
 	socket.2 \
 	socketpair.2 \
 	stat.2 \
 	statfs.2 \
 	swapon.2 \
 	symlink.2 \
 	sync.2 \
 	sysarch.2 \
 	syscall.2 \
 	thr_exit.2 \
 	thr_kill.2 \
 	thr_new.2 \
 	thr_self.2 \
 	thr_set_name.2 \
 	thr_suspend.2 \
 	thr_wake.2 \
 	timer_create.2 \
 	timer_delete.2 \
 	timer_settime.2 \
 	timerfd.2 \
 	truncate.2 \
 	umask.2 \
 	undelete.2 \
 	unlink.2 \
 	utimensat.2 \
 	utimes.2 \
 	utrace.2 \
 	uuidgen.2 \
 	vfork.2 \
 	wait.2 \
 	write.2 \
 	_umtx_op.2
 
 MLINKS+=aio_read.2 aio_readv.2
 MLINKS+=aio_write.2 aio_writev.2
 MLINKS+=accept.2 accept4.2
 MLINKS+=access.2 eaccess.2 \
 	access.2 faccessat.2
 MLINKS+=brk.2 sbrk.2
 MLINKS+=cap_enter.2 cap_getmode.2
 MLINKS+=cap_fcntls_limit.2 cap_fcntls_get.2
 MLINKS+=cap_ioctls_limit.2 cap_ioctls_get.2
 MLINKS+=chdir.2 fchdir.2
 MLINKS+=chflags.2 chflagsat.2 \
 	chflags.2 fchflags.2 \
 	chflags.2 lchflags.2
 MLINKS+=chmod.2 fchmod.2 \
 	chmod.2 fchmodat.2 \
 	chmod.2 lchmod.2
 MLINKS+=chown.2 fchown.2 \
 	chown.2 fchownat.2 \
 	chown.2 lchown.2
 MLINKS+=clock_gettime.2 clock_getres.2 \
 	clock_gettime.2 clock_settime.2
 MLINKS+=closefrom.2 close_range.2
 MLINKS+=nanosleep.2 clock_nanosleep.2
 MLINKS+=cpuset.2 cpuset_getid.2 \
 	cpuset.2 cpuset_setid.2
 MLINKS+=cpuset_getaffinity.2 cpuset_setaffinity.2
 MLINKS+=cpuset_getdomain.2 cpuset_setdomain.2
 MLINKS+=dup.2 dup2.2
 MLINKS+=eventfd.2 eventfd_read.3 \
 	eventfd.2 eventfd_write.3
 MLINKS+=execve.2 fexecve.2
 MLINKS+=extattr_get_file.2 extattr.2 \
 	extattr_get_file.2 extattr_delete_fd.2 \
 	extattr_get_file.2 extattr_delete_file.2 \
 	extattr_get_file.2 extattr_delete_link.2 \
 	extattr_get_file.2 extattr_get_fd.2 \
 	extattr_get_file.2 extattr_get_link.2 \
 	extattr_get_file.2 extattr_list_fd.2 \
 	extattr_get_file.2 extattr_list_file.2 \
 	extattr_get_file.2 extattr_list_link.2 \
 	extattr_get_file.2 extattr_set_fd.2 \
 	extattr_get_file.2 extattr_set_file.2 \
 	extattr_get_file.2 extattr_set_link.2
 MLINKS+=ffclock.2 ffclock_getcounter.2 \
 	ffclock.2 ffclock_getestimate.2 \
 	ffclock.2 ffclock_setestimate.2
 MLINKS+=fhlink.2 fhlinkat.2
 MLINKS+=fhopen.2 fhstat.2 fhopen.2 fhstatfs.2
 MLINKS+=fork.2 _Fork.2
 MLINKS+=fsync.2 fdatasync.2
 MLINKS+=getdirentries.2 getdents.2
 MLINKS+=getfh.2 lgetfh.2 \
 	getfh.2 getfhat.2
 MLINKS+=getgid.2 getegid.2
 MLINKS+=getitimer.2 setitimer.2
 MLINKS+=getlogin.2 getlogin_r.3
 MLINKS+=getlogin.2 setlogin.2
 MLINKS+=getloginclass.2 setloginclass.2
 MLINKS+=getpgrp.2 getpgid.2
 MLINKS+=getpid.2 getppid.2
 MLINKS+=getpriority.2 setpriority.2
 MLINKS+=getrlimit.2 setrlimit.2
 MLINKS+=getsockopt.2 setsockopt.2
 MLINKS+=gettimeofday.2 settimeofday.2
 MLINKS+=getuid.2 geteuid.2
 MLINKS+=intro.2 errno.2
 MLINKS+=jail.2 jail_attach.2 \
 	jail.2 jail_get.2 \
 	jail.2 jail_remove.2 \
 	jail.2 jail_set.2
 MLINKS+=kldunload.2 kldunloadf.2
 MLINKS+=kqueue.2 kevent.2 \
 	kqueue.2 kqueuex.2 \
 	kqueue.2 EV_SET.3
 MLINKS+=link.2 linkat.2
 MLINKS+=madvise.2 posix_madvise.2
 MLINKS+=mkdir.2 mkdirat.2
 MLINKS+=mkfifo.2 mkfifoat.2
 MLINKS+=mknod.2 mknodat.2
 MLINKS+=mlock.2 munlock.2
 MLINKS+=mlockall.2 munlockall.2
 MLINKS+=modnext.2 modfnext.2
 MLINKS+=mount.2 nmount.2 \
 	mount.2 unmount.2
 MLINKS+=mq_receive.2 mq_timedreceive.2
 MLINKS+=mq_send.2 mq_timedsend.2
 MLINKS+=ntp_adjtime.2 ntp_gettime.2
 MLINKS+=open.2 openat.2
 MLINKS+=pathconf.2 fpathconf.2
 MLINKS+=pathconf.2 lpathconf.2
 MLINKS+=pdfork.2 pdgetpid.2\
 	pdfork.2 pdkill.2
 MLINKS+=pipe.2 pipe2.2
 MLINKS+=poll.2 ppoll.2
 MLINKS+=rctl_add_rule.2 rctl_get_limits.2 \
 	rctl_add_rule.2 rctl_get_racct.2 \
 	rctl_add_rule.2 rctl_get_rules.2 \
 	rctl_add_rule.2 rctl_remove_rule.2
 MLINKS+=read.2 pread.2 \
 	read.2 preadv.2 \
 	read.2 readv.2
 MLINKS+=readlink.2 readlinkat.2
 MLINKS+=recv.2 recvfrom.2 \
 	recv.2 recvmsg.2
 MLINKS+=rename.2 renameat.2
 MLINKS+=rtprio.2 rtprio_thread.2
 MLINKS+=sched_get_priority_max.2 sched_get_priority_min.2 \
 	sched_get_priority_max.2 sched_rr_get_interval.2
 MLINKS+=sched_setparam.2 sched_getparam.2
 MLINKS+=sched_setscheduler.2 sched_getscheduler.2
 MLINKS+=sctp_generic_sendmsg.2 sctp_generic_sendmsg_iov.2
 MLINKS+=select.2 FD_CLR.3 \
 	select.2 FD_ISSET.3 \
 	select.2 FD_SET.3 \
 	select.2 FD_ZERO.3
 MLINKS+=send.2 sendmsg.2 \
 	send.2 sendto.2
 MLINKS+=setpgid.2 setpgrp.2
 MLINKS+=setresuid.2 getresgid.2 \
 	setresuid.2 getresuid.2 \
 	setresuid.2 setresgid.2
 MLINKS+=setuid.2 setegid.2 \
 	setuid.2 seteuid.2 \
 	setuid.2 setgid.2
 MLINKS+=shmat.2 shmdt.2
 MLINKS+=shm_open.2 memfd_create.3 \
 	shm_open.2 shm_create_largepage.3 \
 	shm_open.2 shm_unlink.2 \
 	shm_open.2 shm_rename.2
 MLINKS+=sigwaitinfo.2 sigtimedwait.2
 MLINKS+=stat.2 fstat.2 \
 	stat.2 fstatat.2 \
 	stat.2 lstat.2
 MLINKS+=statfs.2 fstatfs.2
 MLINKS+=swapon.2 swapoff.2
 MLINKS+=symlink.2 symlinkat.2
 MLINKS+=syscall.2 __syscall.2
 MLINKS+=timer_settime.2 timer_getoverrun.2 \
 	timer_settime.2 timer_gettime.2
 MLINKS+=timerfd.2 timerfd_create.2 \
 	timerfd.2 timerfd_gettime.2 \
 	timerfd.2 timerfd_settime.2
 MLINKS+=thr_kill.2 thr_kill2.2
 MLINKS+=truncate.2 ftruncate.2
 MLINKS+=unlink.2 unlinkat.2
 MLINKS+=unlink.2 funlinkat.2
 MLINKS+=utimensat.2 futimens.2
 MLINKS+=utimes.2 futimes.2 \
 	utimes.2 futimesat.2 \
 	utimes.2 lutimes.2
 MLINKS+=wait.2 wait3.2 \
 	wait.2 wait4.2 \
 	wait.2 waitpid.2 \
 	wait.2 waitid.2 \
 	wait.2 wait6.2
 MLINKS+=write.2 pwrite.2 \
 	write.2 pwritev.2 \
 	write.2 writev.2
diff --git a/lib/libc/sys/POSIX2x_Fork.c b/lib/libsys/POSIX2x_Fork.c
similarity index 100%
rename from lib/libc/sys/POSIX2x_Fork.c
rename to lib/libsys/POSIX2x_Fork.c
diff --git a/lib/libc/sys/Symbol.map b/lib/libsys/Symbol.sys.map
similarity index 100%
rename from lib/libc/sys/Symbol.map
rename to lib/libsys/Symbol.sys.map
diff --git a/lib/libc/sys/__error.c b/lib/libsys/__error.c
similarity index 100%
rename from lib/libc/sys/__error.c
rename to lib/libsys/__error.c
diff --git a/lib/libc/sys/__vdso_gettimeofday.c b/lib/libsys/__vdso_gettimeofday.c
similarity index 100%
rename from lib/libc/sys/__vdso_gettimeofday.c
rename to lib/libsys/__vdso_gettimeofday.c
diff --git a/lib/libc/sys/_exit.2 b/lib/libsys/_exit.2
similarity index 100%
rename from lib/libc/sys/_exit.2
rename to lib/libsys/_exit.2
diff --git a/lib/libc/sys/_umtx_op.2 b/lib/libsys/_umtx_op.2
similarity index 100%
rename from lib/libc/sys/_umtx_op.2
rename to lib/libsys/_umtx_op.2
diff --git a/lib/libc/aarch64/SYS.h b/lib/libsys/aarch64/SYS.h
similarity index 100%
rename from lib/libc/aarch64/SYS.h
rename to lib/libsys/aarch64/SYS.h
diff --git a/lib/libc/aarch64/sys/cerror.S b/lib/libsys/aarch64/cerror.S
similarity index 100%
rename from lib/libc/aarch64/sys/cerror.S
rename to lib/libsys/aarch64/cerror.S
diff --git a/lib/libc/aarch64/sys/syscall.S b/lib/libsys/aarch64/syscall.S
similarity index 100%
rename from lib/libc/aarch64/sys/syscall.S
rename to lib/libsys/aarch64/syscall.S
diff --git a/lib/libc/aarch64/sys/vfork.S b/lib/libsys/aarch64/vfork.S
similarity index 100%
rename from lib/libc/aarch64/sys/vfork.S
rename to lib/libsys/aarch64/vfork.S
diff --git a/lib/libc/sys/abort2.2 b/lib/libsys/abort2.2
similarity index 100%
rename from lib/libc/sys/abort2.2
rename to lib/libsys/abort2.2
diff --git a/lib/libc/sys/accept.2 b/lib/libsys/accept.2
similarity index 100%
rename from lib/libc/sys/accept.2
rename to lib/libsys/accept.2
diff --git a/lib/libc/sys/accept.c b/lib/libsys/accept.c
similarity index 100%
rename from lib/libc/sys/accept.c
rename to lib/libsys/accept.c
diff --git a/lib/libc/sys/accept4.c b/lib/libsys/accept4.c
similarity index 100%
rename from lib/libc/sys/accept4.c
rename to lib/libsys/accept4.c
diff --git a/lib/libc/sys/access.2 b/lib/libsys/access.2
similarity index 100%
rename from lib/libc/sys/access.2
rename to lib/libsys/access.2
diff --git a/lib/libc/sys/acct.2 b/lib/libsys/acct.2
similarity index 100%
rename from lib/libc/sys/acct.2
rename to lib/libsys/acct.2
diff --git a/lib/libc/sys/adjtime.2 b/lib/libsys/adjtime.2
similarity index 100%
rename from lib/libc/sys/adjtime.2
rename to lib/libsys/adjtime.2
diff --git a/lib/libc/sys/aio_cancel.2 b/lib/libsys/aio_cancel.2
similarity index 100%
rename from lib/libc/sys/aio_cancel.2
rename to lib/libsys/aio_cancel.2
diff --git a/lib/libc/sys/aio_error.2 b/lib/libsys/aio_error.2
similarity index 100%
rename from lib/libc/sys/aio_error.2
rename to lib/libsys/aio_error.2
diff --git a/lib/libc/sys/aio_fsync.2 b/lib/libsys/aio_fsync.2
similarity index 100%
rename from lib/libc/sys/aio_fsync.2
rename to lib/libsys/aio_fsync.2
diff --git a/lib/libc/sys/aio_mlock.2 b/lib/libsys/aio_mlock.2
similarity index 100%
rename from lib/libc/sys/aio_mlock.2
rename to lib/libsys/aio_mlock.2
diff --git a/lib/libc/sys/aio_read.2 b/lib/libsys/aio_read.2
similarity index 100%
rename from lib/libc/sys/aio_read.2
rename to lib/libsys/aio_read.2
diff --git a/lib/libc/sys/aio_return.2 b/lib/libsys/aio_return.2
similarity index 100%
rename from lib/libc/sys/aio_return.2
rename to lib/libsys/aio_return.2
diff --git a/lib/libc/sys/aio_suspend.2 b/lib/libsys/aio_suspend.2
similarity index 100%
rename from lib/libc/sys/aio_suspend.2
rename to lib/libsys/aio_suspend.2
diff --git a/lib/libc/sys/aio_suspend.c b/lib/libsys/aio_suspend.c
similarity index 100%
rename from lib/libc/sys/aio_suspend.c
rename to lib/libsys/aio_suspend.c
diff --git a/lib/libc/sys/aio_waitcomplete.2 b/lib/libsys/aio_waitcomplete.2
similarity index 100%
rename from lib/libc/sys/aio_waitcomplete.2
rename to lib/libsys/aio_waitcomplete.2
diff --git a/lib/libc/sys/aio_write.2 b/lib/libsys/aio_write.2
similarity index 100%
rename from lib/libc/sys/aio_write.2
rename to lib/libsys/aio_write.2
diff --git a/lib/libc/amd64/SYS.h b/lib/libsys/amd64/SYS.h
similarity index 100%
rename from lib/libc/amd64/SYS.h
rename to lib/libsys/amd64/SYS.h
diff --git a/lib/libc/amd64/sys/cerror.S b/lib/libsys/amd64/cerror.S
similarity index 100%
rename from lib/libc/amd64/sys/cerror.S
rename to lib/libsys/amd64/cerror.S
diff --git a/lib/libc/amd64/sys/getcontext.S b/lib/libsys/amd64/getcontext.S
similarity index 100%
rename from lib/libc/amd64/sys/getcontext.S
rename to lib/libsys/amd64/getcontext.S
diff --git a/lib/libc/amd64/sys/vfork.S b/lib/libsys/amd64/vfork.S
similarity index 100%
rename from lib/libc/amd64/sys/vfork.S
rename to lib/libsys/amd64/vfork.S
diff --git a/lib/libc/arm/SYS.h b/lib/libsys/arm/SYS.h
similarity index 100%
rename from lib/libc/arm/SYS.h
rename to lib/libsys/arm/SYS.h
diff --git a/lib/libc/arm/sys/cerror.S b/lib/libsys/arm/cerror.S
similarity index 100%
rename from lib/libc/arm/sys/cerror.S
rename to lib/libsys/arm/cerror.S
diff --git a/lib/libc/arm/sys/syscall.S b/lib/libsys/arm/syscall.S
similarity index 100%
rename from lib/libc/arm/sys/syscall.S
rename to lib/libsys/arm/syscall.S
diff --git a/lib/libc/arm/sys/vfork.S b/lib/libsys/arm/vfork.S
similarity index 100%
rename from lib/libc/arm/sys/vfork.S
rename to lib/libsys/arm/vfork.S
diff --git a/lib/libc/sys/bind.2 b/lib/libsys/bind.2
similarity index 100%
rename from lib/libc/sys/bind.2
rename to lib/libsys/bind.2
diff --git a/lib/libc/sys/bindat.2 b/lib/libsys/bindat.2
similarity index 100%
rename from lib/libc/sys/bindat.2
rename to lib/libsys/bindat.2
diff --git a/lib/libc/sys/brk.2 b/lib/libsys/brk.2
similarity index 100%
rename from lib/libc/sys/brk.2
rename to lib/libsys/brk.2
diff --git a/lib/libc/sys/brk.c b/lib/libsys/brk.c
similarity index 100%
rename from lib/libc/sys/brk.c
rename to lib/libsys/brk.c
diff --git a/lib/libc/sys/cap_enter.2 b/lib/libsys/cap_enter.2
similarity index 100%
rename from lib/libc/sys/cap_enter.2
rename to lib/libsys/cap_enter.2
diff --git a/lib/libc/sys/cap_fcntls_limit.2 b/lib/libsys/cap_fcntls_limit.2
similarity index 100%
rename from lib/libc/sys/cap_fcntls_limit.2
rename to lib/libsys/cap_fcntls_limit.2
diff --git a/lib/libc/sys/cap_ioctls_limit.2 b/lib/libsys/cap_ioctls_limit.2
similarity index 100%
rename from lib/libc/sys/cap_ioctls_limit.2
rename to lib/libsys/cap_ioctls_limit.2
diff --git a/lib/libc/sys/cap_rights_limit.2 b/lib/libsys/cap_rights_limit.2
similarity index 100%
rename from lib/libc/sys/cap_rights_limit.2
rename to lib/libsys/cap_rights_limit.2
diff --git a/lib/libc/sys/chdir.2 b/lib/libsys/chdir.2
similarity index 100%
rename from lib/libc/sys/chdir.2
rename to lib/libsys/chdir.2
diff --git a/lib/libc/sys/chflags.2 b/lib/libsys/chflags.2
similarity index 100%
rename from lib/libc/sys/chflags.2
rename to lib/libsys/chflags.2
diff --git a/lib/libc/sys/chmod.2 b/lib/libsys/chmod.2
similarity index 100%
rename from lib/libc/sys/chmod.2
rename to lib/libsys/chmod.2
diff --git a/lib/libc/sys/chown.2 b/lib/libsys/chown.2
similarity index 100%
rename from lib/libc/sys/chown.2
rename to lib/libsys/chown.2
diff --git a/lib/libc/sys/chroot.2 b/lib/libsys/chroot.2
similarity index 100%
rename from lib/libc/sys/chroot.2
rename to lib/libsys/chroot.2
diff --git a/lib/libc/sys/clock_gettime.2 b/lib/libsys/clock_gettime.2
similarity index 100%
rename from lib/libc/sys/clock_gettime.2
rename to lib/libsys/clock_gettime.2
diff --git a/lib/libc/sys/clock_gettime.c b/lib/libsys/clock_gettime.c
similarity index 100%
rename from lib/libc/sys/clock_gettime.c
rename to lib/libsys/clock_gettime.c
diff --git a/lib/libc/sys/clock_nanosleep.c b/lib/libsys/clock_nanosleep.c
similarity index 100%
rename from lib/libc/sys/clock_nanosleep.c
rename to lib/libsys/clock_nanosleep.c
diff --git a/lib/libc/sys/close.2 b/lib/libsys/close.2
similarity index 100%
rename from lib/libc/sys/close.2
rename to lib/libsys/close.2
diff --git a/lib/libc/sys/close.c b/lib/libsys/close.c
similarity index 100%
rename from lib/libc/sys/close.c
rename to lib/libsys/close.c
diff --git a/lib/libc/sys/closefrom.2 b/lib/libsys/closefrom.2
similarity index 100%
rename from lib/libc/sys/closefrom.2
rename to lib/libsys/closefrom.2
diff --git a/lib/libc/sys/closefrom.c b/lib/libsys/closefrom.c
similarity index 100%
rename from lib/libc/sys/closefrom.c
rename to lib/libsys/closefrom.c
diff --git a/lib/libc/sys/compat-stub.c b/lib/libsys/compat-stub.c
similarity index 100%
rename from lib/libc/sys/compat-stub.c
rename to lib/libsys/compat-stub.c
diff --git a/lib/libc/sys/connect.2 b/lib/libsys/connect.2
similarity index 100%
rename from lib/libc/sys/connect.2
rename to lib/libsys/connect.2
diff --git a/lib/libc/sys/connect.c b/lib/libsys/connect.c
similarity index 100%
rename from lib/libc/sys/connect.c
rename to lib/libsys/connect.c
diff --git a/lib/libc/sys/connectat.2 b/lib/libsys/connectat.2
similarity index 100%
rename from lib/libc/sys/connectat.2
rename to lib/libsys/connectat.2
diff --git a/lib/libc/sys/copy_file_range.2 b/lib/libsys/copy_file_range.2
similarity index 100%
rename from lib/libc/sys/copy_file_range.2
rename to lib/libsys/copy_file_range.2
diff --git a/lib/libc/sys/cpuset.2 b/lib/libsys/cpuset.2
similarity index 100%
rename from lib/libc/sys/cpuset.2
rename to lib/libsys/cpuset.2
diff --git a/lib/libc/sys/cpuset_getaffinity.2 b/lib/libsys/cpuset_getaffinity.2
similarity index 100%
rename from lib/libc/sys/cpuset_getaffinity.2
rename to lib/libsys/cpuset_getaffinity.2
diff --git a/lib/libc/sys/cpuset_getdomain.2 b/lib/libsys/cpuset_getdomain.2
similarity index 100%
rename from lib/libc/sys/cpuset_getdomain.2
rename to lib/libsys/cpuset_getdomain.2
diff --git a/lib/libc/sys/dup.2 b/lib/libsys/dup.2
similarity index 100%
rename from lib/libc/sys/dup.2
rename to lib/libsys/dup.2
diff --git a/lib/libc/sys/eventfd.2 b/lib/libsys/eventfd.2
similarity index 100%
rename from lib/libc/sys/eventfd.2
rename to lib/libsys/eventfd.2
diff --git a/lib/libc/sys/execve.2 b/lib/libsys/execve.2
similarity index 100%
rename from lib/libc/sys/execve.2
rename to lib/libsys/execve.2
diff --git a/lib/libc/sys/extattr_get_file.2 b/lib/libsys/extattr_get_file.2
similarity index 100%
rename from lib/libc/sys/extattr_get_file.2
rename to lib/libsys/extattr_get_file.2
diff --git a/lib/libc/sys/fcntl.2 b/lib/libsys/fcntl.2
similarity index 100%
rename from lib/libc/sys/fcntl.2
rename to lib/libsys/fcntl.2
diff --git a/lib/libc/sys/fcntl.c b/lib/libsys/fcntl.c
similarity index 100%
rename from lib/libc/sys/fcntl.c
rename to lib/libsys/fcntl.c
diff --git a/lib/libc/sys/fdatasync.c b/lib/libsys/fdatasync.c
similarity index 100%
rename from lib/libc/sys/fdatasync.c
rename to lib/libsys/fdatasync.c
diff --git a/lib/libc/sys/ffclock.2 b/lib/libsys/ffclock.2
similarity index 100%
rename from lib/libc/sys/ffclock.2
rename to lib/libsys/ffclock.2
diff --git a/lib/libc/sys/fhlink.2 b/lib/libsys/fhlink.2
similarity index 100%
rename from lib/libc/sys/fhlink.2
rename to lib/libsys/fhlink.2
diff --git a/lib/libc/sys/fhopen.2 b/lib/libsys/fhopen.2
similarity index 100%
rename from lib/libc/sys/fhopen.2
rename to lib/libsys/fhopen.2
diff --git a/lib/libc/sys/fhreadlink.2 b/lib/libsys/fhreadlink.2
similarity index 100%
rename from lib/libc/sys/fhreadlink.2
rename to lib/libsys/fhreadlink.2
diff --git a/lib/libc/sys/flock.2 b/lib/libsys/flock.2
similarity index 100%
rename from lib/libc/sys/flock.2
rename to lib/libsys/flock.2
diff --git a/lib/libc/sys/fork.2 b/lib/libsys/fork.2
similarity index 100%
rename from lib/libc/sys/fork.2
rename to lib/libsys/fork.2
diff --git a/lib/libc/sys/fork.c b/lib/libsys/fork.c
similarity index 100%
rename from lib/libc/sys/fork.c
rename to lib/libsys/fork.c
diff --git a/lib/libc/sys/fspacectl.2 b/lib/libsys/fspacectl.2
similarity index 100%
rename from lib/libc/sys/fspacectl.2
rename to lib/libsys/fspacectl.2
diff --git a/lib/libc/sys/fsync.2 b/lib/libsys/fsync.2
similarity index 100%
rename from lib/libc/sys/fsync.2
rename to lib/libsys/fsync.2
diff --git a/lib/libc/sys/fsync.c b/lib/libsys/fsync.c
similarity index 100%
rename from lib/libc/sys/fsync.c
rename to lib/libsys/fsync.c
diff --git a/lib/libc/sys/getdents.c b/lib/libsys/getdents.c
similarity index 100%
rename from lib/libc/sys/getdents.c
rename to lib/libsys/getdents.c
diff --git a/lib/libc/sys/getdirentries.2 b/lib/libsys/getdirentries.2
similarity index 100%
rename from lib/libc/sys/getdirentries.2
rename to lib/libsys/getdirentries.2
diff --git a/lib/libc/sys/getdtablesize.2 b/lib/libsys/getdtablesize.2
similarity index 100%
rename from lib/libc/sys/getdtablesize.2
rename to lib/libsys/getdtablesize.2
diff --git a/lib/libc/sys/getfh.2 b/lib/libsys/getfh.2
similarity index 100%
rename from lib/libc/sys/getfh.2
rename to lib/libsys/getfh.2
diff --git a/lib/libc/sys/getfsstat.2 b/lib/libsys/getfsstat.2
similarity index 100%
rename from lib/libc/sys/getfsstat.2
rename to lib/libsys/getfsstat.2
diff --git a/lib/libc/sys/getgid.2 b/lib/libsys/getgid.2
similarity index 100%
rename from lib/libc/sys/getgid.2
rename to lib/libsys/getgid.2
diff --git a/lib/libc/sys/getgroups.2 b/lib/libsys/getgroups.2
similarity index 100%
rename from lib/libc/sys/getgroups.2
rename to lib/libsys/getgroups.2
diff --git a/lib/libc/sys/getitimer.2 b/lib/libsys/getitimer.2
similarity index 100%
rename from lib/libc/sys/getitimer.2
rename to lib/libsys/getitimer.2
diff --git a/lib/libc/sys/getlogin.2 b/lib/libsys/getlogin.2
similarity index 100%
rename from lib/libc/sys/getlogin.2
rename to lib/libsys/getlogin.2
diff --git a/lib/libc/sys/getloginclass.2 b/lib/libsys/getloginclass.2
similarity index 100%
rename from lib/libc/sys/getloginclass.2
rename to lib/libsys/getloginclass.2
diff --git a/lib/libc/sys/getpeername.2 b/lib/libsys/getpeername.2
similarity index 100%
rename from lib/libc/sys/getpeername.2
rename to lib/libsys/getpeername.2
diff --git a/lib/libc/sys/getpgrp.2 b/lib/libsys/getpgrp.2
similarity index 100%
rename from lib/libc/sys/getpgrp.2
rename to lib/libsys/getpgrp.2
diff --git a/lib/libc/sys/getpid.2 b/lib/libsys/getpid.2
similarity index 100%
rename from lib/libc/sys/getpid.2
rename to lib/libsys/getpid.2
diff --git a/lib/libc/sys/getpriority.2 b/lib/libsys/getpriority.2
similarity index 100%
rename from lib/libc/sys/getpriority.2
rename to lib/libsys/getpriority.2
diff --git a/lib/libc/sys/getrandom.2 b/lib/libsys/getrandom.2
similarity index 100%
rename from lib/libc/sys/getrandom.2
rename to lib/libsys/getrandom.2
diff --git a/lib/libc/sys/getrlimit.2 b/lib/libsys/getrlimit.2
similarity index 100%
rename from lib/libc/sys/getrlimit.2
rename to lib/libsys/getrlimit.2
diff --git a/lib/libc/sys/getrusage.2 b/lib/libsys/getrusage.2
similarity index 100%
rename from lib/libc/sys/getrusage.2
rename to lib/libsys/getrusage.2
diff --git a/lib/libc/sys/getsid.2 b/lib/libsys/getsid.2
similarity index 100%
rename from lib/libc/sys/getsid.2
rename to lib/libsys/getsid.2
diff --git a/lib/libc/sys/getsockname.2 b/lib/libsys/getsockname.2
similarity index 100%
rename from lib/libc/sys/getsockname.2
rename to lib/libsys/getsockname.2
diff --git a/lib/libc/sys/getsockopt.2 b/lib/libsys/getsockopt.2
similarity index 100%
rename from lib/libc/sys/getsockopt.2
rename to lib/libsys/getsockopt.2
diff --git a/lib/libc/sys/gettimeofday.2 b/lib/libsys/gettimeofday.2
similarity index 100%
rename from lib/libc/sys/gettimeofday.2
rename to lib/libsys/gettimeofday.2
diff --git a/lib/libc/sys/gettimeofday.c b/lib/libsys/gettimeofday.c
similarity index 100%
rename from lib/libc/sys/gettimeofday.c
rename to lib/libsys/gettimeofday.c
diff --git a/lib/libc/sys/getuid.2 b/lib/libsys/getuid.2
similarity index 100%
rename from lib/libc/sys/getuid.2
rename to lib/libsys/getuid.2
diff --git a/lib/libc/i386/SYS.h b/lib/libsys/i386/SYS.h
similarity index 100%
rename from lib/libc/i386/SYS.h
rename to lib/libsys/i386/SYS.h
diff --git a/lib/libc/i386/sys/cerror.S b/lib/libsys/i386/cerror.S
similarity index 100%
rename from lib/libc/i386/sys/cerror.S
rename to lib/libsys/i386/cerror.S
diff --git a/lib/libc/i386/sys/getcontext.S b/lib/libsys/i386/getcontext.S
similarity index 100%
rename from lib/libc/i386/sys/getcontext.S
rename to lib/libsys/i386/getcontext.S
diff --git a/lib/libc/i386/sys/syscall.S b/lib/libsys/i386/syscall.S
similarity index 100%
rename from lib/libc/i386/sys/syscall.S
rename to lib/libsys/i386/syscall.S
diff --git a/lib/libc/i386/sys/vfork.S b/lib/libsys/i386/vfork.S
similarity index 100%
rename from lib/libc/i386/sys/vfork.S
rename to lib/libsys/i386/vfork.S
diff --git a/lib/libc/sys/interposing_table.c b/lib/libsys/interposing_table.c
similarity index 100%
rename from lib/libc/sys/interposing_table.c
rename to lib/libsys/interposing_table.c
diff --git a/lib/libc/sys/intro.2 b/lib/libsys/intro.2
similarity index 100%
rename from lib/libc/sys/intro.2
rename to lib/libsys/intro.2
diff --git a/lib/libc/sys/ioctl.2 b/lib/libsys/ioctl.2
similarity index 100%
rename from lib/libc/sys/ioctl.2
rename to lib/libsys/ioctl.2
diff --git a/lib/libc/sys/issetugid.2 b/lib/libsys/issetugid.2
similarity index 100%
rename from lib/libc/sys/issetugid.2
rename to lib/libsys/issetugid.2
diff --git a/lib/libc/sys/jail.2 b/lib/libsys/jail.2
similarity index 100%
rename from lib/libc/sys/jail.2
rename to lib/libsys/jail.2
diff --git a/lib/libc/sys/kcmp.2 b/lib/libsys/kcmp.2
similarity index 100%
rename from lib/libc/sys/kcmp.2
rename to lib/libsys/kcmp.2
diff --git a/lib/libc/sys/kenv.2 b/lib/libsys/kenv.2
similarity index 100%
rename from lib/libc/sys/kenv.2
rename to lib/libsys/kenv.2
diff --git a/lib/libc/sys/kevent.c b/lib/libsys/kevent.c
similarity index 100%
rename from lib/libc/sys/kevent.c
rename to lib/libsys/kevent.c
diff --git a/lib/libc/sys/kill.2 b/lib/libsys/kill.2
similarity index 100%
rename from lib/libc/sys/kill.2
rename to lib/libsys/kill.2
diff --git a/lib/libc/sys/kldfind.2 b/lib/libsys/kldfind.2
similarity index 100%
rename from lib/libc/sys/kldfind.2
rename to lib/libsys/kldfind.2
diff --git a/lib/libc/sys/kldfirstmod.2 b/lib/libsys/kldfirstmod.2
similarity index 100%
rename from lib/libc/sys/kldfirstmod.2
rename to lib/libsys/kldfirstmod.2
diff --git a/lib/libc/sys/kldload.2 b/lib/libsys/kldload.2
similarity index 100%
rename from lib/libc/sys/kldload.2
rename to lib/libsys/kldload.2
diff --git a/lib/libc/sys/kldnext.2 b/lib/libsys/kldnext.2
similarity index 100%
rename from lib/libc/sys/kldnext.2
rename to lib/libsys/kldnext.2
diff --git a/lib/libc/sys/kldstat.2 b/lib/libsys/kldstat.2
similarity index 100%
rename from lib/libc/sys/kldstat.2
rename to lib/libsys/kldstat.2
diff --git a/lib/libc/sys/kldsym.2 b/lib/libsys/kldsym.2
similarity index 100%
rename from lib/libc/sys/kldsym.2
rename to lib/libsys/kldsym.2
diff --git a/lib/libc/sys/kldunload.2 b/lib/libsys/kldunload.2
similarity index 100%
rename from lib/libc/sys/kldunload.2
rename to lib/libsys/kldunload.2
diff --git a/lib/libc/sys/kqueue.2 b/lib/libsys/kqueue.2
similarity index 100%
rename from lib/libc/sys/kqueue.2
rename to lib/libsys/kqueue.2
diff --git a/lib/libc/sys/ktrace.2 b/lib/libsys/ktrace.2
similarity index 100%
rename from lib/libc/sys/ktrace.2
rename to lib/libsys/ktrace.2
diff --git a/lib/libc/sys/link.2 b/lib/libsys/link.2
similarity index 100%
rename from lib/libc/sys/link.2
rename to lib/libsys/link.2
diff --git a/lib/libc/sys/lio_listio.2 b/lib/libsys/lio_listio.2
similarity index 100%
rename from lib/libc/sys/lio_listio.2
rename to lib/libsys/lio_listio.2
diff --git a/lib/libc/sys/listen.2 b/lib/libsys/listen.2
similarity index 100%
rename from lib/libc/sys/listen.2
rename to lib/libsys/listen.2
diff --git a/lib/libc/sys/lseek.2 b/lib/libsys/lseek.2
similarity index 100%
rename from lib/libc/sys/lseek.2
rename to lib/libsys/lseek.2
diff --git a/lib/libc/sys/lstat.c b/lib/libsys/lstat.c
similarity index 100%
rename from lib/libc/sys/lstat.c
rename to lib/libsys/lstat.c
diff --git a/lib/libc/sys/madvise.2 b/lib/libsys/madvise.2
similarity index 100%
rename from lib/libc/sys/madvise.2
rename to lib/libsys/madvise.2
diff --git a/lib/libc/sys/mincore.2 b/lib/libsys/mincore.2
similarity index 100%
rename from lib/libc/sys/mincore.2
rename to lib/libsys/mincore.2
diff --git a/lib/libc/sys/minherit.2 b/lib/libsys/minherit.2
similarity index 100%
rename from lib/libc/sys/minherit.2
rename to lib/libsys/minherit.2
diff --git a/lib/libc/sys/mkdir.2 b/lib/libsys/mkdir.2
similarity index 100%
rename from lib/libc/sys/mkdir.2
rename to lib/libsys/mkdir.2
diff --git a/lib/libc/sys/mkfifo.2 b/lib/libsys/mkfifo.2
similarity index 100%
rename from lib/libc/sys/mkfifo.2
rename to lib/libsys/mkfifo.2
diff --git a/lib/libc/sys/mknod.2 b/lib/libsys/mknod.2
similarity index 100%
rename from lib/libc/sys/mknod.2
rename to lib/libsys/mknod.2
diff --git a/lib/libc/sys/mknod.c b/lib/libsys/mknod.c
similarity index 100%
rename from lib/libc/sys/mknod.c
rename to lib/libsys/mknod.c
diff --git a/lib/libc/sys/mlock.2 b/lib/libsys/mlock.2
similarity index 100%
rename from lib/libc/sys/mlock.2
rename to lib/libsys/mlock.2
diff --git a/lib/libc/sys/mlockall.2 b/lib/libsys/mlockall.2
similarity index 100%
rename from lib/libc/sys/mlockall.2
rename to lib/libsys/mlockall.2
diff --git a/lib/libc/sys/mmap.2 b/lib/libsys/mmap.2
similarity index 100%
rename from lib/libc/sys/mmap.2
rename to lib/libsys/mmap.2
diff --git a/lib/libc/sys/modfind.2 b/lib/libsys/modfind.2
similarity index 100%
rename from lib/libc/sys/modfind.2
rename to lib/libsys/modfind.2
diff --git a/lib/libc/sys/modnext.2 b/lib/libsys/modnext.2
similarity index 100%
rename from lib/libc/sys/modnext.2
rename to lib/libsys/modnext.2
diff --git a/lib/libc/sys/modstat.2 b/lib/libsys/modstat.2
similarity index 100%
rename from lib/libc/sys/modstat.2
rename to lib/libsys/modstat.2
diff --git a/lib/libc/sys/mount.2 b/lib/libsys/mount.2
similarity index 100%
rename from lib/libc/sys/mount.2
rename to lib/libsys/mount.2
diff --git a/lib/libc/sys/mprotect.2 b/lib/libsys/mprotect.2
similarity index 100%
rename from lib/libc/sys/mprotect.2
rename to lib/libsys/mprotect.2
diff --git a/lib/libc/sys/mq_close.2 b/lib/libsys/mq_close.2
similarity index 100%
rename from lib/libc/sys/mq_close.2
rename to lib/libsys/mq_close.2
diff --git a/lib/libc/sys/mq_getattr.2 b/lib/libsys/mq_getattr.2
similarity index 100%
rename from lib/libc/sys/mq_getattr.2
rename to lib/libsys/mq_getattr.2
diff --git a/lib/libc/sys/mq_notify.2 b/lib/libsys/mq_notify.2
similarity index 100%
rename from lib/libc/sys/mq_notify.2
rename to lib/libsys/mq_notify.2
diff --git a/lib/libc/sys/mq_open.2 b/lib/libsys/mq_open.2
similarity index 100%
rename from lib/libc/sys/mq_open.2
rename to lib/libsys/mq_open.2
diff --git a/lib/libc/sys/mq_receive.2 b/lib/libsys/mq_receive.2
similarity index 100%
rename from lib/libc/sys/mq_receive.2
rename to lib/libsys/mq_receive.2
diff --git a/lib/libc/sys/mq_send.2 b/lib/libsys/mq_send.2
similarity index 100%
rename from lib/libc/sys/mq_send.2
rename to lib/libsys/mq_send.2
diff --git a/lib/libc/sys/mq_setattr.2 b/lib/libsys/mq_setattr.2
similarity index 100%
rename from lib/libc/sys/mq_setattr.2
rename to lib/libsys/mq_setattr.2
diff --git a/lib/libc/sys/mq_unlink.2 b/lib/libsys/mq_unlink.2
similarity index 100%
rename from lib/libc/sys/mq_unlink.2
rename to lib/libsys/mq_unlink.2
diff --git a/lib/libc/sys/msgctl.2 b/lib/libsys/msgctl.2
similarity index 100%
rename from lib/libc/sys/msgctl.2
rename to lib/libsys/msgctl.2
diff --git a/lib/libc/sys/msgget.2 b/lib/libsys/msgget.2
similarity index 100%
rename from lib/libc/sys/msgget.2
rename to lib/libsys/msgget.2
diff --git a/lib/libc/sys/msgrcv.2 b/lib/libsys/msgrcv.2
similarity index 100%
rename from lib/libc/sys/msgrcv.2
rename to lib/libsys/msgrcv.2
diff --git a/lib/libc/sys/msgsnd.2 b/lib/libsys/msgsnd.2
similarity index 100%
rename from lib/libc/sys/msgsnd.2
rename to lib/libsys/msgsnd.2
diff --git a/lib/libc/sys/msync.2 b/lib/libsys/msync.2
similarity index 100%
rename from lib/libc/sys/msync.2
rename to lib/libsys/msync.2
diff --git a/lib/libc/sys/msync.c b/lib/libsys/msync.c
similarity index 100%
rename from lib/libc/sys/msync.c
rename to lib/libsys/msync.c
diff --git a/lib/libc/sys/munmap.2 b/lib/libsys/munmap.2
similarity index 100%
rename from lib/libc/sys/munmap.2
rename to lib/libsys/munmap.2
diff --git a/lib/libc/sys/nanosleep.2 b/lib/libsys/nanosleep.2
similarity index 100%
rename from lib/libc/sys/nanosleep.2
rename to lib/libsys/nanosleep.2
diff --git a/lib/libc/sys/nanosleep.c b/lib/libsys/nanosleep.c
similarity index 100%
rename from lib/libc/sys/nanosleep.c
rename to lib/libsys/nanosleep.c
diff --git a/lib/libc/sys/nfssvc.2 b/lib/libsys/nfssvc.2
similarity index 100%
rename from lib/libc/sys/nfssvc.2
rename to lib/libsys/nfssvc.2
diff --git a/lib/libc/sys/ntp_adjtime.2 b/lib/libsys/ntp_adjtime.2
similarity index 100%
rename from lib/libc/sys/ntp_adjtime.2
rename to lib/libsys/ntp_adjtime.2
diff --git a/lib/libc/sys/open.2 b/lib/libsys/open.2
similarity index 100%
rename from lib/libc/sys/open.2
rename to lib/libsys/open.2
diff --git a/lib/libc/sys/open.c b/lib/libsys/open.c
similarity index 100%
rename from lib/libc/sys/open.c
rename to lib/libsys/open.c
diff --git a/lib/libc/sys/openat.c b/lib/libsys/openat.c
similarity index 100%
rename from lib/libc/sys/openat.c
rename to lib/libsys/openat.c
diff --git a/lib/libc/sys/pathconf.2 b/lib/libsys/pathconf.2
similarity index 100%
rename from lib/libc/sys/pathconf.2
rename to lib/libsys/pathconf.2
diff --git a/lib/libc/sys/pdfork.2 b/lib/libsys/pdfork.2
similarity index 100%
rename from lib/libc/sys/pdfork.2
rename to lib/libsys/pdfork.2
diff --git a/lib/libc/sys/pdfork.c b/lib/libsys/pdfork.c
similarity index 100%
rename from lib/libc/sys/pdfork.c
rename to lib/libsys/pdfork.c
diff --git a/lib/libc/sys/pipe.2 b/lib/libsys/pipe.2
similarity index 100%
rename from lib/libc/sys/pipe.2
rename to lib/libsys/pipe.2
diff --git a/lib/libc/sys/pipe.c b/lib/libsys/pipe.c
similarity index 100%
rename from lib/libc/sys/pipe.c
rename to lib/libsys/pipe.c
diff --git a/lib/libc/sys/poll.2 b/lib/libsys/poll.2
similarity index 100%
rename from lib/libc/sys/poll.2
rename to lib/libsys/poll.2
diff --git a/lib/libc/sys/poll.c b/lib/libsys/poll.c
similarity index 100%
rename from lib/libc/sys/poll.c
rename to lib/libsys/poll.c
diff --git a/lib/libc/sys/posix_fadvise.2 b/lib/libsys/posix_fadvise.2
similarity index 100%
rename from lib/libc/sys/posix_fadvise.2
rename to lib/libsys/posix_fadvise.2
diff --git a/lib/libc/sys/posix_fallocate.2 b/lib/libsys/posix_fallocate.2
similarity index 100%
rename from lib/libc/sys/posix_fallocate.2
rename to lib/libsys/posix_fallocate.2
diff --git a/lib/libc/sys/posix_openpt.2 b/lib/libsys/posix_openpt.2
similarity index 100%
rename from lib/libc/sys/posix_openpt.2
rename to lib/libsys/posix_openpt.2
diff --git a/lib/libc/powerpc/SYS.h b/lib/libsys/powerpc/SYS.h
similarity index 100%
rename from lib/libc/powerpc/SYS.h
rename to lib/libsys/powerpc/SYS.h
diff --git a/lib/libc/powerpc/sys/cerror.S b/lib/libsys/powerpc/cerror.S
similarity index 100%
rename from lib/libc/powerpc/sys/cerror.S
rename to lib/libsys/powerpc/cerror.S
diff --git a/lib/libc/powerpc64/SYS.h b/lib/libsys/powerpc64/SYS.h
similarity index 100%
rename from lib/libc/powerpc64/SYS.h
rename to lib/libsys/powerpc64/SYS.h
diff --git a/lib/libc/powerpc64/sys/cerror.S b/lib/libsys/powerpc64/cerror.S
similarity index 100%
rename from lib/libc/powerpc64/sys/cerror.S
rename to lib/libsys/powerpc64/cerror.S
diff --git a/lib/libc/sys/ppoll.c b/lib/libsys/ppoll.c
similarity index 100%
rename from lib/libc/sys/ppoll.c
rename to lib/libsys/ppoll.c
diff --git a/lib/libc/sys/procctl.2 b/lib/libsys/procctl.2
similarity index 100%
rename from lib/libc/sys/procctl.2
rename to lib/libsys/procctl.2
diff --git a/lib/libc/sys/profil.2 b/lib/libsys/profil.2
similarity index 100%
rename from lib/libc/sys/profil.2
rename to lib/libsys/profil.2
diff --git a/lib/libc/sys/pselect.2 b/lib/libsys/pselect.2
similarity index 100%
rename from lib/libc/sys/pselect.2
rename to lib/libsys/pselect.2
diff --git a/lib/libc/sys/pselect.c b/lib/libsys/pselect.c
similarity index 100%
rename from lib/libc/sys/pselect.c
rename to lib/libsys/pselect.c
diff --git a/lib/libc/sys/ptrace.2 b/lib/libsys/ptrace.2
similarity index 100%
rename from lib/libc/sys/ptrace.2
rename to lib/libsys/ptrace.2
diff --git a/lib/libc/sys/ptrace.c b/lib/libsys/ptrace.c
similarity index 100%
rename from lib/libc/sys/ptrace.c
rename to lib/libsys/ptrace.c
diff --git a/lib/libc/sys/quotactl.2 b/lib/libsys/quotactl.2
similarity index 100%
rename from lib/libc/sys/quotactl.2
rename to lib/libsys/quotactl.2
diff --git a/lib/libc/sys/rctl_add_rule.2 b/lib/libsys/rctl_add_rule.2
similarity index 100%
rename from lib/libc/sys/rctl_add_rule.2
rename to lib/libsys/rctl_add_rule.2
diff --git a/lib/libc/sys/read.2 b/lib/libsys/read.2
similarity index 100%
rename from lib/libc/sys/read.2
rename to lib/libsys/read.2
diff --git a/lib/libc/sys/read.c b/lib/libsys/read.c
similarity index 100%
rename from lib/libc/sys/read.c
rename to lib/libsys/read.c
diff --git a/lib/libc/sys/readlink.2 b/lib/libsys/readlink.2
similarity index 100%
rename from lib/libc/sys/readlink.2
rename to lib/libsys/readlink.2
diff --git a/lib/libc/sys/readv.c b/lib/libsys/readv.c
similarity index 100%
rename from lib/libc/sys/readv.c
rename to lib/libsys/readv.c
diff --git a/lib/libc/sys/reboot.2 b/lib/libsys/reboot.2
similarity index 100%
rename from lib/libc/sys/reboot.2
rename to lib/libsys/reboot.2
diff --git a/lib/libc/sys/recv.2 b/lib/libsys/recv.2
similarity index 100%
rename from lib/libc/sys/recv.2
rename to lib/libsys/recv.2
diff --git a/lib/libc/sys/recvfrom.c b/lib/libsys/recvfrom.c
similarity index 100%
rename from lib/libc/sys/recvfrom.c
rename to lib/libsys/recvfrom.c
diff --git a/lib/libc/sys/recvmsg.c b/lib/libsys/recvmsg.c
similarity index 100%
rename from lib/libc/sys/recvmsg.c
rename to lib/libsys/recvmsg.c
diff --git a/lib/libc/sys/rename.2 b/lib/libsys/rename.2
similarity index 100%
rename from lib/libc/sys/rename.2
rename to lib/libsys/rename.2
diff --git a/lib/libc/sys/revoke.2 b/lib/libsys/revoke.2
similarity index 100%
rename from lib/libc/sys/revoke.2
rename to lib/libsys/revoke.2
diff --git a/lib/libc/sys/rfork.2 b/lib/libsys/rfork.2
similarity index 100%
rename from lib/libc/sys/rfork.2
rename to lib/libsys/rfork.2
diff --git a/lib/libc/riscv/SYS.h b/lib/libsys/riscv/SYS.h
similarity index 100%
rename from lib/libc/riscv/SYS.h
rename to lib/libsys/riscv/SYS.h
diff --git a/lib/libc/riscv/sys/cerror.S b/lib/libsys/riscv/cerror.S
similarity index 100%
rename from lib/libc/riscv/sys/cerror.S
rename to lib/libsys/riscv/cerror.S
diff --git a/lib/libc/riscv/sys/syscall.S b/lib/libsys/riscv/syscall.S
similarity index 100%
rename from lib/libc/riscv/sys/syscall.S
rename to lib/libsys/riscv/syscall.S
diff --git a/lib/libc/riscv/sys/vfork.S b/lib/libsys/riscv/vfork.S
similarity index 100%
rename from lib/libc/riscv/sys/vfork.S
rename to lib/libsys/riscv/vfork.S
diff --git a/lib/libc/sys/rmdir.2 b/lib/libsys/rmdir.2
similarity index 100%
rename from lib/libc/sys/rmdir.2
rename to lib/libsys/rmdir.2
diff --git a/lib/libc/sys/rtprio.2 b/lib/libsys/rtprio.2
similarity index 100%
rename from lib/libc/sys/rtprio.2
rename to lib/libsys/rtprio.2
diff --git a/lib/libc/sys/sched_get_priority_max.2 b/lib/libsys/sched_get_priority_max.2
similarity index 100%
rename from lib/libc/sys/sched_get_priority_max.2
rename to lib/libsys/sched_get_priority_max.2
diff --git a/lib/libc/sys/sched_setparam.2 b/lib/libsys/sched_setparam.2
similarity index 100%
rename from lib/libc/sys/sched_setparam.2
rename to lib/libsys/sched_setparam.2
diff --git a/lib/libc/sys/sched_setscheduler.2 b/lib/libsys/sched_setscheduler.2
similarity index 100%
rename from lib/libc/sys/sched_setscheduler.2
rename to lib/libsys/sched_setscheduler.2
diff --git a/lib/libc/sys/sched_yield.2 b/lib/libsys/sched_yield.2
similarity index 100%
rename from lib/libc/sys/sched_yield.2
rename to lib/libsys/sched_yield.2
diff --git a/lib/libc/sys/sctp_generic_recvmsg.2 b/lib/libsys/sctp_generic_recvmsg.2
similarity index 100%
rename from lib/libc/sys/sctp_generic_recvmsg.2
rename to lib/libsys/sctp_generic_recvmsg.2
diff --git a/lib/libc/sys/sctp_generic_sendmsg.2 b/lib/libsys/sctp_generic_sendmsg.2
similarity index 100%
rename from lib/libc/sys/sctp_generic_sendmsg.2
rename to lib/libsys/sctp_generic_sendmsg.2
diff --git a/lib/libc/sys/sctp_peeloff.2 b/lib/libsys/sctp_peeloff.2
similarity index 100%
rename from lib/libc/sys/sctp_peeloff.2
rename to lib/libsys/sctp_peeloff.2
diff --git a/lib/libc/sys/select.2 b/lib/libsys/select.2
similarity index 100%
rename from lib/libc/sys/select.2
rename to lib/libsys/select.2
diff --git a/lib/libc/sys/select.c b/lib/libsys/select.c
similarity index 100%
rename from lib/libc/sys/select.c
rename to lib/libsys/select.c
diff --git a/lib/libc/sys/semctl.2 b/lib/libsys/semctl.2
similarity index 100%
rename from lib/libc/sys/semctl.2
rename to lib/libsys/semctl.2
diff --git a/lib/libc/sys/semget.2 b/lib/libsys/semget.2
similarity index 100%
rename from lib/libc/sys/semget.2
rename to lib/libsys/semget.2
diff --git a/lib/libc/sys/semop.2 b/lib/libsys/semop.2
similarity index 100%
rename from lib/libc/sys/semop.2
rename to lib/libsys/semop.2
diff --git a/lib/libc/sys/send.2 b/lib/libsys/send.2
similarity index 100%
rename from lib/libc/sys/send.2
rename to lib/libsys/send.2
diff --git a/lib/libc/sys/sendfile.2 b/lib/libsys/sendfile.2
similarity index 100%
rename from lib/libc/sys/sendfile.2
rename to lib/libsys/sendfile.2
diff --git a/lib/libc/sys/sendmsg.c b/lib/libsys/sendmsg.c
similarity index 100%
rename from lib/libc/sys/sendmsg.c
rename to lib/libsys/sendmsg.c
diff --git a/lib/libc/sys/sendto.c b/lib/libsys/sendto.c
similarity index 100%
rename from lib/libc/sys/sendto.c
rename to lib/libsys/sendto.c
diff --git a/lib/libc/sys/setcontext.c b/lib/libsys/setcontext.c
similarity index 100%
rename from lib/libc/sys/setcontext.c
rename to lib/libsys/setcontext.c
diff --git a/lib/libc/sys/setfib.2 b/lib/libsys/setfib.2
similarity index 100%
rename from lib/libc/sys/setfib.2
rename to lib/libsys/setfib.2
diff --git a/lib/libc/sys/setgroups.2 b/lib/libsys/setgroups.2
similarity index 100%
rename from lib/libc/sys/setgroups.2
rename to lib/libsys/setgroups.2
diff --git a/lib/libc/sys/setpgid.2 b/lib/libsys/setpgid.2
similarity index 100%
rename from lib/libc/sys/setpgid.2
rename to lib/libsys/setpgid.2
diff --git a/lib/libc/sys/setregid.2 b/lib/libsys/setregid.2
similarity index 100%
rename from lib/libc/sys/setregid.2
rename to lib/libsys/setregid.2
diff --git a/lib/libc/sys/setresuid.2 b/lib/libsys/setresuid.2
similarity index 100%
rename from lib/libc/sys/setresuid.2
rename to lib/libsys/setresuid.2
diff --git a/lib/libc/sys/setreuid.2 b/lib/libsys/setreuid.2
similarity index 100%
rename from lib/libc/sys/setreuid.2
rename to lib/libsys/setreuid.2
diff --git a/lib/libc/sys/setsid.2 b/lib/libsys/setsid.2
similarity index 100%
rename from lib/libc/sys/setsid.2
rename to lib/libsys/setsid.2
diff --git a/lib/libc/sys/setuid.2 b/lib/libsys/setuid.2
similarity index 100%
rename from lib/libc/sys/setuid.2
rename to lib/libsys/setuid.2
diff --git a/lib/libc/sys/shm_open.2 b/lib/libsys/shm_open.2
similarity index 100%
rename from lib/libc/sys/shm_open.2
rename to lib/libsys/shm_open.2
diff --git a/lib/libc/sys/shm_open.c b/lib/libsys/shm_open.c
similarity index 100%
rename from lib/libc/sys/shm_open.c
rename to lib/libsys/shm_open.c
diff --git a/lib/libc/sys/shmat.2 b/lib/libsys/shmat.2
similarity index 100%
rename from lib/libc/sys/shmat.2
rename to lib/libsys/shmat.2
diff --git a/lib/libc/sys/shmctl.2 b/lib/libsys/shmctl.2
similarity index 100%
rename from lib/libc/sys/shmctl.2
rename to lib/libsys/shmctl.2
diff --git a/lib/libc/sys/shmget.2 b/lib/libsys/shmget.2
similarity index 100%
rename from lib/libc/sys/shmget.2
rename to lib/libsys/shmget.2
diff --git a/lib/libc/sys/shutdown.2 b/lib/libsys/shutdown.2
similarity index 100%
rename from lib/libc/sys/shutdown.2
rename to lib/libsys/shutdown.2
diff --git a/lib/libc/sys/sigaction.2 b/lib/libsys/sigaction.2
similarity index 100%
rename from lib/libc/sys/sigaction.2
rename to lib/libsys/sigaction.2
diff --git a/lib/libc/sys/sigaction.c b/lib/libsys/sigaction.c
similarity index 100%
rename from lib/libc/sys/sigaction.c
rename to lib/libsys/sigaction.c
diff --git a/lib/libc/sys/sigaltstack.2 b/lib/libsys/sigaltstack.2
similarity index 100%
rename from lib/libc/sys/sigaltstack.2
rename to lib/libsys/sigaltstack.2
diff --git a/lib/libc/sys/sigfastblock.2 b/lib/libsys/sigfastblock.2
similarity index 100%
rename from lib/libc/sys/sigfastblock.2
rename to lib/libsys/sigfastblock.2
diff --git a/lib/libc/sys/sigpending.2 b/lib/libsys/sigpending.2
similarity index 100%
rename from lib/libc/sys/sigpending.2
rename to lib/libsys/sigpending.2
diff --git a/lib/libc/sys/sigprocmask.2 b/lib/libsys/sigprocmask.2
similarity index 100%
rename from lib/libc/sys/sigprocmask.2
rename to lib/libsys/sigprocmask.2
diff --git a/lib/libc/sys/sigprocmask.c b/lib/libsys/sigprocmask.c
similarity index 100%
rename from lib/libc/sys/sigprocmask.c
rename to lib/libsys/sigprocmask.c
diff --git a/lib/libc/sys/sigqueue.2 b/lib/libsys/sigqueue.2
similarity index 100%
rename from lib/libc/sys/sigqueue.2
rename to lib/libsys/sigqueue.2
diff --git a/lib/libc/sys/sigreturn.2 b/lib/libsys/sigreturn.2
similarity index 100%
rename from lib/libc/sys/sigreturn.2
rename to lib/libsys/sigreturn.2
diff --git a/lib/libc/sys/sigstack.2 b/lib/libsys/sigstack.2
similarity index 100%
rename from lib/libc/sys/sigstack.2
rename to lib/libsys/sigstack.2
diff --git a/lib/libc/sys/sigsuspend.2 b/lib/libsys/sigsuspend.2
similarity index 100%
rename from lib/libc/sys/sigsuspend.2
rename to lib/libsys/sigsuspend.2
diff --git a/lib/libc/sys/sigsuspend.c b/lib/libsys/sigsuspend.c
similarity index 100%
rename from lib/libc/sys/sigsuspend.c
rename to lib/libsys/sigsuspend.c
diff --git a/lib/libc/sys/sigtimedwait.c b/lib/libsys/sigtimedwait.c
similarity index 100%
rename from lib/libc/sys/sigtimedwait.c
rename to lib/libsys/sigtimedwait.c
diff --git a/lib/libc/sys/sigwait.2 b/lib/libsys/sigwait.2
similarity index 100%
rename from lib/libc/sys/sigwait.2
rename to lib/libsys/sigwait.2
diff --git a/lib/libc/sys/sigwait.c b/lib/libsys/sigwait.c
similarity index 100%
rename from lib/libc/sys/sigwait.c
rename to lib/libsys/sigwait.c
diff --git a/lib/libc/sys/sigwaitinfo.2 b/lib/libsys/sigwaitinfo.2
similarity index 100%
rename from lib/libc/sys/sigwaitinfo.2
rename to lib/libsys/sigwaitinfo.2
diff --git a/lib/libc/sys/sigwaitinfo.c b/lib/libsys/sigwaitinfo.c
similarity index 100%
rename from lib/libc/sys/sigwaitinfo.c
rename to lib/libsys/sigwaitinfo.c
diff --git a/lib/libc/sys/socket.2 b/lib/libsys/socket.2
similarity index 100%
rename from lib/libc/sys/socket.2
rename to lib/libsys/socket.2
diff --git a/lib/libc/sys/socketpair.2 b/lib/libsys/socketpair.2
similarity index 100%
rename from lib/libc/sys/socketpair.2
rename to lib/libsys/socketpair.2
diff --git a/lib/libc/sys/stat.2 b/lib/libsys/stat.2
similarity index 100%
rename from lib/libc/sys/stat.2
rename to lib/libsys/stat.2
diff --git a/lib/libc/sys/stat.c b/lib/libsys/stat.c
similarity index 100%
rename from lib/libc/sys/stat.c
rename to lib/libsys/stat.c
diff --git a/lib/libc/sys/statfs.2 b/lib/libsys/statfs.2
similarity index 100%
rename from lib/libc/sys/statfs.2
rename to lib/libsys/statfs.2
diff --git a/lib/libc/sys/swapcontext.c b/lib/libsys/swapcontext.c
similarity index 100%
rename from lib/libc/sys/swapcontext.c
rename to lib/libsys/swapcontext.c
diff --git a/lib/libc/sys/swapon.2 b/lib/libsys/swapon.2
similarity index 100%
rename from lib/libc/sys/swapon.2
rename to lib/libsys/swapon.2
diff --git a/lib/libc/sys/symlink.2 b/lib/libsys/symlink.2
similarity index 100%
rename from lib/libc/sys/symlink.2
rename to lib/libsys/symlink.2
diff --git a/lib/libc/sys/sync.2 b/lib/libsys/sync.2
similarity index 100%
rename from lib/libc/sys/sync.2
rename to lib/libsys/sync.2
diff --git a/lib/libc/sys/sysarch.2 b/lib/libsys/sysarch.2
similarity index 100%
rename from lib/libc/sys/sysarch.2
rename to lib/libsys/sysarch.2
diff --git a/lib/libc/sys/syscall.2 b/lib/libsys/syscall.2
similarity index 100%
rename from lib/libc/sys/syscall.2
rename to lib/libsys/syscall.2
diff --git a/lib/libc/sys/thr_exit.2 b/lib/libsys/thr_exit.2
similarity index 100%
rename from lib/libc/sys/thr_exit.2
rename to lib/libsys/thr_exit.2
diff --git a/lib/libc/sys/thr_kill.2 b/lib/libsys/thr_kill.2
similarity index 100%
rename from lib/libc/sys/thr_kill.2
rename to lib/libsys/thr_kill.2
diff --git a/lib/libc/sys/thr_new.2 b/lib/libsys/thr_new.2
similarity index 100%
rename from lib/libc/sys/thr_new.2
rename to lib/libsys/thr_new.2
diff --git a/lib/libc/sys/thr_self.2 b/lib/libsys/thr_self.2
similarity index 100%
rename from lib/libc/sys/thr_self.2
rename to lib/libsys/thr_self.2
diff --git a/lib/libc/sys/thr_set_name.2 b/lib/libsys/thr_set_name.2
similarity index 100%
rename from lib/libc/sys/thr_set_name.2
rename to lib/libsys/thr_set_name.2
diff --git a/lib/libc/sys/thr_suspend.2 b/lib/libsys/thr_suspend.2
similarity index 100%
rename from lib/libc/sys/thr_suspend.2
rename to lib/libsys/thr_suspend.2
diff --git a/lib/libc/sys/thr_wake.2 b/lib/libsys/thr_wake.2
similarity index 100%
rename from lib/libc/sys/thr_wake.2
rename to lib/libsys/thr_wake.2
diff --git a/lib/libc/sys/timer_create.2 b/lib/libsys/timer_create.2
similarity index 100%
rename from lib/libc/sys/timer_create.2
rename to lib/libsys/timer_create.2
diff --git a/lib/libc/sys/timer_delete.2 b/lib/libsys/timer_delete.2
similarity index 100%
rename from lib/libc/sys/timer_delete.2
rename to lib/libsys/timer_delete.2
diff --git a/lib/libc/sys/timer_settime.2 b/lib/libsys/timer_settime.2
similarity index 100%
rename from lib/libc/sys/timer_settime.2
rename to lib/libsys/timer_settime.2
diff --git a/lib/libc/sys/timerfd.2 b/lib/libsys/timerfd.2
similarity index 100%
rename from lib/libc/sys/timerfd.2
rename to lib/libsys/timerfd.2
diff --git a/lib/libc/sys/truncate.2 b/lib/libsys/truncate.2
similarity index 100%
rename from lib/libc/sys/truncate.2
rename to lib/libsys/truncate.2
diff --git a/lib/libc/sys/umask.2 b/lib/libsys/umask.2
similarity index 100%
rename from lib/libc/sys/umask.2
rename to lib/libsys/umask.2
diff --git a/lib/libc/sys/undelete.2 b/lib/libsys/undelete.2
similarity index 100%
rename from lib/libc/sys/undelete.2
rename to lib/libsys/undelete.2
diff --git a/lib/libc/sys/unlink.2 b/lib/libsys/unlink.2
similarity index 100%
rename from lib/libc/sys/unlink.2
rename to lib/libsys/unlink.2
diff --git a/lib/libc/sys/utimensat.2 b/lib/libsys/utimensat.2
similarity index 100%
rename from lib/libc/sys/utimensat.2
rename to lib/libsys/utimensat.2
diff --git a/lib/libc/sys/utimes.2 b/lib/libsys/utimes.2
similarity index 100%
rename from lib/libc/sys/utimes.2
rename to lib/libsys/utimes.2
diff --git a/lib/libc/sys/utrace.2 b/lib/libsys/utrace.2
similarity index 100%
rename from lib/libc/sys/utrace.2
rename to lib/libsys/utrace.2
diff --git a/lib/libc/sys/uuidgen.2 b/lib/libsys/uuidgen.2
similarity index 100%
rename from lib/libc/sys/uuidgen.2
rename to lib/libsys/uuidgen.2
diff --git a/lib/libc/sys/vadvise.c b/lib/libsys/vadvise.c
similarity index 100%
rename from lib/libc/sys/vadvise.c
rename to lib/libsys/vadvise.c
diff --git a/lib/libc/sys/vfork.2 b/lib/libsys/vfork.2
similarity index 100%
rename from lib/libc/sys/vfork.2
rename to lib/libsys/vfork.2
diff --git a/lib/libc/sys/wait.2 b/lib/libsys/wait.2
similarity index 100%
rename from lib/libc/sys/wait.2
rename to lib/libsys/wait.2
diff --git a/lib/libc/sys/wait4.c b/lib/libsys/wait4.c
similarity index 100%
rename from lib/libc/sys/wait4.c
rename to lib/libsys/wait4.c
diff --git a/lib/libc/sys/wait6.c b/lib/libsys/wait6.c
similarity index 100%
rename from lib/libc/sys/wait6.c
rename to lib/libsys/wait6.c
diff --git a/lib/libc/sys/write.2 b/lib/libsys/write.2
similarity index 100%
rename from lib/libc/sys/write.2
rename to lib/libsys/write.2
diff --git a/lib/libc/sys/write.c b/lib/libsys/write.c
similarity index 100%
rename from lib/libc/sys/write.c
rename to lib/libsys/write.c
diff --git a/lib/libc/sys/writev.c b/lib/libsys/writev.c
similarity index 100%
rename from lib/libc/sys/writev.c
rename to lib/libsys/writev.c