consistently use <> for standardized headers

322 files changed, 467 insertions, 613 deletions

diff --git a/src/__main.c b/src/__main.c
index dadfe91f..71a1c9e9 100644
--- a/src/__main.c
+++ b/src/__main.c
@@ -1,6 +1,6 @@
-#include "stdlib.h"
-#include "stdio.h"
-#include "locale.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <locale.h>
 #include "stdio/_stdio.h"
 #include "stdlib/_stdlib.h"
 
diff --git a/src/complex/cabs.c b/src/complex/cabs.c
index 87e18fb2..b4b78ee5 100644
--- a/src/complex/cabs.c
+++ b/src/complex/cabs.c
@@ -1,8 +1,7 @@
 # define TGSOURCE "complex/cabs.c"
-#include "_tgmath.h"
-#include "math.h"
-
 #include <complex.h>
+#include <math.h>
+#include "_tgmath.h"
 
 TYPE TGFN(cabs)(TYPE complex z)
 {
diff --git a/src/complex/cacos.c b/src/complex/cacos.c
index 5df9c0df..90d4e018 100644
--- a/src/complex/cacos.c
+++ b/src/complex/cacos.c
@@ -1,8 +1,8 @@
 # define TGSOURCE "complex/cacos.c"
 #include "_tgmath.h"
 #include <complex.h>
-#include "math.h"
-#include "fenv.h"
+#include <math.h>
+#include <fenv.h>
 
 TYPE complex TGFN(cacos)(TYPE complex z)
 {
diff --git a/src/complex/cacosh.c b/src/complex/cacosh.c
index 908e4938..e6242d87 100644
--- a/src/complex/cacosh.c
+++ b/src/complex/cacosh.c
@@ -1,8 +1,8 @@
 # define TGSOURCE "complex/cacosh.c"
 #include "_tgmath.h"
 #include <complex.h>
-#include "math.h"
-#include "fenv.h"
+#include <math.h>
+#include <fenv.h>
 
 TYPE complex TGFN(cacosh)(TYPE complex z)
 {
diff --git a/src/complex/carg.c b/src/complex/carg.c
index 70bfba00..9c3fd16f 100644
--- a/src/complex/carg.c
+++ b/src/complex/carg.c
@@ -1,8 +1,7 @@
 # define TGSOURCE "complex/carg.c"
-#include "_tgmath.h"
-#include "math.h"
-
 #include <complex.h>
+#include <math.h>
+#include "_tgmath.h"
 
 TYPE TGFN(carg)(TYPE complex z)
 {
diff --git a/src/complex/casinh.c b/src/complex/casinh.c
index 4386d5ee..413e01a2 100644
--- a/src/complex/casinh.c
+++ b/src/complex/casinh.c
@@ -1,8 +1,8 @@
 # define TGSOURCE "complex/casinh.c"
 #include "_tgmath.h"
 #include <complex.h>
-#include "math.h"
-#include "fenv.h"
+#include <math.h>
+#include <fenv.h>
 
 TYPE complex TGFN(casinh)(TYPE complex z)
 {
diff --git a/src/complex/catanh.c b/src/complex/catanh.c
index 69ccfd48..9c4aaba1 100644
--- a/src/complex/catanh.c
+++ b/src/complex/catanh.c
@@ -1,8 +1,8 @@
 # define TGSOURCE "complex/catanh.c"
 #include "_tgmath.h"
 #include <complex.h>
-#include "math.h"
-#include "fenv.h"
+#include <math.h>
+#include <fenv.h>
 
 TYPE complex TGFN(catanh)(TYPE complex z)
 {
diff --git a/src/complex/ccosh.c b/src/complex/ccosh.c
index b20aed37..38798e8b 100644
--- a/src/complex/ccosh.c
+++ b/src/complex/ccosh.c
@@ -1,8 +1,8 @@
 # define TGSOURCE "complex/ccosh.c"
 #include "_tgmath.h"
 #include <complex.h>
-#include "math.h"
-#include "fenv.h"
+#include <math.h>
+#include <fenv.h>
 
 TYPE complex TGFN(ccosh)(TYPE complex z)
 {
diff --git a/src/complex/cexp.c b/src/complex/cexp.c
index 500dd6ae..73a9d5f7 100644
--- a/src/complex/cexp.c
+++ b/src/complex/cexp.c
@@ -1,8 +1,8 @@
 # define TGSOURCE "complex/cexp.c"
 #include "_tgmath.h"
 #include <complex.h>
-#include "math.h"
-#include "fenv.h"
+#include <math.h>
+#include <fenv.h>
 
 TYPE complex TGFN(cexp)(TYPE complex z)
 {
diff --git a/src/complex/clog.c b/src/complex/clog.c
index e0ab86ab..f1d6697c 100644
--- a/src/complex/clog.c
+++ b/src/complex/clog.c
@@ -1,8 +1,8 @@
 # define TGSOURCE "complex/clog.c"
 #include "_tgmath.h"
 #include <complex.h>
-#include "math.h"
-#include "fenv.h"
+#include <math.h>
+#include <fenv.h>
 
 TYPE complex TGFN(clog)(TYPE complex z)
 {
diff --git a/src/complex/csinh.c b/src/complex/csinh.c
index ee8dbed1..fb7c71a3 100644
--- a/src/complex/csinh.c
+++ b/src/complex/csinh.c
@@ -1,8 +1,8 @@
 # define TGSOURCE "complex/csinh.c"
 #include "_tgmath.h"
 #include <complex.h>
-#include "math.h"
-#include "fenv.h"
+#include <math.h>
+#include <fenv.h>
 
 TYPE complex TGFN(csinh)(TYPE complex z)
 {
diff --git a/src/complex/csqrt.c b/src/complex/csqrt.c
index fa6b7721..d7f0b65c 100644
--- a/src/complex/csqrt.c
+++ b/src/complex/csqrt.c
@@ -1,8 +1,8 @@
 # define TGSOURCE "complex/csqrt.c"
 #include "_tgmath.h"
 #include <complex.h>
-#include "math.h"
-#include "fenv.h"
+#include <math.h>
+#include <fenv.h>
 
 TYPE complex TGFN(csqrt)(TYPE complex z)
 {
diff --git a/src/complex/ctanh.c b/src/complex/ctanh.c
index 25c60890..8077fb57 100644
--- a/src/complex/ctanh.c
+++ b/src/complex/ctanh.c
@@ -1,8 +1,8 @@
 # define TGSOURCE "complex/ctanh.c"
 #include "_tgmath.h"
 #include <complex.h>
-#include "math.h"
-#include "fenv.h"
+#include <math.h>
+#include <fenv.h>
 
 TYPE complex TGFN(ctanh)(TYPE complex z)
 {
diff --git a/src/ctype/isblank.c b/src/ctype/isblank.c
index b71b0faa..09ca5a99 100644
--- a/src/ctype/isblank.c
+++ b/src/ctype/isblank.c
@@ -1,6 +1,6 @@
 #include <ctype.h>
-#include "limits.h"
-#include "locale.h"
+#include <limits.h>
+#include <locale.h>
 #include "_ctype.h"
 
 /** test whether a character is blank **/
diff --git a/src/curses/box_set.c b/src/curses/box_set.c
index 437cebda..3877fe9d 100644
--- a/src/curses/box_set.c
+++ b/src/curses/box_set.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#include "stddef.h"
+#include <stddef.h>
 
 int box_set(WINDOW * win, const cchar_t * verch, const cchar_t * horch)
 {
diff --git a/src/curses/derwin.c b/src/curses/derwin.c
index e65e1174..1ce2b992 100644
--- a/src/curses/derwin.c
+++ b/src/curses/derwin.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#include "stddef.h"
+#include <stddef.h>
 
 WINDOW * derwin(WINDOW * orig, int nlines, int ncols, int begin_y, int begin_x)
 {
diff --git a/src/curses/dupwin.c b/src/curses/dupwin.c
index 3a1eb716..c5d14563 100644
--- a/src/curses/dupwin.c
+++ b/src/curses/dupwin.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#include "stddef.h"
+#include <stddef.h>
 
 WINDOW * dupwin(WINDOW * win)
 {
diff --git a/src/curses/get_wstr.c b/src/curses/get_wstr.c
index 44c269fd..67e6f71b 100644
--- a/src/curses/get_wstr.c
+++ b/src/curses/get_wstr.c
@@ -1,6 +1,6 @@
 #include <curses.h>
+#inlcude <limits.h>
 #include "_curses.h"
-#inlcude "limits.h"
 
 int wget_wstr(WINDOW * win, wint_t * wstr)
 {
diff --git a/src/curses/getn_wstr.c b/src/curses/getn_wstr.c
index da6a5894..08b584be 100644
--- a/src/curses/getn_wstr.c
+++ b/src/curses/getn_wstr.c
@@ -1,6 +1,6 @@
 #include <curses.h>
+#inlcude <limits.h>
 #include "_curses.h"
-#inlcude "limits.h"
 
 int wgetn_wstr(WINDOW * win, wint_t * wstr, int n)
 {
diff --git a/src/curses/getwin.c b/src/curses/getwin.c
index 90bb80a2..3c229b7e 100644
--- a/src/curses/getwin.c
+++ b/src/curses/getwin.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#include "stdio.h"
+#include <stdio.h>
 
 WINDOW * getwin(FILE * filep)
 {
diff --git a/src/curses/initscr.c b/src/curses/initscr.c
index d0949ce4..884d31f8 100644
--- a/src/curses/initscr.c
+++ b/src/curses/initscr.c
@@ -1,6 +1,6 @@
 #include <curses.h>
-#include "stdio.h"
-#include "stdlib.h"
+#include <stdio.h>
+#include <stdlib.h>
 
 WINDOW * initscr(void)
 {
diff --git a/src/curses/key_name.c b/src/curses/key_name.c
index fda12f11..e11641d3 100644
--- a/src/curses/key_name.c
+++ b/src/curses/key_name.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#include "stddef.h"
+#include <stddef.h>
 
 char * key_name(wchar_t c)
 {
diff --git a/src/curses/keyname.c b/src/curses/keyname.c
index 9b5ced22..9b201752 100644
--- a/src/curses/keyname.c
+++ b/src/curses/keyname.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#include "stddef.h"
+#include <stddef.h>
 
 char * keyname(int c)
 {
diff --git a/src/curses/meta.c b/src/curses/meta.c
index 8842a2ea..0d61ed38 100644
--- a/src/curses/meta.c
+++ b/src/curses/meta.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#include "stddef.h"
+#include <stddef.h>
 
 int meta(WINDOW * win, bool bf)
 {
diff --git a/src/curses/mvderwin.c b/src/curses/mvderwin.c
index 380b2290..cbea58af 100644
--- a/src/curses/mvderwin.c
+++ b/src/curses/mvderwin.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#include "stddef.h"
+#include <stddef.h>
 
 WINDOW * mvderwin(WINDOW * orig, int par_y, int par_x)
 {
diff --git a/src/curses/mvprintw.c b/src/curses/mvprintw.c
index 9f0b78ff..d0b9bfbe 100644
--- a/src/curses/mvprintw.c
+++ b/src/curses/mvprintw.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#include "stdarg.h"
+#include <stdarg.h>
 
 int mvprintw(int y, int x, const char * fmt, ...)
 {
diff --git a/src/curses/mvscanw.c b/src/curses/mvscanw.c
index fad5c9b5..d7849d36 100644
--- a/src/curses/mvscanw.c
+++ b/src/curses/mvscanw.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#include "stdarg.h"
+#include <stdarg.h>
 
 int mvscanw(int y, int x, const char * fmt, ...)
 {
diff --git a/src/curses/mvwprintw.c b/src/curses/mvwprintw.c
index edb0a6ff..e4b6e209 100644
--- a/src/curses/mvwprintw.c
+++ b/src/curses/mvwprintw.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#include "stdarg.h"
+#include <stdarg.h>
 
 int mvwprintw(WINDOW * win, int y, int x, const char * fmt, ...)
 {
diff --git a/src/curses/mvwscanw.c b/src/curses/mvwscanw.c
index c6ed53a4..a5ae33b2 100644
--- a/src/curses/mvwscanw.c
+++ b/src/curses/mvwscanw.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#include "stdarg.h"
+#include <stdarg.h>
 
 int mvwscanw(WINDOW * win, int y, int x, const char * fmt, ...)
 {
diff --git a/src/curses/newterm.c b/src/curses/newterm.c
index 9c6d4480..fd979df1 100644
--- a/src/curses/newterm.c
+++ b/src/curses/newterm.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#include "stddef.h"
+#include <stddef.h>
 
 SCREEN * newterm(const char * type, FILE * outfile, FILE * infile)
 {
diff --git a/src/curses/newwin.c b/src/curses/newwin.c
index e08f9328..f6628c35 100644
--- a/src/curses/newwin.c
+++ b/src/curses/newwin.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#include "stddef.h"
+#include <stddef.h>
 
 WINDOW * newwin(int nlines, int ncols, int begin_y, int begin_x)
 {
diff --git a/src/curses/printw.c b/src/curses/printw.c
index 05f11ae8..836e4b04 100644
--- a/src/curses/printw.c
+++ b/src/curses/printw.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#include "stdarg.h"
+#include <stdarg.h>
 
 int printw(const char * fmt, ...)
 {
diff --git a/src/curses/putwin.c b/src/curses/putwin.c
index 535a0d2f..67d28fca 100644
--- a/src/curses/putwin.c
+++ b/src/curses/putwin.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#include "stdio.h"
+#include <stdio.h>
 
 int putwin(WINDOW * win, FILE * filep)
 {
diff --git a/src/curses/scanw.c b/src/curses/scanw.c
index cc203ec1..f6cb88e4 100644
--- a/src/curses/scanw.c
+++ b/src/curses/scanw.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#include "stdarg.h"
+#include <stdarg.h>
 
 int scanw(const char * fmt, ...)
 {
diff --git a/src/curses/slk_label.c b/src/curses/slk_label.c
index 574bab6a..ea8b7f40 100644
--- a/src/curses/slk_label.c
+++ b/src/curses/slk_label.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#include "stddef.h"
+#include <stddef.h>
 
 char * slk_label(int labnum)
 {
diff --git a/src/curses/subwin.c b/src/curses/subwin.c
index ed6a7b0b..5092befc 100644
--- a/src/curses/subwin.c
+++ b/src/curses/subwin.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#include "stddef.h"
+#include <stddef.h>
 
 WINDOW * subwin(WINDOW * orig, int nlines, int ncols, int begin_y, int begin_x)
 {
diff --git a/src/curses/termname.c b/src/curses/termname.c
index b92fa1fa..232114b9 100644
--- a/src/curses/termname.c
+++ b/src/curses/termname.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#include "stddef.h"
+#include <stddef.h>
 
 char * termname(void)
 {
diff --git a/src/curses/vw_printw.c b/src/curses/vw_printw.c
index 190a6d8d..b247dd90 100644
--- a/src/curses/vw_printw.c
+++ b/src/curses/vw_printw.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#include "stdarg.h"
+#include <stdarg.h>
 
 int vw_printw(WINDOW * win, const char * fmt, va_list varglist)
 {
diff --git a/src/curses/vw_scanw.c b/src/curses/vw_scanw.c
index 0e7c497b..33ec0a39 100644
--- a/src/curses/vw_scanw.c
+++ b/src/curses/vw_scanw.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#include "stdarg.h"
+#include <stdarg.h>
 
 int vw_scanw(WINDOW * win, const char * fmt, va_list varglist)
 {
diff --git a/src/curses/wprintw.c b/src/curses/wprintw.c
index 839d5e22..77b7effb 100644
--- a/src/curses/wprintw.c
+++ b/src/curses/wprintw.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#include "stdarg.h"
+#include <stdarg.h>
 
 int wprintw(WINDOW * win, const char * fmt, ...)
 {
diff --git a/src/curses/wscanw.c b/src/curses/wscanw.c
index 3cfa9db4..cbbfeaf6 100644
--- a/src/curses/wscanw.c
+++ b/src/curses/wscanw.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#include "stdarg.h"
+#include <stdarg.h>
 
 int wscanw(WINDOW * win, const char * fmt, ...)
 {
diff --git a/src/dirent/closedir.c b/src/dirent/closedir.c
index 558fe228..28523411 100644
--- a/src/dirent/closedir.c
+++ b/src/dirent/closedir.c
@@ -1,7 +1,7 @@
 #include <dirent.h>
-#include "sys/types.h"
-#include "unistd.h"
-#include "stdlib.h"
+#include <sys/types.h>
+#include <unistd.h>
+#include <stdlib.h>
 #include "_assert.h"
 #include "_dirent.h"
 
diff --git a/src/dirent/opendir.c b/src/dirent/opendir.c
index 98a5df54..31d9445c 100644
--- a/src/dirent/opendir.c
+++ b/src/dirent/opendir.c
@@ -1,8 +1,8 @@
 #include <dirent.h>
-#include "errno.h"
-#include "sys/types.h"
-#include "stdlib.h"
-#include "fcntl.h"
+#include <errno.h>
+#include <sys/types.h>
+#include <stdlib.h>
+#include <fcntl.h>
 #include "_dirent.h"
 
 #ifndef O_DIRECTORY
diff --git a/src/dirent/rewinddir.c b/src/dirent/rewinddir.c
index f87f3e61..8cca9041 100644
--- a/src/dirent/rewinddir.c
+++ b/src/dirent/rewinddir.c
@@ -1,6 +1,6 @@
 #include <dirent.h>
-#include "sys/types.h"
-#include "unistd.h"
+#include <sys/types.h>
+#include <unistd.h>
 #include "_dirent.h"
 
 void rewinddir(DIR * dirp)
diff --git a/src/fcntl/creat.c b/src/fcntl/creat.c
index eab98ca8..3161da79 100644
--- a/src/fcntl/creat.c
+++ b/src/fcntl/creat.c
@@ -1,4 +1,4 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <fcntl.h>
 
 int creat(const char *path, mode_t mode)
diff --git a/src/fcntl/fcntl.c b/src/fcntl/fcntl.c
index 6f888bf1..3e2715b4 100644
--- a/src/fcntl/fcntl.c
+++ b/src/fcntl/fcntl.c
@@ -1,7 +1,7 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <fcntl.h>
-#include "errno.h"
-#include "stdarg.h"
+#include <errno.h>
+#include <stdarg.h>
 #include "_syscall.h"
 
 int fcntl(int fildes, int cmd, ...)
diff --git a/src/fcntl/open.c b/src/fcntl/open.c
index 14c12e1b..bc1ae2c1 100644
--- a/src/fcntl/open.c
+++ b/src/fcntl/open.c
@@ -1,8 +1,8 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <fcntl.h>
-#include "sys/stat.h"	/* OH */
-#include "errno.h"
-#include "stdarg.h"
+#include <sys/stat.h>	/* OH */
+#include <errno.h>
+#include <stdarg.h>
 #include "_syscall.h"
 
 int open(const char *path, int oflag, ...)
diff --git a/src/fnmatch/fnmatch.c b/src/fnmatch/fnmatch.c
index 3453d64f..069df2ee 100644
--- a/src/fnmatch/fnmatch.c
+++ b/src/fnmatch/fnmatch.c
@@ -1,5 +1,5 @@
 #include <fnmatch.h>
-#include "string.h"
+#include <string.h>
 #include "_assert.h"
 
 int fnmatch(const char * pattern, const char * string, int flags)
diff --git a/src/ftw/ftw.c b/src/ftw/ftw.c
index e7c4b6e9..8bac503e 100644
--- a/src/ftw/ftw.c
+++ b/src/ftw/ftw.c
@@ -1,5 +1,5 @@
 #include <ftw.h>
-#include "sys/stat.h"
+#include <sys/stat.h>
 
 int ftw(const char * path, int (*fn) (const char *, const struct stat * ptr, int flag), int ndirs)
 {
diff --git a/src/glob/glob.c b/src/glob/glob.c
index eafc1c82..02d97add 100644
--- a/src/glob/glob.c
+++ b/src/glob/glob.c
@@ -1,11 +1,11 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <glob.h>
-#include "stdlib.h"
-#include "string.h"
-#include "dirent.h"
-#include "fnmatch.h"
-#include "errno.h"
-#include "unistd.h"
+#include <stdlib.h>
+#include <string.h>
+#include <dirent.h>
+#include <fnmatch.h>
+#include <errno.h>
+#include <unistd.h>
 #include "_assert.h"
 
 int glob(const char * restrict pattern, int flags, int (*errfunc) (const char * epath, int eerrno), glob_t * restrict pglob)
diff --git a/src/glob/globfree.c b/src/glob/globfree.c
index 228dcea8..87f77350 100644
--- a/src/glob/globfree.c
+++ b/src/glob/globfree.c
@@ -1,6 +1,6 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <glob.h>
-#include "stdlib.h"
+#include <stdlib.h>
 
 void globfree(glob_t * pglob)
 {
diff --git a/src/grp/endgrent.c b/src/grp/endgrent.c
index 00e4beb1..c4cb3871 100644
--- a/src/grp/endgrent.c
+++ b/src/grp/endgrent.c
@@ -1,6 +1,6 @@
 #include <grp.h>
+#include <stdio.h>
 #include "_grp.h"
-#include "stdio.h"
 
 void endgrent(void)
 {
diff --git a/src/grp/getgrent.c b/src/grp/getgrent.c
index 417e1ba2..84dd57bb 100644
--- a/src/grp/getgrent.c
+++ b/src/grp/getgrent.c
@@ -3,13 +3,12 @@
 #define _POSIX_C_SOURCE 2
 #endif
 
-#include "sys/types.h"
+#include <sys/types.h>
 #include <grp.h>
-#include "stdlib.h"
-#include "stddef.h"
-#include "stdio.h"
-#include "limits.h"
-#include "string.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <limits.h>
+#include <string.h>
 #include "_config.h"
 #include "_grp.h"
 
diff --git a/src/grp/getgrgid.c b/src/grp/getgrgid.c
index af10469c..64081f64 100644
--- a/src/grp/getgrgid.c
+++ b/src/grp/getgrgid.c
@@ -1,4 +1,4 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <grp.h>
 #include "_grp.h"
 
diff --git a/src/grp/getgrnam.c b/src/grp/getgrnam.c
index 493a6b5a..0ee23bf6 100644
--- a/src/grp/getgrnam.c
+++ b/src/grp/getgrnam.c
@@ -1,7 +1,7 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <grp.h>
+#include <string.h>
 #include "_grp.h"
-#include "string.h"
 
 struct group * getgrnam(const char * name)
 {
diff --git a/src/grp/gid_t.ref b/src/grp/gid_t.ref
index d90d924e..18ec6499 100644
--- a/src/grp/gid_t.ref
+++ b/src/grp/gid_t.ref
@@ -1,3 +1,2 @@
-#include <grp.h>
 REFERENCE(sys/types/gid_t.c)
 XOPEN(4)
diff --git a/src/grp/setgrent.c b/src/grp/setgrent.c
index 4e445404..884c1c5c 100644
--- a/src/grp/setgrent.c
+++ b/src/grp/setgrent.c
@@ -1,6 +1,6 @@
 #include <grp.h>
+#include <stdio.h>
 #include "_grp.h"
-#include "stdio.h"
 
 void setgrent(void)
 {
diff --git a/src/grp/struct_group.c b/src/grp/struct_group.c
index 16097b22..e1f8c376 100644
--- a/src/grp/struct_group.c
+++ b/src/grp/struct_group.c
@@ -1,5 +1,3 @@
-#include <grp.h>
-
 struct group {
 	char *	gr_name;
 	gid_t	gr_gid;
diff --git a/src/inttypes/imaxabs.c b/src/inttypes/imaxabs.c
index be184ebf..0ea60644 100644
--- a/src/inttypes/imaxabs.c
+++ b/src/inttypes/imaxabs.c
@@ -1,4 +1,4 @@
-#include "stddef.h"
+#include <stddef.h>
 #include <inttypes.h>
 
 /** absolute value **/
diff --git a/src/inttypes/imaxdiv.c b/src/inttypes/imaxdiv.c
index a213f9da..eb99f2cf 100644
--- a/src/inttypes/imaxdiv.c
+++ b/src/inttypes/imaxdiv.c
@@ -1,4 +1,4 @@
-#include "stddef.h"
+#include <stddef.h>
 #include <inttypes.h>
 
 /** calculate quotient and remainder **/
diff --git a/src/inttypes/strtoimax.c b/src/inttypes/strtoimax.c
index 36032a9d..9a42b614 100644
--- a/src/inttypes/strtoimax.c
+++ b/src/inttypes/strtoimax.c
@@ -1,7 +1,7 @@
-#include "stddef.h"
+#include <stddef.h>
+#include <ctype.h>
+#include <errno.h>
 #include <inttypes.h>
-#include "ctype.h"
-#include "errno.h"
 
 intmax_t strtoimax(const char * restrict nptr, char ** restrict endptr, int base)
 {
diff --git a/src/inttypes/strtoumax.c b/src/inttypes/strtoumax.c
index 8bfc8f36..f8017371 100644
--- a/src/inttypes/strtoumax.c
+++ b/src/inttypes/strtoumax.c
@@ -1,7 +1,7 @@
-#include "stddef.h"
+#include <stddef.h>
+#include <ctype.h>
+#include <errno.h>
 #include <inttypes.h>
-#include "ctype.h"
-#include "errno.h"
 
 uintmax_t strtoumax(const char *restrict nptr, char ** restrict endptr, int base)
 {
diff --git a/src/inttypes/wcstoimax.c b/src/inttypes/wcstoimax.c
index 061e4365..21c0a56d 100644
--- a/src/inttypes/wcstoimax.c
+++ b/src/inttypes/wcstoimax.c
@@ -1,7 +1,7 @@
-#include "stddef.h"
+#include <stddef.h>
+#include <errno.h>
 #include <inttypes.h>
-#include "wctype.h"
-#include "errno.h"
+#include <wctype.h>
 
 #define isspace iswspace
 
diff --git a/src/inttypes/wcstoumax.c b/src/inttypes/wcstoumax.c
index 4ace23d0..3ffbf5d8 100644
--- a/src/inttypes/wcstoumax.c
+++ b/src/inttypes/wcstoumax.c
@@ -1,7 +1,7 @@
-#include "stddef.h"
+#include <stddef.h>
+#include <errno.h>
 #include <inttypes.h>
-#include "errno.h"
-#include "wctype.h"
+#include <wctype.h>
 
 #define isspace iswspace
 
diff --git a/src/libgen/basename.c b/src/libgen/basename.c
index 4bced87a..1a051854 100644
--- a/src/libgen/basename.c
+++ b/src/libgen/basename.c
@@ -1,6 +1,5 @@
 #include <libgen.h>
-#include "string.h"
-#include "stddef.h"
+#include <string.h>
 
 char * basename(char * path)
 {
diff --git a/src/libgen/dirname.c b/src/libgen/dirname.c
index bf262748..42917d54 100644
--- a/src/libgen/dirname.c
+++ b/src/libgen/dirname.c
@@ -1,5 +1,5 @@
 #include <libgen.h>
-#include "stddef.h"
+#include <string.h>
 
 char * dirname(char * path)
 {
diff --git a/src/locale/__get_locale.c b/src/locale/__get_locale.c
index 4722175c..94bb62a0 100644
--- a/src/locale/__get_locale.c
+++ b/src/locale/__get_locale.c
@@ -1,4 +1,3 @@
-#include "locale.h"
 #include "_locale.h"
 
 /*
diff --git a/src/math/acosh.c b/src/math/acosh.c
index f557c875..4830b027 100644
--- a/src/math/acosh.c
+++ b/src/math/acosh.c
@@ -1,7 +1,7 @@
 # define TGSOURCE "acosh.c"
 #include "_tgmath.h"
 #include <math.h>
-#include "fenv.h"
+#include <fenv.h>
 
 TYPE TGFN(acosh)(TYPE x)
 {
diff --git a/src/math/atanh.c b/src/math/atanh.c
index bfd4e57b..d33e91ea 100644
--- a/src/math/atanh.c
+++ b/src/math/atanh.c
@@ -1,7 +1,7 @@
 # define TGSOURCE "atanh.c"
 #include "_tgmath.h"
 #include <math.h>
-#include "fenv.h"
+#include <fenv.h>
 
 TYPE TGFN(atanh)(TYPE x)
 {
diff --git a/src/math/fma.c b/src/math/fma.c
index 845afea4..83e5f5b4 100644
--- a/src/math/fma.c
+++ b/src/math/fma.c
@@ -1,7 +1,7 @@
 # define TGSOURCE "fma.c"
 #include "_tgmath.h"
 #include <math.h>
-#include "fenv.h"
+#include <fenv.h>
 
 TYPE TGFN(fma)(TYPE x, TYPE y, TYPE z)
 {
diff --git a/src/math/ilogb.c b/src/math/ilogb.c
index d1295815..5d895b6d 100644
--- a/src/math/ilogb.c
+++ b/src/math/ilogb.c
@@ -1,8 +1,8 @@
 # define TGSOURCE "ilogb.c"
 #include "_tgmath.h"
 #include <math.h>
-#include "limits.h"
-#include "fenv.h"
+#include <limits.h>
+#include <fenv.h>
 
 int TGFN(ilogb)(TYPE x)
 {
diff --git a/src/math/lgamma.c b/src/math/lgamma.c
index 3f0799c2..d536c814 100644
--- a/src/math/lgamma.c
+++ b/src/math/lgamma.c
@@ -1,7 +1,7 @@
 # define TGSOURCE "lgamma.c"
 #include "_tgmath.h"
 #include <math.h>
-#include "fenv.h"
+#include <fenv.h>
 
 TYPE TGFN(lgamma)(TYPE x)
 {
diff --git a/src/math/llrint.c b/src/math/llrint.c
index 299a8258..9ec492d4 100644
--- a/src/math/llrint.c
+++ b/src/math/llrint.c
@@ -1,8 +1,8 @@
 # define TGSOURCE "llrint.c"
 #include "_tgmath.h"
 #include <math.h>
-#include "limits.h"
-#include "fenv.h"
+#include <limits.h>
+#include <fenv.h>
 
 long long int TGFN(llrint)(TYPE x)
 {
diff --git a/src/math/log1p.c b/src/math/log1p.c
index 5f3e2684..101e5186 100644
--- a/src/math/log1p.c
+++ b/src/math/log1p.c
@@ -1,7 +1,7 @@
 # define TGSOURCE "log1p.c"
 #include "_tgmath.h"
 #include <math.h>
-#include "fenv.h"
+#include <fenv.h>
 
 TYPE TGFN(log1p)(TYPE x)
 {
diff --git a/src/math/log2.c b/src/math/log2.c
index 55569065..78929e0a 100644
--- a/src/math/log2.c
+++ b/src/math/log2.c
@@ -1,7 +1,7 @@
 #define TGSOURCE "log2.c"
 #include "_tgmath.h"
 #include <math.h>
-#include "fenv.h"
+#include <fenv.h>
 
 TYPE TGFN(log2)(TYPE x)
 {
diff --git a/src/math/logb.c b/src/math/logb.c
index 8dd29371..bf596df6 100644
--- a/src/math/logb.c
+++ b/src/math/logb.c
@@ -1,7 +1,7 @@
 # define TGSOURCE "logb.c"
 #include "_tgmath.h"
 #include <math.h>
-#include "fenv.h"
+#include <fenv.h>
 
 TYPE TGFN(logb)(TYPE x)
 {
diff --git a/src/math/lrint.c b/src/math/lrint.c
index 3ce1dd66..a92e146e 100644
--- a/src/math/lrint.c
+++ b/src/math/lrint.c
@@ -1,8 +1,8 @@
 # define TGSOURCE "lrint.c"
 #include "_tgmath.h"
 #include <math.h>
-#include "limits.h"
-#include "fenv.h"
+#include <limits.h>
+#include <fenv.h>
 
 long int TGFN(lrint)(TYPE x)
 {
diff --git a/src/math/nan.c b/src/math/nan.c
index c0874e5f..93a0d442 100644
--- a/src/math/nan.c
+++ b/src/math/nan.c
@@ -1,8 +1,8 @@
 # define TGSOURCE "nan.c"
 #include "_tgmath.h"
 #include <math.h>
-#include "string.h"
-#include "stdlib.h"
+#include <string.h>
+#include <stdlib.h>
 
 #define strtodf strtof
 #define strtodl strtold
diff --git a/src/math/round.c b/src/math/round.c
index 5eedd578..48260dd2 100644
--- a/src/math/round.c
+++ b/src/math/round.c
@@ -1,7 +1,7 @@
 # define TGSOURCE "round.c"
 #include "_tgmath.h"
 #include <math.h>
-#include "fenv.h"
+#include <fenv.h>
 
 #ifndef __GNUC__
 #pragma STDC FENV_ACCESS ON
diff --git a/src/math/tgamma.c b/src/math/tgamma.c
index 63e25a5b..547dd9bc 100644
--- a/src/math/tgamma.c
+++ b/src/math/tgamma.c
@@ -1,7 +1,7 @@
 # define TGSOURCE "tgamma.c"
 #include "_tgmath.h"
 #include <math.h>
-#include "fenv.h"
+#include <fenv.h>
 
 TYPE TGFN(tgamma)(TYPE x)
 {
diff --git a/src/pwd/endpwent.c b/src/pwd/endpwent.c
index df6af455..bb22e1be 100644
--- a/src/pwd/endpwent.c
+++ b/src/pwd/endpwent.c
@@ -1,6 +1,6 @@
 #include <pwd.h>
+#include <stdio.h>
 #include "_pwd.h"
-#include "stdio.h"
 
 void endpwent(void)
 {
diff --git a/src/pwd/getpwent.c b/src/pwd/getpwent.c
index cdf20e8e..9876fcd5 100644
--- a/src/pwd/getpwent.c
+++ b/src/pwd/getpwent.c
@@ -6,7 +6,6 @@
 #include <sys/types.h>
 #include <pwd.h>
 #include <stdlib.h>
-#include <stddef.h>
 #include <stdio.h>
 #include <limits.h>
 #include <string.h>
diff --git a/src/pwd/getpwnam.c b/src/pwd/getpwnam.c
index b2e059c4..f880aedc 100644
--- a/src/pwd/getpwnam.c
+++ b/src/pwd/getpwnam.c
@@ -1,9 +1,6 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <pwd.h>
-#include "stddef.h"
-#include "stdio.h"
-#include "limits.h"
-#include "string.h"
+#include <string.h>
 #include "_pwd.h"
 
 struct passwd * getpwnam(const char * name)
diff --git a/src/pwd/getpwuid.c b/src/pwd/getpwuid.c
index fe97bea4..29982a2c 100644
--- a/src/pwd/getpwuid.c
+++ b/src/pwd/getpwuid.c
@@ -1,4 +1,4 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <pwd.h>
 #include "_pwd.h"
 
diff --git a/src/pwd/setpwent.c b/src/pwd/setpwent.c
index 0e52d9c0..93fecdf5 100644
--- a/src/pwd/setpwent.c
+++ b/src/pwd/setpwent.c
@@ -1,6 +1,6 @@
 #include <pwd.h>
+#include <stdio.h>
 #include "_pwd.h"
-#include "stdio.h"
 
 void setpwent(void)
 {
diff --git a/src/regex/regcomp.c b/src/regex/regcomp.c
index 22b565b9..f3d55c7d 100644
--- a/src/regex/regcomp.c
+++ b/src/regex/regcomp.c
@@ -1,4 +1,4 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <regex.h>
 
 int regcomp(regex_t * restrict preg, const char * restrict pattern, int cflags)
diff --git a/src/regex/regerror.c b/src/regex/regerror.c
index 49e3e011..ede7a0f1 100644
--- a/src/regex/regerror.c
+++ b/src/regex/regerror.c
@@ -1,4 +1,4 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <regex.h>
 
 size_t regerror(int errcode, const regex_t * restrict preg, char * restrict errbuf, size_t errbuf_size)
diff --git a/src/regex/regexec.c b/src/regex/regexec.c
index 750da74b..e3fedac7 100644
--- a/src/regex/regexec.c
+++ b/src/regex/regexec.c
@@ -1,4 +1,4 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <regex.h>
 
 int regexec(const regex_t * restrict preg, const char * restrict string, size_t nmatch, regmatch_t pmatch[restrict], int eflags)
diff --git a/src/regex/regfree.c b/src/regex/regfree.c
index 1bf6526e..5f59624a 100644
--- a/src/regex/regfree.c
+++ b/src/regex/regfree.c
@@ -1,6 +1,6 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <regex.h>
-#include "stdlib.h"
+#include <stdlib.h>
 
 void regfree(regex_t * preg)
 {
diff --git a/src/search/hsearch.c b/src/search/hsearch.c
index dfdc73c6..8dcb3fcb 100644
--- a/src/search/hsearch.c
+++ b/src/search/hsearch.c
@@ -1,5 +1,5 @@
 #include <search.h>
-#include "stddef.h"
+#include <stddef.h>
 
 ENTRY * hsearch(ENTRY item, ACTION action)
 {
diff --git a/src/setjmp/setjmp.c b/src/setjmp/setjmp.c
index a098997e..15eacb2c 100644
--- a/src/setjmp/setjmp.c
+++ b/src/setjmp/setjmp.c
@@ -1,5 +1,5 @@
 #include <setjmp.h>
-#include "string.h"
+#include <string.h>
 
 /** save program state **/
 
diff --git a/src/setjmp/siglongjmp.c b/src/setjmp/siglongjmp.c
index 039dabf1..87146941 100644
--- a/src/setjmp/siglongjmp.c
+++ b/src/setjmp/siglongjmp.c
@@ -1,6 +1,6 @@
 #include <setjmp.h>
-#include "sys/types.h"
-#include "signal.h"
+#include <sys/types.h>
+#include <signal.h>
 
 /** restore calling environment with signal mask **/
 
diff --git a/src/setjmp/sigsetjmp.c b/src/setjmp/sigsetjmp.c
index 6b75e90f..c66617aa 100644
--- a/src/setjmp/sigsetjmp.c
+++ b/src/setjmp/sigsetjmp.c
@@ -1,6 +1,6 @@
 #include <setjmp.h>
-#include "sys/types.h"
-#include "signal.h"
+#include <sys/types.h>
+#include <signal.h>
 
 /** save program state with signal mask **/
 
diff --git a/src/signal/kill.c b/src/signal/kill.c
index 856dfc36..55b7a90a 100644
--- a/src/signal/kill.c
+++ b/src/signal/kill.c
@@ -1,4 +1,4 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <signal.h>
 #include "_syscall.h"
 
diff --git a/src/signal/sigaction.c b/src/signal/sigaction.c
index c9fddd21..156868c7 100644
--- a/src/signal/sigaction.c
+++ b/src/signal/sigaction.c
@@ -1,5 +1,5 @@
-#include "stddef.h"
-#include "sys/types.h"
+#include <stddef.h>
+#include <sys/types.h>
 #include <signal.h>
 #include "_syscall.h"
 
diff --git a/src/signal/sigaddset.c b/src/signal/sigaddset.c
index fae413e1..994b2c4b 100644
--- a/src/signal/sigaddset.c
+++ b/src/signal/sigaddset.c
@@ -1,6 +1,6 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <signal.h>
-#include "limits.h"
+#include <limits.h>
 
 int sigaddset(sigset_t * set, int signo)
 {
diff --git a/src/signal/sigdelset.c b/src/signal/sigdelset.c
index bcd0d716..1a15a29d 100644
--- a/src/signal/sigdelset.c
+++ b/src/signal/sigdelset.c
@@ -1,6 +1,6 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <signal.h>
-#include "limits.h"
+#include <limits.h>
 
 int sigdelset(sigset_t * set, int signo)
 {
diff --git a/src/signal/sigemptyset.c b/src/signal/sigemptyset.c
index d09ff500..dae7911a 100644
--- a/src/signal/sigemptyset.c
+++ b/src/signal/sigemptyset.c
@@ -1,6 +1,6 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <signal.h>
-#include "string.h"
+#include <string.h>
 
 int sigemptyset(sigset_t * set)
 {
diff --git a/src/signal/sigfillset.c b/src/signal/sigfillset.c
index 493912b3..4c7939eb 100644
--- a/src/signal/sigfillset.c
+++ b/src/signal/sigfillset.c
@@ -1,7 +1,7 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <signal.h>
-#include "string.h"
-#include "limits.h"
+#include <string.h>
+#include <limits.h>
 
 int sigfillset(sigset_t * set)
 {
diff --git a/src/signal/siginterrupt.c b/src/signal/siginterrupt.c
index 0c2d505a..ea325ca6 100644
--- a/src/signal/siginterrupt.c
+++ b/src/signal/siginterrupt.c
@@ -1,4 +1,4 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <signal.h>
 
 int siginterrupt(int sig, int flag)
diff --git a/src/signal/sigismember.c b/src/signal/sigismember.c
index 6d3c1512..af482232 100644
--- a/src/signal/sigismember.c
+++ b/src/signal/sigismember.c
@@ -1,6 +1,6 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <signal.h>
-#include "limits.h"
+#include <limits.h>
 
 int sigismember(const sigset_t * set, int signo)
 {
diff --git a/src/signal/signal.c b/src/signal/signal.c
index 5f25269f..8a794a7e 100644
--- a/src/signal/signal.c
+++ b/src/signal/signal.c
@@ -4,7 +4,6 @@
 #endif
 
 #include <sys/types.h>
-#include <stddef.h>
 #include <signal.h>
 
 /* FIXME: Linux specific, doesn't even work */
diff --git a/src/signal/sigpending.c b/src/signal/sigpending.c
index 0f26d451..3ab5d01d 100644
--- a/src/signal/sigpending.c
+++ b/src/signal/sigpending.c
@@ -1,4 +1,4 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <signal.h>
 #include "_syscall.h"
 
diff --git a/src/signal/sigprocmask.c b/src/signal/sigprocmask.c
index 2d443e7b..63bc58b2 100644
--- a/src/signal/sigprocmask.c
+++ b/src/signal/sigprocmask.c
@@ -1,4 +1,4 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <signal.h>
 #include "_syscall.h"
 
diff --git a/src/signal/sigsuspend.c b/src/signal/sigsuspend.c
index e42e0e4b..fb164d0f 100644
--- a/src/signal/sigsuspend.c
+++ b/src/signal/sigsuspend.c
@@ -1,4 +1,4 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <signal.h>
 #include "_syscall.h"
 
diff --git a/src/stdio/__printf.c b/src/stdio/__printf.c
index 7da38752..ad266e2c 100644
--- a/src/stdio/__printf.c
+++ b/src/stdio/__printf.c
@@ -1,12 +1,13 @@
-#include "stdio.h"
-#include "_stdio.h"
-#include "stddef.h"
+#include <sys/types.h>
+#include <stdio.h>
+#include <stddef.h>
 #include "wctype/wint_t.h"
 #include "wctype/wctrans_t.h"
-#include "wchar.h"
-#include "inttypes.h"
-#include "unistd.h"
-#include "stdlib.h"
+#include <wchar.h>
+#include <inttypes.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include "_stdio.h"
 
 #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199909L
 #include "stdint/intmax_t.h"
diff --git a/src/stdio/__stdio.c b/src/stdio/__stdio.c
index 57843a30..116c6ab9 100644
--- a/src/stdio/__stdio.c
+++ b/src/stdio/__stdio.c
@@ -1,7 +1,3 @@
 #include "_stdio.h"
 
-struct __stdio __stdio =
-{
-	{ { 0 } },
-	"/dev/tty",
-};
+struct __stdio __stdio = { 0 };
diff --git a/src/stdio/_stdio.h b/src/stdio/_stdio.h
index f7424806..80b83556 100644
--- a/src/stdio/_stdio.h
+++ b/src/stdio/_stdio.h
@@ -11,16 +11,15 @@
 #include "sys/types/pid_t.h"
 #endif
 
-#ifndef L_ctermid
-#include "L_ctermid.h"
+#if !defined _POSIX_C_SOURCE || _POSIX_C_SOURCE < 199506L
+#define flockfile(_file)		(void)(_file)
+#define funlockfile(_file)		(void)(_file)
+#define putc_unlocked(_c, _stream)	fputc(_c, _stream)
+#define getc_unlocked(_stream)		fgetc(_stream)
 #endif
 
 #define f_is_open(s) (s && (s->bmode != 0))
 
-struct __fpos_t {
-	size_t off;
-};
-
 struct __FILE {
 	fpos_t pos;
 
@@ -62,16 +61,8 @@ int __scanf(struct io_options * restrict, const char * restrict, va_list);
 
 struct __stdio {
 	struct __FILE FILES[FOPEN_MAX];
-	char ctermid[L_ctermid + 1];
 };
 
 extern struct __stdio __stdio;
 
-#if !defined _POSIX_C_SOURCE || _POSIX_C_SOURCE < 199506L
-#define flockfile(_file)		(void)(_file)
-#define funlockfile(_file)		(void)(_file)
-#define putc_unlocked(_c, _stream)	fputc(_c, _stream)
-#define getc_unlocked(_stream)		fgetc(_stream)
-#endif
-
 #endif
diff --git a/src/stdio/fopen_s.c b/src/stdio/fopen_s.c
index 59385515..904c3584 100644
--- a/src/stdio/fopen_s.c
+++ b/src/stdio/fopen_s.c
@@ -1,4 +1,4 @@
-#include "stdio.h"
+#include <stdio.h>
 #include "__stdio.h"
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/stdio/fprintf_s.c b/src/stdio/fprintf_s.c
index b633dee8..74995abc 100644
--- a/src/stdio/fprintf_s.c
+++ b/src/stdio/fprintf_s.c
@@ -1,5 +1,5 @@
-#include "stdio.h"
-#include "stdarg.h"
+#include <stdio.h>
+#include <stdarg.h>
 
 /** write formatted output to a file stream **/
 int fprintf_s(FILE * restrict stream, const char * restrict format, ...)
diff --git a/src/stdio/freopen_s.c b/src/stdio/freopen_s.c
index d646bec8..d6fae14f 100644
--- a/src/stdio/freopen_s.c
+++ b/src/stdio/freopen_s.c
@@ -1,4 +1,4 @@
-#include "stdio.h"
+#include <stdio.h>
 #include "__stdio.h"
 #include <fcntl.h>
 #include <string.h>
diff --git a/src/stdio/fscanf_s.c b/src/stdio/fscanf_s.c
index de7f9e98..a0b40ba7 100644
--- a/src/stdio/fscanf_s.c
+++ b/src/stdio/fscanf_s.c
@@ -1,6 +1,5 @@
-#include "stdio.h"
-#include "stdio.h"
-#include "stdarg.h"
+#include <stdio.h>
+#include <stdarg.h>
 
 /** read formatted input from a file stream **/
 int fscanf_s(FILE * restrict stream, const char * restrict format, ...)
diff --git a/src/stdio/gets.c b/src/stdio/gets.c
index 8ad0998a..09f6ad3a 100644
--- a/src/stdio/gets.c
+++ b/src/stdio/gets.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "limits.h"
+#include <limits.h>
 
 /** read a line from stdin **/
 
diff --git a/src/stdio/gets_s.c b/src/stdio/gets_s.c
index 5af016dd..88434c40 100644
--- a/src/stdio/gets_s.c
+++ b/src/stdio/gets_s.c
@@ -1,4 +1,4 @@
-#include "stdio.h"
+#include <stdio.h>
 #include <limits.h>
 
 /** read a line from stdin **/
diff --git a/src/stdio/pclose.c b/src/stdio/pclose.c
index 258fc902..a9a89517 100644
--- a/src/stdio/pclose.c
+++ b/src/stdio/pclose.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
-#include "sys/types.h"
-#include "sys/wait.h"
+#include <sys/types.h>
+#include <sys/wait.h>
 #include "_stdio.h"
 
 int pclose(FILE * stream)
diff --git a/src/stdio/popen.c b/src/stdio/popen.c
index 0e3ee7dd..dd338519 100644
--- a/src/stdio/popen.c
+++ b/src/stdio/popen.c
@@ -1,15 +1,15 @@
 #include <stdio.h>
-#include "string.h"
-#include "errno.h"
+#include <string.h>
+#include <errno.h>
 
-#include "sys/types.h"
-#include "unistd.h"
+#include <sys/types.h>
+#include <unistd.h"
 
 #include "_assert.h"
 #include "_stdio.h"
 
 #ifdef __STDC_VERSION__
-#include "wchar.h"
+#include <wchar.h>
 #endif
 
 FILE * popen(const char * command, const char * mode)
diff --git a/src/stdio/printf_s.c b/src/stdio/printf_s.c
index b5917062..bb49bb6f 100644
--- a/src/stdio/printf_s.c
+++ b/src/stdio/printf_s.c
@@ -1,5 +1,5 @@
-#include "stdio.h"
-#include "stdarg.h"
+#include <stdio.h>
+#include <stdarg.h>
 
 /** write formatted output **/
 int printf_s(const char *format, ...)
diff --git a/src/stdio/putc_unlocked.c b/src/stdio/putc_unlocked.c
index 4a3937e8..c6fec42c 100644
--- a/src/stdio/putc_unlocked.c
+++ b/src/stdio/putc_unlocked.c
@@ -7,7 +7,7 @@
 #include <unistd.h>
 #else
 #include "_syscall.h"
-#define write(_fd, _buf, _size) __syscall(__syscall_lookup(write), _fd, _buf, _size)
+#define write(_fd, _buf, _size) __scall3(write, _fd, _buf, _size)
 #endif
 
 /** write a character to a file stream with explicit client locking **/
diff --git a/src/stdio/scanf_s.c b/src/stdio/scanf_s.c
index f67335f7..78ac5cca 100644
--- a/src/stdio/scanf_s.c
+++ b/src/stdio/scanf_s.c
@@ -1,5 +1,5 @@
-#include "stdio.h"
-#include "stdarg.h"
+#include <stdio.h>
+#include <stdarg.h>
 
 /** read formatted input **/
 int scanf_s(const char * restrict format, ...)
diff --git a/src/stdio/snprintf.c b/src/stdio/snprintf.c
index 966883eb..44bb65fe 100644
--- a/src/stdio/snprintf.c
+++ b/src/stdio/snprintf.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "stdarg.h"
+#include <stdarg.h>
 #include "_stdio.h"
 
 int snprintf(char * restrict s, size_t n, const char * restrict format, ...)
diff --git a/src/stdio/snprintf_s.c b/src/stdio/snprintf_s.c
index dcbdafaa..9ed36fcc 100644
--- a/src/stdio/snprintf_s.c
+++ b/src/stdio/snprintf_s.c
@@ -1,4 +1,4 @@
-#include "stdio.h"
+#include <stdio.h>
 
 int snprintf_s( char * restrict s, rsize_t n, const char * restrict format, ...)
 {
diff --git a/src/stdio/sprintf_s.c b/src/stdio/sprintf_s.c
index 223e84c8..c103e179 100644
--- a/src/stdio/sprintf_s.c
+++ b/src/stdio/sprintf_s.c
@@ -1,5 +1,5 @@
-#include "stdio.h"
-#include "stdarg.h"
+#include <stdio.h>
+#include <stdarg.h>
 
 /** write formatted output to a string **/
 int sprintf_s(char * restrict s, rsize_t n, const char * restrict format, ...)
diff --git a/src/stdio/sscanf_s.c b/src/stdio/sscanf_s.c
index c91786f6..b3824825 100644
--- a/src/stdio/sscanf_s.c
+++ b/src/stdio/sscanf_s.c
@@ -1,5 +1,5 @@
-#include "stdio.h"
-#include "stdarg.h"
+#include <stdio.h>
+#include <stdarg.h>
 
 /** read formatted input from a string **/
 int sscanf_s(const char * restrict s, const char * restrict format, ...)
diff --git a/src/stdio/tmpfile_s.c b/src/stdio/tmpfile_s.c
index 948425ad..ea846493 100644
--- a/src/stdio/tmpfile_s.c
+++ b/src/stdio/tmpfile_s.c
@@ -1,4 +1,4 @@
-#include "stdio.h"
+#include <stdio.h>
 
 /* open a temporary file stream */
 errno_t tmpfile_s(FILE * restrict * restrict streamptr)
diff --git a/src/stdio/tmpnam_s.c b/src/stdio/tmpnam_s.c
index 176eb982..6a20f93d 100644
--- a/src/stdio/tmpnam_s.c
+++ b/src/stdio/tmpnam_s.c
@@ -1,4 +1,4 @@
-#include "stdio.h"
+#include <stdio.h>
 
 /** generate a temporary file name **/
 errno_t tmpnam_s(char *s, rsize_t maxsize)
diff --git a/src/stdio/vfprintf_s.c b/src/stdio/vfprintf_s.c
index e2d94c71..f6b8c334 100644
--- a/src/stdio/vfprintf_s.c
+++ b/src/stdio/vfprintf_s.c
@@ -1,4 +1,4 @@
-#include "stdio.h"
+#include <stdio.h>
 #include "__stdio.h"
 #include <stdarg.h>
 
diff --git a/src/stdio/vfscanf_s.c b/src/stdio/vfscanf_s.c
index 82fb238c..726d9508 100644
--- a/src/stdio/vfscanf_s.c
+++ b/src/stdio/vfscanf_s.c
@@ -1,4 +1,4 @@
-#include "stdio.h"
+#include <stdio.h>
 
 int vfscanf_s(FILE * restrict stream, const char * restrict format, va_list arg)
 {
diff --git a/src/stdio/vprintf.c b/src/stdio/vprintf.c
index 7650c066..a27a8d73 100644
--- a/src/stdio/vprintf.c
+++ b/src/stdio/vprintf.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "stdarg.h"
+#include <stdarg.h>
 #include "_stdio.h"
 
 /** write formatted output **/
diff --git a/src/stdio/vprintf_s.c b/src/stdio/vprintf_s.c
index c13b1ead..dd65f66a 100644
--- a/src/stdio/vprintf_s.c
+++ b/src/stdio/vprintf_s.c
@@ -1,4 +1,4 @@
-#include "stdio.h"
+#include <stdio.h>
 
 /** write formatted output **/
 int vprintf_s(const char * restrict format, va_list arg)
diff --git a/src/stdio/vscanf_s.c b/src/stdio/vscanf_s.c
index 85f34e07..7f154f30 100644
--- a/src/stdio/vscanf_s.c
+++ b/src/stdio/vscanf_s.c
@@ -1,4 +1,4 @@
-#include "stdio.h"
+#include <stdio.h>
 
 int vscanf_s(const char * restrict format, va_list arg)
 {
diff --git a/src/stdio/vsnprintf.c b/src/stdio/vsnprintf.c
index b7785f89..62963b2c 100644
--- a/src/stdio/vsnprintf.c
+++ b/src/stdio/vsnprintf.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "stdarg.h"
+#include <stdarg.h>
 #include "_stdio.h"
 
 int vsnprintf(char * restrict s, size_t n, const char *format, va_list arg)
diff --git a/src/stdio/vsprintf_s.c b/src/stdio/vsprintf_s.c
index 98a7794f..5179c7e6 100644
--- a/src/stdio/vsprintf_s.c
+++ b/src/stdio/vsprintf_s.c
@@ -1,4 +1,4 @@
-#include "stdio.h"
+#include <stdio.h>
 #include <stdarg.h>
 #include <stdint.h>
 
diff --git a/src/stdio/vsscanf.c b/src/stdio/vsscanf.c
index a1248beb..2573b213 100644
--- a/src/stdio/vsscanf.c
+++ b/src/stdio/vsscanf.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "stdarg.h"
+#include <stdarg.h>
 #include "_stdio.h"
 
 int vsscanf(const char * restrict s, const char * restrict format, va_list arg)
diff --git a/src/stdio/vsscanf_s.c b/src/stdio/vsscanf_s.c
index 6ac2e6fa..1039a9d5 100644
--- a/src/stdio/vsscanf_s.c
+++ b/src/stdio/vsscanf_s.c
@@ -1,4 +1,4 @@
-#include "stdarg.h"
+#include <stdarg.h>
 
 int vsscanf_s(const char * restrict s, const char * restrict format, va_list arg)
 {
diff --git a/src/stdlib/abort_handler_s.c b/src/stdlib/abort_handler_s.c
index 8f7ef71a..2405cd79 100644
--- a/src/stdlib/abort_handler_s.c
+++ b/src/stdlib/abort_handler_s.c
@@ -1,4 +1,4 @@
-#include "stdlib.h"
+#include <stdlib.h>
 
 void abort_handler_s(const char * restrict msg, void * restrict ptr, errno_t error)
 {
diff --git a/src/stdlib/bsearch_s.c b/src/stdlib/bsearch_s.c
index 12a19c25..0f2cee63 100644
--- a/src/stdlib/bsearch_s.c
+++ b/src/stdlib/bsearch_s.c
@@ -1,12 +1,9 @@
 #include <stddef.h>
 
 /** binary search **/
-void *bsearch_s(const void * key, const void * base,
-	rsize_t nmemb, rsize_t size,
-	int (*compar)(const void *x, const void *y, void * context),
-	void *context)
+
+void *bsearch_s(const void * key, const void * base, rsize_t nmemb, rsize_t size, int (*compar)(const void *x, const void *y, void * context), void *context)
 {
-	__C_EXT(1, 201112L);
 	/* TODO: testing */
 	void *ret = NULL;
 	size_t i = nmemb / 2;
@@ -22,6 +19,7 @@ void *bsearch_s(const void * key, const void * base,
 			i += (nmemb >> trip);
 		}
 	}
+
 	return NULL;
 }
 
diff --git a/src/stdlib/exit.c b/src/stdlib/exit.c
index c9deba7a..557ad2cf 100644
--- a/src/stdlib/exit.c
+++ b/src/stdlib/exit.c
@@ -1,9 +1,7 @@
 #include <stdlib.h>
-#include <limits.h>
-#include <stddef.h>
 #include <stdio.h>
-#include "_syscall.h"
 #include "_stdlib.h"
+#include "_syscall.h"
 
 /** cause normal program termination **/
 _Noreturn void exit(int status)
diff --git a/src/stdlib/getenv_s.c b/src/stdlib/getenv_s.c
index 88156c1e..8760678b 100644
--- a/src/stdlib/getenv_s.c
+++ b/src/stdlib/getenv_s.c
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "stdlib.h"
+#include <stdlib.h>
 
 /** get an environment variable **/
 errno_t getenv_s(size_t * restrict len, char * restrict value, rsize_t maxsize, const char * restrict name)
diff --git a/src/stdlib/ignore_handler_s.c b/src/stdlib/ignore_handler_s.c
index 0a4ef62c..ec8c77ff 100644
--- a/src/stdlib/ignore_handler_s.c
+++ b/src/stdlib/ignore_handler_s.c
@@ -1,4 +1,4 @@
-#include "stdlib.h"
+#include <stdlib.h>
 
 /** ignore constraint violations **/
 void ignore_handler_s(const char * restrict msg, void * restrict ptr, errno_t error)
diff --git a/src/stdlib/llabs.c b/src/stdlib/llabs.c
index 9fc00ab6..a2a6cfbe 100644
--- a/src/stdlib/llabs.c
+++ b/src/stdlib/llabs.c
@@ -1,5 +1,5 @@
 #include <stdlib.h>
-#include "limits.h"
+#include <limits.h>
 
 /** absolute value **/
 
diff --git a/src/stdlib/mbstowcs_s.c b/src/stdlib/mbstowcs_s.c
index 70ef0433..fb60a896 100644
--- a/src/stdlib/mbstowcs_s.c
+++ b/src/stdlib/mbstowcs_s.c
@@ -1,4 +1,4 @@
-#include "stdlib.h"
+#include <stdlib.h>
 
 /** convert multibyte string to wide character string **/
 errno_t mbstowcs_s(size_t * restrict retval, wchar_t * restrict dst, rsize_t dstmax, const char * restrict src, rsize_t len)
diff --git a/src/stdlib/qsort_s.c b/src/stdlib/qsort_s.c
index da12d505..99afe7f0 100644
--- a/src/stdlib/qsort_s.c
+++ b/src/stdlib/qsort_s.c
@@ -1,4 +1,4 @@
-#include "stdlib.h"
+#include <stdlib.h>
 
 /** sort an array **/
 errno_t qsort_s(void *base, rsize_t nmemb, rsize_t size,
diff --git a/src/stdlib/quick_exit.c b/src/stdlib/quick_exit.c
index 25937325..3ff50e4e 100644
--- a/src/stdlib/quick_exit.c
+++ b/src/stdlib/quick_exit.c
@@ -1,6 +1,4 @@
 #include <stdlib.h>
-#include <limits.h>
-#include <stddef.h>
 #include "_stdlib.h"
 
 /** cause normal quick program termination **/
diff --git a/src/stdlib/realloc.c b/src/stdlib/realloc.c
index 9b4d28ee..c1008457 100644
--- a/src/stdlib/realloc.c
+++ b/src/stdlib/realloc.c
@@ -1,19 +1,18 @@
-#include <stdlib.h>
+#if ((!defined _POSIX_C_SOURCE) || (_POSIX_C_SOURCE < 199309L))
+#undef _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 199309L
+#define POSIX_FORCED
+#endif
 
-#if defined _POSIX_C_SOURCE && 199305L <= _POSIX_C_SOURCE
-#include "sys/types.h"
-#include "fcntl.h"
-#include "sys/mman.h"
+#include <stdlib.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <sys/mman.h>
 
-#else
+#ifdef POSIX_FORCED
 #include "_syscall.h"
-#define PROT_READ 0x1
-#define PROT_WRITE 0x2
-#define MAP_PRIVATE 0x2
-#define O_RDWR 0x2
-#define mmap(_a, _l, _p, _fl, _fd, _o) __syscall(__syscall_lookup(mmap), _a, _l, _p, _fl, _fd, _o)
-#define open(_p, _a, _m) __syscall(__syscall_lookup(open), _p, _a, _m)
-
+#define mmap(_a, _l, _p, _fl, _fd, _o)	__scall6(mmap, _a, _l, _p, _fl, _fd, _o)
+#define open(_p, _a, _m)		__scall3(open, _p, _a, _m)
 #endif
 
 /** change the amount of memory allocated **/
@@ -29,8 +28,11 @@ void * realloc(void * ptr, size_t size)
 
 	if (ptr == NULL) {
 		/* malloc() */
-		return (void*)(long)mmap(NULL, size, PROT_READ | PROT_WRITE,
+		ptr = (void*)(long)mmap(NULL, size, PROT_READ | PROT_WRITE,
 			MAP_PRIVATE, backing, 0);
+		if (ptr == MAP_FAILED) {
+			return NULL;
+		}
 	} else if (size == 0) {
 		/* free() */
 	}
diff --git a/src/stdlib/set_constraint_handler_s.c b/src/stdlib/set_constraint_handler_s.c
index b32c9860..3e3200bd 100644
--- a/src/stdlib/set_constraint_handler_s.c
+++ b/src/stdlib/set_constraint_handler_s.c
@@ -1,4 +1,4 @@
-#include "stdlib.h"
+#include <stdlib.h>
 
 constraint_handler_t set_constraint_handler_s(constraint_handler_t handler)
 {
diff --git a/src/stdlib/strtof.c b/src/stdlib/strtof.c
index 2c8fc115..c88a7c3f 100644
--- a/src/stdlib/strtof.c
+++ b/src/stdlib/strtof.c
@@ -1,8 +1,8 @@
 #include <stdlib.h>
-#include "float.h"
-#include "errno.h"
-#include "ctype.h"
-#include "math.h"
+#include <float.h>
+#include <errno.h>
+#include <ctype.h>
+#include <math.h>
 
 /** convert string to floating-point **/
 
diff --git a/src/stdlib/strtold.c b/src/stdlib/strtold.c
index eb19fcc0..1c0ce7b8 100644
--- a/src/stdlib/strtold.c
+++ b/src/stdlib/strtold.c
@@ -1,8 +1,8 @@
 #include <stdlib.h>
-#include "float.h"
-#include "ctype.h"
-#include "errno.h"
-#include "math.h"
+#include <float.h>
+#include <ctype.h>
+#include <errno.h>
+#include <math.h>
 
 /** convert string to floating-point **/
 
diff --git a/src/stdlib/strtoll.c b/src/stdlib/strtoll.c
index 87a338ec..00b763c9 100644
--- a/src/stdlib/strtoll.c
+++ b/src/stdlib/strtoll.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
-#include "ctype.h"
-#include "limits.h"
-#include "errno.h"
+#include <ctype.h>
+#include <limits.h>
+#include <errno.h>
 
 long long int strtoll(const char * restrict nptr, char ** restrict endptr, int base)
 {
diff --git a/src/stdlib/strtoull.c b/src/stdlib/strtoull.c
index 6f9bfe46..f4d1d248 100644
--- a/src/stdlib/strtoull.c
+++ b/src/stdlib/strtoull.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
-#include "ctype.h"
-#include "limits.h"
-#include "errno.h"
+#include <ctype.h>
+#include <limits.h>
+#include <errno.h>
 
 unsigned long long int strtoull(const char * restrict nptr, char ** restrict endptr, int base)
 {
diff --git a/src/stdlib/wcstombs_s.c b/src/stdlib/wcstombs_s.c
index b0a8980b..a0713638 100644
--- a/src/stdlib/wcstombs_s.c
+++ b/src/stdlib/wcstombs_s.c
@@ -1,4 +1,4 @@
-#include "stdlib.h"
+#include <stdlib.h>
 
 /** convert wide character string to multibyte string **/
 errno_t wcstombs_s(size_t * restrict retval, char * restrict dst, rsize_t dstmax, const wchar_t * restrict src, rsize_t len)
diff --git a/src/stdlib/wctomb_s.c b/src/stdlib/wctomb_s.c
index 0a3f510e..161b3504 100644
--- a/src/stdlib/wctomb_s.c
+++ b/src/stdlib/wctomb_s.c
@@ -1,4 +1,4 @@
-#include "stdlib.h"
+#include <stdlib.h>
 
 /** convert wide character to multibyte character **/
 errno_t wctomb_s(int * restrict status, char * restrict s, rsize_t smax, wchar_t wc)
diff --git a/src/string/memcpy_s.c b/src/string/memcpy_s.c
index 366a879c..8bdee520 100644
--- a/src/string/memcpy_s.c
+++ b/src/string/memcpy_s.c
@@ -1,5 +1,5 @@
-#include "string.h"
-#include "sys/_nonstd_.h"
+#include <string.h>
+#include "_assert.h"
 
 /** copy memory **/
 errno_t memcpy_s(void * restrict s1, rsize_t s1max, const void * restrict s2, rsize_t n)
diff --git a/src/string/memmove_s.c b/src/string/memmove_s.c
index c489161d..69bc7208 100644
--- a/src/string/memmove_s.c
+++ b/src/string/memmove_s.c
@@ -1,6 +1,6 @@
-#include "string.h"
-#include "stdlib.h"
-#include "sys/_nonstd_.h"
+#include <string.h>
+#include <stdlib.h>
+#include "_assert.h"
 
 /** move memory **/
 errno_t memmove_s(void *s1, rsize_t s1max, const void *s2, rsize_t n)
diff --git a/src/string/memset_s.c b/src/string/memset_s.c
index 71e3add1..661b8d8b 100644
--- a/src/string/memset_s.c
+++ b/src/string/memset_s.c
@@ -1,4 +1,4 @@
-#include "string.h"
+#include <string.h>
 
 /** fill memory **/
 errno_t memset_s(void *s, rsize_t smax, int c, rsize_t n)
diff --git a/src/string/strcat_s.c b/src/string/strcat_s.c
index 14db822d..a8efb98f 100644
--- a/src/string/strcat_s.c
+++ b/src/string/strcat_s.c
@@ -1,4 +1,4 @@
-#include "string.h"
+#include <string.h>
 
 /** concatenate strings **/
 errno_t strcat_s(char * restrict s1, rsize_t s1max, const char * restrict s2)
diff --git a/src/string/strcpy_s.c b/src/string/strcpy_s.c
index 15e624b4..5522fc26 100644
--- a/src/string/strcpy_s.c
+++ b/src/string/strcpy_s.c
@@ -1,4 +1,4 @@
-#include "string.h"
+#include <string.h>
 #include <limits.h>
 
 /** copy string **/
diff --git a/src/string/strerror_s.c b/src/string/strerror_s.c
index 293bb81d..c1e85cac 100644
--- a/src/string/strerror_s.c
+++ b/src/string/strerror_s.c
@@ -1,5 +1,5 @@
-#include "string.h"
-#include "errno.h"
+#include <string.h>
+#include <errno.h>
 #include "__strerror.h"
 
 /** convert error number to string **/
diff --git a/src/string/strerrorlen_s.c b/src/string/strerrorlen_s.c
index 8b0d99bf..63eaaff6 100644
--- a/src/string/strerrorlen_s.c
+++ b/src/string/strerrorlen_s.c
@@ -1,4 +1,4 @@
-#include "string.h"
+#include <string.h>
 
 size_t strerrorlen_s(errno_t errnum)
 {
diff --git a/src/string/strncat_s.c b/src/string/strncat_s.c
index 2c6d65e6..cbada131 100644
--- a/src/string/strncat_s.c
+++ b/src/string/strncat_s.c
@@ -1,4 +1,4 @@
-#include "string.h"
+#include <string.h>
 
 /** concatenate bounded string **/
 errno_t strncat_s(char * restrict s1, rsize_t s1max, const char * restrict s2, rsize_t n)
diff --git a/src/string/strncpy_s.c b/src/string/strncpy_s.c
index 39b045a9..a228f360 100644
--- a/src/string/strncpy_s.c
+++ b/src/string/strncpy_s.c
@@ -1,4 +1,4 @@
-#include "string.h"
+#include <string.h>
 
 /** copy bounded string **/
 errno_t strncpy_s(char * restrict s1, rsize_t s1max, const char * restrict s2, rsize_t n)
diff --git a/src/string/strnlen_s.c b/src/string/strnlen_s.c
index f1221961..9862974f 100644
--- a/src/string/strnlen_s.c
+++ b/src/string/strnlen_s.c
@@ -1,4 +1,4 @@
-#include "string.h"
+#include <string.h>
 
 size_t strnlen_s(const char *s, size_t maxsize)
 {
diff --git a/src/string/strtok_s.c b/src/string/strtok_s.c
index 9742d09c..caeb4c6d 100644
--- a/src/string/strtok_s.c
+++ b/src/string/strtok_s.c
@@ -1,5 +1,4 @@
-#include "string.h"
-#include "stddef.h"
+#include <string.h>
 
 char * strtok_s(char * restrict s1, rsize_t * restrict s1max, const char * restrict s2, char **restrict ptr)
 {
diff --git a/src/sys/mman/mmap.c b/src/sys/mman/mmap.c
index fb56eb46..85049ab6 100644
--- a/src/sys/mman/mmap.c
+++ b/src/sys/mman/mmap.c
@@ -1,8 +1,3 @@
-#if ((!defined _POSIX_C_SOURCE) || (_POSIX_C_SOURCE < 199309L))
-#undef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 199309L
-#endif
-
 #include <sys/types.h>
 #include <sys/mman.h>
 #include "_syscall.h"
diff --git a/src/sys/stat/chmod.c b/src/sys/stat/chmod.c
index 16aa6f5a..f1a47730 100644
--- a/src/sys/stat/chmod.c
+++ b/src/sys/stat/chmod.c
@@ -1,4 +1,4 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <sys/stat.h>
 #include "_syscall.h"
 
diff --git a/src/sys/stat/fstat.c b/src/sys/stat/fstat.c
index 33634dd0..4859bec7 100644
--- a/src/sys/stat/fstat.c
+++ b/src/sys/stat/fstat.c
@@ -1,4 +1,4 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <sys/stat.h>
 #include "_syscall.h"
 
diff --git a/src/sys/stat/mkdir.c b/src/sys/stat/mkdir.c
index ac46d907..7aa93a7e 100644
--- a/src/sys/stat/mkdir.c
+++ b/src/sys/stat/mkdir.c
@@ -1,4 +1,4 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <sys/stat.h>
 #include "_syscall.h"
 
diff --git a/src/sys/stat/stat.c b/src/sys/stat/stat.c
index a4442bbe..08446b24 100644
--- a/src/sys/stat/stat.c
+++ b/src/sys/stat/stat.c
@@ -1,6 +1,6 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <sys/stat.h>
-#include "stdlib.h"
+#include <stdlib.h>
 #include "_assert.h"
 #include "_syscall.h"
 
diff --git a/src/sys/stat/umask.c b/src/sys/stat/umask.c
index e3f14b73..419a0afb 100644
--- a/src/sys/stat/umask.c
+++ b/src/sys/stat/umask.c
@@ -1,4 +1,4 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <sys/stat.h>
 #include "_syscall.h"
 
diff --git a/src/sys/times/times.c b/src/sys/times/times.c
index f677d3b4..6c6cf329 100644
--- a/src/sys/times/times.c
+++ b/src/sys/times/times.c
@@ -1,4 +1,4 @@
-#include "time.h"
+#include <time.h>
 #include <sys/times.h>
 #include "_syscall.h"
 
diff --git a/src/sys/types/clock_t.ref b/src/sys/types/clock_t.ref
index 37b935b9..772333a5 100644
--- a/src/sys/types/clock_t.ref
+++ b/src/sys/types/clock_t.ref
@@ -1,3 +1,2 @@
-#include <sys/types.h>
 REFERENCE(time/clock_t.c)
 XOPEN(4)
diff --git a/src/sys/types/clockid_t.h b/src/sys/types/clockid_t.h
index 7b05b621..e38addee 100644
--- a/src/sys/types/clockid_t.h
+++ b/src/sys/types/clockid_t.h
@@ -1,4 +1,3 @@
-#include <sys/types.h>
 typedef unsigned long int                                             clockid_t;
 
 /*
diff --git a/src/sys/types/dev_t.h b/src/sys/types/dev_t.h
index 7adec7b6..9c6af9db 100644
--- a/src/sys/types/dev_t.h
+++ b/src/sys/types/dev_t.h
@@ -1,5 +1,3 @@
-#include <sys/types.h>
-
 typedef                                                        unsigned long int
 	dev_t;
 /*
diff --git a/src/sys/types/gid_t.h b/src/sys/types/gid_t.h
index 7cee589b..00584110 100644
--- a/src/sys/types/gid_t.h
+++ b/src/sys/types/gid_t.h
@@ -1,5 +1,3 @@
-#include <sys/types.h>
-
 typedef                                                        unsigned long int
 	gid_t;
 /*
diff --git a/src/sys/types/id_t.h b/src/sys/types/id_t.h
index 9e7990e2..cc1973ae 100644
--- a/src/sys/types/id_t.h
+++ b/src/sys/types/id_t.h
@@ -1,4 +1,3 @@
-#include <sys/types.h>
 typedef unsigned long long int                                             id_t;
 
 /*
diff --git a/src/sys/types/ino_t.h b/src/sys/types/ino_t.h
index f232a979..405bfd57 100644
--- a/src/sys/types/ino_t.h
+++ b/src/sys/types/ino_t.h
@@ -1,5 +1,3 @@
-#include <sys/types.h>
-
 typedef                                                        unsigned long int
 	ino_t;
 
diff --git a/src/sys/types/key_t.h b/src/sys/types/key_t.h
index ab7bb1cc..9a295a17 100644
--- a/src/sys/types/key_t.h
+++ b/src/sys/types/key_t.h
@@ -1,4 +1,3 @@
-#include <sys/types.h>
 typedef unsigned long long int                                            key_t;
 
 /*
diff --git a/src/sys/types/mode_t.h b/src/sys/types/mode_t.h
index 9b68ed05..5d4ac1e4 100644
--- a/src/sys/types/mode_t.h
+++ b/src/sys/types/mode_t.h
@@ -1,5 +1,3 @@
-#include <sys/types.h>
-
 typedef unsigned long int                                                mode_t;
 /*
 POSIX(1)
diff --git a/src/sys/types/nlink_t.h b/src/sys/types/nlink_t.h
index e94c47b4..57d08b74 100644
--- a/src/sys/types/nlink_t.h
+++ b/src/sys/types/nlink_t.h
@@ -1,5 +1,3 @@
-#include <sys/types.h>
-
 typedef                                                        unsigned long int
 	nlink_t;
 /*
diff --git a/src/sys/types/off_t.h b/src/sys/types/off_t.h
index 81ce371d..a6797386 100644
--- a/src/sys/types/off_t.h
+++ b/src/sys/types/off_t.h
@@ -1,5 +1,3 @@
-#include <sys/types.h>
-
 typedef                                                                 long int
 	off_t;
 /*
diff --git a/src/sys/types/pid_t.h b/src/sys/types/pid_t.h
index 91307c09..ca25422e 100644
--- a/src/sys/types/pid_t.h
+++ b/src/sys/types/pid_t.h
@@ -1,5 +1,3 @@
-#include <sys/types.h>
-
 typedef long int                                                          pid_t;
 /*
 POSIX(1)
diff --git a/src/sys/types/size_t.ref b/src/sys/types/size_t.ref
index 2c4c2615..cdac0fd6 100644
--- a/src/sys/types/size_t.ref
+++ b/src/sys/types/size_t.ref
@@ -1,3 +1,2 @@
-#include <sys/types.h>
 REFERENCE(stddef/size_t.c)
 POSIX(1)
diff --git a/src/sys/types/ssize_t.h b/src/sys/types/ssize_t.h
index 2bfdef89..180c980d 100644
--- a/src/sys/types/ssize_t.h
+++ b/src/sys/types/ssize_t.h
@@ -1,5 +1,3 @@
-#include <sys/types.h>
-
 typedef long int                                                        ssize_t;
 
 /*
diff --git a/src/sys/types/time_t.ref b/src/sys/types/time_t.ref
index 7ad0edb9..0c620f9d 100644
--- a/src/sys/types/time_t.ref
+++ b/src/sys/types/time_t.ref
@@ -1,3 +1,2 @@
-#include <sys/types.h>
 REFERENCE(time/time_t.c)
 XOPEN(4)
diff --git a/src/sys/types/timer_t.h b/src/sys/types/timer_t.h
index 49ca4526..8b2aef65 100644
--- a/src/sys/types/timer_t.h
+++ b/src/sys/types/timer_t.h
@@ -1,4 +1,3 @@
-#include <sys/types.h>
 typedef unsigned long int                                               timer_t;
 
 /*
diff --git a/src/sys/types/uid_t.h b/src/sys/types/uid_t.h
index faf47264..b78fff19 100644
--- a/src/sys/types/uid_t.h
+++ b/src/sys/types/uid_t.h
@@ -1,5 +1,3 @@
-#include <sys/types.h>
-
 typedef                                                        unsigned long int
 	uid_t;
 /*
diff --git a/src/sys/types/useconds_t.h b/src/sys/types/useconds_t.h
index fab0354e..54697328 100644
--- a/src/sys/types/useconds_t.h
+++ b/src/sys/types/useconds_t.h
@@ -1,4 +1,3 @@
-#include <sys/types.h>
 typedef unsigned int                                                 useconds_t;
 /*
 XOPEN(400,700)
diff --git a/src/sys/utsname/uname.c b/src/sys/utsname/uname.c
index a6972637..4b82838e 100644
--- a/src/sys/utsname/uname.c
+++ b/src/sys/utsname/uname.c
@@ -1,5 +1,5 @@
 #include <sys/utsname.h>
-#include "string.h"
+#include <string.h>
 #include "_assert.h"
 
 # define __PLATFORM__ "x86"
diff --git a/src/sys/wait/wait.c b/src/sys/wait/wait.c
index be1799fe..ab7b5a72 100644
--- a/src/sys/wait/wait.c
+++ b/src/sys/wait/wait.c
@@ -1,4 +1,4 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <sys/wait.h>
 
 pid_t wait(int *stat_loc)
diff --git a/src/sys/wait/wait3.c b/src/sys/wait/wait3.c
index a530dfa8..d64c1c28 100644
--- a/src/sys/wait/wait3.c
+++ b/src/sys/wait/wait3.c
@@ -1,5 +1,5 @@
-#include "sys/types.h"
-#include "sys/resource.h"
+#include <sys/types.h>
+#include <sys/resource.h>
 #include <sys/wait.h>
 
 pid_t wait3(int *stat_loc, int options, struct rusage *resource_usage)
diff --git a/src/sys/wait/waitid.c b/src/sys/wait/waitid.c
index b8aa19d4..875aa6d7 100644
--- a/src/sys/wait/waitid.c
+++ b/src/sys/wait/waitid.c
@@ -1,18 +1,7 @@
-#include "sys/types.h"
-/*
-#include "sys/time.h"
-#include "ucontext.h"
-#include "signal.h"
+#include <sys/types.h>
 #include <sys/wait.h>
-*/
 #include "_syscall.h"
 
-#define __SYS_WAIT_H__
-
-#include "idtype_t.c"
-
-typedef struct siginfo siginfo_t;
-
 int waitid(idtype_t idtype, id_t id, siginfo_t *infop, int options)
 {
 	SYSCALL(waitid, int, -1, idtype, id, infop, option, NULL, 0);
diff --git a/src/sys/wait/waitpid.c b/src/sys/wait/waitpid.c
index 1b3cb71f..001cc2f6 100644
--- a/src/sys/wait/waitpid.c
+++ b/src/sys/wait/waitpid.c
@@ -1,7 +1,7 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <sys/wait.h>
-#include "signal.h"
-#include "unistd.h"
+#include <signal.h>
+#include <unistd.h>
 #include "_syscall.h"
 
 #ifndef P_PID
diff --git a/src/term/putp.c b/src/term/putp.c
index 6a80fc73..1264f7da 100644
--- a/src/term/putp.c
+++ b/src/term/putp.c
@@ -1,5 +1,5 @@
 #include <term.h>
-#include "curses.h"
+#include <curses.h>
 
 int putp(const char * str)
 {
diff --git a/src/term/tgetent.c b/src/term/tgetent.c
index ab9a677f..96978e40 100644
--- a/src/term/tgetent.c
+++ b/src/term/tgetent.c
@@ -1,5 +1,5 @@
 #include <term.h>
-#include "curses.h"
+#include <curses.h>
 
 int tgetent(char * bp, const char * name)
 {
diff --git a/src/term/tgetflag.c b/src/term/tgetflag.c
index 35521777..844f142a 100644
--- a/src/term/tgetflag.c
+++ b/src/term/tgetflag.c
@@ -1,5 +1,4 @@
 #include <term.h>
-#include "stddef.h"
 
 int tgetflag(char id[2])
 {
diff --git a/src/term/tgetnum.c b/src/term/tgetnum.c
index e5fca9cb..18307000 100644
--- a/src/term/tgetnum.c
+++ b/src/term/tgetnum.c
@@ -1,5 +1,4 @@
 #include <term.h>
-#include "stddef.h"
 
 int tgetnum(char id[2])
 {
diff --git a/src/term/tgetstr.c b/src/term/tgetstr.c
index 19a42334..394627a3 100644
--- a/src/term/tgetstr.c
+++ b/src/term/tgetstr.c
@@ -1,5 +1,5 @@
 #include <term.h>
-#include "string.h"
+#include <string.h>
 
 char * tgetstr(char id[2], char ** area)
 {
diff --git a/src/termios/cfsetispeed.c b/src/termios/cfsetispeed.c
index a1e3ec5b..b13c8423 100644
--- a/src/termios/cfsetispeed.c
+++ b/src/termios/cfsetispeed.c
@@ -1,5 +1,5 @@
 #include <termios.h>
-#include "errno.h"
+#include <errno.h>
 #include "_assert.h"
 
 int cfsetispeed(struct termios *termios_p, speed_t speed)
diff --git a/src/termios/cfsetospeed.c b/src/termios/cfsetospeed.c
index a2b36d6b..edb3f994 100644
--- a/src/termios/cfsetospeed.c
+++ b/src/termios/cfsetospeed.c
@@ -1,5 +1,5 @@
 #include <termios.h>
-#include "errno.h"
+#include <errno.h>
 #include "_assert.h"
 
 int cfsetospeed(struct termios *termios_p, speed_t speed)
diff --git a/src/termios/tcgetsid.c b/src/termios/tcgetsid.c
index aa6c44de..4a202233 100644
--- a/src/termios/tcgetsid.c
+++ b/src/termios/tcgetsid.c
@@ -1,4 +1,4 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <termios.h>
 
 pid_t tcgetsid(int fildes)
diff --git a/src/time/asctime_s.c b/src/time/asctime_s.c
index 69f9fd33..87985906 100644
--- a/src/time/asctime_s.c
+++ b/src/time/asctime_s.c
@@ -1,5 +1,5 @@
-#include "time.h"
-#include "stdio.h"
+#include <time.h>
+#include <stdio.h>
 
 /** convert broken down time to string **/
 errno_t asctime_s(char *s, rsize_t maxsize, const struct tm * timeptr)
diff --git a/src/time/ctime_s.c b/src/time/ctime_s.c
index 8813247c..a8b8e7f3 100644
--- a/src/time/ctime_s.c
+++ b/src/time/ctime_s.c
@@ -1,4 +1,4 @@
-#include "time.h"
+#include <time.h>
 
 /** convert arithmetic time to string **/
 errno_t ctime_s(char *s, rsize_t maxsize, const time_t *timer)
diff --git a/src/time/gmtime_s.c b/src/time/gmtime_s.c
index 1629a651..30464211 100644
--- a/src/time/gmtime_s.c
+++ b/src/time/gmtime_s.c
@@ -1,4 +1,4 @@
-#include "time.h"
+#include <time.h>
 
 /** convert arithmetic time to borken down time **/
 struct tm * gmtime_s(const time_t * restrict timer, struct tm * restrict result)
diff --git a/src/time/localtime_s.c b/src/time/localtime_s.c
index f8ad731a..8a8797fb 100644
--- a/src/time/localtime_s.c
+++ b/src/time/localtime_s.c
@@ -1,4 +1,4 @@
-#include "time.h"
+#include <time.h>
 
 /** convert arithmetic time to broken down time **/
 struct tm * localtime_s(const time_t * restrict timer, struct tm * restrict result)
diff --git a/src/ulimit/ulimit.c b/src/ulimit/ulimit.c
index 1588ea3a..8d763209 100644
--- a/src/ulimit/ulimit.c
+++ b/src/ulimit/ulimit.c
@@ -1,8 +1,8 @@
 #include <ulimit.h>
-#include "sys/resource.h"
-#include "stdarg.h"
-#include "stddef.h"
-#include "errno.h"
+#include <sys/resource.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <errno.h>
 
 long ulimit(int cmd, ...)
 {
diff --git a/src/unctrl/unctrl.c b/src/unctrl/unctrl.c
index 3ec00c33..fc77e6bf 100644
--- a/src/unctrl/unctrl.c
+++ b/src/unctrl/unctrl.c
@@ -1,7 +1,7 @@
 #include <unctrl.h>
-#include "curses.h"
-#include "ctype.h"
-#include "stddef.h"
+#include <curses.h>
+#include <ctype.h>
+#include <stddef.h>
 
 char * unctrl(chtype c)
 {
diff --git a/src/unistd/_exit.c b/src/unistd/_exit.c
index efdc7059..07a0e53f 100644
--- a/src/unistd/_exit.c
+++ b/src/unistd/_exit.c
@@ -1,5 +1,5 @@
-#include "stddef.h"
-#include "sys/types.h"
+#include <stddef.h>
+#include <sys/types.h>
 #include <unistd.h>
 #include "_syscall.h"
 
diff --git a/src/unistd/access.c b/src/unistd/access.c
index 25554edf..5f80359d 100644
--- a/src/unistd/access.c
+++ b/src/unistd/access.c
@@ -1,8 +1,8 @@
-#include "stddef.h"
-#include "sys/types.h"
+#include <stddef.h>
+#include <sys/types.h>
 #include <unistd.h>
-#include "errno.h"
-#include "sys/stat.h"
+#include <errno.h>
+#include <sys/stat.h>
 
 int access(const char *path, int amode)
 {
diff --git a/src/unistd/alarm.c b/src/unistd/alarm.c
index c34d04e2..4137902a 100644
--- a/src/unistd/alarm.c
+++ b/src/unistd/alarm.c
@@ -1,5 +1,5 @@
-#include "stddef.h"
-#include "sys/types.h"
+#include <stddef.h>
+#include <sys/types.h>
 #include <unistd.h>
 #include "_syscall.h"
 
diff --git a/src/unistd/chdir.c b/src/unistd/chdir.c
index 8b80651b..91ef4a52 100644
--- a/src/unistd/chdir.c
+++ b/src/unistd/chdir.c
@@ -1,5 +1,5 @@
-#include "stddef.h"
-#include "sys/types.h"
+#include <stddef.h>
+#include <sys/types.h>
 #include <unistd.h>
 #include "_syscall.h"
 
diff --git a/src/unistd/chown.c b/src/unistd/chown.c
index b1c5569b..38bd3d32 100644
--- a/src/unistd/chown.c
+++ b/src/unistd/chown.c
@@ -1,5 +1,4 @@
-#include "stddef.h"
-#include "sys/types.h"
+#include <sys/types.h>
 #include <unistd.h>
 #include "_syscall.h"
 
diff --git a/src/unistd/close.c b/src/unistd/close.c
index 69739c29..eb3893f7 100644
--- a/src/unistd/close.c
+++ b/src/unistd/close.c
@@ -1,5 +1,4 @@
-#include "stddef.h"
-#include "sys/types.h"
+#include <sys/types.h>
 #include <unistd.h>
 #include "_syscall.h"
 
diff --git a/src/unistd/confstr.c b/src/unistd/confstr.c
index bd66bd67..e1f9e17f 100644
--- a/src/unistd/confstr.c
+++ b/src/unistd/confstr.c
@@ -1,7 +1,7 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <unistd.h>
-#include "errno.h"
-#include "string.h"
+#include <errno.h>
+#include <string.h>
 #include "_assert.h"
 
 size_t confstr(int name, char *buf, size_t len)
diff --git a/src/unistd/ctermid.c b/src/unistd/ctermid.c
index 122bed8a..fd87684e 100644
--- a/src/unistd/ctermid.c
+++ b/src/unistd/ctermid.c
@@ -1,17 +1,18 @@
-#include "stddef.h"
-#include "sys/types.h"
+#include <stddef.h>
+#include <sys/types.h>
 #include <unistd.h>
-#include "stdio.h"
-#include "stdio/_stdio.h"
-#include "string.h"
+#include <stdio.h>
+#include <string.h>
 
 char * ctermid(char * s)
 {
+	static char ctid[L_ctermid + 1] = "/dev/tty";
+
 	/* TODO: return the empty string if there is no controlling terminal */
 	if (s == NULL) {
-		s = __stdio.ctermid;
+		s = ctid;
 	} else {
-		strcpy(s, __stdio.ctermid);
+		strcpy(s, ctid);
 	}
 
 	return s;
diff --git a/src/unistd/cuserid.c b/src/unistd/cuserid.c
index 1fa65dbe..a49b56a2 100644
--- a/src/unistd/cuserid.c
+++ b/src/unistd/cuserid.c
@@ -1,9 +1,9 @@
-#include "stddef.h"
-#include "sys/types.h"
+#include <stddef.h>
+#include <sys/types.h>
 #include <unistd.h>
-#include "stdio.h"
-#include "string.h"
-#include "pwd.h"
+#include <stdio.h>
+#include <string.h>
+#include <pwd.h>
 
 char *cuserid(char *s)
 {
diff --git a/src/unistd/dup.c b/src/unistd/dup.c
index badc0f86..deff2ebf 100644
--- a/src/unistd/dup.c
+++ b/src/unistd/dup.c
@@ -1,7 +1,7 @@
-#include "stddef.h"
-#include "sys/types.h"
+#include <stddef.h>
+#include <sys/types.h>
 #include <unistd.h>
-#include "fcntl.h"
+#include <fcntl.h>
 
 int dup(int fildes)
 {
diff --git a/src/unistd/dup2.c b/src/unistd/dup2.c
index ba709a3c..89d0cb8d 100644
--- a/src/unistd/dup2.c
+++ b/src/unistd/dup2.c
@@ -1,9 +1,9 @@
-#include "stddef.h"
-#include "sys/types.h"
+#include <stddef.h>
+#include <sys/types.h>
 #include <unistd.h>
-#include "fcntl.h"
-#include "limits.h"
-#include "errno.h"
+#include <fcntl.h>
+#include <limits.h>
+#include <errno.h>
 #include "_syscall.h"
 
 int dup2(int fildes, int fildes2)
diff --git a/src/unistd/execl.c b/src/unistd/execl.c
index 4bfcdd9b..f2b459da 100644
--- a/src/unistd/execl.c
+++ b/src/unistd/execl.c
@@ -1,8 +1,8 @@
-#include "stddef.h"
-#include "sys/types.h"
+#include <stddef.h>
+#include <sys/types.h>
 #include <unistd.h>
-#include "limits.h"
-#include "stdarg.h"
+#include <limits.h>
+#include <stdarg.h>
 
 int execl(const char *path, const char *arg0, ...  /*, (char *)0 */)
 {
diff --git a/src/unistd/execle.c b/src/unistd/execle.c
index d1f42a36..d9a8dfeb 100644
--- a/src/unistd/execle.c
+++ b/src/unistd/execle.c
@@ -1,8 +1,8 @@
-#include "stddef.h"
-#include "sys/types.h"
+#include <stddef.h>
+#include <sys/types.h>
 #include <unistd.h>
-#include "limits.h"
-#include "stdarg.h"
+#include <limits.h>
+#include <stdarg.h>
 
 int execle(const char *path, const char *arg0, ... /*, (char *)0, char *const envp[] */)
 {
diff --git a/src/unistd/execlp.c b/src/unistd/execlp.c
index 55d779eb..14a5f868 100644
--- a/src/unistd/execlp.c
+++ b/src/unistd/execlp.c
@@ -1,8 +1,8 @@
-#include "stddef.h"
-#include "sys/types.h"
+#include <stddef.h>
+#include <sys/types.h>
 #include <unistd.h>
-#include "stdarg.h"
-#include "limits.h"
+#include <stdarg.h>
+#include <limits.h>
 
 int execlp(const char *file, const char *arg0, ...  /*, (char *0) */)
 {
diff --git a/src/unistd/execv.c b/src/unistd/execv.c
index 3b3e29fb..5d380b97 100644
--- a/src/unistd/execv.c
+++ b/src/unistd/execv.c
@@ -1,5 +1,4 @@
-#include "stddef.h"
-#include "sys/types.h"
+#include <sys/types.h>
 #include <unistd.h>
 
 int execv(const char *path, char *const argv[])
diff --git a/src/unistd/execve.c b/src/unistd/execve.c
index 504fd0d5..de54fa56 100644
--- a/src/unistd/execve.c
+++ b/src/unistd/execve.c
@@ -1,5 +1,5 @@
-#include "stddef.h"
-#include "sys/types.h"
+#include <errno.h>
+#include <sys/types.h>
 #include <unistd.h>
 #include "_syscall.h"
 
diff --git a/src/unistd/execvp.c b/src/unistd/execvp.c
index 5ad54781..6269f4cd 100644
--- a/src/unistd/execvp.c
+++ b/src/unistd/execvp.c
@@ -1,7 +1,6 @@
-#include "stddef.h"
-#include "sys/types.h"
+#include <sys/types.h>
 #include <unistd.h>
-#include "errno.h"
+#include <errno.h>
 
 int execvp(const char *file, char *const argv[])
 {
diff --git a/src/unistd/fork.c b/src/unistd/fork.c
index 8a03bf32..53ae4569 100644
--- a/src/unistd/fork.c
+++ b/src/unistd/fork.c
@@ -1,7 +1,4 @@
-#include "stddef.h"
-#include "sys/types.h"
-#include <unistd.h>
-#include "errno.h"
+#include <sys/types.h>
 #include "_syscall.h"
 
 pid_t fork(void)
diff --git a/src/unistd/fpathconf.c b/src/unistd/fpathconf.c
index 37fcf41a..79106666 100644
--- a/src/unistd/fpathconf.c
+++ b/src/unistd/fpathconf.c
@@ -1,5 +1,4 @@
-#include "stddef.h"
-#include "sys/types.h"
+#include <sys/types.h>
 #include <unistd.h>
 
 long fpathconf(int fildes, int name)
diff --git a/src/unistd/getcwd.c b/src/unistd/getcwd.c
index 202b8992..d6e65228 100644
--- a/src/unistd/getcwd.c
+++ b/src/unistd/getcwd.c
@@ -1,4 +1,4 @@
-#include "sys/types.h"
+#include <sys/types.h>
 #include <unistd.h>
 #include "_assert.h"
 #include "_syscall.h"
diff --git a/src/unistd/getegid.c b/src/unistd/getegid.c
index 0469abb0..e1e24f0a 100644
--- a/src/unistd/getegid.c
+++ b/src/unistd/getegid.c
@@ -1,6 +1,4 @@
-#include "stddef.h"
-#include "sys/types.h"
-#include <unistd.h>
+#include <sys/types.h>
 #include "_syscall.h"
 
 gid_t getegid(void)
diff --git a/src/unistd/geteuid.c b/src/unistd/geteuid.c
index 20110eb4..d7f3a610 100644
--- a/src/unistd/geteuid.c
+++ b/src/unistd/geteuid.c
@@ -1,6 +1,4 @@
-#include "stddef.h"
-#include "sys/types.h"
-#include <unistd.h>
+#include <sys/types.h>
 #include "_syscall.h"
 
 uid_t geteuid(void)
diff --git a/src/unistd/getgid.c b/src/unistd/getgid.c
index 09e9611f..217775ac 100644
--- a/src/unistd/getgid.c
+++ b/src/unistd/getgid.c
@@ -1,6 +1,4 @@
-#include "stddef.h"
-#include "sys/types.h"
-#include <unistd.h>
+#include <sys/types.h>
 #include "_syscall.h"
 
 gid_t getgid(void)
diff --git a/src/unistd/getgroups.c b/src/unistd/getgroups.c
index 356adaa3..f92139f3 100644
--- a/src/unistd/getgroups.c
+++ b/src/unistd/getgroups.c
@@ -1,7 +1,4 @@
-#include "stddef.h"
-#include "sys/types.h"
-#include <unistd.h>
-#include "errno.h"
+#include <sys/types.h>
 #include "_syscall.h"
 #include "_assert.h"
 
diff --git a/src/unistd/getlogin.c b/src/unistd/getlogin.c
index bd110395..1bed5ee8 100644
--- a/src/unistd/getlogin.c
+++ b/src/unistd/getlogin.c
@@ -1,7 +1,4 @@
-#include "stddef.h"
-#include "sys/types.h"
-#include <unistd.h>
-#include "stdlib.h"
+#include <stdlib.h>
 
 char * getlogin(void)
 {
diff --git a/src/unistd/getopt.c b/src/unistd/getopt.c
index 337de1e8..2f68f647 100644
--- a/src/unistd/getopt.c
+++ b/src/unistd/getopt.c
@@ -1,6 +1,6 @@
-#include "sys/types.h"
-#include "string.h"
-#include "stdio.h"
+#include <sys/types.h>
+#include <string.h>
+#include <stdio.h>
 #include <unistd.h>
 
 int getopt(int argc, char * const argv[], const char *optstring)
diff --git a/src/unistd/getpgrp.c b/src/unistd/getpgrp.c
index 91db3ed5..5a325790 100644
--- a/src/unistd/getpgrp.c
+++ b/src/unistd/getpgrp.c
@@ -1,6 +1,4 @@
-#include "stddef.h"
-#include "sys/types.h"
-#include <unistd.h>
+#include <sys/types.h>
 #include "_syscall.h"
 
 pid_t getpgrp(void)
diff --git a/src/unistd/getpid.c b/src/unistd/getpid.c
index 09a16120..a20ef458 100644
--- a/src/unistd/getpid.c
+++ b/src/unistd/getpid.c
@@ -1,6 +1,4 @@
-#include "stddef.h"
-#include "sys/types.h"
-#include <unistd.h>
+#include <sys/types.h>
 #include "_syscall.h"
 
 pid_t getpid(void)
diff --git a/src/unistd/getppid.c b/src/unistd/getppid.c
index 931ea41c..99504aa5 100644
--- a/src/unistd/getppid.c
+++ b/src/unistd/getppid.c
@@ -1,6 +1,4 @@
-#include "stddef.h"
-#include "sys/types.h"
-#include <unistd.h>
+#include <sys/types.h>
 #include "_syscall.h"
 
 pid_t getppid(void)
diff --git a/src/unistd/getuid.c b/src/unistd/getuid.c
index 02d2143d..bf646dd6 100644
--- a/src/unistd/getuid.c
+++ b/src/unistd/getuid.c
@@ -1,6 +1,4 @@
-#include "stddef.h"
-#include "sys/types.h"
-#include <unistd.h>
+#include <sys/types.h>
 #include "_syscall.h"
 
 uid_t getuid(void)
diff --git a/src/unistd/isatty.c b/src/unistd/isatty.c
index cc27576f..f544d8d6 100644
--- a/src/unistd/isatty.c
+++ b/src/unistd/isatty.c
@@ -1,7 +1,6 @@
-#include "stddef.h"
-#include "sys/types.h"
+#include <sys/types.h>
 #include <unistd.h>
-#include "termios.h"
+#include <termios.h>
 
 /** test for a terminal device **/
 
diff --git a/src/unistd/link.c b/src/unistd/link.c
index 99e2b508..dd94f497 100644
--- a/src/unistd/link.c
+++ b/src/unistd/link.c
@@ -1,5 +1,4 @@
-#include "stddef.h"
-#include "sys/types.h"
+#include <sys/types.h>
 #include <unistd.h>
 #include "_syscall.h"
 
diff --git a/src/unistd/lseek.c b/src/unistd/lseek.c
index 5f5eb78c..a5d30931 100644
--- a/src/unistd/lseek.c
+++ b/src/unistd/lseek.c
@@ -1,5 +1,4 @@
-#include "stddef.h"
-#include "sys/types.h"
+#include <sys/types.h>
 #include <unistd.h>
 #include "_syscall.h"
 
diff --git a/src/unistd/optarg.c b/src/unistd/optarg.c
index 8eddca9d..07b6c465 100644
--- a/src/unistd/optarg.c
+++ b/src/unistd/optarg.c
@@ -1,5 +1,3 @@
-#include "sys/types.h"
-#include <unistd.h>
 char * optarg;
 /*
 POSIX(2)
diff --git a/src/unistd/opterr.c b/src/unistd/opterr.c
index 68d44563..57cc476d 100644
--- a/src/unistd/opterr.c
+++ b/src/unistd/opterr.c
@@ -1,5 +1,3 @@
-#include "sys/types.h"
-#include <unistd.h>
 int opterr;
 /*
 POSIX(2)
diff --git a/src/unistd/optind.c b/src/unistd/optind.c
index b6cff979..a3438432 100644
--- a/src/unistd/optind.c
+++ b/src/unistd/optind.c
@@ -1,5 +1,3 @@
-#include "sys/types.h"
-#include <unistd.h>
 int optind;
 /*
 POSIX(2)
diff --git a/src/unistd/optopt.c b/src/unistd/optopt.c
index 797f4fd9..cff25ef2 100644
--- a/src/unistd/optopt.c
+++ b/src/unistd/optopt.c
@@ -1,5 +1,3 @@
-#include "sys/types.h"
-#include <unistd.h>
 int optopt;
 /*
 POSIX(2)
diff --git a/src/unistd/pathconf.c b/src/unistd/pathconf.c
index c871970e..c36b6f79 100644
--- a/src/unistd/pathconf.c
+++ b/src/unistd/pathconf.c
@@ -1,5 +1,4 @@
-#include "stddef.h"
-#include "sys/types.h"
+#include <sys/types.h>
 #include <unistd.h>
 
 long pathconf(const char *path, int name)
diff --git a/src/unistd/pause.c b/src/unistd/pause.c
index 06080010..b1ece40e 100644
--- a/src/unistd/pause.c
+++ b/src/unistd/pause.c
@@ -1,6 +1,3 @@
-#include "stddef.h"
-#include "sys/types.h"
-#include <unistd.h>
 #include "_syscall.h"
 
 int pause(void)
diff --git a/src/unistd/pipe.c b/src/unistd/pipe.c
index 4c09d22c..df72e548 100644
--- a/src/unistd/pipe.c
+++ b/src/unistd/pipe.c
@@ -1,5 +1,4 @@
-#include "stddef.h"
-#include "sys/types.h"
+#include <sys/types.h>
 #include <unistd.h>
 #include "_assert.h"
 #include "_syscall.h"
diff --git a/src/unistd/read.c b/src/unistd/read.c
index b275c789..bb48e4f3 100644
--- a/src/unistd/read.c
+++ b/src/unistd/read.c
@@ -1,7 +1,4 @@
-#include "stddef.h"
-#include "sys/types.h"
-#include <unistd.h>
-#include "errno.h"
+#include <sys/types.h>
 #include "_syscall.h"
 
 ssize_t read(int fildes, void *buf, size_t nbyte)
diff --git a/src/unistd/rmdir.c b/src/unistd/rmdir.c
index 828767c0..c2137acd 100644
--- a/src/unistd/rmdir.c
+++ b/src/unistd/rmdir.c
@@ -1,7 +1,3 @@
-#include "stddef.h"
-#include "sys/types.h"
-#include <unistd.h>
-#include "errno.h"
 #include "_syscall.h"
 
 int rmdir(const char *path)
diff --git a/src/unistd/setgid.c b/src/unistd/setgid.c
index ecef806d..0cc74a2e 100644
--- a/src/unistd/setgid.c
+++ b/src/unistd/setgid.c
@@ -1,6 +1,4 @@
-#include "stddef.h"
-#include "sys/types.h"
-#include <unistd.h>
+#include <sys/types.h>
 #include "_syscall.h"
 
 int setgid(gid_t gid)
diff --git a/src/unistd/setpgid.c b/src/unistd/setpgid.c
index ee9aa2f4..681af1bb 100644
--- a/src/unistd/setpgid.c
+++ b/src/unistd/setpgid.c
@@ -1,7 +1,4 @@
-#include "stddef.h"
-#include "sys/types.h"
-#include <unistd.h>
-#include "errno.h"
+#include <sys/types.h>
 #include "_syscall.h"
 
 int setpgid(pid_t pid, pid_t pgid)
diff --git a/src/unistd/setsid.c b/src/unistd/setsid.c
index f43731a9..83edc78e 100644
--- a/src/unistd/setsid.c
+++ b/src/unistd/setsid.c
@@ -1,6 +1,4 @@
-#include "stddef.h"
-#include "sys/types.h"
-#include <unistd.h>
+#include <sys/types.h>
 #include "_syscall.h"
 
 pid_t setsid(void)
diff --git a/src/unistd/setuid.c b/src/unistd/setuid.c
index 9f13e543..ef104a3e 100644
--- a/src/unistd/setuid.c
+++ b/src/unistd/setuid.c
@@ -1,6 +1,4 @@
-#include "stddef.h"
-#include "sys/types.h"
-#include <unistd.h>
+#include <sys/types.h>
 #include "_syscall.h"
 
 int setuid(uid_t uid)
diff --git a/src/unistd/sleep.c b/src/unistd/sleep.c
index e4f8bb1c..e0b0c476 100644
--- a/src/unistd/sleep.c
+++ b/src/unistd/sleep.c
@@ -4,8 +4,6 @@
 #endif
 
 #include <sys/types.h>
-#include <stddef.h>
-#include <unistd.h>
 #include <time.h>
 #include "_syscall.h"
 
diff --git a/src/unistd/sysconf.c b/src/unistd/sysconf.c
index 100dab5b..ae8aa5a3 100644
--- a/src/unistd/sysconf.c
+++ b/src/unistd/sysconf.c
@@ -1,5 +1,4 @@
-#include "stddef.h"
-#include "sys/types.h"
+#include <sys/types.h>
 #include <unistd.h>
 
 long sysconf(int name)
diff --git a/src/unistd/tcgetpgrp.c b/src/unistd/tcgetpgrp.c
index 40b60a7e..f2924d5f 100644
--- a/src/unistd/tcgetpgrp.c
+++ b/src/unistd/tcgetpgrp.c
@@ -1,5 +1,4 @@
-#include "stddef.h"
-#include "sys/types.h"
+#include <sys/types.h>
 #include <unistd.h>
 #include "termios/_termios.h"
 
diff --git a/src/unistd/tcsetpgrp.c b/src/unistd/tcsetpgrp.c
index aef0acf5..6e85e652 100644
--- a/src/unistd/tcsetpgrp.c
+++ b/src/unistd/tcsetpgrp.c
@@ -1,7 +1,6 @@
-#include "stddef.h"
-#include "sys/types.h"
+#include <sys/types.h>
 #include <unistd.h>
-#include "termios/_termios.h"
+#include <termios/_termios.h>
 
 int tcsetpgrp(int fildes, pid_t pgid_id)
 {
diff --git a/src/unistd/ttyname.c b/src/unistd/ttyname.c
index 216637c5..471d3ad7 100644
--- a/src/unistd/ttyname.c
+++ b/src/unistd/ttyname.c
@@ -1,8 +1,7 @@
-#include "stddef.h"
-#include "sys/types.h"
+#include <sys/types.h>
 #include <unistd.h>
-#include "limits.h"
-#include "stdio.h"
+#include <limits.h>
+#include <stdio.h>
 #include "_unistd.h"
 #include "_syscall.h"
 
diff --git a/src/unistd/unlink.c b/src/unistd/unlink.c
index 46f3183a..11153c5e 100644
--- a/src/unistd/unlink.c
+++ b/src/unistd/unlink.c
@@ -1,5 +1,4 @@
-#include "stddef.h"
-#include "sys/types.h"
+#include <sys/types.h>
 #include <unistd.h>
 #include "_assert.h"
 #include "_syscall.h"
diff --git a/src/unistd/write.c b/src/unistd/write.c
index 1d95b807..d893c288 100644
--- a/src/unistd/write.c
+++ b/src/unistd/write.c
@@ -1,5 +1,4 @@
-#include "stddef.h"
-#include "sys/types.h"
+#include <sys/types.h>
 #include <unistd.h>
 #include "_assert.h"
 #include "_syscall.h"
diff --git a/src/utime/utime.c b/src/utime/utime.c
index 0ff34006..f79fcfa9 100644
--- a/src/utime/utime.c
+++ b/src/utime/utime.c
@@ -1,4 +1,4 @@
-#include "time.h"
+#include <time.h>
 #include <utime.h>
 #include "_syscall.h"
 
diff --git a/src/utmpx/getutxent.c b/src/utmpx/getutxent.c
index f853cdac..815b735f 100644
--- a/src/utmpx/getutxent.c
+++ b/src/utmpx/getutxent.c
@@ -1,5 +1,5 @@
 #include <utmpx.h>
-#include "stddef.h"
+#include <stddef.h>
 
 struct utmpx * getutxent(void)
 {
diff --git a/src/utmpx/getutxid.c b/src/utmpx/getutxid.c
index d761e288..9a7690a1 100644
--- a/src/utmpx/getutxid.c
+++ b/src/utmpx/getutxid.c
@@ -1,5 +1,5 @@
 #include <utmpx.h>
-#include "stddef.h"
+#include <stddef.h>
 
 struct utmpx * getutxid(const struct utmpx *id)
 {
diff --git a/src/utmpx/getutxline.c b/src/utmpx/getutxline.c
index 40b2deb9..ceed9b1e 100644
--- a/src/utmpx/getutxline.c
+++ b/src/utmpx/getutxline.c
@@ -1,5 +1,5 @@
 #include <utmpx.h>
-#include "stddef.h"
+#include <stddef.h>
 
 struct utmpx * getutxline(const struct utmpx *line)
 {
diff --git a/src/utmpx/pututxline.c b/src/utmpx/pututxline.c
index 08cb3f51..43e5ecc7 100644
--- a/src/utmpx/pututxline.c
+++ b/src/utmpx/pututxline.c
@@ -1,5 +1,5 @@
 #include <utmpx.h>
-#include "stddef.h"
+#include <stddef.h>
 
 struct utmpx * pututxline(const struct utmpx *utmpx)
 {
diff --git a/src/wchar/btowc.c b/src/wchar/btowc.c
index dd986119..5dee422d 100644
--- a/src/wchar/btowc.c
+++ b/src/wchar/btowc.c
@@ -1,6 +1,6 @@
 #include <wchar.h>
-#include "locale.h"
-#include "string.h"
+#include <locale.h>
+#include <string.h>
 
 wint_t btowc(int c)
 {
diff --git a/src/wchar/fgetws.c b/src/wchar/fgetws.c
index b4d66a71..a7210445 100644
--- a/src/wchar/fgetws.c
+++ b/src/wchar/fgetws.c
@@ -1,5 +1,5 @@
 #include <wchar.h>
-#include "stdio.h"
+#include <stdio.h>
 #include "_assert.h"
 
 wchar_t * fgetws(wchar_t * restrict s, int n, FILE * restrict stream)
diff --git a/src/wchar/fwide.c b/src/wchar/fwide.c
index ddf322b5..30699836 100644
--- a/src/wchar/fwide.c
+++ b/src/wchar/fwide.c
@@ -1,5 +1,5 @@
 #include <wchar.h>
-#include "stdio.h"
+#include <stdio.h>
 #include "stdio/_stdio.h"
 #include "_assert.h"
 
diff --git a/src/wchar/fwprintf.c b/src/wchar/fwprintf.c
index 540405f9..308f4fa0 100644
--- a/src/wchar/fwprintf.c
+++ b/src/wchar/fwprintf.c
@@ -1,6 +1,6 @@
 #include <wchar.h>
-#include "stdio.h"
-#include "stdarg.h"
+#include <stdio.h>
+#include <stdarg.h>
 
 int fwprintf(FILE * restrict stream, const wchar_t * restrict format, ...)
 {
diff --git a/src/wchar/fwprintf_s.c b/src/wchar/fwprintf_s.c
index c3011d8d..a88ef2c8 100644
--- a/src/wchar/fwprintf_s.c
+++ b/src/wchar/fwprintf_s.c
@@ -1,5 +1,5 @@
-#include "stdio.h"
-#include "wchar.h"
+#include <stdio.h>
+#include <wchar.h>
 
 int fwprintf_s(FILE * restrict stream, const wchar_t * restrict format, ...)
 {
diff --git a/src/wchar/fwscanf_s.c b/src/wchar/fwscanf_s.c
index 8f16dca7..a55c9d76 100644
--- a/src/wchar/fwscanf_s.c
+++ b/src/wchar/fwscanf_s.c
@@ -1,5 +1,5 @@
-#include "stdio.h"
-#include "wchar.h"
+#include <stdio.h>
+#include <wchar.h>
 
 int fwscanf_s(FILE * restrict stream, const wchar_t * restrict format, ...)
 {
diff --git a/src/wchar/getwc.c b/src/wchar/getwc.c
index 6783e93c..9ee36186 100644
--- a/src/wchar/getwc.c
+++ b/src/wchar/getwc.c
@@ -1,5 +1,5 @@
 #include <wchar.h>
-#include "stdio.h"
+#include <stdio.h>
 
 wint_t getwc(FILE * stream)
 {
diff --git a/src/wchar/getwchar.c b/src/wchar/getwchar.c
index 8d4efa06..2b0d54ce 100644
--- a/src/wchar/getwchar.c
+++ b/src/wchar/getwchar.c
@@ -1,5 +1,5 @@
 #include <wchar.h>
-#include "stdio.h"
+#include <stdio.h>
 
 wint_t getwchar(void)
 {
diff --git a/src/wchar/mbsrtowcs_s.c b/src/wchar/mbsrtowcs_s.c
index 28c89f61..b4c64298 100644
--- a/src/wchar/mbsrtowcs_s.c
+++ b/src/wchar/mbsrtowcs_s.c
@@ -1,4 +1,4 @@
-#include "wchar.h"
+#include <wchar.h>
 
 errno_t mbsrtowcs_s(size_t * restrict retval,
 	wchar_t * restrict dst, rsize_t dstmax,
diff --git a/src/wchar/putwc.c b/src/wchar/putwc.c
index 58154c49..10181319 100644
--- a/src/wchar/putwc.c
+++ b/src/wchar/putwc.c
@@ -1,5 +1,5 @@
 #include <wchar.h>
-#include "stdio.h"
+#include <stdio.h>
 
 wint_t putwc(wchar_t c, FILE * stream)
 {
diff --git a/src/wchar/putwchar.c b/src/wchar/putwchar.c
index 291c45e9..659f4dd7 100644
--- a/src/wchar/putwchar.c
+++ b/src/wchar/putwchar.c
@@ -1,5 +1,5 @@
 #include <wchar.h>
-#include "stdio.h"
+#include <stdio.h>
 
 wint_t putwchar(wchar_t c)
 {
diff --git a/src/wchar/snwprintf_s.c b/src/wchar/snwprintf_s.c
index 20ebc8db..bd3a537d 100644
--- a/src/wchar/snwprintf_s.c
+++ b/src/wchar/snwprintf_s.c
@@ -1,4 +1,4 @@
-#include "wchar.h"
+#include <wchar.h>
 
 int snwprintf_s(wchar_t * restrict s, rsize_t n, const wchar_t * restrict format, ...)
 {
diff --git a/src/wchar/swprintf.c b/src/wchar/swprintf.c
index 1b9ef406..c9a6dcc6 100644
--- a/src/wchar/swprintf.c
+++ b/src/wchar/swprintf.c
@@ -1,5 +1,5 @@
 #include <wchar.h>
-#include "stdarg.h"
+#include <stdarg.h>
 
 int swprintf(wchar_t * restrict s, size_t n, const wchar_t * restrict format, ...)
 {
diff --git a/src/wchar/swprintf_s.c b/src/wchar/swprintf_s.c
index ade55f4e..4f5a4d82 100644
--- a/src/wchar/swprintf_s.c
+++ b/src/wchar/swprintf_s.c
@@ -1,4 +1,4 @@
-#include "wchar.h"
+#include <wchar.h>
 
 int swprintf_s(wchar_t * restrict s, rsize_t n, const wchar_t * restrict format,
 	...)
diff --git a/src/wchar/swscanf_s.c b/src/wchar/swscanf_s.c
index e89fb20c..e00b3e4c 100644
--- a/src/wchar/swscanf_s.c
+++ b/src/wchar/swscanf_s.c
@@ -1,4 +1,4 @@
-#include "wchar.h"
+#include <wchar.h>
 
 int swscanf_s(const wchar_t * restrict s, const wchar_t * restrict format, ...)
 {
diff --git a/src/wchar/ungetwc.c b/src/wchar/ungetwc.c
index 7c40ddb5..72f1fc21 100644
--- a/src/wchar/ungetwc.c
+++ b/src/wchar/ungetwc.c
@@ -1,5 +1,5 @@
 #include <wchar.h>
-#include "stdio.h"
+#include <stdio.h>
 
 wint_t ungetwc(wint_t c, FILE * stream)
 {
diff --git a/src/wchar/vfwprintf_s.c b/src/wchar/vfwprintf_s.c
index 3b18525f..74d0e106 100644
--- a/src/wchar/vfwprintf_s.c
+++ b/src/wchar/vfwprintf_s.c
@@ -1,5 +1,5 @@
-#include "stdio.h"
-#include "wchar.h"
+#include <stdio.h>
+#include <wchar.h>
 
 int vfwprintf_s(FILE * restrict stream, const wchar_t * restrict format, va_list arg)
 {
diff --git a/src/wchar/vfwscanf_s.c b/src/wchar/vfwscanf_s.c
index 163741a1..ea6103ea 100644
--- a/src/wchar/vfwscanf_s.c
+++ b/src/wchar/vfwscanf_s.c
@@ -1,5 +1,5 @@
-#include "stdio.h"
-#include "wchar.h"
+#include <stdio.h>
+#include <wchar.h>
 
 int vfwscanf_s(FILE * restrict stream, const wchar_t * restrict format, va_list arg)
 {
diff --git a/src/wchar/vswprintf_s.c b/src/wchar/vswprintf_s.c
index 69912a57..e6e9559e 100644
--- a/src/wchar/vswprintf_s.c
+++ b/src/wchar/vswprintf_s.c
@@ -1,4 +1,4 @@
-#include "wchar.h"
+#include <wchar.h>
 #include <stdarg.h>
 
 int vswprintf_s(wchar_t * restrict s, rsize_t n, const wchar_t * restrict format, va_list arg)
diff --git a/src/wchar/vswscanf_s.c b/src/wchar/vswscanf_s.c
index c65a8c79..da89ce48 100644
--- a/src/wchar/vswscanf_s.c
+++ b/src/wchar/vswscanf_s.c
@@ -1,4 +1,4 @@
-#include "wchar.h"
+#include <wchar.h>
 #include <stdarg.h>
 
 int vswscanf_s(const wchar_t * restrict s, const wchar_t * restrict format, va_list arg)
diff --git a/src/wchar/vwprintf.c b/src/wchar/vwprintf.c
index 1f983489..a4bfadcb 100644
--- a/src/wchar/vwprintf.c
+++ b/src/wchar/vwprintf.c
@@ -1,5 +1,5 @@
 #include <wchar.h>
-#include "stdio.h"
+#include <stdio.h>
 
 int vwprintf(const wchar_t * restrict format, va_list arg)
 {
diff --git a/src/wchar/vwprintf_s.c b/src/wchar/vwprintf_s.c
index 89709344..25b73a48 100644
--- a/src/wchar/vwprintf_s.c
+++ b/src/wchar/vwprintf_s.c
@@ -1,4 +1,4 @@
-#include "wchar.h"
+#include <wchar.h>
 #include <stdarg.h>
 
 int vwprintf_s(const wchar_t * restrict format, va_list arg)
diff --git a/src/wchar/vwscanf.c b/src/wchar/vwscanf.c
index b5ffbab5..66c501f7 100644
--- a/src/wchar/vwscanf.c
+++ b/src/wchar/vwscanf.c
@@ -1,6 +1,6 @@
 #include <wchar.h>
-#include "stdarg.h"
-#include "stdio.h"
+#include <stdarg.h>
+#include <stdio.h>
 
 int vwscanf(const wchar_t * restrict format, va_list arg)
 {
diff --git a/src/wchar/vwscanf_s.c b/src/wchar/vwscanf_s.c
index 780fb553..7fd6f2f5 100644
--- a/src/wchar/vwscanf_s.c
+++ b/src/wchar/vwscanf_s.c
@@ -1,4 +1,4 @@
-#include "wchar.h"
+#include <wchar.h>
 #include <stdarg.h>
 
 int vwscanf_s(const wchar_t * restrict format, va_list arg)
diff --git a/src/wchar/wcrtomb.c b/src/wchar/wcrtomb.c
index f68c2177..cc8db136 100644
--- a/src/wchar/wcrtomb.c
+++ b/src/wchar/wcrtomb.c
@@ -1,5 +1,5 @@
 #include <wchar.h>
-#include "limits.h"
+#include <limits.h>
 
 size_t wcrtomb(char * restrict s, wchar_t wc, mbstate_t * restrict ps)
 {
diff --git a/src/wchar/wcrtomb_s.c b/src/wchar/wcrtomb_s.c
index 69f7b62d..12ea273e 100644
--- a/src/wchar/wcrtomb_s.c
+++ b/src/wchar/wcrtomb_s.c
@@ -1,4 +1,4 @@
-#include "wchar.h"
+#include <wchar.h>
 
 errno_t wcrtomb_s(size_t * restrict retval, char * restrict s, rsize_t smax,
 	wchar_t wc, mbstate_t * restrict ps)
diff --git a/src/wchar/wcscat_s.c b/src/wchar/wcscat_s.c
index 0b558b11..75d7b779 100644
--- a/src/wchar/wcscat_s.c
+++ b/src/wchar/wcscat_s.c
@@ -1,4 +1,4 @@
-#include "wchar.h"
+#include <wchar.h>
 
 errno_t wcscat_s(wchar_t * restrict s1, rsize_t s1max, const wchar_t * restrict s2)
 {
diff --git a/src/wchar/wcscpy_s.c b/src/wchar/wcscpy_s.c
index 438d29a5..c7ce17c0 100644
--- a/src/wchar/wcscpy_s.c
+++ b/src/wchar/wcscpy_s.c
@@ -1,4 +1,4 @@
-#include "wchar.h"
+#include <wchar.h>
 
 errno_t wcscpy_s(wchar_t * restrict s1, rsize_t s1max, const wchar_t * restrict s2)
 {
diff --git a/src/wchar/wcsncat_s.c b/src/wchar/wcsncat_s.c
index 673a407e..aaae45cf 100644
--- a/src/wchar/wcsncat_s.c
+++ b/src/wchar/wcsncat_s.c
@@ -1,4 +1,4 @@
-#include "wchar.h"
+#include <wchar.h>
 
 errno_t wcsncat_s(wchar_t * restrict s1, rsize_t s1max, const wchar_t * restrict s2, rsize_t n)
 {
diff --git a/src/wchar/wcsncpy_s.c b/src/wchar/wcsncpy_s.c
index 4aba2220..9bcf6906 100644
--- a/src/wchar/wcsncpy_s.c
+++ b/src/wchar/wcsncpy_s.c
@@ -1,4 +1,4 @@
-#include "wchar.h"
+#include <wchar.h>
 
 errno_t wcsncpy_s(wchar_t * restrict s1, rsize_t s1max, const wchar_t * restrict s2, rsize_t n)
 {
diff --git a/src/wchar/wcsrtombs_s.c b/src/wchar/wcsrtombs_s.c
index c0f73aaa..b8c2399a 100644
--- a/src/wchar/wcsrtombs_s.c
+++ b/src/wchar/wcsrtombs_s.c
@@ -1,4 +1,4 @@
-#include "wchar.h"
+#include <wchar.h>
 
 errno_t wcsrtombs_s(size_t * restrict retval,
 	char * restrict dst, rsize_t dstmax,
diff --git a/src/wchar/wcstok_s.c b/src/wchar/wcstok_s.c
index 16ddfdce..69d176ae 100644
--- a/src/wchar/wcstok_s.c
+++ b/src/wchar/wcstok_s.c
@@ -1,4 +1,4 @@
-#include "wchar.h"
+#include <wchar.h>
 
 wchar_t *wcstok_s(wchar_t * restrict s1, rsize_t * restrict s1max,
 	const wchar_t * restrict s2, wchar_t ** restrict ptr)
diff --git a/src/wchar/wctob.c b/src/wchar/wctob.c
index fb110e0b..32cf1ab6 100644
--- a/src/wchar/wctob.c
+++ b/src/wchar/wctob.c
@@ -1,7 +1,7 @@
 #include <wchar.h>
-#include "locale.h"
-#include "string.h"
-#include "stdio.h"
+#include <locale.h>
+#include <string.h>
+#include <stdio.h>
 
 int wctob(wint_t c)
 {
diff --git a/src/wchar/wmemcpy_s.c b/src/wchar/wmemcpy_s.c
index 1481fcd7..348b4139 100644
--- a/src/wchar/wmemcpy_s.c
+++ b/src/wchar/wmemcpy_s.c
@@ -1,4 +1,4 @@
-#include "wchar.h"
+#include <wchar.h>
 
 errno_t wmemcpy_s(wchar_t * restrict s1, rsize_t s1max, const wchar_t * restrict s2, rsize_t n)
 {
diff --git a/src/wchar/wmemmove.c b/src/wchar/wmemmove.c
index 98ae7b96..5a67abe2 100644
--- a/src/wchar/wmemmove.c
+++ b/src/wchar/wmemmove.c
@@ -1,5 +1,5 @@
 #include <wchar.h>
-#include "stdlib.h"
+#include <stdlib.h>
 #include "_assert.h"
 
 wchar_t * wmemmove(wchar_t * s1, const wchar_t * s2, size_t n)
diff --git a/src/wchar/wmemmove_s.c b/src/wchar/wmemmove_s.c
index 2a34b960..ca30a786 100644
--- a/src/wchar/wmemmove_s.c
+++ b/src/wchar/wmemmove_s.c
@@ -1,4 +1,4 @@
-#include "wchar.h"
+#include <wchar.h>
 
 errno_t wmemmove_s(whcar_t *s1, rsize_t s1max, const wchar_t *s2, rsize_t n)
 {
diff --git a/src/wchar/wprintf.c b/src/wchar/wprintf.c
index 9394e785..1d35c1e0 100644
--- a/src/wchar/wprintf.c
+++ b/src/wchar/wprintf.c
@@ -1,5 +1,5 @@
 #include <wchar.h>
-#include "stdarg.h"
+#include <stdarg.h>
 
 int wprintf(const wchar_t * restrict format, ...)
 {
diff --git a/src/wchar/wprintf_s.c b/src/wchar/wprintf_s.c
index b45bc077..da910af9 100644
--- a/src/wchar/wprintf_s.c
+++ b/src/wchar/wprintf_s.c
@@ -1,4 +1,4 @@
-#include "wchar.h"
+#include <wchar.h>
 
 int wprintf_s(const wchar_t * restrict format, ...)
 {
diff --git a/src/wchar/wscanf.c b/src/wchar/wscanf.c
index abd74a33..acd2a829 100644
--- a/src/wchar/wscanf.c
+++ b/src/wchar/wscanf.c
@@ -1,5 +1,5 @@
 #include <wchar.h>
-#include "stdarg.h"
+#include <stdarg.h>
 
 int wscanf(const wchar_t * restrict format, ...)
 {
diff --git a/src/wchar/wscanf_s.c b/src/wchar/wscanf_s.c
index 0359b546..8850d06f 100644
--- a/src/wchar/wscanf_s.c
+++ b/src/wchar/wscanf_s.c
@@ -1,4 +1,4 @@
-#include "wchar.h"
+#include <wchar.h>
 
 int wscanf_s(const wchar_t * restrict format, ...)
 {
diff --git a/src/wctype/iswalnum.c b/src/wctype/iswalnum.c
index d385fd1c..13f9368d 100644
--- a/src/wctype/iswalnum.c
+++ b/src/wctype/iswalnum.c
@@ -1,7 +1,7 @@
 #include <wctype.h>
-#include "limits.h"
+#include <limits.h>
+#include <wchar.h>
 #include "_assert.h"
-#include "wchar.h"
 
 /** test whether a wide character is alphanumeric **/
 int iswalnum(wint_t wc)
diff --git a/src/wctype/iswalpha.c b/src/wctype/iswalpha.c
index 99448d54..d5efc1c2 100644
--- a/src/wctype/iswalpha.c
+++ b/src/wctype/iswalpha.c
@@ -1,5 +1,5 @@
 #include <wctype.h>
-#include "wchar.h"
+#include <wchar.h>
 #include "_assert.h"
 
 /** test whether a wide character is alphabetic **/
diff --git a/src/wctype/iswcntrl.c b/src/wctype/iswcntrl.c
index 571318cc..aee9ed51 100644
--- a/src/wctype/iswcntrl.c
+++ b/src/wctype/iswcntrl.c
@@ -1,5 +1,5 @@
 #include <wctype.h>
-#include "wchar.h"
+#include <wchar.h>
 #include "_assert.h"
 
 /** test whether a wide character is a control character */
diff --git a/src/wctype/iswctype.c b/src/wctype/iswctype.c
index a1ca4c77..acfde506 100644
--- a/src/wctype/iswctype.c
+++ b/src/wctype/iswctype.c
@@ -1,5 +1,5 @@
 #include <wctype.h>
-#include "wchar.h"
+#include <wchar.h>
 #include "_assert.h"
 
 /** test whether a wide character is part of a character class **/
diff --git a/src/wctype/iswdigit.c b/src/wctype/iswdigit.c
index 3b92a8b3..e96492bb 100644
--- a/src/wctype/iswdigit.c
+++ b/src/wctype/iswdigit.c
@@ -1,5 +1,5 @@
 #include <wctype.h>
-#include "wchar.h"
+#include <wchar.h>
 #include "_assert.h"
 
 /** test whether a wide character is a digit **/
diff --git a/src/wctype/iswgraph.c b/src/wctype/iswgraph.c
index 4602bd7f..2c07eab6 100644
--- a/src/wctype/iswgraph.c
+++ b/src/wctype/iswgraph.c
@@ -1,5 +1,5 @@
 #include <wctype.h>
-#include "wchar.h"
+#include <wchar.h>
 #include "_assert.h"
 
 /** test whether a wide character is graphic **/
diff --git a/src/wctype/iswlower.c b/src/wctype/iswlower.c
index 3d3a1b6e..9a174a4d 100644
--- a/src/wctype/iswlower.c
+++ b/src/wctype/iswlower.c
@@ -1,5 +1,5 @@
 #include <wctype.h>
-#include "wchar.h"
+#include <wchar.h>
 #include "_assert.h"
 
 /** test whether a character is a lowercase letter **/
diff --git a/src/wctype/iswprint.c b/src/wctype/iswprint.c
index cd2392ea..3d8c6682 100644
--- a/src/wctype/iswprint.c
+++ b/src/wctype/iswprint.c
@@ -1,5 +1,5 @@
 #include <wctype.h>
-#include "wchar.h"
+#include <wchar.h>
 #include "_assert.h"
 
 /** test whether a wide character is printable **/
diff --git a/src/wctype/iswpunct.c b/src/wctype/iswpunct.c
index 2ef6c246..0b4a2d3a 100644
--- a/src/wctype/iswpunct.c
+++ b/src/wctype/iswpunct.c
@@ -1,5 +1,5 @@
 #include <wctype.h>
-#include "wchar.h"
+#include <wchar.h>
 #include "_assert.h"
 
 /** test whether a wide character is punctuation **/
diff --git a/src/wctype/iswspace.c b/src/wctype/iswspace.c
index 7c1c6b01..8b1b3702 100644
--- a/src/wctype/iswspace.c
+++ b/src/wctype/iswspace.c
@@ -1,5 +1,5 @@
 #include <wctype.h>
-#include "wchar.h"
+#include <wchar.h>
 #include "_assert.h"
 
 /** test whether a wide character is white-space **/
diff --git a/src/wctype/iswupper.c b/src/wctype/iswupper.c
index 5702579c..8578a863 100644
--- a/src/wctype/iswupper.c
+++ b/src/wctype/iswupper.c
@@ -1,5 +1,5 @@
 #include <wctype.h>
-#include "wchar.h"
+#include <wchar.h>
 #include "_assert.h"
 
 /** test whether a wide character is an uppercase letter **/
diff --git a/src/wctype/iswxdigit.c b/src/wctype/iswxdigit.c
index a4fc4d80..655372d0 100644
--- a/src/wctype/iswxdigit.c
+++ b/src/wctype/iswxdigit.c
@@ -1,5 +1,5 @@
 #include <wctype.h>
-#include "wchar.h"
+#include <wchar.h>
 #include "_assert.h"
 
 /** test whether a wide character is a hexadecimal digit **/
diff --git a/src/wctype/towctrans.c b/src/wctype/towctrans.c
index 0b083cad..db35dee3 100644
--- a/src/wctype/towctrans.c
+++ b/src/wctype/towctrans.c
@@ -1,6 +1,6 @@
 #include <wctype.h>
-#include "wchar.h"
-#include "../_assert.h"
+#include <wchar.h>
+#include "_assert.h"
 
 wint_t towctrans(wint_t wc, wctrans_t desc)
 {
diff --git a/src/wctype/towlower.c b/src/wctype/towlower.c
index 2b38a1cd..46598cae 100644
--- a/src/wctype/towlower.c
+++ b/src/wctype/towlower.c
@@ -1,6 +1,6 @@
 #include <wctype.h>
-#include "wchar.h"
-#include "stdlib.h"
+#include <wchar.h>
+#include <stdlib.h>
 #include "_assert.h"
 
 /** convert a wide uppercase letter to lowercase **/
diff --git a/src/wctype/towupper.c b/src/wctype/towupper.c
index 9c683b20..16e2334a 100644
--- a/src/wctype/towupper.c
+++ b/src/wctype/towupper.c
@@ -1,5 +1,5 @@
 #include <wctype.h>
-#include "wchar.h"
+#include <wchar.h>
 #include "_assert.h"
 
 /** convert a wide lowercase letter to uppercase **/
diff --git a/src/wctype/wctrans.c b/src/wctype/wctrans.c
index c19a8548..975a04cb 100644
--- a/src/wctype/wctrans.c
+++ b/src/wctype/wctrans.c
@@ -1,5 +1,5 @@
 #include <wctype.h>
-#include "string.h"
+#include <string.h>
 #include "_assert.h"
 #include "_wctype.h"
 
diff --git a/src/wctype/wctype.c b/src/wctype/wctype.c
index 976e7f05..5c3acbfa 100644
--- a/src/wctype/wctype.c
+++ b/src/wctype/wctype.c
@@ -1,5 +1,5 @@
 #include <wctype.h>
-#include "string.h"
+#include <string.h>
 #include "_assert.h"
 #include "_wctype.h"
 
diff --git a/src/wordexp/wordexp.c b/src/wordexp/wordexp.c
index b981275a..428d0783 100644
--- a/src/wordexp/wordexp.c
+++ b/src/wordexp/wordexp.c
@@ -1,4 +1,3 @@
-#include "sys/types.h"
 #include <wordexp.h>
 
 int wordexp(const char *restrict words, wordexp_t *restrict pwordexp, int flags)
@@ -12,4 +11,3 @@ int wordexp(const char *restrict words, wordexp_t *restrict pwordexp, int flags)
 /*
 POSIX(2)
 */
-
diff --git a/src/wordexp/wordfree.c b/src/wordexp/wordfree.c
index 4bf8ea16..0568f261 100644
--- a/src/wordexp/wordfree.c
+++ b/src/wordexp/wordfree.c
@@ -1,6 +1,5 @@
-#include "sys/types.h"
 #include <wordexp.h>
-#include "stdlib.h"
+#include <stdlib.h>
 
 void wordfree(wordexp_t *pwordexp)
 {
@@ -10,4 +9,3 @@ void wordfree(wordexp_t *pwordexp)
 /*
 POSIX(2)
 */
-