consistently use <> for standardized headers

29 files changed, 15 insertions, 57 deletions

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