19 files changed, 42 insertions, 19 deletions
diff --git a/lib/libc/socket/accept.c b/lib/libc/socket/accept.c
index f3ec738d..d720b2e9 100644
--- a/lib/libc/socket/accept.c
+++ b/lib/libc/socket/accept.c
@@ -1,4 +1,5 @@
-#include "asm/unistd_64.h" // for __NR_accept
+
+
 
 #include <sys/socket.h> // for accept, socklen_t
 #include <syscall.h>	// for __syscall_3, syscall
diff --git a/lib/libc/socket/accept4.c b/lib/libc/socket/accept4.c
index 88c761f5..ff5cbc06 100644
--- a/lib/libc/socket/accept4.c
+++ b/lib/libc/socket/accept4.c
@@ -1,4 +1,5 @@
-#include "asm/unistd_64.h" // for __NR_accept4
+
+
 
 #include <sys/socket.h> // for accept4, socklen_t
 #include <syscall.h>	// for __syscall_4, syscall
diff --git a/lib/libc/socket/bind.c b/lib/libc/socket/bind.c
index ef39d03b..e605cfda 100644
--- a/lib/libc/socket/bind.c
+++ b/lib/libc/socket/bind.c
@@ -1,4 +1,5 @@
-#include "asm/unistd_64.h" // for __NR_bind
+
+
 
 #include <sys/socket.h> // for bind, socklen_t
 #include <syscall.h>	// for __syscall_3, syscall
diff --git a/lib/libc/socket/connect.c b/lib/libc/socket/connect.c
index 19c9ef95..e9f0795a 100644
--- a/lib/libc/socket/connect.c
+++ b/lib/libc/socket/connect.c
@@ -1,4 +1,5 @@
-#include "asm/unistd_64.h" // for __NR_connect
+
+
 
 #include <sys/socket.h> // for connect, socklen_t
 #include <syscall.h>	// for __syscall_3, syscall
diff --git a/lib/libc/socket/getpeername.c b/lib/libc/socket/getpeername.c
index f1bc35e8..d8edb334 100644
--- a/lib/libc/socket/getpeername.c
+++ b/lib/libc/socket/getpeername.c
@@ -1,4 +1,5 @@
-#include "asm/unistd_64.h" // for __NR_getpeername
+
+
 
 #include <sys/socket.h> // for getpeername, socklen_t
 #include <syscall.h>	// for __syscall_3, syscall
diff --git a/lib/libc/socket/getsockname.c b/lib/libc/socket/getsockname.c
index b8422261..3cb898fa 100644
--- a/lib/libc/socket/getsockname.c
+++ b/lib/libc/socket/getsockname.c
@@ -1,4 +1,5 @@
-#include "asm/unistd_64.h" // for __NR_getsockname
+
+
 
 #include <sys/socket.h> // for getsockname, socklen_t
 #include <syscall.h>	// for __syscall_3, syscall
diff --git a/lib/libc/socket/getsockopt.c b/lib/libc/socket/getsockopt.c
index 0c9db0ad..6c5694e8 100644
--- a/lib/libc/socket/getsockopt.c
+++ b/lib/libc/socket/getsockopt.c
@@ -1,4 +1,5 @@
-#include "asm/unistd_64.h" // for __NR_getsockopt
+
+
 
 #include <sys/socket.h> // for getsockopt, socklen_t
 #include <syscall.h>	// for __syscall_5, syscall
diff --git a/lib/libc/socket/listen.c b/lib/libc/socket/listen.c
index a204ba28..62fdb9b4 100644
--- a/lib/libc/socket/listen.c
+++ b/lib/libc/socket/listen.c
@@ -1,4 +1,5 @@
-#include "asm/unistd_64.h" // for __NR_listen
+
+
 
 #include <sys/socket.h> // for listen
 #include <syscall.h>	// for __syscall_2, syscall
diff --git a/lib/libc/socket/recv.c b/lib/libc/socket/recv.c
index 884b753f..a7ed4998 100644
--- a/lib/libc/socket/recv.c
+++ b/lib/libc/socket/recv.c
@@ -1,5 +1,7 @@
-#include "asm/unistd_64.h" // for __NR_recvfrom
 
+
+
+#include <stddef.h>
 #include <sys/socket.h> // for recv
 #include <sys/types.h>	// for size_t, ssize_t
 #include <syscall.h>	// for __syscall_6, syscall
diff --git a/lib/libc/socket/recvfrom.c b/lib/libc/socket/recvfrom.c
index d37089d9..1afb088d 100644
--- a/lib/libc/socket/recvfrom.c
+++ b/lib/libc/socket/recvfrom.c
@@ -1,5 +1,7 @@
-#include "asm/unistd_64.h" // for __NR_recvfrom
 
+
+
+#include <stddef.h>
 #include <sys/socket.h> // for recvfrom, socklen_t
 #include <sys/types.h>	// for size_t, ssize_t
 #include <syscall.h>	// for __syscall_6, syscall
diff --git a/lib/libc/socket/recvmsg.c b/lib/libc/socket/recvmsg.c
index 1b2cfdf1..a4b2cc13 100644
--- a/lib/libc/socket/recvmsg.c
+++ b/lib/libc/socket/recvmsg.c
@@ -1,4 +1,5 @@
-#include "asm/unistd_64.h" // for __NR_recvmsg
+
+
 
 #include <sys/socket.h> // for recvmsg
 #include <sys/types.h>	// for ssize_t
diff --git a/lib/libc/socket/send.c b/lib/libc/socket/send.c
index 7ba42525..45de1514 100644
--- a/lib/libc/socket/send.c
+++ b/lib/libc/socket/send.c
@@ -1,5 +1,7 @@
-#include "asm/unistd_64.h" // for __NR_sendto
 
+
+
+#include <stddef.h>
 #include <sys/socket.h> // for send
 #include <sys/types.h>	// for size_t, ssize_t
 #include <syscall.h>	// for __syscall_6, syscall
diff --git a/lib/libc/socket/sendmsg.c b/lib/libc/socket/sendmsg.c
index b977f7da..11814d19 100644
--- a/lib/libc/socket/sendmsg.c
+++ b/lib/libc/socket/sendmsg.c
@@ -1,4 +1,5 @@
-#include "asm/unistd_64.h" // for __NR_sendmsg
+
+
 
 #include <sys/socket.h> // for sendmsg
 #include <sys/types.h>	// for ssize_t
diff --git a/lib/libc/socket/sendto.c b/lib/libc/socket/sendto.c
index 97376037..a9403917 100644
--- a/lib/libc/socket/sendto.c
+++ b/lib/libc/socket/sendto.c
@@ -1,5 +1,7 @@
-#include "asm/unistd_64.h" // for __NR_sendto
 
+
+
+#include <stddef.h>
 #include <sys/socket.h> // for sendto, socklen_t
 #include <sys/types.h>	// for size_t, ssize_t
 #include <syscall.h>	// for __syscall_6, syscall
diff --git a/lib/libc/socket/setsockopt.c b/lib/libc/socket/setsockopt.c
index 740b2d08..c9ae6f88 100644
--- a/lib/libc/socket/setsockopt.c
+++ b/lib/libc/socket/setsockopt.c
@@ -1,4 +1,5 @@
-#include "asm/unistd_64.h" // for __NR_setsockopt
+
+
 
 #include <sys/socket.h> // for setsockopt, socklen_t
 #include <syscall.h>	// for __syscall_5, syscall
diff --git a/lib/libc/socket/shutdown.c b/lib/libc/socket/shutdown.c
index 7fcae79b..b667204e 100644
--- a/lib/libc/socket/shutdown.c
+++ b/lib/libc/socket/shutdown.c
@@ -1,4 +1,5 @@
-#include "asm/unistd_64.h" // for __NR_shutdown
+
+
 
 #include <syscall.h> // for __syscall_2, syscall
 
diff --git a/lib/libc/socket/sockatmark.c b/lib/libc/socket/sockatmark.c
index 4ae64d95..92045454 100644
--- a/lib/libc/socket/sockatmark.c
+++ b/lib/libc/socket/sockatmark.c
@@ -1,4 +1,5 @@
-#include "asm/unistd_64.h" // for __NR_ioctl
+
+
 
 #include <asm-generic/sockios.h> // for SIOCATMARK
 #include <syscall.h>		 // for __syscall_3, syscall
diff --git a/lib/libc/socket/socket.c b/lib/libc/socket/socket.c
index 09847ff9..2c300be6 100644
--- a/lib/libc/socket/socket.c
+++ b/lib/libc/socket/socket.c
@@ -1,4 +1,5 @@
-#include "asm/unistd_64.h" // for __NR_socket
+
+
 
 #include <syscall.h> // for __syscall_3, syscall
 
diff --git a/lib/libc/socket/socketpair.c b/lib/libc/socket/socketpair.c
index e116c645..30749d3a 100644
--- a/lib/libc/socket/socketpair.c
+++ b/lib/libc/socket/socketpair.c
@@ -1,4 +1,5 @@
-#include "asm/unistd_64.h" // for __NR_socketpair
+
+
 
 #include <syscall.h> // for __syscall_4, syscall