Fix include paths and formatting inconsistencies

20 files changed, 69 insertions, 45 deletions

diff --git a/lib/libc/signal/kill.c b/lib/libc/signal/kill.c
index d2a7ae68..65676ed4 100644
--- a/lib/libc/signal/kill.c
+++ b/lib/libc/signal/kill.c
@@ -1,5 +1,8 @@
-#include <signal.h>
-#include <syscall.h>
+#include "asm/unistd_64.h" // for __NR_kill
+
+#include <signal.h>    // for kill
+#include <sys/types.h> // for pid_t
+#include <syscall.h>   // for __syscall_2, syscall
 
 int kill(pid_t pid, int sig)
 {
diff --git a/lib/libc/signal/killpg.c b/lib/libc/signal/killpg.c
index 27b7a76a..92434d7c 100644
--- a/lib/libc/signal/killpg.c
+++ b/lib/libc/signal/killpg.c
@@ -1,6 +1,6 @@
-#include <errno.h>
-#include <signal.h>
-#include <syscall.h>
+#include <errno.h>     // for EINVAL, errno
+#include <signal.h>    // for kill, killpg
+#include <sys/types.h> // for pid_t
 
 int killpg(pid_t pgrp, int sig)
 {
diff --git a/lib/libc/signal/psiginfo.c b/lib/libc/signal/psiginfo.c
index 47e10508..55accdd3 100644
--- a/lib/libc/signal/psiginfo.c
+++ b/lib/libc/signal/psiginfo.c
@@ -1,4 +1,4 @@
-#include <signal.h>
+#include <signal.h> // for psignal, psiginfo, siginfo_t
 
 void psiginfo(const siginfo_t *pinfo, const char *message)
 {
diff --git a/lib/libc/signal/psignal.c b/lib/libc/signal/psignal.c
index 200b353c..fdf0dc94 100644
--- a/lib/libc/signal/psignal.c
+++ b/lib/libc/signal/psignal.c
@@ -1,6 +1,6 @@
-#include <stdio.h>
-#include <string.h>
-#include <signal.h>
+#include <signal.h> // for psignal
+#include <stdio.h>  // for fprintf, stderr
+#include <string.h> // for strsignal
 
 void psignal(int signum, const char *message)
 {
diff --git a/lib/libc/signal/pthread_kill.c b/lib/libc/signal/pthread_kill.c
index 9323a869..d6855c0c 100644
--- a/lib/libc/signal/pthread_kill.c
+++ b/lib/libc/signal/pthread_kill.c
@@ -1,6 +1,9 @@
-#include <thread.h>
-#include <asm-generic/signal.h>
-#include <syscall.h>
+#include "asm/unistd_64.h" // for __NR_tkill
+#include "errno.h"	   // for EINVAL
+
+#include <asm-generic/signal.h> // for _NSIG
+#include <syscall.h>		// for __syscall_2, syscall
+#include <thread.h>		// for __thread_self
 
 typedef struct __thread_self *pthread_t;
 
diff --git a/lib/libc/signal/pthread_sigmask.c b/lib/libc/signal/pthread_sigmask.c
index 4fcc278f..5e657a6e 100644
--- a/lib/libc/signal/pthread_sigmask.c
+++ b/lib/libc/signal/pthread_sigmask.c
@@ -1,7 +1,13 @@
-#include <errno.h>
-#include <asm-generic/signal.h>
-#include <libc.h>
-#include <stddef.h>
+#define __ASSEMBLY__
+#include <asm-generic/signal.h> // for SIGRTMIN
+
+#undef __ASSEMBLY__
+
+#include <errno.h>  // for errno
+#include <libc.h>   // for unlikely
+#include <stddef.h> // for NULL
+
+typedef __UINT64_TYPE__ sigset_t;
 
 int sigdelset(sigset_t *, int);
 int sigismember(const sigset_t *, int);
diff --git a/lib/libc/signal/raise.c b/lib/libc/signal/raise.c
index 3bdbc9cc..32dc1c6b 100644
--- a/lib/libc/signal/raise.c
+++ b/lib/libc/signal/raise.c
@@ -1,5 +1,5 @@
-#include <unistd.h>
-#include <signal.h>
+#include <signal.h> // for kill, raise
+#include <unistd.h> // for getpid
 
 int raise(int sig)
 {
diff --git a/lib/libc/signal/sig2str.c b/lib/libc/signal/sig2str.c
index 2532d539..eec1c805 100644
--- a/lib/libc/signal/sig2str.c
+++ b/lib/libc/signal/sig2str.c
@@ -1,7 +1,7 @@
-#include <stdio.h>
-#include <string.h>
-#include <asm-generic/signal.h>
-#include <__signal.h>
+#include <__signal.h>		// for __sys_signame
+#include <asm-generic/signal.h> // for SIGRTMAX, SIGRTMIN, SIGHUP, SIGSYS
+#include <stdio.h>		// for snprintf
+#include <string.h>		// for strlcpy
 
 int sig2str(int signum, char *str)
 {
diff --git a/lib/libc/signal/sigaction.c b/lib/libc/signal/sigaction.c
index f8377ebb..6039574a 100644
--- a/lib/libc/signal/sigaction.c
+++ b/lib/libc/signal/sigaction.c
@@ -1,5 +1,7 @@
-#include <signal.h>
-#include <syscall.h>
+#include "asm/unistd_64.h" // for __NR_rt_sigaction
+
+#include <signal.h>  // for sigaction, sigset_t
+#include <syscall.h> // for __syscall_4, syscall
 
 int sigaction(int sig, const struct sigaction *restrict act,
 	      struct sigaction *restrict oact)
diff --git a/lib/libc/signal/sigaddset.c b/lib/libc/signal/sigaddset.c
index 33e74bd0..5606989d 100644
--- a/lib/libc/signal/sigaddset.c
+++ b/lib/libc/signal/sigaddset.c
@@ -1,4 +1,4 @@
-#include <signal.h>
+#include <signal.h> // for sigaddset, sigset_t
 
 int sigaddset(sigset_t *set, int signo)
 {
diff --git a/lib/libc/signal/sigemptyset.c b/lib/libc/signal/sigemptyset.c
index 6552bf45..a5c8958e 100644
--- a/lib/libc/signal/sigemptyset.c
+++ b/lib/libc/signal/sigemptyset.c
@@ -1,4 +1,4 @@
-#include <signal.h>
+#include <signal.h> // for sigemptyset, sigset_t
 
 int sigemptyset(sigset_t *set)
 {
diff --git a/lib/libc/signal/sigismember.c b/lib/libc/signal/sigismember.c
index 8adf5fab..0b73e6ee 100644
--- a/lib/libc/signal/sigismember.c
+++ b/lib/libc/signal/sigismember.c
@@ -1,4 +1,4 @@
-#include <asm-generic/signal.h>
+#include <asm-generic/signal.h> // for _NSIG
 
 typedef __UINT64_TYPE__ __sigset_t;
 
diff --git a/lib/libc/signal/sigpending.c b/lib/libc/signal/sigpending.c
index b57f4adf..b0b4e92c 100644
--- a/lib/libc/signal/sigpending.c
+++ b/lib/libc/signal/sigpending.c
@@ -1,5 +1,7 @@
-#include <signal.h>
-#include <syscall.h>
+#include "asm/unistd_64.h" // for __NR_rt_sigpending
+
+#include <signal.h>  // for sigpending, sigset_t
+#include <syscall.h> // for __syscall_1, syscall
 
 int sigpending(sigset_t *set)
 {
diff --git a/lib/libc/signal/sigprocmask.c b/lib/libc/signal/sigprocmask.c
index 54063b9d..f74d5774 100644
--- a/lib/libc/signal/sigprocmask.c
+++ b/lib/libc/signal/sigprocmask.c
@@ -1,5 +1,7 @@
-#include <signal.h>
-#include <syscall.h>
+#include "asm/unistd_64.h" // for __NR_rt_sigprocmask
+
+#include <signal.h>  // for sigset_t, sigprocmask
+#include <syscall.h> // for __syscall_4, syscall
 
 int sigprocmask(int how, const sigset_t *restrict set, sigset_t *restrict oset)
 {
diff --git a/lib/libc/signal/sigqueue.c b/lib/libc/signal/sigqueue.c
index 9e5b6ddd..b38725cd 100644
--- a/lib/libc/signal/sigqueue.c
+++ b/lib/libc/signal/sigqueue.c
@@ -1,5 +1,5 @@
-#include <signal.h>
-#include <errno.h>
+#include <errno.h>  // for errno
+#include <signal.h> // for pthread_sigmask, sigset_t, sigprocmask
 
 int sigprocmask(int how, const sigset_t *restrict set, sigset_t *restrict old)
 {
diff --git a/lib/libc/signal/sigsuspend.c b/lib/libc/signal/sigsuspend.c
index 1e6b88a6..93701d55 100644
--- a/lib/libc/signal/sigsuspend.c
+++ b/lib/libc/signal/sigsuspend.c
@@ -1,5 +1,7 @@
-#include <signal.h>
-#include <syscall.h>
+#include "asm/unistd_64.h" // for __NR_rt_sigsuspend
+
+#include <signal.h>  // for sigset_t, sigsuspend
+#include <syscall.h> // for __syscall_2, syscall
 
 int sigsuspend(const sigset_t *sigmask)
 {
diff --git a/lib/libc/signal/sigtimedwait.c b/lib/libc/signal/sigtimedwait.c
index d55a4310..dc85e5d1 100644
--- a/lib/libc/signal/sigtimedwait.c
+++ b/lib/libc/signal/sigtimedwait.c
@@ -1,5 +1,9 @@
-#include <signal.h>
-#include <syscall.h>
+#include "asm/unistd_64.h" // for __NR_rt_sigtimedwait
+
+#include <signal.h>  // for siginfo_t, sigset_t, sigtimedwait
+#include <syscall.h> // for __syscall_4, syscall
+
+struct timespec;
 
 #define _NSIG 64
 
diff --git a/lib/libc/signal/sigwait.c b/lib/libc/signal/sigwait.c
index 59b0dd6c..61067aeb 100644
--- a/lib/libc/signal/sigwait.c
+++ b/lib/libc/signal/sigwait.c
@@ -1,4 +1,4 @@
-#include <signal.h>
+#include <signal.h> // for sigtimedwait, siginfo_t, sigset_t, sigwait
 
 int sigwait(const sigset_t *restrict mask, int *restrict sig)
 {
diff --git a/lib/libc/signal/sigwaitinfo.c b/lib/libc/signal/sigwaitinfo.c
index bb51f8b5..a1533120 100644
--- a/lib/libc/signal/sigwaitinfo.c
+++ b/lib/libc/signal/sigwaitinfo.c
@@ -1,4 +1,4 @@
-#include <signal.h>
+#include <signal.h> // for sigtimedwait, siginfo_t, sigset_t, sigwaitinfo
 
 int sigwaitinfo(const sigset_t *restrict mask, siginfo_t *restrict si)
 {
diff --git a/lib/libc/signal/str2sig.c b/lib/libc/signal/str2sig.c
index 288948d7..77796c4d 100644
--- a/lib/libc/signal/str2sig.c
+++ b/lib/libc/signal/str2sig.c
@@ -1,9 +1,9 @@
-#include <__signal.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdbool.h>
-#include <asm-generic/signal.h>
+#include <__signal.h>		// for __sys_signame
+#include <asm-generic/signal.h> // for SIGRTMAX, SIGRTMIN, SIGHUP, SIGSYS
+#include <errno.h>		// for errno
+#include <stdbool.h>		// for bool
+#include <stdlib.h>		// for strtol, NULL
+#include <string.h>		// for strcmp, strncmp, size_t
 
 int str2sig(const char *restrict str, int *restrict pnum)
 {