diff --git a/lib/libc/include/generic-musl/arpa/inet.h b/lib/libc/include/generic-musl/arpa/inet.h
index 8adc584e14aeb310519897e17f709fe23f73b99f..87bcbd8e382fa56a4cd85683db03c58a0e585eea 100644
--- a/lib/libc/include/generic-musl/arpa/inet.h
+++ b/lib/libc/include/generic-musl/arpa/inet.h
@@ -24,11 +24,6 @@ struct in_addr inet_makeaddr(in_addr_t, in_addr_t);
 in_addr_t inet_lnaof(struct in_addr);
 in_addr_t inet_netof(struct in_addr);
 
-#undef INET_ADDRSTRLEN
-#undef INET6_ADDRSTRLEN
-#define INET_ADDRSTRLEN  16
-#define INET6_ADDRSTRLEN 46
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/libc/include/generic-musl/netinet/in.h b/lib/libc/include/generic-musl/netinet/in.h
index 87076c5c0ede01b0574a325daafb9961aa5d2b1d..e3bf81b8d301ecd65b43e5bd1a0ee570d8d8d7cc 100644
--- a/lib/libc/include/generic-musl/netinet/in.h
+++ b/lib/libc/include/generic-musl/netinet/in.h
@@ -60,8 +60,6 @@ struct ipv6_mreq {
 
 extern const struct in6_addr in6addr_any, in6addr_loopback;
 
-#undef INET_ADDRSTRLEN
-#undef INET6_ADDRSTRLEN
 #define INET_ADDRSTRLEN  16
 #define INET6_ADDRSTRLEN 46
 
diff --git a/lib/libc/include/generic-musl/pthread.h b/lib/libc/include/generic-musl/pthread.h
index e812c675c2620f23386905bcec165c01a740d623..c31099ec7f61e2db0f007bcd54d26722b3fda497 100644
--- a/lib/libc/include/generic-musl/pthread.h
+++ b/lib/libc/include/generic-musl/pthread.h
@@ -74,6 +74,9 @@ extern "C" {
 #define PTHREAD_BARRIER_SERIAL_THREAD (-1)
 
 
+#define PTHREAD_NULL ((pthread_t)0)
+
+
 int pthread_create(pthread_t *__restrict, const pthread_attr_t *__restrict, void *(*)(void *), void *__restrict);
 int pthread_detach(pthread_t);
 _Noreturn void pthread_exit(void *);
diff --git a/lib/libc/include/mips-linux-musl/bits/signal.h b/lib/libc/include/mips-linux-musl/bits/signal.h
index f9a6ea657a41f6f15b7d07af6204a95f4132f81d..b35b14ea6ac2a78d78da4d679c86facb657bb7d9 100644
--- a/lib/libc/include/mips-linux-musl/bits/signal.h
+++ b/lib/libc/include/mips-linux-musl/bits/signal.h
@@ -93,7 +93,7 @@ typedef struct __ucontext {
 #define SIGTRAP   5
 #define SIGABRT   6
 #define SIGIOT    SIGABRT
-#define SIGSTKFLT 7
+#define SIGEMT    7
 #define SIGFPE    8
 #define SIGKILL   9
 #define SIGBUS    10
diff --git a/lib/libc/include/mips64-linux-musl/bits/signal.h b/lib/libc/include/mips64-linux-musl/bits/signal.h
index 82029cc2b45cf70641644ec1e4ebd1551993e690..444a192351984886344d30d0ed2b645ad215d870 100644
--- a/lib/libc/include/mips64-linux-musl/bits/signal.h
+++ b/lib/libc/include/mips64-linux-musl/bits/signal.h
@@ -112,7 +112,7 @@ typedef struct __ucontext {
 #define SIGTRAP   5
 #define SIGABRT   6
 #define SIGIOT    SIGABRT
-#define SIGSTKFLT 7
+#define SIGEMT    7
 #define SIGFPE    8
 #define SIGKILL   9
 #define SIGBUS    10
diff --git a/lib/libc/include/powerpc-linux-musl/bits/mman.h b/lib/libc/include/powerpc-linux-musl/bits/mman.h
index 91dfed1e5aa3441b0b87656bde5daf190d077a92..2b30bf75b89c865a1151846a84e11a165b9c4196 100644
--- a/lib/libc/include/powerpc-linux-musl/bits/mman.h
+++ b/lib/libc/include/powerpc-linux-musl/bits/mman.h
@@ -4,7 +4,6 @@
 #define MAP_NORESERVE   0x40
 #undef MAP_LOCKED
 #define MAP_LOCKED	0x80
-#undef MAP_SYNC
 
 #undef MCL_CURRENT
 #define MCL_CURRENT     0x2000
diff --git a/lib/libc/include/powerpc64-linux-musl/bits/mman.h b/lib/libc/include/powerpc64-linux-musl/bits/mman.h
index 91dfed1e5aa3441b0b87656bde5daf190d077a92..2b30bf75b89c865a1151846a84e11a165b9c4196 100644
--- a/lib/libc/include/powerpc64-linux-musl/bits/mman.h
+++ b/lib/libc/include/powerpc64-linux-musl/bits/mman.h
@@ -4,7 +4,6 @@
 #define MAP_NORESERVE   0x40
 #undef MAP_LOCKED
 #define MAP_LOCKED	0x80
-#undef MAP_SYNC
 
 #undef MCL_CURRENT
 #define MCL_CURRENT     0x2000