From 5663ff65185bd844e02c31bb2dcf2c0364e35a8f Mon Sep 17 00:00:00 2001
From: Luigi Rizzo <rizzo@icir.org>
Date: Sat, 17 Nov 2007 14:45:46 +0000
Subject: [PATCH] fix breakage induced by previous mistake

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89382 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 channels/chan_sip.c | 9 ++-------
 main/acl.c          | 6 ++++++
 main/dns.c          | 5 ++---
 main/dnsmgr.c       | 4 ----
 main/netsock.c      | 1 -
 main/rtp.c          | 3 ---
 main/udptl.c        | 3 ---
 7 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 71c8e6f7c7..ead2594886 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -88,20 +88,15 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <ctype.h>
-#include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <net/if.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <netdb.h>
 #include <signal.h>
 #include <sys/signal.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <arpa/inet.h>
-#include <netinet/ip.h>
 #include <regex.h>
 
+#include "asterisk/network.h"
+
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/config.h"
diff --git a/main/acl.c b/main/acl.c
index 03a01e7396..a68b0ede42 100644
--- a/main/acl.c
+++ b/main/acl.c
@@ -27,11 +27,17 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include "asterisk/network.h"
+
 #include <sys/time.h>
 #include <signal.h>
 #include <errno.h>
 #include <sys/ioctl.h>
 
+#include <net/if.h>
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
 #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
 #include <fcntl.h>
 #include <net/route.h>
diff --git a/main/dns.c b/main/dns.c
index a325796c0d..229122ac46 100644
--- a/main/dns.c
+++ b/main/dns.c
@@ -33,9 +33,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
+#include "asterisk/network.h"
+#include <arpa/nameser.h>	/* res_* functions */
 #include <resolv.h>
 
 #include "asterisk/logger.h"
diff --git a/main/dnsmgr.c b/main/dnsmgr.c
index 34dc2ebc65..acf618fac2 100644
--- a/main/dnsmgr.c
+++ b/main/dnsmgr.c
@@ -27,10 +27,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <resolv.h>
 #include <regex.h>
 #include <signal.h>
 
diff --git a/main/netsock.c b/main/netsock.c
index 6cd5e090f2..5eedb324f1 100644
--- a/main/netsock.c
+++ b/main/netsock.c
@@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
 #include <fcntl.h>
-#include <net/route.h>
 #endif
 
 #if defined (SOLARIS)
diff --git a/main/rtp.c b/main/rtp.c
index 285d671823..03765eb610 100644
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -33,9 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/time.h>
 #include <signal.h>
 #include <errno.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
 #include <fcntl.h>
 
 #include "asterisk/rtp.h"
diff --git a/main/udptl.c b/main/udptl.c
index 9ac5aff5b8..33671802d0 100644
--- a/main/udptl.c
+++ b/main/udptl.c
@@ -53,9 +53,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/time.h>
 #include <signal.h>
 #include <errno.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
 #include <fcntl.h>
 
 #include "asterisk/udptl.h"