clean up dependencies

217 files changed, 32 insertions, 2548 deletions

diff --git a/mk/__checked_call.d b/mk/__checked_call.d
index 80e0bfaf..5bc24230 100644
--- a/mk/__checked_call.d
+++ b/mk/__checked_call.d
@@ -4,7 +4,6 @@ libc.a(__checked_call.o): $(OBJDIR)/__checked_call.o
 
 $(OBJDIR)/__checked_call.o: src/__checked_call.c
 $(OBJDIR)/__checked_call.o: src/_safety.h
-$(OBJDIR)/__checked_call.o: src/stdlib/abort_handler_s.c
 $(OBJDIR)/__checked_call.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/__checked_call.c
diff --git a/mk/__signal_handler.d b/mk/__signal_handler.d
index ca7ef109..de8249e3 100644
--- a/mk/__signal_handler.d
+++ b/mk/__signal_handler.d
@@ -4,6 +4,7 @@ libc.a(__signal_handler.o): $(OBJDIR)/__signal_handler.o
 
 $(OBJDIR)/__signal_handler.o: src/signal/__signal_handler.c
 $(OBJDIR)/__signal_handler.o: src/signal/_signal.h
+$(OBJDIR)/__signal_handler.o: src/stdlib/_stdlib.h
 $(OBJDIR)/__signal_handler.o: src/_safety.h
 $(OBJDIR)/__signal_handler.o:
 	@mkdir -p $(@D)
diff --git a/mk/__undefined.d b/mk/__undefined.d
index dda5ff29..b8337431 100644
--- a/mk/__undefined.d
+++ b/mk/__undefined.d
@@ -3,6 +3,8 @@ libc.a(__undefined.o): $(OBJDIR)/__undefined.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/__undefined.o: src/__undefined.c
+$(OBJDIR)/__undefined.o: src/_safety.h
+$(OBJDIR)/__undefined.o: src/stdlib/_Exit.c
 $(OBJDIR)/__undefined.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/__undefined.c
diff --git a/mk/_exit.d b/mk/_exit.d
deleted file mode 100644
index 9637981e..00000000
--- a/mk/_exit.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(_exit.o)
-libc.a(_exit.o): $(OBJDIR)/_exit.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/_exit.o: src/unistd/_exit.c
-$(OBJDIR)/_exit.o: src/_syscall.h
-$(OBJDIR)/_exit.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/_exit.c
diff --git a/mk/_longjmp.d b/mk/_longjmp.d
deleted file mode 100644
index b467ac6d..00000000
--- a/mk/_longjmp.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.400: libc.a(_longjmp.o)
-libc.a(_longjmp.o): $(OBJDIR)/_longjmp.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/_longjmp.o: src/setjmp/_longjmp.c
-$(OBJDIR)/_longjmp.o: src/_safety.h
-$(OBJDIR)/_longjmp.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/setjmp/_longjmp.c
diff --git a/mk/_setjmp.d b/mk/_setjmp.d
deleted file mode 100644
index 7c02f45f..00000000
--- a/mk/_setjmp.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.400: libc.a(_setjmp.o)
-libc.a(_setjmp.o): $(OBJDIR)/_setjmp.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/_setjmp.o: src/setjmp/_setjmp.c
-$(OBJDIR)/_setjmp.o: src/_safety.h
-$(OBJDIR)/_setjmp.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/setjmp/_setjmp.c
diff --git a/mk/a64l.d b/mk/a64l.d
deleted file mode 100644
index b6401a42..00000000
--- a/mk/a64l.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.400: libc.a(a64l.o)
-libc.a(a64l.o): $(OBJDIR)/a64l.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/a64l.o: src/stdlib/a64l.c
-$(OBJDIR)/a64l.o: src/stdlib/_stdlib.h
-$(OBJDIR)/a64l.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/a64l.c
diff --git a/mk/access.d b/mk/access.d
deleted file mode 100644
index 3755c9b5..00000000
--- a/mk/access.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.1: libc.a(access.o)
-libc.a(access.o): $(OBJDIR)/access.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/access.o: src/unistd/access.c
-$(OBJDIR)/access.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/access.c
diff --git a/mk/alarm.d b/mk/alarm.d
deleted file mode 100644
index e5b821cb..00000000
--- a/mk/alarm.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(alarm.o)
-libc.a(alarm.o): $(OBJDIR)/alarm.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/alarm.o: src/unistd/alarm.c
-$(OBJDIR)/alarm.o: src/_syscall.h
-$(OBJDIR)/alarm.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/alarm.c
diff --git a/mk/all.mk b/mk/all.mk
index f73af9b3..15e93cf9 100644
--- a/mk/all.mk
+++ b/mk/all.mk
@@ -1,6 +1,3 @@
-include mk/creat.d
-include mk/fcntl.d
-include mk/open.d
 include mk/atomic_fetch_and.d
 include mk/atomic_flag_clear_explicit.d
 include mk/atomic_compare_exchange_strong.d
@@ -73,12 +70,10 @@ include mk/memcmp.d
 include mk/strcmp.d
 include mk/strcat.d
 include mk/strncat_s.d
-include mk/memccpy.d
 include mk/strrchr.d
 include mk/strcpy.d
 include mk/strtok_s.d
 include mk/strerror_s.d
-include mk/strdup.d
 include mk/strncpy.d
 include mk/strstr.d
 include mk/strcat_s.d
@@ -116,7 +111,6 @@ include mk/wcstok.d
 include mk/fwscanf_s.d
 include mk/vfwprintf_s.d
 include mk/wmemset.d
-include mk/wcswidth.d
 include mk/wprintf_s.d
 include mk/snwprintf_s.d
 include mk/wcsncpy.d
@@ -156,12 +150,10 @@ include mk/wcsrtombs_s.d
 include mk/wcsstr.d
 include mk/swprintf.d
 include mk/wcsnlen_s.d
-include mk/wcwidth.d
 include mk/wscanf.d
 include mk/wcsxfrm.d
 include mk/wmemmove.d
 include mk/fwscanf.d
-include mk/wcswcs.d
 include mk/fgetwc.d
 include mk/vwprintf_s.d
 include mk/wcscmp.d
@@ -186,7 +178,6 @@ include mk/setlocale.d
 include mk/localeconv.d
 include mk/__load_locale.d
 include mk/__get_locale.d
-include mk/mktemp.d
 include mk/atof.d
 include mk/srand.d
 include mk/wctomb_s.d
@@ -194,89 +185,58 @@ include mk/ignore_handler_s.d
 include mk/strtoul.d
 include mk/strtod.d
 include mk/ldiv.d
-include mk/valloc.d
-include mk/lcong48.d
-include mk/ecvt.d
 include mk/atoi.d
 include mk/at_quick_exit.d
 include mk/labs.d
-include mk/erand48.d
 include mk/abort.d
 include mk/bsearch_s.d
 include mk/exit.d
-include mk/fcvt.d
 include mk/system.d
 include mk/div.d
-include mk/lrand48.d
 include mk/strtol.d
 include mk/strtof.d
 include mk/wcstombs.d
-include mk/srand48.d
-include mk/putenv.d
-include mk/setkey.d
-include mk/l64a.d
 include mk/strtold.d
 include mk/malloc.d
 include mk/rand.d
-include mk/initstate.d
 include mk/__stdlib.d
-include mk/realpath.d
 include mk/atexit.d
 include mk/realloc.d
 include mk/free.d
 include mk/wcstombs_s.d
-include mk/random.d
-include mk/grantpt.d
 include mk/abort_handler_s.d
-include mk/seed48.d
-include mk/srandom.d
 include mk/mbstowcs.d
 include mk/calloc.d
 include mk/set_constraint_handler_s.d
-include mk/unlockpt.d
 include mk/mblen.d
 include mk/aligned_alloc.d
-include mk/setstate.d
 include mk/qsort_s.d
 include mk/lldiv.d
-include mk/jrand48.d
-include mk/mrand48.d
 include mk/strtoll.d
 include mk/abs.d
 include mk/atoll.d
 include mk/bsearch.d
 include mk/mbtowc.d
 include mk/llabs.d
-include mk/nrand48.d
 include mk/quick_exit.d
-include mk/gcvt.d
 include mk/strtoull.d
-include mk/drand48.d
-include mk/ttyslot.d
-include mk/mkstemp.d
 include mk/wctomb.d
-include mk/a64l.d
 include mk/getenv.d
 include mk/qsort.d
 include mk/_Exit.d
 include mk/getenv_s.d
-include mk/getsubopt.d
 include mk/mbstowcs_s.d
 include mk/atol.d
-include mk/ptsname.d
 include mk/modf.d
 include mk/sinh.d
 include mk/acosh.d
 include mk/tanh.d
-include mk/j1.d
 include mk/fma.d
 include mk/nextafter.d
 include mk/llround.d
 include mk/exp2.d
-include mk/yn.d
 include mk/fdim.d
 include mk/nexttoward.d
-include mk/scalb.d
 include mk/sqrt.d
 include mk/pow.d
 include mk/erfc.d
@@ -292,7 +252,6 @@ include mk/logb.d
 include mk/scalbln.d
 include mk/nan.d
 include mk/log2.d
-include mk/signgam.d
 include mk/hypot.d
 include mk/rint.d
 include mk/asin.d
@@ -305,7 +264,6 @@ include mk/ldexp.d
 include mk/cbrt.d
 include mk/floor.d
 include mk/atan2.d
-include mk/y1.d
 include mk/remquo.d
 include mk/ilogb.d
 include mk/log10.d
@@ -321,14 +279,9 @@ include mk/frexp.d
 include mk/fabs.d
 include mk/tan.d
 include mk/round.d
-include mk/gamma.d
-include mk/remainder.d
-include mk/y0.d
-include mk/j0.d
 include mk/fmod.d
 include mk/llrint.d
 include mk/tgamma.d
-include mk/jn.d
 include mk/trunc.d
 include mk/sin.d
 include mk/__sigsegv.d
@@ -342,157 +295,33 @@ include mk/mbrtoc32.d
 include mk/c32rtomb.d
 include mk/c16rtomb.d
 include mk/mbrtoc16.d
-include mk/munlock.d
-include mk/shm_unlink.d
-include mk/munmap.d
-include mk/shm_open.d
-include mk/munlockall.d
-include mk/mmap.d
-include mk/msync.d
-include mk/mlock.d
-include mk/mprotect.d
-include mk/mlockall.d
-include mk/mkdir.d
-include mk/chmod.d
-include mk/mkfifo.d
-include mk/mknod.d
-include mk/fstat.d
-include mk/stat.d
-include mk/fchmod.d
-include mk/umask.d
-include mk/lstat.d
-include mk/waitpid.d
-include mk/wait.d
-include mk/waitid.d
-include mk/wait3.d
 include mk/__assert.d
 include mk/assert.d
 include mk/iscntrl.d
 include mk/isalpha.d
 include mk/toupper.d
-include mk/toascii.d
 include mk/isdigit.d
 include mk/isupper.d
 include mk/isspace.d
 include mk/ispunct.d
 include mk/islower.d
 include mk/isxdigit.d
-include mk/isascii.d
 include mk/isgraph.d
 include mk/isblank.d
 include mk/tolower.d
 include mk/isprint.d
 include mk/isalnum.d
-include mk/getwd.d
-include mk/optarg.d
-include mk/getpgid.d
-include mk/fpathconf.d
-include mk/ualarm.d
-include mk/alarm.d
-include mk/fdatasync.d
-include mk/encrypt.d
-include mk/swab.d
-include mk/chown.d
-include mk/fsync.d
-include mk/getlogin.d
-include mk/execl.d
-include mk/lchown.d
-include mk/brk.d
-include mk/vfork.d
-include mk/getpgrp.d
-include mk/pause.d
-include mk/write.d
-include mk/opterr.d
-include mk/sysconf.d
-include mk/execle.d
-include mk/rmdir.d
-include mk/optopt.d
-include mk/getsid.d
-include mk/access.d
-include mk/getpid.d
-include mk/sleep.d
-include mk/fchown.d
-include mk/confstr.d
-include mk/fchdir.d
-include mk/setpgid.d
-include mk/getuid.d
-include mk/getdtablesize.d
-include mk/pipe.d
-include mk/sbrk.d
-include mk/nice.d
-include mk/setuid.d
-include mk/lseek.d
-include mk/readlink.d
-include mk/geteuid.d
-include mk/setgid.d
-include mk/unlink.d
-include mk/getcwd.d
-include mk/pathconf.d
-include mk/ttyname.d
-include mk/read.d
-include mk/getppid.d
-include mk/ctermid.d
-include mk/execvp.d
-include mk/getegid.d
-include mk/chroot.d
-include mk/execve.d
-include mk/execv.d
-include mk/chdir.d
-include mk/usleep.d
-include mk/getgid.d
-include mk/gethostid.d
-include mk/cuserid.d
-include mk/optind.d
-include mk/tcgetpgrp.d
-include mk/symlink.d
-include mk/getgroups.d
-include mk/setpgrp.d
-include mk/tcsetpgrp.d
-include mk/setreuid.d
-include mk/getpagesize.d
-include mk/ftruncate.d
-include mk/fork.d
-include mk/sync.d
-include mk/lockf.d
-include mk/execlp.d
-include mk/_exit.d
-include mk/setsid.d
-include mk/isatty.d
-include mk/setregid.d
-include mk/crypt.d
-include mk/getopt.d
-include mk/dup.d
-include mk/truncate.d
-include mk/dup2.d
-include mk/close.d
-include mk/getpass.d
-include mk/link.d
-include mk/clock_settime.d
-include mk/tzname.d
-include mk/timer_settime.d
 include mk/strftime.d
 include mk/time.d
-include mk/timezone.d
-include mk/strptime.d
-include mk/daylight.d
 include mk/asctime.d
 include mk/ctime.d
-include mk/timer_create.d
 include mk/clock.d
-include mk/getdate_err.d
 include mk/ctime_s.d
 include mk/gmtime.d
 include mk/gmtime_s.d
-include mk/tzset.d
-include mk/timer_delete.d
-include mk/clock_getres.d
 include mk/difftime.d
-include mk/timer_getoverrun.d
 include mk/localtime.d
-include mk/getdate.d
 include mk/nanosleep.d
-include mk/timer_gettime.d
-include mk/clock_gettime.d
 include mk/__time.d
 include mk/timespec_get.d
 include mk/localtime_s.d
@@ -500,13 +329,8 @@ include mk/asctime_s.d
 include mk/mktime.d
 include mk/__main.d
 include mk/environ.d
-include mk/_longjmp.d
-include mk/sigjmp_buf.d
-include mk/_setjmp.d
 include mk/setjmp.d
-include mk/siglongjmp.d
 include mk/longjmp.d
-include mk/sigsetjmp.d
 include mk/fputs.d
 include mk/fwrite.d
 include mk/vscanf.d
@@ -515,13 +339,10 @@ include mk/vfprintf.d
 include mk/getchar_unlocked.d
 include mk/ferror.d
 include mk/fgetc.d
-include mk/fileno.d
 include mk/funlockfile.d
-include mk/popen.d
 include mk/fprintf_s.d
 include mk/putc.d
 include mk/scanf.d
-include mk/getw.d
 include mk/sscanf_s.d
 include mk/sscanf.d
 include mk/ftell.d
@@ -538,7 +359,6 @@ include mk/freopen.d
 include mk/putchar_unlocked.d
 include mk/setbuf.d
 include mk/freopen_s.d
-include mk/pclose.d
 include mk/scanf_s.d
 include mk/vsnprintf_s.d
 include mk/tmpfile_s.d
@@ -556,6 +376,7 @@ include mk/fgets.d
 include mk/snprintf_s.d
 include mk/getc_unlocked.d
 include mk/fprintf.d
+include mk/getc.d
 include mk/vsprintf_s.d
 include mk/rename.d
 include mk/flockfile.d
@@ -570,10 +391,10 @@ include mk/fscanf.d
 include mk/fscanf_s.d
 include mk/vfprintf_s.d
 include mk/snprintf.d
+include mk/gets.d
 include mk/sprintf_s.d
 include mk/vprintf_s.d
 include mk/getchar.d
-include mk/tempnam.d
 include mk/fopen_s.d
 include mk/remove.d
 include mk/putchar.d
@@ -582,12 +403,10 @@ include mk/vsscanf_s.d
 include mk/printf.d
 include mk/ungetc.d
 include mk/gets_s.d
-include mk/fdopen.d
 include mk/vsscanf.d
 include mk/fgetpos.d
 include mk/tmpfile.d
 include mk/setvbuf.d
-include mk/putw.d
 include mk/fflush.d
 include mk/__errno.d
 include mk/thrd_current.d
diff --git a/mk/assert.d b/mk/assert.d
index 6e6e2970..8c27b855 100644
--- a/mk/assert.d
+++ b/mk/assert.d
@@ -3,7 +3,7 @@ libc.a(assert.o): $(OBJDIR)/assert.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/assert.o: src/assert/assert.c
-$(OBJDIR)/assert.o: src/stdlib/_stdlib.h
+$(OBJDIR)/assert.o: src/_safety.h
 $(OBJDIR)/assert.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/assert/assert.c
diff --git a/mk/brk.d b/mk/brk.d
deleted file mode 100644
index 179494b8..00000000
--- a/mk/brk.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_X.400: libc.a(brk.o)
-libc.a(brk.o): $(OBJDIR)/brk.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/brk.o: src/unistd/brk.c
-$(OBJDIR)/brk.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/brk.c
diff --git a/mk/chdir.d b/mk/chdir.d
deleted file mode 100644
index bec0a6d3..00000000
--- a/mk/chdir.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(chdir.o)
-libc.a(chdir.o): $(OBJDIR)/chdir.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/chdir.o: src/unistd/chdir.c
-$(OBJDIR)/chdir.o: src/_syscall.h
-$(OBJDIR)/chdir.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/chdir.c
diff --git a/mk/chmod.d b/mk/chmod.d
deleted file mode 100644
index c006e08b..00000000
--- a/mk/chmod.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(chmod.o)
-libc.a(chmod.o): $(OBJDIR)/chmod.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/chmod.o: src/sys/stat/chmod.c
-$(OBJDIR)/chmod.o: src/_syscall.h
-$(OBJDIR)/chmod.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/sys/stat/chmod.c
diff --git a/mk/chown.d b/mk/chown.d
deleted file mode 100644
index 4ced115c..00000000
--- a/mk/chown.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(chown.o)
-libc.a(chown.o): $(OBJDIR)/chown.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/chown.o: src/unistd/chown.c
-$(OBJDIR)/chown.o: src/_syscall.h
-$(OBJDIR)/chown.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/chown.c
diff --git a/mk/chroot.d b/mk/chroot.d
deleted file mode 100644
index ca66df37..00000000
--- a/mk/chroot.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_X.400: libc.a(chroot.o)
-libc.a(chroot.o): $(OBJDIR)/chroot.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/chroot.o: src/unistd/chroot.c
-$(OBJDIR)/chroot.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/chroot.c
diff --git a/mk/clock_getres.d b/mk/clock_getres.d
deleted file mode 100644
index 7645727d..00000000
--- a/mk/clock_getres.d
+++ /dev/null
@@ -1,9 +0,0 @@
-librt_P.199309: librt.a(clock_getres.o)
-librt.a(clock_getres.o): $(OBJDIR)/clock_getres.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/clock_getres.o: src/time/clock_getres.c
-$(OBJDIR)/clock_getres.o: src/_safety.h
-$(OBJDIR)/clock_getres.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/time/clock_getres.c
diff --git a/mk/clock_gettime.d b/mk/clock_gettime.d
deleted file mode 100644
index 30ee2603..00000000
--- a/mk/clock_gettime.d
+++ /dev/null
@@ -1,9 +0,0 @@
-librt_P.199309: librt.a(clock_gettime.o)
-librt.a(clock_gettime.o): $(OBJDIR)/clock_gettime.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/clock_gettime.o: src/time/clock_gettime.c
-$(OBJDIR)/clock_gettime.o: src/_safety.h
-$(OBJDIR)/clock_gettime.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/time/clock_gettime.c
diff --git a/mk/clock_settime.d b/mk/clock_settime.d
deleted file mode 100644
index 113c1c1f..00000000
--- a/mk/clock_settime.d
+++ /dev/null
@@ -1,9 +0,0 @@
-librt_P.199309: librt.a(clock_settime.o)
-librt.a(clock_settime.o): $(OBJDIR)/clock_settime.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/clock_settime.o: src/time/clock_settime.c
-$(OBJDIR)/clock_settime.o: src/_safety.h
-$(OBJDIR)/clock_settime.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/time/clock_settime.c
diff --git a/mk/close.d b/mk/close.d
deleted file mode 100644
index ff1bfe8a..00000000
--- a/mk/close.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(close.o)
-libc.a(close.o): $(OBJDIR)/close.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/close.o: src/unistd/close.c
-$(OBJDIR)/close.o: src/_syscall.h
-$(OBJDIR)/close.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/close.c
diff --git a/mk/confstr.d b/mk/confstr.d
deleted file mode 100644
index d1d72500..00000000
--- a/mk/confstr.d
+++ /dev/null
@@ -1,10 +0,0 @@
-libc_P.2: libc.a(confstr.o)
-libc.a(confstr.o): $(OBJDIR)/confstr.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/confstr.o: src/unistd/confstr.c
-$(OBJDIR)/confstr.o: src/_safety.h
-$(OBJDIR)/confstr.o: src/unistd/_confstr.h
-$(OBJDIR)/confstr.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/confstr.c
diff --git a/mk/creat.d b/mk/creat.d
deleted file mode 100644
index ea3cac2d..00000000
--- a/mk/creat.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.1: libc.a(creat.o)
-libc.a(creat.o): $(OBJDIR)/creat.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/creat.o: src/fcntl/creat.c
-$(OBJDIR)/creat.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/fcntl/creat.c
diff --git a/mk/crypt.d b/mk/crypt.d
deleted file mode 100644
index 0579ee50..00000000
--- a/mk/crypt.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_X.4: libc.a(crypt.o)
-libc.a(crypt.o): $(OBJDIR)/crypt.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/crypt.o: src/unistd/crypt.c
-$(OBJDIR)/crypt.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/crypt.c
diff --git a/mk/ctermid.d b/mk/ctermid.d
deleted file mode 100644
index a7b99744..00000000
--- a/mk/ctermid.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.1: libc.a(ctermid.o)
-libc.a(ctermid.o): $(OBJDIR)/ctermid.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/ctermid.o: src/unistd/ctermid.c
-$(OBJDIR)/ctermid.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/ctermid.c
diff --git a/mk/cuserid.d b/mk/cuserid.d
deleted file mode 100644
index ff60f192..00000000
--- a/mk/cuserid.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.1: libc.a(cuserid.o)
-libc.a(cuserid.o): $(OBJDIR)/cuserid.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/cuserid.o: src/unistd/cuserid.c
-$(OBJDIR)/cuserid.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/cuserid.c
diff --git a/mk/daylight.d b/mk/daylight.d
deleted file mode 100644
index 27b18b29..00000000
--- a/mk/daylight.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_X.4: libc.a(daylight.o)
-libc.a(daylight.o): $(OBJDIR)/daylight.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/daylight.o: src/time/daylight.c
-$(OBJDIR)/daylight.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/time/daylight.c
diff --git a/mk/deps.mk b/mk/deps.mk
index 25a9c2aa..ac1d5553 100644
--- a/mk/deps.mk
+++ b/mk/deps.mk
@@ -2,18 +2,6 @@
 
 all:
 
-all: mk/creat.d
-mk/creat.d: src/fcntl/creat.c
-	sh mk/deps.sh src/fcntl/creat.c
-
-all: mk/fcntl.d
-mk/fcntl.d: src/fcntl/fcntl.c
-	sh mk/deps.sh src/fcntl/fcntl.c
-
-all: mk/open.d
-mk/open.d: src/fcntl/open.c
-	sh mk/deps.sh src/fcntl/open.c
-
 all: mk/atomic_fetch_and.d
 mk/atomic_fetch_and.d: src/stdatomic/atomic_fetch_and.c
 	sh mk/deps.sh src/stdatomic/atomic_fetch_and.c
@@ -302,10 +290,6 @@ all: mk/strncat_s.d
 mk/strncat_s.d: src/string/strncat_s.c
 	sh mk/deps.sh src/string/strncat_s.c
 
-all: mk/memccpy.d
-mk/memccpy.d: src/string/memccpy.c
-	sh mk/deps.sh src/string/memccpy.c
-
 all: mk/strrchr.d
 mk/strrchr.d: src/string/strrchr.c
 	sh mk/deps.sh src/string/strrchr.c
@@ -322,10 +306,6 @@ all: mk/strerror_s.d
 mk/strerror_s.d: src/string/strerror_s.c
 	sh mk/deps.sh src/string/strerror_s.c
 
-all: mk/strdup.d
-mk/strdup.d: src/string/strdup.c
-	sh mk/deps.sh src/string/strdup.c
-
 all: mk/strncpy.d
 mk/strncpy.d: src/string/strncpy.c
 	sh mk/deps.sh src/string/strncpy.c
@@ -474,10 +454,6 @@ all: mk/wmemset.d
 mk/wmemset.d: src/wchar/wmemset.c
 	sh mk/deps.sh src/wchar/wmemset.c
 
-all: mk/wcswidth.d
-mk/wcswidth.d: src/wchar/wcswidth.c
-	sh mk/deps.sh src/wchar/wcswidth.c
-
 all: mk/wprintf_s.d
 mk/wprintf_s.d: src/wchar/wprintf_s.c
 	sh mk/deps.sh src/wchar/wprintf_s.c
@@ -634,10 +610,6 @@ all: mk/wcsnlen_s.d
 mk/wcsnlen_s.d: src/wchar/wcsnlen_s.c
 	sh mk/deps.sh src/wchar/wcsnlen_s.c
 
-all: mk/wcwidth.d
-mk/wcwidth.d: src/wchar/wcwidth.c
-	sh mk/deps.sh src/wchar/wcwidth.c
-
 all: mk/wscanf.d
 mk/wscanf.d: src/wchar/wscanf.c
 	sh mk/deps.sh src/wchar/wscanf.c
@@ -654,10 +626,6 @@ all: mk/fwscanf.d
 mk/fwscanf.d: src/wchar/fwscanf.c
 	sh mk/deps.sh src/wchar/fwscanf.c
 
-all: mk/wcswcs.d
-mk/wcswcs.d: src/wchar/wcswcs.c
-	sh mk/deps.sh src/wchar/wcswcs.c
-
 all: mk/fgetwc.d
 mk/fgetwc.d: src/wchar/fgetwc.c
 	sh mk/deps.sh src/wchar/fgetwc.c
@@ -754,10 +722,6 @@ all: mk/__get_locale.d
 mk/__get_locale.d: src/locale/__get_locale.c
 	sh mk/deps.sh src/locale/__get_locale.c
 
-all: mk/mktemp.d
-mk/mktemp.d: src/stdlib/mktemp.c
-	sh mk/deps.sh src/stdlib/mktemp.c
-
 all: mk/atof.d
 mk/atof.d: src/stdlib/atof.c
 	sh mk/deps.sh src/stdlib/atof.c
@@ -786,18 +750,6 @@ all: mk/ldiv.d
 mk/ldiv.d: src/stdlib/ldiv.c
 	sh mk/deps.sh src/stdlib/ldiv.c
 
-all: mk/valloc.d
-mk/valloc.d: src/stdlib/valloc.c
-	sh mk/deps.sh src/stdlib/valloc.c
-
-all: mk/lcong48.d
-mk/lcong48.d: src/stdlib/lcong48.c
-	sh mk/deps.sh src/stdlib/lcong48.c
-
-all: mk/ecvt.d
-mk/ecvt.d: src/stdlib/ecvt.c
-	sh mk/deps.sh src/stdlib/ecvt.c
-
 all: mk/atoi.d
 mk/atoi.d: src/stdlib/atoi.c
 	sh mk/deps.sh src/stdlib/atoi.c
@@ -810,10 +762,6 @@ all: mk/labs.d
 mk/labs.d: src/stdlib/labs.c
 	sh mk/deps.sh src/stdlib/labs.c
 
-all: mk/erand48.d
-mk/erand48.d: src/stdlib/erand48.c
-	sh mk/deps.sh src/stdlib/erand48.c
-
 all: mk/abort.d
 mk/abort.d: src/stdlib/abort.c
 	sh mk/deps.sh src/stdlib/abort.c
@@ -826,10 +774,6 @@ all: mk/exit.d
 mk/exit.d: src/stdlib/exit.c
 	sh mk/deps.sh src/stdlib/exit.c
 
-all: mk/fcvt.d
-mk/fcvt.d: src/stdlib/fcvt.c
-	sh mk/deps.sh src/stdlib/fcvt.c
-
 all: mk/system.d
 mk/system.d: src/stdlib/system.c
 	sh mk/deps.sh src/stdlib/system.c
@@ -838,10 +782,6 @@ all: mk/div.d
 mk/div.d: src/stdlib/div.c
 	sh mk/deps.sh src/stdlib/div.c
 
-all: mk/lrand48.d
-mk/lrand48.d: src/stdlib/lrand48.c
-	sh mk/deps.sh src/stdlib/lrand48.c
-
 all: mk/strtol.d
 mk/strtol.d: src/stdlib/strtol.c
 	sh mk/deps.sh src/stdlib/strtol.c
@@ -854,22 +794,6 @@ all: mk/wcstombs.d
 mk/wcstombs.d: src/stdlib/wcstombs.c
 	sh mk/deps.sh src/stdlib/wcstombs.c
 
-all: mk/srand48.d
-mk/srand48.d: src/stdlib/srand48.c
-	sh mk/deps.sh src/stdlib/srand48.c
-
-all: mk/putenv.d
-mk/putenv.d: src/stdlib/putenv.c
-	sh mk/deps.sh src/stdlib/putenv.c
-
-all: mk/setkey.d
-mk/setkey.d: src/stdlib/setkey.c
-	sh mk/deps.sh src/stdlib/setkey.c
-
-all: mk/l64a.d
-mk/l64a.d: src/stdlib/l64a.c
-	sh mk/deps.sh src/stdlib/l64a.c
-
 all: mk/strtold.d
 mk/strtold.d: src/stdlib/strtold.c
 	sh mk/deps.sh src/stdlib/strtold.c
@@ -882,18 +806,10 @@ all: mk/rand.d
 mk/rand.d: src/stdlib/rand.c
 	sh mk/deps.sh src/stdlib/rand.c
 
-all: mk/initstate.d
-mk/initstate.d: src/stdlib/initstate.c
-	sh mk/deps.sh src/stdlib/initstate.c
-
 all: mk/__stdlib.d
 mk/__stdlib.d: src/stdlib/__stdlib.c
 	sh mk/deps.sh src/stdlib/__stdlib.c
 
-all: mk/realpath.d
-mk/realpath.d: src/stdlib/realpath.c
-	sh mk/deps.sh src/stdlib/realpath.c
-
 all: mk/atexit.d
 mk/atexit.d: src/stdlib/atexit.c
 	sh mk/deps.sh src/stdlib/atexit.c
@@ -910,26 +826,10 @@ all: mk/wcstombs_s.d
 mk/wcstombs_s.d: src/stdlib/wcstombs_s.c
 	sh mk/deps.sh src/stdlib/wcstombs_s.c
 
-all: mk/random.d
-mk/random.d: src/stdlib/random.c
-	sh mk/deps.sh src/stdlib/random.c
-
-all: mk/grantpt.d
-mk/grantpt.d: src/stdlib/grantpt.c
-	sh mk/deps.sh src/stdlib/grantpt.c
-
 all: mk/abort_handler_s.d
 mk/abort_handler_s.d: src/stdlib/abort_handler_s.c
 	sh mk/deps.sh src/stdlib/abort_handler_s.c
 
-all: mk/seed48.d
-mk/seed48.d: src/stdlib/seed48.c
-	sh mk/deps.sh src/stdlib/seed48.c
-
-all: mk/srandom.d
-mk/srandom.d: src/stdlib/srandom.c
-	sh mk/deps.sh src/stdlib/srandom.c
-
 all: mk/mbstowcs.d
 mk/mbstowcs.d: src/stdlib/mbstowcs.c
 	sh mk/deps.sh src/stdlib/mbstowcs.c
@@ -942,10 +842,6 @@ all: mk/set_constraint_handler_s.d
 mk/set_constraint_handler_s.d: src/stdlib/set_constraint_handler_s.c
 	sh mk/deps.sh src/stdlib/set_constraint_handler_s.c
 
-all: mk/unlockpt.d
-mk/unlockpt.d: src/stdlib/unlockpt.c
-	sh mk/deps.sh src/stdlib/unlockpt.c
-
 all: mk/mblen.d
 mk/mblen.d: src/stdlib/mblen.c
 	sh mk/deps.sh src/stdlib/mblen.c
@@ -954,10 +850,6 @@ all: mk/aligned_alloc.d
 mk/aligned_alloc.d: src/stdlib/aligned_alloc.c
 	sh mk/deps.sh src/stdlib/aligned_alloc.c
 
-all: mk/setstate.d
-mk/setstate.d: src/stdlib/setstate.c
-	sh mk/deps.sh src/stdlib/setstate.c
-
 all: mk/qsort_s.d
 mk/qsort_s.d: src/stdlib/qsort_s.c
 	sh mk/deps.sh src/stdlib/qsort_s.c
@@ -966,14 +858,6 @@ all: mk/lldiv.d
 mk/lldiv.d: src/stdlib/lldiv.c
 	sh mk/deps.sh src/stdlib/lldiv.c
 
-all: mk/jrand48.d
-mk/jrand48.d: src/stdlib/jrand48.c
-	sh mk/deps.sh src/stdlib/jrand48.c
-
-all: mk/mrand48.d
-mk/mrand48.d: src/stdlib/mrand48.c
-	sh mk/deps.sh src/stdlib/mrand48.c
-
 all: mk/strtoll.d
 mk/strtoll.d: src/stdlib/strtoll.c
 	sh mk/deps.sh src/stdlib/strtoll.c
@@ -998,42 +882,18 @@ all: mk/llabs.d
 mk/llabs.d: src/stdlib/llabs.c
 	sh mk/deps.sh src/stdlib/llabs.c
 
-all: mk/nrand48.d
-mk/nrand48.d: src/stdlib/nrand48.c
-	sh mk/deps.sh src/stdlib/nrand48.c
-
 all: mk/quick_exit.d
 mk/quick_exit.d: src/stdlib/quick_exit.c
 	sh mk/deps.sh src/stdlib/quick_exit.c
 
-all: mk/gcvt.d
-mk/gcvt.d: src/stdlib/gcvt.c
-	sh mk/deps.sh src/stdlib/gcvt.c
-
 all: mk/strtoull.d
 mk/strtoull.d: src/stdlib/strtoull.c
 	sh mk/deps.sh src/stdlib/strtoull.c
 
-all: mk/drand48.d
-mk/drand48.d: src/stdlib/drand48.c
-	sh mk/deps.sh src/stdlib/drand48.c
-
-all: mk/ttyslot.d
-mk/ttyslot.d: src/stdlib/ttyslot.c
-	sh mk/deps.sh src/stdlib/ttyslot.c
-
-all: mk/mkstemp.d
-mk/mkstemp.d: src/stdlib/mkstemp.c
-	sh mk/deps.sh src/stdlib/mkstemp.c
-
 all: mk/wctomb.d
 mk/wctomb.d: src/stdlib/wctomb.c
 	sh mk/deps.sh src/stdlib/wctomb.c
 
-all: mk/a64l.d
-mk/a64l.d: src/stdlib/a64l.c
-	sh mk/deps.sh src/stdlib/a64l.c
-
 all: mk/getenv.d
 mk/getenv.d: src/stdlib/getenv.c
 	sh mk/deps.sh src/stdlib/getenv.c
@@ -1050,10 +910,6 @@ all: mk/getenv_s.d
 mk/getenv_s.d: src/stdlib/getenv_s.c
 	sh mk/deps.sh src/stdlib/getenv_s.c
 
-all: mk/getsubopt.d
-mk/getsubopt.d: src/stdlib/getsubopt.c
-	sh mk/deps.sh src/stdlib/getsubopt.c
-
 all: mk/mbstowcs_s.d
 mk/mbstowcs_s.d: src/stdlib/mbstowcs_s.c
 	sh mk/deps.sh src/stdlib/mbstowcs_s.c
@@ -1062,10 +918,6 @@ all: mk/atol.d
 mk/atol.d: src/stdlib/atol.c
 	sh mk/deps.sh src/stdlib/atol.c
 
-all: mk/ptsname.d
-mk/ptsname.d: src/stdlib/ptsname.c
-	sh mk/deps.sh src/stdlib/ptsname.c
-
 all: mk/modf.d
 mk/modf.d: src/math/modf.c
 	sh mk/deps.sh src/math/modf.c
@@ -1082,10 +934,6 @@ all: mk/tanh.d
 mk/tanh.d: src/math/tanh.c
 	sh mk/deps.sh src/math/tanh.c
 
-all: mk/j1.d
-mk/j1.d: src/math/j1.c
-	sh mk/deps.sh src/math/j1.c
-
 all: mk/fma.d
 mk/fma.d: src/math/fma.c
 	sh mk/deps.sh src/math/fma.c
@@ -1102,10 +950,6 @@ all: mk/exp2.d
 mk/exp2.d: src/math/exp2.c
 	sh mk/deps.sh src/math/exp2.c
 
-all: mk/yn.d
-mk/yn.d: src/math/yn.c
-	sh mk/deps.sh src/math/yn.c
-
 all: mk/fdim.d
 mk/fdim.d: src/math/fdim.c
 	sh mk/deps.sh src/math/fdim.c
@@ -1114,10 +958,6 @@ all: mk/nexttoward.d
 mk/nexttoward.d: src/math/nexttoward.c
 	sh mk/deps.sh src/math/nexttoward.c
 
-all: mk/scalb.d
-mk/scalb.d: src/math/scalb.c
-	sh mk/deps.sh src/math/scalb.c
-
 all: mk/sqrt.d
 mk/sqrt.d: src/math/sqrt.c
 	sh mk/deps.sh src/math/sqrt.c
@@ -1178,10 +1018,6 @@ all: mk/log2.d
 mk/log2.d: src/math/log2.c
 	sh mk/deps.sh src/math/log2.c
 
-all: mk/signgam.d
-mk/signgam.d: src/math/signgam.c
-	sh mk/deps.sh src/math/signgam.c
-
 all: mk/hypot.d
 mk/hypot.d: src/math/hypot.c
 	sh mk/deps.sh src/math/hypot.c
@@ -1230,10 +1066,6 @@ all: mk/atan2.d
 mk/atan2.d: src/math/atan2.c
 	sh mk/deps.sh src/math/atan2.c
 
-all: mk/y1.d
-mk/y1.d: src/math/y1.c
-	sh mk/deps.sh src/math/y1.c
-
 all: mk/remquo.d
 mk/remquo.d: src/math/remquo.c
 	sh mk/deps.sh src/math/remquo.c
@@ -1294,22 +1126,6 @@ all: mk/round.d
 mk/round.d: src/math/round.c
 	sh mk/deps.sh src/math/round.c
 
-all: mk/gamma.d
-mk/gamma.d: src/math/gamma.c
-	sh mk/deps.sh src/math/gamma.c
-
-all: mk/remainder.d
-mk/remainder.d: src/math/remainder.c
-	sh mk/deps.sh src/math/remainder.c
-
-all: mk/y0.d
-mk/y0.d: src/math/y0.c
-	sh mk/deps.sh src/math/y0.c
-
-all: mk/j0.d
-mk/j0.d: src/math/j0.c
-	sh mk/deps.sh src/math/j0.c
-
 all: mk/fmod.d
 mk/fmod.d: src/math/fmod.c
 	sh mk/deps.sh src/math/fmod.c
@@ -1322,10 +1138,6 @@ all: mk/tgamma.d
 mk/tgamma.d: src/math/tgamma.c
 	sh mk/deps.sh src/math/tgamma.c
 
-all: mk/jn.d
-mk/jn.d: src/math/jn.c
-	sh mk/deps.sh src/math/jn.c
-
 all: mk/trunc.d
 mk/trunc.d: src/math/trunc.c
 	sh mk/deps.sh src/math/trunc.c
@@ -1378,98 +1190,6 @@ all: mk/mbrtoc16.d
 mk/mbrtoc16.d: src/uchar/mbrtoc16.c
 	sh mk/deps.sh src/uchar/mbrtoc16.c
 
-all: mk/munlock.d
-mk/munlock.d: src/sys/mman/munlock.c
-	sh mk/deps.sh src/sys/mman/munlock.c
-
-all: mk/shm_unlink.d
-mk/shm_unlink.d: src/sys/mman/shm_unlink.c
-	sh mk/deps.sh src/sys/mman/shm_unlink.c
-
-all: mk/munmap.d
-mk/munmap.d: src/sys/mman/munmap.c
-	sh mk/deps.sh src/sys/mman/munmap.c
-
-all: mk/shm_open.d
-mk/shm_open.d: src/sys/mman/shm_open.c
-	sh mk/deps.sh src/sys/mman/shm_open.c
-
-all: mk/munlockall.d
-mk/munlockall.d: src/sys/mman/munlockall.c
-	sh mk/deps.sh src/sys/mman/munlockall.c
-
-all: mk/mmap.d
-mk/mmap.d: src/sys/mman/mmap.c
-	sh mk/deps.sh src/sys/mman/mmap.c
-
-all: mk/msync.d
-mk/msync.d: src/sys/mman/msync.c
-	sh mk/deps.sh src/sys/mman/msync.c
-
-all: mk/mlock.d
-mk/mlock.d: src/sys/mman/mlock.c
-	sh mk/deps.sh src/sys/mman/mlock.c
-
-all: mk/mprotect.d
-mk/mprotect.d: src/sys/mman/mprotect.c
-	sh mk/deps.sh src/sys/mman/mprotect.c
-
-all: mk/mlockall.d
-mk/mlockall.d: src/sys/mman/mlockall.c
-	sh mk/deps.sh src/sys/mman/mlockall.c
-
-all: mk/mkdir.d
-mk/mkdir.d: src/sys/stat/mkdir.c
-	sh mk/deps.sh src/sys/stat/mkdir.c
-
-all: mk/chmod.d
-mk/chmod.d: src/sys/stat/chmod.c
-	sh mk/deps.sh src/sys/stat/chmod.c
-
-all: mk/mkfifo.d
-mk/mkfifo.d: src/sys/stat/mkfifo.c
-	sh mk/deps.sh src/sys/stat/mkfifo.c
-
-all: mk/mknod.d
-mk/mknod.d: src/sys/stat/mknod.c
-	sh mk/deps.sh src/sys/stat/mknod.c
-
-all: mk/fstat.d
-mk/fstat.d: src/sys/stat/fstat.c
-	sh mk/deps.sh src/sys/stat/fstat.c
-
-all: mk/stat.d
-mk/stat.d: src/sys/stat/stat.c
-	sh mk/deps.sh src/sys/stat/stat.c
-
-all: mk/fchmod.d
-mk/fchmod.d: src/sys/stat/fchmod.c
-	sh mk/deps.sh src/sys/stat/fchmod.c
-
-all: mk/umask.d
-mk/umask.d: src/sys/stat/umask.c
-	sh mk/deps.sh src/sys/stat/umask.c
-
-all: mk/lstat.d
-mk/lstat.d: src/sys/stat/lstat.c
-	sh mk/deps.sh src/sys/stat/lstat.c
-
-all: mk/waitpid.d
-mk/waitpid.d: src/sys/wait/waitpid.c
-	sh mk/deps.sh src/sys/wait/waitpid.c
-
-all: mk/wait.d
-mk/wait.d: src/sys/wait/wait.c
-	sh mk/deps.sh src/sys/wait/wait.c
-
-all: mk/waitid.d
-mk/waitid.d: src/sys/wait/waitid.c
-	sh mk/deps.sh src/sys/wait/waitid.c
-
-all: mk/wait3.d
-mk/wait3.d: src/sys/wait/wait3.c
-	sh mk/deps.sh src/sys/wait/wait3.c
-
 all: mk/__assert.d
 mk/__assert.d: src/assert/__assert.c
 	sh mk/deps.sh src/assert/__assert.c
@@ -1490,10 +1210,6 @@ all: mk/toupper.d
 mk/toupper.d: src/ctype/toupper.c
 	sh mk/deps.sh src/ctype/toupper.c
 
-all: mk/toascii.d
-mk/toascii.d: src/ctype/toascii.c
-	sh mk/deps.sh src/ctype/toascii.c
-
 all: mk/isdigit.d
 mk/isdigit.d: src/ctype/isdigit.c
 	sh mk/deps.sh src/ctype/isdigit.c
@@ -1518,10 +1234,6 @@ all: mk/isxdigit.d
 mk/isxdigit.d: src/ctype/isxdigit.c
 	sh mk/deps.sh src/ctype/isxdigit.c
 
-all: mk/isascii.d
-mk/isascii.d: src/ctype/isascii.c
-	sh mk/deps.sh src/ctype/isascii.c
-
 all: mk/isgraph.d
 mk/isgraph.d: src/ctype/isgraph.c
 	sh mk/deps.sh src/ctype/isgraph.c
@@ -1542,354 +1254,6 @@ all: mk/isalnum.d
 mk/isalnum.d: src/ctype/isalnum.c
 	sh mk/deps.sh src/ctype/isalnum.c
 
-all: mk/getwd.d
-mk/getwd.d: src/unistd/getwd.c
-	sh mk/deps.sh src/unistd/getwd.c
-
-all: mk/optarg.d
-mk/optarg.d: src/unistd/optarg.c
-	sh mk/deps.sh src/unistd/optarg.c
-
-all: mk/getpgid.d
-mk/getpgid.d: src/unistd/getpgid.c
-	sh mk/deps.sh src/unistd/getpgid.c
-
-all: mk/fpathconf.d
-mk/fpathconf.d: src/unistd/fpathconf.c
-	sh mk/deps.sh src/unistd/fpathconf.c
-
-all: mk/ualarm.d
-mk/ualarm.d: src/unistd/ualarm.c
-	sh mk/deps.sh src/unistd/ualarm.c
-
-all: mk/alarm.d
-mk/alarm.d: src/unistd/alarm.c
-	sh mk/deps.sh src/unistd/alarm.c
-
-all: mk/fdatasync.d
-mk/fdatasync.d: src/unistd/fdatasync.c
-	sh mk/deps.sh src/unistd/fdatasync.c
-
-all: mk/encrypt.d
-mk/encrypt.d: src/unistd/encrypt.c
-	sh mk/deps.sh src/unistd/encrypt.c
-
-all: mk/swab.d
-mk/swab.d: src/unistd/swab.c
-	sh mk/deps.sh src/unistd/swab.c
-
-all: mk/chown.d
-mk/chown.d: src/unistd/chown.c
-	sh mk/deps.sh src/unistd/chown.c
-
-all: mk/fsync.d
-mk/fsync.d: src/unistd/fsync.c
-	sh mk/deps.sh src/unistd/fsync.c
-
-all: mk/getlogin.d
-mk/getlogin.d: src/unistd/getlogin.c
-	sh mk/deps.sh src/unistd/getlogin.c
-
-all: mk/execl.d
-mk/execl.d: src/unistd/execl.c
-	sh mk/deps.sh src/unistd/execl.c
-
-all: mk/lchown.d
-mk/lchown.d: src/unistd/lchown.c
-	sh mk/deps.sh src/unistd/lchown.c
-
-all: mk/brk.d
-mk/brk.d: src/unistd/brk.c
-	sh mk/deps.sh src/unistd/brk.c
-
-all: mk/vfork.d
-mk/vfork.d: src/unistd/vfork.c
-	sh mk/deps.sh src/unistd/vfork.c
-
-all: mk/getpgrp.d
-mk/getpgrp.d: src/unistd/getpgrp.c
-	sh mk/deps.sh src/unistd/getpgrp.c
-
-all: mk/pause.d
-mk/pause.d: src/unistd/pause.c
-	sh mk/deps.sh src/unistd/pause.c
-
-all: mk/write.d
-mk/write.d: src/unistd/write.c
-	sh mk/deps.sh src/unistd/write.c
-
-all: mk/opterr.d
-mk/opterr.d: src/unistd/opterr.c
-	sh mk/deps.sh src/unistd/opterr.c
-
-all: mk/sysconf.d
-mk/sysconf.d: src/unistd/sysconf.c
-	sh mk/deps.sh src/unistd/sysconf.c
-
-all: mk/execle.d
-mk/execle.d: src/unistd/execle.c
-	sh mk/deps.sh src/unistd/execle.c
-
-all: mk/rmdir.d
-mk/rmdir.d: src/unistd/rmdir.c
-	sh mk/deps.sh src/unistd/rmdir.c
-
-all: mk/optopt.d
-mk/optopt.d: src/unistd/optopt.c
-	sh mk/deps.sh src/unistd/optopt.c
-
-all: mk/getsid.d
-mk/getsid.d: src/unistd/getsid.c
-	sh mk/deps.sh src/unistd/getsid.c
-
-all: mk/access.d
-mk/access.d: src/unistd/access.c
-	sh mk/deps.sh src/unistd/access.c
-
-all: mk/getpid.d
-mk/getpid.d: src/unistd/getpid.c
-	sh mk/deps.sh src/unistd/getpid.c
-
-all: mk/sleep.d
-mk/sleep.d: src/unistd/sleep.c
-	sh mk/deps.sh src/unistd/sleep.c
-
-all: mk/fchown.d
-mk/fchown.d: src/unistd/fchown.c
-	sh mk/deps.sh src/unistd/fchown.c
-
-all: mk/confstr.d
-mk/confstr.d: src/unistd/confstr.c
-	sh mk/deps.sh src/unistd/confstr.c
-
-all: mk/fchdir.d
-mk/fchdir.d: src/unistd/fchdir.c
-	sh mk/deps.sh src/unistd/fchdir.c
-
-all: mk/setpgid.d
-mk/setpgid.d: src/unistd/setpgid.c
-	sh mk/deps.sh src/unistd/setpgid.c
-
-all: mk/getuid.d
-mk/getuid.d: src/unistd/getuid.c
-	sh mk/deps.sh src/unistd/getuid.c
-
-all: mk/getdtablesize.d
-mk/getdtablesize.d: src/unistd/getdtablesize.c
-	sh mk/deps.sh src/unistd/getdtablesize.c
-
-all: mk/pipe.d
-mk/pipe.d: src/unistd/pipe.c
-	sh mk/deps.sh src/unistd/pipe.c
-
-all: mk/sbrk.d
-mk/sbrk.d: src/unistd/sbrk.c
-	sh mk/deps.sh src/unistd/sbrk.c
-
-all: mk/nice.d
-mk/nice.d: src/unistd/nice.c
-	sh mk/deps.sh src/unistd/nice.c
-
-all: mk/setuid.d
-mk/setuid.d: src/unistd/setuid.c
-	sh mk/deps.sh src/unistd/setuid.c
-
-all: mk/lseek.d
-mk/lseek.d: src/unistd/lseek.c
-	sh mk/deps.sh src/unistd/lseek.c
-
-all: mk/readlink.d
-mk/readlink.d: src/unistd/readlink.c
-	sh mk/deps.sh src/unistd/readlink.c
-
-all: mk/geteuid.d
-mk/geteuid.d: src/unistd/geteuid.c
-	sh mk/deps.sh src/unistd/geteuid.c
-
-all: mk/setgid.d
-mk/setgid.d: src/unistd/setgid.c
-	sh mk/deps.sh src/unistd/setgid.c
-
-all: mk/unlink.d
-mk/unlink.d: src/unistd/unlink.c
-	sh mk/deps.sh src/unistd/unlink.c
-
-all: mk/getcwd.d
-mk/getcwd.d: src/unistd/getcwd.c
-	sh mk/deps.sh src/unistd/getcwd.c
-
-all: mk/pathconf.d
-mk/pathconf.d: src/unistd/pathconf.c
-	sh mk/deps.sh src/unistd/pathconf.c
-
-all: mk/ttyname.d
-mk/ttyname.d: src/unistd/ttyname.c
-	sh mk/deps.sh src/unistd/ttyname.c
-
-all: mk/read.d
-mk/read.d: src/unistd/read.c
-	sh mk/deps.sh src/unistd/read.c
-
-all: mk/getppid.d
-mk/getppid.d: src/unistd/getppid.c
-	sh mk/deps.sh src/unistd/getppid.c
-
-all: mk/ctermid.d
-mk/ctermid.d: src/unistd/ctermid.c
-	sh mk/deps.sh src/unistd/ctermid.c
-
-all: mk/execvp.d
-mk/execvp.d: src/unistd/execvp.c
-	sh mk/deps.sh src/unistd/execvp.c
-
-all: mk/getegid.d
-mk/getegid.d: src/unistd/getegid.c
-	sh mk/deps.sh src/unistd/getegid.c
-
-all: mk/chroot.d
-mk/chroot.d: src/unistd/chroot.c
-	sh mk/deps.sh src/unistd/chroot.c
-
-all: mk/execve.d
-mk/execve.d: src/unistd/execve.c
-	sh mk/deps.sh src/unistd/execve.c
-
-all: mk/execv.d
-mk/execv.d: src/unistd/execv.c
-	sh mk/deps.sh src/unistd/execv.c
-
-all: mk/chdir.d
-mk/chdir.d: src/unistd/chdir.c
-	sh mk/deps.sh src/unistd/chdir.c
-
-all: mk/usleep.d
-mk/usleep.d: src/unistd/usleep.c
-	sh mk/deps.sh src/unistd/usleep.c
-
-all: mk/getgid.d
-mk/getgid.d: src/unistd/getgid.c
-	sh mk/deps.sh src/unistd/getgid.c
-
-all: mk/gethostid.d
-mk/gethostid.d: src/unistd/gethostid.c
-	sh mk/deps.sh src/unistd/gethostid.c
-
-all: mk/cuserid.d
-mk/cuserid.d: src/unistd/cuserid.c
-	sh mk/deps.sh src/unistd/cuserid.c
-
-all: mk/optind.d
-mk/optind.d: src/unistd/optind.c
-	sh mk/deps.sh src/unistd/optind.c
-
-all: mk/tcgetpgrp.d
-mk/tcgetpgrp.d: src/unistd/tcgetpgrp.c
-	sh mk/deps.sh src/unistd/tcgetpgrp.c
-
-all: mk/symlink.d
-mk/symlink.d: src/unistd/symlink.c
-	sh mk/deps.sh src/unistd/symlink.c
-
-all: mk/getgroups.d
-mk/getgroups.d: src/unistd/getgroups.c
-	sh mk/deps.sh src/unistd/getgroups.c
-
-all: mk/setpgrp.d
-mk/setpgrp.d: src/unistd/setpgrp.c
-	sh mk/deps.sh src/unistd/setpgrp.c
-
-all: mk/tcsetpgrp.d
-mk/tcsetpgrp.d: src/unistd/tcsetpgrp.c
-	sh mk/deps.sh src/unistd/tcsetpgrp.c
-
-all: mk/setreuid.d
-mk/setreuid.d: src/unistd/setreuid.c
-	sh mk/deps.sh src/unistd/setreuid.c
-
-all: mk/getpagesize.d
-mk/getpagesize.d: src/unistd/getpagesize.c
-	sh mk/deps.sh src/unistd/getpagesize.c
-
-all: mk/ftruncate.d
-mk/ftruncate.d: src/unistd/ftruncate.c
-	sh mk/deps.sh src/unistd/ftruncate.c
-
-all: mk/fork.d
-mk/fork.d: src/unistd/fork.c
-	sh mk/deps.sh src/unistd/fork.c
-
-all: mk/sync.d
-mk/sync.d: src/unistd/sync.c
-	sh mk/deps.sh src/unistd/sync.c
-
-all: mk/lockf.d
-mk/lockf.d: src/unistd/lockf.c
-	sh mk/deps.sh src/unistd/lockf.c
-
-all: mk/execlp.d
-mk/execlp.d: src/unistd/execlp.c
-	sh mk/deps.sh src/unistd/execlp.c
-
-all: mk/_exit.d
-mk/_exit.d: src/unistd/_exit.c
-	sh mk/deps.sh src/unistd/_exit.c
-
-all: mk/setsid.d
-mk/setsid.d: src/unistd/setsid.c
-	sh mk/deps.sh src/unistd/setsid.c
-
-all: mk/isatty.d
-mk/isatty.d: src/unistd/isatty.c
-	sh mk/deps.sh src/unistd/isatty.c
-
-all: mk/setregid.d
-mk/setregid.d: src/unistd/setregid.c
-	sh mk/deps.sh src/unistd/setregid.c
-
-all: mk/crypt.d
-mk/crypt.d: src/unistd/crypt.c
-	sh mk/deps.sh src/unistd/crypt.c
-
-all: mk/getopt.d
-mk/getopt.d: src/unistd/getopt.c
-	sh mk/deps.sh src/unistd/getopt.c
-
-all: mk/dup.d
-mk/dup.d: src/unistd/dup.c
-	sh mk/deps.sh src/unistd/dup.c
-
-all: mk/truncate.d
-mk/truncate.d: src/unistd/truncate.c
-	sh mk/deps.sh src/unistd/truncate.c
-
-all: mk/dup2.d
-mk/dup2.d: src/unistd/dup2.c
-	sh mk/deps.sh src/unistd/dup2.c
-
-all: mk/close.d
-mk/close.d: src/unistd/close.c
-	sh mk/deps.sh src/unistd/close.c
-
-all: mk/getpass.d
-mk/getpass.d: src/unistd/getpass.c
-	sh mk/deps.sh src/unistd/getpass.c
-
-all: mk/link.d
-mk/link.d: src/unistd/link.c
-	sh mk/deps.sh src/unistd/link.c
-
-all: mk/clock_settime.d
-mk/clock_settime.d: src/time/clock_settime.c
-	sh mk/deps.sh src/time/clock_settime.c
-
-all: mk/tzname.d
-mk/tzname.d: src/time/tzname.c
-	sh mk/deps.sh src/time/tzname.c
-
-all: mk/timer_settime.d
-mk/timer_settime.d: src/time/timer_settime.c
-	sh mk/deps.sh src/time/timer_settime.c
-
 all: mk/strftime.d
 mk/strftime.d: src/time/strftime.c
 	sh mk/deps.sh src/time/strftime.c
@@ -1898,18 +1262,6 @@ all: mk/time.d
 mk/time.d: src/time/time.c
 	sh mk/deps.sh src/time/time.c
 
-all: mk/timezone.d
-mk/timezone.d: src/time/timezone.c
-	sh mk/deps.sh src/time/timezone.c
-
-all: mk/strptime.d
-mk/strptime.d: src/time/strptime.c
-	sh mk/deps.sh src/time/strptime.c
-
-all: mk/daylight.d
-mk/daylight.d: src/time/daylight.c
-	sh mk/deps.sh src/time/daylight.c
-
 all: mk/asctime.d
 mk/asctime.d: src/time/asctime.c
 	sh mk/deps.sh src/time/asctime.c
@@ -1918,18 +1270,10 @@ all: mk/ctime.d
 mk/ctime.d: src/time/ctime.c
 	sh mk/deps.sh src/time/ctime.c
 
-all: mk/timer_create.d
-mk/timer_create.d: src/time/timer_create.c
-	sh mk/deps.sh src/time/timer_create.c
-
 all: mk/clock.d
 mk/clock.d: src/time/clock.c
 	sh mk/deps.sh src/time/clock.c
 
-all: mk/getdate_err.d
-mk/getdate_err.d: src/time/getdate_err.c
-	sh mk/deps.sh src/time/getdate_err.c
-
 all: mk/ctime_s.d
 mk/ctime_s.d: src/time/ctime_s.c
 	sh mk/deps.sh src/time/ctime_s.c
@@ -1942,46 +1286,18 @@ all: mk/gmtime_s.d
 mk/gmtime_s.d: src/time/gmtime_s.c
 	sh mk/deps.sh src/time/gmtime_s.c
 
-all: mk/tzset.d
-mk/tzset.d: src/time/tzset.c
-	sh mk/deps.sh src/time/tzset.c
-
-all: mk/timer_delete.d
-mk/timer_delete.d: src/time/timer_delete.c
-	sh mk/deps.sh src/time/timer_delete.c
-
-all: mk/clock_getres.d
-mk/clock_getres.d: src/time/clock_getres.c
-	sh mk/deps.sh src/time/clock_getres.c
-
 all: mk/difftime.d
 mk/difftime.d: src/time/difftime.c
 	sh mk/deps.sh src/time/difftime.c
 
-all: mk/timer_getoverrun.d
-mk/timer_getoverrun.d: src/time/timer_getoverrun.c
-	sh mk/deps.sh src/time/timer_getoverrun.c
-
 all: mk/localtime.d
 mk/localtime.d: src/time/localtime.c
 	sh mk/deps.sh src/time/localtime.c
 
-all: mk/getdate.d
-mk/getdate.d: src/time/getdate.c
-	sh mk/deps.sh src/time/getdate.c
-
 all: mk/nanosleep.d
 mk/nanosleep.d: src/time/nanosleep.c
 	sh mk/deps.sh src/time/nanosleep.c
 
-all: mk/timer_gettime.d
-mk/timer_gettime.d: src/time/timer_gettime.c
-	sh mk/deps.sh src/time/timer_gettime.c
-
-all: mk/clock_gettime.d
-mk/clock_gettime.d: src/time/clock_gettime.c
-	sh mk/deps.sh src/time/clock_gettime.c
-
 all: mk/__time.d
 mk/__time.d: src/time/__time.c
 	sh mk/deps.sh src/time/__time.c
@@ -2010,34 +1326,14 @@ all: mk/environ.d
 mk/environ.d: src/environ.c
 	sh mk/deps.sh src/environ.c
 
-all: mk/_longjmp.d
-mk/_longjmp.d: src/setjmp/_longjmp.c
-	sh mk/deps.sh src/setjmp/_longjmp.c
-
-all: mk/sigjmp_buf.d
-mk/sigjmp_buf.d: src/setjmp/sigjmp_buf.c
-	sh mk/deps.sh src/setjmp/sigjmp_buf.c
-
-all: mk/_setjmp.d
-mk/_setjmp.d: src/setjmp/_setjmp.c
-	sh mk/deps.sh src/setjmp/_setjmp.c
-
 all: mk/setjmp.d
 mk/setjmp.d: src/setjmp/setjmp.c
 	sh mk/deps.sh src/setjmp/setjmp.c
 
-all: mk/siglongjmp.d
-mk/siglongjmp.d: src/setjmp/siglongjmp.c
-	sh mk/deps.sh src/setjmp/siglongjmp.c
-
 all: mk/longjmp.d
 mk/longjmp.d: src/setjmp/longjmp.c
 	sh mk/deps.sh src/setjmp/longjmp.c
 
-all: mk/sigsetjmp.d
-mk/sigsetjmp.d: src/setjmp/sigsetjmp.c
-	sh mk/deps.sh src/setjmp/sigsetjmp.c
-
 all: mk/fputs.d
 mk/fputs.d: src/stdio/fputs.c
 	sh mk/deps.sh src/stdio/fputs.c
@@ -2070,18 +1366,10 @@ all: mk/fgetc.d
 mk/fgetc.d: src/stdio/fgetc.c
 	sh mk/deps.sh src/stdio/fgetc.c
 
-all: mk/fileno.d
-mk/fileno.d: src/stdio/fileno.c
-	sh mk/deps.sh src/stdio/fileno.c
-
 all: mk/funlockfile.d
 mk/funlockfile.d: src/stdio/funlockfile.c
 	sh mk/deps.sh src/stdio/funlockfile.c
 
-all: mk/popen.d
-mk/popen.d: src/stdio/popen.c
-	sh mk/deps.sh src/stdio/popen.c
-
 all: mk/fprintf_s.d
 mk/fprintf_s.d: src/stdio/fprintf_s.c
 	sh mk/deps.sh src/stdio/fprintf_s.c
@@ -2094,10 +1382,6 @@ all: mk/scanf.d
 mk/scanf.d: src/stdio/scanf.c
 	sh mk/deps.sh src/stdio/scanf.c
 
-all: mk/getw.d
-mk/getw.d: src/stdio/getw.c
-	sh mk/deps.sh src/stdio/getw.c
-
 all: mk/sscanf_s.d
 mk/sscanf_s.d: src/stdio/sscanf_s.c
 	sh mk/deps.sh src/stdio/sscanf_s.c
@@ -2162,10 +1446,6 @@ all: mk/freopen_s.d
 mk/freopen_s.d: src/stdio/freopen_s.c
 	sh mk/deps.sh src/stdio/freopen_s.c
 
-all: mk/pclose.d
-mk/pclose.d: src/stdio/pclose.c
-	sh mk/deps.sh src/stdio/pclose.c
-
 all: mk/scanf_s.d
 mk/scanf_s.d: src/stdio/scanf_s.c
 	sh mk/deps.sh src/stdio/scanf_s.c
@@ -2310,10 +1590,6 @@ all: mk/getchar.d
 mk/getchar.d: src/stdio/getchar.c
 	sh mk/deps.sh src/stdio/getchar.c
 
-all: mk/tempnam.d
-mk/tempnam.d: src/stdio/tempnam.c
-	sh mk/deps.sh src/stdio/tempnam.c
-
 all: mk/fopen_s.d
 mk/fopen_s.d: src/stdio/fopen_s.c
 	sh mk/deps.sh src/stdio/fopen_s.c
@@ -2346,10 +1622,6 @@ all: mk/gets_s.d
 mk/gets_s.d: src/stdio/gets_s.c
 	sh mk/deps.sh src/stdio/gets_s.c
 
-all: mk/fdopen.d
-mk/fdopen.d: src/stdio/fdopen.c
-	sh mk/deps.sh src/stdio/fdopen.c
-
 all: mk/vsscanf.d
 mk/vsscanf.d: src/stdio/vsscanf.c
 	sh mk/deps.sh src/stdio/vsscanf.c
@@ -2366,10 +1638,6 @@ all: mk/setvbuf.d
 mk/setvbuf.d: src/stdio/setvbuf.c
 	sh mk/deps.sh src/stdio/setvbuf.c
 
-all: mk/putw.d
-mk/putw.d: src/stdio/putw.c
-	sh mk/deps.sh src/stdio/putw.c
-
 all: mk/fflush.d
 mk/fflush.d: src/stdio/fflush.c
 	sh mk/deps.sh src/stdio/fflush.c
diff --git a/mk/drand48.d b/mk/drand48.d
deleted file mode 100644
index 8d52b16d..00000000
--- a/mk/drand48.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.4: libc.a(drand48.o)
-libc.a(drand48.o): $(OBJDIR)/drand48.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/drand48.o: src/stdlib/drand48.c
-$(OBJDIR)/drand48.o: src/stdlib/_stdlib.h
-$(OBJDIR)/drand48.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/drand48.c
diff --git a/mk/dup.d b/mk/dup.d
deleted file mode 100644
index 8b8680c6..00000000
--- a/mk/dup.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.1: libc.a(dup.o)
-libc.a(dup.o): $(OBJDIR)/dup.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/dup.o: src/unistd/dup.c
-$(OBJDIR)/dup.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/dup.c
diff --git a/mk/dup2.d b/mk/dup2.d
deleted file mode 100644
index effb712a..00000000
--- a/mk/dup2.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(dup2.o)
-libc.a(dup2.o): $(OBJDIR)/dup2.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/dup2.o: src/unistd/dup2.c
-$(OBJDIR)/dup2.o: src/_syscall.h
-$(OBJDIR)/dup2.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/dup2.c
diff --git a/mk/ecvt.d b/mk/ecvt.d
deleted file mode 100644
index 5847aa2b..00000000
--- a/mk/ecvt.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.400: libc.a(ecvt.o)
-libc.a(ecvt.o): $(OBJDIR)/ecvt.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/ecvt.o: src/stdlib/ecvt.c
-$(OBJDIR)/ecvt.o: src/stdlib/_stdlib.h
-$(OBJDIR)/ecvt.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/ecvt.c
diff --git a/mk/encrypt.d b/mk/encrypt.d
deleted file mode 100644
index 662332f6..00000000
--- a/mk/encrypt.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_X.4: libc.a(encrypt.o)
-libc.a(encrypt.o): $(OBJDIR)/encrypt.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/encrypt.o: src/unistd/encrypt.c
-$(OBJDIR)/encrypt.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/encrypt.c
diff --git a/mk/erand48.d b/mk/erand48.d
deleted file mode 100644
index 19cbe065..00000000
--- a/mk/erand48.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.4: libc.a(erand48.o)
-libc.a(erand48.o): $(OBJDIR)/erand48.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/erand48.o: src/stdlib/erand48.c
-$(OBJDIR)/erand48.o: src/stdlib/_stdlib.h
-$(OBJDIR)/erand48.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/erand48.c
diff --git a/mk/execl.d b/mk/execl.d
deleted file mode 100644
index e6754476..00000000
--- a/mk/execl.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.1: libc.a(execl.o)
-libc.a(execl.o): $(OBJDIR)/execl.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/execl.o: src/unistd/execl.c
-$(OBJDIR)/execl.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/execl.c
diff --git a/mk/execle.d b/mk/execle.d
deleted file mode 100644
index 1881e768..00000000
--- a/mk/execle.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.1: libc.a(execle.o)
-libc.a(execle.o): $(OBJDIR)/execle.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/execle.o: src/unistd/execle.c
-$(OBJDIR)/execle.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/execle.c
diff --git a/mk/execlp.d b/mk/execlp.d
deleted file mode 100644
index e34f5e7e..00000000
--- a/mk/execlp.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.1: libc.a(execlp.o)
-libc.a(execlp.o): $(OBJDIR)/execlp.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/execlp.o: src/unistd/execlp.c
-$(OBJDIR)/execlp.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/execlp.c
diff --git a/mk/execv.d b/mk/execv.d
deleted file mode 100644
index f284e783..00000000
--- a/mk/execv.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.1: libc.a(execv.o)
-libc.a(execv.o): $(OBJDIR)/execv.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/execv.o: src/unistd/execv.c
-$(OBJDIR)/execv.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/execv.c
diff --git a/mk/execve.d b/mk/execve.d
deleted file mode 100644
index 38da602c..00000000
--- a/mk/execve.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(execve.o)
-libc.a(execve.o): $(OBJDIR)/execve.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/execve.o: src/unistd/execve.c
-$(OBJDIR)/execve.o: src/_syscall.h
-$(OBJDIR)/execve.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/execve.c
diff --git a/mk/execvp.d b/mk/execvp.d
deleted file mode 100644
index 525169dc..00000000
--- a/mk/execvp.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.1: libc.a(execvp.o)
-libc.a(execvp.o): $(OBJDIR)/execvp.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/execvp.o: src/unistd/execvp.c
-$(OBJDIR)/execvp.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/execvp.c
diff --git a/mk/fchdir.d b/mk/fchdir.d
deleted file mode 100644
index 8bf66e05..00000000
--- a/mk/fchdir.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.200809: libc.a(fchdir.o)
-libc_X.400: libc.a(fchdir.o)
-libc.a(fchdir.o): $(OBJDIR)/fchdir.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/fchdir.o: src/unistd/fchdir.c
-$(OBJDIR)/fchdir.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/fchdir.c
diff --git a/mk/fchmod.d b/mk/fchmod.d
deleted file mode 100644
index c9bb7eae..00000000
--- a/mk/fchmod.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.199309: libc.a(fchmod.o)
-libc_X.4: libc.a(fchmod.o)
-libc.a(fchmod.o): $(OBJDIR)/fchmod.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/fchmod.o: src/sys/stat/fchmod.c
-$(OBJDIR)/fchmod.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/sys/stat/fchmod.c
diff --git a/mk/fchown.d b/mk/fchown.d
deleted file mode 100644
index fea53911..00000000
--- a/mk/fchown.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.200112: libc.a(fchown.o)
-libc_X.400: libc.a(fchown.o)
-libc.a(fchown.o): $(OBJDIR)/fchown.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/fchown.o: src/unistd/fchown.c
-$(OBJDIR)/fchown.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/fchown.c
diff --git a/mk/fcntl.d b/mk/fcntl.d
deleted file mode 100644
index 48f243e1..00000000
--- a/mk/fcntl.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(fcntl.o)
-libc.a(fcntl.o): $(OBJDIR)/fcntl.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/fcntl.o: src/fcntl/fcntl.c
-$(OBJDIR)/fcntl.o: src/_syscall.h
-$(OBJDIR)/fcntl.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/fcntl/fcntl.c
diff --git a/mk/fcvt.d b/mk/fcvt.d
deleted file mode 100644
index 6e64316b..00000000
--- a/mk/fcvt.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.400: libc.a(fcvt.o)
-libc.a(fcvt.o): $(OBJDIR)/fcvt.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/fcvt.o: src/stdlib/fcvt.c
-$(OBJDIR)/fcvt.o: src/stdlib/_stdlib.h
-$(OBJDIR)/fcvt.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/fcvt.c
diff --git a/mk/fdatasync.d b/mk/fdatasync.d
deleted file mode 100644
index bcae5db0..00000000
--- a/mk/fdatasync.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.199309: libc.a(fdatasync.o)
-libc.a(fdatasync.o): $(OBJDIR)/fdatasync.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/fdatasync.o: src/unistd/fdatasync.c
-$(OBJDIR)/fdatasync.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/fdatasync.c
diff --git a/mk/fdopen.d b/mk/fdopen.d
deleted file mode 100644
index 5220ee08..00000000
--- a/mk/fdopen.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(fdopen.o)
-libc.a(fdopen.o): $(OBJDIR)/fdopen.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/fdopen.o: src/stdio/fdopen.c
-$(OBJDIR)/fdopen.o: src/stdio/_stdio.h
-$(OBJDIR)/fdopen.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdio/fdopen.c
diff --git a/mk/feclearexcept.d b/mk/feclearexcept.d
index 4d248813..b9ffafeb 100644
--- a/mk/feclearexcept.d
+++ b/mk/feclearexcept.d
@@ -3,7 +3,7 @@ libm.a(feclearexcept.o): $(OBJDIR)/feclearexcept.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/feclearexcept.o: src/fenv/feclearexcept.c
-$(OBJDIR)/feclearexcept.o: src/_safety.h
+$(OBJDIR)/feclearexcept.o: src/fenv/_fenv.h
 $(OBJDIR)/feclearexcept.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/fenv/feclearexcept.c
diff --git a/mk/fegetexceptflag.d b/mk/fegetexceptflag.d
index 908baa9c..03229470 100644
--- a/mk/fegetexceptflag.d
+++ b/mk/fegetexceptflag.d
@@ -3,7 +3,7 @@ libm.a(fegetexceptflag.o): $(OBJDIR)/fegetexceptflag.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/fegetexceptflag.o: src/fenv/fegetexceptflag.c
-$(OBJDIR)/fegetexceptflag.o: src/_safety.h
+$(OBJDIR)/fegetexceptflag.o: src/fenv/_fenv.h
 $(OBJDIR)/fegetexceptflag.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/fenv/fegetexceptflag.c
diff --git a/mk/feraiseexcept.d b/mk/feraiseexcept.d
index 08cf6cec..2b9681f3 100644
--- a/mk/feraiseexcept.d
+++ b/mk/feraiseexcept.d
@@ -3,7 +3,7 @@ libm.a(feraiseexcept.o): $(OBJDIR)/feraiseexcept.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/feraiseexcept.o: src/fenv/feraiseexcept.c
-$(OBJDIR)/feraiseexcept.o: src/_safety.h
+$(OBJDIR)/feraiseexcept.o: src/fenv/_fenv.h
 $(OBJDIR)/feraiseexcept.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/fenv/feraiseexcept.c
diff --git a/mk/fesetenv.d b/mk/fesetenv.d
index 9b3af5b4..c1e04577 100644
--- a/mk/fesetenv.d
+++ b/mk/fesetenv.d
@@ -3,7 +3,7 @@ libm.a(fesetenv.o): $(OBJDIR)/fesetenv.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/fesetenv.o: src/fenv/fesetenv.c
-$(OBJDIR)/fesetenv.o: src/_safety.h
+$(OBJDIR)/fesetenv.o: src/fenv/_fenv.h
 $(OBJDIR)/fesetenv.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/fenv/fesetenv.c
diff --git a/mk/fesetexceptflag.d b/mk/fesetexceptflag.d
index 33c9931e..6aedb0ab 100644
--- a/mk/fesetexceptflag.d
+++ b/mk/fesetexceptflag.d
@@ -3,7 +3,7 @@ libm.a(fesetexceptflag.o): $(OBJDIR)/fesetexceptflag.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/fesetexceptflag.o: src/fenv/fesetexceptflag.c
-$(OBJDIR)/fesetexceptflag.o: src/_safety.h
+$(OBJDIR)/fesetexceptflag.o: src/fenv/_fenv.h
 $(OBJDIR)/fesetexceptflag.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/fenv/fesetexceptflag.c
diff --git a/mk/fetestexcept.d b/mk/fetestexcept.d
index 87b892eb..978404c3 100644
--- a/mk/fetestexcept.d
+++ b/mk/fetestexcept.d
@@ -3,7 +3,7 @@ libm.a(fetestexcept.o): $(OBJDIR)/fetestexcept.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/fetestexcept.o: src/fenv/fetestexcept.c
-$(OBJDIR)/fetestexcept.o: src/_safety.h
+$(OBJDIR)/fetestexcept.o: src/fenv/_fenv.h
 $(OBJDIR)/fetestexcept.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/fenv/fetestexcept.c
diff --git a/mk/fileno.d b/mk/fileno.d
deleted file mode 100644
index 254c02d1..00000000
--- a/mk/fileno.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(fileno.o)
-libc.a(fileno.o): $(OBJDIR)/fileno.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/fileno.o: src/stdio/fileno.c
-$(OBJDIR)/fileno.o: src/stdio/_stdio.h
-$(OBJDIR)/fileno.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdio/fileno.c
diff --git a/mk/fork.d b/mk/fork.d
deleted file mode 100644
index c6a8f7d3..00000000
--- a/mk/fork.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(fork.o)
-libc.a(fork.o): $(OBJDIR)/fork.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/fork.o: src/unistd/fork.c
-$(OBJDIR)/fork.o: src/_syscall.h
-$(OBJDIR)/fork.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/fork.c
diff --git a/mk/fpathconf.d b/mk/fpathconf.d
deleted file mode 100644
index ec62520f..00000000
--- a/mk/fpathconf.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.1: libc.a(fpathconf.o)
-libc.a(fpathconf.o): $(OBJDIR)/fpathconf.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/fpathconf.o: src/unistd/fpathconf.c
-$(OBJDIR)/fpathconf.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/fpathconf.c
diff --git a/mk/fstat.d b/mk/fstat.d
deleted file mode 100644
index 825b48d6..00000000
--- a/mk/fstat.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(fstat.o)
-libc.a(fstat.o): $(OBJDIR)/fstat.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/fstat.o: src/sys/stat/fstat.c
-$(OBJDIR)/fstat.o: src/_syscall.h
-$(OBJDIR)/fstat.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/sys/stat/fstat.c
diff --git a/mk/fsync.d b/mk/fsync.d
deleted file mode 100644
index 13045c22..00000000
--- a/mk/fsync.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.199309: libc.a(fsync.o)
-libc_X.4: libc.a(fsync.o)
-libc.a(fsync.o): $(OBJDIR)/fsync.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/fsync.o: src/unistd/fsync.c
-$(OBJDIR)/fsync.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/fsync.c
diff --git a/mk/ftruncate.d b/mk/ftruncate.d
deleted file mode 100644
index cfb33e8d..00000000
--- a/mk/ftruncate.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.199309: libc.a(ftruncate.o)
-libc_X.400: libc.a(ftruncate.o)
-libc.a(ftruncate.o): $(OBJDIR)/ftruncate.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/ftruncate.o: src/unistd/ftruncate.c
-$(OBJDIR)/ftruncate.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/ftruncate.c
diff --git a/mk/gamma.d b/mk/gamma.d
deleted file mode 100644
index 80c15196..00000000
--- a/mk/gamma.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libm_X.4: libm.a(gamma.o)
-libm.a(gamma.o): $(OBJDIR)/gamma.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/gamma.o: src/math/gamma.c
-$(OBJDIR)/gamma.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/math/gamma.c
diff --git a/mk/gcvt.d b/mk/gcvt.d
deleted file mode 100644
index ff41a177..00000000
--- a/mk/gcvt.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.400: libc.a(gcvt.o)
-libc.a(gcvt.o): $(OBJDIR)/gcvt.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/gcvt.o: src/stdlib/gcvt.c
-$(OBJDIR)/gcvt.o: src/stdlib/_stdlib.h
-$(OBJDIR)/gcvt.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/gcvt.c
diff --git a/mk/getcwd.d b/mk/getcwd.d
deleted file mode 100644
index 78023dd6..00000000
--- a/mk/getcwd.d
+++ /dev/null
@@ -1,10 +0,0 @@
-libc_P.1: libc.a(getcwd.o)
-libc.a(getcwd.o): $(OBJDIR)/getcwd.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/getcwd.o: src/unistd/getcwd.c
-$(OBJDIR)/getcwd.o: src/_safety.h
-$(OBJDIR)/getcwd.o: src/_syscall.h
-$(OBJDIR)/getcwd.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/getcwd.c
diff --git a/mk/getdate.d b/mk/getdate.d
deleted file mode 100644
index 9ef0b11e..00000000
--- a/mk/getdate.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.400: libc.a(getdate.o)
-libc.a(getdate.o): $(OBJDIR)/getdate.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/getdate.o: src/time/getdate.c
-$(OBJDIR)/getdate.o: src/_safety.h
-$(OBJDIR)/getdate.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/time/getdate.c
diff --git a/mk/getdate_err.d b/mk/getdate_err.d
deleted file mode 100644
index 031224ba..00000000
--- a/mk/getdate_err.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_X.400: libc.a(getdate_err.o)
-libc.a(getdate_err.o): $(OBJDIR)/getdate_err.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/getdate_err.o: src/time/getdate_err.c
-$(OBJDIR)/getdate_err.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/time/getdate_err.c
diff --git a/mk/getdtablesize.d b/mk/getdtablesize.d
deleted file mode 100644
index 68660593..00000000
--- a/mk/getdtablesize.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_X.400: libc.a(getdtablesize.o)
-libc.a(getdtablesize.o): $(OBJDIR)/getdtablesize.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/getdtablesize.o: src/unistd/getdtablesize.c
-$(OBJDIR)/getdtablesize.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/getdtablesize.c
diff --git a/mk/getegid.d b/mk/getegid.d
deleted file mode 100644
index 6f1bd1b5..00000000
--- a/mk/getegid.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(getegid.o)
-libc.a(getegid.o): $(OBJDIR)/getegid.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/getegid.o: src/unistd/getegid.c
-$(OBJDIR)/getegid.o: src/_syscall.h
-$(OBJDIR)/getegid.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/getegid.c
diff --git a/mk/geteuid.d b/mk/geteuid.d
deleted file mode 100644
index 938406b8..00000000
--- a/mk/geteuid.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(geteuid.o)
-libc.a(geteuid.o): $(OBJDIR)/geteuid.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/geteuid.o: src/unistd/geteuid.c
-$(OBJDIR)/geteuid.o: src/_syscall.h
-$(OBJDIR)/geteuid.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/geteuid.c
diff --git a/mk/getgid.d b/mk/getgid.d
deleted file mode 100644
index cec45d4c..00000000
--- a/mk/getgid.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(getgid.o)
-libc.a(getgid.o): $(OBJDIR)/getgid.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/getgid.o: src/unistd/getgid.c
-$(OBJDIR)/getgid.o: src/_syscall.h
-$(OBJDIR)/getgid.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/getgid.c
diff --git a/mk/getgroups.d b/mk/getgroups.d
deleted file mode 100644
index 6e775037..00000000
--- a/mk/getgroups.d
+++ /dev/null
@@ -1,10 +0,0 @@
-libc_P.1: libc.a(getgroups.o)
-libc.a(getgroups.o): $(OBJDIR)/getgroups.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/getgroups.o: src/unistd/getgroups.c
-$(OBJDIR)/getgroups.o: src/_syscall.h
-$(OBJDIR)/getgroups.o: src/_safety.h
-$(OBJDIR)/getgroups.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/getgroups.c
diff --git a/mk/gethostid.d b/mk/gethostid.d
deleted file mode 100644
index ab023a29..00000000
--- a/mk/gethostid.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_X.400: libc.a(gethostid.o)
-libc.a(gethostid.o): $(OBJDIR)/gethostid.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/gethostid.o: src/unistd/gethostid.c
-$(OBJDIR)/gethostid.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/gethostid.c
diff --git a/mk/getlogin.d b/mk/getlogin.d
deleted file mode 100644
index be6e25e6..00000000
--- a/mk/getlogin.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.1: libc.a(getlogin.o)
-libc.a(getlogin.o): $(OBJDIR)/getlogin.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/getlogin.o: src/unistd/getlogin.c
-$(OBJDIR)/getlogin.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/getlogin.c
diff --git a/mk/getopt.d b/mk/getopt.d
deleted file mode 100644
index 49b46139..00000000
--- a/mk/getopt.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.2: libc.a(getopt.o)
-libc.a(getopt.o): $(OBJDIR)/getopt.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/getopt.o: src/unistd/getopt.c
-$(OBJDIR)/getopt.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/getopt.c
diff --git a/mk/getpagesize.d b/mk/getpagesize.d
deleted file mode 100644
index 8f1ae6ca..00000000
--- a/mk/getpagesize.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_X.400: libc.a(getpagesize.o)
-libc.a(getpagesize.o): $(OBJDIR)/getpagesize.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/getpagesize.o: src/unistd/getpagesize.c
-$(OBJDIR)/getpagesize.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/getpagesize.c
diff --git a/mk/getpass.d b/mk/getpass.d
deleted file mode 100644
index acc4b5ef..00000000
--- a/mk/getpass.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_X.4: libc.a(getpass.o)
-libc.a(getpass.o): $(OBJDIR)/getpass.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/getpass.o: src/unistd/getpass.c
-$(OBJDIR)/getpass.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/getpass.c
diff --git a/mk/getpgid.d b/mk/getpgid.d
deleted file mode 100644
index 7cb97a09..00000000
--- a/mk/getpgid.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.200809: libc.a(getpgid.o)
-libc_X.400: libc.a(getpgid.o)
-libc.a(getpgid.o): $(OBJDIR)/getpgid.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/getpgid.o: src/unistd/getpgid.c
-$(OBJDIR)/getpgid.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/getpgid.c
diff --git a/mk/getpgrp.d b/mk/getpgrp.d
deleted file mode 100644
index 45abbd5a..00000000
--- a/mk/getpgrp.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(getpgrp.o)
-libc.a(getpgrp.o): $(OBJDIR)/getpgrp.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/getpgrp.o: src/unistd/getpgrp.c
-$(OBJDIR)/getpgrp.o: src/_syscall.h
-$(OBJDIR)/getpgrp.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/getpgrp.c
diff --git a/mk/getpid.d b/mk/getpid.d
deleted file mode 100644
index 7433ef00..00000000
--- a/mk/getpid.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(getpid.o)
-libc.a(getpid.o): $(OBJDIR)/getpid.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/getpid.o: src/unistd/getpid.c
-$(OBJDIR)/getpid.o: src/_syscall.h
-$(OBJDIR)/getpid.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/getpid.c
diff --git a/mk/getppid.d b/mk/getppid.d
deleted file mode 100644
index 3c1fd34b..00000000
--- a/mk/getppid.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(getppid.o)
-libc.a(getppid.o): $(OBJDIR)/getppid.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/getppid.o: src/unistd/getppid.c
-$(OBJDIR)/getppid.o: src/_syscall.h
-$(OBJDIR)/getppid.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/getppid.c
diff --git a/mk/getsid.d b/mk/getsid.d
deleted file mode 100644
index 071e3088..00000000
--- a/mk/getsid.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.200809: libc.a(getsid.o)
-libc_X.400: libc.a(getsid.o)
-libc.a(getsid.o): $(OBJDIR)/getsid.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/getsid.o: src/unistd/getsid.c
-$(OBJDIR)/getsid.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/getsid.c
diff --git a/mk/getsubopt.d b/mk/getsubopt.d
deleted file mode 100644
index f5ef0a5a..00000000
--- a/mk/getsubopt.d
+++ /dev/null
@@ -1,10 +0,0 @@
-libc_P.200809: libc.a(getsubopt.o)
-libc_X.400: libc.a(getsubopt.o)
-libc.a(getsubopt.o): $(OBJDIR)/getsubopt.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/getsubopt.o: src/stdlib/getsubopt.c
-$(OBJDIR)/getsubopt.o: src/stdlib/_stdlib.h
-$(OBJDIR)/getsubopt.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/getsubopt.c
diff --git a/mk/getuid.d b/mk/getuid.d
deleted file mode 100644
index dca1b14a..00000000
--- a/mk/getuid.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(getuid.o)
-libc.a(getuid.o): $(OBJDIR)/getuid.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/getuid.o: src/unistd/getuid.c
-$(OBJDIR)/getuid.o: src/_syscall.h
-$(OBJDIR)/getuid.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/getuid.c
diff --git a/mk/getw.d b/mk/getw.d
deleted file mode 100644
index c70fa659..00000000
--- a/mk/getw.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.4: libc.a(getw.o)
-libc.a(getw.o): $(OBJDIR)/getw.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/getw.o: src/stdio/getw.c
-$(OBJDIR)/getw.o: src/stdio/_stdio.h
-$(OBJDIR)/getw.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdio/getw.c
diff --git a/mk/getwd.d b/mk/getwd.d
deleted file mode 100644
index 9a4f26f4..00000000
--- a/mk/getwd.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_X.400: libc.a(getwd.o)
-libc.a(getwd.o): $(OBJDIR)/getwd.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/getwd.o: src/unistd/getwd.c
-$(OBJDIR)/getwd.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/getwd.c
diff --git a/mk/grantpt.d b/mk/grantpt.d
deleted file mode 100644
index 401470ca..00000000
--- a/mk/grantpt.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.400: libc.a(grantpt.o)
-libc.a(grantpt.o): $(OBJDIR)/grantpt.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/grantpt.o: src/stdlib/grantpt.c
-$(OBJDIR)/grantpt.o: src/stdlib/_stdlib.h
-$(OBJDIR)/grantpt.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/grantpt.c
diff --git a/mk/initstate.d b/mk/initstate.d
deleted file mode 100644
index d40ed1a2..00000000
--- a/mk/initstate.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.400: libc.a(initstate.o)
-libc.a(initstate.o): $(OBJDIR)/initstate.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/initstate.o: src/stdlib/initstate.c
-$(OBJDIR)/initstate.o: src/stdlib/_stdlib.h
-$(OBJDIR)/initstate.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/initstate.c
diff --git a/mk/isalnum.d b/mk/isalnum.d
index 96baebd9..e2cb5dd7 100644
--- a/mk/isalnum.d
+++ b/mk/isalnum.d
@@ -3,7 +3,7 @@ libc.a(isalnum.o): $(OBJDIR)/isalnum.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/isalnum.o: src/ctype/isalnum.c
-$(OBJDIR)/isalnum.o: src/_safety.h
+$(OBJDIR)/isalnum.o: src/ctype/_ctype.h
 $(OBJDIR)/isalnum.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/ctype/isalnum.c
diff --git a/mk/isalpha.d b/mk/isalpha.d
index 828efe92..e64c952e 100644
--- a/mk/isalpha.d
+++ b/mk/isalpha.d
@@ -3,7 +3,7 @@ libc.a(isalpha.o): $(OBJDIR)/isalpha.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/isalpha.o: src/ctype/isalpha.c
-$(OBJDIR)/isalpha.o: src/_safety.h
+$(OBJDIR)/isalpha.o: src/ctype/_ctype.h
 $(OBJDIR)/isalpha.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/ctype/isalpha.c
diff --git a/mk/isascii.d b/mk/isascii.d
deleted file mode 100644
index 60bd3796..00000000
--- a/mk/isascii.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_X.4: libc.a(isascii.o)
-libc.a(isascii.o): $(OBJDIR)/isascii.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/isascii.o: src/ctype/isascii.c
-$(OBJDIR)/isascii.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/ctype/isascii.c
diff --git a/mk/isatty.d b/mk/isatty.d
deleted file mode 100644
index 9523a7ba..00000000
--- a/mk/isatty.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.1: libc.a(isatty.o)
-libc.a(isatty.o): $(OBJDIR)/isatty.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/isatty.o: src/unistd/isatty.c
-$(OBJDIR)/isatty.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/isatty.c
diff --git a/mk/isdigit.d b/mk/isdigit.d
index 19bb55c6..6efb085f 100644
--- a/mk/isdigit.d
+++ b/mk/isdigit.d
@@ -3,7 +3,7 @@ libc.a(isdigit.o): $(OBJDIR)/isdigit.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/isdigit.o: src/ctype/isdigit.c
-$(OBJDIR)/isdigit.o: src/_safety.h
+$(OBJDIR)/isdigit.o: src/ctype/_ctype.h
 $(OBJDIR)/isdigit.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/ctype/isdigit.c
diff --git a/mk/iswalnum.d b/mk/iswalnum.d
index 12da6f85..16c73b70 100644
--- a/mk/iswalnum.d
+++ b/mk/iswalnum.d
@@ -3,7 +3,7 @@ libc.a(iswalnum.o): $(OBJDIR)/iswalnum.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/iswalnum.o: src/wctype/iswalnum.c
-$(OBJDIR)/iswalnum.o: src/_safety.h
+$(OBJDIR)/iswalnum.o: src/wctype/_wctype.h
 $(OBJDIR)/iswalnum.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/wctype/iswalnum.c
diff --git a/mk/iswalpha.d b/mk/iswalpha.d
index 2476059b..0141209c 100644
--- a/mk/iswalpha.d
+++ b/mk/iswalpha.d
@@ -3,7 +3,7 @@ libc.a(iswalpha.o): $(OBJDIR)/iswalpha.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/iswalpha.o: src/wctype/iswalpha.c
-$(OBJDIR)/iswalpha.o: src/_safety.h
+$(OBJDIR)/iswalpha.o: src/wctype/_wctype.h
 $(OBJDIR)/iswalpha.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/wctype/iswalpha.c
diff --git a/mk/iswblank.d b/mk/iswblank.d
index 3044be25..eca5b9dc 100644
--- a/mk/iswblank.d
+++ b/mk/iswblank.d
@@ -3,7 +3,7 @@ libc.a(iswblank.o): $(OBJDIR)/iswblank.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/iswblank.o: src/wctype/iswblank.c
-$(OBJDIR)/iswblank.o: src/_safety.h
+$(OBJDIR)/iswblank.o: src/wctype/_wctype.h
 $(OBJDIR)/iswblank.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/wctype/iswblank.c
diff --git a/mk/iswcntrl.d b/mk/iswcntrl.d
index fdb451f2..6010adbd 100644
--- a/mk/iswcntrl.d
+++ b/mk/iswcntrl.d
@@ -3,7 +3,7 @@ libc.a(iswcntrl.o): $(OBJDIR)/iswcntrl.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/iswcntrl.o: src/wctype/iswcntrl.c
-$(OBJDIR)/iswcntrl.o: src/_safety.h
+$(OBJDIR)/iswcntrl.o: src/wctype/_wctype.h
 $(OBJDIR)/iswcntrl.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/wctype/iswcntrl.c
diff --git a/mk/iswctype.d b/mk/iswctype.d
index 1323a42b..e893b24d 100644
--- a/mk/iswctype.d
+++ b/mk/iswctype.d
@@ -3,7 +3,7 @@ libc.a(iswctype.o): $(OBJDIR)/iswctype.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/iswctype.o: src/wctype/iswctype.c
-$(OBJDIR)/iswctype.o: src/_safety.h
+$(OBJDIR)/iswctype.o: src/wctype/_wctype.h
 $(OBJDIR)/iswctype.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/wctype/iswctype.c
diff --git a/mk/iswdigit.d b/mk/iswdigit.d
index 2b7cb863..e285eb03 100644
--- a/mk/iswdigit.d
+++ b/mk/iswdigit.d
@@ -3,7 +3,7 @@ libc.a(iswdigit.o): $(OBJDIR)/iswdigit.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/iswdigit.o: src/wctype/iswdigit.c
-$(OBJDIR)/iswdigit.o: src/_safety.h
+$(OBJDIR)/iswdigit.o: src/wctype/_wctype.h
 $(OBJDIR)/iswdigit.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/wctype/iswdigit.c
diff --git a/mk/iswgraph.d b/mk/iswgraph.d
index 81cd4a9f..35a231a1 100644
--- a/mk/iswgraph.d
+++ b/mk/iswgraph.d
@@ -3,7 +3,7 @@ libc.a(iswgraph.o): $(OBJDIR)/iswgraph.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/iswgraph.o: src/wctype/iswgraph.c
-$(OBJDIR)/iswgraph.o: src/_safety.h
+$(OBJDIR)/iswgraph.o: src/wctype/_wctype.h
 $(OBJDIR)/iswgraph.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/wctype/iswgraph.c
diff --git a/mk/iswlower.d b/mk/iswlower.d
index d8f3504e..f3e7b058 100644
--- a/mk/iswlower.d
+++ b/mk/iswlower.d
@@ -3,7 +3,7 @@ libc.a(iswlower.o): $(OBJDIR)/iswlower.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/iswlower.o: src/wctype/iswlower.c
-$(OBJDIR)/iswlower.o: src/_safety.h
+$(OBJDIR)/iswlower.o: src/wctype/_wctype.h
 $(OBJDIR)/iswlower.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/wctype/iswlower.c
diff --git a/mk/iswprint.d b/mk/iswprint.d
index 54b5e8d8..c8e36718 100644
--- a/mk/iswprint.d
+++ b/mk/iswprint.d
@@ -3,7 +3,7 @@ libc.a(iswprint.o): $(OBJDIR)/iswprint.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/iswprint.o: src/wctype/iswprint.c
-$(OBJDIR)/iswprint.o: src/_safety.h
+$(OBJDIR)/iswprint.o: src/wctype/_wctype.h
 $(OBJDIR)/iswprint.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/wctype/iswprint.c
diff --git a/mk/iswpunct.d b/mk/iswpunct.d
index 9b7143cd..80713024 100644
--- a/mk/iswpunct.d
+++ b/mk/iswpunct.d
@@ -3,7 +3,7 @@ libc.a(iswpunct.o): $(OBJDIR)/iswpunct.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/iswpunct.o: src/wctype/iswpunct.c
-$(OBJDIR)/iswpunct.o: src/_safety.h
+$(OBJDIR)/iswpunct.o: src/wctype/_wctype.h
 $(OBJDIR)/iswpunct.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/wctype/iswpunct.c
diff --git a/mk/iswspace.d b/mk/iswspace.d
index 309f70f8..0e880ca4 100644
--- a/mk/iswspace.d
+++ b/mk/iswspace.d
@@ -3,7 +3,7 @@ libc.a(iswspace.o): $(OBJDIR)/iswspace.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/iswspace.o: src/wctype/iswspace.c
-$(OBJDIR)/iswspace.o: src/_safety.h
+$(OBJDIR)/iswspace.o: src/wctype/_wctype.h
 $(OBJDIR)/iswspace.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/wctype/iswspace.c
diff --git a/mk/iswupper.d b/mk/iswupper.d
index c825bf0e..8ac4ac8e 100644
--- a/mk/iswupper.d
+++ b/mk/iswupper.d
@@ -3,7 +3,7 @@ libc.a(iswupper.o): $(OBJDIR)/iswupper.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/iswupper.o: src/wctype/iswupper.c
-$(OBJDIR)/iswupper.o: src/_safety.h
+$(OBJDIR)/iswupper.o: src/wctype/_wctype.h
 $(OBJDIR)/iswupper.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/wctype/iswupper.c
diff --git a/mk/iswxdigit.d b/mk/iswxdigit.d
index b51ad2ea..45e20cb8 100644
--- a/mk/iswxdigit.d
+++ b/mk/iswxdigit.d
@@ -3,7 +3,7 @@ libc.a(iswxdigit.o): $(OBJDIR)/iswxdigit.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/iswxdigit.o: src/wctype/iswxdigit.c
-$(OBJDIR)/iswxdigit.o: src/_safety.h
+$(OBJDIR)/iswxdigit.o: src/wctype/_wctype.h
 $(OBJDIR)/iswxdigit.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/wctype/iswxdigit.c
diff --git a/mk/j0.d b/mk/j0.d
deleted file mode 100644
index bb3ef903..00000000
--- a/mk/j0.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libm_X.4: libm.a(j0.o)
-libm.a(j0.o): $(OBJDIR)/j0.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/j0.o: src/math/j0.c
-$(OBJDIR)/j0.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/math/j0.c
diff --git a/mk/j1.d b/mk/j1.d
deleted file mode 100644
index 7bece8de..00000000
--- a/mk/j1.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libm_X.4: libm.a(j1.o)
-libm.a(j1.o): $(OBJDIR)/j1.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/j1.o: src/math/j1.c
-$(OBJDIR)/j1.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/math/j1.c
diff --git a/mk/jn.d b/mk/jn.d
deleted file mode 100644
index a11465c6..00000000
--- a/mk/jn.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libm_X.4: libm.a(jn.o)
-libm.a(jn.o): $(OBJDIR)/jn.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/jn.o: src/math/jn.c
-$(OBJDIR)/jn.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/math/jn.c
diff --git a/mk/jrand48.d b/mk/jrand48.d
deleted file mode 100644
index ca22fbdc..00000000
--- a/mk/jrand48.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.4: libc.a(jrand48.o)
-libc.a(jrand48.o): $(OBJDIR)/jrand48.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/jrand48.o: src/stdlib/jrand48.c
-$(OBJDIR)/jrand48.o: src/stdlib/_stdlib.h
-$(OBJDIR)/jrand48.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/jrand48.c
diff --git a/mk/l64a.d b/mk/l64a.d
deleted file mode 100644
index de2c5fda..00000000
--- a/mk/l64a.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.400: libc.a(l64a.o)
-libc.a(l64a.o): $(OBJDIR)/l64a.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/l64a.o: src/stdlib/l64a.c
-$(OBJDIR)/l64a.o: src/stdlib/_stdlib.h
-$(OBJDIR)/l64a.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/l64a.c
diff --git a/mk/lchown.d b/mk/lchown.d
deleted file mode 100644
index dc4f62a5..00000000
--- a/mk/lchown.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.200809: libc.a(lchown.o)
-libc_X.400: libc.a(lchown.o)
-libc.a(lchown.o): $(OBJDIR)/lchown.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/lchown.o: src/unistd/lchown.c
-$(OBJDIR)/lchown.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/lchown.c
diff --git a/mk/lcong48.d b/mk/lcong48.d
deleted file mode 100644
index 6ce49cc7..00000000
--- a/mk/lcong48.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.4: libc.a(lcong48.o)
-libc.a(lcong48.o): $(OBJDIR)/lcong48.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/lcong48.o: src/stdlib/lcong48.c
-$(OBJDIR)/lcong48.o: src/stdlib/_stdlib.h
-$(OBJDIR)/lcong48.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/lcong48.c
diff --git a/mk/link.d b/mk/link.d
deleted file mode 100644
index b5e5cd67..00000000
--- a/mk/link.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(link.o)
-libc.a(link.o): $(OBJDIR)/link.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/link.o: src/unistd/link.c
-$(OBJDIR)/link.o: src/_syscall.h
-$(OBJDIR)/link.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/link.c
diff --git a/mk/lockf.d b/mk/lockf.d
deleted file mode 100644
index 96654ece..00000000
--- a/mk/lockf.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_X.400: libc.a(lockf.o)
-libc.a(lockf.o): $(OBJDIR)/lockf.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/lockf.o: src/unistd/lockf.c
-$(OBJDIR)/lockf.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/lockf.c
diff --git a/mk/lrand48.d b/mk/lrand48.d
deleted file mode 100644
index cc886571..00000000
--- a/mk/lrand48.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.4: libc.a(lrand48.o)
-libc.a(lrand48.o): $(OBJDIR)/lrand48.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/lrand48.o: src/stdlib/lrand48.c
-$(OBJDIR)/lrand48.o: src/stdlib/_stdlib.h
-$(OBJDIR)/lrand48.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/lrand48.c
diff --git a/mk/lseek.d b/mk/lseek.d
deleted file mode 100644
index 46926e4f..00000000
--- a/mk/lseek.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(lseek.o)
-libc.a(lseek.o): $(OBJDIR)/lseek.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/lseek.o: src/unistd/lseek.c
-$(OBJDIR)/lseek.o: src/_syscall.h
-$(OBJDIR)/lseek.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/lseek.c
diff --git a/mk/lstat.d b/mk/lstat.d
deleted file mode 100644
index 18db56a7..00000000
--- a/mk/lstat.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.200112: libc.a(lstat.o)
-libc_X.400: libc.a(lstat.o)
-libc.a(lstat.o): $(OBJDIR)/lstat.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/lstat.o: src/sys/stat/lstat.c
-$(OBJDIR)/lstat.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/sys/stat/lstat.c
diff --git a/mk/memccpy.d b/mk/memccpy.d
deleted file mode 100644
index 75729c2e..00000000
--- a/mk/memccpy.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.4: libc.a(memccpy.o)
-libc.a(memccpy.o): $(OBJDIR)/memccpy.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/memccpy.o: src/string/memccpy.c
-$(OBJDIR)/memccpy.o: src/_safety.h
-$(OBJDIR)/memccpy.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/string/memccpy.c
diff --git a/mk/mkdir.d b/mk/mkdir.d
deleted file mode 100644
index 429e4c6a..00000000
--- a/mk/mkdir.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(mkdir.o)
-libc.a(mkdir.o): $(OBJDIR)/mkdir.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/mkdir.o: src/sys/stat/mkdir.c
-$(OBJDIR)/mkdir.o: src/_syscall.h
-$(OBJDIR)/mkdir.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/sys/stat/mkdir.c
diff --git a/mk/mkfifo.d b/mk/mkfifo.d
deleted file mode 100644
index 3c815306..00000000
--- a/mk/mkfifo.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(mkfifo.o)
-libc.a(mkfifo.o): $(OBJDIR)/mkfifo.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/mkfifo.o: src/sys/stat/mkfifo.c
-$(OBJDIR)/mkfifo.o: src/_syscall.h
-$(OBJDIR)/mkfifo.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/sys/stat/mkfifo.c
diff --git a/mk/mknod.d b/mk/mknod.d
deleted file mode 100644
index 7a3b32d8..00000000
--- a/mk/mknod.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_X.400: libc.a(mknod.o)
-libc.a(mknod.o): $(OBJDIR)/mknod.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/mknod.o: src/sys/stat/mknod.c
-$(OBJDIR)/mknod.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/sys/stat/mknod.c
diff --git a/mk/mkstemp.d b/mk/mkstemp.d
deleted file mode 100644
index 3a90af6f..00000000
--- a/mk/mkstemp.d
+++ /dev/null
@@ -1,10 +0,0 @@
-libc_P.200809: libc.a(mkstemp.o)
-libc_X.400: libc.a(mkstemp.o)
-libc.a(mkstemp.o): $(OBJDIR)/mkstemp.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/mkstemp.o: src/stdlib/mkstemp.c
-$(OBJDIR)/mkstemp.o: src/stdlib/_stdlib.h
-$(OBJDIR)/mkstemp.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/mkstemp.c
diff --git a/mk/mktemp.d b/mk/mktemp.d
deleted file mode 100644
index 0108680d..00000000
--- a/mk/mktemp.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.400: libc.a(mktemp.o)
-libc.a(mktemp.o): $(OBJDIR)/mktemp.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/mktemp.o: src/stdlib/mktemp.c
-$(OBJDIR)/mktemp.o: src/stdlib/_stdlib.h
-$(OBJDIR)/mktemp.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/mktemp.c
diff --git a/mk/mlock.d b/mk/mlock.d
deleted file mode 100644
index 8bee124c..00000000
--- a/mk/mlock.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.199309: libc.a(mlock.o)
-libc.a(mlock.o): $(OBJDIR)/mlock.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/mlock.o: src/sys/mman/mlock.c
-$(OBJDIR)/mlock.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/sys/mman/mlock.c
diff --git a/mk/mlockall.d b/mk/mlockall.d
deleted file mode 100644
index fc8dc499..00000000
--- a/mk/mlockall.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.199309: libc.a(mlockall.o)
-libc.a(mlockall.o): $(OBJDIR)/mlockall.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/mlockall.o: src/sys/mman/mlockall.c
-$(OBJDIR)/mlockall.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/sys/mman/mlockall.c
diff --git a/mk/mmap.d b/mk/mmap.d
deleted file mode 100644
index 07af1a15..00000000
--- a/mk/mmap.d
+++ /dev/null
@@ -1,10 +0,0 @@
-libc_P.199309: libc.a(mmap.o)
-libc_X.400: libc.a(mmap.o)
-libc.a(mmap.o): $(OBJDIR)/mmap.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/mmap.o: src/sys/mman/mmap.c
-$(OBJDIR)/mmap.o: src/_syscall.h
-$(OBJDIR)/mmap.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/sys/mman/mmap.c
diff --git a/mk/mprotect.d b/mk/mprotect.d
deleted file mode 100644
index c2e3a914..00000000
--- a/mk/mprotect.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.199309: libc.a(mprotect.o)
-libc_X.400: libc.a(mprotect.o)
-libc.a(mprotect.o): $(OBJDIR)/mprotect.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/mprotect.o: src/sys/mman/mprotect.c
-$(OBJDIR)/mprotect.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/sys/mman/mprotect.c
diff --git a/mk/mrand48.d b/mk/mrand48.d
deleted file mode 100644
index 79042355..00000000
--- a/mk/mrand48.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.4: libc.a(mrand48.o)
-libc.a(mrand48.o): $(OBJDIR)/mrand48.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/mrand48.o: src/stdlib/mrand48.c
-$(OBJDIR)/mrand48.o: src/stdlib/_stdlib.h
-$(OBJDIR)/mrand48.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/mrand48.c
diff --git a/mk/msync.d b/mk/msync.d
deleted file mode 100644
index 89dd068b..00000000
--- a/mk/msync.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.199309: libc.a(msync.o)
-libc_X.400: libc.a(msync.o)
-libc.a(msync.o): $(OBJDIR)/msync.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/msync.o: src/sys/mman/msync.c
-$(OBJDIR)/msync.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/sys/mman/msync.c
diff --git a/mk/munlock.d b/mk/munlock.d
deleted file mode 100644
index b38dcb36..00000000
--- a/mk/munlock.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.199309: libc.a(munlock.o)
-libc.a(munlock.o): $(OBJDIR)/munlock.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/munlock.o: src/sys/mman/munlock.c
-$(OBJDIR)/munlock.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/sys/mman/munlock.c
diff --git a/mk/munlockall.d b/mk/munlockall.d
deleted file mode 100644
index 99ea4179..00000000
--- a/mk/munlockall.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.199309: libc.a(munlockall.o)
-libc.a(munlockall.o): $(OBJDIR)/munlockall.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/munlockall.o: src/sys/mman/munlockall.c
-$(OBJDIR)/munlockall.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/sys/mman/munlockall.c
diff --git a/mk/munmap.d b/mk/munmap.d
deleted file mode 100644
index 5e779c9a..00000000
--- a/mk/munmap.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.199309: libc.a(munmap.o)
-libc_X.400: libc.a(munmap.o)
-libc.a(munmap.o): $(OBJDIR)/munmap.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/munmap.o: src/sys/mman/munmap.c
-$(OBJDIR)/munmap.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/sys/mman/munmap.c
diff --git a/mk/nice.d b/mk/nice.d
deleted file mode 100644
index 48e81644..00000000
--- a/mk/nice.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_X.4: libc.a(nice.o)
-libc.a(nice.o): $(OBJDIR)/nice.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/nice.o: src/unistd/nice.c
-$(OBJDIR)/nice.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/nice.c
diff --git a/mk/nrand48.d b/mk/nrand48.d
deleted file mode 100644
index 6daed8d1..00000000
--- a/mk/nrand48.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.4: libc.a(nrand48.o)
-libc.a(nrand48.o): $(OBJDIR)/nrand48.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/nrand48.o: src/stdlib/nrand48.c
-$(OBJDIR)/nrand48.o: src/stdlib/_stdlib.h
-$(OBJDIR)/nrand48.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/nrand48.c
diff --git a/mk/open.d b/mk/open.d
deleted file mode 100644
index 263644d5..00000000
--- a/mk/open.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(open.o)
-libc.a(open.o): $(OBJDIR)/open.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/open.o: src/fcntl/open.c
-$(OBJDIR)/open.o: src/_syscall.h
-$(OBJDIR)/open.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/fcntl/open.c
diff --git a/mk/optarg.d b/mk/optarg.d
deleted file mode 100644
index 8b8a213c..00000000
--- a/mk/optarg.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.2: libc.a(optarg.o)
-libc.a(optarg.o): $(OBJDIR)/optarg.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/optarg.o: src/unistd/optarg.c
-$(OBJDIR)/optarg.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/optarg.c
diff --git a/mk/opterr.d b/mk/opterr.d
deleted file mode 100644
index 484b253a..00000000
--- a/mk/opterr.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.2: libc.a(opterr.o)
-libc.a(opterr.o): $(OBJDIR)/opterr.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/opterr.o: src/unistd/opterr.c
-$(OBJDIR)/opterr.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/opterr.c
diff --git a/mk/optind.d b/mk/optind.d
deleted file mode 100644
index 1a6706b9..00000000
--- a/mk/optind.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.2: libc.a(optind.o)
-libc.a(optind.o): $(OBJDIR)/optind.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/optind.o: src/unistd/optind.c
-$(OBJDIR)/optind.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/optind.c
diff --git a/mk/optopt.d b/mk/optopt.d
deleted file mode 100644
index 81d2d354..00000000
--- a/mk/optopt.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.2: libc.a(optopt.o)
-libc.a(optopt.o): $(OBJDIR)/optopt.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/optopt.o: src/unistd/optopt.c
-$(OBJDIR)/optopt.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/optopt.c
diff --git a/mk/pathconf.d b/mk/pathconf.d
deleted file mode 100644
index 425cb692..00000000
--- a/mk/pathconf.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.1: libc.a(pathconf.o)
-libc.a(pathconf.o): $(OBJDIR)/pathconf.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/pathconf.o: src/unistd/pathconf.c
-$(OBJDIR)/pathconf.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/pathconf.c
diff --git a/mk/pause.d b/mk/pause.d
deleted file mode 100644
index 441262a1..00000000
--- a/mk/pause.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(pause.o)
-libc.a(pause.o): $(OBJDIR)/pause.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/pause.o: src/unistd/pause.c
-$(OBJDIR)/pause.o: src/_syscall.h
-$(OBJDIR)/pause.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/pause.c
diff --git a/mk/pclose.d b/mk/pclose.d
deleted file mode 100644
index fa721dec..00000000
--- a/mk/pclose.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.2: libc.a(pclose.o)
-libc.a(pclose.o): $(OBJDIR)/pclose.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/pclose.o: src/stdio/pclose.c
-$(OBJDIR)/pclose.o: src/stdio/_stdio.h
-$(OBJDIR)/pclose.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdio/pclose.c
diff --git a/mk/pipe.d b/mk/pipe.d
deleted file mode 100644
index 90d75ace..00000000
--- a/mk/pipe.d
+++ /dev/null
@@ -1,10 +0,0 @@
-libc_P.1: libc.a(pipe.o)
-libc.a(pipe.o): $(OBJDIR)/pipe.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/pipe.o: src/unistd/pipe.c
-$(OBJDIR)/pipe.o: src/_safety.h
-$(OBJDIR)/pipe.o: src/_syscall.h
-$(OBJDIR)/pipe.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/pipe.c
diff --git a/mk/popen.d b/mk/popen.d
deleted file mode 100644
index 3bf0a4ac..00000000
--- a/mk/popen.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.2: libc.a(popen.o)
-libc.a(popen.o): $(OBJDIR)/popen.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/popen.o: src/stdio/popen.c
-$(OBJDIR)/popen.o: src/stdio/_stdio.h
-$(OBJDIR)/popen.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdio/popen.c
diff --git a/mk/ptsname.d b/mk/ptsname.d
deleted file mode 100644
index d5924db0..00000000
--- a/mk/ptsname.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.400: libc.a(ptsname.o)
-libc.a(ptsname.o): $(OBJDIR)/ptsname.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/ptsname.o: src/stdlib/ptsname.c
-$(OBJDIR)/ptsname.o: src/stdlib/_stdlib.h
-$(OBJDIR)/ptsname.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/ptsname.c
diff --git a/mk/putenv.d b/mk/putenv.d
deleted file mode 100644
index 089c03ad..00000000
--- a/mk/putenv.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.4: libc.a(putenv.o)
-libc.a(putenv.o): $(OBJDIR)/putenv.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/putenv.o: src/stdlib/putenv.c
-$(OBJDIR)/putenv.o: src/stdlib/_stdlib.h
-$(OBJDIR)/putenv.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/putenv.c
diff --git a/mk/putw.d b/mk/putw.d
deleted file mode 100644
index 55787213..00000000
--- a/mk/putw.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.4: libc.a(putw.o)
-libc.a(putw.o): $(OBJDIR)/putw.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/putw.o: src/stdio/putw.c
-$(OBJDIR)/putw.o: src/stdio/_stdio.h
-$(OBJDIR)/putw.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdio/putw.c
diff --git a/mk/raise.d b/mk/raise.d
index ecc39e34..3c7cf38b 100644
--- a/mk/raise.d
+++ b/mk/raise.d
@@ -3,6 +3,7 @@ libc.a(raise.o): $(OBJDIR)/raise.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/raise.o: src/signal/raise.c
+$(OBJDIR)/raise.o: src/stdlib/_stdlib.h
 $(OBJDIR)/raise.o: src/_syscall.h
 $(OBJDIR)/raise.o: src/_safety.h
 $(OBJDIR)/raise.o:
diff --git a/mk/random.d b/mk/random.d
deleted file mode 100644
index 45ea2bb3..00000000
--- a/mk/random.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.400: libc.a(random.o)
-libc.a(random.o): $(OBJDIR)/random.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/random.o: src/stdlib/random.c
-$(OBJDIR)/random.o: src/stdlib/_stdlib.h
-$(OBJDIR)/random.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/random.c
diff --git a/mk/read.d b/mk/read.d
deleted file mode 100644
index bdac8137..00000000
--- a/mk/read.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(read.o)
-libc.a(read.o): $(OBJDIR)/read.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/read.o: src/unistd/read.c
-$(OBJDIR)/read.o: src/_syscall.h
-$(OBJDIR)/read.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/read.c
diff --git a/mk/readlink.d b/mk/readlink.d
deleted file mode 100644
index 04f2a28f..00000000
--- a/mk/readlink.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.200112: libc.a(readlink.o)
-libc_X.400: libc.a(readlink.o)
-libc.a(readlink.o): $(OBJDIR)/readlink.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/readlink.o: src/unistd/readlink.c
-$(OBJDIR)/readlink.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/readlink.c
diff --git a/mk/realpath.d b/mk/realpath.d
deleted file mode 100644
index b2c5ca09..00000000
--- a/mk/realpath.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.400: libc.a(realpath.o)
-libc.a(realpath.o): $(OBJDIR)/realpath.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/realpath.o: src/stdlib/realpath.c
-$(OBJDIR)/realpath.o: src/stdlib/_stdlib.h
-$(OBJDIR)/realpath.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/realpath.c
diff --git a/mk/remainder.d b/mk/remainder.d
deleted file mode 100644
index 2b44e11e..00000000
--- a/mk/remainder.d
+++ /dev/null
@@ -1,11 +0,0 @@
-libm_P.200112: libm.a(remainder.o)
-libm_X.400: libm.a(remainder.o)
-libm.a(remainder.o): $(OBJDIR)/remainder.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/remainder.o: src/math/remainder.c
-$(OBJDIR)/remainder.o: src/complex/_tgmath.h
-$(OBJDIR)/src/math/_tgmath.h.o: 
-$(OBJDIR)/remainder.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/math/remainder.c
diff --git a/mk/rmdir.d b/mk/rmdir.d
deleted file mode 100644
index 8d6e259e..00000000
--- a/mk/rmdir.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(rmdir.o)
-libc.a(rmdir.o): $(OBJDIR)/rmdir.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/rmdir.o: src/unistd/rmdir.c
-$(OBJDIR)/rmdir.o: src/_syscall.h
-$(OBJDIR)/rmdir.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/rmdir.c
diff --git a/mk/sbrk.d b/mk/sbrk.d
deleted file mode 100644
index f75396cf..00000000
--- a/mk/sbrk.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_X.400: libc.a(sbrk.o)
-libc.a(sbrk.o): $(OBJDIR)/sbrk.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/sbrk.o: src/unistd/sbrk.c
-$(OBJDIR)/sbrk.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/sbrk.c
diff --git a/mk/scalb.d b/mk/scalb.d
deleted file mode 100644
index 86870692..00000000
--- a/mk/scalb.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libm_X.400: libm.a(scalb.o)
-libm.a(scalb.o): $(OBJDIR)/scalb.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/scalb.o: src/math/scalb.c
-$(OBJDIR)/scalb.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/math/scalb.c
diff --git a/mk/seed48.d b/mk/seed48.d
deleted file mode 100644
index 2403cd8e..00000000
--- a/mk/seed48.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.4: libc.a(seed48.o)
-libc.a(seed48.o): $(OBJDIR)/seed48.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/seed48.o: src/stdlib/seed48.c
-$(OBJDIR)/seed48.o: src/stdlib/_stdlib.h
-$(OBJDIR)/seed48.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/seed48.c
diff --git a/mk/setgid.d b/mk/setgid.d
deleted file mode 100644
index 819bab36..00000000
--- a/mk/setgid.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(setgid.o)
-libc.a(setgid.o): $(OBJDIR)/setgid.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/setgid.o: src/unistd/setgid.c
-$(OBJDIR)/setgid.o: src/_syscall.h
-$(OBJDIR)/setgid.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/setgid.c
diff --git a/mk/setkey.d b/mk/setkey.d
deleted file mode 100644
index ebabb43b..00000000
--- a/mk/setkey.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.4: libc.a(setkey.o)
-libc.a(setkey.o): $(OBJDIR)/setkey.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/setkey.o: src/stdlib/setkey.c
-$(OBJDIR)/setkey.o: src/stdlib/_stdlib.h
-$(OBJDIR)/setkey.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/setkey.c
diff --git a/mk/setpgid.d b/mk/setpgid.d
deleted file mode 100644
index 11edac71..00000000
--- a/mk/setpgid.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(setpgid.o)
-libc.a(setpgid.o): $(OBJDIR)/setpgid.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/setpgid.o: src/unistd/setpgid.c
-$(OBJDIR)/setpgid.o: src/_syscall.h
-$(OBJDIR)/setpgid.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/setpgid.c
diff --git a/mk/setpgrp.d b/mk/setpgrp.d
deleted file mode 100644
index a3d9c60d..00000000
--- a/mk/setpgrp.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_X.400: libc.a(setpgrp.o)
-libc.a(setpgrp.o): $(OBJDIR)/setpgrp.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/setpgrp.o: src/unistd/setpgrp.c
-$(OBJDIR)/setpgrp.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/setpgrp.c
diff --git a/mk/setregid.d b/mk/setregid.d
deleted file mode 100644
index 5be2f50e..00000000
--- a/mk/setregid.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_X.400: libc.a(setregid.o)
-libc.a(setregid.o): $(OBJDIR)/setregid.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/setregid.o: src/unistd/setregid.c
-$(OBJDIR)/setregid.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/setregid.c
diff --git a/mk/setreuid.d b/mk/setreuid.d
deleted file mode 100644
index 55e398ff..00000000
--- a/mk/setreuid.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_X.400: libc.a(setreuid.o)
-libc.a(setreuid.o): $(OBJDIR)/setreuid.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/setreuid.o: src/unistd/setreuid.c
-$(OBJDIR)/setreuid.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/setreuid.c
diff --git a/mk/setsid.d b/mk/setsid.d
deleted file mode 100644
index 217014db..00000000
--- a/mk/setsid.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(setsid.o)
-libc.a(setsid.o): $(OBJDIR)/setsid.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/setsid.o: src/unistd/setsid.c
-$(OBJDIR)/setsid.o: src/_syscall.h
-$(OBJDIR)/setsid.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/setsid.c
diff --git a/mk/setstate.d b/mk/setstate.d
deleted file mode 100644
index 0f0335a5..00000000
--- a/mk/setstate.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.400: libc.a(setstate.o)
-libc.a(setstate.o): $(OBJDIR)/setstate.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/setstate.o: src/stdlib/setstate.c
-$(OBJDIR)/setstate.o: src/stdlib/_stdlib.h
-$(OBJDIR)/setstate.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/setstate.c
diff --git a/mk/setuid.d b/mk/setuid.d
deleted file mode 100644
index e3d81b81..00000000
--- a/mk/setuid.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(setuid.o)
-libc.a(setuid.o): $(OBJDIR)/setuid.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/setuid.o: src/unistd/setuid.c
-$(OBJDIR)/setuid.o: src/_syscall.h
-$(OBJDIR)/setuid.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/setuid.c
diff --git a/mk/shm_open.d b/mk/shm_open.d
deleted file mode 100644
index e50b2039..00000000
--- a/mk/shm_open.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.199309: libc.a(shm_open.o)
-libc.a(shm_open.o): $(OBJDIR)/shm_open.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/shm_open.o: src/sys/mman/shm_open.c
-$(OBJDIR)/shm_open.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/sys/mman/shm_open.c
diff --git a/mk/shm_unlink.d b/mk/shm_unlink.d
deleted file mode 100644
index ddeefbbe..00000000
--- a/mk/shm_unlink.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.199309: libc.a(shm_unlink.o)
-libc.a(shm_unlink.o): $(OBJDIR)/shm_unlink.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/shm_unlink.o: src/sys/mman/shm_unlink.c
-$(OBJDIR)/shm_unlink.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/sys/mman/shm_unlink.c
diff --git a/mk/sigjmp_buf.d b/mk/sigjmp_buf.d
deleted file mode 100644
index 9ae255b1..00000000
--- a/mk/sigjmp_buf.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.1: libc.a(sigjmp_buf.o)
-libc.a(sigjmp_buf.o): $(OBJDIR)/sigjmp_buf.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/sigjmp_buf.o: src/setjmp/sigjmp_buf.c
-$(OBJDIR)/sigjmp_buf.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/setjmp/sigjmp_buf.c
diff --git a/mk/siglongjmp.d b/mk/siglongjmp.d
deleted file mode 100644
index 71823321..00000000
--- a/mk/siglongjmp.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(siglongjmp.o)
-libc.a(siglongjmp.o): $(OBJDIR)/siglongjmp.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/siglongjmp.o: src/setjmp/siglongjmp.c
-$(OBJDIR)/siglongjmp.o: src/_safety.h
-$(OBJDIR)/siglongjmp.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/setjmp/siglongjmp.c
diff --git a/mk/signgam.d b/mk/signgam.d
deleted file mode 100644
index b3288354..00000000
--- a/mk/signgam.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libm_X.4: libm.a(signgam.o)
-libm.a(signgam.o): $(OBJDIR)/signgam.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/signgam.o: src/math/signgam.c
-$(OBJDIR)/signgam.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/math/signgam.c
diff --git a/mk/sigsetjmp.d b/mk/sigsetjmp.d
deleted file mode 100644
index c7c3f21b..00000000
--- a/mk/sigsetjmp.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.1: libc.a(sigsetjmp.o)
-libc.a(sigsetjmp.o): $(OBJDIR)/sigsetjmp.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/sigsetjmp.o: src/setjmp/sigsetjmp.c
-$(OBJDIR)/sigsetjmp.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/setjmp/sigsetjmp.c
diff --git a/mk/sleep.d b/mk/sleep.d
deleted file mode 100644
index a3ac610c..00000000
--- a/mk/sleep.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(sleep.o)
-libc.a(sleep.o): $(OBJDIR)/sleep.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/sleep.o: src/unistd/sleep.c
-$(OBJDIR)/sleep.o: src/_syscall.h
-$(OBJDIR)/sleep.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/sleep.c
diff --git a/mk/srand48.d b/mk/srand48.d
deleted file mode 100644
index 4fa9b784..00000000
--- a/mk/srand48.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.4: libc.a(srand48.o)
-libc.a(srand48.o): $(OBJDIR)/srand48.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/srand48.o: src/stdlib/srand48.c
-$(OBJDIR)/srand48.o: src/stdlib/_stdlib.h
-$(OBJDIR)/srand48.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/srand48.c
diff --git a/mk/srandom.d b/mk/srandom.d
deleted file mode 100644
index 8a49b508..00000000
--- a/mk/srandom.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.400: libc.a(srandom.o)
-libc.a(srandom.o): $(OBJDIR)/srandom.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/srandom.o: src/stdlib/srandom.c
-$(OBJDIR)/srandom.o: src/stdlib/_stdlib.h
-$(OBJDIR)/srandom.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/srandom.c
diff --git a/mk/stat.d b/mk/stat.d
deleted file mode 100644
index 828b7fd1..00000000
--- a/mk/stat.d
+++ /dev/null
@@ -1,10 +0,0 @@
-libc_P.1: libc.a(stat.o)
-libc.a(stat.o): $(OBJDIR)/stat.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/stat.o: src/sys/stat/stat.c
-$(OBJDIR)/stat.o: src/_safety.h
-$(OBJDIR)/stat.o: src/_syscall.h
-$(OBJDIR)/stat.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/sys/stat/stat.c
diff --git a/mk/strdup.d b/mk/strdup.d
deleted file mode 100644
index 995f7a9a..00000000
--- a/mk/strdup.d
+++ /dev/null
@@ -1,10 +0,0 @@
-libc_P.200809: libc.a(strdup.o)
-libc_X.400: libc.a(strdup.o)
-libc.a(strdup.o): $(OBJDIR)/strdup.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/strdup.o: src/string/strdup.c
-$(OBJDIR)/strdup.o: src/_safety.h
-$(OBJDIR)/strdup.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/string/strdup.c
diff --git a/mk/strptime.d b/mk/strptime.d
deleted file mode 100644
index 0ee31fd1..00000000
--- a/mk/strptime.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.4: libc.a(strptime.o)
-libc.a(strptime.o): $(OBJDIR)/strptime.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/strptime.o: src/time/strptime.c
-$(OBJDIR)/strptime.o: src/_safety.h
-$(OBJDIR)/strptime.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/time/strptime.c
diff --git a/mk/swab.d b/mk/swab.d
deleted file mode 100644
index cff5981b..00000000
--- a/mk/swab.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_X.4: libc.a(swab.o)
-libc.a(swab.o): $(OBJDIR)/swab.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/swab.o: src/unistd/swab.c
-$(OBJDIR)/swab.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/swab.c
diff --git a/mk/symlink.d b/mk/symlink.d
deleted file mode 100644
index f0290be1..00000000
--- a/mk/symlink.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.200112: libc.a(symlink.o)
-libc_X.400: libc.a(symlink.o)
-libc.a(symlink.o): $(OBJDIR)/symlink.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/symlink.o: src/unistd/symlink.c
-$(OBJDIR)/symlink.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/symlink.c
diff --git a/mk/sync.d b/mk/sync.d
deleted file mode 100644
index c63efa2c..00000000
--- a/mk/sync.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_X.400: libc.a(sync.o)
-libc.a(sync.o): $(OBJDIR)/sync.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/sync.o: src/unistd/sync.c
-$(OBJDIR)/sync.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/sync.c
diff --git a/mk/sysconf.d b/mk/sysconf.d
deleted file mode 100644
index 6f938231..00000000
--- a/mk/sysconf.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.1: libc.a(sysconf.o)
-libc.a(sysconf.o): $(OBJDIR)/sysconf.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/sysconf.o: src/unistd/sysconf.c
-$(OBJDIR)/sysconf.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/sysconf.c
diff --git a/mk/tcgetpgrp.d b/mk/tcgetpgrp.d
deleted file mode 100644
index 3eb1d900..00000000
--- a/mk/tcgetpgrp.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(tcgetpgrp.o)
-libc.a(tcgetpgrp.o): $(OBJDIR)/tcgetpgrp.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/tcgetpgrp.o: src/unistd/tcgetpgrp.c
-$(OBJDIR)/tcgetpgrp.o: 
-$(OBJDIR)/tcgetpgrp.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/tcgetpgrp.c
diff --git a/mk/tcsetpgrp.d b/mk/tcsetpgrp.d
deleted file mode 100644
index 88786a26..00000000
--- a/mk/tcsetpgrp.d
+++ /dev/null
@@ -1,10 +0,0 @@
-libc_P.1: libc.a(tcsetpgrp.o)
-libc.a(tcsetpgrp.o): $(OBJDIR)/tcsetpgrp.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/tcsetpgrp.o: src/unistd/tcsetpgrp.c
-$(OBJDIR)/tcsetpgrp.o: 
-$(OBJDIR)/tcsetpgrp.o: 
-$(OBJDIR)/tcsetpgrp.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/tcsetpgrp.c
diff --git a/mk/tempnam.d b/mk/tempnam.d
deleted file mode 100644
index 20443011..00000000
--- a/mk/tempnam.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_X.4: libc.a(tempnam.o)
-libc.a(tempnam.o): $(OBJDIR)/tempnam.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/tempnam.o: src/stdio/tempnam.c
-$(OBJDIR)/tempnam.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdio/tempnam.c
diff --git a/mk/timer_create.d b/mk/timer_create.d
deleted file mode 100644
index ea59d4b7..00000000
--- a/mk/timer_create.d
+++ /dev/null
@@ -1,9 +0,0 @@
-librt_P.199309: librt.a(timer_create.o)
-librt.a(timer_create.o): $(OBJDIR)/timer_create.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/timer_create.o: src/time/timer_create.c
-$(OBJDIR)/timer_create.o: src/_safety.h
-$(OBJDIR)/timer_create.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/time/timer_create.c
diff --git a/mk/timer_delete.d b/mk/timer_delete.d
deleted file mode 100644
index 531d840b..00000000
--- a/mk/timer_delete.d
+++ /dev/null
@@ -1,9 +0,0 @@
-librt_P.199309: librt.a(timer_delete.o)
-librt.a(timer_delete.o): $(OBJDIR)/timer_delete.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/timer_delete.o: src/time/timer_delete.c
-$(OBJDIR)/timer_delete.o: src/_safety.h
-$(OBJDIR)/timer_delete.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/time/timer_delete.c
diff --git a/mk/timer_getoverrun.d b/mk/timer_getoverrun.d
deleted file mode 100644
index 4d1d4c51..00000000
--- a/mk/timer_getoverrun.d
+++ /dev/null
@@ -1,9 +0,0 @@
-librt_P.199309: librt.a(timer_getoverrun.o)
-librt.a(timer_getoverrun.o): $(OBJDIR)/timer_getoverrun.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/timer_getoverrun.o: src/time/timer_getoverrun.c
-$(OBJDIR)/timer_getoverrun.o: src/_safety.h
-$(OBJDIR)/timer_getoverrun.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/time/timer_getoverrun.c
diff --git a/mk/timer_gettime.d b/mk/timer_gettime.d
deleted file mode 100644
index 867d500a..00000000
--- a/mk/timer_gettime.d
+++ /dev/null
@@ -1,9 +0,0 @@
-librt_P.199309: librt.a(timer_gettime.o)
-librt.a(timer_gettime.o): $(OBJDIR)/timer_gettime.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/timer_gettime.o: src/time/timer_gettime.c
-$(OBJDIR)/timer_gettime.o: src/_safety.h
-$(OBJDIR)/timer_gettime.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/time/timer_gettime.c
diff --git a/mk/timer_settime.d b/mk/timer_settime.d
deleted file mode 100644
index 178e103b..00000000
--- a/mk/timer_settime.d
+++ /dev/null
@@ -1,9 +0,0 @@
-librt_P.199309: librt.a(timer_settime.o)
-librt.a(timer_settime.o): $(OBJDIR)/timer_settime.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/timer_settime.o: src/time/timer_settime.c
-$(OBJDIR)/timer_settime.o: src/_safety.h
-$(OBJDIR)/timer_settime.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/time/timer_settime.c
diff --git a/mk/timezone.d b/mk/timezone.d
deleted file mode 100644
index bbe3c28f..00000000
--- a/mk/timezone.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_X.4: libc.a(timezone.o)
-libc.a(timezone.o): $(OBJDIR)/timezone.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/timezone.o: src/time/timezone.c
-$(OBJDIR)/timezone.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/time/timezone.c
diff --git a/mk/toascii.d b/mk/toascii.d
deleted file mode 100644
index bb6c8f08..00000000
--- a/mk/toascii.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_X.4: libc.a(toascii.o)
-libc.a(toascii.o): $(OBJDIR)/toascii.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/toascii.o: src/ctype/toascii.c
-$(OBJDIR)/toascii.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/ctype/toascii.c
diff --git a/mk/towctrans.d b/mk/towctrans.d
index 3b14c770..9226fd9c 100644
--- a/mk/towctrans.d
+++ b/mk/towctrans.d
@@ -3,7 +3,7 @@ libc.a(towctrans.o): $(OBJDIR)/towctrans.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/towctrans.o: src/wctype/towctrans.c
-$(OBJDIR)/towctrans.o: src/_safety.h
+$(OBJDIR)/towctrans.o: src/wctype/_wctype.h
 $(OBJDIR)/towctrans.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/wctype/towctrans.c
diff --git a/mk/towlower.d b/mk/towlower.d
index d6ba8e3c..7e98e299 100644
--- a/mk/towlower.d
+++ b/mk/towlower.d
@@ -3,7 +3,7 @@ libc.a(towlower.o): $(OBJDIR)/towlower.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/towlower.o: src/wctype/towlower.c
-$(OBJDIR)/towlower.o: src/_safety.h
+$(OBJDIR)/towlower.o: src/wctype/_wctype.h
 $(OBJDIR)/towlower.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/wctype/towlower.c
diff --git a/mk/towupper.d b/mk/towupper.d
index 5533cf24..f41e00c6 100644
--- a/mk/towupper.d
+++ b/mk/towupper.d
@@ -3,7 +3,7 @@ libc.a(towupper.o): $(OBJDIR)/towupper.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/towupper.o: src/wctype/towupper.c
-$(OBJDIR)/towupper.o: src/_safety.h
+$(OBJDIR)/towupper.o: src/wctype/_wctype.h
 $(OBJDIR)/towupper.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/wctype/towupper.c
diff --git a/mk/truncate.d b/mk/truncate.d
deleted file mode 100644
index f454ab2f..00000000
--- a/mk/truncate.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.200809: libc.a(truncate.o)
-libc_X.400: libc.a(truncate.o)
-libc.a(truncate.o): $(OBJDIR)/truncate.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/truncate.o: src/unistd/truncate.c
-$(OBJDIR)/truncate.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/truncate.c
diff --git a/mk/ttyname.d b/mk/ttyname.d
deleted file mode 100644
index 65693c7d..00000000
--- a/mk/ttyname.d
+++ /dev/null
@@ -1,10 +0,0 @@
-libc_P.1: libc.a(ttyname.o)
-libc.a(ttyname.o): $(OBJDIR)/ttyname.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/ttyname.o: src/unistd/ttyname.c
-$(OBJDIR)/ttyname.o: src/unistd/_unistd.h
-$(OBJDIR)/ttyname.o: src/_syscall.h
-$(OBJDIR)/ttyname.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/ttyname.c
diff --git a/mk/ttyslot.d b/mk/ttyslot.d
deleted file mode 100644
index 04d48daf..00000000
--- a/mk/ttyslot.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.400: libc.a(ttyslot.o)
-libc.a(ttyslot.o): $(OBJDIR)/ttyslot.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/ttyslot.o: src/stdlib/ttyslot.c
-$(OBJDIR)/ttyslot.o: src/stdlib/_stdlib.h
-$(OBJDIR)/ttyslot.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/ttyslot.c
diff --git a/mk/tzname.d b/mk/tzname.d
deleted file mode 100644
index ef7d5a1e..00000000
--- a/mk/tzname.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.1: libc.a(tzname.o)
-libc.a(tzname.o): $(OBJDIR)/tzname.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/tzname.o: src/time/tzname.c
-$(OBJDIR)/tzname.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/time/tzname.c
diff --git a/mk/tzset.d b/mk/tzset.d
deleted file mode 100644
index d5648959..00000000
--- a/mk/tzset.d
+++ /dev/null
@@ -1,10 +0,0 @@
-libc_P.1: libc.a(tzset.o)
-libc.a(tzset.o): $(OBJDIR)/tzset.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/tzset.o: src/time/tzset.c
-$(OBJDIR)/tzset.o: src/time/_time.h
-$(OBJDIR)/tzset.o: src/_safety.h
-$(OBJDIR)/tzset.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/time/tzset.c
diff --git a/mk/ualarm.d b/mk/ualarm.d
deleted file mode 100644
index aa076dcb..00000000
--- a/mk/ualarm.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_X.400: libc.a(ualarm.o)
-libc.a(ualarm.o): $(OBJDIR)/ualarm.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/ualarm.o: src/unistd/ualarm.c
-$(OBJDIR)/ualarm.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/ualarm.c
diff --git a/mk/umask.d b/mk/umask.d
deleted file mode 100644
index 9dc88fd0..00000000
--- a/mk/umask.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_P.1: libc.a(umask.o)
-libc.a(umask.o): $(OBJDIR)/umask.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/umask.o: src/sys/stat/umask.c
-$(OBJDIR)/umask.o: src/_syscall.h
-$(OBJDIR)/umask.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/sys/stat/umask.c
diff --git a/mk/unlink.d b/mk/unlink.d
deleted file mode 100644
index 0086f4a2..00000000
--- a/mk/unlink.d
+++ /dev/null
@@ -1,10 +0,0 @@
-libc_P.1: libc.a(unlink.o)
-libc.a(unlink.o): $(OBJDIR)/unlink.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/unlink.o: src/unistd/unlink.c
-$(OBJDIR)/unlink.o: src/_safety.h
-$(OBJDIR)/unlink.o: src/_syscall.h
-$(OBJDIR)/unlink.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/unlink.c
diff --git a/mk/unlockpt.d b/mk/unlockpt.d
deleted file mode 100644
index a9216aa5..00000000
--- a/mk/unlockpt.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_X.400: libc.a(unlockpt.o)
-libc.a(unlockpt.o): $(OBJDIR)/unlockpt.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/unlockpt.o: src/stdlib/unlockpt.c
-$(OBJDIR)/unlockpt.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/unlockpt.c
diff --git a/mk/usleep.d b/mk/usleep.d
deleted file mode 100644
index cfa227f8..00000000
--- a/mk/usleep.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_X.400: libc.a(usleep.o)
-libc.a(usleep.o): $(OBJDIR)/usleep.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/usleep.o: src/unistd/usleep.c
-$(OBJDIR)/usleep.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/usleep.c
diff --git a/mk/valloc.d b/mk/valloc.d
deleted file mode 100644
index 35e74c7b..00000000
--- a/mk/valloc.d
+++ /dev/null
@@ -1,9 +0,0 @@
-libc_X.400: libc.a(valloc.o)
-libc.a(valloc.o): $(OBJDIR)/valloc.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/valloc.o: src/stdlib/valloc.c
-$(OBJDIR)/valloc.o: src/stdlib/_stdlib.h
-$(OBJDIR)/valloc.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/stdlib/valloc.c
diff --git a/mk/vfork.d b/mk/vfork.d
deleted file mode 100644
index c124e9a5..00000000
--- a/mk/vfork.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_X.400: libc.a(vfork.o)
-libc.a(vfork.o): $(OBJDIR)/vfork.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/vfork.o: src/unistd/vfork.c
-$(OBJDIR)/vfork.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/vfork.c
diff --git a/mk/wait.d b/mk/wait.d
deleted file mode 100644
index 41cc989a..00000000
--- a/mk/wait.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_P.1: libc.a(wait.o)
-libc.a(wait.o): $(OBJDIR)/wait.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/wait.o: src/sys/wait/wait.c
-$(OBJDIR)/wait.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/sys/wait/wait.c
diff --git a/mk/wait3.d b/mk/wait3.d
deleted file mode 100644
index 8787a4de..00000000
--- a/mk/wait3.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libc_X.400: libc.a(wait3.o)
-libc.a(wait3.o): $(OBJDIR)/wait3.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/wait3.o: src/sys/wait/wait3.c
-$(OBJDIR)/wait3.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/sys/wait/wait3.c
diff --git a/mk/waitid.d b/mk/waitid.d
deleted file mode 100644
index fd698c0e..00000000
--- a/mk/waitid.d
+++ /dev/null
@@ -1,10 +0,0 @@
-libc_P.200809: libc.a(waitid.o)
-libc_X.400: libc.a(waitid.o)
-libc.a(waitid.o): $(OBJDIR)/waitid.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/waitid.o: src/sys/wait/waitid.c
-$(OBJDIR)/waitid.o: src/_syscall.h
-$(OBJDIR)/waitid.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/sys/wait/waitid.c
diff --git a/mk/waitpid.d b/mk/waitpid.d
deleted file mode 100644
index 3083b7af..00000000
--- a/mk/waitpid.d
+++ /dev/null
@@ -1,15 +0,0 @@
-libc_P.1: libc.a(waitpid.o)
-libc.a(waitpid.o): $(OBJDIR)/waitpid.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/waitpid.o: src/sys/wait/waitpid.c
-$(OBJDIR)/waitpid.o: src/_syscall.h
-$(OBJDIR)/waitpid.o: src/signal/union_sigval.h
-$(OBJDIR)/waitpid.o: src/signal/siginfo_t.h
-$(OBJDIR)/waitpid.o: src/sys/wait/idtype_t.h
-$(OBJDIR)/waitpid.o: src/sys/wait/P_PID.h
-$(OBJDIR)/waitpid.o: src/sys/wait/P_PGID.h
-$(OBJDIR)/waitpid.o: src/sys/wait/P_ALL.h
-$(OBJDIR)/waitpid.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/sys/wait/waitpid.c
diff --git a/mk/wcswcs.d b/mk/wcswcs.d
deleted file mode 100644
index e177442c..00000000
--- a/mk/wcswcs.d
+++ /dev/null
@@ -1,10 +0,0 @@
-libc_X.4: libc.a(wcswcs.o)
-libc.a(wcswcs.o): $(OBJDIR)/wcswcs.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/wcswcs.o: src/wchar/wcswcs.c
-$(OBJDIR)/wcswcs.o: 
-$(OBJDIR)/wcswcs.o: 
-$(OBJDIR)/wcswcs.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/wchar/wcswcs.c
diff --git a/mk/wcswidth.d b/mk/wcswidth.d
deleted file mode 100644
index 8512aa50..00000000
--- a/mk/wcswidth.d
+++ /dev/null
@@ -1,10 +0,0 @@
-libc_X.4: libc.a(wcswidth.o)
-libc.a(wcswidth.o): $(OBJDIR)/wcswidth.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/wcswidth.o: src/wchar/wcswidth.c
-$(OBJDIR)/wcswidth.o: 
-$(OBJDIR)/wcswidth.o: 
-$(OBJDIR)/wcswidth.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/wchar/wcswidth.c
diff --git a/mk/wctrans.d b/mk/wctrans.d
index cad03a9d..a303666f 100644
--- a/mk/wctrans.d
+++ b/mk/wctrans.d
@@ -3,7 +3,6 @@ libc.a(wctrans.o): $(OBJDIR)/wctrans.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/wctrans.o: src/wctype/wctrans.c
-$(OBJDIR)/wctrans.o: src/_safety.h
 $(OBJDIR)/wctrans.o: src/wctype/_wctype.h
 $(OBJDIR)/wctrans.o:
 	@mkdir -p $(@D)
diff --git a/mk/wctype.d b/mk/wctype.d
index 144cc2fa..3c300acd 100644
--- a/mk/wctype.d
+++ b/mk/wctype.d
@@ -3,7 +3,6 @@ libc.a(wctype.o): $(OBJDIR)/wctype.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/wctype.o: src/wctype/wctype.c
-$(OBJDIR)/wctype.o: src/_safety.h
 $(OBJDIR)/wctype.o: src/wctype/_wctype.h
 $(OBJDIR)/wctype.o:
 	@mkdir -p $(@D)
diff --git a/mk/wcwidth.d b/mk/wcwidth.d
deleted file mode 100644
index 7794789b..00000000
--- a/mk/wcwidth.d
+++ /dev/null
@@ -1,10 +0,0 @@
-libc_X.4: libc.a(wcwidth.o)
-libc.a(wcwidth.o): $(OBJDIR)/wcwidth.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/wcwidth.o: src/wchar/wcwidth.c
-$(OBJDIR)/wcwidth.o: 
-$(OBJDIR)/wcwidth.o: 
-$(OBJDIR)/wcwidth.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/wchar/wcwidth.c
diff --git a/mk/write.d b/mk/write.d
deleted file mode 100644
index 6f75d6b8..00000000
--- a/mk/write.d
+++ /dev/null
@@ -1,10 +0,0 @@
-libc_P.1: libc.a(write.o)
-libc.a(write.o): $(OBJDIR)/write.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/write.o: src/unistd/write.c
-$(OBJDIR)/write.o: src/_safety.h
-$(OBJDIR)/write.o: src/_syscall.h
-$(OBJDIR)/write.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/unistd/write.c
diff --git a/mk/y0.d b/mk/y0.d
deleted file mode 100644
index 709eb443..00000000
--- a/mk/y0.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libm_X.4: libm.a(y0.o)
-libm.a(y0.o): $(OBJDIR)/y0.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/y0.o: src/math/y0.c
-$(OBJDIR)/y0.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/math/y0.c
diff --git a/mk/y1.d b/mk/y1.d
deleted file mode 100644
index 48b19abc..00000000
--- a/mk/y1.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libm_X.4: libm.a(y1.o)
-libm.a(y1.o): $(OBJDIR)/y1.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/y1.o: src/math/y1.c
-$(OBJDIR)/y1.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/math/y1.c
diff --git a/mk/yn.d b/mk/yn.d
deleted file mode 100644
index 78906489..00000000
--- a/mk/yn.d
+++ /dev/null
@@ -1,8 +0,0 @@
-libm_X.4: libm.a(yn.o)
-libm.a(yn.o): $(OBJDIR)/yn.o
-	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
-
-$(OBJDIR)/yn.o: src/math/yn.c
-$(OBJDIR)/yn.o:
-	@mkdir -p $(@D)
-	$(CC) -c -o $@ $(CFLAGS) src/math/yn.c