diff --git a/src/compat/inet_aton.h b/src/compat/inet_aton.h
index 78acf4463..f0d8d8769 100644
--- a/src/compat/inet_aton.h
+++ b/src/compat/inet_aton.h
@@ -24,10 +24,6 @@
 #define _EGG_COMPAT_INET_ATON_H
 
 #include "src/main.h"
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-#include <netinet/in.h>
 #include <arpa/inet.h>
 
 #ifndef HAVE_INET_ATON
diff --git a/src/dns.c b/src/dns.c
index 69b3a03e5..3050f8fe2 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -26,8 +26,6 @@
 
 #include "main.h"
 #include <netdb.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
 #include <arpa/inet.h>
 #include "dns.h"
 #ifdef EGG_TDNS
diff --git a/src/mod/ctcp.mod/ctcp.c b/src/mod/ctcp.mod/ctcp.c
index ebe45c2fc..7ef4a6884 100644
--- a/src/mod/ctcp.mod/ctcp.c
+++ b/src/mod/ctcp.mod/ctcp.c
@@ -27,7 +27,6 @@
 #include "ctcp.h"
 #include "src/mod/module.h"
 #include "server.mod/server.h"
-#include <netinet/in.h>
 #include <arpa/inet.h>
 
 static Function *global = NULL, *server_funcs = NULL;
diff --git a/src/mod/share.mod/share.c b/src/mod/share.mod/share.c
index 9fc14891f..ef94248ea 100644
--- a/src/mod/share.mod/share.c
+++ b/src/mod/share.mod/share.c
@@ -27,7 +27,6 @@
 #include <errno.h>
 #include "src/mod/module.h"
 
-#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/stat.h>
 
diff --git a/src/mod/transfer.mod/transfer.c b/src/mod/transfer.mod/transfer.c
index 9bfdbb1db..2527a315e 100644
--- a/src/mod/transfer.mod/transfer.c
+++ b/src/mod/transfer.mod/transfer.c
@@ -35,7 +35,6 @@
 #include "src/users.h"
 #include "transfer.h"
 
-#include <netinet/in.h>
 #include <arpa/inet.h>
 
 
diff --git a/src/mod/uptime.mod/uptime.c b/src/mod/uptime.mod/uptime.c
index de75b2c21..a366f699b 100644
--- a/src/mod/uptime.mod/uptime.c
+++ b/src/mod/uptime.mod/uptime.c
@@ -35,12 +35,10 @@
 #include "../module.h"
 #include "../server.mod/server.h"
 #include <netdb.h>
-#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/src/net.c b/src/net.c
index 6ec1d5b3a..0710a1f2a 100644
--- a/src/net.c
+++ b/src/net.c
@@ -31,11 +31,9 @@
 #include <limits.h>
 #include <string.h>
 #include <netdb.h>
-#include <sys/socket.h>
 #if HAVE_SYS_SELECT_H
 #  include <sys/select.h>
 #endif
-#include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 #include <errno.h>
diff --git a/src/users.c b/src/users.c
index 928f85ae9..ba262ac67 100644
--- a/src/users.c
+++ b/src/users.c
@@ -32,9 +32,7 @@
 #include "main.h"
 #include "modules.h"
 #include "tandem.h"
-
 #include <errno.h>
-#include <netinet/in.h>
 #include <arpa/inet.h>
 
 extern struct dcc_t *dcc;