8 files changed, 20 insertions, 6 deletions
diff --git a/.deps/all.c b/.deps/all.c
index 942eaba7..55b6cf90 100644
--- a/.deps/all.c
+++ b/.deps/all.c
@@ -19,6 +19,7 @@
 ./src/nonstd/_FTM/_POSIX_C_SOURCE.c
 ./src/nonstd/_FTM/_POSIX_SOURCE.c
 ./src/nonstd/_FTM/_XOPEN_SOURCE_EXTENDED.c
+./src/nonstd/__load_locale.c
 ./src/nonstd/struct_FILE.c
 ./src/nonstd/SYSCALL_NUMBER.c
 ./src/nonstd/__syscall.c
diff --git a/.deps/all.h b/.deps/all.h
index a25b589c..5ffc5c5c 100644
--- a/.deps/all.h
+++ b/.deps/all.h
@@ -30,6 +30,7 @@ nonstd/assert.h
 nonstd/ctype.h
 nonstd/internal.h
 nonstd/io.h
+nonstd/lib.h
 nonstd/locale.h
 nonstd/syscall.h
 poll.h
diff --git a/.deps/all.ref b/.deps/all.ref
index 5ae77ca9..54d4ea9c 100644
--- a/.deps/all.ref
+++ b/.deps/all.ref
@@ -1,8 +1,12 @@
-./src/nonstd/nonstd-inernal.ref
+./src/nonstd/syscall-internal.ref
+./src/nonstd/io-internal.ref
+./src/nonstd/lib-internal.ref
+./src/nonstd/locale-internal.ref
 ./src/nonstd/pid_t.ref
 ./src/nonstd/ENOSYS.ref
 ./src/nonstd/stdio.ref
 ./src/nonstd/errno.ref
+./src/nonstd/ctype-internal.ref
 ./src/signal/ucontext_t.ref
 ./src/signal/pid_t.ref
 ./src/term/bool.ref
diff --git a/.deps/nonstd/ctype.h.deps b/.deps/nonstd/ctype.h.deps
index b8b88446..626cfee5 100644
--- a/.deps/nonstd/ctype.h.deps
+++ b/.deps/nonstd/ctype.h.deps
@@ -1 +1,2 @@
 ./src/nonstd/ctype_t.c
+./src/nonstd/ctype-internal.ref
diff --git a/.deps/nonstd/io.h.deps b/.deps/nonstd/io.h.deps
index c79016c7..09191a4e 100644
--- a/.deps/nonstd/io.h.deps
+++ b/.deps/nonstd/io.h.deps
@@ -6,5 +6,6 @@
 ./src/nonstd/ftrylockfile.c
 ./src/nonstd/getc_unlocked.c
 ./src/nonstd/__scanf.c
+./src/nonstd/io-internal.ref
 ./src/nonstd/pid_t.ref
 ./src/nonstd/stdio.ref
diff --git a/.deps/nonstd/locale.h.deps b/.deps/nonstd/locale.h.deps
index 114cbee5..ad3e74eb 100644
--- a/.deps/nonstd/locale.h.deps
+++ b/.deps/nonstd/locale.h.deps
@@ -1 +1,3 @@
 ./src/nonstd/struct_locale_t.c
+./src/nonstd/__load_locale.c
+./src/nonstd/locale-internal.ref
diff --git a/.deps/nonstd/syscall.h.deps b/.deps/nonstd/syscall.h.deps
index eea79e92..47150833 100644
--- a/.deps/nonstd/syscall.h.deps
+++ b/.deps/nonstd/syscall.h.deps
@@ -3,6 +3,6 @@
 ./src/nonstd/__lookup.c
 ./src/nonstd/syscall_lookup_t.c
 ./src/nonstd/SYSCALL.c
-./src/nonstd/nonstd-inernal.ref
+./src/nonstd/syscall-internal.ref
 ./src/nonstd/ENOSYS.ref
 ./src/nonstd/errno.ref
diff --git a/.headers.mk b/.headers.mk
index e9ec5dbb..00ad4b5d 100644
--- a/.headers.mk
+++ b/.headers.mk
@@ -87,19 +87,22 @@ $(INCDIR)/nl_types.h: mkh.sh $(SRCDIR)/nl_types/nl_catd.c $(SRCDIR)/nl_types/NL_
 $(INCDIR)/nonstd/assert.h: mkh.sh $(SRCDIR)/nonstd/ASSERT_REPRESENTABLE.c $(SRCDIR)/nonstd/ASSERT_NONNULL.c $(SRCDIR)/nonstd/ASSERT_NOOVERLAP.c $(SRCDIR)/nonstd/ASSERT_NONZERO.c 
 	INCDIR=$(INCDIR) sh mkh.sh $(INCDIR)/nonstd/assert.h
 
-$(INCDIR)/nonstd/ctype.h: mkh.sh $(SRCDIR)/nonstd/ctype_t.c 
+$(INCDIR)/nonstd/ctype.h: mkh.sh $(SRCDIR)/nonstd/ctype_t.c $(SRCDIR)/nonstd/ctype-internal.ref 
 	INCDIR=$(INCDIR) sh mkh.sh $(INCDIR)/nonstd/ctype.h
 
 $(INCDIR)/nonstd/internal.h: mkh.sh $(SRCDIR)/nonstd/__libc.c $(SRCDIR)/nonstd/struct_atexit.c $(SRCDIR)/nonstd/LIBC_INTERNAL.c 
 	INCDIR=$(INCDIR) sh mkh.sh $(INCDIR)/nonstd/internal.h
 
-$(INCDIR)/nonstd/io.h: mkh.sh $(SRCDIR)/nonstd/struct_io_options.c $(SRCDIR)/nonstd/flockfile.c $(SRCDIR)/nonstd/__printf.c $(SRCDIR)/nonstd/struct_FILE.c $(SRCDIR)/nonstd/funlockfile.c $(SRCDIR)/nonstd/ftrylockfile.c $(SRCDIR)/nonstd/getc_unlocked.c $(SRCDIR)/nonstd/__scanf.c $(SRCDIR)/nonstd/pid_t.ref $(SRCDIR)/nonstd/stdio.ref 
+$(INCDIR)/nonstd/io.h: mkh.sh $(SRCDIR)/nonstd/struct_io_options.c $(SRCDIR)/nonstd/flockfile.c $(SRCDIR)/nonstd/__printf.c $(SRCDIR)/nonstd/struct_FILE.c $(SRCDIR)/nonstd/funlockfile.c $(SRCDIR)/nonstd/ftrylockfile.c $(SRCDIR)/nonstd/getc_unlocked.c $(SRCDIR)/nonstd/__scanf.c $(SRCDIR)/nonstd/io-internal.ref $(SRCDIR)/nonstd/pid_t.ref $(SRCDIR)/nonstd/stdio.ref 
 	INCDIR=$(INCDIR) sh mkh.sh $(INCDIR)/nonstd/io.h
 
-$(INCDIR)/nonstd/locale.h: mkh.sh $(SRCDIR)/nonstd/struct_locale_t.c 
+$(INCDIR)/nonstd/lib.h: mkh.sh $(SRCDIR)/nonstd/lib-internal.ref 
+	INCDIR=$(INCDIR) sh mkh.sh $(INCDIR)/nonstd/lib.h
+
+$(INCDIR)/nonstd/locale.h: mkh.sh $(SRCDIR)/nonstd/struct_locale_t.c $(SRCDIR)/nonstd/__load_locale.c $(SRCDIR)/nonstd/locale-internal.ref 
 	INCDIR=$(INCDIR) sh mkh.sh $(INCDIR)/nonstd/locale.h
 
-$(INCDIR)/nonstd/syscall.h: mkh.sh $(SRCDIR)/nonstd/SYSCALL_NUMBER.c $(SRCDIR)/nonstd/__syscall.c $(SRCDIR)/nonstd/__lookup.c $(SRCDIR)/nonstd/syscall_lookup_t.c $(SRCDIR)/nonstd/SYSCALL.c $(SRCDIR)/nonstd/nonstd-inernal.ref $(SRCDIR)/nonstd/ENOSYS.ref $(SRCDIR)/nonstd/errno.ref 
+$(INCDIR)/nonstd/syscall.h: mkh.sh $(SRCDIR)/nonstd/SYSCALL_NUMBER.c $(SRCDIR)/nonstd/__syscall.c $(SRCDIR)/nonstd/__lookup.c $(SRCDIR)/nonstd/syscall_lookup_t.c $(SRCDIR)/nonstd/SYSCALL.c $(SRCDIR)/nonstd/syscall-internal.ref $(SRCDIR)/nonstd/ENOSYS.ref $(SRCDIR)/nonstd/errno.ref 
 	INCDIR=$(INCDIR) sh mkh.sh $(INCDIR)/nonstd/syscall.h
 
 $(INCDIR)/poll.h: mkh.sh $(SRCDIR)/poll/POLLIN.c $(SRCDIR)/poll/POLLWRBAND.c $(SRCDIR)/poll/POLLPRI.c $(SRCDIR)/poll/POLLRDBAND.c $(SRCDIR)/poll/POLLNVAL.c $(SRCDIR)/poll/POLLWRNORM.c $(SRCDIR)/poll/struct_pollfd.c $(SRCDIR)/poll/POLLRDNORM.c $(SRCDIR)/poll/nfds_t.c $(SRCDIR)/poll/POLLERR.c $(SRCDIR)/poll/poll.c $(SRCDIR)/poll/POLLHUP.c $(SRCDIR)/poll/POLLOUT.c 
@@ -282,6 +285,7 @@ headers:  \
 	$(INCDIR)/nonstd/ctype.h \
 	$(INCDIR)/nonstd/internal.h \
 	$(INCDIR)/nonstd/io.h \
+	$(INCDIR)/nonstd/lib.h \
 	$(INCDIR)/nonstd/locale.h \
 	$(INCDIR)/nonstd/syscall.h \
 	$(INCDIR)/poll.h \