--- Libc/Libc-1158.1.2/include/signal.h
+++ Libc/Libc-583/include/signal.h
@@ -62,8 +62,10 @@
 #include <_types.h>
 #include <sys/signal.h>
 
-#include <sys/_pthread/_pthread_types.h>
-#include <sys/_pthread/_pthread_t.h>
+#ifndef _PTHREAD_T
+typedef __darwin_pthread_t	pthread_t;
+#define _PTHREAD_T
+#endif
 
 #if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
 extern __const char *__const sys_signame[NSIG];
@@ -76,7 +78,7 @@
 
 #ifndef	_ANSI_SOURCE
 __BEGIN_DECLS
-void	(* _Nullable bsd_signal(int, void (* _Nullable)(int)))(int);
+void	(*bsd_signal(int, void (*)(int)))(int);
 //Begin-Libc
 #ifndef LIBC_ALIAS_KILL
 //End-Libc
@@ -111,10 +113,10 @@
 //Begin-Libc
 #ifndef LIBC_ALIAS_SIGALTSTACK
 //End-Libc
-int	sigaltstack(const stack_t * __restrict, stack_t * __restrict)  __DARWIN_ALIAS(sigaltstack) __WATCHOS_PROHIBITED __TVOS_PROHIBITED;
+int	sigaltstack(const stack_t * __restrict, stack_t * __restrict)  __DARWIN_ALIAS(sigaltstack);
 //Begin-Libc
 #else /* LIBC_ALIAS_SIGALTSTACK */
-int	sigaltstack(const stack_t * __restrict, stack_t * __restrict)  LIBC_ALIAS(sigaltstack) __WATCHOS_PROHIBITED __TVOS_PROHIBITED;
+int	sigaltstack(const stack_t * __restrict, stack_t * __restrict)  LIBC_ALIAS(sigaltstack);
 #endif /* !LIBC_ALIAS_SIGALTSTACK */
 //End-Libc
 int	sigdelset(sigset_t *, int);
@@ -136,7 +138,7 @@
 int	sigpending(sigset_t *);
 int	sigprocmask(int, const sigset_t * __restrict, sigset_t * __restrict);
 int	sigrelse(int);
-void    (* _Nullable sigset(int, void (* _Nullable)(int)))(int);
+void    (*sigset(int, void (*)(int)))(int); 
 //Begin-Libc
 #ifndef LIBC_ALIAS_SIGSUSPEND
 //End-Libc
@@ -166,7 +168,7 @@
 /* List definitions after function declarations, or Reiser cpp gets upset. */
 #if defined(__i386__) || defined(__x86_64__)
 /* The left shift operator on intel is modulo 32 */
-__header_always_inline int
+static __inline int
 __sigbits(int __signo)
 {
     return __signo > __DARWIN_NSIG ? 0 : (1 << (__signo - 1));