diff --git a/userspace/libraries/LibC/arpa/inet.cpp b/userspace/libraries/LibC/arpa/inet.cpp
index 08005daa..15e98950 100644
--- a/userspace/libraries/LibC/arpa/inet.cpp
+++ b/userspace/libraries/LibC/arpa/inet.cpp
@@ -2,6 +2,7 @@
 
 #include <arpa/inet.h>
 #include <errno.h>
+#include <netinet/in.h>
 #include <stdio.h>
 
 uint32_t htonl(uint32_t hostlong)
diff --git a/userspace/libraries/LibC/include/arpa/inet.h b/userspace/libraries/LibC/include/arpa/inet.h
index b4bd04d8..5db471ce 100644
--- a/userspace/libraries/LibC/include/arpa/inet.h
+++ b/userspace/libraries/LibC/include/arpa/inet.h
@@ -1,5 +1,5 @@
-#ifndef _INET_H
-#define _INET_H 1
+#ifndef _ARPA_INET_H
+#define _ARPA_INET_H 1
 
 // https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/arpa_inet.h.html
 
@@ -7,13 +7,8 @@
 
 __BEGIN_DECLS
 
-#include <netinet/in.h>
-#include <inttypes.h>
-
-uint32_t htonl(uint32_t);
-uint16_t htons(uint16_t);
-uint32_t ntohl(uint32_t);
-uint16_t ntohs(uint16_t);
+#include <bits/inet_common.h>
+#include <bits/types/socklen_t.h>
 
 in_addr_t	inet_addr(const char* cp);
 char*		inet_ntoa(struct in_addr in);
diff --git a/userspace/libraries/LibC/include/bits/inet_common.h b/userspace/libraries/LibC/include/bits/inet_common.h
new file mode 100644
index 00000000..610131de
--- /dev/null
+++ b/userspace/libraries/LibC/include/bits/inet_common.h
@@ -0,0 +1,28 @@
+#ifndef _BITS_INET_COMMON_H
+#define _BITS_INET_COMMON_H 1
+
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+
+#include <inttypes.h>
+
+#define INET_ADDRSTRLEN  16
+#define INET6_ADDRSTRLEN 46
+
+typedef uint16_t in_port_t;
+typedef uint32_t in_addr_t;
+
+struct in_addr
+{
+	in_addr_t s_addr;
+};
+
+uint32_t htonl(uint32_t);
+uint16_t htons(uint16_t);
+uint32_t ntohl(uint32_t);
+uint16_t ntohs(uint16_t);
+
+__END_DECLS
+
+#endif
diff --git a/userspace/libraries/LibC/include/bits/types/socklen_t.h b/userspace/libraries/LibC/include/bits/types/socklen_t.h
new file mode 100644
index 00000000..0997bcff
--- /dev/null
+++ b/userspace/libraries/LibC/include/bits/types/socklen_t.h
@@ -0,0 +1,12 @@
+#ifndef _BITS_TYPES_SOCKLEN_T_H
+#define _BITS_TYPES_SOCKLEN_T_H 1
+
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+
+typedef long socklen_t;
+
+__END_DECLS
+
+#endif
diff --git a/userspace/libraries/LibC/include/netinet/in.h b/userspace/libraries/LibC/include/netinet/in.h
index a07ecb64..38de5ece 100644
--- a/userspace/libraries/LibC/include/netinet/in.h
+++ b/userspace/libraries/LibC/include/netinet/in.h
@@ -7,7 +7,7 @@
 
 __BEGIN_DECLS
 
-#include <inttypes.h>
+#include <bits/inet_common.h>
 #include <sys/socket.h>
 
 #define IPPROTO_IP		1
@@ -30,9 +30,6 @@ __BEGIN_DECLS
 #define INADDR_BROADCAST	0xFFFFFFFF
 #define INADDR_LOOPBACK     0x7F000001
 
-#define INET_ADDRSTRLEN		16
-#define INET6_ADDRSTRLEN	46
-
 #define IN6ADDR_ANY_INIT		{ { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } }
 #define IN6ADDR_LOOPBACK_INIT	{ { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } }
 
@@ -51,14 +48,6 @@ __BEGIN_DECLS
 #define IN6_IS_ADDR_MC_GLOBAL(addr)
 #endif
 
-typedef uint16_t in_port_t;
-typedef uint32_t in_addr_t;
-
-struct in_addr
-{
-	in_addr_t s_addr;
-};
-
 struct sockaddr_in
 {
 	sa_family_t		sin_family;	/* AF_INET. */
diff --git a/userspace/libraries/LibC/include/sys/socket.h b/userspace/libraries/LibC/include/sys/socket.h
index f633455c..77166715 100644
--- a/userspace/libraries/LibC/include/sys/socket.h
+++ b/userspace/libraries/LibC/include/sys/socket.h
@@ -14,7 +14,7 @@ __BEGIN_DECLS
 #include <sys/uio.h>
 
 #include <bits/types/sa_family_t.h>
-typedef long socklen_t;
+#include <bits/types/socklen_t.h>
 
 #if !defined(FILENAME_MAX)
 	#define FILENAME_MAX 256