diff --git a/channels/chan_features.c b/channels/chan_features.c
index f1b251fab4bb4eae536c1586209219b4bfa766cf..4545b1b62f29c14065eb6d289e52b8e11d56142c 100644
--- a/channels/chan_features.c
+++ b/channels/chan_features.c
@@ -34,12 +34,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/socket.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 #include <sys/signal.h>
 
 #include "asterisk/lock.h"
diff --git a/channels/chan_local.c b/channels/chan_local.c
index 8a93e2584a147558bd87606797a9d38684d125ce..789cf54b3d7db4190bfe237379df4a621959bfc1 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -29,12 +29,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/socket.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 #include <sys/signal.h>
 
 #include "asterisk/lock.h"
diff --git a/main/config.c b/main/config.c
index da499acdd5bd78baaa173837707a25b4e7aea484..cb4e9cabccaffef8b8727605241f4677f5a464bd 100644
--- a/main/config.c
+++ b/main/config.c
@@ -30,10 +30,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include "asterisk/network.h"	/* we do some sockaddr manipulation here */
 #include <errno.h>
 #include <time.h>
 #include <sys/stat.h>
-#include <sys/socket.h>		/* for AF_INET */
 #define AST_INCLUDE_GLOB 1
 #ifdef AST_INCLUDE_GLOB
 #if defined(__Darwin__) || defined(__CYGWIN__)
diff --git a/main/http.c b/main/http.c
index 7271e8523dd0e0bfbfd9af1f39f81eafca8c6e2d..ee5fad2d1ecf30f90352330abc536cad625c299b 100644
--- a/main/http.c
+++ b/main/http.c
@@ -32,13 +32,11 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include "asterisk/network.h"
 #include <time.h>
-#include <netinet/in.h>
 #include <sys/time.h>
-#include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/signal.h>
-#include <arpa/inet.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <pthread.h>
diff --git a/main/translate.c b/main/translate.c
index 734f369d4da4ebdbd476461e93d9024c0eabff9a..29e438afe2173c3afbf57e3e2c91573568d8bc03 100644
--- a/main/translate.c
+++ b/main/translate.c
@@ -27,7 +27,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/resource.h>