17 files changed, 13 insertions, 17 deletions

diff --git a/lib/libc/compat-43/Makefile.inc b/lib/libc/compat-43/Makefile.inc
index f0b385e8372c..b0fcd0d4af8b 100644
--- a/lib/libc/compat-43/Makefile.inc
+++ b/lib/libc/compat-43/Makefile.inc
@@ -2,12 +2,12 @@
 # compat-43 sources
 .PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/compat-43 ${LIBC_SRCTOP}/compat-43
 
-SRCS+=	creat.c gethostid.c getwd.c killpg.c sethostid.c setpgrp.c \
+SRCS+=	gethostid.c getwd.c killpg.c sethostid.c setpgrp.c \
 	setrgid.c setruid.c sigcompat.c
 
 SYM_MAPS+=${LIBC_SRCTOP}/compat-43/Symbol.map
 
-MAN+=	creat.2 killpg.2 sigpause.2 sigsetmask.2 sigvec.2
+MAN+=	killpg.2 sigpause.2 sigsetmask.2 sigvec.2
 MAN+=	gethostid.3 setruid.3
 
 MLINKS+=gethostid.3 sethostid.3
diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
index 5c3f029586b8..b7eb92090722 100644
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -99,7 +99,6 @@ SRCS+=	__getosreldate.c \
 	lcong48.c \
 	libc_dlopen.c \
 	libc_interposing_table.c  \
-	lockf.c \
 	lrand48.c \
 	memalign.c \
 	memfd_create.c \
@@ -121,7 +120,6 @@ SRCS+=	__getosreldate.c \
 	readdir.c \
 	readdir-compat11.c \
 	readpassphrase.c \
-	recvmmsg.c \
 	rewinddir.c \
 	scandir.c \
 	scandir_b.c \
@@ -131,7 +129,6 @@ SRCS+=	__getosreldate.c \
 	seed48.c \
 	seekdir.c \
 	semctl.c \
-	sendmmsg.c \
 	setdomainname.c \
 	sethostname.c \
 	setjmperr.c \
@@ -142,7 +139,6 @@ SRCS+=	__getosreldate.c \
 	siglist.c \
 	signal.c \
 	sigsetops.c \
-	sleep.c \
 	srand48.c \
 	statvfs.c \
 	stringlist.c \
@@ -166,14 +162,9 @@ SRCS+=	__getosreldate.c \
 	ulimit.c \
 	uname.c \
 	unvis-compat.c \
-	usleep.c \
 	utime.c \
 	utxdb.c \
 	valloc.c \
-	wait.c \
-	wait3.c \
-	waitpid.c \
-	waitid.c \
 	wordexp.c
 
 CFLAGS.arc4random.c= -I${SRCTOP}/sys -I${SRCTOP}/sys/crypto/chacha20
@@ -267,7 +258,6 @@ MAN+=	alarm.3 \
 	initgroups.3 \
 	isgreater.3 \
 	ldexp.3 \
-	lockf.3 \
 	makecontext.3 \
 	modf.3 \
 	nice.3 \
@@ -304,7 +294,6 @@ MAN+=	alarm.3 \
 	siginterrupt.3 \
 	signal.3 \
 	sigsetops.3 \
-	sleep.3 \
 	statvfs.3 \
 	stringlist.3 \
 	strtofflags.3 \
@@ -330,7 +319,6 @@ MAN+=	alarm.3 \
 	ulimit.3 \
 	uname.3 \
 	unvis.3 \
-	usleep.3 \
 	utime.3 \
 	valloc.3 \
 	vis.3 \
@@ -501,7 +489,6 @@ MLINKS+=rand48.3 _rand48.3 \
 	rand48.3 nrand48.3 \
 	rand48.3 seed48.3 \
 	rand48.3 srand48.3
-MLINKS+=recv.2 recvmmsg.2
 MLINKS+=scandir.3 alphasort.3 \
 	scandir.3 scandirat.3 \
 	scandir.3 scandir_b.3 \
@@ -510,7 +497,6 @@ MLINKS+=sem_open.3 sem_close.3 \
 	sem_open.3 sem_unlink.3
 MLINKS+=sem_wait.3 sem_trywait.3
 MLINKS+=sem_timedwait.3 sem_clockwait_np.3
-MLINKS+=send.2 sendmmsg.2
 MLINKS+=setjmp.3 _longjmp.3 \
 	setjmp.3 _setjmp.3 \
 	setjmp.3 longjmp.3 \
diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc
index d75d42fb0679..1305500176a3 100644
--- a/lib/libc/net/Makefile.inc
+++ b/lib/libc/net/Makefile.inc
@@ -12,7 +12,7 @@ SRCS+=	base64.c ether_addr.c eui64.c \
 	if_indextoname.c if_nameindex.c if_nametoindex.c \
 	ip6opt.c linkaddr.c map_v4v6.c name6.c ntoh.c \
 	nsdispatch.c nslexer.l nsparser.y nss_compat.c \
-	rcmd.c rcmdsh.c recv.c rthdr.c sctp_sys_calls.c send.c \
+	rcmd.c rcmdsh.c rthdr.c sctp_sys_calls.c \
         sockatmark.c sourcefilter.c vars.c
 
 .if ${MK_NS_CACHING} != "no"
diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys
index 2c7472ebad06..42409c35121b 100644
--- a/lib/libsys/Makefile.sys
+++ b/lib/libsys/Makefile.sys
@@ -34,6 +34,10 @@ SRCS+=	\
 
 SRCS+= getdents.c lstat.c mknod.c stat.c
 
+SRCS+=	creat.c
+SRCS+=	lockf.c sleep.c usleep.c wait.c wait3.c waitpid.c waitid.c
+SRCS+=	recv.c recvmmsg.c send.c sendmmsg.c
+
 NOASM+=  sched_getcpu.o
 PSEUDO+= _sched_getcpu.o
 
@@ -177,6 +181,7 @@ MAN+=	abort2.2 \
 	cpuset.2 \
 	cpuset_getaffinity.2 \
 	cpuset_getdomain.2 \
+	creat.2 \
 	dup.2 \
 	eventfd.2 \
 	execve.2 \
@@ -356,6 +361,11 @@ MAN+=	abort2.2 \
 	write.2 \
 	_umtx_op.2
 
+MAN+= \
+	lockf.3 \
+	sleep.3 \
+	usleep.3
+
 MLINKS+=aio_read.2 aio_readv.2
 MLINKS+=aio_write.2 aio_writev.2
 MLINKS+=accept.2 accept4.2
diff --git a/lib/libc/compat-43/creat.2 b/lib/libsys/creat.2
index c15c68e445c0..c15c68e445c0 100644
--- a/lib/libc/compat-43/creat.2
+++ b/lib/libsys/creat.2
diff --git a/lib/libc/compat-43/creat.c b/lib/libsys/creat.c
index 9bc1db19de1d..9bc1db19de1d 100644
--- a/lib/libc/compat-43/creat.c
+++ b/lib/libsys/creat.c
diff --git a/lib/libc/gen/lockf.c b/lib/libsys/lockf.c
index bb98ebc1be82..bb98ebc1be82 100644
--- a/lib/libc/gen/lockf.c
+++ b/lib/libsys/lockf.c
diff --git a/lib/libc/net/recv.c b/lib/libsys/recv.c
index db3d6216ed61..db3d6216ed61 100644
--- a/lib/libc/net/recv.c
+++ b/lib/libsys/recv.c
diff --git a/lib/libc/gen/recvmmsg.c b/lib/libsys/recvmmsg.c
index 24c4abf58287..24c4abf58287 100644
--- a/lib/libc/gen/recvmmsg.c
+++ b/lib/libsys/recvmmsg.c
diff --git a/lib/libc/net/send.c b/lib/libsys/send.c
index 94983553b1c3..94983553b1c3 100644
--- a/lib/libc/net/send.c
+++ b/lib/libsys/send.c
diff --git a/lib/libc/gen/sendmmsg.c b/lib/libsys/sendmmsg.c
index 41eb62d1e0c8..41eb62d1e0c8 100644
--- a/lib/libc/gen/sendmmsg.c
+++ b/lib/libsys/sendmmsg.c
diff --git a/lib/libc/gen/sleep.c b/lib/libsys/sleep.c
index 7d0fa5332ecc..7d0fa5332ecc 100644
--- a/lib/libc/gen/sleep.c
+++ b/lib/libsys/sleep.c
diff --git a/lib/libc/gen/usleep.c b/lib/libsys/usleep.c
index efd5ee0d1667..efd5ee0d1667 100644
--- a/lib/libc/gen/usleep.c
+++ b/lib/libsys/usleep.c
diff --git a/lib/libc/gen/wait.c b/lib/libsys/wait.c
index c400d07f9dd5..c400d07f9dd5 100644
--- a/lib/libc/gen/wait.c
+++ b/lib/libsys/wait.c
diff --git a/lib/libc/gen/wait3.c b/lib/libsys/wait3.c
index 40baf70ac6e6..40baf70ac6e6 100644
--- a/lib/libc/gen/wait3.c
+++ b/lib/libsys/wait3.c
diff --git a/lib/libc/gen/waitid.c b/lib/libsys/waitid.c
index b6e5ca33eed3..b6e5ca33eed3 100644
--- a/lib/libc/gen/waitid.c
+++ b/lib/libsys/waitid.c
diff --git a/lib/libc/gen/waitpid.c b/lib/libsys/waitpid.c
index ba7e667218cf..ba7e667218cf 100644
--- a/lib/libc/gen/waitpid.c
+++ b/lib/libsys/waitpid.c